sycommon-python-lib 0.2.2a2__py3-none-any.whl → 0.2.2a3__py3-none-any.whl

sycommon/llm/get_llm.py

@@ -7,13 +7,15 @@ from sycommon.llm.usage_token import LLMWithAutoTokenUsage
 from typing import Any, Optional, Union
 from langchain_core.language_models import BaseChatModel
 
+_TIMEOUT_UNSET = object()
+
 
 def get_llm(
     model: Optional[str] = None,
     *,
     streaming: bool = False,
     temperature: Optional[float] = None,
-    timeout: float = 180,
+    timeout: Optional[float] = _TIMEOUT_UNSET,
     max_retries: int = 3,
     wrap_structured: bool = True,
     thinking: bool = False,
@@ -26,7 +28,9 @@ def get_llm(
         model: 模型名称，如果为 None 则使用配置中 default=True 的模型
         streaming: 是否启用流式输出
         temperature: 温度参数，如果为 None 则根据 thinking 模式自动设置
-        timeout: 请求超时时间（秒），默认180秒
+        timeout: 请求超时时间（秒），不传则根据 wrap_structured 自动决定：
+            - wrap_structured=True（结构化输出）：默认 180 秒
+            - wrap_structured=False（普通调用）：默认不设超时
         max_retries: 最大重试次数，默认3次
         wrap_structured: 是否包装为结构化输出实例，默认True
             - True: 返回 LLMWithAutoTokenUsage，支持 with_structured_output()
@@ -147,6 +151,10 @@ def get_llm(
     langfuse_callbacks, langfuse = LangfuseInitializer.get()
     callbacks = [LLMLogger()] + langfuse_callbacks
 
+    # 根据 wrap_structured 决定默认超时
+    if timeout is _TIMEOUT_UNSET:
+        timeout = 180 if wrap_structured else None
+
     init_params = {
         "model_provider": llmConfig.provider,
         "model": llmConfig.model,
@@ -158,7 +166,6 @@ def get_llm(
         "timeout": timeout,
         "max_retries": max_retries,
         "stream_chunk_timeout": None,
-        # "model_kwargs": {"response_format": {"type": "json_object"}},
     }
 
     # 合并其他透传参数（包括 presence_penalty, extra_body, top_p 等）

{sycommon_python_lib-0.2.2a2.dist-info → sycommon_python_lib-0.2.2a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.2a2
+Version: 0.2.2a3
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.2a2.dist-info → sycommon_python_lib-0.2.2a3.dist-info}/RECORD

@@ -162,7 +162,7 @@ sycommon/heartbeat_process/heartbeat_process_manager.py,sha256=24qUKs8qegdWHqcox
 sycommon/heartbeat_process/heartbeat_process_worker.py,sha256=duuAEFwda43Y6pZE8tOOspitlyxecaFsg1n1iH9jQDQ,16863
 sycommon/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/llm/embedding.py,sha256=Xwmg1HcgbdW7OcpYyzu8k7U-27rC5lzjIqbg221CcyY,19129
-sycommon/llm/get_llm.py,sha256=zMZCGfyRjFnImMdwWNy9b11VyBsCX3S0hyf7SE1iF1Q,7085
+sycommon/llm/get_llm.py,sha256=472LbzRH6TGCz2p3MH1UH2BE0PJ33knSKSY6s2JNs70,7378
 sycommon/llm/llm_logger.py,sha256=LLXiESwDP5f8dB50nFabShVoLKv8UCf2ll69zo1FOso,3365
 sycommon/llm/llm_tokens.py,sha256=yGEessxfk5wRMrPGyWHhiiIIQFDVT23FSaqnwqHGCoY,4712
 sycommon/llm/llm_with_token_tracking.py,sha256=flGN3dbsjw1enal-p5Wh2Fq14F9Z9_O84aOd6kdq4kc,12377
@@ -246,8 +246,8 @@ sycommon/tools/syemail.py,sha256=BDFhgf7WDOQeTcjxJEQdu0dQhnHFPO_p3eI0-Ni3LhQ,561
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=JIEJaGXhqrTLcyxlyynSrsHg9bBnDNzX-D4qIWLRPUE,6815
-sycommon_python_lib-0.2.2a2.dist-info/METADATA,sha256=GG6m9_Lg7cmVgZo1teSqt1KgyxjicnHCEhT4amnuDPM,7683
-sycommon_python_lib-0.2.2a2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.2a2.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.2a2.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.2a2.dist-info/RECORD,,
+sycommon_python_lib-0.2.2a3.dist-info/METADATA,sha256=JzdlgU0tqIPnpanKWQWPVrHCKAtpd_gq-8noMxPKdRo,7683
+sycommon_python_lib-0.2.2a3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.2a3.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.2a3.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.2a3.dist-info/RECORD,,