Skip to content

Commit

Permalink
Comments from PR review
Browse files Browse the repository at this point in the history
  • Loading branch information
cyberosa committed Nov 21, 2024
1 parent a940e0f commit 8845f9c
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 36 deletions.
14 changes: 7 additions & 7 deletions packages/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa",
"skill/valory/decision_maker_abci/0.1.0": "bafybeicngtrfoad3yqbrdslmgngpfiqipqac5t4jv3rc22yyboiimp7kjq",
"skill/valory/trader_abci/0.1.0": "bafybeie57hhm6j5jfo43oq4hu2zfrteqh67zb4eatqyvrinsbc4qg4v2ma",
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeibevivb6pfty5ghtzjwwn2sgnn4ij263wbiziv373yfd5m4cyotpq",
"skill/valory/market_manager_abci/0.1.0": "bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq",
"skill/valory/decision_maker_abci/0.1.0": "bafybeidbfdiaahyvepu74ckf3nqqq7asspvpayxoe2r3iivkrdkxlblnte",
"skill/valory/trader_abci/0.1.0": "bafybeifexwp553txmblwheyexshbqybuyifeljpio3t5a55py3lr7d35we",
"skill/valory/tx_settlement_multiplexer_abci/0.1.0": "bafybeicl42463nbrodbj54f236szjgbsm3rhgu6sv7rzamv5winpcnpzp4",
"skill/valory/staking_abci/0.1.0": "bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne",
"skill/valory/check_stop_trading_abci/0.1.0": "bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini",
"agent/valory/trader/0.1.0": "bafybeicc6jkakg6dhvqpb6esidgnffl5ses2bnk67eqs3falrkbw4aa47q",
"service/valory/trader/0.1.0": "bafybeih6cbruabwq5z2jl22pcrhzamzw4pz5yhvld4nmee3k7jkjvhmohu",
"service/valory/trader_pearl/0.1.0": "bafybeibvcu6rnngqw4i6mzqukwwn4gxc2v7hn6cydyha6ouqeyen54vcla"
"agent/valory/trader/0.1.0": "bafybeia7bs3z2jcfe2yoq3lendyzmx7he7rcwy26qbc5vvpzf6m7rndtie",
"service/valory/trader/0.1.0": "bafybeihgiralvmuag3wcx7qgkknsfsqrdxu6l2uupumgxwuix2adx52o3u",
"service/valory/trader_pearl/0.1.0": "bafybeigj4u7vwkx5uu44ri4mc4pzt3kswfxqwxcnoo3vbjbb34epaj73je"
},
"third_party": {
"protocol/open_aea/signing/1.0.0": "bafybeihv62fim3wl2bayavfcg3u5e5cxu3b7brtu4cn5xoxd6lqwachasi",
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#
# ------------------------------------------------------------------------------

"""Valory packages."""
"""This module contains the skills packages authored by Valory AG."""
8 changes: 4 additions & 4 deletions packages/valory/agents/trader/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,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:bafybeibevivb6pfty5ghtzjwwn2sgnn4ij263wbiziv373yfd5m4cyotpq
- valory/market_manager_abci:0.1.0:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa
- valory/decision_maker_abci:0.1.0:bafybeicngtrfoad3yqbrdslmgngpfiqipqac5t4jv3rc22yyboiimp7kjq
- valory/trader_abci:0.1.0:bafybeie57hhm6j5jfo43oq4hu2zfrteqh67zb4eatqyvrinsbc4qg4v2ma
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeicl42463nbrodbj54f236szjgbsm3rhgu6sv7rzamv5winpcnpzp4
- valory/market_manager_abci:0.1.0:bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq
- valory/decision_maker_abci:0.1.0:bafybeidbfdiaahyvepu74ckf3nqqq7asspvpayxoe2r3iivkrdkxlblnte
- valory/trader_abci:0.1.0:bafybeifexwp553txmblwheyexshbqybuyifeljpio3t5a55py3lr7d35we
- valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne
- valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini
- valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/services/trader/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: bafybeigtuothskwyvrhfosps2bu6suauycolj67dpuxqvnicdrdu7yhtvq
fingerprint_ignore_patterns: []
agent: valory/trader:0.1.0:bafybeicc6jkakg6dhvqpb6esidgnffl5ses2bnk67eqs3falrkbw4aa47q
agent: valory/trader:0.1.0:bafybeia7bs3z2jcfe2yoq3lendyzmx7he7rcwy26qbc5vvpzf6m7rndtie
number_of_agents: 4
deployment:
agent:
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/services/trader_pearl/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license: Apache-2.0
fingerprint:
README.md: bafybeibg7bdqpioh4lmvknw3ygnllfku32oca4eq5pqtvdrdsgw6buko7e
fingerprint_ignore_patterns: []
agent: valory/trader:0.1.0:bafybeicc6jkakg6dhvqpb6esidgnffl5ses2bnk67eqs3falrkbw4aa47q
agent: valory/trader:0.1.0:bafybeia7bs3z2jcfe2yoq3lendyzmx7he7rcwy26qbc5vvpzf6m7rndtie
number_of_agents: 1
deployment:
agent:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -569,8 +569,9 @@ def async_act(self) -> Generator:
# always remove the processed trade from the benchmarking input file
# now there is one reader pointer per market
bet = self.get_active_sampled_bet()
if self.shared_state.bet_id_row_manager[bet.id]:
self.shared_state.bet_id_row_manager[bet.id].pop(0)
rows_queue = self.shared_state.bet_id_row_manager[bet.id]
if rows_queue:
rows_queue.pop(0)

self._update_selected_bet(prediction_response)
payload = DecisionReceivePayload(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ def async_act(self) -> Generator:
if len(self.shared_state.bet_id_row_manager) == 0:
bets_mapping = self.initialize_bet_id_row_manager()
self.shared_state.bet_id_row_manager = bets_mapping
log_message = (
f"Loaded bets mapping: {self.shared_state.bet_id_row_manager}"
)
self.context.logger.info(log_message)

agent = self.context.agent_address
payload = DecisionRequestPayload(agent, payload_content, mocking_mode)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ def has_liquidity_changed(self, bet: Bet) -> bool:
def processable_bet(self, bet: Bet, now: int) -> bool:
"""Whether we can process the given bet."""

self.context.logger.info(
f"Analyzing bet with id: {bet.id}, processed_timestamp: {bet.processed_timestamp} and n_bets: {bet.n_bets}"
)
# self.context.logger.info(
# f"Analyzing bet with id: {bet.id}, processed_timestamp: {bet.processed_timestamp} and n_bets: {bet.n_bets}"
# )
# Note: `openingTimestamp` is the timestamp when a question stops being available for voting.
within_opening_range = bet.openingTimestamp <= (
now + self.params.sample_bets_closing_days * UNIX_DAY
Expand All @@ -79,8 +79,8 @@ def processable_bet(self, bet: Bet, now: int) -> bool:
- self.params.opening_margin
- self.params.safe_voting_range
)
self.context.logger.info(f"within_opening_range ={within_opening_range}")
self.context.logger.info(f"within_safe_range ={within_safe_range}")
# self.context.logger.info(f"within_opening_range ={within_opening_range}")
# self.context.logger.info(f"within_safe_range ={within_safe_range}")
within_ranges = within_opening_range and within_safe_range

# rebetting is allowed only if we have already placed at least one bet in this market.
Expand Down
12 changes: 6 additions & 6 deletions packages/valory/skills/decision_maker_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ fingerprint:
behaviours/blacklisting.py: bafybeifitqx2omj5qdwokizhqjkxvybtsyxo22dxkucbtxaocafzgbseku
behaviours/check_benchmarking.py: bafybeiao2lyj7apezkqrpgsyzb3dwvrdgsrgtprf6iuhsmlsufvxfl5bci
behaviours/claim_subscription.py: bafybeigbqkhc6mb73rbwaks32tfiqx6u2xza43uiy6rvbtrnqd6m4fru3e
behaviours/decision_receive.py: bafybeiaumdloth77oesggzkedzn6ueqrueznahlbb6u3kedqu4sevcqjmu
behaviours/decision_request.py: bafybeifc5kmafyjae3nrydqytpn5nbjabvfxdliwlisl6ejlqk76hmcr6y
behaviours/decision_receive.py: bafybeib3kxn6v4ssk5fh7dsf2yycyajnaaoihiqzdzipi5uxdxq6d53w44
behaviours/decision_request.py: bafybeigse4ytzo7hey7kho2dg4hwoxdt7772zc6zoyiq5rjzkebx566rcu
behaviours/handle_failed_tx.py: bafybeidxpc6u575ymct5tdwutvzov6zqfdoio5irgldn3fw7q3lg36mmxm
behaviours/order_subscription.py: bafybeicrmdvhci5prfldvuf3bclbbqi6j7lpv6hmphw3qwgmkmwat3od44
behaviours/randomness.py: bafybeiaoj3awyyg2onhpsdsn3dyczs23gr4smuzqcbw3e5ocljwxswjkce
behaviours/reedem.py: bafybeiaxwp4lx62owcaqfp6xcqh6567f5yvwnl4rage2f5hmq4nltkzjjy
behaviours/round_behaviour.py: bafybeih63hpia2bwwzu563hxs5yd3t5ycvxvkfnhvxbzghbyy3mw3xjl3i
behaviours/sampling.py: bafybeie6ab5pdwal5glhg75am2637lijz5kwqx4ctk2lgqjyllmnw335ca
behaviours/sampling.py: bafybeih3zp6t55c7rd3u26uvhn3vxrtcosasx23jwdr3ep6tutdue56zvu
behaviours/storage_manager.py: bafybeignur4cwwkdmoj33ll3pmylnddbaqd6gpn6m2n7idieyyti7m3jg4
behaviours/tool_selection.py: bafybeienlxcgjs3ogyofli3d7q3p5rst3mcxxcnwqf7qolqjeefjtixeke
dialogues.py: bafybeigpwuzku3we7axmxeamg7vn656maww6emuztau5pg3ebsoquyfdqm
fsm_specification.yaml: bafybeid5d47zwe7zegrmgzswdkjr6to4veequs43uqxgcs7lol6unadary
handlers.py: bafybeigod6gbjrxy4mbmulbzsbokeaoycoqys64vqtxnumishfukzf73za
io_/__init__.py: bafybeifxgmmwjqzezzn3e6keh2bfo4cyo7y5dq2ept3stfmgglbrzfl5rq
io_/loader.py: bafybeih3sdsx5dhe4kzhtoafexjgkutsujwqy3zcdrlrkhtdks45bc7exa
models.py: bafybeifhmwxoix5fqka4phtmv6324osei52zwirg3ogziondvlq33brnby
payloads.py: bafybeicloiy4ax7dlipwp4czlueflgjgtlev4a6vhn2m7ztoehnemiiko4
models.py: bafybeifnbcepew5ambs5y2ebj5np5rt722etiqfnk426w6edqsg2yfk4xe
payloads.py: bafybeibio3sokcwjp7gqf4usrmqkasarhg5bapfwfsfj5j5lassecf45de
policy.py: bafybeihlzs4o5e7yfmfzcvvrzkf4bhxfsg5gxnzsrpepwgfugh45gafye4
redeem_info.py: bafybeifiiix4gihfo4avraxt34sfw35v6dqq45do2drrssei2shbps63mm
rounds.py: bafybeiaf7fh6b5th2vcjtzhayp4jblxuiyaxoe5fli2rg76eg6jdyi4qrq
Expand Down Expand Up @@ -101,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:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa
- valory/market_manager_abci:0.1.0:bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq
- valory/transaction_settlement_abci:0.1.0:bafybeic7q7recyka272udwcupblwbkc3jkodgp74fvcdxb7urametg5dae
- valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
behaviours:
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/skills/market_manager_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ aea_version: '>=1.0.0, <2.0.0'
fingerprint:
README.md: bafybeie6miwn67uin3bphukmf7qgiifh4xtm42i5v3nuyqxzxtehxsqvcq
__init__.py: bafybeigrtedqzlq5mtql2ssjsdriw76ml3666m4e2c3fay6vmyzofl6v6e
behaviours.py: bafybeifzt6vykvvgr5rtzmzdbo7bfsxi765xsljdfrktrq35ogf6cdhmna
behaviours.py: bafybeigduqoj32y6g5iirfjbxwlb2pwsdy3fnyw5afopquvjpe2yzgb4ry
bets.py: bafybeif25efeykh4lcw36dxzb35bcoaqtays6o2pmtqhgxske3mf2lkku4
dialogues.py: bafybeiebofyykseqp3fmif36cqmmyf3k7d2zbocpl6t6wnlpv4szghrxbm
fsm_specification.yaml: bafybeic5cvwfbiu5pywyp3h5s2elvu7jqdrcwayay7o3v3ow47vu2jw53q
Expand Down
6 changes: 3 additions & 3 deletions packages/valory/skills/trader_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:bafybeicztk62pslofv6ui3aw3giw2tnvlfwfmatqbyvvzv4ampneu6isqa
- valory/decision_maker_abci:0.1.0:bafybeicngtrfoad3yqbrdslmgngpfiqipqac5t4jv3rc22yyboiimp7kjq
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeibevivb6pfty5ghtzjwwn2sgnn4ij263wbiziv373yfd5m4cyotpq
- valory/market_manager_abci:0.1.0:bafybeifhedrcyzfeewmcaujk7gr6larcakyv3aosa255i6te5rhxdqvouq
- valory/decision_maker_abci:0.1.0:bafybeidbfdiaahyvepu74ckf3nqqq7asspvpayxoe2r3iivkrdkxlblnte
- valory/tx_settlement_multiplexer_abci:0.1.0:bafybeicl42463nbrodbj54f236szjgbsm3rhgu6sv7rzamv5winpcnpzp4
- valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne
- valory/check_stop_trading_abci:0.1.0:bafybeifmi64g4ki6zwbcncb35ovhd4sllw4xrszrkturpeqdhgf5bkiini
- valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:bafybeicngtrfoad3yqbrdslmgngpfiqipqac5t4jv3rc22yyboiimp7kjq
- valory/decision_maker_abci:0.1.0:bafybeidbfdiaahyvepu74ckf3nqqq7asspvpayxoe2r3iivkrdkxlblnte
- valory/staking_abci:0.1.0:bafybeictd5pxhscuhqntvctb7l5lfjausxt2m22rg5mkaiuj4cwwcxpvne
- valory/mech_interact_abci:0.1.0:bafybeid6m3i5ofq7vuogqapdnoshhq7mswmudhvfcr2craw25fdwtoe3lm
behaviours:
Expand Down

0 comments on commit 8845f9c

Please sign in to comment.