RomanNum3ral
/
ollama-app
mirror of https://github.com/JHubi1/ollama-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Overhauled title system

This commit is contained in:
JHubi1 2024-08-20 21:39:15 +02:00
parent 4d63da801c
commit 8813571b65
No known key found for this signature in database
GPG Key ID: 7BF82570CBBBD050
2 changed files with 81 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
lib/worker/sender.dart
View File

@ -53,7 +53,34 @@ Future<List<llama.Message>> getHistory([String? addToSystem]) async {
return history; return history;
} }
List getHistoryString([String? uuid]) {
uuid ??= chatUuid!;
List messages = [];
for (var i = 0; i < (prefs!.getStringList("chats") ?? []).length; i++) {
if (jsonDecode((prefs!.getStringList("chats") ?? [])[i])["uuid"] == uuid) {
messages = jsonDecode(
jsonDecode((prefs!.getStringList("chats") ?? [])[i])["messages"]);
break;
}
}
if (messages[0]["role"] == "system") {
messages.removeAt(0);
}
for (var i = 0; i < messages.length; i++) {
if (messages[i]["type"] == "image") {
messages[i] = {
"role": messages[i]["role"]!,
"content": "<${messages[i]["role"]} inserted an image>"
};
}
}
return messages;
}
Future<String> getTitleAi(List history) async { Future<String> getTitleAi(List history) async {
print(history);
final generated = await (llama.OllamaClient( final generated = await (llama.OllamaClient(
headers: (jsonDecode(prefs!.getString("hostHeaders") ?? "{}") as Map) headers: (jsonDecode(prefs!.getString("hostHeaders") ?? "{}") as Map)
.cast<String, String>(), .cast<String, String>(),
@ -65,20 +92,44 @@ Future<String> getTitleAi(List history) async {
const llama.Message( const llama.Message(
role: llama.MessageRole.system, role: llama.MessageRole.system,
content: content:
"You must not use markdown or any other formatting language! Create a short title for the subject of the conversation described in the following json object. It is not allowed to be too general; no 'Assistance', 'Help' or similar!"), "Generate a three to six word title for the conversation provided by the user. If an object or person is very important in the conversation, put it in the title as well; keep the focus on the main subject. You must not put the assistant in the focus and you must not put the word 'assistant' in the title! Do preferably use title case. Use a formal tone, don't use dramatic words, like 'mystery' Use spaces between words, do not use camel case! You must not use markdown or any other formatting language! You must not use emojis or any other symbols! You must not use general clauses like 'assistance', 'help' or 'session' in your title! \n\n~~User Introduces Themselves~~ -> User Introduction\n~~User Asks for Help with a Problem~~ -> Problem Help\n~~User has a _**big**_ Problem~~ -> Big Problem\n~~Conversation~~ -> Conversation about Fireflies"),
llama.Message( llama.Message(
role: llama.MessageRole.user, content: jsonEncode(history)) role: llama.MessageRole.user,
content: "```\n${jsonEncode(history)}\n```")
], ],
keepAlive: int.parse(prefs!.getString("keepAlive") ?? "300")), keepAlive: int.parse(prefs!.getString("keepAlive") ?? "300")),
) )
.timeout(const Duration(seconds: 10)); .timeout(const Duration(seconds: 10));
var title = generated.message!.content var title = generated.message!.content;
.replaceAll("\"", "") title = title.replaceAll("\n", " ").trim();
.replaceAll("'", "")
.replaceAll("*", "") var terms = [
.replaceAll("_", "") "\"",
.replaceAll("\n", " ") "'",
.trim(); "*",
"_",
".",
",",
"!",
"?",
":",
";",
"(",
")",
"[",
"]",
"{",
"}"
];
for (var i = 0; i < terms.length; i++) {
title = title.replaceAll(terms[i], "");
}
title = title.replaceAll(RegExp(r'<.*?>', dotAll: true), "");
if (title.split(":").length == 2) {
title = title.split(":")[1].trim();
}
while (title.contains(" ")) { while (title.contains(" ")) {
title = title.replaceAll(" ", " "); title = title.replaceAll(" ", " ");
} }
@ -213,9 +264,6 @@ Future<String> send(String value, BuildContext context, Function setState,
) )
.timeout(const Duration(seconds: 30)); .timeout(const Duration(seconds: 30));
if (chatAllowed) return ""; if (chatAllowed) return "";
// if (request.message!.content.trim() == "") {
// throw Exception();
// }
messages.insert( messages.insert(
0, 0,
types.TextMessage( types.TextMessage(
@ -265,7 +313,7 @@ Future<String> send(String value, BuildContext context, Function setState,
if (newChat && (prefs!.getBool("generateTitles") ?? true)) { if (newChat && (prefs!.getBool("generateTitles") ?? true)) {
void setTitle() async { void setTitle() async {
await setTitleAi(await getHistory()); await setTitleAi(getHistoryString());
setState(() {}); setState(() {});
} }

57
lib/worker/setter.dart
View File

@ -517,47 +517,30 @@ Future<String> prompt(BuildContext context,
setLocalState(() { setLocalState(() {
loading = true; loading = true;
}); });
for (var i = 0;
i < try {
(prefs!.getStringList( var title = await getTitleAi(
"chats") ?? getHistoryString(uuid));
[]) controller.text = title;
.length; setLocalState(() {
i++) { loading = false;
if (jsonDecode((prefs! });
.getStringList( } catch (_) {
"chats") ?? try {
[])[i])["uuid"] == setLocalState(() {
uuid) { loading = false;
try { });
var title = await getTitleAi( // ignore: use_build_context_synchronously
jsonDecode(jsonDecode( ScaffoldMessenger.of(context)
(prefs!.getStringList( .showSnackBar(SnackBar(
"chats") ?? content: Text(
[])[ AppLocalizations.of(
i])["messages"]));
controller.text = title;
setLocalState(() {
loading = false;
});
} catch (_) {
try {
setLocalState(() {
loading = false;
});
// ignore: use_build_context_synchronously
ScaffoldMessenger.of(context)
.showSnackBar(SnackBar(
content: Text(AppLocalizations.of(
// ignore: use_build_context_synchronously // ignore: use_build_context_synchronously
context)! context)!
.settingsHostInvalid( .settingsHostInvalid(
"timeout")), "timeout")),
showCloseIcon: true)); showCloseIcon: true));
} catch (_) {} } catch (_) {}
}
break;
}
} }
}, },
icon: const Icon( icon: const Icon(