### 1.10.3

- Fixed Bug:Fixed a bug where CreateChatCompletionRequest, CreateRunRequest, and CreateThreadAndRunRequest could not be properly requested when tools were not provided.
WhiteMagic2014 · Jun 7, 2024 · 85eb424 · 85eb424
1 parent fc78d39
commit 85eb424
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -96,6 +96,11 @@ new CreateChatCompletionRequest()
 
 ## Version
 
+### 1.10.3
+
+- Fixed Bug:Fixed a bug where CreateChatCompletionRequest, CreateRunRequest, and CreateThreadAndRunRequest could not be
+  properly requested when tools were not provided.
+
 ### 1.10.2
 
 - Update: Changelog [Jun 6th, 2024](https://platform.openai.com/docs/changelog/jun-6th-2024)

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/WhiteMagic2014/gpt-magic.git</url>
     <groupId>io.github.whitemagic2014</groupId>
     <artifactId>gpt-magic</artifactId>
-    <version>1.10.2</version>
+    <version>1.10.3</version>
 
     <developers>
         <developer>

diff --git a/src/main/java/com/github/WhiteMagic2014/gptApi/Assistant/Thread/Run/CreateRunRequest.java b/src/main/java/com/github/WhiteMagic2014/gptApi/Assistant/Thread/Run/CreateRunRequest.java
@@ -365,6 +365,13 @@ protected String sendHook() {
         }
         if (tools != null && !tools.isEmpty()) {
             param.put("tools", tools);
+            if (toolChoice != null) {
+                param.put("tool_choice", toolChoice);
+            }
+            if (toolChoiceTemp != null) {
+                param.put("tool_choice", toolChoiceTemp);
+            }
+            param.put("parallel_tool_calls", parallelToolCalls);
         }
         if (metadata != null && !metadata.isEmpty()) {
             param.put("metadata", metadata);
@@ -384,13 +391,6 @@ protected String sendHook() {
         if (truncationStrategy != null) {
             param.put("truncation_strategy", truncationStrategy);
         }
-        if (toolChoice != null) {
-            param.put("tool_choice", toolChoice);
-        }
-        if (toolChoiceTemp != null) {
-            param.put("tool_choice", toolChoiceTemp);
-        }
-        param.put("parallel_tool_calls", parallelToolCalls);
         if (responseFormat.equals("auto")) {
             param.put("response_format", responseFormat);
         } else {

diff --git a/...java/com/github/WhiteMagic2014/gptApi/Assistant/Thread/Run/CreateThreadAndRunRequest.java b/...java/com/github/WhiteMagic2014/gptApi/Assistant/Thread/Run/CreateThreadAndRunRequest.java
@@ -383,6 +383,13 @@ protected String sendHook() {
         }
         if (tools != null && !tools.isEmpty()) {
             param.put("tools", tools);
+            if (toolChoice != null) {
+                param.put("tool_choice", toolChoice);
+            }
+            if (toolChoiceTemp != null) {
+                param.put("tool_choice", toolChoiceTemp);
+            }
+            param.put("parallel_tool_calls", parallelToolCalls);
         }
         if (toolResources != null) {
             param.put("tool_resources", toolResources);
@@ -405,13 +412,6 @@ protected String sendHook() {
         if (truncationStrategy != null) {
             param.put("truncation_strategy", truncationStrategy);
         }
-        if (toolChoice != null) {
-            param.put("tool_choice", toolChoice);
-        }
-        if (toolChoiceTemp != null) {
-            param.put("tool_choice", toolChoiceTemp);
-        }
-        param.put("parallel_tool_calls", parallelToolCalls);
         if (responseFormat.equals("auto")) {
             param.put("response_format", responseFormat);
         } else {

diff --git a/src/main/java/com/github/WhiteMagic2014/gptApi/Chat/CreateChatCompletionRequest.java b/src/main/java/com/github/WhiteMagic2014/gptApi/Chat/CreateChatCompletionRequest.java
@@ -440,14 +440,14 @@ protected String sendHook() {
         }
         if (tools != null && !tools.isEmpty()) {
             param.put("tools", tools);
+            if (toolChoice != null) {
+                param.put("tool_choice", toolChoice);
+            }
+            if (toolChoiceTemp != null) {
+                param.put("tool_choice", toolChoiceTemp);
+            }
+            param.put("parallel_tool_calls", parallelToolCalls);
         }
-        if (toolChoice != null) {
-            param.put("tool_choice", toolChoice);
-        }
-        if (toolChoiceTemp != null) {
-            param.put("tool_choice", toolChoiceTemp);
-        }
-        param.put("parallel_tool_calls", parallelToolCalls);
         if (user != null) {
             param.put("user", user);
         }