fix: use lists as sets are not supported by the framework

valory-xyz · Sep 20, 2023 · 86879d1 · 86879d1
1 parent d9535df
commit 86879d1
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/packages/valory/agents/trader/aea-config.yaml b/packages/valory/agents/trader/aea-config.yaml
@@ -188,9 +188,9 @@ models:
       slippage: ${float:0.01}
       redeem_margin_days: ${int:15}
       epsilon: ${float:0.1}
-      irrelevant_tools: ${set:{"openai-text-davinci-002", "openai-text-davinci-003", "openai-gpt-3.5-turbo", 
+      irrelevant_tools: ${list:["openai-text-davinci-002", "openai-text-davinci-003", "openai-gpt-3.5-turbo", 
         "openai-gpt-4", "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"}}
+        "stabilityai-stable-diffusion-512-v2-1", "stabilityai-stable-diffusion-768-v2-1"]}
 ---
 public_id: valory/p2p_libp2p_client:0.1.0
 type: connection

diff --git a/packages/valory/services/trader/service.yaml b/packages/valory/services/trader/service.yaml
@@ -105,10 +105,10 @@ type: skill
         slippage: ${SLIPPAGE:float:0.01}
         redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15}
         epsilon: ${EPSILON:float:0.1}
-        irrelevant_tools: ${IRRELEVANT_TOOLS:set:{"openai-text-davinci-002", "openai-text-davinci-003", 
+        irrelevant_tools: ${IRRELEVANT_TOOLS:list:["openai-text-davinci-002", "openai-text-davinci-003", 
           "openai-gpt-3.5-turbo", "openai-gpt-4", "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"}}
+          "stabilityai-stable-diffusion-768-v2-1"]}
     benchmark_tool: &id005
       args:
         log_dir: ${LOG_DIR:str:/benchmarks}
@@ -174,10 +174,10 @@ type: skill
         slippage: ${SLIPPAGE:float:0.01}
         redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15}
         epsilon: ${EPSILON:float:0.1}
-        irrelevant_tools: ${IRRELEVANT_TOOLS:set:{"openai-text-davinci-002", "openai-text-davinci-003", 
+        irrelevant_tools: ${IRRELEVANT_TOOLS:list:["openai-text-davinci-002", "openai-text-davinci-003", 
           "openai-gpt-3.5-turbo", "openai-gpt-4", "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"}}
+          "stabilityai-stable-diffusion-768-v2-1"]}
     benchmark_tool: *id005
 2:
   models:
@@ -241,10 +241,10 @@ type: skill
         slippage: ${SLIPPAGE:float:0.01}
         redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15}
         epsilon: ${EPSILON:float:0.1}
-        irrelevant_tools: ${IRRELEVANT_TOOLS:set:{"openai-text-davinci-002", "openai-text-davinci-003", 
+        irrelevant_tools: ${IRRELEVANT_TOOLS:list:["openai-text-davinci-002", "openai-text-davinci-003", 
           "openai-gpt-3.5-turbo", "openai-gpt-4", "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"}}
+          "stabilityai-stable-diffusion-768-v2-1"]}
     benchmark_tool: *id005
 3:
   models:
@@ -308,10 +308,10 @@ type: skill
         slippage: ${SLIPPAGE:float:0.01}
         redeem_margin_days: ${REDEEM_MARGIN_DAYS:int:15}
         epsilon: ${EPSILON:float:0.1}
-        irrelevant_tools: ${IRRELEVANT_TOOLS:set:{"openai-text-davinci-002", "openai-text-davinci-003", 
+        irrelevant_tools: ${IRRELEVANT_TOOLS:list:["openai-text-davinci-002", "openai-text-davinci-003", 
           "openai-gpt-3.5-turbo", "openai-gpt-4", "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"}}
+          "stabilityai-stable-diffusion-768-v2-1"]}
     benchmark_tool: *id005
 ---
 public_id: valory/ledger:0.19.0

diff --git a/packages/valory/skills/decision_maker_abci/models.py b/packages/valory/skills/decision_maker_abci/models.py
@@ -126,7 +126,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         self.agent_registry_address: str = self._ensure(
             "agent_registry_address", kwargs, str
         )
-        self.irrelevant_tools: set = self._ensure("irrelevant_tools", kwargs, set)
+        self.irrelevant_tools: set = set(self._ensure("irrelevant_tools", kwargs, list))
         super().__init__(*args, **kwargs)
 
     @property

diff --git a/packages/valory/skills/decision_maker_abci/skill.yaml b/packages/valory/skills/decision_maker_abci/skill.yaml
@@ -183,15 +183,15 @@ models:
       redeeming_batch_size: 5
       slippage: 0.01
       epsilon: 0.1
-      irrelevant_tools: !!set
-        ? openai-text-davinci-002
-        ? openai-text-davinci-003
-        ? openai-gpt-3.5-turbo
-        ? openai-gpt-4
-        ? 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
+      irrelevant_tools:
+      - openai-text-davinci-002
+      - openai-text-davinci-003
+      - openai-gpt-3.5-turbo
+      - openai-gpt-4
+      - 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
     class_name: DecisionMakerParams
   mech_response:
     args:

diff --git a/packages/valory/skills/trader_abci/skill.yaml b/packages/valory/skills/trader_abci/skill.yaml
@@ -170,15 +170,15 @@ models:
       slippage: 0.01
       redeem_margin_days: 15
       epsilon: 0.1
-      irrelevant_tools: !!set
-        ? openai-text-davinci-002
-        ? openai-text-davinci-003
-        ? openai-gpt-3.5-turbo
-        ? openai-gpt-4
-        ? 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
+      irrelevant_tools:
+      - openai-text-davinci-002
+      - openai-text-davinci-003
+      - openai-gpt-3.5-turbo
+      - openai-gpt-4
+      - 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
     class_name: TraderParams
   network_subgraph:
     args: