refactor: clean up imports and enhance async request handling with backward compatibility checks
This commit is contained in:
+16
-22
@@ -1,8 +1,5 @@
|
||||
from io import BytesIO
|
||||
from pprint import pprint
|
||||
from aiohttp import web
|
||||
import os
|
||||
import requests
|
||||
import folder_paths
|
||||
import json
|
||||
import server
|
||||
@@ -13,34 +10,24 @@ import random
|
||||
import traceback
|
||||
import uuid
|
||||
import asyncio
|
||||
import logging
|
||||
from urllib.parse import quote
|
||||
import inspect
|
||||
from urllib.parse import quote, urlencode
|
||||
import threading
|
||||
import hashlib
|
||||
import aiohttp
|
||||
from aiohttp import ClientSession, web
|
||||
from aiohttp import web, ClientSession, ClientError, ClientTimeout
|
||||
import aiofiles
|
||||
from typing import Dict, List, Union, Any, Optional
|
||||
from PIL import Image
|
||||
from typing import Dict, Any
|
||||
import copy
|
||||
import struct
|
||||
from aiohttp import web, ClientSession, ClientError, ClientTimeout, ClientResponseError
|
||||
import atexit
|
||||
from model_management import get_torch_device
|
||||
import torch
|
||||
import psutil
|
||||
from collections import OrderedDict
|
||||
import io
|
||||
from urllib.parse import urlencode
|
||||
|
||||
# Global session
|
||||
client_session = None
|
||||
|
||||
# def create_client_session():
|
||||
# global client_session
|
||||
# if client_session is None:
|
||||
# client_session = aiohttp.ClientSession()
|
||||
|
||||
|
||||
async def ensure_client_session():
|
||||
global client_session
|
||||
@@ -82,8 +69,6 @@ retry_delay_multiplier = float(os.environ.get("RETRY_DELAY_MULTIPLIER", "2"))
|
||||
|
||||
print(f"max_retries: {max_retries}, retry_delay_multiplier: {retry_delay_multiplier}")
|
||||
|
||||
import time
|
||||
|
||||
|
||||
async def async_request_with_retry(
|
||||
method, url, disable_timeout=False, token=None, **kwargs
|
||||
@@ -1327,6 +1312,9 @@ try:
|
||||
is_async = asyncio.iscoroutinefunction(origin_execute)
|
||||
|
||||
if is_async:
|
||||
# Check signature for backward compatibility (v0.3.67 has 10 params, v0.3.68+ has 11)
|
||||
sig = inspect.signature(origin_execute)
|
||||
has_ui_outputs = len(sig.parameters) >= 11
|
||||
|
||||
async def swizzle_execute(
|
||||
server,
|
||||
@@ -1339,12 +1327,14 @@ try:
|
||||
execution_list,
|
||||
pending_subgraph_results,
|
||||
pending_async_nodes,
|
||||
ui_outputs=None,
|
||||
):
|
||||
unique_id = current_item
|
||||
class_type = dynprompt.get_node(unique_id)["class_type"]
|
||||
last_node_id = server.last_node_id
|
||||
|
||||
result = await origin_execute(
|
||||
# Build args list - add ui_outputs only for v0.3.68+
|
||||
args = [
|
||||
server,
|
||||
dynprompt,
|
||||
caches,
|
||||
@@ -1355,12 +1345,16 @@ try:
|
||||
execution_list,
|
||||
pending_subgraph_results,
|
||||
pending_async_nodes,
|
||||
)
|
||||
]
|
||||
if has_ui_outputs:
|
||||
args.append(ui_outputs)
|
||||
|
||||
result = await origin_execute(*args)
|
||||
|
||||
handle_execute(class_type, last_node_id, prompt_id, server, unique_id)
|
||||
return result
|
||||
else:
|
||||
|
||||
# Sync version for very old ComfyUI versions
|
||||
def swizzle_execute(
|
||||
server,
|
||||
dynprompt,
|
||||
|
||||
Reference in New Issue
Block a user