pycoze 0.1.285__py3-none-any.whl → 0.1.288__py3-none-any.whl

pycoze/ai/llm/chat.py

@@ -1,131 +1,124 @@
-from pycoze import utils
-import json5
-import re
-from retrying import retry
-from openai import OpenAI
-import openai
-import requests
-import os
-
-
-def never_retry_on_rate_limit_error(exception):
-    """Return True if we should retry (in this case when it's NOT a RateLimitError), False otherwise"""
-    return not isinstance(exception, openai.RateLimitError)
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
-def chat(user_text, history, temperature=0.2, stop=None, **kwargs):
-    user_msg = {"role": "user", "content": user_text}
-    cfg = utils.read_json_file("llm.json")
-
-    base_url = cfg["baseURL"]
-    api_key = cfg["apiKey"]
-    model = cfg["model"]
-
-    base_url = base_url.replace("/chat/completions", "")
-
-    client = OpenAI(api_key=api_key, base_url=base_url)
-
-    response = client.chat.completions.create(model=model,
-                                              messages=simple_history(history) + [user_msg],
-                                              temperature=temperature,
-                                              stop=stop)
-    return response.choices[0].message.content
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
-def chat_stream(user_text, history, temperature=0.2, stop=None, **kwargs):
-    user_msg = {"role": "user", "content": user_text}
-    cfg = utils.read_json_file("llm.json")
-
-    base_url = cfg["baseURL"]
-    api_key = cfg["apiKey"]
-    model = cfg["model"]
-    
-    base_url = base_url.replace("/chat/completions", "")
-
-    client = OpenAI(api_key=api_key, base_url=base_url)
-
-
-    stream = client.chat.completions.create(model=model,
-                                            messages=simple_history(history) + [user_msg],
-                                            stream=True,
-                                            temperature=temperature,
-                                            stop=stop)
-    for chunk in stream:
-        yield chunk.choices[0].delta.content or ""
-
-
-def simple_history(history):
-    return [{"role": h["role"], "content": h["content"]} for h in history]
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
-def extract(response_data, text: str, temperature=0, **kwargs):
-    """print(extract({"name": "lowercase"}, "hello XiaoMing"))"""
-    if isinstance(response_data, dict):
-        response_items = [[res, response_data[res]] for res in response_data]
-    else:
-        response_items = response_data
-
-    json_text = ""
-    for i, res in enumerate(response_items):
-        comma = "," if i != len(response_items) - 1 else ""
-        json_text += f'    "{res[0]}": {res[1]}{comma}\n'
-
-    # Combine the provided text with the formatted JSON schema
-    chat_text = f"""
-The output should be a markdown code snippet formatted in the following schema, including the leading and trailing "```json" and "```" tags:
-```json
-{{
-{json_text}
-}}
-```
-
-Request:
-{text}
-"""
-    # text放后面,当翻译等情况时,不会把"The output should"之类翻译了,导致错误
-    markdown = chat(chat_text, [], temperature=temperature, **kwargs)
-    pattern = r'```json(.*?)```'
-    matches = re.findall(pattern, markdown, re.DOTALL)
-    if matches:
-        json_str = matches[0].strip() 
-    # lines = [line.split("//")[0] for line in json_str.split("\n")]//这样当json中有//时会出错，例如https://
-    json_dict = json5.loads(json_str)
-    for item in response_items:
-        if item[0] not in json_dict:
-            raise "item:" + item + " not exists"
-    return json_dict
-
-
-def yes_or_no(question, temperature=0, **kwargs):
-    result = extract([("Result", "Yes or No")], question, 
-                     temperature=temperature, **kwargs)["Result"]
-    if isinstance(result, bool):
-        return result
-    return result.upper() == "YES"
-
-
-@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
-def extract_code(text: str, temperature=0, language="python", markdown_word='python', **kwargs):
-    """print(extract_code("sum 1~100"))"""
-    chat_text = text + f"""
-The output should be a complete and usable {language} code snippet, including the leading and trailing "```{markdown_word}" and "```":
-"""
-    markdown = chat(chat_text, [], temperature=temperature, **kwargs)
-    # 使用正则表达式匹配围绕在```{markdown_word} 和 ```之间的文本
-    pattern = rf'```{markdown_word}(.*?)```'
-    matches = re.findall(pattern, markdown, re.DOTALL)
-    if matches:
-        # 去除可能的前后空白字符
-        return matches[0].strip()
-    else:
-        raise Exception("The string is not a valid python code.")
-
-
-if __name__ == "__main__":
-    print(chat("你好", []))
-    for chunk in chat_stream("你好", []):
-        print(chunk)
-    print(extract({"name": "lowercase"}, "hello XiaoMing"))
-    print(extract_code("sum 1~100"))
+from pycoze import utils
+import json5
+import re
+from retrying import retry
+from openai import OpenAI
+import openai
+
+
+def never_retry_on_rate_limit_error(exception):
+    """Return True if we should retry (in this case when it's NOT a RateLimitError), False otherwise"""
+    return not isinstance(exception, openai.RateLimitError)
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
+def chat(messages, temperature=0.2, stop=None, **kwargs):
+    cfg = utils.read_json_file("llm.json")
+
+    base_url = cfg["baseURL"]
+    api_key = cfg["apiKey"]
+    model = cfg["model"]
+
+    base_url = base_url.replace("/chat/completions", "")
+
+    client = OpenAI(api_key=api_key, base_url=base_url)
+
+    response = client.chat.completions.create(model=model,
+                                              messages=messages,
+                                              temperature=temperature,
+                                              stop=stop)
+    return response.choices[0].message.content
+
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=5)
+def chat_stream(user_text, history, temperature=0.2, stop=None, **kwargs):
+    user_msg = {"role": "user", "content": user_text}
+    cfg = utils.read_json_file("llm.json")
+
+    base_url = cfg["baseURL"]
+    api_key = cfg["apiKey"]
+    model = cfg["model"]
+
+    base_url = base_url.replace("/chat/completions", "")
+
+    client = OpenAI(api_key=api_key, base_url=base_url)
+
+
+    stream = client.chat.completions.create(model=model,
+                                            messages=simple_history(history) + [user_msg],
+                                            stream=True,
+                                            temperature=temperature,
+                                            stop=stop)
+    for chunk in stream:
+        yield chunk.choices[0].delta.content or ""
+
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
+def extract(response_data, text: str, temperature=0, **kwargs):
+    """print(extract({"name": "lowercase"}, "hello XiaoMing"))"""
+    if isinstance(response_data, dict):
+        response_items = [[res, response_data[res]] for res in response_data]
+    else:
+        response_items = response_data
+
+    json_text = ""
+    for i, res in enumerate(response_items):
+        comma = "," if i != len(response_items) - 1 else ""
+        json_text += f'    "{res[0]}": {res[1]}{comma}\n'
+
+    # Combine the provided text with the formatted JSON schema
+    chat_text = f"""
+The output should be a markdown code snippet formatted in the following schema, including the leading and trailing "```json" and "```" tags:
+```json
+{{
+{json_text}
+}}
+```
+
+Request:
+{text}
+"""
+    # text放后面,当翻译等情况时,不会把"The output should"之类翻译了,导致错误
+    markdown = chat([{"role": "user", "content": chat_text}], temperature=temperature, **kwargs)
+    pattern = r'```json(.*?)```'
+    matches = re.findall(pattern, markdown, re.DOTALL)
+    if matches:
+        json_str = matches[0].strip()
+    # lines = [line.split("//")[0] for line in json_str.split("\n")]//这样当json中有//时会出错，例如https://
+    json_dict = json5.loads(json_str)
+    for item in response_items:
+        if item[0] not in json_dict:
+            raise "item:" + item + " not exists"
+    return json_dict
+
+
+def yes_or_no(question, temperature=0, **kwargs):
+    result = extract([("Result", "Yes or No")], question,
+                     temperature=temperature, **kwargs)["Result"]
+    if isinstance(result, bool):
+        return result
+    return result.upper() == "YES"
+
+
+@retry(retry_on_exception=never_retry_on_rate_limit_error, wait_exponential_multiplier=500, stop_max_attempt_number=3)
+def extract_code(text: str, temperature=0, language="python", markdown_word='python', **kwargs):
+    """print(extract_code("sum 1~100"))"""
+    chat_text = text + f"""
+The output should be a complete and usable {language} code snippet, including the leading and trailing "```{markdown_word}" and "```":
+"""
+    markdown = chat([{"role": "user", "content": chat_text}], temperature=temperature, **kwargs)
+    # 使用正则表达式匹配围绕在```{markdown_word} 和 ```之间的文本
+    pattern = rf'```{markdown_word}(.*?)```'
+    matches = re.findall(pattern, markdown, re.DOTALL)
+    if matches:
+        # 去除可能的前后空白字符
+        return matches[0].strip()
+    else:
+        raise Exception("The string is not a valid python code.")
+
+
+if __name__ == "__main__":
+    print(chat([{"role": "user", "content": "你好"}]))
+    for chunk in chat_stream([{"role": "user", "content": "你好"}]):
+        print(chunk)
+    print(extract({"name": "lowercase"}, "hello XiaoMing"))
+    print(extract_code("sum 1~100"))

