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

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

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

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

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

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

@@ -20,6 +20,7 @@ import sys
 from openpyxl import load_workbook
 import xlwings as xw
 from openai import OpenAI
+from loguru import logger
 
 # 通用参数
 #########################################################################
@@ -841,9 +842,14 @@ def get_llm_response(
     timeout: int = 3000):
     llm_client = OpenAI(api_key=api_key, base_url=base_url, timeout=timeout)
     messages_input = []
+    print(f'-'*50)
+    print(f'*** 大模型【{llm_model}】解析中...')
     if sys_prompt:
+        print(f'*** SYSTEM输入 ***\n{sys_prompt[:1000]}......')
         messages_input.append({"role": "system", "content": sys_prompt})
     messages_input.append({"role": "user", "content": base_prompt})
+    print(f'*** USER输入 ***\n{base_prompt[:1000]}......')
+    print(f'-'*50)
     if extra_body is None:
         extra_body = {}
     for attempt_idx in range(retry_times + 1):
@@ -858,17 +864,22 @@ def get_llm_response(
                 extra_body=extra_body
             )
             if not if_stream:
+                print(f'*** 输出结果 ***')
+                print(response.choices[0].message.content)
+                print(f'-' * 50)
                 return response.choices[0].message.content
             else:
                 return response     # 流式输出需要做特殊处理（增量片段解析）
         except Exception as e:
-            print('调用失败，重新尝试...')
             if attempt_idx < retry_times:
+                print(f'调用失败，开始第【{attempt_idx}】次尝试...')
                 time.sleep(1)
                 continue
             else:
-                return ''
-    return ''
+                print(f'调用失败，尝试次数达上限，返回None...')
+                return None
+    print(f'调用失败，返回None...')
+    return None
 
 def extract_dict(text):
     code_block_pattern = re.compile(r"```(?:json)?\s*\n?([\s\S]*?)\n?```")

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

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