Merge pull request #24 from modzy/http-status-marshal

Http status marshal

Author: raul-casallas

internal/testing/main.go

@@ -26,15 +26,16 @@ func main() {
 	client := modzy.NewClient(baseURL).WithAPIKey(apiKey)
 
 	if os.Getenv("MODZY_DEBUG") == "1" {
-		client = client.WithOptions(modzy.WithHTTPDebugging(false, false))
+		client = client.WithOptions(modzy.WithHTTPDebugging(true, true))
 	}
 
-	// listJobsHistory(client)
+	listJobsHistory(client)
 	// errorChecking()
 	// submitExampleText(client, false)
+	// submitExampleTextWithFailures(client, false)
 	// submitExampleEmbedded(client, true)
 	// submitExampleChunked(client, false)
-	submitExampleS3(client, false)
+	// submitExampleS3(client, false)
 	// submitExampleJDBC(client, false)
 	// describeJob(client, "86b76e20-c506-485d-af4e-2072c41ca35b")
 	// describeModel(client, "ed542963de")
@@ -125,6 +126,30 @@ func submitExampleText(client modzy.Client, cancel bool) {
 	afterSubmit(client, cancel, submittedJob)
 }
 
+func submitExampleTextWithFailures(client modzy.Client, cancel bool) {
+	logrus.Info("Will submit example text job")
+	submittedJob, err := client.Jobs().SubmitJobText(ctx, &modzy.SubmitJobTextInput{
+		ModelIdentifier: "ed542963de",
+		ModelVersion:    "0.0.27",
+		Timeout:         time.Minute * 5,
+		Inputs: map[string]modzy.TextInputItem{
+			"happy-text": {
+				"not-input.txt": "I love AI! :)",
+			},
+			"angry-text": {
+				"input.txt": "I hate AI! abysmal. adverse. alarming. angry. annoy. anxious :(",
+			},
+		},
+	})
+	if err != nil {
+		logrus.WithError(err).Fatalf("Failed to submit text job")
+		return
+	}
+
+	logrus.WithField("jobIdentifier", submittedJob.Response.JobIdentifier).Info("text job submitted")
+	afterSubmit(client, cancel, submittedJob)
+}
+
 //go:embed smiling_face.encoded
 var SmilingFace string
 
@@ -240,6 +265,10 @@ func afterSubmit(client modzy.Client, cancel bool, job modzy.JobActions) {
 			return
 		}
 		logrus.Infof("Job results: %s -> %d results", jobResults.Results.JobIdentifier, jobResults.Results.Total)
+
+		if len(jobResults.Results.Failures) > 0 {
+			logrus.Warnf("Job had failures: %+v", jobResults.Results.Failures)
+		}
 	}
 }
 

model/jobresult.go

@@ -7,18 +7,36 @@ import (
 )
 
 type JobResults struct {
-	JobIdentifier string               `json:"jobIdentifier"`
-	Total         int                  `json:"total"`
-	Completed     int                  `json:"completed"`
-	Failed        int                  `json:"failed"`
-	Finished      bool                 `json:"finished"`
-	SubmittedBy   string               `json:"submittedByKey"`
-	Results       map[string]JobResult `json:"results"`
+	JobIdentifier string    `json:"jobIdentifier"`
+	Total         int       `json:"total"`
+	Completed     int       `json:"completed"`
+	Failed        int       `json:"failed"`
+	Finished      bool      `json:"finished"`
+	SubmittedBy   string    `json:"submittedByKey"`
+	Explained     bool      `json:"explained"`
+	SubmittedAt   ModzyTime `json:"submittedAt"`
+
+	JobQueueTime     int `json:"jobQueueTime"`
+	JobProcessedTime int `json:"jobProcessedTime"`
+	JobElapsedTime   int `json:"jobElapsedTime"`
+
+	// next api version:
+	// InitialQueueTime          int       `json:"initialQueueTime"`
+	// TotalQueueTime            int       `json:"totalQueueTime"`
+	// AverageModelLatency       float64   `json:"averageModelLatency"`
+	// TotalModelLatency         float64   `json:"totalModelLatency"`
+	// ElapsedTime               float64   `json:"elapsedTime"`
+	// StartingResultSummarizing ModzyTime `json:"startingResultSummarizing"`
+	// ResultSummarizing         int       `json:"resultSummarizing"`
+
+	Results  map[string]JobResult `json:"results"`
+	Failures map[string]JobResult `json:"failures"`
 }
 
 type JobResult struct {
 	Status      string                 `json:"status"`
 	Engine      string                 `json:"engine"`
+	Error       string                 `json:"error"`
 	StartTime   ModzyTime              `json:"startTime"`
 	UpdateTime  ModzyTime              `json:"updateTime"`
 	EndTime     ModzyTime              `json:"endTime"`

requestor.go

@@ -107,7 +107,8 @@ func (r *requestor) execute(
 		// non OK response
 		apiError := &ModzyHTTPError{}
 		if err := json.NewDecoder(toDecode).Decode(apiError); err != nil {
-			return resp, errors.WithMessagef(err, "failed parsing non 200 response of %d from %s:%s", resp.StatusCode, method, path)
+			logrus.WithError(err).Warnf("failed parsing non 200 response of %d from %s:%s", resp.StatusCode, method, path)
+			return resp, fmt.Errorf("request to %s failed with response: %s", req.URL, resp.Status)
 		}
 		return resp, apiError
 	}