hyperpocket 0.5.2__tar.gz → 0.5.4__tar.gz

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperpocket
-Version: 0.5.2
+Version: 0.5.4
 Summary: Building AI agent with hyperpocket tool in a flash
 Project-URL: Homepage, https://vessl-ai.github.io/hyperpocket
 Project-URL: Repository, https://github.com/vessl-ai/hyperpocket
@@ -14,10 +14,9 @@ Requires-Dist: httpx==0.27
 Requires-Dist: jinja2>=3.1.4
 Requires-Dist: multiprocess>=0.70.17
 Requires-Dist: nest-asyncio>=1.6.0
-Requires-Dist: playwright>=1.49.0
 Requires-Dist: pydantic>=2.10.2
 Requires-Dist: pygithub>=2.5.0
-Requires-Dist: python-multipart>=0.0.19
+Requires-Dist: python-multipart>=0.0.18
 Requires-Dist: redis>=5.2.1
 Requires-Dist: requests>=2.32.3
 Requires-Dist: toml>=0.10.2

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/hyperpocket/cli/__main__.py

@@ -1,10 +1,7 @@
 import click
 
-from hyperpocket.cli.eject import eject
-from hyperpocket.cli.pull import pull
-from hyperpocket.cli.eject import eject
-from hyperpocket.cli.auth_token import create_token_auth_template
 from hyperpocket.cli.auth_oauth2 import create_oauth2_auth_template
+from hyperpocket.cli.auth_token import create_token_auth_template
 from hyperpocket.cli.tool_create import create_tool_template, build_tool
 from hyperpocket.cli.tool_export import export_tool
 
@@ -26,7 +23,4 @@ devtool.add_command(create_tool_template)
 devtool.add_command(build_tool)
 devtool.add_command(export_tool)
 
-cli.add_command(pull)
-cli.add_command(eject)
-
 cli()

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/hyperpocket/pocket_main.py

