Merge pull request #373 from valory-xyz/fix/irrelevant-tools

Fix ignored `irrelevant_tools` configuration

packages/packages.json

@@ -16,14 +16,14 @@
         "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy",
         "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4",
         "skill/valory/market_manager_abci/0.1.0": "bafybeiaru2d32wpmcgqs64eepxud4idgubc3vmsbdwbia7gygipql2mmqi",
-        "skill/valory/decision_maker_abci/0.1.0": "bafybeiajitqnw7nitv534sl7ekfpzvpogrmw6sawiha2u4b3mpd442mh4q",
-        "skill/valory/trader_abci/0.1.0": "bafybeiaszj67msvm2fehrhkuswvxxeknfgw3hyhje3ubxb3tdom24rojoi",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeia75xr4li3syofg4teqasxf5cgvy3soubnfdh5lxy52rd37dokxwu",
+        "skill/valory/decision_maker_abci/0.1.0": "bafybeig5oivc24sqhgyxfhjbl2xsoa5yssv72lcu5ezunbcpwu3xo4jglm",
+        "skill/valory/trader_abci/0.1.0": "bafybeicmtcs4gaabwbyr4im2ux7co73y5n6ugj4abk6dayxzew7jly2zhe",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeifpf3sk5evrvwxyht7mswcml3qy4nhzo5ddvjvgklapwsjwq6mera",
         "skill/valory/staking_abci/0.1.0": "bafybeicupccurmrg7qesivonlyt3nryarsmk5qf5yh6auno64wn45bybvq",
         "skill/valory/check_stop_trading_abci/0.1.0": "bafybeieduekpd4zbvjztyxyooppqnmjvup6jfp74uo6hhupvtvzzscdzkq",
-        "agent/valory/trader/0.1.0": "bafybeibkytr3qda2wc6vpwkddynsfetuiiee7b4llfkpthldmjs6bhuodm",
-        "service/valory/trader/0.1.0": "bafybeig42f7cmag4aipppmetgmpxsmlgslkpgmzdcrhmmloou3cjrtzjhe",
-        "service/valory/trader_pearl/0.1.0": "bafybeicebj3ksrkkp6szq5ddevxonyqw6aqyq2yk2fgqq5nvzdnmg6qjna"
+        "agent/valory/trader/0.1.0": "bafybeih3r5xefwfqfdmmwx3e5n3i4df7pv3mvhqlk7qen2i75anj27ds4u",
+        "service/valory/trader/0.1.0": "bafybeid2xxc5plszxy644kbhcqxjwmpc6ay6xqhewc2c6bb3dqv3llt63u",
+        "service/valory/trader_pearl/0.1.0": "bafybeiaihaivsiyotduxvnmecvdf23t42bwnphwmswxcpfdhi3k6w57gze"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",

packages/valory/agents/trader/aea-config.yaml

@@ -45,10 +45,10 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba
 - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm
 - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia75xr4li3syofg4teqasxf5cgvy3soubnfdh5lxy52rd37dokxwu
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifpf3sk5evrvwxyht7mswcml3qy4nhzo5ddvjvgklapwsjwq6mera
 - valory/market_manager_abci:0.1.0:bafybeiaru2d32wpmcgqs64eepxud4idgubc3vmsbdwbia7gygipql2mmqi
-- valory/decision_maker_abci:0.1.0:bafybeiajitqnw7nitv534sl7ekfpzvpogrmw6sawiha2u4b3mpd442mh4q
-- valory/trader_abci:0.1.0:bafybeiaszj67msvm2fehrhkuswvxxeknfgw3hyhje3ubxb3tdom24rojoi
+- valory/decision_maker_abci:0.1.0:bafybeig5oivc24sqhgyxfhjbl2xsoa5yssv72lcu5ezunbcpwu3xo4jglm
+- valory/trader_abci:0.1.0:bafybeicmtcs4gaabwbyr4im2ux7co73y5n6ugj4abk6dayxzew7jly2zhe
 - valory/staking_abci:0.1.0:bafybeicupccurmrg7qesivonlyt3nryarsmk5qf5yh6auno64wn45bybvq
 - valory/check_stop_trading_abci:0.1.0:bafybeieduekpd4zbvjztyxyooppqnmjvup6jfp74uo6hhupvtvzzscdzkq
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
@@ -274,6 +274,8 @@ models:
       requests: ${str:total_requests}
       accuracy: ${str:tool_accuracy}
       sep: ${str:,}
