Skip to content

Commit

Permalink
Merge pull request #90 from valory-xyz/chore/bump
Browse files Browse the repository at this point in the history
Bumps frameworks to latest
  • Loading branch information
Adamantios committed May 9, 2024
2 parents 49a0642 + 67717d4 commit d8751c0
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 57 deletions.
16 changes: 8 additions & 8 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ grpcio = "==1.53.0"
hypothesis = "==6.21.6"
joblib = "==1.1.0"
numpy = "==1.23.5"
open-aea = {version = "==1.51.0", extras = ["all"]}
open-aea-ledger-ethereum = "==1.51.0"
open-aea-ledger-cosmos = "==1.51.0"
open-aea-test-autonomy = "==0.14.11.post1"
open-aea-cli-ipfs = "==1.51.0"
open-autonomy = {version = "==0.14.11.post1", extras = ["all"]}
open-aea = {version = "==1.52.0", extras = ["all"]}
open-aea-ledger-ethereum = "==1.52.0"
open-aea-ledger-cosmos = "==1.52.0"
open-aea-test-autonomy = "==0.14.12"
open-aea-cli-ipfs = "==1.52.0"
open-autonomy = {version = "==0.14.12", extras = ["all"]}
optuna = "==2.10.1"
pandas = "==1.5.3"
pandas-stubs = "==1.2.0.62"
pmdarima = ">=2.0.1"
pytz = "==2022.2.1"
pytest = "==7.2.1"
pytest-asyncio = "==0.20.3"
pytest-asyncio = ">=0.21.0,<0.22.0"
pytest-cov = "==4.0.0"
pytest-randomly = "==3.12.0"
pytest-rerunfailures = "==11.0"
Expand All @@ -41,7 +41,7 @@ scikit-learn = ">=1.0.2"
statsmodels = ">=0.13.2"
### tests deps
mistune = "==2.0.3"
tomte = {version = "==0.2.15", extras = ["cli", "tests"]}
tomte = {version = "==0.2.17", extras = ["cli", "tests"]}
# for http server connection
openapi-core = "==0.15.0"
openapi-spec-validator = "<0.5.0,>=0.4.0"
Expand Down
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ In order to run a local demo of the ML APY Prediction Oracle service:
mkdir your_workspace && cd your_workspace
touch Pipfile && pipenv --python 3.10 && pipenv shell

