Marketplace of tools (1/N) #237

gabrielfior · 2024-06-04T19:38:38Z

Proposed changes

Added tool for building buyTokens/sellTokens txParams.

Types of changes

What types of changes does your code introduce? (A breaking change is a fix or feature that would cause existing functionality and APIs to not work as expected.)
Put an x in the box that applies

Non-breaking fix (non-breaking change which fixes an issue)
Breaking fix (breaking change which fixes an issue)
[x ] Non-breaking feature (non-breaking change which adds functionality)
Breaking feature (breaking change which adds functionality)
Refactor (non-breaking change which changes implementation)
Messy (mixture of the above - requires explanation!)

Checklist

Put an x in the boxes that apply.

[ x] I have read the CONTRIBUTING doc
[ x] I am making a pull request against the main branch (left side). Also you should start your branch off our main.
Lint and unit tests pass locally with my changes -> Lint throws error on file unrelated to this PR
[ x] I have added tests that prove my fix is effective or that my feature works

gabrielfior · 2024-06-04T19:39:46Z

packages/gnosis/customs/omen_tools/component.yaml

+aea_version: '>=1.0.0, <2.0.0'
+fingerprint:
+  __init__.py: bafybeibbn67pnrrm4qm3n3kbelvbs3v7fjlrjniywmw2vbizarippidtvi
+  prediction_sum_url_content.py: bafybeieywowx265yycgf5735bw4zyabfy6ivwnntl6smxa2hicktipgeby
+fingerprint_ignore_patterns: []


This wasn't updated - should I generate new values? If so, how?

It's not necessary

gabrielfior · 2024-06-04T19:40:16Z

packages/gnosis/customs/omen_tools/omen_buy_sell.py

+"""
+This module implements a tool which prepares a transaction for the transaction settlement skill.
+Please note that the gnosis safe parameters are missing from the payload, e.g., `safe_tx_hash`, `safe_tx_gas`, etc.
+"""


This file contains logic for buying and selling tokens on Omen.

gabrielfior · 2024-06-04T19:41:03Z

packages/gnosis/customs/omen_tools/omen_buy_sell.py

+        return error_response("No api key has been given.")
+
+    with OpenAIClientManager(api_key):
+        return transaction_builder(prompt)


This file is rather long, but I was unsure if splitting is encouraged, since other packages under customs also contain large files.
If desired, happy to split this into multiple files for better readability.

All good, its expected to be long, and cannot be split into multiple files atm. This is because these packages are loaded dynamically at runtime from IPFS.

gabrielfior · 2024-06-04T19:42:32Z

pyproject.toml

@@ -74,6 +74,7 @@ replicate = "0.15.7"
 lxml = {extras = ["html-clean"], version = "^5.1.0"}
 langgraph = "==0.0.55"
 langchain-community = "==0.2.1"
+prediction-market-agent-tooling = {git = "https://github.com/gnosis/prediction-market-agent-tooling.git", rev = "gabriel/olas-deps"}


I wasn't sure this is the proper place for adding a new dependency required by the new tool - please advise.

We might also need to add it to the tool's component.yaml dependencies. I'll let @0xArdi chime in.

Check the dependencies section here

Thanks @0xArdi , added dependencies to more files (please see commit)

gabrielfior · 2024-06-04T19:43:05Z

tests/test_tools.py

+class TestOmenTransactionBuilder(BaseToolTest):
+    """Test Prediction COT."""
+
+    os.environ["GNOSIS_RPC_URL"] = "https://gnosis-rpc.publicnode.com"


ENV var needed for tool to be executed - will also be required during regular (non-test) execution.

0xArdi

Thanks @gabrielfior changes look great!
Just a small comment on the dependencies part. LMK if you have any questions.

0xArdi · 2024-06-05T09:14:38Z

packages/gnosis/customs/omen_tools/component.yaml

+aea_version: '>=1.0.0, <2.0.0'
+fingerprint:
+  __init__.py: bafybeibbn67pnrrm4qm3n3kbelvbs3v7fjlrjniywmw2vbizarippidtvi
+  prediction_sum_url_content.py: bafybeieywowx265yycgf5735bw4zyabfy6ivwnntl6smxa2hicktipgeby
+fingerprint_ignore_patterns: []


It's not necessary

0xArdi · 2024-06-05T09:16:37Z

packages/gnosis/customs/omen_tools/omen_buy_sell.py

+        return error_response("No api key has been given.")
+
+    with OpenAIClientManager(api_key):
+        return transaction_builder(prompt)


All good, its expected to be long, and cannot be split into multiple files atm. This is because these packages are loaded dynamically at runtime from IPFS.

0xArdi · 2024-06-05T09:17:58Z

pyproject.toml