+      max: ${str:max}
+      datetime_format: ${str:%Y-%m-%d %H:%M:%S}
   network_subgraph:
     args:
       headers:

packages/valory/services/trader/service.yaml

@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeibkytr3qda2wc6vpwkddynsfetuiiee7b4llfkpthldmjs6bhuodm
+agent: valory/trader:0.1.0:bafybeih3r5xefwfqfdmmwx3e5n3i4df7pv3mvhqlk7qen2i75anj27ds4u
 number_of_agents: 4
 deployment:
   agent:
@@ -177,6 +177,8 @@ type: skill
         requests: ${ACC_INFO_FIELDS_REQUESTS:str:total_requests}
         accuracy: ${ACC_INFO_FIELDS_ACCURACY:str:tool_accuracy}
         sep: ${ACC_INFO_FIELDS_SEP:str:,}
+        max: ${ACC_INFO_FIELDS_MAX:str:max}
+        datetime_format: ${ACC_INFO_FIELDS_DATETIME_FORMAT:str:%Y-%m-%d %H:%M:%S}
     network_subgraph: &id006
       args:
         headers:

packages/valory/services/trader_pearl/service.yaml

@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeibkytr3qda2wc6vpwkddynsfetuiiee7b4llfkpthldmjs6bhuodm
+agent: valory/trader:0.1.0:bafybeih3r5xefwfqfdmmwx3e5n3i4df7pv3mvhqlk7qen2i75anj27ds4u
 number_of_agents: 1
 deployment:
   agent:

packages/valory/skills/decision_maker_abci/behaviours/storage_manager.py

@@ -24,7 +24,7 @@
 from abc import ABC
 from datetime import datetime
 from io import StringIO
-from typing import Any, Dict, Generator, List, Optional
+from typing import Any, Dict, Generator, List, Optional, Tuple
 
 from packages.valory.contracts.agent_registry.contract import AgentRegistryContract
 from packages.valory.protocols.contract_api import ContractApiMessage
@@ -46,8 +46,6 @@
 UTILIZED_TOOLS_STORE = "utilized_tools.json"
 GET = "GET"
 OK_CODE = 200
-MAX_STR = "max"
-DATETIME_FORMAT_STR = "%Y-%m-%d %H:%M:%S"
 
 
 class StorageManagerBehaviour(DecisionMakerBaseBehaviour, ABC):
@@ -279,97 +277,121 @@ def _fetch_accuracy_info(self) -> Generator[None, None, bool]:
 
         return True
 
