fix: empty tools exception (#112)

lollipopkit · Jul 24, 2024 · 40386e7 · 40386e7
1 parent be12da7
commit 40386e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -381,7 +381,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 267;
+				CURRENT_PROJECT_VERSION = 268;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -512,7 +512,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 267;
+				CURRENT_PROJECT_VERSION = 268;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -537,7 +537,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 267;
+				CURRENT_PROJECT_VERSION = 268;
 				DEVELOPMENT_TEAM = BA88US33G6;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

diff --git a/lib/data/res/build.dart b/lib/data/res/build.dart
@@ -2,5 +2,5 @@
 
 class Build {
   static const String name = "GPTBox";
-  static const int build = 267;
+  static const int build = 268;
 }
diff --git a/lib/view/page/home/req.dart b/lib/view/page/home/req.dart
@@ -134,14 +134,18 @@ Future<void> _onCreateText(
   _loadingChatIds.add(chatId);
   _autoScroll(chatId);
 
-  final useTools = OpenAICfg.canUseToolNow;
+  final useTools = Stores.tool.enabled.fetch() && OpenAICfg.canUseToolNow;
 
   // #104
   final singleChatScopeUseTools = workingChat.settings?.useTools != false;
 
+  // #111
+  final availableTools = OpenAIFuncCalls.tools;
+  final isToolsEmpty = availableTools.isEmpty;
+
   /// TODO: after switching to http img url, remove this condition.
   /// To save tokens, we don't use tools for image prompt
-  if (useTools && !hasImg && singleChatScopeUseTools) {
+  if (useTools && !hasImg && singleChatScopeUseTools && !isToolsEmpty) {
     final toolReply = ChatHistoryItem.single(role: ChatRole.tool, raw: '');
     workingChat.items.add(toolReply);
     _loadingChatIds.add(toolReply.id);
@@ -160,7 +164,7 @@ Future<void> _onCreateText(
           ).toOpenAI,
           ...msgs,
         ],
-        tools: OpenAIFuncCalls.tools,
+        tools: availableTools,
       );
     } catch (e, s) {
       _onErr(e, s, chatId, 'Tool');

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: gpt_box
 description: "A third-party GPT Client for OpenAI API."
 publish_to: 'none'
-version: 1.0.267+267
+version: 1.0.268+268
 
 environment:
   sdk: '>=3.3.0 <4.0.0'