User page and provider

lib/main.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:maid/providers/user.dart';
 import 'package:maid/ui/mobile/pages/home_page.dart';
 import 'package:maid/providers/ai_platform.dart';
 import 'package:maid/providers/session.dart';
@@ -23,6 +24,7 @@ void main() {
       providers: [
         ChangeNotifierProvider(create: (context) => MainProvider()),
         ChangeNotifierProvider(create: (context) => AiPlatform()),
+        ChangeNotifierProvider(create: (context) => User()),
         ChangeNotifierProvider(create: (context) => Character()),
         ChangeNotifierProvider(create: (context) => Session()),
       ],
@@ -67,11 +69,12 @@ class MaidApp extends StatefulWidget {
 class MaidAppState extends State<MaidApp> {
   @override
   Widget build(BuildContext context) {
-    return Consumer4<MainProvider, AiPlatform, Character, Session>(
-      builder: (context, mainProvider, ai, character, session, child) {
+    return Consumer5<MainProvider, AiPlatform, User, Character, Session>(
+      builder: (context, mainProvider, ai, user, character, session, child) {
         if (!mainProvider.initialised) {
           mainProvider.init();
           ai.init();
+          user.init();
           character.init();
           session.init();
         }

lib/providers/ai_platform.dart

@@ -45,7 +45,7 @@ class AiPlatform extends ChangeNotifier {
   void newPreset() {
     final key = UniqueKey().toString();
     _preset = "New Preset $key";
-    resetAll();
+    reset();
   }
 
   void notify() {
@@ -64,7 +64,7 @@ class AiPlatform extends ChangeNotifier {
       fromMap(lastModel);
       Logger.log(lastModel.toString());
     } else {
-      resetAll();
+      reset();
     }
   }
 
@@ -255,7 +255,7 @@ class AiPlatform extends ChangeNotifier {
 
   void fromMap(Map<String, dynamic> inputJson) {
     if (inputJson.isEmpty) {
-      resetAll();
+      reset();
     } else {
       _promptFormat = PromptFormatType.values[
           inputJson["prompt_promptFormat"] ?? PromptFormatType.alpaca.index];
@@ -328,7 +328,7 @@ class AiPlatform extends ChangeNotifier {
     return outputJson;
   }
 
-  void resetAll() {
+  void reset() {
     rootBundle.loadString('assets/default_parameters.json').then((jsonString) {
       Map<String, dynamic> assetJson = json.decode(jsonString);
 
@@ -370,7 +370,7 @@ class AiPlatform extends ChangeNotifier {
 
       fromMap(inputJson);
     } catch (e) {
-      resetAll();
+      reset();
       return "Error: $e";
     }
 

lib/providers/character.dart

@@ -7,7 +7,6 @@ import 'package:flutter/material.dart';
 import 'package:maid/static/file_manager.dart';
 import 'package:maid/static/logger.dart';
 import 'package:image/image.dart';
-import 'package:maid/static/user.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -28,7 +27,7 @@ class Character extends ChangeNotifier {
   void newCharacter() {
     final key = UniqueKey().toString();
     _name = "New Character $key";
-    resetAll();
+    reset();
   }
 
   void notify() {
@@ -47,7 +46,7 @@ class Character extends ChangeNotifier {
       Logger.log(lastCharacter.toString());
       fromMap(lastCharacter);
     } else {
-      resetAll();
+      reset();
     }
   }
 
@@ -72,7 +71,7 @@ class Character extends ChangeNotifier {
     _name = inputJson["name"] ?? "Unknown";
 
     if (inputJson.isEmpty) {
-      resetAll();
+      reset();
     }
 
     _description = inputJson["description"] ?? "";
@@ -234,7 +233,7 @@ class Character extends ChangeNotifier {
 
   List<Map<String, dynamic>> get examples => _examples;
 
-  void resetAll() {
+  void reset() {
     // Reset all the internal state to the defaults
     rootBundle.loadString('assets/default_character.json').then((jsonString) {
       Map<String, dynamic> jsonCharacter = json.decode(jsonString);
@@ -276,14 +275,14 @@ class Character extends ChangeNotifier {
       Map<String, dynamic> jsonCharacter = json.decode(jsonString);
 
       if (jsonCharacter.isEmpty) {
-        resetAll();
+        reset();
         return "Failed to decode character";
       }
 
       fromMap(jsonCharacter);
       return "Character Successfully Loaded";
     } catch (e) {
-      resetAll();
+      reset();
       Logger.log("Error: $e");
       return "Error: $e";
     }
@@ -377,7 +376,7 @@ class Character extends ChangeNotifier {
       notifyListeners();
       return "Character Successfully Loaded";
     } catch (e) {
-      resetAll();
+      reset();
       Logger.log("Error: $e");
       return "Error: $e";
     }
@@ -429,20 +428,4 @@ class Character extends ChangeNotifier {
 
     return buffer.toString();
   }
-
-  String formatPlaceholders(String input) {
-    input = _replaceCaseInsensitive(input, "{{char}}", _name);
-    input = _replaceCaseInsensitive(input, "<BOT>", _name);
-    input = _replaceCaseInsensitive(input, "{{user}}", User.name);
-    input = _replaceCaseInsensitive(input, "<USER>", User.name);
-
-    return input;
-  }
-
-  String _replaceCaseInsensitive(
-      String original, String from, String replaceWith) {
-    // This creates a regular expression that ignores case (case-insensitive)
-    RegExp exp = RegExp(RegExp.escape(from), caseSensitive: false);
-    return original.replaceAll(exp, replaceWith);
-  }
 }

lib/providers/user.dart

@@ -0,0 +1,64 @@
+import 'dart:io';
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class User extends ChangeNotifier {
+  File _profile = File("assets/chadUser.png");
+  String _name = "User";
+
+  File get profile => _profile;
+
+  String get name => _name;
+
+  set profile(File value) {
+    _profile = value;
+    notifyListeners();
+  }
+
+  set name(String value) {
+    _name = value;
+    notifyListeners();
+  }
+
+  void init() async {
+    final prefs = await SharedPreferences.getInstance();
+
+    Map<String, dynamic> lastUser =
+        json.decode(prefs.getString("last_user") ?? "{}") ?? {};
+
+    if (lastUser.isNotEmpty) {
+      fromMap(lastUser);
+    } else {
+      reset();
+    }
+
+    notifyListeners();
+  }
+
+  void fromMap(Map<String, dynamic> inputJson) {
+    if (inputJson["profile"] != null) {
+      _profile = File(inputJson["profile"]);
+    } else {
+      _profile = File("assets/chadUser.png");
+    }
+
+    _name = inputJson["name"];
+    notifyListeners();
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      "profile": _profile.path,
+      "name": _name,
+    };
+  }
+
+  void reset() {
+    _profile = File("assets/chadUser.png");
+    _name = "User";
+    notifyListeners();
+  }
+}

lib/static/generation_manager.dart

@@ -13,6 +13,7 @@ import 'package:langchain_openai/langchain_openai.dart';
 import 'package:llama_cpp_dart/llama_cpp_dart.dart';
 import 'package:maid/providers/character.dart';
 import 'package:maid/providers/session.dart';
+import 'package:maid/providers/user.dart';
 import 'package:maid/static/logger.dart';
 import 'package:maid/providers/ai_platform.dart';
 import 'package:lan_scanner/lan_scanner.dart';
@@ -39,6 +40,7 @@ class GenerationManager {
     _completer = Completer();
 
     final ai = context.read<AiPlatform>();
+    final user = context.read<User>();
     final character = context.read<Character>();
     final session = context.read<Session>();
 
@@ -76,10 +78,10 @@ class GenerationManager {
       {
         'role': 'system',
         'content': '''
-          ${character.formatPlaceholders(character.description)}\n\n
-          ${character.formatPlaceholders(character.personality)}\n\n
-          ${character.formatPlaceholders(character.scenario)}\n\n
-          ${character.formatPlaceholders(character.system)}\n\n
+          ${formatPlaceholders(character.description, user.name, character.name)}\n\n
+          ${formatPlaceholders(character.personality, user.name, character.name)}\n\n
+          ${formatPlaceholders(character.scenario, user.name, character.name)}\n\n
+          ${formatPlaceholders(character.system, user.name, character.name)}\n\n
         '''
       }
     ];
@@ -107,6 +109,7 @@ class GenerationManager {
   static void remotePrompt(String input, BuildContext context,
       void Function(String?) callback) async {
     final ai = context.read<AiPlatform>();
+    final user = context.read<User>();
     final character = context.read<Character>();
     final session = context.read<Session>();
 
@@ -118,10 +121,10 @@ class GenerationManager {
     List<ChatMessage> chatMessages = [];
 
     final prePrompt = '''
-      ${character.formatPlaceholders(character.description)}\n\n
-      ${character.formatPlaceholders(character.personality)}\n\n
-      ${character.formatPlaceholders(character.scenario)}\n\n
-      ${character.formatPlaceholders(character.system)}\n\n
+      ${formatPlaceholders(character.description, user.name, character.name)}\n\n
+      ${formatPlaceholders(character.personality, user.name, character.name)}\n\n
+      ${formatPlaceholders(character.scenario, user.name, character.name)}\n\n
+      ${formatPlaceholders(character.system, user.name, character.name)}\n\n
     ''';
 
     List<Map<String, dynamic>> messages = [
@@ -152,8 +155,8 @@ class GenerationManager {
           break;
       }
 
-      chatMessages.add(
-          ChatMessage.system(character.formatPlaceholders(character.system)));
+      chatMessages.add(ChatMessage.system(
+          formatPlaceholders(character.system, user.name, character.name)));
     }
 
     chatMessages.add(ChatMessage.humanText(input));
@@ -399,4 +402,21 @@ class GenerationManager {
       return false;
     }
   }
+
+  static String formatPlaceholders(
+      String input, String userName, String characterName) {
+    input = _replaceCaseInsensitive(input, "{{char}}", characterName);
+    input = _replaceCaseInsensitive(input, "<BOT>", characterName);
+    input = _replaceCaseInsensitive(input, "{{user}}", userName);
+    input = _replaceCaseInsensitive(input, "<USER>", userName);
+
+    return input;
+  }
+
+  static String _replaceCaseInsensitive(
+      String original, String from, String replaceWith) {
+    // This creates a regular expression that ignores case (case-insensitive)
+    RegExp exp = RegExp(RegExp.escape(from), caseSensitive: false);
+    return original.replaceAll(exp, replaceWith);
+  }
 }

lib/ui/mobile/pages/character_page.dart

@@ -102,8 +102,7 @@ class _CharacterPageState extends State<CharacterPage> {
                     children: [
                       const SizedBox(height: 10.0),
                       CircleAvatar(
-                        backgroundImage:
-                            const AssetImage("assets/maid.png"),
+                        backgroundImage: const AssetImage("assets/maid.png"),
                         foregroundImage: Image.file(character.profile).image,
                         radius: 75,
                       ),
@@ -236,7 +235,7 @@ class _CharacterPageState extends State<CharacterPage> {
                           },
                           rightText: "Reset All",
                           rightOnPressed: () {
-                            character.resetAll();
+                            character.reset();
                           }),
                       const SizedBox(height: 15.0),
                       DoubleButtonRow(