-    def _fetch_remote_tool_date(self) -> int:
-        """Fetch the max transaction date from the remote accuracy storage."""
-        self.context.logger.info("Checking remote accuracy information date... ")
-        self.context.logger.info("Trying to read max date in file...")
-        accuracy_information = self.remote_accuracy_information
-
-        max_transaction_date = None
-
-        if accuracy_information:
-            sep = self.acc_info_fields.sep
-            accuracy_information.seek(0)  # Ensure we’re at the beginning
-            reader = csv.DictReader(accuracy_information.readlines(), delimiter=sep)
-
-            # try to read the maximum transaction date in the remote accuracy info
-            try:
-                for row in reader:
-                    current_transaction_date = row.get(MAX_STR)
-                    if (
-                        max_transaction_date is None
-                        or current_transaction_date > max_transaction_date
-                    ):
-                        max_transaction_date = current_transaction_date
-
-            except TypeError:
-                self.context.logger.warning(
-                    "Invalid transaction date found. Continuing with local accuracy information..."
-                )
-                return 0
-
-        if max_transaction_date:
-            self.context.logger.info(f"Maximum date found: {max_transaction_date}")
-            max_datetime = datetime.strptime(max_transaction_date, DATETIME_FORMAT_STR)
-            unix_timestamp = int(max_datetime.timestamp())
-            return unix_timestamp
-
-        self.context.logger.info("No maximum date found.")
-        return 0
-
-    def _check_local_policy_store_overwrite(self) -> bool:
-        """Compare the local and remote policy store dates and decide which to use."""
-
-        local_policy_store_date = self.policy.updated_ts
-        remote_policy_store_date = self._fetch_remote_tool_date()
-        policy_store_update_offset = self.params.policy_store_update_offset
-
-        self.context.logger.info("Comparing tool accuracy dates...")
-
-        overwrite = (
-            True
-            if remote_policy_store_date
-            > (local_policy_store_date - policy_store_update_offset)
-            else False
-        )
-        self.context.logger.info(f"Local policy store overwrite: {overwrite}.")
-        return overwrite
+    def _remove_irrelevant_tools(self) -> None:
+        """Remove irrelevant tools from the accuracy store."""
+        accuracy_store = self.policy.accuracy_store
+        for tool in accuracy_store.copy():
+            if tool not in self.mech_tools:
+                accuracy_store.pop(tool, None)
 
-    def _update_accuracy_store(self) -> None:
-        """Update the accuracy store file with the latest information available"""
-        self.context.logger.info("Updating accuracy information of the policy...")
+    def _global_info_date_to_unix(self, tool_transaction_date: str) -> Optional[int]:
+        """Convert the global information date to unix."""
+        datetime_format = self.acc_info_fields.datetime_format
+        try:
+            tool_transaction_datetime = datetime.strptime(
+                tool_transaction_date, datetime_format
+            )
+        except (ValueError, TypeError):
+            self.context.logger.warning(
+                f"Could not parse the global info date {tool_transaction_date!r} using format {datetime_format!r}!"
+            )
+            return None
+
+        return int(tool_transaction_datetime.timestamp())
+
+    def _parse_global_info_row(
+        self,
+        row: Dict[str, str],
+        max_transaction_date: int,
+        tool_to_global_info: Dict[str, Dict[str, str]],
+    ) -> int:
+        """Parse a row of the global information."""
+        tool = row[self.acc_info_fields.tool]
+        if tool not in self.mech_tools:
+            # skip irrelevant tools
+            return max_transaction_date
+
+        # store the global information
+        tool_to_global_info[tool] = row
+
+        # find the latest transaction date
+        tool_transaction_date = row[self.acc_info_fields.max]
+        tool_transaction_unix = self._global_info_date_to_unix(tool_transaction_date)
+        if (
+            tool_transaction_unix is not None
+            and tool_transaction_unix > max_transaction_date
+        ):
+            return tool_transaction_unix
+
+        return max_transaction_date
+
+    def _parse_global_info(self) -> Tuple[int, Dict[str, Dict[str, str]]]:
+        """Parse the global information of the tools."""
         sep = self.acc_info_fields.sep
-        self.remote_accuracy_information.seek(
-            0
-        )  # Ensure the file pointer is at the start
         reader: csv.DictReader = csv.DictReader(
             self.remote_accuracy_information, delimiter=sep
         )
-        accuracy_store = self.policy.accuracy_store
-
-        # remove tools which are irrelevant
-        for tool in accuracy_store.copy():
-            if tool not in self.mech_tools:
-                accuracy_store.pop(tool, None)
 
-        # update the accuracy store using the latest accuracy information (only entered during the first period)
+        max_transaction_date = 0
+        tool_to_global_info: Dict[str, Dict[str, str]] = {}
         for row in reader:
