From 5855ddac2908a24ed0317f20bf1e75108f19a479 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 11:17:01 +0200 Subject: [PATCH 01/30] chore: bump --- Pipfile | 12 ++++++------ docs/index.md | 2 +- .../valory/agents/impact_evaluator/aea-config.yaml | 2 +- .../contracts/dynamic_contribution/contract.yaml | 2 +- tox.ini | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Pipfile b/Pipfile index 2f670bfd..c7f7de3a 100644 --- a/Pipfile +++ b/Pipfile @@ -29,12 +29,12 @@ pytest-cov = "==4.0.0" pytest-randomly = "==3.12.0" openapi-core = "==0.13.2" openapi-spec-validator = "==0.2.8" -open-aea = "==1.39.0.post1" -open-aea-ledger-ethereum = "==1.39.0.post1" -open-aea-ledger-cosmos = "==1.39.0.post1" -open-aea-cli-ipfs = "==1.39.0.post1" -open-aea-test-autonomy = "==0.12.1.post4" -open-autonomy = {version = "==0.12.1.post4", extras = [ "all"]} +open-aea = "==1.41.0" +open-aea-ledger-ethereum = "==1.41.0" +open-aea-ledger-cosmos = "==1.41.0" +open-aea-cli-ipfs = "==1.41.0" +open-aea-test-autonomy = "==0.13.1" +open-autonomy = {version = "==0.13.1", extras = [ "all"]} open-aea-web3 = "==6.0.1" tomte = {version = "==0.2.12", extras = ["cli", "tests"]} requests = "==2.28.2" diff --git a/docs/index.md b/docs/index.md index d440bc96..0ec21d4a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -24,7 +24,7 @@ In order to run a local demo service based on the IEKit: mkdir your_workspace && cd your_workspace touch Pipfile && pipenv --python 3.10 && pipenv shell - pipenv install open-autonomy[all]==0.12.1.post4 + pipenv install open-autonomy[all]==0.13.1 autonomy init --remote --ipfs --reset --author=your_name ``` diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 9884d1a3..cd48110d 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -87,7 +87,7 @@ logging_config: skill_exception_policy: stop_and_exit dependencies: open-aea-ledger-ethereum: - version: ==1.39.0.post1 + version: ==1.41.0 default_connection: null --- public_id: valory/openai:0.1.0 diff --git a/packages/valory/contracts/dynamic_contribution/contract.yaml b/packages/valory/contracts/dynamic_contribution/contract.yaml index 6cf90ecd..92242c02 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.yaml +++ b/packages/valory/contracts/dynamic_contribution/contract.yaml @@ -15,7 +15,7 @@ contract_interface_paths: ethereum: build/DynamicContribution.json dependencies: open-aea-ledger-ethereum: - version: ==1.39.0.post1 + version: ==1.41.0 open-aea-web3: version: ==6.0.1 contracts: [] diff --git a/tox.ini b/tox.ini index a8e231a5..20e99eca 100644 --- a/tox.ini +++ b/tox.ini @@ -35,12 +35,12 @@ deps = pytest-asyncio==0.18.0 openapi-core==0.13.2 openapi-spec-validator==0.2.8 - open-aea==1.39.0.post1 - open-aea-ledger-ethereum==1.39.0.post1 - open-aea-ledger-cosmos==1.39.0.post1 - open-aea-cli-ipfs==1.39.0.post1 - open-aea-test-autonomy==0.12.1.post4 - open-autonomy==0.12.1.post4 + open-aea==1.41.0 + open-aea-ledger-ethereum==1.41.0 + open-aea-ledger-cosmos==1.41.0 + open-aea-cli-ipfs==1.41.0 + open-aea-test-autonomy==0.13.1 + open-autonomy==0.13.1 open-aea-web3==6.0.1 requests==2.28.2 typing-extensions==4.5.0 From c7049d07e03735d9e7b48faa90756af64e059525 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 13:22:26 +0200 Subject: [PATCH 02/30] chore: update libprotoc version --- .github/workflows/main_workflow.yml | 16 ++++++++-------- packages/valory/protocols/llm/__init__.py | 2 +- packages/valory/protocols/twitter/__init__.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main_workflow.yml b/.github/workflows/main_workflow.yml index 1916e9a2..36bb6b02 100644 --- a/.github/workflows/main_workflow.yml +++ b/.github/workflows/main_workflow.yml @@ -92,7 +92,7 @@ jobs: pip install tomte[tox,cli]==0.2.12 pip install --upgrade setuptools==60.10.0 # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip + wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip unzip protoc-3.11.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc # install IPFS @@ -165,7 +165,7 @@ jobs: pip install --upgrade setuptools==60.10.0 # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip + wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip unzip protoc-3.11.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc @@ -198,8 +198,8 @@ jobs: brew install gcc # brew install protobuf # brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/72457f0166d5619a83f508f2345b22d0617b5021/Formula/protobuf.rb - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-osx-x86_64.zip - unzip protoc-3.19.4-osx-x86_64.zip -d protoc + wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-osx-x86_64.zip + unzip protoc-24.3-osx-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc brew tap yoheimuta/protolint brew install protolint @@ -226,14 +226,14 @@ jobs: python -m pip install -U pip echo "::add-path::C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64" choco install wget -y - choco install protoc --version 3.19.4 + choco install protoc --version 24.3 choco install mingw -y choco install make -y # to check make was installed make --version pip install tomte[tox]==0.2.12 - # wget https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-win64.zip - # unzip protoc-3.19.4-win64.zip -d protoc + # wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-win64.zip + # unzip protoc-24.3-win64.zip -d protoc # sudo mv protoc/bin/protoc /usr/local/bin/protoc python scripts\update_symlinks_cross_platform.py @@ -285,7 +285,7 @@ jobs: pip install --upgrade setuptools==60.10.0 # install Protobuf compiler - wget https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip + wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip unzip protoc-3.11.4-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 1f369ba2..845b47fe 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__init__.py @@ -41,7 +41,7 @@ """ This module contains the support resources for the llm protocol. -It was created with protocol buffer compiler version `libprotoc 3.19.4` and aea protocol generator version `1.0.0`. +It was created with protocol buffer compiler version `libprotoc 24.3` and aea protocol generator version `1.0.0`. """ from packages.valory.protocols.llm.message import LlmMessage diff --git a/packages/valory/protocols/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index f5a98753..8346937a 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__init__.py @@ -41,7 +41,7 @@ """ This module contains the support resources for the twitter protocol. -It was created with protocol buffer compiler version `libprotoc 3.19.4` and aea protocol generator version `1.0.0`. +It was created with protocol buffer compiler version `libprotoc 24.3` and aea protocol generator version `1.0.0`. """ from packages.valory.protocols.twitter.message import TwitterMessage From 24c314b81233a18a656badb9ea80bb35d45f0cdd Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 13:34:28 +0200 Subject: [PATCH 03/30] fix: remove web3 fork --- Pipfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Pipfile b/Pipfile index c7f7de3a..41f1f8b3 100644 --- a/Pipfile +++ b/Pipfile @@ -35,7 +35,6 @@ open-aea-ledger-cosmos = "==1.41.0" open-aea-cli-ipfs = "==1.41.0" open-aea-test-autonomy = "==0.13.1" open-autonomy = {version = "==0.13.1", extras = [ "all"]} -open-aea-web3 = "==6.0.1" tomte = {version = "==0.2.12", extras = ["cli", "tests"]} requests = "==2.28.2" typing-extensions = "4.5.0" From 6c6e771152d7c453a8c9c5f1f98ae50c4d93882e Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 13:38:53 +0200 Subject: [PATCH 04/30] chore: sync packages --- packages/packages.json | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index cda71c0d..c9ceb24c 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -20,29 +20,29 @@ "skill/valory/olas_week_abci/0.1.0": "bafybeidegg3yi5qww6q6r24pgjmmbkgconyfnecuohacljvferqqg3tc2e" }, "third_party": { - "protocol/open_aea/signing/1.0.0": "bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m", - "protocol/valory/abci/0.1.0": "bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe", - "protocol/valory/contract_api/1.0.0": "bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa", - "protocol/valory/http/1.0.0": "bafybeia5bxdua2i6chw6pg47bvoljzcpuqxzy4rdrorbdmcbnwmnfdobtu", - "protocol/valory/ledger_api/1.0.0": "bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby", - "protocol/valory/acn/1.1.0": "bafybeiapa5ilsobggnspoqhspftwolrx52udrwmaxdxgrk26heuvl4oooa", - "protocol/valory/ipfs/0.1.0": "bafybeibjzhsengtxfofqpxy6syamplevp35obemwfp4c5lhag3v2bvgysa", - "protocol/valory/tendermint/0.1.0": "bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa", - "skill/valory/abstract_abci/0.1.0": "bafybeigafjci7m7ezwzasav5xqo7v2mbxxn7qb4y7vnuc2wr2irzvn7wsy", - "skill/valory/reset_pause_abci/0.1.0": "bafybeigeoc363gv3wp2rrmk6p2fdxney33nxd3owtpfugzapgruwe4klyu", - "skill/valory/registration_abci/0.1.0": "bafybeibndt6vxiwc2edgtaxpjbhwto3eyu33ujz3zmvtygvo2qz7xme5li", - "skill/valory/abstract_round_abci/0.1.0": "bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq", - "contract/valory/service_registry/0.1.0": "bafybeige6pubafkiqmaiyuql6pcojm6fvh5thvhrsapi53au2rhuumqymu", - "connection/valory/abci/0.1.0": "bafybeib3exj2vkz4u76rc2amtwz6veeozipr6zdgzlaqsovu3dorppcina", - "connection/valory/http_client/0.23.0": "bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y", - "connection/valory/ipfs/0.1.0": "bafybeidu3xd6rd5zysv2due2cnrc3sxx5vss2usxwaxxtxxuyha2kuhd3e", - "connection/valory/ledger/0.19.0": "bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a", - "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq", - "connection/fetchai/http_server/0.22.0": "bafybeihp5umafxzx45aad5pj7s3343se2wjkgnbirt4pybrape22swm6de", - "contract/valory/multisend/0.1.0": "bafybeieg4tywd5lww2vygvpkilg3hcepa4rmhehjuamyvdf6vazt554v6u", - "skill/valory/transaction_settlement_abci/0.1.0": "bafybeia7rzsbea3ch4gcafyp3z6uvqh4npws2xpdwbkkdbrqqpjops7nui", - "skill/valory/termination_abci/0.1.0": "bafybeigqpij2sgrpnilqjljfciixop4fldq5qceixc7534q6af4potdmdm", - "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeid6glyjikjxmefwmhn62cxiofophegjmg2z5vqqsvk6tmyunwc274", - "contract/valory/gnosis_safe/0.1.0": "bafybeih6d3vxz3jlgodxm5b2qcwsmansqj4xobuyd6hjnhzremuvd65yrm" + "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", + "protocol/valory/abci/0.1.0": "bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu", + "protocol/valory/contract_api/1.0.0": "bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka", + "protocol/valory/http/1.0.0": "bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe", + "protocol/valory/ledger_api/1.0.0": "bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru", + "protocol/valory/acn/1.1.0": "bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu", + "protocol/valory/ipfs/0.1.0": "bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u", + "protocol/valory/tendermint/0.1.0": "bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu", + "skill/valory/abstract_abci/0.1.0": "bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a", + "skill/valory/reset_pause_abci/0.1.0": "bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe", + "skill/valory/registration_abci/0.1.0": "bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm", + "skill/valory/abstract_round_abci/0.1.0": "bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq", + "contract/valory/service_registry/0.1.0": "bafybeiebuuhs7fmigfh4c5dvzt6rbm5ekwrcnz7zouyjey7yyyqmpa6dyu", + "connection/valory/abci/0.1.0": "bafybeibtnfu6skrpducj2fzjzw7lrwj3et63xx6u5dryrabec26utzxsf4", + "connection/valory/http_client/0.23.0": "bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny", + "connection/valory/ipfs/0.1.0": "bafybeigkn27u7m5atju6a724clycyfshbgcbwheztil2bky7krfa46ub2a", + "connection/valory/ledger/0.19.0": "bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu", + "connection/valory/p2p_libp2p_client/0.1.0": "bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq", + "connection/valory/http_server/0.22.0": "bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom", + "contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y", + "skill/valory/transaction_settlement_abci/0.1.0": "bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy", + "skill/valory/termination_abci/0.1.0": "bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy", + "contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeigxqwbd6wds57ecsfkl2hf4z4vbz5gokex6nutu5zcdpw6irh573y", + "contract/valory/gnosis_safe/0.1.0": "bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci" } } \ No newline at end of file From e25793ac66b9075b875e880641a83aed2ce15252 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:24:27 +0200 Subject: [PATCH 05/30] fix: remove web3 fork, use valory http server, generators --- docs/index.md | 2 +- packages/packages.json | 36 +- .../agents/impact_evaluator/aea-config.yaml | 82 ++--- .../impact_evaluator/tests/helpers/docker.py | 3 +- .../tests/test_impact_evaluator.py | 5 +- .../valory/connections/openai/connection.py | 1 + .../valory/connections/openai/connection.yaml | 4 +- .../valory/connections/twitter/connection.py | 3 +- .../connections/twitter/connection.yaml | 4 +- .../dynamic_contribution/contract.py | 5 +- .../dynamic_contribution/contract.yaml | 4 +- packages/valory/protocols/llm/protocol.yaml | 2 +- .../valory/protocols/twitter/protocol.yaml | 2 +- .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/ceramic_read_abci/skill.yaml | 4 +- .../tests/test_behaviours.py | 1 + .../skills/ceramic_write_abci/skill.yaml | 4 +- .../tests/test_behaviours.py | 1 + .../skills/decision_making_abci/skill.yaml | 2 +- .../skills/dynamic_nft_abci/handlers.py | 2 +- .../valory/skills/dynamic_nft_abci/skill.yaml | 14 +- .../dynamic_nft_abci/tests/test_handlers.py | 3 +- .../skills/generic_scoring_abci/skill.yaml | 2 +- .../skills/impact_evaluator_abci/skill.yaml | 28 +- packages/valory/skills/llm_abci/skill.yaml | 6 +- .../valory/skills/olas_week_abci/skill.yaml | 10 +- .../skills/twitter_scoring_abci/skill.yaml | 10 +- .../skills/twitter_write_abci/skill.yaml | 10 +- scripts/check_doc_ipfs_hashes.py | 1 + setup.cfg | 328 ++++++++++++++++++ tox.ini | 5 +- 32 files changed, 458 insertions(+), 130 deletions(-) create mode 100644 setup.cfg diff --git a/docs/index.md b/docs/index.md index 0ec21d4a..0233b744 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeiaapq7a5g464bya2ic7rkidai23whm7jn4mie54nrc6kc2jpb7bf4 --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeiee26nlyajwylnqe3fwgexmrc7ggb3pnmmt2xcc5qeszfz7lpeox4 --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index c9ceb24c..a2e29103 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeihirytmmua4677vv5avrzias2vd47hvziogaq2mfucg5lmlqctz24", - "contract/valory/dynamic_contribution/0.1.0": "bafybeiht364qavknmnuz7pwkw4zjzrkkugyzymgxrjvtasfcy7eya3nbxa", - "service/valory/impact_evaluator/0.1.0": "bafybeiaapq7a5g464bya2ic7rkidai23whm7jn4mie54nrc6kc2jpb7bf4", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiexenlxvf32jjlxrow35qlo4xtmi2ezznulczhayux2n2mx27ya6i", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeicngrngwq4fna57rj4lo4nsvt73t3x3d33jb52po5e6kc7stbkl3q", - "skill/valory/ceramic_read_abci/0.1.0": "bafybeide5tbobzkwfdi7yzw6bsau36h43hdlgbnk2bfqvvhmq3hl3ucjmm", - "skill/valory/ceramic_write_abci/0.1.0": "bafybeihnalj6zhl5pbf7x2lkznuhivwj45jzrafbtxatwebrpb7st2v6oa", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiexzqy6nrkfw2b6fbhqk5b4yipvj246lxzhipndeuub2zrlytwtgi", - "skill/valory/generic_scoring_abci/0.1.0": "bafybeig4hoc5gjiyuwh2ye3mwneegq3s3cghl5j7yokvngacvn7ixwdoga", - "protocol/valory/twitter/0.1.0": "bafybeib4eyf7qbs7kdntqzhwqsaaj4o2mzcokcztaza6qgwt7sbxgkqu2m", - "protocol/valory/llm/1.0.0": "bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4", - "connection/valory/twitter/0.1.0": "bafybeifm7tpjdd2y5dy5xzuxt3tebyqxmgn56agkqv64nloggqo5cr3sku", - "connection/valory/openai/0.1.0": "bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq", - "skill/valory/twitter_write_abci/0.1.0": "bafybeidjumloxy2yvoyymgzuwbua3ks2p66fyybna2qhrz2upzkxzjrznq", - "skill/valory/llm_abci/0.1.0": "bafybeifesvwe5ya7imxefijpawgtd7aje5hhr4oh2bzgfsm2ucjp3lxije", - "skill/valory/decision_making_abci/0.1.0": "bafybeicjrztkcvqjnk6odukj3j2dr6ee4j2jaaw5nsga6byjhjyuxhng5m", - "service/valory/impact_evaluator_local/0.1.0": "bafybeih35wij4e32htxntga7svxddkgrrmcq36jae3xrmf4s6yuuovvcme", - "skill/valory/olas_week_abci/0.1.0": "bafybeidegg3yi5qww6q6r24pgjmmbkgconyfnecuohacljvferqqg3tc2e" + "agent/valory/impact_evaluator/0.1.0": "bafybeibeea4yq46d4xkpefzu5xfemjrp6iae3i4cgu7nlje7or6rmt67u4", + "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", + "service/valory/impact_evaluator/0.1.0": "bafybeigctjzsni4ikwel4snqrtv4xvok5qcxtugmoly7vo2xlmym57odzu", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm", + "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", + "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeictmo6lk44dzj6cvokkocamnn45jzoh2svt3raravgz764wchoanq", + "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", + "protocol/valory/twitter/0.1.0": "bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4", + "protocol/valory/llm/1.0.0": "bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi", + "connection/valory/twitter/0.1.0": "bafybeig542ufsbxtbx5ot4643257g6lwiv6vptv3oia6ibms7btroe4x4a", + "connection/valory/openai/0.1.0": "bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm", + "skill/valory/twitter_write_abci/0.1.0": "bafybeica2qikrkpnzmxkjyn433yaehcrgv7ochfzt67idfniu2jexbm4hq", + "skill/valory/llm_abci/0.1.0": "bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem", + "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", + "service/valory/impact_evaluator_local/0.1.0": "bafybeibn6comrya2fqvma2az7ka34dfvikgzkrnwa3qiblqw2lkqwrfzyy", + "skill/valory/olas_week_abci/0.1.0": "bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index cd48110d..5e239390 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -10,52 +10,52 @@ fingerprint: tests/helpers/__init__.py: bafybeif7verbag26h6i35gr5rlatxl7veq4drup5ykwdvhgtussf2jreei tests/helpers/constants.py: bafybeibbokz7gzdlubnjwxrmh4tqckc7j75hfy3ae6l5a63mrbd4hp6l7u tests/helpers/data/json_server/data.json: bafybeiapboptlarlpc2lboj4g2526vev7fwqpr267tb2qn6cevbblpnewe - tests/helpers/docker.py: bafybeihlg5thdrcaiuzyte5s7x25mikqfyxdjwuqvhmeddluyjdkzhuhqi + tests/helpers/docker.py: bafybeihjgiuroofg7zn4sng4f7mwl2s24hk2ij5ibk4alkzgvxouns6spi tests/helpers/fixtures.py: bafybeidfsamzdrqqkdra4ektollyfkhiyb2iqymy6djavgewon2cb23vwu - tests/test_impact_evaluator.py: bafybeic55qbou5gfl47v5lw7hg3hawrlio667z5tjv66wfp5ue2gfsc4n4 + tests/test_impact_evaluator.py: bafybeiejwkxnd3johulxt4rkj5cvrrvkt6yaxkwyuwvmees3z4jxs5sday fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeihp5umafxzx45aad5pj7s3343se2wjkgnbirt4pybrape22swm6de -- valory/abci:0.1.0:bafybeib3exj2vkz4u76rc2amtwz6veeozipr6zdgzlaqsovu3dorppcina -- valory/http_client:0.23.0:bafybeieoeuy4brzimtnubmokwirhrx27ezls6cdnl5qik4rkykfle3nn2y -- valory/ledger:0.19.0:bafybeigfoz7d7si7s4jehvloq2zmiiocpbxcaathl3bxkyarxoerxq7g3a -- valory/p2p_libp2p_client:0.1.0:bafybeihdnfdth3qgltefgrem7xyi4b3ejzaz67xglm2hbma2rfvpl2annq -- valory/openai:0.1.0:bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq -- valory/twitter:0.1.0:bafybeifm7tpjdd2y5dy5xzuxt3tebyqxmgn56agkqv64nloggqo5cr3sku +- valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom +- valory/abci:0.1.0:bafybeibtnfu6skrpducj2fzjzw7lrwj3et63xx6u5dryrabec26utzxsf4 +- valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny +- valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu +- valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq +- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm +- valory/twitter:0.1.0:bafybeig542ufsbxtbx5ot4643257g6lwiv6vptv3oia6ibms7btroe4x4a contracts: -- valory/dynamic_contribution:0.1.0:bafybeiht364qavknmnuz7pwkw4zjzrkkugyzymgxrjvtasfcy7eya3nbxa -- valory/gnosis_safe:0.1.0:bafybeih6d3vxz3jlgodxm5b2qcwsmansqj4xobuyd6hjnhzremuvd65yrm -- valory/gnosis_safe_proxy_factory:0.1.0:bafybeid6glyjikjxmefwmhn62cxiofophegjmg2z5vqqsvk6tmyunwc274 -- valory/multisend:0.1.0:bafybeieg4tywd5lww2vygvpkilg3hcepa4rmhehjuamyvdf6vazt554v6u -- valory/service_registry:0.1.0:bafybeige6pubafkiqmaiyuql6pcojm6fvh5thvhrsapi53au2rhuumqymu +- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y +- valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci +- valory/gnosis_safe_proxy_factory:0.1.0:bafybeigxqwbd6wds57ecsfkl2hf4z4vbz5gokex6nutu5zcdpw6irh573y +- valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y +- valory/service_registry:0.1.0:bafybeiebuuhs7fmigfh4c5dvzt6rbm5ekwrcnz7zouyjey7yyyqmpa6dyu protocols: -- open_aea/signing:1.0.0:bafybeifuxs7gdg2okbn7uofymenjlmnih2wxwkym44lsgwmklgwuckxm2m -- valory/abci:0.1.0:bafybeigootsvqpk6th5xpdtzanxum3earifrrezfyhylfrit7yvqdrtgpe -- valory/acn:1.1.0:bafybeiapa5ilsobggnspoqhspftwolrx52udrwmaxdxgrk26heuvl4oooa -- valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa -- valory/http:1.0.0:bafybeia5bxdua2i6chw6pg47bvoljzcpuqxzy4rdrorbdmcbnwmnfdobtu -- valory/ipfs:0.1.0:bafybeibjzhsengtxfofqpxy6syamplevp35obemwfp4c5lhag3v2bvgysa -- valory/ledger_api:1.0.0:bafybeigsvceac33asd6ecbqev34meyyjwu3rangenv6xp5rkxyz4krvcby -- valory/llm:1.0.0:bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4 -- valory/tendermint:0.1.0:bafybeidjqmwvgi4rqgp65tbkhmi45fwn2odr5ecezw6q47hwitsgyw4jpa -- valory/twitter:0.1.0:bafybeib4eyf7qbs7kdntqzhwqsaaj4o2mzcokcztaza6qgwt7sbxgkqu2m +- open_aea/signing:1.0.0:bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii +- valory/abci:0.1.0:bafybeihmzlmmb4pdo3zkhg6ehuyaa4lhw7bfpclln2o2z7v3o6fcep26iu +- valory/acn:1.1.0:bafybeic2pxzfc3voxl2ejhcqyf2ehm4wm5gxvgx7bliloiqi2uppmq6weu +- valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka +- valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe +- valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u +- valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru +- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi +- valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu +- valory/twitter:0.1.0:bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4 skills: -- valory/abstract_abci:0.1.0:bafybeigafjci7m7ezwzasav5xqo7v2mbxxn7qb4y7vnuc2wr2irzvn7wsy -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq -- valory/impact_evaluator_abci:0.1.0:bafybeiexzqy6nrkfw2b6fbhqk5b4yipvj246lxzhipndeuub2zrlytwtgi -- valory/generic_scoring_abci:0.1.0:bafybeig4hoc5gjiyuwh2ye3mwneegq3s3cghl5j7yokvngacvn7ixwdoga -- valory/twitter_scoring_abci:0.1.0:bafybeicngrngwq4fna57rj4lo4nsvt73t3x3d33jb52po5e6kc7stbkl3q -- valory/ceramic_read_abci:0.1.0:bafybeide5tbobzkwfdi7yzw6bsau36h43hdlgbnk2bfqvvhmq3hl3ucjmm -- valory/ceramic_write_abci:0.1.0:bafybeihnalj6zhl5pbf7x2lkznuhivwj45jzrafbtxatwebrpb7st2v6oa -- valory/dynamic_nft_abci:0.1.0:bafybeiexenlxvf32jjlxrow35qlo4xtmi2ezznulczhayux2n2mx27ya6i -- valory/registration_abci:0.1.0:bafybeibndt6vxiwc2edgtaxpjbhwto3eyu33ujz3zmvtygvo2qz7xme5li -- valory/reset_pause_abci:0.1.0:bafybeigeoc363gv3wp2rrmk6p2fdxney33nxd3owtpfugzapgruwe4klyu -- valory/termination_abci:0.1.0:bafybeigqpij2sgrpnilqjljfciixop4fldq5qceixc7534q6af4potdmdm -- valory/transaction_settlement_abci:0.1.0:bafybeia7rzsbea3ch4gcafyp3z6uvqh4npws2xpdwbkkdbrqqpjops7nui -- valory/twitter_write_abci:0.1.0:bafybeidjumloxy2yvoyymgzuwbua3ks2p66fyybna2qhrz2upzkxzjrznq -- valory/decision_making_abci:0.1.0:bafybeicjrztkcvqjnk6odukj3j2dr6ee4j2jaaw5nsga6byjhjyuxhng5m -- valory/llm_abci:0.1.0:bafybeifesvwe5ya7imxefijpawgtd7aje5hhr4oh2bzgfsm2ucjp3lxije -- valory/olas_week_abci:0.1.0:bafybeidegg3yi5qww6q6r24pgjmmbkgconyfnecuohacljvferqqg3tc2e +- valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq +- valory/impact_evaluator_abci:0.1.0:bafybeictmo6lk44dzj6cvokkocamnn45jzoh2svt3raravgz764wchoanq +- valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 +- valory/twitter_scoring_abci:0.1.0:bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm +- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m +- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena +- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq +- valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm +- valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe +- valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy +- valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy +- valory/twitter_write_abci:0.1.0:bafybeica2qikrkpnzmxkjyn433yaehcrgv7ochfzt67idfniu2jexbm4hq +- valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm +- valory/llm_abci:0.1.0:bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem +- valory/olas_week_abci:0.1.0:bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q default_ledger: ethereum required_ledgers: - ethereum @@ -231,7 +231,7 @@ models: light_slash_unit_amount: ${int:5000000000000000} serious_slash_unit_amount: ${int:8000000000000000} --- -public_id: fetchai/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq +public_id: valory/http_server:0.22.0:bafybeicblltx7ha3ulthg7bzfccuqqyjmihhrvfeztlgrlcoxhr7kf6nbq type: connection config: host: 0.0.0.0 diff --git a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py index 988b31a1..f307150a 100644 --- a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py +++ b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py @@ -26,10 +26,11 @@ import docker import requests -from aea.exceptions import enforce from aea_test_autonomy.docker.base import DockerImage from docker.models.containers import Container +from aea.exceptions import enforce + from packages.valory.agents.impact_evaluator import PACKAGE_DIR from packages.valory.agents.impact_evaluator.tests.helpers.constants import ( DYNAMIC_CONTRIBUTION_CONTRACT_ADDRESS, diff --git a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py index d8a99350..c9dd24b1 100644 --- a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py +++ b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py @@ -23,7 +23,6 @@ from typing import Tuple import pytest -from aea.configurations.data_types import PublicId from aea_test_autonomy.base_test_classes.agents import ( BaseTestEnd2EndExecution, RoundChecks, @@ -44,6 +43,8 @@ from aea_test_autonomy.fixture_helpers import tendermint # noqa: F401 from aea_test_autonomy.fixture_helpers import tendermint_port # noqa: F401 +from aea.configurations.data_types import PublicId + from packages.valory.agents.impact_evaluator.tests.helpers.docker import ( DEFAULT_JSON_SERVER_ADDR as _DEFAULT_JSON_SERVER_ADDR, ) @@ -190,7 +191,7 @@ class BaseTestEnd2EndImpactEvaluatorNormalExecution(BaseTestEnd2EndExecution): ] http_server_port_config = { - "dotted_path": "vendor.fetchai.connections.http_server.config.port", + "dotted_path": "vendor.valory.connections.http_server.config.port", "value": 8000, } diff --git a/packages/valory/connections/openai/connection.py b/packages/valory/connections/openai/connection.py index e2455044..ddab1d43 100644 --- a/packages/valory/connections/openai/connection.py +++ b/packages/valory/connections/openai/connection.py @@ -23,6 +23,7 @@ from typing import Any, Dict, cast import openai + from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index 78806215..4bcb5ebe 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeiagnziswj5tll4yzx63u4hvat4yieoaaqt5b67chvvqxg5th5mxz4 - connection.py: bafybeifkomaatfsg6fetdxhnuxl4dckstmsed3d5c7ve4rbpy2lb43y3vm + connection.py: bafybeiasbiwduhvs4j257i3p4xgbgukzlirlzpjoe6cggs5u5nutbswimq readme.md: bafybeibqbvpfn6i2w7vxk2m65gizd2hcofu7mdzp2yusx7uupelztme724 fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/llm:1.0.0:bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4 +- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi class_name: OpenaiConnection config: engine: text-davinci-003 diff --git a/packages/valory/connections/twitter/connection.py b/packages/valory/connections/twitter/connection.py index 1a34792a..7ecedfb8 100644 --- a/packages/valory/connections/twitter/connection.py +++ b/packages/valory/connections/twitter/connection.py @@ -22,12 +22,13 @@ from typing import Any, Callable, cast import tweepy +from tweepy.errors import HTTPException as TweepyHTTPException + from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope from aea.protocols.base import Address, Message from aea.protocols.dialogue.base import Dialogue -from tweepy.errors import HTTPException as TweepyHTTPException from packages.valory.protocols.twitter.dialogues import TwitterDialogue from packages.valory.protocols.twitter.dialogues import ( diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index cec6575c..d77d825f 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeibxwzkyh7odchnlkeczpguencdjiizm4nezfmi4drybn2zd25xdkq - connection.py: bafybeidokslaxwsvqge6sqn2wtmmaag7u3vajunrv2gqeutwmyprgdxcyy + connection.py: bafybeies2zce7sxbihoesassplbnwmcucyajcp4hkuu6oov6ympjej6uy4 readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeib4eyf7qbs7kdntqzhwqsaaj4o2mzcokcztaza6qgwt7sbxgkqu2m +- valory/twitter:0.1.0:bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4 class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/contracts/dynamic_contribution/contract.py b/packages/valory/contracts/dynamic_contribution/contract.py index 5e552a35..73efa40b 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.py +++ b/packages/valory/contracts/dynamic_contribution/contract.py @@ -21,12 +21,13 @@ from typing import Any, cast +from aea_ledger_ethereum import EthereumApi +from web3.types import BlockIdentifier + from aea.common import JSONLike from aea.configurations.base import PublicId from aea.contracts.base import Contract from aea.crypto.base import LedgerApi -from aea_ledger_ethereum import EthereumApi -from web3.types import BlockIdentifier class DynamicContributionContract(Contract): diff --git a/packages/valory/contracts/dynamic_contribution/contract.yaml b/packages/valory/contracts/dynamic_contribution/contract.yaml index 92242c02..674fb905 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.yaml +++ b/packages/valory/contracts/dynamic_contribution/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidk77j5zmvjhf42ie7grv33hzjedgc6vdiwn22uzhlwuo6xh6hmsi build/DynamicContribution.json: bafybeicq5ee4hba3h6tsluzvdrtyvzllpqsseqys66e24bfrpjlegnxome - contract.py: bafybeihe45m6zeuymlanetr6purk4bx6vcxh5efjvn3rteovhexkksdpqy + contract.py: bafybeicdzpatfrgapps3tsig5rlegc5ulcfnppcfr3bdiil67l6n7oc7ba fingerprint_ignore_patterns: [] class_name: DynamicContributionContract contract_interface_paths: @@ -16,6 +16,4 @@ contract_interface_paths: dependencies: open-aea-ledger-ethereum: version: ==1.41.0 - open-aea-web3: - version: ==6.0.1 contracts: [] diff --git a/packages/valory/protocols/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 328e2c38..52de85e7 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeihjblrbc5rxy3b5jkv5bnxffkf7pobuy5y2kojnxi5b44wynepaka + __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 llm_pb2.py: bafybeihagcvaz53kkozrbipqlusn3vd5juse27wqufeccddxp5hqa3uere diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 39b72c8d..034a9773 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -7,7 +7,7 @@ description: A protocol for twitter interactions. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - __init__.py: bafybeicdojz3mblavk5ree6xx47c6im4uj6zspftaa4fll5hk3qe6ewqaa + __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u message.py: bafybeicxisvolj2w3ya2texgarfi53npnm24twpqsutd3avlo6w3eysanm serialization.py: bafybeihp4sa7ohk2yyixkjoohod2oayprs55dw2tgby7msmdee6xuwk4y4 diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index fdf02a8e..6e4cb4e3 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeihirytmmua4677vv5avrzias2vd47hvziogaq2mfucg5lmlqctz24 +agent: valory/impact_evaluator:0.1.0:bafybeibeea4yq46d4xkpefzu5xfemjrp6iae3i4cgu7nlje7or6rmt67u4 number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 581892b4..f9bc3f34 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeihirytmmua4677vv5avrzias2vd47hvziogaq2mfucg5lmlqctz24 +agent: valory/impact_evaluator:0.1.0:bafybeibeea4yq46d4xkpefzu5xfemjrp6iae3i4cgu7nlje7or6rmt67u4 number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/ceramic_read_abci/skill.yaml b/packages/valory/skills/ceramic_read_abci/skill.yaml index e7e649fa..3f8749b0 100644 --- a/packages/valory/skills/ceramic_read_abci/skill.yaml +++ b/packages/valory/skills/ceramic_read_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeigxhmr2m7ej7caedeqbheabq2tmnhxosyfvgpjfofgke4zkiyj3tm rounds.py: bafybeig2wb3rdu4byxzj2rzilsndgu75qcb65ryaitecr6cq3zywzgxf2y tests/__init__.py: bafybeibkxeuyukyuzek3lk5bqmo7jhl354fyznmqxv3dh4lsnly56xjkzu - tests/test_behaviours.py: bafybeia5ey4ezfjbewoidssiwuz44hazogdac77mpzhoefistbecdtlbqm + tests/test_behaviours.py: bafybeifghtktetrzak7wwmmhwdx62yyr7tez4c7jonjizqwfpiixli3xt4 tests/test_dialogues.py: bafybeias37opzowuenzii2dzwgwyaz57t3o4ocec67a274ghokptkdqaq4 tests/test_handlers.py: bafybeid26pxtjf33fkpmzpgfdg3fqyp6uttrscacwb7odprvjvysjmu36q tests/test_models.py: bafybeicuelcbuv2n2n5k3bdm3ek4gorpife5sg3whytnrpvfovyrz4mu7i @@ -28,7 +28,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} diff --git a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py index a8613a54..d79711b1 100644 --- a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py @@ -25,6 +25,7 @@ from typing import Any, Dict, Optional, Type, cast import pytest + from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/ceramic_write_abci/skill.yaml b/packages/valory/skills/ceramic_write_abci/skill.yaml index 1d5b6c83..03fc893c 100644 --- a/packages/valory/skills/ceramic_write_abci/skill.yaml +++ b/packages/valory/skills/ceramic_write_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeig63ibt5qa5sa4nw37gly3lvf4wwtps7vgr2zbvpp5zz6hzm66edq rounds.py: bafybeidfandv3ywplalo6ftkvig3nhimgohmaa3xpj35phc6pde374oaci tests/__init__.py: bafybeigknrv5xw52pmcscrsxhtpibey5jbr26dss7o5eofery6ktd6w42e - tests/test_behaviours.py: bafybeibmelmxw4tgx46oqdhfi7xx4sadqgn5q3mrxhlzfnuyeqts3otiwm + tests/test_behaviours.py: bafybeia73imiu4mdgau2u6fsgepfv3ow44jpyurtrikhminjgj73tz4qrq tests/test_dialogues.py: bafybeibvhslg6mwhvmeffhoho5olnmr56ohvx63onv63aryhaidizk3jou tests/test_handlers.py: bafybeih6yobt7ihsp32n6nliq3ourwfmgpc7lvb672timj7cqx4wg4n5ba tests/test_models.py: bafybeihqwbnrtarzos5tak2ywurtbel6fxodpupyk677aipdemaxlgs7qi @@ -28,7 +28,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} diff --git a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py index 78ef2fe8..4d3d13f2 100644 --- a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py @@ -25,6 +25,7 @@ from typing import Any, Dict, Optional, Type, cast import pytest + from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/decision_making_abci/skill.yaml b/packages/valory/skills/decision_making_abci/skill.yaml index 8eb81cd6..28760c93 100644 --- a/packages/valory/skills/decision_making_abci/skill.yaml +++ b/packages/valory/skills/decision_making_abci/skill.yaml @@ -35,7 +35,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} diff --git a/packages/valory/skills/dynamic_nft_abci/handlers.py b/packages/valory/skills/dynamic_nft_abci/handlers.py index c3ecb8a6..81aed03a 100644 --- a/packages/valory/skills/dynamic_nft_abci/handlers.py +++ b/packages/valory/skills/dynamic_nft_abci/handlers.py @@ -28,7 +28,7 @@ from aea.protocols.base import Message -from packages.fetchai.connections.http_server.connection import ( +from packages.valory.connections.http_server.connection import ( PUBLIC_ID as HTTP_SERVER_PUBLIC_ID, ) from packages.valory.protocols.http.message import HttpMessage diff --git a/packages/valory/skills/dynamic_nft_abci/skill.yaml b/packages/valory/skills/dynamic_nft_abci/skill.yaml index f7d316c7..d60c7902 100644 --- a/packages/valory/skills/dynamic_nft_abci/skill.yaml +++ b/packages/valory/skills/dynamic_nft_abci/skill.yaml @@ -11,7 +11,7 @@ fingerprint: ceramic_db.py: bafybeicusdonrdq6kirgkpdqmi3a6kmeal4nctnm5ozjqf5s5se6jpitjm dialogues.py: bafybeiabtq2to7x6bbbnxzrvupz5rky4b6k73y2lw5dmclb6xx74nuzxe4 fsm_specification.yaml: bafybeibkm4iniyjt7ofqredclpvvudtfjbmuatccnblygvqnfucsuymbxy - handlers.py: bafybeiciwdw6ori5sld5ww3znevwgfoiiiwcquv7imq2s7z6a4ybmb2c54 + handlers.py: bafybeidco56mt3ump7wjd7o3u5czp2gqynm5qqrsxrtfj6eu5feb42tyma models.py: bafybeianeimox27xwxbm5yq6go3ygf3oa2cbuv6h4y64oyjo3m2ua23sxq payloads.py: bafybeiggpj2qmh73nlr2rscisscxovf7bfrczlut7k33jujvutzgszjcwi rounds.py: bafybeia7fehb5yuxr4p3lakgfohtgwmw24kjfvor4tbhkm3v7yx2uxcg3m @@ -19,20 +19,20 @@ fingerprint: tests/test_behaviours.py: bafybeibojamjtso4gc5zxuvssqwdhigpaeixz2f4s7jkeiwxi5g5vvhaqm tests/test_ceramic_db.py: bafybeiaemz76p55aicazhysbgisrjm5sls55jbbnyfbbyye5fpsk6ltxz4 tests/test_dialogues.py: bafybeigybvptoehtw2o2jbudvyxggo5yr4pyqic7m732sha4xtaaxnfdpe - tests/test_handlers.py: bafybeifrxvoby7wcdiovtbqhct55zj6rrr6wkxudxrhrvvrts327l3akvi + tests/test_handlers.py: bafybeigstd57brwxufhkhidb4dchxtemk2qbt4cavpkf63bekdg5xub3l4 tests/test_models.py: bafybeietgyqb5rsbnzqgzcsgm2pu2qcadu7rr7akxscfmegtghc5aguz44 tests/test_payloads.py: bafybeifpwaozt6s56uctvfmkdmcuxqawmvhu5skgyfu3ekegqd3iz7v2nm tests/test_rounds.py: bafybeid5ndadenmeqctrnzir4m7mpv2beqfbi3t66ry2dyozd7rabrezrq fingerprint_ignore_patterns: [] connections: -- fetchai/http_server:0.22.0:bafybeihp5umafxzx45aad5pj7s3343se2wjkgnbirt4pybrape22swm6de +- valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom contracts: -- valory/dynamic_contribution:0.1.0:bafybeiht364qavknmnuz7pwkw4zjzrkkugyzymgxrjvtasfcy7eya3nbxa +- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y protocols: -- valory/contract_api:1.0.0:bafybeiasywsvax45qmugus5kxogejj66c5taen27h4voriodz7rgushtqa -- valory/http:1.0.0:bafybeia5bxdua2i6chw6pg47bvoljzcpuqxzy4rdrorbdmcbnwmnfdobtu +- valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka +- valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} diff --git a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py index 394fd264..33602846 100644 --- a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py +++ b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py @@ -28,10 +28,11 @@ from unittest.mock import Mock, patch import pytest + from aea.protocols.dialogue.base import DialogueMessage from aea.test_tools.test_skill import BaseSkillTestCase -from packages.fetchai.connections.http_server.connection import ( +from packages.valory.connections.http_server.connection import ( PUBLIC_ID as HTTP_SERVER_PUBLIC_ID, ) from packages.valory.protocols.http.message import HttpMessage diff --git a/packages/valory/skills/generic_scoring_abci/skill.yaml b/packages/valory/skills/generic_scoring_abci/skill.yaml index d4cc34a8..21b9cbe5 100644 --- a/packages/valory/skills/generic_scoring_abci/skill.yaml +++ b/packages/valory/skills/generic_scoring_abci/skill.yaml @@ -29,7 +29,7 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index a0d348bb..b69061d1 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -23,20 +23,20 @@ connections: [] contracts: [] protocols: [] skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq -- valory/ceramic_read_abci:0.1.0:bafybeide5tbobzkwfdi7yzw6bsau36h43hdlgbnk2bfqvvhmq3hl3ucjmm -- valory/generic_scoring_abci:0.1.0:bafybeig4hoc5gjiyuwh2ye3mwneegq3s3cghl5j7yokvngacvn7ixwdoga -- valory/twitter_scoring_abci:0.1.0:bafybeicngrngwq4fna57rj4lo4nsvt73t3x3d33jb52po5e6kc7stbkl3q -- valory/ceramic_write_abci:0.1.0:bafybeihnalj6zhl5pbf7x2lkznuhivwj45jzrafbtxatwebrpb7st2v6oa -- valory/dynamic_nft_abci:0.1.0:bafybeiexenlxvf32jjlxrow35qlo4xtmi2ezznulczhayux2n2mx27ya6i -- valory/registration_abci:0.1.0:bafybeibndt6vxiwc2edgtaxpjbhwto3eyu33ujz3zmvtygvo2qz7xme5li -- valory/reset_pause_abci:0.1.0:bafybeigeoc363gv3wp2rrmk6p2fdxney33nxd3owtpfugzapgruwe4klyu -- valory/termination_abci:0.1.0:bafybeigqpij2sgrpnilqjljfciixop4fldq5qceixc7534q6af4potdmdm -- valory/transaction_settlement_abci:0.1.0:bafybeia7rzsbea3ch4gcafyp3z6uvqh4npws2xpdwbkkdbrqqpjops7nui -- valory/decision_making_abci:0.1.0:bafybeicjrztkcvqjnk6odukj3j2dr6ee4j2jaaw5nsga6byjhjyuxhng5m -- valory/llm_abci:0.1.0:bafybeifesvwe5ya7imxefijpawgtd7aje5hhr4oh2bzgfsm2ucjp3lxije -- valory/twitter_write_abci:0.1.0:bafybeidjumloxy2yvoyymgzuwbua3ks2p66fyybna2qhrz2upzkxzjrznq -- valory/olas_week_abci:0.1.0:bafybeidegg3yi5qww6q6r24pgjmmbkgconyfnecuohacljvferqqg3tc2e +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq +- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m +- valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 +- valory/twitter_scoring_abci:0.1.0:bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm +- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena +- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq +- valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm +- valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe +- valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy +- valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy +- valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm +- valory/llm_abci:0.1.0:bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem +- valory/twitter_write_abci:0.1.0:bafybeica2qikrkpnzmxkjyn433yaehcrgv7ochfzt67idfniu2jexbm4hq +- valory/olas_week_abci:0.1.0:bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index f005b888..7e3246fe 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,12 +23,12 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq +- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm contracts: [] protocols: -- valory/llm:1.0.0:bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4 +- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index 08b16d95..1db11a3a 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,12 +19,12 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq +- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm contracts: [] protocols: -- valory/llm:1.0.0:bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4 +- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} @@ -164,7 +164,5 @@ models: tendermint_dialogues: args: {} class_name: TendermintDialogues -dependencies: - open-aea-web3: - version: ==6.0.1 +dependencies: {} is_abstract: true diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index 723cd731..a64a77a2 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,12 +27,12 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeibn42k4zebenmjsumkngfxllxbofkwdno2fm65o6zf5y2uihmo2dq +- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm contracts: [] protocols: -- valory/llm:1.0.0:bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4 +- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} @@ -174,7 +174,5 @@ models: tendermint_dialogues: args: {} class_name: TendermintDialogues -dependencies: - open-aea-web3: - version: ==6.0.1 +dependencies: {} is_abstract: true diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index cd931087..8f9487e9 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,12 +24,12 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeifm7tpjdd2y5dy5xzuxt3tebyqxmgn56agkqv64nloggqo5cr3sku +- valory/twitter:0.1.0:bafybeig542ufsbxtbx5ot4643257g6lwiv6vptv3oia6ibms7btroe4x4a contracts: [] protocols: -- valory/twitter:0.1.0:bafybeib4eyf7qbs7kdntqzhwqsaaj4o2mzcokcztaza6qgwt7sbxgkqu2m +- valory/twitter:0.1.0:bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4 skills: -- valory/abstract_round_abci:0.1.0:bafybeih2fyfb6kkf7r45pvdk7pyyebr5xloia4xiqxtb3qsrasnstqmepq +- valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: main: args: {} @@ -160,7 +160,5 @@ models: twitter_dialogues: args: {} class_name: TwitterDialogues -dependencies: - open-aea-web3: - version: ==6.0.1 +dependencies: {} is_abstract: true diff --git a/scripts/check_doc_ipfs_hashes.py b/scripts/check_doc_ipfs_hashes.py index aef3a8ff..afaf498f 100755 --- a/scripts/check_doc_ipfs_hashes.py +++ b/scripts/check_doc_ipfs_hashes.py @@ -29,6 +29,7 @@ from typing import Dict, List, Optional import yaml + from aea.cli.packages import get_package_manager from aea.configurations.data_types import PackageId from aea.helpers.base import IPFS_HASH_REGEX, SIMPLE_ID_REGEX diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..ab2836a7 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,328 @@ +[bdist_wheel] +# we dont support py2 +universal = 0 + +[flake8] +paths=aea,examples,packages,scripts,tests +exclude=.md, + *_pb2.py, + aea/__init__.py, + aea/cli/__init__.py, + tests/common/oef_search_pluto_scripts, + tests/common/click_testing.py, + scripts/oef/launch.py +max-line-length = 88 +select = B,C,D,E,F,I,W, +ignore = E203,E501,W503,D202,B014,D400,D401,DAR,B028,B017 +application-import-names = aea,packages,tests,scripts +per-file-ignores = + tests/test_cli/test_upgrade.py:E800 + tests/test_protocols/test_generator/test_end_to_end.py:E800,F401 + tests/test_cli/test_launch_end_to_end.py:E800 + **/aea_ledger_cosmos/cosmos.py:F401 + **/aea_ledger_fetchai/_cosmos.py:F401 + +# ignore as too restrictive for our needs: +# D400: First line should end with a period +# D401: First line should be in imperative mood +# E501: https://www.flake8rules.com/rules/E501.html (Line too long) +# E203: https://www.flake8rules.com/rules/E203.html (Whitespace) +# W503: https://www.flake8rules.com/rules/W503.html (Line break) +# D202: blank lines +# B014: redundant exception + +[isort] +# for black compatibility +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +use_parentheses=True +ensure_newline_before_comments = True +line_length=88 +# custom configurations +order_by_type=False +case_sensitive=True +lines_after_imports=2 +skip = + tests/data/dummy_aea/vendor/ + tests/data/dummy_aea/skills/dummy +skip_glob = **/*_pb2.py +known_first_party=aea +known_packages=packages +known_local_folder=tests +sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER + +[mypy] +python_version = 3.8 +strict_optional = True + +# temporary until fixed +exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py|acn/tests/test_acn.py|packages/valory/connections/test_libp2p + +# Before adding a module here, make sure it does not support type hints + +# Per-module options for aea dir: + +[mypy-aea/mail/base_pb2] +ignore_errors = True + +[mypy-aea/helpers/multiaddr/crypto_pb2] +ignore_errors = True + +[mypy-aea/helpers/search/models_pb2] +ignore_errors = True + +[mypy-packages.valory.protocols.ledger_api.serialization] +ignore_errors = True + +[mypy-oef.*] +ignore_missing_imports = True + +[mypy-semver.*] +ignore_missing_imports = True + +[mypy-eth_keys.*] +ignore_missing_imports = True + +[mypy-jsonschema.*] +ignore_missing_imports = True + +[mypy-dotenv] +ignore_missing_imports = True + +[mypy-connexion] +ignore_missing_imports = True + +[mypy-eth_account.*] +ignore_missing_imports = True + +[mypy-ipfshttpclient.*] +ignore_missing_imports = True + +[mypy-aea/helpers/ipfs/pb/unixfs_pb2] +ignore_errors = True + +[mypy-aea/helpers/ipfs/pb/merkledag_pb2] +ignore_errors = True + +[mypy-win32con.*] +ignore_missing_imports = True + +[mypy-win32file.*] +ignore_missing_imports = True + +[mypy-pywintypes.*] +ignore_missing_imports = True + +[mypy-ecdsa.*] +ignore_missing_imports = True + +[mypy-urllib3.*] +ignore_missing_imports = True + +[mypy-aea_ledger_fetchai.*] +ignore_missing_imports = True + +[mypy-aea_ledger_ethereum.*] +ignore_missing_imports = True + +[mypy-aea_ledger_cosmos.*] +ignore_missing_imports = True + +[mypy-aea_ledger_solana.*] +ignore_missing_imports = True + +# Per-module options for examples dir: + +[mypy-numpy] +ignore_missing_imports = True + +[mypy-gym.*] +ignore_missing_imports = True + +# Per-module options for tests dir: + +[mypy-pytest] +ignore_missing_imports = True + +[mypy-pytest_asyncio] +ignore_missing_imports = True + +[mypy-docker.*] +ignore_missing_imports = True + +[mypy-tests/data/generator/t_protocol/*] +ignore_errors = True + +[mypy-tests/data/generator/t_protocol_no_ct/*] +ignore_errors = True + +[mypy-tests/data/dummy_aea/vendor/*] +ignore_errors = True + +[mypy-mistune] +ignore_missing_imports = True + +[mypy-git.*] +ignore_missing_imports = True + +[mypy-packaging.*] +ignore_missing_imports = True + +[mypy-aiohttp.*] +ignore_missing_imports = True + +[mypy-base58.*] +ignore_missing_imports = True + +[mypy-multidict.*] +ignore_missing_imports = True + +[mypy-web3.*] +ignore_missing_imports = True + +# Per-module options for packages dir: + +[mypy-packages/fetchai/protocols/contract_api/contract_api_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/default/default_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/fipa/fipa_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/gym/gym_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/http/http_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/ledger_api/ledger_api_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/oef_search/oef_search_pb2] +ignore_errors = True + +[mypy-packages/open_aea/protocols/signing/signing_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/state_update/state_update_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/tac/tac_pb2] +ignore_errors = True + +[mypy-packages/valory/protocols/acn/acn_pb2] +ignore_errors = True + +[mypy-packages/valory/protocols/tendermint/tendermint_pb2] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol/t_protocol_pb2] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/t_protocol_no_ct_pb2] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol/serialization] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/serialization] +ignore_errors = True + +[mypy-tensorflow.*] +ignore_missing_imports = True + +[mypy-temper.*] +ignore_missing_imports = True + +[mypy-openapi_core.*] +ignore_missing_imports = True + +[mypy-openapi_spec_validator.*] +ignore_missing_imports = True + +[mypy-sqlalchemy] +ignore_missing_imports = True + +[mypy-defusedxml.*] +ignore_missing_imports = True + +[mypy-cosmpy.*] +ignore_missing_imports = True + +[mypy-google.*] +ignore_missing_imports = True + +[mypy-click.*] +ignore_missing_imports = True + +[mypy-yaml.*] +ignore_missing_imports = True + +[mypy-requests.*] +ignore_missing_imports = True + +[mypy-certifi.*] +ignore_missing_imports = True + +[mypy-werkzeug.*] +ignore_missing_imports = True + +[mypy-pkg_resources.*] +ignore_missing_imports = True + +[mypy-gyms.*] +ignore_missing_imports = True + +[mypy-rl.*] +ignore_missing_imports = True + +[mypy-multibase.*] +ignore_missing_imports = True + +[mypy-multicodec.*] +ignore_missing_imports = True + +[mypy-morphys.*] +ignore_missing_imports = True + +[mypy-multihash.*] +ignore_missing_imports = True + +[mypy-coverage.*] +ignore_missing_imports = True + +[mypy-Crypto.*] +ignore_missing_imports = True + +[mypy-eth_typing.*] +ignore_missing_imports = True + +[mypy-bech32.*] +ignore_missing_imports = True + +[mypy-eth_utils.*] +ignore_missing_imports = True + +[mypy-_strptime.*] +ignore_missing_imports = True + +[mypy-hypothesis.*] +ignore_missing_imports = True + +[mypy-hexbytes.*] +ignore_missing_imports=True + +[mypy-flashbots.*] +ignore_missing_imports=True + +[mypy-asyncio.*] +ignore_missing_imports=True + +[darglint] +docstring_style=sphinx +strictness=short +ignore_regex=.*_pb2\.py +ignore=DAR401 diff --git a/tox.ini b/tox.ini index 20e99eca..f439024c 100644 --- a/tox.ini +++ b/tox.ini @@ -41,7 +41,6 @@ deps = open-aea-cli-ipfs==1.41.0 open-aea-test-autonomy==0.13.1 open-autonomy==0.13.1 - open-aea-web3==6.0.1 requests==2.28.2 typing-extensions==4.5.0 requests==2.28.2 @@ -446,7 +445,7 @@ exclude=.md, connection/valory/ipfs connection/valory/ledger connection/valory/p2p_libp2p_client - connection/fetchai/http_server + connection/valory/http_server contract/valory/gnosis_safe_proxy_factory contract/valory/gnosis_safe skill/valory/transaction_settlement_abci @@ -479,7 +478,7 @@ line_length=88 order_by_type=False case_sensitive=True lines_after_imports=2 -skip=packages/valory/protocols/open_aea,protocol/valory/abci,protocol/valory/contract_api,protocol/valory/http,protocol/valory/ledger_api,protocol/valory/acn,protocol/valory/ipfs,protocol/valory/tendermint,skill/valory/abstract_abci,skill/valory/reset_pause_abci,skill/valory/registration_abci,skill/valory/abstract_round_abci,contract/valory/service_registry,connection/valory/abci,connection/valory/http_client,connection/valory/ipfs,connection/valory/ledger,connection/valory/p2p_libp2p_client,connection/fetchai/http_server,contract/valory/gnosis_safe_proxy_factory,contract/valory/gnosis_safe,skill/valory/transaction_settlement_abci,contract/valory/multisend,skill/valory/termination_abci, +skip=packages/valory/protocols/open_aea,protocol/valory/abci,protocol/valory/contract_api,protocol/valory/http,protocol/valory/ledger_api,protocol/valory/acn,protocol/valory/ipfs,protocol/valory/tendermint,skill/valory/abstract_abci,skill/valory/reset_pause_abci,skill/valory/registration_abci,skill/valory/abstract_round_abci,contract/valory/service_registry,connection/valory/abci,connection/valory/http_client,connection/valory/ipfs,connection/valory/ledger,connection/valory/p2p_libp2p_client,connection/valory/http_server,contract/valory/gnosis_safe_proxy_factory,contract/valory/gnosis_safe,skill/valory/transaction_settlement_abci,contract/valory/multisend,skill/valory/termination_abci, skip_glob = known_first_party=autonomy known_packages=packages From 66744116d31f833f9538bd516b5609fe3a1c00d8 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:29:43 +0200 Subject: [PATCH 06/30] fix: generators --- Makefile | 2 +- docs/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cdd3b9aa..16b3b5be 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ security: generators: find . -empty -type d -delete # remove empty directories to avoid wrong hashes tox -e abci-docstrings - tomte format-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci + tomte format-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part http_server autonomy packages lock tox -e fix-doc-hashes diff --git a/docs/index.md b/docs/index.md index 0233b744..8b2a5a9b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeiee26nlyajwylnqe3fwgexmrc7ggb3pnmmt2xcc5qeszfz7lpeox4 --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeigctjzsni4ikwel4snqrtv4xvok5qcxtugmoly7vo2xlmym57odzu --service ``` 3. Build the Docker image of the service agents From db08f3d96ef100b49d4150a838a317453557a9d4 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:45:40 +0200 Subject: [PATCH 07/30] fix: add protocol readme --- .gitignore | 1 - packages/valory/protocols/twitter/README.md | 37 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 packages/valory/protocols/twitter/README.md diff --git a/.gitignore b/.gitignore index b73bfe8c..4a0caa93 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ packages/valory/skills/safe_deployment_abci packages/valory/skills/transaction_settlement_abci packages/valory/skills/termination_abci packages/open_aea -packages/fetchai *.pyc .vscode/ .coverage* diff --git a/packages/valory/protocols/twitter/README.md b/packages/valory/protocols/twitter/README.md new file mode 100644 index 00000000..ac3b65f3 --- /dev/null +++ b/packages/valory/protocols/twitter/README.md @@ -0,0 +1,37 @@ +# Twitter Protocol + +## Description + +This is a protocol for interacting with Twitter. + +## Specification + +```yaml +--- +name: twitter +author: valory +version: 0.1.0 +description: A protocol for interacting with Twitter. +license: Apache-2.0 +aea_version: '>=1.0.0, <2.0.0' +protocol_specification_id: valory/twitter:0.1.0 +speech_acts: + request: + data: pt:str + response: + tweet_id: pt:str +... +--- +initiation: [request] +reply: + request: [response] + response: [] +termination: [response] +roles: {skill, connection} +end_states: [successful] +keep_terminal_state_dialogues: false +... +``` + +## Links + From 00258a50b3fd5f6a206f90b06537d1d47f9f6f38 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:46:30 +0200 Subject: [PATCH 08/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 14 +++++++------- .../valory/agents/impact_evaluator/aea-config.yaml | 8 ++++---- .../valory/connections/twitter/connection.yaml | 2 +- packages/valory/protocols/twitter/protocol.yaml | 1 + .../valory/services/impact_evaluator/service.yaml | 2 +- .../services/impact_evaluator_local/service.yaml | 2 +- .../valory/skills/impact_evaluator_abci/skill.yaml | 2 +- .../valory/skills/twitter_write_abci/skill.yaml | 4 ++-- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/docs/index.md b/docs/index.md index 8b2a5a9b..e8f2bddd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeigctjzsni4ikwel4snqrtv4xvok5qcxtugmoly7vo2xlmym57odzu --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeibempaojguuu7khxrr3agwrn3dsxo2e5h5kc6vqtbfzr3wetlij54 --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index a2e29103..548bb2af 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,22 +1,22 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeibeea4yq46d4xkpefzu5xfemjrp6iae3i4cgu7nlje7or6rmt67u4", + "agent/valory/impact_evaluator/0.1.0": "bafybeicoqmbcavkqf23t4wdcgauf7zichur4ukdbhbqg6ar4i7pplx3hty", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeigctjzsni4ikwel4snqrtv4xvok5qcxtugmoly7vo2xlmym57odzu", + "service/valory/impact_evaluator/0.1.0": "bafybeibempaojguuu7khxrr3agwrn3dsxo2e5h5kc6vqtbfzr3wetlij54", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeictmo6lk44dzj6cvokkocamnn45jzoh2svt3raravgz764wchoanq", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidcec62lwfbf22b6w7rnbrvln37k36sce2r6jdjryukumsyyqjaf4", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4", + "protocol/valory/twitter/0.1.0": "bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y", "protocol/valory/llm/1.0.0": "bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi", - "connection/valory/twitter/0.1.0": "bafybeig542ufsbxtbx5ot4643257g6lwiv6vptv3oia6ibms7btroe4x4a", + "connection/valory/twitter/0.1.0": "bafybeial6pvki6qioonvtvtwagiajwp7uhogbglzkcq73w5w3eavfj4g3y", "connection/valory/openai/0.1.0": "bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm", - "skill/valory/twitter_write_abci/0.1.0": "bafybeica2qikrkpnzmxkjyn433yaehcrgv7ochfzt67idfniu2jexbm4hq", + "skill/valory/twitter_write_abci/0.1.0": "bafybeia2fxjjepn7lmt4n6ilqx2s3ztr5sxbmwdov27rgbsho3izhixiji", "skill/valory/llm_abci/0.1.0": "bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeibn6comrya2fqvma2az7ka34dfvikgzkrnwa3qiblqw2lkqwrfzyy", + "service/valory/impact_evaluator_local/0.1.0": "bafybeidulrfvvhjh357exxgnqcvvzpeqnpomlteiui354tkm7stfnwipty", "skill/valory/olas_week_abci/0.1.0": "bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q" }, "third_party": { diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 5e239390..3d15c2b8 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -21,7 +21,7 @@ connections: - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq - valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm -- valory/twitter:0.1.0:bafybeig542ufsbxtbx5ot4643257g6lwiv6vptv3oia6ibms7btroe4x4a +- valory/twitter:0.1.0:bafybeial6pvki6qioonvtvtwagiajwp7uhogbglzkcq73w5w3eavfj4g3y contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -38,11 +38,11 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4 +- valory/twitter:0.1.0:bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeictmo6lk44dzj6cvokkocamnn45jzoh2svt3raravgz764wchoanq +- valory/impact_evaluator_abci:0.1.0:bafybeidcec62lwfbf22b6w7rnbrvln37k36sce2r6jdjryukumsyyqjaf4 - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 - valory/twitter_scoring_abci:0.1.0:bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m @@ -52,7 +52,7 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeica2qikrkpnzmxkjyn433yaehcrgv7ochfzt67idfniu2jexbm4hq +- valory/twitter_write_abci:0.1.0:bafybeia2fxjjepn7lmt4n6ilqx2s3ztr5sxbmwdov27rgbsho3izhixiji - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem - valory/olas_week_abci:0.1.0:bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index d77d825f..32dc71d2 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4 +- valory/twitter:0.1.0:bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 034a9773..563c73fc 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -7,6 +7,7 @@ description: A protocol for twitter interactions. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: + README.md: bafybeiemontaaeytd3px2grliu5eaf2gghnt2asqi2uunmmlwrvjmxlxdy __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u message.py: bafybeicxisvolj2w3ya2texgarfi53npnm24twpqsutd3avlo6w3eysanm diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 6e4cb4e3..0283af4a 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibeea4yq46d4xkpefzu5xfemjrp6iae3i4cgu7nlje7or6rmt67u4 +agent: valory/impact_evaluator:0.1.0:bafybeicoqmbcavkqf23t4wdcgauf7zichur4ukdbhbqg6ar4i7pplx3hty number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index f9bc3f34..b44c092a 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibeea4yq46d4xkpefzu5xfemjrp6iae3i4cgu7nlje7or6rmt67u4 +agent: valory/impact_evaluator:0.1.0:bafybeicoqmbcavkqf23t4wdcgauf7zichur4ukdbhbqg6ar4i7pplx3hty number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index b69061d1..b5279922 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -35,7 +35,7 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem -- valory/twitter_write_abci:0.1.0:bafybeica2qikrkpnzmxkjyn433yaehcrgv7ochfzt67idfniu2jexbm4hq +- valory/twitter_write_abci:0.1.0:bafybeia2fxjjepn7lmt4n6ilqx2s3ztr5sxbmwdov27rgbsho3izhixiji - valory/olas_week_abci:0.1.0:bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q behaviours: main: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index 8f9487e9..5b52d9bb 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeig542ufsbxtbx5ot4643257g6lwiv6vptv3oia6ibms7btroe4x4a +- valory/twitter:0.1.0:bafybeial6pvki6qioonvtvtwagiajwp7uhogbglzkcq73w5w3eavfj4g3y contracts: [] protocols: -- valory/twitter:0.1.0:bafybeiff2rhmfo6dfmhylr7o2yhjnplnyh6mkrmlqaucweqj7qeyzj6vm4 +- valory/twitter:0.1.0:bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From 30069696e79d0b0c69cb8a4d5ed4faac57d0497b Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:47:46 +0200 Subject: [PATCH 09/30] fix: regenerate protocols --- packages/valory/protocols/llm/__init__.py | 21 ----- packages/valory/protocols/llm/dialogues.py | 21 ----- packages/valory/protocols/llm/llm_pb2.py | 78 ++++--------------- packages/valory/protocols/llm/message.py | 23 +----- packages/valory/protocols/llm/protocol.yaml | 10 +-- .../valory/protocols/llm/serialization.py | 36 ++------- packages/valory/protocols/twitter/__init__.py | 21 ----- .../valory/protocols/twitter/dialogues.py | 35 ++------- packages/valory/protocols/twitter/message.py | 69 ++++------------ .../valory/protocols/twitter/protocol.yaml | 16 ++-- .../valory/protocols/twitter/serialization.py | 70 +++++------------ .../valory/protocols/twitter/twitter.proto | 17 ++-- .../valory/protocols/twitter/twitter_pb2.py | 76 +++--------------- 13 files changed, 95 insertions(+), 398 deletions(-) diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 845b47fe..83565f19 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__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/llm/dialogues.py b/packages/valory/protocols/llm/dialogues.py index 2b7e0967..643dd397 100644 --- a/packages/valory/protocols/llm/dialogues.py +++ b/packages/valory/protocols/llm/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/llm/llm_pb2.py b/packages/valory/protocols/llm/llm_pb2.py index 2384280f..4ada3001 100644 --- a/packages/valory/protocols/llm/llm_pb2.py +++ b/packages/valory/protocols/llm/llm_pb2.py @@ -4,10 +4,8 @@ """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database - +from google.protobuf.internal import builder as _builder # @@protoc_insertion_point(imports) @@ -18,69 +16,21 @@ b'\n\tllm.proto\x12\x15\x61\x65\x61.valory.llm.v1_0_0"\xa4\x03\n\nLlmMessage\x12I\n\x07request\x18\x05 \x01(\x0b\x32\x36.aea.valory.llm.v1_0_0.LlmMessage.Request_PerformativeH\x00\x12K\n\x08response\x18\x06 \x01(\x0b\x32\x37.aea.valory.llm.v1_0_0.LlmMessage.Response_PerformativeH\x00\x1a\xc5\x01\n\x14Request_Performative\x12\x17\n\x0fprompt_template\x18\x01 \x01(\t\x12_\n\rprompt_values\x18\x02 \x03(\x0b\x32H.aea.valory.llm.v1_0_0.LlmMessage.Request_Performative.PromptValuesEntry\x1a\x33\n\x11PromptValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\x1a&\n\x15Response_Performative\x12\r\n\x05value\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' ) - -_LLMMESSAGE = DESCRIPTOR.message_types_by_name["LlmMessage"] -_LLMMESSAGE_REQUEST_PERFORMATIVE = _LLMMESSAGE.nested_types_by_name[ - "Request_Performative" -] -_LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY = ( - _LLMMESSAGE_REQUEST_PERFORMATIVE.nested_types_by_name["PromptValuesEntry"] -) -_LLMMESSAGE_RESPONSE_PERFORMATIVE = _LLMMESSAGE.nested_types_by_name[ - "Response_Performative" -] -LlmMessage = _reflection.GeneratedProtocolMessageType( - "LlmMessage", - (_message.Message,), - { - "Request_Performative": _reflection.GeneratedProtocolMessageType( - "Request_Performative", - (_message.Message,), - { - "PromptValuesEntry": _reflection.GeneratedProtocolMessageType( - "PromptValuesEntry", - (_message.Message,), - { - "DESCRIPTOR": _LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY, - "__module__": "llm_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.llm.v1_0_0.LlmMessage.Request_Performative.PromptValuesEntry) - }, - ), - "DESCRIPTOR": _LLMMESSAGE_REQUEST_PERFORMATIVE, - "__module__": "llm_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.llm.v1_0_0.LlmMessage.Request_Performative) - }, - ), - "Response_Performative": _reflection.GeneratedProtocolMessageType( - "Response_Performative", - (_message.Message,), - { - "DESCRIPTOR": _LLMMESSAGE_RESPONSE_PERFORMATIVE, - "__module__": "llm_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.llm.v1_0_0.LlmMessage.Response_Performative) - }, - ), - "DESCRIPTOR": _LLMMESSAGE, - "__module__": "llm_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.llm.v1_0_0.LlmMessage) - }, -) -_sym_db.RegisterMessage(LlmMessage) -_sym_db.RegisterMessage(LlmMessage.Request_Performative) -_sym_db.RegisterMessage(LlmMessage.Request_Performative.PromptValuesEntry) -_sym_db.RegisterMessage(LlmMessage.Response_Performative) - +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "llm_pb2", _globals) if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None _LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY._options = None _LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY._serialized_options = b"8\001" - _LLMMESSAGE._serialized_start = 37 - _LLMMESSAGE._serialized_end = 457 - _LLMMESSAGE_REQUEST_PERFORMATIVE._serialized_start = 204 - _LLMMESSAGE_REQUEST_PERFORMATIVE._serialized_end = 401 - _LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY._serialized_start = 350 - _LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY._serialized_end = 401 - _LLMMESSAGE_RESPONSE_PERFORMATIVE._serialized_start = 403 - _LLMMESSAGE_RESPONSE_PERFORMATIVE._serialized_end = 441 + _globals["_LLMMESSAGE"]._serialized_start = 37 + _globals["_LLMMESSAGE"]._serialized_end = 457 + _globals["_LLMMESSAGE_REQUEST_PERFORMATIVE"]._serialized_start = 204 + _globals["_LLMMESSAGE_REQUEST_PERFORMATIVE"]._serialized_end = 401 + _globals[ + "_LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY" + ]._serialized_start = 350 + _globals["_LLMMESSAGE_REQUEST_PERFORMATIVE_PROMPTVALUESENTRY"]._serialized_end = 401 + _globals["_LLMMESSAGE_RESPONSE_PERFORMATIVE"]._serialized_start = 403 + _globals["_LLMMESSAGE_RESPONSE_PERFORMATIVE"]._serialized_end = 441 # @@protoc_insertion_point(module_scope) diff --git a/packages/valory/protocols/llm/message.py b/packages/valory/protocols/llm/message.py index 96cfe303..16618c75 100644 --- a/packages/valory/protocols/llm/message.py +++ b/packages/valory/protocols/llm/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 -*- # ------------------------------------------------------------------------------ # @@ -46,7 +25,7 @@ from aea.configurations.base import PublicId from aea.exceptions import AEAEnforceError, enforce -from aea.protocols.base import Message +from aea.protocols.base import Message # type: ignore _default_logger = logging.getLogger("aea.packages.valory.protocols.llm.message") diff --git a/packages/valory/protocols/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 52de85e7..54314889 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m - dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 + __init__.py: bafybeiauadqjlhqmauczfl4ljcdcs6imvg3kc4nbaobb5nrmgh5qqvyq5i + dialogues.py: bafybeict3p7xmn2r2mur3iep54fmbosvsrp4mk4l6ad4hzc7ywwl3c4ale llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 - llm_pb2.py: bafybeihagcvaz53kkozrbipqlusn3vd5juse27wqufeccddxp5hqa3uere - message.py: bafybeichahp2zsq7qy4pihnoln7cypvhaz26tpvqy7cl4bhmykba7n3lvq - serialization.py: bafybeid5pqtwafnq4j3u6wbjjgq2ud3jwlojwetzj6pp4kaicsg7hzr5ri + llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e + message.py: bafybeiayhrzk2l4fsacw5c2eu57yods5ey7yicx2ugvrz5yedjxmakrvbm + serialization.py: bafybeideqcjtagyhzrblxnq42ulyqqnjsex7r4n47cvlabhxdimyklpmwa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im tests/test_llm_messages.py: bafybeidur77uf5moysw2zfborvlpc24fytcncucwsh6gqt3dufj5sl7srq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/llm/serialization.py b/packages/valory/protocols/llm/serialization.py index 94718eed..8cc497f3 100644 --- a/packages/valory/protocols/llm/serialization.py +++ b/packages/valory/protocols/llm/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 -*- # ------------------------------------------------------------------------------ # @@ -43,12 +22,13 @@ # pylint: disable=too-many-statements,too-many-locals,no-member,too-few-public-methods,redefined-builtin from typing import Any, Dict, cast -from aea.mail.base_pb2 import DialogueMessage -from aea.mail.base_pb2 import Message as ProtobufMessage -from aea.protocols.base import Message, Serializer +from aea.mail.base_pb2 import DialogueMessage # type: ignore +from aea.mail.base_pb2 import Message as ProtobufMessage # type: ignore +from aea.protocols.base import Message # type: ignore +from aea.protocols.base import Serializer # type: ignore -from packages.valory.protocols.llm import llm_pb2 -from packages.valory.protocols.llm.message import LlmMessage +from packages.valory.protocols.llm import llm_pb2 # type: ignore +from packages.valory.protocols.llm.message import LlmMessage # type: ignore class LlmSerializer(Serializer): @@ -65,7 +45,7 @@ def encode(msg: Message) -> bytes: msg = cast(LlmMessage, msg) message_pb = ProtobufMessage() dialogue_message_pb = DialogueMessage() - llm_msg = llm_pb2.LlmMessage() + llm_msg = llm_pb2.LlmMessage() # type: ignore dialogue_message_pb.message_id = msg.message_id dialogue_reference = msg.dialogue_reference @@ -104,7 +84,7 @@ def decode(obj: bytes) -> Message: :return: the 'Llm' message. """ message_pb = ProtobufMessage() - llm_pb = llm_pb2.LlmMessage() + llm_pb = llm_pb2.LlmMessage() # type: ignore message_pb.ParseFromString(obj) message_id = message_pb.dialogue_message.message_id dialogue_reference = ( diff --git a/packages/valory/protocols/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index 8346937a..0da37af1 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__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/twitter/dialogues.py b/packages/valory/protocols/twitter/dialogues.py index a156857f..a27172d2 100644 --- a/packages/valory/protocols/twitter/dialogues.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -59,20 +38,16 @@ class TwitterDialogue(Dialogue): """The twitter dialogue class maintains state of a dialogue and manages it.""" INITIAL_PERFORMATIVES: FrozenSet[Message.Performative] = frozenset( - {TwitterMessage.Performative.CREATE_TWEET} + {TwitterMessage.Performative.REQUEST} ) TERMINAL_PERFORMATIVES: FrozenSet[Message.Performative] = frozenset( - {TwitterMessage.Performative.TWEET_CREATED, TwitterMessage.Performative.ERROR} + {TwitterMessage.Performative.RESPONSE} ) VALID_REPLIES: Dict[Message.Performative, FrozenSet[Message.Performative]] = { - TwitterMessage.Performative.CREATE_TWEET: frozenset( - { - TwitterMessage.Performative.TWEET_CREATED, - TwitterMessage.Performative.ERROR, - } + TwitterMessage.Performative.REQUEST: frozenset( + {TwitterMessage.Performative.RESPONSE} ), - TwitterMessage.Performative.ERROR: frozenset(), - TwitterMessage.Performative.TWEET_CREATED: frozenset(), + TwitterMessage.Performative.RESPONSE: frozenset(), } class Role(Dialogue.Role): diff --git a/packages/valory/protocols/twitter/message.py b/packages/valory/protocols/twitter/message.py index 1acfe94b..c32f454a 100644 --- a/packages/valory/protocols/twitter/message.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -46,7 +25,7 @@ from aea.configurations.base import PublicId from aea.exceptions import AEAEnforceError, enforce -from aea.protocols.base import Message +from aea.protocols.base import Message # type: ignore _default_logger = logging.getLogger("aea.packages.valory.protocols.twitter.message") @@ -55,33 +34,31 @@ class TwitterMessage(Message): - """A protocol for twitter interactions.""" + """A protocol for interacting with Twitter.""" protocol_id = PublicId.from_str("valory/twitter:0.1.0") - protocol_specification_id = PublicId.from_str("valory/twitter:1.0.0") + protocol_specification_id = PublicId.from_str("valory/twitter:0.1.0") class Performative(Message.Performative): """Performatives for the twitter protocol.""" - CREATE_TWEET = "create_tweet" - ERROR = "error" - TWEET_CREATED = "tweet_created" + REQUEST = "request" + RESPONSE = "response" def __str__(self) -> str: """Get the string representation.""" return str(self.value) - _performatives = {"create_tweet", "error", "tweet_created"} + _performatives = {"request", "response"} __slots__: Tuple[str, ...] = tuple() class _SlotsCls: __slots__ = ( + "data", "dialogue_reference", - "message", "message_id", "performative", "target", - "text", "tweet_id", ) @@ -140,16 +117,10 @@ def target(self) -> int: return cast(int, self.get("target")) @property - def message(self) -> str: - """Get the 'message' content from the message.""" - enforce(self.is_set("message"), "'message' content is not set.") - return cast(str, self.get("message")) - - @property - def text(self) -> str: - """Get the 'text' content from the message.""" - enforce(self.is_set("text"), "'text' content is not set.") - return cast(str, self.get("text")) + def data(self) -> str: + """Get the 'data' content from the message.""" + enforce(self.is_set("data"), "'data' content is not set.") + return cast(str, self.get("data")) @property def tweet_id(self) -> str: @@ -203,15 +174,15 @@ def _is_consistent(self) -> bool: # Check correct contents actual_nb_of_contents = len(self._body) - DEFAULT_BODY_SIZE expected_nb_of_contents = 0 - if self.performative == TwitterMessage.Performative.CREATE_TWEET: + if self.performative == TwitterMessage.Performative.REQUEST: expected_nb_of_contents = 1 enforce( - isinstance(self.text, str), - "Invalid type for content 'text'. Expected 'str'. Found '{}'.".format( - type(self.text) + isinstance(self.data, str), + "Invalid type for content 'data'. Expected 'str'. Found '{}'.".format( + type(self.data) ), ) - elif self.performative == TwitterMessage.Performative.TWEET_CREATED: + elif self.performative == TwitterMessage.Performative.RESPONSE: expected_nb_of_contents = 1 enforce( isinstance(self.tweet_id, str), @@ -219,14 +190,6 @@ def _is_consistent(self) -> bool: type(self.tweet_id) ), ) - elif self.performative == TwitterMessage.Performative.ERROR: - expected_nb_of_contents = 1 - enforce( - isinstance(self.message, str), - "Invalid type for content 'message'. Expected 'str'. Found '{}'.".format( - type(self.message) - ), - ) # Check correct content count enforce( diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 563c73fc..ca272094 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -1,21 +1,21 @@ name: twitter author: valory version: 0.1.0 -protocol_specification_id: valory/twitter:1.0.0 +protocol_specification_id: valory/twitter:0.1.0 type: protocol -description: A protocol for twitter interactions. +description: A protocol for interacting with Twitter. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiemontaaeytd3px2grliu5eaf2gghnt2asqi2uunmmlwrvjmxlxdy - __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um - dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u - message.py: bafybeicxisvolj2w3ya2texgarfi53npnm24twpqsutd3avlo6w3eysanm - serialization.py: bafybeihp4sa7ohk2yyixkjoohod2oayprs55dw2tgby7msmdee6xuwk4y4 + __init__.py: bafybeigok4xqrjbpfwxti4jde4gmf2spo5po7lgl3o6ttjrfmv7g5tn42y + dialogues.py: bafybeifbrvpw7653j7vb4w5asnshshzn34vxozjqqecpiitv4irv7zqwfa + message.py: bafybeiheaobsjsyrbtsk2yyix2rgtlhrw23eykww275w7j6dtwb3knhrhy + serialization.py: bafybeicxbkj2bndln2hdhjwkczonjjeweluvspcikj2nvg4sexqvvwgmiu tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza - twitter.proto: bafybeigicva2k2qybojxc2zd7fzob2ngazwo3vjw462dm6zdjp45k6socq - twitter_pb2.py: bafybeiapdaidyeyw72ncdipgpn65xznh2zv2f56dzn4ef5luthmz746moi + twitter.proto: bafybeihx4mk22qabkcbc2siysvi7vhiwvfo6dr67wk6ozrkwyoviowj5ty + twitter_pb2.py: bafybeigp2stbkt5o43vvto5tr4sf2immouu5nvolq4exjozmggm2nttyyq fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/twitter/serialization.py b/packages/valory/protocols/twitter/serialization.py index 940ea08b..4cbd01cd 100644 --- a/packages/valory/protocols/twitter/serialization.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -43,12 +22,13 @@ # pylint: disable=too-many-statements,too-many-locals,no-member,too-few-public-methods,redefined-builtin from typing import Any, Dict, cast -from aea.mail.base_pb2 import DialogueMessage -from aea.mail.base_pb2 import Message as ProtobufMessage -from aea.protocols.base import Message, Serializer +from aea.mail.base_pb2 import DialogueMessage # type: ignore +from aea.mail.base_pb2 import Message as ProtobufMessage # type: ignore +from aea.protocols.base import Message # type: ignore +from aea.protocols.base import Serializer # type: ignore -from packages.valory.protocols.twitter import twitter_pb2 -from packages.valory.protocols.twitter.message import TwitterMessage +from packages.valory.protocols.twitter import twitter_pb2 # type: ignore +from packages.valory.protocols.twitter.message import TwitterMessage # type: ignore class TwitterSerializer(Serializer): @@ -65,7 +45,7 @@ def encode(msg: Message) -> bytes: msg = cast(TwitterMessage, msg) message_pb = ProtobufMessage() dialogue_message_pb = DialogueMessage() - twitter_msg = twitter_pb2.TwitterMessage() + twitter_msg = twitter_pb2.TwitterMessage() # type: ignore dialogue_message_pb.message_id = msg.message_id dialogue_reference = msg.dialogue_reference @@ -74,21 +54,16 @@ def encode(msg: Message) -> bytes: dialogue_message_pb.target = msg.target performative_id = msg.performative - if performative_id == TwitterMessage.Performative.CREATE_TWEET: - performative = twitter_pb2.TwitterMessage.Create_Tweet_Performative() # type: ignore - text = msg.text - performative.text = text - twitter_msg.create_tweet.CopyFrom(performative) - elif performative_id == TwitterMessage.Performative.TWEET_CREATED: - performative = twitter_pb2.TwitterMessage.Tweet_Created_Performative() # type: ignore + if performative_id == TwitterMessage.Performative.REQUEST: + performative = twitter_pb2.TwitterMessage.Request_Performative() # type: ignore + data = msg.data + performative.data = data + twitter_msg.request.CopyFrom(performative) + elif performative_id == TwitterMessage.Performative.RESPONSE: + performative = twitter_pb2.TwitterMessage.Response_Performative() # type: ignore tweet_id = msg.tweet_id performative.tweet_id = tweet_id - twitter_msg.tweet_created.CopyFrom(performative) - elif performative_id == TwitterMessage.Performative.ERROR: - performative = twitter_pb2.TwitterMessage.Error_Performative() # type: ignore - message = msg.message - performative.message = message - twitter_msg.error.CopyFrom(performative) + twitter_msg.response.CopyFrom(performative) else: raise ValueError("Performative not valid: {}".format(performative_id)) @@ -107,7 +82,7 @@ def decode(obj: bytes) -> Message: :return: the 'Twitter' message. """ message_pb = ProtobufMessage() - twitter_pb = twitter_pb2.TwitterMessage() + twitter_pb = twitter_pb2.TwitterMessage() # type: ignore message_pb.ParseFromString(obj) message_id = message_pb.dialogue_message.message_id dialogue_reference = ( @@ -120,15 +95,12 @@ def decode(obj: bytes) -> Message: performative = twitter_pb.WhichOneof("performative") performative_id = TwitterMessage.Performative(str(performative)) performative_content = dict() # type: Dict[str, Any] - if performative_id == TwitterMessage.Performative.CREATE_TWEET: - text = twitter_pb.create_tweet.text - performative_content["text"] = text - elif performative_id == TwitterMessage.Performative.TWEET_CREATED: - tweet_id = twitter_pb.tweet_created.tweet_id + if performative_id == TwitterMessage.Performative.REQUEST: + data = twitter_pb.request.data + performative_content["data"] = data + elif performative_id == TwitterMessage.Performative.RESPONSE: + tweet_id = twitter_pb.response.tweet_id performative_content["tweet_id"] = tweet_id - elif performative_id == TwitterMessage.Performative.ERROR: - message = twitter_pb.error.message - performative_content["message"] = message else: raise ValueError("Performative not valid: {}.".format(performative_id)) diff --git a/packages/valory/protocols/twitter/twitter.proto b/packages/valory/protocols/twitter/twitter.proto index 64071f02..ba23f017 100644 --- a/packages/valory/protocols/twitter/twitter.proto +++ b/packages/valory/protocols/twitter/twitter.proto @@ -1,26 +1,21 @@ syntax = "proto3"; -package aea.valory.twitter.v1_0_0; +package aea.valory.twitter.v0_1_0; message TwitterMessage{ // Performatives and contents - message Create_Tweet_Performative{ - string text = 1; + message Request_Performative{ + string data = 1; } - message Tweet_Created_Performative{ + message Response_Performative{ string tweet_id = 1; } - message Error_Performative{ - string message = 1; - } - oneof performative{ - Create_Tweet_Performative create_tweet = 5; - Error_Performative error = 6; - Tweet_Created_Performative tweet_created = 7; + Request_Performative request = 5; + Response_Performative response = 6; } } diff --git a/packages/valory/protocols/twitter/twitter_pb2.py b/packages/valory/protocols/twitter/twitter_pb2.py index 8d9e56db..edd11890 100644 --- a/packages/valory/protocols/twitter/twitter_pb2.py +++ b/packages/valory/protocols/twitter/twitter_pb2.py @@ -4,10 +4,8 @@ """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database - +from google.protobuf.internal import builder as _builder # @@protoc_insertion_point(imports) @@ -15,70 +13,18 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( - b'\n\rtwitter.proto\x12\x19\x61\x65\x61.valory.twitter.v1_0_0"\xad\x03\n\x0eTwitterMessage\x12[\n\x0c\x63reate_tweet\x18\x05 \x01(\x0b\x32\x43.aea.valory.twitter.v1_0_0.TwitterMessage.Create_Tweet_PerformativeH\x00\x12M\n\x05\x65rror\x18\x06 \x01(\x0b\x32<.aea.valory.twitter.v1_0_0.TwitterMessage.Error_PerformativeH\x00\x12]\n\rtweet_created\x18\x07 \x01(\x0b\x32\x44.aea.valory.twitter.v1_0_0.TwitterMessage.Tweet_Created_PerformativeH\x00\x1a)\n\x19\x43reate_Tweet_Performative\x12\x0c\n\x04text\x18\x01 \x01(\t\x1a.\n\x1aTweet_Created_Performative\x12\x10\n\x08tweet_id\x18\x01 \x01(\t\x1a%\n\x12\x45rror_Performative\x12\x0f\n\x07message\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' + b'\n\rtwitter.proto\x12\x19\x61\x65\x61.valory.twitter.v0_1_0"\x99\x02\n\x0eTwitterMessage\x12Q\n\x07request\x18\x05 \x01(\x0b\x32>.aea.valory.twitter.v0_1_0.TwitterMessage.Request_PerformativeH\x00\x12S\n\x08response\x18\x06 \x01(\x0b\x32?.aea.valory.twitter.v0_1_0.TwitterMessage.Response_PerformativeH\x00\x1a$\n\x14Request_Performative\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\t\x1a)\n\x15Response_Performative\x12\x10\n\x08tweet_id\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' ) - -_TWITTERMESSAGE = DESCRIPTOR.message_types_by_name["TwitterMessage"] -_TWITTERMESSAGE_CREATE_TWEET_PERFORMATIVE = _TWITTERMESSAGE.nested_types_by_name[ - "Create_Tweet_Performative" -] -_TWITTERMESSAGE_TWEET_CREATED_PERFORMATIVE = _TWITTERMESSAGE.nested_types_by_name[ - "Tweet_Created_Performative" -] -_TWITTERMESSAGE_ERROR_PERFORMATIVE = _TWITTERMESSAGE.nested_types_by_name[ - "Error_Performative" -] -TwitterMessage = _reflection.GeneratedProtocolMessageType( - "TwitterMessage", - (_message.Message,), - { - "Create_Tweet_Performative": _reflection.GeneratedProtocolMessageType( - "Create_Tweet_Performative", - (_message.Message,), - { - "DESCRIPTOR": _TWITTERMESSAGE_CREATE_TWEET_PERFORMATIVE, - "__module__": "twitter_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.twitter.v1_0_0.TwitterMessage.Create_Tweet_Performative) - }, - ), - "Tweet_Created_Performative": _reflection.GeneratedProtocolMessageType( - "Tweet_Created_Performative", - (_message.Message,), - { - "DESCRIPTOR": _TWITTERMESSAGE_TWEET_CREATED_PERFORMATIVE, - "__module__": "twitter_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.twitter.v1_0_0.TwitterMessage.Tweet_Created_Performative) - }, - ), - "Error_Performative": _reflection.GeneratedProtocolMessageType( - "Error_Performative", - (_message.Message,), - { - "DESCRIPTOR": _TWITTERMESSAGE_ERROR_PERFORMATIVE, - "__module__": "twitter_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.twitter.v1_0_0.TwitterMessage.Error_Performative) - }, - ), - "DESCRIPTOR": _TWITTERMESSAGE, - "__module__": "twitter_pb2" - # @@protoc_insertion_point(class_scope:aea.valory.twitter.v1_0_0.TwitterMessage) - }, -) -_sym_db.RegisterMessage(TwitterMessage) -_sym_db.RegisterMessage(TwitterMessage.Create_Tweet_Performative) -_sym_db.RegisterMessage(TwitterMessage.Tweet_Created_Performative) -_sym_db.RegisterMessage(TwitterMessage.Error_Performative) - +_globals = globals() +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, "twitter_pb2", _globals) if _descriptor._USE_C_DESCRIPTORS == False: - DESCRIPTOR._options = None - _TWITTERMESSAGE._serialized_start = 45 - _TWITTERMESSAGE._serialized_end = 474 - _TWITTERMESSAGE_CREATE_TWEET_PERFORMATIVE._serialized_start = 330 - _TWITTERMESSAGE_CREATE_TWEET_PERFORMATIVE._serialized_end = 371 - _TWITTERMESSAGE_TWEET_CREATED_PERFORMATIVE._serialized_start = 373 - _TWITTERMESSAGE_TWEET_CREATED_PERFORMATIVE._serialized_end = 419 - _TWITTERMESSAGE_ERROR_PERFORMATIVE._serialized_start = 421 - _TWITTERMESSAGE_ERROR_PERFORMATIVE._serialized_end = 458 + _globals["_TWITTERMESSAGE"]._serialized_start = 45 + _globals["_TWITTERMESSAGE"]._serialized_end = 326 + _globals["_TWITTERMESSAGE_REQUEST_PERFORMATIVE"]._serialized_start = 231 + _globals["_TWITTERMESSAGE_REQUEST_PERFORMATIVE"]._serialized_end = 267 + _globals["_TWITTERMESSAGE_RESPONSE_PERFORMATIVE"]._serialized_start = 269 + _globals["_TWITTERMESSAGE_RESPONSE_PERFORMATIVE"]._serialized_end = 310 # @@protoc_insertion_point(module_scope) From d1caab9ebf9e4a1352bb5055ddb6846c791a1b62 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:52:29 +0200 Subject: [PATCH 10/30] fix: packages lock --- packages/packages.json | 24 +++++++++---------- .../agents/impact_evaluator/aea-config.yaml | 18 +++++++------- .../valory/connections/openai/connection.yaml | 2 +- .../connections/twitter/connection.yaml | 2 +- .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/impact_evaluator_abci/skill.yaml | 8 +++---- packages/valory/skills/llm_abci/skill.yaml | 4 ++-- .../valory/skills/olas_week_abci/skill.yaml | 4 ++-- .../skills/twitter_scoring_abci/skill.yaml | 4 ++-- .../skills/twitter_write_abci/skill.yaml | 4 ++-- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/packages.json b/packages/packages.json index 548bb2af..ffdf74af 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeicoqmbcavkqf23t4wdcgauf7zichur4ukdbhbqg6ar4i7pplx3hty", + "agent/valory/impact_evaluator/0.1.0": "bafybeib7svrgomosw3tqdgyvby6rquwlsdxmzxkpe6ezmzkjvtnabgdzem", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeibempaojguuu7khxrr3agwrn3dsxo2e5h5kc6vqtbfzr3wetlij54", + "service/valory/impact_evaluator/0.1.0": "bafybeigfmmmsrflutah2p6quv2zzvcswamozuebfxc6yyv7c57yxnxblwa", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeifqwwyndwfb73qc5aprlnleehqyemvxeqfrxsc3n4fzabdids6v2e", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidcec62lwfbf22b6w7rnbrvln37k36sce2r6jdjryukumsyyqjaf4", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeia3cgoblksjhflziqwk33prlff3xe5nett3675yjtf6ftbraveiou", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y", - "protocol/valory/llm/1.0.0": "bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi", - "connection/valory/twitter/0.1.0": "bafybeial6pvki6qioonvtvtwagiajwp7uhogbglzkcq73w5w3eavfj4g3y", - "connection/valory/openai/0.1.0": "bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm", - "skill/valory/twitter_write_abci/0.1.0": "bafybeia2fxjjepn7lmt4n6ilqx2s3ztr5sxbmwdov27rgbsho3izhixiji", - "skill/valory/llm_abci/0.1.0": "bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem", + "protocol/valory/twitter/0.1.0": "bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi", + "protocol/valory/llm/1.0.0": "bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu", + "connection/valory/twitter/0.1.0": "bafybeig3mm6wpzzt4mans4daqieo63z5lw6gzlzmvjouvbf6c6wdgub4gu", + "connection/valory/openai/0.1.0": "bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu", + "skill/valory/twitter_write_abci/0.1.0": "bafybeigksrm4tsoluhlc6okdycgbzh7lga5elegq7ltcrosrmuw55jsi4u", + "skill/valory/llm_abci/0.1.0": "bafybeihsoejmiox4mphp63ucetaiqz53jkc5urq26veby4nkpjh4xxnate", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeidulrfvvhjh357exxgnqcvvzpeqnpomlteiui354tkm7stfnwipty", - "skill/valory/olas_week_abci/0.1.0": "bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q" + "service/valory/impact_evaluator_local/0.1.0": "bafybeib35iwqb3g4m37rnnn7347bipyf7yrkurzgl2jp3fqnaj6gt3crf4", + "skill/valory/olas_week_abci/0.1.0": "bafybeianp5gwexl3o32p3trigajaevaucwuotxqxwjboqyadpm77zz2i5q" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 3d15c2b8..0e48e5e6 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -20,8 +20,8 @@ connections: - valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm -- valory/twitter:0.1.0:bafybeial6pvki6qioonvtvtwagiajwp7uhogbglzkcq73w5w3eavfj4g3y +- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu +- valory/twitter:0.1.0:bafybeig3mm6wpzzt4mans4daqieo63z5lw6gzlzmvjouvbf6c6wdgub4gu contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -36,15 +36,15 @@ protocols: - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru -- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi +- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y +- valory/twitter:0.1.0:bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeidcec62lwfbf22b6w7rnbrvln37k36sce2r6jdjryukumsyyqjaf4 +- valory/impact_evaluator_abci:0.1.0:bafybeia3cgoblksjhflziqwk33prlff3xe5nett3675yjtf6ftbraveiou - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm +- valory/twitter_scoring_abci:0.1.0:bafybeifqwwyndwfb73qc5aprlnleehqyemvxeqfrxsc3n4fzabdids6v2e - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena - valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq @@ -52,10 +52,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeia2fxjjepn7lmt4n6ilqx2s3ztr5sxbmwdov27rgbsho3izhixiji +- valory/twitter_write_abci:0.1.0:bafybeigksrm4tsoluhlc6okdycgbzh7lga5elegq7ltcrosrmuw55jsi4u - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem -- valory/olas_week_abci:0.1.0:bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q +- valory/llm_abci:0.1.0:bafybeihsoejmiox4mphp63ucetaiqz53jkc5urq26veby4nkpjh4xxnate +- valory/olas_week_abci:0.1.0:bafybeianp5gwexl3o32p3trigajaevaucwuotxqxwjboqyadpm77zz2i5q default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index 4bcb5ebe..68f2da58 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi +- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu class_name: OpenaiConnection config: engine: text-davinci-003 diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index 32dc71d2..2d93951a 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y +- valory/twitter:0.1.0:bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 0283af4a..5f33ce3b 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeicoqmbcavkqf23t4wdcgauf7zichur4ukdbhbqg6ar4i7pplx3hty +agent: valory/impact_evaluator:0.1.0:bafybeib7svrgomosw3tqdgyvby6rquwlsdxmzxkpe6ezmzkjvtnabgdzem number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index b44c092a..2e595c2a 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeicoqmbcavkqf23t4wdcgauf7zichur4ukdbhbqg6ar4i7pplx3hty +agent: valory/impact_evaluator:0.1.0:bafybeib7svrgomosw3tqdgyvby6rquwlsdxmzxkpe6ezmzkjvtnabgdzem number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index b5279922..9600f58c 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -26,7 +26,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeiaj3eyk4q3vhffathsb5xhqyrce4pvw6z7q55p6hktn5bjulzyfqm +- valory/twitter_scoring_abci:0.1.0:bafybeifqwwyndwfb73qc5aprlnleehqyemvxeqfrxsc3n4fzabdids6v2e - valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena - valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm @@ -34,9 +34,9 @@ skills: - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeievx3lamtaoxsoccvy4whugvqsazgwmxxvpae23hgik5y3yxkkjem -- valory/twitter_write_abci:0.1.0:bafybeia2fxjjepn7lmt4n6ilqx2s3ztr5sxbmwdov27rgbsho3izhixiji -- valory/olas_week_abci:0.1.0:bafybeicves3qwjhkoqjapftitamneb7i626ckm2got2azscsuhcfmzde4q +- valory/llm_abci:0.1.0:bafybeihsoejmiox4mphp63ucetaiqz53jkc5urq26veby4nkpjh4xxnate +- valory/twitter_write_abci:0.1.0:bafybeigksrm4tsoluhlc6okdycgbzh7lga5elegq7ltcrosrmuw55jsi4u +- valory/olas_week_abci:0.1.0:bafybeianp5gwexl3o32p3trigajaevaucwuotxqxwjboqyadpm77zz2i5q behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index 7e3246fe..e4d4ef74 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,10 +23,10 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm +- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu contracts: [] protocols: -- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi +- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index 1db11a3a..4a488314 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,10 +19,10 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm +- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu contracts: [] protocols: -- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi +- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index a64a77a2..af6a3019 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,10 +27,10 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeicc4cn3tgmyvhhgwa3jdwlpakw2ompaw7q6k55536jxsfvenzi4lm +- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu contracts: [] protocols: -- valory/llm:1.0.0:bafybeif5pqy3gbzmbcuxadm65p5kpweoetn6edcrzlpjalccwowwvs3rvi +- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index 5b52d9bb..3ceb5ffe 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeial6pvki6qioonvtvtwagiajwp7uhogbglzkcq73w5w3eavfj4g3y +- valory/twitter:0.1.0:bafybeig3mm6wpzzt4mans4daqieo63z5lw6gzlzmvjouvbf6c6wdgub4gu contracts: [] protocols: -- valory/twitter:0.1.0:bafybeiacgkbunz3zomtypiltvqi3gsy6lqrqbzetyllv36qf26tes4pp6y +- valory/twitter:0.1.0:bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From c660969342286a833a6f973bf210d014cc46385c Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:54:18 +0200 Subject: [PATCH 11/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 24 +++++++++---------- .../agents/impact_evaluator/aea-config.yaml | 18 +++++++------- .../valory/connections/openai/connection.yaml | 2 +- .../connections/twitter/connection.yaml | 2 +- packages/valory/protocols/llm/__init__.py | 21 ++++++++++++++++ packages/valory/protocols/llm/dialogues.py | 21 ++++++++++++++++ packages/valory/protocols/llm/message.py | 21 ++++++++++++++++ packages/valory/protocols/llm/protocol.yaml | 8 +++---- .../valory/protocols/llm/serialization.py | 21 ++++++++++++++++ packages/valory/protocols/twitter/__init__.py | 21 ++++++++++++++++ .../valory/protocols/twitter/dialogues.py | 21 ++++++++++++++++ packages/valory/protocols/twitter/message.py | 21 ++++++++++++++++ .../valory/protocols/twitter/protocol.yaml | 8 +++---- .../valory/protocols/twitter/serialization.py | 21 ++++++++++++++++ .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/impact_evaluator_abci/skill.yaml | 8 +++---- packages/valory/skills/llm_abci/skill.yaml | 4 ++-- .../valory/skills/olas_week_abci/skill.yaml | 4 ++-- .../skills/twitter_scoring_abci/skill.yaml | 4 ++-- .../skills/twitter_write_abci/skill.yaml | 4 ++-- 22 files changed, 214 insertions(+), 46 deletions(-) diff --git a/docs/index.md b/docs/index.md index e8f2bddd..d8debfd9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeibempaojguuu7khxrr3agwrn3dsxo2e5h5kc6vqtbfzr3wetlij54 --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeidyixr2a6ddcihf2xph7w6lqpnoxle2pcnfuehy3vrhoe33dhb3t4 --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index ffdf74af..c8c4b653 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeib7svrgomosw3tqdgyvby6rquwlsdxmzxkpe6ezmzkjvtnabgdzem", + "agent/valory/impact_evaluator/0.1.0": "bafybeigdpnl4mkw2vskswov6kiotrkwpanntzqumqrxwujodildtcswm6e", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeigfmmmsrflutah2p6quv2zzvcswamozuebfxc6yyv7c57yxnxblwa", + "service/valory/impact_evaluator/0.1.0": "bafybeidyixr2a6ddcihf2xph7w6lqpnoxle2pcnfuehy3vrhoe33dhb3t4", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeifqwwyndwfb73qc5aprlnleehqyemvxeqfrxsc3n4fzabdids6v2e", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeia3cgoblksjhflziqwk33prlff3xe5nett3675yjtf6ftbraveiou", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiew35nruo2rayvnhyis3dzcs3c5hng2px4qepmkfn6x7irjizdgna", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi", - "protocol/valory/llm/1.0.0": "bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu", - "connection/valory/twitter/0.1.0": "bafybeig3mm6wpzzt4mans4daqieo63z5lw6gzlzmvjouvbf6c6wdgub4gu", - "connection/valory/openai/0.1.0": "bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu", - "skill/valory/twitter_write_abci/0.1.0": "bafybeigksrm4tsoluhlc6okdycgbzh7lga5elegq7ltcrosrmuw55jsi4u", - "skill/valory/llm_abci/0.1.0": "bafybeihsoejmiox4mphp63ucetaiqz53jkc5urq26veby4nkpjh4xxnate", + "protocol/valory/twitter/0.1.0": "bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu", + "protocol/valory/llm/1.0.0": "bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba", + "connection/valory/twitter/0.1.0": "bafybeibftx2ofelldnczfqhtz2lavtrr2eo26ywljfkkebrif5vjnosage", + "connection/valory/openai/0.1.0": "bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm", + "skill/valory/twitter_write_abci/0.1.0": "bafybeihwmiaixcvoiflrflh4xl5em2wctqyr7oxij4wg25smm5z44mwkei", + "skill/valory/llm_abci/0.1.0": "bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeib35iwqb3g4m37rnnn7347bipyf7yrkurzgl2jp3fqnaj6gt3crf4", - "skill/valory/olas_week_abci/0.1.0": "bafybeianp5gwexl3o32p3trigajaevaucwuotxqxwjboqyadpm77zz2i5q" + "service/valory/impact_evaluator_local/0.1.0": "bafybeie7wzykdnlixe5c6uoycctuqqic6qltvs6glb4nzddrusp2mgjrla", + "skill/valory/olas_week_abci/0.1.0": "bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 0e48e5e6..c4fb849f 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -20,8 +20,8 @@ connections: - valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu -- valory/twitter:0.1.0:bafybeig3mm6wpzzt4mans4daqieo63z5lw6gzlzmvjouvbf6c6wdgub4gu +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/twitter:0.1.0:bafybeibftx2ofelldnczfqhtz2lavtrr2eo26ywljfkkebrif5vjnosage contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -36,15 +36,15 @@ protocols: - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru -- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi +- valory/twitter:0.1.0:bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeia3cgoblksjhflziqwk33prlff3xe5nett3675yjtf6ftbraveiou +- valory/impact_evaluator_abci:0.1.0:bafybeiew35nruo2rayvnhyis3dzcs3c5hng2px4qepmkfn6x7irjizdgna - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeifqwwyndwfb73qc5aprlnleehqyemvxeqfrxsc3n4fzabdids6v2e +- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena - valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq @@ -52,10 +52,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeigksrm4tsoluhlc6okdycgbzh7lga5elegq7ltcrosrmuw55jsi4u +- valory/twitter_write_abci:0.1.0:bafybeihwmiaixcvoiflrflh4xl5em2wctqyr7oxij4wg25smm5z44mwkei - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeihsoejmiox4mphp63ucetaiqz53jkc5urq26veby4nkpjh4xxnate -- valory/olas_week_abci:0.1.0:bafybeianp5gwexl3o32p3trigajaevaucwuotxqxwjboqyadpm77zz2i5q +- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi +- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index 68f2da58..a501b75b 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba class_name: OpenaiConnection config: engine: text-davinci-003 diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index 2d93951a..a99cd435 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi +- valory/twitter:0.1.0:bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 83565f19..845b47fe 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__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/llm/dialogues.py b/packages/valory/protocols/llm/dialogues.py index 643dd397..2b7e0967 100644 --- a/packages/valory/protocols/llm/dialogues.py +++ b/packages/valory/protocols/llm/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/llm/message.py b/packages/valory/protocols/llm/message.py index 16618c75..6fd162f4 100644 --- a/packages/valory/protocols/llm/message.py +++ b/packages/valory/protocols/llm/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/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 54314889..6df89420 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeiauadqjlhqmauczfl4ljcdcs6imvg3kc4nbaobb5nrmgh5qqvyq5i - dialogues.py: bafybeict3p7xmn2r2mur3iep54fmbosvsrp4mk4l6ad4hzc7ywwl3c4ale + __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m + dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e - message.py: bafybeiayhrzk2l4fsacw5c2eu57yods5ey7yicx2ugvrz5yedjxmakrvbm - serialization.py: bafybeideqcjtagyhzrblxnq42ulyqqnjsex7r4n47cvlabhxdimyklpmwa + message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 + serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im tests/test_llm_messages.py: bafybeidur77uf5moysw2zfborvlpc24fytcncucwsh6gqt3dufj5sl7srq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/llm/serialization.py b/packages/valory/protocols/llm/serialization.py index 8cc497f3..4231717e 100644 --- a/packages/valory/protocols/llm/serialization.py +++ b/packages/valory/protocols/llm/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/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index 0da37af1..8346937a 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__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/twitter/dialogues.py b/packages/valory/protocols/twitter/dialogues.py index a27172d2..c893d5f6 100644 --- a/packages/valory/protocols/twitter/dialogues.py +++ b/packages/valory/protocols/twitter/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/twitter/message.py b/packages/valory/protocols/twitter/message.py index c32f454a..32276d7b 100644 --- a/packages/valory/protocols/twitter/message.py +++ b/packages/valory/protocols/twitter/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/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index ca272094..16f7476b 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -8,10 +8,10 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiemontaaeytd3px2grliu5eaf2gghnt2asqi2uunmmlwrvjmxlxdy - __init__.py: bafybeigok4xqrjbpfwxti4jde4gmf2spo5po7lgl3o6ttjrfmv7g5tn42y - dialogues.py: bafybeifbrvpw7653j7vb4w5asnshshzn34vxozjqqecpiitv4irv7zqwfa - message.py: bafybeiheaobsjsyrbtsk2yyix2rgtlhrw23eykww275w7j6dtwb3knhrhy - serialization.py: bafybeicxbkj2bndln2hdhjwkczonjjeweluvspcikj2nvg4sexqvvwgmiu + __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um + dialogues.py: bafybeias63limtgev2htn4432mpus452rliqbdban46ij4na6or3rbjh2u + message.py: bafybeichmenrrnv2no7qakye7pllcg4bwn4tfw6hrlegd6susk2ubnntli + serialization.py: bafybeibc5gd5m2tmngtbbjqtlwyvxiqgat33kgpasik4fkkn3rwjgclp2a tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza twitter.proto: bafybeihx4mk22qabkcbc2siysvi7vhiwvfo6dr67wk6ozrkwyoviowj5ty diff --git a/packages/valory/protocols/twitter/serialization.py b/packages/valory/protocols/twitter/serialization.py index 4cbd01cd..25f4543a 100644 --- a/packages/valory/protocols/twitter/serialization.py +++ b/packages/valory/protocols/twitter/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/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 5f33ce3b..c95422ea 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeib7svrgomosw3tqdgyvby6rquwlsdxmzxkpe6ezmzkjvtnabgdzem +agent: valory/impact_evaluator:0.1.0:bafybeigdpnl4mkw2vskswov6kiotrkwpanntzqumqrxwujodildtcswm6e number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 2e595c2a..dcb1b3cc 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeib7svrgomosw3tqdgyvby6rquwlsdxmzxkpe6ezmzkjvtnabgdzem +agent: valory/impact_evaluator:0.1.0:bafybeigdpnl4mkw2vskswov6kiotrkwpanntzqumqrxwujodildtcswm6e number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 9600f58c..c4f62837 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -26,7 +26,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeifqwwyndwfb73qc5aprlnleehqyemvxeqfrxsc3n4fzabdids6v2e +- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa - valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena - valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm @@ -34,9 +34,9 @@ skills: - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeihsoejmiox4mphp63ucetaiqz53jkc5urq26veby4nkpjh4xxnate -- valory/twitter_write_abci:0.1.0:bafybeigksrm4tsoluhlc6okdycgbzh7lga5elegq7ltcrosrmuw55jsi4u -- valory/olas_week_abci:0.1.0:bafybeianp5gwexl3o32p3trigajaevaucwuotxqxwjboqyadpm77zz2i5q +- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi +- valory/twitter_write_abci:0.1.0:bafybeihwmiaixcvoiflrflh4xl5em2wctqyr7oxij4wg25smm5z44mwkei +- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index e4d4ef74..0d800c65 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,10 +23,10 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm contracts: [] protocols: -- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index 4a488314..cb392ef7 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,10 +19,10 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm contracts: [] protocols: -- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index af6a3019..e2636e1e 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,10 +27,10 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeihkr5itnix5yuf5tz5j5nhkcb3jo6otshtfld7fduf6sagdvie3gu +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm contracts: [] protocols: -- valory/llm:1.0.0:bafybeiham2k5toohvr6cixshoivdsl7c5e5c7xp5zsgqasy3th33riavnu +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index 3ceb5ffe..a1567db6 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeig3mm6wpzzt4mans4daqieo63z5lw6gzlzmvjouvbf6c6wdgub4gu +- valory/twitter:0.1.0:bafybeibftx2ofelldnczfqhtz2lavtrr2eo26ywljfkkebrif5vjnosage contracts: [] protocols: -- valory/twitter:0.1.0:bafybeihi54z4klphpinziqchugjlq4jpdbpb7k4wknmgbu3mtusn3hcwdi +- valory/twitter:0.1.0:bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From cd9a4240c452f58356299494789879e8cedc7a9c Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 15:59:47 +0200 Subject: [PATCH 12/30] chore: remove file --- setup.cfg | 328 ------------------------------------------------------ 1 file changed, 328 deletions(-) delete mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ab2836a7..00000000 --- a/setup.cfg +++ /dev/null @@ -1,328 +0,0 @@ -[bdist_wheel] -# we dont support py2 -universal = 0 - -[flake8] -paths=aea,examples,packages,scripts,tests -exclude=.md, - *_pb2.py, - aea/__init__.py, - aea/cli/__init__.py, - tests/common/oef_search_pluto_scripts, - tests/common/click_testing.py, - scripts/oef/launch.py -max-line-length = 88 -select = B,C,D,E,F,I,W, -ignore = E203,E501,W503,D202,B014,D400,D401,DAR,B028,B017 -application-import-names = aea,packages,tests,scripts -per-file-ignores = - tests/test_cli/test_upgrade.py:E800 - tests/test_protocols/test_generator/test_end_to_end.py:E800,F401 - tests/test_cli/test_launch_end_to_end.py:E800 - **/aea_ledger_cosmos/cosmos.py:F401 - **/aea_ledger_fetchai/_cosmos.py:F401 - -# ignore as too restrictive for our needs: -# D400: First line should end with a period -# D401: First line should be in imperative mood -# E501: https://www.flake8rules.com/rules/E501.html (Line too long) -# E203: https://www.flake8rules.com/rules/E203.html (Whitespace) -# W503: https://www.flake8rules.com/rules/W503.html (Line break) -# D202: blank lines -# B014: redundant exception - -[isort] -# for black compatibility -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -ensure_newline_before_comments = True -line_length=88 -# custom configurations -order_by_type=False -case_sensitive=True -lines_after_imports=2 -skip = - tests/data/dummy_aea/vendor/ - tests/data/dummy_aea/skills/dummy -skip_glob = **/*_pb2.py -known_first_party=aea -known_packages=packages -known_local_folder=tests -sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER - -[mypy] -python_version = 3.8 -strict_optional = True - -# temporary until fixed -exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py|acn/tests/test_acn.py|packages/valory/connections/test_libp2p - -# Before adding a module here, make sure it does not support type hints - -# Per-module options for aea dir: - -[mypy-aea/mail/base_pb2] -ignore_errors = True - -[mypy-aea/helpers/multiaddr/crypto_pb2] -ignore_errors = True - -[mypy-aea/helpers/search/models_pb2] -ignore_errors = True - -[mypy-packages.valory.protocols.ledger_api.serialization] -ignore_errors = True - -[mypy-oef.*] -ignore_missing_imports = True - -[mypy-semver.*] -ignore_missing_imports = True - -[mypy-eth_keys.*] -ignore_missing_imports = True - -[mypy-jsonschema.*] -ignore_missing_imports = True - -[mypy-dotenv] -ignore_missing_imports = True - -[mypy-connexion] -ignore_missing_imports = True - -[mypy-eth_account.*] -ignore_missing_imports = True - -[mypy-ipfshttpclient.*] -ignore_missing_imports = True - -[mypy-aea/helpers/ipfs/pb/unixfs_pb2] -ignore_errors = True - -[mypy-aea/helpers/ipfs/pb/merkledag_pb2] -ignore_errors = True - -[mypy-win32con.*] -ignore_missing_imports = True - -[mypy-win32file.*] -ignore_missing_imports = True - -[mypy-pywintypes.*] -ignore_missing_imports = True - -[mypy-ecdsa.*] -ignore_missing_imports = True - -[mypy-urllib3.*] -ignore_missing_imports = True - -[mypy-aea_ledger_fetchai.*] -ignore_missing_imports = True - -[mypy-aea_ledger_ethereum.*] -ignore_missing_imports = True - -[mypy-aea_ledger_cosmos.*] -ignore_missing_imports = True - -[mypy-aea_ledger_solana.*] -ignore_missing_imports = True - -# Per-module options for examples dir: - -[mypy-numpy] -ignore_missing_imports = True - -[mypy-gym.*] -ignore_missing_imports = True - -# Per-module options for tests dir: - -[mypy-pytest] -ignore_missing_imports = True - -[mypy-pytest_asyncio] -ignore_missing_imports = True - -[mypy-docker.*] -ignore_missing_imports = True - -[mypy-tests/data/generator/t_protocol/*] -ignore_errors = True - -[mypy-tests/data/generator/t_protocol_no_ct/*] -ignore_errors = True - -[mypy-tests/data/dummy_aea/vendor/*] -ignore_errors = True - -[mypy-mistune] -ignore_missing_imports = True - -[mypy-git.*] -ignore_missing_imports = True - -[mypy-packaging.*] -ignore_missing_imports = True - -[mypy-aiohttp.*] -ignore_missing_imports = True - -[mypy-base58.*] -ignore_missing_imports = True - -[mypy-multidict.*] -ignore_missing_imports = True - -[mypy-web3.*] -ignore_missing_imports = True - -# Per-module options for packages dir: - -[mypy-packages/fetchai/protocols/contract_api/contract_api_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/default/default_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/fipa/fipa_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/gym/gym_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/http/http_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/ledger_api/ledger_api_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/oef_search/oef_search_pb2] -ignore_errors = True - -[mypy-packages/open_aea/protocols/signing/signing_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/state_update/state_update_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/tac/tac_pb2] -ignore_errors = True - -[mypy-packages/valory/protocols/acn/acn_pb2] -ignore_errors = True - -[mypy-packages/valory/protocols/tendermint/tendermint_pb2] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol/t_protocol_pb2] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/t_protocol_no_ct_pb2] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol/serialization] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/serialization] -ignore_errors = True - -[mypy-tensorflow.*] -ignore_missing_imports = True - -[mypy-temper.*] -ignore_missing_imports = True - -[mypy-openapi_core.*] -ignore_missing_imports = True - -[mypy-openapi_spec_validator.*] -ignore_missing_imports = True - -[mypy-sqlalchemy] -ignore_missing_imports = True - -[mypy-defusedxml.*] -ignore_missing_imports = True - -[mypy-cosmpy.*] -ignore_missing_imports = True - -[mypy-google.*] -ignore_missing_imports = True - -[mypy-click.*] -ignore_missing_imports = True - -[mypy-yaml.*] -ignore_missing_imports = True - -[mypy-requests.*] -ignore_missing_imports = True - -[mypy-certifi.*] -ignore_missing_imports = True - -[mypy-werkzeug.*] -ignore_missing_imports = True - -[mypy-pkg_resources.*] -ignore_missing_imports = True - -[mypy-gyms.*] -ignore_missing_imports = True - -[mypy-rl.*] -ignore_missing_imports = True - -[mypy-multibase.*] -ignore_missing_imports = True - -[mypy-multicodec.*] -ignore_missing_imports = True - -[mypy-morphys.*] -ignore_missing_imports = True - -[mypy-multihash.*] -ignore_missing_imports = True - -[mypy-coverage.*] -ignore_missing_imports = True - -[mypy-Crypto.*] -ignore_missing_imports = True - -[mypy-eth_typing.*] -ignore_missing_imports = True - -[mypy-bech32.*] -ignore_missing_imports = True - -[mypy-eth_utils.*] -ignore_missing_imports = True - -[mypy-_strptime.*] -ignore_missing_imports = True - -[mypy-hypothesis.*] -ignore_missing_imports = True - -[mypy-hexbytes.*] -ignore_missing_imports=True - -[mypy-flashbots.*] -ignore_missing_imports=True - -[mypy-asyncio.*] -ignore_missing_imports=True - -[darglint] -docstring_style=sphinx -strictness=short -ignore_regex=.*_pb2\.py -ignore=DAR401 From 72e0cd698da9199db8375333ea4c0b2988a38b0d Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:07:15 +0200 Subject: [PATCH 13/30] fix: protocol --- packages/valory/protocols/twitter/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/valory/protocols/twitter/README.md b/packages/valory/protocols/twitter/README.md index ac3b65f3..787783d8 100644 --- a/packages/valory/protocols/twitter/README.md +++ b/packages/valory/protocols/twitter/README.md @@ -16,17 +16,20 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' protocol_specification_id: valory/twitter:0.1.0 speech_acts: - request: + create_tweet: data: pt:str - response: + tweet_created: tweet_id: pt:str + error: + message: pt:str ... --- initiation: [request] reply: - request: [response] + create_tweet: [tweet_created, error] response: [] -termination: [response] + error: [] +termination: [response, error] roles: {skill, connection} end_states: [successful] keep_terminal_state_dialogues: false From 6856b53547a3c5e98ba7da568ad65b2074a86714 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:07:35 +0200 Subject: [PATCH 14/30] fix: formatters --- .../valory/agents/impact_evaluator/tests/helpers/docker.py | 3 +-- .../agents/impact_evaluator/tests/test_impact_evaluator.py | 3 +-- packages/valory/connections/openai/connection.py | 1 - packages/valory/connections/twitter/connection.py | 3 +-- packages/valory/contracts/dynamic_contribution/contract.py | 5 ++--- packages/valory/protocols/llm/llm_pb2.py | 1 + packages/valory/protocols/twitter/twitter_pb2.py | 1 + .../valory/skills/ceramic_read_abci/tests/test_behaviours.py | 1 - .../skills/ceramic_write_abci/tests/test_behaviours.py | 1 - .../valory/skills/dynamic_nft_abci/tests/test_handlers.py | 1 - scripts/check_doc_ipfs_hashes.py | 1 - 11 files changed, 7 insertions(+), 14 deletions(-) diff --git a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py index f307150a..988b31a1 100644 --- a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py +++ b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py @@ -26,11 +26,10 @@ import docker import requests +from aea.exceptions import enforce from aea_test_autonomy.docker.base import DockerImage from docker.models.containers import Container -from aea.exceptions import enforce - from packages.valory.agents.impact_evaluator import PACKAGE_DIR from packages.valory.agents.impact_evaluator.tests.helpers.constants import ( DYNAMIC_CONTRIBUTION_CONTRACT_ADDRESS, diff --git a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py index c9dd24b1..e33f7f3a 100644 --- a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py +++ b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py @@ -23,6 +23,7 @@ from typing import Tuple import pytest +from aea.configurations.data_types import PublicId from aea_test_autonomy.base_test_classes.agents import ( BaseTestEnd2EndExecution, RoundChecks, @@ -43,8 +44,6 @@ from aea_test_autonomy.fixture_helpers import tendermint # noqa: F401 from aea_test_autonomy.fixture_helpers import tendermint_port # noqa: F401 -from aea.configurations.data_types import PublicId - from packages.valory.agents.impact_evaluator.tests.helpers.docker import ( DEFAULT_JSON_SERVER_ADDR as _DEFAULT_JSON_SERVER_ADDR, ) diff --git a/packages/valory/connections/openai/connection.py b/packages/valory/connections/openai/connection.py index ddab1d43..e2455044 100644 --- a/packages/valory/connections/openai/connection.py +++ b/packages/valory/connections/openai/connection.py @@ -23,7 +23,6 @@ from typing import Any, Dict, cast import openai - from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope diff --git a/packages/valory/connections/twitter/connection.py b/packages/valory/connections/twitter/connection.py index 7ecedfb8..1a34792a 100644 --- a/packages/valory/connections/twitter/connection.py +++ b/packages/valory/connections/twitter/connection.py @@ -22,13 +22,12 @@ from typing import Any, Callable, cast import tweepy -from tweepy.errors import HTTPException as TweepyHTTPException - from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope from aea.protocols.base import Address, Message from aea.protocols.dialogue.base import Dialogue +from tweepy.errors import HTTPException as TweepyHTTPException from packages.valory.protocols.twitter.dialogues import TwitterDialogue from packages.valory.protocols.twitter.dialogues import ( diff --git a/packages/valory/contracts/dynamic_contribution/contract.py b/packages/valory/contracts/dynamic_contribution/contract.py index 73efa40b..5e552a35 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.py +++ b/packages/valory/contracts/dynamic_contribution/contract.py @@ -21,13 +21,12 @@ from typing import Any, cast -from aea_ledger_ethereum import EthereumApi -from web3.types import BlockIdentifier - from aea.common import JSONLike from aea.configurations.base import PublicId from aea.contracts.base import Contract from aea.crypto.base import LedgerApi +from aea_ledger_ethereum import EthereumApi +from web3.types import BlockIdentifier class DynamicContributionContract(Contract): diff --git a/packages/valory/protocols/llm/llm_pb2.py b/packages/valory/protocols/llm/llm_pb2.py index 4ada3001..7d9a5400 100644 --- a/packages/valory/protocols/llm/llm_pb2.py +++ b/packages/valory/protocols/llm/llm_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder + # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/packages/valory/protocols/twitter/twitter_pb2.py b/packages/valory/protocols/twitter/twitter_pb2.py index edd11890..8bf7a506 100644 --- a/packages/valory/protocols/twitter/twitter_pb2.py +++ b/packages/valory/protocols/twitter/twitter_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder + # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py index d79711b1..a8613a54 100644 --- a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py @@ -25,7 +25,6 @@ from typing import Any, Dict, Optional, Type, cast import pytest - from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py index 4d3d13f2..78ef2fe8 100644 --- a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py @@ -25,7 +25,6 @@ from typing import Any, Dict, Optional, Type, cast import pytest - from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py index 33602846..be93c8de 100644 --- a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py +++ b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py @@ -28,7 +28,6 @@ from unittest.mock import Mock, patch import pytest - from aea.protocols.dialogue.base import DialogueMessage from aea.test_tools.test_skill import BaseSkillTestCase diff --git a/scripts/check_doc_ipfs_hashes.py b/scripts/check_doc_ipfs_hashes.py index afaf498f..aef3a8ff 100755 --- a/scripts/check_doc_ipfs_hashes.py +++ b/scripts/check_doc_ipfs_hashes.py @@ -29,7 +29,6 @@ from typing import Dict, List, Optional import yaml - from aea.cli.packages import get_package_manager from aea.configurations.data_types import PackageId from aea.helpers.base import IPFS_HASH_REGEX, SIMPLE_ID_REGEX From afd521efc91f2b334a06d96f05252313aea93915 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:09:04 +0200 Subject: [PATCH 15/30] fix: add setup.cfg --- setup.cfg | 328 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 328 insertions(+) create mode 100644 setup.cfg diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..ab2836a7 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,328 @@ +[bdist_wheel] +# we dont support py2 +universal = 0 + +[flake8] +paths=aea,examples,packages,scripts,tests +exclude=.md, + *_pb2.py, + aea/__init__.py, + aea/cli/__init__.py, + tests/common/oef_search_pluto_scripts, + tests/common/click_testing.py, + scripts/oef/launch.py +max-line-length = 88 +select = B,C,D,E,F,I,W, +ignore = E203,E501,W503,D202,B014,D400,D401,DAR,B028,B017 +application-import-names = aea,packages,tests,scripts +per-file-ignores = + tests/test_cli/test_upgrade.py:E800 + tests/test_protocols/test_generator/test_end_to_end.py:E800,F401 + tests/test_cli/test_launch_end_to_end.py:E800 + **/aea_ledger_cosmos/cosmos.py:F401 + **/aea_ledger_fetchai/_cosmos.py:F401 + +# ignore as too restrictive for our needs: +# D400: First line should end with a period +# D401: First line should be in imperative mood +# E501: https://www.flake8rules.com/rules/E501.html (Line too long) +# E203: https://www.flake8rules.com/rules/E203.html (Whitespace) +# W503: https://www.flake8rules.com/rules/W503.html (Line break) +# D202: blank lines +# B014: redundant exception + +[isort] +# for black compatibility +multi_line_output=3 +include_trailing_comma=True +force_grid_wrap=0 +use_parentheses=True +ensure_newline_before_comments = True +line_length=88 +# custom configurations +order_by_type=False +case_sensitive=True +lines_after_imports=2 +skip = + tests/data/dummy_aea/vendor/ + tests/data/dummy_aea/skills/dummy +skip_glob = **/*_pb2.py +known_first_party=aea +known_packages=packages +known_local_folder=tests +sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER + +[mypy] +python_version = 3.8 +strict_optional = True + +# temporary until fixed +exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py|acn/tests/test_acn.py|packages/valory/connections/test_libp2p + +# Before adding a module here, make sure it does not support type hints + +# Per-module options for aea dir: + +[mypy-aea/mail/base_pb2] +ignore_errors = True + +[mypy-aea/helpers/multiaddr/crypto_pb2] +ignore_errors = True + +[mypy-aea/helpers/search/models_pb2] +ignore_errors = True + +[mypy-packages.valory.protocols.ledger_api.serialization] +ignore_errors = True + +[mypy-oef.*] +ignore_missing_imports = True + +[mypy-semver.*] +ignore_missing_imports = True + +[mypy-eth_keys.*] +ignore_missing_imports = True + +[mypy-jsonschema.*] +ignore_missing_imports = True + +[mypy-dotenv] +ignore_missing_imports = True + +[mypy-connexion] +ignore_missing_imports = True + +[mypy-eth_account.*] +ignore_missing_imports = True + +[mypy-ipfshttpclient.*] +ignore_missing_imports = True + +[mypy-aea/helpers/ipfs/pb/unixfs_pb2] +ignore_errors = True + +[mypy-aea/helpers/ipfs/pb/merkledag_pb2] +ignore_errors = True + +[mypy-win32con.*] +ignore_missing_imports = True + +[mypy-win32file.*] +ignore_missing_imports = True + +[mypy-pywintypes.*] +ignore_missing_imports = True + +[mypy-ecdsa.*] +ignore_missing_imports = True + +[mypy-urllib3.*] +ignore_missing_imports = True + +[mypy-aea_ledger_fetchai.*] +ignore_missing_imports = True + +[mypy-aea_ledger_ethereum.*] +ignore_missing_imports = True + +[mypy-aea_ledger_cosmos.*] +ignore_missing_imports = True + +[mypy-aea_ledger_solana.*] +ignore_missing_imports = True + +# Per-module options for examples dir: + +[mypy-numpy] +ignore_missing_imports = True + +[mypy-gym.*] +ignore_missing_imports = True + +# Per-module options for tests dir: + +[mypy-pytest] +ignore_missing_imports = True + +[mypy-pytest_asyncio] +ignore_missing_imports = True + +[mypy-docker.*] +ignore_missing_imports = True + +[mypy-tests/data/generator/t_protocol/*] +ignore_errors = True + +[mypy-tests/data/generator/t_protocol_no_ct/*] +ignore_errors = True + +[mypy-tests/data/dummy_aea/vendor/*] +ignore_errors = True + +[mypy-mistune] +ignore_missing_imports = True + +[mypy-git.*] +ignore_missing_imports = True + +[mypy-packaging.*] +ignore_missing_imports = True + +[mypy-aiohttp.*] +ignore_missing_imports = True + +[mypy-base58.*] +ignore_missing_imports = True + +[mypy-multidict.*] +ignore_missing_imports = True + +[mypy-web3.*] +ignore_missing_imports = True + +# Per-module options for packages dir: + +[mypy-packages/fetchai/protocols/contract_api/contract_api_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/default/default_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/fipa/fipa_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/gym/gym_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/http/http_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/ledger_api/ledger_api_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/oef_search/oef_search_pb2] +ignore_errors = True + +[mypy-packages/open_aea/protocols/signing/signing_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/state_update/state_update_pb2] +ignore_errors = True + +[mypy-packages/fetchai/protocols/tac/tac_pb2] +ignore_errors = True + +[mypy-packages/valory/protocols/acn/acn_pb2] +ignore_errors = True + +[mypy-packages/valory/protocols/tendermint/tendermint_pb2] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol/t_protocol_pb2] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/t_protocol_no_ct_pb2] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol/serialization] +ignore_errors = True + +[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/serialization] +ignore_errors = True + +[mypy-tensorflow.*] +ignore_missing_imports = True + +[mypy-temper.*] +ignore_missing_imports = True + +[mypy-openapi_core.*] +ignore_missing_imports = True + +[mypy-openapi_spec_validator.*] +ignore_missing_imports = True + +[mypy-sqlalchemy] +ignore_missing_imports = True + +[mypy-defusedxml.*] +ignore_missing_imports = True + +[mypy-cosmpy.*] +ignore_missing_imports = True + +[mypy-google.*] +ignore_missing_imports = True + +[mypy-click.*] +ignore_missing_imports = True + +[mypy-yaml.*] +ignore_missing_imports = True + +[mypy-requests.*] +ignore_missing_imports = True + +[mypy-certifi.*] +ignore_missing_imports = True + +[mypy-werkzeug.*] +ignore_missing_imports = True + +[mypy-pkg_resources.*] +ignore_missing_imports = True + +[mypy-gyms.*] +ignore_missing_imports = True + +[mypy-rl.*] +ignore_missing_imports = True + +[mypy-multibase.*] +ignore_missing_imports = True + +[mypy-multicodec.*] +ignore_missing_imports = True + +[mypy-morphys.*] +ignore_missing_imports = True + +[mypy-multihash.*] +ignore_missing_imports = True + +[mypy-coverage.*] +ignore_missing_imports = True + +[mypy-Crypto.*] +ignore_missing_imports = True + +[mypy-eth_typing.*] +ignore_missing_imports = True + +[mypy-bech32.*] +ignore_missing_imports = True + +[mypy-eth_utils.*] +ignore_missing_imports = True + +[mypy-_strptime.*] +ignore_missing_imports = True + +[mypy-hypothesis.*] +ignore_missing_imports = True + +[mypy-hexbytes.*] +ignore_missing_imports=True + +[mypy-flashbots.*] +ignore_missing_imports=True + +[mypy-asyncio.*] +ignore_missing_imports=True + +[darglint] +docstring_style=sphinx +strictness=short +ignore_regex=.*_pb2\.py +ignore=DAR401 From 3e6d64b77fd275a5d45322d853614133135fef04 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:09:39 +0200 Subject: [PATCH 16/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 32 +++++++++---------- .../agents/impact_evaluator/aea-config.yaml | 30 ++++++++--------- .../valory/connections/openai/connection.yaml | 4 +-- .../connections/twitter/connection.yaml | 4 +-- .../dynamic_contribution/contract.yaml | 2 +- packages/valory/protocols/llm/protocol.yaml | 2 +- .../valory/protocols/twitter/protocol.yaml | 4 +-- .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/ceramic_read_abci/skill.yaml | 2 +- .../skills/ceramic_write_abci/skill.yaml | 2 +- .../valory/skills/dynamic_nft_abci/skill.yaml | 4 +-- .../skills/impact_evaluator_abci/skill.yaml | 14 ++++---- packages/valory/skills/llm_abci/skill.yaml | 4 +-- .../valory/skills/olas_week_abci/skill.yaml | 4 +-- .../skills/twitter_scoring_abci/skill.yaml | 4 +-- .../skills/twitter_write_abci/skill.yaml | 4 +-- 18 files changed, 61 insertions(+), 61 deletions(-) diff --git a/docs/index.md b/docs/index.md index d8debfd9..3d5cf1f3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeidyixr2a6ddcihf2xph7w6lqpnoxle2pcnfuehy3vrhoe33dhb3t4 --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeihhh63way37tf6mlihez5x46rklhn52fagnvjy6gveyvrsymgi2oe --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index c8c4b653..a239ea9d 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeigdpnl4mkw2vskswov6kiotrkwpanntzqumqrxwujodildtcswm6e", - "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeidyixr2a6ddcihf2xph7w6lqpnoxle2pcnfuehy3vrhoe33dhb3t4", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa", - "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", - "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiew35nruo2rayvnhyis3dzcs3c5hng2px4qepmkfn6x7irjizdgna", + "agent/valory/impact_evaluator/0.1.0": "bafybeibkr34vhefwkjzdrp5eiixwopamrwwdsllrinmirt5wgzfgowb2lm", + "contract/valory/dynamic_contribution/0.1.0": "bafybeihlnij4fzrkv3isf2fo6enw25uqac6ksopoh4dlxor7225liseo2i", + "service/valory/impact_evaluator/0.1.0": "bafybeihhh63way37tf6mlihez5x46rklhn52fagnvjy6gveyvrsymgi2oe", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeicfvceddibkjsnbs6h5t2eivdq4ewvhvqdan3zvjvo2ahvfmzhuji", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeib7qzyoe65ppchvusasvknsxxl5dduq2cyujtl3ximmeo75d3zqxq", + "skill/valory/ceramic_read_abci/0.1.0": "bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey", + "skill/valory/ceramic_write_abci/0.1.0": "bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeif4bvpkcf3gexcaasdoaqizoq3t3w3hcfznljbzfq27sxh5r6exti", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu", - "protocol/valory/llm/1.0.0": "bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba", - "connection/valory/twitter/0.1.0": "bafybeibftx2ofelldnczfqhtz2lavtrr2eo26ywljfkkebrif5vjnosage", - "connection/valory/openai/0.1.0": "bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm", - "skill/valory/twitter_write_abci/0.1.0": "bafybeihwmiaixcvoiflrflh4xl5em2wctqyr7oxij4wg25smm5z44mwkei", - "skill/valory/llm_abci/0.1.0": "bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi", + "protocol/valory/twitter/0.1.0": "bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua", + "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", + "connection/valory/twitter/0.1.0": "bafybeiejrglaati6hcwaowrnryk57chwczduhgfsps4sdoaiaxrmxbm2mq", + "connection/valory/openai/0.1.0": "bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e", + "skill/valory/twitter_write_abci/0.1.0": "bafybeih6eqhd2gwgpcvjva47wtspoiawjdpjk7ugm66ch3gn2ewhh5lpy4", + "skill/valory/llm_abci/0.1.0": "bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeie7wzykdnlixe5c6uoycctuqqic6qltvs6glb4nzddrusp2mgjrla", - "skill/valory/olas_week_abci/0.1.0": "bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y" + "service/valory/impact_evaluator_local/0.1.0": "bafybeielac2say7fygqtfj6aggsonswjohhumynveekuh573jfva4fbqaa", + "skill/valory/olas_week_abci/0.1.0": "bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index c4fb849f..66bc5d6f 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -10,9 +10,9 @@ fingerprint: tests/helpers/__init__.py: bafybeif7verbag26h6i35gr5rlatxl7veq4drup5ykwdvhgtussf2jreei tests/helpers/constants.py: bafybeibbokz7gzdlubnjwxrmh4tqckc7j75hfy3ae6l5a63mrbd4hp6l7u tests/helpers/data/json_server/data.json: bafybeiapboptlarlpc2lboj4g2526vev7fwqpr267tb2qn6cevbblpnewe - tests/helpers/docker.py: bafybeihjgiuroofg7zn4sng4f7mwl2s24hk2ij5ibk4alkzgvxouns6spi + tests/helpers/docker.py: bafybeihlg5thdrcaiuzyte5s7x25mikqfyxdjwuqvhmeddluyjdkzhuhqi tests/helpers/fixtures.py: bafybeidfsamzdrqqkdra4ektollyfkhiyb2iqymy6djavgewon2cb23vwu - tests/test_impact_evaluator.py: bafybeiejwkxnd3johulxt4rkj5cvrrvkt6yaxkwyuwvmees3z4jxs5sday + tests/test_impact_evaluator.py: bafybeig2674hoob2mcuugihgdcvrc4zyo46vsa67wrskseode4gatfdcma fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom @@ -20,10 +20,10 @@ connections: - valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm -- valory/twitter:0.1.0:bafybeibftx2ofelldnczfqhtz2lavtrr2eo26ywljfkkebrif5vjnosage +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e +- valory/twitter:0.1.0:bafybeiejrglaati6hcwaowrnryk57chwczduhgfsps4sdoaiaxrmxbm2mq contracts: -- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y +- valory/dynamic_contribution:0.1.0:bafybeihlnij4fzrkv3isf2fo6enw25uqac6ksopoh4dlxor7225liseo2i - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci - valory/gnosis_safe_proxy_factory:0.1.0:bafybeigxqwbd6wds57ecsfkl2hf4z4vbz5gokex6nutu5zcdpw6irh573y - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y @@ -36,26 +36,26 @@ protocols: - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu +- valory/twitter:0.1.0:bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeiew35nruo2rayvnhyis3dzcs3c5hng2px4qepmkfn6x7irjizdgna +- valory/impact_evaluator_abci:0.1.0:bafybeif4bvpkcf3gexcaasdoaqizoq3t3w3hcfznljbzfq27sxh5r6exti - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa -- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m -- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena -- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq +- valory/twitter_scoring_abci:0.1.0:bafybeib7qzyoe65ppchvusasvknsxxl5dduq2cyujtl3ximmeo75d3zqxq +- valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey +- valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 +- valory/dynamic_nft_abci:0.1.0:bafybeicfvceddibkjsnbs6h5t2eivdq4ewvhvqdan3zvjvo2ahvfmzhuji - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeihwmiaixcvoiflrflh4xl5em2wctqyr7oxij4wg25smm5z44mwkei +- valory/twitter_write_abci:0.1.0:bafybeih6eqhd2gwgpcvjva47wtspoiawjdpjk7ugm66ch3gn2ewhh5lpy4 - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi -- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y +- valory/llm_abci:0.1.0:bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve +- valory/olas_week_abci:0.1.0:bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4 default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index a501b75b..b75758fa 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeiagnziswj5tll4yzx63u4hvat4yieoaaqt5b67chvvqxg5th5mxz4 - connection.py: bafybeiasbiwduhvs4j257i3p4xgbgukzlirlzpjoe6cggs5u5nutbswimq + connection.py: bafybeifkomaatfsg6fetdxhnuxl4dckstmsed3d5c7ve4rbpy2lb43y3vm readme.md: bafybeibqbvpfn6i2w7vxk2m65gizd2hcofu7mdzp2yusx7uupelztme724 fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 class_name: OpenaiConnection config: engine: text-davinci-003 diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index a99cd435..8eeebcd3 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeibxwzkyh7odchnlkeczpguencdjiizm4nezfmi4drybn2zd25xdkq - connection.py: bafybeies2zce7sxbihoesassplbnwmcucyajcp4hkuu6oov6ympjej6uy4 + connection.py: bafybeidokslaxwsvqge6sqn2wtmmaag7u3vajunrv2gqeutwmyprgdxcyy readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu +- valory/twitter:0.1.0:bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/contracts/dynamic_contribution/contract.yaml b/packages/valory/contracts/dynamic_contribution/contract.yaml index 674fb905..1032d12f 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.yaml +++ b/packages/valory/contracts/dynamic_contribution/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidk77j5zmvjhf42ie7grv33hzjedgc6vdiwn22uzhlwuo6xh6hmsi build/DynamicContribution.json: bafybeicq5ee4hba3h6tsluzvdrtyvzllpqsseqys66e24bfrpjlegnxome - contract.py: bafybeicdzpatfrgapps3tsig5rlegc5ulcfnppcfr3bdiil67l6n7oc7ba + contract.py: bafybeihe45m6zeuymlanetr6purk4bx6vcxh5efjvn3rteovhexkksdpqy fingerprint_ignore_patterns: [] class_name: DynamicContributionContract contract_interface_paths: diff --git a/packages/valory/protocols/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 6df89420..46b0a9a6 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -11,7 +11,7 @@ fingerprint: __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 - llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e + llm_pb2.py: bafybeifwerxjwysdotin5bjglloh2sqbeb7iwitpp2mfrne4fs2q3vj2ta message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 16f7476b..a5f2a646 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -7,7 +7,7 @@ description: A protocol for interacting with Twitter. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: bafybeiemontaaeytd3px2grliu5eaf2gghnt2asqi2uunmmlwrvjmxlxdy + README.md: bafybeibg7w4ghuqtnquwxhsfpdj4xg3roflvjr7qx2a2yptaegiy2sklm4 __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um dialogues.py: bafybeias63limtgev2htn4432mpus452rliqbdban46ij4na6or3rbjh2u message.py: bafybeichmenrrnv2no7qakye7pllcg4bwn4tfw6hrlegd6susk2ubnntli @@ -15,7 +15,7 @@ fingerprint: tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza twitter.proto: bafybeihx4mk22qabkcbc2siysvi7vhiwvfo6dr67wk6ozrkwyoviowj5ty - twitter_pb2.py: bafybeigp2stbkt5o43vvto5tr4sf2immouu5nvolq4exjozmggm2nttyyq + twitter_pb2.py: bafybeigpnqeaux4odnrci6vintboc5qvukulhodv7i4oltznim6uanvgoy fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index c95422ea..57a65cd7 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeigdpnl4mkw2vskswov6kiotrkwpanntzqumqrxwujodildtcswm6e +agent: valory/impact_evaluator:0.1.0:bafybeibkr34vhefwkjzdrp5eiixwopamrwwdsllrinmirt5wgzfgowb2lm number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index dcb1b3cc..e3452fb8 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeigdpnl4mkw2vskswov6kiotrkwpanntzqumqrxwujodildtcswm6e +agent: valory/impact_evaluator:0.1.0:bafybeibkr34vhefwkjzdrp5eiixwopamrwwdsllrinmirt5wgzfgowb2lm number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/ceramic_read_abci/skill.yaml b/packages/valory/skills/ceramic_read_abci/skill.yaml index 3f8749b0..f1d5f6d8 100644 --- a/packages/valory/skills/ceramic_read_abci/skill.yaml +++ b/packages/valory/skills/ceramic_read_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeigxhmr2m7ej7caedeqbheabq2tmnhxosyfvgpjfofgke4zkiyj3tm rounds.py: bafybeig2wb3rdu4byxzj2rzilsndgu75qcb65ryaitecr6cq3zywzgxf2y tests/__init__.py: bafybeibkxeuyukyuzek3lk5bqmo7jhl354fyznmqxv3dh4lsnly56xjkzu - tests/test_behaviours.py: bafybeifghtktetrzak7wwmmhwdx62yyr7tez4c7jonjizqwfpiixli3xt4 + tests/test_behaviours.py: bafybeia5ey4ezfjbewoidssiwuz44hazogdac77mpzhoefistbecdtlbqm tests/test_dialogues.py: bafybeias37opzowuenzii2dzwgwyaz57t3o4ocec67a274ghokptkdqaq4 tests/test_handlers.py: bafybeid26pxtjf33fkpmzpgfdg3fqyp6uttrscacwb7odprvjvysjmu36q tests/test_models.py: bafybeicuelcbuv2n2n5k3bdm3ek4gorpife5sg3whytnrpvfovyrz4mu7i diff --git a/packages/valory/skills/ceramic_write_abci/skill.yaml b/packages/valory/skills/ceramic_write_abci/skill.yaml index 03fc893c..6270b10e 100644 --- a/packages/valory/skills/ceramic_write_abci/skill.yaml +++ b/packages/valory/skills/ceramic_write_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeig63ibt5qa5sa4nw37gly3lvf4wwtps7vgr2zbvpp5zz6hzm66edq rounds.py: bafybeidfandv3ywplalo6ftkvig3nhimgohmaa3xpj35phc6pde374oaci tests/__init__.py: bafybeigknrv5xw52pmcscrsxhtpibey5jbr26dss7o5eofery6ktd6w42e - tests/test_behaviours.py: bafybeia73imiu4mdgau2u6fsgepfv3ow44jpyurtrikhminjgj73tz4qrq + tests/test_behaviours.py: bafybeibmelmxw4tgx46oqdhfi7xx4sadqgn5q3mrxhlzfnuyeqts3otiwm tests/test_dialogues.py: bafybeibvhslg6mwhvmeffhoho5olnmr56ohvx63onv63aryhaidizk3jou tests/test_handlers.py: bafybeih6yobt7ihsp32n6nliq3ourwfmgpc7lvb672timj7cqx4wg4n5ba tests/test_models.py: bafybeihqwbnrtarzos5tak2ywurtbel6fxodpupyk677aipdemaxlgs7qi diff --git a/packages/valory/skills/dynamic_nft_abci/skill.yaml b/packages/valory/skills/dynamic_nft_abci/skill.yaml index d60c7902..18dde4c1 100644 --- a/packages/valory/skills/dynamic_nft_abci/skill.yaml +++ b/packages/valory/skills/dynamic_nft_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: tests/test_behaviours.py: bafybeibojamjtso4gc5zxuvssqwdhigpaeixz2f4s7jkeiwxi5g5vvhaqm tests/test_ceramic_db.py: bafybeiaemz76p55aicazhysbgisrjm5sls55jbbnyfbbyye5fpsk6ltxz4 tests/test_dialogues.py: bafybeigybvptoehtw2o2jbudvyxggo5yr4pyqic7m732sha4xtaaxnfdpe - tests/test_handlers.py: bafybeigstd57brwxufhkhidb4dchxtemk2qbt4cavpkf63bekdg5xub3l4 + tests/test_handlers.py: bafybeibyhvjmehlie5tzu5sqaizf2k4en3rdmp3dqdh6tf7jsgnzr4jt3e tests/test_models.py: bafybeietgyqb5rsbnzqgzcsgm2pu2qcadu7rr7akxscfmegtghc5aguz44 tests/test_payloads.py: bafybeifpwaozt6s56uctvfmkdmcuxqawmvhu5skgyfu3ekegqd3iz7v2nm tests/test_rounds.py: bafybeid5ndadenmeqctrnzir4m7mpv2beqfbi3t66ry2dyozd7rabrezrq @@ -27,7 +27,7 @@ fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom contracts: -- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y +- valory/dynamic_contribution:0.1.0:bafybeihlnij4fzrkv3isf2fo6enw25uqac6ksopoh4dlxor7225liseo2i protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index c4f62837..5478c053 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -24,19 +24,19 @@ contracts: [] protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m +- valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa -- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena -- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq +- valory/twitter_scoring_abci:0.1.0:bafybeib7qzyoe65ppchvusasvknsxxl5dduq2cyujtl3ximmeo75d3zqxq +- valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 +- valory/dynamic_nft_abci:0.1.0:bafybeicfvceddibkjsnbs6h5t2eivdq4ewvhvqdan3zvjvo2ahvfmzhuji - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi -- valory/twitter_write_abci:0.1.0:bafybeihwmiaixcvoiflrflh4xl5em2wctqyr7oxij4wg25smm5z44mwkei -- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y +- valory/llm_abci:0.1.0:bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve +- valory/twitter_write_abci:0.1.0:bafybeih6eqhd2gwgpcvjva47wtspoiawjdpjk7ugm66ch3gn2ewhh5lpy4 +- valory/olas_week_abci:0.1.0:bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4 behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index 0d800c65..f393f34d 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,10 +23,10 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e contracts: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index cb392ef7..a9ff1398 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,10 +19,10 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e contracts: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index e2636e1e..94c675c7 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,10 +27,10 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e contracts: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index a1567db6..dbf7caf3 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeibftx2ofelldnczfqhtz2lavtrr2eo26ywljfkkebrif5vjnosage +- valory/twitter:0.1.0:bafybeiejrglaati6hcwaowrnryk57chwczduhgfsps4sdoaiaxrmxbm2mq contracts: [] protocols: -- valory/twitter:0.1.0:bafybeibpzjbiz2bg66ycgll4boy4ghdjvu6tgokqk72afj3unjxeuqsjcu +- valory/twitter:0.1.0:bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From 7f67283093f8b000a012a3f0ac34761a6440cf75 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:11:19 +0200 Subject: [PATCH 17/30] fix: protocol --- packages/valory/protocols/twitter/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/valory/protocols/twitter/README.md b/packages/valory/protocols/twitter/README.md index 787783d8..53000932 100644 --- a/packages/valory/protocols/twitter/README.md +++ b/packages/valory/protocols/twitter/README.md @@ -24,7 +24,7 @@ speech_acts: message: pt:str ... --- -initiation: [request] +initiation: [create_tweet] reply: create_tweet: [tweet_created, error] response: [] From 6616b71a128ebcebe21b51e9a4146addf20f8630 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:11:57 +0200 Subject: [PATCH 18/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 30 +++++++++---------- .../agents/impact_evaluator/aea-config.yaml | 28 ++++++++--------- .../impact_evaluator/tests/helpers/docker.py | 3 +- .../tests/test_impact_evaluator.py | 3 +- .../valory/connections/openai/connection.py | 1 + .../valory/connections/openai/connection.yaml | 2 +- .../valory/connections/twitter/connection.py | 3 +- .../connections/twitter/connection.yaml | 4 +-- .../dynamic_contribution/contract.py | 5 ++-- .../dynamic_contribution/contract.yaml | 2 +- .../valory/protocols/twitter/protocol.yaml | 2 +- .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/ceramic_read_abci/skill.yaml | 2 +- .../tests/test_behaviours.py | 1 + .../skills/ceramic_write_abci/skill.yaml | 2 +- .../tests/test_behaviours.py | 1 + .../valory/skills/dynamic_nft_abci/skill.yaml | 4 +-- .../dynamic_nft_abci/tests/test_handlers.py | 1 + .../skills/impact_evaluator_abci/skill.yaml | 14 ++++----- packages/valory/skills/llm_abci/skill.yaml | 2 +- .../valory/skills/olas_week_abci/skill.yaml | 2 +- .../skills/twitter_scoring_abci/skill.yaml | 2 +- .../skills/twitter_write_abci/skill.yaml | 4 +-- scripts/check_doc_ipfs_hashes.py | 1 + 26 files changed, 67 insertions(+), 58 deletions(-) diff --git a/docs/index.md b/docs/index.md index 3d5cf1f3..be6560b2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeihhh63way37tf6mlihez5x46rklhn52fagnvjy6gveyvrsymgi2oe --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeic5gf6uw4tnwzohj4bqmp3ayfkmvzf53vrw2vq7nox4suxirb4xwi --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index a239ea9d..58e8c8ee 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeibkr34vhefwkjzdrp5eiixwopamrwwdsllrinmirt5wgzfgowb2lm", - "contract/valory/dynamic_contribution/0.1.0": "bafybeihlnij4fzrkv3isf2fo6enw25uqac6ksopoh4dlxor7225liseo2i", - "service/valory/impact_evaluator/0.1.0": "bafybeihhh63way37tf6mlihez5x46rklhn52fagnvjy6gveyvrsymgi2oe", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeicfvceddibkjsnbs6h5t2eivdq4ewvhvqdan3zvjvo2ahvfmzhuji", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeib7qzyoe65ppchvusasvknsxxl5dduq2cyujtl3ximmeo75d3zqxq", - "skill/valory/ceramic_read_abci/0.1.0": "bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey", - "skill/valory/ceramic_write_abci/0.1.0": "bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeif4bvpkcf3gexcaasdoaqizoq3t3w3hcfznljbzfq27sxh5r6exti", + "agent/valory/impact_evaluator/0.1.0": "bafybeihff6p57t7v63yjo7pdashfuqarcrqbotmwxde3uuym24vglta6bm", + "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", + "service/valory/impact_evaluator/0.1.0": "bafybeic5gf6uw4tnwzohj4bqmp3ayfkmvzf53vrw2vq7nox4suxirb4xwi", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe", + "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", + "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidnmzvoeks3i2gi777ju3a2no5inihtojbuj75623oslav2zfe3sa", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua", + "protocol/valory/twitter/0.1.0": "bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca", "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", - "connection/valory/twitter/0.1.0": "bafybeiejrglaati6hcwaowrnryk57chwczduhgfsps4sdoaiaxrmxbm2mq", - "connection/valory/openai/0.1.0": "bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e", - "skill/valory/twitter_write_abci/0.1.0": "bafybeih6eqhd2gwgpcvjva47wtspoiawjdpjk7ugm66ch3gn2ewhh5lpy4", - "skill/valory/llm_abci/0.1.0": "bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve", + "connection/valory/twitter/0.1.0": "bafybeidvr7emajqilx2tdr6jednx7h6tgr4vdpuvfegbdos7i64eftjm7u", + "connection/valory/openai/0.1.0": "bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q", + "skill/valory/twitter_write_abci/0.1.0": "bafybeicq3w3i35iqu6myidza7xqpehw277v4vmfq6llkq7cmqtpqj337o4", + "skill/valory/llm_abci/0.1.0": "bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeielac2say7fygqtfj6aggsonswjohhumynveekuh573jfva4fbqaa", - "skill/valory/olas_week_abci/0.1.0": "bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4" + "service/valory/impact_evaluator_local/0.1.0": "bafybeiaqg6zrkinbphqduuzetkh7x6nroupj6riehlw2dd4rmwtpzeeora", + "skill/valory/olas_week_abci/0.1.0": "bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 66bc5d6f..620c8d00 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -10,9 +10,9 @@ fingerprint: tests/helpers/__init__.py: bafybeif7verbag26h6i35gr5rlatxl7veq4drup5ykwdvhgtussf2jreei tests/helpers/constants.py: bafybeibbokz7gzdlubnjwxrmh4tqckc7j75hfy3ae6l5a63mrbd4hp6l7u tests/helpers/data/json_server/data.json: bafybeiapboptlarlpc2lboj4g2526vev7fwqpr267tb2qn6cevbblpnewe - tests/helpers/docker.py: bafybeihlg5thdrcaiuzyte5s7x25mikqfyxdjwuqvhmeddluyjdkzhuhqi + tests/helpers/docker.py: bafybeihjgiuroofg7zn4sng4f7mwl2s24hk2ij5ibk4alkzgvxouns6spi tests/helpers/fixtures.py: bafybeidfsamzdrqqkdra4ektollyfkhiyb2iqymy6djavgewon2cb23vwu - tests/test_impact_evaluator.py: bafybeig2674hoob2mcuugihgdcvrc4zyo46vsa67wrskseode4gatfdcma + tests/test_impact_evaluator.py: bafybeiejwkxnd3johulxt4rkj5cvrrvkt6yaxkwyuwvmees3z4jxs5sday fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom @@ -20,10 +20,10 @@ connections: - valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e -- valory/twitter:0.1.0:bafybeiejrglaati6hcwaowrnryk57chwczduhgfsps4sdoaiaxrmxbm2mq +- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q +- valory/twitter:0.1.0:bafybeidvr7emajqilx2tdr6jednx7h6tgr4vdpuvfegbdos7i64eftjm7u contracts: -- valory/dynamic_contribution:0.1.0:bafybeihlnij4fzrkv3isf2fo6enw25uqac6ksopoh4dlxor7225liseo2i +- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci - valory/gnosis_safe_proxy_factory:0.1.0:bafybeigxqwbd6wds57ecsfkl2hf4z4vbz5gokex6nutu5zcdpw6irh573y - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y @@ -38,24 +38,24 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua +- valory/twitter:0.1.0:bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeif4bvpkcf3gexcaasdoaqizoq3t3w3hcfznljbzfq27sxh5r6exti +- valory/impact_evaluator_abci:0.1.0:bafybeidnmzvoeks3i2gi777ju3a2no5inihtojbuj75623oslav2zfe3sa - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeib7qzyoe65ppchvusasvknsxxl5dduq2cyujtl3ximmeo75d3zqxq -- valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey -- valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 -- valory/dynamic_nft_abci:0.1.0:bafybeicfvceddibkjsnbs6h5t2eivdq4ewvhvqdan3zvjvo2ahvfmzhuji +- valory/twitter_scoring_abci:0.1.0:bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe +- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m +- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena +- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeih6eqhd2gwgpcvjva47wtspoiawjdpjk7ugm66ch3gn2ewhh5lpy4 +- valory/twitter_write_abci:0.1.0:bafybeicq3w3i35iqu6myidza7xqpehw277v4vmfq6llkq7cmqtpqj337o4 - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve -- valory/olas_week_abci:0.1.0:bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4 +- valory/llm_abci:0.1.0:bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu +- valory/olas_week_abci:0.1.0:bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py index 988b31a1..f307150a 100644 --- a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py +++ b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py @@ -26,10 +26,11 @@ import docker import requests -from aea.exceptions import enforce from aea_test_autonomy.docker.base import DockerImage from docker.models.containers import Container +from aea.exceptions import enforce + from packages.valory.agents.impact_evaluator import PACKAGE_DIR from packages.valory.agents.impact_evaluator.tests.helpers.constants import ( DYNAMIC_CONTRIBUTION_CONTRACT_ADDRESS, diff --git a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py index e33f7f3a..c9dd24b1 100644 --- a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py +++ b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py @@ -23,7 +23,6 @@ from typing import Tuple import pytest -from aea.configurations.data_types import PublicId from aea_test_autonomy.base_test_classes.agents import ( BaseTestEnd2EndExecution, RoundChecks, @@ -44,6 +43,8 @@ from aea_test_autonomy.fixture_helpers import tendermint # noqa: F401 from aea_test_autonomy.fixture_helpers import tendermint_port # noqa: F401 +from aea.configurations.data_types import PublicId + from packages.valory.agents.impact_evaluator.tests.helpers.docker import ( DEFAULT_JSON_SERVER_ADDR as _DEFAULT_JSON_SERVER_ADDR, ) diff --git a/packages/valory/connections/openai/connection.py b/packages/valory/connections/openai/connection.py index e2455044..ddab1d43 100644 --- a/packages/valory/connections/openai/connection.py +++ b/packages/valory/connections/openai/connection.py @@ -23,6 +23,7 @@ from typing import Any, Dict, cast import openai + from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index b75758fa..3ef81b4d 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -7,7 +7,7 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeiagnziswj5tll4yzx63u4hvat4yieoaaqt5b67chvvqxg5th5mxz4 - connection.py: bafybeifkomaatfsg6fetdxhnuxl4dckstmsed3d5c7ve4rbpy2lb43y3vm + connection.py: bafybeiasbiwduhvs4j257i3p4xgbgukzlirlzpjoe6cggs5u5nutbswimq readme.md: bafybeibqbvpfn6i2w7vxk2m65gizd2hcofu7mdzp2yusx7uupelztme724 fingerprint_ignore_patterns: [] connections: [] diff --git a/packages/valory/connections/twitter/connection.py b/packages/valory/connections/twitter/connection.py index 1a34792a..7ecedfb8 100644 --- a/packages/valory/connections/twitter/connection.py +++ b/packages/valory/connections/twitter/connection.py @@ -22,12 +22,13 @@ from typing import Any, Callable, cast import tweepy +from tweepy.errors import HTTPException as TweepyHTTPException + from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope from aea.protocols.base import Address, Message from aea.protocols.dialogue.base import Dialogue -from tweepy.errors import HTTPException as TweepyHTTPException from packages.valory.protocols.twitter.dialogues import TwitterDialogue from packages.valory.protocols.twitter.dialogues import ( diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index 8eeebcd3..c5521c11 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeibxwzkyh7odchnlkeczpguencdjiizm4nezfmi4drybn2zd25xdkq - connection.py: bafybeidokslaxwsvqge6sqn2wtmmaag7u3vajunrv2gqeutwmyprgdxcyy + connection.py: bafybeies2zce7sxbihoesassplbnwmcucyajcp4hkuu6oov6ympjej6uy4 readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua +- valory/twitter:0.1.0:bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/contracts/dynamic_contribution/contract.py b/packages/valory/contracts/dynamic_contribution/contract.py index 5e552a35..73efa40b 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.py +++ b/packages/valory/contracts/dynamic_contribution/contract.py @@ -21,12 +21,13 @@ from typing import Any, cast +from aea_ledger_ethereum import EthereumApi +from web3.types import BlockIdentifier + from aea.common import JSONLike from aea.configurations.base import PublicId from aea.contracts.base import Contract from aea.crypto.base import LedgerApi -from aea_ledger_ethereum import EthereumApi -from web3.types import BlockIdentifier class DynamicContributionContract(Contract): diff --git a/packages/valory/contracts/dynamic_contribution/contract.yaml b/packages/valory/contracts/dynamic_contribution/contract.yaml index 1032d12f..674fb905 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.yaml +++ b/packages/valory/contracts/dynamic_contribution/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidk77j5zmvjhf42ie7grv33hzjedgc6vdiwn22uzhlwuo6xh6hmsi build/DynamicContribution.json: bafybeicq5ee4hba3h6tsluzvdrtyvzllpqsseqys66e24bfrpjlegnxome - contract.py: bafybeihe45m6zeuymlanetr6purk4bx6vcxh5efjvn3rteovhexkksdpqy + contract.py: bafybeicdzpatfrgapps3tsig5rlegc5ulcfnppcfr3bdiil67l6n7oc7ba fingerprint_ignore_patterns: [] class_name: DynamicContributionContract contract_interface_paths: diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index a5f2a646..37b2dbaa 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -7,7 +7,7 @@ description: A protocol for interacting with Twitter. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: bafybeibg7w4ghuqtnquwxhsfpdj4xg3roflvjr7qx2a2yptaegiy2sklm4 + README.md: bafybeibahvj7osv32b4l6qodr2pxjipiwqpsgcruf53rqzb2y4mx4ukwpu __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um dialogues.py: bafybeias63limtgev2htn4432mpus452rliqbdban46ij4na6or3rbjh2u message.py: bafybeichmenrrnv2no7qakye7pllcg4bwn4tfw6hrlegd6susk2ubnntli diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 57a65cd7..ce631a5a 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibkr34vhefwkjzdrp5eiixwopamrwwdsllrinmirt5wgzfgowb2lm +agent: valory/impact_evaluator:0.1.0:bafybeihff6p57t7v63yjo7pdashfuqarcrqbotmwxde3uuym24vglta6bm number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index e3452fb8..4a3d9a33 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibkr34vhefwkjzdrp5eiixwopamrwwdsllrinmirt5wgzfgowb2lm +agent: valory/impact_evaluator:0.1.0:bafybeihff6p57t7v63yjo7pdashfuqarcrqbotmwxde3uuym24vglta6bm number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/ceramic_read_abci/skill.yaml b/packages/valory/skills/ceramic_read_abci/skill.yaml index f1d5f6d8..3f8749b0 100644 --- a/packages/valory/skills/ceramic_read_abci/skill.yaml +++ b/packages/valory/skills/ceramic_read_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeigxhmr2m7ej7caedeqbheabq2tmnhxosyfvgpjfofgke4zkiyj3tm rounds.py: bafybeig2wb3rdu4byxzj2rzilsndgu75qcb65ryaitecr6cq3zywzgxf2y tests/__init__.py: bafybeibkxeuyukyuzek3lk5bqmo7jhl354fyznmqxv3dh4lsnly56xjkzu - tests/test_behaviours.py: bafybeia5ey4ezfjbewoidssiwuz44hazogdac77mpzhoefistbecdtlbqm + tests/test_behaviours.py: bafybeifghtktetrzak7wwmmhwdx62yyr7tez4c7jonjizqwfpiixli3xt4 tests/test_dialogues.py: bafybeias37opzowuenzii2dzwgwyaz57t3o4ocec67a274ghokptkdqaq4 tests/test_handlers.py: bafybeid26pxtjf33fkpmzpgfdg3fqyp6uttrscacwb7odprvjvysjmu36q tests/test_models.py: bafybeicuelcbuv2n2n5k3bdm3ek4gorpife5sg3whytnrpvfovyrz4mu7i diff --git a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py index a8613a54..d79711b1 100644 --- a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py @@ -25,6 +25,7 @@ from typing import Any, Dict, Optional, Type, cast import pytest + from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/ceramic_write_abci/skill.yaml b/packages/valory/skills/ceramic_write_abci/skill.yaml index 6270b10e..03fc893c 100644 --- a/packages/valory/skills/ceramic_write_abci/skill.yaml +++ b/packages/valory/skills/ceramic_write_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeig63ibt5qa5sa4nw37gly3lvf4wwtps7vgr2zbvpp5zz6hzm66edq rounds.py: bafybeidfandv3ywplalo6ftkvig3nhimgohmaa3xpj35phc6pde374oaci tests/__init__.py: bafybeigknrv5xw52pmcscrsxhtpibey5jbr26dss7o5eofery6ktd6w42e - tests/test_behaviours.py: bafybeibmelmxw4tgx46oqdhfi7xx4sadqgn5q3mrxhlzfnuyeqts3otiwm + tests/test_behaviours.py: bafybeia73imiu4mdgau2u6fsgepfv3ow44jpyurtrikhminjgj73tz4qrq tests/test_dialogues.py: bafybeibvhslg6mwhvmeffhoho5olnmr56ohvx63onv63aryhaidizk3jou tests/test_handlers.py: bafybeih6yobt7ihsp32n6nliq3ourwfmgpc7lvb672timj7cqx4wg4n5ba tests/test_models.py: bafybeihqwbnrtarzos5tak2ywurtbel6fxodpupyk677aipdemaxlgs7qi diff --git a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py index 78ef2fe8..4d3d13f2 100644 --- a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py @@ -25,6 +25,7 @@ from typing import Any, Dict, Optional, Type, cast import pytest + from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/dynamic_nft_abci/skill.yaml b/packages/valory/skills/dynamic_nft_abci/skill.yaml index 18dde4c1..d60c7902 100644 --- a/packages/valory/skills/dynamic_nft_abci/skill.yaml +++ b/packages/valory/skills/dynamic_nft_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: tests/test_behaviours.py: bafybeibojamjtso4gc5zxuvssqwdhigpaeixz2f4s7jkeiwxi5g5vvhaqm tests/test_ceramic_db.py: bafybeiaemz76p55aicazhysbgisrjm5sls55jbbnyfbbyye5fpsk6ltxz4 tests/test_dialogues.py: bafybeigybvptoehtw2o2jbudvyxggo5yr4pyqic7m732sha4xtaaxnfdpe - tests/test_handlers.py: bafybeibyhvjmehlie5tzu5sqaizf2k4en3rdmp3dqdh6tf7jsgnzr4jt3e + tests/test_handlers.py: bafybeigstd57brwxufhkhidb4dchxtemk2qbt4cavpkf63bekdg5xub3l4 tests/test_models.py: bafybeietgyqb5rsbnzqgzcsgm2pu2qcadu7rr7akxscfmegtghc5aguz44 tests/test_payloads.py: bafybeifpwaozt6s56uctvfmkdmcuxqawmvhu5skgyfu3ekegqd3iz7v2nm tests/test_rounds.py: bafybeid5ndadenmeqctrnzir4m7mpv2beqfbi3t66ry2dyozd7rabrezrq @@ -27,7 +27,7 @@ fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom contracts: -- valory/dynamic_contribution:0.1.0:bafybeihlnij4fzrkv3isf2fo6enw25uqac6ksopoh4dlxor7225liseo2i +- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe diff --git a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py index be93c8de..33602846 100644 --- a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py +++ b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py @@ -28,6 +28,7 @@ from unittest.mock import Mock, patch import pytest + from aea.protocols.dialogue.base import DialogueMessage from aea.test_tools.test_skill import BaseSkillTestCase diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 5478c053..051fff36 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -24,19 +24,19 @@ contracts: [] protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey +- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeib7qzyoe65ppchvusasvknsxxl5dduq2cyujtl3ximmeo75d3zqxq -- valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 -- valory/dynamic_nft_abci:0.1.0:bafybeicfvceddibkjsnbs6h5t2eivdq4ewvhvqdan3zvjvo2ahvfmzhuji +- valory/twitter_scoring_abci:0.1.0:bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe +- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena +- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve -- valory/twitter_write_abci:0.1.0:bafybeih6eqhd2gwgpcvjva47wtspoiawjdpjk7ugm66ch3gn2ewhh5lpy4 -- valory/olas_week_abci:0.1.0:bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4 +- valory/llm_abci:0.1.0:bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu +- valory/twitter_write_abci:0.1.0:bafybeicq3w3i35iqu6myidza7xqpehw277v4vmfq6llkq7cmqtpqj337o4 +- valory/olas_week_abci:0.1.0:bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index f393f34d..61b9dccc 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,7 +23,7 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e +- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q contracts: [] protocols: - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index a9ff1398..e1492839 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e +- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q contracts: [] protocols: - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index 94c675c7..c0aded98 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,7 +27,7 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e +- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q contracts: [] protocols: - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index dbf7caf3..60be0ff4 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeiejrglaati6hcwaowrnryk57chwczduhgfsps4sdoaiaxrmxbm2mq +- valory/twitter:0.1.0:bafybeidvr7emajqilx2tdr6jednx7h6tgr4vdpuvfegbdos7i64eftjm7u contracts: [] protocols: -- valory/twitter:0.1.0:bafybeibgcm4qgmzpclw4pkikme7e6bsiwdbofuhkraimgfpveptepcxdua +- valory/twitter:0.1.0:bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/scripts/check_doc_ipfs_hashes.py b/scripts/check_doc_ipfs_hashes.py index aef3a8ff..afaf498f 100755 --- a/scripts/check_doc_ipfs_hashes.py +++ b/scripts/check_doc_ipfs_hashes.py @@ -29,6 +29,7 @@ from typing import Dict, List, Optional import yaml + from aea.cli.packages import get_package_manager from aea.configurations.data_types import PackageId from aea.helpers.base import IPFS_HASH_REGEX, SIMPLE_ID_REGEX From 76cb271b91f0deb507a755fca22d2c2a1327351c Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:13:26 +0200 Subject: [PATCH 19/30] fix: protocol --- packages/valory/protocols/twitter/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/valory/protocols/twitter/README.md b/packages/valory/protocols/twitter/README.md index 53000932..26e2dd9f 100644 --- a/packages/valory/protocols/twitter/README.md +++ b/packages/valory/protocols/twitter/README.md @@ -27,9 +27,9 @@ speech_acts: initiation: [create_tweet] reply: create_tweet: [tweet_created, error] - response: [] + tweet_created: [] error: [] -termination: [response, error] +termination: [tweet_created, error] roles: {skill, connection} end_states: [successful] keep_terminal_state_dialogues: false From a18dbd265395a3e3feba61d7d4ae96f954a374b4 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:13:51 +0200 Subject: [PATCH 20/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 14 +++++++------- .../valory/agents/impact_evaluator/aea-config.yaml | 8 ++++---- .../valory/connections/twitter/connection.yaml | 2 +- packages/valory/protocols/twitter/protocol.yaml | 2 +- .../valory/services/impact_evaluator/service.yaml | 2 +- .../services/impact_evaluator_local/service.yaml | 2 +- .../valory/skills/impact_evaluator_abci/skill.yaml | 2 +- .../valory/skills/twitter_write_abci/skill.yaml | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/index.md b/docs/index.md index be6560b2..101df7c8 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeic5gf6uw4tnwzohj4bqmp3ayfkmvzf53vrw2vq7nox4suxirb4xwi --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeielhh7o4fz3rjh6cmmw3cdc63ktafa3xpdem66r4sa4ixfur5l5yu --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 58e8c8ee..8cd6767a 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,22 +1,22 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeihff6p57t7v63yjo7pdashfuqarcrqbotmwxde3uuym24vglta6bm", + "agent/valory/impact_evaluator/0.1.0": "bafybeicb3bv44c7trgqge7yslp3thry4jb5dloalckiefolbyq2njqgzeq", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeic5gf6uw4tnwzohj4bqmp3ayfkmvzf53vrw2vq7nox4suxirb4xwi", + "service/valory/impact_evaluator/0.1.0": "bafybeielhh7o4fz3rjh6cmmw3cdc63ktafa3xpdem66r4sa4ixfur5l5yu", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", "skill/valory/twitter_scoring_abci/0.1.0": "bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidnmzvoeks3i2gi777ju3a2no5inihtojbuj75623oslav2zfe3sa", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidyluxwb6jeh3sytq5irnafj3auhw5rpjyhhcwcghxx3s6tactrdq", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca", + "protocol/valory/twitter/0.1.0": "bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa", "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", - "connection/valory/twitter/0.1.0": "bafybeidvr7emajqilx2tdr6jednx7h6tgr4vdpuvfegbdos7i64eftjm7u", + "connection/valory/twitter/0.1.0": "bafybeihix5btuggisozge2esrqwvfdc26qrc5ygky3qx6zdmtdhhot4554", "connection/valory/openai/0.1.0": "bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q", - "skill/valory/twitter_write_abci/0.1.0": "bafybeicq3w3i35iqu6myidza7xqpehw277v4vmfq6llkq7cmqtpqj337o4", + "skill/valory/twitter_write_abci/0.1.0": "bafybeickj4hrp4wxbhiqjsuqd7a2lb6k3yspf5kzhsdzox3y253jo4nw74", "skill/valory/llm_abci/0.1.0": "bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeiaqg6zrkinbphqduuzetkh7x6nroupj6riehlw2dd4rmwtpzeeora", + "service/valory/impact_evaluator_local/0.1.0": "bafybeib6i4dryddxxdrpa2ryb4ggfbhgj2ijyjllkynek5ex6qxr7c5u6m", "skill/valory/olas_week_abci/0.1.0": "bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru" }, "third_party": { diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 620c8d00..7c5fd257 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -21,7 +21,7 @@ connections: - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq - valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q -- valory/twitter:0.1.0:bafybeidvr7emajqilx2tdr6jednx7h6tgr4vdpuvfegbdos7i64eftjm7u +- valory/twitter:0.1.0:bafybeihix5btuggisozge2esrqwvfdc26qrc5ygky3qx6zdmtdhhot4554 contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -38,11 +38,11 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca +- valory/twitter:0.1.0:bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeidnmzvoeks3i2gi777ju3a2no5inihtojbuj75623oslav2zfe3sa +- valory/impact_evaluator_abci:0.1.0:bafybeidyluxwb6jeh3sytq5irnafj3auhw5rpjyhhcwcghxx3s6tactrdq - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 - valory/twitter_scoring_abci:0.1.0:bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m @@ -52,7 +52,7 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeicq3w3i35iqu6myidza7xqpehw277v4vmfq6llkq7cmqtpqj337o4 +- valory/twitter_write_abci:0.1.0:bafybeickj4hrp4wxbhiqjsuqd7a2lb6k3yspf5kzhsdzox3y253jo4nw74 - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu - valory/olas_week_abci:0.1.0:bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index c5521c11..febf9a14 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca +- valory/twitter:0.1.0:bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 37b2dbaa..a607d384 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -7,7 +7,7 @@ description: A protocol for interacting with Twitter. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: bafybeibahvj7osv32b4l6qodr2pxjipiwqpsgcruf53rqzb2y4mx4ukwpu + README.md: bafybeigsozugpnpasmqnymszbqlduboikq7ctgnetgn6brrm37aznlyh6e __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um dialogues.py: bafybeias63limtgev2htn4432mpus452rliqbdban46ij4na6or3rbjh2u message.py: bafybeichmenrrnv2no7qakye7pllcg4bwn4tfw6hrlegd6susk2ubnntli diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index ce631a5a..5d9b14ab 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeihff6p57t7v63yjo7pdashfuqarcrqbotmwxde3uuym24vglta6bm +agent: valory/impact_evaluator:0.1.0:bafybeicb3bv44c7trgqge7yslp3thry4jb5dloalckiefolbyq2njqgzeq number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 4a3d9a33..58555c88 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeihff6p57t7v63yjo7pdashfuqarcrqbotmwxde3uuym24vglta6bm +agent: valory/impact_evaluator:0.1.0:bafybeicb3bv44c7trgqge7yslp3thry4jb5dloalckiefolbyq2njqgzeq number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 051fff36..5a0a4654 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -35,7 +35,7 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu -- valory/twitter_write_abci:0.1.0:bafybeicq3w3i35iqu6myidza7xqpehw277v4vmfq6llkq7cmqtpqj337o4 +- valory/twitter_write_abci:0.1.0:bafybeickj4hrp4wxbhiqjsuqd7a2lb6k3yspf5kzhsdzox3y253jo4nw74 - valory/olas_week_abci:0.1.0:bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru behaviours: main: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index 60be0ff4..a651740e 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeidvr7emajqilx2tdr6jednx7h6tgr4vdpuvfegbdos7i64eftjm7u +- valory/twitter:0.1.0:bafybeihix5btuggisozge2esrqwvfdc26qrc5ygky3qx6zdmtdhhot4554 contracts: [] protocols: -- valory/twitter:0.1.0:bafybeihsbxc253gmojfbxszx4bjkr3rgjvxg37dfdcdaoyecya4iih6nca +- valory/twitter:0.1.0:bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From 9e01f6cf258bebb6fcf16b899ba10f846d0816ba Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:14:49 +0200 Subject: [PATCH 21/30] fix: regenerate protocols --- packages/valory/protocols/llm/__init__.py | 21 -------- packages/valory/protocols/llm/dialogues.py | 21 -------- packages/valory/protocols/llm/llm_pb2.py | 1 - packages/valory/protocols/llm/message.py | 21 -------- packages/valory/protocols/llm/protocol.yaml | 10 ++-- .../valory/protocols/llm/serialization.py | 21 -------- packages/valory/protocols/twitter/__init__.py | 21 -------- .../valory/protocols/twitter/dialogues.py | 35 ++++--------- packages/valory/protocols/twitter/message.py | 47 ++++++++---------- .../valory/protocols/twitter/protocol.yaml | 12 ++--- .../valory/protocols/twitter/serialization.py | 49 +++++++------------ .../valory/protocols/twitter/twitter.proto | 13 +++-- .../valory/protocols/twitter/twitter_pb2.py | 15 +++--- 13 files changed, 76 insertions(+), 211 deletions(-) diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 845b47fe..83565f19 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__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/llm/dialogues.py b/packages/valory/protocols/llm/dialogues.py index 2b7e0967..643dd397 100644 --- a/packages/valory/protocols/llm/dialogues.py +++ b/packages/valory/protocols/llm/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/llm/llm_pb2.py b/packages/valory/protocols/llm/llm_pb2.py index 7d9a5400..4ada3001 100644 --- a/packages/valory/protocols/llm/llm_pb2.py +++ b/packages/valory/protocols/llm/llm_pb2.py @@ -7,7 +7,6 @@ from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/packages/valory/protocols/llm/message.py b/packages/valory/protocols/llm/message.py index 6fd162f4..16618c75 100644 --- a/packages/valory/protocols/llm/message.py +++ b/packages/valory/protocols/llm/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/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 46b0a9a6..54314889 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m - dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 + __init__.py: bafybeiauadqjlhqmauczfl4ljcdcs6imvg3kc4nbaobb5nrmgh5qqvyq5i + dialogues.py: bafybeict3p7xmn2r2mur3iep54fmbosvsrp4mk4l6ad4hzc7ywwl3c4ale llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 - llm_pb2.py: bafybeifwerxjwysdotin5bjglloh2sqbeb7iwitpp2mfrne4fs2q3vj2ta - message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 - serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa + llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e + message.py: bafybeiayhrzk2l4fsacw5c2eu57yods5ey7yicx2ugvrz5yedjxmakrvbm + serialization.py: bafybeideqcjtagyhzrblxnq42ulyqqnjsex7r4n47cvlabhxdimyklpmwa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im tests/test_llm_messages.py: bafybeidur77uf5moysw2zfborvlpc24fytcncucwsh6gqt3dufj5sl7srq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/llm/serialization.py b/packages/valory/protocols/llm/serialization.py index 4231717e..8cc497f3 100644 --- a/packages/valory/protocols/llm/serialization.py +++ b/packages/valory/protocols/llm/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/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index 8346937a..0da37af1 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__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/twitter/dialogues.py b/packages/valory/protocols/twitter/dialogues.py index c893d5f6..65639d48 100644 --- a/packages/valory/protocols/twitter/dialogues.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -59,16 +38,20 @@ class TwitterDialogue(Dialogue): """The twitter dialogue class maintains state of a dialogue and manages it.""" INITIAL_PERFORMATIVES: FrozenSet[Message.Performative] = frozenset( - {TwitterMessage.Performative.REQUEST} + {TwitterMessage.Performative.CREATE_TWEET} ) TERMINAL_PERFORMATIVES: FrozenSet[Message.Performative] = frozenset( - {TwitterMessage.Performative.RESPONSE} + {TwitterMessage.Performative.TWEET_CREATED, TwitterMessage.Performative.ERROR} ) VALID_REPLIES: Dict[Message.Performative, FrozenSet[Message.Performative]] = { - TwitterMessage.Performative.REQUEST: frozenset( - {TwitterMessage.Performative.RESPONSE} + TwitterMessage.Performative.CREATE_TWEET: frozenset( + { + TwitterMessage.Performative.TWEET_CREATED, + TwitterMessage.Performative.ERROR, + } ), - TwitterMessage.Performative.RESPONSE: frozenset(), + TwitterMessage.Performative.ERROR: frozenset(), + TwitterMessage.Performative.TWEET_CREATED: frozenset(), } class Role(Dialogue.Role): diff --git a/packages/valory/protocols/twitter/message.py b/packages/valory/protocols/twitter/message.py index 32276d7b..dae49d75 100644 --- a/packages/valory/protocols/twitter/message.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -63,20 +42,22 @@ class TwitterMessage(Message): class Performative(Message.Performative): """Performatives for the twitter protocol.""" - REQUEST = "request" - RESPONSE = "response" + CREATE_TWEET = "create_tweet" + ERROR = "error" + TWEET_CREATED = "tweet_created" def __str__(self) -> str: """Get the string representation.""" return str(self.value) - _performatives = {"request", "response"} + _performatives = {"create_tweet", "error", "tweet_created"} __slots__: Tuple[str, ...] = tuple() class _SlotsCls: __slots__ = ( "data", "dialogue_reference", + "message", "message_id", "performative", "target", @@ -143,6 +124,12 @@ def data(self) -> str: enforce(self.is_set("data"), "'data' content is not set.") return cast(str, self.get("data")) + @property + def message(self) -> str: + """Get the 'message' content from the message.""" + enforce(self.is_set("message"), "'message' content is not set.") + return cast(str, self.get("message")) + @property def tweet_id(self) -> str: """Get the 'tweet_id' content from the message.""" @@ -195,7 +182,7 @@ def _is_consistent(self) -> bool: # Check correct contents actual_nb_of_contents = len(self._body) - DEFAULT_BODY_SIZE expected_nb_of_contents = 0 - if self.performative == TwitterMessage.Performative.REQUEST: + if self.performative == TwitterMessage.Performative.CREATE_TWEET: expected_nb_of_contents = 1 enforce( isinstance(self.data, str), @@ -203,7 +190,7 @@ def _is_consistent(self) -> bool: type(self.data) ), ) - elif self.performative == TwitterMessage.Performative.RESPONSE: + elif self.performative == TwitterMessage.Performative.TWEET_CREATED: expected_nb_of_contents = 1 enforce( isinstance(self.tweet_id, str), @@ -211,6 +198,14 @@ def _is_consistent(self) -> bool: type(self.tweet_id) ), ) + elif self.performative == TwitterMessage.Performative.ERROR: + expected_nb_of_contents = 1 + enforce( + isinstance(self.message, str), + "Invalid type for content 'message'. Expected 'str'. Found '{}'.".format( + type(self.message) + ), + ) # Check correct content count enforce( diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index a607d384..b301d0d9 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -8,14 +8,14 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeigsozugpnpasmqnymszbqlduboikq7ctgnetgn6brrm37aznlyh6e - __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um - dialogues.py: bafybeias63limtgev2htn4432mpus452rliqbdban46ij4na6or3rbjh2u - message.py: bafybeichmenrrnv2no7qakye7pllcg4bwn4tfw6hrlegd6susk2ubnntli - serialization.py: bafybeibc5gd5m2tmngtbbjqtlwyvxiqgat33kgpasik4fkkn3rwjgclp2a + __init__.py: bafybeigok4xqrjbpfwxti4jde4gmf2spo5po7lgl3o6ttjrfmv7g5tn42y + dialogues.py: bafybeifjnkd6ppnvj7yplsoyrf52nq7cgeragazhqhxmbntg7f7umy47aq + message.py: bafybeick5njcz555cojcywqvsljwv6u5ubyp5imukccjupvugbknpf5yz4 + serialization.py: bafybeibezaj62bhpgquqw7tpgd3fevzdphy5bpa7vydc4z5yeeavaxr4bq tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza - twitter.proto: bafybeihx4mk22qabkcbc2siysvi7vhiwvfo6dr67wk6ozrkwyoviowj5ty - twitter_pb2.py: bafybeigpnqeaux4odnrci6vintboc5qvukulhodv7i4oltznim6uanvgoy + twitter.proto: bafybeih25rayl3cnefwwxmbr6fjclhxkfwpx4pzjc6brc553zwtjgj7vxy + twitter_pb2.py: bafybeiblifabapyecyno4fevci4rmm2pr3lacdcsd2h5b4mydu3a54nkii fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/twitter/serialization.py b/packages/valory/protocols/twitter/serialization.py index 25f4543a..9fd2f70e 100644 --- a/packages/valory/protocols/twitter/serialization.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -75,16 +54,21 @@ def encode(msg: Message) -> bytes: dialogue_message_pb.target = msg.target performative_id = msg.performative - if performative_id == TwitterMessage.Performative.REQUEST: - performative = twitter_pb2.TwitterMessage.Request_Performative() # type: ignore + if performative_id == TwitterMessage.Performative.CREATE_TWEET: + performative = twitter_pb2.TwitterMessage.Create_Tweet_Performative() # type: ignore data = msg.data performative.data = data - twitter_msg.request.CopyFrom(performative) - elif performative_id == TwitterMessage.Performative.RESPONSE: - performative = twitter_pb2.TwitterMessage.Response_Performative() # type: ignore + twitter_msg.create_tweet.CopyFrom(performative) + elif performative_id == TwitterMessage.Performative.TWEET_CREATED: + performative = twitter_pb2.TwitterMessage.Tweet_Created_Performative() # type: ignore tweet_id = msg.tweet_id performative.tweet_id = tweet_id - twitter_msg.response.CopyFrom(performative) + twitter_msg.tweet_created.CopyFrom(performative) + elif performative_id == TwitterMessage.Performative.ERROR: + performative = twitter_pb2.TwitterMessage.Error_Performative() # type: ignore + message = msg.message + performative.message = message + twitter_msg.error.CopyFrom(performative) else: raise ValueError("Performative not valid: {}".format(performative_id)) @@ -116,12 +100,15 @@ def decode(obj: bytes) -> Message: performative = twitter_pb.WhichOneof("performative") performative_id = TwitterMessage.Performative(str(performative)) performative_content = dict() # type: Dict[str, Any] - if performative_id == TwitterMessage.Performative.REQUEST: - data = twitter_pb.request.data + if performative_id == TwitterMessage.Performative.CREATE_TWEET: + data = twitter_pb.create_tweet.data performative_content["data"] = data - elif performative_id == TwitterMessage.Performative.RESPONSE: - tweet_id = twitter_pb.response.tweet_id + elif performative_id == TwitterMessage.Performative.TWEET_CREATED: + tweet_id = twitter_pb.tweet_created.tweet_id performative_content["tweet_id"] = tweet_id + elif performative_id == TwitterMessage.Performative.ERROR: + message = twitter_pb.error.message + performative_content["message"] = message else: raise ValueError("Performative not valid: {}.".format(performative_id)) diff --git a/packages/valory/protocols/twitter/twitter.proto b/packages/valory/protocols/twitter/twitter.proto index ba23f017..1bc089ed 100644 --- a/packages/valory/protocols/twitter/twitter.proto +++ b/packages/valory/protocols/twitter/twitter.proto @@ -5,17 +5,22 @@ package aea.valory.twitter.v0_1_0; message TwitterMessage{ // Performatives and contents - message Request_Performative{ + message Create_Tweet_Performative{ string data = 1; } - message Response_Performative{ + message Tweet_Created_Performative{ string tweet_id = 1; } + message Error_Performative{ + string message = 1; + } + oneof performative{ - Request_Performative request = 5; - Response_Performative response = 6; + Create_Tweet_Performative create_tweet = 5; + Error_Performative error = 6; + Tweet_Created_Performative tweet_created = 7; } } diff --git a/packages/valory/protocols/twitter/twitter_pb2.py b/packages/valory/protocols/twitter/twitter_pb2.py index 8bf7a506..ad73e5bc 100644 --- a/packages/valory/protocols/twitter/twitter_pb2.py +++ b/packages/valory/protocols/twitter/twitter_pb2.py @@ -7,14 +7,13 @@ from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder - # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( - b'\n\rtwitter.proto\x12\x19\x61\x65\x61.valory.twitter.v0_1_0"\x99\x02\n\x0eTwitterMessage\x12Q\n\x07request\x18\x05 \x01(\x0b\x32>.aea.valory.twitter.v0_1_0.TwitterMessage.Request_PerformativeH\x00\x12S\n\x08response\x18\x06 \x01(\x0b\x32?.aea.valory.twitter.v0_1_0.TwitterMessage.Response_PerformativeH\x00\x1a$\n\x14Request_Performative\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\t\x1a)\n\x15Response_Performative\x12\x10\n\x08tweet_id\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' + b'\n\rtwitter.proto\x12\x19\x61\x65\x61.valory.twitter.v0_1_0"\xad\x03\n\x0eTwitterMessage\x12[\n\x0c\x63reate_tweet\x18\x05 \x01(\x0b\x32\x43.aea.valory.twitter.v0_1_0.TwitterMessage.Create_Tweet_PerformativeH\x00\x12M\n\x05\x65rror\x18\x06 \x01(\x0b\x32<.aea.valory.twitter.v0_1_0.TwitterMessage.Error_PerformativeH\x00\x12]\n\rtweet_created\x18\x07 \x01(\x0b\x32\x44.aea.valory.twitter.v0_1_0.TwitterMessage.Tweet_Created_PerformativeH\x00\x1a)\n\x19\x43reate_Tweet_Performative\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\t\x1a.\n\x1aTweet_Created_Performative\x12\x10\n\x08tweet_id\x18\x01 \x01(\t\x1a%\n\x12\x45rror_Performative\x12\x0f\n\x07message\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' ) _globals = globals() @@ -23,9 +22,11 @@ if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None _globals["_TWITTERMESSAGE"]._serialized_start = 45 - _globals["_TWITTERMESSAGE"]._serialized_end = 326 - _globals["_TWITTERMESSAGE_REQUEST_PERFORMATIVE"]._serialized_start = 231 - _globals["_TWITTERMESSAGE_REQUEST_PERFORMATIVE"]._serialized_end = 267 - _globals["_TWITTERMESSAGE_RESPONSE_PERFORMATIVE"]._serialized_start = 269 - _globals["_TWITTERMESSAGE_RESPONSE_PERFORMATIVE"]._serialized_end = 310 + _globals["_TWITTERMESSAGE"]._serialized_end = 474 + _globals["_TWITTERMESSAGE_CREATE_TWEET_PERFORMATIVE"]._serialized_start = 330 + _globals["_TWITTERMESSAGE_CREATE_TWEET_PERFORMATIVE"]._serialized_end = 371 + _globals["_TWITTERMESSAGE_TWEET_CREATED_PERFORMATIVE"]._serialized_start = 373 + _globals["_TWITTERMESSAGE_TWEET_CREATED_PERFORMATIVE"]._serialized_end = 419 + _globals["_TWITTERMESSAGE_ERROR_PERFORMATIVE"]._serialized_start = 421 + _globals["_TWITTERMESSAGE_ERROR_PERFORMATIVE"]._serialized_end = 458 # @@protoc_insertion_point(module_scope) From 8c21acd617fee0031b242245e135162dccbe00c9 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:15:52 +0200 Subject: [PATCH 22/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 24 +++++++++---------- .../agents/impact_evaluator/aea-config.yaml | 18 +++++++------- .../valory/connections/openai/connection.yaml | 2 +- .../connections/twitter/connection.yaml | 2 +- packages/valory/protocols/llm/__init__.py | 21 ++++++++++++++++ packages/valory/protocols/llm/dialogues.py | 21 ++++++++++++++++ packages/valory/protocols/llm/message.py | 21 ++++++++++++++++ packages/valory/protocols/llm/protocol.yaml | 8 +++---- .../valory/protocols/llm/serialization.py | 21 ++++++++++++++++ packages/valory/protocols/twitter/__init__.py | 21 ++++++++++++++++ .../valory/protocols/twitter/dialogues.py | 21 ++++++++++++++++ packages/valory/protocols/twitter/message.py | 21 ++++++++++++++++ .../valory/protocols/twitter/protocol.yaml | 8 +++---- .../valory/protocols/twitter/serialization.py | 21 ++++++++++++++++ .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/impact_evaluator_abci/skill.yaml | 8 +++---- packages/valory/skills/llm_abci/skill.yaml | 4 ++-- .../valory/skills/olas_week_abci/skill.yaml | 4 ++-- .../skills/twitter_scoring_abci/skill.yaml | 4 ++-- .../skills/twitter_write_abci/skill.yaml | 4 ++-- 22 files changed, 214 insertions(+), 46 deletions(-) diff --git a/docs/index.md b/docs/index.md index 101df7c8..0e8d0d94 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeielhh7o4fz3rjh6cmmw3cdc63ktafa3xpdem66r4sa4ixfur5l5yu --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeigzj5cbx5sjvggeg6mvfckbaqfutt5dd6o4xgnhgm2xdm6zke2zhi --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 8cd6767a..320f49b2 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeicb3bv44c7trgqge7yslp3thry4jb5dloalckiefolbyq2njqgzeq", + "agent/valory/impact_evaluator/0.1.0": "bafybeievmul7aegu77hdsx5p5wqbhwjky66wi3enxesaedem5cgjswal3a", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeielhh7o4fz3rjh6cmmw3cdc63ktafa3xpdem66r4sa4ixfur5l5yu", + "service/valory/impact_evaluator/0.1.0": "bafybeigzj5cbx5sjvggeg6mvfckbaqfutt5dd6o4xgnhgm2xdm6zke2zhi", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeidyluxwb6jeh3sytq5irnafj3auhw5rpjyhhcwcghxx3s6tactrdq", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiguzqhull2ylmcw7z37jx7j4oc5xt4374d5pmmeg3dqh3ezqsilse", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa", - "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", - "connection/valory/twitter/0.1.0": "bafybeihix5btuggisozge2esrqwvfdc26qrc5ygky3qx6zdmtdhhot4554", - "connection/valory/openai/0.1.0": "bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q", - "skill/valory/twitter_write_abci/0.1.0": "bafybeickj4hrp4wxbhiqjsuqd7a2lb6k3yspf5kzhsdzox3y253jo4nw74", - "skill/valory/llm_abci/0.1.0": "bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu", + "protocol/valory/twitter/0.1.0": "bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe", + "protocol/valory/llm/1.0.0": "bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba", + "connection/valory/twitter/0.1.0": "bafybeiclak2bgeriauxl4c6m55dlb6azgxxgqvfcipgkersh4ylwmmnyfa", + "connection/valory/openai/0.1.0": "bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm", + "skill/valory/twitter_write_abci/0.1.0": "bafybeigjhiig2xyoaqyu233ptvt37hvsvgui66gcgsjwuzla73zgl62ehm", + "skill/valory/llm_abci/0.1.0": "bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeib6i4dryddxxdrpa2ryb4ggfbhgj2ijyjllkynek5ex6qxr7c5u6m", - "skill/valory/olas_week_abci/0.1.0": "bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru" + "service/valory/impact_evaluator_local/0.1.0": "bafybeiesxyllsxnsdzsx4zyblt7mnamor54w25gdp3caoqsvfbmnkubur4", + "skill/valory/olas_week_abci/0.1.0": "bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 7c5fd257..95e76154 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -20,8 +20,8 @@ connections: - valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q -- valory/twitter:0.1.0:bafybeihix5btuggisozge2esrqwvfdc26qrc5ygky3qx6zdmtdhhot4554 +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/twitter:0.1.0:bafybeiclak2bgeriauxl4c6m55dlb6azgxxgqvfcipgkersh4ylwmmnyfa contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -36,15 +36,15 @@ protocols: - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru -- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa +- valory/twitter:0.1.0:bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeidyluxwb6jeh3sytq5irnafj3auhw5rpjyhhcwcghxx3s6tactrdq +- valory/impact_evaluator_abci:0.1.0:bafybeiguzqhull2ylmcw7z37jx7j4oc5xt4374d5pmmeg3dqh3ezqsilse - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe +- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena - valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq @@ -52,10 +52,10 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeickj4hrp4wxbhiqjsuqd7a2lb6k3yspf5kzhsdzox3y253jo4nw74 +- valory/twitter_write_abci:0.1.0:bafybeigjhiig2xyoaqyu233ptvt37hvsvgui66gcgsjwuzla73zgl62ehm - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu -- valory/olas_week_abci:0.1.0:bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru +- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi +- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index 3ef81b4d..a501b75b 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba class_name: OpenaiConnection config: engine: text-davinci-003 diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index febf9a14..747f4a97 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa +- valory/twitter:0.1.0:bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 83565f19..845b47fe 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__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/llm/dialogues.py b/packages/valory/protocols/llm/dialogues.py index 643dd397..2b7e0967 100644 --- a/packages/valory/protocols/llm/dialogues.py +++ b/packages/valory/protocols/llm/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/llm/message.py b/packages/valory/protocols/llm/message.py index 16618c75..6fd162f4 100644 --- a/packages/valory/protocols/llm/message.py +++ b/packages/valory/protocols/llm/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/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 54314889..6df89420 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeiauadqjlhqmauczfl4ljcdcs6imvg3kc4nbaobb5nrmgh5qqvyq5i - dialogues.py: bafybeict3p7xmn2r2mur3iep54fmbosvsrp4mk4l6ad4hzc7ywwl3c4ale + __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m + dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e - message.py: bafybeiayhrzk2l4fsacw5c2eu57yods5ey7yicx2ugvrz5yedjxmakrvbm - serialization.py: bafybeideqcjtagyhzrblxnq42ulyqqnjsex7r4n47cvlabhxdimyklpmwa + message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 + serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im tests/test_llm_messages.py: bafybeidur77uf5moysw2zfborvlpc24fytcncucwsh6gqt3dufj5sl7srq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/llm/serialization.py b/packages/valory/protocols/llm/serialization.py index 8cc497f3..4231717e 100644 --- a/packages/valory/protocols/llm/serialization.py +++ b/packages/valory/protocols/llm/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/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index 0da37af1..8346937a 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__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/twitter/dialogues.py b/packages/valory/protocols/twitter/dialogues.py index 65639d48..a156857f 100644 --- a/packages/valory/protocols/twitter/dialogues.py +++ b/packages/valory/protocols/twitter/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/twitter/message.py b/packages/valory/protocols/twitter/message.py index dae49d75..cbfe478b 100644 --- a/packages/valory/protocols/twitter/message.py +++ b/packages/valory/protocols/twitter/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/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index b301d0d9..684f11e5 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -8,10 +8,10 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeigsozugpnpasmqnymszbqlduboikq7ctgnetgn6brrm37aznlyh6e - __init__.py: bafybeigok4xqrjbpfwxti4jde4gmf2spo5po7lgl3o6ttjrfmv7g5tn42y - dialogues.py: bafybeifjnkd6ppnvj7yplsoyrf52nq7cgeragazhqhxmbntg7f7umy47aq - message.py: bafybeick5njcz555cojcywqvsljwv6u5ubyp5imukccjupvugbknpf5yz4 - serialization.py: bafybeibezaj62bhpgquqw7tpgd3fevzdphy5bpa7vydc4z5yeeavaxr4bq + __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um + dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u + message.py: bafybeig7mnnmlkqgmapixwqdoc7jcxo5vnjcsb3a6usalj2ah33l5xbrlu + serialization.py: bafybeihsltjsvgackkujmarb64i2jyq4kqt2ot462j2pxuk6wcghvfmrem tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza twitter.proto: bafybeih25rayl3cnefwwxmbr6fjclhxkfwpx4pzjc6brc553zwtjgj7vxy diff --git a/packages/valory/protocols/twitter/serialization.py b/packages/valory/protocols/twitter/serialization.py index 9fd2f70e..f20c1405 100644 --- a/packages/valory/protocols/twitter/serialization.py +++ b/packages/valory/protocols/twitter/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/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 5d9b14ab..e2eb926c 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeicb3bv44c7trgqge7yslp3thry4jb5dloalckiefolbyq2njqgzeq +agent: valory/impact_evaluator:0.1.0:bafybeievmul7aegu77hdsx5p5wqbhwjky66wi3enxesaedem5cgjswal3a number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 58555c88..c14ecdab 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeicb3bv44c7trgqge7yslp3thry4jb5dloalckiefolbyq2njqgzeq +agent: valory/impact_evaluator:0.1.0:bafybeievmul7aegu77hdsx5p5wqbhwjky66wi3enxesaedem5cgjswal3a number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 5a0a4654..68cde5a4 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -26,7 +26,7 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeie33kcqtdo5tj2n4snvi2u6lrolpbrevqi72vo237hqu3ht72aqfe +- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa - valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena - valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm @@ -34,9 +34,9 @@ skills: - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeibbwyoqkduqxemzhqb43m7lywxckynqeppal7v377wtiykjh5y7vu -- valory/twitter_write_abci:0.1.0:bafybeickj4hrp4wxbhiqjsuqd7a2lb6k3yspf5kzhsdzox3y253jo4nw74 -- valory/olas_week_abci:0.1.0:bafybeid3ui7qyk22rkjit4n5w76b7kaugcrtcsulz5b5zzchg44k7evhru +- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi +- valory/twitter_write_abci:0.1.0:bafybeigjhiig2xyoaqyu233ptvt37hvsvgui66gcgsjwuzla73zgl62ehm +- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index 61b9dccc..0d800c65 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,10 +23,10 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm contracts: [] protocols: -- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index e1492839..cb392ef7 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,10 +19,10 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm contracts: [] protocols: -- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index c0aded98..e2636e1e 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,10 +27,10 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeie5ofc3il66jjnqdessdyfa62lsms2ynlxndmv3plak2vbrs7wo3q +- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm contracts: [] protocols: -- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 +- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index a651740e..ae660a45 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeihix5btuggisozge2esrqwvfdc26qrc5ygky3qx6zdmtdhhot4554 +- valory/twitter:0.1.0:bafybeiclak2bgeriauxl4c6m55dlb6azgxxgqvfcipgkersh4ylwmmnyfa contracts: [] protocols: -- valory/twitter:0.1.0:bafybeigyb37k55jhemr5f5difmpvc45qgqfzgdfswoqt2enseffo5bxapa +- valory/twitter:0.1.0:bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From db25d0baff554cae735f273e0eacd82e1cf8b50f Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:22:15 +0200 Subject: [PATCH 23/30] fix: protocol --- packages/valory/protocols/twitter/README.md | 2 +- packages/valory/skills/twitter_write_abci/behaviours.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/valory/protocols/twitter/README.md b/packages/valory/protocols/twitter/README.md index 26e2dd9f..a28fc256 100644 --- a/packages/valory/protocols/twitter/README.md +++ b/packages/valory/protocols/twitter/README.md @@ -17,7 +17,7 @@ aea_version: '>=1.0.0, <2.0.0' protocol_specification_id: valory/twitter:0.1.0 speech_acts: create_tweet: - data: pt:str + text: pt:str tweet_created: tweet_id: pt:str error: diff --git a/packages/valory/skills/twitter_write_abci/behaviours.py b/packages/valory/skills/twitter_write_abci/behaviours.py index 0ecdcbe9..b6c58799 100644 --- a/packages/valory/skills/twitter_write_abci/behaviours.py +++ b/packages/valory/skills/twitter_write_abci/behaviours.py @@ -120,7 +120,7 @@ def _tweet(self) -> Generator: data = self.synchronized_data.write_data[write_index] text = data["text"] credentials = data["credentials"] - self.context.logger.info(f"Creating post with text:{text}") + self.context.logger.info(f"Creating post with text: {text}") response = yield from self._create_tweet(text=text, credentials=credentials) if response.performative == TwitterMessage.Performative.ERROR: self.context.logger.error( From 1482e48f97a10f507daebc295ed61b2b3dc2bee5 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:22:42 +0200 Subject: [PATCH 24/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 14 +++++++------- .../valory/agents/impact_evaluator/aea-config.yaml | 8 ++++---- .../valory/connections/twitter/connection.yaml | 2 +- packages/valory/protocols/twitter/protocol.yaml | 2 +- .../valory/services/impact_evaluator/service.yaml | 2 +- .../services/impact_evaluator_local/service.yaml | 2 +- .../valory/skills/impact_evaluator_abci/skill.yaml | 2 +- .../valory/skills/twitter_write_abci/skill.yaml | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/index.md b/docs/index.md index 0e8d0d94..fda53edd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeigzj5cbx5sjvggeg6mvfckbaqfutt5dd6o4xgnhgm2xdm6zke2zhi --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeiglyg7h6imuulnacvz4if7hlcohllw7iwytq6ozal7hkse42wrbhq --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 320f49b2..60684b90 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,22 +1,22 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeievmul7aegu77hdsx5p5wqbhwjky66wi3enxesaedem5cgjswal3a", + "agent/valory/impact_evaluator/0.1.0": "bafybeige6yr5fbgxdlk6pfwx23shfbv7sb3bnnnln5pzo26aupmv7ib7ri", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeigzj5cbx5sjvggeg6mvfckbaqfutt5dd6o4xgnhgm2xdm6zke2zhi", + "service/valory/impact_evaluator/0.1.0": "bafybeiglyg7h6imuulnacvz4if7hlcohllw7iwytq6ozal7hkse42wrbhq", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeiguzqhull2ylmcw7z37jx7j4oc5xt4374d5pmmeg3dqh3ezqsilse", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeifh7ssdv7wwkioarrk7hkxokr5cxpuj75xk2iea4v3lck24lg2kbq", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe", + "protocol/valory/twitter/0.1.0": "bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a", "protocol/valory/llm/1.0.0": "bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba", - "connection/valory/twitter/0.1.0": "bafybeiclak2bgeriauxl4c6m55dlb6azgxxgqvfcipgkersh4ylwmmnyfa", + "connection/valory/twitter/0.1.0": "bafybeif3rpo4sjc2nvn5yizuf36yqlmxxofkyug7japovdpwctpjeyjlfe", "connection/valory/openai/0.1.0": "bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm", - "skill/valory/twitter_write_abci/0.1.0": "bafybeigjhiig2xyoaqyu233ptvt37hvsvgui66gcgsjwuzla73zgl62ehm", + "skill/valory/twitter_write_abci/0.1.0": "bafybeigocmiyj2btktlqsn72ezs4qfudouno4qk2gsoldl6jyujx2gr5ry", "skill/valory/llm_abci/0.1.0": "bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeiesxyllsxnsdzsx4zyblt7mnamor54w25gdp3caoqsvfbmnkubur4", + "service/valory/impact_evaluator_local/0.1.0": "bafybeiftbompnobtxjgrq2k2xv5weeqrgizdsfhd5mxvialmjj5yesmm6i", "skill/valory/olas_week_abci/0.1.0": "bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y" }, "third_party": { diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 95e76154..04255cc0 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -21,7 +21,7 @@ connections: - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq - valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm -- valory/twitter:0.1.0:bafybeiclak2bgeriauxl4c6m55dlb6azgxxgqvfcipgkersh4ylwmmnyfa +- valory/twitter:0.1.0:bafybeif3rpo4sjc2nvn5yizuf36yqlmxxofkyug7japovdpwctpjeyjlfe contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -38,11 +38,11 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe +- valory/twitter:0.1.0:bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeiguzqhull2ylmcw7z37jx7j4oc5xt4374d5pmmeg3dqh3ezqsilse +- valory/impact_evaluator_abci:0.1.0:bafybeifh7ssdv7wwkioarrk7hkxokr5cxpuj75xk2iea4v3lck24lg2kbq - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 - valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m @@ -52,7 +52,7 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeigjhiig2xyoaqyu233ptvt37hvsvgui66gcgsjwuzla73zgl62ehm +- valory/twitter_write_abci:0.1.0:bafybeigocmiyj2btktlqsn72ezs4qfudouno4qk2gsoldl6jyujx2gr5ry - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi - valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index 747f4a97..abc10c86 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe +- valory/twitter:0.1.0:bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 684f11e5..94165833 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -7,7 +7,7 @@ description: A protocol for interacting with Twitter. license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: - README.md: bafybeigsozugpnpasmqnymszbqlduboikq7ctgnetgn6brrm37aznlyh6e + README.md: bafybeiaagbdeh4zropm6fcvorzv3ca4k6vfu7ya4wicesm4j2qtkoqada4 __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u message.py: bafybeig7mnnmlkqgmapixwqdoc7jcxo5vnjcsb3a6usalj2ah33l5xbrlu diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index e2eb926c..22b41775 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeievmul7aegu77hdsx5p5wqbhwjky66wi3enxesaedem5cgjswal3a +agent: valory/impact_evaluator:0.1.0:bafybeige6yr5fbgxdlk6pfwx23shfbv7sb3bnnnln5pzo26aupmv7ib7ri number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index c14ecdab..119dd3c5 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeievmul7aegu77hdsx5p5wqbhwjky66wi3enxesaedem5cgjswal3a +agent: valory/impact_evaluator:0.1.0:bafybeige6yr5fbgxdlk6pfwx23shfbv7sb3bnnnln5pzo26aupmv7ib7ri number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 68cde5a4..39f5735c 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -35,7 +35,7 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi -- valory/twitter_write_abci:0.1.0:bafybeigjhiig2xyoaqyu233ptvt37hvsvgui66gcgsjwuzla73zgl62ehm +- valory/twitter_write_abci:0.1.0:bafybeigocmiyj2btktlqsn72ezs4qfudouno4qk2gsoldl6jyujx2gr5ry - valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y behaviours: main: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index ae660a45..a45fd355 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeifmfivpoooso45mltpffcv3vvonhrtycv443aqpzm6cetrkwopsdi - behaviours.py: bafybeid377rzt47onp6ra76wpzv7ma6cvvqhysk67dvvxkwwc4yrpspwga + behaviours.py: bafybeie4m65fzhaltzmf62eyhcdy77vsrvdovgtajmvkupk3lkiuk2oxzq dialogues.py: bafybeicbuuhc6u3oih6yeziqs7dqi2tebmahdgpc6sd5fzgqyjek6qhwty fsm_specification.yaml: bafybeif77zpgvvwjxxpeakzbi5ftsjejlsryeyjhkzddpvqkcq6wrxzufy handlers.py: bafybeibofqqb5dvfugwjzuwmm5ktcumwzdak43uyfvythrdrfhk7wcacne @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeiclak2bgeriauxl4c6m55dlb6azgxxgqvfcipgkersh4ylwmmnyfa +- valory/twitter:0.1.0:bafybeif3rpo4sjc2nvn5yizuf36yqlmxxofkyug7japovdpwctpjeyjlfe contracts: [] protocols: -- valory/twitter:0.1.0:bafybeiacv3yy63otf3m2ebgns7e3c5zexz7fqs52mtsguwb6uuhf7spjfe +- valory/twitter:0.1.0:bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From 5598ca2990b0d28aa75ac5c26671ad2ce54ceef2 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:23:48 +0200 Subject: [PATCH 25/30] fix: generate protocols --- packages/valory/protocols/llm/__init__.py | 21 ---------- packages/valory/protocols/llm/dialogues.py | 21 ---------- packages/valory/protocols/llm/message.py | 21 ---------- packages/valory/protocols/llm/protocol.yaml | 8 ++-- .../valory/protocols/llm/serialization.py | 21 ---------- packages/valory/protocols/twitter/__init__.py | 21 ---------- .../valory/protocols/twitter/dialogues.py | 21 ---------- packages/valory/protocols/twitter/message.py | 41 +++++-------------- .../valory/protocols/twitter/protocol.yaml | 12 +++--- .../valory/protocols/twitter/serialization.py | 29 ++----------- .../valory/protocols/twitter/twitter.proto | 2 +- .../valory/protocols/twitter/twitter_pb2.py | 2 +- 12 files changed, 26 insertions(+), 194 deletions(-) diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 845b47fe..83565f19 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__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/llm/dialogues.py b/packages/valory/protocols/llm/dialogues.py index 2b7e0967..643dd397 100644 --- a/packages/valory/protocols/llm/dialogues.py +++ b/packages/valory/protocols/llm/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/llm/message.py b/packages/valory/protocols/llm/message.py index 6fd162f4..16618c75 100644 --- a/packages/valory/protocols/llm/message.py +++ b/packages/valory/protocols/llm/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/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 6df89420..54314889 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m - dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 + __init__.py: bafybeiauadqjlhqmauczfl4ljcdcs6imvg3kc4nbaobb5nrmgh5qqvyq5i + dialogues.py: bafybeict3p7xmn2r2mur3iep54fmbosvsrp4mk4l6ad4hzc7ywwl3c4ale llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e - message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 - serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa + message.py: bafybeiayhrzk2l4fsacw5c2eu57yods5ey7yicx2ugvrz5yedjxmakrvbm + serialization.py: bafybeideqcjtagyhzrblxnq42ulyqqnjsex7r4n47cvlabhxdimyklpmwa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im tests/test_llm_messages.py: bafybeidur77uf5moysw2zfborvlpc24fytcncucwsh6gqt3dufj5sl7srq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/llm/serialization.py b/packages/valory/protocols/llm/serialization.py index 4231717e..8cc497f3 100644 --- a/packages/valory/protocols/llm/serialization.py +++ b/packages/valory/protocols/llm/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/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index 8346937a..0da37af1 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__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/twitter/dialogues.py b/packages/valory/protocols/twitter/dialogues.py index a156857f..65639d48 100644 --- a/packages/valory/protocols/twitter/dialogues.py +++ b/packages/valory/protocols/twitter/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/twitter/message.py b/packages/valory/protocols/twitter/message.py index cbfe478b..58f38993 100644 --- a/packages/valory/protocols/twitter/message.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -76,12 +55,12 @@ def __str__(self) -> str: class _SlotsCls: __slots__ = ( - "data", "dialogue_reference", "message", "message_id", "performative", "target", + "text", "tweet_id", ) @@ -139,18 +118,18 @@ def target(self) -> int: enforce(self.is_set("target"), "target is not set.") return cast(int, self.get("target")) - @property - def data(self) -> str: - """Get the 'data' content from the message.""" - enforce(self.is_set("data"), "'data' content is not set.") - return cast(str, self.get("data")) - @property def message(self) -> str: """Get the 'message' content from the message.""" enforce(self.is_set("message"), "'message' content is not set.") return cast(str, self.get("message")) + @property + def text(self) -> str: + """Get the 'text' content from the message.""" + enforce(self.is_set("text"), "'text' content is not set.") + return cast(str, self.get("text")) + @property def tweet_id(self) -> str: """Get the 'tweet_id' content from the message.""" @@ -206,9 +185,9 @@ def _is_consistent(self) -> bool: if self.performative == TwitterMessage.Performative.CREATE_TWEET: expected_nb_of_contents = 1 enforce( - isinstance(self.data, str), - "Invalid type for content 'data'. Expected 'str'. Found '{}'.".format( - type(self.data) + isinstance(self.text, str), + "Invalid type for content 'text'. Expected 'str'. Found '{}'.".format( + type(self.text) ), ) elif self.performative == TwitterMessage.Performative.TWEET_CREATED: diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 94165833..1ce93cf8 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -8,14 +8,14 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiaagbdeh4zropm6fcvorzv3ca4k6vfu7ya4wicesm4j2qtkoqada4 - __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um - dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u - message.py: bafybeig7mnnmlkqgmapixwqdoc7jcxo5vnjcsb3a6usalj2ah33l5xbrlu - serialization.py: bafybeihsltjsvgackkujmarb64i2jyq4kqt2ot462j2pxuk6wcghvfmrem + __init__.py: bafybeigok4xqrjbpfwxti4jde4gmf2spo5po7lgl3o6ttjrfmv7g5tn42y + dialogues.py: bafybeifjnkd6ppnvj7yplsoyrf52nq7cgeragazhqhxmbntg7f7umy47aq + message.py: bafybeiel4dhpyudf6iznygzlbg6iqqnkygbqogp5j3acgxf3yfer6x56iy + serialization.py: bafybeifu5nagpxnbk4bmdmibxawqfti4havii7f3fx2jpizs2ct76aw3n4 tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza - twitter.proto: bafybeih25rayl3cnefwwxmbr6fjclhxkfwpx4pzjc6brc553zwtjgj7vxy - twitter_pb2.py: bafybeiblifabapyecyno4fevci4rmm2pr3lacdcsd2h5b4mydu3a54nkii + twitter.proto: bafybeieaepg4kzjpzkbhg7amwfjmk77esizsjedkr524m6pd2cqfzykbgm + twitter_pb2.py: bafybeifmntf6p6lhlxxpl73f7yvswpulmfnmisehkdsdv6e5bsga3mc3gq fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/twitter/serialization.py b/packages/valory/protocols/twitter/serialization.py index f20c1405..d06cb7c6 100644 --- a/packages/valory/protocols/twitter/serialization.py +++ b/packages/valory/protocols/twitter/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 -*- # ------------------------------------------------------------------------------ # @@ -77,8 +56,8 @@ def encode(msg: Message) -> bytes: performative_id = msg.performative if performative_id == TwitterMessage.Performative.CREATE_TWEET: performative = twitter_pb2.TwitterMessage.Create_Tweet_Performative() # type: ignore - data = msg.data - performative.data = data + text = msg.text + performative.text = text twitter_msg.create_tweet.CopyFrom(performative) elif performative_id == TwitterMessage.Performative.TWEET_CREATED: performative = twitter_pb2.TwitterMessage.Tweet_Created_Performative() # type: ignore @@ -122,8 +101,8 @@ def decode(obj: bytes) -> Message: performative_id = TwitterMessage.Performative(str(performative)) performative_content = dict() # type: Dict[str, Any] if performative_id == TwitterMessage.Performative.CREATE_TWEET: - data = twitter_pb.create_tweet.data - performative_content["data"] = data + text = twitter_pb.create_tweet.text + performative_content["text"] = text elif performative_id == TwitterMessage.Performative.TWEET_CREATED: tweet_id = twitter_pb.tweet_created.tweet_id performative_content["tweet_id"] = tweet_id diff --git a/packages/valory/protocols/twitter/twitter.proto b/packages/valory/protocols/twitter/twitter.proto index 1bc089ed..29758282 100644 --- a/packages/valory/protocols/twitter/twitter.proto +++ b/packages/valory/protocols/twitter/twitter.proto @@ -6,7 +6,7 @@ message TwitterMessage{ // Performatives and contents message Create_Tweet_Performative{ - string data = 1; + string text = 1; } message Tweet_Created_Performative{ diff --git a/packages/valory/protocols/twitter/twitter_pb2.py b/packages/valory/protocols/twitter/twitter_pb2.py index ad73e5bc..1e11894d 100644 --- a/packages/valory/protocols/twitter/twitter_pb2.py +++ b/packages/valory/protocols/twitter/twitter_pb2.py @@ -13,7 +13,7 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile( - b'\n\rtwitter.proto\x12\x19\x61\x65\x61.valory.twitter.v0_1_0"\xad\x03\n\x0eTwitterMessage\x12[\n\x0c\x63reate_tweet\x18\x05 \x01(\x0b\x32\x43.aea.valory.twitter.v0_1_0.TwitterMessage.Create_Tweet_PerformativeH\x00\x12M\n\x05\x65rror\x18\x06 \x01(\x0b\x32<.aea.valory.twitter.v0_1_0.TwitterMessage.Error_PerformativeH\x00\x12]\n\rtweet_created\x18\x07 \x01(\x0b\x32\x44.aea.valory.twitter.v0_1_0.TwitterMessage.Tweet_Created_PerformativeH\x00\x1a)\n\x19\x43reate_Tweet_Performative\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\t\x1a.\n\x1aTweet_Created_Performative\x12\x10\n\x08tweet_id\x18\x01 \x01(\t\x1a%\n\x12\x45rror_Performative\x12\x0f\n\x07message\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' + b'\n\rtwitter.proto\x12\x19\x61\x65\x61.valory.twitter.v0_1_0"\xad\x03\n\x0eTwitterMessage\x12[\n\x0c\x63reate_tweet\x18\x05 \x01(\x0b\x32\x43.aea.valory.twitter.v0_1_0.TwitterMessage.Create_Tweet_PerformativeH\x00\x12M\n\x05\x65rror\x18\x06 \x01(\x0b\x32<.aea.valory.twitter.v0_1_0.TwitterMessage.Error_PerformativeH\x00\x12]\n\rtweet_created\x18\x07 \x01(\x0b\x32\x44.aea.valory.twitter.v0_1_0.TwitterMessage.Tweet_Created_PerformativeH\x00\x1a)\n\x19\x43reate_Tweet_Performative\x12\x0c\n\x04text\x18\x01 \x01(\t\x1a.\n\x1aTweet_Created_Performative\x12\x10\n\x08tweet_id\x18\x01 \x01(\t\x1a%\n\x12\x45rror_Performative\x12\x0f\n\x07message\x18\x01 \x01(\tB\x0e\n\x0cperformativeb\x06proto3' ) _globals = globals() From 2817919387d55d0b1d297f1306bf7b105a7e30a4 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:24:21 +0200 Subject: [PATCH 26/30] fix: generators --- docs/index.md | 2 +- packages/packages.json | 14 ++++++------- .../agents/impact_evaluator/aea-config.yaml | 8 +++---- .../connections/twitter/connection.yaml | 2 +- packages/valory/protocols/llm/__init__.py | 21 +++++++++++++++++++ packages/valory/protocols/llm/dialogues.py | 21 +++++++++++++++++++ packages/valory/protocols/llm/message.py | 21 +++++++++++++++++++ packages/valory/protocols/llm/protocol.yaml | 8 +++---- .../valory/protocols/llm/serialization.py | 21 +++++++++++++++++++ packages/valory/protocols/twitter/__init__.py | 21 +++++++++++++++++++ .../valory/protocols/twitter/dialogues.py | 21 +++++++++++++++++++ packages/valory/protocols/twitter/message.py | 21 +++++++++++++++++++ .../valory/protocols/twitter/protocol.yaml | 8 +++---- .../valory/protocols/twitter/serialization.py | 21 +++++++++++++++++++ .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/impact_evaluator_abci/skill.yaml | 2 +- .../skills/twitter_write_abci/skill.yaml | 4 ++-- 18 files changed, 194 insertions(+), 26 deletions(-) diff --git a/docs/index.md b/docs/index.md index fda53edd..091b80c0 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeiglyg7h6imuulnacvz4if7hlcohllw7iwytq6ozal7hkse42wrbhq --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeifv7xipn7vft5xvrlnnhfblvr2jvk7s76i3zd57d5yzeaosjjibhu --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 60684b90..2492e725 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,22 +1,22 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeige6yr5fbgxdlk6pfwx23shfbv7sb3bnnnln5pzo26aupmv7ib7ri", + "agent/valory/impact_evaluator/0.1.0": "bafybeif7uwl3crzxwaxqepyzpgchm36ewdz2ned5bbk77lufaxun5txadq", "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeiglyg7h6imuulnacvz4if7hlcohllw7iwytq6ozal7hkse42wrbhq", + "service/valory/impact_evaluator/0.1.0": "bafybeifv7xipn7vft5xvrlnnhfblvr2jvk7s76i3zd57d5yzeaosjjibhu", "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa", "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeifh7ssdv7wwkioarrk7hkxokr5cxpuj75xk2iea4v3lck24lg2kbq", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeifp7n7dqq2nc5g4yrx4dwteinebrwxk56grkf4ibgx327pamcl7w4", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a", + "protocol/valory/twitter/0.1.0": "bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm", "protocol/valory/llm/1.0.0": "bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba", - "connection/valory/twitter/0.1.0": "bafybeif3rpo4sjc2nvn5yizuf36yqlmxxofkyug7japovdpwctpjeyjlfe", + "connection/valory/twitter/0.1.0": "bafybeiajxsodecy5rmozsfvgwea2tiuvnamulplcycpehyewtwxwnntgea", "connection/valory/openai/0.1.0": "bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm", - "skill/valory/twitter_write_abci/0.1.0": "bafybeigocmiyj2btktlqsn72ezs4qfudouno4qk2gsoldl6jyujx2gr5ry", + "skill/valory/twitter_write_abci/0.1.0": "bafybeibyisgkohdrzkj6rej3j3b3qsubntwx3vjowxjp6hqiy5s4dfppzi", "skill/valory/llm_abci/0.1.0": "bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeiftbompnobtxjgrq2k2xv5weeqrgizdsfhd5mxvialmjj5yesmm6i", + "service/valory/impact_evaluator_local/0.1.0": "bafybeif3bmgo3npffuey34s4jvqak6uke3d23hczn2v5opkecxi6uzfxku", "skill/valory/olas_week_abci/0.1.0": "bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y" }, "third_party": { diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 04255cc0..2e804e1d 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -21,7 +21,7 @@ connections: - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq - valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm -- valory/twitter:0.1.0:bafybeif3rpo4sjc2nvn5yizuf36yqlmxxofkyug7japovdpwctpjeyjlfe +- valory/twitter:0.1.0:bafybeiajxsodecy5rmozsfvgwea2tiuvnamulplcycpehyewtwxwnntgea contracts: - valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci @@ -38,11 +38,11 @@ protocols: - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru - valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a +- valory/twitter:0.1.0:bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeifh7ssdv7wwkioarrk7hkxokr5cxpuj75xk2iea4v3lck24lg2kbq +- valory/impact_evaluator_abci:0.1.0:bafybeifp7n7dqq2nc5g4yrx4dwteinebrwxk56grkf4ibgx327pamcl7w4 - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 - valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa - valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m @@ -52,7 +52,7 @@ skills: - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeigocmiyj2btktlqsn72ezs4qfudouno4qk2gsoldl6jyujx2gr5ry +- valory/twitter_write_abci:0.1.0:bafybeibyisgkohdrzkj6rej3j3b3qsubntwx3vjowxjp6hqiy5s4dfppzi - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi - valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index abc10c86..9f06dd12 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -12,7 +12,7 @@ fingerprint: fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a +- valory/twitter:0.1.0:bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/protocols/llm/__init__.py b/packages/valory/protocols/llm/__init__.py index 83565f19..845b47fe 100644 --- a/packages/valory/protocols/llm/__init__.py +++ b/packages/valory/protocols/llm/__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/llm/dialogues.py b/packages/valory/protocols/llm/dialogues.py index 643dd397..2b7e0967 100644 --- a/packages/valory/protocols/llm/dialogues.py +++ b/packages/valory/protocols/llm/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/llm/message.py b/packages/valory/protocols/llm/message.py index 16618c75..6fd162f4 100644 --- a/packages/valory/protocols/llm/message.py +++ b/packages/valory/protocols/llm/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/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 54314889..6df89420 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -8,12 +8,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeicetvgjqzw4lgggv2kxwsxshery2mow3becpquk3b4qdb5g6p76tm - __init__.py: bafybeiauadqjlhqmauczfl4ljcdcs6imvg3kc4nbaobb5nrmgh5qqvyq5i - dialogues.py: bafybeict3p7xmn2r2mur3iep54fmbosvsrp4mk4l6ad4hzc7ywwl3c4ale + __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m + dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e - message.py: bafybeiayhrzk2l4fsacw5c2eu57yods5ey7yicx2ugvrz5yedjxmakrvbm - serialization.py: bafybeideqcjtagyhzrblxnq42ulyqqnjsex7r4n47cvlabhxdimyklpmwa + message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 + serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im tests/test_llm_messages.py: bafybeidur77uf5moysw2zfborvlpc24fytcncucwsh6gqt3dufj5sl7srq fingerprint_ignore_patterns: [] diff --git a/packages/valory/protocols/llm/serialization.py b/packages/valory/protocols/llm/serialization.py index 8cc497f3..4231717e 100644 --- a/packages/valory/protocols/llm/serialization.py +++ b/packages/valory/protocols/llm/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/twitter/__init__.py b/packages/valory/protocols/twitter/__init__.py index 0da37af1..8346937a 100644 --- a/packages/valory/protocols/twitter/__init__.py +++ b/packages/valory/protocols/twitter/__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/twitter/dialogues.py b/packages/valory/protocols/twitter/dialogues.py index 65639d48..a156857f 100644 --- a/packages/valory/protocols/twitter/dialogues.py +++ b/packages/valory/protocols/twitter/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/twitter/message.py b/packages/valory/protocols/twitter/message.py index 58f38993..c734fdb9 100644 --- a/packages/valory/protocols/twitter/message.py +++ b/packages/valory/protocols/twitter/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/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index 1ce93cf8..c46ccb4e 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -8,10 +8,10 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: README.md: bafybeiaagbdeh4zropm6fcvorzv3ca4k6vfu7ya4wicesm4j2qtkoqada4 - __init__.py: bafybeigok4xqrjbpfwxti4jde4gmf2spo5po7lgl3o6ttjrfmv7g5tn42y - dialogues.py: bafybeifjnkd6ppnvj7yplsoyrf52nq7cgeragazhqhxmbntg7f7umy47aq - message.py: bafybeiel4dhpyudf6iznygzlbg6iqqnkygbqogp5j3acgxf3yfer6x56iy - serialization.py: bafybeifu5nagpxnbk4bmdmibxawqfti4havii7f3fx2jpizs2ct76aw3n4 + __init__.py: bafybeih5sj6mqcrnmctng5tkyqwdvbvk7usvirvuldd4q5ou6x4xnrh5um + dialogues.py: bafybeibxkkxvdzxgw5otuu4seej6rptybs7dzc3zbdmlalx6frxw5lsp2u + message.py: bafybeidlcwtwhcuql55loiuguu5j6bum36hz4klzbmnshryrk2jiomfn5u + serialization.py: bafybeiahmlp56h6dmkvb7qtmt3f2sofpvnctdp3e6i4zjbitqrwe24dqwi tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza twitter.proto: bafybeieaepg4kzjpzkbhg7amwfjmk77esizsjedkr524m6pd2cqfzykbgm diff --git a/packages/valory/protocols/twitter/serialization.py b/packages/valory/protocols/twitter/serialization.py index d06cb7c6..b39bc9a4 100644 --- a/packages/valory/protocols/twitter/serialization.py +++ b/packages/valory/protocols/twitter/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/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 22b41775..c4007a96 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeige6yr5fbgxdlk6pfwx23shfbv7sb3bnnnln5pzo26aupmv7ib7ri +agent: valory/impact_evaluator:0.1.0:bafybeif7uwl3crzxwaxqepyzpgchm36ewdz2ned5bbk77lufaxun5txadq number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 119dd3c5..3795bb25 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeige6yr5fbgxdlk6pfwx23shfbv7sb3bnnnln5pzo26aupmv7ib7ri +agent: valory/impact_evaluator:0.1.0:bafybeif7uwl3crzxwaxqepyzpgchm36ewdz2ned5bbk77lufaxun5txadq number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 39f5735c..c47fd98e 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -35,7 +35,7 @@ skills: - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm - valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi -- valory/twitter_write_abci:0.1.0:bafybeigocmiyj2btktlqsn72ezs4qfudouno4qk2gsoldl6jyujx2gr5ry +- valory/twitter_write_abci:0.1.0:bafybeibyisgkohdrzkj6rej3j3b3qsubntwx3vjowxjp6hqiy5s4dfppzi - valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y behaviours: main: diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index a45fd355..6cebb10f 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeif3rpo4sjc2nvn5yizuf36yqlmxxofkyug7japovdpwctpjeyjlfe +- valory/twitter:0.1.0:bafybeiajxsodecy5rmozsfvgwea2tiuvnamulplcycpehyewtwxwnntgea contracts: [] protocols: -- valory/twitter:0.1.0:bafybeial36s3ac62nocwt2kqfmftbs7puqboqa6h76swx5zwrnksind55a +- valory/twitter:0.1.0:bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: From 394ade600a39fc213e7fe84aac168fb558e6d555 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:27:21 +0200 Subject: [PATCH 27/30] fix: linters --- .github/workflows/main_workflow.yml | 2 +- Makefile | 4 +- setup.cfg | 328 ---------------------------- 3 files changed, 3 insertions(+), 331 deletions(-) delete mode 100644 setup.cfg diff --git a/.github/workflows/main_workflow.yml b/.github/workflows/main_workflow.yml index 36bb6b02..e7c8ccd1 100644 --- a/.github/workflows/main_workflow.yml +++ b/.github/workflows/main_workflow.yml @@ -60,7 +60,7 @@ jobs: pip install tomte[tox,cli]==0.2.12 pip install --upgrade setuptools==60.10.0 - name: Check copyright headers - run: tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci + run: tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part http_server - name: License compatibility check run: tox -e liccheck - name: Check doc links diff --git a/Makefile b/Makefile index 16b3b5be..23627b24 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ generators: .PHONY: common-checks-1 common-checks-1: - tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci + tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part http_server tomte tomte check-doc-links --url-skips "https://goerli.infura.io/v3/" tox -p -e check-hash -e check-packages -e check-doc-hashes @@ -144,7 +144,7 @@ fix-abci-app-specs: all-linters: gitleaks detect --report-format json --report-path leak_report tox -e spell-check - tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci + tomte check-copyright --author valory --exclude-part abci --exclude-part http_client --exclude-part ipfs --exclude-part ledger --exclude-part p2p_libp2p_client --exclude-part gnosis_safe --exclude-part gnosis_safe_proxy_factory --exclude-part multisend --exclude-part service_registry --exclude-part acn --exclude-part contract_api --exclude-part http --exclude-part ipfs --exclude-part ledger_api --exclude-part tendermint --exclude-part abstract_abci --exclude-part abstract_round_abci --exclude-part registration_abci --exclude-part reset_pause_abci --exclude-part termination_abci --exclude-part transaction_settlement_abci --exclude-part http_server tox -e check-doc-hashes tox -e bandit tox -e safety diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ab2836a7..00000000 --- a/setup.cfg +++ /dev/null @@ -1,328 +0,0 @@ -[bdist_wheel] -# we dont support py2 -universal = 0 - -[flake8] -paths=aea,examples,packages,scripts,tests -exclude=.md, - *_pb2.py, - aea/__init__.py, - aea/cli/__init__.py, - tests/common/oef_search_pluto_scripts, - tests/common/click_testing.py, - scripts/oef/launch.py -max-line-length = 88 -select = B,C,D,E,F,I,W, -ignore = E203,E501,W503,D202,B014,D400,D401,DAR,B028,B017 -application-import-names = aea,packages,tests,scripts -per-file-ignores = - tests/test_cli/test_upgrade.py:E800 - tests/test_protocols/test_generator/test_end_to_end.py:E800,F401 - tests/test_cli/test_launch_end_to_end.py:E800 - **/aea_ledger_cosmos/cosmos.py:F401 - **/aea_ledger_fetchai/_cosmos.py:F401 - -# ignore as too restrictive for our needs: -# D400: First line should end with a period -# D401: First line should be in imperative mood -# E501: https://www.flake8rules.com/rules/E501.html (Line too long) -# E203: https://www.flake8rules.com/rules/E203.html (Whitespace) -# W503: https://www.flake8rules.com/rules/W503.html (Line break) -# D202: blank lines -# B014: redundant exception - -[isort] -# for black compatibility -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -ensure_newline_before_comments = True -line_length=88 -# custom configurations -order_by_type=False -case_sensitive=True -lines_after_imports=2 -skip = - tests/data/dummy_aea/vendor/ - tests/data/dummy_aea/skills/dummy -skip_glob = **/*_pb2.py -known_first_party=aea -known_packages=packages -known_local_folder=tests -sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,PACKAGES,LOCALFOLDER - -[mypy] -python_version = 3.8 -strict_optional = True - -# temporary until fixed -exclude=contract_api/tests/test_contract_api.py|fipa/tests/test_fipa.py|default/tests/test_default.py|gym/tests/test_gym.py|http/tests/test_http.py|ledger_api/tests/test_ledger_api.py|oef_search/tests/test_oef_search.py|state_update/tests/test_state_update.py|tac/tests/test_tac.py|erc1155/tests/test_contract.py|gym/tests/test_handlers.py|gym/tests/test_rl_agent.py|gym/tests/test_task.py|gym/tests/test_helpers.py|gym/tests/test_dialogues.py|gym/tests/intermediate_class.py|erc1155_deploy/tests/test_behaviours.p|erc1155_deploy/tests/test_dialogues.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_handlers.py|erc1155_deploy/tests/test_strategy.py|erc1155_client/tests/test_behaviours.py|erc1155_client/tests/test_handlers.py|erc1155_client/tests/test_dialogues.py|erc1155_client/tests/test_strategy.py|generic_buyer/tests/test_handlers.py|generic_buyer/tests/test_behaviours.py|generic_buyer/tests/test_dialogues.py|generic_buyer/tests/test_models.py|erc1155_deploy/tests/intermediate_class.py|generic_seller/tests/test_handlers.py|generic_seller/tests/test_models.py|generic_seller/tests/test_dialogues.py|generic_seller/tests/test_behaviours.py|ledger/tests/test_ledger_api.py|local/tests/test_search_services.py|echo/tests/test_handlers.py|http_echo/tests/test_dialogues.py|http_client/tests/test_http_client.py|http_server/tests/test_http_server.py|echo/tests/test_dialogues.py|echo/tests/test_behaviours.py|local/tests/test_misc.py|signing/tests/test_signing.py|tendermint/tests/test_tendermint.py|stub/tests/test_stub.py|ledger/tests/conftest.py|erc1155_client/tests/intermediate_class.py|gym/tests/helpers.py|acn/tests/test_acn.py|packages/valory/connections/test_libp2p - -# Before adding a module here, make sure it does not support type hints - -# Per-module options for aea dir: - -[mypy-aea/mail/base_pb2] -ignore_errors = True - -[mypy-aea/helpers/multiaddr/crypto_pb2] -ignore_errors = True - -[mypy-aea/helpers/search/models_pb2] -ignore_errors = True - -[mypy-packages.valory.protocols.ledger_api.serialization] -ignore_errors = True - -[mypy-oef.*] -ignore_missing_imports = True - -[mypy-semver.*] -ignore_missing_imports = True - -[mypy-eth_keys.*] -ignore_missing_imports = True - -[mypy-jsonschema.*] -ignore_missing_imports = True - -[mypy-dotenv] -ignore_missing_imports = True - -[mypy-connexion] -ignore_missing_imports = True - -[mypy-eth_account.*] -ignore_missing_imports = True - -[mypy-ipfshttpclient.*] -ignore_missing_imports = True - -[mypy-aea/helpers/ipfs/pb/unixfs_pb2] -ignore_errors = True - -[mypy-aea/helpers/ipfs/pb/merkledag_pb2] -ignore_errors = True - -[mypy-win32con.*] -ignore_missing_imports = True - -[mypy-win32file.*] -ignore_missing_imports = True - -[mypy-pywintypes.*] -ignore_missing_imports = True - -[mypy-ecdsa.*] -ignore_missing_imports = True - -[mypy-urllib3.*] -ignore_missing_imports = True - -[mypy-aea_ledger_fetchai.*] -ignore_missing_imports = True - -[mypy-aea_ledger_ethereum.*] -ignore_missing_imports = True - -[mypy-aea_ledger_cosmos.*] -ignore_missing_imports = True - -[mypy-aea_ledger_solana.*] -ignore_missing_imports = True - -# Per-module options for examples dir: - -[mypy-numpy] -ignore_missing_imports = True - -[mypy-gym.*] -ignore_missing_imports = True - -# Per-module options for tests dir: - -[mypy-pytest] -ignore_missing_imports = True - -[mypy-pytest_asyncio] -ignore_missing_imports = True - -[mypy-docker.*] -ignore_missing_imports = True - -[mypy-tests/data/generator/t_protocol/*] -ignore_errors = True - -[mypy-tests/data/generator/t_protocol_no_ct/*] -ignore_errors = True - -[mypy-tests/data/dummy_aea/vendor/*] -ignore_errors = True - -[mypy-mistune] -ignore_missing_imports = True - -[mypy-git.*] -ignore_missing_imports = True - -[mypy-packaging.*] -ignore_missing_imports = True - -[mypy-aiohttp.*] -ignore_missing_imports = True - -[mypy-base58.*] -ignore_missing_imports = True - -[mypy-multidict.*] -ignore_missing_imports = True - -[mypy-web3.*] -ignore_missing_imports = True - -# Per-module options for packages dir: - -[mypy-packages/fetchai/protocols/contract_api/contract_api_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/default/default_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/fipa/fipa_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/gym/gym_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/http/http_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/ledger_api/ledger_api_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/oef_search/oef_search_pb2] -ignore_errors = True - -[mypy-packages/open_aea/protocols/signing/signing_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/state_update/state_update_pb2] -ignore_errors = True - -[mypy-packages/fetchai/protocols/tac/tac_pb2] -ignore_errors = True - -[mypy-packages/valory/protocols/acn/acn_pb2] -ignore_errors = True - -[mypy-packages/valory/protocols/tendermint/tendermint_pb2] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol/t_protocol_pb2] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/t_protocol_no_ct_pb2] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol/serialization] -ignore_errors = True - -[mypy-tests/data/packages/fetchai/protocols/t_protocol_no_ct/serialization] -ignore_errors = True - -[mypy-tensorflow.*] -ignore_missing_imports = True - -[mypy-temper.*] -ignore_missing_imports = True - -[mypy-openapi_core.*] -ignore_missing_imports = True - -[mypy-openapi_spec_validator.*] -ignore_missing_imports = True - -[mypy-sqlalchemy] -ignore_missing_imports = True - -[mypy-defusedxml.*] -ignore_missing_imports = True - -[mypy-cosmpy.*] -ignore_missing_imports = True - -[mypy-google.*] -ignore_missing_imports = True - -[mypy-click.*] -ignore_missing_imports = True - -[mypy-yaml.*] -ignore_missing_imports = True - -[mypy-requests.*] -ignore_missing_imports = True - -[mypy-certifi.*] -ignore_missing_imports = True - -[mypy-werkzeug.*] -ignore_missing_imports = True - -[mypy-pkg_resources.*] -ignore_missing_imports = True - -[mypy-gyms.*] -ignore_missing_imports = True - -[mypy-rl.*] -ignore_missing_imports = True - -[mypy-multibase.*] -ignore_missing_imports = True - -[mypy-multicodec.*] -ignore_missing_imports = True - -[mypy-morphys.*] -ignore_missing_imports = True - -[mypy-multihash.*] -ignore_missing_imports = True - -[mypy-coverage.*] -ignore_missing_imports = True - -[mypy-Crypto.*] -ignore_missing_imports = True - -[mypy-eth_typing.*] -ignore_missing_imports = True - -[mypy-bech32.*] -ignore_missing_imports = True - -[mypy-eth_utils.*] -ignore_missing_imports = True - -[mypy-_strptime.*] -ignore_missing_imports = True - -[mypy-hypothesis.*] -ignore_missing_imports = True - -[mypy-hexbytes.*] -ignore_missing_imports=True - -[mypy-flashbots.*] -ignore_missing_imports=True - -[mypy-asyncio.*] -ignore_missing_imports=True - -[darglint] -docstring_style=sphinx -strictness=short -ignore_regex=.*_pb2\.py -ignore=DAR401 From 2c4d142e42be8f9e9bc7a586b70036283065744d Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:33:58 +0200 Subject: [PATCH 28/30] fix: deps --- docs/index.md | 2 +- packages/packages.json | 32 +++++++++---------- .../agents/impact_evaluator/aea-config.yaml | 30 ++++++++--------- .../impact_evaluator/tests/helpers/docker.py | 3 +- .../tests/test_impact_evaluator.py | 3 +- .../valory/connections/openai/connection.py | 1 - .../valory/connections/openai/connection.yaml | 4 +-- .../valory/connections/twitter/connection.py | 3 +- .../connections/twitter/connection.yaml | 4 +-- .../dynamic_contribution/contract.py | 5 ++- .../dynamic_contribution/contract.yaml | 4 ++- packages/valory/protocols/llm/llm_pb2.py | 1 + packages/valory/protocols/llm/protocol.yaml | 2 +- .../valory/protocols/twitter/protocol.yaml | 2 +- .../valory/protocols/twitter/twitter_pb2.py | 1 + .../services/impact_evaluator/service.yaml | 2 +- .../impact_evaluator_local/service.yaml | 2 +- .../skills/ceramic_read_abci/skill.yaml | 2 +- .../tests/test_behaviours.py | 1 - .../skills/ceramic_write_abci/skill.yaml | 2 +- .../tests/test_behaviours.py | 1 - .../valory/skills/dynamic_nft_abci/skill.yaml | 4 +-- .../dynamic_nft_abci/tests/test_handlers.py | 1 - .../skills/impact_evaluator_abci/skill.yaml | 14 ++++---- packages/valory/skills/llm_abci/skill.yaml | 4 +-- .../valory/skills/olas_week_abci/skill.yaml | 4 +-- .../skills/twitter_scoring_abci/skill.yaml | 8 +++-- .../skills/twitter_write_abci/skill.yaml | 4 +-- scripts/check_doc_ipfs_hashes.py | 1 - 29 files changed, 72 insertions(+), 75 deletions(-) diff --git a/docs/index.md b/docs/index.md index 091b80c0..2102b9f2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeifv7xipn7vft5xvrlnnhfblvr2jvk7s76i3zd57d5yzeaosjjibhu --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeib7xjiezl2pbot74o2hj2xuspzazweozak3kcv5kiucmulwqwwgba --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 2492e725..6b364fd4 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,23 +1,23 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeif7uwl3crzxwaxqepyzpgchm36ewdz2ned5bbk77lufaxun5txadq", - "contract/valory/dynamic_contribution/0.1.0": "bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y", - "service/valory/impact_evaluator/0.1.0": "bafybeifv7xipn7vft5xvrlnnhfblvr2jvk7s76i3zd57d5yzeaosjjibhu", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa", - "skill/valory/ceramic_read_abci/0.1.0": "bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m", - "skill/valory/ceramic_write_abci/0.1.0": "bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeifp7n7dqq2nc5g4yrx4dwteinebrwxk56grkf4ibgx327pamcl7w4", + "agent/valory/impact_evaluator/0.1.0": "bafybeibpiuom6yvuygrska5ec5poao7klftwlr6hzkywysqn7pxb4vql2m", + "contract/valory/dynamic_contribution/0.1.0": "bafybeihiwtdhcjawj7fwtng2qzpfpvcq4vkequst6cd7nhragy4pn2cqci", + "service/valory/impact_evaluator/0.1.0": "bafybeib7xjiezl2pbot74o2hj2xuspzazweozak3kcv5kiucmulwqwwgba", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeihvxot6opk4qvayiuadnwltcbvops22b3qzhejr3afyg66f7mfhqu", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeig4sf6bazcjjw7ksck5qdaroeaxxrogctrozrhzqrberliekjmoyi", + "skill/valory/ceramic_read_abci/0.1.0": "bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey", + "skill/valory/ceramic_write_abci/0.1.0": "bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeicj6zb3scihnwji5zhd7ljt26ee52l42s5tajtslmwwdpp27f6scm", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", - "protocol/valory/twitter/0.1.0": "bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm", - "protocol/valory/llm/1.0.0": "bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba", - "connection/valory/twitter/0.1.0": "bafybeiajxsodecy5rmozsfvgwea2tiuvnamulplcycpehyewtwxwnntgea", - "connection/valory/openai/0.1.0": "bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm", - "skill/valory/twitter_write_abci/0.1.0": "bafybeibyisgkohdrzkj6rej3j3b3qsubntwx3vjowxjp6hqiy5s4dfppzi", - "skill/valory/llm_abci/0.1.0": "bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi", + "protocol/valory/twitter/0.1.0": "bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4", + "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", + "connection/valory/twitter/0.1.0": "bafybeies2hfmhirfw6vkg5jvdi6wxqddrtyroh5qvzqvduvhv3zlets564", + "connection/valory/openai/0.1.0": "bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e", + "skill/valory/twitter_write_abci/0.1.0": "bafybeihyyd7jslzmfmbszhfxjfjrbzcbvu3cvvnfprgtjqsyy7hler72aa", + "skill/valory/llm_abci/0.1.0": "bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeif3bmgo3npffuey34s4jvqak6uke3d23hczn2v5opkecxi6uzfxku", - "skill/valory/olas_week_abci/0.1.0": "bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y" + "service/valory/impact_evaluator_local/0.1.0": "bafybeig2zdaz3efw3lhgesox24dnb7wesqrpreefeg7worp4tlrr3gd62u", + "skill/valory/olas_week_abci/0.1.0": "bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4" }, "third_party": { "protocol/open_aea/signing/1.0.0": "bafybeie7xyems76v5b4wc2lmaidcujizpxfzjnnwdeokmhje53g7ym25ii", diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 2e804e1d..3d22651b 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -10,9 +10,9 @@ fingerprint: tests/helpers/__init__.py: bafybeif7verbag26h6i35gr5rlatxl7veq4drup5ykwdvhgtussf2jreei tests/helpers/constants.py: bafybeibbokz7gzdlubnjwxrmh4tqckc7j75hfy3ae6l5a63mrbd4hp6l7u tests/helpers/data/json_server/data.json: bafybeiapboptlarlpc2lboj4g2526vev7fwqpr267tb2qn6cevbblpnewe - tests/helpers/docker.py: bafybeihjgiuroofg7zn4sng4f7mwl2s24hk2ij5ibk4alkzgvxouns6spi + tests/helpers/docker.py: bafybeihlg5thdrcaiuzyte5s7x25mikqfyxdjwuqvhmeddluyjdkzhuhqi tests/helpers/fixtures.py: bafybeidfsamzdrqqkdra4ektollyfkhiyb2iqymy6djavgewon2cb23vwu - tests/test_impact_evaluator.py: bafybeiejwkxnd3johulxt4rkj5cvrrvkt6yaxkwyuwvmees3z4jxs5sday + tests/test_impact_evaluator.py: bafybeig2674hoob2mcuugihgdcvrc4zyo46vsa67wrskseode4gatfdcma fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom @@ -20,10 +20,10 @@ connections: - valory/http_client:0.23.0:bafybeifgeqgryx6b3s6eseyzyezygmeitcpt3tkor2eiycozoi6clgdrny - valory/ledger:0.19.0:bafybeigo5vst3zlltkouenwxuzn6c47yr2fbbml6dl2o32rfnsezmalgnu - valory/p2p_libp2p_client:0.1.0:bafybeihge56dn3xep2dzomu7rtvbgo4uc2qqh7ljl3fubqdi2lq44gs5lq -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm -- valory/twitter:0.1.0:bafybeiajxsodecy5rmozsfvgwea2tiuvnamulplcycpehyewtwxwnntgea +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e +- valory/twitter:0.1.0:bafybeies2hfmhirfw6vkg5jvdi6wxqddrtyroh5qvzqvduvhv3zlets564 contracts: -- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y +- valory/dynamic_contribution:0.1.0:bafybeihiwtdhcjawj7fwtng2qzpfpvcq4vkequst6cd7nhragy4pn2cqci - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci - valory/gnosis_safe_proxy_factory:0.1.0:bafybeigxqwbd6wds57ecsfkl2hf4z4vbz5gokex6nutu5zcdpw6irh573y - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y @@ -36,26 +36,26 @@ protocols: - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe - valory/ipfs:0.1.0:bafybeiedxeismnx3k5ty4mvvhlqideixlhqmi5mtcki4lxqfa7uqh7p33u - valory/ledger_api:1.0.0:bafybeige5agrztgzfevyglf7mb4o7pzfttmq4f6zi765y4g2zvftbyowru -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 - valory/tendermint:0.1.0:bafybeig6g6twajlwssfbfp5rlnu5mwzuu5kgak5cs4fich7rlkx6whesnu -- valory/twitter:0.1.0:bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm +- valory/twitter:0.1.0:bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4 skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeifp7n7dqq2nc5g4yrx4dwteinebrwxk56grkf4ibgx327pamcl7w4 +- valory/impact_evaluator_abci:0.1.0:bafybeicj6zb3scihnwji5zhd7ljt26ee52l42s5tajtslmwwdpp27f6scm - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa -- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m -- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena -- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq +- valory/twitter_scoring_abci:0.1.0:bafybeig4sf6bazcjjw7ksck5qdaroeaxxrogctrozrhzqrberliekjmoyi +- valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey +- valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 +- valory/dynamic_nft_abci:0.1.0:bafybeihvxot6opk4qvayiuadnwltcbvops22b3qzhejr3afyg66f7mfhqu - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy -- valory/twitter_write_abci:0.1.0:bafybeibyisgkohdrzkj6rej3j3b3qsubntwx3vjowxjp6hqiy5s4dfppzi +- valory/twitter_write_abci:0.1.0:bafybeihyyd7jslzmfmbszhfxjfjrbzcbvu3cvvnfprgtjqsyy7hler72aa - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi -- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y +- valory/llm_abci:0.1.0:bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve +- valory/olas_week_abci:0.1.0:bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4 default_ledger: ethereum required_ledgers: - ethereum diff --git a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py index f307150a..988b31a1 100644 --- a/packages/valory/agents/impact_evaluator/tests/helpers/docker.py +++ b/packages/valory/agents/impact_evaluator/tests/helpers/docker.py @@ -26,11 +26,10 @@ import docker import requests +from aea.exceptions import enforce from aea_test_autonomy.docker.base import DockerImage from docker.models.containers import Container -from aea.exceptions import enforce - from packages.valory.agents.impact_evaluator import PACKAGE_DIR from packages.valory.agents.impact_evaluator.tests.helpers.constants import ( DYNAMIC_CONTRIBUTION_CONTRACT_ADDRESS, diff --git a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py index c9dd24b1..e33f7f3a 100644 --- a/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py +++ b/packages/valory/agents/impact_evaluator/tests/test_impact_evaluator.py @@ -23,6 +23,7 @@ from typing import Tuple import pytest +from aea.configurations.data_types import PublicId from aea_test_autonomy.base_test_classes.agents import ( BaseTestEnd2EndExecution, RoundChecks, @@ -43,8 +44,6 @@ from aea_test_autonomy.fixture_helpers import tendermint # noqa: F401 from aea_test_autonomy.fixture_helpers import tendermint_port # noqa: F401 -from aea.configurations.data_types import PublicId - from packages.valory.agents.impact_evaluator.tests.helpers.docker import ( DEFAULT_JSON_SERVER_ADDR as _DEFAULT_JSON_SERVER_ADDR, ) diff --git a/packages/valory/connections/openai/connection.py b/packages/valory/connections/openai/connection.py index ddab1d43..e2455044 100644 --- a/packages/valory/connections/openai/connection.py +++ b/packages/valory/connections/openai/connection.py @@ -23,7 +23,6 @@ from typing import Any, Dict, cast import openai - from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope diff --git a/packages/valory/connections/openai/connection.yaml b/packages/valory/connections/openai/connection.yaml index a501b75b..b75758fa 100644 --- a/packages/valory/connections/openai/connection.yaml +++ b/packages/valory/connections/openai/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeiagnziswj5tll4yzx63u4hvat4yieoaaqt5b67chvvqxg5th5mxz4 - connection.py: bafybeiasbiwduhvs4j257i3p4xgbgukzlirlzpjoe6cggs5u5nutbswimq + connection.py: bafybeifkomaatfsg6fetdxhnuxl4dckstmsed3d5c7ve4rbpy2lb43y3vm readme.md: bafybeibqbvpfn6i2w7vxk2m65gizd2hcofu7mdzp2yusx7uupelztme724 fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 class_name: OpenaiConnection config: engine: text-davinci-003 diff --git a/packages/valory/connections/twitter/connection.py b/packages/valory/connections/twitter/connection.py index 7ecedfb8..1a34792a 100644 --- a/packages/valory/connections/twitter/connection.py +++ b/packages/valory/connections/twitter/connection.py @@ -22,13 +22,12 @@ from typing import Any, Callable, cast import tweepy -from tweepy.errors import HTTPException as TweepyHTTPException - from aea.configurations.base import PublicId from aea.connections.base import BaseSyncConnection from aea.mail.base import Envelope from aea.protocols.base import Address, Message from aea.protocols.dialogue.base import Dialogue +from tweepy.errors import HTTPException as TweepyHTTPException from packages.valory.protocols.twitter.dialogues import TwitterDialogue from packages.valory.protocols.twitter.dialogues import ( diff --git a/packages/valory/connections/twitter/connection.yaml b/packages/valory/connections/twitter/connection.yaml index 9f06dd12..e294d10d 100644 --- a/packages/valory/connections/twitter/connection.yaml +++ b/packages/valory/connections/twitter/connection.yaml @@ -7,12 +7,12 @@ license: Apache-2.0 aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeibxwzkyh7odchnlkeczpguencdjiizm4nezfmi4drybn2zd25xdkq - connection.py: bafybeies2zce7sxbihoesassplbnwmcucyajcp4hkuu6oov6ympjej6uy4 + connection.py: bafybeidokslaxwsvqge6sqn2wtmmaag7u3vajunrv2gqeutwmyprgdxcyy readme.md: bafybeihg5yfzgqvg5ngy7r2o5tfeqnelx2ffxw4po5hmheqjfhumpmxpoq fingerprint_ignore_patterns: [] connections: [] protocols: -- valory/twitter:0.1.0:bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm +- valory/twitter:0.1.0:bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4 class_name: TwitterConnection config: access_secret: diff --git a/packages/valory/contracts/dynamic_contribution/contract.py b/packages/valory/contracts/dynamic_contribution/contract.py index 73efa40b..5e552a35 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.py +++ b/packages/valory/contracts/dynamic_contribution/contract.py @@ -21,13 +21,12 @@ from typing import Any, cast -from aea_ledger_ethereum import EthereumApi -from web3.types import BlockIdentifier - from aea.common import JSONLike from aea.configurations.base import PublicId from aea.contracts.base import Contract from aea.crypto.base import LedgerApi +from aea_ledger_ethereum import EthereumApi +from web3.types import BlockIdentifier class DynamicContributionContract(Contract): diff --git a/packages/valory/contracts/dynamic_contribution/contract.yaml b/packages/valory/contracts/dynamic_contribution/contract.yaml index 674fb905..2c7fe939 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.yaml +++ b/packages/valory/contracts/dynamic_contribution/contract.yaml @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0' fingerprint: __init__.py: bafybeidk77j5zmvjhf42ie7grv33hzjedgc6vdiwn22uzhlwuo6xh6hmsi build/DynamicContribution.json: bafybeicq5ee4hba3h6tsluzvdrtyvzllpqsseqys66e24bfrpjlegnxome - contract.py: bafybeicdzpatfrgapps3tsig5rlegc5ulcfnppcfr3bdiil67l6n7oc7ba + contract.py: bafybeihe45m6zeuymlanetr6purk4bx6vcxh5efjvn3rteovhexkksdpqy fingerprint_ignore_patterns: [] class_name: DynamicContributionContract contract_interface_paths: @@ -16,4 +16,6 @@ contract_interface_paths: dependencies: open-aea-ledger-ethereum: version: ==1.41.0 + web3: + version: ==6.0.1 contracts: [] diff --git a/packages/valory/protocols/llm/llm_pb2.py b/packages/valory/protocols/llm/llm_pb2.py index 4ada3001..7d9a5400 100644 --- a/packages/valory/protocols/llm/llm_pb2.py +++ b/packages/valory/protocols/llm/llm_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder + # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/packages/valory/protocols/llm/protocol.yaml b/packages/valory/protocols/llm/protocol.yaml index 6df89420..46b0a9a6 100644 --- a/packages/valory/protocols/llm/protocol.yaml +++ b/packages/valory/protocols/llm/protocol.yaml @@ -11,7 +11,7 @@ fingerprint: __init__.py: bafybeihpfshhgdil3vzraagsfrq42cirxvg7ced5duhpe6kbqgo7g7v72m dialogues.py: bafybeigspfpqhdvgnwbiahxsc2qlilmzbcxyrffcwoilvnb7hx76uanul4 llm.proto: bafybeiah7wq6spk7sr2ctwlutj3dn6sq3erbgm6ihja7abl7czoyoanyu4 - llm_pb2.py: bafybeicq2giviznr2g5wunsgbvbj74jues7odcobka7xckht2736fhjq4e + llm_pb2.py: bafybeifwerxjwysdotin5bjglloh2sqbeb7iwitpp2mfrne4fs2q3vj2ta message.py: bafybeidcpa427xs4jagfmt2l72mel5f4vidrb6hnzewnqlicydw64y4ir4 serialization.py: bafybeie55m7zgbbbogrgbh5kzymdmipfe2qv7qloclw7bjyqnuswela4wa tests/test_llm_dialogues.py: bafybeihnug7m5c6733v6w5kdjpxrhgdcoz2vmg2mqjdle5yxqrvufp52im diff --git a/packages/valory/protocols/twitter/protocol.yaml b/packages/valory/protocols/twitter/protocol.yaml index c46ccb4e..8ea906b9 100644 --- a/packages/valory/protocols/twitter/protocol.yaml +++ b/packages/valory/protocols/twitter/protocol.yaml @@ -15,7 +15,7 @@ fingerprint: tests/test_twitter_dialogues.py: bafybeibu4cmtkmf5iaf54axcny2yaan2dt56dorv5664tg37fnxhsjgpya tests/test_twitter_messages.py: bafybeie5eyw2t5n6ck3iu3l6yv543kmk4tpqwb4curjyzyzqdwubghonza twitter.proto: bafybeieaepg4kzjpzkbhg7amwfjmk77esizsjedkr524m6pd2cqfzykbgm - twitter_pb2.py: bafybeifmntf6p6lhlxxpl73f7yvswpulmfnmisehkdsdv6e5bsga3mc3gq + twitter_pb2.py: bafybeiexfvi6gta5wpk5tdhkpu2p3pq4lp253q22ld5u4kfln7erqz3aay fingerprint_ignore_patterns: [] dependencies: protobuf: {} diff --git a/packages/valory/protocols/twitter/twitter_pb2.py b/packages/valory/protocols/twitter/twitter_pb2.py index 1e11894d..5119c632 100644 --- a/packages/valory/protocols/twitter/twitter_pb2.py +++ b/packages/valory/protocols/twitter/twitter_pb2.py @@ -7,6 +7,7 @@ from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder + # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index c4007a96..3c43fc87 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeif7uwl3crzxwaxqepyzpgchm36ewdz2ned5bbk77lufaxun5txadq +agent: valory/impact_evaluator:0.1.0:bafybeibpiuom6yvuygrska5ec5poao7klftwlr6hzkywysqn7pxb4vql2m number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 3795bb25..3c046c11 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeif7uwl3crzxwaxqepyzpgchm36ewdz2ned5bbk77lufaxun5txadq +agent: valory/impact_evaluator:0.1.0:bafybeibpiuom6yvuygrska5ec5poao7klftwlr6hzkywysqn7pxb4vql2m number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/ceramic_read_abci/skill.yaml b/packages/valory/skills/ceramic_read_abci/skill.yaml index 3f8749b0..f1d5f6d8 100644 --- a/packages/valory/skills/ceramic_read_abci/skill.yaml +++ b/packages/valory/skills/ceramic_read_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeigxhmr2m7ej7caedeqbheabq2tmnhxosyfvgpjfofgke4zkiyj3tm rounds.py: bafybeig2wb3rdu4byxzj2rzilsndgu75qcb65ryaitecr6cq3zywzgxf2y tests/__init__.py: bafybeibkxeuyukyuzek3lk5bqmo7jhl354fyznmqxv3dh4lsnly56xjkzu - tests/test_behaviours.py: bafybeifghtktetrzak7wwmmhwdx62yyr7tez4c7jonjizqwfpiixli3xt4 + tests/test_behaviours.py: bafybeia5ey4ezfjbewoidssiwuz44hazogdac77mpzhoefistbecdtlbqm tests/test_dialogues.py: bafybeias37opzowuenzii2dzwgwyaz57t3o4ocec67a274ghokptkdqaq4 tests/test_handlers.py: bafybeid26pxtjf33fkpmzpgfdg3fqyp6uttrscacwb7odprvjvysjmu36q tests/test_models.py: bafybeicuelcbuv2n2n5k3bdm3ek4gorpife5sg3whytnrpvfovyrz4mu7i diff --git a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py index d79711b1..a8613a54 100644 --- a/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_read_abci/tests/test_behaviours.py @@ -25,7 +25,6 @@ from typing import Any, Dict, Optional, Type, cast import pytest - from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/ceramic_write_abci/skill.yaml b/packages/valory/skills/ceramic_write_abci/skill.yaml index 03fc893c..6270b10e 100644 --- a/packages/valory/skills/ceramic_write_abci/skill.yaml +++ b/packages/valory/skills/ceramic_write_abci/skill.yaml @@ -17,7 +17,7 @@ fingerprint: payloads.py: bafybeig63ibt5qa5sa4nw37gly3lvf4wwtps7vgr2zbvpp5zz6hzm66edq rounds.py: bafybeidfandv3ywplalo6ftkvig3nhimgohmaa3xpj35phc6pde374oaci tests/__init__.py: bafybeigknrv5xw52pmcscrsxhtpibey5jbr26dss7o5eofery6ktd6w42e - tests/test_behaviours.py: bafybeia73imiu4mdgau2u6fsgepfv3ow44jpyurtrikhminjgj73tz4qrq + tests/test_behaviours.py: bafybeibmelmxw4tgx46oqdhfi7xx4sadqgn5q3mrxhlzfnuyeqts3otiwm tests/test_dialogues.py: bafybeibvhslg6mwhvmeffhoho5olnmr56ohvx63onv63aryhaidizk3jou tests/test_handlers.py: bafybeih6yobt7ihsp32n6nliq3ourwfmgpc7lvb672timj7cqx4wg4n5ba tests/test_models.py: bafybeihqwbnrtarzos5tak2ywurtbel6fxodpupyk677aipdemaxlgs7qi diff --git a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py index 4d3d13f2..78ef2fe8 100644 --- a/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py +++ b/packages/valory/skills/ceramic_write_abci/tests/test_behaviours.py @@ -25,7 +25,6 @@ from typing import Any, Dict, Optional, Type, cast import pytest - from aea.exceptions import AEAActException from packages.valory.skills.abstract_round_abci.base import AbciAppDB diff --git a/packages/valory/skills/dynamic_nft_abci/skill.yaml b/packages/valory/skills/dynamic_nft_abci/skill.yaml index d60c7902..a8fd5179 100644 --- a/packages/valory/skills/dynamic_nft_abci/skill.yaml +++ b/packages/valory/skills/dynamic_nft_abci/skill.yaml @@ -19,7 +19,7 @@ fingerprint: tests/test_behaviours.py: bafybeibojamjtso4gc5zxuvssqwdhigpaeixz2f4s7jkeiwxi5g5vvhaqm tests/test_ceramic_db.py: bafybeiaemz76p55aicazhysbgisrjm5sls55jbbnyfbbyye5fpsk6ltxz4 tests/test_dialogues.py: bafybeigybvptoehtw2o2jbudvyxggo5yr4pyqic7m732sha4xtaaxnfdpe - tests/test_handlers.py: bafybeigstd57brwxufhkhidb4dchxtemk2qbt4cavpkf63bekdg5xub3l4 + tests/test_handlers.py: bafybeibyhvjmehlie5tzu5sqaizf2k4en3rdmp3dqdh6tf7jsgnzr4jt3e tests/test_models.py: bafybeietgyqb5rsbnzqgzcsgm2pu2qcadu7rr7akxscfmegtghc5aguz44 tests/test_payloads.py: bafybeifpwaozt6s56uctvfmkdmcuxqawmvhu5skgyfu3ekegqd3iz7v2nm tests/test_rounds.py: bafybeid5ndadenmeqctrnzir4m7mpv2beqfbi3t66ry2dyozd7rabrezrq @@ -27,7 +27,7 @@ fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom contracts: -- valory/dynamic_contribution:0.1.0:bafybeielsskpznbnk2z3ttwi4otmxgyu3znkarwwsc5c2dtbqlvqrw7z6y +- valory/dynamic_contribution:0.1.0:bafybeihiwtdhcjawj7fwtng2qzpfpvcq4vkequst6cd7nhragy4pn2cqci protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe diff --git a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py index 33602846..be93c8de 100644 --- a/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py +++ b/packages/valory/skills/dynamic_nft_abci/tests/test_handlers.py @@ -28,7 +28,6 @@ from unittest.mock import Mock, patch import pytest - from aea.protocols.dialogue.base import DialogueMessage from aea.test_tools.test_skill import BaseSkillTestCase diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index c47fd98e..3044b108 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -24,19 +24,19 @@ contracts: [] protocols: [] skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/ceramic_read_abci:0.1.0:bafybeiblsnuno2dnm6wzuztz5tqmf4ry7fjg46u6i4jsxxlyl74vv7rw3m +- valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeic2jrsdpxpdc722qpiudk5znqwm3gb7tebhvrmmxkjjezxf6truxa -- valory/ceramic_write_abci:0.1.0:bafybeifw2qrwkwjvdw4mj7iggvbi7ot3ibnal4piotcbvnqak3dj6bxena -- valory/dynamic_nft_abci:0.1.0:bafybeiee5n3jtisgbab7tfpky7picbrsgxfvilmjld7aq4w3gzng2waneq +- valory/twitter_scoring_abci:0.1.0:bafybeig4sf6bazcjjw7ksck5qdaroeaxxrogctrozrhzqrberliekjmoyi +- valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 +- valory/dynamic_nft_abci:0.1.0:bafybeihvxot6opk4qvayiuadnwltcbvops22b3qzhejr3afyg66f7mfhqu - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy - valory/transaction_settlement_abci:0.1.0:bafybeia6cdxdlqrcwk2maw25fo7dafzd2p3rs7syropvufophk2pitzbwy - valory/decision_making_abci:0.1.0:bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm -- valory/llm_abci:0.1.0:bafybeif76rcl63fswgcnreg2kqind3w2bne6vu23tvej6nwzxuu6hjwroi -- valory/twitter_write_abci:0.1.0:bafybeibyisgkohdrzkj6rej3j3b3qsubntwx3vjowxjp6hqiy5s4dfppzi -- valory/olas_week_abci:0.1.0:bafybeie3dcg3c4rhn7effzs4y4vimaqxjdsdbxjgs4xbvbzuklyxvtao7y +- valory/llm_abci:0.1.0:bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve +- valory/twitter_write_abci:0.1.0:bafybeihyyd7jslzmfmbszhfxjfjrbzcbvu3cvvnfprgtjqsyy7hler72aa +- valory/olas_week_abci:0.1.0:bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4 behaviours: main: args: {} diff --git a/packages/valory/skills/llm_abci/skill.yaml b/packages/valory/skills/llm_abci/skill.yaml index 0d800c65..f393f34d 100644 --- a/packages/valory/skills/llm_abci/skill.yaml +++ b/packages/valory/skills/llm_abci/skill.yaml @@ -23,10 +23,10 @@ fingerprint: tests/test_rounds.py: bafybeicoiykxooup743nzzzfzc3m4uvsab5bljeipgcoo2hke54fcab3xa fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e contracts: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/olas_week_abci/skill.yaml b/packages/valory/skills/olas_week_abci/skill.yaml index cb392ef7..a9ff1398 100644 --- a/packages/valory/skills/olas_week_abci/skill.yaml +++ b/packages/valory/skills/olas_week_abci/skill.yaml @@ -19,10 +19,10 @@ fingerprint: rounds.py: bafybeihy72ld66pzdamubpuj6obtbnr4tbzsxl4axb36maw4eru6bb66em fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e contracts: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index e2636e1e..27f8e8c2 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -27,10 +27,10 @@ fingerprint: tests/test_rounds.py: bafybeibbznfio2tgvgzpc4l3jm6jwzd5ifflzgm6aflurllseeolef3ydm fingerprint_ignore_patterns: [] connections: -- valory/openai:0.1.0:bafybeiclwxjno7qqpav6xcstuqmzd4u4ioo46t5ov3xag45ytl3hzd4ybm +- valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e contracts: [] protocols: -- valory/llm:1.0.0:bafybeigdww27sv7uzwkr3gzh73ojtemamcxhv3a5qylrknzv6hfhihs6ba +- valory/llm:1.0.0:bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: @@ -174,5 +174,7 @@ models: tendermint_dialogues: args: {} class_name: TendermintDialogues -dependencies: {} +dependencies: + web3: + version: ==6.0.1 is_abstract: true diff --git a/packages/valory/skills/twitter_write_abci/skill.yaml b/packages/valory/skills/twitter_write_abci/skill.yaml index 6cebb10f..fd262463 100644 --- a/packages/valory/skills/twitter_write_abci/skill.yaml +++ b/packages/valory/skills/twitter_write_abci/skill.yaml @@ -24,10 +24,10 @@ fingerprint: tests/test_rounds.py: bafybeihmp5cnruopzf2qfxubhlhnrjsauavo2zx5ubdutmubhnnoedpxim fingerprint_ignore_patterns: [] connections: -- valory/twitter:0.1.0:bafybeiajxsodecy5rmozsfvgwea2tiuvnamulplcycpehyewtwxwnntgea +- valory/twitter:0.1.0:bafybeies2hfmhirfw6vkg5jvdi6wxqddrtyroh5qvzqvduvhv3zlets564 contracts: [] protocols: -- valory/twitter:0.1.0:bafybeiascqifuxocc5xejesav3auwabynvo5m7dhxvl76s5cye3ndlvorm +- valory/twitter:0.1.0:bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4 skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq behaviours: diff --git a/scripts/check_doc_ipfs_hashes.py b/scripts/check_doc_ipfs_hashes.py index afaf498f..aef3a8ff 100755 --- a/scripts/check_doc_ipfs_hashes.py +++ b/scripts/check_doc_ipfs_hashes.py @@ -29,7 +29,6 @@ from typing import Dict, List, Optional import yaml - from aea.cli.packages import get_package_manager from aea.configurations.data_types import PackageId from aea.helpers.base import IPFS_HASH_REGEX, SIMPLE_ID_REGEX From 5084bb0555afbda00d3bdaf0f34df07ffa8fe0ec Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:43:01 +0200 Subject: [PATCH 29/30] fix: worflow --- .github/workflows/main_workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main_workflow.yml b/.github/workflows/main_workflow.yml index e7c8ccd1..1697b52a 100644 --- a/.github/workflows/main_workflow.yml +++ b/.github/workflows/main_workflow.yml @@ -93,7 +93,7 @@ jobs: pip install --upgrade setuptools==60.10.0 # install Protobuf compiler wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + unzip protoc-24.3-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc # install IPFS sudo apt-get install -y wget @@ -166,7 +166,7 @@ jobs: # install Protobuf compiler wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + unzip protoc-24.3-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc # install IPFS @@ -286,7 +286,7 @@ jobs: # install Protobuf compiler wget https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip - unzip protoc-3.11.4-linux-x86_64.zip -d protoc + unzip protoc-24.3-linux-x86_64.zip -d protoc sudo mv protoc/bin/protoc /usr/local/bin/protoc # install IPFS From 4f69f7f4256b2d9e25a4be6e45c0c8e0ef1801a2 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Wed, 18 Oct 2023 16:53:55 +0200 Subject: [PATCH 30/30] fix: web3 version --- docs/index.md | 2 +- packages/packages.json | 14 +++++++------- .../valory/agents/impact_evaluator/aea-config.yaml | 8 ++++---- .../contracts/dynamic_contribution/contract.yaml | 2 +- .../valory/services/impact_evaluator/service.yaml | 2 +- .../services/impact_evaluator_local/service.yaml | 2 +- packages/valory/skills/dynamic_nft_abci/skill.yaml | 2 +- .../valory/skills/impact_evaluator_abci/skill.yaml | 4 ++-- .../valory/skills/twitter_scoring_abci/skill.yaml | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/index.md b/docs/index.md index 2102b9f2..34eeeb2a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -31,7 +31,7 @@ In order to run a local demo service based on the IEKit: 2. Fetch the IEKit. ```bash - autonomy fetch valory/impact_evaluator:0.1.0:bafybeib7xjiezl2pbot74o2hj2xuspzazweozak3kcv5kiucmulwqwwgba --service + autonomy fetch valory/impact_evaluator:0.1.0:bafybeih2uoaaruxswpuzh6qd5mfzietyd7yeresslbqinkjj7iypfrt2sy --service ``` 3. Build the Docker image of the service agents diff --git a/packages/packages.json b/packages/packages.json index 6b364fd4..6c0b0a52 100644 --- a/packages/packages.json +++ b/packages/packages.json @@ -1,13 +1,13 @@ { "dev": { - "agent/valory/impact_evaluator/0.1.0": "bafybeibpiuom6yvuygrska5ec5poao7klftwlr6hzkywysqn7pxb4vql2m", - "contract/valory/dynamic_contribution/0.1.0": "bafybeihiwtdhcjawj7fwtng2qzpfpvcq4vkequst6cd7nhragy4pn2cqci", - "service/valory/impact_evaluator/0.1.0": "bafybeib7xjiezl2pbot74o2hj2xuspzazweozak3kcv5kiucmulwqwwgba", - "skill/valory/dynamic_nft_abci/0.1.0": "bafybeihvxot6opk4qvayiuadnwltcbvops22b3qzhejr3afyg66f7mfhqu", - "skill/valory/twitter_scoring_abci/0.1.0": "bafybeig4sf6bazcjjw7ksck5qdaroeaxxrogctrozrhzqrberliekjmoyi", + "agent/valory/impact_evaluator/0.1.0": "bafybeih2cckykn2modsuraz4pce4mtvu2xlylqg52lttbifsgqpfo4frny", + "contract/valory/dynamic_contribution/0.1.0": "bafybeigwlg56p4jfxc6i2baduohsdrqfgbpql3ohston3ibkjocejm5w34", + "service/valory/impact_evaluator/0.1.0": "bafybeih2uoaaruxswpuzh6qd5mfzietyd7yeresslbqinkjj7iypfrt2sy", + "skill/valory/dynamic_nft_abci/0.1.0": "bafybeigben7gpf3pcihd5ruktrcbnf3pvvpieb7vkpcy2alvhucwgjomlu", + "skill/valory/twitter_scoring_abci/0.1.0": "bafybeibvhl76xhunfclpo4ydsnebegbqngymuyif62w5jhkpf3gkm4fohu", "skill/valory/ceramic_read_abci/0.1.0": "bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey", "skill/valory/ceramic_write_abci/0.1.0": "bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4", - "skill/valory/impact_evaluator_abci/0.1.0": "bafybeicj6zb3scihnwji5zhd7ljt26ee52l42s5tajtslmwwdpp27f6scm", + "skill/valory/impact_evaluator_abci/0.1.0": "bafybeihen74opdpyk5scfdrhs2em7t37r2nmnacmcxiyngxjsr6otv2xyi", "skill/valory/generic_scoring_abci/0.1.0": "bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4", "protocol/valory/twitter/0.1.0": "bafybeig7dugazhljpb4qtu4zfnoimttvivopiq574rogjz3qggf5eysnk4", "protocol/valory/llm/1.0.0": "bafybeihj2orqapokafg7co3wlogwgf6cckaaj2bz3nuv4rm3opkoyhrlp4", @@ -16,7 +16,7 @@ "skill/valory/twitter_write_abci/0.1.0": "bafybeihyyd7jslzmfmbszhfxjfjrbzcbvu3cvvnfprgtjqsyy7hler72aa", "skill/valory/llm_abci/0.1.0": "bafybeib4uwl2adgo6y4oixzkrqc6zabls2aghovupdaprzei57f36apmve", "skill/valory/decision_making_abci/0.1.0": "bafybeidhuxtuc5fuvvhjctsjjpfxhpmrovnbkp2vegtyitfkyu7d2kfqbm", - "service/valory/impact_evaluator_local/0.1.0": "bafybeig2zdaz3efw3lhgesox24dnb7wesqrpreefeg7worp4tlrr3gd62u", + "service/valory/impact_evaluator_local/0.1.0": "bafybeihruqz2mfnk4wsnei265lyh4uuds3tcjjx5bdir6tlm7rszezsaqq", "skill/valory/olas_week_abci/0.1.0": "bafybeiezsqvcqif3fjzbemjd7fa7jlpl4df6znugqhekmgdufrqftmt5n4" }, "third_party": { diff --git a/packages/valory/agents/impact_evaluator/aea-config.yaml b/packages/valory/agents/impact_evaluator/aea-config.yaml index 3d22651b..7251f5ae 100644 --- a/packages/valory/agents/impact_evaluator/aea-config.yaml +++ b/packages/valory/agents/impact_evaluator/aea-config.yaml @@ -23,7 +23,7 @@ connections: - valory/openai:0.1.0:bafybeigiib2l2vji4ehr7jm43bwpzhxe4u2ih4ybwy5zwmkpyjmj3k7u3e - valory/twitter:0.1.0:bafybeies2hfmhirfw6vkg5jvdi6wxqddrtyroh5qvzqvduvhv3zlets564 contracts: -- valory/dynamic_contribution:0.1.0:bafybeihiwtdhcjawj7fwtng2qzpfpvcq4vkequst6cd7nhragy4pn2cqci +- valory/dynamic_contribution:0.1.0:bafybeigwlg56p4jfxc6i2baduohsdrqfgbpql3ohston3ibkjocejm5w34 - valory/gnosis_safe:0.1.0:bafybeibt7arvjzz4ah24omst74f4sfjpzrdef76yti6ml7dopsauhdzeci - valory/gnosis_safe_proxy_factory:0.1.0:bafybeigxqwbd6wds57ecsfkl2hf4z4vbz5gokex6nutu5zcdpw6irh573y - valory/multisend:0.1.0:bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y @@ -42,12 +42,12 @@ protocols: skills: - valory/abstract_abci:0.1.0:bafybeihgemn2gwjc2wyxuh7rttg5pk5gec7dxhet3ih2tmg75vsdbgad7a - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq -- valory/impact_evaluator_abci:0.1.0:bafybeicj6zb3scihnwji5zhd7ljt26ee52l42s5tajtslmwwdpp27f6scm +- valory/impact_evaluator_abci:0.1.0:bafybeihen74opdpyk5scfdrhs2em7t37r2nmnacmcxiyngxjsr6otv2xyi - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeig4sf6bazcjjw7ksck5qdaroeaxxrogctrozrhzqrberliekjmoyi +- valory/twitter_scoring_abci:0.1.0:bafybeibvhl76xhunfclpo4ydsnebegbqngymuyif62w5jhkpf3gkm4fohu - valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey - valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 -- valory/dynamic_nft_abci:0.1.0:bafybeihvxot6opk4qvayiuadnwltcbvops22b3qzhejr3afyg66f7mfhqu +- valory/dynamic_nft_abci:0.1.0:bafybeigben7gpf3pcihd5ruktrcbnf3pvvpieb7vkpcy2alvhucwgjomlu - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy diff --git a/packages/valory/contracts/dynamic_contribution/contract.yaml b/packages/valory/contracts/dynamic_contribution/contract.yaml index 2c7fe939..5ddb9285 100644 --- a/packages/valory/contracts/dynamic_contribution/contract.yaml +++ b/packages/valory/contracts/dynamic_contribution/contract.yaml @@ -17,5 +17,5 @@ dependencies: open-aea-ledger-ethereum: version: ==1.41.0 web3: - version: ==6.0.1 + version: '>=6.0.0,<7' contracts: [] diff --git a/packages/valory/services/impact_evaluator/service.yaml b/packages/valory/services/impact_evaluator/service.yaml index 3c43fc87..0d52a60b 100644 --- a/packages/valory/services/impact_evaluator/service.yaml +++ b/packages/valory/services/impact_evaluator/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibpiuom6yvuygrska5ec5poao7klftwlr6hzkywysqn7pxb4vql2m +agent: valory/impact_evaluator:0.1.0:bafybeih2cckykn2modsuraz4pce4mtvu2xlylqg52lttbifsgqpfo4frny number_of_agents: 4 deployment: agent: diff --git a/packages/valory/services/impact_evaluator_local/service.yaml b/packages/valory/services/impact_evaluator_local/service.yaml index 3c046c11..eedc04d9 100644 --- a/packages/valory/services/impact_evaluator_local/service.yaml +++ b/packages/valory/services/impact_evaluator_local/service.yaml @@ -8,7 +8,7 @@ license: Apache-2.0 fingerprint: README.md: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe fingerprint_ignore_patterns: [] -agent: valory/impact_evaluator:0.1.0:bafybeibpiuom6yvuygrska5ec5poao7klftwlr6hzkywysqn7pxb4vql2m +agent: valory/impact_evaluator:0.1.0:bafybeih2cckykn2modsuraz4pce4mtvu2xlylqg52lttbifsgqpfo4frny number_of_agents: 1 deployment: agent: diff --git a/packages/valory/skills/dynamic_nft_abci/skill.yaml b/packages/valory/skills/dynamic_nft_abci/skill.yaml index a8fd5179..2207d319 100644 --- a/packages/valory/skills/dynamic_nft_abci/skill.yaml +++ b/packages/valory/skills/dynamic_nft_abci/skill.yaml @@ -27,7 +27,7 @@ fingerprint_ignore_patterns: [] connections: - valory/http_server:0.22.0:bafybeie3d6tj2kzewced4nnttxdvr7njue2ortvawmwdt67gwf4tcuosom contracts: -- valory/dynamic_contribution:0.1.0:bafybeihiwtdhcjawj7fwtng2qzpfpvcq4vkequst6cd7nhragy4pn2cqci +- valory/dynamic_contribution:0.1.0:bafybeigwlg56p4jfxc6i2baduohsdrqfgbpql3ohston3ibkjocejm5w34 protocols: - valory/contract_api:1.0.0:bafybeialhbjvwiwcnqq3ysxcyemobcbie7xza66gaofcvla5njezkvhcka - valory/http:1.0.0:bafybeiejoqgv7finfxo3rcvvovrlj5ccrbgxodjq43uo26ylpowsa3llfe diff --git a/packages/valory/skills/impact_evaluator_abci/skill.yaml b/packages/valory/skills/impact_evaluator_abci/skill.yaml index 3044b108..e5ce336d 100644 --- a/packages/valory/skills/impact_evaluator_abci/skill.yaml +++ b/packages/valory/skills/impact_evaluator_abci/skill.yaml @@ -26,9 +26,9 @@ skills: - valory/abstract_round_abci:0.1.0:bafybeid7neqpxxe4ualp23gxgrtpf6r5u3myr2mmc4uvwameyqshfdoydq - valory/ceramic_read_abci:0.1.0:bafybeigeu5wie5qaymzffdgbxshgwor2fmodshyqhno75r3andhl6pwxey - valory/generic_scoring_abci:0.1.0:bafybeiby5wi7232fnptkqucxirckvm3c3zfc6koc64katki2evfv3xqrm4 -- valory/twitter_scoring_abci:0.1.0:bafybeig4sf6bazcjjw7ksck5qdaroeaxxrogctrozrhzqrberliekjmoyi +- valory/twitter_scoring_abci:0.1.0:bafybeibvhl76xhunfclpo4ydsnebegbqngymuyif62w5jhkpf3gkm4fohu - valory/ceramic_write_abci:0.1.0:bafybeie3l6hzcbvegmhkkhrh6rbslplt6rlpgdnxrnizqsuddmu2dwtar4 -- valory/dynamic_nft_abci:0.1.0:bafybeihvxot6opk4qvayiuadnwltcbvops22b3qzhejr3afyg66f7mfhqu +- valory/dynamic_nft_abci:0.1.0:bafybeigben7gpf3pcihd5ruktrcbnf3pvvpieb7vkpcy2alvhucwgjomlu - valory/registration_abci:0.1.0:bafybeidbirkdjus6wbpynmyv6ffb6uevsi3zeuhokiqokuw42o7ar5j7hm - valory/reset_pause_abci:0.1.0:bafybeicpxn2khtaesuf4cq6ypwdmdmonlqroj2q2i6cxvpizc2y4cw66pe - valory/termination_abci:0.1.0:bafybeieqm46zuccaagnko3qlw6p3nvoohdrfgvpmw467r5lyil2dqrzjsy diff --git a/packages/valory/skills/twitter_scoring_abci/skill.yaml b/packages/valory/skills/twitter_scoring_abci/skill.yaml index 27f8e8c2..0fad059a 100644 --- a/packages/valory/skills/twitter_scoring_abci/skill.yaml +++ b/packages/valory/skills/twitter_scoring_abci/skill.yaml @@ -176,5 +176,5 @@ models: class_name: TendermintDialogues dependencies: web3: - version: ==6.0.1 + version: '>=6.0.0,<7' is_abstract: true