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

22 add more cdi features #72

Closed
wants to merge 13 commits into from
Closed

22 add more cdi features #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a566255
Added ModerationModel ChatMemoryProvider (but might need rework).
TheEliteGentleman Nov 11, 2024
aef662b
Enable the Fault Tolerance Interceptor.
TheEliteGentleman Nov 23, 2024
2b4eecb
Enable the Fault Tolerance Interceptor.
TheEliteGentleman Nov 23, 2024
9413a6c
Added support for Metrics and Telemetry tracing using Microprofile Me…
TheEliteGentleman Nov 27, 2024
7c2d0b6
Rewrote the Metrics using Microprofile Telemetry API instead of MP Me…
TheEliteGentleman Nov 28, 2024
f20c253
Rewrote the Metrics using Microprofile Telemetry API instead of MP Me…
TheEliteGentleman Nov 28, 2024
fa05659
Bug fixes.
TheEliteGentleman Nov 29, 2024
4e0941a
Enabled Telemetry.
TheEliteGentleman Dec 3, 2024
b943ad8
Update to register listeners.
TheEliteGentleman Dec 6, 2024
cc1ae9f
Bug fix.
TheEliteGentleman Dec 6, 2024
59a9152
Updated to support CDI creation for RAG support.
TheEliteGentleman Dec 13, 2024
fc5c976
Git merge with main.
TheEliteGentleman Dec 13, 2024
6c9e14e
Git merge with main.
TheEliteGentleman Dec 13, 2024
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/glassfish-car-booking/src/main/java/io/jefrajames/booking/ChatAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.time.temporal.ChronoUnit;

