move this back since the issue is resolved

This commit is contained in:
Benjamin Berman 2023-08-22 18:00:18 -07:00
parent cc215a0658
commit b98e1c0f01
64 changed files with 35 additions and 27 deletions

View File

@ -14,15 +14,15 @@
__version__ = "1.0.0" __version__ = "1.0.0"
# import ApiClient # import ApiClient
from api_client import ApiClient from .api_client import ApiClient
# import Configuration # import Configuration
from configuration import Configuration from .configuration import Configuration
# import exceptions # import exceptions
from exceptions import OpenApiException from .exceptions import OpenApiException
from exceptions import ApiAttributeError from .exceptions import ApiAttributeError
from exceptions import ApiTypeError from .exceptions import ApiTypeError
from exceptions import ApiValueError from .exceptions import ApiValueError
from exceptions import ApiKeyError from .exceptions import ApiKeyError
from exceptions import ApiException from .exceptions import ApiException

View File

@ -263,7 +263,7 @@ paths:
- name: digest - name: digest
in: path in: path
required: true required: true
description: A digest of the request used to generate the imaeg description: A digest of the request used to generate the image
schema: schema:
type: string type: string
example: e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3 example: e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3
@ -394,7 +394,7 @@ paths:
items: items:
type: string type: string
example: example:
uris: [ "/api/v1/images/e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3", "http://127.0.0.1:8188/view?filename=ComfyUI_00001_.png&type=output" ] urls: [ "/api/v1/images/e5187160a7b2c496773c1c5a45bfd3ffbf25eaa5969328e6469d36f31cf240a3", "http://127.0.0.1:8188/view?filename=ComfyUI_00001_.png&type=output" ]
204: 204:
description: | description: |
The prompt was run but did not contain any SaveImage outputs, so nothing will be returned. The prompt was run but did not contain any SaveImage outputs, so nothing will be returned.

View File

@ -8,8 +8,8 @@ from importlib_resources import files, as_file
from ..vendor.appdirs import user_cache_dir from ..vendor.appdirs import user_cache_dir
_openapi_jar_basename = "openapi-generator-cli-6.4.0.jar" _openapi_jar_basename = "openapi-generator-cli-6.6.0.jar"
_openapi_jar_url = f"https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.4.0/{_openapi_jar_basename}" _openapi_jar_url = f"https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.6.0/{_openapi_jar_basename}"
def is_java_installed(): def is_java_installed():
@ -36,9 +36,17 @@ def main():
with as_file(files('comfy.api').joinpath('openapi.yaml')) as openapi_schema: with as_file(files('comfy.api').joinpath('openapi.yaml')) as openapi_schema:
with as_file(files('comfy.api').joinpath('openapi_python_config.yaml')) as python_config: with as_file(files('comfy.api').joinpath('openapi_python_config.yaml')) as python_config:
cmds = ["java", "--add-opens", "java.base/java.io=ALL-UNNAMED", "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", cmds = [
"java.base/java.lang=ALL-UNNAMED", "-jar", jar, "generate", "--input-spec", openapi_schema, "-g", "python", "--global-property", "models", "java",
"--config", python_config] "--add-opens", "java.base/java.io=ALL-UNNAMED",
"--add-opens", "java.base/java.util=ALL-UNNAMED",
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
"-jar", jar,
"generate",
"--input-spec", openapi_schema,
"--global-property", "models",
"--config", python_config
]
subprocess.check_output(cmds) subprocess.check_output(cmds)

View File

@ -1,5 +1,5 @@
import torch import torch
from ...nodes.common import MAX_RESOLUTION from comfy.nodes.common import MAX_RESOLUTION
class CLIPTextEncodeSDXLRefiner: class CLIPTextEncodeSDXLRefiner:

View File

@ -1,5 +1,5 @@
from ... import utils from comfy import utils
from ...cmd import folder_paths from comfy.cmd import folder_paths
import torch import torch
def load_hypernetwork_patch(path, strength): def load_hypernetwork_patch(path, strength):

View File

@ -2,7 +2,7 @@ import numpy as np
from scipy.ndimage import grey_dilation from scipy.ndimage import grey_dilation
import torch import torch
from ...nodes.common import MAX_RESOLUTION from comfy.nodes.common import MAX_RESOLUTION
def composite(destination, source, x, y, mask = None, multiplier = 8, resize_source = False): def composite(destination, source, x, y, mask = None, multiplier = 8, resize_source = False):

View File

@ -1,11 +1,11 @@
from ... import sd from comfy import sd
from ... import model_base from comfy import model_base
from ...cmd import folder_paths from comfy.cmd import folder_paths
import json import json
import os import os
from ...cli_args import args from comfy.cli_args import args
class ModelMergeSimple: class ModelMergeSimple:
@classmethod @classmethod

View File

@ -4,7 +4,7 @@ import torch.nn.functional as F
from PIL import Image from PIL import Image
import math import math
from ... import utils from comfy import utils
class Blend: class Blend:

View File

@ -1,8 +1,8 @@
from ..chainner_models import model_loading from ..chainner_models import model_loading
from ... import model_management from comfy import model_management
import torch import torch
from ... import utils from comfy import utils
from ...cmd import folder_paths from comfy.cmd import folder_paths
class UpscaleModelLoader: class UpscaleModelLoader: