pycoze 0.1.29__py3-none-any.whl → 0.1.31__py3-none-any.whl

pycoze/bot/agent/agent_types/__init__.py

@@ -1,10 +1,5 @@
-from .openai_func_call_agent import (
-    create_openai_func_call_agent_executor
-)
+from .openai_func_call_agent import create_openai_func_call_agent_executor
 from .react_agent import create_react_agent_executor
 
 
-__all__ = [
-    create_openai_func_call_agent_executor,
-    create_react_agent_executor
-]
+__all__ = [create_openai_func_call_agent_executor, create_react_agent_executor]

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -4,22 +4,23 @@ import json
 from langchain.tools import BaseTool
 from langchain_core.utils.function_calling import convert_to_openai_tool
 from langchain_core.language_models.base import LanguageModelLike
-from langchain_core.messages import  SystemMessage, ToolMessage
+from langchain_core.messages import SystemMessage, ToolMessage
 from langgraph.graph import END
 from langgraph.graph.message import MessageGraph
 from langgraph.prebuilt import ToolExecutor, ToolInvocation
 from typing import Any
 
 
-def create_openai_func_call_agent_executor(tools: list[BaseTool], llm: LanguageModelLike,
-                                        system_message: str, **kwargs):
+def create_openai_func_call_agent_executor(
+    tools: list[BaseTool], llm: LanguageModelLike, system_message: str, **kwargs
+):
 
     async def _get_messages(messages):
         msgs = []
         for m in messages:
             if isinstance(m, ToolMessage):
                 _dict = m.dict()
-                _dict['content'] = str(_dict['content'])
+                _dict["content"] = str(_dict["content"])
                 m_c = ToolMessage(**_dict)
                 msgs.append(m_c)
             else:
@@ -50,43 +51,47 @@ def create_openai_func_call_agent_executor(tools: list[BaseTool], llm: LanguageM
         # Based on the continue condition
         # we know the last message involves a FuncCall
         last_message = messages[-1]
-        for tool_call in last_message.additional_kwargs['tool_calls']:
-            function = tool_call['function']
-            function_name = function['name']
-            _tool_input = json.loads(function['arguments'] or '{}')
+        for tool_call in last_message.additional_kwargs["tool_calls"]:
+            function = tool_call["function"]
+            function_name = function["name"]
+            _tool_input = json.loads(function["arguments"] or "{}")
             # We construct an ToolInvocation from the function_call
-            actions.append(ToolInvocation(
-                tool=function_name,
-                tool_input=_tool_input,
-            ))
+            actions.append(
+                ToolInvocation(
+                    tool=function_name,
+                    tool_input=_tool_input,
+                )
+            )
         # We call the tool_executor and get back a response
         responses = await tool_executor.abatch(actions, **kwargs)
         # We use the response to create a ToolMessage
         tool_messages = [
             ToolMessage(
-                tool_call_id=tool_call['id'],
+                tool_call_id=tool_call["id"],
                 content=response,
-                additional_kwargs={'name': tool_call['function']['name']},
+                additional_kwargs={"name": tool_call["function"]["name"]},
+            )
+            for tool_call, response in zip(
+                last_message.additional_kwargs["tool_calls"], responses
             )
-            for tool_call, response in zip(last_message.additional_kwargs['tool_calls'], responses)
         ]
         return tool_messages
 
     workflow = MessageGraph()
 
     # Define the two nodes we will cycle between
-    workflow.add_node('agent', agent)
-    workflow.add_node('action', call_tool)
+    workflow.add_node("agent", agent)
+    workflow.add_node("action", call_tool)
 
     # Set the entrypoint as `agent`
     # This means that this node is the first one called
-    workflow.set_entry_point('agent')
+    workflow.set_entry_point("agent")
 
     # We now add a conditional edge
     workflow.add_conditional_edges(
         # First, we define the start node. We use `agent`.
         # This means these are the edges taken after the `agent` node is called.
-        'agent',
+        "agent",
         # Next, we pass in the function that will determine which node is called next.
         should_continue,
         # Finally we pass in a mapping.
@@ -97,15 +102,15 @@ def create_openai_func_call_agent_executor(tools: list[BaseTool], llm: LanguageM
         # Based on which one it matches, that node will then be called.
         {
             # If `tools`, then we call the tool node.
-            'continue': 'action',
+            "continue": "action",
             # Otherwise we finish.
-            'end': END,
+            "end": END,
         },
     )
 
     # We now add a normal edge from `tools` to `agent`.
     # This means that after `tools` is called, `agent` node is called next.
-    workflow.add_edge('action', 'agent')
+    workflow.add_edge("action", "agent")
 
     # Finally, we compile it!
     # This compiles it into a LangChain Runnable,

pycoze/bot/agent/agent_types/react_agent.py

@@ -17,7 +17,7 @@ def create_react_agent_executor(
     tools: list[BaseTool],
     llm: LanguageModelLike,
     system_message: str,
-    **kwargs # ignore
+    **kwargs  # ignore
 ):
     prompt = react_agent_prompt.partial(assistant_message=system_message)
     agent = create_structured_chat_agent(llm, tools, prompt)

pycoze/bot/agent/agent_types/react_prompt.py

@@ -3,9 +3,16 @@ from langchain_core.prompts.chat import (
     ChatPromptTemplate,
     HumanMessagePromptTemplate,
     SystemMessagePromptTemplate,
-    MessagesPlaceholder
+    MessagesPlaceholder,
+)
+from langchain_core.messages import (
+    FunctionMessage,
+    SystemMessage,
+    ToolMessage,
+    AIMessage,
+    HumanMessage,
+    ChatMessage,
 )
-from langchain_core.messages import FunctionMessage, SystemMessage, ToolMessage, AIMessage, HumanMessage, ChatMessage
 
 
 system_temp = """
@@ -56,12 +63,29 @@ Thought: {agent_scratchpad}
 
 
 react_agent_prompt = ChatPromptTemplate(
-    input_variables=['agent_scratchpad', 'input', 'tool_names', 'tools', 'assistant_message'], 
-    optional_variables=['chat_history'], 
-    input_types={'chat_history': List[Union[AIMessage, HumanMessage, ChatMessage, SystemMessage, FunctionMessage, ToolMessage]]}, 
+    input_variables=[
+        "agent_scratchpad",
+        "input",
+        "tool_names",
+        "tools",
+        "assistant_message",
+    ],
+    optional_variables=["chat_history"],
+    input_types={
+        "chat_history": List[
+            Union[
+                AIMessage,
+                HumanMessage,
+                ChatMessage,
+                SystemMessage,
+                FunctionMessage,
+                ToolMessage,
+            ]
+        ]
+    },
     messages=[
         SystemMessagePromptTemplate.from_template(system_temp),
-        MessagesPlaceholder(variable_name='chat_history', optional=True), 
-        HumanMessagePromptTemplate.from_template(human_temp)
-    ]
-)
+        MessagesPlaceholder(variable_name="chat_history", optional=True),
+        HumanMessagePromptTemplate.from_template(human_temp),
+    ],
+)

pycoze/bot/base.py

@@ -6,8 +6,10 @@ 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()
@@ -20,6 +22,7 @@ def wrapped_tool(tool, module_path):
             os.chdir(old_path)
         print(f"{tool.name}调用完毕,结果为:", result)
         return result
+
     return _wrapped_tool
 
 
@@ -43,8 +46,12 @@ def import_tools(tool_id):
         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):
+            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
 
@@ -71,9 +78,9 @@ def import_tools(tool_id):
 
 def read_arg(param: str, is_path=False):
     parser = argparse.ArgumentParser()
-    parser.add_argument(param, nargs='?', help=f'Parameter {param}')
+    parser.add_argument(param, nargs="?", help=f"Parameter {param}")
     args = parser.parse_args()
-    value = getattr(args, param.lstrip('-'))
+    value = getattr(args, param.lstrip("-"))
     # 如果是路径并且有引号，去掉引号
     if is_path and value and value.startswith('"') and value.endswith('"'):
         value = value[1:-1]

pycoze/bot/bot.py

@@ -3,18 +3,20 @@ 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 langchain_core.messages import AIMessage, HumanMessage, SystemMessage
 from pycoze import utils
 
 
 params = utils.arg.read_params()
 llm_file = params["appPath"] + "/JsonStorage/llm.json"
 
-def load_role_setting(bot_setting_file:str):
+
+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):
+
+def load_tools(bot_setting_file: str):
     with open(bot_setting_file, "r", encoding="utf-8") as f:
         role_setting = json.load(f)
 
@@ -24,31 +26,40 @@ def load_tools(bot_setting_file:str):
     return tools
 
 
-
-
-def chat(bot_setting_file:str):
-    history = []
+def chat(bot_setting_file: str):
 
     while True:
-        message = input()
+        input_text = input()
         role_setting = load_role_setting(bot_setting_file)
         tools = load_tools(bot_setting_file)
-        if not message.startswith(INPUT_MESSAGE):
+        if not input_text.startswith(INPUT_MESSAGE):
             raise ValueError("Invalid message")
-        message = json.loads(message[len(INPUT_MESSAGE):])["content"]
-        print("user:", message)
+        messages = json.loads(input_text[len(INPUT_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"])
+            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)]
+        agent = Runnable(
+            agent_execution_mode="FuncCall",  # 'FuncCall' or 'ReAct'，大模型支持FuncCall的话就用FuncCall
+            tools=tools,
+            llm=chat,
+            assistant_message=role_setting["prompt"],
+        )
+        history = []
+        for message in messages:
+            if message["role"] == "assistant":
+                history += [AIMessage(content=message["content"])]
+            elif message["role"] == "user":
+                history += [HumanMessage(content=message["content"])]
+            elif message["role"] == "system":
+                history += [SystemMessage(content=message["content"])]
+            else:
+                raise ValueError("Invalid message")
         result = asyncio.run(run_agent(agent, history))
         output("assistant", result, history)
-

pycoze/gpu/gpu_reserve.py

@@ -4,6 +4,7 @@ import atexit
 import time
 import os
 import psutil
+import sys
 
 try:
     from pycoze.utils import utils
@@ -99,12 +100,15 @@ def reserve_gpu(gb):
             return False
 
 
-def reserve_gpu_retry(gb, retry=10000):
+def reserve_gpu_retry(gb, retry=None):
+    if retry is None:
+        # 接近无限重试，python中允许无限大的整数，尽管sys.maxsize不是真正的无限大，但足够大
+        retry = sys.maxsize
     for i in range(retry):
         time.sleep(1)
+        if i % 10 == 0 or i < 10:
+            print(f"重试第{i}次")
         if reserve_gpu(gb):
-            if i % 10 == 0 or i < 10:
-                print(f"重试第{i}次")
             return True
     return False
 
@@ -158,10 +162,12 @@ initialize_and_check()
 atexit.register(cleanup)
 
 if __name__ == "__main__":
-    if reserve_gpu_retry(10):
-        print("GPU资源预留成功")
-        time.sleep(100)
-        release_gpu()
-        print("GPU资源释放成功")
+    if reserve_gpu_retry(5):
+        print("(1)GPU资源预留成功")
+        if reserve_gpu_retry(5):
+            print("(2)GPU资源预留成功")
+            time.sleep(100)
+            release_gpu()
+            print("GPU资源释放成功")
     else:
         print("GPU资源不足，无法预留")

pycoze/utils/__init__.py

@@ -1 +1,2 @@
 from .arg import read_arg, read_params
+from .text_or_file import to_text

pycoze/utils/arg.py

@@ -2,24 +2,26 @@ import argparse
 import sys
 import json
 
+
 def read_arg(param, is_path=False):
     args = sys.argv[1:]
     parser = argparse.ArgumentParser()
-    parser.add_argument(param, nargs='?', help=f'Parameter {param}')
+    parser.add_argument(param, nargs="?", help=f"Parameter {param}")
     args = parser.parse_known_args(args)[0]
-    value = getattr(args, param.lstrip('-'))
+    value = getattr(args, param.lstrip("-"))
     # 如果是路径并且有引号，去掉引号
     if is_path and value and value.startswith('"') and value.endswith('"'):
         value = value[1:-1]
 
     return value
 
+
 def read_params():
-  params_file = read_arg('params_file', True)
-  params = None
-  try:
-      with open(params_file, 'r', encoding='utf-8') as f:
-          params = json.load(f)
-  except Exception as e:
-      print(e)
-  return params
+    params_file = read_arg("params_file", True)
+    params = None
+    try:
+        with open(params_file, "r", encoding="utf-8") as f:
+            params = json.load(f)
+    except Exception as e:
+        print(e)
+    return params

{pycoze-0.1.29.dist-info → pycoze-0.1.31.dist-info}/METADATA

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

{pycoze-0.1.29.dist-info → pycoze-0.1.31.dist-info}/RECORD

@@ -1,28 +1,28 @@
 pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/module.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/bot/__init__.py,sha256=pciDtfcIXda7iFt9uI5Fpm0JKpGBhdXHmJv4966WTVU,21
-pycoze/bot/base.py,sha256=-2EfIdcPZvFm1cjRyTIhjYsyRuAaSVdhdXJR5_7r4CE,2616
-pycoze/bot/bot.py,sha256=3BxTejG164_7DFS47lDrEk-C49CrXa2WPnFxgSvZ6Wk,1836
+pycoze/bot/base.py,sha256=GWYDVGGtiCpk6gv-163cAbDid_IsnMe5jTj7eZUMJQU,2679
+pycoze/bot/bot.py,sha256=c8xje38_BMf4RgkWNDDuGBelHHszosMdYZevGD8dk-c,2225
 pycoze/bot/agent/__init__.py,sha256=IaYqQCJ3uBor92JdOxI_EY4HtYOHgej8lijr3UrN1Vc,161
 pycoze/bot/agent/agent.py,sha256=vDbTCorUL6Eh2Az4uzwGsLa3Hp4EPcOkq62JpQXt8-s,3435
 pycoze/bot/agent/assistant.py,sha256=QLeWaPi415P9jruYOm8qcIbC94cXXAhJYmLTkyC9NTQ,1267
 pycoze/bot/agent/chat.py,sha256=C2X0meUcIPbn5FCxvhkhxozldPG7qdb2jVR-WnPqqnQ,791
-pycoze/bot/agent/agent_types/__init__.py,sha256=PoYsSeQld0kdROjejN3BNjC9NsgKNekjNy4FqtWRJqM,227
-pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=YkpiMxrLl7aMYZJsOtZraTT2UE0IZrQsfikGRCHx4jM,4467
-pycoze/bot/agent/agent_types/react_agent.py,sha256=xgS6NFBtWUOrXQrJ1hq060VoTRsTj4Y_3gI1Sy3bEsU,6748
-pycoze/bot/agent/agent_types/react_prompt.py,sha256=PdzL3SFb0Ee0dbK4HGqG09bRISrru4bhOj45CXBtqI0,1919
+pycoze/bot/agent/agent_types/__init__.py,sha256=W2jTNMLqUMqgCMG0Tw0d8n7WpsbsnIonqaPR-YLegLU,210
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=LBCkcPbFHpI9ijrze2X15O-9tXxCbi7IKbJRtrBQjwg,4504
+pycoze/bot/agent/agent_types/react_agent.py,sha256=AnjHwHXVwLAm77ndglJGi4rQhqDGWaLuUfl46uZVSzM,6749
+pycoze/bot/agent/agent_types/react_prompt.py,sha256=jyovokGaPzNIe5bvTRvn0gmsWLx5kpDIPmRwmEMCl-M,2142
 pycoze/gpu/__init__.py,sha256=cuxwDdz2Oo-VcwZ50FtFtEIJXdqoz2el-n0QpSt_NMc,75
-pycoze/gpu/gpu_reserve.py,sha256=eKEnULikr1mKfqLeAZz3FdlWvJMdoUvqmCqx0K8eW4c,5141
+pycoze/gpu/gpu_reserve.py,sha256=T-M1w8DiQQNtyNVok9Fj9qXGfTs5mxJp-gw-rxs50es,5410
 pycoze/ui/__init__.py,sha256=CBBpypz4qDoqJkPmGqR2BroCOEIX4rZiJucRsANPnwo,448
 pycoze/ui/base.py,sha256=nXNXRTZ5Tl1AQp5nfjzLvOVzt_1nLSCn2IOyfxAN_fc,1471
 pycoze/ui/color.py,sha256=cT9Ib8uNzkOKxyW0IwVj46o4LwdB1xgNCj1_Rou9d_4,854
 pycoze/ui/typ.py,sha256=NpT0FrbHvByOszBZMFtroRp7I7pN-38tYz_zPOPejF4,1723
 pycoze/ui/ui_def.py,sha256=CNFYH8NC-WYmbceIPpxsRr9H6O006pMKukx7U-BOE1Q,3744
-pycoze/utils/__init__.py,sha256=GMP9EhOsbRM0EfIzS2ll1fXKKSpY3zqpqkm66fPGBaM,39
-pycoze/utils/arg.py,sha256=VKinJRPiNw0TPvuRFwLg0Vz8u8HXx_ejGfOojfE9b_Y,706
+pycoze/utils/__init__.py,sha256=KExBkotf23dr2NfTEouWke5nJB1q2IuDXgHrmuyd95k,73
+pycoze/utils/arg.py,sha256=rRujm1zKc0XlnNlpIJ6JAAaFiTzDGmL_RliIpSc5OD8,724
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.29.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.29.dist-info/METADATA,sha256=cmFsa4E0qSRyhkqlvMHdv17SICiu9HP_J72Rcj71jJs,719
-pycoze-0.1.29.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-pycoze-0.1.29.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.29.dist-info/RECORD,,
+pycoze-0.1.31.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.31.dist-info/METADATA,sha256=uUXKqs4ukQy4dj2MHEabHQPWu8IdK-sckxW0R4GV5kY,719
+pycoze-0.1.31.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+pycoze-0.1.31.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.31.dist-info/RECORD,,