Merge remote-tracking branch 'origin/feat/prometheus-endpoint' into f…

…eat/prometheus-endpoint # Conflicts: # packages/packages.json # packages/valory/agents/trader/aea-config.yaml # packages/valory/services/trader/service.yaml # packages/valory/services/trader_pearl/service.yaml # packages/valory/skills/decision_maker_abci/skill.yaml # packages/valory/skills/trader_abci/skill.yaml # packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
valory-xyz · Dec 19, 2024 · 1565bb4 · 1565bb4
2 parents 0902d35 + 48874d5
commit 1565bb4
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/packages/packages.json b/packages/packages.json
@@ -15,15 +15,15 @@
         "contract/valory/mech_activity/0.1.0": "bafybeibmqmle5fnal3gxlpdmcos2kogzra4q3pr3o5nh7shplxuilji3t4",
         "contract/valory/staking_token/0.1.0": "bafybeiep4r6qyilbfgzdvx6t7zvpgaioxqktmxm7puwtnbpb2ftlib43gy",
         "contract/valory/relayer/0.1.0": "bafybeicawmds6czx7db2lcktvexwrp245jpekgulndtos5s5zdid3ilvq4",
-        "skill/valory/market_manager_abci/0.1.0": "bafybeiflv6n2t5ptofgvy4clds5vdrheefvp4uycvwcwznxcbvthjvylxa",
-        "skill/valory/decision_maker_abci/0.1.0": "bafybeidbnagu3r35ykdgzolgshjpygsccgvyhq75nt4x2x2j5ib5gruwgq",
-        "skill/valory/trader_abci/0.1.0": "bafybeifdts75tjnea2boi7bhz5q7wu5saf6urtieuezqyq5dygktkc6xyu",
-        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeidjqazm3n6s4thjlmqshxml7ssu77qp5uz4xr23vp3ei3zraw3fti",
+        "skill/valory/market_manager_abci/0.1.0": "bafybeih5r5dstwiouiv2ue3pezu6mf77b5n64rge6vm3y3cvy336lu7kyq",
+        "skill/valory/decision_maker_abci/0.1.0": "bafybeiee5njul4owt3cfk2ktyd36wqro73a4utnt4zq24btkzcrxkszqea",
+        "skill/valory/trader_abci/0.1.0": "bafybeic3dcbkbiidlkmskhb2yiuj6xglkngfujej6hfsu5rkrsq73aqbyq",
+        "skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeic6zhms3pt53btzxjyc7ce6aalfpbtghhpanjiczoq2mfb3uyv34u",
         "skill/valory/staking_abci/0.1.0": "bafybeif2cwf2bcjczbj4fykzyogtvfbfwo3u3ot2gfmeh4cygdenzvt2d4",
         "skill/valory/check_stop_trading_abci/0.1.0": "bafybeiggs243oehh736f3j4lwuahgperjfnkv6clxdmqdqjbt62g46q254",
