prediction-market-agent-tooling 0.56.0.dev113__py3-none-any.whl → 0.56.0.dev1858__py3-none-any.whl

prediction_market_agent_tooling/deploy/agent.py

@@ -555,18 +555,16 @@ class DeployableTraderAgent(DeployablePredictionAgent):
         BettingStrategy.assert_trades_currency_match_markets(market, trades)
         return trades
 
-    def before_process_market(
-        self, market_type: MarketType, market: AgentMarket
-    ) -> None:
-        super().before_process_market(market_type, market)
-        self.check_min_required_balance_to_trade(market)
-
     def process_market(
         self,
         market_type: MarketType,
         market: AgentMarket,
         verify_market: bool = True,
     ) -> ProcessedTradedMarket | None:
+        self.check_min_required_balance_to_trade(
+            market
+        )  # Do this as part of `process_market` because it observes some methods --> To keep everything traced under the `process_market`.
+
         processed_market = super().process_market(market_type, market, verify_market)
         if processed_market is None:
             return None

prediction_market_agent_tooling/tools/caches/db_cache.py

@@ -31,6 +31,7 @@ class FunctionCache(SQLModel, table=True):
     __tablename__ = "function_cache"
     id: int | None = Field(default=None, primary_key=True)
     function_name: str = Field(index=True)
+    full_function_name: str = Field(index=True)
     # Args are stored to see what was the function called with.
     args: Any = Field(sa_column=Column(JSONB, nullable=False))
     # Args hash is stored as a fast look-up option when looking for cache hits.
@@ -148,8 +149,10 @@ def db_cache(
         arg_string = json.dumps(args_dict, sort_keys=True, default=str)
         args_hash = hashlib.md5(arg_string.encode()).hexdigest()
 
-        # Get the function name as concat of module and qualname, to not accidentally clash
-        function_name = func.__module__ + "." + func.__qualname__
+        # Get the full function name as concat of module and qualname, to not accidentally clash
+        full_function_name = func.__module__ + "." + func.__qualname__
+        # But also get the standard function name to easily search for it in database
+        function_name = func.__name__
 
         # Determine if the function returns or contains Pydantic BaseModel(s)
         return_type = func.__annotations__.get("return", None)
@@ -166,6 +169,7 @@ def db_cache(
                     select(FunctionCache)
                     .where(
                         FunctionCache.function_name == function_name,
+                        FunctionCache.full_function_name == full_function_name,
                         FunctionCache.args_hash == args_hash,
                     )
                     .order_by(desc(FunctionCache.created_at))
@@ -179,7 +183,7 @@ def db_cache(
 
         if cached_result:
             logger.info(
-                f"Cache hit for {function_name} with args {args_dict} and output {cached_result.result}"
+                f"Cache hit for {full_function_name} with args {args_dict} and output {cached_result.result}"
             )
             if is_pydantic_model:
                 try:
@@ -196,7 +200,7 @@ def db_cache(
         # On cache miss, compute the result
         computed_result = func(*args, **kwargs)
         logger.info(
-            f"Cache miss for {function_name} with args {args_dict}, computed the output {computed_result}"
+            f"Cache miss for {full_function_name} with args {args_dict}, computed the output {computed_result}"
         )
 
         # If postgres access was specified, save it to dB.
@@ -209,6 +213,7 @@ def db_cache(
             )
             cache_entry = FunctionCache(
                 function_name=function_name,
+                full_function_name=full_function_name,
                 args_hash=args_hash,
                 args=args_dict,
                 result=result_data,

{prediction_market_agent_tooling-0.56.0.dev113.dist-info → prediction_market_agent_tooling-0.56.0.dev1858.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prediction-market-agent-tooling
-Version: 0.56.0.dev113
+Version: 0.56.0.dev1858
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 Author: Gnosis
 Requires-Python: >=3.10,<3.12

{prediction_market_agent_tooling-0.56.0.dev113.dist-info → prediction_market_agent_tooling-0.56.0.dev1858.dist-info}/RECORD

@@ -17,7 +17,7 @@ prediction_market_agent_tooling/benchmark/agents.py,sha256=B1-uWdyeN4GGKMWGK_-Cc
 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=114f3V9abaok27p5jX3UVr5b5gRUiSxBIYn8Snid34I,6731
-prediction_market_agent_tooling/deploy/agent.py,sha256=5jIZ_Wqj9XALGINCkFp2bkNV33bAnUQ_r9oNGrNgDmA,22654
+prediction_market_agent_tooling/deploy/agent.py,sha256=v6jnk8gY_ckF_Z8Slj408RLBadC5cZwx_nqV02TiThU,22642
 prediction_market_agent_tooling/deploy/agent_example.py,sha256=dIIdZashExWk9tOdyDjw87AuUcGyM7jYxNChYrVK2dM,1001
 prediction_market_agent_tooling/deploy/betting_strategy.py,sha256=kMrIE3wMv_IB6nJd_1DmDXDkEZhsXFOgyTd7JZ0gqHI,13068
 prediction_market_agent_tooling/deploy/constants.py,sha256=M5ty8URipYMGe_G-RzxRydK3AFL6CyvmqCraJUrLBnE,82
@@ -69,7 +69,7 @@ prediction_market_agent_tooling/tools/betting_strategies/market_moving.py,sha256
 prediction_market_agent_tooling/tools/betting_strategies/minimum_bet_to_win.py,sha256=-FUSuQQgjcWSSnoFxnlAyTeilY6raJABJVM2QKkFqAY,438
 prediction_market_agent_tooling/tools/betting_strategies/stretch_bet_between.py,sha256=THMXwFlskvzbjnX_OiYtDSzI8XVFyULWfP2525_9UGc,429
 prediction_market_agent_tooling/tools/betting_strategies/utils.py,sha256=kpIb-ci67Vc1Yqqaa-_S4OUkbhWSIYog4_Iwp69HU_k,97
-prediction_market_agent_tooling/tools/caches/db_cache.py,sha256=xJ9zIXCUm0SaHbzWJOk61pGJaZZxCnIVSzpjIx1TxWY,11869
+prediction_market_agent_tooling/tools/caches/db_cache.py,sha256=2a1bIDQk1KmVcp6cR8nSDKyT7rWnBQ7oqmqLjw49sps,12196
 prediction_market_agent_tooling/tools/caches/inmemory_cache.py,sha256=tGHHd9HCiE_hCCtPtloHZQdDfBuiow9YsqJNYi2Tx_0,499
 prediction_market_agent_tooling/tools/contract.py,sha256=s3yo8IbXTcvAJcPfLM0_NbgaEsWwLsPmyVnOgyjq_xI,20919
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
@@ -97,8 +97,8 @@ prediction_market_agent_tooling/tools/tavily/tavily_models.py,sha256=5ldQs1pZe6u
 prediction_market_agent_tooling/tools/tavily/tavily_search.py,sha256=Kw2mXNkMTYTEe1MBSTqhQmLoeXtgb6CkmHlcAJvhtqE,3809
 prediction_market_agent_tooling/tools/utils.py,sha256=W-9SqeCKd51BYMRhDjYPQ7lfNO_zE9EvYpmu2r5WXGA,7163
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=44W8siSLNQxeib98bbwAe7V5C609NHNlUuxwuWIRDiY,11838
-prediction_market_agent_tooling-0.56.0.dev113.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.56.0.dev113.dist-info/METADATA,sha256=u9ZsAzD8yLPWsVdefl84VAyLTvhFI8D4lxRooHqnBRU,8113
-prediction_market_agent_tooling-0.56.0.dev113.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-prediction_market_agent_tooling-0.56.0.dev113.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.56.0.dev113.dist-info/RECORD,,
+prediction_market_agent_tooling-0.56.0.dev1858.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.56.0.dev1858.dist-info/METADATA,sha256=K1Igqgk7hNSEVoHZ40ZW3x7s9_rjtsgDIGJ7HrH7nVk,8114
+prediction_market_agent_tooling-0.56.0.dev1858.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+prediction_market_agent_tooling-0.56.0.dev1858.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.56.0.dev1858.dist-info/RECORD,,