LightAgent 0.2.0__tar.gz → 0.2.1__tar.gz

{lightagent-0.2.0 → lightagent-0.2.1}/LightAgent/la_core.py

@@ -10,13 +10,14 @@ from openai import OpenAI
 import logging
 import os
 import httpx
-
+import importlib
 # 全局工具注册表
 _FUNCTION_MAPPINGS = {}  # 工具名称 -> 工具函数
 _OPENAI_FUNCTION_SCHEMAS = []  # OpenAI 格式的工具描述
 _PROMPT_FUNCTION_SCHEMAS = []  # prompt 格式的工具描述
 
-import importlib
+__version__ = "0.2.1"  # 你可以根据需要设置版本号
+
 
 
 def register_tool_manually(tools: List[Union[str, Callable]]) -> bool:
@@ -146,7 +147,9 @@ def get_tools_str() -> str:
     tools_str = json.dumps(_OPENAI_FUNCTION_SCHEMAS, indent=4, ensure_ascii=False)
     return tools_str
 
+
 class LightAgent:
+    __version__ = "0.2.1"  # 将版本号放在类中
     def __init__(
             self,
             *,
@@ -431,6 +434,9 @@ class LightAgent:
             if response.choices[0].message.tool_calls:
                 # 初始化一个列表，用于存储所有工具调用的结果
                 tool_responses = []
+                # 初始化变量
+                output = ""
+                function_call_name = ""
                 tool_calls = response.choices[0].message.tool_calls
                 self.log("DEBUG", "tool_calls", {"tool_calls": tool_calls})
 
@@ -444,6 +450,7 @@ class LightAgent:
 
                     # 调用工具并获取响应
                     tool_response = dispatch_tool(function_call.name, function_args)
+                    function_call_name = function_call.name
                     combined_response = ""
 
                     # 如果工具返回的是生成器（流式输出），则将所有 chunk 叠加
@@ -489,6 +496,8 @@ class LightAgent:
                 return reply
 
             # 更新响应
+            if function_call_name == 'finish':
+                return  # 如果最后调用了finish工具，则结束生成器
             response = self.client.chat.completions.create(**params)
 
         # 重试次数用尽
@@ -569,13 +578,14 @@ class LightAgent:
                                 for json_obj in json_objects:
                                     function_args = json.loads(json_obj)
                                     tool_response = dispatch_tool(function_call["name"], function_args)
+                                    function_call_name = function_call["name"]
 
                                     # 如果工具返回的是生成器（流式输出），则将所有 chunk 叠加
                                     if isinstance(tool_response, Generator):
                                         # print(f"Streaming response from tool: {function_call['name']}")
                                         combined_response = ""
                                         for chunk in tool_response:
-                                            # yield chunk
+                                            yield chunk
                                             combined_response += chunk  # 将每个 chunk 叠加
                                         tool_responses.append(combined_response)  # 将叠加后的完整响应添加到列表
                                     else:
@@ -610,6 +620,8 @@ class LightAgent:
                     break
 
             # 更新响应
+            if function_call_name == 'finish':
+                return  # 如果最后调用了finish工具，则结束生成器
             response = self.client.chat.completions.create(**params)
 
         # 重试次数用尽