Fix @coderabbitai review

dRAGon-Okinawa · Aug 7, 2024 · e0591a2 · e0591a2
1 parent 5939170
commit e0591a2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/backend/src/main/java/ai/dragon/util/ChatMessageUtil.java b/backend/src/main/java/ai/dragon/util/ChatMessageUtil.java
@@ -40,7 +40,7 @@ public static String singleTextFrom(ChatMessage message) {
         }
         return sb.toString();
     }
-    
+
     public static String singleTextFrom(OpenAiCompletionRequest request) {
         Object prompt = request.getPrompt();
         if (prompt instanceof String stringPrompt) {
@@ -77,14 +77,16 @@ public static Optional<ChatMessage> convertToChatMessage(OpenAiCompletionMessage
 
     private static List<Content> contentsListFrom(List<Map<String, Object>> content) {
         List<Content> contents = new ArrayList<>();
-        content.forEach(contentItem -> {
-            String type = (String) contentItem.get("type");
-            if (type == null) {
-                LOGGER.error("Content part must have a type field!");
-                return;
-            }
-            contents.add(createContent(type, contentItem));
-        });
+        if (content != null) {
+            content.forEach(contentItem -> {
+                String type = (String) contentItem.get("type");
+                if (type == null) {
+                    LOGGER.error("Content part must have a type field!");
+                    return;
+                }
+                contents.add(createContent(type, contentItem));
+            });
+        }
         return contents;
     }
 

diff --git a/backend/src/main/java/ai/dragon/util/DataUrlUtil.java b/backend/src/main/java/ai/dragon/util/DataUrlUtil.java
@@ -26,7 +26,7 @@ public static String getImageType(String base64String) {
 
     public static String convertFileToDataImageBase64(File file) throws IOException {
         String mimeType = Files.probeContentType(file.toPath());
-        return convertFileToDataImageBase64(file, mimeType);
+        return convertFileToDataImageBase64(file, mimeType != null ? mimeType : "application/octet-stream");
     }
 
     public static String convertFileToDataImageBase64(File file, String mimeType) throws IOException {