From 8406d2946b07abf26fbff35df0cc96d7156ab998 Mon Sep 17 00:00:00 2001 From: Ardian Date: Tue, 13 Feb 2024 21:26:54 +0100 Subject: [PATCH 1/7] feat: add support for dynamic pricing --- packages/packages.json | 6 +-- packages/valory/agents/mech/aea-config.yaml | 3 +- packages/valory/services/mech/service.yaml | 6 ++- .../skills/task_execution/behaviours.py | 16 +++++- .../valory/skills/task_execution/models.py | 33 +++++++++++++ .../valory/skills/task_execution/skill.yaml | 13 +++-- .../task_execution/utils/cost_calculation.py | 49 +++++++++++++++++++ .../skills/task_execution/utils/ipfs.py | 2 +- tox.ini | 3 ++ 9 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 packages/valory/skills/task_execution/utils/cost_calculation.py diff --git a/packages/packages.json b/packages/packages.json index d36d70dd..5323cb7c 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -2,13 +2,13 @@ "dev": { "connection/valory/websocket_client/0.1.0": "bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm", "skill/valory/contract_subscription/0.1.0": "bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4", - "agent/valory/mech/0.1.0": "bafybeibwlyxqtitnfgmt2liuygv75pydlvih23e2ilwpr6xlffac5flyse", + "agent/valory/mech/0.1.0": "bafybeiazsvppldwszwte6m2htcd3glh2kk35cb7fql73stdeijcbphilgq", "skill/valory/mech_abci/0.1.0": "bafybeieimp7xzxcnbzsuunf2xkcy5juulhmzsmkq2v3sw3o3lgssb53cnu", "contract/valory/agent_mech/0.1.0": "bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e", - "service/valory/mech/0.1.0": "bafybeicw64tjmcx6fbffwhpgdabmnxfwbuk6cycwrcu4me3hplcleu4mze", + "service/valory/mech/0.1.0": "bafybeidyogsdqt5vo26hkwgegwalxawgux3xjub4orae3ptsqphhedbqra", "protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq", "skill/valory/task_submission_abci/0.1.0": "bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi", - "skill/valory/task_execution/0.1.0": "bafybeieercgbjemdjiovecetxadurwil26cs2swleupmbgc4py2rg6e2kq", + "skill/valory/task_execution/0.1.0": "bafybeicsbtef4hbuuevraqdyicswlnc3i54fzxeqcjzh5soo5wjvh5ecni", "contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu", "protocol/valory/websocket_client/0.1.0": "bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4", "skill/valory/websocket_client/0.1.0": "bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index 9c72b415..525b5310 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -42,7 +42,7 @@ skills: - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba - valory/subscription_abci:0.1.0:bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie -- valory/task_execution:0.1.0:bafybeieercgbjemdjiovecetxadurwil26cs2swleupmbgc4py2rg6e2kq +- valory/task_execution:0.1.0:bafybeicsbtef4hbuuevraqdyicswlnc3i54fzxeqcjzh5soo5wjvh5ecni - valory/task_submission_abci:0.1.0:bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja @@ -203,6 +203,7 @@ models: agent_index: ${int:0} num_agents: ${int:4} from_block_range: ${int:50000} + mech_to_config: ${list:[["0x77af31De935740567Cf4fF1986D04B2c964A786a",["use_dynamic_pricing","false"]]]} timeout_limit: ${int:3} max_block_window: ${int:500} --- diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index f764171a..c43371e6 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeibwlyxqtitnfgmt2liuygv75pydlvih23e2ilwpr6xlffac5flyse +agent: valory/mech:0.1.0:bafybeiazsvppldwszwte6m2htcd3glh2kk35cb7fql73stdeijcbphilgq number_of_agents: 4 deployment: agent: @@ -177,6 +177,7 @@ type: skill agent_index: ${AGENT_INDEX_0:int:0} num_agents: ${NUM_AGENTS:int:4} timeout_limit: ${TIMEOUT_LIMIT:int:3} + mech_to_config: ${list:[["0xFf82123dFB52ab75C417195c5fDB87630145ae81",["use_dynamic_pricing","false"]],["0x77af31De935740567Cf4fF1986D04B2c964A786a",["use_dynamic_pricing","false"]]]} max_block_window: ${MAX_BLOCK_WINDOW:int:500} 1: models: @@ -189,6 +190,7 @@ type: skill polling_interval: ${POLLING_INTERVAL:float:30.0} agent_index: ${AGENT_INDEX_1:int:1} num_agents: ${NUM_AGENTS:int:4} + mech_to_config: ${list:[["0xFf82123dFB52ab75C417195c5fDB87630145ae81",["use_dynamic_pricing","false"]],["0x77af31De935740567Cf4fF1986D04B2c964A786a",["use_dynamic_pricing","false"]]]} timeout_limit: ${TIMEOUT_LIMIT:int:3} max_block_window: ${MAX_BLOCK_WINDOW:int:500} 2: @@ -202,6 +204,7 @@ type: skill polling_interval: ${POLLING_INTERVAL:float:30.0} agent_index: ${AGENT_INDEX_2:int:2} num_agents: ${NUM_AGENTS:int:4} + mech_to_config: ${list:[["0xFf82123dFB52ab75C417195c5fDB87630145ae81",["use_dynamic_pricing","false"]],["0x77af31De935740567Cf4fF1986D04B2c964A786a",["use_dynamic_pricing","false"]]]} timeout_limit: ${TIMEOUT_LIMIT:int:3} max_block_window: ${MAX_BLOCK_WINDOW:int:500} 3: @@ -216,6 +219,7 @@ type: skill agent_index: ${AGENT_INDEX_3:int:3} num_agents: ${NUM_AGENTS:int:4} timeout_limit: ${TIMEOUT_LIMIT:int:3} + mech_to_config: ${list:[["0xFf82123dFB52ab75C417195c5fDB87630145ae81",["use_dynamic_pricing","false"]],["0x77af31De935740567Cf4fF1986D04B2c964A786a",["use_dynamic_pricing","false"]]]} max_block_window: ${MAX_BLOCK_WINDOW:int:500} --- public_id: valory/ledger:0.19.0 diff --git a/packages/valory/skills/task_execution/behaviours.py b/packages/valory/skills/task_execution/behaviours.py index 38beb317..b0c89660 100644 --- a/packages/valory/skills/task_execution/behaviours.py +++ b/packages/valory/skills/task_execution/behaviours.py @@ -31,6 +31,7 @@ from aea.protocols.base import Message from aea.protocols.dialogue.base import Dialogue from aea.skills.behaviours import SimpleBehaviour +from eth_abi import encode from packages.valory.connections.ipfs.connection import IpfsDialogues from packages.valory.connections.ipfs.connection import PUBLIC_ID as IPFS_CONNECTION_ID @@ -49,6 +50,9 @@ from packages.valory.protocols.ledger_api import LedgerApiMessage from packages.valory.skills.task_execution.models import Params from packages.valory.skills.task_execution.utils.benchmarks import TokenCounterCallback +from packages.valory.skills.task_execution.utils.cost_calculation import ( + get_cost_for_done_task, +) from packages.valory.skills.task_execution.utils.ipfs import ( ComponentPackageLoader, get_ipfs_file_hash, @@ -454,7 +458,17 @@ def _handle_store_response(self, message: IpfsMessage, dialogue: Dialogue) -> No data=ipfs_hash, ) done_task = cast(Dict[str, Any], self._done_task) - done_task["task_result"] = to_multihash(ipfs_hash) + task_result = to_multihash(ipfs_hash) + cost = get_cost_for_done_task(done_task) + self.context.logger.info(f"Cost for task {req_id}: {cost}") + mech_config = self.params.mech_to_config[done_task["mech_address"]] + if mech_config.use_dynamic_pricing: + self.context.logger.info(f"Dynamic pricing is enabled for task {req_id}.") + task_result = encode( + ["uint256", "bytes"], [cost, bytes.fromhex(task_result)] + ) + + done_task["task_result"] = task_result # add to done tasks, in thread safe way with self.done_tasks_lock: self.done_tasks.append(done_task) diff --git a/packages/valory/skills/task_execution/models.py b/packages/valory/skills/task_execution/models.py index 3e81775e..b3aed992 100644 --- a/packages/valory/skills/task_execution/models.py +++ b/packages/valory/skills/task_execution/models.py @@ -18,6 +18,7 @@ # ------------------------------------------------------------------------------ """This module contains the shared state for the abci skill of Mech.""" +import dataclasses from collections import defaultdict from typing import Any, Callable, Dict, List, Optional, cast @@ -25,6 +26,20 @@ from aea.skills.base import Model +@dataclasses.dataclass +class MechConfig: + """Mech config dataclass.""" + + use_dynamic_pricing: bool + + @staticmethod + def from_dict(raw_dict: Dict[str, Any]) -> "MechConfig": + """From dict.""" + return MechConfig( + use_dynamic_pricing=raw_dict["use_dynamic_pricing"].lower() == "true" + ) + + class Params(Model): """A model to represent params for multiple abci apps.""" @@ -66,6 +81,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: enforce(self.max_block_window is not None, "max_block_window must be set!") # maps the request id to the number of times it has timed out self.request_id_to_num_timeouts: Dict[int, int] = defaultdict(lambda: 0) + self.mech_to_config: Dict[str, MechConfig] = self._parse_mech_configs(kwargs) super().__init__(*args, **kwargs) def _nested_list_todict_workaround( @@ -78,3 +94,20 @@ def _nested_list_todict_workaround( if len(values) == 0: raise ValueError(f"No {key} specified!") return {value[0]: value[1] for value in values} + + def _parse_mech_configs(self, kwargs: Dict) -> Dict[str, MechConfig]: + """Parse the mech configs.""" + mech_configs_json = self._nested_list_todict_workaround( + kwargs, "mech_to_config" + ) + mech_configs = { + mech: MechConfig.from_dict(config) + for mech, config in mech_configs_json.items() + } + for self.agent_mech_contract_addresses in mech_configs.keys(): + enforce( + self.agent_mech_contract_addresses + in self.agent_mech_contract_addresses, + f"agent_mech_contract_addresses {self.agent_mech_contract_addresses} must be in mech_configs!", + ) + return mech_configs diff --git a/packages/valory/skills/task_execution/skill.yaml b/packages/valory/skills/task_execution/skill.yaml index 48e84c31..d8fec078 100644 --- a/packages/valory/skills/task_execution/skill.yaml +++ b/packages/valory/skills/task_execution/skill.yaml @@ -7,13 +7,14 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidqhvvlnthkbnmrdkdeyjyx2f2ab6z4xdgmagh7welqnh2v6wczx4 - behaviours.py: bafybeihprwot27csugwpoimsqcwprxu5bstqpvanot3nkmfgvhbr66ww4y + behaviours.py: bafybeihxko4mv7dpeypi6g2v4zgdmwwvurnfd3yzdgyxvxx6oydr5izjd4 dialogues.py: bafybeid4zxalqdlo5mw4yfbuf34hx4jp5ay5z6chm4zviwu4cj7fudtwca handlers.py: bafybeidbt5ezj74cgfogk3w4uw4si2grlnk5g54veyumw7g5yh6gdscywu - models.py: bafybeihgclxctyltuehj2f4fzj26edptqugrrm4phd6ovuulezrqot6qo4 + models.py: bafybeiaz5lwhqzfv2azbdqjozwm5sums5eoingrhd2wz6syr4qiddftbhm utils/__init__.py: bafybeiccdijaigu6e5p2iruwo5mkk224o7ywedc7nr6xeu5fpmhjqgk24e utils/benchmarks.py: bafybeibdwt4svz24ahok4x4h2rpeotlmlmvifccd27oizsz5bjwj6dqree - utils/ipfs.py: bafybeidinbdqkidix44ibz5hug7inkcbijooag53gr5mtbaa72tk335uqq + utils/cost_calculation.py: bafybeib7wpojbriolfvrdb57ts6wl3cz5p4is2myofpvde7isr5iqztjem + utils/ipfs.py: bafybeibffem6y23fxdilc373kge4z6ht7phshbnlqbl55irb2xr7brdrlm utils/task.py: bafybeieuziu7owtk543z3umgmayhjh67klftk7vrhz24l6rlaii5lvkqh4 fingerprint_ignore_patterns: [] connections: @@ -84,6 +85,10 @@ models: - stabilityai-stable-diffusion-768-v2-1 from_block_range: 50000 num_agents: 4 + mech_to_config: + - - '0x9A676e781A523b5d0C0e43731313A708CB607508' + - - - use_dynamic_pricing + - 'false' polling_interval: 30.0 task_deadline: 240.0 max_block_window: 500 @@ -111,4 +116,6 @@ dependencies: version: ==0.5.1 anthropic: version: ==0.3.11 + eth-abi: + version: ==4.0.0 is_abstract: false diff --git a/packages/valory/skills/task_execution/utils/cost_calculation.py b/packages/valory/skills/task_execution/utils/cost_calculation.py new file mode 100644 index 00000000..a521fd26 --- /dev/null +++ b/packages/valory/skills/task_execution/utils/cost_calculation.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2024 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ +"""Calculate the cost for tools.""" +import logging +from typing import Any, Dict, cast + +from packages.valory.skills.task_execution import PUBLIC_ID + + +_logger = logging.getLogger( + f"aea.packages.{PUBLIC_ID.author}.contracts.{PUBLIC_ID.name}.utils.cost_calculation" +) + +DEFAULT_PRICE = 1 * 10**16 + + +def get_cost_for_done_task( + done_task: Dict[str, Any], fallback_price: int = DEFAULT_PRICE +) -> int: + """Get the cost for a done task.""" + cost_dict = done_task.get("cost_dict", {}) + if cost_dict == {}: + _logger.warning(f"Cost dict not found in done task {done_task['request_id']}.") + return fallback_price + total_cost = cost_dict.get("total_cost", None) + if total_cost is None: + _logger.warning( + f"Total cost not found in cost dict {cost_dict} for {done_task['request_id']}." + ) + return fallback_price + + total_cost = cast(float, total_cost) + return int(total_cost * 10**18) diff --git a/packages/valory/skills/task_execution/utils/ipfs.py b/packages/valory/skills/task_execution/utils/ipfs.py index 364a3a28..c10c3b54 100644 --- a/packages/valory/skills/task_execution/utils/ipfs.py +++ b/packages/valory/skills/task_execution/utils/ipfs.py @@ -40,7 +40,7 @@ def get_ipfs_file_hash(data: bytes) -> str: return file_hash -def to_multihash(hash_string: str) -> bytes: +def to_multihash(hash_string: str) -> str: """To multihash string.""" # Decode the Base32 CID to bytes cid_bytes = multibase.decode(hash_string) diff --git a/tox.ini b/tox.ini index 25718a95..c77c82db 100644 --- a/tox.ini +++ b/tox.ini @@ -370,6 +370,9 @@ ignore_missing_imports = True [mypy-certifi.*] ignore_missing_imports = True +[mypy-eth_abi.*] +ignore_missing_imports = True + [mypy-pandas.*] ignore_missing_imports = True From f92a447c4f4ecbfd32c1096f122bf6a0f555e22a Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 14 Feb 2024 20:58:44 +0100 Subject: [PATCH 2/7] fix: misc fixes on dynamic pricing --- packages/packages.json | 22 +++++++++---------- packages/valory/agents/mech/aea-config.yaml | 18 +++++++-------- .../connections/http_client/__init__.py | 21 ++++++++++++++++++ .../connections/http_client/connection.py | 21 ++++++++++++++++++ .../connections/http_client/tests/__init__.py | 21 ++++++++++++++++++ .../http_client/tests/test_http_client.py | 21 ++++++++++++++++++ .../connections/websocket_client/__init__.py | 21 ++++++++++++++++++ .../websocket_client/connection.py | 21 ++++++++++++++++++ .../websocket_client/connection.yaml | 6 ++--- packages/valory/protocols/__init__.py | 19 ++++++++++++++++ .../protocols/acn_data_share/__init__.py | 21 ++++++++++++++++++ .../protocols/acn_data_share/dialogues.py | 21 ++++++++++++++++++ .../protocols/acn_data_share/message.py | 21 ++++++++++++++++++ .../protocols/acn_data_share/protocol.yaml | 12 +++++----- .../protocols/acn_data_share/serialization.py | 21 ++++++++++++++++++ .../tests/test_acn_data_share_dialogues.py | 21 ++++++++++++++++++ .../tests/test_acn_data_share_messages.py | 21 ++++++++++++++++++ packages/valory/protocols/default/__init__.py | 21 ++++++++++++++++++ .../valory/protocols/default/dialogues.py | 21 ++++++++++++++++++ packages/valory/protocols/default/message.py | 21 ++++++++++++++++++ .../valory/protocols/default/serialization.py | 21 ++++++++++++++++++ .../default/tests/test_default_dialogues.py | 21 ++++++++++++++++++ .../protocols/websocket_client/__init__.py | 21 ++++++++++++++++++ .../protocols/websocket_client/dialogues.py | 21 ++++++++++++++++++ .../protocols/websocket_client/message.py | 21 ++++++++++++++++++ .../protocols/websocket_client/protocol.yaml | 12 +++++----- .../websocket_client/serialization.py | 21 ++++++++++++++++++ .../tests/test_websocket_client_dialogues.py | 21 ++++++++++++++++++ .../tests/test_websocket_client_messages.py | 21 ++++++++++++++++++ packages/valory/services/mech/service.yaml | 10 ++++++++- .../skills/contract_subscription/__init__.py | 21 ++++++++++++++++++ .../contract_subscription/behaviours.py | 21 ++++++++++++++++++ .../skills/contract_subscription/dialogues.py | 21 ++++++++++++++++++ .../skills/contract_subscription/handlers.py | 21 ++++++++++++++++++ .../skills/contract_subscription/skill.yaml | 14 ++++++------ packages/valory/skills/mech_abci/skill.yaml | 4 ++-- .../skills/subscription_abci/skill.yaml | 2 +- .../skills/task_execution/behaviours.py | 2 +- .../valory/skills/task_execution/models.py | 11 ++++++---- .../valory/skills/task_execution/skill.yaml | 10 ++++----- .../task_execution/utils/cost_calculation.py | 7 ++++-- .../skills/task_execution/utils/ipfs.py | 2 +- .../skills/task_submission_abci/skill.yaml | 2 +- .../skills/websocket_client/__init__.py | 21 ++++++++++++++++++ .../skills/websocket_client/behaviours.py | 21 ++++++++++++++++++ .../skills/websocket_client/dialogues.py | 21 ++++++++++++++++++ .../skills/websocket_client/handlers.py | 21 ++++++++++++++++++ .../valory/skills/websocket_client/skill.yaml | 12 +++++----- 48 files changed, 750 insertions(+), 66 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 5323cb7c..c8774664 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,19 +1,19 @@ { "dev": { - "connection/valory/websocket_client/0.1.0": "bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm", - "skill/valory/contract_subscription/0.1.0": "bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4", - "agent/valory/mech/0.1.0": "bafybeiazsvppldwszwte6m2htcd3glh2kk35cb7fql73stdeijcbphilgq", - "skill/valory/mech_abci/0.1.0": "bafybeieimp7xzxcnbzsuunf2xkcy5juulhmzsmkq2v3sw3o3lgssb53cnu", + "connection/valory/websocket_client/0.1.0": "bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm", + "skill/valory/contract_subscription/0.1.0": "bafybeibaiesuhgnnato46w6tuiqesg6obcjcrmka6yzmt2clzm4fuyikxu", + "agent/valory/mech/0.1.0": "bafybeigkgbssv6uihdreow3dajv3vx46eeukr3xw3ycu2leyemodcf2qlu", + "skill/valory/mech_abci/0.1.0": "bafybeig3kkrxzn5rte4gwjw2ori3bonnhmh7ncteyu7ffnjlu3wgthcz5u", "contract/valory/agent_mech/0.1.0": "bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e", - "service/valory/mech/0.1.0": "bafybeidyogsdqt5vo26hkwgegwalxawgux3xjub4orae3ptsqphhedbqra", - "protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq", - "skill/valory/task_submission_abci/0.1.0": "bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi", - "skill/valory/task_execution/0.1.0": "bafybeicsbtef4hbuuevraqdyicswlnc3i54fzxeqcjzh5soo5wjvh5ecni", + "service/valory/mech/0.1.0": "bafybeicfoxom2loawhuju3jscy5efkkuvd73k23shs5plpjipxakcvgs3e", + "protocol/valory/acn_data_share/0.1.0": "bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji", + "skill/valory/task_submission_abci/0.1.0": "bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe", + "skill/valory/task_execution/0.1.0": "bafybeif64ca45o54ue6dlljbm5fkqmy3vzsyq7pgtlc7g4rsxeiyx6pbeq", "contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu", - "protocol/valory/websocket_client/0.1.0": "bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4", - "skill/valory/websocket_client/0.1.0": "bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta", + "protocol/valory/websocket_client/0.1.0": "bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q", + "skill/valory/websocket_client/0.1.0": "bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm", "contract/valory/hash_checkpoint/0.1.0": "bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa", - "skill/valory/subscription_abci/0.1.0": "bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie" + "skill/valory/subscription_abci/0.1.0": "bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa" }, "third_party": { "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index 525b5310..b4851e37 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -13,7 +13,7 @@ connections: - valory/ipfs:0.1.0:bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq - valory/ledger:0.19.0:bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm +- valory/websocket_client:0.1.0:bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm contracts: - valory/agent_mech:0.1.0:bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e - valory/agent_registry:0.1.0:bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu @@ -26,27 +26,27 @@ protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu - valory/acn:1.1.0:bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu -- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq +- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/default:1.0.0:bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 +- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q skills: - valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq -- valory/contract_subscription:0.1.0:bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4 -- valory/mech_abci:0.1.0:bafybeieimp7xzxcnbzsuunf2xkcy5juulhmzsmkq2v3sw3o3lgssb53cnu +- valory/contract_subscription:0.1.0:bafybeibaiesuhgnnato46w6tuiqesg6obcjcrmka6yzmt2clzm4fuyikxu +- valory/mech_abci:0.1.0:bafybeig3kkrxzn5rte4gwjw2ori3bonnhmh7ncteyu7ffnjlu3wgthcz5u - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba -- valory/subscription_abci:0.1.0:bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie -- valory/task_execution:0.1.0:bafybeicsbtef4hbuuevraqdyicswlnc3i54fzxeqcjzh5soo5wjvh5ecni -- valory/task_submission_abci:0.1.0:bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi +- valory/subscription_abci:0.1.0:bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa +- valory/task_execution:0.1.0:bafybeif64ca45o54ue6dlljbm5fkqmy3vzsyq7pgtlc7g4rsxeiyx6pbeq +- valory/task_submission_abci:0.1.0:bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja -- valory/websocket_client:0.1.0:bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta +- valory/websocket_client:0.1.0:bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/connections/http_client/__init__.py b/packages/valory/connections/http_client/__init__.py index 6c4b0765..c7970685 100644 --- a/packages/valory/connections/http_client/__init__.py +++ b/packages/valory/connections/http_client/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/http_client/connection.py b/packages/valory/connections/http_client/connection.py index 4eeb1249..232335e7 100644 --- a/packages/valory/connections/http_client/connection.py +++ b/packages/valory/connections/http_client/connection.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/http_client/tests/__init__.py b/packages/valory/connections/http_client/tests/__init__.py index f7c0817d..283a004e 100644 --- a/packages/valory/connections/http_client/tests/__init__.py +++ b/packages/valory/connections/http_client/tests/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/http_client/tests/test_http_client.py b/packages/valory/connections/http_client/tests/test_http_client.py index 85f92b50..131b1867 100644 --- a/packages/valory/connections/http_client/tests/test_http_client.py +++ b/packages/valory/connections/http_client/tests/test_http_client.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/websocket_client/__init__.py b/packages/valory/connections/websocket_client/__init__.py index c3ad65f8..3eaf6026 100644 --- a/packages/valory/connections/websocket_client/__init__.py +++ b/packages/valory/connections/websocket_client/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/websocket_client/connection.py b/packages/valory/connections/websocket_client/connection.py index 025835ad..2dcb0ce0 100644 --- a/packages/valory/connections/websocket_client/connection.py +++ b/packages/valory/connections/websocket_client/connection.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/websocket_client/connection.yaml b/packages/valory/connections/websocket_client/connection.yaml index 0116c6a8..480764ee 100644 --- a/packages/valory/connections/websocket_client/connection.yaml +++ b/packages/valory/connections/websocket_client/connection.yaml @@ -7,13 +7,13 @@ description: Simple Websocket Client to allow the agent to interact with a Webso license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeicyrebbic2h3ytyxeg776zelg2bpshcepnkm4qc5oypqqqfq3sqmq - connection.py: bafybeiakisvetjqs3qqlpdo5asm45gfygx35lw7cciypaneyqieyf6ul34 + __init__.py: bafybeiblpz4ectgegknj5dwd3jmce4w3pmrqhfzapfatqztrt3l6xtq7zq + connection.py: bafybeiadziz6xynw7nnqjxcyklo54ibplqesyhqjysia64y7mhkdk3nvly readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 +- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q class_name: WebSocketClient config: endpoint: null diff --git a/packages/valory/protocols/__init__.py b/packages/valory/protocols/__init__.py index e69de29b..60cdc1b6 100644 --- a/packages/valory/protocols/__init__.py +++ b/packages/valory/protocols/__init__.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ diff --git a/packages/valory/protocols/acn_data_share/__init__.py b/packages/valory/protocols/acn_data_share/__init__.py index e8569f34..8f2ff958 100644 --- a/packages/valory/protocols/acn_data_share/__init__.py +++ b/packages/valory/protocols/acn_data_share/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/dialogues.py b/packages/valory/protocols/acn_data_share/dialogues.py index 12e8f713..ce7cc75a 100644 --- a/packages/valory/protocols/acn_data_share/dialogues.py +++ b/packages/valory/protocols/acn_data_share/dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/message.py b/packages/valory/protocols/acn_data_share/message.py index d622d773..0d376c70 100644 --- a/packages/valory/protocols/acn_data_share/message.py +++ b/packages/valory/protocols/acn_data_share/message.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/protocol.yaml b/packages/valory/protocols/acn_data_share/protocol.yaml index 2afaf59d..b8d837cc 100644 --- a/packages/valory/protocols/acn_data_share/protocol.yaml +++ b/packages/valory/protocols/acn_data_share/protocol.yaml @@ -8,14 +8,14 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiexqywrjzv4ajzesbzaw7bujvmgadsqtxzfnerwqogi7nz6jcvp6u - __init__.py: bafybeif7fohg7vfalh35nyuqchdw5lnjblqtodhxmcnnhycderagqs46du + __init__.py: bafybeidy3rxwh6zfwyzhdykymtwazgdcahfedthq57f2dotybvk6lqdepq acn_data_share.proto: bafybeiell3oa6eo2oogbgymu5cupeakbkpkmxkh7gossgy4jdip7lrr7tu acn_data_share_pb2.py: bafybeifyna3ykdjrh2t5etusxc22hiplfvekh6vjlrnom2tzgcolmhsslu - dialogues.py: bafybeigtnzvicosvctjk67qni5mu3yy77fp5u2xpb2eszwfht7igeaip4m - message.py: bafybeiggjuq6fooopoy423v6huhfk6szyzdlgkxk5ardlyllawj2qykhfq - serialization.py: bafybeihi2cogvek6irdncct5ga2ztdeqho4eai6krtk354yq2ip2d5f3se - tests/test_acn_data_share_dialogues.py: bafybeie5kcwchjl5vozdlrnwhmim4kffa7fr5zsqjy3r27mjzuilaog5su - tests/test_acn_data_share_messages.py: bafybeifap2cnraojc4ohd46rrjgusi6iisjm5tum2bs4sfgdocx5zjsqea + dialogues.py: bafybeieg4ksez4v2pnosvin6jmevflofjpnupinxu352k5qe7pamw5tmme + message.py: bafybeibvhh5aaqp5gl55rtlnvlhbtbkbrfvppmyr6pu2pxn3njqvtl6u4a + serialization.py: bafybeiafsqn27z6pfukxbqe5quni34vfnkys7wcxl5qxcib77ew2feizwm + tests/test_acn_data_share_dialogues.py: bafybeiceldlprmdjvhphsv2ezyixlglsrsie3lurek7izi6z3vmtmyru7i + tests/test_acn_data_share_messages.py: bafybeicktuow6ekap5o3yk6pyg3shoruebyegcjemlqoq3kahr3h2f7zuu fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/acn_data_share/serialization.py b/packages/valory/protocols/acn_data_share/serialization.py index 587e1578..1161def3 100644 --- a/packages/valory/protocols/acn_data_share/serialization.py +++ b/packages/valory/protocols/acn_data_share/serialization.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py index 9582e4ce..93771420 100644 --- a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py +++ b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py index e1090720..bcd33a7e 100644 --- a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py +++ b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/__init__.py b/packages/valory/protocols/default/__init__.py index 0be9c200..60a9b959 100644 --- a/packages/valory/protocols/default/__init__.py +++ b/packages/valory/protocols/default/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/dialogues.py b/packages/valory/protocols/default/dialogues.py index 28e7d9ad..41ef1312 100644 --- a/packages/valory/protocols/default/dialogues.py +++ b/packages/valory/protocols/default/dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/message.py b/packages/valory/protocols/default/message.py index fad168f3..4bdaeac4 100644 --- a/packages/valory/protocols/default/message.py +++ b/packages/valory/protocols/default/message.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/serialization.py b/packages/valory/protocols/default/serialization.py index b6e3317c..ea97707d 100644 --- a/packages/valory/protocols/default/serialization.py +++ b/packages/valory/protocols/default/serialization.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/tests/test_default_dialogues.py b/packages/valory/protocols/default/tests/test_default_dialogues.py index 69e8deb0..8f2f36b9 100644 --- a/packages/valory/protocols/default/tests/test_default_dialogues.py +++ b/packages/valory/protocols/default/tests/test_default_dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/__init__.py b/packages/valory/protocols/websocket_client/__init__.py index 12836897..0f46df29 100644 --- a/packages/valory/protocols/websocket_client/__init__.py +++ b/packages/valory/protocols/websocket_client/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/dialogues.py b/packages/valory/protocols/websocket_client/dialogues.py index e360fc19..f91599a3 100644 --- a/packages/valory/protocols/websocket_client/dialogues.py +++ b/packages/valory/protocols/websocket_client/dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/message.py b/packages/valory/protocols/websocket_client/message.py index 27ae91af..21d9b227 100644 --- a/packages/valory/protocols/websocket_client/message.py +++ b/packages/valory/protocols/websocket_client/message.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/protocol.yaml b/packages/valory/protocols/websocket_client/protocol.yaml index 7872ef30..87956f31 100644 --- a/packages/valory/protocols/websocket_client/protocol.yaml +++ b/packages/valory/protocols/websocket_client/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeieot47xhqlvc3dwl2hc4yq3f6wcva7xf5dx5wz5n4ir6woknyqrsi - __init__.py: bafybeifhhqtcfac5lcrjxrcdpsrs3kyyxt7uf2qv2a4ivllyyt3c62q4aq - dialogues.py: bafybeienrjdbwqsx4dikqo3wjfgner5pz5qtbwfb2qtzsukn6iog6e4iyi - message.py: bafybeigpuhz4fw5ng3qay7duci7qhb4rj336wb2qwiyszddkjmnjebf72e - serialization.py: bafybeiar6guqw2qgofycbjuyhy7puxill5wcy6hsyrqmbkzcjzitxuws5i - tests/test_websocket_client_dialogues.py: bafybeig7cd7mllqmk6w4oaz7wqwubueaa4hpofgplhzeivqtwihalhpnne - tests/test_websocket_client_messages.py: bafybeibboz4j4itkwjh5ahza53v4d4dew3qxqq6fsbzragz76wnjin254u + __init__.py: bafybeibtetavf2d4i6m6opwg672prrkzmpgblew7g2pvaozuvzxf7jdifa + dialogues.py: bafybeifans57uwhcy3zfj3uoynreg7my7yj4qc4ut4x6p37vgwhidwgra4 + message.py: bafybeicdcrshwx5jf3epyzzj2opacgvzzp3qfs4eougfpfgdhu7tooxkjy + serialization.py: bafybeig3wpnbr4v2ir7emji6urraeqepehevxjhs2i2z5bnd7ldgmta4gi + tests/test_websocket_client_dialogues.py: bafybeidefxcd7j5qeou7pbzffyv6kk2fji2txulirabov6xiu7b5bjqndy + tests/test_websocket_client_messages.py: bafybeiagmqf36glbu326d7nptqfuqjgyafjja5rl4jswvc4jmawexzpjya websocket_client.proto: bafybeifqkmkqzbepxkj56o45ljysxujmoftjlm6pkllj7t4tbryqt42ql4 websocket_client_pb2.py: bafybeickjzx5ikfg5hwisfiypifzvnp4dxecqrqf6op2gzcaojmuvkcdlq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/websocket_client/serialization.py b/packages/valory/protocols/websocket_client/serialization.py index 18b74ec6..5741b21b 100644 --- a/packages/valory/protocols/websocket_client/serialization.py +++ b/packages/valory/protocols/websocket_client/serialization.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py b/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py index 3f7eb0c8..2f2c5332 100644 --- a/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py +++ b/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py b/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py index f0f7b63c..dec6c455 100644 --- a/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py +++ b/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index c43371e6..b34b1e2a 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeiazsvppldwszwte6m2htcd3glh2kk35cb7fql73stdeijcbphilgq +agent: valory/mech:0.1.0:bafybeigkgbssv6uihdreow3dajv3vx46eeukr3xw3ycu2leyemodcf2qlu number_of_agents: 4 deployment: agent: @@ -232,6 +232,8 @@ type: connection chain_id: ${ETHEREUM_LEDGER_CHAIN_ID:int:1} poa_chain: ${ETHEREUM_LEDGER_IS_POA_CHAIN:bool:false} default_gas_price_strategy: ${ETHEREUM_LEDGER_PRICING:str:eip1559} + gnosis: + address: ${GNOSIS_RPC_0:str:http://host.docker.internal:8545} 1: config: ledger_apis: @@ -240,6 +242,8 @@ type: connection chain_id: ${ETHEREUM_LEDGER_CHAIN_ID:int:1} poa_chain: ${ETHEREUM_LEDGER_IS_POA_CHAIN:bool:false} default_gas_price_strategy: ${ETHEREUM_LEDGER_PRICING:str:eip1559} + gnosis: + address: ${GNOSIS_RPC_1:str:http://host.docker.internal:8545} 2: config: ledger_apis: @@ -248,6 +252,8 @@ type: connection chain_id: ${ETHEREUM_LEDGER_CHAIN_ID:int:1} poa_chain: ${ETHEREUM_LEDGER_IS_POA_CHAIN:bool:false} default_gas_price_strategy: ${ETHEREUM_LEDGER_PRICING:str:eip1559} + gnosis: + address: ${GNOSIS_RPC_2:str:http://host.docker.internal:8545} 3: config: ledger_apis: @@ -256,6 +262,8 @@ type: connection chain_id: ${ETHEREUM_LEDGER_CHAIN_ID:int:1} poa_chain: ${ETHEREUM_LEDGER_IS_POA_CHAIN:bool:false} default_gas_price_strategy: ${ETHEREUM_LEDGER_PRICING:str:eip1559} + gnosis: + address: ${GNOSIS_RPC_3:str:http://host.docker.internal:8545} --- public_id: valory/p2p_libp2p_client:0.1.0 type: connection diff --git a/packages/valory/skills/contract_subscription/__init__.py b/packages/valory/skills/contract_subscription/__init__.py index 802a2467..0565bfba 100644 --- a/packages/valory/skills/contract_subscription/__init__.py +++ b/packages/valory/skills/contract_subscription/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/behaviours.py b/packages/valory/skills/contract_subscription/behaviours.py index 4ca00ab9..00728357 100644 --- a/packages/valory/skills/contract_subscription/behaviours.py +++ b/packages/valory/skills/contract_subscription/behaviours.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/dialogues.py b/packages/valory/skills/contract_subscription/dialogues.py index 4b74ce3d..7d81e90d 100644 --- a/packages/valory/skills/contract_subscription/dialogues.py +++ b/packages/valory/skills/contract_subscription/dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/handlers.py b/packages/valory/skills/contract_subscription/handlers.py index 880d7afe..99a2dcca 100644 --- a/packages/valory/skills/contract_subscription/handlers.py +++ b/packages/valory/skills/contract_subscription/handlers.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/skill.yaml b/packages/valory/skills/contract_subscription/skill.yaml index d6821587..54acff3a 100644 --- a/packages/valory/skills/contract_subscription/skill.yaml +++ b/packages/valory/skills/contract_subscription/skill.yaml @@ -7,19 +7,19 @@ description: A simple skill to subscribe to events on a particular contract usin license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeihmbiavlq5ekiat57xuekfuxjkoniizurn77hivqwtsaqydv32owu - behaviours.py: bafybeihhhfpan6i5vzxaoggmnj5jw556wnxz75ufcmiucq3yygrbmlsdpm - dialogues.py: bafybeigxlbj6mte72ko7osykjfilg4udfmnrnhxtoib5k4xcxde6qi3niu - handlers.py: bafybeiasnq4qlq5qys4ugktetmaeqnreaswvaqyi7zvjjlifmhbylucasu + __init__.py: bafybeigz755syta7a5egb43q57c4wwaut7cazx3rbvjsbvbsmysnme6pu4 + behaviours.py: bafybeiey452ydculctkvcb6hkk6fxt4t3zhbm6ppmeo6ljhrpfjgve5x5y + dialogues.py: bafybeihboynznoh6sts3joz3suxk7n65rvp7odmxcwsma7uvkutfli4pne + handlers.py: bafybeihk3jdquh5psaktsoh6663fdwqyqwiswfvxu765r5noyqvfddhbbe models.py: bafybeiafdc32u7yjph4kb4tvsdsaz4tpzo25m3gmthssc62newpgvrros4 fingerprint_ignore_patterns: [] connections: -- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm +- valory/websocket_client:0.1.0:bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm contracts: [] protocols: -- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 +- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q skills: -- valory/websocket_client:0.1.0:bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta +- valory/websocket_client:0.1.0:bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm behaviours: contract_subscriptions: args: {} diff --git a/packages/valory/skills/mech_abci/skill.yaml b/packages/valory/skills/mech_abci/skill.yaml index aedb1f16..7ea9f51a 100644 --- a/packages/valory/skills/mech_abci/skill.yaml +++ b/packages/valory/skills/mech_abci/skill.yaml @@ -23,10 +23,10 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba -- valory/task_submission_abci:0.1.0:bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi +- valory/task_submission_abci:0.1.0:bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja -- valory/subscription_abci:0.1.0:bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie +- valory/subscription_abci:0.1.0:bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa behaviours: main: args: {} diff --git a/packages/valory/skills/subscription_abci/skill.yaml b/packages/valory/skills/subscription_abci/skill.yaml index fa5d1058..174acd11 100644 --- a/packages/valory/skills/subscription_abci/skill.yaml +++ b/packages/valory/skills/subscription_abci/skill.yaml @@ -22,7 +22,7 @@ contracts: - valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y protocols: -- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq +- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka skills: - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq diff --git a/packages/valory/skills/task_execution/behaviours.py b/packages/valory/skills/task_execution/behaviours.py index b0c89660..b28c33f6 100644 --- a/packages/valory/skills/task_execution/behaviours.py +++ b/packages/valory/skills/task_execution/behaviours.py @@ -466,7 +466,7 @@ def _handle_store_response(self, message: IpfsMessage, dialogue: Dialogue) -> No self.context.logger.info(f"Dynamic pricing is enabled for task {req_id}.") task_result = encode( ["uint256", "bytes"], [cost, bytes.fromhex(task_result)] - ) + ).hex() done_task["task_result"] = task_result # add to done tasks, in thread safe way diff --git a/packages/valory/skills/task_execution/models.py b/packages/valory/skills/task_execution/models.py index b3aed992..d2bf7a3d 100644 --- a/packages/valory/skills/task_execution/models.py +++ b/packages/valory/skills/task_execution/models.py @@ -100,14 +100,17 @@ def _parse_mech_configs(self, kwargs: Dict) -> Dict[str, MechConfig]: mech_configs_json = self._nested_list_todict_workaround( kwargs, "mech_to_config" ) + mech_configs_json = { + key: {value[0]: value[1]} for key, value in mech_configs_json.items() + } + mech_configs = { mech: MechConfig.from_dict(config) for mech, config in mech_configs_json.items() } - for self.agent_mech_contract_addresses in mech_configs.keys(): + for address in self.agent_mech_contract_addresses: enforce( - self.agent_mech_contract_addresses - in self.agent_mech_contract_addresses, - f"agent_mech_contract_addresses {self.agent_mech_contract_addresses} must be in mech_configs!", + address in mech_configs, + f"agent_mech_contract_addresses {address} must be in mech_configs!", ) return mech_configs diff --git a/packages/valory/skills/task_execution/skill.yaml b/packages/valory/skills/task_execution/skill.yaml index d8fec078..11ec8a07 100644 --- a/packages/valory/skills/task_execution/skill.yaml +++ b/packages/valory/skills/task_execution/skill.yaml @@ -7,14 +7,14 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidqhvvlnthkbnmrdkdeyjyx2f2ab6z4xdgmagh7welqnh2v6wczx4 - behaviours.py: bafybeihxko4mv7dpeypi6g2v4zgdmwwvurnfd3yzdgyxvxx6oydr5izjd4 + behaviours.py: bafybeiclizwd4icgkkof7zx4z5ckruckzlq7b5mho3flicpobahgsqguya dialogues.py: bafybeid4zxalqdlo5mw4yfbuf34hx4jp5ay5z6chm4zviwu4cj7fudtwca handlers.py: bafybeidbt5ezj74cgfogk3w4uw4si2grlnk5g54veyumw7g5yh6gdscywu - models.py: bafybeiaz5lwhqzfv2azbdqjozwm5sums5eoingrhd2wz6syr4qiddftbhm + models.py: bafybeicnze4r7ge7ul62fvm5krbdymqee3rtb5q5wz73bwozurttvdvo6u utils/__init__.py: bafybeiccdijaigu6e5p2iruwo5mkk224o7ywedc7nr6xeu5fpmhjqgk24e utils/benchmarks.py: bafybeibdwt4svz24ahok4x4h2rpeotlmlmvifccd27oizsz5bjwj6dqree - utils/cost_calculation.py: bafybeib7wpojbriolfvrdb57ts6wl3cz5p4is2myofpvde7isr5iqztjem - utils/ipfs.py: bafybeibffem6y23fxdilc373kge4z6ht7phshbnlqbl55irb2xr7brdrlm + utils/cost_calculation.py: bafybeighafxied73w3mcmgziwfp3u2x6t4qlztw4kyekyq2ddgyhdge74q + utils/ipfs.py: bafybeic7cbuv3tomi2xv7h2qowrqnpoufpanngzlgzljl4ptimpss3meqm utils/task.py: bafybeieuziu7owtk543z3umgmayhjh67klftk7vrhz24l6rlaii5lvkqh4 fingerprint_ignore_patterns: [] connections: @@ -24,7 +24,7 @@ connections: contracts: - valory/agent_mech:0.1.0:bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e protocols: -- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq +- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/default:1.0.0:bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq diff --git a/packages/valory/skills/task_execution/utils/cost_calculation.py b/packages/valory/skills/task_execution/utils/cost_calculation.py index a521fd26..efd19acd 100644 --- a/packages/valory/skills/task_execution/utils/cost_calculation.py +++ b/packages/valory/skills/task_execution/utils/cost_calculation.py @@ -18,6 +18,7 @@ # ------------------------------------------------------------------------------ """Calculate the cost for tools.""" import logging +import math from typing import Any, Dict, cast from packages.valory.skills.task_execution import PUBLIC_ID @@ -27,7 +28,7 @@ f"aea.packages.{PUBLIC_ID.author}.contracts.{PUBLIC_ID.name}.utils.cost_calculation" ) -DEFAULT_PRICE = 1 * 10**16 +DEFAULT_PRICE = 1 def get_cost_for_done_task( @@ -46,4 +47,6 @@ def get_cost_for_done_task( return fallback_price total_cost = cast(float, total_cost) - return int(total_cost * 10**18) + # 0.01 token (ex. xDAI/USDC) -> 1 NFT credit + cost_in_credits = math.ceil(total_cost * 100) + return cost_in_credits diff --git a/packages/valory/skills/task_execution/utils/ipfs.py b/packages/valory/skills/task_execution/utils/ipfs.py index c10c3b54..a6c12d8b 100644 --- a/packages/valory/skills/task_execution/utils/ipfs.py +++ b/packages/valory/skills/task_execution/utils/ipfs.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # -# Copyright 2023 Valory AG +# Copyright 2023-2024 Valory AG # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/valory/skills/task_submission_abci/skill.yaml b/packages/valory/skills/task_submission_abci/skill.yaml index c39ac630..1075e642 100644 --- a/packages/valory/skills/task_submission_abci/skill.yaml +++ b/packages/valory/skills/task_submission_abci/skill.yaml @@ -26,7 +26,7 @@ contracts: - valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm - valory/hash_checkpoint:0.1.0:bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa protocols: -- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq +- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru skills: diff --git a/packages/valory/skills/websocket_client/__init__.py b/packages/valory/skills/websocket_client/__init__.py index 00f1495b..5679be70 100644 --- a/packages/valory/skills/websocket_client/__init__.py +++ b/packages/valory/skills/websocket_client/__init__.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/websocket_client/behaviours.py b/packages/valory/skills/websocket_client/behaviours.py index bbcd1f8c..6b38dffd 100644 --- a/packages/valory/skills/websocket_client/behaviours.py +++ b/packages/valory/skills/websocket_client/behaviours.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/websocket_client/dialogues.py b/packages/valory/skills/websocket_client/dialogues.py index 03269db5..ab2ce60f 100644 --- a/packages/valory/skills/websocket_client/dialogues.py +++ b/packages/valory/skills/websocket_client/dialogues.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + """ Dialogues """ diff --git a/packages/valory/skills/websocket_client/handlers.py b/packages/valory/skills/websocket_client/handlers.py index 20f061b5..9bd3d0b2 100644 --- a/packages/valory/skills/websocket_client/handlers.py +++ b/packages/valory/skills/websocket_client/handlers.py @@ -1,3 +1,24 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# ------------------------------------------------------------------------------ +# +# Copyright 2021-2023 Valory AG +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------------ + + # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/websocket_client/skill.yaml b/packages/valory/skills/websocket_client/skill.yaml index 2889eef8..309806ed 100644 --- a/packages/valory/skills/websocket_client/skill.yaml +++ b/packages/valory/skills/websocket_client/skill.yaml @@ -6,17 +6,17 @@ description: Websocket client. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeibgl4hnpsd3vokfs6cfkg4elgqu7nm4yhs6sh373j6erwvgpjdqeu - behaviours.py: bafybeianfyloqfumjydjgogjg2sr5wrw7epzjt5o7sxv4drfasl2kgmq4i - dialogues.py: bafybeicc26sbiipnfublma3ywvh54elbx5y5sj7xckq3xyqyfmmoamiouy - handlers.py: bafybeibqfinswattz7gu4pijjxvixp5gtrgfz5idsz3uzlgrjw2vanjiu4 + __init__.py: bafybeibkv63mtgar5snm2kqqh2dz4undeerm6kpcx5e3m52oksor6zccly + behaviours.py: bafybeidntlztp7yzlmsj2odqu3xkylp54iugbbetg7olkp4r3boqvykkca + dialogues.py: bafybeia6it4ogryyuxrlujf47l7cllfdxq5cevumnjqskhvfoerelkgif4 + handlers.py: bafybeidtgq7jmrfe4x64u3rpea5yzqmpu5y6pomlo3fedo4ijr62akmmke models.py: bafybeicuei7xoozvgr6kyp6cp7b6gqonlkmlgkvhhff37iecnjqzhkvbgi fingerprint_ignore_patterns: [] connections: -- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm +- valory/websocket_client:0.1.0:bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm contracts: [] protocols: -- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 +- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q skills: [] behaviours: websocket_subscription: From 5edd83a1e0b5009344f9b03126298fa493adb6f9 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 14 Feb 2024 20:58:52 +0100 Subject: [PATCH 3/7] fix: tool degradation --- .../native_transfer_request.py | 2 +- tools/openai_request/openai_request.py | 12 ++++++------ .../optimization_by_prompting.py | 2 +- tools/prediction_request/prediction_request.py | 10 +++++----- .../prediction_request_claude.py | 8 ++++---- .../prediction_sentence_embedding.py | 6 +++--- .../prediction_request_sme/prediction_request_sme.py | 5 ++--- .../prediction_sum_url_content.py | 6 +++--- tools/stability_ai_request/stabilityai_request.py | 7 ++++--- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tools/native_transfer_request/native_transfer_request.py b/tools/native_transfer_request/native_transfer_request.py index dd87799b..b0553327 100644 --- a/tools/native_transfer_request/native_transfer_request.py +++ b/tools/native_transfer_request/native_transfer_request.py @@ -119,7 +119,7 @@ def native_transfer( # parse the response to get the transaction object string itself parsed_txs = ast.literal_eval(response) except SyntaxError: - return response, None, None + return response, None, None, None # build the transaction object, unknowns are referenced from parsed_txs transaction = { diff --git a/tools/openai_request/openai_request.py b/tools/openai_request/openai_request.py index 5515c38f..5ea87827 100644 --- a/tools/openai_request/openai_request.py +++ b/tools/openai_request/openai_request.py @@ -61,7 +61,7 @@ def count_tokens(text: str, model: str) -> int: ALLOWED_TOOLS = [PREFIX + value for values in ENGINES.values() for value in values] -def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: +def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any, Any]: """Run the task""" with OpenAIClientManager(kwargs["api_keys"]["openai"]): max_tokens = kwargs.get("max_tokens", DEFAULT_OPENAI_SETTINGS["max_tokens"]) @@ -70,12 +70,12 @@ def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: tool = kwargs["tool"] counter_callback = kwargs.get("counter_callback", None) if tool not in ALLOWED_TOOLS: - return f"Tool {tool} is not in the list of supported tools.", None, None + return f"Tool {tool} is not in the list of supported tools.", None, None, None engine = tool.replace(PREFIX, "") moderation_result = client.moderations.create(input=prompt) if moderation_result.results[0].flagged: - return "Moderation flagged the prompt as in violation of terms.", None, None + return "Moderation flagged the prompt as in violation of terms.", None, None, None if engine in ENGINES["chat"]: messages = [ @@ -91,9 +91,9 @@ def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: timeout=120, stop=None, ) - return response.choices[0].message.content, prompt, None + return response.choices[0].message.content, prompt, None, None response = client.completions.create( - engine=engine, + model=engine, prompt=prompt, temperature=temperature, max_tokens=max_tokens, @@ -102,4 +102,4 @@ def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: timeout=120, presence_penalty=0, ) - return response.choices[0].text, prompt, counter_callback + return response.choices[0].text, prompt, None, counter_callback diff --git a/tools/optimization_by_prompting/optimization_by_prompting.py b/tools/optimization_by_prompting/optimization_by_prompting.py index 7759e24a..7e809744 100644 --- a/tools/optimization_by_prompting/optimization_by_prompting.py +++ b/tools/optimization_by_prompting/optimization_by_prompting.py @@ -387,7 +387,7 @@ def fetch_additional_information( return "\n".join(["- " + text for text in texts]) -def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: +def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any, Any]: """Run the task""" with OpenAIClientManager(kwargs["api_keys"]["openai"]): tool = kwargs["tool"] diff --git a/tools/prediction_request/prediction_request.py b/tools/prediction_request/prediction_request.py index 0017019e..8025c221 100644 --- a/tools/prediction_request/prediction_request.py +++ b/tools/prediction_request/prediction_request.py @@ -261,7 +261,7 @@ def fetch_additional_information( num_words: Optional[int], counter_callback: Optional[Callable] = None, source_links: Optional[List[str]] = None, -) -> str: +) -> Tuple[str, Any]: """Fetch additional information.""" url_query_prompt = URL_QUERY_PROMPT.format(user_prompt=prompt) moderation_result = client.moderations.create(input=url_query_prompt) @@ -363,7 +363,7 @@ def summarize(text: str, compression_factor: float, vocab: str) -> str: return summary_text -def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: +def run(**kwargs) -> Tuple[Optional[str], Any, Optional[Dict[str, Any]], Any]: """Run the task""" with OpenAIClientManager(kwargs["api_keys"]["openai"]): tool = kwargs["tool"] @@ -409,7 +409,7 @@ def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: ) moderation_result = client.moderations.create(input=prediction_prompt) if moderation_result.results[0].flagged: - return "Moderation flagged the prompt as in violation of terms.", None, None + return "Moderation flagged the prompt as in violation of terms.", None, None, None messages = [ {"role": "system", "content": "You are a helpful assistant."}, {"role": "user", "content": prediction_prompt}, @@ -430,5 +430,5 @@ def run(**kwargs) -> Tuple[Optional[str], Optional[Dict[str, Any]], Any]: model=engine, token_counter=count_tokens, ) - return response.choices[0].message.content, prediction_prompt, counter_callback - return response.choices[0].message.content, prediction_prompt, None + return response.choices[0].message.content, prediction_prompt, None, counter_callback + return response.choices[0].message.content, prediction_prompt, None, None diff --git a/tools/prediction_request_claude/prediction_request_claude.py b/tools/prediction_request_claude/prediction_request_claude.py index e7682f78..a2461491 100644 --- a/tools/prediction_request_claude/prediction_request_claude.py +++ b/tools/prediction_request_claude/prediction_request_claude.py @@ -32,7 +32,7 @@ from googleapiclient.discovery import build NUM_URLS_EXTRACT = 5 -DEFAULT_NUM_WORDS: Dict[str, Optional[int]] = defaultdict(lambda: 300) +DEFAULT_NUM_WORDS = 300 DEFAULT_OPENAI_SETTINGS = { "max_tokens": 500, "temperature": 0.7, @@ -259,7 +259,7 @@ def fetch_additional_information( return "\n".join(["- " + text for text in texts]), None -def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: +def run(**kwargs) -> Tuple[Optional[str], Any, Optional[Dict[str, Any]], Any]: """Run the task""" tool = kwargs["tool"] prompt = kwargs["prompt"] @@ -308,6 +308,6 @@ def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: output_prompt=completion.completion, token_counter=count_tokens, ) - return completion.completion, prediction_prompt, counter_callback + return completion.completion, prediction_prompt, None, counter_callback - return completion.completion, prediction_prompt, None + return completion.completion, prediction_prompt, None, None diff --git a/tools/prediction_request_embedding/prediction_sentence_embedding.py b/tools/prediction_request_embedding/prediction_sentence_embedding.py index b8d133f4..d4262eeb 100644 --- a/tools/prediction_request_embedding/prediction_sentence_embedding.py +++ b/tools/prediction_request_embedding/prediction_sentence_embedding.py @@ -1105,7 +1105,7 @@ def fetch_additional_information( return additional_informations -def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: +def run(**kwargs) -> Tuple[Optional[str], Any, Optional[Dict[str, Any]], Any]: """ Run the task with the given arguments. @@ -1187,7 +1187,7 @@ def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: # Perform moderation moderation_result = client.moderations.create(input=prediction_prompt) if moderation_result.results[0].flagged: - return "Moderation flagged the prompt as in violation of terms.", None, None + return "Moderation flagged the prompt as in violation of terms.", None, None, None # Create messages for the OpenAI engine messages = [ @@ -1205,4 +1205,4 @@ def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: timeout=150, stop=None, ) - return response.choices[0].message.content, prediction_prompt, None + return response.choices[0].message.content, prediction_prompt, None, None diff --git a/tools/prediction_request_sme/prediction_request_sme.py b/tools/prediction_request_sme/prediction_request_sme.py index b99dca3b..363da469 100644 --- a/tools/prediction_request_sme/prediction_request_sme.py +++ b/tools/prediction_request_sme/prediction_request_sme.py @@ -303,7 +303,6 @@ def fetch_additional_information( json_data["queries"], api_key=google_api_key, engine=google_engine, - num_urls=num_urls, ) texts = extract_texts(urls, num_words) else: @@ -433,5 +432,5 @@ def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: model=engine, token_counter=count_tokens, ) - return response.choices[0].message.content, prediction_prompt, counter_callback - return response.choices[0].message.content, prediction_prompt, None + return response.choices[0].message.content, prediction_prompt, None, counter_callback + return response.choices[0].message.content, prediction_prompt, None, None diff --git a/tools/prediction_sum_url_content/prediction_sum_url_content.py b/tools/prediction_sum_url_content/prediction_sum_url_content.py index 68e11786..d411584c 100644 --- a/tools/prediction_sum_url_content/prediction_sum_url_content.py +++ b/tools/prediction_sum_url_content/prediction_sum_url_content.py @@ -1049,7 +1049,7 @@ def fetch_additional_information( return additional_informations -def run(**kwargs) -> Tuple[str, Optional[Dict[str, Any]], Any]: +def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: """ Run the task with the given arguments. @@ -1155,7 +1155,7 @@ def run(**kwargs) -> Tuple[str, Optional[Dict[str, Any]], Any]: # Perform moderation moderation_result = client.moderations.create(input=prediction_prompt) if moderation_result.results[0].flagged: - return "Moderation flagged the prompt as in violation of terms.", None, None + return "Moderation flagged the prompt as in violation of terms.", None, None, None # Create messages for the OpenAI engine messages = [ @@ -1174,4 +1174,4 @@ def run(**kwargs) -> Tuple[str, Optional[Dict[str, Any]], Any]: stop=None, ) print(f"RESPONSE: {response}") - return response.choices[0].message.content, None, None + return response.choices[0].message.content, None, None, None diff --git a/tools/stability_ai_request/stabilityai_request.py b/tools/stability_ai_request/stabilityai_request.py index c7703978..add4b651 100644 --- a/tools/stability_ai_request/stabilityai_request.py +++ b/tools/stability_ai_request/stabilityai_request.py @@ -68,14 +68,14 @@ class FinishReason(Enum): ERROR = 2 -def run(**kwargs: Any) -> Tuple[str, Optional[str], Optional[Dict[str, Any]]]: +def run(**kwargs) -> Tuple[str, Optional[str], Optional[Dict[str, Any]], Any]: """Run the task""" api_key = kwargs["api_keys"]["stabilityai"] tool = kwargs["tool"] prompt = kwargs["prompt"] if tool not in ALLOWED_TOOLS: - return f"Tool {tool} is not in the list of supported tools.", None + return f"Tool {tool} is not in the list of supported tools.", None, None, None # Place content moderation request here if needed engine = tool.replace(PREFIX, "") @@ -118,9 +118,10 @@ def run(**kwargs: Any) -> Tuple[str, Optional[str], Optional[Dict[str, Any]]]: json=json_params, ) if response.status_code == 200: - return json.dumps(response.json()), None, None + return json.dumps(response.json()), None, None, None return ( f"Error: Non-200 response ({response.status_code}): {response.text}", None, None, + None ) From d206771ab2c6332c691f8824d3210b42619f36cd Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 14 Feb 2024 21:05:50 +0100 Subject: [PATCH 4/7] chore: generators --- packages/packages.json | 6 +++--- packages/valory/agents/mech/aea-config.yaml | 2 +- .../connections/http_client/__init__.py | 21 ------------------- .../connections/http_client/connection.py | 21 ------------------- .../connections/http_client/tests/__init__.py | 21 ------------------- .../http_client/tests/test_http_client.py | 21 ------------------- packages/valory/protocols/default/__init__.py | 21 ------------------- .../valory/protocols/default/dialogues.py | 21 ------------------- packages/valory/protocols/default/message.py | 21 ------------------- .../valory/protocols/default/serialization.py | 21 ------------------- .../default/tests/test_default_dialogues.py | 21 ------------------- packages/valory/services/mech/service.yaml | 2 +- .../valory/skills/task_execution/skill.yaml | 2 +- 13 files changed, 6 insertions(+), 195 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index c8774664..dad707b4 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -2,13 +2,13 @@ "dev": { "connection/valory/websocket_client/0.1.0": "bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm", "skill/valory/contract_subscription/0.1.0": "bafybeibaiesuhgnnato46w6tuiqesg6obcjcrmka6yzmt2clzm4fuyikxu", - "agent/valory/mech/0.1.0": "bafybeigkgbssv6uihdreow3dajv3vx46eeukr3xw3ycu2leyemodcf2qlu", + "agent/valory/mech/0.1.0": "bafybeiebm7qauxogsjjwgotmboxnvpdofcput7ca3zdt6aq4nymqxhwp3e", "skill/valory/mech_abci/0.1.0": "bafybeig3kkrxzn5rte4gwjw2ori3bonnhmh7ncteyu7ffnjlu3wgthcz5u", "contract/valory/agent_mech/0.1.0": "bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e", - "service/valory/mech/0.1.0": "bafybeicfoxom2loawhuju3jscy5efkkuvd73k23shs5plpjipxakcvgs3e", + "service/valory/mech/0.1.0": "bafybeia7ke4u5ku6udhsgfyie4my2by55j6ifm3xpvey4rtm2plvocwisa", "protocol/valory/acn_data_share/0.1.0": "bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji", "skill/valory/task_submission_abci/0.1.0": "bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe", - "skill/valory/task_execution/0.1.0": "bafybeif64ca45o54ue6dlljbm5fkqmy3vzsyq7pgtlc7g4rsxeiyx6pbeq", + "skill/valory/task_execution/0.1.0": "bafybeiejpcwbyhpy4blns5nmvac5wnklk7tngxgak2jqzx7gjzpnhfkl5y", "contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu", "protocol/valory/websocket_client/0.1.0": "bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q", "skill/valory/websocket_client/0.1.0": "bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index b4851e37..caf5974c 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -42,7 +42,7 @@ skills: - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba - valory/subscription_abci:0.1.0:bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa -- valory/task_execution:0.1.0:bafybeif64ca45o54ue6dlljbm5fkqmy3vzsyq7pgtlc7g4rsxeiyx6pbeq +- valory/task_execution:0.1.0:bafybeiejpcwbyhpy4blns5nmvac5wnklk7tngxgak2jqzx7gjzpnhfkl5y - valory/task_submission_abci:0.1.0:bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja diff --git a/packages/valory/connections/http_client/__init__.py b/packages/valory/connections/http_client/__init__.py index c7970685..6c4b0765 100644 --- a/packages/valory/connections/http_client/__init__.py +++ b/packages/valory/connections/http_client/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/http_client/connection.py b/packages/valory/connections/http_client/connection.py index 232335e7..4eeb1249 100644 --- a/packages/valory/connections/http_client/connection.py +++ b/packages/valory/connections/http_client/connection.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/http_client/tests/__init__.py b/packages/valory/connections/http_client/tests/__init__.py index 283a004e..f7c0817d 100644 --- a/packages/valory/connections/http_client/tests/__init__.py +++ b/packages/valory/connections/http_client/tests/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/http_client/tests/test_http_client.py b/packages/valory/connections/http_client/tests/test_http_client.py index 131b1867..85f92b50 100644 --- a/packages/valory/connections/http_client/tests/test_http_client.py +++ b/packages/valory/connections/http_client/tests/test_http_client.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/__init__.py b/packages/valory/protocols/default/__init__.py index 60a9b959..0be9c200 100644 --- a/packages/valory/protocols/default/__init__.py +++ b/packages/valory/protocols/default/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/dialogues.py b/packages/valory/protocols/default/dialogues.py index 41ef1312..28e7d9ad 100644 --- a/packages/valory/protocols/default/dialogues.py +++ b/packages/valory/protocols/default/dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/message.py b/packages/valory/protocols/default/message.py index 4bdaeac4..fad168f3 100644 --- a/packages/valory/protocols/default/message.py +++ b/packages/valory/protocols/default/message.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/serialization.py b/packages/valory/protocols/default/serialization.py index ea97707d..b6e3317c 100644 --- a/packages/valory/protocols/default/serialization.py +++ b/packages/valory/protocols/default/serialization.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/default/tests/test_default_dialogues.py b/packages/valory/protocols/default/tests/test_default_dialogues.py index 8f2f36b9..69e8deb0 100644 --- a/packages/valory/protocols/default/tests/test_default_dialogues.py +++ b/packages/valory/protocols/default/tests/test_default_dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index b34b1e2a..cb9260bd 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeigkgbssv6uihdreow3dajv3vx46eeukr3xw3ycu2leyemodcf2qlu +agent: valory/mech:0.1.0:bafybeiebm7qauxogsjjwgotmboxnvpdofcput7ca3zdt6aq4nymqxhwp3e number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/task_execution/skill.yaml b/packages/valory/skills/task_execution/skill.yaml index 11ec8a07..f92d09cf 100644 --- a/packages/valory/skills/task_execution/skill.yaml +++ b/packages/valory/skills/task_execution/skill.yaml @@ -10,7 +10,7 @@ fingerprint: behaviours.py: bafybeiclizwd4icgkkof7zx4z5ckruckzlq7b5mho3flicpobahgsqguya dialogues.py: bafybeid4zxalqdlo5mw4yfbuf34hx4jp5ay5z6chm4zviwu4cj7fudtwca handlers.py: bafybeidbt5ezj74cgfogk3w4uw4si2grlnk5g54veyumw7g5yh6gdscywu - models.py: bafybeicnze4r7ge7ul62fvm5krbdymqee3rtb5q5wz73bwozurttvdvo6u + models.py: bafybeid6befxrrbiaw7nduz4zgbm5nfc246fn2eb6rfmja6v5hmq4wtcwe utils/__init__.py: bafybeiccdijaigu6e5p2iruwo5mkk224o7ywedc7nr6xeu5fpmhjqgk24e utils/benchmarks.py: bafybeibdwt4svz24ahok4x4h2rpeotlmlmvifccd27oizsz5bjwj6dqree utils/cost_calculation.py: bafybeighafxied73w3mcmgziwfp3u2x6t4qlztw4kyekyq2ddgyhdge74q From 35f26c8ae10bd5567ebeea9451d065ff35df93f7 Mon Sep 17 00:00:00 2001 From: Ardian Date: Wed, 14 Feb 2024 21:06:18 +0100 Subject: [PATCH 5/7] chore: gitleaks --- .gitleaksignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitleaksignore b/.gitleaksignore index 1c42ce39..abf713be 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -20,4 +20,6 @@ a8e306437319e480ae967d24c27b7e0265a853c8:packages/valory/skills/registration_abc a8e306437319e480ae967d24c27b7e0265a853c8:packages/valory/skills/termination_abci/skill.yaml:generic-api-key:84 a8e306437319e480ae967d24c27b7e0265a853c8:packages/valory/skills/transaction_settlement_abci/skill.yaml:generic-api-key:92 ed97b16cdd270e228ecd3d837da4484c09357108:packages/valory/skills/reset_pause_abci/skill.yaml:generic-api-key:80 -0c8c92a4a5e3b94e0f8b8aadb7c104c644f23277:packages/valory/skills/subscription_abci/skill.yaml:generic-api-key:89 \ No newline at end of file +0c8c92a4a5e3b94e0f8b8aadb7c104c644f23277:packages/valory/skills/subscription_abci/skill.yaml:generic-api-key:89 +f92a447c4f4ecbfd32c1096f122bf6a0f555e22a:packages/valory/protocols/websocket_client/protocol.yaml:generic-api-key:15 +f92a447c4f4ecbfd32c1096f122bf6a0f555e22a:packages/valory/protocols/websocket_client/protocol.yaml:generic-api-key:16 From 76e101cc83c5ee35d29227539c91071490c97bf5 Mon Sep 17 00:00:00 2001 From: Ardian Date: Thu, 15 Feb 2024 10:24:45 +0100 Subject: [PATCH 6/7] chore: copyright --- packages/packages.json | 22 +++++++++---------- packages/valory/agents/mech/aea-config.yaml | 18 +++++++-------- .../connections/websocket_client/__init__.py | 21 ------------------ .../websocket_client/connection.py | 21 ------------------ .../websocket_client/connection.yaml | 6 ++--- packages/valory/protocols/__init__.py | 19 ---------------- .../protocols/acn_data_share/__init__.py | 21 ------------------ .../protocols/acn_data_share/dialogues.py | 21 ------------------ .../protocols/acn_data_share/message.py | 21 ------------------ .../protocols/acn_data_share/protocol.yaml | 12 +++++----- .../protocols/acn_data_share/serialization.py | 21 ------------------ .../tests/test_acn_data_share_dialogues.py | 21 ------------------ .../tests/test_acn_data_share_messages.py | 21 ------------------ .../protocols/websocket_client/__init__.py | 21 ------------------ .../protocols/websocket_client/dialogues.py | 21 ------------------ .../protocols/websocket_client/message.py | 21 ------------------ .../protocols/websocket_client/protocol.yaml | 12 +++++----- .../websocket_client/serialization.py | 21 ------------------ .../tests/test_websocket_client_dialogues.py | 21 ------------------ .../tests/test_websocket_client_messages.py | 21 ------------------ packages/valory/services/mech/service.yaml | 2 +- .../skills/contract_subscription/__init__.py | 21 ------------------ .../contract_subscription/behaviours.py | 21 ------------------ .../skills/contract_subscription/dialogues.py | 21 ------------------ .../skills/contract_subscription/handlers.py | 21 ------------------ .../skills/contract_subscription/skill.yaml | 14 ++++++------ packages/valory/skills/mech_abci/skill.yaml | 4 ++-- .../skills/subscription_abci/skill.yaml | 2 +- .../valory/skills/task_execution/skill.yaml | 2 +- .../skills/task_submission_abci/skill.yaml | 2 +- .../skills/websocket_client/__init__.py | 21 ------------------ .../skills/websocket_client/behaviours.py | 21 ------------------ .../skills/websocket_client/dialogues.py | 21 ------------------ .../skills/websocket_client/handlers.py | 21 ------------------ .../valory/skills/websocket_client/skill.yaml | 12 +++++----- 35 files changed, 54 insertions(+), 535 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index dad707b4..82e0ff6a 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,19 +1,19 @@ { "dev": { - "connection/valory/websocket_client/0.1.0": "bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm", - "skill/valory/contract_subscription/0.1.0": "bafybeibaiesuhgnnato46w6tuiqesg6obcjcrmka6yzmt2clzm4fuyikxu", - "agent/valory/mech/0.1.0": "bafybeiebm7qauxogsjjwgotmboxnvpdofcput7ca3zdt6aq4nymqxhwp3e", - "skill/valory/mech_abci/0.1.0": "bafybeig3kkrxzn5rte4gwjw2ori3bonnhmh7ncteyu7ffnjlu3wgthcz5u", + "connection/valory/websocket_client/0.1.0": "bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm", + "skill/valory/contract_subscription/0.1.0": "bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4", + "agent/valory/mech/0.1.0": "bafybeifcrgru4m3wsftglweasvybe7n74dwmyiisjs6kuieooeiagmhthi", + "skill/valory/mech_abci/0.1.0": "bafybeieimp7xzxcnbzsuunf2xkcy5juulhmzsmkq2v3sw3o3lgssb53cnu", "contract/valory/agent_mech/0.1.0": "bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e", - "service/valory/mech/0.1.0": "bafybeia7ke4u5ku6udhsgfyie4my2by55j6ifm3xpvey4rtm2plvocwisa", - "protocol/valory/acn_data_share/0.1.0": "bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji", - "skill/valory/task_submission_abci/0.1.0": "bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe", - "skill/valory/task_execution/0.1.0": "bafybeiejpcwbyhpy4blns5nmvac5wnklk7tngxgak2jqzx7gjzpnhfkl5y", + "service/valory/mech/0.1.0": "bafybeicodktlcyqz76qjmj24inrrqbbied2qeeluao35ajm62txykwli54", + "protocol/valory/acn_data_share/0.1.0": "bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq", + "skill/valory/task_submission_abci/0.1.0": "bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi", + "skill/valory/task_execution/0.1.0": "bafybeidsq3mpnfmjp2jfrurrx3ck3ozwfh7jg4mzhc3742dqyoeijizocq", "contract/valory/agent_registry/0.1.0": "bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu", - "protocol/valory/websocket_client/0.1.0": "bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q", - "skill/valory/websocket_client/0.1.0": "bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm", + "protocol/valory/websocket_client/0.1.0": "bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4", + "skill/valory/websocket_client/0.1.0": "bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta", "contract/valory/hash_checkpoint/0.1.0": "bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa", - "skill/valory/subscription_abci/0.1.0": "bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa" + "skill/valory/subscription_abci/0.1.0": "bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie" }, "third_party": { "skill/valory/transaction_settlement_abci/0.1.0": "bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja", diff --git a/packages/valory/agents/mech/aea-config.yaml b/packages/valory/agents/mech/aea-config.yaml index caf5974c..97691dd7 100644 --- a/packages/valory/agents/mech/aea-config.yaml +++ b/packages/valory/agents/mech/aea-config.yaml @@ -13,7 +13,7 @@ connections: - valory/ipfs:0.1.0:bafybeihx7wb5hngjobw2salzqqryrhxvmxfuw7o2npjyqd2talmh2flqeq - valory/ledger:0.19.0:bafybeia47rr37ianvwsh77tjjpv3nwif5sywhhy2fbdshnz4a2icwln76a - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/websocket_client:0.1.0:bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm +- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm contracts: - valory/agent_mech:0.1.0:bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e - valory/agent_registry:0.1.0:bafybeiargayav6yiztdnwzejoejstcx4idssch2h4f5arlgtzj3tgsgfmu @@ -26,27 +26,27 @@ protocols: - open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii - valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu - valory/acn:1.1.0:bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu -- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji +- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/default:1.0.0:bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q +- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 skills: - valory/abstract_abci:0.1.0:bafybeiflcfufixmsrhobf56bn5745m2iipcfqyulwk2qegtnagb3kvaaxi - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq -- valory/contract_subscription:0.1.0:bafybeibaiesuhgnnato46w6tuiqesg6obcjcrmka6yzmt2clzm4fuyikxu -- valory/mech_abci:0.1.0:bafybeig3kkrxzn5rte4gwjw2ori3bonnhmh7ncteyu7ffnjlu3wgthcz5u +- valory/contract_subscription:0.1.0:bafybeicyugrkx5glat4p4ezwf6i7oduh26eycfie6ftd4uxrknztzl3ik4 +- valory/mech_abci:0.1.0:bafybeieimp7xzxcnbzsuunf2xkcy5juulhmzsmkq2v3sw3o3lgssb53cnu - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba -- valory/subscription_abci:0.1.0:bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa -- valory/task_execution:0.1.0:bafybeiejpcwbyhpy4blns5nmvac5wnklk7tngxgak2jqzx7gjzpnhfkl5y -- valory/task_submission_abci:0.1.0:bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe +- valory/subscription_abci:0.1.0:bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie +- valory/task_execution:0.1.0:bafybeidsq3mpnfmjp2jfrurrx3ck3ozwfh7jg4mzhc3742dqyoeijizocq +- valory/task_submission_abci:0.1.0:bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja -- valory/websocket_client:0.1.0:bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm +- valory/websocket_client:0.1.0:bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/connections/websocket_client/__init__.py b/packages/valory/connections/websocket_client/__init__.py index 3eaf6026..c3ad65f8 100644 --- a/packages/valory/connections/websocket_client/__init__.py +++ b/packages/valory/connections/websocket_client/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/websocket_client/connection.py b/packages/valory/connections/websocket_client/connection.py index 2dcb0ce0..025835ad 100644 --- a/packages/valory/connections/websocket_client/connection.py +++ b/packages/valory/connections/websocket_client/connection.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/connections/websocket_client/connection.yaml b/packages/valory/connections/websocket_client/connection.yaml index 480764ee..0116c6a8 100644 --- a/packages/valory/connections/websocket_client/connection.yaml +++ b/packages/valory/connections/websocket_client/connection.yaml @@ -7,13 +7,13 @@ description: Simple Websocket Client to allow the agent to interact with a Webso license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeiblpz4ectgegknj5dwd3jmce4w3pmrqhfzapfatqztrt3l6xtq7zq - connection.py: bafybeiadziz6xynw7nnqjxcyklo54ibplqesyhqjysia64y7mhkdk3nvly + __init__.py: bafybeicyrebbic2h3ytyxeg776zelg2bpshcepnkm4qc5oypqqqfq3sqmq + connection.py: bafybeiakisvetjqs3qqlpdo5asm45gfygx35lw7cciypaneyqieyf6ul34 readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q +- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 class_name: WebSocketClient config: endpoint: null diff --git a/packages/valory/protocols/__init__.py b/packages/valory/protocols/__init__.py index 60cdc1b6..e69de29b 100644 --- a/packages/valory/protocols/__init__.py +++ b/packages/valory/protocols/__init__.py @@ -1,19 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ diff --git a/packages/valory/protocols/acn_data_share/__init__.py b/packages/valory/protocols/acn_data_share/__init__.py index 8f2ff958..e8569f34 100644 --- a/packages/valory/protocols/acn_data_share/__init__.py +++ b/packages/valory/protocols/acn_data_share/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/dialogues.py b/packages/valory/protocols/acn_data_share/dialogues.py index ce7cc75a..12e8f713 100644 --- a/packages/valory/protocols/acn_data_share/dialogues.py +++ b/packages/valory/protocols/acn_data_share/dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/message.py b/packages/valory/protocols/acn_data_share/message.py index 0d376c70..d622d773 100644 --- a/packages/valory/protocols/acn_data_share/message.py +++ b/packages/valory/protocols/acn_data_share/message.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/protocol.yaml b/packages/valory/protocols/acn_data_share/protocol.yaml index b8d837cc..2afaf59d 100644 --- a/packages/valory/protocols/acn_data_share/protocol.yaml +++ b/packages/valory/protocols/acn_data_share/protocol.yaml @@ -8,14 +8,14 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiexqywrjzv4ajzesbzaw7bujvmgadsqtxzfnerwqogi7nz6jcvp6u - __init__.py: bafybeidy3rxwh6zfwyzhdykymtwazgdcahfedthq57f2dotybvk6lqdepq + __init__.py: bafybeif7fohg7vfalh35nyuqchdw5lnjblqtodhxmcnnhycderagqs46du acn_data_share.proto: bafybeiell3oa6eo2oogbgymu5cupeakbkpkmxkh7gossgy4jdip7lrr7tu acn_data_share_pb2.py: bafybeifyna3ykdjrh2t5etusxc22hiplfvekh6vjlrnom2tzgcolmhsslu - dialogues.py: bafybeieg4ksez4v2pnosvin6jmevflofjpnupinxu352k5qe7pamw5tmme - message.py: bafybeibvhh5aaqp5gl55rtlnvlhbtbkbrfvppmyr6pu2pxn3njqvtl6u4a - serialization.py: bafybeiafsqn27z6pfukxbqe5quni34vfnkys7wcxl5qxcib77ew2feizwm - tests/test_acn_data_share_dialogues.py: bafybeiceldlprmdjvhphsv2ezyixlglsrsie3lurek7izi6z3vmtmyru7i - tests/test_acn_data_share_messages.py: bafybeicktuow6ekap5o3yk6pyg3shoruebyegcjemlqoq3kahr3h2f7zuu + dialogues.py: bafybeigtnzvicosvctjk67qni5mu3yy77fp5u2xpb2eszwfht7igeaip4m + message.py: bafybeiggjuq6fooopoy423v6huhfk6szyzdlgkxk5ardlyllawj2qykhfq + serialization.py: bafybeihi2cogvek6irdncct5ga2ztdeqho4eai6krtk354yq2ip2d5f3se + tests/test_acn_data_share_dialogues.py: bafybeie5kcwchjl5vozdlrnwhmim4kffa7fr5zsqjy3r27mjzuilaog5su + tests/test_acn_data_share_messages.py: bafybeifap2cnraojc4ohd46rrjgusi6iisjm5tum2bs4sfgdocx5zjsqea fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/acn_data_share/serialization.py b/packages/valory/protocols/acn_data_share/serialization.py index 1161def3..587e1578 100644 --- a/packages/valory/protocols/acn_data_share/serialization.py +++ b/packages/valory/protocols/acn_data_share/serialization.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py index 93771420..9582e4ce 100644 --- a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py +++ b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py index bcd33a7e..e1090720 100644 --- a/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py +++ b/packages/valory/protocols/acn_data_share/tests/test_acn_data_share_messages.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/__init__.py b/packages/valory/protocols/websocket_client/__init__.py index 0f46df29..12836897 100644 --- a/packages/valory/protocols/websocket_client/__init__.py +++ b/packages/valory/protocols/websocket_client/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/dialogues.py b/packages/valory/protocols/websocket_client/dialogues.py index f91599a3..e360fc19 100644 --- a/packages/valory/protocols/websocket_client/dialogues.py +++ b/packages/valory/protocols/websocket_client/dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/message.py b/packages/valory/protocols/websocket_client/message.py index 21d9b227..27ae91af 100644 --- a/packages/valory/protocols/websocket_client/message.py +++ b/packages/valory/protocols/websocket_client/message.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/protocol.yaml b/packages/valory/protocols/websocket_client/protocol.yaml index 87956f31..7872ef30 100644 --- a/packages/valory/protocols/websocket_client/protocol.yaml +++ b/packages/valory/protocols/websocket_client/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeieot47xhqlvc3dwl2hc4yq3f6wcva7xf5dx5wz5n4ir6woknyqrsi - __init__.py: bafybeibtetavf2d4i6m6opwg672prrkzmpgblew7g2pvaozuvzxf7jdifa - dialogues.py: bafybeifans57uwhcy3zfj3uoynreg7my7yj4qc4ut4x6p37vgwhidwgra4 - message.py: bafybeicdcrshwx5jf3epyzzj2opacgvzzp3qfs4eougfpfgdhu7tooxkjy - serialization.py: bafybeig3wpnbr4v2ir7emji6urraeqepehevxjhs2i2z5bnd7ldgmta4gi - tests/test_websocket_client_dialogues.py: bafybeidefxcd7j5qeou7pbzffyv6kk2fji2txulirabov6xiu7b5bjqndy - tests/test_websocket_client_messages.py: bafybeiagmqf36glbu326d7nptqfuqjgyafjja5rl4jswvc4jmawexzpjya + __init__.py: bafybeifhhqtcfac5lcrjxrcdpsrs3kyyxt7uf2qv2a4ivllyyt3c62q4aq + dialogues.py: bafybeienrjdbwqsx4dikqo3wjfgner5pz5qtbwfb2qtzsukn6iog6e4iyi + message.py: bafybeigpuhz4fw5ng3qay7duci7qhb4rj336wb2qwiyszddkjmnjebf72e + serialization.py: bafybeiar6guqw2qgofycbjuyhy7puxill5wcy6hsyrqmbkzcjzitxuws5i + tests/test_websocket_client_dialogues.py: bafybeig7cd7mllqmk6w4oaz7wqwubueaa4hpofgplhzeivqtwihalhpnne + tests/test_websocket_client_messages.py: bafybeibboz4j4itkwjh5ahza53v4d4dew3qxqq6fsbzragz76wnjin254u websocket_client.proto: bafybeifqkmkqzbepxkj56o45ljysxujmoftjlm6pkllj7t4tbryqt42ql4 websocket_client_pb2.py: bafybeickjzx5ikfg5hwisfiypifzvnp4dxecqrqf6op2gzcaojmuvkcdlq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/websocket_client/serialization.py b/packages/valory/protocols/websocket_client/serialization.py index 5741b21b..18b74ec6 100644 --- a/packages/valory/protocols/websocket_client/serialization.py +++ b/packages/valory/protocols/websocket_client/serialization.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py b/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py index 2f2c5332..3f7eb0c8 100644 --- a/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py +++ b/packages/valory/protocols/websocket_client/tests/test_websocket_client_dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py b/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py index dec6c455..f0f7b63c 100644 --- a/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py +++ b/packages/valory/protocols/websocket_client/tests/test_websocket_client_messages.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/services/mech/service.yaml b/packages/valory/services/mech/service.yaml index cb9260bd..955330d0 100644 --- a/packages/valory/services/mech/service.yaml +++ b/packages/valory/services/mech/service.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeif7ia4jdlazy6745ke2k2x5yoqlwsgwr6sbztbgqtwvs3ndm2p7ba fingerprint_ignore_patterns: [] -agent: valory/mech:0.1.0:bafybeiebm7qauxogsjjwgotmboxnvpdofcput7ca3zdt6aq4nymqxhwp3e +agent: valory/mech:0.1.0:bafybeifcrgru4m3wsftglweasvybe7n74dwmyiisjs6kuieooeiagmhthi number_of_agents: 4 deployment: agent: diff --git a/packages/valory/skills/contract_subscription/__init__.py b/packages/valory/skills/contract_subscription/__init__.py index 0565bfba..802a2467 100644 --- a/packages/valory/skills/contract_subscription/__init__.py +++ b/packages/valory/skills/contract_subscription/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/behaviours.py b/packages/valory/skills/contract_subscription/behaviours.py index 00728357..4ca00ab9 100644 --- a/packages/valory/skills/contract_subscription/behaviours.py +++ b/packages/valory/skills/contract_subscription/behaviours.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/dialogues.py b/packages/valory/skills/contract_subscription/dialogues.py index 7d81e90d..4b74ce3d 100644 --- a/packages/valory/skills/contract_subscription/dialogues.py +++ b/packages/valory/skills/contract_subscription/dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/handlers.py b/packages/valory/skills/contract_subscription/handlers.py index 99a2dcca..880d7afe 100644 --- a/packages/valory/skills/contract_subscription/handlers.py +++ b/packages/valory/skills/contract_subscription/handlers.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/contract_subscription/skill.yaml b/packages/valory/skills/contract_subscription/skill.yaml index 54acff3a..d6821587 100644 --- a/packages/valory/skills/contract_subscription/skill.yaml +++ b/packages/valory/skills/contract_subscription/skill.yaml @@ -7,19 +7,19 @@ description: A simple skill to subscribe to events on a particular contract usin license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeigz755syta7a5egb43q57c4wwaut7cazx3rbvjsbvbsmysnme6pu4 - behaviours.py: bafybeiey452ydculctkvcb6hkk6fxt4t3zhbm6ppmeo6ljhrpfjgve5x5y - dialogues.py: bafybeihboynznoh6sts3joz3suxk7n65rvp7odmxcwsma7uvkutfli4pne - handlers.py: bafybeihk3jdquh5psaktsoh6663fdwqyqwiswfvxu765r5noyqvfddhbbe + __init__.py: bafybeihmbiavlq5ekiat57xuekfuxjkoniizurn77hivqwtsaqydv32owu + behaviours.py: bafybeihhhfpan6i5vzxaoggmnj5jw556wnxz75ufcmiucq3yygrbmlsdpm + dialogues.py: bafybeigxlbj6mte72ko7osykjfilg4udfmnrnhxtoib5k4xcxde6qi3niu + handlers.py: bafybeiasnq4qlq5qys4ugktetmaeqnreaswvaqyi7zvjjlifmhbylucasu models.py: bafybeiafdc32u7yjph4kb4tvsdsaz4tpzo25m3gmthssc62newpgvrros4 fingerprint_ignore_patterns: [] connections: -- valory/websocket_client:0.1.0:bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm +- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm contracts: [] protocols: -- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q +- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 skills: -- valory/websocket_client:0.1.0:bafybeicoz64sobnzltj2bvjj3qv4t6vlmjx4iswkhrazjoourl3mds55bm +- valory/websocket_client:0.1.0:bafybeidwntmkk4b2ixq5454ycbkknclqx7a6vpn7aqpm2nw3duszqrxvta behaviours: contract_subscriptions: args: {} diff --git a/packages/valory/skills/mech_abci/skill.yaml b/packages/valory/skills/mech_abci/skill.yaml index 7ea9f51a..aedb1f16 100644 --- a/packages/valory/skills/mech_abci/skill.yaml +++ b/packages/valory/skills/mech_abci/skill.yaml @@ -23,10 +23,10 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq - valory/registration_abci:0.1.0:bafybeic2ynseiak7jpta7jfwuqwyp453b4p7lolr4wihxmpn633uekv5am - valory/reset_pause_abci:0.1.0:bafybeidzajbe3erygeh2xbd6lrjv7nsptznjuzrt24ykgvhgotdeyhfnba -- valory/task_submission_abci:0.1.0:bafybeifqluw73fdnhztlbxeadu3luxj7tcuuafq67douciucrd3qp4zlfe +- valory/task_submission_abci:0.1.0:bafybeib4m2bwgchloqss3wotsx4rz7qqkwydaesiqkls2zq7zbtp6jtpsi - valory/termination_abci:0.1.0:bafybeie4zvjfxvdu7qrulmur3chpjz3kpj5m4bjsxvpk4gvj5zbyyayfaa - valory/transaction_settlement_abci:0.1.0:bafybeiaefgqbs7zsn5xe5kdwrujj7ivygkn3ujpw6crnvi3knvxw75qmja -- valory/subscription_abci:0.1.0:bafybeidtcq7umeombwq673z6cb7z572llvhcqnd7yfjmpdb2atjykx3ewa +- valory/subscription_abci:0.1.0:bafybeigaxq7m2dqv2huhg5jvb4jx3rysqwvvjj2xhojow3t3zzuwq2k4ie behaviours: main: args: {} diff --git a/packages/valory/skills/subscription_abci/skill.yaml b/packages/valory/skills/subscription_abci/skill.yaml index 174acd11..fa5d1058 100644 --- a/packages/valory/skills/subscription_abci/skill.yaml +++ b/packages/valory/skills/subscription_abci/skill.yaml @@ -22,7 +22,7 @@ contracts: - valory/gnosis_safe:0.1.0:bafybeidll7frtdsq2ckiluazkwk4zpkp7natt4kdejjehwvykqwzyuf6ei - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y protocols: -- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji +- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka skills: - valory/abstract_round_abci:0.1.0:bafybeiaqcl7h2famylusiffigwem7tevkcsyocdu5xd42jkmgq6kvowzgq diff --git a/packages/valory/skills/task_execution/skill.yaml b/packages/valory/skills/task_execution/skill.yaml index f92d09cf..161f165f 100644 --- a/packages/valory/skills/task_execution/skill.yaml +++ b/packages/valory/skills/task_execution/skill.yaml @@ -24,7 +24,7 @@ connections: contracts: - valory/agent_mech:0.1.0:bafybeiepxumywg6z2zapqzc3bg3iey23cmlgjzxisqox5j74o5i2texr5e protocols: -- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji +- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/default:1.0.0:bafybeifqcqy5hfbnd7fjv4mqdjrtujh2vx3p2xhe33y67zoxa6ph7wdpaq diff --git a/packages/valory/skills/task_submission_abci/skill.yaml b/packages/valory/skills/task_submission_abci/skill.yaml index 1075e642..c39ac630 100644 --- a/packages/valory/skills/task_submission_abci/skill.yaml +++ b/packages/valory/skills/task_submission_abci/skill.yaml @@ -26,7 +26,7 @@ contracts: - valory/service_registry:0.1.0:bafybeia2swgpmczn3iykmptigabklk2eqbqxzhmbnunq3givmjygvmgtbm - valory/hash_checkpoint:0.1.0:bafybeieys27hidb5m267jwqsxdgorf5v37o6lvrfy2oga557stjn4xgoaa protocols: -- valory/acn_data_share:0.1.0:bafybeibomntloszuvaerlz5d3br6m2nizozewghg3sgkg43nmvoopt4eji +- valory/acn_data_share:0.1.0:bafybeih5ydonnvrwvy2ygfqgfabkr47s4yw3uqxztmwyfprulwfsoe7ipq - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru skills: diff --git a/packages/valory/skills/websocket_client/__init__.py b/packages/valory/skills/websocket_client/__init__.py index 5679be70..00f1495b 100644 --- a/packages/valory/skills/websocket_client/__init__.py +++ b/packages/valory/skills/websocket_client/__init__.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/websocket_client/behaviours.py b/packages/valory/skills/websocket_client/behaviours.py index 6b38dffd..bbcd1f8c 100644 --- a/packages/valory/skills/websocket_client/behaviours.py +++ b/packages/valory/skills/websocket_client/behaviours.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/websocket_client/dialogues.py b/packages/valory/skills/websocket_client/dialogues.py index ab2ce60f..03269db5 100644 --- a/packages/valory/skills/websocket_client/dialogues.py +++ b/packages/valory/skills/websocket_client/dialogues.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - """ Dialogues """ diff --git a/packages/valory/skills/websocket_client/handlers.py b/packages/valory/skills/websocket_client/handlers.py index 9bd3d0b2..20f061b5 100644 --- a/packages/valory/skills/websocket_client/handlers.py +++ b/packages/valory/skills/websocket_client/handlers.py @@ -1,24 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# ------------------------------------------------------------------------------ -# -# Copyright 2021-2023 Valory AG -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------------ - - # -*- coding: utf-8 -*- # ------------------------------------------------------------------------------ # diff --git a/packages/valory/skills/websocket_client/skill.yaml b/packages/valory/skills/websocket_client/skill.yaml index 309806ed..2889eef8 100644 --- a/packages/valory/skills/websocket_client/skill.yaml +++ b/packages/valory/skills/websocket_client/skill.yaml @@ -6,17 +6,17 @@ description: Websocket client. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeibkv63mtgar5snm2kqqh2dz4undeerm6kpcx5e3m52oksor6zccly - behaviours.py: bafybeidntlztp7yzlmsj2odqu3xkylp54iugbbetg7olkp4r3boqvykkca - dialogues.py: bafybeia6it4ogryyuxrlujf47l7cllfdxq5cevumnjqskhvfoerelkgif4 - handlers.py: bafybeidtgq7jmrfe4x64u3rpea5yzqmpu5y6pomlo3fedo4ijr62akmmke + __init__.py: bafybeibgl4hnpsd3vokfs6cfkg4elgqu7nm4yhs6sh373j6erwvgpjdqeu + behaviours.py: bafybeianfyloqfumjydjgogjg2sr5wrw7epzjt5o7sxv4drfasl2kgmq4i + dialogues.py: bafybeicc26sbiipnfublma3ywvh54elbx5y5sj7xckq3xyqyfmmoamiouy + handlers.py: bafybeibqfinswattz7gu4pijjxvixp5gtrgfz5idsz3uzlgrjw2vanjiu4 models.py: bafybeicuei7xoozvgr6kyp6cp7b6gqonlkmlgkvhhff37iecnjqzhkvbgi fingerprint_ignore_patterns: [] connections: -- valory/websocket_client:0.1.0:bafybeie2774vydtn7qxpaaqvghmt36ez3nagq22hn2mxznkebeeldxzjfm +- valory/websocket_client:0.1.0:bafybeiflmystocxaqblhpzqlcop2vkhsknpzjx2jomohomaxamwskeokzm contracts: [] protocols: -- valory/websocket_client:0.1.0:bafybeihgjcjzhsjnxvkaltoqhretc2spvnf4jtoqy5p7vgp2mger4ynx4q +- valory/websocket_client:0.1.0:bafybeih43mnztdv3v2hetr2k3gezg7d3yj4ur7cxdvcyaqhg65e52s5sf4 skills: [] behaviours: websocket_subscription: From 6b88fd9ca58f36ba07a4399bb706b41789523dcf Mon Sep 17 00:00:00 2001 From: Ardian Date: Thu, 15 Feb 2024 10:34:26 +0100 Subject: [PATCH 7/7] chore: gitleaks --- .gitleaksignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitleaksignore b/.gitleaksignore index abf713be..eb484528 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -23,3 +23,5 @@ ed97b16cdd270e228ecd3d837da4484c09357108:packages/valory/skills/reset_pause_abci 0c8c92a4a5e3b94e0f8b8aadb7c104c644f23277:packages/valory/skills/subscription_abci/skill.yaml:generic-api-key:89 f92a447c4f4ecbfd32c1096f122bf6a0f555e22a:packages/valory/protocols/websocket_client/protocol.yaml:generic-api-key:15 f92a447c4f4ecbfd32c1096f122bf6a0f555e22a:packages/valory/protocols/websocket_client/protocol.yaml:generic-api-key:16 +76e101cc83c5ee35d29227539c91071490c97bf5:packages/valory/protocols/websocket_client/protocol.yaml:generic-api-key:15 +76e101cc83c5ee35d29227539c91071490c97bf5:packages/valory/protocols/websocket_client/protocol.yaml:generic-api-key:16