Merge pull request #288 from unarxiv/xzyaoi/feat/envs-for-runner

Xzyaoi/feat/envs for runner

Makefile

@@ -28,7 +28,7 @@ docs:
 	cd docs && npm run docs:build
 
 package:
-	python setup.py sdist bdist_wheel
+	python3 setup.py sdist bdist_wheel
 
 clean:
 	rm -rf build

cli/daemon.go

@@ -8,7 +8,9 @@ You can uninstall that service by using cvpm daemon uninstall */
 package main
 
 import (
+	"bytes"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"net/http/httputil"
@@ -229,17 +231,26 @@ func ReverseProxy(c *gin.Context) {
 		})
 	}
 	// the solver is running
+	body, err := ioutil.ReadAll(c.Request.Body)
+	log.Println(body)
+	if err != nil {
+		log.Println(err)
+		raven.CaptureErrorAndWait(err, nil)
+	}
 	target := url.URL{
 		Scheme: "http",
 		Host:   "localhost:" + runningPort,
 		Path:   "/infer",
 	}
+
 	director := func(req *http.Request) {
 		req.Host = target.Host
 		req.URL.Host = req.Host
 		req.URL.Scheme = target.Scheme
 		req.URL.Path = target.Path
+		req.Body = ioutil.NopCloser(bytes.NewBuffer(body))
 	}
+
 	proxy := httputil.NewSingleHostReverseProxy(&target)
 	proxy.Director = director
 	proxy.ServeHTTP(c.Writer, c.Request)
@@ -262,10 +273,13 @@ func runServer(port string) {
 	}
 	r := gin.Default()
 	r.Use(BeforeResponse())
+	r.Use(gin.Recovery())
 	watchLogs(socketServer)
-	r.Use(static.Serve("/", static.LocalFile(webuiFolder, false)))
+	r.Use(static.Serve("/webui", static.LocalFile(webuiFolder, false)))
 	r.Use(auth.InspectorStats())
 	r.Use(gin.Logger())
