From a207b730829b178521d5b36203461b98a1bf9e68 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 9 May 2024 20:20:00 +0200 Subject: [PATCH] Gemini: fixed temperature range --- .../java/eu/faircode/email/FragmentOptionsIntegrations.java | 4 ++-- app/src/main/java/eu/faircode/email/Gemini.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java b/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java index a0a7f4a363..2de1d3e8db 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsIntegrations.java @@ -642,7 +642,7 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP sbGeminiTemperature.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - float temp = progress / 20f; + float temp = progress / 10f; prefs.edit().putFloat("gemini_temperature", temp).apply(); } @@ -806,7 +806,7 @@ public class FragmentOptionsIntegrations extends FragmentBase implements SharedP temperature = prefs.getFloat("gemini_temperature", 0.5f); tvGeminiTemperature.setText(getString(R.string.title_advanced_openai_temperature, NF.format(temperature))); - sbGeminiTemperature.setProgress(Math.round(temperature * 20)); + sbGeminiTemperature.setProgress(Math.round(temperature * 10)); sbGeminiTemperature.setEnabled(swGemini.isChecked()); etGeminiSummarize.setText(prefs.getString("gemini_summarize", null)); diff --git a/app/src/main/java/eu/faircode/email/Gemini.java b/app/src/main/java/eu/faircode/email/Gemini.java index b634c60d1f..cd5523424c 100644 --- a/app/src/main/java/eu/faircode/email/Gemini.java +++ b/app/src/main/java/eu/faircode/email/Gemini.java @@ -62,6 +62,7 @@ public class Gemini { } static Message[] generate(Context context, String model, Message[] messages, Float temperature, int n) throws JSONException, IOException { + //https://ai.google.dev/api/rest/v1beta/models/generateContent JSONArray jcontents = new JSONArray(); for (Message message : messages) { JSONArray jparts = new JSONArray(); @@ -78,13 +79,13 @@ public class Gemini { jcontents.put(jcontent); } - // https://ai.google.dev/api/python/google/ai/generativelanguage/GenerationConfig + // https://ai.google.dev/api/rest/v1beta/GenerationConfig JSONObject jconfig = new JSONObject(); if (temperature != null) jconfig.put("temperature", temperature); jconfig.put("candidate_count", n); - // https://ai.google.dev/api/python/google/ai/generativelanguage/SafetySetting + // https://ai.google.dev/api/rest/v1beta/SafetySetting JSONArray jsafety = new JSONArray(); JSONObject jsex = new JSONObject(); @@ -107,7 +108,6 @@ public class Gemini { jdanger.put("threshold", "BLOCK_ONLY_HIGH"); jsafety.put(jdanger); - // https://ai.google.dev/api/python/google/ai/generativelanguage/GenerateContentRequest JSONObject jrequest = new JSONObject(); jrequest.put("contents", jcontents); jrequest.put("generationConfig", jconfig);