pinokiod 1.2.31 → 1.2.33

package/kernel/api/goto/index.js

@@ -8,8 +8,17 @@ module.exports = async (req, ondata, kernel) => {
       }
     }
   */
-  if (req.params && typeof req.params.index !== "undefined") {
+  if (req.params.hasOwnProperty("index")) {
     req.next = req.params.index
-    return req.params.input
+  } else if (req.params.hasOwnProperty("id")) {
+    // find the req.next
+    let run = req.parent.body.run
+    for(let i=0; i<run.length; i++) {
+      let step = run[i]
+      if (step && step.id === req.params.id) {
+        req.next = i
+      }
+    }
   }
+  return req.params.input
 }

package/kernel/api/gradio/index.js

@@ -0,0 +1,60 @@
+class Gradio {
+  /*
+  {
+    "method": "gradio.predict",
+    "params": {
+      uri: <uri>,
+      path: "/answer_question_1"
+      params: [
+        { image: <filepath> }, 
+        { video: <uri> },
+        <str>
+      ]
+    }
+  }
+  */
+  async predict(req, ondata, kernel) {
+    if (!this.client) {
+      const dynamic = new Function('modulePath', 'return import(modulePath)');
+      const { client } = await dynamic('node-gradio-client');
+      //const { client } = await dynamic('@gradio/client');
+      this.client = client
+    }
+    const app = await this.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)
+//      }
+//    }
+
+    let args = req.params.params
+    console.log("args", args)
+    let res = await app.predict(req.params.path, args)
+    return res
+  }
+}
+module.exports = Gradio

package/kernel/api/import/index.js

@@ -0,0 +1,14 @@
+module.exports = async (req, ondata, kernel) => {
+  /*
+    req := {
+      "method": "import",
+      "params": {
+        <name>: <uri>|<relative_filepath>|<absolute_filepath>,
+        <name>: <uri>|<relative_filepath>|<absolute_filepath>,
+      }
+    }
+  */
+  let imported = kernel.import(req.params, req.cwd)
+  console.log("IMPORTED", imported)
+  return imported
+}

package/kernel/api/index.js

@@ -488,7 +488,7 @@ class Api {
   }
   async step (request, rawrpc, input, i, total, args) {
 
-    await this.kernel.api.init()
+    await this.init()
 
     // clear global regular expression object RegExp.lastMatch (memory leak prevention)
     let r = /\s*/g.exec("");
@@ -518,6 +518,8 @@ class Api {
     this.executing = request
 
 
+    console.log("memory", memory)
+
     // render until `{{ }}` pattern does not exist
     // 1. render once
     let rpc = rawrpc
@@ -540,6 +542,8 @@ class Api {
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
 
+    console.log("rpc", rpc)
+
     // 6. rpc must have method names
     if (rpc.method) {
 

package/kernel/api/local/index.js

@@ -1,6 +1,30 @@
 const set = require("../set")
 const rm = require("../rm")
 class Local {
+  async import(req, ondata, kernel) {
+    /*
+      req := {
+        "method": "local.import",
+        "params": {
+          <name>: <uri>|<relative_filepath>|<absolute_filepath>,
+          <name>: <uri>|<relative_filepath>|<absolute_filepath>,
+        }
+      }
+    */
+    let imported = kernel.import("local", req.params, req.cwd)
+    console.log("IMPORTED", imported)
+
+    let converted = Object.assign({}, req, {
+      params: {
+        local: imported
+      }
+    })
+    console.log("converted", converted)
+    let res = await set(converted, ondata, kernel)
+
+    console.log("memory", JSON.stringify(kernel.memory, null, 2))
+    return res
+  }
   async set(req, ondata, kernel) {
     /*
       req := {

package/kernel/api/script/index.js

@@ -1,5 +1,20 @@
 const path = require('path')
 class Script {
+  async start(req, ondata, kernel) {
+    let res = await this.run(req, ondata, kernel)
+    return res
+  }
+  async stop(req, ondata, kernel) {
+    // stop the script
+    kernel.api.stop({
+      params: {
+        uri: req.params.uri
+      }
+    })
+    ondata({
+      raw: `\r\nStopped ${req.params.uri}\r\n`
+    })
+  }
   async run(req, ondata, kernel) {
     /*
       {

package/kernel/api/self/index.js

@@ -40,6 +40,7 @@ class Self {
         self: req.params
       }
     })
+    console.log({ req, converted })
     let res = await set(converted, ondata, kernel)
     return res
   }

package/kernel/index.js

@@ -45,6 +45,19 @@ class Kernel {
       this.procs[uri] = undefined
     }
   }
+  import(type, params, cwd) {
+    /*
+      type := "local" | "global"
+    */
+    let o = {}
+    for(let key in params) {
+      // get memory for each uri
+      let uri = params[key]
+      let fpath = this.api.filePath(uri, cwd)
+      o[key] = this.memory[type][fpath]
+    }
+    return o
+  }
   local(...args) {
     // get local variables at path
     let filePath = this.api.filePath(path.resolve(...args))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.2.31",
+  "version": "1.2.33",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -43,6 +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.2",
     "node-pty-prebuilt-multiarch-cp": "^0.10.1-pre.48",
     "open": "8.4.2",
     "pdrive": "^0.0.23",