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

Xzyaoi/feat/envs for runner
autoai-org · Mar 20, 2019 · f2e843c · f2e843c
2 parents d9ec721 + fbc5352
commit f2e843c
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 62 deletions.
diff --git a/cli/Gopkg.lock b/cli/Gopkg.lock
diff --git a/cli/daemon.go b/cli/daemon.go
@@ -232,7 +232,6 @@ 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)

diff --git a/cli/template.go b/cli/template.go
@@ -15,7 +15,7 @@ import (
 )
 
 func _getRunnerTpl() string {
-	var runnerTpl = "https://tpl.cvtron.xyz/runners/runner.tpl"
+	var runnerTpl = "https://raw.githubusercontent.com/unarxiv/CVPM/master/templates/runner.tpl"
 	resp, err := http.Get(runnerTpl)
 	if err != nil {
 		log.Fatal(err)

diff --git a/dashboard/src/components/CVPM-Git-Import.vue b/dashboard/src/components/CVPM-Git-Import.vue
@@ -108,6 +108,10 @@ export default {
       this.$emit('closeDialog', true)
     },
     fetchMeta () {
+      // re-init error/info to avoid #282
+      // For more info: https://github.com/unarxiv/CVPM/issues/282
+      this.error = ''
+      this.info = ''
       let self = this
       const pureRepo = this.repo.split('/')[3] + '/' + this.repo.split('/')[4]
       let githubService = new GithubService(pureRepo)

diff --git a/dashboard/src/components/CVPM-Repo-Solver.vue b/dashboard/src/components/CVPM-Repo-Solver.vue
@@ -28,12 +28,8 @@
             v-for="(solver, index) in runningSolvers"
             :key="index"
           >
-            <v-list-tile-content>
-              {{ solver.SolverName }}
-            </v-list-tile-content>
-            <v-list-tile-avatar>
-              {{ solver.Port }}
-            </v-list-tile-avatar>
+            <v-list-tile-content>{{ solver.SolverName }}</v-list-tile-content>
+            <v-list-tile-avatar>{{ solver.Port }}</v-list-tile-avatar>
           </v-list-tile>
         </v-list>
       </v-expansion-panel-content>
@@ -171,19 +167,27 @@ export default {
     confirmedRun () {
       this.isRequesting = true
       let self = this
-      systemService
-        .runRepoSolver(
-          this.selectedVendor,
-          this.selectedPackage,
-          this.selectedSolver,
-          this.runningPort
-        )
-        .then(function (res) {
-          self.isRequesting = false
-          self.runningConfirmDialog = false
-          self.responseRunningPort = res.data.port
-          self.fetchRunningSolver()
-        })
+      if (
+        this.selectedSolver === '' ||
+        this.selectedVendor === '' ||
+        this.selectedPackage === ''
+      ) {
+        alert('Select Solver/Vendor/Package First!')
+      } else {
+        systemService
+          .runRepoSolver(
+            this.selectedVendor,
+            this.selectedPackage,
+            this.selectedSolver,
+            this.runningPort
+          )
+          .then(function (res) {
+            self.isRequesting = false
+            self.runningConfirmDialog = false
+            self.responseRunningPort = res.data.port
+            self.fetchRunningSolver()
+          })
+      }
     }
   }
 }

diff --git a/dashboard/src/components/CVPM-Request.vue b/dashboard/src/components/CVPM-Request.vue
@@ -83,12 +83,16 @@ export default {
       }
     },
     vendor: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     },
     packageName: {
-      type: String,
-      default: ''
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   data () {

diff --git a/dashboard/src/components/basic/CVPM-Parameter-Input.vue b/dashboard/src/components/basic/CVPM-Parameter-Input.vue
@@ -61,7 +61,7 @@ import { systemService } from '@/services/system'
 export default {
   props: {
     file: {
-      type: Object,
+      type: File,
       default: function () {
         return {}
       }
@@ -94,10 +94,14 @@ export default {
   },
   computed: {
     stringParameters () {
-      return this.systemRequiredParams.filter(each => typeof (each.value) === 'string')
+      return this.systemRequiredParams.filter(
+        each => typeof each.value === 'string'
+      )
     },
     booleanParamters () {
-      return this.systemRequiredParams.filter(each => typeof (each.value) === 'boolean')
+      return this.systemRequiredParams.filter(
+        each => typeof each.value === 'boolean'
+      )
     }
   },
   methods: {
@@ -113,21 +117,29 @@ export default {
       const requestParams = this.systemRequiredParams.concat(
         this.solverDefinedParams
       )
-      systemService
-        .testRepoSolver(
-          this.vendor,
-          this.packageName,
-          this.solverName,
-          requestParams,
-          this.file
-        )
-        .then(function (res) {
-          self.loading = false
-          self.$emit('finishInfer', res)
-        })
-        .catch(function (err) {
-          alert('an error occured' + err)
-        })
+      if (
+        typeof this.selectedSolver === 'undefined' ||
+        typeof this.selectedVendor === 'undefined' ||
+        typeof this.selectedPackage === 'undefined'
+      ) {
+        alert('Select Solver/Vendor/Package First!')
+      } else {
+        systemService
+          .testRepoSolver(
+            this.vendor,
+            this.packageName,
+            this.solverName,
+            requestParams,
+            this.file
+          )
+          .then(function (res) {
+            self.loading = false
+            self.$emit('finishInfer', res)
+          })
+          .catch(function (err) {
+            alert('an error occured' + err)
+          })
+      }
     }
   }
 }