pipenv install open-autonomy[all]==0.14.11.post1
pipenv install open-autonomy[all]==0.14.12
autonomy init --remote --ipfs --reset --author=your_name
```

2. Fetch the ML APY Prediction Oracle service.

```bash
autonomy fetch valory/apy_estimation:0.1.0:bafybeicsxwaemsw2v22n55zue3jwatxd462l44dlqwswgow7g7ekwsdaea --service
autonomy fetch valory/apy_estimation:0.1.0:bafybeigqy2j3ggzs5wpass7k5p2xzw4wp53pzlutvzgemv2ozhqhwckkdm --service
```

3. Build the Docker image of the service agents
Expand Down
30 changes: 15 additions & 15 deletions packages/packages.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"dev": {
"skill/valory/apy_estimation_abci/0.1.0": "bafybeibzywrszknufplj2efjyn7wbiatfbugg37723si43yfgbdpfw5mdu",
"skill/valory/apy_estimation_chained_abci/0.1.0": "bafybeid6c6yqr3revoxsfc67v6g6vskr4wsej4arp6fceljrnaqzphleh4",
"agent/valory/apy_estimation/0.1.0": "bafybeicoz4vor7s67fi7j6g4iy2fa5i27pk5p65yye25xvg6tmb7ca4aki",
"service/valory/apy_estimation/0.1.0": "bafybeicsxwaemsw2v22n55zue3jwatxd462l44dlqwswgow7g7ekwsdaea"
"skill/valory/apy_estimation_abci/0.1.0": "bafybeiflu5odb3odcmp2wkdd6ltstz75id7h7pvzbauby6kh2yf7oxvdtq",
"skill/valory/apy_estimation_chained_abci/0.1.0": "bafybeiaqgikx5mi7xy5lvvfpgoz5xyujqo2ry57qvvrd7rytwqu7hurjlu",
"agent/valory/apy_estimation/0.1.0": "bafybeihuw72gru5elc6afaifjijrtb4n2bxbcqw3dlbakjjln4lt3z6fcm",
"service/valory/apy_estimation/0.1.0": "bafybeigqy2j3ggzs5wpass7k5p2xzw4wp53pzlutvzgemv2ozhqhwckkdm"
},
"third_party": {
"protocol/valory/ipfs/0.1.0": "bafybeiftxi2qhreewgsc5wevogi7yc5g6hbcbo4uiuaibauhv3nhfcdtvm",
Expand All @@ -14,21 +14,21 @@
"protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",
"protocol/valory/acn/1.1.0": "bafybeidluaoeakae3exseupaea4i3yvvk5vivyt227xshjlffywwxzcxqe",
"protocol/valory/tendermint/0.1.0": "bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra",
"contract/valory/service_registry/0.1.0": "bafybeigrfupd7lo6aet376rwluqgm33jfghibkbvumfsdgrymqxoopqydq",
"contract/valory/service_registry/0.1.0": "bafybeiekytropd5ysnap2wkekub3byi5jbda3qll7awchvhu5plbpafhmi",
"contract/valory/multisend/0.1.0": "bafybeig5byt5urg2d2bsecufxe5ql7f4mezg3mekfleeh32nmuusx66p4y",
"contract/valory/gnosis_safe/0.1.0": "bafybeiag5jjj5c66skkbjnxcjngeufhtcvcpnbnjlgox5mtuo2tk4w3ohi",
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeiafghfcxrg3apccnrvvw7tfgjbopedbfevmhepw2reyhyertxrilm",
"connection/valory/ipfs/0.1.0": "bafybeifqca6e232lbvwrjhd7ioh43bo3evxfkpumdvcr6re2sdwjuntgna",
"connection/valory/abci/0.1.0": "bafybeihhtx7t5fsxaoajzq5nm4hrq57smigx7gqv35bss766txaaffjmsa",
"contract/valory/gnosis_safe/0.1.0": "bafybeidcb25wneezfd2iaiqa7ygxlimwwacvycahhenvpw7tdvwdigllzm",
"contract/valory/gnosis_safe_proxy_factory/0.1.0": "bafybeidwwhkqin3zchbjl7ro6n3tj5kwbfhfvmrdpuxn7owy3b4ktrluba",
"connection/valory/ipfs/0.1.0": "bafybeieaq56usnosbwdslmo6i2yvttwpsm6djvawsowq3jt6bkjwhw3tl4",
"connection/valory/abci/0.1.0": "bafybeicksmavx23ralbdw3ajxv5fq5s4c3wzhbc3zdudefm4jqsgrg72ai",
"connection/valory/http_client/0.23.0": "bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u",
"connection/valory/ledger/0.19.0": "bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu",
"connection/valory/p2p_libp2p_client/0.1.0": "bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e",
"connection/valory/http_server/0.22.0": "bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m",
"skill/valory/abstract_abci/0.1.0": "bafybeiedikuvfpdx7xhyrxcpp6ywi2d6qf6uqvlwmhgcal7qhw5duicvym",
"skill/valory/abstract_round_abci/0.1.0": "bafybeia7msuvsouwcky263k6lup5hwcj73pka4pepkgyii6sya2wfawqvy",
"skill/valory/registration_abci/0.1.0": "bafybeihwkqc6klqrk247esh4cumfphosx3yadullxhmrrkovzg2rward5y",
"skill/valory/reset_pause_abci/0.1.0": "bafybeibd5divbbng3klkxlkzfwmwdc7imobcymfx57lf3owbyf7we7xdem",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeihfrdgfhu7ijjorvktjplfa4aq3b5as4dtwmkgl6nhy2oz4ayidfu",
"skill/valory/termination_abci/0.1.0": "bafybeifw36rnniyjay4f3af6jtfxpeycm5nu4zm4ejoutsk4yh2rv24ysm"
"skill/valory/abstract_abci/0.1.0": "bafybeieh4ei3qdelmacnm7vwq57phoewgumr3udvxt6pybmuggwc3yk65q",
"skill/valory/abstract_round_abci/0.1.0": "bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui",
"skill/valory/registration_abci/0.1.0": "bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q",
"skill/valory/reset_pause_abci/0.1.0": "bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie",
"skill/valory/transaction_settlement_abci/0.1.0": "bafybeic3tccdjypuge2lewtlgprwkbb53lhgsgn7oiwzyrcrrptrbeyote",
"skill/valory/termination_abci/0.1.0": "bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq"
}
}
28 changes: 14 additions & 14 deletions packages/valory/agents/apy_estimation/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ fingerprint:
fingerprint_ignore_patterns: []
connections:
- valory/http_server:0.22.0:bafybeihpgu56ovmq4npazdbh6y6ru5i7zuv6wvdglpxavsckyih56smu7m
- valory/abci:0.1.0:bafybeihhtx7t5fsxaoajzq5nm4hrq57smigx7gqv35bss766txaaffjmsa
- valory/abci:0.1.0:bafybeicksmavx23ralbdw3ajxv5fq5s4c3wzhbc3zdudefm4jqsgrg72ai
- valory/http_client:0.23.0:bafybeihi772xgzpqeipp3fhmvpct4y6e6tpjp4sogwqrnf3wqspgeilg4u
- valory/ipfs:0.1.0:bafybeifqca6e232lbvwrjhd7ioh43bo3evxfkpumdvcr6re2sdwjuntgna
- valory/ipfs:0.1.0:bafybeieaq56usnosbwdslmo6i2yvttwpsm6djvawsowq3jt6bkjwhw3tl4
- valory/ledger:0.19.0:bafybeig7woeog4srdby75hpjkmx4rhpkzncbf4h2pm5r6varsp26pf2uhu
- valory/p2p_libp2p_client:0.1.0:bafybeid3xg5k2ol5adflqloy75ibgljmol6xsvzvezebsg7oudxeeolz7e
contracts:
- valory/service_registry:0.1.0:bafybeigrfupd7lo6aet376rwluqgm33jfghibkbvumfsdgrymqxoopqydq
- valory/service_registry:0.1.0:bafybeiekytropd5ysnap2wkekub3byi5jbda3qll7awchvhu5plbpafhmi
protocols:
- open_aea/signing:1.0.0:bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi
- valory/abci:0.1.0:bafybeiaqmp7kocbfdboksayeqhkbrynvlfzsx4uy4x6nohywnmaig4an7u
Expand All @@ -29,14 +29,14 @@ protocols:
- valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni
- valory/tendermint:0.1.0:bafybeig4mi3vmlv5zpbjbfuzcgida6j5f2nhrpedxicmrrfjweqc5r7cra
skills:
- valory/abstract_abci:0.1.0:bafybeiedikuvfpdx7xhyrxcpp6ywi2d6qf6uqvlwmhgcal7qhw5duicvym
- valory/abstract_round_abci:0.1.0:bafybeia7msuvsouwcky263k6lup5hwcj73pka4pepkgyii6sya2wfawqvy
- valory/apy_estimation_abci:0.1.0:bafybeibzywrszknufplj2efjyn7wbiatfbugg37723si43yfgbdpfw5mdu
- valory/apy_estimation_chained_abci:0.1.0:bafybeid6c6yqr3revoxsfc67v6g6vskr4wsej4arp6fceljrnaqzphleh4
- valory/registration_abci:0.1.0:bafybeihwkqc6klqrk247esh4cumfphosx3yadullxhmrrkovzg2rward5y
- valory/reset_pause_abci:0.1.0:bafybeibd5divbbng3klkxlkzfwmwdc7imobcymfx57lf3owbyf7we7xdem
- valory/termination_abci:0.1.0:bafybeifw36rnniyjay4f3af6jtfxpeycm5nu4zm4ejoutsk4yh2rv24ysm
- valory/transaction_settlement_abci:0.1.0:bafybeihfrdgfhu7ijjorvktjplfa4aq3b5as4dtwmkgl6nhy2oz4ayidfu
- valory/abstract_abci:0.1.0:bafybeieh4ei3qdelmacnm7vwq57phoewgumr3udvxt6pybmuggwc3yk65q
- valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
- valory/apy_estimation_abci:0.1.0:bafybeiflu5odb3odcmp2wkdd6ltstz75id7h7pvzbauby6kh2yf7oxvdtq
- valory/apy_estimation_chained_abci:0.1.0:bafybeiaqgikx5mi7xy5lvvfpgoz5xyujqo2ry57qvvrd7rytwqu7hurjlu
- valory/registration_abci:0.1.0:bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q
- valory/reset_pause_abci:0.1.0:bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie
- valory/termination_abci:0.1.0:bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq
- valory/transaction_settlement_abci:0.1.0:bafybeic3tccdjypuge2lewtlgprwkbb53lhgsgn7oiwzyrcrrptrbeyote
default_ledger: ethereum
required_ledgers:
- ethereum
Expand Down Expand Up @@ -68,11 +68,11 @@ logging_config:
propagate: true
dependencies:
open-aea-ledger-cosmos:
version: ==1.51.0
version: ==1.52.0
open-aea-ledger-ethereum:
version: ==1.51.0
version: ==1.52.0
open-aea-test-autonomy:
version: ==0.14.11.post1
version: ==0.14.12
skill_exception_policy: just_log
connection_exception_policy: just_log
default_connection: null
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/services/apy_estimation/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license: Apache-2.0
fingerprint:
README.md: bafybeibhbkelnxxvsln677imq65vgbglmlhyxtax4iqtzempjiwcoef3gq
fingerprint_ignore_patterns: []
agent: valory/apy_estimation:0.1.0:bafybeicoz4vor7s67fi7j6g4iy2fa5i27pk5p65yye25xvg6tmb7ca4aki
agent: valory/apy_estimation:0.1.0:bafybeihuw72gru5elc6afaifjijrtb4n2bxbcqw3dlbakjjln4lt3z6fcm
number_of_agents: 4
deployment: {}
---
Expand Down
4 changes: 2 additions & 2 deletions packages/valory/skills/apy_estimation_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ connections: []
contracts: []
protocols: []
skills:
- valory/abstract_round_abci:0.1.0:bafybeia7msuvsouwcky263k6lup5hwcj73pka4pepkgyii6sya2wfawqvy
- valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
behaviours:
main:
args: {}
Expand Down Expand Up @@ -278,7 +278,7 @@ dependencies:
numpy:
version: ==1.23.5
open-aea-test-autonomy:
version: ==0.14.11.post1
version: ==0.14.12
optuna:
version: ==2.10.1
pandas:
Expand Down
12 changes: 6 additions & 6 deletions packages/valory/skills/apy_estimation_chained_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ contracts: []
protocols:
- valory/http:1.0.0:bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae
skills:
- valory/abstract_round_abci:0.1.0:bafybeia7msuvsouwcky263k6lup5hwcj73pka4pepkgyii6sya2wfawqvy
- valory/apy_estimation_abci:0.1.0:bafybeibzywrszknufplj2efjyn7wbiatfbugg37723si43yfgbdpfw5mdu
- valory/registration_abci:0.1.0:bafybeihwkqc6klqrk247esh4cumfphosx3yadullxhmrrkovzg2rward5y
- valory/reset_pause_abci:0.1.0:bafybeibd5divbbng3klkxlkzfwmwdc7imobcymfx57lf3owbyf7we7xdem
- valory/termination_abci:0.1.0:bafybeifw36rnniyjay4f3af6jtfxpeycm5nu4zm4ejoutsk4yh2rv24ysm
- valory/abstract_round_abci:0.1.0:bafybeiar2yhzxacfe3qqamqhaihtlcimquwedffctw55sowx6rac3cm3ui
- valory/apy_estimation_abci:0.1.0:bafybeiflu5odb3odcmp2wkdd6ltstz75id7h7pvzbauby6kh2yf7oxvdtq
- valory/registration_abci:0.1.0:bafybeieu7vq3pyns4t5ty6u3sbmpkd7yznpg3rmqifoz3jhy7pmqyg3w6q
- valory/reset_pause_abci:0.1.0:bafybeiameewywqigpupy3u2iwnkfczeiiucue74x2l5lbge74rmw6bgaie
- valory/termination_abci:0.1.0:bafybeif2zim2de356eo3sipkmoev5emwadpqqzk3huwqarywh4tmqt3vzq
behaviours:
main:
args: {}
Expand Down Expand Up @@ -264,7 +264,7 @@ dependencies:
numpy:
version: ==1.23.5
open-aea-cli-ipfs:
version: ==1.51.0
version: ==1.52.0
optuna:
version: ==2.10.1
pandas:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@




18 changes: 9 additions & 9 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ skip_missing_interpreters = true

[deps-tests]
deps =
tomte[tests]==0.2.15
tomte[tests]==0.2.17
mistune==2.0.3

[deps-packages]
Expand All @@ -23,9 +23,9 @@ deps =
grpcio==1.53.0
hypothesis==6.21.6
joblib==1.1.0
open-aea-ledger-cosmos==1.51.0
open-aea-test-autonomy==0.14.11.post1
open-autonomy[all]==0.14.11.post1
open-aea-ledger-cosmos==1.52.0
open-aea-test-autonomy==0.14.12
open-autonomy[all]==0.14.12
optuna==2.10.1
pandas==1.5.3
pandas-stubs==1.2.0.62
Expand Down Expand Up @@ -267,7 +267,7 @@ skipsdist = True
usedevelop = True
deps =
protobuf<4.25.0,>=4.21.6
open-autonomy[all]==0.14.11.post1
open-autonomy[all]==0.14.12
commands =
autonomy init --reset --author ci --remote --ipfs --ipfs-node "/dns/registry.autonolas.tech/tcp/443/https"
autonomy packages sync
Expand Down Expand Up @@ -314,7 +314,7 @@ whitelist_externals = /bin/sh
skipsdist = True
deps =
{[deps-packages]deps}
tomte[pylint]==0.2.15
tomte[pylint]==0.2.17
commands = pylint --ignore-patterns=".*_pb2.py" --ignore-paths="^packages/valory/.*$" --disable=C0103,R0801,R0912,C0301,C0201,C0204,C0209,W1203,C0302,R1735,R1729,W0511 {env:PACKAGES_PATHS} scripts

[testenv:safety]
Expand All @@ -335,8 +335,8 @@ skipsdist = True
usedevelop = True
deps =
{[deps-packages]deps}
tomte[isort]==0.2.15
tomte[black]==0.2.15
tomte[isort]==0.2.17
tomte[black]==0.2.17
commands = autonomy generate-all-protocols --check-clean

[testenv:spell-check]
Expand Down Expand Up @@ -657,7 +657,7 @@ fetchai-ledger-api: >=0.0.1
chardet: >=3.0.4
certifi: >=2019.11.28
;TODO: the following are conflicting packages that need to be sorted
; sub-dep of open-aea-ledger-ethereum-hwi==1.51.0
; sub-dep of open-aea-ledger-ethereum-hwi==1.52.0
hidapi: >=0.13.2
; shows in pip freeze but not referenced on code
paramiko: >=3.1.0
Expand Down

0 comments on commit d8751c0

Please sign in to comment.