Merge branch 'master' into matt/openapi-fix-billing-status-enum

The previous PR (#14070) inadvertently left BillingStatus as an
invalid hybrid: an OpenAPI object schema with both 'properties' and
'enum' — the enum is meaningless on an object type.

The object properties (subscription, balance, has_payment_method)
duplicate what's already in BillingStatusResponse, the only place
that referenced BillingStatus did so via 'billing_status' field
which clearly wants the enum value.

Cleanly converts BillingStatus to a string enum matching cloud's
runtime emission. Closes the last (1) handler reference in
Comfy-Org/cloud's TestCutoverSafe gate (BE-1106).

README.md

@@ -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). This repository now hosts the compiled JS (from TS/Vue) under the `web/` directory.
+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.
 
 ### Reporting Issues and Requesting Features
 

app/logger.py

@@ -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
@@ -85,7 +51,7 @@ def on_flush(callback):
     if stderr_interceptor is not None:
         stderr_interceptor.on_flush(callback)
 
-def setup_logger(log_level: str = 'INFO', capacity: int = 300, use_stdout: bool = False, color_logs: bool = True):
+def setup_logger(log_level: str = 'INFO', capacity: int = 300, use_stdout: bool = False):
     global logs
     if logs:
         return
@@ -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") if color_logs else logging.Formatter("%(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)
 

comfy/cli_args.py

@@ -183,7 +183,6 @@ parser.add_argument("--multi-user", action="store_true", help="Enables per-user
 
 parser.add_argument("--verbose", default='INFO', const='DEBUG', nargs="?", choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], help='Set the logging level')
 parser.add_argument("--log-stdout", action="store_true", help="Send normal process output to stdout instead of stderr (default).")
-parser.add_argument("--color-logs", action=argparse.BooleanOptionalAction, default=True, help="Enable ANSI colored log output in the terminal (default: enabled, use --no-color-logs to disable).")
 
 
 # The default built-in provider hosted under web/

main.py

@@ -17,7 +17,7 @@ import folder_paths
 import time
 from comfy.cli_args import enables_dynamic_vram
 from app.logger import setup_logger
-setup_logger(log_level=args.verbose, use_stdout=args.log_stdout, color_logs=args.color_logs)
+setup_logger(log_level=args.verbose, use_stdout=args.log_stdout)
 
 from app.assets.seeder import asset_seeder
 from app.assets.services import register_output_files
@@ -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)

openapi.yaml

@@ -9585,16 +9585,9 @@ components:
           description: List of plan features
 
     BillingStatus:
-      type: object
+      type: string
       x-runtime: [cloud]
-      description: "[cloud-only] Overall billing and subscription status."
-      properties:
-        subscription:
-          $ref: "#/components/schemas/BillingSubscription"
-        balance:
-          $ref: "#/components/schemas/BillingBalance"
-        has_payment_method:
-          type: boolean
+      description: "[cloud-only] Overall billing/payment lifecycle status."
       enum:
         - awaiting_payment_method
         - pending_payment