refactor(server): extract client disconnect response logic

- Moved client disconnect response to a dedicated function _client_disconnect_response
- Simplified handler to return the new function's response on disconnect
- Improved logging of client disconnect event with request ID
- Applied consistent multi-line formatting for async client call
- Cleaned up redundant parentheses in exception handling block
- Updated import statements to remove unused OSSUploadError
- Corrected pylint disable comment for abstract class instantiation in tests
- Minor formatting improvements in test logging string concatenation

Author: luk384090-cloud

dashscope/applications/finetune/reinforcement/common/constants.py

@@ -67,6 +67,7 @@ def resolve_fc_api_key(api_key: Optional[str] = None) -> str:
         or ""
     )
 
+
 # --------------------------
 # Logging Configuration
 # --------------------------

dashscope/applications/finetune/reinforcement/common/model.py

@@ -1323,7 +1323,11 @@ async def query_function_instance_logs(
         if keywords:
             request_data["keywords"] = keywords
 
-        result = await client_fc(resolve_fc_api_key(api_key), url, request_data)
+        result = await client_fc(
+            resolve_fc_api_key(api_key),
+            url,
+            request_data,
+        )
         status = result.get("status", {})
         if isinstance(status, Dict) and status.get("code", 200) != 200:
             raise InstanceQueryError(

dashscope/applications/finetune/reinforcement/component/server/server.py

@@ -211,9 +211,7 @@ async def validation_exception_handler(
         try:
             body_preview = str(deep_mask(json.loads(body_bytes)))[:2000]
         except Exception:
-            body_preview = (
-                body_bytes.decode("utf-8", errors="ignore")[:200]
-            )
+            body_preview = body_bytes.decode("utf-8", errors="ignore")[:200]
         logger.debug(f"[Server] Request body (masked): {body_preview}")
 
     return JSONResponse(
@@ -466,6 +464,19 @@ async def _cancel_task_on_disconnect(
     return False
 
 
+def _client_disconnect_response(request: "Request") -> JSONResponse:
+    """Build the 499 response returned when the client disconnects."""
+    logger.warning(
+        "[Server] Client disconnected during processing, "
+        "task cancelled. x-fc-request-id: %s",
+        get_fc_request_id(request),
+    )
+    return JSONResponse(
+        status_code=499,
+        content={"message": "Client disconnected, request cancelled."},
+    )
+
+
 async def _log_request_metrics(
     request: "Request",
     processor_input,
@@ -567,16 +578,7 @@ async def _listen_for_disconnect():
 
         if disconnected_flag:
             cancelled = True
-            fc_request_id = get_fc_request_id(request)
-            logger.warning(
-                "[Server] Client disconnected during processing, "
-                "task cancelled. x-fc-request-id: %s",
-                fc_request_id,
-            )
-            return JSONResponse(
-                status_code=499,
-                content={"message": "Client disconnected, request cancelled."},
-            )
+            return _client_disconnect_response(request)
 
         # Processing completed normally
         result = process_task.result()

tests/legacy_1x/unit/test_agentic_rl_model.py

@@ -17,7 +17,6 @@
     FunctionComponentModel,
     FunctionComponentRuntime,
     RegistrationError,
-    OSSUploadError,
     OutputError,
     get_filepath_classname,
 )

tests/legacy_1x/unit/test_agentic_rl_review_regressions.py

@@ -40,10 +40,10 @@
     to_bailian_data,
 )
 from dashscope.applications.finetune.reinforcement.common import constants
-from dashscope.applications.finetune.reinforcement.component.demo.reward_processor_demo import (  # noqa: E501
+from dashscope.applications.finetune.reinforcement.component.demo import (
     DemoRewardProcessor,
 )
-from dashscope.applications.finetune.reinforcement.component.func_manager import (  # noqa: E501
+from dashscope.applications.finetune.reinforcement.component.func_manager import (
     FuncManager,
 )
 
@@ -252,6 +252,9 @@ async def test_two_instances_do_not_share_metadata(self):
             ),
         )
 
+        # ``@reward_func`` injects ``process()`` and clears
+        # ``__abstractmethods__`` at decoration time, which astroid cannot see.
+        # pylint: disable=abstract-class-instantiated
         p1 = _IsolationProcessor(1.0)
         p2 = _IsolationProcessor(2.0)
 

tests/legacy_1x/unit/test_agentic_rl_server_hardening.py

@@ -209,9 +209,7 @@ async def fake_wait_for(awaitable, timeout):
         )
 
         assert result is True
-        logged = " ".join(
-            str(c) for c in logger_mock.warning.call_args_list
-        )
+        logged = " ".join(str(c) for c in logger_mock.warning.call_args_list)
         assert "still running" in logged
 
         with contextlib.suppress(asyncio.CancelledError):