pinokiod 1.2.42 → 1.2.44

package/kernel/api/gradio/index.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const { client } = require('node-gradio-client')
 class Gradio {
   /*
   {
@@ -6,6 +7,7 @@ class Gradio {
     "params": {
       uri: <uri>,
       path: "/answer_question_1"
+      //on: "{{payload.data.translation}}"
       params: [
         { image: <filepath> }, 
         { video: <uri> },
@@ -15,59 +17,8 @@ class Gradio {
   }
   */
   async predict(req, ondata, kernel) {
-    if (!this.client) {
-      const gradio_path = path.resolve(__dirname, '../../../node_modules/node-gradio-client/dist')
-      //const gradio_path = path.resolve(__dirname, '../../../node_modules/node-gradio-client/dist/index.mjs')
-      //const gradio_path = path.resolve(__dirname, '../../../node_modules/node-gradio-client')
-      //const gradio_path = "node-gradio-client"
-      //const gradio_path = path.resolve(__dirname, 'node-gradio-client')
-      //const gradio_path = path.resolve(__dirname, 'node-gradio-client')
-      //const gradio_path = path.resolve(__dirname, '../../../node_modules/node-gradio-client/dist/index.js')
-      console.log("gradio_path", gradio_path)
-      //const gradio_path = 'node-gradio-client'
-      const dynamic = new Function('modulePath', 'return import(modulePath)');
-      const { client } = await dynamic(gradio_path)
-//      const { client } = await import(gradio_path)
-      //const { client } = require(gradio_path)
-      console.log("Client", client)
-      //const { client } = await dynamic('@gradio/client');
-      this.client = client
-    }
-    const app = await this.client(req.params.uri)
-//    console.log("PREDICT", client)
-    //const app = await client(req.params.uri)
-
-
-    // params parsing
-//    let args = []
-//    for(let param of req.params.params) {
-//      if (typeof param === 'object') {
-//        let key = Object.keys(param)[0]
-//        let val = param[key]
-//
-//        if (val.startsWith("http")) {
-//          // http url
-//          const response = await fetch(param.uri)
-//          const blob = await response.blob();
-//          args.push(blob)
-//        } else {
-//          // file path
-//          const buffer = await fs.promises.readFile(param.file)
-//          args.push(buffer)
-//        }
-//
-//        if (param.file) {
-//          // open file
-//        } else if (param.uri) {
-//          // fetch uri
-//        }
-//      } else {
-//        args.push(param)
-//      }
-//    }
-
+    const app = await client(req.params.uri)
     let args = req.params.params
-    console.log("Args", args)
     let res = await app.predict(req.params.path, args)
     return res
   }

package/kernel/api/script/index.js

@@ -5,15 +5,24 @@ class Script {
     return res
   }
   async stop(req, ondata, kernel) {
-    // stop the script
-    kernel.api.stop({
-      params: {
-        uri: req.params.uri
+    console.log("script.stop", req)
+    /*
+      {
+        "method": "script.run",
+        "params": {
+          "uri": <string>|<array>
+        }
       }
-    })
-    ondata({
-      raw: `\r\nStopped ${req.params.uri}\r\n`
-    })
+    */
+    // stop the script
+    let uris = req.params.uri
+    if (!Array.isArray(uris)) {
+      uris = [uris]
+    }
+    for(let uri of uris) {
+      kernel.api.stop({ params: { uri } })
+      ondata({ raw: `\r\nStopped ${req.params.uri}\r\n` })
+    }
   }
   async run(req, ondata, kernel) {
     /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.2.42",
+  "version": "1.2.44",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -43,7 +43,7 @@
     "multer": "^1.4.5-lts.1",
     "node-calls-python": "^1.8.2",
     "node-downloader-helper": "^2.1.9",
-    "node-gradio-client": "^0.14.4",
+    "node-gradio-client": "^0.14.6",
     "node-pty-prebuilt-multiarch-cp": "^0.10.1-pre.48",
     "open": "8.4.2",
     "pdrive": "^0.0.23",