LightAgent 0.2.1__tar.gz → 0.2.5__tar.gz

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

@@ -11,6 +11,7 @@ import logging
 import os
 import httpx
 import importlib
+
 # 全局工具注册表
 _FUNCTION_MAPPINGS = {}  # 工具名称 -> 工具函数
 _OPENAI_FUNCTION_SCHEMAS = []  # OpenAI 格式的工具描述
@@ -19,7 +20,6 @@ _PROMPT_FUNCTION_SCHEMAS = []  # prompt 格式的工具描述
 __version__ = "0.2.1"  # 你可以根据需要设置版本号
 
 
-
 def register_tool_manually(tools: List[Union[str, Callable]]) -> bool:
     """
     手动注册多个工具，从函数属性中提取工具信息
@@ -114,6 +114,7 @@ def stream_generator(result):
     for chunk in result:
         yield chunk
 
+
 def dispatch_tool_old(tool_name: str, tool_params: Dict[str, Any]) -> str:
     """
     调用工具执行
@@ -150,6 +151,7 @@ def get_tools_str() -> str:
 
 class LightAgent:
     __version__ = "0.2.1"  # 将版本号放在类中
+
     def __init__(
             self,
             *,
@@ -162,6 +164,7 @@ class LightAgent:
             websocket_base_url: str | httpx.URL | None = None,
             memory=None,  # 支持外部传入记忆模块
             tree_of_thought: bool = False,  # 是否启用链式思考
+            self_learning: bool = False,  # 是否启用agent自我学习
             tools: List[Union[str, Callable]] = None,  # 支持混合输入
             debug: bool = False,  # 是否启用调试模式
             log_level: str = "INFO",  # 日志级别（INFO, DEBUG, ERROR）
@@ -202,6 +205,7 @@ class LightAgent:
         self.model = model
         self.memory = memory
         self.tree_of_thought = tree_of_thought
+        self.self_learning = self_learning
 
         self.debug = debug
         self.log_level = log_level.upper()
@@ -236,8 +240,6 @@ class LightAgent:
             api_key=self.api_key
         )
 
-
-
     def get_tool(self, tool_name: str) -> Callable:
         """
         用于外部可以获取已加载的工具函数
@@ -358,6 +360,7 @@ class LightAgent:
             stream: bool = False,
             max_retry: int = 5,
             user_id: str = "default_user",
+            history: list = None,
             metadata: Optional[Dict] = None,
     ) -> Union[Generator[str, None, None], str]:
         """
@@ -368,10 +371,15 @@ class LightAgent:
         :param stream: 是否启用流式输出。
         :param max_retry: 最大重试次数。
         :param user_id: 用户 ID。
