diff --git a/docs/index.md b/docs/index.md index 91d0c159..c6efb348 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeievo2pfivymvq5ci2rqofg5aqlshbdkmjmqjdjmha7hix53ptwqf4 --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeibsp32ki6vvxa6p6ht7lfkn6q4zq5ws57d7ci22f3jb2dgdjgfl5u --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 5de71ab8..68afb4ca 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -16,23 +16,23 @@ "connection/valory/openai/0.1.0": "bafybeiaryip2lbiluf7vjsdq6r5qiqdesmhqevrzekfrxpugfypqja6gae", "connection/valory/farcaster/0.1.0": "bafybeibbdas7lxbipksodaphjms3uop7vnzjqkroktjq2g6wbvgtlldaxi", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeigyn5xcndifdqceieqotpkhmmadacybojdl4zl3bnpromrg5e4thi", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeibpevvo25gngej3mtd3ilkoevieq74d5ag5mevgycgtzd7r3ceemu", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeieycvfqjkuxepnqtoshzuhqmp2urdqsgy3vjqzo6zpmueiuedpw7m", "skill/valory/ceramic_read_abci/0.1.0": "bafybeibph35jhtvn6kgytj6mqdz4lpjkvtfqd75qorrt4onv6i2trxfttu", "skill/valory/ceramic_write_abci/0.1.0": "bafybeihez2zrvvt6cyi5vu3fpomjlbo3v4fzyf4buv7ysxzj4dntr2wy3q", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeie24g5jonosupl5eiwboim2hwtoyhst35anwmfa6vjsxhems7m65e", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeigw7ge4p33zzaxw3ga2b7aitugy4r6t4brnmbfxcy2psxig7zszpi", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiho6p6ahlrbbavssqe6mgigj6lbpkifc2gspzfe2b6ayib3le4oxm", "skill/valory/twitter_write_abci/0.1.0": "bafybeihytynpd7d55pzzs7jugn3ivad3u656iiqm3hev2ryvflleotrcue", "skill/valory/llm_abci/0.1.0": "bafybeihpfesi2sjqdcb2j2mqybhz7av7jlvf27ozk32wbwmklkdugycxyq", "skill/valory/decision_making_abci/0.1.0": "bafybeibovigvsxoq2huixbpeb7z5mxfvkwzf2zltveibj55eqbaepy2a74", "skill/valory/olas_week_abci/0.1.0": "bafybeibjfxhu3j7ww2lxcekwtw7uiq7iptmhkzgjhk2342mbamrmvol7ma", - "skill/valory/mech_interact_abci/0.1.0": "bafybeib4vn6m2yumwoclh5aatcdt5yxcjc5owxmxy5o7t3nfzormgwkr64", + "skill/valory/mech_interact_abci/0.1.0": "bafybeih5t5ow5krn3vsl66dn6f4dj34bl3mum7yvudygzrylbpvpzrilbu", "skill/valory/farcaster_write_abci/0.1.0": "bafybeibbbfui3g2s63cg5vsvxqpzzdg2uxhd7a4ikwfo6dy7b2klqthvu4", "skill/valory/farcaster_test_abci/0.1.0": "bafybeiblauv376hvy7dzi232fxf6iq5nxxnhvk2gy6g7kcsj7a4r2bilqa", "skill/valory/staking_abci/0.1.0": "bafybeiffqyu4plhkkezhz6oabgx6nb6v2ozhs53iruw7p4ucclbgvo5u24", - "agent/valory/impact_evaluator/0.1.0": "bafybeictbhqjd2a54zs3mura3puwxuxrdajapvfxzbusqjliovrlxwmtca", + "agent/valory/impact_evaluator/0.1.0": "bafybeigxkyuajnmem4z3ev46rw6ltjpwxsgm2hy4em3zrtikjpgsttb2im", "agent/valory/farcaster_test/0.1.0": "bafybeig6yilme5s7fvru2b44dtr5xxqz3gf7p56swr7c5hip775l5wally", - "service/valory/impact_evaluator/0.1.0": "bafybeievo2pfivymvq5ci2rqofg5aqlshbdkmjmqjdjmha7hix53ptwqf4", - "service/valory/impact_evaluator_local/0.1.0": "bafybeig6asssrntjn4tbneuarfga7mrmifj5xyesnibabjcj4csf7k7wke" + "service/valory/impact_evaluator/0.1.0": "bafybeigqtxqhgi6t3lpc6wf4b6hka26p3xj74awbmwexpqqlqcltgktua4", + "service/valory/impact_evaluator_local/0.1.0": "bafybeifow4hacvf7y7kc77auzusvm4tfrk5g3vgqemsjihdceo5q6qd2ee" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index cf91dca6..4cb0111a 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -46,9 +46,9 @@ protocols: skills: - valory/abstract_abci:0.1.0:bafybeif2naoydlrqkdpnig34uejedwgurjwyvmbpcz53tif7pyukfdophq - valory/abstract_round_abci:0.1.0:bafybeigjddhk7epta7xpnfvv426xedff5abh4xlkwi6cqgp4vkutgkvydm -- valory/impact_evaluator_abci:0.1.0:bafybeie24g5jonosupl5eiwboim2hwtoyhst35anwmfa6vjsxhems7m65e +- valory/impact_evaluator_abci:0.1.0:bafybeigw7ge4p33zzaxw3ga2b7aitugy4r6t4brnmbfxcy2psxig7zszpi - valory/generic_scoring_abci:0.1.0:bafybeiho6p6ahlrbbavssqe6mgigj6lbpkifc2gspzfe2b6ayib3le4oxm -- valory/twitter_scoring_abci:0.1.0:bafybeibpevvo25gngej3mtd3ilkoevieq74d5ag5mevgycgtzd7r3ceemu +- valory/twitter_scoring_abci:0.1.0:bafybeieycvfqjkuxepnqtoshzuhqmp2urdqsgy3vjqzo6zpmueiuedpw7m - valory/ceramic_read_abci:0.1.0:bafybeibph35jhtvn6kgytj6mqdz4lpjkvtfqd75qorrt4onv6i2trxfttu - valory/ceramic_write_abci:0.1.0:bafybeihez2zrvvt6cyi5vu3fpomjlbo3v4fzyf4buv7ysxzj4dntr2wy3q - valory/dynamic_nft_abci:0.1.0:bafybeigyn5xcndifdqceieqotpkhmmadacybojdl4zl3bnpromrg5e4thi @@ -60,7 +60,7 @@ skills: - valory/decision_making_abci:0.1.0:bafybeibovigvsxoq2huixbpeb7z5mxfvkwzf2zltveibj55eqbaepy2a74 - valory/llm_abci:0.1.0:bafybeihpfesi2sjqdcb2j2mqybhz7av7jlvf27ozk32wbwmklkdugycxyq - valory/olas_week_abci:0.1.0:bafybeibjfxhu3j7ww2lxcekwtw7uiq7iptmhkzgjhk2342mbamrmvol7ma -- valory/mech_interact_abci:0.1.0:bafybeib4vn6m2yumwoclh5aatcdt5yxcjc5owxmxy5o7t3nfzormgwkr64 +- valory/mech_interact_abci:0.1.0:bafybeih5t5ow5krn3vsl66dn6f4dj34bl3mum7yvudygzrylbpvpzrilbu - valory/staking_abci:0.1.0:bafybeiffqyu4plhkkezhz6oabgx6nb6v2ozhs53iruw7p4ucclbgvo5u24 default_ledger: ethereum required_ledgers: diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 96fb47f9..273f2ebc 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeictbhqjd2a54zs3mura3puwxuxrdajapvfxzbusqjliovrlxwmtca +agent: valory/impact_evaluator:0.1.0:bafybeigxkyuajnmem4z3ev46rw6ltjpwxsgm2hy4em3zrtikjpgsttb2im number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 8127dba4..3a1d9e30 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeictbhqjd2a54zs3mura3puwxuxrdajapvfxzbusqjliovrlxwmtca +agent: valory/impact_evaluator:0.1.0:bafybeigxkyuajnmem4z3ev46rw6ltjpwxsgm2hy4em3zrtikjpgsttb2im number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index e0f9bcdd..65ef0820 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -26,7 +26,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeigjddhk7epta7xpnfvv426xedff5abh4xlkwi6cqgp4vkutgkvydm - valory/ceramic_read_abci:0.1.0:bafybeibph35jhtvn6kgytj6mqdz4lpjkvtfqd75qorrt4onv6i2trxfttu - valory/generic_scoring_abci:0.1.0:bafybeiho6p6ahlrbbavssqe6mgigj6lbpkifc2gspzfe2b6ayib3le4oxm -- valory/twitter_scoring_abci:0.1.0:bafybeibpevvo25gngej3mtd3ilkoevieq74d5ag5mevgycgtzd7r3ceemu +- valory/twitter_scoring_abci:0.1.0:bafybeieycvfqjkuxepnqtoshzuhqmp2urdqsgy3vjqzo6zpmueiuedpw7m - valory/ceramic_write_abci:0.1.0:bafybeihez2zrvvt6cyi5vu3fpomjlbo3v4fzyf4buv7ysxzj4dntr2wy3q - valory/dynamic_nft_abci:0.1.0:bafybeigyn5xcndifdqceieqotpkhmmadacybojdl4zl3bnpromrg5e4thi - valory/registration_abci:0.1.0:bafybeiagi6e2h7kochmlemy5c5yk6hwn37tfxiqvk2en74jhowsdwlmrny @@ -37,7 +37,7 @@ skills: - valory/llm_abci:0.1.0:bafybeihpfesi2sjqdcb2j2mqybhz7av7jlvf27ozk32wbwmklkdugycxyq - valory/twitter_write_abci:0.1.0:bafybeihytynpd7d55pzzs7jugn3ivad3u656iiqm3hev2ryvflleotrcue - valory/olas_week_abci:0.1.0:bafybeibjfxhu3j7ww2lxcekwtw7uiq7iptmhkzgjhk2342mbamrmvol7ma -- valory/mech_interact_abci:0.1.0:bafybeib4vn6m2yumwoclh5aatcdt5yxcjc5owxmxy5o7t3nfzormgwkr64 +- valory/mech_interact_abci:0.1.0:bafybeih5t5ow5krn3vsl66dn6f4dj34bl3mum7yvudygzrylbpvpzrilbu - valory/staking_abci:0.1.0:bafybeiffqyu4plhkkezhz6oabgx6nb6v2ozhs53iruw7p4ucclbgvo5u24 behaviours: main: diff --git a/packages/valory/skills/mech_interact_abci/behaviours/request.py b/packages/valory/skills/mech_interact_abci/behaviours/request.py index a4bff8fc..87aed926 100644 --- a/packages/valory/skills/mech_interact_abci/behaviours/request.py +++ b/packages/valory/skills/mech_interact_abci/behaviours/request.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023-2024 Valory AG +# Copyright 2023-2025 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -468,6 +468,7 @@ def async_act(self) -> Generator: """Do the action.""" with self.context.benchmark_tool.measure(self.behaviour_id).local(): + agent_address = self.context.agent_address if not self._mech_requests: n_params = len(MechRequestPayload.__annotations__) empty_payload_params = (None,) * n_params @@ -482,10 +483,11 @@ def async_act(self) -> Generator: for data in (self._mech_requests, self._pending_responses) ) self.context.logger.info( - f"Preparing mech request:\ntx_hex: {self.tx_hex}\nprice: {self.price}\nserialized_data: {serialized_data}\n" + f"Preparing mech request:\ntx_hex: {self.tx_hex}\nprice: {self.price}\n" + f"serialized_data: {serialized_data}" ) payload = MechRequestPayload( - self.context.agent_address, + agent_address, self.matching_round.auto_round_id(), self.tx_hex, self.price, diff --git a/packages/valory/skills/mech_interact_abci/skill.yaml b/packages/valory/skills/mech_interact_abci/skill.yaml index d4879073..e2e063fb 100644 --- a/packages/valory/skills/mech_interact_abci/skill.yaml +++ b/packages/valory/skills/mech_interact_abci/skill.yaml @@ -10,7 +10,7 @@ fingerprint: __init__.py: bafybeidf3nlv5fpvfy4libtscayhirdw64shgmhfmvjiftjmjkmhu7auxq behaviours/__init__.py: bafybeie3zsi6p3yanz5mqwpkdrcgywaqvkit3hdintsb4awnvalgxpxa4i behaviours/base.py: bafybeibrl2rniag7qf6fpn5rgbv5bagnyyps7tm6kb3yjz3ilz56lzfz74 - behaviours/request.py: bafybeic7nul5iawujburikfdr544g23gxto2wb3jqs4it3kpqffp3fdgrq + behaviours/request.py: bafybeiev7bp6mtzdhn66cj4rqj65gfrpc4ebkdy77pjbdt4k4pb3qahizm behaviours/response.py: bafybeicmcsl5ubv6qcsunfk2e3dn4i5nk2xaioioigzamvybmijftftxu4 behaviours/round_behaviour.py: bafybeib33inrpyzzlx7k7i3okkslsx4p46dgdaww2m5k7rno57o5nndage dialogues.py: bafybeicgtxsrzld6uyi2n455temnz6mj55irmxqxw55jxo4b6ud4rt7nsm @@ -22,7 +22,7 @@ fingerprint: states/__init__.py: bafybeie34wx5znr2hxwh3gs2fchmbeuzjcfnraymdvtzjaxaq5zsiw233q states/base.py: bafybeidr2vmblx7q43clzqt64x7nqe42mcr2apwi3we7gizkfwobaab4ke states/final_states.py: bafybeihjntrbc666blxj4viz74y4p2hfc5e4vijs3bqng2k4vqbwkud7sq - states/request.py: bafybeigbqkawdoo4ouq5yb5pufmjso2eezamfgdyfsnkahgdumoxfbuwdy + states/request.py: bafybeif3ydxbum5svwkpkk4fjjko4om3evma4csemryycucd3tbmx5kpdi states/response.py: bafybeibaxnp2oxwjptoq7qzm6o7ww2qrdj2vnxzg2qt523vz2ftqzx5hyi tests/__init__.py: bafybeifojfnffwlsv6aiku25nwyjwm7h4m45yci3fgmaawpeoyoogzonum tests/test_behaviours.py: bafybeidj7git7zaego7k75eejtxlr3usj6wnnqisu7urqwvalpwh5w7nyq diff --git a/packages/valory/skills/mech_interact_abci/states/request.py b/packages/valory/skills/mech_interact_abci/states/request.py index fc455d05..94ac802d 100644 --- a/packages/valory/skills/mech_interact_abci/states/request.py +++ b/packages/valory/skills/mech_interact_abci/states/request.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023-2024 Valory AG +# Copyright 2023-2025 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +32,6 @@ class MechRequestRound(MechInteractionRound): """A round for performing requests to a Mech.""" payload_class = MechRequestPayload - selection_key = ( get_name(SynchronizedData.tx_submitter), get_name(SynchronizedData.most_voted_tx_hash), diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index 357a0d77..86ff0d24 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -33,7 +33,7 @@ protocols: skills: - valory/abstract_round_abci:0.1.0:bafybeigjddhk7epta7xpnfvv426xedff5abh4xlkwi6cqgp4vkutgkvydm - valory/decision_making_abci:0.1.0:bafybeibovigvsxoq2huixbpeb7z5mxfvkwzf2zltveibj55eqbaepy2a74 -- valory/mech_interact_abci:0.1.0:bafybeib4vn6m2yumwoclh5aatcdt5yxcjc5owxmxy5o7t3nfzormgwkr64 +- valory/mech_interact_abci:0.1.0:bafybeih5t5ow5krn3vsl66dn6f4dj34bl3mum7yvudygzrylbpvpzrilbu behaviours: main: args: {}