前后端增加system_proxy_enable选项

docutranslate/agents/agent.py

@@ -112,14 +112,14 @@ def extract_token_info(response_data: dict) -> tuple[int, int, int, int]:
         # 尝试从不同格式获取cached_tokens
         # 格式1: input_tokens_details.cached_tokens
         if (
-                "input_tokens_details" in usage
-                and "cached_tokens" in usage["input_tokens_details"]
+            "input_tokens_details" in usage
+            and "cached_tokens" in usage["input_tokens_details"]
         ):
             cached_tokens = usage["input_tokens_details"]["cached_tokens"]
         # 格式2: prompt_tokens_details.cached_tokens
         elif (
-                "prompt_tokens_details" in usage
-                and "cached_tokens" in usage["prompt_tokens_details"]
+            "prompt_tokens_details" in usage
+            and "cached_tokens" in usage["prompt_tokens_details"]
         ):
             cached_tokens = usage["prompt_tokens_details"]["cached_tokens"]
         # 格式3: prompt_cache_hit_tokens (直接在usage下)
@@ -129,14 +129,14 @@ def extract_token_info(response_data: dict) -> tuple[int, int, int, int]:
         # 尝试从不同格式获取reasoning_tokens
         # 格式1: output_tokens_details.reasoning_tokens
         if (
-                "output_tokens_details" in usage
-                and "reasoning_tokens" in usage["output_tokens_details"]
+            "output_tokens_details" in usage
+            and "reasoning_tokens" in usage["output_tokens_details"]
         ):
             reasoning_tokens = usage["output_tokens_details"]["reasoning_tokens"]
         # 格式2: completion_tokens_details.reasoning_tokens
         elif (
-                "completion_tokens_details" in usage
-                and "reasoning_tokens" in usage["completion_tokens_details"]
+            "completion_tokens_details" in usage
+            and "reasoning_tokens" in usage["completion_tokens_details"]
         ):
             reasoning_tokens = usage["completion_tokens_details"]["reasoning_tokens"]
         return input_tokens, cached_tokens, output_tokens, reasoning_tokens
@@ -156,11 +156,11 @@ class TokenCounter:
         self.logger = logger
 
     def add(
-            self,
-            input_tokens: int,
-            cached_tokens: int,
-            output_tokens: int,
-            reasoning_tokens: int,
+        self,
+        input_tokens: int,
+        cached_tokens: int,
+        output_tokens: int,
+        reasoning_tokens: int,
     ):
         with self.lock:
             self.input_tokens += input_tokens
@@ -249,7 +249,8 @@ class Agent:
 
         self.retry = config.retry
 
-        self.system_proxy_enable=config.system_proxy_enable
+        self.system_proxy_enable = config.system_proxy_enable
+
     def _add_thinking_mode(self, data: dict):
         if self.domain not in self._think_factory:
             return
@@ -260,7 +261,7 @@ class Agent:
             data[field_thinking] = val_disable
 
     def _prepare_request_data(
-            self, prompt: str, system_prompt: str, temperature=None, top_p=0.9
+        self, prompt: str, system_prompt: str, temperature=None, top_p=0.9
     ):
         if temperature is None:
             temperature = self.temperature
@@ -282,16 +283,16 @@ class Agent:
         return headers, data
 
     async def send_async(
-            self,
-            client: httpx.AsyncClient,
-            prompt: str,
-            system_prompt: None | str = None,
-            retry=True,
-            retry_count=0,
-            pre_send_handler: PreSendHandlerType = None,
-            result_handler: ResultHandlerType = None,
-            error_result_handler: ErrorResultHandlerType = None,
-            best_partial_result: dict | None = None,
+        self,
+        client: httpx.AsyncClient,
+        prompt: str,
+        system_prompt: None | str = None,
+        retry=True,
+        retry_count=0,
+        pre_send_handler: PreSendHandlerType = None,
+        result_handler: ResultHandlerType = None,
+        error_result_handler: ErrorResultHandlerType = None,
+        best_partial_result: dict | None = None,
     ) -> Any:
         if system_prompt is None:
             system_prompt = self.system_prompt
@@ -432,24 +433,24 @@ class Agent:
             )
 
     async def send_prompts_async(
-            self,
-            prompts: list[str],
-            system_prompt: str | None = None,
-            max_concurrent: int | None = None,
-            pre_send_handler: PreSendHandlerType = None,
-            result_handler: ResultHandlerType = None,
-            error_result_handler: ErrorResultHandlerType = None,
+        self,
+        prompts: list[str],
+        system_prompt: str | None = None,
+        max_concurrent: int | None = None,
+        pre_send_handler: PreSendHandlerType = None,
+        result_handler: ResultHandlerType = None,
+        error_result_handler: ErrorResultHandlerType = None,
     ) -> list[Any]:
         max_concurrent = (
             self.max_concurrent if max_concurrent is None else max_concurrent
         )
         total = len(prompts)
         self.logger.info(
-            f"base-url:{self.baseurl},model-id:{self.model_id},concurrent:{max_concurrent},temperature:{self.temperature}"
+            f"base-url:{self.baseurl},model-id:{self.model_id},concurrent:{max_concurrent},temperature:{self.temperature},system_proxy:{self.system_proxy_enable}"
         )
         self.logger.info(f"预计发送{total}个请求，并发请求数:{max_concurrent}")
         self.total_error_counter.max_errors_count = (
-                len(prompts) // MAX_REQUESTS_PER_ERROR
+            len(prompts) // MAX_REQUESTS_PER_ERROR
         )
 
         # 新增：在每次批量发送前重置计数器
@@ -469,7 +470,7 @@ class Agent:
         )
 
         async with httpx.AsyncClient(
-                trust_env=False, proxies=proxies, verify=False, limits=limits
+            trust_env=False, proxies=proxies, verify=False, limits=limits
         ) as client:
 
             async def send_with_semaphore(p_text: str):
@@ -500,7 +501,7 @@ class Agent:
 
             # 新增：打印token使用统计
             token_stats = self.token_counter.get_stats()
-            if token_stats['input_tokens'] < 0:
+            if token_stats["input_tokens"] < 0:
                 self.logger.info("Token统计失败")
             else:
                 self.logger.info(
@@ -512,16 +513,16 @@ class Agent:
             return results
 
     def send(
-            self,
-            client: httpx.Client,
-            prompt: str,
-            system_prompt: None | str = None,
-            retry=True,
-            retry_count=0,
-            pre_send_handler=None,
-            result_handler=None,
-            error_result_handler=None,
-            best_partial_result: dict | None = None,
+        self,
+        client: httpx.Client,
+        prompt: str,
+        system_prompt: None | str = None,
+        retry=True,
+        retry_count=0,
+        pre_send_handler=None,
+        result_handler=None,
+        error_result_handler=None,
+        best_partial_result: dict | None = None,
     ) -> Any:
         if system_prompt is None:
             system_prompt = self.system_prompt
@@ -658,14 +659,14 @@ class Agent:
             )
 
     def _send_prompt_count(
-            self,
-            client: httpx.Client,
-            prompt: str,
-            system_prompt: None | str,
-            count: PromptsCounter,
-            pre_send_handler,
-            result_handler,
-            error_result_handler,
+        self,
+        client: httpx.Client,
+        prompt: str,
+        system_prompt: None | str,
+        count: PromptsCounter,
+        pre_send_handler,
+        result_handler,
+        error_result_handler,
     ) -> Any:
         result = self.send(
             client,
@@ -679,21 +680,21 @@ class Agent:
         return result
 
     def send_prompts(
-            self,
-            prompts: list[str],
-            system_prompt: str | None = None,
-            pre_send_handler: PreSendHandlerType = None,
-            result_handler: ResultHandlerType = None,
-            error_result_handler: ErrorResultHandlerType = None,
+        self,
+        prompts: list[str],
+        system_prompt: str | None = None,
+        pre_send_handler: PreSendHandlerType = None,
+        result_handler: ResultHandlerType = None,
+        error_result_handler: ErrorResultHandlerType = None,
     ) -> list[Any]:
         self.logger.info(
-            f"base-url:{self.baseurl},model-id:{self.model_id},concurrent:{self.max_concurrent},temperature:{self.temperature}"
+            f"base-url:{self.baseurl},model-id:{self.model_id},concurrent:{self.max_concurrent},temperature:{self.temperature},system_proxy:{self.system_proxy_enable}"
         )
         self.logger.info(
             f"预计发送{len(prompts)}个请求，并发请求数:{self.max_concurrent}"
         )
         self.total_error_counter.max_errors_count = (
-                len(prompts) // MAX_REQUESTS_PER_ERROR
+            len(prompts) // MAX_REQUESTS_PER_ERROR
         )
 
         # 新增：在每次批量发送前重置计数器
@@ -714,7 +715,7 @@ class Agent:
         )
         proxies = get_httpx_proxies() if self.system_proxy_enable else None
         with httpx.Client(
-                trust_env=False, proxies=proxies, verify=False, limits=limits
+            trust_env=False, proxies=proxies, verify=False, limits=limits
         ) as client:
             clients = itertools.repeat(client, len(prompts))
             with ThreadPoolExecutor(max_workers=self.max_concurrent) as executor:
