mech-client 0.9.0__tar.gz → 0.10.0__tar.gz

{mech_client-0.9.0 → mech_client-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mech-client
-Version: 0.9.0
+Version: 0.10.0
 Summary: Basic client to interact with a mech
 License: Apache-2.0
 Author: David Minarsch

mech_client-0.10.0/mech_client/__init__.py

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

{mech_client-0.9.0 → mech_client-0.10.0}/mech_client/abis/MechMarketplace.json

@@ -303,7 +303,13 @@
             {
                 "indexed": false,
                 "internalType": "bytes",
-                "name": "data",
+                "name": "requestData",
+                "type": "bytes"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes",
+                "name": "deliveryData",
                 "type": "bytes"
             }
         ],
@@ -333,7 +339,7 @@
                 "type": "address"
             },
             {
-                "indexed": true,
+                "indexed": false,
                 "internalType": "address[]",
                 "name": "requesters",
                 "type": "address[]"
@@ -442,6 +448,12 @@
                 "internalType": "bytes32[]",
                 "name": "requestIds",
                 "type": "bytes32[]"
+            },
+            {
+                "indexed": false,
+                "internalType": "bytes[]",
+                "name": "requestDatas",
+                "type": "bytes[]"
             }
         ],
         "name": "MarketplaceRequest",

{mech_client-0.9.0 → mech_client-0.10.0}/mech_client/marketplace_interact.py

@@ -50,6 +50,7 @@ from mech_client.interact import (
     get_event_signatures,
     get_mech_config,
 )
+from mech_client.mech_marketplace_tool_management import get_mech_tools
 from mech_client.prompt_to_ipfs import push_metadata_to_ipfs
 from mech_client.wss import (
     register_event_handlers,
@@ -254,6 +255,9 @@ def fetch_requester_nvm_subscription_balance(
     nvm_balance_tracker_contract = get_contract(
         contract_address=mech_payment_balance_tracker, abi=abi, ledger_api=ledger_api
     )
+    requester_balance_tracker_balance = (
+        nvm_balance_tracker_contract.functions.mapRequesterBalances(requester).call()
+    )
     subscription_nft_address = (
         nvm_balance_tracker_contract.functions.subscriptionNFT().call()
     )
@@ -271,7 +275,7 @@ def fetch_requester_nvm_subscription_balance(
         requester, subscription_id
     ).call()
 
-    return requester_balance
+    return requester_balance_tracker_balance + requester_balance
 
 
 def send_marketplace_request(  # pylint: disable=too-many-arguments,too-many-locals
@@ -587,6 +591,8 @@ def wait_for_offchain_marketplace_data(mech_offchain_url: str, request_id: str)
             ).json()
             if response:
                 return response
+
+            time.sleep(WAIT_SLEEP)
         except Exception:  # pylint: disable=broad-except
             time.sleep(WAIT_SLEEP)
 
@@ -640,6 +646,30 @@ def check_prepaid_balances(
             sys.exit(1)
 
 
+def verify_tools(tools: tuple, service_id: int, chain_config: Optional[str]) -> None:
+    """
+    Verifies user supplied tool(s) with the mech's metadata
+
+    :param tools: The user supplied tools.
+    :type tools: tuple
+    :param service_id: Service id of the mech.
+    :type service_id: int
+    :param chain_config: Id of the mech's chain configuration (stored configs/mechs.json)
+    :type chain_config: str
+    :rtype: None
+    """
+    mech_tools_data = get_mech_tools(service_id=service_id, chain_config=chain_config)
+    if not mech_tools_data:
+        raise ValueError("Error while fetching mech tools data")
+
+    mech_tools = mech_tools_data.get("tools", [])
+    invalid_tools = [tool for tool in tools if tool not in mech_tools]
+    if invalid_tools:
+        raise ValueError(
+            f"Tool(s) {invalid_tools} not found in mech tools: {mech_tools}"
+        )
+
+
 def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals, too-many-statements, too-many-return-statements
     prompts: tuple,
     priority_mech: str,
@@ -742,7 +772,7 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
     )
     (
         payment_type,
-        _,
+        service_id,
         max_delivery_rate,
         mech_payment_balance_tracker,
         mech_contract,
@@ -754,6 +784,8 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
     mech_marketplace_request_config.delivery_rate = max_delivery_rate
     mech_marketplace_request_config.payment_type = payment_type
 
+    verify_tools(tools, service_id, chain_config)
+
     with open(IMECH_ABI_PATH, encoding="utf-8") as f:
         abi = json.load(f)
 
@@ -802,22 +834,29 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
             max_delivery_rate,
         )
 
-    if payment_type in [PaymentType.NATIVE_NVM.value, PaymentType.TOKEN_NVM.value]:
+    is_nvm_mech = payment_type in [
+        PaymentType.NATIVE_NVM.value,
+        PaymentType.TOKEN_NVM.value,
+    ]
+    if is_nvm_mech:
         nvm_mech_type = PaymentType(payment_type).name.lower()
         print(
             f"{nvm_mech_type} Nevermined Mech detected, subscription credits to be used"
         )
         requester = crypto.address
-        requester_balance = fetch_requester_nvm_subscription_balance(
+        requester_total_balance_before = fetch_requester_nvm_subscription_balance(
             requester, ledger_api, mech_payment_balance_tracker, payment_type
         )
-        if requester_balance < price:
+        if requester_total_balance_before < price:
             print(
-                f"  - Sender Subscription balance low. Needed: {price}, Actual: {requester_balance}"
+                f"  - Sender Subscription balance low. Needed: {price}, Actual: {requester_total_balance_before}"
             )
             print(f"  - Sender Address: {requester}")
             sys.exit(1)
 
+        print(
+            f"  - Sender Subscription balance before request: {requester_total_balance_before}"
+        )
         # set price 0 to not send any msg.value in request transaction for nvm type mech
         price = 0
 
@@ -878,6 +917,19 @@ def marketplace_interact(  # pylint: disable=too-many-arguments, too-many-locals
             )
 
             if data_url:
+                if is_nvm_mech:
+                    requester_total_balance_after = (
+                        fetch_requester_nvm_subscription_balance(
+                            requester,
+                            ledger_api,
+                            mech_payment_balance_tracker,
+                            payment_type,
+                        )
+                    )
+                    print(
+                        f"  - Sender Subscription balance after delivery: {requester_total_balance_after}"
+                    )
+
                 print(f"  - Data arrived: {data_url}")
                 data = requests.get(f"{data_url}/{request_id_int}", timeout=30).json()
                 print("  - Data from agent:")

{mech_client-0.9.0 → mech_client-0.10.0}/mech_client/mech_marketplace_tool_management.py

@@ -7,8 +7,9 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import requests
 from aea_ledger_ethereum import EthereumApi
+from web3.constants import ADDRESS_ZERO
 
-from mech_client.marketplace_interact import ADDRESS_ZERO, get_contract, get_mech_config
+from mech_client.interact import get_contract, get_mech_config
 
 
 ABI_DIR_PATH = Path(__file__).parent / "abis"
@@ -58,7 +59,7 @@ def fetch_tools(
 
 
 def get_mech_tools(
-    service_id: int, chain_config: str = DEFAULT_CONFIG
+    service_id: int, chain_config: Optional[str] = DEFAULT_CONFIG
 ) -> Optional[Dict[str, Any]]:
     """
     Fetch tools for a given mech's service ID.

{mech_client-0.9.0 → mech_client-0.10.0}/pyproject.toml

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

mech_client-0.9.0/mech_client/__init__.py

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