mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Handle empty summaries

Browse source
This commit is contained in:
M66B 2024-06-25 10:03:30 +02:00
parent ef3ede5c90
commit 6beb28511d
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/AI.java
View file

@ -190,6 +190,10 @@ public class AI {
HtmlHelper.truncate(d, MAX_SUMMARIZE_TEXT_SIZE);
String body = d.body().text().trim();
if (TextUtils.isEmpty(body))
return null;
String templatePrompt = null;
if (template > 0L) {
DB db = DB.getInstance(context);
@ -218,7 +222,7 @@ public class AI {
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())}));
new OpenAI.Content(OpenAI.CONTENT_TEXT, body)}));
OpenAI.Message[] completions =
OpenAI.completeChat(context, model, input.toArray(new OpenAI.Message[0]), temperature, 1);
@ -235,8 +239,6 @@ public class AI {
float temperature = prefs.getFloat("gemini_temperature", Gemini.DEFAULT_TEMPERATURE);
String defaultPrompt = prefs.getString("gemini_summarize", Gemini.DEFAULT_SUMMARY_PROMPT);
String body = d.text();
List<String> texts = new ArrayList<>();
texts.add(templatePrompt == null ? defaultPrompt : templatePrompt);
if (!TextUtils.isEmpty(body))

3
app/src/main/java/eu/faircode/email/EntityRule.java
View file

@ -1584,7 +1584,8 @@ public class EntityRule {
try {
Spanned summary = AI.getSummaryText(context, message, -1L);
message.preview = (summary == null ? null : summary.toString().trim());
if (summary != null)
message.preview = summary.toString().trim();
} catch (Throwable ex) {
message.error = Log.formatThrowable(ex);
db.message().setMessageError(message.id, message.error);