Dev custom widgets

.github/workflows/package-and-upload-new-linux.yaml

@@ -67,7 +67,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build

.github/workflows/package-and-upload-new-mac.yaml

@@ -67,7 +67,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build

.github/workflows/package-and-upload-new-windows.yaml

@@ -66,7 +66,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build
@@ -125,7 +125,7 @@ jobs:
           overwrite: true
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./web-build

.github/workflows/package-and-upload.yaml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./web-build
@@ -94,7 +94,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build
@@ -172,7 +172,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build
@@ -222,7 +222,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build

.github/workflows/package-test.yaml

@@ -57,7 +57,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build
@@ -127,7 +127,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build
@@ -169,7 +169,7 @@ jobs:
           python-version: 3.10.10
 
       - name: Download web-build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: web-build
           path: ./servers/web-build

.gitignore

@@ -26,3 +26,4 @@ hf_repo
 launch.sh
 .idea/
 .DS_Store
+custom_widgets/*/

assets/myshell_widget_list.json

@@ -1,4 +1,65 @@
 {
+  "1892877244783509504": {
+    "id": "1892877244783509504",
+    "name": "API Widget",
+    "description": "API Widget",
+    "usage": "Tools",
+    "inputs": {
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "API endpoint URL",
+          "default": ""
+        },
+        "method": {
+          "type": "string",
+          "description": "HTTP method",
+          "enum": [
+            "GET",
+            "POST",
+            "PUT",
+            "DELETE"
+          ],
+          "default": "GET"
+        },
+        "headers": {
+          "type": "string",
+          "description": "Request headers (JSON format)",
+          "default": "{}"
+        },
+        "params": {
+          "type": "string",
+          "description": "URL parameters (JSON format)",
+          "default": "{}"
+        },
+        "data": {
+          "type": "string",
+          "description": "Request body (JSON format)",
+          "default": "{}"
+        }
+      },
+      "required": [
+        "url"
+      ]
+    },
+    "outputs": {
+      "properties": {
+        "status_code": {
+          "type": "integer",
+          "description": "HTTP status code"
+        },
+        "headers": {
+          "type": "object",
+          "description": "Response headers"
+        },
+        "body": {
+          "type": "string",
+          "description": "Response body"
+        }
+      }
+    },
+    "widget_id": "1892877244783509504"
+  },
   "1781991963803181056": {
     "id": "1781991963803181056",
     "name": "Crawler",

custom_widget_info.json

@@ -1,8 +1,8 @@
 {
-    "proconfig-diffuser-imagen": {
-        "git": "https://github.com/wl-zhao/proconfig-diffuser-imagen.git",
-        "commit": "latest",
+    "custom_widget_demo": {
+        "git": "https://github.com/Cherwayway/custom_widget_demo.git",
+        "commit": "651f1c69cad4921d09e705802733aadae1aa9058",
         "branch": "main",
-        "description": "Simple image generation widget implemented by diffusers"
+        "description": "A demo widget for custom widgets"
     }
 }

proconfig/runners/runner.py

@@ -14,6 +14,7 @@
 
 from proconfig.utils.pytree import tree_map
 import proconfig.utils.pytree as pytree
+from proconfig.widgets.base import WIDGETS
 from proconfig.utils.expressions import calc_expression
 from proconfig.utils.misc import hash_dict
 from proconfig.core import Automata, Workflow, State
@@ -253,6 +254,14 @@ def process_myshell_extra_inputs(self, task):
             "inputs": copy.deepcopy(task.inputs)
         }
         task.inputs["myshell_actual_inputs"] = myshell_actual_inputs
+
+    def process_custom_widget_extra_inputs(self, task):
+        custom_widget_actual_inputs = {
+            "widget_name": task.widget_class_name,
+            "inputs": copy.deepcopy(task.inputs)
+        }
+        task.widget_class_name = "CustomAnyWidgetCallerWidget"
+        task.inputs["custom_widget_actual_inputs"] = custom_widget_actual_inputs
 
     def run_task(self, container, task, environ, local_vars):
 
@@ -262,6 +271,8 @@ def run_task(self, container, task, environ, local_vars):
             self.process_comfy_extra_inputs(task)
         elif task.widget_class_name == "MyShellAnyWidgetCallerWidget":
             self.process_myshell_extra_inputs(task)
+        elif not WIDGETS.get(task.widget_class_name):
+            self.process_custom_widget_extra_inputs(task)
 
         if task.mode in ["widget", "comfy_workflow"]:
             return self.run_widget_task(container, task, environ, local_vars)

proconfig/widgets/__init__.py

@@ -4,23 +4,51 @@
 os.environ[CURRENT_PACKAGE_NAME_KEY] = "myshell"
 from proconfig.widgets.utils import load_module
 from proconfig.widgets.base import build_widgets
+from proconfig.utils.widget_manager import install_widget
 
 import proconfig.widgets.imagen_widgets
 import proconfig.widgets.language_models
 import proconfig.widgets.tools
 import proconfig.widgets.myshell_widgets
+import proconfig.widgets.custom_widgets
 # load custom widgets
 
 import os
 
 def load_custom_widgets():
-    widget_status = json.load(open("custom_widgets/widgets_status.json"))
-    for custom_widget in os.listdir("custom_widgets"):
-        if not os.path.isdir(os.path.join("custom_widgets", custom_widget)):
-            continue
-        if custom_widget in widget_status:
-            current_commit = widget_status[custom_widget]["current_commit"]
-            os.environ[CURRENT_PACKAGE_NAME_KEY] = custom_widget
-            load_module(os.path.join(custom_widget, current_commit), "custom_widgets", module_name=custom_widget)
-
+    try:
+        with open("custom_widget_info.json", "r") as f:
+            widget_info = json.load(f)
+        # Remove custom_widget_demo if it exists
+        if "custom_widget_demo" in widget_info:
+            del widget_info["custom_widget_demo"]
+    except FileNotFoundError:
+        widget_info = {}
+
+    # Get list of existing widget directories
+    existing_widgets = set(d for d in os.listdir("custom_widgets") 
+                         if os.path.isdir(os.path.join("custom_widgets", d)))
+
+    # Install widgets from widget_info that don't exist
+    for widget_name, widget_data in widget_info.items():
+        if widget_name not in existing_widgets:
+            # Extract git URL from widget_data if it's a dictionary
+            install_widget(
+                widget_data["git"], 
+                os.path.join("custom_widgets", widget_name),
+                widget_data.get("commit", None),
+                widget_data.get("branch", "main")
+            )
+
+    # Update existing widget list, filter out non-directory files
+    existing_widgets = set(d for d in os.listdir("custom_widgets") 
+                         if os.path.isdir(os.path.join("custom_widgets", d)) 
+                         and not d.startswith('.') 
+                         and not d.startswith('__'))
+
+    # Load all widgets from custom_widgets directory
+    for custom_widget in existing_widgets:
+        os.environ[CURRENT_PACKAGE_NAME_KEY] = custom_widget
+        load_module(custom_widget, "custom_widgets", module_name=custom_widget)
+
 load_custom_widgets()

proconfig/widgets/custom_widgets/__init__.py

@@ -0,0 +1 @@
+from proconfig.widgets.custom_widgets.custom_widget_caller import CustomAnyWidgetCallerWidget

proconfig/widgets/custom_widgets/custom_widget_caller.py

@@ -0,0 +1,75 @@
+from typing import Any, Literal, Optional, List
+from pydantic import Field, BaseModel
+
+from proconfig.widgets.base import BaseWidget, WIDGETS
+from proconfig.core.exception import ShellException
+
+# import instructor
+import os
+from pydantic import BaseModel, Field
+import requests
+import json
+
+@WIDGETS.register_module()
+class CustomAnyWidgetCallerWidget(BaseWidget):
+    NAME = "CustomAnyWidgetCallerWidget"
+    dynamic_schema = True
+
+    class InputsSchema(BaseWidget.InputsSchema):
+        widget_name: str = Field(..., description="the widget name to call")
+        inputs: dict = {}
+
+    class OutputsSchema(BaseWidget.OutputsSchema): # useless
+        data: str | list
+
+    def execute(self, environ, config_ori):
+        # API endpoint URL
+        url = "https://openapi.myshell.ai/public/v1/custom_widget/run"
+        if "MYSHELL_DEPLOY" in os.environ and os.environ["MYSHELL_DEPLOY"] == "TEST":
+            url = "https://openapi-test.myshell.fun/public/v1/custom_widget/run"
+        config = config_ori["custom_widget_actual_inputs"]
+        widget_name = config["widget_name"]
+
+        # Headers for the API request
+        headers = {
+            "x-myshell-openapi-key": os.environ["MYSHELL_API_KEY"],
+            "Content-Type": "application/json",
+            **environ.get("MYSHELL_HEADERS", {})
+        }
+
+        # Request payload
+        data = {
+            "widget_name": widget_name,
+            "input": json.dumps(config["inputs"])
+        }
+
+        del config_ori["custom_widget_actual_inputs"]
+
+        # print("widget inputs:", config["inputs"])
+
+        # Send POST request to the API
+        response = requests.post(url, headers=headers, json=data)
+
+        # Parse the JSON response
+        json_response = response.json()
+
+        # Extract the 'result' field and return it as a string
+        if json_response.get('success') and 'result' in json_response:
+            result = json.loads(json_response['result'])
+            # handle the _url
+            if "_url" in result:
+                response = requests.get(result["_url"])
+                if response.status_code == 200:
+                    return response.json()
+                else:
+                    return {"error_message": "error when retrieve the result"}
+            return result
+        else:
+            error = {
+                'error_code': 'SHELL-1102',
+                'error_head': 'Widget Execution Error', 
+                'msg': f'widget {widget_name} failed to execute',
+                'traceback': json.dumps(json_response),
+            }
+            exception = ShellException(**error)
+            raise exception