+	// Reverse Proxy for solvers
+	r.POST("/engine/solvers/:vendor/:name/:solver", ReverseProxy)
 	// Status Related Handlers
 	r.GET("/status", func(c *gin.Context) {
 		c.JSON(http.StatusOK, gin.H{
@@ -284,8 +298,6 @@ func runServer(port string) {
 	r.GET("/solvers/running", GetRunningSolversHandler)
 	r.GET("/solvers/running/:vendor/:package", GetRunningSolversByPackageHandler)
 	r.DELETE("/solvers/running/:vendor/:name/:solver", StopInferProcess)
-	// Reverse Proxy for solvers
-	r.POST("/engine/solvers/:vendor/:name/:solver", ReverseProxy)
 	// Socket Related Routes
 	r.GET("/socket.io/", socketHandler)
 	r.POST("/socket.io/", socketHandler)

cli/handler.go

@@ -159,6 +159,7 @@ func InputAndParseConfigContent(label string, validate promptui.ValidateFunc) st
 	return result
 }
 
+// ConfigHandler Handles Config Related
 func ConfigHandler(c *cli.Context) {
 	prevConfig := readConfig()
 	var nextConfig CvpmConfig

cli/virtual.go

@@ -11,6 +11,12 @@
  */
 package main
 
+import (
+	"log"
+
+	"github.com/cvpm-contrib/database"
+)
+
 // Constants
 // SUPPORTEDVIRTUALENV declares all supported virtual environment method
 var SUPPORTEDVIRTUALENV = []string{"venv"}
@@ -24,6 +30,14 @@ type VirtualEnv struct {
 	RepositoryFolder   string
 }
 
+// EnvironmentVariable declares the envs for runner to RUN
+type EnvironmentVariable struct {
+	Key         string `db:"env-Key"`
+	Value       string `db:"env-Var"`
+	Vendor      string `db:"env-Vendor`
+	PackageName string `db:"env-PackageName"`
+}
+
 func (virtualenv VirtualEnv) validate() bool {
 	if isStringInSlice(virtualenv.Name, SUPPORTEDVIRTUALENV) {
 		return true
@@ -38,3 +52,32 @@ func (virtualenv VirtualEnv) initiate() {
 func (virtualenv VirtualEnv) triggerEnable() {
 
 }
+
+func QueryVariables(Vendor string, PackageName string) []EnvironmentVariable {
+	var envs []EnvironmentVariable
+	sess := database.GetDBInstance()
+	envCollection := sess.Collection("environment")
+	res := envCollection.Find()
+	err := res.All(&envs)
+	if err != nil {
+		log.Fatalf("res.All(): %q\n", err)
+	}
+	database.CloseDB(sess)
+	return envs
+}
+
+func AddNewEnvToPackage(Vendor string, PackageName string, Key string, Value string) {
+	envObject := EnvironmentVariable{
+		Vendor:      Vendor,
+		PackageName: PackageName,
+		Key:         Key,
+		Value:       Value,
+	}
+	sess := database.GetDBInstance()
+	envCollection := sess.Collection("environment")
+	err := envCollection.InsertReturning(&envObject)
+	if err != nil {
+		panic(err)
+	}
+	database.CloseDB(sess)
+}

cvpm/requirements.txt

@@ -1,4 +1,5 @@
 gevent
 flask
 toml
-psutil
+psutil
+pillow

cvpm/server.py

@@ -17,7 +17,7 @@
 server = Flask(__name__)
 
 ALLOWED_EXTENSIONS_TRAIN = set(['zip'])
-ALLOWED_EXTENSIONS_INFER = set(['jpg', 'jpeg', 'png'])
+ALLOWED_EXTENSIONS_INFER = set(['jpg', 'jpeg', 'png', 'zip'])
 UPLOAD_FOLDER = './temp'
 
 server.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER

cvpm/utility.py

@@ -1,6 +1,6 @@
 import os
 from urllib.request import urlopen
-
+from pathlib import Path
 import numpy as np
 import PIL.Image
 import requests
@@ -13,6 +13,14 @@ def load_image_file(file, mode='RGB'):
         im = im.convert(mode)
     return np.array(im)
 
+def save_image(filename,target_name):
+    home = str(Path.home())
+    assets_path = os.path.join(home, 'cvpm', 'webui','results')
+    target_file = os.path.join(assets_path, target_name)
+    if not os.path.isdir(assets_path):
+        os.makedirs(assets_path)
+    os.rename(filename, target_file)
+    return target_name
 
 class Downloader(object):
     def __init__(self):

dashboard/src/components/CVPM-Actions.vue

@@ -55,12 +55,16 @@ export default {
       }
     },
     vendor: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     },
     packageName: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   data () {

dashboard/src/components/CVPM-Repo-Meta.vue

@@ -51,10 +51,8 @@ export default {
   },
   props: {
     config: {
-      type: Object,
-      default: function () {
-        return {}
-      }
+      type: String,
+      default: ''
     },
     dependency: {
       type: String,

dashboard/src/components/CVPM-Repo-Solver.vue

@@ -100,12 +100,16 @@ export default {
       }
     },
     vendor: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     },
     packageName: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   data () {

dashboard/src/components/CVPM-Table.vue

@@ -58,6 +58,12 @@ export default {
     loading: {
       type: Boolean,
       default: false
+    },
+    items: {
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   data () {

dashboard/src/components/basic/CVPM-Image-Upload.vue

@@ -12,7 +12,7 @@
       ref="uploadInput"
       type="file"
       name="file"
-      accept="image/*"
+      accept="*"
       :multiple="false"
       @change="uploadFile($event)"
     >

dashboard/src/components/basic/CVPM-Solver-Selection.vue

@@ -31,12 +31,16 @@ export default {
       }
     },
     vendor: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     },
     packageName: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   data () {

dashboard/src/pages/Detail.vue

@@ -66,7 +66,7 @@ export default {
     return {
       readme: '',
       config: '',
-      parsedConfig: '',
+      parsedConfig: {},
       diskSize: '',
       dependency: '',
       messageList: []

dashboard/src/services/system.js

@@ -71,7 +71,7 @@ class SystemService {
       for (let i = 0; i < parameters.length; i++) {
         payload.append(parameters[i].key, parameters[i].value)
       }
-      axios.post(this.endpoint + '/solvers/' + vendor + '/' + packageName + '/' + solver, payload).then(function (res) {
+      axios.post(this.endpoint + '/engine/solvers/' + vendor + '/' + packageName + '/' + solver, payload).then(function (res) {
         resolve(res)
       }).catch(function (err) {
         reject(err)

setup.py

@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name="cvpm",
-    version="0.0.2.1",
+    version="0.0.2.4",
     author="Xiaozhe Yao",
     author_email="xiaozhe.yaoi@gmail.com",
     description="Computer Vision Package Manager",

templates/runner.tpl

@@ -0,0 +1,16 @@
+#coding:utf-8
+import os
+import argparse
+import sys
+os.chdir(sys.path[0])
+
+parser = argparse.ArgumentParser(description='CVPM Runner')
+parser.add_argument('port', type=int, help='Listening on Port')
+
+args = parser.parse_args()
+
+from {{Package}}.{{Filename}} import {{Classname}}
+
+solver = {{Classname}}()
+
+solver.start(args.port)