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

Added options to configure "AI" summarize prompt

Browse Source
pull/215/head
M66B 1 year ago
parent 0f7283f9ec
commit ea03f8c5f6
4 changed files with 111 additions and 7 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/eu/faircode/email/FragmentDialogSummarize.java
Unescape View File

@ -90,9 +90,10 @@ public class FragmentDialogSummarize extends FragmentDialogBase {
if (OpenAI.isAvailable(context)) {
String model = prefs.getString("openai_model", "gpt-3.5-turbo");
float temperature = prefs.getFloat("openai_temperature", 0.5f);
String prompt = prefs.getString("openai_summarize", OpenAI.SUMMARY_PROMPT);
List<OpenAI.Message> result = new ArrayList<>();
result.add(new OpenAI.Message(OpenAI.ASSISTANT, OpenAI.SUMMARY_PROMPT));
result.add(new OpenAI.Message(OpenAI.ASSISTANT, prompt));
result.add(new OpenAI.Message(OpenAI.USER, text));
OpenAI.Message[] completions =
OpenAI.completeChat(context, model, result.toArray(new OpenAI.Message[0]), temperature, 1);
@ -105,8 +106,9 @@ public class FragmentDialogSummarize extends FragmentDialogBase {
return sb.toString();
} else if (Gemini.isAvailable(context)) {
String model = prefs.getString("gemini_model", "gemini-pro");
String prompt = prefs.getString("gemini_summarize", Gemini.SUMMARY_PROMPT);
String[] result = Gemini.generate(context, model, new String[]{Gemini.SUMMARY_PROMPT, text});
String[] result = Gemini.generate(context, model, new String[]{prompt, text});
return TextUtils.join("\n", result);
}

63
app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java
Unescape View File

@ -83,12 +83,14 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
private TextView tvOpenAiTemperature;
private SeekBar sbOpenAiTemperature;
private SwitchCompat swOpenAiModeration;
private EditText etOpenAiSummarize;
private ImageButton ibOpenAi;
private SwitchCompat swGemini;
private TextView tvGeminiPrivacy;
private EditText etGemini;
private TextInputLayout tilGemini;
private EditText etGeminiModel;
private EditText etGeminiSummarize;
private ImageButton ibGemini;
private CardView cardVirusTotal;
@ -103,8 +105,8 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
"deepl_enabled",
"vt_enabled", "vt_apikey",
"send_enabled", "send_host", "send_dlimit", "send_tlimit",
"openai_enabled", "openai_uri", "openai_apikey", "openai_model", "openai_temperature", "openai_moderation",
"gemini_enabled", "gemini_uri", "gemini_apikey", "gemini_model"
"openai_enabled", "openai_uri", "openai_apikey", "openai_model", "openai_temperature", "openai_moderation", "openai_summarize",
"gemini_enabled", "gemini_uri", "gemini_apikey", "gemini_model", "gemini_summarize"
));
@Override
@ -152,6 +154,7 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
tvOpenAiTemperature = view.findViewById(R.id.tvOpenAiTemperature);
sbOpenAiTemperature = view.findViewById(R.id.sbOpenAiTemperature);
swOpenAiModeration = view.findViewById(R.id.swOpenAiModeration);
etOpenAiSummarize = view.findViewById(R.id.etOpenAiSummarize);
ibOpenAi = view.findViewById(R.id.ibOpenAi);
swGemini = view.findViewById(R.id.swGemini);
@ -159,6 +162,7 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
etGemini = view.findViewById(R.id.etGemini);
tilGemini = view.findViewById(R.id.tilGemini);
etGeminiModel = view.findViewById(R.id.etGeminiModel);
etGeminiSummarize = view.findViewById(R.id.etGeminiSummarize);
ibGemini = view.findViewById(R.id.ibGemini);
cardVirusTotal = view.findViewById(R.id.cardVirusTotal);
@ -415,6 +419,7 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
etOpenAiModel.setEnabled(checked);
sbOpenAiTemperature.setEnabled(checked);
swOpenAiModeration.setEnabled(checked);
etOpenAiSummarize.setEnabled(checked);
if (checked)
swGemini.setChecked(false);
}
@ -517,6 +522,28 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
}
});
etOpenAiSummarize.setHint(OpenAI.SUMMARY_PROMPT);
etOpenAiSummarize.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
// Do nothing
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
// Do nothing
}
@Override
public void afterTextChanged(Editable s) {
String prompt = s.toString().trim();
if (TextUtils.isEmpty(prompt))
prefs.edit().remove("openai_summarize").apply();
else
prefs.edit().putString("openai_summarize", prompt).apply();
}
});
ibOpenAi.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -529,6 +556,7 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("gemini_enabled", checked).apply();
etGeminiModel.setEnabled(checked);
etGeminiSummarize.setEnabled(checked);
if (checked)
swOpenAi.setChecked(false);
}
@ -606,6 +634,28 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
}
});
etGeminiSummarize.setHint(Gemini.SUMMARY_PROMPT);
etGeminiSummarize.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
// Do nothing
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
// Do nothing
}
@Override
public void afterTextChanged(Editable s) {
String prompt = s.toString().trim();
if (TextUtils.isEmpty(prompt))
prefs.edit().remove("gemini_summarize").apply();
else
prefs.edit().putString("gemini_summarize", prompt).apply();
}
});
ibGemini.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -645,9 +695,11 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
"openai_uri".equals(key) ||
"openai_apikey".equals(key) ||
"openai_model".equals(key) ||
"openai_summarize".equals(key) ||
"gemini_uri".equals(key) ||
"gemini_apikey".equals(key) ||
"gemini_model".equals(key))
"gemini_model".equals(key) ||
"gemini_summarize".equals(key))
return;
getMainHandler().removeCallbacks(update);
@ -720,11 +772,16 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP
swOpenAiModeration.setChecked(prefs.getBoolean("openai_moderation", false));
swOpenAiModeration.setEnabled(swOpenAi.isChecked());
etOpenAiSummarize.setText(prefs.getString("openai_summarize", null));
etOpenAiSummarize.setEnabled(swOpenAi.isChecked());
swGemini.setChecked(prefs.getBoolean("gemini_enabled", false));
etGemini.setText(prefs.getString("gemini_uri", null));
tilGemini.getEditText().setText(prefs.getString("gemini_apikey", null));
etGeminiModel.setText(prefs.getString("gemini_model", null));
etGeminiModel.setEnabled(swGemini.isChecked());
etGeminiSummarize.setText(prefs.getString("gemini_summarize", null));
etGeminiSummarize.setEnabled(swGemini.isChecked());
} catch (Throwable ex) {
Log.e(ex);
}