+        :param history: 历史对话 。
         :param metadata: 元数据。
         :return: 代理的回复。
         """
         self.log("INFO", "run", {"query": query, "user_id": user_id, "light_swarm": light_swarm, "stream": stream})
+        if history is None:
+            history = []
+        # 构建消息列表，先添加系统提示信息
+        params = {}
 
         # 1. 判断是否需要转移任务
         # if light_swarm:
@@ -396,14 +404,19 @@ class LightAgent:
         current_time = now.strftime("%H:%M:%S")
         system_prompt = f"##代理名称：{self.name} ##代理指令 /n{self.instructions}  ##身份 /n {self.role} /n 请一步一步思考来完成用户的要求。尽可能完成用户的回答，如果有补充信息，请参考补充信息来调用工具，直到获取所有满足用户的提问所需的答案。 /n 今日的日期: {current_date} 当前时间: {current_time}"
         params = dict(model=self.model, stream=stream)
-
-        # 3. 从记忆中检索相关内容
+        memory = ''
+        # 3. 从记忆中检索相关内容&保存记忆
         if self.memory:
             related_memories = self.memory.retrieve(query=query, user_id=user_id)
-            query = self._build_context(query, related_memories)
+            memory = memory + self._build_context(related_memories)
             self.memory.store(data=query, user_id=user_id)
-        else:
-            query = query
+            if self.self_learning:
+                agent_memories = self.memory.retrieve(query=query, user_id=self.name)
+                memory = memory + self._build_agent_memory(agent_memories)
+                self.memory.store(data=query, user_id=self.name)
+
+        query = f"{memory}\n##用户提问：\n{query}"
+        # print(query)
 
         # 4. 拼接tools工具
         if self.tools:
@@ -418,10 +431,15 @@ class LightAgent:
             system_prompt = system_prompt + f" /n ##以下是问题的补充说明 /n {tot_response}"
             self.log("DEBUG", "tree_of_thought", {"response": tot_response})
 
-        params["messages"] = [{"role": "system", "content": system_prompt}, {"role": "user", "content": query}]
+        # 6. 调用核心运行逻辑
+        params["messages"] = [{"role": "system", "content": system_prompt}]
+        # 将历史对话添加到消息列表中
+        for item in history:
+            params["messages"].append({"role": item["role"], "content": item["input"]})
+        # 最后添加当前用户的查询信息
+        params["messages"].append({"role": "user", "content": query})
         response = self.client.chat.completions.create(**params)
 
-        # 6. 调用核心运行逻辑
         result = self._core_run_logic(response, params, stream, max_retry)
 
         return result
@@ -458,7 +476,11 @@ class LightAgent:
                         # print(f"Streaming response from tool: {function_call.name}")
                         for chunk in tool_response:
                             # print("Received chunk:", chunk)  # 打印每个 chunk
-                            combined_response += chunk  # 将每个 chunk 叠加
+                            if function_call_name == 'finish':
+                                content = chunk.choices[0].delta.content or ""
+                                combined_response += content  # 将每个 chunk 叠加
+                            else:
+                                combined_response += chunk  # 将每个 chunk 叠加
                         if combined_response == "":
                             combined_response = "".join(tool_response)
                         tool_responses.append(combined_response)  # 将叠加后的完整响应添加到列表
@@ -518,8 +540,9 @@ class LightAgent:
 
             for chunk in response:
                 content = chunk.choices[0].delta.content or ""
-                yield chunk  # 流式返回内容
-                output += content
+                if content:
+                    yield chunk  # 流式返回内容
+                    output += content
 
                 try:
                     # 检查是否有工具调用
@@ -563,6 +586,8 @@ class LightAgent:
                                 "arguments": tool_call["arguments"],
                             }
                             self.log("INFO", "tool_call", {"function_call": function_call})
+                            # 将工具的调用信息推送给开发者
+                            yield function_call
 
                             # 解析参数并调用工具
                             try:
@@ -586,7 +611,11 @@ class LightAgent:
                                         combined_response = ""
                                         for chunk in tool_response:
                                             yield chunk
-                                            combined_response += chunk  # 将每个 chunk 叠加
+                                            if function_call_name == 'finish':
+                                                content = chunk.choices[0].delta.content or ""
+                                                combined_response += content  # 将每个 chunk 叠加
+                                            else:
+                                                combined_response += chunk  # 将每个 chunk 叠加
                                         tool_responses.append(combined_response)  # 将叠加后的完整响应添加到列表
                                     else:
                                         # print(f"Non-streaming response from tool: {function_call['name']}")
@@ -722,25 +751,41 @@ class LightAgent:
             self.log("ERROR", "run_failed", {"error": str(e)})
             raise  # 重新抛出异常以便调试
 
-    def _build_context(self, user_input, related_memories):
+    def _build_context(self, related_memories):
         """
         构建上下文，将用户输入和记忆内容结合。
