From bfd4e226f2c557697c3d0114560c020175f8c5a5 Mon Sep 17 00:00:00 2001 From: rookiestar28 <151893693+rookiestar28@users.noreply.github.com> Date: Thu, 12 Feb 2026 02:23:39 +0800 Subject: [PATCH] style: apply pre-commit auto-fixes for F40/R71/R72 changes --- api/routes.py | 10 +++++----- api/webhook_submit.py | 9 +++------ api/webhook_validate.py | 10 +++------- services/job_events.py | 8 ++------ services/operator_doctor.py | 4 +--- tests/test_f40_webhook_mapping.py | 11 ++++++----- tests/test_r71_job_events.py | 1 + tests/test_r72_operator_doctor.py | 6 +++++- 8 files changed, 26 insertions(+), 33 deletions(-) diff --git a/api/routes.py b/api/routes.py index 4ef8715..2f85e57 100644 --- a/api/routes.py +++ b/api/routes.py @@ -46,6 +46,7 @@ if web is not None: llm_models_handler, llm_test_handler, ) + from ..api.events import events_poll_handler, events_stream_handler # R71 from ..api.preflight_handler import inventory_handler, preflight_handler from ..api.secrets import ( secrets_delete_handler, @@ -56,7 +57,6 @@ if web is not None: from ..api.webhook import webhook_handler from ..api.webhook_submit import webhook_submit_handler from ..api.webhook_validate import webhook_validate_handler - from ..api.events import events_poll_handler, events_stream_handler # R71 # IMPORTANT: use PACK_VERSION / PACK_START_TIME from config. # Do NOT import VERSION or config_path (they do not exist) or route registration will fail. @@ -89,6 +89,10 @@ if web is not None: llm_models_handler, llm_test_handler, ) + from api.events import ( # R71 # type: ignore + events_poll_handler, + events_stream_handler, + ) from api.preflight_handler import inventory_handler, preflight_handler from api.secrets import ( secrets_delete_handler, @@ -99,10 +103,6 @@ if web is not None: from api.webhook import webhook_handler from api.webhook_submit import webhook_submit_handler from api.webhook_validate import webhook_validate_handler - from api.events import ( - events_poll_handler, - events_stream_handler, - ) # R71 # type: ignore # IMPORTANT: keep PACK_* imports aligned with config.py (VERSION/config_path do not exist). from config import LOG_FILE, PACK_NAME, PACK_START_TIME, PACK_VERSION diff --git a/api/webhook_submit.py b/api/webhook_submit.py index 348ae6a..ea35e45 100644 --- a/api/webhook_submit.py +++ b/api/webhook_submit.py @@ -28,10 +28,7 @@ if __package__ and "." in __package__: from ..services.trace import get_effective_trace_id from ..services.trace_store import trace_store from ..services.webhook_auth import require_auth - from ..services.webhook_mapping import ( - apply_mapping, - resolve_profile, - ) # F40 + from ..services.webhook_mapping import apply_mapping, resolve_profile # F40 else: # pragma: no cover (test-only import mode) from models.schemas import MAX_BODY_SIZE, WebhookJobRequest from services.callback_delivery import start_callback_watch # type: ignore @@ -45,10 +42,10 @@ else: # pragma: no cover (test-only import mode) from services.trace import get_effective_trace_id # type: ignore from services.trace_store import trace_store # type: ignore from services.webhook_auth import require_auth # type: ignore - from services.webhook_mapping import ( + from services.webhook_mapping import ( # F40 # type: ignore apply_mapping, resolve_profile, - ) # F40 # type: ignore + ) logger = logging.getLogger("ComfyUI-OpenClaw.api.webhook_submit") diff --git a/api/webhook_validate.py b/api/webhook_validate.py index f16870c..1f97b74 100644 --- a/api/webhook_validate.py +++ b/api/webhook_validate.py @@ -43,13 +43,9 @@ if __package__ and "." in __package__: from ..services.templates import get_template_service from ..services.trace import get_effective_trace_id from ..services.webhook_auth import require_auth - from ..services.webhook_mapping import ( - apply_mapping, - resolve_profile, - ) # F40 + from ..services.webhook_mapping import apply_mapping, resolve_profile # F40 else: # pragma: no cover (test-only import mode) from models.schemas import MAX_BODY_SIZE, WebhookJobRequest - from services.execution_budgets import ( # type: ignore BudgetExceededError, check_render_size, @@ -59,10 +55,10 @@ else: # pragma: no cover (test-only import mode) from services.templates import get_template_service # type: ignore from services.trace import get_effective_trace_id # type: ignore from services.webhook_auth import require_auth # type: ignore - from services.webhook_mapping import ( + from services.webhook_mapping import ( # F40 # type: ignore apply_mapping, resolve_profile, - ) # F40 # type: ignore + ) logger = logging.getLogger("ComfyUI-OpenClaw.api.webhook_validate") diff --git a/services/job_events.py b/services/job_events.py index ca14f14..c6717d2 100644 --- a/services/job_events.py +++ b/services/job_events.py @@ -32,12 +32,8 @@ logger = logging.getLogger("ComfyUI-OpenClaw.services.job_events") # Configuration # --------------------------------------------------------------------------- -MAX_EVENT_BUFFER = int( - os.environ.get("OPENCLAW_JOB_EVENT_BUFFER_SIZE", "500") -) -EVENT_TTL_SEC = int( - os.environ.get("OPENCLAW_JOB_EVENT_TTL_SEC", "600") -) # 10 minutes +MAX_EVENT_BUFFER = int(os.environ.get("OPENCLAW_JOB_EVENT_BUFFER_SIZE", "500")) +EVENT_TTL_SEC = int(os.environ.get("OPENCLAW_JOB_EVENT_TTL_SEC", "600")) # 10 minutes # --------------------------------------------------------------------------- diff --git a/services/operator_doctor.py b/services/operator_doctor.py index f985389..c42f5af 100644 --- a/services/operator_doctor.py +++ b/services/operator_doctor.py @@ -192,9 +192,7 @@ def check_node_version(report: DoctorReport) -> None: ) return try: - out = subprocess.check_output( - [node, "--version"], text=True, timeout=5 - ).strip() + out = subprocess.check_output([node, "--version"], text=True, timeout=5).strip() report.environment["node"] = out major = int(out.lstrip("v").split(".")[0]) if major >= 18: diff --git a/tests/test_f40_webhook_mapping.py b/tests/test_f40_webhook_mapping.py index 0bfcec8..f13bd1e 100644 --- a/tests/test_f40_webhook_mapping.py +++ b/tests/test_f40_webhook_mapping.py @@ -3,15 +3,16 @@ Tests for F40 Webhook Mapping Engine. """ import unittest + from services.webhook_mapping import ( - MappingProfile, - FieldMapping, + BUILTIN_PROFILES, CoercionType, - apply_mapping, - resolve_profile, + FieldMapping, + MappingProfile, _resolve_path, _set_path, - BUILTIN_PROFILES, + apply_mapping, + resolve_profile, ) diff --git a/tests/test_r71_job_events.py b/tests/test_r71_job_events.py index d864349..2a4258c 100644 --- a/tests/test_r71_job_events.py +++ b/tests/test_r71_job_events.py @@ -3,6 +3,7 @@ Tests for R71 Job Event Stream (SSE). """ import unittest + from services.job_events import ( JobEvent, JobEventStore, diff --git a/tests/test_r72_operator_doctor.py b/tests/test_r72_operator_doctor.py index e2272d2..7d983b3 100644 --- a/tests/test_r72_operator_doctor.py +++ b/tests/test_r72_operator_doctor.py @@ -4,14 +4,16 @@ Tests for R72 Operator Doctor. import unittest from pathlib import Path + from services.operator_doctor import ( CheckResult, DoctorReport, check_python_version, - check_venv, check_state_dir, + check_venv, ) + class TestOperatorDoctor(unittest.TestCase): def test_report_structure(self): report = DoctorReport() @@ -40,6 +42,7 @@ class TestOperatorDoctor(unittest.TestCase): # Mock env vars?? No, just call directly. # But check_state_dir reads os.environ. import os + orig = os.environ.get("MOLTBOT_STATE_DIR") try: os.environ["MOLTBOT_STATE_DIR"] = "/tmp/does-not-exist-123" @@ -53,5 +56,6 @@ class TestOperatorDoctor(unittest.TestCase): else: del os.environ["MOLTBOT_STATE_DIR"] + if __name__ == "__main__": unittest.main()