Skip to content

Commit

Permalink
[feat] fix packages
Browse files Browse the repository at this point in the history
  • Loading branch information
8baller committed May 12, 2023
1 parent 6fdadea commit 11d585c
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 148 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/common_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ jobs:
poetry run autonomy packages sync
- name: Lint
env:
PYTHONPATH=.
run: |
poetry run adev lint -v
Expand Down
6 changes: 3 additions & 3 deletions packages/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"agent/eightballer/mech/0.1.0": "bafybeieylo6ev4w4p7ui7vr5lyenb2lb33mbyqr7xtq43vcihwu5ttn3a4",
"skill/valory/multiplexer_abci/0.1.0": "bafybeiasnzbdjouazce73me2rn5kjn3h4i6ebb3psqea4nmdttyztyjn2i",
"skill/valory/task_execution_abci/0.1.0": "bafybeiaebuxdbfuu6pvm3ar4hrvcmosj52b62orhzu7ex6mbj3rhxj4pwy",
"skill/valory/mech_abci/0.1.0": "bafybeibhszc3xrltl3acydouhi2tiq6ylxxfs3inzute5b4y52u5kyw4yy",
"skill/valory/transaction_preparation_abci/0.1.0": "bafybeiftsmbbn3mmbw2yo54dtqj6n3gz37mlmvujk6j3rvmxfh7poqcw7q"
"skill/valory/mech_abci/0.1.0": "bafybeig4jv6m5ks7aobnad2h5i5wpkkxy6e6zfnqso2nrgg2fcy2c6yoqu",
"skill/valory/transaction_preparation_abci/0.1.0": "bafybeihilhms4sxdvaygn46x4v4vq3kbnapxrdtorpgtdiaiuricambjzq"
},
"third_party": {
"protocol/fetchai/default/1.0.0": "bafybeig3w57l7laofhuyl7nco2lfzgtbqf4cto75edfccymugtixjqnm6y",
Expand Down Expand Up @@ -34,4 +34,4 @@
"contract/valory/multisend/0.1.0": "bafybeigjywkl7hydjsrkogob3xebj2ifhqwmfhhxoeyrndzhhxi5u6amey",
"skill/valory/termination_abci/0.1.0": "bafybeiglkntthppslj5p64n35aoqer4fcalezhqvpndo6eb2vaoynm6qxe"
}
}
}
1 change: 0 additions & 1 deletion packages/valory/skills/mech_abci/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@

from aea.configurations.base import PublicId


PUBLIC_ID = PublicId.from_str("valory/mech_abci:0.1.0")
37 changes: 13 additions & 24 deletions packages/valory/skills/mech_abci/behaviours.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,22 @@
from typing import Set, Type

from packages.valory.skills.abstract_round_abci.behaviours import (
AbstractRoundBehaviour,
BaseBehaviour,
)
AbstractRoundBehaviour, BaseBehaviour)
from packages.valory.skills.mech_abci.composition import MechAbciApp
from packages.valory.skills.transaction_preparation_abci.behaviours import (
TransactionPreparationRoundBehaviour,
)
from packages.valory.skills.multiplexer_abci.behaviours import (
MultiplexerRoundBehaviour,
)
from packages.valory.skills.task_execution_abci.behaviours import (
TaskExecutionRoundBehaviour,
)
from packages.valory.skills.multiplexer_abci.behaviours import \
MultiplexerRoundBehaviour
from packages.valory.skills.registration_abci.behaviours import (
AgentRegistrationRoundBehaviour,
RegistrationStartupBehaviour,
)
from packages.valory.skills.reset_pause_abci.behaviours import (
ResetPauseABCIConsensusBehaviour,
)
AgentRegistrationRoundBehaviour, RegistrationStartupBehaviour)
from packages.valory.skills.reset_pause_abci.behaviours import \
ResetPauseABCIConsensusBehaviour
from packages.valory.skills.task_execution_abci.behaviours import \
TaskExecutionRoundBehaviour
from packages.valory.skills.termination_abci.behaviours import (
BackgroundBehaviour,
TerminationAbciBehaviours,
)
from packages.valory.skills.transaction_settlement_abci.behaviours import (
TransactionSettlementRoundBehaviour,
)
BackgroundBehaviour, TerminationAbciBehaviours)
from packages.valory.skills.transaction_preparation_abci.behaviours import \
TransactionPreparationRoundBehaviour
from packages.valory.skills.transaction_settlement_abci.behaviours import \
TransactionSettlementRoundBehaviour


