fix error messages - process timeout to 14sec

TEAMuP-dev · Nov 11, 2024 · c2c7bab · c2c7bab
1 parent 9ff844b
commit c2c7bab
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/WebModel.h b/src/WebModel.h
@@ -224,7 +224,8 @@ class WebModel : public Model
         }
 
         juce::String response;
-        result = gradioClient.getResponseFromEventID(endpoint, eventId, response);
+        result =
+            gradioClient.getResponseFromEventID(endpoint, eventId, response, 14000);
         if (result.failed())
         {
             status2 = ModelStatus::ERROR;
@@ -244,7 +245,7 @@ class WebModel : public Model
         juce::JSON::parse(responseData, parsedData);
         if (! parsedData.isObject())
         {
-            error.devMessage = "Failed to parse the data portion of the received controls JSON.";
+            error.devMessage = "Failed to parse the 'data' key of the received JSON.";
             status2 = ModelStatus::ERROR;
             return OpResult::fail(error);
         }

diff --git a/src/errors.h b/src/errors.h
@@ -28,13 +28,16 @@ enum class ErrorType
 struct Error
 {
     ErrorType type;
+    int code = -1;
     juce::String devMessage;
     juce::String userMessage;
 
     /*
     * In this function, we parse the detailed developer message 
     * of an Error object, and fill the user message accordingly.
     * by default, we set the user message to the developer message.
+    * TODO: the if/else statements below are very simple checks, and 
+    * serve just as an example.
     */
     static void fillUserMessage(Error& error)
     {
@@ -51,6 +54,17 @@ struct Error
             {
                 error.userMessage = "TIMEOUT: The gradio app is SLEEPING. Please try again later.";
             }
+            else if (containsAllSubstrings(error.devMessage, { "GET", "input stream" }))
+            {
+                //
+                error.userMessage = error.devMessage;
+                // error.userMessage += "\n There was some network connectivity issue. Please try again";
+                if (error.code == 0)
+                {
+                    error.userMessage +=
+                        "\n\nProbably a request timeout, e.g the model is taking too long to process the audio file.";
+                }
+            }
         }
         else if (error.type == ErrorType::FileUploadError)
         {

diff --git a/src/gradio/GradioClient.cpp b/src/gradio/GradioClient.cpp
@@ -14,8 +14,7 @@ OpResult GradioClient::extractKeyFromResponse(const juce::String& response,
     {
         Error error;
         error.type = ErrorType::MissingJsonKey;
-        error.devMessage = "Key " + key + " not found in response";
-        error.userMessage = error.devMessage;
+        error.devMessage = "Missing Key in JSON :: Key " + key + " not found in response";
         return OpResult::fail(error);
     }
 
@@ -209,6 +208,7 @@ OpResult GradioClient::uploadFileRequest(const juce::File& fileToUpload,
 
     if (stream == nullptr)
     {
+        error.code = statusCode;
         error.devMessage = "Failed to create input stream for file upload request.";
         return OpResult::fail(error);
     }
@@ -281,6 +281,7 @@ OpResult GradioClient::makePostRequestForEventID(const juce::String endpoint,
 
     if (stream == nullptr)
     {
+        error.code = statusCode;
         error.devMessage = "Failed to create input stream for POST request to " + endpoint;
         return OpResult::fail(error);
     }
@@ -290,6 +291,7 @@ OpResult GradioClient::makePostRequestForEventID(const juce::String endpoint,
     // Check the status code to ensure the request was successful
     if (statusCode != 200)
     {
+        error.code = statusCode;
         error.devMessage =
             "Request to " + endpoint + " failed with status code: " + juce::String(statusCode);
         return OpResult::fail(error);
@@ -350,8 +352,9 @@ OpResult GradioClient::getResponseFromEventID(const juce::String callID,
 
     if (stream == nullptr)
     {
+        error.code = statusCode;
         error.devMessage =
-            "Failed to create input stream for GET request to " + callID + "/" + eventID;
+            "Failed to create input stream for GET request \nto " + callID + "/" + eventID;
         return OpResult::fail(error);
     }
 

diff --git a/src/media/MidiDisplayComponent.cpp b/src/media/MidiDisplayComponent.cpp
@@ -7,7 +7,7 @@ MidiDisplayComponent::MidiDisplayComponent()
     addAndMakeVisible(pianoRoll);
 
     mediaHandlerInstructions =
-        "MIDI pianoroll.\nClick and drag to start playback from any point in the pianoroll\nVertical scroll to zoom in/out.\nHorizontal scroll to move the pianoroll.";
+        "MIDI pianoroll.\nClick and drag to start playback from any point in the pianoroll\nVertical or Horizontal scroll to move.\nCmd+scroll to zoom in both axis.";
 }
 
 MidiDisplayComponent::~MidiDisplayComponent()