Merge pull request #76 from yaso-meth/QOL-TTS-for-Mzansi-AI
QOL-TTS-for-Mzansi-AI
This commit is contained in:
@@ -64,5 +64,9 @@
|
|||||||
<intent>
|
<intent>
|
||||||
<action android:name="android.support.customtabs.action.CustomTabsService" />
|
<action android:name="android.support.customtabs.action.CustomTabsService" />
|
||||||
</intent>
|
</intent>
|
||||||
|
<!-- Text to speech android 11 -->
|
||||||
|
<intent>
|
||||||
|
<action android:name="android.intent.action.TTS_SERVICE" />
|
||||||
|
</intent>
|
||||||
</queries>
|
</queries>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_chat_ui/flutter_chat_ui.dart';
|
import 'package:flutter_chat_ui/flutter_chat_ui.dart';
|
||||||
import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
|
import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
|
||||||
import 'package:flutter/services.dart' show rootBundle;
|
import 'package:flutter/services.dart' show rootBundle;
|
||||||
|
import 'package:flutter_tts/flutter_tts.dart';
|
||||||
import 'package:ollama_dart/ollama_dart.dart' as ollama;
|
import 'package:ollama_dart/ollama_dart.dart' as ollama;
|
||||||
import 'package:uuid/uuid.dart';
|
import 'package:uuid/uuid.dart';
|
||||||
|
|
||||||
@@ -28,9 +29,14 @@ class AiChat extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _AiChatState extends State<AiChat> {
|
class _AiChatState extends State<AiChat> {
|
||||||
final TextEditingController _modelCopntroller = TextEditingController();
|
final TextEditingController _modelController = TextEditingController();
|
||||||
final TextEditingController _fontSizeCopntroller = TextEditingController();
|
final TextEditingController _fontSizeController = TextEditingController();
|
||||||
|
final TextEditingController _ttsController = TextEditingController();
|
||||||
final ValueNotifier<bool> _showModelOptions = ValueNotifier(false);
|
final ValueNotifier<bool> _showModelOptions = ValueNotifier(false);
|
||||||
|
FlutterTts _flutterTts = FlutterTts();
|
||||||
|
String? textStream;
|
||||||
|
List<Map> _voices = [];
|
||||||
|
Map? _currentVoice;
|
||||||
List<types.Message> _messages = [];
|
List<types.Message> _messages = [];
|
||||||
late types.User _user;
|
late types.User _user;
|
||||||
late types.User _mihAI;
|
late types.User _mihAI;
|
||||||
@@ -109,12 +115,67 @@ class _AiChatState extends State<AiChat> {
|
|||||||
stream: aiChatStream,
|
stream: aiChatStream,
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
if (snapshot.hasData) {
|
if (snapshot.hasData) {
|
||||||
|
textStream = snapshot.requireData;
|
||||||
|
// print("Text: $textStream");
|
||||||
|
// _speakText(textStream!);
|
||||||
return MihAppWindow(
|
return MihAppWindow(
|
||||||
fullscreen: false,
|
fullscreen: false,
|
||||||
windowTitle: 'Mzansi AI Thoughts',
|
windowTitle: 'Mzansi AI Thoughts',
|
||||||
windowTools: const [],
|
windowTools: [
|
||||||
|
Visibility(
|
||||||
|
visible: _aiThinking == false,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(5.0),
|
||||||
|
child: Container(
|
||||||
|
//color: MzanziInnovationHub.of(context)!.theme.successColor(),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color:
|
||||||
|
MzanziInnovationHub.of(context)!.theme.successColor(),
|
||||||
|
borderRadius: const BorderRadius.all(
|
||||||
|
Radius.circular(100),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: IconButton(
|
||||||
|
color:
|
||||||
|
MzanziInnovationHub.of(context)!.theme.primaryColor(),
|
||||||
|
onPressed: () {
|
||||||
|
print("Start TTS now");
|
||||||
|
_speakText(snapshot.requireData);
|
||||||
|
},
|
||||||
|
icon: const Icon(Icons.volume_up),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Visibility(
|
||||||
|
visible: _aiThinking == true,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(5.0),
|
||||||
|
child: Container(
|
||||||
|
// color: MzanziInnovationHub.of(context)!.theme.errorColor(),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color:
|
||||||
|
MzanziInnovationHub.of(context)!.theme.errorColor(),
|
||||||
|
borderRadius: const BorderRadius.all(
|
||||||
|
Radius.circular(100),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: IconButton(
|
||||||
|
color:
|
||||||
|
MzanziInnovationHub.of(context)!.theme.primaryColor(),
|
||||||
|
onPressed: () {
|
||||||
|
//print("Start TTS now");
|
||||||
|
_flutterTts.stop();
|
||||||
|
},
|
||||||
|
icon: const Icon(Icons.volume_off),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
onWindowTapClose: () {
|
onWindowTapClose: () {
|
||||||
_captureAIResponse(snapshot.requireData);
|
_captureAIResponse(snapshot.requireData);
|
||||||
|
_flutterTts.stop();
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
},
|
},
|
||||||
windowBody: [
|
windowBody: [
|
||||||
@@ -141,6 +202,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
autofocus: true,
|
autofocus: true,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
_captureAIResponse(snapshot.requireData);
|
_captureAIResponse(snapshot.requireData);
|
||||||
|
_flutterTts.stop();
|
||||||
Navigator.of(context).pop();
|
Navigator.of(context).pop();
|
||||||
},
|
},
|
||||||
focusColor: MzanziInnovationHub.of(context)!
|
focusColor: MzanziInnovationHub.of(context)!
|
||||||
@@ -220,7 +282,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
) async* {
|
) async* {
|
||||||
final aiStream = client.generateChatCompletionStream(
|
final aiStream = client.generateChatCompletionStream(
|
||||||
request: ollama.GenerateChatCompletionRequest(
|
request: ollama.GenerateChatCompletionRequest(
|
||||||
model: _modelCopntroller.text,
|
model: _modelController.text,
|
||||||
messages: _chatHistory,
|
messages: _chatHistory,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -328,7 +390,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
width: 300,
|
width: 300,
|
||||||
child: MIHDropdownField(
|
child: MIHDropdownField(
|
||||||
controller: _modelCopntroller,
|
controller: _modelController,
|
||||||
hintText: "AI Model",
|
hintText: "AI Model",
|
||||||
dropdownOptions: const [
|
dropdownOptions: const [
|
||||||
'deepseek-r1:1.5b',
|
'deepseek-r1:1.5b',
|
||||||
@@ -350,7 +412,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
setState(() {
|
setState(() {
|
||||||
_chatFrontSize -= 1;
|
_chatFrontSize -= 1;
|
||||||
_fontSizeCopntroller.text =
|
_fontSizeController.text =
|
||||||
_chatFrontSize.ceil().toString();
|
_chatFrontSize.ceil().toString();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -362,7 +424,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
SizedBox(
|
SizedBox(
|
||||||
width: 200,
|
width: 200,
|
||||||
child: MIHTextField(
|
child: MIHTextField(
|
||||||
controller: _fontSizeCopntroller,
|
controller: _fontSizeController,
|
||||||
hintText: "Chat Font Size",
|
hintText: "Chat Font Size",
|
||||||
editable: false,
|
editable: false,
|
||||||
required: true,
|
required: true,
|
||||||
@@ -373,7 +435,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
setState(() {
|
setState(() {
|
||||||
_chatFrontSize += 1;
|
_chatFrontSize += 1;
|
||||||
_fontSizeCopntroller.text =
|
_fontSizeController.text =
|
||||||
_chatFrontSize.ceil().toString();
|
_chatFrontSize.ceil().toString();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -384,6 +446,28 @@ class _AiChatState extends State<AiChat> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 25),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 300,
|
||||||
|
child: MIHDropdownField(
|
||||||
|
controller: _ttsController,
|
||||||
|
hintText: "AI Voice",
|
||||||
|
dropdownOptions: _voices
|
||||||
|
.map((_voice) => _voice["name"] as String)
|
||||||
|
.toList(),
|
||||||
|
required: true,
|
||||||
|
editable: true,
|
||||||
|
enableSearch: false,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -395,12 +479,58 @@ class _AiChatState extends State<AiChat> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setTtsVoice(String voiceName) {
|
||||||
|
_flutterTts.setVoice(
|
||||||
|
{
|
||||||
|
"name": voiceName,
|
||||||
|
"locale": _voices
|
||||||
|
.where((_voice) => _voice["name"].contains(voiceName))
|
||||||
|
.first["locale"]
|
||||||
|
},
|
||||||
|
);
|
||||||
|
_ttsController.text = _currentVoice!["name"];
|
||||||
|
}
|
||||||
|
|
||||||
|
void _speakText(String text) async {
|
||||||
|
try {
|
||||||
|
await _flutterTts.stop(); // Stop any ongoing speech
|
||||||
|
await _flutterTts.speak(text); // Speak the new text
|
||||||
|
} catch (e) {
|
||||||
|
print("TTS Error: $e");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
// TODO: implement dispose
|
// TODO: implement dispose
|
||||||
super.dispose();
|
super.dispose();
|
||||||
_modelCopntroller.dispose();
|
_modelController.dispose();
|
||||||
|
_fontSizeController.dispose();
|
||||||
|
_ttsController.dispose();
|
||||||
client.endSession();
|
client.endSession();
|
||||||
|
_flutterTts.stop();
|
||||||
|
}
|
||||||
|
|
||||||
|
void initTTS() {
|
||||||
|
_flutterTts.setVolume(0.7);
|
||||||
|
_flutterTts.getVoices.then(
|
||||||
|
(data) {
|
||||||
|
try {
|
||||||
|
_voices = List<Map>.from(data);
|
||||||
|
|
||||||
|
print("=================== Voices ===================\n$_voices");
|
||||||
|
setState(() {
|
||||||
|
_voices = _voices
|
||||||
|
.where((_voice) => _voice["name"].contains("en"))
|
||||||
|
.toList();
|
||||||
|
_currentVoice = _voices.first;
|
||||||
|
setTtsVoice(_currentVoice!["name"]);
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
print(e);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -414,8 +544,8 @@ class _AiChatState extends State<AiChat> {
|
|||||||
firstName: "Mzansi AI",
|
firstName: "Mzansi AI",
|
||||||
id: const Uuid().v4(),
|
id: const Uuid().v4(),
|
||||||
);
|
);
|
||||||
_modelCopntroller.text = 'gemma2:2b';
|
_modelController.text = 'gemma2:2b';
|
||||||
_fontSizeCopntroller.text = _chatFrontSize.ceil().toString();
|
_fontSizeController.text = _chatFrontSize.ceil().toString();
|
||||||
_chatHistory.add(
|
_chatHistory.add(
|
||||||
ollama.Message(
|
ollama.Message(
|
||||||
role: ollama.MessageRole.system,
|
role: ollama.MessageRole.system,
|
||||||
@@ -423,6 +553,7 @@ class _AiChatState extends State<AiChat> {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
_loadMessages();
|
_loadMessages();
|
||||||
|
initTTS();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import Foundation
|
|||||||
|
|
||||||
import device_info_plus
|
import device_info_plus
|
||||||
import firebase_core
|
import firebase_core
|
||||||
|
import flutter_tts
|
||||||
import geolocator_apple
|
import geolocator_apple
|
||||||
import local_auth_darwin
|
import local_auth_darwin
|
||||||
import mobile_scanner
|
import mobile_scanner
|
||||||
@@ -20,6 +21,7 @@ import webview_flutter_wkwebview
|
|||||||
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
||||||
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
|
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
|
||||||
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
|
FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
|
||||||
|
FlutterTtsPlugin.register(with: registry.registrar(forPlugin: "FlutterTtsPlugin"))
|
||||||
GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
|
GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
|
||||||
FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
|
FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
|
||||||
MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
|
MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
|
||||||
|
|||||||
@@ -507,6 +507,14 @@ packages:
|
|||||||
description: flutter
|
description: flutter
|
||||||
source: sdk
|
source: sdk
|
||||||
version: "0.0.0"
|
version: "0.0.0"
|
||||||
|
flutter_tts:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: flutter_tts
|
||||||
|
sha256: baa3cb6b4990318460fe28bfa8c7869399e97223971532c02bd97c5e876aa3c5
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "4.2.2"
|
||||||
flutter_web_plugins:
|
flutter_web_plugins:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description: flutter
|
description: flutter
|
||||||
|
|||||||
@@ -74,6 +74,7 @@ dependencies:
|
|||||||
flutter_chat_ui: ^1.6.15
|
flutter_chat_ui: ^1.6.15
|
||||||
flutter_chat_types: ^3.6.2
|
flutter_chat_types: ^3.6.2
|
||||||
uuid: ^4.5.1
|
uuid: ^4.5.1
|
||||||
|
flutter_tts: ^4.2.2
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
|
|
||||||
#include <firebase_core/firebase_core_plugin_c_api.h>
|
#include <firebase_core/firebase_core_plugin_c_api.h>
|
||||||
#include <fl_downloader/fl_downloader_plugin_c_api.h>
|
#include <fl_downloader/fl_downloader_plugin_c_api.h>
|
||||||
|
#include <flutter_tts/flutter_tts_plugin.h>
|
||||||
#include <geolocator_windows/geolocator_windows.h>
|
#include <geolocator_windows/geolocator_windows.h>
|
||||||
#include <local_auth_windows/local_auth_plugin.h>
|
#include <local_auth_windows/local_auth_plugin.h>
|
||||||
#include <permission_handler_windows/permission_handler_windows_plugin.h>
|
#include <permission_handler_windows/permission_handler_windows_plugin.h>
|
||||||
@@ -21,6 +22,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
|
|||||||
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
|
registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
|
||||||
FlDownloaderPluginCApiRegisterWithRegistrar(
|
FlDownloaderPluginCApiRegisterWithRegistrar(
|
||||||
registry->GetRegistrarForPlugin("FlDownloaderPluginCApi"));
|
registry->GetRegistrarForPlugin("FlDownloaderPluginCApi"));
|
||||||
|
FlutterTtsPluginRegisterWithRegistrar(
|
||||||
|
registry->GetRegistrarForPlugin("FlutterTtsPlugin"));
|
||||||
GeolocatorWindowsRegisterWithRegistrar(
|
GeolocatorWindowsRegisterWithRegistrar(
|
||||||
registry->GetRegistrarForPlugin("GeolocatorWindows"));
|
registry->GetRegistrarForPlugin("GeolocatorWindows"));
|
||||||
LocalAuthPluginRegisterWithRegistrar(
|
LocalAuthPluginRegisterWithRegistrar(
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
list(APPEND FLUTTER_PLUGIN_LIST
|
list(APPEND FLUTTER_PLUGIN_LIST
|
||||||
firebase_core
|
firebase_core
|
||||||
fl_downloader
|
fl_downloader
|
||||||
|
flutter_tts
|
||||||
geolocator_windows
|
geolocator_windows
|
||||||
local_auth_windows
|
local_auth_windows
|
||||||
permission_handler_windows
|
permission_handler_windows
|
||||||
|
|||||||
Reference in New Issue
Block a user