class MechConsensusBehaviour(AbstractRoundBehaviour):
Expand Down
13 changes: 5 additions & 8 deletions packages/valory/skills/mech_abci/composition.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,19 @@

"""This package contains round behaviours of MechAbciApp."""

import packages.valory.skills.transaction_preparation_abci.rounds as TransactionPreparationAbciApp
import packages.valory.skills.multiplexer_abci.rounds as MultiplexerAbciApp
import packages.valory.skills.task_execution_abci.rounds as TaskExecutionAbciApp

import packages.valory.skills.registration_abci.rounds as RegistrationAbci
import packages.valory.skills.reset_pause_abci.rounds as ResetAndPauseAbci
import packages.valory.skills.task_execution_abci.rounds as TaskExecutionAbciApp
import packages.valory.skills.transaction_preparation_abci.rounds as TransactionPreparationAbciApp
import packages.valory.skills.transaction_settlement_abci.rounds as TransactionSubmissionAbciApp
from packages.valory.skills.abstract_round_abci.abci_app_chain import (
AbciAppTransitionMapping,
chain,
)
AbciAppTransitionMapping, chain)
from packages.valory.skills.termination_abci.rounds import BackgroundRound
from packages.valory.skills.termination_abci.rounds import Event as TerminationEvent
from packages.valory.skills.termination_abci.rounds import \
Event as TerminationEvent
from packages.valory.skills.termination_abci.rounds import TerminationAbciApp