@@ -737,7 +738,7 @@ class Agent:
 
         # 新增：打印token使用统计
         token_stats = self.token_counter.get_stats()
-        if token_stats['input_tokens'] < 0:
+        if token_stats["input_tokens"] < 0:
             self.logger.info("Token统计失败")
         else:
             self.logger.info(

docutranslate/translator/ai_translator/base.py

@@ -12,9 +12,13 @@ from docutranslate.translator.base import Translator, TranslatorConfig
 
 @dataclass(kw_only=True)
 class AiTranslatorConfig(TranslatorConfig, AgentConfig):
-    base_url: str | None = field(default=None,
-                                 metadata={"description": "OpenAI兼容地址，当skip_translate为False时为必填项"})
-    model_id: str | None = field(default=None, metadata={"description": "当skip_translate为False时为必填项"})
+    base_url: str | None = field(
+        default=None,
+        metadata={"description": "OpenAI兼容地址，当skip_translate为False时为必填项"},
+    )
+    model_id: str | None = field(
+        default=None, metadata={"description": "当skip_translate为False时为必填项"}
+    )
     to_lang: str = "简体中文"
     custom_prompt: str | None = None
     chunk_size: int = 3000
@@ -24,7 +28,7 @@ class AiTranslatorConfig(TranslatorConfig, AgentConfig):
     skip_translate: bool = False  # 当skip_translate为False时base_url、model_id为必填项
 
 
-T = TypeVar('T', bound=Document)
+T = TypeVar("T", bound=Document)
 
 
 class AiTranslator(Translator[T]):
@@ -37,8 +41,12 @@ class AiTranslator(Translator[T]):
         self.skip_translate = config.skip_translate
         self.glossary_agent = None
         self.glossary_dict_gen = None
-        if not self.skip_translate and (config.base_url is None or config.api_key is None or config.model_id is None):
-            raise ValueError("skip_translate不为false时，base_url、api_key、model_id为必填项")
+        if not self.skip_translate and (
+            config.base_url is None or config.api_key is None or config.model_id is None
+        ):
+            raise ValueError(
+                "skip_translate不为false时，base_url、api_key、model_id为必填项"
+            )
 
         if config.glossary_generate_enable:
             if config.glossary_agent_config:
@@ -54,14 +62,13 @@ class AiTranslator(Translator[T]):
                     concurrent=config.concurrent,
                     timeout=config.timeout,
                     logger=self.logger,
-                    retry=config.retry
+                    retry=config.retry,
+                    system_proxy_enable=config.system_proxy_enable,
                 )
                 self.glossary_agent = GlossaryAgent(glossary_agent_config)
 
     @abstractmethod
-    def translate(self, document: T) -> Document:
-        ...
+    def translate(self, document: T) -> Document: ...
 
     @abstractmethod
-    async def translate_async(self, document: T) -> Document:
-        ...
+    async def translate_async(self, document: T) -> Document: ...

docutranslate/utils/utils.py

@@ -12,3 +12,6 @@ def get_httpx_proxies():
     if http_proxy:
         proxies["http://"] = http_proxy
     return proxies
+
+if __name__ == '__main__':
+    print(get_httpx_proxies())