Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-27 11:16:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplify OpenAI plain input

Browse Source
This commit is contained in:
M66B
2025-01-31 23:21:57 +01:00
parent 861471d058
commit 4c05436739
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/java/eu/faircode/email/AI.java
View File

@@ -61,20 +61,27 @@ public class AI {
messages.add(new OpenAI.Message(OpenAI.SYSTEM, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, systemPrompt)}));
messages.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, prompt == null ? defaultPrompt : prompt)}));
if (body instanceof Spannable && multimodal) {
messages.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, prompt == null ? defaultPrompt : prompt)}));
if (!TextUtils.isEmpty(body))
if (body instanceof Spannable && multimodal)
if (!TextUtils.isEmpty(body))
messages.add(new OpenAI.Message(OpenAI.USER,
OpenAI.Content.get((Spannable) body, id, context)));
else
messages.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, body.toString())}));
if (!TextUtils.isEmpty(reply))
if (!TextUtils.isEmpty(reply))
messages.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, reply)}));
} else {
List<String> contents = new ArrayList<>();
contents.add(prompt == null ? defaultPrompt : prompt);
if (!TextUtils.isEmpty(body))
contents.add(body.toString());
if (!TextUtils.isEmpty(reply))
contents.add(reply);
messages.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, reply)}));
new OpenAI.Content(OpenAI.CONTENT_TEXT, TextUtils.join("\n", contents))}));
}
OpenAI.Message[] completions = OpenAI.completeChat(context,
model, messages.toArray(new OpenAI.Message[0]), temperature, 1);
@@ -182,17 +189,22 @@ public class AI {
boolean multimodal = prefs.getBoolean("openai_multimodal", false);
List<OpenAI.Message> input = new ArrayList<>();
input.add(new OpenAI.Message(OpenAI.USER,
new OpenAI.Content[]{new OpenAI.Content(OpenAI.CONTENT_TEXT,
templatePrompt == null ? defaultPrompt : templatePrompt)}));
if (multimodal) {
input.add(new OpenAI.Message(OpenAI.USER,
new OpenAI.Content[]{new OpenAI.Content(OpenAI.CONTENT_TEXT,
templatePrompt == null ? defaultPrompt : templatePrompt)}));
SpannableStringBuilder ssb = HtmlHelper.fromDocument(context, d, null, null);
input.add(new OpenAI.Message(OpenAI.USER,
OpenAI.Content.get(ssb, message.id, context)));
} else
} else {
List<String> contents = new ArrayList<>();
contents.add(templatePrompt == null ? defaultPrompt : templatePrompt);
contents.add(body);
input.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, body)}));
new OpenAI.Content(OpenAI.CONTENT_TEXT, TextUtils.join("\n", contents))}));
}
OpenAI.Message[] completions =
OpenAI.completeChat(context, model, input.toArray(new OpenAI.Message[0]), temperature, 1);