Merge pull request #278 from unarxiv/xzyaoi/feat/inspector

Xzyaoi/feat/inspector

cli/Gopkg.toml

@@ -108,15 +108,15 @@
 [prune]
   go-tests = true
   unused-packages = true
-
-[[constraint]]
-  name = "github.com/HouzuoGuo/tiedot"
-  version = "3.4.0"
-
+
 [[constraint]]
   branch = "master"
   name = "github.com/fatihkahveci/gin-inspector"
 
 [[constraint]]
   name = "gopkg.in/appleboy/gin-status-api.v1"
   version = "1.0.1"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/cvpm-contrib/auth"

cli/contrib.go

@@ -6,6 +6,7 @@
 package main
 
 import (
+	"io"
 	"net/http"
 
 	dataset "github.com/cvpm-contrib/dataset"
@@ -32,3 +33,10 @@ func AddNewRegistry(c *gin.Context) {
 		"status": "Finished",
 	})
 }
+
+// StreamCamera GET /camera
+func StreamCamera(c *gin.Context) {
+	c.Stream(func(w io.Writer) bool {
+		return true
+	})
+}

cli/daemon.go

@@ -15,6 +15,7 @@ import (
 	"net/url"
 	"path/filepath"
 
+	auth "github.com/cvpm-contrib/auth"
 	"github.com/fatih/color"
 	raven "github.com/getsentry/raven-go"
 	"github.com/gin-contrib/static"
@@ -263,7 +264,7 @@ func runServer(port string) {
 	r.Use(BeforeResponse())
 	watchLogs(socketServer)
 	r.Use(static.Serve("/", static.LocalFile(webuiFolder, false)))
-	r.Use(InspectorStats())
+	r.Use(auth.InspectorStats())
 	r.Use(gin.Logger())
 	// Status Related Handlers
 	r.GET("/status", func(c *gin.Context) {
@@ -289,11 +290,13 @@ func runServer(port string) {
 	r.GET("/socket.io/", socketHandler)
 	r.POST("/socket.io/", socketHandler)
 	// Contrib Related Routes
+	// Datasets
 	r.GET("/contrib/datasets", GetAllDatasets)
 	r.POST("/contrib/datasets/registries", AddNewRegistry)
+	// Camera
 	// Plugin Related Routes
 	r.GET("/_inspector", func(c *gin.Context) {
-		c.JSON(200, GetPaginator())
+		c.JSON(200, auth.GetRequests())
 	})
 	r.GET("/_api/status", api.StatusHandler)
 	// Socket Related Routes

cvpm/requirements.txt

@@ -1,3 +1,4 @@
 gevent
 flask
-toml
+toml
+psutil

cvpm/server.py

@@ -7,6 +7,7 @@
 from flask import Flask, request
 from werkzeug.datastructures import ImmutableMultiDict
 from werkzeug.utils import secure_filename
+import psutil
 
 # extensions
 
@@ -56,6 +57,15 @@ def help():
     help_message = server.solver.help_message
     return help_message
 
+@server.route("/_status", methods=["GET"])
+def status():
+    process = psutil.Process(os.getpid())
+    result = {
+        'memory': process.memory_info(),
+        'cpu_percent': process.cpu_percent(),
+        'id': process.pid
+    }
+    return json.dumps(result)
 
 @server.route("/infer", methods=["GET", "POST"])
 def infer():

dashboard/package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "@vuetify/vuex-cognito-module": "0.4.0",
     "axios": "0.18.0",
+    "dayjs": "^1.8.10",
     "eslint-plugin-html": "5.0.3",
     "flexsearch": "0.6.21",
     "js-base64": "2.5.1",

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

@@ -49,7 +49,26 @@ export default {
   components: {
     'vue-markdown': VueMarkdown
   },
-  props: ['config', 'dependency', 'diskSize', 'readme']
+  props: {
+    config: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    dependency: {
+      type: String,
+      default: ''
+    },
+    diskSize: {
+      type: String,
+      default: ''
+    },
+    readme: {
+      type: String,
+      default: ''
+    }
+  }
 }
 </script>
 
@@ -58,14 +77,14 @@ export default {
   padding: 2em;
 }
 pre {
-    word-wrap: break-word;
-    white-space: pre-wrap;
+  word-wrap: break-word;
+  white-space: pre-wrap;
 }
 .cvpm-repo-readme {
-    padding: 2em;
+  padding: 2em;
 }
 .cvpm-meta-detail {
-    margin-left: auto;
-    margin-right: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 </style>

dashboard/src/components/CVPM-Table.vue

@@ -42,7 +42,24 @@
 
 <script>
 export default {
-  props: ['items', 'headers', 'loading'],
+  props: {
+    config: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    headers: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
   data () {
     return {}
   },

dashboard/src/components/basic/CVPM-Parameter-Input.vue

@@ -59,7 +59,26 @@
 <script>
 import { systemService } from '@/services/system'
 export default {
-  props: ['file', 'vendor', 'packageName', 'solverName'],
+  props: {
+    file: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
+    vendor: {
+      type: String,
+      default: ''
+    },
+    packageName: {
+      type: String,
+      default: ''
+    },
+    solverName: {
+      type: String,
+      default: ''
+    }
+  },
   data () {
     return {
       loading: false,

dashboard/src/main.js

@@ -11,7 +11,6 @@ import TreeView from 'vue-json-tree-view'
 import VueTour from 'vue-tour'
 import colors from 'vuetify/es5/util/colors'
 import { ConfigService } from '@/services/config'
-
 import 'vuetify/dist/vuetify.min.css'
 import '@/assets/styles/main.css'
 import 'vue-tour/dist/vue-tour.css'