hyperpocket-llamaindex 0.1.9__tar.gz → 0.2.0__tar.gz

{hyperpocket_llamaindex-0.1.9 → hyperpocket_llamaindex-0.2.0}/.gitignore

@@ -14,6 +14,7 @@ __pycache__/
 build/
 develop-eggs/
 dist/
+!tools/**/dist/
 downloads/
 eggs/
 .eggs/

{hyperpocket_llamaindex-0.1.9 → hyperpocket_llamaindex-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperpocket-llamaindex
-Version: 0.1.9
+Version: 0.2.0
 Author-email: Hyperpocket Team <hyperpocket@vessl.ai>
 Requires-Python: >=3.10
 Requires-Dist: hyperpocket>=0.0.3

{hyperpocket_llamaindex-0.1.9 → hyperpocket_llamaindex-0.2.0}/hyperpocket_llamaindex/pocket_llamaindex.py

@@ -3,11 +3,9 @@ from typing import List, Optional
 from pydantic import BaseModel
 
 try:
-    from llama_index.core.tools import FunctionTool, BaseTool, ToolMetadata
+    from llama_index.core.tools import BaseTool, FunctionTool, ToolMetadata
 except ImportError:
-    raise ImportError(
-        "You need to install llama-index to use pocket llamaindex"
-    )
+    raise ImportError("You need to install llama-index to use pocket llamaindex")
 
 from hyperpocket import Pocket
 from hyperpocket.tool import Tool
@@ -35,11 +33,16 @@ class PocketLlamaindex(Pocket):
             if isinstance(body, BaseModel):
                 body = body.model_dump()
 
-            result, interrupted = self.invoke_with_state(pocket_tool.name, body=body, thread_id=thread_id,
-                                                         profile=profile, **kwargs)
+            result, interrupted = self.invoke_with_state(
+                pocket_tool.name,
+                body=body,
+                thread_id=thread_id,
+                profile=profile,
+                **kwargs,
+            )
             say = result
             if interrupted:
-                say = f'{say}\n\nThe tool execution interrupted. Please talk to me to resume.'
+                say = f"{say}\n\nThe tool execution interrupted. Please talk to me to resume."
             return say
 
         async def _ainvoke(**kwargs) -> str:
@@ -55,11 +58,16 @@ class PocketLlamaindex(Pocket):
             if isinstance(body, BaseModel):
                 body = body.model_dump()
 
-            result, interrupted = await self.ainvoke_with_state(pocket_tool.name, body=body,
-                                                                thread_id=thread_id, profile=profile, **kwargs)
+            result, interrupted = await self.ainvoke_with_state(
+                pocket_tool.name,
+                body=body,
+                thread_id=thread_id,
+                profile=profile,
+                **kwargs,
+            )
             say = result
             if interrupted:
-                say = f'{say}\n\nThe tool execution interrupted. Please talk to me to resume.'
+                say = f"{say}\n\nThe tool execution interrupted. Please talk to me to resume."
             return say
 
         return FunctionTool.from_defaults(
@@ -69,5 +77,5 @@ class PocketLlamaindex(Pocket):
                 name=pocket_tool.name,
                 description=pocket_tool.get_description(use_profile=self.use_profile),
                 fn_schema=pocket_tool.schema_model(use_profile=self.use_profile),
-            )
+            ),
         )

{hyperpocket_llamaindex-0.1.9 → hyperpocket_llamaindex-0.2.0}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "hyperpocket-llamaindex"
-version = "0.1.9"
+version = "0.2.0"
 description = ""
 authors = [{ name = "Hyperpocket Team", email = "hyperpocket@vessl.ai" }]
 requires-python = ">=3.10"
@@ -18,19 +18,5 @@ dev = ["pytest>=8.3.4", "ruff>=0.8.6"]
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.ruff.lint]
-select = [
-    "E", # pycodestyle errors,
-    "F", # pyflakes errors,
-    "I", # isort errors,
-]
-ignore = [
-    "E501", # line too long, handled by formatting
-]
-
 [tool.ruff]