# Here we define how the transition between the FSMs should happen
# more information here: https://docs.autonolas.network/fsm_app_introduction/#composition-of-fsm-apps
abci_app_transition_mapping: AbciAppTransitionMapping = {
Expand Down
81 changes: 32 additions & 49 deletions packages/valory/skills/mech_abci/dialogues.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,55 +19,38 @@

"""This module contains the classes required for dialogue management."""

from packages.valory.skills.abstract_round_abci.dialogues import (
AbciDialogue as BaseAbciDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
AbciDialogues as BaseAbciDialogues,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
ContractApiDialogue as BaseContractApiDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
ContractApiDialogues as BaseContractApiDialogues,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
HttpDialogue as BaseHttpDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
HttpDialogues as BaseHttpDialogues,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
IpfsDialogue as BaseIpfsDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
IpfsDialogues as BaseIpfsDialogues,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
LedgerApiDialogue as BaseLedgerApiDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
LedgerApiDialogues as BaseLedgerApiDialogues,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
SigningDialogue as BaseSigningDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
SigningDialogues as BaseSigningDialogues,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
TendermintDialogue as BaseTendermintDialogue,
)
from packages.valory.skills.abstract_round_abci.dialogues import (
TendermintDialogues as BaseTendermintDialogues,
)
from packages.valory.skills.proposal_voter_abci.dialogues import (
LlmDialogue as BaseLlmDialogue,
)
from packages.valory.skills.proposal_voter_abci.dialogues import (
LlmDialogues as BaseLlmDialogues,
)

from packages.valory.skills.abstract_round_abci.dialogues import \
AbciDialogue as BaseAbciDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
AbciDialogues as BaseAbciDialogues
from packages.valory.skills.abstract_round_abci.dialogues import \
ContractApiDialogue as BaseContractApiDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
ContractApiDialogues as BaseContractApiDialogues
from packages.valory.skills.abstract_round_abci.dialogues import \
HttpDialogue as BaseHttpDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
HttpDialogues as BaseHttpDialogues
from packages.valory.skills.abstract_round_abci.dialogues import \
IpfsDialogue as BaseIpfsDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
IpfsDialogues as BaseIpfsDialogues
from packages.valory.skills.abstract_round_abci.dialogues import \
LedgerApiDialogue as BaseLedgerApiDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
LedgerApiDialogues as BaseLedgerApiDialogues
from packages.valory.skills.abstract_round_abci.dialogues import \
SigningDialogue as BaseSigningDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
SigningDialogues as BaseSigningDialogues
from packages.valory.skills.abstract_round_abci.dialogues import \
TendermintDialogue as BaseTendermintDialogue
from packages.valory.skills.abstract_round_abci.dialogues import \
TendermintDialogues as BaseTendermintDialogues
from packages.valory.skills.proposal_voter_abci.dialogues import \
LlmDialogue as BaseLlmDialogue
from packages.valory.skills.proposal_voter_abci.dialogues import \
LlmDialogues as BaseLlmDialogues

AbciDialogue = BaseAbciDialogue
AbciDialogues = BaseAbciDialogues
Expand Down
41 changes: 16 additions & 25 deletions packages/valory/skills/mech_abci/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,22 @@

"""This module contains the handlers for the skill of AutonomousFundAbciApp."""

from packages.valory.skills.abstract_round_abci.handlers import (
ABCIRoundHandler as BaseABCIRoundHandler,
)
from packages.valory.skills.abstract_round_abci.handlers import (
ContractApiHandler as BaseContractApiHandler,
)
from packages.valory.skills.abstract_round_abci.handlers import (
IpfsHandler as BaseIpfsHandler,
)
from packages.valory.skills.abstract_round_abci.handlers import (
LedgerApiHandler as BaseLedgerApiHandler,
)
from packages.valory.skills.abstract_round_abci.handlers import (
SigningHandler as BaseSigningHandler,
)
from packages.valory.skills.abstract_round_abci.handlers import (
TendermintHandler as BaseTendermintHandler,
)
from packages.valory.skills.proposal_collector_abci.handlers import (
HttpHandler as BaseHttpHandler,
)
from packages.valory.skills.proposal_voter_abci.handlers import (
LlmHandler as BaseLlmHandler,
)

from packages.valory.skills.abstract_round_abci.handlers import \
ABCIRoundHandler as BaseABCIRoundHandler
from packages.valory.skills.abstract_round_abci.handlers import \
ContractApiHandler as BaseContractApiHandler
from packages.valory.skills.abstract_round_abci.handlers import \
IpfsHandler as BaseIpfsHandler
from packages.valory.skills.abstract_round_abci.handlers import \
LedgerApiHandler as BaseLedgerApiHandler
from packages.valory.skills.abstract_round_abci.handlers import \
SigningHandler as BaseSigningHandler
from packages.valory.skills.abstract_round_abci.handlers import \
TendermintHandler as BaseTendermintHandler
from packages.valory.skills.proposal_collector_abci.handlers import \
HttpHandler as BaseHttpHandler
from packages.valory.skills.proposal_voter_abci.handlers import \
LlmHandler as BaseLlmHandler

ABCIRoundHandler = BaseABCIRoundHandler
HttpHandler = BaseHttpHandler
Expand Down
50 changes: 20 additions & 30 deletions packages/valory/skills/mech_abci/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,28 @@
"""This module contains the shared state for the abci skill of Mech."""

from packages.valory.skills.abstract_round_abci.models import ApiSpecs
from packages.valory.skills.abstract_round_abci.models import (
BenchmarkTool as BaseBenchmarkTool,
)
from packages.valory.skills.abstract_round_abci.models import Requests as BaseRequests
from packages.valory.skills.abstract_round_abci.models import \
BenchmarkTool as BaseBenchmarkTool
from packages.valory.skills.abstract_round_abci.models import \
Requests as BaseRequests
from packages.valory.skills.abstract_round_abci.models import \
SharedState as BaseSharedState
from packages.valory.skills.mech_abci.composition import MechAbciApp
from packages.valory.skills.abstract_round_abci.models import (
SharedState as BaseSharedState,
)

from packages.valory.skills.multiplexer_abci.models import (
Params as MultiplexerAbciParams,
)
from packages.valory.skills.task_execution_abci.models import (
Params as TaskExecutionAbciParams,
)
from packages.valory.skills.transaction_preparation_abci.models import (
Params as TransactionPreparationAbciParams,
)

from packages.valory.skills.multiplexer_abci.rounds import (
Event as MultiplexerEvent,
)
from packages.valory.skills.task_execution_abci.rounds import (
Event as TaskExecutionEvent,
)
from packages.valory.skills.transaction_preparation_abci.rounds import (
Event as TransactionPreparationEvent,
)

from packages.valory.skills.reset_pause_abci.rounds import Event as ResetPauseEvent
from packages.valory.skills.multiplexer_abci.models import \
Params as MultiplexerAbciParams
from packages.valory.skills.multiplexer_abci.rounds import \
Event as MultiplexerEvent
from packages.valory.skills.reset_pause_abci.rounds import \
Event as ResetPauseEvent
from packages.valory.skills.task_execution_abci.models import \
Params as TaskExecutionAbciParams
from packages.valory.skills.task_execution_abci.rounds import \
Event as TaskExecutionEvent
from packages.valory.skills.termination_abci.models import TerminationParams

from packages.valory.skills.transaction_preparation_abci.models import \
Params as TransactionPreparationAbciParams
from packages.valory.skills.transaction_preparation_abci.rounds import \
Event as TransactionPreparationEvent

MultiplexerParams = MultiplexerAbciParams
TaskExecutionParams = TaskExecutionAbciParams
Expand Down
14 changes: 7 additions & 7 deletions packages/valory/skills/mech_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ description: The chained abci for the mech skill.
license: Apache-2.0
aea_version: '>=1.0.0, <2.0.0'
fingerprint:
__init__.py: bafybeihscyr3poal6eyk6jeywtbdq552piwpbh2uo5h7bepjqdeivgiyem
behaviours.py: bafybeiflva5sqc6jtwq6kegz7xireg7wsaa6ssnrw5hbknwalbdeg5kdiy
composition.py: bafybeidl6evgww6y4sdtizze7y66smetopuiwfswgio232iedpngsfal3e
dialogues.py: bafybeiayva5koyr6upomicnhbfefypjk2sebogk7ew24wxwwnccuqktcki
__init__.py: bafybeia33nkx3vpttbjokbubh2ov7qa6fnjwbvyktwmwua4dxujaajnxze
behaviours.py: bafybeiar7vx4bm3maqiktzyobig5cnnpgrldslqrzcg3av2dy7msijjwsu
composition.py: bafybeihkytxwxatc23lkxycqbb5mqdyuy3mi33q6l2nqufglqfilt4vxtu
dialogues.py: bafybeice5rd4m7ftvqcqmhd4dbzhedsv63ddxto44nsyf6a355oklixqbu
fsm_specification.yaml: bafybeifnw2wanrc7zmtokz6xpkq7blfp3tjbh4jv4sfsyiuamdiktxpzzi
handlers.py: bafybeiefhvk666md6clddjpkv6ccnletnxmekptz2p5qjjnubfokwlofia
models.py: bafybeig7epm7a7hvgr5zrjw24m6o63hoq2yjr7bbbd27wzfuzsiwwmdpgu
handlers.py: bafybeiackylafg7gpphvo7oor5soiesvzkm4iz7evb5uowi3qbsmvdcxve
models.py: bafybeidfk32ekrbxjxwxheqnoqf3hnmguj76mdbu32wt4wsfmi67wpemhq
fingerprint_ignore_patterns: []
connections: []
contracts: []
Expand All @@ -24,7 +24,7 @@ skills:
- valory/reset_pause_abci:0.1.0:bafybeigwsp2crzvqan7xnap6dh4f4lxdut5il6naj7r4jwaslopstufgl4
- valory/task_execution_abci:0.1.0:bafybeiaebuxdbfuu6pvm3ar4hrvcmosj52b62orhzu7ex6mbj3rhxj4pwy
- valory/termination_abci:0.1.0:bafybeiglkntthppslj5p64n35aoqer4fcalezhqvpndo6eb2vaoynm6qxe
- valory/transaction_preparation_abci:0.1.0:bafybeiftsmbbn3mmbw2yo54dtqj6n3gz37mlmvujk6j3rvmxfh7poqcw7q
- valory/transaction_preparation_abci:0.1.0:bafybeihilhms4sxdvaygn46x4v4vq3kbnapxrdtorpgtdiaiuricambjzq
- valory/transaction_settlement_abci:0.1.0:bafybeibor5qxitvgvgm47vzor4u7p53tcpw3fzez7hbd6qv4rglxladxye
behaviours:
main:
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ description: The scaffold skill is a scaffold for your own skill implementation.
license: Apache-2.0
aea_version: '>=1.0.0, <2.0.0'
fingerprint:
.behaviours.py.swp: bafybeiduqzaegjc2vkfurxtvgkvrz7jrjrasf5d4kfbxhje5j6cerdupqm
__init__.py: bafybeicffbkqynejxmx6kqcdbhhaopn7phg2yfpcufp4d774jfwqsm7gx4
behaviours.py: bafybeihm4shxtdguba3tvwy5od5wk6am7j5sraz6dxw2dd5tva32aszwpu
dialogues.py: bafybeidwzysmmicss6myr36mqja6annr72nyuc5vmvp2zifcza54zayjye
Expand Down

0 comments on commit 11d585c

Please sign in to comment.