erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Moved to Gemini 1.5 Flash

Browse source
This commit is contained in:
Erik C. Thauvin 2024-07-15 21:00:28 -07:00
parent c3a8018cc3
commit 8d9acd8184
Signed by: erik
GPG key ID: 776702A6A2DA330E
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini.kt
View file

@ -35,7 +35,6 @@ import com.google.cloud.vertexai.VertexAI
import com.google.cloud.vertexai.api.GenerationConfig import com.google.cloud.vertexai.api.GenerationConfig
import com.google.cloud.vertexai.api.HarmCategory import com.google.cloud.vertexai.api.HarmCategory
import com.google.cloud.vertexai.api.SafetySetting import com.google.cloud.vertexai.api.SafetySetting
import com.google.cloud.vertexai.generativeai.ChatSession
import com.google.cloud.vertexai.generativeai.GenerativeModel import com.google.cloud.vertexai.generativeai.GenerativeModel
import com.google.cloud.vertexai.generativeai.ResponseHandler import com.google.cloud.vertexai.generativeai.ResponseHandler
import net.thauvin.erik.mobibot.Utils import net.thauvin.erik.mobibot.Utils
@ -57,7 +56,7 @@ class Gemini : AbstractModule() {
val answer = chat( val answer = chat(
args.trim(), args.trim(),
properties[PROJECT_ID_PROP], properties[PROJECT_ID_PROP],
properties[LOCATION_PROPR], properties[LOCATION_PROP],
properties.getOrDefault(MAX_TOKENS_PROP, "1024").toInt() properties.getOrDefault(MAX_TOKENS_PROP, "1024").toInt()
) )
if (!answer.isNullOrEmpty()) { if (!answer.isNullOrEmpty()) {
@ -83,17 +82,17 @@ class Gemini : AbstractModule() {
const val GEMINI_NAME = "Gemini" const val GEMINI_NAME = "Gemini"
/** /**
* The Google cloud project ID. * The Google cloud project ID property.
*/ */
const val PROJECT_ID_PROP = "gemini-project-id" const val PROJECT_ID_PROP = "gemini-project-id"
/** /**
* The Vertex AI location. * The Vertex AI location property.
*/ */
const val LOCATION_PROPR = "gemini-location" const val LOCATION_PROP = "gemini-location"
/** /**
* The max tokens property. * The max number of tokens property.
*/ */
const val MAX_TOKENS_PROP = "gemini-max-tokens" const val MAX_TOKENS_PROP = "gemini-max-tokens"
@ -112,31 +111,30 @@ class Gemini : AbstractModule() {
try { try {
VertexAI(projectId, location).use { vertexAI -> VertexAI(projectId, location).use { vertexAI ->
val generationConfig = GenerationConfig.newBuilder().setMaxOutputTokens(maxToken).build() val generationConfig = GenerationConfig.newBuilder().setMaxOutputTokens(maxToken).build()
val safetySettings = Arrays.asList( val safetySettings = listOf(
SafetySetting.newBuilder() SafetySetting.newBuilder()
.setCategory(HarmCategory.HARM_CATEGORY_HATE_SPEECH) .setCategory(HarmCategory.HARM_CATEGORY_HATE_SPEECH)
.setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE) .setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_LOW_AND_ABOVE)
.build(), .build(),
SafetySetting.newBuilder() SafetySetting.newBuilder()
.setCategory(HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT) .setCategory(HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT)
.setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE) .setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_LOW_AND_ABOVE)
.build(), .build(),
SafetySetting.newBuilder() SafetySetting.newBuilder()
.setCategory(HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT) .setCategory(HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT)
.setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE) .setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_LOW_AND_ABOVE)
.build(), .build(),
SafetySetting.newBuilder() SafetySetting.newBuilder()
.setCategory(HarmCategory.HARM_CATEGORY_HARASSMENT) .setCategory(HarmCategory.HARM_CATEGORY_HARASSMENT)
.setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_MEDIUM_AND_ABOVE) .setThreshold(SafetySetting.HarmBlockThreshold.BLOCK_LOW_AND_ABOVE)
.build() .build()
) )
val model = GenerativeModel.Builder().setModelName("gemini-pro-vision") val model = GenerativeModel.Builder().setModelName("gemini-1.5-flash-001")
.setGenerationConfig(generationConfig) .setGenerationConfig(generationConfig)
.setVertexAi(vertexAI).build() .setVertexAi(vertexAI).build()
.withSafetySettings(safetySettings) .withSafetySettings(safetySettings)
val session = ChatSession(model)
val response = session.sendMessage(query)
val response = model.generateContent(query)
return ResponseHandler.getText(response) return ResponseHandler.getText(response)
} }
} catch (e: Exception) { } catch (e: Exception) {
@ -161,7 +159,7 @@ class Gemini : AbstractModule() {
add(Utils.helpFormat("%c $GEMINI_CMD explain quantum computing in simple terms")) add(Utils.helpFormat("%c $GEMINI_CMD explain quantum computing in simple terms"))
add(Utils.helpFormat("%c $GEMINI_CMD how do I make an HTTP request in Javascript?")) add(Utils.helpFormat("%c $GEMINI_CMD how do I make an HTTP request in Javascript?"))
} }
initProperties(PROJECT_ID_PROP, LOCATION_PROPR, MAX_TOKENS_PROP) initProperties(PROJECT_ID_PROP, LOCATION_PROP, MAX_TOKENS_PROP)
} }
} }

2
src/test/kotlin/net/thauvin/erik/mobibot/modules/GeminiTest.kt
View file

@ -49,7 +49,7 @@ class GeminiTest : LocalProperties() {
@DisableOnCi @DisableOnCi
fun chatPrompt() { fun chatPrompt() {
val projectId = getProperty(Gemini.PROJECT_ID_PROP) val projectId = getProperty(Gemini.PROJECT_ID_PROP)
val location = getProperty(Gemini.LOCATION_PROPR) val location = getProperty(Gemini.LOCATION_PROP)
val maxTokens = getProperty(Gemini.MAX_TOKENS_PROP).toInt() val maxTokens = getProperty(Gemini.MAX_TOKENS_PROP).toInt()
assertThat( assertThat(