SimpleLLMFunc 0.2.7__tar.gz → 0.2.8__tar.gz

{simplellmfunc-0.2.7 → simplellmfunc-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: SimpleLLMFunc
-Version: 0.2.7
+Version: 0.2.8
 Summary: 一个轻量但完备的LLM/Agent应用开发框架，提供装饰器实现将函数DocString作为Prompt而无需函数体具体实现但能够享受函数定义和类型标注带来效率提升的开发体验。以最Code的方式，用最少的代码将LLM能力集成到任意Python项目中。
 Author: Ni Jingzhe
 Author-email: nijingzhe@zju.edu.cn
@@ -22,7 +22,7 @@ Description-Content-Type: text/markdown
 ![SimpleLLMFunc](https://github.com/NiJingzhe/SimpleLLMFunc/blob/master/img/repocover_new.png?raw=true)
 
 <center>
-<h2 style="font-size:2em;">Everything is Function, Prompt is Code</h2>
+<h2 style="font-size:2em;">LLM as Function, Prompt as Code</h2>
 </center>
 
 ----
@@ -36,7 +36,7 @@ Description-Content-Type: text/markdown
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/NiJingzhe/SimpleLLMFunc/graphs/commit-activity)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/NiJingzhe/SimpleLLMFunc/pulls)
 
-### 更新说明
+### 更新说明 (0.2.8 Latest)
 ### Look here: [Change Log](https://github.com/NiJingzhe/SimpleLLMFunc/blob/master/CHANGELOG.md)
 
 ### 文档（ReadtheDoc）

{simplellmfunc-0.2.7 → simplellmfunc-0.2.8}/README.md

@@ -1,7 +1,7 @@
 ![SimpleLLMFunc](https://github.com/NiJingzhe/SimpleLLMFunc/blob/master/img/repocover_new.png?raw=true)
 
 <center>
-<h2 style="font-size:2em;">Everything is Function, Prompt is Code</h2>
+<h2 style="font-size:2em;">LLM as Function, Prompt as Code</h2>
 </center>
 
 ----
@@ -15,7 +15,7 @@
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/NiJingzhe/SimpleLLMFunc/graphs/commit-activity)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/NiJingzhe/SimpleLLMFunc/pulls)
 
-### 更新说明
+### 更新说明 (0.2.8 Latest)
 ### Look here: [Change Log](https://github.com/NiJingzhe/SimpleLLMFunc/blob/master/CHANGELOG.md)
 
 ### 文档（ReadtheDoc）

{simplellmfunc-0.2.7 → simplellmfunc-0.2.8}/SimpleLLMFunc/llm_decorator/utils.py

@@ -21,6 +21,11 @@ from SimpleLLMFunc.logger import (
     push_debug,
 )
 from SimpleLLMFunc.logger.logger import get_current_context_attribute, get_location
+from SimpleLLMFunc.llm_decorator.multimodal_types import (
+    Text,
+    ImgUrl,
+    ImgPath,
+)
 
 # 定义一个类型变量，用于函数的返回类型
 T = TypeVar("T")
@@ -437,7 +442,6 @@ def extract_content_from_stream_response(chunk: Any, func_name: str) -> str:
         push_error(f"提取流响应内容时出错: {str(e)}")
         content = ""
 
-    push_debug(f"LLM 函数 '{func_name}' 提取的流内容:\n{content}")
     return content
 
 
