prediction-market-agent-tooling 0.60.5__py3-none-any.whl → 0.61.0__py3-none-any.whl

prediction_market_agent_tooling/config.py

@@ -3,7 +3,7 @@ import typing as t
 from copy import deepcopy
 
 from eth_account.signers.local import LocalAccount
-from pydantic import BeforeValidator, Field, model_validator
+from pydantic import Field, model_validator
 from pydantic.types import SecretStr
 from pydantic.v1.types import SecretStr as SecretStrV1
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -39,10 +39,7 @@ class APIKeys(BaseSettings):
     METACULUS_API_KEY: t.Optional[SecretStr] = None
     METACULUS_USER_ID: t.Optional[int] = None
     BET_FROM_PRIVATE_KEY: t.Optional[PrivateKey] = None
-    SAFE_ADDRESS: t.Annotated[
-        ChecksumAddress | None,
-        BeforeValidator(lambda x: x if x is None else Web3.to_checksum_address(x)),
-    ] = None
+    SAFE_ADDRESS: str | None = None
     OPENAI_API_KEY: t.Optional[SecretStr] = None
     GRAPH_API_KEY: t.Optional[SecretStr] = None
     TENDERLY_FORK_RPC: t.Optional[str] = None
@@ -60,6 +57,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 +101,18 @@ class APIKeys(BaseSettings):
         data.SAFE_ADDRESS = None
         return data
 
+    @property
+    def safe_address_checksum(self) -> ChecksumAddress | None:
+        return (
+            Web3.to_checksum_address(self.SAFE_ADDRESS) if self.SAFE_ADDRESS else None
+        )
+
+    @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(
@@ -140,7 +151,11 @@ class APIKeys(BaseSettings):
     @property
     def bet_from_address(self) -> ChecksumAddress:
         """If the SAFE is available, we always route transactions via SAFE. Otherwise we use the EOA."""
-        return self.SAFE_ADDRESS if self.SAFE_ADDRESS else self.public_key
+        return (
+            self.safe_address_checksum
+            if self.safe_address_checksum
+            else self.public_key
+        )
 
     @property
     def openai_api_key(self) -> SecretStr:
@@ -249,10 +264,10 @@ class APIKeys(BaseSettings):
         }
 
     def check_if_is_safe_owner(self, ethereum_client: EthereumClient) -> bool:
-        if not self.SAFE_ADDRESS:
+        if not self.safe_address_checksum:
             raise ValueError("Cannot check ownership if safe_address is not defined.")
 
-        s = SafeV141(self.SAFE_ADDRESS, ethereum_client)
+        s = SafeV141(self.safe_address_checksum, ethereum_client)
         public_key_from_signer = private_key_to_public_key(self.bet_from_private_key)
         return s.retrieve_is_owner(public_key_from_signer)
 

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/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/tools/contract.py

