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

Merging develop into main #269

Merged
merged 29 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6d7f698
created base mech repo and removed all unnecessary deps
KahanMajmudar Nov 14, 2024
b1997c0
added back required mints
KahanMajmudar Nov 15, 2024
9948df7
added core/required deps back
KahanMajmudar Nov 15, 2024
978b194
removed openai_request tool
KahanMajmudar Nov 15, 2024
dde76f9
removed test tools and tool dependency
KahanMajmudar Nov 15, 2024
b985035
removed unnecessary deps from yaml files
KahanMajmudar Nov 15, 2024
59be3e6
removed anthropic as a dep
KahanMajmudar Nov 15, 2024
911004c
Merge pull request #264 from valory-xyz/feat/base-repo
0xArdi Nov 15, 2024
4d7a2c1
Updated README and .env.example based on mech changes
KahanMajmudar Nov 18, 2024
37cd6e3
Merge pull request #265 from valory-xyz/fix/README
0xArdi Nov 18, 2024
ce2f569
fix: misc
0xArdi Nov 18, 2024
5f0fc42
Merge pull request #266 from valory-xyz/fix/misc-marketplace
0xArdi Nov 18, 2024
7953430
added mech quickstart single agent service
KahanMajmudar Nov 19, 2024
9cf376c
added missing gnosis params
KahanMajmudar Nov 19, 2024
527281b
updated service yaml
KahanMajmudar Nov 19, 2024
0d06756
fix: misc
0xArdi Nov 19, 2024
05a1668
fix: deps and env vars
0xArdi Nov 20, 2024
b65661b
patch: ledger apis
0xArdi Nov 20, 2024
cd1cf45
Merge pull request #267 from valory-xyz/feat/mech-quickstart-service
0xArdi Nov 21, 2024
3782d90
fix linters
KahanMajmudar Nov 22, 2024
2b43c02
fix gitleaks
KahanMajmudar Nov 22, 2024
8ef84c2
fix check hash
KahanMajmudar Nov 22, 2024
732f2ef
remove openai-core
KahanMajmudar Nov 22, 2024
fd86736
Merge pull request #268 from valory-xyz/fix/linters
0xArdi Nov 22, 2024
09f8e4d
feat: add healthcheck
0xArdi Nov 22, 2024
b89d7ff
chore: generators
0xArdi Nov 22, 2024
37579dd
chore: generators
0xArdi Nov 22, 2024
0313df8
chore: copyright
0xArdi Nov 22, 2024
575c8f3
Merge pull request #270 from valory-xyz/feat/add-healthcheck
0xArdi Nov 22, 2024
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
11 changes: 7 additions & 4 deletions .example.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
FILE_HASH_TO_TOOLS='[["bafybeibdcttrlgp5udygntka5fofi566pitkxhquke37ng7csvndhy4s2i",["openai-gpt-3.5-turbo-instruct","openai-gpt-3.5-turbo","openai-gpt-4"]],["bafybeiegbsq2ajxyipajac4mmxyvbt22ctwyuypuid6ziavqpndns6fsjy",["stabilityai-stable-diffusion-v1-5","stabilityai-stable-diffusion-xl-beta-v2-2-2","stabilityai-stable-diffusion-512-v2-1","stabilityai-stable-diffusion-768-v2-1"]],["bafybeihugaylajwh2fgypxatcw5qrw5qxadtrsi2h2s2246442wlvjirtm",["transfer-native"]],["bafybeiayity7o6c2yynrpe6libyak37hgf4fp7a4kjfcnqkkxwy3zkp3ie",["prediction-offline","prediction-online"]],["bafybeifpalgiya4dyu42hehsqxlwr36fjtxdo75xf3gcpfrauvoxgargy4",["gemini-pro", "gemini-1.0-pro-001", "gemini-1.0-pro-latest", "gemini-1.5-pro-latest"]]]'
API_KEYS='[["openai","dummy_api_key"],["stabilityai","dummy_api_key"],["gemini","dummy_api_key"]]'
TOOLS_TO_PACKAGE_HASH="{"openai-gpt-3.5-turbo-instruct":"bafybeigz5brshryms5awq5zscxsxibjymdofm55dw5o6ud7gtwmodm3vmq","openai-gpt-3.5-turbo":"bafybeigz5brshryms5awq5zscxsxibjymdofm55dw5o6ud7gtwmodm3vmq","openai-gpt-4":"bafybeigz5brshryms5awq5zscxsxibjymdofm55dw5o6ud7gtwmodm3vmq"}"
API_KEYS="{"openai":"dummy_api_key", "google_api_key":"dummy_api_key"}"
ETHEREUM_LEDGER_RPC_0=https://rpc.eu-central-2.gateway.fm/v4/gnosis/non-archival/mainnet
GNOSIS_RPC_0=https://rpc.eu-central-2.gateway.fm/v4/gnosis/non-archival/mainnet
ETHEREUM_WEBSOCKET_RPC_0=wss://rpc.eu-central-2.gateway.fm/ws/v4/gnosis/non-archival/mainnet
ETHEREUM_LEDGER_CHAIN_ID=100
ALL_PARTICIPANTS='["0x10E867Ac2Fb0Aa156ca81eF440a5cdf373bE1AaC"]'
RESET_PAUSE_DURATION=100
SAFE_CONTRACT_ADDRESS="0x5e1D1eb61E1164D5a50b28C575dA73A29595dFf7"
AGENT_MECH_CONTRACT_ADDRESS="0xFf82123dFB52ab75C417195c5fDB87630145ae81"
SERVICE_REGISTRY_ADDRESS="0x9338b5153AE39BB89f50468E608eD9d764B755fD"
AGENT_REGISTRY_ADDRESS="0xE49CB081e8d96920C38aA7AB90cb0294ab4Bc8EA"
MECH_MARKETPLACE_ADDRESS="0x4554fE75c1f5576c1d7F765B2A036c199Adae329"
MECH_TO_SUBSCRIPTION="{"0x77af31De935740567Cf4fF1986D04B2c964A786a":{"tokenAddress":"0x0000000000000000000000000000000000000000","tokenId":"1"}}"
MECH_TO_CONFIG="{"0xFf82123dFB52ab75C417195c5fDB87630145ae81":{"use_dynamic_pricing":false,"is_marketplace_mech":false}}"
18 changes: 1 addition & 17 deletions .github/workflows/common_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,20 +156,4 @@ jobs:
sudo apt-get autoremove
sudo apt-get autoclean
pip install tomte[tox,cli]==0.2.15
pip install --user --upgrade setuptools
- name: Tool unit tests
env:
OPENAI_SECRET_KEY: ${{ secrets.OPENAI_API_KEY }}
STABILITY_API_KEY: ${{ secrets.STABILITY_AI_KEY }}
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
GOOGLE_ENGINE_ID: ${{ vars.GOOGLE_ENGINE_ID }}
CLAUDE_API_KEY: ${{ secrets.CLAUDE_API_KEY }}
REPLICATE_API_KEY: ${{ secrets.REPLICATE_API_KEY }}
NEWS_API_KEY: ${{ secrets.NEWS_API_KEY }}
OPENROUTER_API_KEY: ${{ secrets.OPEN_ROUTER_API_KEY }}
GNOSIS_RPC_URL: ${{ secrets.GNOSIS_RPC_URL }}
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
GRAPH_API_KEY: ${{ secrets.GRAPH_API_KEY }}
run: |
printenv
tox -e check-tools
pip install --user --upgrade setuptools
3 changes: 2 additions & 1 deletion .gitleaksignore
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,5 @@ eecbf34a242377fb07d28230cf11ea43fb07de8d:packages/valory/skills/task_execution/s
d7f9fd6ad8bcf9ea2bf14bf3de221971ddb56268:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
c0dee637e3d520b9706e91db197e859ca5fce23a:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
c0aaf1331142b5e804d41ebe1a17be19b6014eb4:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
bead325392d69c64be89a862c92134e5b8663832:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
bead325392d69c64be89a862c92134e5b8663832:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
0d067561292282eee8a0b8036daeafba0eaa7734:packages/valory/skills/task_execution/skill.yaml:generic-api-key:15
207 changes: 102 additions & 105 deletions README.md

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion mints/10.json

