mech-client 0.2.16__tar.gz → 0.2.18__tar.gz

{mech_client-0.2.16 → mech_client-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.2.16
+Version: 0.2.18
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch
@@ -226,12 +226,12 @@ You will see an output like this:
 To get the description of a specific tool, use the `tool-description` command. You need to specify the unique identifier of the tool.
 
 ```bash
-mechx tool-description --unique-identifier <unique_identifier> --chain-config <chain_config>
+mechx tool-description <unique_identifier> --chain-config <chain_config>
 ```
 Example usage:
 
 ```bash
-mechx tool-description --unique-identifier "6-claude-prediction-offline" --chain-config gnosis
+mechx tool-description "6-claude-prediction-offline" --chain-config gnosis
 ```
 You will see an output like this:
 ```bash
@@ -244,16 +244,22 @@ Description for tool 6-claude-prediction-offline: Makes a prediction using Claud
 To get the input/output schema of a specific tool, use the `tool_io_schema` command. You need to specify the unique identifier of the tool.
 
 ```bash
-mechx tool-io-schema --unique-identifier <unique_identifier> --chain-config <chain_config>
+mechx tool-io-schema <unique_identifier> --chain-config <chain_config>
 ```
 
 Example usage:
 
 ```bash
-mechx tool-io-schema --unique-identifier "6-prediction-offline" --chain-config gnosis
+mechx tool-io-schema "6-prediction-offline" --chain-config gnosis
 ```
 You will see an output like this:
 ```bash
+Tool Details:
++---------------------------+-----------------------------------------------+
+| Tool Name                 | Tool Description                              |
++===========================+===============================================+
+| OpenAI Prediction Offline | Makes a prediction using OpenAI GPT-3.5 Turbo |
++---------------------------+-----------------------------------------------+
 Input Schema:
 +-------------+----------------------------------+
 | Field       | Value                            |

{mech_client-0.2.16 → mech_client-0.2.18}/README.md

@@ -204,12 +204,12 @@ You will see an output like this:
 To get the description of a specific tool, use the `tool-description` command. You need to specify the unique identifier of the tool.
 
 ```bash
-mechx tool-description --unique-identifier <unique_identifier> --chain-config <chain_config>
+mechx tool-description <unique_identifier> --chain-config <chain_config>
 ```
 Example usage:
 
 ```bash
-mechx tool-description --unique-identifier "6-claude-prediction-offline" --chain-config gnosis
+mechx tool-description "6-claude-prediction-offline" --chain-config gnosis
 ```
 You will see an output like this:
 ```bash
@@ -222,16 +222,22 @@ Description for tool 6-claude-prediction-offline: Makes a prediction using Claud
 To get the input/output schema of a specific tool, use the `tool_io_schema` command. You need to specify the unique identifier of the tool.
 
 ```bash
-mechx tool-io-schema --unique-identifier <unique_identifier> --chain-config <chain_config>
+mechx tool-io-schema <unique_identifier> --chain-config <chain_config>
 ```
 
 Example usage:
 
 ```bash
-mechx tool-io-schema --unique-identifier "6-prediction-offline" --chain-config gnosis
+mechx tool-io-schema "6-prediction-offline" --chain-config gnosis
 ```
 You will see an output like this:
 ```bash
+Tool Details:
++---------------------------+-----------------------------------------------+
+| Tool Name                 | Tool Description                              |
++===========================+===============================================+
+| OpenAI Prediction Offline | Makes a prediction using OpenAI GPT-3.5 Turbo |
++---------------------------+-----------------------------------------------+
 Input Schema:
 +-------------+----------------------------------+
 | Field       | Value                            |

mech_client-0.2.18/mech_client/__init__.py

@@ -0,0 +1,3 @@
+"""Mech client."""
+
+__version__ = "0.2.18"

{mech_client-0.2.16 → mech_client-0.2.18}/mech_client/cli.py

@@ -167,17 +167,39 @@ def tools_for_agents(agent_id: Optional[int], chain_config: str) -> None:
         result = get_tools_for_agents(agent_id, chain_config)
 
         if agent_id is not None:
-            headers = ["Tool Name", "Unique Identifier"]
+            headers = ["Tool Name", "Unique Identifier", "Mech Marketplace Support"]
             data: List[Tuple[str, ...]] = [
-                (str(tool["tool_name"]), str(tool["unique_identifier"]))
+                (
+                    str(tool["tool_name"]),
+                    str(tool["unique_identifier"]),
+                    "✓" if bool(tool["is_marketplace_supported"]) else "✗",
+                )
                 for tool in result["tools"]
             ]
         else:
-            headers = ["Agent ID", "Tool Name", "Unique Identifier"]
+            headers = [
+                "Agent ID",
+                "Tool Name",
+                "Unique Identifier",
+                "Mech Marketplace Support",
+            ]
+
             data = [
-                (str(agent_id), str(tool_name), f"{agent_id}-{tool_name}")
-                for agent_id, tools in result["agent_tools_map"].items()
-                for tool_name in tools
+                (
+                    str(agent_id),
+                    tool["tool_name"],
+                    tool["unique_identifier"],
+                    (
+                        "✓"
+                        if bool(
+                            tool["is_marketplace_supported"],
+                        )
+                        else "✗"
+                    ),
+                )
+                for agent_id, _ in result["agent_tools_map"].items()
+                for tool in result["all_tools_with_identifiers"]
+                if tool["unique_identifier"].startswith(f"{agent_id}-")
             ]
 
         click.echo(tabulate(data, headers=headers, tablefmt="grid"))
@@ -209,18 +231,35 @@ def tool_description(tool_id: str, chain_config: str) -> None:
 @click.argument("tool_id")
 @click.option("--chain-config", default="gnosis", help="Chain configuration to use.")
 def tool_io_schema(tool_id: str, chain_config: str) -> None:
-    """Fetch and display the input/output schema for a specific tool."""
+    """Fetch and display the tool's name and description along with the input/output schema for a specific tool."""
     try:
-        io_schema = get_tool_io_schema(tool_id, chain_config)
+        result = get_tool_io_schema(tool_id, chain_config)
+
+        name = result["name"]
+        description = result["description"]
         # Prepare data for tabulation
-        input_schema = [(key, io_schema["input"][key]) for key in io_schema["input"]]
+        input_schema = [(key, result["input"][key]) for key in result["input"]]
 
         # Handling nested output schema
         output_schema = []
-        if "properties" in io_schema["output"]["schema"]:
-            for key, value in io_schema["output"]["schema"]["properties"].items():
+        if "properties" in result["output"]["schema"]:
+            for key, value in result["output"]["schema"]["properties"].items():
                 output_schema.append((key, value["type"], value.get("description", "")))
 
+        # Display tool details in tabulated format
+        click.echo("Tool Details:")
+        click.echo(
+            tabulate(
+                [
+                    [
+                        name,
+                        description,
+                    ]
+                ],
+                headers=["Tool Name", "Tool Description"],
+                tablefmt="grid",
+            )
+        )
         # Display schemas in tabulated format
         click.echo("Input Schema:")
         click.echo(tabulate(input_schema, headers=["Field", "Value"], tablefmt="grid"))

{mech_client-0.2.16 → mech_client-0.2.18}/mech_client/interact.py

@@ -455,6 +455,7 @@ def wait_for_data_url(  # pylint: disable=too-many-arguments
     :rtype: Any
     """
     loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
     tasks = []
 
     if confirmation_type in (

{mech_client-0.2.16 → mech_client-0.2.18}/mech_client/mech_tool_management.py

@@ -35,13 +35,14 @@ def get_total_supply(chain_config: str = "gnosis") -> int:
 
 
 def get_agent_tools(
-    agent_id: int, chain_config: str = "gnosis"
+    agent_id: int, chain_config: str = "gnosis", include_metadata: bool = False
 ) -> Optional[Union[List[str], Tuple[List[str], Dict[str, Any]]]]:
     """
     Fetch tools for a given agent ID.
 
     :param agent_id: The ID of the agent.
     :param chain_config: The chain configuration to use (default is "gnosis").
+    :param include_metadata: To include tools metadata or not (default is False)
     :return: A list of tools if successful, or a tuple of (list of tools, metadata) if metadata is included, or None if an error occurs.
     """
     try:
@@ -58,6 +59,7 @@ def get_agent_tools(
             ledger_api=ledger_api,
             agent_registry_contract=mech_config.agent_registry_contract,
             contract_abi_url=mech_config.contract_abi_url,
+            include_metadata=include_metadata,
         )
     except (requests.exceptions.RequestException, json.JSONDecodeError, KeyError) as e:
         print(f"An error occurred while fetching tools for agent {agent_id}: {e}")
@@ -78,31 +80,51 @@ def get_tools_for_agents(
         total_supply = get_total_supply(chain_config)
 
         if agent_id is not None:
-            tools = get_agent_tools(agent_id, chain_config)
-            if isinstance(tools, list):
-                tools_with_ids = [
-                    {"tool_name": tool, "unique_identifier": f"{agent_id}-{tool}"}
-                    for tool in tools
-                ]
-            else:
-                tools_with_ids = []
-            return {"agent_id": agent_id, "tools": tools_with_ids}
+            result = get_agent_tools(agent_id, chain_config, True)
+
+            if result is not None:
+                (tools, tool_metadata) = result
+
+                if isinstance(tools, list) and isinstance(tool_metadata, dict):
+                    tools_with_ids = [
+                        {
+                            "tool_name": tool,
+                            "unique_identifier": f"{agent_id}-{tool}",
+                            "is_marketplace_supported": (
+                                tool_metadata.get(tool, {}).get(
+                                    "isMechMarketplaceSupported", None
+                                )
+                            ),
+                        }
+                        for tool in tools
+                    ]
+                else:
+                    tools_with_ids = []
+                return {"agent_id": agent_id, "tools": tools_with_ids}
 
         all_tools_with_ids = []
         agent_tools_map = {}
 
         for current_agent_id in range(1, total_supply + 1):
-            tools = get_agent_tools(current_agent_id, chain_config)
-            if isinstance(tools, list):
-                tools_with_ids = [
-                    {
-                        "tool_name": tool,
-                        "unique_identifier": f"{current_agent_id}-{tool}",
-                    }
-                    for tool in tools
-                ]
-                agent_tools_map[current_agent_id] = tools
-                all_tools_with_ids.extend(tools_with_ids)
+            result = get_agent_tools(current_agent_id, chain_config, True)
+            if result is not None:
+                (tools, tool_metadata) = result
+
+                if isinstance(tools, list) and isinstance(tool_metadata, dict):
+                    tools_with_ids = [
+                        {
+                            "tool_name": tool,
+                            "unique_identifier": f"{current_agent_id}-{tool}",
+                            "is_marketplace_supported": (
+                                tool_metadata.get(tool, {}).get(
+                                    "isMechMarketplaceSupported", None
+                                )
+                            ),
+                        }
+                        for tool in tools
+                    ]
+                    agent_tools_map[current_agent_id] = tools
+                    all_tools_with_ids.extend(tools_with_ids)
 
         return {
             "all_tools_with_identifiers": all_tools_with_ids,
@@ -148,11 +170,11 @@ def get_tool_io_schema(
     unique_identifier: str, chain_config: str = "gnosis"
 ) -> Dict[str, Any]:
     """
-    Fetch the input and output schema of a specific tool based on a unique identifier.
+    Fetch the input and output schema along with tool name and description of a specific tool based on a unique identifier.
 
     :param unique_identifier: The unique identifier for the tool.
     :param chain_config: The chain configuration to use.
-    :return: Dictionary containing input and output schemas.
+    :return: Dictionary containing name, description, input and output schemas.
     """
     parts = unique_identifier.split("-")
     agent_id = int(parts[0])
@@ -174,6 +196,8 @@ def get_tool_io_schema(
         tool_info = tool_metadata.get(tool_name, {})
         if isinstance(tool_info, dict):
             return {
+                "name": tool_info.get("name", {}),
+                "description": tool_info.get("description", {}),
                 "input": tool_info.get("input", {}),
                 "output": tool_info.get("output", {}),
             }

{mech_client-0.2.16 → mech_client-0.2.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mech-client"
-version = "0.2.16"
+version = "0.2.18"
 description = "Basic client to interact with a mech"
 authors = ["David Minarsch <david.minarsch@googlemail.com>"]
 readme = "README.md"

mech_client-0.2.16/mech_client/__init__.py

@@ -1,3 +0,0 @@
-"""Mech client."""
-
-__version__ = "0.2.16"