Handling controls from Glowbom file

glowbom · May 12, 2023 · 55584e7 · 55584e7
1 parent 77e07c4
commit 55584e7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/app/lib/ai.dart b/app/lib/ai.dart
@@ -25,6 +25,7 @@ class Ai {
   Future<List<Message>> message(
     String message, {
     List<Map<String, String?>> previousMessages = const [],
+    bool aiEnabled = true,
   }) async {
     List<Map<String, Object>> foundQuestions = _findMatchingQuestions(message);
 
@@ -33,7 +34,7 @@ class Ai {
     }
 
     // Call the OpenAI API if no matching questions are found locally
-    if (OpenAI_API.oat().isNotEmpty) {
+    if (aiEnabled && OpenAI_API.oat().isNotEmpty) {
       newtworkOperation = await OpenAI_API.getResponseFromOpenAI(message,
           previousMessages: previousMessages);
       String response = await newtworkOperation!.value;

diff --git a/app/lib/chat_screen.dart b/app/lib/chat_screen.dart
@@ -21,7 +21,6 @@ class ChatScreen extends StatefulWidget {
   final String? _selectedLanguage;
   final String? _systemPrompt;
   final bool? _allowEnterKey;
-  final bool? _allowDataImport;
   final bool? _autonomousMode;
   final bool? _enableAi;
   final bool? _showAiSettings;
@@ -34,7 +33,6 @@ class ChatScreen extends StatefulWidget {
       this._selectedLanguage,
       this._systemPrompt,
       this._allowEnterKey,
-      this._allowDataImport,
       this._autonomousMode,
       this._enableAi,
       this._showAiSettings);
@@ -376,6 +374,7 @@ class _ChatScreenState extends State<ChatScreen> {
                 _messages,
                 widget._questions,
                 widget._name,
+                widget._enableAi,
                 onAutonomousModeMessage: (String userInput) async {
                   List<String> tasks = await _generateTasks(userInput);
                   setState(() {
@@ -390,19 +389,22 @@ class _ChatScreenState extends State<ChatScreen> {
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: <Widget>[
-                    ElevatedButton(
-                      child: Text('Enter API Key'),
-                      onPressed: _showApiKeyDialog,
-                    ),
+                    if (widget._allowEnterKey != null && widget._allowEnterKey!)
+                      ElevatedButton(
+                        child: Text('Enter API Key'),
+                        onPressed: _showApiKeyDialog,
+                      ),
                     // Add the AI Settings button conditionally
                     if (OpenAI_API.oat().isNotEmpty)
-                      Padding(
-                        padding: const EdgeInsets.only(left: 8.0),
-                        child: ElevatedButton(
-                          child: Text('AI Settings'),
-                          onPressed: _showAiSettingsDialog,
+                      if (widget._showAiSettings != null &&
+                          widget._showAiSettings!)
+                        Padding(
+                          padding: const EdgeInsets.only(left: 8.0),
+                          child: ElevatedButton(
+                            child: Text('AI Settings'),
+                            onPressed: _showAiSettingsDialog,
+                          ),
                         ),
-                      ),
                   ],
                 ),
               ),

diff --git a/app/lib/new_message.dart b/app/lib/new_message.dart
@@ -38,9 +38,11 @@ class NewMessage extends StatefulWidget {
   final List<Message> _messages;
   final List<Map<String, Object>>? _questions;
   final String? _name;
+  final bool? _enableAi;
   final Function(String) onAutonomousModeMessage;
 
   NewMessage(this._refresh, this._messages, this._questions, this._name,
+      this._enableAi,
       {required this.onAutonomousModeMessage});
 
   @override
@@ -149,8 +151,10 @@ class _NewMessageState extends State<NewMessage> {
       final description = pattern != null
           ? message.replaceAll(RegExp(pattern, caseSensitive: false), '').trim()
           : '';
-      print('description: $description');
-      if (description.isNotEmpty) {
+      //print('description: $description');
+      //print('enableAi: ${widget._enableAi}');
+      if (description.isNotEmpty &&
+          (widget._enableAi == null || widget._enableAi!)) {
         Message drawingMessage = Message(
           text: Utils.getRandomImageGenerationFunnyMessage(),
           createdAt: Timestamp.now(),
@@ -238,7 +242,8 @@ class _NewMessageState extends State<NewMessage> {
       });
 
       var response = await ai.message(message,
-          previousMessages: formattedPreviousMessages);
+          previousMessages: formattedPreviousMessages,
+          aiEnabled: widget._enableAi == null ? true : widget._enableAi!);
 
       if (_stopRequested) {
         return;

diff --git a/app/lib/preset_talk.dart b/app/lib/preset_talk.dart
@@ -48,8 +48,8 @@ class _TalkState extends State<Talk> {
       _allowEnterKey = _content['ai_allow_enter_key'] ?? true;
       _allowDataImport = _content['ai_allow_data_import'] ?? true;
       _autonomousMode = _content['ai_autonomous_mode'] ?? false;
-      _enableAi = _content['ai_enable'] ?? true;
-      _showAiSettings = _content['ai_show_settings'] ?? true;
+      _enableAi = _content['ai_enable_ai'] ?? true;
+      _showAiSettings = _content['ai_show_ai_settings'] ?? true;
 
       _pressed100();
     } else {
@@ -64,8 +64,8 @@ class _TalkState extends State<Talk> {
             _allowEnterKey = _content['ai_allow_enter_key'] ?? true;
             _allowDataImport = _content['ai_allow_data_import'] ?? true;
             _autonomousMode = _content['ai_autonomous_mode'] ?? false;
-            _enableAi = _content['ai_enable'] ?? true;
-            _showAiSettings = _content['ai_show_settings'] ?? true;
+            _enableAi = _content['ai_enable_ai'] ?? true;
+            _showAiSettings = _content['ai_show_ai_settings'] ?? true;
 
             _questions = buildQuestions(_content['questions']);
             _pressed100();
@@ -174,10 +174,11 @@ class _TalkState extends State<Talk> {
           ),
           centerTitle: true,
           actions: [
-            IconButton(
-              icon: Icon(Icons.file_upload),
-              onPressed: _startFilePicker,
-            ),
+            if (_allowDataImport != null && _allowDataImport == true)
+              IconButton(
+                icon: Icon(Icons.file_upload),
+                onPressed: _startFilePicker,
+              ),
           ],
         ),
         body: _appScreen == 'Loading'
@@ -198,7 +199,6 @@ class _TalkState extends State<Talk> {
                     _selectedLanguage,
                     _systemPrompt,
                     _allowEnterKey,
-                    _allowDataImport,
                     _autonomousMode,
                     _enableAi,
                     _showAiSettings,