Update to latest snapshot

ThomasVitale · Dec 21, 2024 · 0196ed1 · 0196ed1
1 parent e13f5df
commit 0196ed1
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 494 deletions.
diff --git a/README.md b/README.md
@@ -144,10 +144,6 @@ Question answering with documents using different RAG flows (with Ollama and PGV
 * **[Naive](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/rag/rag-sequential/rag-naive)**
 * **[Advanced](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/rag/rag-sequential/rag-advanced)**
 
-### ❔ Conditional RAG
-
-* **[Conditional](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/rag/rag-conditional)**
-
 ### 🌳 Branching RAG
 
 * **[Branching](https://github.com/ThomasVitale/llm-apps-java-spring-ai/tree/main/rag/rag-branching)**

diff --git a/.../observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java b/.../observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ChatController.java
@@ -49,7 +49,7 @@ String chatProviderOptions(String question) {
         return chatClient
                 .prompt(question)
                 .options(OpenAiChatOptions.builder()
-                        .withLogprobs(true)
+                        .logprobs(true)
                         .build())
                 .call()
                 .content();

diff --git a/...rvability-models-openai/src/main/java/com/thomasvitale/ai/spring/EmbeddingController.java b/...rvability-models-openai/src/main/java/com/thomasvitale/ai/spring/EmbeddingController.java
@@ -44,7 +44,7 @@ String embedGenericOptions(String query) {
     String embedProviderOptions(String query) {
         logger.info("Embedding with provider options: {}", query);
         var embeddings = embeddingModel.call(new EmbeddingRequest(List.of(query), OpenAiEmbeddingOptions.builder()
-                        .withEncodingFormat("float")
+                        .encodingFormat("float")
                         .build()))
                 .getResult().getOutput();
         return "Size of the embedding vector: " + embeddings.length;

diff --git a/...observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ImageController.java b/...observability-models-openai/src/main/java/com/thomasvitale/ai/spring/ImageController.java
@@ -26,8 +26,8 @@ class ImageController {
     String image(String message) {
         logger.info("Generating image: {}", message);
         var imageResponse = imageModel.call(new ImagePrompt(message, ImageOptionsBuilder.builder()
-                .withHeight(1024)
-                .withWidth(1024)
+                .height(1024)
+                .width(1024)
                 .build()));
         return imageResponse.getResult().getOutput().getUrl();
     }

diff --git a/rag/rag-conditional/README.md b/rag/rag-conditional/README.md
diff --git a/rag/rag-conditional/build.gradle b/rag/rag-conditional/build.gradle
diff --git a/rag/rag-conditional/src/main/java/com/thomasvitale/ai/spring/IngestionPipeline.java b/rag/rag-conditional/src/main/java/com/thomasvitale/ai/spring/IngestionPipeline.java
diff --git a/rag/rag-conditional/src/main/java/com/thomasvitale/ai/spring/RagConditional.java b/rag/rag-conditional/src/main/java/com/thomasvitale/ai/spring/RagConditional.java
diff --git a/...ag-conditional/src/main/java/com/thomasvitale/ai/spring/RagControllerRoutingKeywords.java b/...ag-conditional/src/main/java/com/thomasvitale/ai/spring/RagControllerRoutingKeywords.java
diff --git a/rag/rag-conditional/src/main/resources/application.yml b/rag/rag-conditional/src/main/resources/application.yml
diff --git a/rag/rag-conditional/src/main/resources/documents/story1.md b/rag/rag-conditional/src/main/resources/documents/story1.md