[Google] [Gemini] 修改流式输出调用 API

Author: qianmoQ

src/main/java/org/devlive/sdk/openai/model/CompletionModel.java

@@ -64,6 +64,7 @@ public enum CompletionModel
             "Most capable model in the GPT-3 series. Can perform any task the other GPT-3 models can, often with higher quality, longer output and better instruction-following. It can process up to 4,000 tokens per request.",
             "Complex intent, cause and effect, creative generation, search, summarization for audience",
             4097),
+    @Deprecated
     TEXT_DAVINCI_003("text-davinci-003",
             "Most capable model in the GPT-3 series. Can perform any task the other GPT-3 models can, often with higher quality, longer output and better instruction-following. It can process up to 4,000 tokens per request.",
             "Complex intent, cause and effect, creative generation, search, summarization for audience",
@@ -134,7 +135,7 @@ public enum CompletionModel
             null,
             32768),
 
-     GPT_4O("gpt-4o",
+    GPT_4O("gpt-4o",
             "most advanced, multimodal flagship model that’s cheaper and faster than GPT-4 Turbo. Currently points to gpt-4o-2024-05-13",
             null,
             128000),

src/main/java/org/devlive/sdk/platform/google/interceptor/GoogleInterceptor.java

@@ -39,7 +39,7 @@ protected Request prepared(Request original)
         List<String> pathSegments = Lists.newArrayList();
         httpUrl = HttpUrlUtils.removePathSegment(httpUrl);
         // https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:generateContent?key=YOUR_API_KEY
-        pathSegments.add(0, String.join(":", getModel(), "generateContent"));
+        pathSegments.add(0, String.join(":", getModel(), stream ? "streamGenerateContent" : "generateContent"));
         pathSegments.add(0, "models");
         pathSegments.add(0, version.getVersion());
         httpUrl = httpUrl.newBuilder()

src/test/java/org/devlive/sdk/openai/StreamClientTest.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.devlive.sdk.ResourceUtils;
 import org.devlive.sdk.common.listener.ConsoleEventSourceListener;
 import org.devlive.sdk.openai.entity.ChatEntity;
 import org.devlive.sdk.openai.entity.CompletionEntity;
@@ -26,7 +27,7 @@ public void before()
                 .countDownLatch(countDownLatch)
                 .build();
         client = OpenAiClient.builder()
-                .apiKey(System.getProperty("openai.token"))
+                .apiKey(ResourceUtils.getValue("openai.token"))
                 .listener(listener)
                 .build();
     }