pycoze 0.1.299__tar.gz → 0.1.301__tar.gz

{pycoze-0.1.299 → pycoze-0.1.301}/PKG-INFO

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

{pycoze-0.1.299 → pycoze-0.1.301}/pycoze/api/__init__.py

@@ -1,13 +1,16 @@
-from .lib.window_cls import WindowCls
-from .lib.tab_cls import TabCls
+from .lib.window import WindowCls
+from .lib.tab import TabCls
+from .lib.web import WebCls
 
 class Api:
     def __init__(self) -> None:
         self.window = WindowCls()
         self.tab = TabCls()
+        self.web = WebCls()
 
 api = Api()
 window = api.window
 tab = api.tab
+web = api.web
 
 # from ps_view import ViewCls, WebsiteViewCls, FileViewCls, DirectoryViewCls, WorkflowCls

pycoze-0.1.301/pycoze/api/lib/web.py

@@ -0,0 +1,11 @@
+from pycoze import utils
+
+
+socket = utils.socket
+
+
+class WebCls:
+    def get_simplified_webpage(self, url: str) -> str:
+        return socket.post_and_recv_result(
+            "getSimplifiedWebpage", {"url": url}
+        )

{pycoze-0.1.299 → pycoze-0.1.301}/pycoze/reference/bot.py

@@ -1,5 +1,4 @@
 import os
-from langchain.agents import tool as to_agent_tool
 from .lib import ModuleManager, wrapped_func
 import json
 from pycoze import utils
@@ -9,7 +8,7 @@ bot_index = 0
 params = utils.params
 
 
-def ref_bot(bot_id, as_agent_tool=False, workspace_path=None):
+def ref_bot(bot_id, workspace_path=None):
     global bot_index
     if workspace_path is None:
         workspace_path = params["workspacePath"]
@@ -51,11 +50,10 @@ def {random_name}(command:str) -> str:
     return result
 """
             exec(function_code)
-            tool = to_agent_tool(eval(random_name))
-            tool.func = wrapped_func(tool, module_path)
-            if tool.description is None:
-                tool.description = "This tool is used to " + tool.name + "."
-            return tool if as_agent_tool else tool.func
+            tool = eval(random_name)
+            tool = wrapped_func(tool, module_path)
+
+            return tool
     except Exception as e:
         print(f"Error loading bot {bot_id}: {e}")
         return None

{pycoze-0.1.299 → pycoze-0.1.301}/pycoze/reference/lib.py

@@ -48,20 +48,19 @@ class ModuleManager:
                 del sys.modules[key]
                 
 
-def wrapped_func(item, module_path):
-    original_tool_function = item.func
+def wrapped_func(func, module_path):
 
     def _wrapped(*args, **kwargs):
         try:
-            print(f"调用了 {item.name}")
+            print(f"调用了 {func.__name__}")
         except:
             print(f"called unknown")
         with ChangeDirectoryAndPath(module_path):
-            result = original_tool_function(*args, **kwargs)
+            result = func(*args, **kwargs)
         try:
             if isinstance(result, types.GeneratorType):
                 result = list(result)
-            print(f"{item.name} 调用完毕,结果为:", result)
+            print(f"{func.__name__} 调用完毕,结果为:", result)
         except:
             pass
         return result

pycoze-0.1.301/pycoze/reference/tool.py

@@ -0,0 +1,35 @@
+import os
+import importlib
+from .lib import ModuleManager, wrapped_func
+from pycoze import utils
+
+
+params = utils.params
+
+
+def ref_tools(tool_id, workspace_path=None):
+    if workspace_path is None:
+        workspace_path = params["workspacePath"]
+    tool_base_path = os.path.join(workspace_path, "User/Local/tool")
+    module_path = os.path.join(tool_base_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 []
+
+    try:
+        with ModuleManager(module_path) as manager:
+            module = importlib.import_module("tool")
+            export_tools = getattr(module, "export_tools")
+
+    except Exception as e:
+        print(f"Error loading tool {tool_id}: {e}")
+        return []
+
+    for tool in export_tools:
+        tool = wrapped_func(tool, module_path)
+        if tool.__doc__ is None:
+            tool.__doc__ = "This tool is used to " + tool.name + "."
+
+    return [tool.func for tool in export_tools]

pycoze-0.1.301/pycoze/reference/workflow.py

@@ -0,0 +1,45 @@
+import os
+import importlib
+from .lib import ModuleManager, wrapped_func
+from pycoze import utils
+
+
+params = utils.params
+
+
+def _ref_workflows(workflow_id, 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")
+
+    except Exception as e:
+        print(f"Error loading workflow {workflow_id}: {e}")
+        return []
+
+    for tool in export_tools:
+        tool = wrapped_func(tool, module_path)
+        if tool.__doc__ is None:
+            tool.__doc__ = "This tool is used to " + tool.name + "."
+
+    return [tool.func for tool in export_tools]
+
+
+def ref_workflow(workflow_id, workspace_path=None):
+    tools = _ref_workflows(
+        workflow_id, workspace_path=workspace_path
+    )
+    if len(tools) > 0:
+        return tools[0]
+    else:
+        return None

{pycoze-0.1.299 → pycoze-0.1.301}/pycoze.egg-info/PKG-INFO

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

{pycoze-0.1.299 → pycoze-0.1.301}/pycoze.egg-info/SOURCES.txt

@@ -14,9 +14,10 @@ pycoze/ai/llm/text_to_image_prompt.py
 pycoze/ai/llm/think.py
 pycoze/api/__init__.py
 pycoze/api/lib/__init__.py
-pycoze/api/lib/tab_cls.py
+pycoze/api/lib/tab.py
 pycoze/api/lib/view.py
-pycoze/api/lib/window_cls.py
+pycoze/api/lib/web.py
+pycoze/api/lib/window.py
 pycoze/bot/__init__.py
 pycoze/bot/agent_chat.py
 pycoze/bot/bot.py

{pycoze-0.1.299 → pycoze-0.1.301}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pycoze",
-    version="0.1.299",
+    version="0.1.301",
     packages=find_packages(),
     install_requires=[],
     author="Yuan Jie Xiong",

pycoze-0.1.299/pycoze/reference/tool.py

@@ -1,49 +0,0 @@
-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_tools(tool_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/tool")
-    module_path = os.path.join(tool_base_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 []
-
-    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 tool {tool_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]

pycoze-0.1.299/pycoze/reference/workflow.py

@@ -1,59 +0,0 @@
-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