-        "agent/valory/trader/0.1.0": "bafybeifdrw6igkudsfplwaxy73yqlvtbbmseam54sihgdndq3lednhq36q",
-        "service/valory/trader/0.1.0": "bafybeigtipyix2v3vuh47fatefc7mflcqzfubda2tpvbmjlux7taqin5r4",
-        "service/valory/trader_pearl/0.1.0": "bafybeifklh43lpmzqpfqslwhpiwt6dwag6oitutch4nhgv3a3f4oswub5q"
+        "agent/valory/trader/0.1.0": "bafybeiav5hkpnbfbxrd4vtjbbpmkirxt6fknf3dadeavy4ocva72hm3yy4",
+        "service/valory/trader/0.1.0": "bafybeieyg3xl3ynqd2l327mffbmq3ximqshh6simg2xbor4hx52pohphmu",
+        "service/valory/trader_pearl/0.1.0": "bafybeihjxr2avfblnl4auknzfoo2oesbnntejnu6off7ihc62rrpbhwvea"
     },
     "third_party": {
         "protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",

diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml
@@ -46,10 +46,10 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba
 - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm
 - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidjqazm3n6s4thjlmqshxml7ssu77qp5uz4xr23vp3ei3zraw3fti
-- valory/market_manager_abci:0.1.0:bafybeiflv6n2t5ptofgvy4clds5vdrheefvp4uycvwcwznxcbvthjvylxa
-- valory/decision_maker_abci:0.1.0:bafybeidbnagu3r35ykdgzolgshjpygsccgvyhq75nt4x2x2j5ib5gruwgq
-- valory/trader_abci:0.1.0:bafybeifdts75tjnea2boi7bhz5q7wu5saf6urtieuezqyq5dygktkc6xyu
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic6zhms3pt53btzxjyc7ce6aalfpbtghhpanjiczoq2mfb3uyv34u
+- valory/market_manager_abci:0.1.0:bafybeih5r5dstwiouiv2ue3pezu6mf77b5n64rge6vm3y3cvy336lu7kyq
+- valory/decision_maker_abci:0.1.0:bafybeiee5njul4owt3cfk2ktyd36wqro73a4utnt4zq24btkzcrxkszqea
+- valory/trader_abci:0.1.0:bafybeic3dcbkbiidlkmskhb2yiuj6xglkngfujej6hfsu5rkrsq73aqbyq
 - valory/staking_abci:0.1.0:bafybeif2cwf2bcjczbj4fykzyogtvfbfwo3u3ot2gfmeh4cygdenzvt2d4
 - valory/check_stop_trading_abci:0.1.0:bafybeiggs243oehh736f3j4lwuahgperjfnkv6clxdmqdqjbt62g46q254
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm

diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml
@@ -7,7 +7,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeifdrw6igkudsfplwaxy73yqlvtbbmseam54sihgdndq3lednhq36q
+agent: valory/trader:0.1.0:bafybeiav5hkpnbfbxrd4vtjbbpmkirxt6fknf3dadeavy4ocva72hm3yy4
 number_of_agents: 4
 deployment:
   agent:

diff --git a/packages/valory/services/trader_pearl/service.yaml b/packages/valory/services/trader_pearl/service.yaml
@@ -8,7 +8,7 @@ license: Apache-2.0
 fingerprint:
   README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e
 fingerprint_ignore_patterns: []
-agent: valory/trader:0.1.0:bafybeifdrw6igkudsfplwaxy73yqlvtbbmseam54sihgdndq3lednhq36q
+agent: valory/trader:0.1.0:bafybeiav5hkpnbfbxrd4vtjbbpmkirxt6fknf3dadeavy4ocva72hm3yy4
 number_of_agents: 1
 deployment:
   agent:

diff --git a/packages/valory/skills/decision_maker_abci/handlers.py b/packages/valory/skills/decision_maker_abci/handlers.py
@@ -26,7 +26,7 @@
 from typing import Any, Callable, Dict, Optional, Tuple, cast
 from urllib.parse import urlparse
 
-import prometheus_client  # type: ignore
+import prometheus_client
 from aea.protocols.base import Message
 from prometheus_client import CollectorRegistry, Gauge, generate_latest
 

diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml
@@ -9,7 +9,6 @@ description: This skill is responsible for the decision making and placing the b
 license: Apache-2.0
 aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
-  .coverage: bafybeiamyhdetx6urx43npwxxsid2o26dt5akzyvtyvyeb33v4h4rhrqii
   README.md: bafybeia367zzdwndvlhw27rvnwodytjo3ms7gbc3q7mhrrjqjgfasnk47i
   __init__.py: bafybeih563ujnigeci2ldzh7hakbau6a222vsed7leg3b7lq32vcn3nm4a
   behaviours/__init__.py: bafybeih6ddz2ocvm6x6ytvlbcz6oi4snb5ee5xh5h65nq4w2qf7fd7zfky
@@ -30,7 +29,7 @@ fingerprint:
   behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke
   dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
   fsm_specification.yaml: bafybeigwlvvi6fav72wg4wz22xjekegenzjnub5efwz5xu6qsrjnxluspq
-  handlers.py: bafybeibsd67mgjtnxxrikksjjakmvr4kwagvi7ejpd73aylsmocp23lepq
+  handlers.py: bafybeih763sihxtcfh7yc24vc2uvpsn6rgbvvhh4fvhos43uw7aree2foq
   io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq
   io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa
   models.py: bafybeidhdqgwcgn4rrncufpdmkbcye7xfqd6ytow7zx3hbcpsgpjmxgfmm
@@ -102,7 +101,7 @@ protocols:
 - valory/http:1.0.0:bafybeifugzl63kfdmwrxwphrnrhj7bn6iruxieme3a4ntzejf6kmtuwmae
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u
-- valory/market_manager_abci:0.1.0:bafybeiflv6n2t5ptofgvy4clds5vdrheefvp4uycvwcwznxcbvthjvylxa
+- valory/market_manager_abci:0.1.0:bafybeih5r5dstwiouiv2ue3pezu6mf77b5n64rge6vm3y3cvy336lu7kyq
 - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
 - valory/staking_abci:0.1.0:bafybeif2cwf2bcjczbj4fykzyogtvfbfwo3u3ot2gfmeh4cygdenzvt2d4
@@ -436,4 +435,6 @@ dependencies:
     version: ==4.0.0
   pyyaml:
     version: <=6.0.1,>=3.10
+  prometheus_client:
+    version: ==0.21.1
 is_abstract: true
diff --git a/packages/valory/skills/market_manager_abci/skill.yaml b/packages/valory/skills/market_manager_abci/skill.yaml
@@ -6,7 +6,6 @@ description: This skill implements the MarketManager for an AEA.
 license: Apache-2.0
 aea_version: '>=1.0.0, <2.0.0'
 fingerprint:
-  .coverage: bafybeiamyhdetx6urx43npwxxsid2o26dt5akzyvtyvyeb33v4h4rhrqii
   README.md: bafybeie6miwn67uin3bphukmf7qgiifh4xtm42i5v3nuyqxzxtehxsqvcq
   __init__.py: bafybeigrtedqzlq5mtql2ssjsdriw76ml3666m4e2c3fay6vmyzofl6v6e
   behaviours.py: bafybeig5akdvjjl2jviph5x76jvdeydk6ykasfkv5em3x7xflm6w3ylmwm

diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml
@@ -26,9 +26,9 @@ skills:
 - valory/reset_pause_abci:0.1.0:bafybeigrdlxed3xlsnxtjhnsbl3cojruihxcqx4jxhgivkd5i2fkjncgba
 - valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
 - valory/termination_abci:0.1.0:bafybeib5l7jhew5ic6iq24dd23nidcoimzqkrk556gqywhoziatj33zvwm
-- valory/market_manager_abci:0.1.0:bafybeiflv6n2t5ptofgvy4clds5vdrheefvp4uycvwcwznxcbvthjvylxa
-- valory/decision_maker_abci:0.1.0:bafybeidbnagu3r35ykdgzolgshjpygsccgvyhq75nt4x2x2j5ib5gruwgq
-- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeidjqazm3n6s4thjlmqshxml7ssu77qp5uz4xr23vp3ei3zraw3fti
+- valory/market_manager_abci:0.1.0:bafybeih5r5dstwiouiv2ue3pezu6mf77b5n64rge6vm3y3cvy336lu7kyq
+- valory/decision_maker_abci:0.1.0:bafybeiee5njul4owt3cfk2ktyd36wqro73a4utnt4zq24btkzcrxkszqea
+- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeic6zhms3pt53btzxjyc7ce6aalfpbtghhpanjiczoq2mfb3uyv34u
 - valory/staking_abci:0.1.0:bafybeif2cwf2bcjczbj4fykzyogtvfbfwo3u3ot2gfmeh4cygdenzvt2d4
 - valory/check_stop_trading_abci:0.1.0:bafybeiggs243oehh736f3j4lwuahgperjfnkv6clxdmqdqjbt62g46q254
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm

diff --git a/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml b/packages/valory/skills/tx_settlement_multiplexer_abci/skill.yaml
@@ -23,7 +23,7 @@ protocols:
 - valory/ledger_api:1.0.0:bafybeihdk6psr4guxmbcrc26jr2cbgzpd5aljkqvpwo64bvaz7tdti2oni
 skills:
 - valory/abstract_round_abci:0.1.0:bafybeib733xfbndtpvkf44mtk7oyodnficgloo6xhn7xmqxxeos33es65u
-- valory/decision_maker_abci:0.1.0:bafybeidbnagu3r35ykdgzolgshjpygsccgvyhq75nt4x2x2j5ib5gruwgq
+- valory/decision_maker_abci:0.1.0:bafybeiee5njul4owt3cfk2ktyd36wqro73a4utnt4zq24btkzcrxkszqea
 - valory/staking_abci:0.1.0:bafybeif2cwf2bcjczbj4fykzyogtvfbfwo3u3ot2gfmeh4cygdenzvt2d4
 - valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
 behaviours:

diff --git a/tox.ini b/tox.ini
@@ -75,6 +75,7 @@ deps = {[deps-base]deps}
 [extra-deps]
 deps =
     attrs
+    prometheus_client==0.21.1
     pyinstaller==6.8.0
     pyyaml<=6.0.1,>=3.10
     werkzeug
@@ -407,6 +408,9 @@ ignore_missing_imports = True
 [mypy-packages.open_aea.*]
 ignore_errors=True
 
+[mypy-prometheus_client]
+ignore_missing_imports = True
+
 [mypy-toml.*]
 ignore_missing_imports = True