fix comments

Author: YanhuiDua

tests/ray/test_mock_rollout.py

@@ -4,13 +4,10 @@
 from transformers import AutoTokenizer
 import torch
 from xtuner.v1.ray.config.worker import RolloutConfig
-from xtuner.v1.ray.judger.controller import JudgerConfig
 from xtuner.v1.ray.base import AcceleratorResourcesConfig, AutoAcceleratorWorkers
 from xtuner.v1.ray.dataflow import DataFlow, DataFlowConfig, ReplayBufferConfig
-from xtuner.v1.data_proto.rl_data import SampleParams
 from xtuner.v1.ray.environment import SingleTurnEnvironment
-from xtuner.v1.ray.judger.dapo_math import DapoMathJudgerConfig
-from xtuner.v1.datasets import RLTokenizeFnConfig, build_datasets
+from xtuner.v1.datasets import RLTokenizeFnConfig
 from xtuner.v1.datasets.config import DataloaderConfig, DatasetConfig
 from xtuner.v1.ray.rollout.controller import RolloutController
 # 导入 Mock Worker

xtuner/v1/data_proto/rl_data.py

@@ -153,7 +153,7 @@ def check_dataflow_item(group_data_items):
 
     # 如果存在abort的状态，相当于跳过检查，下次会重新rollout
     is_abort = any(item.env.rollout.finish_reason == "abort" for item in group_data_items)
-    is_skipped = all(item.env.rollout.finish_reason == "skipped" for item in group_data_items)
+    is_skipped = any(item.env.rollout.finish_reason == "skipped" for item in group_data_items)
     if is_abort or is_skipped:
         return True
 

xtuner/v1/ray/rollout/worker.py

@@ -331,7 +331,7 @@ async def rollout_task(
         http_result = await self._create_request(
             endpoint_url,
             openai_prompts,
-            None,
+            input_ids,
             openai_tools,
             tool_choice,
             sample_params=sample_params,

xtuner/v1/utils/httpx_utils.py

@@ -16,9 +16,9 @@ class HttpRequestErrorType(IntEnum):
     an HTTP status code.
 
     Example:
-        if error_code == RequestErrorType.BAD_REQUEST:
+        if error_code == HttpRequestErrorType.BAD_REQUEST:
             print("Bad request from server!")
-        elif error_code == RequestErrorType.TIMEOUT_ERROR:
+        elif error_code == HttpRequestErrorType.TIMEOUT_ERROR:
             print("Client-side request timed out!")
     """
 
@@ -86,7 +86,7 @@ def __post_init__(self):
             default_messages = {
                 HttpRequestErrorType.UNKNOWN_ERROR: f"An unknown error {self.exception} occurred, Traceback: {traceback.format_exc()}",
                 HttpRequestErrorType.TIMEOUT_ERROR: "The request timed out.",
-                HttpRequestErrorType.REQUEST_ERROR: f"A network request error occurred occurred. TypeError: {type(self.exception)}",
+                HttpRequestErrorType.REQUEST_ERROR: f"A network request error occurred. TypeError: {type(self.exception)}",
                 HttpRequestErrorType.BAD_REQUEST: f"Bad Request (400): The server could not process the request {self.payload}",
                 HttpRequestErrorType.UNAUTHORIZED: "Unauthorized (401): Authentication failed or is required.",
                 HttpRequestErrorType.FORBIDDEN: "Forbidden (403): Access is denied.",
@@ -139,4 +139,6 @@ def set_rollout_response_status(http_result: HttpRequestResult, response: RLRoll
     elif http_result.is_server_error:
         response.finish_reason = "failed"
         if server_url:
-            response.extra_info = {"url": server_url}
+            if response.extra_info is None:
+                response.extra_info = {}
+            response.extra_info.update({"url": server_url})

xtuner/v1/utils/rl_test_utils.py

@@ -53,7 +53,8 @@ def launch_server(self):
 class MockRequestErrorRolloutWorker(LMDeployWorker):
     async def _safe_post_request(self, url, headers, payload) -> HttpRequestResult:
         try:
-            raise httpx.RequestError("Mocked httpx request error")
+            req = httpx.Request("POST", url)
+            raise httpx.RequestError("Mocked httpx request error", request=req)
         except Exception as e:
             error_type = HttpRequestErrorType.from_exception(e)
             result = HttpRequestResult(error_type=error_type, exception=e, url=url, payload=payload)