@@ -113,13 +113,13 @@ class ContractBaseClass(BaseModel):
         Used for changing a state (writing) to the contract.
         """
 
-        if api_keys.SAFE_ADDRESS:
+        if api_keys.safe_address_checksum:
             return send_function_on_contract_tx_using_safe(
                 web3=web3 or self.get_web3(),
                 contract_address=self.address,
                 contract_abi=self.abi,
                 from_private_key=api_keys.bet_from_private_key,
-                safe_address=api_keys.SAFE_ADDRESS,
+                safe_address=api_keys.safe_address_checksum,
                 function_name=function_name,
                 function_params=function_params,
                 tx_params=tx_params,

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/tools/langfuse_client_utils.py

@@ -64,24 +64,28 @@ def get_traces_for_agent(
     has_output: bool,
     client: Langfuse,
     to_timestamp: DatetimeUTC | None = None,
+    tags: str | list[str] | None = None,
 ) -> list[TraceWithDetails]:
     """
     Fetch agent traces using pagination
     """
+    total_pages = -1
     page = 1  # index starts from 1
     all_agent_traces = []
     while True:
-        logger.debug(f"fetching page {page}")
+        logger.debug(f"Fetching Langfuse page {page} / {total_pages}.")
         traces = client.fetch_traces(
             name=trace_name,
             limit=100,
             page=page,
             from_timestamp=from_timestamp,
             to_timestamp=to_timestamp,
+            tags=tags,
         )
         if not traces.data:
             break
         page += 1
+        total_pages = traces.meta.total_pages
 
         agent_traces = [
             t

{prediction_market_agent_tooling-0.60.5.dist-info → prediction_market_agent_tooling-0.61.0.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.60.5.dist-info → prediction_market_agent_tooling-0.61.0.dist-info}/RECORD

@@ -20,8 +20,8 @@ prediction_market_agent_tooling/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-
 prediction_market_agent_tooling/benchmark/agents.py,sha256=B1-uWdyeN4GGKMWGK_-CcAFJg1m9Y_XuaeIHPB29QR8,3971
 prediction_market_agent_tooling/benchmark/benchmark.py,sha256=MqTiaaJ3cYiOLUVR7OyImLWxcEya3Rl5JyFYW-K0lwM,17097
 prediction_market_agent_tooling/benchmark/utils.py,sha256=D0MfUkVZllmvcU0VOurk9tcKT7JTtwwOp-63zuCBVuc,2880
-prediction_market_agent_tooling/config.py,sha256=eiJPhb736Jtgrbh2d035_bFz2YaIiipUPapgIjYNqM4,9629
-prediction_market_agent_tooling/deploy/agent.py,sha256=tC0MQKR_63SdsfDrCWXAko0yP01zvP7tuspAbjCj0eE,24988
+prediction_market_agent_tooling/config.py,sha256=pZW8xsmPhAkhYE9XG8G3f9UIYlaoLSpZ9nv7MHxYpuo,10058
+prediction_market_agent_tooling/deploy/agent.py,sha256=tMREXM2LwFsatbysCaNRvtCAyCNMAPMGgkkIEpCRj7g,25022
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=Y6Pb8OfSb6galRbfdNBvvNTgO-4dR2ybJ4o5GKJcMoM,12894
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -60,7 +60,7 @@ prediction_market_agent_tooling/markets/polymarket/api.py,sha256=UZ4_TG8ceb9Y-qg
 prediction_market_agent_tooling/markets/polymarket/data_models.py,sha256=Fd5PI5y3mJM8VHExBhWFWEnuuIKxQmIAXgBuoPDvNjw,4341
 prediction_market_agent_tooling/markets/polymarket/data_models_web.py,sha256=VZhVccTApygSKMmy6Au2G02JCJOKJnR_oVeKlaesuSg,12548
 prediction_market_agent_tooling/markets/polymarket/polymarket.py,sha256=NRoZK71PtH8kkangMqme7twcAXhRJSSabbmOir-UnAI,3418
-prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=DImFxeMg8lTfsEDZ8FavndW38TfUsCkawcVGnucsuGo,2029
+prediction_market_agent_tooling/markets/polymarket/utils.py,sha256=8kTeVjXPcXC6DkDvWYsZQLY7x8DS6CEp_yznSEazsNU,2037
 prediction_market_agent_tooling/markets/seer/data_models.py,sha256=HGJv4XSvCxXLLC5VwxZTZ5E4w_bWGKv50fM_6ssloxI,8203
 prediction_market_agent_tooling/markets/seer/seer.py,sha256=r21sXj_4_oIG2L1N5l56vEYGI_q2RGem_6G-Sixkbck,12954
 prediction_market_agent_tooling/markets/seer/seer_contracts.py,sha256=E7CYAKZiK6cg3dyj1kJuIPKSYYUft98F64shF5S0g4s,2730
@@ -83,14 +83,14 @@ prediction_market_agent_tooling/tools/betting_strategies/utils.py,sha256=kpIb-ci
 prediction_market_agent_tooling/tools/caches/db_cache.py,sha256=dB8LNs2JvVRaFCeAKRmIQRwiirsMgtL31he8051wM-g,11431
 prediction_market_agent_tooling/tools/caches/inmemory_cache.py,sha256=ZW5iI5rmjqeAebu5T7ftRnlkxiL02IC-MxCfDB80x7w,1506
 prediction_market_agent_tooling/tools/caches/serializers.py,sha256=vFDx4fsPxclXp2q0sv27j4al_M_Tj9aR2JJP-xNHQXA,2151
-prediction_market_agent_tooling/tools/contract.py,sha256=BCl3R-n5jpp5XPAho9yTuUxRbOoKbZSga1Qaa4RfAp8,20945
+prediction_market_agent_tooling/tools/contract.py,sha256=XM7v6Wmi5OXPtn0SS__27MhlaBHGJG3VEeQFSIBJo6U,20963
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
 prediction_market_agent_tooling/tools/cow/cow_manager.py,sha256=WK6Uk722VotjLHtxDPHxvwBrWVb3rvTegg_3w58ehwU,3869
 prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=M3zQohgAzy_LETnf9rKtS1L9rr7FP92CH6v0G2laZkM,4435
 prediction_market_agent_tooling/tools/custom_exceptions.py,sha256=Fh8z1fbwONvP4-j7AmV_PuEcoqb6-QXa9PJ9m7guMcM,93
 prediction_market_agent_tooling/tools/datetime_utc.py,sha256=8_WackjtjC8zHXrhQFTGQ6e6Fz_6llWoKR4CSFvIv9I,2766
 prediction_market_agent_tooling/tools/db/db_manager.py,sha256=GtzHH1NLl8HwqC8Z7s6eTlIQXuV0blxfaV2PeQrBnfQ,3013
-prediction_market_agent_tooling/tools/google_utils.py,sha256=t3_UEEvKX3L0biSIQ560GdRbllQ6eprhK_upE243A-0,3185
+prediction_market_agent_tooling/tools/google_utils.py,sha256=D-6FB2HRtmxaKZJ_Za-qj6VZCp5XU18rF4wLMMrqEUg,2557
 prediction_market_agent_tooling/tools/hexbytes_custom.py,sha256=ytwr4N8t-9UF1F4wXsln3IV1HBKgaYirsErc3NsKL-M,2119
 prediction_market_agent_tooling/tools/httpx_cached_client.py,sha256=RxD-hwtZCMctnMwfzy8t51W9Z9gxFGtDYxBIMChazpc,406
 prediction_market_agent_tooling/tools/image_gen/image_gen.py,sha256=HzRwBx62hOXBOmrtpkXaP9Qq1Ku03uUGdREocyjLQ_k,1266
@@ -99,7 +99,7 @@ prediction_market_agent_tooling/tools/ipfs/ipfs_handler.py,sha256=CTTMfTvs_8PH4k
 prediction_market_agent_tooling/tools/is_invalid.py,sha256=TAHQXiiusAU45xJ11ZyEP7PnEfcjfzVG7qHRbsHiAd0,5335
 prediction_market_agent_tooling/tools/is_predictable.py,sha256=qVd6zqay2Dg2fyeAuZvAFqSHMg71TcPfCZULsVk2XvA,6797
 prediction_market_agent_tooling/tools/langfuse_.py,sha256=jI_4ROxqo41CCnWGS1vN_AeDVhRzLMaQLxH3kxDu3L8,1153
-prediction_market_agent_tooling/tools/langfuse_client_utils.py,sha256=83T31s-YbsnNBLyYCjmBI2BBKUEqJUuYFa0uCdkoqy8,5901
+prediction_market_agent_tooling/tools/langfuse_client_utils.py,sha256=IQboU9EPl4QEIo0poNylomevuVntpPpmkuNCzZl1Qdg,6058
 prediction_market_agent_tooling/tools/omen/reality_accuracy.py,sha256=M1SF7iSW1gVlQSTskdVFTn09uPLST23YeipVIWj54io,2236
 prediction_market_agent_tooling/tools/omen/sell_positions.py,sha256=hZCxXpcACO95DyiZ5oLFp982N0erZg4wccdSUKTgRlA,2307
 prediction_market_agent_tooling/tools/parallelism.py,sha256=6Gou0hbjtMZrYvxjTDFUDZuxmE2nqZVbb6hkg1hF82A,1022
@@ -117,8 +117,8 @@ prediction_market_agent_tooling/tools/tokens/main_token.py,sha256=7JPgVF4RbiFzLD
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=jLG4nbEoIzzJiZ4RgMx4Q969Zdl0p0s63p8uET_0Fuw,6440
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=3wfqNxvMn44ivweFRoeKNVb9QRtFd7kFtp7VUY5juEE,12862
-prediction_market_agent_tooling-0.60.5.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.60.5.dist-info/METADATA,sha256=Mx8hYXaIMNmbl5cRGcdZDhBeosJAmKHqfKL3xhElrZg,8629
-prediction_market_agent_tooling-0.60.5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-prediction_market_agent_tooling-0.60.5.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.60.5.dist-info/RECORD,,
+prediction_market_agent_tooling-0.61.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.61.0.dist-info/METADATA,sha256=Dj083O-3F_h45GoO99u4jvmNKsgeaLGnrB869GRE1Gk,8629
+prediction_market_agent_tooling-0.61.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+prediction_market_agent_tooling-0.61.0.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.61.0.dist-info/RECORD,,