@@ -482,13 +482,12 @@ class Pocket(object):
         Args:
             tools (Union[List[ToolLike], ToolLike]): A list of tool identifiers to be loaded.
         """
-        dock = self._default_dock()
         if not isinstance(tools, list):
             tools = [tools]
 
         loaded_tools = []
         with concurrent.futures.ThreadPoolExecutor(max_workers=10, thread_name_prefix="tool-loader") as executor:
-            futures = [executor.submit(self._load_tool, tool_like, dock) for tool_like in tools]
+            futures = [executor.submit(self._load_tool, tool_like) for tool_like in tools]
             loaded_tools = [future.result() for future in concurrent.futures.as_completed(futures)]
 
         for tool in loaded_tools:
@@ -498,11 +497,9 @@ class Pocket(object):
 
         return loaded_tools
 
-    def _load_tool(self, tool_like, dock: Dock = None) -> Tool:
-        if dock is None:
-            dock = self._default_dock()
-
+    def _load_tool(self, tool_like) -> Tool:
         if isinstance(tool_like, str) or isinstance(tool_like, tuple):
+            dock = self._default_dock()
             return dock(tool_like)
         elif isinstance(tool_like, Tool):
             return tool_like

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/hyperpocket/util/function_to_model.py

@@ -38,18 +38,15 @@ def function_to_model(func: callable) -> Type[BaseModel]:
             raise Exception(
                 f"Should all arguments be annotated but {param_name} is not annotated"
             )
+        
+        if param.annotation.__module__ == "typing":
+            for arg in param.annotation.__args__:
+                if arg.__module__ != "builtins" and not issubclass(arg, BaseModel):
+                    raise Exception(
+                        f"currently only support builtin types and pydantic BaseModel but {param_name} is not builtin type"
+                    )
 
-        if (
-            param.annotation.__module__ == "typing"
-            and param.annotation.__name__ == "Optional"
-        ):
-            fields[param_name] = (
-                param.annotation.__args__[0],
-                FieldInfo(
-                    default=param.default,
-                    description=param_desc_map.get(param_name, ""),
-                ),
-            )
+        # if annotation type isn't typing, check this type directly.
         elif param.annotation.__module__ != "builtins" and not issubclass(
             param.annotation, BaseModel
         ):

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperpocket"
-version = "0.5.2"
+version = "0.5.4"
 description = "Building AI agent with hyperpocket tool in a flash"
 authors = [{ name = "Hyperpocket Team", email = "hyperpocket@vessl.ai" }]
 requires-python = ">=3.10"
@@ -14,14 +14,13 @@ dependencies = [
     "httpx==0.27",
     "toml>=0.10.2",
     "jinja2>=3.1.4",
-    "playwright>=1.49.0",
     "pygithub>=2.5.0",
-    "python-multipart>=0.0.19",
     "multiprocess>=0.70.17",
     "gitpython>=3.1.43",
     "redis>=5.2.1",
     "dynaconf>=3.2.6",
     "nest-asyncio>=1.6.0",
+    "python-multipart>=0.0.18",
 ]
 
 [project.urls]
@@ -37,7 +36,13 @@ standard = [
 ]
 
 [dependency-groups]
-dev = ["pytest>=8.3.4", "pytest-cov>=6.0.0", "ruff>=0.8.6"]
+dev = [
+    "hyperdock-container",
+    "pytest>=8.3.4",
+    "pytest-asyncio>=0.25.3",
+    "pytest-cov>=6.0.0",
+    "ruff>=0.8.6",
+]
 
 [build-system]
 requires = ["hatchling"]

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/tests/session/test_in_memory.py

@@ -20,7 +20,7 @@ class TestInMemorySessionStorage(unittest.TestCase):
         )
 
     def tearDown(self):
-        del self.storage
+        self.storage.storage.clear()
         del self.auth_context
 
     def test_make_session_key(self):

{hyperpocket-0.5.2 → hyperpocket-0.5.4}/tests/test_pocket.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel
 
 from hyperpocket import Pocket
 from hyperpocket.auth import AuthProvider
-from hyperpocket.tool import function_tool
+from hyperpocket.tool import function_tool, Tool
 
 
 class FirstNumber(BaseModel):
@@ -22,11 +22,101 @@ class TestPocket(IsolatedAsyncioTestCase):
     async def asyncSetUp(self):
         self.profile = "test-profile"
         self.thread_id = "test_thread_id"
-        self.pocket: Pocket = None
 
-    async def asyncTearDown(self):
-        if self.pocket:
-            self.pocket._teardown_server()
+    @pytest.mark.asyncio
+    async def test_load_tools_str(self):
+        """
+        Test Load tools in case str type
+        """
+        # when
+        pocket = Pocket(
+            tools=[
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool"
+            ]
+        )
+
+        # then
+        simple_echo_tool = pocket.tools["simple_echo_tool"]
+        self.assertIsInstance(simple_echo_tool, Tool)
+        self.assertEqual(simple_echo_tool.name, "simple_echo_tool")
+
+    async def test_load_tools_tuple(self):
+        """
+        Test Load tools in case tuple type
+        """
+        # when
+        pocket = Pocket(
+            tools=[
+                ("https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool",
+                 {"TEST_VAR": "TEST"})
+            ]
+        )
+
+        # then
+        simple_echo_tool = pocket.tools["simple_echo_tool"]
+        self.assertEqual(simple_echo_tool.tool_vars["TEST_VAR"], "TEST")
+
+    async def test_load_tools_tool(self):
+        """
+        Test Load tools in case tool type
+        """
+        # given
+        pocket = Pocket()
+
+        # when
+        tool_before_load = pocket.tools.get("simple_echo_tool")
+        pocket.load_tools(
+            tools=[
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool"
+            ]
+        )
+        tool_after_load = pocket.tools.get("simple_echo_tool")
+
+        # then
+        self.assertIsNone(tool_before_load)
+        self.assertIsInstance(tool_after_load, Tool)
+
+    async def test_remove_tool(self):
+        """
+        Test Load tools in case tuple type
+        """
+        # given
+        pocket = Pocket(
+            tools=[
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool"
+            ])
+
+        # when
+        tool_before_remove = pocket.tools.get("simple_echo_tool")
+        pocket.remove_tool("simple_echo_tool")
+        tool_after_remove = pocket.tools.get("simple_echo_tool")
+
+        # then
+        self.assertIsInstance(tool_before_remove, Tool)
+        self.assertIsNone(tool_after_remove)
+
+    async def test_grouping_tool_by_auth_provider(self):
+        """
+        Test grouping tool by auth provider
+        It should return dict which groups tools by auth provider.
+        """
+        # given
+        pocket = Pocket(
+            tools=[
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool",
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/google/create-spreadsheet",
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/google/list-gmail",
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/slack/get-messages",
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/slack/post-message",
+            ])
+
+        # when
+        grouped = pocket.grouping_tool_by_auth_provider()
+
+        # then
+        self.assertEqual(len(grouped), 2)
+        self.assertEqual(len(grouped["GOOGLE"]), 2)
+        self.assertEqual(len(grouped["SLACK"]), 2)
 
     async def test_function_tool(self):
         # given
@@ -87,13 +177,12 @@ class TestPocket(IsolatedAsyncioTestCase):
         # then
         self.assertEqual(result, "4")
 
-    @pytest.mark.skip(reason="after open repo")
-    async def test_wasm_tool(self):
+    async def test_container_tool(self):
         # given
-        tool_name = "simple_echo_text"
+        tool_name = "simple_echo_tool"
         self.pocket = Pocket(
             tools=[
-                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool"
+                "https://github.com/vessl-ai/hyperpocket/tree/main/tools/none/simple-echo-tool",
             ]
         )
 
@@ -104,14 +193,20 @@ class TestPocket(IsolatedAsyncioTestCase):
             thread_id=self.thread_id,
             profile=self.profile,
         )
-        output = ast.literal_eval(result)
 
         # then
-        self.assertTrue(output["stdout"].startswith("echo message : test"))
+        self.assertTrue("echo message : test" in result)
 
-    @pytest.mark.skip("config error")
     async def test_initialize_tool_auth(self):
         # given
+        from hyperpocket.config.auth import GoogleAuthConfig
+        from hyperpocket.config.settings import config
+
+        config().auth.google = GoogleAuthConfig(
+            client_id="test",
+            client_secret="test",
+        )
+
         @function_tool(auth_provider=AuthProvider.GOOGLE, scopes=["scope1", "scope2"])
         def google_function_a(**kwargs):
             """