Toolmarketplace (#1098)

* fixed toolconfig update when installed from marketplace * toolconfig and toolkit test fix
TransformerOptimus · Aug 22, 2023 · c990e16 · c990e16
1 parent ccc108f
commit c990e16
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/superagi/controllers/toolkit.py b/superagi/controllers/toolkit.py
@@ -157,7 +157,7 @@ def install_toolkit_from_marketplace(toolkit_name: str,
                            folder_name=tool['folder_name'], class_name=tool['class_name'], file_name=tool['file_name'],
                            toolkit_id=db_toolkit.id)
     for config in toolkit['configs']:
-        ToolConfig.add_or_update(session=db.session, toolkit_id=db_toolkit.id, key=config['key'], value=config['value'])
+        ToolConfig.add_or_update(session=db.session, toolkit_id=db_toolkit.id, key=config['key'], value=config['value'], key_type = config['key_type'], is_secret = config['is_secret'], is_required = config['is_required'])
     return {"message": "ToolKit installed successfully"}
 
 
@@ -364,4 +364,4 @@ def update_toolkit(toolkit_name: str, organisation: Organisation = Depends(get_u
 
     for tool_config_key in marketplace_toolkit["configs"]:
         ToolConfig.add_or_update(db.session, toolkit_id=update_toolkit.id,
-                                 key=tool_config_key["key"])
+                                 key=tool_config_key["key"], key_type = tool_config_key['key_type'], is_secret = tool_config_key['is_secret'], is_required = tool_config_key['is_required'])
diff --git a/tests/unit_tests/controllers/test_toolkit.py b/tests/unit_tests/controllers/test_toolkit.py
@@ -7,6 +7,7 @@
 from superagi.models.organisation import Organisation
 from superagi.models.tool import Tool
 from superagi.models.tool_config import ToolConfig
+from superagi.types.key_type import ToolConfigKeyType
 from superagi.models.toolkit import Toolkit
 
 client = TestClient(app)
@@ -86,11 +87,18 @@ def mock_toolkit_details():
         "configs": [
             {
                 "key": "config_key_1",
-                "value": "config_value_1"
+                "value": "config_value_1",
+                'key_type': ToolConfigKeyType.STRING,
+                'is_secret': True,
+                'is_required': False
             },
             {
                 "key": "config_key_2",
-                "value": "config_value_2"
+                "value": "config_value_2",
+                'key_type': ToolConfigKeyType.FILE,
+                'is_secret': True,
+                'is_required': False
+
             }
         ]
     }