-            tool = row[self.acc_info_fields.tool]
-            if tool not in self.mech_tools:
-                continue
+            max_transaction_date = self._parse_global_info_row(
+                row, max_transaction_date, tool_to_global_info
+            )
+
+        return max_transaction_date, tool_to_global_info
+
+    def _should_use_global_info(self, global_update_timestamp: int) -> bool:
+        """Whether we should use the global information of the tools."""
+        local_update_timestamp = self.policy.updated_ts
+        local_update_offset = self.params.policy_store_update_offset
+        return global_update_timestamp > local_update_timestamp - local_update_offset
+
+    def _overwrite_local_info(
+        self, tool_to_global_info: Dict[str, Dict[str, str]]
+    ) -> None:
+        """Overwrite the local information with the global information."""
+        self.context.logger.info(
+            "The local policy store will be overwritten with global information."
+        )
 
-            # overwrite local with global information (naturally, no global information is available for pending)
+        accuracy_store = self.policy.accuracy_store
+        for tool, row in tool_to_global_info.items():
             accuracy_store[tool] = AccuracyInfo(
                 int(row[self.acc_info_fields.requests]),
-                # set the pending using the local policy if this information exists
+                # naturally, no global information is available for pending.
+                # set it using the local policy if this information exists
                 accuracy_store.get(tool, AccuracyInfo()).pending,
                 float(row[self.acc_info_fields.accuracy]),
             )
+            self.policy.updated_ts = int(datetime.now().timestamp())
 
-        # update the accuracy store by adding tools which we do not have any global information about yet
-        for tool in self.mech_tools:
-            accuracy_store.setdefault(tool, AccuracyInfo())
+    def _update_accuracy_store(
+        self,
+        global_update_timestamp: int,
+        tool_to_global_info: Dict[str, Dict[str, str]],
+    ) -> None:
+        """
+        Update the accuracy store using the latest accuracy information.
 
+        The current method should only be called at the first period.
+
+        :param global_update_timestamp: the timestamp of the latest global information update
+        :param tool_to_global_info: the global information of the tools
+        """
+        if self._should_use_global_info(global_update_timestamp):
+            self._overwrite_local_info(tool_to_global_info)
+
+        # update the accuracy store by adding tools for which we do not have any global information yet
+        for tool in self.mech_tools:
+            self.policy.accuracy_store.setdefault(tool, AccuracyInfo())
+
+    def _update_policy_tools(self) -> None:
+        """Update the policy's tools and their accuracy with the latest information available if `with_global_info`."""
+        self.context.logger.info("Updating information of the policy...")
+        self._remove_irrelevant_tools()
+        global_info = self._parse_global_info()
+        self._update_accuracy_store(*global_info)
         self.policy.update_weighted_accuracy()
 
     def _set_policy(self) -> Generator:
@@ -386,11 +408,9 @@ def _set_policy(self) -> Generator:
         yield from self.wait_for_condition_with_sleep(
             self._fetch_accuracy_info, sleep_time_override=self.params.sleep_time
         )
-        overwrite_local_store = self._check_local_policy_store_overwrite()
 
-        if self.is_first_period and overwrite_local_store:
-            self.policy.updated_ts = int(datetime.now().timestamp())
-            self._update_accuracy_store()
+        if self.is_first_period:
+            self._update_policy_tools()
 
     def _try_recover_utilized_tools(self) -> Dict[str, str]:
         """Try to recover the utilized tools from the tools store."""

packages/valory/skills/decision_maker_abci/models.py

@@ -568,6 +568,8 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         self.requests: str = self._ensure("requests", kwargs, str)
         self.accuracy: str = self._ensure("accuracy", kwargs, str)
         self.sep: str = self._ensure("sep", kwargs, str)
+        self.max: str = self._ensure("max", kwargs, str)
+        self.datetime_format: str = self._ensure("datetime_format", kwargs, str)
         super().__init__(*args, **kwargs)
 
 

packages/valory/skills/decision_maker_abci/skill.yaml

@@ -25,14 +25,14 @@ fingerprint:
   behaviours/reedem.py: bafybeidjmhh6c6shbg25d7exmc4nnp4heqbqselwuxj7rp2ss665lrytxe
   behaviours/round_behaviour.py: bafybeih63hpia2bwwzu563hxs5yd3t5ycvxvkfnhvxbzghbyy3mw3xjl3i
   behaviours/sampling.py: bafybeicvtxjv5rxlsdrmbtetqwzzau6is47guystvw245grd6s2qs5pxea
-  behaviours/storage_manager.py: bafybeich6xoxty2fbsju5ubhpeikfq2jer2qg7xfrtuavoobpsfz3nnyne
+  behaviours/storage_manager.py: bafybeic6wca37fkwonbsrwme55xnklfbqtheknroudayzfxdge4pxdbm7y
   behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke
   dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
   fsm_specification.yaml: bafybeidlnqnd7dwg7r2vhsgm2balrqhxm36qdflkmr7csze2kdeu3a7sbu
   handlers.py: bafybeibf42562x3d5i66yf5p3vi6a2oolhwwxr32pjqtuxz5w4gmg3r4oa
   io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq
   io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa
-  models.py: bafybeidys6bdmkrcncx6bqpky3yu3pjbodlzdtbzelugevozc3fgts2mc4
+  models.py: bafybeibifjp45ii5amaghmdk5yjha7if5qpyreg2axpcxcj3ek23ys4fxm
   payloads.py: bafybeieygushjlrzwzpnhagjgpbs3goot3pnfheh6yawuwctrk3uoeesfm
   policy.py: bafybeidya6626uuvztdf3vhmrazjg2yxafa2iqrxmeh5gddzjjcbano5bi
   redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm
@@ -353,6 +353,8 @@ models:
       requests: total_requests
       accuracy: tool_accuracy
       sep: ','
+      max: max
+      datetime_format: '%Y-%m-%d %H:%M:%S'
     class_name: AccuracyInfoFields
   trades_subgraph:
     args:

packages/valory/skills/trader_abci/skill.yaml

@@ -27,8 +27,8 @@ skills:
 - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
 - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm
 - valory/market_manager_abci:0.1.0:bafybeiaru2d32wpmcgqs64eepxud4idgubc3vmsbdwbia7gygipql2mmqi
-- valory/decision_maker_abci:0.1.0:bafybeiajitqnw7nitv534sl7ekfpzvpogrmw6sawiha2u4b3mpd442mh4q
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeia75xr4li3syofg4teqasxf5cgvy3soubnfdh5lxy52rd37dokxwu
+- valory/decision_maker_abci:0.1.0:bafybeig5oivc24sqhgyxfhjbl2xsoa5yssv72lcu5ezunbcpwu3xo4jglm
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeifpf3sk5evrvwxyht7mswcml3qy4nhzo5ddvjvgklapwsjwq6mera
 - valory/staking_abci:0.1.0:bafybeicupccurmrg7qesivonlyt3nryarsmk5qf5yh6auno64wn45bybvq
 - valory/check_stop_trading_abci:0.1.0:bafybeieduekpd4zbvjztyxyooppqnmjvup6jfp74uo6hhupvtvzzscdzkq
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
@@ -293,6 +293,8 @@ models:
       requests: total_requests
       accuracy: tool_accuracy
       sep: ','
+      max: max
+      datetime_format: '%Y-%m-%d %H:%M:%S'
     class_name: AccuracyInfoFields
   network_subgraph:
     args:

packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml

@@ -23,7 +23,7 @@ protocols:
 - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u
-- valory/decision_maker_abci:0.1.0:bafybeiajitqnw7nitv534sl7ekfpzvpogrmw6sawiha2u4b3mpd442mh4q
+- valory/decision_maker_abci:0.1.0:bafybeig5oivc24sqhgyxfhjbl2xsoa5yssv72lcu5ezunbcpwu3xo4jglm
 - valory/staking_abci:0.1.0:bafybeicupccurmrg7qesivonlyt3nryarsmk5qf5yh6auno64wn45bybvq
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
 behaviours: