mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-05-25 10:36:57 +08:00
Compare commits
5 Commits
master
...
matt/opena
| Author | SHA1 | Date | |
|---|---|---|---|
| 899e4f55f4 | |||
| 52752612aa | |||
| 50289f2607 | |||
| a0deb78424 | |||
| 96d4c86e4b |
35
.github/workflows/backport_release.yaml
vendored
35
.github/workflows/backport_release.yaml
vendored
@ -458,41 +458,6 @@ jobs:
|
||||
|
||||
echo "Released ${NEW_VERSION} on ${RELEASE_BRANCH}."
|
||||
|
||||
- name: Delete remote source branch
|
||||
env:
|
||||
GH_TOKEN: ${{ steps.app-token.outputs.token }}
|
||||
REPO: ${{ github.repository }}
|
||||
SOURCE_BRANCH: ${{ steps.resolve.outputs.source_branch }}
|
||||
SOURCE_COMMIT: ${{ inputs.commit }}
|
||||
RELEASE_BRANCH: ${{ steps.latest.outputs.release_branch }}
|
||||
DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
|
||||
# Belt-and-braces: the resolve step already refuses the default branch,
|
||||
# but never delete the default or the release branch under any
|
||||
# circumstances.
|
||||
if [[ "${SOURCE_BRANCH}" == "${DEFAULT_BRANCH}" || "${SOURCE_BRANCH}" == "${RELEASE_BRANCH}" ]]; then
|
||||
echo "::error::Refusing to delete '${SOURCE_BRANCH}' (matches default or release branch)."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Delete the source branch on origin, but only if its tip is still the
|
||||
# SHA we released from. If someone pushed new commits to it after we
|
||||
# resolved it, leave it alone — those commits would be silently lost.
|
||||
current_tip="$(git ls-remote origin "refs/heads/${SOURCE_BRANCH}" | awk '{print $1}')"
|
||||
if [[ -z "${current_tip}" ]]; then
|
||||
echo "Source branch '${SOURCE_BRANCH}' no longer exists on origin; nothing to delete."
|
||||
exit 0
|
||||
fi
|
||||
if [[ "${current_tip}" != "${SOURCE_COMMIT}" ]]; then
|
||||
echo "::warning::Source branch '${SOURCE_BRANCH}' tip (${current_tip}) no longer matches released commit (${SOURCE_COMMIT}). Leaving it in place."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
git push origin --delete "refs/heads/${SOURCE_BRANCH}"
|
||||
echo "Deleted remote branch '${SOURCE_BRANCH}'."
|
||||
|
||||
- name: Summary
|
||||
if: always()
|
||||
env:
|
||||
|
||||
@ -433,7 +433,7 @@ See also: [https://www.comfy.org/](https://www.comfy.org/)
|
||||
|
||||
## Frontend Development
|
||||
|
||||
As of August 15, 2024, we have transitioned to a new frontend, which is now hosted in a separate repository: [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend). The compiled JS files (from TS/Vue) are published to [pypi](https://pypi.org/project/comfyui-frontend-package) and installed as a dependency in ComfyUI.
|
||||
As of August 15, 2024, we have transitioned to a new frontend, which is now hosted in a separate repository: [ComfyUI Frontend](https://github.com/Comfy-Org/ComfyUI_frontend). This repository now hosts the compiled JS (from TS/Vue) under the `web/` directory.
|
||||
|
||||
### Reporting Issues and Requesting Features
|
||||
|
||||
|
||||
@ -5,40 +5,6 @@ import logging
|
||||
import sys
|
||||
import threading
|
||||
|
||||
ANSI_NAMED_COLORS = {
|
||||
'black': '\033[30m',
|
||||
'red': '\033[31m',
|
||||
'green': '\033[32m',
|
||||
'yellow': '\033[33m',
|
||||
'blue': '\033[34m',
|
||||
'magenta': '\033[35m',
|
||||
'cyan': '\033[36m',
|
||||
'white': '\033[37m',
|
||||
}
|
||||
|
||||
ANSI_LEVEL_COLORS = {
|
||||
'DEBUG': ANSI_NAMED_COLORS['cyan'],
|
||||
'INFO': ANSI_NAMED_COLORS['green'],
|
||||
'WARNING': ANSI_NAMED_COLORS['yellow'],
|
||||
'ERROR': ANSI_NAMED_COLORS['red'],
|
||||
'CRITICAL': ANSI_NAMED_COLORS['magenta'],
|
||||
}
|
||||
|
||||
ANSI_RESET = '\033[0m'
|
||||
ANSI_BOLD = '\033[1m'
|
||||
|
||||
|
||||
class ColoredFormatter(logging.Formatter):
|
||||
def format(self, record):
|
||||
color = ANSI_LEVEL_COLORS.get(record.levelname, '')
|
||||
bold = ANSI_BOLD if record.levelno >= logging.WARNING else ''
|
||||
level_tag = f"{bold}{color}[{record.levelname}]{ANSI_RESET} "
|
||||
message = super().format(record)
|
||||
line_color = ANSI_NAMED_COLORS.get(getattr(record, 'color', ''), '')
|
||||
if line_color:
|
||||
return f"{level_tag}{line_color}{message}{ANSI_RESET}"
|
||||
return level_tag + message
|
||||
|
||||
logs = None
|
||||
stdout_interceptor = None
|
||||
stderr_interceptor = None
|
||||
@ -102,10 +68,8 @@ def setup_logger(log_level: str = 'INFO', capacity: int = 300, use_stdout: bool
|
||||
logger = logging.getLogger()
|
||||
logger.setLevel(log_level)
|
||||
|
||||
formatter = ColoredFormatter("%(message)s")
|
||||
|
||||
stream_handler = logging.StreamHandler()
|
||||
stream_handler.setFormatter(formatter)
|
||||
stream_handler.setFormatter(logging.Formatter("%(message)s"))
|
||||
|
||||
if use_stdout:
|
||||
# Only errors and critical to stderr
|
||||
@ -113,7 +77,7 @@ def setup_logger(log_level: str = 'INFO', capacity: int = 300, use_stdout: bool
|
||||
|
||||
# Lesser to stdout
|
||||
stdout_handler = logging.StreamHandler(sys.stdout)
|
||||
stdout_handler.setFormatter(formatter)
|
||||
stdout_handler.setFormatter(logging.Formatter("%(message)s"))
|
||||
stdout_handler.addFilter(lambda record: record.levelno < logging.ERROR)
|
||||
logger.addHandler(stdout_handler)
|
||||
|
||||
|
||||
@ -111,7 +111,7 @@ parser.add_argument("--preview-method", type=LatentPreviewMethod, default=Latent
|
||||
parser.add_argument("--preview-size", type=int, default=512, help="Sets the maximum preview size for sampler nodes.")
|
||||
|
||||
cache_group = parser.add_mutually_exclusive_group()
|
||||
cache_group.add_argument("--cache-ram", nargs='*', type=float, default=[], metavar="GB", help="Use RAM pressure caching with the specified headroom thresholds. This is the default caching mode. The first value sets the active-cache threshold; the optional second value sets the inactive-cache/pin threshold. Defaults when no values are provided: active 10%% of system RAM (min 2GB, max 10GB), inactive 100%% of system RAM (max 96GB).")
|
||||
cache_group.add_argument("--cache-ram", nargs='*', type=float, default=[], metavar="GB", help="Use RAM pressure caching with the specified headroom thresholds. This is the default caching mode. The first value sets the active-cache threshold; the optional second value sets the inactive-cache/pin threshold. Defaults when no values are provided: active 25%% of system RAM (min 4GB, max 32GB), inactive 75%% of system RAM (min 12GB, max 96GB).")
|
||||
cache_group.add_argument("--cache-classic", action="store_true", help="Use the old style (aggressive) caching.")
|
||||
cache_group.add_argument("--cache-lru", type=int, default=0, help="Use LRU caching with a maximum of N node results cached. May use more RAM/VRAM.")
|
||||
cache_group.add_argument("--cache-none", action="store_true", help="Reduced RAM/VRAM usage at the expense of executing every node for each run.")
|
||||
|
||||
@ -741,12 +741,12 @@ optimized_attention = attention_basic
|
||||
if model_management.sage_attention_enabled():
|
||||
logging.info("Using sage attention")
|
||||
optimized_attention = attention_sage
|
||||
elif model_management.flash_attention_enabled():
|
||||
logging.info("Using Flash Attention")
|
||||
optimized_attention = attention_flash
|
||||
elif model_management.xformers_enabled():
|
||||
logging.info("Using xformers attention")
|
||||
optimized_attention = attention_xformers
|
||||
elif model_management.flash_attention_enabled():
|
||||
logging.info("Using Flash Attention")
|
||||
optimized_attention = attention_flash
|
||||
elif model_management.pytorch_attention_enabled():
|
||||
logging.info("Using pytorch attention")
|
||||
optimized_attention = attention_pytorch
|
||||
|
||||
@ -1217,7 +1217,7 @@ def get_aimdo_cast_buffer(offload_stream, device):
|
||||
def get_pin_buffer(offload_stream):
|
||||
pin_buffer = STREAM_PIN_BUFFERS.get(offload_stream, None)
|
||||
if pin_buffer is None:
|
||||
pin_buffer = comfy_aimdo.host_buffer.HostBuffer(0, 0, pinned_hostbuf_size(8 * 1024**3), mark_cold=False)
|
||||
pin_buffer = comfy_aimdo.host_buffer.HostBuffer(0, 0, pinned_hostbuf_size(8 * 1024**3))
|
||||
STREAM_PIN_BUFFERS[offload_stream] = pin_buffer
|
||||
elif offload_stream is not None:
|
||||
event = getattr(pin_buffer, "_comfy_event", None)
|
||||
|
||||
@ -265,6 +265,7 @@ def _calc_cond_batch(model: BaseModel, conds: list[list[dict]], x_in: torch.Tens
|
||||
input_shape = [len(batch_amount) * first_shape[0]] + list(first_shape)[1:]
|
||||
cond_shapes = collections.defaultdict(list)
|
||||
for tt in batch_amount:
|
||||
cond = {k: v.size() for k, v in to_run[tt][0].conditioning.items()}
|
||||
for k, v in to_run[tt][0].conditioning.items():
|
||||
cond_shapes[k].append(v.size())
|
||||
|
||||
|
||||
8
main.py
8
main.py
@ -286,8 +286,8 @@ def prompt_worker(q, server_instance):
|
||||
cache_ram = 0
|
||||
cache_ram_inactive = 0
|
||||
if not args.cache_classic and not args.cache_none and args.cache_lru <= 0:
|
||||
cache_ram = min(10.0, max(2.0, comfy.model_management.total_ram * 0.10 / 1024.0))
|
||||
cache_ram_inactive = min(96.0, comfy.model_management.total_ram / 1024.0)
|
||||
cache_ram = min(32.0, max(4.0, comfy.model_management.total_ram * 0.25 / 1024.0))
|
||||
cache_ram_inactive = min(96.0, max(12.0, comfy.model_management.total_ram * 0.75 / 1024.0))
|
||||
if len(args.cache_ram) > 0:
|
||||
cache_ram = args.cache_ram[0]
|
||||
if len(args.cache_ram) > 1:
|
||||
@ -344,9 +344,9 @@ def prompt_worker(q, server_instance):
|
||||
# Log Time in a more readable way after 10 minutes
|
||||
if execution_time > 600:
|
||||
execution_time = time.strftime("%H:%M:%S", time.gmtime(execution_time))
|
||||
logging.info(f"Prompt executed in {execution_time}", extra={'color': 'green'})
|
||||
logging.info(f"Prompt executed in {execution_time}")
|
||||
else:
|
||||
logging.info("Prompt executed in {:.2f} seconds".format(execution_time), extra={'color': 'green'})
|
||||
logging.info("Prompt executed in {:.2f} seconds".format(execution_time))
|
||||
|
||||
if not asset_seeder.is_disabled():
|
||||
paths = _collect_output_absolute_paths(e.history_result)
|
||||
|
||||
428
openapi.yaml
428
openapi.yaml
@ -1200,7 +1200,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/GetUserDataResponseFull"
|
||||
$ref: "#/components/schemas/ListUserdataResponse"
|
||||
"404":
|
||||
description: Directory not found
|
||||
|
||||
@ -1340,7 +1340,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/UserDataResponseFull"
|
||||
$ref: "#/components/schemas/UserDataResponse"
|
||||
"409":
|
||||
description: File exists and overwrite not set
|
||||
'400':
|
||||
@ -1434,7 +1434,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/UserDataResponseFull"
|
||||
$ref: "#/components/schemas/UserDataResponse"
|
||||
"404":
|
||||
description: Source file not found
|
||||
"409":
|
||||
@ -2752,7 +2752,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/JobCancelResponse"
|
||||
$ref: "#/components/schemas/CloudJobStatus"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -2803,7 +2803,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/JobStatusResponse"
|
||||
$ref: "#/components/schemas/CloudJobStatus"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -2899,7 +2899,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/HistoryResponse"
|
||||
$ref: "#/components/schemas/HistoryV2Response"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -2938,7 +2938,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/HistoryDetailResponse"
|
||||
$ref: "#/components/schemas/HistoryV2Entry"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -2994,7 +2994,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/LogsResponse"
|
||||
$ref: "#/components/schemas/CloudLogsResponse"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -3315,7 +3315,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/AssetMetadataResponse"
|
||||
$ref: "#/components/schemas/RemoteAssetMetadata"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -3889,7 +3889,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/HubWorkflowListResponse"
|
||||
$ref: "#/components/schemas/HubWorkflowList"
|
||||
'400':
|
||||
description: Bad request (e.g. malformed pagination cursor)
|
||||
content:
|
||||
@ -3972,7 +3972,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/HubWorkflowDetail"
|
||||
$ref: "#/components/schemas/HubWorkflow"
|
||||
"404":
|
||||
description: Not found
|
||||
content:
|
||||
@ -4092,7 +4092,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/WorkflowListResponse"
|
||||
$ref: "#/components/schemas/CloudWorkflowList"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -4136,7 +4136,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/WorkflowResponse"
|
||||
$ref: "#/components/schemas/CloudWorkflow"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -4183,7 +4183,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/WorkflowResponse"
|
||||
$ref: "#/components/schemas/CloudWorkflow"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -4239,7 +4239,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/WorkflowResponse"
|
||||
$ref: "#/components/schemas/CloudWorkflow"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -4438,7 +4438,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/WorkflowResponse"
|
||||
$ref: "#/components/schemas/CloudWorkflow"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -4607,7 +4607,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/PublishedWorkflowDetail"
|
||||
$ref: "#/components/schemas/CloudWorkflow"
|
||||
"404":
|
||||
description: Not found
|
||||
content:
|
||||
@ -4743,7 +4743,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/ExchangeTokenResponse"
|
||||
$ref: "#/components/schemas/AuthTokenResponse"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -5089,7 +5089,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/BillingBalanceResponse"
|
||||
$ref: "#/components/schemas/BillingBalance"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -5132,7 +5132,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/BillingEventsResponse"
|
||||
$ref: "#/components/schemas/BillingEventList"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -5166,7 +5166,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/BillingOpStatusResponse"
|
||||
$ref: "#/components/schemas/BillingOp"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -5278,7 +5278,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/PreviewSubscribeResponse"
|
||||
$ref: "#/components/schemas/SubscriptionPreview"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -5311,7 +5311,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/BillingStatusResponse"
|
||||
$ref: "#/components/schemas/BillingStatus"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -5359,7 +5359,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/SubscribeResponse"
|
||||
$ref: "#/components/schemas/BillingSubscription"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -5392,7 +5392,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/CancelSubscriptionResponse"
|
||||
$ref: "#/components/schemas/BillingSubscription"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -5425,7 +5425,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/ResubscribeResponse"
|
||||
$ref: "#/components/schemas/BillingSubscription"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -5470,7 +5470,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/CreateTopupResponse"
|
||||
$ref: "#/components/schemas/BillingBalance"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -5555,7 +5555,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/CreateWorkspaceAPIKeyResponse"
|
||||
$ref: "#/components/schemas/WorkspaceApiKeyCreated"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -5704,7 +5704,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/PendingInvite"
|
||||
$ref: "#/components/schemas/WorkspaceInvite"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -6315,7 +6315,22 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/FeedbackRequest"
|
||||
type: object
|
||||
required:
|
||||
- message
|
||||
properties:
|
||||
message:
|
||||
type: string
|
||||
description: Feedback message
|
||||
rating:
|
||||
type: integer
|
||||
minimum: 1
|
||||
maximum: 5
|
||||
description: Optional satisfaction rating
|
||||
context:
|
||||
type: object
|
||||
additionalProperties: true
|
||||
description: Additional context metadata
|
||||
responses:
|
||||
"201":
|
||||
description: Feedback submitted
|
||||
@ -6471,7 +6486,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/AcceptInviteResponse"
|
||||
$ref: "#/components/schemas/Workspace"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -6571,7 +6586,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/SecretResponse"
|
||||
$ref: "#/components/schemas/SecretMeta"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -6630,7 +6645,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/SecretResponse"
|
||||
$ref: "#/components/schemas/SecretMeta"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -6687,7 +6702,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/SecretResponse"
|
||||
$ref: "#/components/schemas/SecretMeta"
|
||||
"400":
|
||||
description: Bad request
|
||||
content:
|
||||
@ -6790,7 +6805,7 @@ paths:
|
||||
content:
|
||||
application/json:
|
||||
schema:
|
||||
$ref: "#/components/schemas/UserResponse"
|
||||
$ref: "#/components/schemas/CloudUser"
|
||||
"401":
|
||||
description: Unauthorized
|
||||
content:
|
||||
@ -7520,12 +7535,6 @@ components:
|
||||
description: Unique job identifier (same as prompt_id)
|
||||
status:
|
||||
type: string
|
||||
enum:
|
||||
- pending
|
||||
- in_progress
|
||||
- completed
|
||||
- failed
|
||||
- cancelled
|
||||
description: Current job status
|
||||
create_time:
|
||||
type: integer
|
||||
@ -7559,12 +7568,6 @@ components:
|
||||
format: uuid
|
||||
status:
|
||||
type: string
|
||||
enum:
|
||||
- pending
|
||||
- in_progress
|
||||
- completed
|
||||
- failed
|
||||
- cancelled
|
||||
workflow:
|
||||
type: object
|
||||
additionalProperties: true
|
||||
@ -9585,15 +9588,16 @@ components:
|
||||
description: List of plan features
|
||||
|
||||
BillingStatus:
|
||||
type: string
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: "[cloud-only] Overall billing/payment lifecycle status."
|
||||
enum:
|
||||
- awaiting_payment_method
|
||||
- pending_payment
|
||||
- paid
|
||||
- payment_failed
|
||||
- inactive
|
||||
description: "[cloud-only] Overall billing and subscription status."
|
||||
properties:
|
||||
subscription:
|
||||
$ref: "#/components/schemas/BillingSubscription"
|
||||
balance:
|
||||
$ref: "#/components/schemas/BillingBalance"
|
||||
has_payment_method:
|
||||
type: boolean
|
||||
|
||||
BillingSubscription:
|
||||
type: object
|
||||
@ -9655,12 +9659,6 @@ components:
|
||||
type: string
|
||||
name:
|
||||
type: string
|
||||
type:
|
||||
type: string
|
||||
enum:
|
||||
- personal
|
||||
- team
|
||||
description: Workspace type (personal vs. team).
|
||||
owner_id:
|
||||
type: string
|
||||
member_count:
|
||||
@ -11381,311 +11379,3 @@ components:
|
||||
message:
|
||||
type: string
|
||||
description: Human-readable error message
|
||||
|
||||
AcceptInviteResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response returned after successfully accepting a workspace invitation.'
|
||||
required:
|
||||
- workspace_id
|
||||
- workspace_name
|
||||
properties:
|
||||
workspace_id:
|
||||
type: string
|
||||
description: ID of the workspace joined
|
||||
workspace_name:
|
||||
type: string
|
||||
description: Name of the workspace joined
|
||||
|
||||
BillingEventsResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Paginated list of billing events for a workspace.'
|
||||
required:
|
||||
- total
|
||||
- events
|
||||
- page
|
||||
- limit
|
||||
- totalPages
|
||||
properties:
|
||||
total:
|
||||
type: integer
|
||||
description: Total number of events
|
||||
events:
|
||||
type: array
|
||||
items:
|
||||
$ref: '#/components/schemas/BillingEvent'
|
||||
page:
|
||||
type: integer
|
||||
description: Current page number (1-indexed)
|
||||
limit:
|
||||
type: integer
|
||||
description: Items per page
|
||||
totalPages:
|
||||
type: integer
|
||||
description: Total number of pages
|
||||
|
||||
BillingOpStatusResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Status of an asynchronous billing operation.'
|
||||
required:
|
||||
- id
|
||||
- status
|
||||
- started_at
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
description: Unique identifier for the billing operation
|
||||
status:
|
||||
type: string
|
||||
enum:
|
||||
- pending
|
||||
- succeeded
|
||||
- failed
|
||||
description: Current status of the operation
|
||||
error_message:
|
||||
type: string
|
||||
description: Error message if status is failed
|
||||
started_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: When the operation was initiated
|
||||
completed_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: When the operation completed (success or failure)
|
||||
|
||||
CancelSubscriptionResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response after successfully cancelling a subscription.'
|
||||
required:
|
||||
- cancel_at
|
||||
- billing_op_id
|
||||
properties:
|
||||
billing_op_id:
|
||||
type: string
|
||||
description: Billing operation ID to poll for status via GET /api/billing/ops/{id}
|
||||
cancel_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: The date when the subscription will end (end of current billing period)
|
||||
|
||||
CreateTopupResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response after successfully purchasing a credit top-up.'
|
||||
required:
|
||||
- topup_id
|
||||
- status
|
||||
- amount_cents
|
||||
- billing_op_id
|
||||
properties:
|
||||
billing_op_id:
|
||||
type: string
|
||||
description: Billing operation ID to poll for status via GET /api/billing/ops/{id}
|
||||
topup_id:
|
||||
type: string
|
||||
description: Unique identifier for the top-up request (same as billing_op_id, deprecated)
|
||||
status:
|
||||
type: string
|
||||
enum:
|
||||
- pending
|
||||
- completed
|
||||
- failed
|
||||
description: Current status of the top-up
|
||||
amount_cents:
|
||||
type: integer
|
||||
format: int64
|
||||
description: Amount being charged in cents
|
||||
|
||||
CreateWorkspaceAPIKeyResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response containing the newly created workspace API key.'
|
||||
required:
|
||||
- id
|
||||
- name
|
||||
- description
|
||||
- key
|
||||
- key_prefix
|
||||
- created_at
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
format: uuid
|
||||
description: API key ID
|
||||
name:
|
||||
type: string
|
||||
description: User-provided label
|
||||
description:
|
||||
type: string
|
||||
description: User-provided description of the key's purpose. Limit is byte-based (UTF-8 encoding); 5000 bytes equals
|
||||
5000 ASCII characters or fewer multi-byte characters.
|
||||
maxLength: 5000
|
||||
key:
|
||||
type: string
|
||||
description: The full plaintext API key (only shown once)
|
||||
key_prefix:
|
||||
type: string
|
||||
description: First 8 chars after prefix for display
|
||||
expires_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: When the key expires (if set)
|
||||
created_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: When the key was created
|
||||
|
||||
ExchangeTokenResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response containing the issued Cloud JWT and its expiry.'
|
||||
required:
|
||||
- token
|
||||
- expires_at
|
||||
- workspace
|
||||
- role
|
||||
- permissions
|
||||
properties:
|
||||
token:
|
||||
type: string
|
||||
description: Cloud JWT token
|
||||
expires_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: Token expiration time (RFC 3339)
|
||||
workspace:
|
||||
$ref: '#/components/schemas/WorkspaceSummary'
|
||||
role:
|
||||
type: string
|
||||
enum:
|
||||
- owner
|
||||
- member
|
||||
description: User's role in the workspace
|
||||
permissions:
|
||||
type: array
|
||||
items:
|
||||
type: string
|
||||
description: Permission strings for the role
|
||||
example:
|
||||
- owner:*
|
||||
|
||||
JobCancelResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response for POST /api/jobs/{job_id}/cancel. Returned on both fresh cancels and idempotent no-ops.'
|
||||
required:
|
||||
- cancelled
|
||||
properties:
|
||||
cancelled:
|
||||
type: boolean
|
||||
description: "True when a cancel event was successfully dispatched by this call.\nFalse when the job was already in\
|
||||
\ a terminal or cancelling state,\nin which case the call is a no-op (still 200 \u2014 idempotent).\n"
|
||||
|
||||
ResubscribeResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response after successfully resubscribing to a billing plan.'
|
||||
required:
|
||||
- status
|
||||
- billing_op_id
|
||||
properties:
|
||||
billing_op_id:
|
||||
type: string
|
||||
description: Billing operation ID to poll for status via GET /api/billing/ops/{id}
|
||||
status:
|
||||
type: string
|
||||
enum:
|
||||
- active
|
||||
description: The subscription status after resubscribing
|
||||
message:
|
||||
type: string
|
||||
description: Human-readable confirmation message
|
||||
|
||||
SubscribeResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Response after successfully subscribing to a billing plan.'
|
||||
required:
|
||||
- status
|
||||
- billing_op_id
|
||||
properties:
|
||||
billing_op_id:
|
||||
type: string
|
||||
description: Billing operation ID to poll for status via GET /api/billing/ops/{id}
|
||||
status:
|
||||
type: string
|
||||
enum:
|
||||
- subscribed
|
||||
- needs_payment_method
|
||||
- pending_payment
|
||||
description: 'Status of the subscription operation:
|
||||
|
||||
- subscribed: Subscription is active immediately
|
||||
|
||||
- needs_payment_method: User must add payment method via payment_method_url
|
||||
|
||||
- pending_payment: Upgrade initiated, waiting for payment to complete
|
||||
|
||||
'
|
||||
effective_at:
|
||||
type: string
|
||||
format: date-time
|
||||
description: When the subscription became/becomes active (present when status=subscribed or pending_payment)
|
||||
payment_method_url:
|
||||
type: string
|
||||
description: URL to redirect user to add payment method (present when status=needs_payment_method)
|
||||
|
||||
UserResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] User information response'
|
||||
required:
|
||||
- id
|
||||
- status
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
description: Firebase UID of the authenticated user
|
||||
status:
|
||||
type: string
|
||||
description: User status (always "active" for authenticated users)
|
||||
|
||||
WorkflowListResponse:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: '[cloud-only] Paginated list of saved workflows.'
|
||||
required:
|
||||
- data
|
||||
- pagination
|
||||
properties:
|
||||
data:
|
||||
type: array
|
||||
items:
|
||||
$ref: '#/components/schemas/WorkflowResponse'
|
||||
pagination:
|
||||
$ref: '#/components/schemas/PaginationInfo'
|
||||
|
||||
FeedbackRequest:
|
||||
type: object
|
||||
x-runtime: [cloud]
|
||||
description: "[cloud-only] User feedback submission body."
|
||||
required:
|
||||
- message
|
||||
properties:
|
||||
type:
|
||||
type: string
|
||||
enum:
|
||||
- missing_nodes
|
||||
- general
|
||||
- missing_models
|
||||
description: Feedback category
|
||||
category:
|
||||
type: string
|
||||
description: Additional category metadata
|
||||
message:
|
||||
type: string
|
||||
description: User-provided feedback message
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
comfyui-frontend-package==1.44.19
|
||||
comfyui-frontend-package==1.43.18
|
||||
comfyui-workflow-templates==0.9.82
|
||||
comfyui-embedded-docs==0.5.0
|
||||
torch
|
||||
@ -23,7 +23,7 @@ SQLAlchemy>=2.0.0
|
||||
filelock
|
||||
av>=14.2.0
|
||||
comfy-kitchen>=0.2.8
|
||||
comfy-aimdo==0.4.5
|
||||
comfy-aimdo==0.4.3
|
||||
requests
|
||||
simpleeval>=1.0.0
|
||||
blake3
|
||||
|
||||
Reference in New Issue
Block a user