meshagent-tools 0.20.5__py3-none-any.whl → 0.20.6__py3-none-any.whl

meshagent/tools/database.py

@@ -5,6 +5,10 @@ from .hosting import RemoteToolkit, Toolkit
 from typing import Literal, Optional
 from meshagent.api.room_server_client import DataType, RoomClient
 
+import logging
+
+logger = logging.getLogger("database_toolkit")
+
 
 class ListTablesTool(Tool):
     def __init__(self):
@@ -208,7 +212,6 @@ class SearchTool(Tool):
             },
         }
 
-        print(input_schema)
         super().__init__(
             name=f"search_{table}",
             title=f"search {table}",
@@ -242,6 +245,183 @@ class SearchTool(Tool):
         }
 
 
+class LLMßSearchTool(Tool):
+    def __init__(
+        self,
+        *,
+        table: str,
+        schema: dict[str, DataType],
+        namespace: Optional[list[str]] = None,
+    ):
+        self.table = table
+        self.namespace = namespace
+
+        query = {
+            "type": "object",
+            "required": [],
+            "additionalProperties": False,
+            "properties": {},
+        }
+
+        for k, v in schema.items():
+            query["required"].append(k)
+            query["properties"][k] = v.to_json_schema()
+
+        input_schema = {
+            "type": "object",
+            "required": ["query", "limit", "offset", "select"],
+            "additionalProperties": False,
+            "properties": {
+                "query": query,
+                "select": {
+                    "type": "array",
+                    "description": f"the columns to return, available columns: {','.join(schema.keys())}",
+                    "items": {
+                        "type": "string",
+                    },
+                },
+                "limit": {"type": "integer"},
+                "offset": {"type": "integer"},
+            },
+        }
+
+        super().__init__(
+            name=f"search_{table}",
+            title=f"search {table}",
+            description=f"search {table} table for rows with the specified values (specify null for a column to exclude it from the search)",
+            input_schema=input_schema,
+        )
+
+    async def execute(
+        self,
+        context: ToolContext,
+        query: object,
+        limit: int,
+        offset: int,
+        select: list[str],
+    ):
+        search = {}
+
+        for k, v in query.items():
+            if v is not None:
+                search[k] = v
+
+        return {
+            "rows": await context.room.database.search(
+                select=select,
+                table=self.table,
+                where=search if len(search) > 0 else None,
+                namespace=self.namespace,
+                offset=offset,
+                limit=limit,
+            )
+        }
+
+
+class SpawnTaskForEachRow(Tool):
+    def __init__(
+        self,
+        *,
+        table: str,
+        schema: dict[str, DataType],
+        prompt: str,
+        queue: str,
+        namespace: Optional[list[str]] = None,
+        name: Optional[str] = None,
+        title: Optional[str] = None,
+        description: Optional[str] = None,
+        supports_context: bool = True,
+    ):
+        self.table = table
+        self.namespace = namespace
+        self.queue = queue
+        self.prompt = prompt
+
+        query = {
+            "type": "object",
+            "required": [],
+            "additionalProperties": False,
+            "properties": {},
+        }
+
+        for k, v in schema.items():
+            query["required"].append(k)
+            query["properties"][k] = v.to_json_schema()
+
+        input_schema = {
+            "type": "object",
+            "required": ["query", "limit", "offset", "select"],
+            "additionalProperties": False,
+            "properties": {
+                "query": query,
+                "select": {
+                    "type": "array",
+                    "description": f"the columns to return, available columns: {','.join(schema.keys())}",
+                    "items": {
+                        "type": "string",
+                    },
+                },
+                "limit": {"type": "integer"},
+                "offset": {"type": "integer"},
+            },
+        }
+
+        print(input_schema)
+        super().__init__(
+            name=name or f"spawn_task_for_each_{table}_row",
+            title=title or f"Spawn task for each {table} row",
+            description=description
+            or f"for each result in {table} where rows match the specified values (specify null for a column to exclude it from the search), queue a worker task",
+            input_schema=input_schema,
+            supports_context=supports_context,
+        )
+
+    def make_message(self, *, context: ToolContext, row: dict):
+        msg = {
+            "prompt": self.prompt.format(**row),
+            "row": row,
+        }
+
+        if self.supports_context:
+            msg["caller_context"] = context.caller_context
+
+        return msg
+
+    async def execute(
+        self,
+        context: ToolContext,
+        query: object,
+        limit: int,
+        offset: int,
+        select: list[str],
+    ):
+        search = {}
+
+        for k, v in query.items():
+            if v is not None:
+                search[k] = v
+
+        rows = await context.room.database.search(
+            select=select,
+            table=self.table,
+            where=search if len(search) > 0 else None,
+            namespace=self.namespace,
+            offset=offset,
+            limit=limit,
+        )
+
+        logger.info(
+            f"spawn_task_for_each_{self.table}_row matched {len(rows)}. adding items to the queue {self.queue}"
+        )
+
+        for row in rows:
+            await context.room.queues.send(
+                name=self.queue, message=self.make_message(context=context, row=row)
+            )
+
+        return {f"added {len(row)} items to the queue {self.queue}"}
+
+
 class CountTool(Tool):
     def __init__(
         self,

meshagent/tools/version.py

@@ -1 +1 @@
-__version__ = "0.20.5"
+__version__ = "0.20.6"

{meshagent_tools-0.20.5.dist-info → meshagent_tools-0.20.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-tools
-Version: 0.20.5
+Version: 0.20.6
 Summary: Tools for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com
@@ -12,7 +12,7 @@ License-File: LICENSE
 Requires-Dist: pyjwt~=2.10
 Requires-Dist: pytest~=8.4
 Requires-Dist: pytest-asyncio~=0.26
-Requires-Dist: meshagent-api~=0.20.5
+Requires-Dist: meshagent-api~=0.20.6
 Requires-Dist: aiohttp~=3.10
 Requires-Dist: opentelemetry-distro~=0.54b1
 Dynamic: license-file

{meshagent_tools-0.20.5.dist-info → meshagent_tools-0.20.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 meshagent/tools/__init__.py,sha256=1zgD5OvAJP10eERoE72VbDu9hFVfAqCWUXw3SiCYFTE,1285
 meshagent/tools/blob.py,sha256=aDW_z8R4HrmrYzAWoWm13Ypqcxcl4rL1Dc0ESnQETLM,1473
 meshagent/tools/config.py,sha256=zH2xGxg28K7Tg-aYor6LXdzf0LRxS9iE0679H1FuWhE,79
-meshagent/tools/database.py,sha256=TXy7L7_0IxjKM9TqZlx8om4SP_bTjTWqPfNosljb0kE,12910
+meshagent/tools/database.py,sha256=YpCuLsLRcaDec1KAN9ax1-3dun-iSbVIUHVTM9B-3lg,18116
 meshagent/tools/datetime.py,sha256=2pOUOWopYIsc5y4EoFo_1PdBaBcTSkeOOs_EqdqYTk0,17503
 meshagent/tools/discovery.py,sha256=GZcC4XCgk0ftcYCBxuWlaIsLV5vU4-gXiu0HhlDUlwY,1861
 meshagent/tools/document_tools.py,sha256=LMULXOSBjsvhKjqzxUxe8586t0Vol0v1Btu5v6ofm7A,11755
@@ -13,10 +13,10 @@ meshagent/tools/strict_schema.py,sha256=IytdAANa6lsfrsg5FsJuqYrxH9D_fayl-Lc9EwgL
 meshagent/tools/tool.py,sha256=9OAlbfaHqfgJnCDBSW-8PS0Z1K1KjWGD3JBUyiHOxAk,3131
 meshagent/tools/toolkit.py,sha256=rCCkpQBoSkmmhjnRGA4jx0QP-ds6WTJ0PkQVnf1Ls7s,3843
 meshagent/tools/uuid.py,sha256=mzRwDmXy39U5lHhd9wqV4r-ZdS8jPfDTTs4UfW4KHJQ,1342
-meshagent/tools/version.py,sha256=KohmrV3SWmyEbdcyopRMCctCtbthoMrxKM29jQ5Xa58,23
+meshagent/tools/version.py,sha256=rWRn3W8IFYBR0LbP9YUZbZlJo0Ke1ew7xlL3sY6L77o,23
 meshagent/tools/web_toolkit.py,sha256=IoOYjOBmcbQsqWT14xYg02jjWpWmGOkDSxt2U-LQoaA,1258
-meshagent_tools-0.20.5.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
-meshagent_tools-0.20.5.dist-info/METADATA,sha256=S8uACMfFpfUK0w7jK4eloi0fSC1ZtFahWBsUL89HGXE,2878
-meshagent_tools-0.20.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-meshagent_tools-0.20.5.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
-meshagent_tools-0.20.5.dist-info/RECORD,,
+meshagent_tools-0.20.6.dist-info/licenses/LICENSE,sha256=eTt0SPW-sVNdkZe9PS_S8WfCIyLjRXRl7sUBWdlteFg,10254
+meshagent_tools-0.20.6.dist-info/METADATA,sha256=QyN7OGyOX9sNUIoAH9-1YUxgPLTAAWET665MkbOd0qM,2878
+meshagent_tools-0.20.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+meshagent_tools-0.20.6.dist-info/top_level.txt,sha256=GlcXnHtRP6m7zlG3Df04M35OsHtNXy_DY09oFwWrH74,10
+meshagent_tools-0.20.6.dist-info/RECORD,,