Skip to content

Commit 2fe4f3f

Browse files
kpavlovkpavlov
authored
Upgrade Mokksy (#134)
Upgrades Mokksy to 0.4.0
1 parent 0613d47 commit 2fe4f3f

File tree

6 files changed

+96
-23
lines changed

6 files changed

+96
-23
lines changed

‎.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24
1+
21

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
build:
2+
mvn --version
23
mvn clean verify site -Prelease -Dgpg.skip
34

45
apidocs:

‎langchain4j-kotlin/pom.xml

Lines changed: 68 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>me.kpavlov.langchain4j.kotlin</groupId>
@@ -15,6 +16,7 @@
1516
<dependency>
1617
<groupId>dev.langchain4j</groupId>
1718
<artifactId>langchain4j-core</artifactId>
19+
<scope>compile</scope>
1820
</dependency>
1921
<dependency>
2022
<groupId>org.jetbrains.kotlin</groupId>
@@ -35,8 +37,9 @@
3537
</dependency>
3638
<!-- Test Dependencies -->
3739
<dependency>
38-
<groupId>org.junit.jupiter</groupId>
39-
<artifactId>junit-jupiter-api</artifactId>
40+
<groupId>org.jetbrains.kotlin</groupId>
41+
<artifactId>kotlin-test-junit5</artifactId>
42+
<version>${kotlin.version}</version>
4043
<scope>test</scope>
4144
</dependency>
4245
<dependency>
@@ -61,7 +64,12 @@
6164
</dependency>
6265
<dependency>
6366
<groupId>me.kpavlov.aimocks</groupId>
64-
<artifactId>ai-mocks-openai</artifactId>
67+
<artifactId>ai-mocks-openai-jvm</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>io.kotest</groupId>
72+
<artifactId>kotest-assertions-core-jvm</artifactId>
6573
<scope>test</scope>
6674
</dependency>
6775
<dependency>
@@ -91,4 +99,60 @@
9199
</plugins>
92100
</build>
93101

102+
<profiles>
103+
<profile>
104+
<id>linux</id>
105+
<activation>
106+
<os>
107+
<family>unix</family>
108+
<name>Linux</name>
109+
</os>
110+
</activation>
111+
<dependencies>
112+
<!-- Netty native transport for Linux -->
113+
<dependency>
114+
<groupId>io.netty</groupId>
115+
<artifactId>netty-transport-native-epoll</artifactId>
116+
<classifier>linux-x86_64</classifier>
117+
<scope>runtime</scope>
118+
<optional>true</optional>
119+
</dependency>
120+
<dependency>
121+
<groupId>io.netty</groupId>
122+
<artifactId>netty-transport-native-epoll</artifactId>
123+
<classifier>linux-aarch_64</classifier>
124+
<scope>runtime</scope>
125+
<optional>true</optional>
126+
</dependency>
127+
</dependencies>
128+
</profile>
129+
130+
<profile>
131+
<id>mac</id>
132+
<activation>
133+
<os>
134+
<family>mac</family>
135+
</os>
136+
</activation>
137+
<dependencies>
138+
<!-- Netty native transport for macOS -->
139+
<dependency>
140+
<groupId>io.netty</groupId>
141+
<artifactId>netty-transport-native-kqueue</artifactId>
142+
<classifier>osx-x86_64</classifier>
143+
<scope>runtime</scope>
144+
<optional>true</optional>
145+
</dependency>
146+
<dependency>
147+
<groupId>io.netty</groupId>
148+
<artifactId>netty-transport-native-kqueue</artifactId>
149+
<classifier>osx-aarch_64</classifier>
150+
<scope>runtime</scope>
151+
<optional>true</optional>
152+
</dependency>
153+
</dependencies>
154+
</profile>
155+
156+
</profiles>
157+
94158
</project>

‎langchain4j-kotlin/src/test/kotlin/me/kpavlov/langchain4j/kotlin/model/chat/StreamingChatModelIT.kt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package me.kpavlov.langchain4j.kotlin.model.chat
22

3-
import assertk.assertThat
4-
import assertk.assertions.contains
5-
import assertk.assertions.isEqualTo
6-
import assertk.assertions.isNotNull
73
import dev.langchain4j.data.message.SystemMessage.systemMessage
84
import dev.langchain4j.data.message.UserMessage.userMessage
95
import dev.langchain4j.model.chat.StreamingChatModel
106
import dev.langchain4j.model.chat.response.ChatResponse
7+
import io.kotest.matchers.nulls.shouldNotBeNull
8+
import io.kotest.matchers.string.shouldContain
119
import kotlinx.coroutines.delay
1210
import kotlinx.coroutines.flow.flow
1311
import kotlinx.coroutines.test.runTest
@@ -24,7 +22,7 @@ import org.slf4j.LoggerFactory
2422
import java.util.concurrent.ConcurrentLinkedQueue
2523
import java.util.concurrent.atomic.AtomicReference
2624

27-
internal class StreamingChatModelIT {
25+
internal open class StreamingChatModelIT {
2826
private val logger = LoggerFactory.getLogger(javaClass)
2927

3028
private val model: StreamingChatModel = createOpenAiStreamingModel()
@@ -66,7 +64,8 @@ internal class StreamingChatModelIT {
6664
.chatFlow {
6765
messages += systemMessage
6866
messages += userMessage
69-
}.collect {
67+
}
68+
.collect {
7069
when (it) {
7170
is PartialResponse -> {
7271
println("Token: '${it.token}'")
@@ -80,12 +79,10 @@ internal class StreamingChatModelIT {
8079
}
8180

8281
val response = responseRef.get()!!
83-
assertThat(response.metadata()).isNotNull()
84-
assertThat(response.aiMessage()).isNotNull()
85-
val textContent = response.aiMessage()?.text()!!
86-
assertThat(textContent).isNotNull()
87-
assertThat(collectedTokens.joinToString("")).isEqualTo(textContent)
88-
assertThat(textContent).contains("Blumblefang loves to help")
82+
response.metadata().shouldNotBeNull()
83+
response.aiMessage().shouldNotBeNull {
84+
text() shouldContain "Blumblefang loves to help"
85+
}
8986
}
9087

9188
fun setupMockResponseIfNecessary(

‎langchain4j-kotlin/src/test/kotlin/me/kpavlov/langchain4j/kotlin/model/chat/TestSetup.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal fun createOpenAiStreamingModel(
2121
} else {
2222
modelBuilder
2323
.apiKey("my-key")
24-
.baseUrl("http://localhost:${TestEnvironment.mockOpenAi.port()}/v1")
24+
.baseUrl(TestEnvironment.mockOpenAi.baseUrl())
2525
}
2626
configurer.invoke(modelBuilder)
2727

‎pom.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,17 @@
5353
<maven.compiler.release>${java.version}</maven.compiler.release>
5454
<maven.compiler.source>${java.version}</maven.compiler.source>
5555
<!-- Dependencies -->
56-
<ai-mocks.version>0.1.1</ai-mocks.version>
56+
<ai-mocks.version>0.4.0</ai-mocks.version>
5757
<awaitility.version>4.2.2</awaitility.version>
5858
<finchly.version>0.1.1</finchly.version>
5959
<junit.version>5.12.2</junit.version>
60+
<kotest.version>5.9.1</kotest.version>
6061
<kotlinx-coroutines.version>1.9.0</kotlinx-coroutines.version>
6162
<langchain4j.version>1.0.1</langchain4j.version>
6263
<mockito-kotlin.version>5.4.0</mockito-kotlin.version>
6364
<mockito.version>5.18.0</mockito.version>
6465
<slf4j.version>2.0.17</slf4j.version>
66+
<netty.version>4.2.1.Final</netty.version>
6567
</properties>
6668

6769
<dependencyManagement>
@@ -78,6 +80,13 @@
7880
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
7981
<version>${kotlinx-coroutines.version}</version>
8082
</dependency>
83+
<dependency>
84+
<groupId>io.netty</groupId>
85+
<artifactId>netty-bom</artifactId>
86+
<version>${netty.version}</version>
87+
<type>pom</type>
88+
<scope>import</scope>
89+
</dependency>
8190
<dependency>
8291
<groupId>org.slf4j</groupId>
8392
<artifactId>slf4j-bom</artifactId>
@@ -114,10 +123,8 @@
114123
</dependency>
115124
<dependency>
116125
<groupId>me.kpavlov.aimocks</groupId>
117-
<artifactId>bom</artifactId>
126+
<artifactId>ai-mocks-openai-jvm</artifactId>
118127
<version>${ai-mocks.version}</version>
119-
<type>pom</type>
120-
<scope>import</scope>
121128
</dependency>
122129
<dependency>
123130
<groupId>org.mockito.kotlin</groupId>
@@ -143,7 +150,11 @@
143150
<version>${finchly.version}</version>
144151
<scope>test</scope>
145152
</dependency>
146-
153+
<dependency>
154+
<groupId>io.kotest</groupId>
155+
<artifactId>kotest-assertions-core-jvm</artifactId>
156+
<version>${kotest.version}</version>
157+
</dependency>
147158
</dependencies>
148159
</dependencyManagement>
149160

0 commit comments

Comments
 (0)