Add run meta info in Run response

codiewio · Feb 18, 2025 · f7723ce · f7723ce
1 parent c8bc044
commit f7723ce
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 226 deletions.
diff --git a/api/api.yaml b/api/api.yaml
@@ -183,20 +183,11 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/SubmissionResponseEvents'
-        Time:
-          type: string
-        Errors:
-          type: array
-          items:
-            type: string
-        Meta:
-          type: object
-          properties:
-            Version:
-              type: string
-          additionalProperties: true
+        RunEnvironment:
+          $ref: '#/components/schemas/RunEnvironment'
       required:
         - Events
+        - RunEnvironment
 
     SubmissionResponseEvents:
       type: object
@@ -209,6 +200,20 @@ components:
         - Message
         - Kind
 
+    RunEnvironment:
+      type: object
+      properties:
+        compileCmd:
+          type: string
+        runCmd:
+          type: string
+        runTime:
+          type: number
+      required:
+        - compileCmd
+        - runCmd
+        - runTime
+
     SandboxResponse:
       type: object
       properties:
@@ -222,10 +227,13 @@ components:
         stderr:
           type: string
           format: byte
+        RunEnvironment:
+          $ref: '#/components/schemas/RunEnvironment'
       required:
         - exitCode
         - stdout
         - stderr
+        - RunEnvironment
 
     SandboxRequest:
       type: object

diff --git a/api/gen/api.gen.go b/api/gen/api.gen.go
diff --git a/docs/api/swagger.json b/docs/api/swagger.json
@@ -211,27 +211,13 @@
               "$ref": "#/components/schemas/SubmissionResponseEvents"
             }
           },
-          "Time": {
-            "type": "string"
-          },
-          "Errors": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          },
-          "Meta": {
-            "type": "object",
-            "properties": {
-              "Version": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": true
+          "RunEnvironment": {
+            "$ref": "#/components/schemas/RunEnvironment"
           }
         },
         "required": [
-          "Events"
+          "Events",
+          "RunEnvironment"
         ]
       },
       "SubmissionResponseEvents": {
@@ -249,6 +235,25 @@
           "Kind"
         ]
       },
+      "RunEnvironment": {
+        "type": "object",
+        "properties": {
+          "compileCmd": {
+            "type": "string"
+          },
+          "runCmd": {
+            "type": "string"
+          },
+          "runTime": {
+            "type": "number"
+          }
+        },
+        "required": [
+          "compileCmd",
+          "runCmd",
+          "runTime"
+        ]
+      },
       "SandboxResponse": {
         "type": "object",
         "properties": {
@@ -265,12 +270,16 @@
           "stderr": {
             "type": "string",
             "format": "byte"
+          },
+          "RunEnvironment": {
+            "$ref": "#/components/schemas/RunEnvironment"
           }
         },
         "required": [
           "exitCode",
           "stdout",
-          "stderr"
+          "stderr",
+          "RunEnvironment"
         ]
       },
       "SandboxRequest": {

diff --git a/internal/handler/handler_run.go b/internal/handler/handler_run.go
@@ -179,8 +179,6 @@ func runCode(ctx context.Context, req api.SubmissionRequest, backendURL string)
 		_ = resp.Body.Close()
 	}()
 
-	// TODO:: [HOOK] post-response hook
-
 	if resp.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("unexpected http status from backend: %d", resp.StatusCode)
 	}
@@ -200,8 +198,11 @@ func runCode(ctx context.Context, req api.SubmissionRequest, backendURL string)
 
 	apiRes := &api.SubmissionResponse{
 		Events: events,
-		Meta:   nil,
-		Time:   nil,
+		RunEnvironment: api.RunEnvironment{
+			RunCmd:     execRes.RunEnvironment.RunCmd,
+			CompileCmd: execRes.RunEnvironment.CompileCmd,
+			RunTime:    execRes.RunEnvironment.RunTime,
+		},
 	}
 
 	return apiRes, nil