-line-length = 88
-target-version = "py310"
-
-[tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["F401"]
+extend = "../../../.ruff.toml"

{hyperpocket_llamaindex-0.1.9 → hyperpocket_llamaindex-0.2.0}/tests/test_pocket_llamaindex_no_profile.py

@@ -2,17 +2,16 @@ import ast
 import json
 from unittest.async_case import IsolatedAsyncioTestCase
 
+from hyperpocket.config import config, secret
+from hyperpocket.tool import from_git
 from llama_index.agent.openai import OpenAIAgent
 from llama_index.llms.openai import OpenAI
 from pydantic import BaseModel
 
-from hyperpocket.config import config, secret
-from hyperpocket.tool import from_git
 from hyperpocket_llamaindex import PocketLlamaindex
 
 
 class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
-
     async def asyncSetUp(self):
         config.public_server_port = "https"
         config.public_hostname = "localhost"
@@ -22,12 +21,15 @@ class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
 
         self.pocket = PocketLlamaindex(
             tools=[
-                from_git("https://github.com/vessl-ai/hyperawesometools", "main",
-                         "managed-tools/none/simple-echo-tool"),
+                from_git(
+                    "https://github.com/vessl-ai/hyperawesometools",
+                    "main",
+                    "managed-tools/none/simple-echo-tool",
+                ),
                 self.add,
-                self.sub_pydantic_args
+                self.sub_pydantic_args,
             ],
-            use_profile=False
+            use_profile=False,
         )
 
         self.llm = OpenAI(model="gpt-4o", api_key=secret["OPENAI_API_KEY"])
@@ -40,7 +42,7 @@ class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
         agent = OpenAIAgent.from_tools(
             tools=self.pocket.get_tools(),
             llm=OpenAI(model="gpt-4o", api_key=secret["OPENAI_API_KEY"]),
-            verbose=True
+            verbose=True,
         )
 
         # when
@@ -50,7 +52,9 @@ class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
 
     async def test_function_tool_no_profile(self):
         # when
-        response = self.llm.chat_with_tools(user_msg="add 1, 2", tools=self.pocket.get_tools(), verbose=True)
+        response = self.llm.chat_with_tools(
+            user_msg="add 1, 2", tools=self.pocket.get_tools(), verbose=True
+        )
         message = response.message
         tool_calls = message.additional_kwargs["tool_calls"]
 
@@ -62,15 +66,20 @@ class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
 
         # then
         self.assertEqual(tool_name, "add")
-        self.assertEqual(args, {
-            "a": 1,
-            "b": 2,
-        })
-        self.assertEqual(result, '3')
+        self.assertEqual(
+            args,
+            {
+                "a": 1,
+                "b": 2,
+            },
+        )
+        self.assertEqual(result, "3")
 
     async def test_pydantic_function_tool_no_profile(self):
         # when
-        response = self.llm.chat_with_tools(user_msg="sub 1, 2", tools=self.pocket.get_tools(), verbose=True)
+        response = self.llm.chat_with_tools(
+            user_msg="sub 1, 2", tools=self.pocket.get_tools(), verbose=True
+        )
         tool_calls = response.message.additional_kwargs["tool_calls"]
 
         tool_name = tool_calls[0].function.name
@@ -81,15 +90,20 @@ class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
 
         # then
         self.assertEqual(tool_name, "sub_pydantic_args")
-        self.assertEqual(args, {
-            "a": {"first": 1},
-            "b": {"second": 2},
-        })
-        self.assertEqual(result, '-1')
+        self.assertEqual(
+            args,
+            {
+                "a": {"first": 1},
+                "b": {"second": 2},
+            },
+        )
+        self.assertEqual(result, "-1")
 
     async def test_wasm_tool_no_profile(self):
         # when
-        response = self.llm.chat_with_tools(user_msg="echo 'hello world'", tools=self.pocket.get_tools(), verbose=True)
+        response = self.llm.chat_with_tools(
+            user_msg="echo 'hello world'", tools=self.pocket.get_tools(), verbose=True
+        )
         tool_calls = response.message.additional_kwargs["tool_calls"]
 
         tool_name = tool_calls[0].function.name
@@ -101,9 +115,7 @@ class TestPocketLlamaindexNoProfile(IsolatedAsyncioTestCase):
 
         # then
         self.assertEqual(tool_name, "simple_echo_text")
-        self.assertEqual(args, {
-            "text": "hello world"
-        })
+        self.assertEqual(args, {"text": "hello world"})
         self.assertTrue(output["stdout"].startswith("echo message : hello world"))
 
     @staticmethod

{hyperpocket_llamaindex-0.1.9 → hyperpocket_llamaindex-0.2.0}/tests/test_pocket_llamaindex_use_profile.py

@@ -2,17 +2,16 @@ import ast
 import json
 from unittest.async_case import IsolatedAsyncioTestCase
 
+from hyperpocket.config import config, secret
+from hyperpocket.tool import from_git
 from llama_index.agent.openai import OpenAIAgent
 from llama_index.llms.openai import OpenAI
 from pydantic import BaseModel
 
-from hyperpocket.config import config, secret
-from hyperpocket.tool import from_git
 from hyperpocket_llamaindex import PocketLlamaindex
 
 
 class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
-
     async def asyncSetUp(self):
         config.public_server_port = "https"
         config.public_hostname = "localhost"
@@ -22,12 +21,15 @@ class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
 
         self.pocket = PocketLlamaindex(
             tools=[
-                from_git("https://github.com/vessl-ai/hyperawesometools", "main",
-                         "managed-tools/none/simple-echo-tool"),
+                from_git(
+                    "https://github.com/vessl-ai/hyperawesometools",
+                    "main",
+                    "managed-tools/none/simple-echo-tool",
+                ),
                 self.add,
-                self.sub_pydantic_args
+                self.sub_pydantic_args,
             ],
-            use_profile=True
+            use_profile=True,
         )
 
         self.llm = OpenAI(model="gpt-4o", api_key=secret["OPENAI_API_KEY"])
@@ -40,7 +42,7 @@ class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
         agent = OpenAIAgent.from_tools(
             tools=self.pocket.get_tools(),
             llm=OpenAI(model="gpt-4o", api_key=secret["OPENAI_API_KEY"]),
-            verbose=True
+            verbose=True,
         )
 
         # when
@@ -50,7 +52,9 @@ class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
 
     async def test_function_tool(self):
         # when
-        response = self.llm.chat_with_tools(user_msg="add 1, 2", tools=self.pocket.get_tools(), verbose=True)
+        response = self.llm.chat_with_tools(
+            user_msg="add 1, 2", tools=self.pocket.get_tools(), verbose=True
+        )
         message = response.message
         tool_calls = message.additional_kwargs["tool_calls"]
 
@@ -62,15 +66,20 @@ class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
 
         # then
         self.assertEqual(tool_name, "add")
-        self.assertEqual(args["body"], {
-            "a": 1,
-            "b": 2,
-        })
-        self.assertEqual(result, '3')
+        self.assertEqual(
+            args["body"],
+            {
+                "a": 1,
+                "b": 2,
+            },
+        )
+        self.assertEqual(result, "3")
 
     async def test_pydantic_function_tool(self):
         # when
-        response = self.llm.chat_with_tools(user_msg="sub 1, 2", tools=self.pocket.get_tools(), verbose=True)
+        response = self.llm.chat_with_tools(
+            user_msg="sub 1, 2", tools=self.pocket.get_tools(), verbose=True
+        )
         tool_calls = response.message.additional_kwargs["tool_calls"]
 
         tool_name = tool_calls[0].function.name
@@ -81,15 +90,20 @@ class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
 
         # then
         self.assertEqual(tool_name, "sub_pydantic_args")
-        self.assertEqual(args["body"], {
-            "a": {"first": 1},
-            "b": {"second": 2},
-        })
-        self.assertEqual(result, '-1')
+        self.assertEqual(
+            args["body"],
+            {
+                "a": {"first": 1},
+                "b": {"second": 2},
+            },
+        )
+        self.assertEqual(result, "-1")
 
     async def test_wasm_tool(self):
         # when
-        response = self.llm.chat_with_tools(user_msg="echo 'hello world'", tools=self.pocket.get_tools(), verbose=True)
+        response = self.llm.chat_with_tools(
+            user_msg="echo 'hello world'", tools=self.pocket.get_tools(), verbose=True
+        )
         tool_calls = response.message.additional_kwargs["tool_calls"]
 
         tool_name = tool_calls[0].function.name
@@ -101,9 +115,7 @@ class TestPocketLlamaindexUseProfile(IsolatedAsyncioTestCase):
 
         # then
         self.assertEqual(tool_name, "simple_echo_text")
-        self.assertEqual(args["body"], {
-            "text": "hello world"
-        })
+        self.assertEqual(args["body"], {"text": "hello world"})
         self.assertTrue(output["stdout"].startswith("echo message : hello world"))
 
     @staticmethod