diff --git a/pom.xml b/pom.xml index b515fba..323022e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik.mobibot mobibot - 0.8.0-rc+20250515203523 + 0.8.0-rc+20250515215148 mobibot @@ -114,25 +114,25 @@ dev.langchain4j langchain4j-open-ai - 0.36.2 + 1.0.0 compile dev.langchain4j langchain4j-google-ai-gemini - 0.36.2 + 1.0.0-beta5 compile dev.langchain4j langchain4j-core - 0.36.2 + 1.0.0 compile dev.langchain4j langchain4j - 0.36.2 + 1.0.0 compile diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 45f0c6b..0cdac32 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -82,7 +82,7 @@ public class MobibotBuild extends Project { var log4j = version(2, 24, 3); var kotlin = version(2, 1, 21); - var langchain = version(0, 36, 2); + var langchain = version(1, 0, 0); scope(compile) // PircBotX .include(dependency("com.github.pircbotx", "pircbotx", "2.3.1")) @@ -108,7 +108,7 @@ public class MobibotBuild extends Project { .include(dependency("org.apache.logging.log4j", "log4j-slf4j2-impl", log4j)) // LangChain4J .include(dependency("dev.langchain4j", "langchain4j-open-ai", langchain)) - .include(dependency("dev.langchain4j", "langchain4j-google-ai-gemini", langchain)) + .include(dependency("dev.langchain4j", "langchain4j-google-ai-gemini", "1.0.0-beta5")) .include(dependency("dev.langchain4j", "langchain4j-core", langchain)) .include(dependency("dev.langchain4j", "langchain4j", langchain)) // Misc. diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2.kt index c31cbaf..078eb3c 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2.kt @@ -77,7 +77,7 @@ class ChatGpt2 : AbstractModule() { .maxTokens(maxTokens) .build() - return model.generate(query) + return model.chat(query) } catch (e: Exception) { throw ModuleException( "$CHATGPT_CMD($query): IO", diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt index a690e26..6707b73 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt @@ -90,7 +90,7 @@ class Gemini2 : AbstractModule() { .maxOutputTokens(maxTokens) .build() - return gemini.generate(query) + return gemini.chat(query) } catch (e: Exception) { throw ModuleException("$GEMINI_CMD($query): IO", IO_ERROR, e) } diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2Test.kt index 573dfa2..f12e1dd 100644 --- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2Test.kt +++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ChatGpt2Test.kt @@ -71,6 +71,7 @@ class ChatGpt2Test : LocalProperties() { .isInstanceOf(ModuleException::class.java) .hasNoCause() } + private val apiKey = getProperty(ChatGpt2.API_KEY_PROP) @Test