Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to clean things #93

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Trying to clean things #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</modules>

<properties>
<dev.langchain4j.version>0.36.2</dev.langchain4j.version>
<dev.langchain4j.version>1.0.0-alpha1</dev.langchain4j.version>
</properties>

<dependencyManagement>
Expand Down
10 changes: 9 additions & 1 deletion examples/quarkus-car-booking/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.8.6</quarkus.platform.version>
<quarkus.platform.version>3.18.3</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
</properties>
Expand All @@ -42,6 +42,14 @@
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-config-mpconfig</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down
14 changes: 13 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
<version.org.jboss.logging>3.5.3.Final</version.org.jboss.logging>
<version.dev.langchain4j>1.0.0-alpha1</version.dev.langchain4j>
<version.io.smallrye.config>3.8.1</version.io.smallrye.config>
<version.io.smallrye.config>3.8.1</version.io.smallrye.config>
<version.io.smallrye.fault-tolerance>6.7.3</version.io.smallrye.fault-tolerance>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
Expand Down Expand Up @@ -80,7 +82,7 @@
<module>smallrye-llm-langchain4j-buildcompatible-extension</module>
<module>smallrye-llm-langchain4j-core</module>
<module>smallrye-llm-langchain4j-config-mpconfig</module>
<module>smallrye-llm-langchain4j-fault-tolerance</module>
<module>smallrye-llm-langchain4j-fault-tolerance</module>
<module>smallrye-llm-langchain4j-telemetry</module>
</modules>

Expand Down Expand Up @@ -172,12 +174,22 @@
<artifactId>smallrye-llm-langchain4j-telemetry</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
<version>${version.io.smallrye.config}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
<version>${version.io.smallrye.fault-tolerance}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
4 changes: 4 additions & 0 deletions ...src/main/java/io/smallrye/llm/aiservice/Langchain4JAIServiceBuildCompatibleExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public void detectRegisterAIService(FieldConfig config) throws ClassNotFoundExce
if (info.type().isClass()) {
ClassType classType = info.type().asClass();
ClassInfo classInfo = classType.declaration();
if (classInfo.name().equals(Object.class.getName())) {
return;
}
LOGGER.debug("Detecting RegisterAIService on type " + classInfo.name());
AnnotationInfo annotationInfo = classInfo.annotation(RegisterAIService.class);
if (annotationInfo != null) {
registerAIService(classInfo);
Expand Down
1 change: 0 additions & 1 deletion ...rye-llm-langchain4j-core/src/main/java/io/smallrye/llm/plugin/CommonLLMPluginCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ public static Object create(Instance<Object> lookup, String beanName, Class<?> t
throw new RuntimeException(e);
}
}

if (listeners != null && !listeners.isEmpty()) {
listeners.stream().forEach(l -> LOGGER.info("Adding listener: " + l.getClass().getName()));
methodToCall.invoke(builder, listeners);
Expand Down
23 changes: 11 additions & 12 deletions smallrye-llm-langchain4j-fault-tolerance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
<name>SmallRye LLM: LangChain4j Fault Tolerance</name>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>smallrye-llm-langchain4j-fault-tolerance</artifactId>
<name>SmallRye LLM: LangChain4j Fault Tolerance</name>

<dependencies>
<dependencies>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
Expand All @@ -19,7 +19,6 @@
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-fault-tolerance</artifactId>
<version>6.6.2</version>
</dependency>
<dependency>
<groupId>io.smallrye.llm</groupId>
Expand Down
1 change: 0 additions & 1 deletion smallrye-llm-langchain4j-portable-extension/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<dependency>
<groupId>io.smallrye.config</groupId>
<artifactId>smallrye-config</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down