yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #61 from yaso-meth/revert-57-QOL-Mzansi-AI-Chat-improvements

Browse Source 
Revert "- Add visibile sign when settings is clicked."
This commit is contained in:
yaso-meth
2025-01-29 19:46:22 +02:00
committed by GitHub
parent 6b6dc63e19 a94c191c7a
commit 5ee1e1f2e3
1 changed files with 109 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

325
Frontend/lib/mih_packages/mzansi_ai/ai_chat.dart
View File

@@ -1,10 +1,7 @@
import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:Mzansi_Innovation_Hub/main.dart'; import 'package:Mzansi_Innovation_Hub/main.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_window.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_window.dart';
import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -29,20 +26,17 @@ class AiChat extends StatefulWidget {
} }
class _AiChatState extends State<AiChat> { class _AiChatState extends State<AiChat> {
final TextEditingController _modelCopntroller = TextEditingController(); TextEditingController _modelCopntroller = TextEditingController();
final TextEditingController _fontSizeCopntroller = TextEditingController();
final ValueNotifier<bool> _showModelOptions = ValueNotifier(false); final ValueNotifier<bool> _showModelOptions = ValueNotifier(false);
List<types.Message> _messages = []; List<types.Message> _messages = [];
late types.User _user; late types.User _user;
late types.User _mihAI; late types.User _mihAI;
String systemPromt = String systemPromt =
"You are a helpful and friendly AI assistant. You are running on a system called MIH which was created by \"Mzansi Innovation Hub\" a South African based company."; "You are a helpful and friendly AI assistant. You are running on a system called MIH which was created by \"Mzansi Innovation Hub\" a South African based company.";
bool _aiThinking = false;
final client = ollama.OllamaClient( final client = ollama.OllamaClient(
baseUrl: "${AppEnviroment.baseAiUrl}/api", baseUrl: "${AppEnviroment.baseAiUrl}/api",
); );
List<ollama.Message> _chatHistory = []; List<ollama.Message> _chatHistory = [];
double _chatFrontSize = 17;
void _addMessage(types.Message message) { void _addMessage(types.Message message) {
setState(() { setState(() {
@@ -73,66 +67,86 @@ class _AiChatState extends State<AiChat> {
} }
void _handleMessageBack(String userMessage) async { void _handleMessageBack(String userMessage) async {
// types.TextMessage textMessage;
// String aiResponse = "";
// final aiResponseStream =
showDialog( showDialog(
context: context, context: context,
builder: (context) { builder: (context) {
return const Mihloadingcircle(); return const Mihloadingcircle();
}, },
); );
Stream<String> aiChatStream = _generateChatCompletionWithHistoryStream(userMessage, client)
_generateChatCompletionWithHistoryStream(userMessage, client); .listen((response) {
//aiResponse = response; //.split("</think>").last.trim();
});
Navigator.of(context).pop(); Navigator.of(context).pop();
showDialog( showDialog(
context: context, context: context,
barrierDismissible: false,
builder: (context) { builder: (context) {
return responseWindow(aiChatStream); return responseWindow();
}, },
); );
// setState(() {
// _chatHistory.add(
// ollama.Message(
// role: ollama.MessageRole.assistant,
// content: aiResponse,
// ),
// );
// });
// textMessage = types.TextMessage(
// author: _mihAI,
// createdAt: DateTime.now().millisecondsSinceEpoch,
// id: const Uuid().v4(),
// text: aiResponse //message.text,
// );
// _addMessage(textMessage);
// print(_chatHistory.toString());
// Navigator.of(context).pop();
} }
Widget responseWindow( Widget responseWindow() {
Stream<String> aiChatStream,
// StreamSubscription<String> aiChatSubscription,
) {
StreamSubscription<String> aiChatSubscription =
aiChatStream.listen((response) {});
types.TextMessage textMessage; types.TextMessage textMessage;
return StreamBuilder( return StreamBuilder(
stream: _generateChatCompletionWithHistoryStream("", client), stream: _generateChatCompletionWithHistoryStream("Hello", client),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasData) { if (snapshot.hasData) {
return MihAppWindow( return MihAppWindow(
fullscreen: false, fullscreen: false,
windowTitle: 'Mzansi AI Thoughts', windowTitle: 'Mzansi AI Thoughts',
windowTools: const [], windowTools: [
onWindowTapClose: () { IconButton(
if (_aiThinking) { onPressed: () {
aiChatSubscription.cancel(); setState(() {
} _chatHistory.add(
setState(() { ollama.Message(
_chatHistory.add( role: ollama.MessageRole.assistant,
ollama.Message( content: snapshot.requireData,
role: ollama.MessageRole.assistant, ),
content: snapshot.requireData, );
), });
); textMessage = types.TextMessage(
}); author: _mihAI,
textMessage = types.TextMessage( createdAt: DateTime.now().millisecondsSinceEpoch,
author: _mihAI, id: const Uuid().v4(),
createdAt: DateTime.now().millisecondsSinceEpoch, // metadata: <String, dynamic>{
id: const Uuid().v4(), // "thoughts": snapshot.requireData
// metadata: <String, dynamic>{ // },
// "thoughts": snapshot.requireData text: snapshot.requireData
// }, .replaceAll("<think>\n\n", "Thinking:\n")
text: snapshot.requireData .replaceAll(
.replaceAll("<think>\n\n", "Thinking:\n") "</think>\n\n", "Answer:\n"), //message.text,
.replaceAll("<think>\n", "Thinking:\n") );
.replaceAll("</think>\n\n", "Answer:\n"), //message.text,
);
_addMessage(textMessage); _addMessage(textMessage);
Navigator.of(context).pop();
},
icon: const Icon(Icons.arrow_back),
),
],
onWindowTapClose: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
windowBody: [ windowBody: [
@@ -142,47 +156,10 @@ class _AiChatState extends State<AiChat> {
style: TextStyle( style: TextStyle(
color: color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontSize: _chatFrontSize, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
const SizedBox(height: 15),
Visibility(
visible: _aiThinking == false,
child: MIHButton(
onTap: () {
setState(() {
_chatHistory.add(
ollama.Message(
role: ollama.MessageRole.assistant,
content: snapshot.requireData,
),
);
});
textMessage = types.TextMessage(
author: _mihAI,
createdAt: DateTime.now().millisecondsSinceEpoch,
id: const Uuid().v4(),
// metadata: <String, dynamic>{
// "thoughts": snapshot.requireData
// },
text: snapshot.requireData
.replaceAll("<think>\n\n", "Thinking:\n")
.replaceAll("<think>\n", "Thinking:\n")
.replaceAll(
"</think>\n\n", "Answer:\n"), //message.text,
);
_addMessage(textMessage);
Navigator.of(context).pop();
},
buttonText: "Continue",
buttonColor:
MzanziInnovationHub.of(context)!.theme.successColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
),
),
], ],
); );
} else { } else {
@@ -213,6 +190,19 @@ class _AiChatState extends State<AiChat> {
}); });
} }
// Future<String> _generateChatCompletionWithHistory(
// String userMessage,
// final ollama.OllamaClient client,
// ) async {
// final generated = await client.generateChatCompletion(
// request: ollama.GenerateChatCompletionRequest(
// model: _modelCopntroller.text,
// messages: _chatHistory,
// ),
// );
// return generated.message.content;
// }
Stream<String> _generateChatCompletionWithHistoryStream( Stream<String> _generateChatCompletionWithHistoryStream(
String userMessage, String userMessage,
final ollama.OllamaClient client, final ollama.OllamaClient client,
@@ -224,16 +214,10 @@ class _AiChatState extends State<AiChat> {
), ),
); );
String text = ''; String text = '';
setState(() {
_aiThinking = true;
});
await for (final res in aiStream) { await for (final res in aiStream) {
text += (res.message.content); text += (res.message.content);
yield text; yield text;
} }
setState(() {
_aiThinking = false;
});
// print(text); // print(text);
} }
@@ -263,19 +247,19 @@ class _AiChatState extends State<AiChat> {
errorColor: MzanziInnovationHub.of(context)!.theme.errorColor(), errorColor: MzanziInnovationHub.of(context)!.theme.errorColor(),
sentMessageBodyTextStyle: TextStyle( sentMessageBodyTextStyle: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
fontSize: _chatFrontSize, fontSize: 17,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontFamily: 'Segoe UI', fontFamily: 'Segoe UI',
), ),
receivedMessageBodyTextStyle: TextStyle( receivedMessageBodyTextStyle: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
fontSize: _chatFrontSize, fontSize: 17,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontFamily: 'Segoe UI', fontFamily: 'Segoe UI',
), ),
emptyChatPlaceholderTextStyle: TextStyle( emptyChatPlaceholderTextStyle: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.messageTextColor(), color: MzanziInnovationHub.of(context)!.theme.messageTextColor(),
fontSize: _chatFrontSize, fontSize: 17,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
fontFamily: 'Segoe UI', fontFamily: 'Segoe UI',
), ),
@@ -302,7 +286,6 @@ class _AiChatState extends State<AiChat> {
id: const Uuid().v4(), id: const Uuid().v4(),
); );
_modelCopntroller.text = 'deepseek-r1:1.5b'; _modelCopntroller.text = 'deepseek-r1:1.5b';
_fontSizeCopntroller.text = _chatFrontSize.ceil().toString();
// _chatHistory.add( // _chatHistory.add(
// ollama.Message( // ollama.Message(
// role: ollama.MessageRole.system, // role: ollama.MessageRole.system,
@@ -317,54 +300,25 @@ class _AiChatState extends State<AiChat> {
return MihAppToolBody( return MihAppToolBody(
borderOn: false, borderOn: false,
bodyItem: Column( bodyItem: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
children: [ children: [
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Expanded( IconButton(
child: Container( onPressed: () {
alignment: Alignment.centerLeft, if (_showModelOptions.value == true) {
child: Row( setState(() {
children: [ _showModelOptions.value = false;
Visibility( });
visible: _showModelOptions.value == false, } else {
child: IconButton( setState(() {
onPressed: () { _showModelOptions.value = true;
if (_showModelOptions.value == true) { });
setState(() { }
_showModelOptions.value = false; },
}); icon: const Icon(Icons.settings),
} else {
setState(() {
_showModelOptions.value = true;
});
}
},
icon: const Icon(Icons.settings),
),
),
Visibility(
visible: _showModelOptions.value == true,
child: IconButton.filled(
onPressed: () {
if (_showModelOptions.value == true) {
setState(() {
_showModelOptions.value = false;
});
} else {
setState(() {
_showModelOptions.value = true;
});
}
},
icon: const Icon(Icons.settings),
),
),
],
),
),
), ),
Text( Text(
"Mzansi AI", "Mzansi AI",
@@ -376,16 +330,11 @@ class _AiChatState extends State<AiChat> {
MzanziInnovationHub.of(context)!.theme.secondaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
Expanded( IconButton(
child: Container( onPressed: () {
alignment: Alignment.centerRight, _resetChat();
child: IconButton( },
onPressed: () { icon: const Icon(Icons.refresh),
_resetChat();
},
icon: const Icon(Icons.refresh),
),
),
), ),
], ],
), ),
@@ -394,83 +343,27 @@ class _AiChatState extends State<AiChat> {
builder: (BuildContext context, bool value, Widget? child) { builder: (BuildContext context, bool value, Widget? child) {
return Visibility( return Visibility(
visible: value, visible: value,
child: Padding( child: Row(
padding: const EdgeInsets.only(top: 10.0), mainAxisAlignment: MainAxisAlignment.start,
child: Row( children: [
mainAxisAlignment: MainAxisAlignment.start, Padding(
children: [ padding: const EdgeInsets.symmetric(horizontal: 25),
Padding( child: SizedBox(
padding: const EdgeInsets.symmetric(horizontal: 25), width: 300,
child: SizedBox( child: MIHDropdownField(
width: 300, controller: _modelCopntroller,
child: MIHDropdownField( hintText: "AI Model",
controller: _modelCopntroller, dropdownOptions: const ['deepseek-r1:1.5b'],
hintText: "AI Model",
dropdownOptions: const ['deepseek-r1:1.5b'],
required: true,
editable: true,
),
),
)
],
),
),
);
},
),
const SizedBox(height: 15),
ValueListenableBuilder(
valueListenable: _showModelOptions,
builder: (BuildContext context, bool value, Widget? child) {
return Visibility(
visible: value,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 25),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
IconButton.filled(
onPressed: () {
setState(() {
_chatFrontSize -= 1;
_fontSizeCopntroller.text =
_chatFrontSize.ceil().toString();
});
},
icon: const Icon(
Icons.remove,
),
),
const SizedBox(width: 10),
SizedBox(
width: 200,
child: MIHTextField(
controller: _fontSizeCopntroller,
hintText: "Chat Font Size",
editable: false,
required: true, required: true,
editable: true,
), ),
), ),
const SizedBox(width: 10), )
IconButton.filled( ],
onPressed: () {
setState(() {
_chatFrontSize += 1;
_fontSizeCopntroller.text =
_chatFrontSize.ceil().toString();
});
},
icon: const Icon(
Icons.add,
),
),
],
),
), ),
); );
}, },
), ),
const SizedBox(height: 5),
Expanded( Expanded(
child: Chat( child: Chat(
messages: _messages, messages: _messages,