Merge branch 'dev' of private:sdcb/chats into dev

sdcb · Feb 26, 2025 · 738a025 · 738a025
2 parents 500dcbe + f94df54
commit 738a025
Show file tree

Hide file tree

Showing 5 changed files with 238 additions and 169 deletions.
diff --git a/src/BE/Controllers/Chats/Chats/ChatController.cs b/src/BE/Controllers/Chats/Chats/ChatController.cs
@@ -456,10 +456,16 @@ private static async Task<ChatSpanResponse> ProcessChatSpan(
         }
         catch (UriFormatException e)
         {
-            icc.FinishReason = DBFinishReason.InvalidApiHostUrl;
+            icc.FinishReason = DBFinishReason.InternalConfigIssue;
             errorText = e.Message;
             logger.LogError(e, "Invalid URL in conversation for message: {userMessageId}", req.MessageId);
         }
+        catch (JsonException e)
+        {
+            icc.FinishReason = DBFinishReason.InternalConfigIssue;
+            errorText = e.Message;
+            logger.LogError(e, "Invalid JSON config in conversation for message: {userMessageId}", req.MessageId);
+        }
         catch (Exception e)
         {
             icc.FinishReason = DBFinishReason.UnknownError;

diff --git a/src/BE/Controllers/OpenAICompatible/OpenAICompatibleController.cs b/src/BE/Controllers/OpenAICompatible/OpenAICompatibleController.cs
@@ -79,10 +79,16 @@ public async Task<ActionResult> ChatCompletion([FromBody] JsonObject json, [From
         }
         catch (UriFormatException e)
         {
-            icc.FinishReason = DBFinishReason.InvalidApiHostUrl;
+            icc.FinishReason = DBFinishReason.InternalConfigIssue;
             logger.LogError(e, "Invalid API host URL");
             errorToReturn = await YieldError(hasSuccessYield && cco.Stream, icc.FinishReason, e.Message, cancellationToken);
         }
+        catch (JsonException e)
+        {
+            icc.FinishReason = DBFinishReason.InternalConfigIssue;
+            logger.LogError(e, "Invalid JSON config");
+            errorToReturn = await YieldError(hasSuccessYield && cco.Stream, icc.FinishReason, e.Message, cancellationToken);
+        }
         catch (Exception e)
         {
             icc.FinishReason = DBFinishReason.UnknownError;