8000 fix: rename directories to fix import error by JJassonn69 · Pull Request #1 · livepeer/ComfyUI · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: rename directories to fix import error #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/comfy/web/assets/** linguist-generated
/comfy/web/** linguist-vendored
/hiddenswitch_comfy/web/assets/** linguist-generated
/hiddenswitch_comfy/web/** linguist-vendored
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ jobs:
uv run pytest -v tests/unit
- name: Lint for errors
run: |
uv run pylint --rcfile=.pylintrc comfy/
uv run pylint --rcfile=.pylintrc comfy_extras/
pylint --rcfile=.pylintrc hiddenswitch_comfy/
pylint --rcfile=.pylintrc hiddenswitch_comfy_extras/
4 changes: 2 additions & 2 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ignore=CVS
# ignore-list. The regex matches against paths and can be in Posix or Windows
# format. Because '\\' represents the directory delimiter on Windows systems,
# it can't be used as an escape character.
ignore-paths=^comfy/api/.*$
ignore-paths=^hiddenswitch_comfy/api/.*$

# Files or directories matching the regular expression patterns are skipped.
# The regex matches against base names, not paths. The default value ignores
Expand All @@ -64,7 +64,7 @@ ignore-patterns=^\.#
# manipulated during runtime and thus existing member attributes cannot be
# deduced by static analysis). It supports qualified module names, as well as
# Unix pattern matching.
ignored-modules=sentencepiece.*,comfy.api,comfy.cmd.folder_paths
ignored-modules=sentencepiece.*,hiddenswitch_comfy.api,hiddenswitch_comfy.cmd.folder_paths

# Python code to execute, usually for sys.path manipulation such as
# pygtk.require().
Expand Down
4 changes: 2 additions & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
/utils/ @yoland68 @robinjhuang @huchenlei @webfiltered @pythongosssss @ltdrdata @christian-byrne

# Node developers
/comfy_extras/ @yoland68 @robinjhuang @huchenlei @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne
/comfy/comfy_types/ @yoland68 @robinjhuang @huchenlei @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne
/hiddenswitch_comfy_extras/ @yoland68 @robinjhuang @huchenlei @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne
/hiddenswitch_comfy/comfy_types/ @yoland68 @robinjhuang @huchenlei @pythongosssss @ltdrdata @Kosinkadink @webfiltered @christian-byrne
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ WORKDIR /workspace
RUN comfyui --quick-test-for-ci --cpu --cwd /workspace

EXPOSE 8188
CMD ["python", "-m", "comfy.cmd.main", "--listen"]
CMD ["python", "-m", "hiddenswitch_comfy.cmd.main", "--listen"]
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
recursive-include comfy/ *
recursive-include hiddenswitch_comfy/ *
include requirements-dev.txt
include requirements.txt
include README.md
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ All `.py` files located in the package specified by the entrypoint with your pac
**some_nodes.py**:

```py
from comfy.nodes.package_typing import CustomNode
from hiddenswitch_comfy.nodes.package_typing import CustomNode


class Binary_Pre 8000 processor(CustomNode):
Expand All @@ -590,7 +590,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {

These packages will be scanned recursively.

Extending the `comfy.nodes.package_typing.CustomNode` provides type hints for authoring nodes.
Extending the `hiddenswitch_comfy.nodes.package_typing.CustomNode` provides type hints for authoring nodes.

## Adding Custom Configuration

Expand Down Expand Up @@ -700,8 +700,8 @@ the nodes will potentially be initialized without any configuration.
Access your configuration from `cli_args`:

```python
from comfy.cli_args import args
from comfy.cli_args_types import Configuration
from hiddenswitch_comfy.cli_args import args
from hiddenswitch_comfy.cli_args_types import Configuration
from typing import Optional


Expand Down Expand Up @@ -1033,7 +1033,7 @@ There are multiple ways to use this ComfyUI package to run workflows programmati
Start ComfyUI by creating an ordinary Python object. This does not create a web server. It runs ComfyUI as a library, like any other package you are familiar with:

```python
from comfy.client.embedded_comfy_client import Comfy
from hiddenswitch_comfy.client.embedded_comfy_client import Comfy

async with Comfy() as client:
# This will run your prompt
Expand Down Expand Up @@ -1065,7 +1065,7 @@ pip install --no-deps git+https://github.com/hiddenswitch/ComfyUI.git
Then the following idiomatic pattern is available:

```python
from comfy.client.aio_client import AsyncRemoteComfyClient
from hiddenswitch_comfy.client.aio_client import AsyncRemoteComfyClient

client = AsyncRemoteComfyClient(server_address="http://localhost:8188")
# Now let's get the bytes of the PNG image saved by the SaveImage node:
Expand Down
26 changes: 0 additions & 26 deletions comfy/api/__init__.py

This file was deleted.

48 changes: 0 additions & 48 deletions comfy/api/apis/tags/default_api.py

This file was deleted.

20 changes: 0 additions & 20 deletions comfy/api/components/schemas/__init__.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions comfy/api/paths/view/get/parameters/parameter_0/schema.py

This file was deleted.

13 changes: 0 additions & 13 deletions comfy/api/paths/view/get/parameters/parameter_2/schema.py

This file was deleted.

8 changes: 4 additions & 4 deletions docs/examples/script_examples/basic_api_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ async def main():
prompt_dict["3"]["inputs"]["seed"] = 5

# Now we will validate the prompt. This Prompt class contains everything we need to validate the prompt.
from comfy.api.components.schema.prompt import Prompt
from hiddenswitch_comfy.api.components.schema.prompt import Prompt
prompt = Prompt.validate(prompt_dict)

# Your prompt is ready to be processed.
# You should **not** be running the ComfyUI application (the thing you start with /main.py). You don't need it. You
# are not making any HTTP requests, you are not running a server, you are not connecting to anything, you are not
# executing the main.py from the ComfyUI git repository, you don't even need that Git repository located anywhere.

from comfy.cli_args_types import Configuration
from hiddenswitch_comfy.cli_args_types import Configuration

# Let's specify some settings. Suppose this is the structure of your directories:
# C:/Users/comfyanonymous/Documents/models
Expand All @@ -136,8 +136,8 @@ async def main():
# configuration.cwd = os.path.dirname(__file__)
configuration = Configuration()

from comfy.client.embedded_comfy_client import Comfy
async with Comfy(configuration=configuration) as client:
from hiddenswitch_comfy.client.embedded_comfy_client import EmbeddedComfyClient
async with EmbeddedComfyClient(configuration=configuration) as client:
# This will run your prompt
outputs = await client.queue_prompt(prompt)

Expand Down
4 changes: 2 additions & 2 deletions docs/examples/script_examples/remote_api_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,15 @@ async def main():
prompt_dict["3"]["inputs"]["seed"] = 5

# Now we will validate the prompt. This Prompt class contains everything we need to validate the prompt.
from comfy.api.components.schema.prompt import Prompt
from hiddenswitch_comfy.api.components.schema.prompt import Prompt
prompt = Prompt.validate(prompt_dict)

# Your prompt is ready to be processed. You should start your ComfyUI server; or, specify a remote URL for it.
# If you want to run your own ComfyUI server, follow the **Manual Install (Windows, Linux, macOS)** instructions.
# Then, as the README specifies, `cd` into the directory that contains your `models/` folder and run:
# comfyui --listen
# Let's create the client we will use to access it:
from comfy.client.aio_client import AsyncRemoteComfyClient
from hiddenswitch_comfy.client.aio_client import AsyncRemoteComfyClient
client = AsyncRemoteComfyClient(server_address="http://localhost:8188")

# Now let's get the bytes of the PNG image saved by the SaveImage node:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
26 changes: 26 additions & 0 deletions hiddenswitch_comfy/api/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# coding: utf-8

# flake8: noqa

"""
comfyui
No description provided (generated by Openapi JSON Schema Generator https://github.com/openapi-json-schema-tools/openapi-json-schema-generator) # noqa: E501
The version of the OpenAPI document: 0.0.1
Generated by: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
"""

__version__ = "1.0.0"

# import ApiClient
from hiddenswitch_comfy.api.api_client import ApiClient

# import Configuration
from hiddenswitch_comfy.api.configurations.api_configuration import ApiConfiguration

# import exceptions
from hiddenswitch_comfy.api.exceptions import OpenApiException
from hiddenswitch_comfy.api.exceptions import ApiAttributeError
from hiddenswitch_comfy.api.exceptions import ApiTypeError
from hiddenswitch_comfy.api.exceptions import ApiValueError
from hiddenswitch_comfy.api.exceptions import ApiKeyError
from hiddenswitch_comfy.api.exceptions import ApiException
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
from urllib3 import _collections, fields


from comfy.api import exceptions, rest, schemas, security_schemes, api_response
from comfy.api.configurations import api_configuration, schema_configuration as schema_configuration_
from hiddenswitch_comfy.api import exceptions, rest, schemas, security_schemes, api_response
from hiddenswitch_comfy.api.configurations import api_configuration, schema_configuration as schema_configuration_


class JSONEncoder(json.JSONEncoder):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import urllib3

from comfy.api import schemas
from hiddenswitch_comfy.api import schemas


@dataclasses.dataclass(frozen=True)
Expand Down
File renamed without changes.
Loading
Loading
0