pycoze 0.1.10__tar.gz → 0.1.14__tar.gz

{pycoze-0.1.10 → pycoze-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.10
+Version: 0.1.14
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.10 → pycoze-0.1.14}/pycoze/bot/agent/agent_types/react_agent.py

@@ -8,15 +8,15 @@ from langchain_core.language_models import LanguageModelLike
 from langgraph.graph import END, StateGraph
 from langgraph.graph.state import CompiledStateGraph
 from langgraph.prebuilt.tool_executor import ToolExecutor
-from langgraph.utils import RunnableCallable
+from langgraph.utils.runnable import RunnableCallable
 from langchain.agents import create_structured_chat_agent
 from .react_prompt import react_agent_prompt
 
 
 def create_react_agent_executor(
-    tools: list[BaseTool], 
+    tools: list[BaseTool],
     llm: LanguageModelLike,
-    system_message: str, 
+    system_message: str,
     **kwargs # ignore
 ):
     prompt = react_agent_prompt.partial(assistant_message=system_message)

{pycoze-0.1.10 → pycoze-0.1.14}/pycoze/bot/base.py

@@ -1,79 +1,81 @@
-import sys
-import os
-import argparse
-import importlib
-from langchain.agents import tool as _tool
-import types
-import langchain_core
-
-def wrapped_tool(tool, module_path):
-    old_tool_fun = tool.func
-    def _wrapped_tool(*args, **kwargs):
-        print(f"调用了{tool.name}")
-        old_path = os.getcwd()
-        try:
-            sys.path.insert(0, module_path)  # 插入到第一个位置
-            os.chdir(module_path)
-            result = old_tool_fun(*args, **kwargs)
-        finally:
-            sys.path.remove(module_path)
-            os.chdir(old_path)
-        print(f"{tool.name}调用完毕,结果为:", result)
-        return result
-    return _wrapped_tool
-
-
-def import_tools(tool_id):
-    tool_path = "../../tool"
-    old_path = os.getcwd()
-    module_path = os.path.join(tool_path, tool_id)
-    module_path = os.path.normpath(os.path.abspath(module_path))
-    
-    if not os.path.exists(module_path):
-        return []
-    
-    # 保存当前的 sys.modules 状态
-    original_modules = sys.modules.copy()
-    
-    try:
-        sys.path.insert(0, module_path)  # 插入到第一个位置
-        os.chdir(module_path)
-        module = importlib.import_module("tool")
-        export_tools = getattr(module, "export_tools")
-        temp_list = []
-        for tool in export_tools:
-            assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(tool, types.FunctionType), f"Tool is not a StructuredTool or function: {tool}"
-            if isinstance(tool, types.FunctionType) and not isinstance(tool, langchain_core.tools.StructuredTool):
-                temp_list.append(_tool(tool))
-        export_tools = temp_list
-                
-    except Exception as e:
-        sys.path.remove(module_path)
-        os.chdir(old_path)
-        return []
-    
-    # 卸载模块并恢复 sys.modules 状态
-    importlib.invalidate_caches()
-    for key in list(sys.modules.keys()):
-        if key not in original_modules:
-            del sys.modules[key]
-    
-    sys.path.remove(module_path)
-    os.chdir(old_path)
-    
-    for tool in export_tools:
-        tool.func = wrapped_tool(tool, module_path)
-    
-    return export_tools
-
-
-def read_arg(param: str, is_path=False):
-    parser = argparse.ArgumentParser()
-    parser.add_argument(param, nargs='?', help=f'Parameter {param}')
-    args = parser.parse_args()
-    value = getattr(args, param.lstrip('-'))
-    # 如果是路径并且有引号，去掉引号
-    if is_path and value and value.startswith('"') and value.endswith('"'):
-        value = value[1:-1]
-
-    return value
+import sys
+import os
+import argparse
+import importlib
+from langchain.agents import tool as _tool
+import types
+import langchain_core
+
+def wrapped_tool(tool, module_path):
+    old_tool_fun = tool.func
+    def _wrapped_tool(*args, **kwargs):
+        print(f"调用了{tool.name}")
+        old_path = os.getcwd()
+        try:
+            sys.path.insert(0, module_path)  # 插入到第一个位置
+            os.chdir(module_path)
+            result = old_tool_fun(*args, **kwargs)
+        finally:
+            sys.path.remove(module_path)
+            os.chdir(old_path)
+        print(f"{tool.name}调用完毕,结果为:", result)
+        return result
+    return _wrapped_tool
+
+
+def import_tools(tool_id):
+    tool_path = "../../tool"
+    old_path = os.getcwd()
+    module_path = os.path.join(tool_path, tool_id)
+    module_path = os.path.normpath(os.path.abspath(module_path))
+
+    if not os.path.exists(module_path):
+        print(f"Tool {tool_id} not found")
+        return []
+
+    # 保存当前的 sys.modules 状态
+    original_modules = sys.modules.copy()
+
+    try:
+        sys.path.insert(0, module_path)  # 插入到第一个位置
+        os.chdir(module_path)
+        module = importlib.import_module("tool")
+        export_tools = getattr(module, "export_tools")
+        temp_list = []
+        for tool in export_tools:
+            assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(tool, types.FunctionType), f"Tool is not a StructuredTool or function: {tool}"
+            if isinstance(tool, types.FunctionType) and not isinstance(tool, langchain_core.tools.StructuredTool):
+                temp_list.append(_tool(tool))
+        export_tools = temp_list
+
+    except Exception as e:
+        print(f"Error loading tool {tool_id}: {e}")
+        sys.path.remove(module_path)
+        os.chdir(old_path)
+        return []
+
+    # 卸载模块并恢复 sys.modules 状态
+    importlib.invalidate_caches()
+    for key in list(sys.modules.keys()):
+        if key not in original_modules:
+            del sys.modules[key]
+
+    sys.path.remove(module_path)
+    os.chdir(old_path)
+
+    for tool in export_tools:
+        tool.func = wrapped_tool(tool, module_path)
+
+    return export_tools
+
+
+def read_arg(param: str, is_path=False):
+    parser = argparse.ArgumentParser()
+    parser.add_argument(param, nargs='?', help=f'Parameter {param}')
+    args = parser.parse_args()
+    value = getattr(args, param.lstrip('-'))
+    # 如果是路径并且有引号，去掉引号
+    if is_path and value and value.startswith('"') and value.endswith('"'):
+        value = value[1:-1]
+
+    return value

{pycoze-0.1.10 → pycoze-0.1.14}/pycoze/bot/bot.py

@@ -1,50 +1,54 @@
-import json
-from langchain_openai import ChatOpenAI
-from .base import import_tools
-from .agent import run_agent, Runnable, INPUT_MESSAGE, output
-import asyncio
-from langchain_core.messages import HumanMessage
-
-
-def load_role_setting(bot_setting_file:str):
-    with open(bot_setting_file, "r", encoding="utf-8") as f:
-        return json.load(f)
-
-def load_tools(bot_setting_file:str):
-    with open(bot_setting_file, "r", encoding="utf-8") as f:
-        role_setting = json.load(f)
-        
-    tools = []
-    for tool_id in role_setting["tools"]:
-        tools.extend(import_tools(tool_id))
-    return tools
-
-
-
-
-def chat(bot_setting_file:str, llm_file:str):
-    history = []
-
-    while True:
-        message = input()
-        role_setting = load_role_setting(bot_setting_file)
-        tools = load_tools(bot_setting_file)
-        if not message.startswith(INPUT_MESSAGE):
-            raise ValueError("Invalid message")
-        message = json.loads(message[len(INPUT_MESSAGE):])["content"]
-        print("user:", message)
-        
-        with open(llm_file, "r", encoding="utf-8") as f:
-            cfg = json.load(f)
-            chat = ChatOpenAI(api_key=cfg["apiKey"], base_url=cfg['baseURL'], model=cfg["model"], temperature=role_setting["temperature"])
-
-
-        agent = Runnable(agent_execution_mode='FuncCall', # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
-                                                tools=tools,
-                                                llm=chat,
-                                                assistant_message=role_setting["prompt"],)
-
-        history += [HumanMessage(content=message)]
-        result = asyncio.run(run_agent(agent, history))
-        output("assistant", result, history)
-
+import json
+from langchain_openai import ChatOpenAI
+from .base import import_tools
+from .agent import run_agent, Runnable, INPUT_MESSAGE, output
+import asyncio
+from langchain_core.messages import HumanMessage
+from pycoze import utils
+
+
+params = utils.arg.read_params()
+llm_file = params["appPath"] + "/JsonStorage/llm.json"
+
+def load_role_setting(bot_setting_file:str):
+    with open(bot_setting_file, "r", encoding="utf-8") as f:
+        return json.load(f)
+
+def load_tools(bot_setting_file:str):
+    with open(bot_setting_file, "r", encoding="utf-8") as f:
+        role_setting = json.load(f)
+
+    tools = []
+    for tool_id in role_setting["tools"]:
+        tools.extend(import_tools(tool_id))
+    return tools
+
+
+
+
+def chat(bot_setting_file:str):
+    history = []
+
+    while True:
+        message = input()
+        role_setting = load_role_setting(bot_setting_file)
+        tools = load_tools(bot_setting_file)
+        if not message.startswith(INPUT_MESSAGE):
+            raise ValueError("Invalid message")
+        message = json.loads(message[len(INPUT_MESSAGE):])["content"]
+        print("user:", message)
+
+        with open(llm_file, "r", encoding="utf-8") as f:
+            cfg = json.load(f)
+            chat = ChatOpenAI(api_key=cfg["apiKey"], base_url=cfg['baseURL'], model=cfg["model"], temperature=role_setting["temperature"])
+
+
+        agent = Runnable(agent_execution_mode='FuncCall', # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
+                                                tools=tools,
+                                                llm=chat,
+                                                assistant_message=role_setting["prompt"],)
+
+        history += [HumanMessage(content=message)]
+        result = asyncio.run(run_agent(agent, history))
+        output("assistant", result, history)
+

pycoze-0.1.14/pycoze/utils/__init__.py

@@ -0,0 +1 @@
+from .arg import read_arg, read_params

{pycoze-0.1.10 → pycoze-0.1.14}/pycoze.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.10
+Version: 0.1.14
 Summary: Package for pycoze only!
 Author: Yuan Jie Xiong
 Author-email: aiqqqqqqq@qq.com

{pycoze-0.1.10 → pycoze-0.1.14}/setup.py

@@ -1,19 +1,19 @@
-from setuptools import setup, find_packages
-
-setup(
-    name="pycoze",
-    version="0.1.10",
-    packages=find_packages(),
-    install_requires=[],
-    author="Yuan Jie Xiong",
-    author_email="aiqqqqqqq@qq.com",
-    description="Package for pycoze only!",
-    long_description=open('README.md', encoding="utf-8").read(),
-    long_description_content_type='text/markdown',
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.6',
-)
+from setuptools import setup, find_packages
+
+setup(
+    name="pycoze",
+    version="0.1.14",
+    packages=find_packages(),
+    install_requires=[],
+    author="Yuan Jie Xiong",
+    author_email="aiqqqqqqq@qq.com",
+    description="Package for pycoze only!",
+    long_description=open('README.md', encoding="utf-8").read(),
+    long_description_content_type='text/markdown',
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+    ],
+    python_requires='>=3.6',
+)

pycoze-0.1.10/pycoze/utils/__init__.py

@@ -1 +0,0 @@
-from .arg import read_arg