Merge pull request #115 from valory-xyz/feat/configure_resolution_tool

Configure market resolving tool
valory-xyz · Sep 2, 2024 · 2d7af26 · 2d7af26
2 parents e5684cf + a71b6d0
commit 2d7af26
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/packages/packages.json b/packages/packages.json
@@ -3,10 +3,10 @@
         "contract/valory/fpmm_deterministic_factory/0.1.0": "bafybeigjfuahxhb2y4q5ueayry55boaojcryoamwr6fshgayf5s762vpl4",
         "contract/valory/wxdai/0.1.0": "bafybeidalocwbhmbto6ii6adldtpcughtdt6j3v4tv36utevjk2wrdyqie",
         "contract/valory/fpmm/0.1.0": "bafybeiai2ruj27nnglvn7yc5atojyojo3fkmofw6wrjgz2ybps2uwdizx4",
-        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeibuw4lootgmocuktlkojapcpcqjx6naj35jbtyoyzogx2vrfyczhe",
-        "skill/valory/market_maker_abci/0.1.0": "bafybeigr7anwsma3ezjcksmgc6voc3nnnogm3uje2urfw2wohzdcy6eg44",
-        "agent/valory/market_maker/0.1.0": "bafybeibukrahyir5ig6a32tpg3zjpqmmowjauk4arnhwmhjjzezeqotmve",
-        "service/valory/market_maker/0.1.0": "bafybeihbrgma2fuhgadkz7jzhggnduywv4ihozqjxdeulqx7t3pkcuvhe4"
+        "skill/valory/market_creation_manager_abci/0.1.0": "bafybeigopmjddoomz57pkeafpjvssvvbemgtl6zitjvvjgj2y2dbyazf5e",
+        "skill/valory/market_maker_abci/0.1.0": "bafybeih7cs656swz6l33cdw43njf5dqro3lu2rbkr362jtkw3ixahll2ya",
+        "agent/valory/market_maker/0.1.0": "bafybeih4jazyeuw7w3npc36eujvkrdc4yk5yt33iep2jhj6rjzmpgyjj6e",
+        "service/valory/market_maker/0.1.0": "bafybeie3ibdzqzpiycrrbc6g6gx2hkhz57cb3tc2gz5toh7qovaotcektm"
     },
     "third_party": {
         "protocol/valory/contract_api/1.0.0": "bafybeidgu7o5llh26xp3u3ebq3yluull5lupiyeu6iooi2xyymdrgnzq5i",

diff --git a/packages/valory/agents/market_maker/aea-config.yaml b/packages/valory/agents/market_maker/aea-config.yaml
@@ -37,9 +37,9 @@ protocols:
 skills:
 - valory/abstract_abci:0.1.0:bafybeieh4ei3qdelmacnm7vwq57phoewgumr3udvxt6pybmuggwc3yk65q
 - valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
-- valory/market_maker_abci:0.1.0:bafybeigr7anwsma3ezjcksmgc6voc3nnnogm3uje2urfw2wohzdcy6eg44
+- valory/market_maker_abci:0.1.0:bafybeih7cs656swz6l33cdw43njf5dqro3lu2rbkr362jtkw3ixahll2ya
 - valory/registration_abci:0.1.0:bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q
-- valory/market_creation_manager_abci:0.1.0:bafybeibuw4lootgmocuktlkojapcpcqjx6naj35jbtyoyzogx2vrfyczhe
+- valory/market_creation_manager_abci:0.1.0:bafybeigopmjddoomz57pkeafpjvssvvbemgtl6zitjvvjgj2y2dbyazf5e
 - valory/reset_pause_abci:0.1.0:bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie
 - valory/termination_abci:0.1.0:bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq
 - valory/transaction_settlement_abci:0.1.0:bafybeic3tccdjypuge2lewtlgprwkbb53lhgsgn7oiwzyrcrrptrbeyote
@@ -218,6 +218,7 @@ models:
       google_engine_id: ${str:google_engine_id}
       openai_api_key: ${str:openai_api_key}
       mech_contract_address: ${str:0x77af31de935740567cf4ff1986d04b2c964a786a}
+      mech_tool_resolve_market: ${str:resolve-market-reasoning-gpt-4}
       answer_retry_intervals: ${list:[0, 86400, 259200, 604800, 1209600]}
   randomness_api:
     args:

diff --git a/packages/valory/services/market_maker/service.yaml b/packages/valory/services/market_maker/service.yaml
@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibwz3af6326msp4h3kqehijvmyhaytvyfbo3o2npc2w4b6zrg6pfq
 fingerprint_ignore_patterns: []
-agent: valory/market_maker:0.1.0:bafybeibukrahyir5ig6a32tpg3zjpqmmowjauk4arnhwmhjjzezeqotmve
+agent: valory/market_maker:0.1.0:bafybeih4jazyeuw7w3npc36eujvkrdc4yk5yt33iep2jhj6rjzmpgyjj6e
 number_of_agents: 1
 deployment:
   agent:
@@ -70,6 +70,7 @@ models:
       multisend_batch_size: ${MULTISEND_BATCH_SIZE:int:1}
       ipfs_address: ${IPFS_ADDRESS:str:https://gateway.autonolas.tech/ipfs/}
       mech_contract_address: ${MECH_CONTRACT_ADDRESS:str:0x77af31de935740567cf4ff1986d04b2c964a786a}
+      mech_tool_resolve_market: ${MECH_TOOL_RESOLVE_MARKET:str:resolve-market-reasoning-gpt-4}
       answer_retry_intervals: ${ANSWER_RETRY_INTERVALS:list:[0, 86400, 259200, 604800,
         1209600]}
       on_chain_service_id: ${ON_CHAIN_SERVICE_ID:int:null}

diff --git a/packages/valory/skills/market_creation_manager_abci/behaviours.py b/packages/valory/skills/market_creation_manager_abci/behaviours.py
@@ -2398,7 +2398,7 @@ def get_payload(self) -> Generator[None, None, str]:
                 asdict(
                     MechMetadata(
                         nonce=question_id,
-                        tool="resolve-market-reasoning-gpt-4",
+                        tool=self.params.mech_tool_resolve_market,
                         prompt=question["title"],
                     )
                 )

diff --git a/packages/valory/skills/market_creation_manager_abci/models.py b/packages/valory/skills/market_creation_manager_abci/models.py
@@ -136,6 +136,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
             kwargs=kwargs,
             type_=str,
         )
+        self.mech_tool_resolve_market = self._ensure(
+            key="mech_tool_resolve_market",
+            kwargs=kwargs,
+            type_=str,
+        )
         self.market_fee = self._ensure("market_fee", kwargs, type_=float)
         self.market_timeout = self._ensure("market_timeout", kwargs, type_=int)
         self.event_offset_start_days = self._ensure(

diff --git a/packages/valory/skills/market_creation_manager_abci/skill.yaml b/packages/valory/skills/market_creation_manager_abci/skill.yaml
@@ -10,11 +10,11 @@ aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
   .gitignore: bafybeihdfdezgtr3s2lzq5y3oaitfrdy4u4pehionju2bdez35wcjgqx6y
   __init__.py: bafybeibkyjt4covc4yhd22aw7kav45zozk3exdv344emt3lilln64soaxm
-  behaviours.py: bafybeieq7lwoujmsyevbhv3vwz3d6f3ysj6a2yxq57wf4fmhzpad3vgpjm
+  behaviours.py: bafybeibaeqww3qnhiqck3pi7t276azxv7jt4tzscex25onaoobtrakqnoi
   dialogues.py: bafybeicmaufkl7vdomnfciv7lw4536ssld7x4uemdapuhsyvfpd4ncibza
   fsm_specification.yaml: bafybeiebwzp5jirrwo475r2hzwrirx45jlxtp5duo4275phypqfkueybtq
   handlers.py: bafybeietxjfli2i57kb7heoy772rcq2znusl36gg7jjj5g3pddw7egny3q
-  models.py: bafybeib6zsvkkqszeg3zhzuiirkuwxkfzniiyauwaggn7elaw33bnen2lu
+  models.py: bafybeic2w6gyk3hhn4ksea3nte4c6mron6f2zojxjgo6u5kyvkfnx2g6ie
   payloads.py: bafybeibu7sptf43adazxpyzwtfpph7bgfhtwiotg5sdlcwjt6iw3idqn7a
   rounds.py: bafybeifnezj3cw323fj5xnieuucfqarznzlpesaj75huylfkpeyuunqkvy
   tests/__init__.py: bafybeihfxvqnyfly72tbxnnnglshcilm2kanihqnjiasvcz3ec3csw32ti
@@ -217,6 +217,7 @@ models:
       light_slash_unit_amount: 5000000000000000
       serious_slash_unit_amount: 8000000000000000
       mech_contract_address: '0x77af31de935740567cf4ff1986d04b2c964a786a'
+      mech_tool_resolve_market: resolve-market-reasoning-gpt-4
       answer_retry_intervals:
       - 0
       - 86400

diff --git a/packages/valory/skills/market_maker_abci/skill.yaml b/packages/valory/skills/market_maker_abci/skill.yaml
@@ -24,7 +24,7 @@ skills:
 - valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
 - valory/registration_abci:0.1.0:bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q
 - valory/reset_pause_abci:0.1.0:bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie
-- valory/market_creation_manager_abci:0.1.0:bafybeibuw4lootgmocuktlkojapcpcqjx6naj35jbtyoyzogx2vrfyczhe
+- valory/market_creation_manager_abci:0.1.0:bafybeigopmjddoomz57pkeafpjvssvvbemgtl6zitjvvjgj2y2dbyazf5e
 - valory/termination_abci:0.1.0:bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq
 - valory/transaction_settlement_abci:0.1.0:bafybeic3tccdjypuge2lewtlgprwkbb53lhgsgn7oiwzyrcrrptrbeyote
 - valory/mech_interact_abci:0.1.0:bafybeieryw7rk2tspyxx46loqqqimr2l5vvhtshiyg2mmdxijzb7pdoi6a
@@ -213,6 +213,7 @@ models:
       light_slash_unit_amount: 5000000000000000
       serious_slash_unit_amount: 8000000000000000
       mech_contract_address: '0x77af31de935740567cf4ff1986d04b2c964a786a'
+      mech_tool_resolve_market: resolve-market-reasoning-gpt-4
       answer_retry_intervals:
       - 0
       - 86400