Remove result in UI after executed (#186)

* add sr deprecated message * remove the ui update after executed * Update llm.py * reformat * refine ci * cacne in progress ci
siliconflow · Oct 26, 2024 · d192239 · d192239
1 parent aa7ba1a
commit d192239
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 94 deletions.
diff --git a/.github/workflows/workflow-ci.yml b/.github/workflows/workflow-ci.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   check-modified-files:
     runs-on: ubuntu-latest
@@ -16,10 +20,14 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Fetch target branch
+      run: |
+        git fetch origin ${{ github.base_ref }} --depth=1
+
     - name: Check modified files
       id: check_files
       run: |
-        modified_files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }})
+        modified_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
         only_non_code_files=true
         for file in $modified_files; do
           if [[ "$file" == *.py ]] || [[ "$file" == *.js ]] || [[ "$file" == *.json ]]; then

diff --git a/js/siliconcloud_llm_api.js b/js/siliconcloud_llm_api.js
@@ -1,95 +1,5 @@
 import { app } from "../../scripts/app.js";
-import { ComfyWidgets } from "../../scripts/widgets.js";
 
-app.registerExtension({
-    name: "bizyair.siliconcloud.llm.api.populate",
-    async beforeRegisterNodeDef(nodeType, nodeData, app) {
-        if (nodeData.name === "BizyAirSiliconCloudLLMAPI") {
-            function populate(text) {
-                if (this.widgets) {
-                    const pos = this.widgets.findIndex((w) => w.name === "showtext");
-                    if (pos !== -1) {
-                        for (let i = pos; i < this.widgets.length; i++) {
-                            this.widgets[i].onRemove?.();
-                        }
-                        this.widgets.length = pos;
-                    }
-                }
-
-                for (const list of text) {
-                    const w = ComfyWidgets["STRING"](this, "showtext", ["STRING", { multiline: true }], app).widget;
-                    w.inputEl.readOnly = true;
-                    w.inputEl.style.opacity = 0.6;
-                    w.value = list;
-                }
-
-                requestAnimationFrame(() => {
-                    const sz = this.computeSize();
-                    if (sz[0] < this.size[0]) {
-                        sz[0] = this.size[0];
-                    }
-                    if (sz[1] < this.size[1]) {
-                        sz[1] = this.size[1];
-                    }
-                    this.onResize?.(sz);
-                    app.graph.setDirtyCanvas(true, false);
-                });
-            }
-
-            const onExecuted = nodeType.prototype.onExecuted;
-            nodeType.prototype.onExecuted = function (message) {
-                onExecuted?.apply(this, arguments);
-                populate.call(this, message.text);
-            };
-        }
-    },
-});
-
-app.registerExtension({
-    name: "bizyair.siliconcloud.vlm.api.populate",
-    async beforeRegisterNodeDef(nodeType, nodeData, app) {
-        if (nodeData.name === "BizyAirSiliconCloudVLMAPI") {
-            function populate(text) {
-                if (this.widgets) {
-                    const pos = this.widgets.findIndex((w) => w.name === "showtext");
-                    if (pos !== -1) {
-                        for (let i = pos; i < this.widgets.length; i++) {
-                            this.widgets[i].onRemove?.();
-                        }
-                        this.widgets.length = pos;
-                    }
-                }
-
-                for (const list of text) {
-                    const w = ComfyWidgets["STRING"](this, "showtext", ["STRING", { multiline: true }], app).widget;
-                    w.inputEl.readOnly = true;
-                    w.inputEl.style.opacity = 0.6;
-                    w.value = list;
-                }
-
-                requestAnimationFrame(() => {
-                    const sz = this.computeSize();
-                    if (sz[0] < this.size[0]) {
-                        sz[0] = this.size[0];
-                    }
-                    if (sz[1] < this.size[1]) {
-                        sz[1] = this.size[1];
-                    }
-                    this.onResize?.(sz);
-                    app.graph.setDirtyCanvas(true, false);
-                });
-            }
-
-            const onExecuted = nodeType.prototype.onExecuted;
-            nodeType.prototype.onExecuted = function (message) {
-                onExecuted?.apply(this, arguments);
-                populate.call(this, message.text);
-            };
-        }
-    },
-});
-
-// 通用的模型获取和更新函数
 const createModelFetchExtension = (nodeName, endpoint) => {
     return {
         name: `bizyair.siliconcloud.${nodeName.toLowerCase()}.api.model_fetch`,

diff --git a/llm.py b/llm.py
@@ -116,7 +116,7 @@ def get_llm_model_response(
         )
         ret = json.loads(response)
         text = ret["choices"][0]["message"]["content"]
-        return {"ui": {"text": (text,)}, "result": (text,)}
+        return (text,)  # if update ui:  {"ui": {"text": (text,)}, "result": (text,)}
 
 
 class SiliconCloudVLMAPI:
@@ -183,7 +183,7 @@ def get_vlm_model_response(
         )
         ret = json.loads(response)
         text = ret["choices"][0]["message"]["content"]
-        return {"ui": {"text": (text,)}, "result": (text,)}
+        return (text,)
 
 
 class BizyAirJoyCaption:
@@ -269,7 +269,7 @@ def joycaption(self, image, do_sample, temperature, max_tokens):
             raise Exception(f"Unexpected response type: {msg}")
 
         caption = msg["data"]
-        return {"ui": {"text": (caption,)}, "result": (caption,)}
+        return (caption,)
 
 
 NODE_CLASS_MAPPINGS = {