msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

AI improvements

Browse Source
master
M66B 2 months ago
parent 3f0702fb1e
commit 6abb6dd47d
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File

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

@ -53,9 +53,9 @@ public class AI {
boolean multimodal = prefs.getBoolean("openai_multimodal", false); boolean multimodal = prefs.getBoolean("openai_multimodal", false);
OpenAI.Message message; OpenAI.Message message;
if (body instanceof Spannable) if (body instanceof Spannable && multimodal)
message = new OpenAI.Message(OpenAI.USER, message = new OpenAI.Message(OpenAI.USER,
OpenAI.Content.get((Spannable) body, id, multimodal, context)); OpenAI.Content.get((Spannable) body, id, context));
else else
message = new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{ message = new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, body.toString())}); new OpenAI.Content(OpenAI.CONTENT_TEXT, body.toString())});
@ -139,9 +139,13 @@ public class AI {
input.add(new OpenAI.Message(OpenAI.USER, input.add(new OpenAI.Message(OpenAI.USER,
new OpenAI.Content[]{new OpenAI.Content(OpenAI.CONTENT_TEXT, message.subject)})); new OpenAI.Content[]{new OpenAI.Content(OpenAI.CONTENT_TEXT, message.subject)}));
SpannableStringBuilder ssb = HtmlHelper.fromDocument(context, d, null, null); if (multimodal) {
input.add(new OpenAI.Message(OpenAI.USER, SpannableStringBuilder ssb = HtmlHelper.fromDocument(context, d, null, null);
OpenAI.Content.get(ssb, message.id, multimodal, context))); input.add(new OpenAI.Message(OpenAI.USER,
OpenAI.Content.get(ssb, message.id, context)));
} else
input.add(new OpenAI.Message(OpenAI.USER, new OpenAI.Content[]{
new OpenAI.Content(OpenAI.CONTENT_TEXT, d.text())}));
OpenAI.Message[] completions = OpenAI.Message[] completions =
OpenAI.completeChat(context, model, input.toArray(new OpenAI.Message[0]), temperature, 1); OpenAI.completeChat(context, model, input.toArray(new OpenAI.Message[0]), temperature, 1);
@ -160,10 +164,15 @@ public class AI {
float temperature = prefs.getFloat("gemini_temperature", Gemini.DEFAULT_TEMPERATURE); float temperature = prefs.getFloat("gemini_temperature", Gemini.DEFAULT_TEMPERATURE);
String prompt = prefs.getString("gemini_summarize", Gemini.DEFAULT_SUMMARY_PROMPT); String prompt = prefs.getString("gemini_summarize", Gemini.DEFAULT_SUMMARY_PROMPT);
String text = d.text(); String body = d.text();
if (TextUtils.isEmpty(text))
return null; List<String> texts = new ArrayList<>();
Gemini.Message content = new Gemini.Message(Gemini.USER, new String[]{prompt, text}); texts.add(prompt);
if (!TextUtils.isEmpty(message.subject))
texts.add(message.subject);
if (!TextUtils.isEmpty(body))
texts.add(body);
Gemini.Message content = new Gemini.Message(Gemini.USER, texts.toArray(new String[0]));
Gemini.Message[] completions = Gemini.Message[] completions =
Gemini.generate(context, model, new Gemini.Message[]{content}, temperature, 1); Gemini.generate(context, model, new Gemini.Message[]{content}, temperature, 1);

46
app/src/main/java/eu/faircode/email/OpenAI.java
Unescape View File

@ -277,7 +277,7 @@ public class OpenAI {
return this.content; return this.content;
} }
static Content[] get(Spannable ssb, long id, boolean multimodal, Context context) { static Content[] get(Spannable ssb, long id, Context context) {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
List<OpenAI.Content> contents = new ArrayList<>(); List<OpenAI.Content> contents = new ArrayList<>();
int start = 0; int start = 0;
@ -298,29 +298,29 @@ public class OpenAI {
Log.i("OpenAI images=" + (spans == null ? null : spans.length)); Log.i("OpenAI images=" + (spans == null ? null : spans.length));
if (spans != null && spans.length == 1) { if (spans != null && spans.length == 1) {
int e = ssb.getSpanEnd(spans[0]); int e = ssb.getSpanEnd(spans[0]);
if (multimodal) {
String url = null; String url = null;
String src = spans[0].getSource(); String src = spans[0].getSource();
Log.i("OpenAI image url=" + src); Log.i("OpenAI image url=" + src);
if (src != null && src.startsWith("cid:")) { if (src != null && src.startsWith("cid:")) {
String cid = '<' + src.substring(4) + '>'; String cid = '<' + src.substring(4) + '>';
EntityAttachment attachment = db.attachment().getAttachment(id, cid); EntityAttachment attachment = db.attachment().getAttachment(id, cid);
if (attachment != null && attachment.available) { if (attachment != null && attachment.available) {
File file = attachment.getFile(context); File file = attachment.getFile(context);
try (InputStream is = new FileInputStream(file)) { try (InputStream is = new FileInputStream(file)) {
Bitmap bm = ImageHelper.getScaledBitmap(is, null, null, SCALE2PIXELS); Bitmap bm = ImageHelper.getScaledBitmap(is, null, null, SCALE2PIXELS);
Helper.ByteArrayInOutStream bos = new Helper.ByteArrayInOutStream(); Helper.ByteArrayInOutStream bos = new Helper.ByteArrayInOutStream();
bm.compress(Bitmap.CompressFormat.PNG, 90, bos); bm.compress(Bitmap.CompressFormat.PNG, 90, bos);
url = ImageHelper.getDataUri(bos.getInputStream(), "image/png"); url = ImageHelper.getDataUri(bos.getInputStream(), "image/png");
} catch (Throwable ex) { } catch (Throwable ex) {
Log.w(ex); Log.w(ex);
}
} }
} else }
url = src; } else
if (url != null) url = src;
contents.add(new OpenAI.Content(OpenAI.CONTENT_IMAGE, url)); if (url != null)
} contents.add(new OpenAI.Content(OpenAI.CONTENT_IMAGE, url));
end = e; end = e;
} }
} }

Write Preview
Loading…
Cancel
Save