pycoze/bot/agent/agent_types/openai_func_call_agent.py

@@ -1,6 +1,5 @@
 # reference：https://github.com/maxtheman/opengpts/blob/d3425b1ba80aec48953a327ecd9a61b80efb0e69/backend/app/agent_types/openai_agent.py
 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
@@ -13,6 +12,7 @@ import json
 import random
 from .const import HumanToolString
 
+
 def get_all_markdown_json(content):
     # Find all markdown json blocks
     markdown_json_blocks = re.findall(r"```json(.*?)```", content, re.DOTALL)
@@ -107,8 +107,8 @@ def create_openai_func_call_agent_executor(
             last_message.content = last_message.content + "\n\n"  # 避免影响阅读
         tools = get_tools(last_message)
         if last_message.tool_calls or tools:
-            return 'continue'
-        return 'end'
+            return "continue"
+        return "end"
 
     # Define the function to execute tools
     async def call_tool(messages):
@@ -140,9 +140,7 @@ def create_openai_func_call_agent_executor(
         responses = await tool_executor.abatch(actions, **kwargs)
         # We use the response to create a ToolMessage
         tool_messages = []
-        for tool_call, response in zip(
-            get_tools(last_message), responses
-        ):
+        for tool_call, response in zip(get_tools(last_message), responses):
             if not isinstance(response, (str, int, float, bool, list, tuple)):
                 response = repr(
                     response
@@ -157,9 +155,7 @@ def create_openai_func_call_agent_executor(
         if tool_compatibility_mode:
             # HumanMessage
             tool_msgs_str = repr(tool_messages)
-            tool_messages = [
-                HumanMessage(content=HumanToolString + tool_msgs_str)
-            ]
+            tool_messages = [HumanMessage(content=HumanToolString + tool_msgs_str)]
         return tool_messages
 
     workflow = MessageGraph()

pycoze/reference/tool.py

@@ -1,15 +1,15 @@
-import sys
 import os
 import importlib
 from langchain.agents import tool as to_agent_tool
 import types
 import langchain_core
-from .lib import ChangeDirectoryAndPath, ModuleManager, wrapped_func
+from .lib import ModuleManager, wrapped_func
 from pycoze import utils
 
 
 params = utils.params
 
+
 def ref_tools(tool_id, as_agent_tool=False, workspace_path=None):
     if workspace_path is None:
         workspace_path = params["workspacePath"]
@@ -27,7 +27,9 @@ def ref_tools(tool_id, as_agent_tool=False, workspace_path=None):
             export_tools = getattr(module, "export_tools")
             valid_tools = []
             for tool in export_tools:
-                assert isinstance(tool, langchain_core.tools.StructuredTool) or isinstance(
+                assert isinstance(
+                    tool, langchain_core.tools.StructuredTool
+                ) or isinstance(
                     tool, types.FunctionType
                 ), f"Tool is not a StructuredTool or function: {tool}"
                 if not isinstance(tool, langchain_core.tools.StructuredTool):

pycoze/reference/workflow.py

@@ -1,56 +1,59 @@
-import sys
-import os
-import importlib
-from langchain.agents import tool as to_agent_tool
-import types
-import langchain_core
-from .lib import ModuleManager, wrapped_func
-from pycoze import utils
-
-
-params = utils.params
-
-def _ref_workflows(workflow_id, as_agent_tool=False, workspace_path=None):
-    if workspace_path is None:
-        workspace_path = params["workspacePath"]
-    tool_base_path = os.path.join(workspace_path, "User/Local/workflow")
-    module_path = os.path.join(tool_base_path, workflow_id)
-    module_path = os.path.normpath(os.path.abspath(module_path))
-
-    if not os.path.exists(module_path):
-        print(f"Workflow {workflow_id} not found")
-        return []
-
-    try:
-        with ModuleManager(module_path) as manager:
-            module = importlib.import_module("tool")
-            export_tools = getattr(module, "export_tools")
-            valid_tools = []
-            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 not isinstance(tool, langchain_core.tools.StructuredTool):
-                    tool = to_agent_tool(tool)
-                valid_tools.append(tool)
-            export_tools = valid_tools
-
-    except Exception as e:
-        print(f"Error loading workflow {workflow_id}: {e}")
-        return []
-
-    for tool in export_tools:
-        tool.func = wrapped_func(tool, module_path)
-        if tool.description is None:
-            tool.description = "This tool is used to " + tool.name + "."
-
-    return export_tools if as_agent_tool else [tool.func for tool in export_tools]
-
-
-def ref_workflow(workflow_id, as_agent_tool=False, workspace_path=None):
-    tools = _ref_workflows(workflow_id, as_agent_tool=as_agent_tool, workspace_path=workspace_path)
-    if len(tools) > 0:
-        return tools[0]
-    else:
-        return None
-
+import os
+import importlib
+from langchain.agents import tool as to_agent_tool
+import types
+import langchain_core
+from .lib import ModuleManager, wrapped_func
+from pycoze import utils
+
+
+params = utils.params
+
+
+def _ref_workflows(workflow_id, as_agent_tool=False, workspace_path=None):
+    if workspace_path is None:
+        workspace_path = params["workspacePath"]
+    tool_base_path = os.path.join(workspace_path, "User/Local/workflow")
+    module_path = os.path.join(tool_base_path, workflow_id)
+    module_path = os.path.normpath(os.path.abspath(module_path))
+
+    if not os.path.exists(module_path):
+        print(f"Workflow {workflow_id} not found")
+        return []
+
+    try:
+        with ModuleManager(module_path) as manager:
+            module = importlib.import_module("tool")
+            export_tools = getattr(module, "export_tools")
+            valid_tools = []
+            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 not isinstance(tool, langchain_core.tools.StructuredTool):
+                    tool = to_agent_tool(tool)
+                valid_tools.append(tool)
+            export_tools = valid_tools
+
+    except Exception as e:
+        print(f"Error loading workflow {workflow_id}: {e}")
+        return []
+
+    for tool in export_tools:
+        tool.func = wrapped_func(tool, module_path)
+        if tool.description is None:
+            tool.description = "This tool is used to " + tool.name + "."
+
+    return export_tools if as_agent_tool else [tool.func for tool in export_tools]
+
+
+def ref_workflow(workflow_id, as_agent_tool=False, workspace_path=None):
+    tools = _ref_workflows(
+        workflow_id, as_agent_tool=as_agent_tool, workspace_path=workspace_path
+    )
+    if len(tools) > 0:
+        return tools[0]
+    else:
+        return None

{pycoze-0.1.285.dist-info → pycoze-0.1.288.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycoze
-Version: 0.1.285
+Version: 0.1.288
 Summary: Package for pycoze only!
 Home-page: UNKNOWN
 Author: Yuan Jie Xiong

{pycoze-0.1.285.dist-info → pycoze-0.1.288.dist-info}/RECORD

@@ -2,7 +2,7 @@ pycoze/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/ai/__init__.py,sha256=amfVImcuiRRnGbmOjIqjXKiuH1H3zZPHOrJue2dEB8U,355
 pycoze/ai/vram_reserve.py,sha256=DRxKzqf89fLAts0DzU8e19z9kecIF8OdMkQnJlCKZV0,4244
 pycoze/ai/llm/__init__.py,sha256=5_AnOrzXI2V6ZZsLUWW1v5ATRWmJy53JLN9jfSZQXCg,249
-pycoze/ai/llm/chat.py,sha256=izriC7nCp5qeJRqcUVQBVqTHiH6MJS77ROzGBJufdNI,5133
+pycoze/ai/llm/chat.py,sha256=_aJo0KzqA2m4lLql-9AqTh9f6mJmwi80K_tam7F2ehU,4882
 pycoze/ai/llm/text_to_image_prompt.py,sha256=0bx2C_YRvjAo7iphHGp1-pmGKsKqwur7dM0t3SiA8kA,3398
 pycoze/ai/llm/think.py,sha256=sUgTBdGzcZtL3r-Wx8M3lDuVUmDVz8g3qC0VU8uiKAI,5143
 pycoze/api/__init__.py,sha256=GGRRRPop0ZxdXe5JRhg2XvHITGIWfNcHA25opJZ0f1w,313
@@ -19,12 +19,12 @@ pycoze/bot/agent/assistant.py,sha256=5LIgPIVVzx6uIOWT5S_XDDyPPjPHRBBNpIU3GiOkVHc
 pycoze/bot/agent/chat.py,sha256=9wZ24CPdSbSnPCWmCQJle05U5VlDGgZhZ9z1mezLst0,816
 pycoze/bot/agent/agent_types/__init__.py,sha256=zmU2Kmrv5mCdfg-QlPn2H6pWxbGeq8s7YTqLhpzJC6k,179
 pycoze/bot/agent/agent_types/const.py,sha256=BfUKPrhAHREoMLHuFNG2bCIEkC1-f7K0LEqNg4RwiRE,70
-pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=6aKnUQDINyUaCW24oa9Qjkm5w3ctZ6lxAgcE4m9YHwE,6701
+pycoze/bot/agent/agent_types/openai_func_call_agent.py,sha256=3qOyrddujtJ50W9SbH5bapbVTwjgE_LC2TnYJWUH9yc,6649
 pycoze/reference/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycoze/reference/bot.py,sha256=d5uB0OH1MF3LXGoBAF6vX6y50IV3sOrNi_5hXAHAmGU,2255
 pycoze/reference/lib.py,sha256=0xQJTLTHedGzQBsjuTFNBVqYc4-8Yl65gGCrAhWyOX8,2155
-pycoze/reference/tool.py,sha256=CYUS95M_XGnUcl4uWayjzKOM9jGpylS7vWJ66JfNTjI,1710
-pycoze/reference/workflow.py,sha256=LiubvvhGa6KoVIP8W8D8zTZaL595M4Dorsa_kxZ8UgQ,2028
+pycoze/reference/tool.py,sha256=_dggSWn-oC_reB8TuNOPl48Xr-pgwJHF7XmzlIw6lsQ,1714
+pycoze/reference/workflow.py,sha256=22y8yyJgBMcGShBbqKpUGFl2CM9dh646LsM8r-1UKcs,2013
 pycoze/ui/__init__.py,sha256=uaXet23wUk64TcZjpBX8qOx4aUhwA_ucrmcxy7Q4Qr4,929
 pycoze/ui/base.py,sha256=bz9mHZwIXA8LErEHTIonH347u6LP7rxV2EADMMjNZos,1081
 pycoze/ui/color.py,sha256=cT9Ib8uNzkOKxyW0IwVj46o4LwdB1xgNCj1_Rou9d_4,854
@@ -35,8 +35,8 @@ pycoze/utils/arg.py,sha256=jop1tBfe5hYkHW1NSpCeaZBEznkgguBscj_7M2dWfrs,503
 pycoze/utils/env.py,sha256=5pWlXfM1F5ZU9hhv1rHlDEanjEW5wf0nbyez9bNRqqA,559
 pycoze/utils/socket.py,sha256=bZbFFRH4mfThzRqt55BAAGQ6eICx_ja4x8UGGrUdAm8,2428
 pycoze/utils/text_or_file.py,sha256=gpxZVWt2DW6YiEg_MnMuwg36VNf3TX383QD_1oZNB0Y,551
-pycoze-0.1.285.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
-pycoze-0.1.285.dist-info/METADATA,sha256=Qb3Dk-FsO1-K9xMul-gH7ds6KoH56qCjAH2RpUJPNqY,755
-pycoze-0.1.285.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-pycoze-0.1.285.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
-pycoze-0.1.285.dist-info/RECORD,,
+pycoze-0.1.288.dist-info/LICENSE,sha256=QStd_Qsd0-kAam_-sOesCIp_uKrGWeoKwt9M49NVkNU,1090
+pycoze-0.1.288.dist-info/METADATA,sha256=72pjOMZ7pPYKaJ7PLzFV-fa2zfNZkfCHuulwkvb2HOs,755
+pycoze-0.1.288.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+pycoze-0.1.288.dist-info/top_level.txt,sha256=76dPeDhKvOCleL3ZC5gl1-y4vdS1tT_U1hxWVAn7sFo,7
+pycoze-0.1.288.dist-info/RECORD,,