-
-        :param user_input: 用户输入的问题或内容。
         :param related_memories: 从记忆中检索到的相关内容。
         :return: 结合记忆后的上下文。
         """
         if not related_memories or not related_memories["memories"]:
-            return user_input
+            return ""
 
         memory_context = "\n".join([m["memory"] for m in related_memories["memories"]])
         if not memory_context:
-            return user_input
+            return ""
 
-        prompt = f"\n用户之前提到了\n{memory_context}。\n现在用户问\n{user_input}"
+        prompt = f"\n##用户偏好 \n用户之前提到了\n{memory_context}。"
         self.log("DEBUG", "related_memories", {"memory_context": memory_context})
         return prompt
 
+    def _build_agent_memory(self, agent_memories):
+        """
+        构建上下文，将用户输入和记忆内容结合。
+
+        :param agent_memories: 从记忆中检索到的相关内容。
+        :return: 结合记忆后的上下文。
+        """
+        if not agent_memories or not agent_memories["memories"]:
+            return ""
+
+        memory_context = "\n".join([m["memory"] for m in agent_memories["memories"]])
+        if not memory_context:
+            return ""
+
+        prompt = f"\n##以下是解决该问题的相关补充信息：\n{memory_context}。"
+        self.log("DEBUG", "agent_memories", {"memory_context": memory_context})
+        return prompt
+
     def run_thought(self, query: str, stream=False, tools=None):
         """使用思维树的方式 让大模型先根据get_tools_str生成一个解答用户query的工具使用计划"""
         tot_model = "deepseek-chat"  # self.model

{lightagent-0.2.1 → lightagent-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LightAgent
-Version: 0.2.1
+Version: 0.2.5
 Summary: **LightAgent** is an extremely lightweight active Agentic Framework with memory (`mem0`), tools (`Tools`), and a Tree of Thought (`ToT`). It supports swarm-like multi-agent collaboration, automated tool generation, and agent assessment, with underlying model support for OpenAI, Zhipu ChatGLM, Baichuan Large Model, DeepSeek, Qwen series large models, and more. At the same time, LightAgent supports OpenAI streaming format API service output, seamlessly integrating with major mainstream chat frameworks. 🌟
 Home-page: https://github.com/wxai-space/LightAgent
 License: Apache 2.0
@@ -20,7 +20,7 @@ Project-URL: Repository, https://github.com/wxai-space/LightAgent
 Description-Content-Type: text/markdown
 
 
-![LightAgent Banner](https://raw.githubusercontent.com/wxai-space/LightAgent/refs/heads/main/docs/images/lightagent-banner.jpg)
+![LightAgent Banner](docs/images/lightagent-banner.jpg)
 <div align="center">
   <p>
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License"></a>
@@ -690,6 +690,11 @@ We look forward to your feedback and work together to make LightAgent even stron
 
 **LightAgent** —— A lightweight, flexible, and powerful active Agent framework that assists you in quickly building intelligent applications!
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=wxai-space/LightAgent&type=Date)](https://star-history.com/#wxai-space/LightAgent&Date)
+
+
 ![LightAgent Banner](docs/images/lightagent-banner.jpg)
 <div align="center">
   <p>
@@ -1375,6 +1380,11 @@ LightAgent 采用 [Apache 2.0 许可证](LICENSE)。您可以自由使用、修
  
 **LightAgent** —— 轻量、灵活、强大的主动式 Agent 框架，助您快速构建智能应用！
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=wxai-space/LightAgent&type=Date)](https://star-history.com/#wxai-space/LightAgent&Date)
+
+
 ![LightAgent Banner](docs/images/lightagent-banner.jpg)
 <div align="center">
   <p>

{lightagent-0.2.1 → lightagent-0.2.5}/README.md

@@ -1,5 +1,5 @@
 
-![LightAgent Banner](https://raw.githubusercontent.com/wxai-space/LightAgent/refs/heads/main/docs/images/lightagent-banner.jpg)
+![LightAgent Banner](docs/images/lightagent-banner.jpg)
 <div align="center">
   <p>
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" alt="License"></a>
@@ -667,4 +667,8 @@ We look forward to your feedback and work together to make LightAgent even stron
   <strong>LightAgent - Making intelligence lighter, making the future simpler.</strong> 🌈
 </p>
 
-**LightAgent** —— A lightweight, flexible, and powerful active Agent framework that assists you in quickly building intelligent applications!
+**LightAgent** —— A lightweight, flexible, and powerful active Agent framework that assists you in quickly building intelligent applications!
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=wxai-space/LightAgent&type=Date)](https://star-history.com/#wxai-space/LightAgent&Date)

{lightagent-0.2.1 → lightagent-0.2.5}/README.zh-CN.md

@@ -682,4 +682,8 @@ LightAgent 采用 [Apache 2.0 许可证](LICENSE)。您可以自由使用、修
 </p>
 
  
-**LightAgent** —— 轻量、灵活、强大的主动式 Agent 框架，助您快速构建智能应用！
+**LightAgent** —— 轻量、灵活、强大的主动式 Agent 框架，助您快速构建智能应用！
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=wxai-space/LightAgent&type=Date)](https://star-history.com/#wxai-space/LightAgent&Date)

{lightagent-0.2.1 → lightagent-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "LightAgent"
-version = "0.2.1"
+version = "0.2.5"
 description = "**LightAgent** is an extremely lightweight active Agentic Framework with memory (`mem0`), tools (`Tools`), and a Tree of Thought (`ToT`). It supports swarm-like multi-agent collaboration, automated tool generation, and agent assessment, with underlying model support for OpenAI, Zhipu ChatGLM, Baichuan Large Model, DeepSeek, Qwen series large models, and more. At the same time, LightAgent supports OpenAI streaming format API service output, seamlessly integrating with major mainstream chat frameworks. 🌟"
 authors = ["caiweige <caiweige@qq.com>"]
 license = "Apache 2.0"