prediction-market-agent-tooling 0.60.4__tar.gz → 0.60.6__tar.gz

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: prediction-market-agent-tooling
-Version: 0.60.4
+Version: 0.60.6
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.13

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/prediction_market_agent_tooling/config.py

@@ -60,6 +60,8 @@ class APIKeys(BaseSettings):
     PINATA_API_SECRET: t.Optional[SecretStr] = None
 
     TAVILY_API_KEY: t.Optional[SecretStr] = None
+    # Don't get fooled! Serper and Serp are two different services.
+    SERPER_API_KEY: t.Optional[SecretStr] = None
 
     SQLALCHEMY_DB_URL: t.Optional[SecretStr] = None
 
@@ -102,6 +104,12 @@ class APIKeys(BaseSettings):
         data.SAFE_ADDRESS = None
         return data
 
+    @property
+    def serper_api_key(self) -> SecretStr:
+        return check_not_none(
+            self.SERPER_API_KEY, "SERPER_API_KEY missing in the environment."
+        )
+
     @property
     def manifold_user_id(self) -> str:
         return get_authenticated_user(

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/prediction_market_agent_tooling/deploy/agent.py

@@ -106,6 +106,7 @@ class DeployableAgent:
     ) -> None:
         self.start_time = utcnow()
         self.enable_langfuse = enable_langfuse
+        self.api_keys = APIKeys()
         self.initialize_langfuse()
         self.load()
 

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/prediction_market_agent_tooling/markets/polymarket/utils.py

@@ -3,7 +3,7 @@ from prediction_market_agent_tooling.markets.markets import MarketType
 from prediction_market_agent_tooling.markets.polymarket.data_models_web import (
     PolymarketFullMarket,
 )
-from prediction_market_agent_tooling.tools.google_utils import search_google
+from prediction_market_agent_tooling.tools.google_utils import search_google_gcp
 
 
 def find_resolution_on_polymarket(question: str) -> Resolution | None:
@@ -35,7 +35,7 @@ def find_url_to_polymarket(question: str) -> str | None:
     slug = "".join(replace_chars.get(char, char) for char in question.lower())
 
     # Search for the links to the Polymarket's market page on Google.
-    links = search_google(
+    links = search_google_gcp(
         # For some reason, just giving it in the query works better than using `site_search`, `exact_terms` or other parameters of the google search.
         query=f"{MarketType.POLYMARKET.market_class.base_url} {question}",
         num=10,

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/prediction_market_agent_tooling/tools/balances.py

@@ -1,4 +1,5 @@
 from pydantic import BaseModel
+from tenacity import retry, stop_after_attempt, wait_fixed
 from web3 import Web3
 from web3.types import Wei
 
@@ -20,6 +21,7 @@ class Balances(BaseModel):
         return xDai(self.xdai + self.wxdai + self.sdai)
 
 
+@retry(stop=stop_after_attempt(3), wait=wait_fixed(1))
 def get_balances(address: ChecksumAddress, web3: Web3 | None = None) -> Balances:
     if not web3:
         web3 = WrappedxDaiContract().get_web3()

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/prediction_market_agent_tooling/tools/google_utils.py

@@ -1,14 +1,11 @@
-import json
 import typing as t
 from datetime import timedelta
 
+import requests
 import tenacity
-from google.cloud import secretmanager
 from googleapiclient.discovery import build
-from pydantic import SecretStr
 
-from prediction_market_agent_tooling.config import APIKeys, CloudCredentials
-from prediction_market_agent_tooling.gtypes import PrivateKey
+from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.tools.caches.db_cache import db_cache
 
@@ -16,10 +13,10 @@ from prediction_market_agent_tooling.tools.caches.db_cache import db_cache
 @tenacity.retry(
     wait=tenacity.wait_fixed(1),
     stop=tenacity.stop_after_attempt(3),
-    after=lambda x: logger.debug(f"search_google failed, {x.attempt_number=}."),
+    after=lambda x: logger.debug(f"search_google_gcp failed, {x.attempt_number=}."),
 )
 @db_cache(max_age=timedelta(days=1))
-def search_google(
+def search_google_gcp(
     query: str | None = None,
     num: int = 3,
     exact_terms: str | None = None,
@@ -57,24 +54,23 @@ def search_google(
         raise ValueError(f"Can not parse results: {search}") from e
 
 
-def get_private_key_from_gcp_secret(
-    secret_id: str,
-    project_id: str = "582587111398",  # Gnosis AI default project_id
-    version_id: str = "latest",
-) -> PrivateKey:
-    # If credentials filename specified, use that, else read using default credentials path.
-    google_application_credentials_filename = (
-        CloudCredentials().GOOGLE_APPLICATION_CREDENTIALS
+@tenacity.retry(
+    wait=tenacity.wait_fixed(1),
+    stop=tenacity.stop_after_attempt(3),
+    after=lambda x: logger.debug(f"search_google_serper failed, {x.attempt_number=}."),
+)
+@db_cache(max_age=timedelta(days=1))
+def search_google_serper(q: str) -> list[str]:
+    """Search Google using the Serper API."""
+    url = "https://google.serper.dev/search"
+    response = requests.post(
+        url,
+        headers={
+            "X-API-KEY": APIKeys().serper_api_key.get_secret_value(),
+            "Content-Type": "application/json",
+        },
+        json={"q": q},
     )
-    if google_application_credentials_filename is not None:
-        # mypy interprets incorrectly that from_service_account_json requires further args.
-        client = secretmanager.SecretManagerServiceClient.from_service_account_json(filename=google_application_credentials_filename)  # type: ignore [call-arg]
-    else:
-        client = secretmanager.SecretManagerServiceClient()
-    name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}"
-    response = client.access_secret_version(request={"name": name})
-    secret_payload = response.payload.data.decode("UTF-8")
-    secret_json = json.loads(secret_payload)
-    if "private_key" not in secret_json:
-        raise ValueError(f"Private key not found in gcp secret {secret_id}")
-    return PrivateKey(SecretStr(secret_json["private_key"]))
+    response.raise_for_status()
+    parsed = response.json()
+    return [x["link"] for x in parsed["organic"] if x.get("link")]

{prediction_market_agent_tooling-0.60.4 → prediction_market_agent_tooling-0.60.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.60.4"
+version = "0.60.6"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"