@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
@RegisterAIService(tools = BookingService.class, chatMemoryMaxMessages = 10, chatLanguageModelName = "chat-model")
@RegisterAIService(tools = BookingService.class, chatLanguageModelName = "chat-model") // had chatMemoryMaxMessages = 10
public interface ChatAiService {

@SystemMessage("""
Expand Down
4 changes: 1 addition & 3 deletions examples/glassfish-car-booking/src/main/java/io/jefrajames/booking/FraudAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
import io.smallrye.llm.spi.RegisterAIService;

@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
@RegisterAIService(chatMemoryMaxMessages = 5,

chatLanguageModelName = "chat-model")
@RegisterAIService(chatLanguageModelName = "chat-model") // had chatMemoryMaxMessages = 5
public interface FraudAiService {

@SystemMessage("""
Expand Down
2 changes: 1 addition & 1 deletion ...s/helidon-car-booking-portable-ext/src/main/java/io/jefrajames/booking/ChatAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import io.smallrye.llm.spi.RegisterAIService;

@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
@RegisterAIService(tools = BookingService.class, chatMemoryMaxMessages = 10, chatLanguageModelName = "chat-model")
@RegisterAIService(tools = BookingService.class, chatLanguageModelName = "chat-model") // had chatMemoryMaxMessages = 10
public interface ChatAiService {

@SystemMessage("""
Expand Down
4 changes: 1 addition & 3 deletions .../helidon-car-booking-portable-ext/src/main/java/io/jefrajames/booking/FraudAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
import io.smallrye.llm.spi.RegisterAIService;

@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
@RegisterAIService(chatMemoryMaxMessages = 5,

chatLanguageModelName = "chat-model")
@RegisterAIService(chatLanguageModelName = "chat-model") // had chatMemoryMaxMessages = 5
public interface FraudAiService {

@SystemMessage("""
Expand Down
1 change: 0 additions & 1 deletion examples/helidon-car-booking/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<properties>
<mainClass>io.helidon.Main</mainClass>
<dev.langchain4j.version>0.34.0</dev.langchain4j.version>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion examples/helidon-car-booking/src/main/java/io/jefrajames/booking/ChatAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import io.smallrye.llm.spi.RegisterAIService;

@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
@RegisterAIService(tools = BookingService.class, chatMemoryMaxMessages = 10, chatLanguageModelName = "chat-model")
@RegisterAIService(tools = BookingService.class, chatLanguageModelName = "chat-model") // had chatMemoryMaxMessages = 10
public interface ChatAiService {

@SystemMessage("""
Expand Down
4 changes: 1 addition & 3 deletions examples/helidon-car-booking/src/main/java/io/jefrajames/booking/FraudAiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
import io.smallrye.llm.spi.RegisterAIService;

@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
@RegisterAIService(chatMemoryMaxMessages = 5,

chatLanguageModelName = "chat-model")
@RegisterAIService(chatLanguageModelName = "chat-model") // had chatMemoryMaxMessages = 5
public interface FraudAiService {

@SystemMessage("""
Expand Down
2 changes: 1 addition & 1 deletion examples/liberty-car-booking/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ To package the application in JVM mode run: `mvn package`.

## Configuration

All configuration is centralized in `microprofile-config.properties`(found is `resources\META-INF` folder) and can be redefined using environment variables.
All configuration is centralized in `microprofile-config.properties` (found is `resources\META-INF` folder) and can be redefined using environment variables.

## Running the application

Expand Down
180 changes: 116 additions & 64 deletions examples/liberty-car-booking/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,22 @@
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.report.sourceEncoding>UTF-8</project.report.sourceEncoding>
<jakartaee-api.version>10.0.0</jakartaee-api.version>
<microprofile-api.version>6.1</microprofile-api.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<war-plugin.version>3.4.0</war-plugin.version>
<!--Strictly for OpenLiberty-->
<liberty.env.ENGINE_CACHE_DIR>${project.build.directory}/liberty/wlp/usr/shared/resources/lib/</liberty.env.ENGINE_CACHE_DIR>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.report.sourceEncoding>UTF-8</project.report.sourceEncoding>
<jakartaee-api.version>10.0.0</jakartaee-api.version>
<microprofile-api.version>6.1</microprofile-api.version>
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<war-plugin.version>3.4.0</war-plugin.version>
<dev.langchain4j.version>0.36.0</dev.langchain4j.version>

<!-- We need only javac to use the release parameter. OpenLiberty doesn't depend on maven-compiler-plugin.' -->
<maven.compiler.source combine.self="override" />
<maven.compiler.target combine.self="override" />

<!--Strictly for OpenLiberty-->
<liberty.env.ENGINE_CACHE_DIR>${project.build.directory}/liberty/wlp/usr/shared/resources/lib/</liberty.env.ENGINE_CACHE_DIR>
</properties>

<dependencyManagement>
<dependencies>
Expand All @@ -46,45 +52,104 @@
<scope>provided</scope>
</dependency>

<!--
<dependency>
<groupId>io.smallrye.llm.liberty-bundle</groupId>
<artifactId>smallrye-llm-langchain4j-features-bom</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
-->
<!--
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-buildcompatible-extension</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
-->
<!-- https://mvnrepository.com/artifact/ai.djl.huggingface/tokenizers -->
<dependency>
<groupId>ai.djl.huggingface</groupId>
<artifactId>tokenizers</artifactId>
<version>0.30.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<!-- https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-api -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>1.44.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
<version>2.10.0</version>
<scope>provided</scope>
</dependency>

<dependencies>
<!-- https://mvnrepository.com/artifact/jakarta.platform/jakarta.jakartaee-api -->
<!--
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-config-mpconfig</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-portable-extension</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-telemetry</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j</artifactId>
<version>${dev.langchain4j.version}</version>
</dependency>

<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-hugging-face</artifactId>
<version>${dev.langchain4j.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/dev.langchain4j/langchain4j-azure-open-ai -->
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-azure-open-ai</artifactId>
<version>${dev.langchain4j.version}</version>
</dependency>

<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-open-ai</artifactId>
<version>${dev.langchain4j.version}</version>
</dependency>

<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-embeddings-all-minilm-l6-v2</artifactId>
<version>${dev.langchain4j.version}</version>
</dependency>

<!-- https://mvnrepository.com/artifact/ai.djl.huggingface/tokenizers -->
<dependency>
<groupId>ai.djl.huggingface</groupId>
<artifactId>tokenizers</artifactId>
<version>0.30.0</version>
</dependency>

<!-- SLF4J messages from langchain4j and Azure OpenAI SDK backed by JUL -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
<version>2.0.9</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
</dependency>

<!-- https://mvnrepository.com/artifact/io.opentelemetry.instrumentation/opentelemetry-instrumentation-annotations -->
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
</dependency>

<dependency>
<groupId>io.smallrye.llm</groupId>
Expand All @@ -96,27 +161,14 @@
<artifactId>smallrye-llm-langchain4j-portable-extension</artifactId>
</dependency>

<!--
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-buildcompatible-extension</artifactId>
</dependency>
-->

<!--
<dependency>
<groupId>io.smallrye.llm.liberty-bundle</groupId>
<artifactId>smallrye-llm-langchain4j-feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>io.smallrye.llm</groupId>
<artifactId>smallrye-llm-langchain4j-telemetry</artifactId>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<!-- langchain4j dependencies -->
Expand Down
Loading
Loading