48
app/src/main/res/layout/fragment_options_integrations.xml
Unescape View File

@ -602,6 +602,28 @@
app:layout_constraintTop_toBottomOf="@id/sbOpenAiTemperature"
app:switchPadding="12dp" />
<TextView
android:id="@+id/tvOpenAiSummarize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_summarize_prompt"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swOpenAiModeration" />
<EditText
android:id="@+id/etOpenAiSummarize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:inputType="textCapSentences"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOpenAiSummarize" />
<ImageButton
android:id="@+id/ibOpenAi"
android:layout_width="wrap_content"
@ -611,7 +633,7 @@
android:contentDescription="@string/title_info"
android:tooltipText="@string/title_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swOpenAiModeration"
app:layout_constraintTop_toBottomOf="@id/etOpenAiSummarize"
app:srcCompat="@drawable/twotone_info_24" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
@ -728,6 +750,28 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGeminiModel" />
<TextView
android:id="@+id/tvGeminiSummarize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="@string/title_advanced_summarize_prompt"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etGeminiModel" />
<EditText
android:id="@+id/etGeminiSummarize"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:inputType="textCapSentences"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvGeminiSummarize" />
<ImageButton
android:id="@+id/ibGemini"
android:layout_width="wrap_content"
@ -737,7 +781,7 @@
android:contentDescription="@string/title_info"
android:tooltipText="@string/title_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/etGeminiModel"
app:layout_constraintTop_toBottomOf="@id/etGeminiSummarize"
app:srcCompat="@drawable/twotone_info_24" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

1
app/src/main/res/values/strings.xml
Unescape View File

@ -887,6 +887,7 @@
<string name="title_advanced_openai_temperature">Temperature: %1$s</string>
<string name="title_advanced_openai_moderation">Content moderation</string>
<string name="title_advanced_gemini">Gemini integration</string>
<string name="title_advanced_summarize_prompt">Summarize prompt</string>
<string name="title_advanced_sdcard">I want to use an SD card</string>
<string name="title_advanced_watchdog">Periodically check if FairEmail is still active</string>
<string name="title_advanced_updates">Check for GitHub updates</string>

Write Preview
Loading…
Cancel
Save