Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/two keepers #90

Merged
merged 11 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:bafybeidtxoqpimts5erkcpuscojhmy3f7pyhr7ivbt7ynorro3zx7pmzwy --service
autonomy fetch valory/impact_evaluator:0.1.0:bafybeiewo55hyk4tgw53c2h7jszttk35lx3thuiodcpkzyi3fmrv74o7bq --service
```

3. Build the Docker image of the service agents
Expand Down
8 changes: 4 additions & 4 deletions packages/packages.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"dev": {
"agent/valory/impact_evaluator/0.1.0": "bafybeifcppzj5u5fgic5fjqliignzrc6dkejgjh7zfbgrumap42nx3lgqm",
"agent/valory/impact_evaluator/0.1.0": "bafybeif6lpdpuq2pcocmre4iswp6puraxrlib6b2ydzew2daboei6pduju",
"contract/valory/dynamic_contribution/0.1.0": "bafybeie76ynpueo3hh2ujzcfgpqcsbyqwa4pdcc6g44a4he6bueyb4tqiy",
"service/valory/impact_evaluator/0.1.0": "bafybeidtxoqpimts5erkcpuscojhmy3f7pyhr7ivbt7ynorro3zx7pmzwy",
"service/valory/impact_evaluator/0.1.0": "bafybeiewo55hyk4tgw53c2h7jszttk35lx3thuiodcpkzyi3fmrv74o7bq",
"skill/valory/dynamic_nft_abci/0.1.0": "bafybeie5vfscnjpvuwqe5vk7i2rzzlqciojswdg7uh34fjnuk3bspca5zq",
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeihplombdirefn37vtnugn55f2b4khcywtboi4w72iczxybf4x5pwm",
"skill/valory/twitter_scoring_abci/0.1.0": "bafybeifu7vbznnx42oayoh24malmebchfvbitndzpbmf6xmp7hgq26buyy",
"skill/valory/ceramic_read_abci/0.1.0": "bafybeidruvxgpbggchuvlnssuswdxuoz2ep6sjvzzqjeyckybb6gpjx3ia",
"skill/valory/ceramic_write_abci/0.1.0": "bafybeigtkv57h5suaqqpjfknimfegbidovxna7cok7znsgzrfb4nftqvay",
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeifjst43yn2bn6ibljwbfcjirc7yhbelwsugntpan4k666xin3ebom",
"skill/valory/impact_evaluator_abci/0.1.0": "bafybeig5kiim7x6svzbrxsmwjqntlfqbdmaod5n2vjbs7yqwj5sldgi6y4",
"skill/valory/generic_scoring_abci/0.1.0": "bafybeiemmcnduhdj427kgafkxcbn2rfhaihabtpda34yqnks7utm3g4xiq",
"protocol/valory/twitter/0.1.0": "bafybeib4eyf7qbs7kdntqzhwqsaaj4o2mzcokcztaza6qgwt7sbxgkqu2m",
"protocol/valory/llm/1.0.0": "bafybeigqybmg75vsxexmp57hkms7lkp7iwpf54r7wpygizxryvrhfqqpb4",
Expand Down
6 changes: 3 additions & 3 deletions packages/valory/agents/impact_evaluator/aea-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fingerprint:
tests/helpers/data/json_server/data.json: bafybeiapboptlarlpc2lboj4g2526vev7fwqpr267tb2qn6cevbblpnewe
tests/helpers/docker.py: bafybeihlg5thdrcaiuzyte5s7x25mikqfyxdjwuqvhmeddluyjdkzhuhqi
tests/helpers/fixtures.py: bafybeidfsamzdrqqkdra4ektollyfkhiyb2iqymy6djavgewon2cb23vwu
tests/test_impact_evaluator.py: bafybeigo4mbjppcd24f47zykj7icq2vatfddskqrfpyylqqdphcfd5hbeu
tests/test_impact_evaluator.py: bafybeic55qbou5gfl47v5lw7hg3hawrlio667z5tjv66wfp5ue2gfsc4n4
fingerprint_ignore_patterns: []
connections:
- fetchai/http_server:0.22.0:bafybeihp5umafxzx45aad5pj7s3343se2wjkgnbirt4pybrape22swm6de
Expand Down Expand Up @@ -42,9 +42,9 @@ protocols:
skills:
- valory/abstract_abci:0.1.0:bafybeicg7dv7cff34nv2k2z47c4yp4kddsxp3wozonzow6tnvfvwndz3cy
- valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq
- valory/impact_evaluator_abci:0.1.0:bafybeifjst43yn2bn6ibljwbfcjirc7yhbelwsugntpan4k666xin3ebom
- valory/impact_evaluator_abci:0.1.0:bafybeig5kiim7x6svzbrxsmwjqntlfqbdmaod5n2vjbs7yqwj5sldgi6y4
- valory/generic_scoring_abci:0.1.0:bafybeiemmcnduhdj427kgafkxcbn2rfhaihabtpda34yqnks7utm3g4xiq
- valory/twitter_scoring_abci:0.1.0:bafybeihplombdirefn37vtnugn55f2b4khcywtboi4w72iczxybf4x5pwm
- valory/twitter_scoring_abci:0.1.0:bafybeifu7vbznnx42oayoh24malmebchfvbitndzpbmf6xmp7hgq26buyy
- valory/ceramic_read_abci:0.1.0:bafybeidruvxgpbggchuvlnssuswdxuoz2ep6sjvzzqjeyckybb6gpjx3ia
- valory/ceramic_write_abci:0.1.0:bafybeigtkv57h5suaqqpjfknimfegbidovxna7cok7znsgzrfb4nftqvay
- valory/dynamic_nft_abci:0.1.0:bafybeie5vfscnjpvuwqe5vk7i2rzzlqciojswdg7uh34fjnuk3bspca5zq
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,30 +72,44 @@
TwitterDecisionMakingRound,
TwitterHashtagsCollectionRound,
TwitterMentionsCollectionRound,
TwitterRandomnessRound,
TwitterSelectKeepersRound,
)


HAPPY_PATH: Tuple[RoundChecks, ...] = (
# Start, read data and generic scoring
RoundChecks(RegistrationStartupRound.auto_round_id(), n_periods=1),
RoundChecks(StreamReadRound.auto_round_id(), n_periods=3),
RoundChecks(GenericScoringRound.auto_round_id(), n_periods=2),

# Keeper
RoundChecks(TwitterDecisionMakingRound.auto_round_id(), n_periods=2),
RoundChecks(TwitterRandomnessRound.auto_round_id(), n_periods=2),
RoundChecks(TwitterSelectKeepersRound.auto_round_id(), n_periods=2),

# OpenAI check
RoundChecks(TwitterDecisionMakingRound.auto_round_id(), n_periods=2),
RoundChecks(OpenAICallCheckRound.auto_round_id(), n_periods=2),

# Twitter API
RoundChecks(TwitterDecisionMakingRound.auto_round_id(), n_periods=2),
RoundChecks(TwitterMentionsCollectionRound.auto_round_id(), n_periods=2),

RoundChecks(TwitterDecisionMakingRound.auto_round_id(), n_periods=2),
RoundChecks(TwitterHashtagsCollectionRound.auto_round_id(), n_periods=2),

# Evaluation
RoundChecks(TwitterDecisionMakingRound.auto_round_id(), n_periods=2),
RoundChecks(TweetEvaluationRound.auto_round_id(), n_periods=2),

# DB update
RoundChecks(TwitterDecisionMakingRound.auto_round_id(), n_periods=2),
RoundChecks(DBUpdateRound.auto_round_id(), n_periods=2),

# Check token
RoundChecks(TokenTrackRound.auto_round_id(), n_periods=2),

# Write db and reset
RoundChecks(RandomnessRound.auto_round_id(), n_periods=2),
RoundChecks(SelectKeeperRound.auto_round_id(), n_periods=2),
RoundChecks(StreamWriteRound.auto_round_id(), n_periods=2),
Expand Down
2 changes: 1 addition & 1 deletion packages/valory/services/impact_evaluator/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: bafybeign56hilwuoa6bgos3uqabss4gew4vadkik7vhj3ucpqw6nxtqtpe
fingerprint_ignore_patterns: []
agent: valory/impact_evaluator:0.1.0:bafybeifcppzj5u5fgic5fjqliignzrc6dkejgjh7zfbgrumap42nx3lgqm
agent: valory/impact_evaluator:0.1.0:bafybeif6lpdpuq2pcocmre4iswp6puraxrlib6b2ydzew2daboei6pduju
number_of_agents: 4
deployment:
agent:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ alphabet_in:
- ROUND_TIMEOUT
- SCHEDULED_TWEET
- SCORE
- SELECT_KEEPERS
- TWEET_EVALUATION_ROUND_TIMEOUT
- UPDATE_CENTAURS
- VERIFICATION_ERROR
Expand Down Expand Up @@ -59,6 +60,8 @@ states:
- TwitterDecisionMakingRound
- TwitterHashtagsCollectionRound
- TwitterMentionsCollectionRound
- TwitterRandomnessRound
- TwitterSelectKeepersRound
- TwitterWriteRound
- VerificationRound
transition_func:
Expand Down Expand Up @@ -138,6 +141,7 @@ transition_func:
(TwitterDecisionMakingRound, RETRIEVE_HASHTAGS): TwitterHashtagsCollectionRound
(TwitterDecisionMakingRound, RETRIEVE_MENTIONS): TwitterMentionsCollectionRound
(TwitterDecisionMakingRound, ROUND_TIMEOUT): TwitterDecisionMakingRound
(TwitterDecisionMakingRound, SELECT_KEEPERS): TwitterRandomnessRound
(TwitterHashtagsCollectionRound, API_ERROR): TwitterHashtagsCollectionRound
(TwitterHashtagsCollectionRound, DONE): TwitterDecisionMakingRound
(TwitterHashtagsCollectionRound, DONE_MAX_RETRIES): TwitterDecisionMakingRound
Expand All @@ -148,6 +152,12 @@ transition_func:
(TwitterMentionsCollectionRound, DONE_MAX_RETRIES): TwitterDecisionMakingRound
(TwitterMentionsCollectionRound, NO_MAJORITY): TwitterMentionsCollectionRound
(TwitterMentionsCollectionRound, ROUND_TIMEOUT): TwitterMentionsCollectionRound
(TwitterRandomnessRound, DONE): TwitterSelectKeepersRound
(TwitterRandomnessRound, NO_MAJORITY): TwitterRandomnessRound
(TwitterRandomnessRound, ROUND_TIMEOUT): TwitterRandomnessRound
(TwitterSelectKeepersRound, DONE): TwitterDecisionMakingRound
(TwitterSelectKeepersRound, NO_MAJORITY): TwitterRandomnessRound
(TwitterSelectKeepersRound, ROUND_TIMEOUT): TwitterRandomnessRound
(TwitterWriteRound, API_ERROR): RandomnessTwitterRound
(TwitterWriteRound, CONTINUE): TwitterWriteRound
(TwitterWriteRound, DONE): DecisionMakingRound
Expand Down
4 changes: 2 additions & 2 deletions packages/valory/skills/impact_evaluator_abci/skill.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fingerprint:
behaviours.py: bafybeifhoufesr4r4re65mxjadqasjymvz6tkc25xn5yyn473yunhjiufe
composition.py: bafybeifmf52jhbiyyqyxzd67gxrydedm44ouzib3jh56kzoe5xohjrhm34
dialogues.py: bafybeigjknz4qqynbsltjje46gidg4rftsqw6ybjwegz24wetmycutpzh4
fsm_specification.yaml: bafybeibgyjc25ukeorz3w3vxnmnjhczvy3psobl4gtivcbhnfq5qetwh4y
fsm_specification.yaml: bafybeiczfb5nrqfuugkhi3pa4gyw5odtv5bwl6twdh6rlmmq7dwxsxud7a
handlers.py: bafybeidkli6fphcmdgwsys4lkyf3fx6fbawet4nt2pnixfypzijhg6b3ze
models.py: bafybeifhcshu4iwqvc2fz3auu5ngfykkhvqnroeug52ilrwwc4kowkeg5a
tests/__init__.py: bafybeievwzwojvq4aofk5kjpf4jzygfes7ew6s6svc6b6frktjnt3sicce
Expand All @@ -26,7 +26,7 @@ skills:
- valory/abstract_round_abci:0.1.0:bafybeigxjcci53vwytymzlhr37436yvenh7jup4astrn7dgyixo24aq2pq
- valory/ceramic_read_abci:0.1.0:bafybeidruvxgpbggchuvlnssuswdxuoz2ep6sjvzzqjeyckybb6gpjx3ia
- valory/generic_scoring_abci:0.1.0:bafybeiemmcnduhdj427kgafkxcbn2rfhaihabtpda34yqnks7utm3g4xiq
- valory/twitter_scoring_abci:0.1.0:bafybeihplombdirefn37vtnugn55f2b4khcywtboi4w72iczxybf4x5pwm
- valory/twitter_scoring_abci:0.1.0:bafybeifu7vbznnx42oayoh24malmebchfvbitndzpbmf6xmp7hgq26buyy
- valory/ceramic_write_abci:0.1.0:bafybeigtkv57h5suaqqpjfknimfegbidovxna7cok7znsgzrfb4nftqvay
- valory/dynamic_nft_abci:0.1.0:bafybeie5vfscnjpvuwqe5vk7i2rzzlqciojswdg7uh34fjnuk3bspca5zq
- valory/registration_abci:0.1.0:bafybeibc4kczqbh23sc6tufrzn3axmhp3vjav7fa3u6cnpvolrbbc2fd7i
Expand Down
Loading
Loading