AI summarize: select prompt

master
M66B 2 weeks ago
parent 35cbcb8f02
commit 8d46dbab13

@ -172,7 +172,7 @@ public class AI {
return context.getString(R.string.title_summarize);
}
static Spanned getSummaryText(Context context, EntityMessage message) throws JSONException, IOException {
static Spanned getSummaryText(Context context, EntityMessage message, long template) throws JSONException, IOException {
File file = message.getFile(context);
if (!file.exists())
return null;
@ -190,16 +190,27 @@ public class AI {
HtmlHelper.truncate(d, MAX_SUMMARIZE_TEXT_SIZE);
String templatePrompt = null;
if (template > 0L) {
DB db = DB.getInstance(context);
EntityAnswer t = db.answer().getAnswer(template);
if (t != null) {
String html = t.getData(context, null).getHtml();
templatePrompt = JsoupEx.parse(html).body().text();
}
}
StringBuilder sb = new StringBuilder();
if (OpenAI.isAvailable(context)) {
String model = prefs.getString("openai_model", OpenAI.DEFAULT_MODEL);
float temperature = prefs.getFloat("openai_temperature", OpenAI.DEFAULT_TEMPERATURE);
String prompt = prefs.getString("openai_summarize", OpenAI.DEFAULT_SUMMARY_PROMPT);
String defaultPrompt = prefs.getString("openai_summarize", OpenAI.DEFAULT_SUMMARY_PROMPT);
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, prompt)}));
new OpenAI.Content[]{new OpenAI.Content(OpenAI.CONTENT_TEXT,
templatePrompt == null ? defaultPrompt : templatePrompt)}));
if (!TextUtils.isEmpty(message.subject))
input.add(new OpenAI.Message(OpenAI.USER,
@ -226,12 +237,12 @@ public class AI {
} else if (Gemini.isAvailable(context)) {
String model = prefs.getString("gemini_model", Gemini.DEFAULT_MODEL);
float temperature = prefs.getFloat("gemini_temperature", Gemini.DEFAULT_TEMPERATURE);
String prompt = prefs.getString("gemini_summarize", Gemini.DEFAULT_SUMMARY_PROMPT);
String defaultPrompt = prefs.getString("gemini_summarize", Gemini.DEFAULT_SUMMARY_PROMPT);
String body = d.text();
List<String> texts = new ArrayList<>();
texts.add(prompt);
texts.add(templatePrompt == null ? defaultPrompt : templatePrompt);
if (!TextUtils.isEmpty(message.subject))
texts.add(message.subject);
if (!TextUtils.isEmpty(body))

@ -4596,7 +4596,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} else if (id == R.id.ibTranslate) {
onActionTranslate(message);
} else if (id == R.id.ibSummarize) {
onActionSummarize(message);
onActionSummarize(message, ibSummarize);
} else if (id == R.id.ibFullScreen)
onActionOpenFull(message);
else if (id == R.id.ibForceLight) {
@ -6480,7 +6480,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onActionTranslate(message);
return true;
} else if (itemId == R.id.menu_summarize) {
onActionSummarize(message);
onActionSummarize(message, null);
return true;
} else if (itemId == R.id.menu_force_light) {
onActionForceLight(message);
@ -7393,8 +7393,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
}
private void onActionSummarize(TupleMessageEx message) {
FragmentDialogSummarize.summarize(message, parentFragment.getParentFragmentManager());
private void onActionSummarize(TupleMessageEx message, View anchor) {
FragmentDialogSummarize.summarize(message, parentFragment.getParentFragmentManager(), anchor, owner);
}
private void onActionForceLight(TupleMessageEx message) {

@ -65,7 +65,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import javax.net.ssl.HttpsURLConnection;

@ -1578,7 +1578,7 @@ public class EntityRule {
}
try {
Spanned summary = AI.getSummaryText(context, message);
Spanned summary = AI.getSummaryText(context, message, -1L);
message.preview = (summary == null ? null : summary.toString());
} catch (Throwable ex) {
message.error = Log.formatThrowable(ex);

@ -23,12 +23,17 @@ import android.app.Dialog;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Build;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.RelativeSizeSpan;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageButton;
import android.widget.TextView;
@ -37,10 +42,15 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.PreferenceManager;
import org.jsoup.nodes.Document;
import java.util.Date;
import java.util.List;
public class FragmentDialogSummarize extends FragmentDialogBase {
@NonNull
@ -83,8 +93,38 @@ public class FragmentDialogSummarize extends FragmentDialogBase {
});
Bundle args = getArguments();
long template = args.getLong("template");
if (template <= 0)
tvCaption.setText(AI.getSummarizePrompt(context));
else {
new SimpleTask<String>() {
@Override
protected String onExecute(Context context, Bundle args) throws Throwable {
long template = args.getLong("template");
DB db = DB.getInstance(context);
EntityAnswer prompt = db.answer().getAnswer(template);
if (prompt == null)
return null;
Document doc = JsoupEx.parse(prompt.getData(context, null).getHtml());
Spanned spanned = HtmlHelper.fromDocument(context, doc, null, null);
return spanned.toString();
}
@Override
protected void onExecuted(Bundle args, String prompt) {
tvCaption.setText(prompt);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "ai:prompt");
}
tvCaption.setText(AI.getSummarizePrompt(context));
tvFrom.setText(args.getString("from"));
tvSubject.setText(args.getString("subject"));
@ -106,6 +146,7 @@ public class FragmentDialogSummarize extends FragmentDialogBase {
@Override
protected Spanned onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
long template = args.getLong("template");
DB db = DB.getInstance(context);
EntityMessage message = db.message().getMessage(id);
@ -113,7 +154,7 @@ public class FragmentDialogSummarize extends FragmentDialogBase {
return null;
long start = new Date().getTime();
Spanned summary = AI.getSummaryText(context, message);
Spanned summary = AI.getSummaryText(context, message, template);
args.putLong("elapsed", new Date().getTime() - start);
return summary;
@ -142,11 +183,68 @@ public class FragmentDialogSummarize extends FragmentDialogBase {
return builder.create();
}
public static void summarize(EntityMessage message, FragmentManager fm) {
public static void summarize(EntityMessage message, FragmentManager fm, View anchor, LifecycleOwner owner) {
if (anchor == null) {
summarize(message, fm, null);
return;
}
final Context context = anchor.getContext();
new SimpleTask<List<EntityAnswer>>() {
@Override
protected List<EntityAnswer> onExecute(Context context, Bundle args) throws Throwable {
DB db = DB.getInstance(context);
return db.answer().getAiPrompts();
}
@Override
protected void onExecuted(Bundle args, List<EntityAnswer> prompts) {
if (prompts == null || prompts.isEmpty())
summarize(message, fm, null);
else {
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, owner, anchor);
String title = context.getString(R.string.title_advanced_default_prompt);
SpannableStringBuilder ssb = new SpannableStringBuilderEx(title);
ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), 0, ssb.length(), 0);
popupMenu.getMenu()
.add(Menu.NONE, 1, 1, ssb)
.setIntent(new Intent().putExtra("id", -1L));
for (int i = 0; i < prompts.size(); i++) {
EntityAnswer prompt = prompts.get(i);
popupMenu.getMenu()
.add(Menu.NONE, i + 2, i + 2, prompt.name)
.setIntent(new Intent().putExtra("id", prompt.id));
}
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
long id = item.getIntent().getLongExtra("id", -1L);
summarize(message, fm, id);
return true;
}
});
popupMenu.show();
}
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(fm, ex);
}
}.execute(context, owner, new Bundle(), "AI:select");
}
private static void summarize(EntityMessage message, FragmentManager fm, Long template) {
Bundle args = new Bundle();
args.putLong("id", message.id);
args.putString("from", MessageHelper.formatAddresses(message.from));
args.putString("subject", message.subject);
args.putLong("template", template == null ? -1L : template);
FragmentDialogSummarize fragment = new FragmentDialogSummarize();
fragment.setArguments(args);

@ -1628,7 +1628,7 @@ public class FragmentMessages extends FragmentBase
if (result == null || result.single == null || !result.single.content)
return;
FragmentDialogSummarize.summarize(result.single, getParentFragmentManager());
FragmentDialogSummarize.summarize(result.single, getParentFragmentManager(), ibSummarize, getViewLifecycleOwner());
}
});
@ -3575,7 +3575,7 @@ public class FragmentMessages extends FragmentBase
private void onSwipeSummarize(final @NonNull TupleMessageEx message) {
final Context context = getContext();
if (AI.isAvailable(context))
FragmentDialogSummarize.summarize(message, getParentFragmentManager());
FragmentDialogSummarize.summarize(message, getParentFragmentManager(), null, getViewLifecycleOwner());
else
context.startActivity(new Intent(context, ActivitySetup.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)

Loading…
Cancel
Save