This file was deleted.

Binary file removed mints/10.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/11.json

This file was deleted.

Binary file removed mints/11.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/12.json

This file was deleted.

Binary file removed mints/12.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/13.json

This file was deleted.

Binary file removed mints/13.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/14.json

This file was deleted.

Binary file removed mints/14.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/15.json

This file was deleted.

Binary file removed mints/15.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/16.json

This file was deleted.

Binary file removed mints/16.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/17.json

This file was deleted.

Binary file removed mints/17.png
Binary file not shown.
1 change: 0 additions & 1 deletion mints/18.json

This file was deleted.

Binary file removed mints/18.png
Binary file not shown.
13 changes: 1 addition & 12 deletions mints/mapping.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,7 @@ token_id-"component_id"
84-"skill/valory/task_execution_abci/0.1.0"
85-"skill/valory/mech_abci/0.1.0"
168-"custom/valory/openai_request/0.1.0"
169-"custom/psouranis/optimization_by_prompting/0.1.0"
170-"custom/valory/prediction_request/0.1.0"
171-"custom/valory/prediction_request_claude/0.1.0"
172-"custom/valory/prediction_request_embedding/0.1.0"
173-"custom/nickcom007/prediction_request_sme/0.1.0"
174-"custom/jhehemann/prediction_sum_url_content/0.1.0"
175-"custom/nickcom007/sme_generation_request/0.1.0"
176-"custom/valory/stability_ai_request/0.1.0"
181-"custom/polywrap/prediction_with_research_report/0.1.0"
186-"custom/valory/resolve_market/0.1.0"
TBD-"custom/napthaai/prediction_request_rag/0.1.0"
TBD-"custom/napthaai/resolve_market_reasoning/0.1.0"

---
token_id-"agent_id"
9-"agent/valory/mech/0.1.0"
Expand Down
6 changes: 1 addition & 5 deletions mints/whitelist.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
contract/valory/agent_registry/0.1.0
custom/napthaai/prediction_request_rag/0.1.0
custom/napthaai/prediction_request_reasoning/0.1.0
custom/napthaai/resolve_market_reasoning/0.1.0
custom/polywrap/prediction_with_research_report/0.1.0
contract/valory/agent_registry/0.1.0
19 changes: 0 additions & 19 deletions packages/dvilela/customs/__init__.py

This file was deleted.

20 changes: 0 additions & 20 deletions packages/dvilela/customs/corcel_request/__init__.py

This file was deleted.

16 changes: 0 additions & 16 deletions packages/dvilela/customs/corcel_request/component.yaml

This file was deleted.

180 changes: 0 additions & 180 deletions packages/dvilela/customs/corcel_request/corcel_request.py

This file was deleted.

20 changes: 0 additions & 20 deletions packages/dvilela/customs/gemini_prediction/__init__.py

This file was deleted.

18 changes: 0 additions & 18 deletions packages/dvilela/customs/gemini_prediction/component.yaml

This file was deleted.

Loading
Loading