Merge pull request modelscope#4 from qbc2016/dev_input_refine

refine input
DavdGao · Jun 6, 2024 · b81b935 · b81b935
2 parents e41a701 + 3ba8269
commit b81b935
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 24 deletions.
diff --git a/setup.py b/setup.py
@@ -23,6 +23,7 @@
     "protobuf==4.25.0",
     "expiringdict",
     "dill",
+    "psutil",
 ]
 
 service_requires = [
@@ -50,6 +51,11 @@
     "black",
 ]
 
+studio_requires = [
+    "appdirs",
+    "flask_sqlalchemy",
+]
+
 # released requires
 minimal_requires = [
     "docstring_parser",
@@ -85,6 +91,7 @@
     + doc_requires
     + test_requires
     + gradio_requires
+    + studio_requires
 )
 
 with open("README.md", "r", encoding="UTF-8") as fh:

diff --git a/src/agentscope/web/studio/_app.py b/src/agentscope/web/studio/_app.py
@@ -99,7 +99,7 @@ def close_a_request(cls, run_id: str, agent_id: str) -> None:
             cls._requests[run_id].pop(agent_id)
 
 
-class Run(db.Model):
+class Run(db.Model):  # type: ignore[name-defined]
     """Runtime object."""
 
     run_id = db.Column(db.String, primary_key=True)

diff --git a/src/agentscope/web/studio/static/css/workstation.css b/src/agentscope/web/studio/static/css/workstation.css
@@ -832,4 +832,11 @@ pre[class*="language-"] {
     to {
         opacity: 1;
     }
+}
+
+.text-input {
+    font-family: Arial, sans-serif;
+    font-size: 16px;
+    line-height: 1.2;
+    resize: vertical;
 }
diff --git a/src/agentscope/web/studio/static/html-drag-components/agent-dialogagent.html b/src/agentscope/web/studio/static/html-drag-components/agent-dialogagent.html
@@ -22,8 +22,8 @@
         <br>
 
         <label>System prompt</label>
-        <input type="text" df-args-sys_prompt
-               placeholder="You're an assistant." data-required="true">
+        <textarea type="text" df-args-sys_prompt  class="text-input"
+               placeholder="You're an assistant." data-required="true"></textarea>
         <br>
 
         <label>Model config name</label>

diff --git a/src/agentscope/web/studio/static/html-drag-components/agent-dictdialogagent.html b/src/agentscope/web/studio/static/html-drag-components/agent-dictdialogagent.html
@@ -23,8 +23,8 @@
         <br>
 
         <label>System prompt</label>
-        <input type="text" df-args-sys_prompt
-               placeholder="You're an assistant." data-required="true">
+        <textarea type="text" df-args-sys_prompt  class="text-input"
+               placeholder="You're an assistant." data-required="true"></textarea>
         <br>
 
         <label>Model config name</label>

diff --git a/src/agentscope/web/studio/static/html-drag-components/agent-reactagent.html b/src/agentscope/web/studio/static/html-drag-components/agent-reactagent.html
@@ -25,8 +25,9 @@
         <br>
 
         <label>System prompt</label>
-        <input type="text" df-args-sys_prompt
-               placeholder="You're an assistant.">
+        <textarea type="text" df-args-sys_prompt  class="text-input"
+               placeholder="You're an assistant."
+                  data-required="true"></textarea>
         <br>
 
         <label>Model config name</label>

diff --git a/src/agentscope/web/studio/static/js/workstation.js b/src/agentscope/web/studio/static/js/workstation.js
@@ -132,6 +132,7 @@ async function initializeWorkstationPage() {
         setupNodeListeners(id);
         setupNodeCopyListens(id);
         addEventListenersToNumberInputs(id);
+        setupTextInputListeners(id);
     })
 
     editor.on('nodeRemoved', function (id) {
@@ -769,6 +770,20 @@ async function addNodeToDrawFlow(name, pos_x, pos_y) {
     }
 }
 
+function setupTextInputListeners(nodeId) {
+    const newNode = document.getElementById(`node-${nodeId}`);
+    if (newNode) {
+        const stopPropagation = function(event) {
+            event.stopPropagation();
+        };
+        newNode.addEventListener('mousedown', function(event) {
+            const target = event.target;
+            if (target.tagName === 'TEXTAREA' || target.tagName === 'INPUT') {
+                stopPropagation(event);
+            }
+        }, false);
+    }
+}
 
 function toggleAdvanced() {
     var advancedBox = document.querySelector('.advanced-box');
@@ -1260,7 +1275,6 @@ function checkConditions() {
         console.log("node", node);
         console.log("node.inputs", node.inputs);
 
-
         if (node.inputs) {
             for (let inputKey in node.inputs) {
                 if (node.inputs[inputKey].connections &&
@@ -1277,22 +1291,6 @@ function checkConditions() {
             }
         }
 
-        if (node.outputs) {
-            for (let outputKey in node.outputs) {
-                if (node.outputs[outputKey].connections &&
-                    node.outputs[outputKey].connections.length > 1) {
-                    Swal.fire({
-                        title: 'Invalid Connections',
-                        text:
-                            `${node.name} has more than one connection in outputs.`,
-                        icon: 'error',
-                        confirmButtonText: 'Ok'
-                    });
-                    return false;
-                }
-            }
-        }
-
         let nodeElement = document.getElementById('node-' + nodeId);
         const requiredInputs = nodeElement.querySelectorAll('input[data-required="true"]');