Allow system prompt updates, fix aggressive mem cleanup, fix phone tu…

…ning option maxheight
1runeberg · Aug 23, 2024 · 9a4ab1d · 9a4ab1d
1 parent 46b2174
commit 9a4ab1d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/confichat/.idea/workspace.xml b/confichat/.idea/workspace.xml
diff --git a/confichat/lib/ui_advanced_options.dart b/confichat/lib/ui_advanced_options.dart
@@ -93,15 +93,14 @@ class AdvancedOptionsState extends State<AdvancedOptions> {
             const SizedBox(height: 24),
 
           ConstrainedBox(
-            constraints: const BoxConstraints(
-              maxHeight: 500.0, 
-            ),
+            constraints: BoxConstraints(
+              maxHeight: AppData.instance.getUserDeviceType(context) == UserDeviceType.phone ? 250.0 : 500, ),
             child: SingleChildScrollView(
               scrollDirection: Axis.vertical,
               child: Column( 
                 children: [
 
-                  const Text('Scroll down to see more tuning options', style: TextStyle(fontStyle: FontStyle.italic)),
+                  const Text('Scroll to see more tuning options', style: TextStyle(fontStyle: FontStyle.italic)),
                   const SizedBox(height: 16),
 
                   _buildSliderWithTooltip(
@@ -317,6 +316,7 @@ class AdvancedOptionsState extends State<AdvancedOptions> {
     widget.api.probability = probability;
     widget.api.maxTokens = maxTokens;
     widget.api.stopSequences = stopSequenceController.text.split(',').map((s) => s.trim()).toList();
+    widget.api.systemPrompt = systemPromptController.text;
   }
 
 }
diff --git a/confichat/lib/ui_canvass.dart b/confichat/lib/ui_canvass.dart
@@ -296,7 +296,7 @@ class CanvassState extends State<Canvass> {
                                 context: context,
                                 barrierDismissible: false,
                                 builder: (BuildContext context) {
-                                  return AdvancedOptions(api: widget.appData.api, enableSystemPrompt: chatData.isEmpty);
+                                  return AdvancedOptions(api: widget.appData.api, enableSystemPrompt: true);
                                 },
                               );
                             },
@@ -732,8 +732,6 @@ class CanvassState extends State<Canvass> {
                         // ignore: use_build_context_synchronously
                         ScaffoldMessenger.of(context).showSnackBar(SnackBar(backgroundColor: Theme.of(context).colorScheme.error, content: Text('Unable to save encrypted chat session: ${e.toString()}')));
                       } finally{
-                        // Cleanup
-                        encryptionKeyController.dispose();
                         // ignore: use_build_context_synchronously
                         Navigator.of(context).pop(); 
                       }
@@ -755,8 +753,6 @@ class CanvassState extends State<Canvass> {
                   // ignore: use_build_context_synchronously
                   ScaffoldMessenger.of(context).showSnackBar(SnackBar(backgroundColor: Theme.of(context).colorScheme.primaryContainer, content: const Text('Chat session updated.')));
 
-                  // Cleanup
-                  encryptionKeyController.dispose();
                   // ignore: use_build_context_synchronously
                   Navigator.of(context).pop(); 
                 }
@@ -766,8 +762,6 @@ class CanvassState extends State<Canvass> {
             ElevatedButton(
               child: const Text('Cancel'),
               onPressed: () {
-                // Cleanup
-                encryptionKeyController.dispose();
                 Navigator.of(context).pop();
               },
             ),
@@ -828,6 +822,24 @@ class CanvassState extends State<Canvass> {
           "content": widget.appData.api.systemPrompt
           });
       });
+    } else if(chatData.isNotEmpty 
+      && widget.appData.api.systemPrompt.isNotEmpty 
+      && chatData[0].containsKey('role')
+      && chatData[0].containsKey('content')) {
+
+        setState(() {
+          if( chatData[0]['role'] == 'system') {
+            // update system prompt
+            chatData[0]['content'] = widget.appData.api.systemPrompt;
+          } else {
+            // Add system prompt
+            chatData.insert( 0, {
+              "role": "system", 
+              "content": widget.appData.api.systemPrompt
+            });
+          }
+        });
+
     }
 
     // Add prompt to messages

diff --git a/confichat/lib/ui_sidebar.dart b/confichat/lib/ui_sidebar.dart
@@ -135,7 +135,7 @@ class SidebarState extends State<Sidebar> {
                                 itemBuilder: (context) => [
 
                                   // Allow updates if there are unsaved messages
-                                  if(widget.appData.haveUnsavedMessages)
+                                  if(widget.appData.haveUnsavedMessages )
                                   const PopupMenuItem(
                                     value: 'update',
                                     child: Text('Update'),