universal-function-zsd 1.8.0__tar.gz → 1.8.2__tar.gz

{universal_function_zsd-1.8.0/src/universal_function_zsd.egg-info → universal_function_zsd-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal_function_zsd
-Version: 1.8.0
+Version: 1.8.2
 Summary: 可用于大部分项目的通用型函数库
 Author-email: Colin Zhang <zsd0830@163.com>
 Classifier: Programming Language :: Python :: 3

{universal_function_zsd-1.8.0 → universal_function_zsd-1.8.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "universal_function_zsd"
-version = "1.8.0"
+version = "1.8.2"
 authors = [
   { name = "Colin Zhang", email = "zsd0830@163.com" },
 ]

{universal_function_zsd-1.8.0 → universal_function_zsd-1.8.2}/src/universal_function_zsd/universal_function.py

@@ -833,8 +833,7 @@ def get_llm_response(
     sys_prompt: str,
     base_prompt: str,
     max_tokens: int,
-    platform_name: str = 'qwen',
-    enable_thinking: bool = False,
+    extra_body: dict = None,
     if_stream: bool = False,
     temperature: float = 0.1,
     top_p: float = 0.95,
@@ -845,10 +844,8 @@ def get_llm_response(
     if sys_prompt:
         messages_input.append({"role": "system", "content": sys_prompt})
     messages_input.append({"role": "user", "content": base_prompt})
-    extra_body = {}
-    if platform_name == "qwen":
-        # 百炼支持enable_thinking；qianfan千帆不支持该参数
-        extra_body["enable_thinking"] = enable_thinking
+    if extra_body is None:
+        extra_body = {}
     for attempt_idx in range(retry_times + 1):
         try:
             response = llm_client.chat.completions.create(
@@ -871,4 +868,27 @@ def get_llm_response(
                 continue
             else:
                 return ''
-    return ''
+    return ''
+
+def extract_dict(text):
+    code_block_pattern = re.compile(r"```(?:json)?\s*\n?([\s\S]*?)\n?```")
+    match = code_block_pattern.search(text)
+    if match:
+        raw = match.group(1)
+    else:
+        # Step2：兜底，提取从第一个 { / [ 到最后一个 } / ]
+        start_idx = min(
+            idx for idx in [text.find("{"), text.find("[")] if idx != -1
+        )
+        end_idx = max(
+            idx for idx in [text.rfind("}"), text.rfind("]")] if idx != -1
+        )
+        raw = text[start_idx:end_idx + 1]
+
+    # Step3：清洗非法控制字符（保留 \t \r \n）
+    clean_json = re.sub(r'[\x00-\x08\x0b\x0c\x0e-\x1f]', '', raw)
+    try:
+        return json.loads(clean_json)
+    except json.JSONDecodeError as e:
+        logger.warning(f"JSON解析失败：{e}, 原始的清洗后文本：{clean_json}")
+        return None

{universal_function_zsd-1.8.0 → universal_function_zsd-1.8.2/src/universal_function_zsd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: universal_function_zsd
-Version: 1.8.0
+Version: 1.8.2
 Summary: 可用于大部分项目的通用型函数库
 Author-email: Colin Zhang <zsd0830@163.com>
 Classifier: Programming Language :: Python :: 3