@@ -615,15 +619,79 @@ def _process_tool_calls(
             tool_result = tool_func(**arguments)
 
             # 创建工具响应消息
-            tool_result_str = json.dumps(tool_result, ensure_ascii=False, indent=2)
-            tool_message = {
-                "role": "tool",
-                "tool_call_id": tool_call_id,
-                "content": tool_result_str,
-            }
+            # 如果是多模态消息，构建对应的content
+            if isinstance(tool_result, ImgUrl):
+                # 将工具返回的图片URL转换为用户消息
+                tool_result_packet = {
+                    "type": "image_url", 
+                    "image_url": {"url": tool_result.url, "detail": tool_result.detail}
+                }
+                
+                # 移除最后一条tool call消息，替换为assistant消息
+                if current_messages and current_messages[-1].get("role") == "assistant" and current_messages[-1].get("tool_calls"):
+                    current_messages[-1] = {
+                        "role": "assistant",
+                        "content": f"我将会通过工具 '{tool_name}' 获取目标的图像"
+                    }
+                
+                # 添加包含多模态内容的用户消息
+                user_multimodal_message = {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": f"这是工具 '{tool_name}' 返回的图像："
+                        },
+                        tool_result_packet
+                    ]
+                }
+                current_messages.append(user_multimodal_message)
+                continue  # 跳过默认的tool消息处理
+                
+            elif isinstance(tool_result, ImgPath):
+                # 转换本地图片为base64格式
+                base64_img = tool_result.to_base64()
+                mime_type = tool_result.get_mime_type()
+                data_url = f"data:{mime_type};base64,{base64_img}"
+                
+                tool_result_packet = {
+                    "type": "image_url", 
+                    "image_url": {"url": data_url, "detail": tool_result.detail}
+                }
+                
+                # 移除最后一条tool call消息，替换为assistant消息
+                if current_messages and current_messages[-1].get("role") == "assistant" and current_messages[-1].get("tool_calls"):
+                    current_messages[-1] = {
+                        "role": "assistant", 
+                        "content": f"我将要调用工具 '{tool_name}' 获取图像文件"
+                    }
+                
+                # 添加包含多模态内容的用户消息
+                user_multimodal_message = {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": f"这是工具 '{tool_name}' 返回的图像文件："
+                        },
+                        tool_result_packet
+                    ]
+                }
+                current_messages.append(user_multimodal_message)
+                continue  # 跳过默认的tool消息处理
+
+            elif isinstance(tool_result, (Text, str)):
+                tool_result_packet = json.dumps(tool_result, ensure_ascii=False, indent=2)
+
+                tool_message = {
+                    "role": "tool",
+                    "tool_call_id": tool_call_id,
+                    "content": tool_result_packet,
+                }
+
             current_messages.append(tool_message)
 
-            push_debug(f"工具 '{tool_name}' 执行完成: {tool_result_str}")
+            push_debug(f"工具 '{tool_name}' 执行完成: {tool_result_packet}")
 
         except Exception as e:
             # 处理工具执行错误
@@ -838,7 +906,6 @@ def has_multimodal_content(
     Returns:
         是否包含多模态内容
     """
-    from SimpleLLMFunc.llm_decorator.multimodal_types import Text, ImgUrl, ImgPath
     
     exclude_params = exclude_params or []
     

{simplellmfunc-0.2.7 → simplellmfunc-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleLLMFunc"
-version = "0.2.7"
+version = "0.2.8"
 description = "一个轻量但完备的LLM/Agent应用开发框架，提供装饰器实现将函数DocString作为Prompt而无需函数体具体实现但能够享受函数定义和类型标注带来效率提升的开发体验。以最Code的方式，用最少的代码将LLM能力集成到任意Python项目中。"
 authors = ["Ni Jingzhe <nijingzhe@zju.edu.cn>"]
 readme = "README.md"

simplellmfunc-0.2.7/SimpleLLMFunc/tool/agent.log

@@ -1,5 +0,0 @@
-{"timestamp": "2025-06-20T18:41:11.176039", "level": "INFO", "logger": "SimpleLLMFunc", "message": "Logger initialized (dir=./, file=agent.log)", "module": "logger", "function": "setup_logger", "line": 635, "thread": "MainThread", "process": 5149}
-{"timestamp": "2025-06-20T18:41:11.176523", "level": "INFO", "logger": "SimpleLLMFunc", "message": "全局日志系统初始化完成, 日志文件路径: .//agent.log, 日志级别: DEBUG", "module": "logger", "function": "push_info", "line": 825, "thread": "MainThread", "process": 5149}
-{"timestamp": "2025-06-20T18:41:11.176675", "level": "DEBUG", "logger": "SimpleLLMFunc", "message": "测试DEBUG级别日志", "module": "logger", "function": "push_debug", "line": 796, "thread": "MainThread", "process": 5149}
-{"timestamp": "2025-06-20T18:41:11.176773", "level": "INFO", "logger": "SimpleLLMFunc", "message": "测试INFO级别日志(app_log)", "module": "logger", "function": "app_log", "line": 767, "thread": "MainThread", "process": 5149}
-{"timestamp": "2025-06-20T18:41:11.176859", "level": "INFO", "logger": "SimpleLLMFunc", "message": "测试INFO级别日志(push_info)", "module": "logger", "function": "push_info", "line": 825, "thread": "MainThread", "process": 5149}

simplellmfunc-0.2.7/SimpleLLMFunc/tool/log_indices/trace_index.json

@@ -1,12 +0,0 @@
-{
-  "init": [
-    {
-      "timestamp": "2025-06-20T18:41:11.176039+08:00",
-      "level": "INFO",
-      "location": "__init__.py:<module>:45",
-      "message": "Logger initialized (dir=./, file=agent.log)",
-      "input_tokens": 0,
-      "output_tokens": 0
-    }
-  ]
-}