@@ -74,6 +74,7 @@ replicate = "0.15.7"
 lxml = {extras = ["html-clean"], version = "^5.1.0"}
 langgraph = "==0.0.55"
 langchain-community = "==0.2.1"
+prediction-market-agent-tooling = {git = "https://github.com/gnosis/prediction-market-agent-tooling.git", rev = "gabriel/olas-deps"}


Check the dependencies section here

0xArdi · 2024-06-05T09:18:39Z

tests/test_tools.py

+class TestOmenTransactionBuilder(BaseToolTest):
+    """Test Prediction COT."""
+
+    os.environ["GNOSIS_RPC_URL"] = "https://gnosis-rpc.publicnode.com"


gabrielfior · 2024-06-05T19:36:40Z

@0xArdi As can be seen in the checks above, the test that I wrote () is still not passing during CI execution (please see relevant error message here).
Could it be the case that the ENV OPENAI_API_KEY is not defined during CI test execution? The tox definition is here .
Also, the test that is failing passes locally.
Could you please provide guidance? Thanks.

0xArdi

@gabrielfior all the API keys are provided to the tool via the kwargs. In case you need any of them as enviroment variables, you will need to add them to the env in the tool itself. The mech does not provide any API keys as env vars.

gabrielfior · 2024-06-07T17:26:23Z

packages/gnosis/customs/omen_tools/omen_buy_sell.py

+    if api_key is None:
+        return error_response("No api key has been given.")
+
+    gnosis_rpc_url: str | None = kwargs.get("api_keys", {}).get("gnosis_rpc_url", None)


Here is where I fetch gnosis_rpc_url from the api_keys

gabrielfior · 2024-06-07T17:27:35Z

@gabrielfior all the API keys are provided to the tool via the kwargs. In case you need any of them as enviroment variables, you will need to add them to the env in the tool itself. The mech does not provide any API keys as env vars.

Thanks @0xArdi - refactored the logic to not expect GNOSIS_RPC_URL as environment variable, rather to fetch it from the api_keys (please see link).
Now I assume that a new secret (GNOSIS_RPC_URL) should be added to the Github Test runner (see change) for the unit tests to pass.

0xArdi

Thanks @gabrielfior , merging this now. Will address the RPC in a separate PR.

gabrielfior added 5 commits May 30, 2024 18:19

First skeleton for omen_buy_yes_tokens

1a825db

Improved LLM call with Pydantic output object

d3d52f3

Added sell token functionality

7edecf8

Updated poetry dependencies

c53c5b2

Added tests

bec95a1

gabrielfior commented Jun 4, 2024

View reviewed changes

0xArdi reviewed Jun 5, 2024

View reviewed changes

Added dependencies to more files per PR comments

c3d7e78

gabrielfior had a problem deploying to ci June 5, 2024 16:42 — with GitHub Actions Failure

0xArdi reviewed Jun 7, 2024

View reviewed changes

gabrielfior added 2 commits June 7, 2024 14:18

Added gnosis_rpc_url to key chain, removed from environ

77a92aa

Added GNOSIS_RPC_URL as secrets to unit tests

f09951f

gabrielfior commented Jun 7, 2024

View reviewed changes

gabrielfior had a problem deploying to ci June 7, 2024 18:15 — with GitHub Actions Failure

0xArdi approved these changes Jun 7, 2024

View reviewed changes

0xArdi merged commit 84b7148 into valory-xyz:main Jun 7, 2024
3 of 7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Marketplace of tools (1/N) #237

Marketplace of tools (1/N) #237

gabrielfior commented Jun 4, 2024

gabrielfior Jun 4, 2024

0xArdi Jun 5, 2024

gabrielfior Jun 4, 2024

gabrielfior Jun 4, 2024

0xArdi Jun 5, 2024

gabrielfior Jun 4, 2024

dvilelaf Jun 5, 2024

0xArdi Jun 5, 2024

gabrielfior Jun 5, 2024

gabrielfior Jun 4, 2024

dvilelaf Jun 5, 2024

0xArdi Jun 5, 2024

0xArdi left a comment

0xArdi Jun 5, 2024

0xArdi Jun 5, 2024

0xArdi Jun 5, 2024

0xArdi Jun 5, 2024

gabrielfior commented Jun 5, 2024

0xArdi left a comment

gabrielfior Jun 7, 2024

gabrielfior commented Jun 7, 2024

0xArdi left a comment

Marketplace of tools (1/N) #237

Marketplace of tools (1/N) #237

Conversation

gabrielfior commented Jun 4, 2024

Proposed changes

Types of changes

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0xArdi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabrielfior commented Jun 5, 2024

0xArdi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabrielfior commented Jun 7, 2024

0xArdi left a comment

Choose a reason for hiding this comment