Skip to content

Commit 614633b

Browse files
authored
fix langchain module errors (#13853)
* fix git modules requires and uses * test with uses to fix langchain4j error * try to fix moduöes * Fix modules
1 parent 31633d8 commit 614633b

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

build-logic/src/main/kotlin/org.jabref.gradle.base.dependency-rules.gradle.kts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.gradle.api.internal.artifacts.dsl.dependencies.DependenciesExtensionModule.module
2+
13
plugins {
24
id("org.gradlex.extra-java-module-info")
35
id("org.gradlex.jvm-dependency-conflict-resolution")
@@ -192,7 +194,21 @@ extraJavaModuleInfo {
192194
// requires("jackson.annotations")
193195
}
194196
module("dev.langchain4j:langchain4j", "langchain4j")
195-
module("dev.langchain4j:langchain4j-core", "langchain4j.core")
197+
module("dev.langchain4j:langchain4j-core", "langchain4j.core") {
198+
// workaround for https://github.com/langchain4j/langchain4j/issues/3668
199+
mergeJar("dev.langchain4j:langchain4j-http-client")
200+
mergeJar("dev.langchain4j:langchain4j-http-client-jdk")
201+
mergeJar("dev.langchain4j:langchain4j-hugging-face")
202+
mergeJar("dev.langchain4j:langchain4j-mistral-ai")
203+
mergeJar("dev.langchain4j:langchain4j-open-ai")
204+
mergeJar("dev.langchain4j:langchain4j-google-ai-gemini")
205+
requires("jtokkit")
206+
requires("java.net.http")
207+
uses("dev.langchain4j.http.client.HttpClientBuilderFactory")
208+
exportAllPackages()
209+
requireAllDefinedDependencies()
210+
patchRealModule()
211+
}
196212
module("dev.langchain4j:langchain4j-google-ai-gemini", "langchain4j.google.ai.gemini")
197213
module("dev.langchain4j:langchain4j-http-client", "langchain4j.http.client")
198214
module("dev.langchain4j:langchain4j-http-client-jdk", "langchain4j.http.client.jdk")

jablib/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ dependencies {
163163
implementation("dev.langchain4j:langchain4j-mistral-ai")
164164
implementation("dev.langchain4j:langchain4j-google-ai-gemini")
165165
implementation("dev.langchain4j:langchain4j-hugging-face")
166+
implementation("dev.langchain4j:langchain4j-http-client")
167+
implementation("dev.langchain4j:langchain4j-http-client-jdk")
166168

167169
implementation("org.apache.velocity:velocity-engine-core")
168170
implementation("ai.djl:api")

jablib/src/main/java/module-info.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@
217217
requires jvm.openai;
218218
requires langchain4j;
219219
requires langchain4j.core;
220-
requires langchain4j.google.ai.gemini;
221-
requires langchain4j.hugging.face;
222-
requires langchain4j.mistral.ai;
223-
requires langchain4j.open.ai;
224220
uses ai.djl.engine.EngineProvider;
225221
uses ai.djl.repository.RepositoryFactory;
226222
uses ai.djl.repository.zoo.ZooProvider;

versions/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ val pdfbox = "3.0.5"
1212

1313
dependencies {
1414
api(platform("ai.djl:bom:0.34.0"))
15-
api(platform("dev.langchain4j:langchain4j-bom:1.3.0"))
15+
api(platform("dev.langchain4j:langchain4j-bom:1.4.0"))
1616
api("dev.langchain4j:langchain4j")
1717
api("dev.langchain4j:langchain4j-google-ai-gemini")
1818
api("dev.langchain4j:langchain4j-hugging-face")

0 commit comments

Comments
 (0)