mech-client 0.11.0__tar.gz → 0.12.0__tar.gz

{mech_client-0.11.0 → mech_client-0.12.0}/PKG-INFO

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

mech_client-0.12.0/mech_client/__init__.py

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

{mech_client-0.11.0 → mech_client-0.12.0}/mech_client/interact.py

@@ -45,7 +45,7 @@ from web3.contract import Contract as Web3Contract
 
 from mech_client.acn import watch_for_data_url_from_mech
 from mech_client.prompt_to_ipfs import push_metadata_to_ipfs
-from mech_client.subgraph import query_agent_address, watch_for_data_url_from_subgraph
+from mech_client.subgraph import query_agent_address
 from mech_client.wss import (
     register_event_handlers,
     watch_for_data_url_from_wss,
@@ -433,7 +433,7 @@ def send_request(  # pylint: disable=too-many-arguments,too-many-locals
     return None
 
 
-def wait_for_data_url(  # pylint: disable=too-many-arguments
+def wait_for_data_url(  # pylint: disable=too-many-arguments, unused-argument
     request_id: str,
     wss: websocket.WebSocket,
     mech_contract: Web3Contract,
@@ -492,14 +492,6 @@ def wait_for_data_url(  # pylint: disable=too-many-arguments
         )
         tasks.append(on_chain_task)
 
-        if subgraph_url:
-            mech_task = loop.create_task(
-                watch_for_data_url_from_subgraph(
-                    request_id=request_id, url=subgraph_url
-                )
-            )
-            tasks.append(mech_task)
-
     async def _wait_for_tasks() -> Any:  # type: ignore
         """Wait for tasks to finish."""
         (finished, *_), unfinished = await asyncio.wait(

{mech_client-0.11.0 → mech_client-0.12.0}/mech_client/subgraph.py

@@ -19,13 +19,9 @@
 
 """Subgraph client for mech."""
 
-import asyncio
 from string import Template
 from typing import Optional
 
-from gql import Client, gql
-from gql.transport.aiohttp import AIOHTTPTransport
-
 
 AGENT_QUERY_TEMPLATE = Template(
     """{
@@ -35,18 +31,7 @@ AGENT_QUERY_TEMPLATE = Template(
 }
 """
 )
-DELIVER_QUERY_TEMPLATE = Template(
-    """{
-    delivers(
-        orderBy: blockTimestamp
-        where: {requestId:"$request_id"}
-        orderDirection: desc
-    ) {
-        ipfsHash
-  }
-}
-"""
-)
+
 DEFAULT_TIMEOUT = 600.0
 CHAIN_TO_ADDRESSES = {
     "gnosis": {
@@ -85,66 +70,3 @@ def query_agent_address(  # pylint: disable=too-many-return-statements
     if not chain_config:
         raise ValueError("Chain config not specified")
     return CHAIN_TO_ADDRESSES.get(chain_config, {}).get(agent_id, None)
-
-
-async def query_deliver_hash(
-    request_id: str, url: str, timeout: Optional[float] = None
-) -> Optional[str]:
-    """
-    Query deliver IPFS hash from subgraph.
-
-    :param request_id: The ID of the mech request.
-    :type request_id: str
-    :param url: Subgraph URL.
-    :type url: str
-    :param timeout: Timeout for the request.
-    :type timeout: Optional[float]
-    :return: The deliver IPFS hash if found, None otherwise.
-    :rtype: Optional[str]
-    """
-    client = Client(
-        transport=AIOHTTPTransport(url=url),
-        execute_timeout=timeout or 30.0,
-    )
-    response = await client.execute_async(
-        document=gql(
-            request_string=DELIVER_QUERY_TEMPLATE.substitute({"request_id": request_id})
-        )
-    )
-    delivers = response["delivers"]  # pylint: disable=unsubscriptable-object
-    if len(delivers) == 0:
-        return None
-
-    (record,) = delivers
-    return record["ipfsHash"]
-
-
-async def watch_for_data_url_from_subgraph(
-    request_id: str, url: str, timeout: Optional[float] = None
-) -> Optional[str]:
-    """
-    Continuously query for data URL until it's available or timeout is reached.
-
-    :param request_id: The ID of the mech request.
-    :type request_id: str
-    :param url: Subgraph URL.
-    :type url: str
-    :param timeout: Maximum time to wait for the data URL in seconds. Defaults to DEFAULT_TIMEOUT.
-    :type timeout: Optional[float]
-    :return: Data URL if available within timeout, otherwise None.
-    :rtype: Optional[str]
-    """
-    timeout = timeout or DEFAULT_TIMEOUT
-    start_time = asyncio.get_event_loop().time()
-    while True:
-        response = await query_deliver_hash(request_id=request_id, url=url)
-        if response is not None:
-            return f"https://gateway.autonolas.tech/ipfs/{response}"
-
-        if asyncio.get_event_loop().time() - start_time >= timeout:
-            print(f"Error: No response received after {timeout} seconds.")
-            break
-
-        await asyncio.sleep(5)
-
-    return None

{mech_client-0.11.0 → mech_client-0.12.0}/pyproject.toml

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

mech_client-0.11.0/mech_client/__init__.py

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