moved from local toolspec to shared package

Author: mmaelicke

api/api.go

@@ -80,7 +80,7 @@ func RespondWithError(w http.ResponseWriter, status int, err string) {
 	w.Write([]byte(err))
 }
 
-func ResondWithJSON(w http.ResponseWriter, status int, data interface{}) {
+func RespondWithJSON(w http.ResponseWriter, status int, data interface{}) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(status)
 	err := json.NewEncoder(w).Encode(data)

api/auth.go

@@ -28,7 +28,7 @@ func HandleRefreshToken(w http.ResponseWriter, r *http.Request) {
 		RespondWithError(w, http.StatusUnauthorized, fmt.Sprintf("Invalid refresh token: %v", err))
 	}
 
-	ResondWithJSON(w, http.StatusOK, response)
+	RespondWithJSON(w, http.StatusOK, response)
 }
 
 func HandleLogin(w http.ResponseWriter, r *http.Request) {
@@ -50,5 +50,5 @@ func HandleLogin(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ResondWithJSON(w, http.StatusOK, response)
+	RespondWithJSON(w, http.StatusOK, response)
 }

api/files.go

@@ -52,7 +52,7 @@ func HandleFileUpload(w http.ResponseWriter, r *http.Request) {
 		RespondWithError(w, 500, fmt.Sprintf("error writing to target file: %s", err))
 	}
 
-	ResondWithJSON(w, http.StatusCreated, map[string]interface{}{
+	RespondWithJSON(w, http.StatusCreated, map[string]interface{}{
 		"path": targetPath,
 		"size": writtenBytes,
 		"name": handler.Filename,
@@ -83,7 +83,7 @@ func FindFile(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	ResondWithJSON(w, http.StatusOK, FindFilesResponse{
+	RespondWithJSON(w, http.StatusOK, FindFilesResponse{
 		Count: len(matches),
 		Files: matches,
 	})

api/results.go

@@ -19,7 +19,7 @@ func ListRunResults(w http.ResponseWriter, r *http.Request, tool tool.Tool) {
 		RespondWithError(w, http.StatusInternalServerError, err.Error())
 	}
 
-	ResondWithJSON(w, http.StatusOK, ListRunResultsResponse{
+	RespondWithJSON(w, http.StatusOK, ListRunResultsResponse{
 		Count: len(results),
 		Files: results,
 	})

api/run_specs.go

@@ -9,7 +9,8 @@ import (
 	"github.com/hydrocode-de/gorun/internal/cache"
 	"github.com/hydrocode-de/gorun/internal/db"
 	"github.com/hydrocode-de/gorun/internal/tool"
-	"github.com/hydrocode-de/tool-spec-go"
+	toolspec "github.com/hydrocode-de/tool-spec-go"
+	"github.com/hydrocode-de/tool-spec-go/validate"
 	"github.com/spf13/viper"
 )
 
@@ -73,14 +74,14 @@ func GetToolSpec(w http.ResponseWriter, r *http.Request) {
 	if !wasFound {
 		RespondWithError(w, http.StatusNotFound, "tool not found")
 	}
-	ResondWithJSON(w, http.StatusOK, spec)
+	RespondWithJSON(w, http.StatusOK, spec)
 }
 
 func ListToolSpecs(w http.ResponseWriter, r *http.Request) {
 	Cache := viper.Get("cache").(*cache.Cache)
 	specs := Cache.ListToolSpecs()
 
-	ResondWithJSON(w, http.StatusOK, ListToolSpecResponse{
+	RespondWithJSON(w, http.StatusOK, ListToolSpecResponse{
 		Count: len(specs),
 		Tools: specs,
 	})
@@ -100,6 +101,25 @@ func CreateRun(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	Cache := viper.Get("cache").(*cache.Cache)
+	toolSlug := fmt.Sprintf("%s::%s", payload.DockerImage, payload.ToolName)
+	toolSpec, wasFound := Cache.GetToolSpec(toolSlug)
+	if !wasFound {
+		RespondWithError(w, http.StatusNotFound, fmt.Sprintf("a tool %s was not found in the cache", toolSlug))
+		return
+	}
+	hasErrors, errs := validate.ValidateInputs(*toolSpec, toolspec.ToolInput{
+		Parameters: payload.Parameters,
+		Datasets:   payload.DataPaths,
+	})
+	if hasErrors {
+		RespondWithJSON(w, http.StatusBadRequest, map[string]interface{}{
+			"message": fmt.Sprintf("the provided payload is invalid for the tool %s", toolSlug),
+			"errors":  errs,
+		})
+		return
+	}
+
 	// create the mount paths with random strategy
 	opts := tool.CreateRunOptions{
 		Name:       payload.ToolName,
@@ -112,5 +132,5 @@ func CreateRun(w http.ResponseWriter, r *http.Request) {
 		RespondWithError(w, http.StatusInternalServerError, err.Error())
 	}
 
-	ResondWithJSON(w, http.StatusCreated, runData)
+	RespondWithJSON(w, http.StatusCreated, runData)
 }

api/runs_state.go

@@ -69,7 +69,7 @@ func GetAllRuns(w http.ResponseWriter, r *http.Request) {
 		toolRuns = append(toolRuns, toolRun)
 	}
 
-	ResondWithJSON(w, http.StatusOK, RunsResponse{
+	RespondWithJSON(w, http.StatusOK, RunsResponse{
 		Count:  len(runs),
 		Status: filter,
 		Runs:   toolRuns,
@@ -102,14 +102,14 @@ func DeleteRun(w http.ResponseWriter, r *http.Request, tool tool.Tool) {
 	if err != nil {
 		RespondWithError(w, http.StatusInternalServerError, err.Error())
 	}
-	ResondWithJSON(w, http.StatusOK, map[string]string{
+	RespondWithJSON(w, http.StatusOK, map[string]string{
 		"message": "Run deleted",
 	})
 
 }
 
 func GetRunStatus(w http.ResponseWriter, r *http.Request, run tool.Tool) {
-	ResondWithJSON(w, http.StatusOK, run)
+	RespondWithJSON(w, http.StatusOK, run)
 }
 
 func HandleRunStart(w http.ResponseWriter, r *http.Request, run tool.Tool) {
@@ -139,5 +139,5 @@ func HandleRunStart(w http.ResponseWriter, r *http.Request, run tool.Tool) {
 	if err != nil {
 		RespondWithError(w, http.StatusInternalServerError, err.Error())
 	}
-	ResondWithJSON(w, http.StatusProcessing, started)
+	RespondWithJSON(w, http.StatusProcessing, started)
 }

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/docker/docker v28.3.1+incompatible
 	github.com/golang-jwt/jwt/v5 v5.2.2
 	github.com/google/uuid v1.6.0
-	github.com/hydrocode-de/tool-spec-go v0.0.0-20251123064647-3a7cc964f7b2
+	github.com/hydrocode-de/tool-spec-go v0.1.0
 	github.com/jedib0t/go-pretty/v6 v6.6.7
 	github.com/joho/godotenv v1.5.1
 	github.com/pressly/goose/v3 v3.24.3

go.sum

@@ -51,8 +51,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 h1:X5VWvz21y3gzm9Nw/kaUeku/1+uBhcekkmy4IkffJww=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1/go.mod h1:Zanoh4+gvIgluNqcfMVTJueD4wSS5hT7zTt4Mrutd90=
-github.com/hydrocode-de/tool-spec-go v0.0.0-20251123064647-3a7cc964f7b2 h1:nfApKsi6KJxffNVlkSsIAVcSbc9i6dnKMHr+hIHSi7g=
-github.com/hydrocode-de/tool-spec-go v0.0.0-20251123064647-3a7cc964f7b2/go.mod h1:jM1nE1DBIPNCenBbNj6OCbEIImMCza/ANsUzec6trk0=
+github.com/hydrocode-de/tool-spec-go v0.1.0 h1:GnAlPDylTmz5n8wIZegYJ5cLzh9MqLAr7hm5fxl+bQU=
+github.com/hydrocode-de/tool-spec-go v0.1.0/go.mod h1:jM1nE1DBIPNCenBbNj6OCbEIImMCza/ANsUzec6trk0=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jedib0t/go-pretty/v6 v6.6.7 h1:m+LbHpm0aIAPLzLbMfn8dc3Ht8MW7lsSO4MPItz/Uuo=

internal/cache/cache.go

@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"github.com/hydrocode-de/tool-spec-go"
+	toolspec "github.com/hydrocode-de/tool-spec-go"
 )
 
 type Cache struct {

internal/tool/create.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hydrocode-de/gorun/internal/files"
 	"github.com/hydrocode-de/gorun/internal/helper"
 	"github.com/hydrocode-de/gorun/internal/toolImage"
-	"github.com/hydrocode-de/tool-spec-go"
+	toolspec "github.com/hydrocode-de/tool-spec-go"
 	"github.com/spf13/viper"
 )