From b8e470a3a64cbc073665592972464aaae92436b4 Mon Sep 17 00:00:00 2001 From: Jan Martiska Date: Fri, 8 Dec 2023 08:45:40 +0100 Subject: [PATCH] Change Pinecone config to RUNTIME, adjust test javadoc --- .../includes/quarkus-langchain4j-pinecone.adoc | 16 ++++++++-------- .../deployment/PineconeEmbeddingStoreTest.java | 8 ++++---- .../pinecone/runtime/PineconeConfig.java | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/modules/ROOT/pages/includes/quarkus-langchain4j-pinecone.adoc b/docs/modules/ROOT/pages/includes/quarkus-langchain4j-pinecone.adoc index 04197c7ed..7e2028be2 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-langchain4j-pinecone.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-langchain4j-pinecone.adoc @@ -10,7 +10,7 @@ h|[[quarkus-langchain4j-pinecone_configuration]]link:#quarkus-langchain4j-pineco h|Type h|Default -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.api-key]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.api-key[quarkus.langchain4j.pinecone.api-key]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.api-key]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.api-key[quarkus.langchain4j.pinecone.api-key]` [.description] @@ -27,7 +27,7 @@ endif::add-copy-button-to-env-var[] |required icon:exclamation-circle[title=Configuration property is required] -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.environment]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.environment[quarkus.langchain4j.pinecone.environment]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.environment]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.environment[quarkus.langchain4j.pinecone.environment]` [.description] @@ -44,7 +44,7 @@ endif::add-copy-button-to-env-var[] |required icon:exclamation-circle[title=Configuration property is required] -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.project-id]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.project-id[quarkus.langchain4j.pinecone.project-id]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.project-id]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.project-id[quarkus.langchain4j.pinecone.project-id]` [.description] @@ -61,7 +61,7 @@ endif::add-copy-button-to-env-var[] |required icon:exclamation-circle[title=Configuration property is required] -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.index-name]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.index-name[quarkus.langchain4j.pinecone.index-name]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.index-name]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.index-name[quarkus.langchain4j.pinecone.index-name]` [.description] @@ -78,7 +78,7 @@ endif::add-copy-button-to-env-var[] |required icon:exclamation-circle[title=Configuration property is required] -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.dimension]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.dimension[quarkus.langchain4j.pinecone.dimension]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.dimension]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.dimension[quarkus.langchain4j.pinecone.dimension]` [.description] @@ -95,7 +95,7 @@ endif::add-copy-button-to-env-var[] | -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.namespace]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.namespace[quarkus.langchain4j.pinecone.namespace]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.namespace]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.namespace[quarkus.langchain4j.pinecone.namespace]` [.description] @@ -112,7 +112,7 @@ endif::add-copy-button-to-env-var[] | -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.text-field-name]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.text-field-name[quarkus.langchain4j.pinecone.text-field-name]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.text-field-name]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.text-field-name[quarkus.langchain4j.pinecone.text-field-name]` [.description] @@ -129,7 +129,7 @@ endif::add-copy-button-to-env-var[] |`text` -a|icon:lock[title=Fixed at build time] [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.timeout]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.timeout[quarkus.langchain4j.pinecone.timeout]` +a| [[quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.timeout]]`link:#quarkus-langchain4j-pinecone_quarkus.langchain4j.pinecone.timeout[quarkus.langchain4j.pinecone.timeout]` [.description] diff --git a/pinecone/deployment/src/test/java/io/quarkiverse/langchain4j/pinecone/deployment/PineconeEmbeddingStoreTest.java b/pinecone/deployment/src/test/java/io/quarkiverse/langchain4j/pinecone/deployment/PineconeEmbeddingStoreTest.java index fd7f02d24..20c28e350 100644 --- a/pinecone/deployment/src/test/java/io/quarkiverse/langchain4j/pinecone/deployment/PineconeEmbeddingStoreTest.java +++ b/pinecone/deployment/src/test/java/io/quarkiverse/langchain4j/pinecone/deployment/PineconeEmbeddingStoreTest.java @@ -39,10 +39,10 @@ * and the following environment variables must be set accordingly: * PINECONE_API_KEY, PINECONE_ENVIRONMENT, PINECONE_PROJECT_ID and PINECONE_INDEX_NAME * - * These are set as GitHub secrets in the main repository. GitHub doesn't - * pass them to workflows triggered from forks though, so this test only - * runs with the nightly CI workflow, or for PRs submitted from the main - * quarkiverse repository (NOT from a fork). + * These are set as GitHub secrets in the main repository. Because we only + * have one account in the starter region and one shared Pinecone index, we + * can't run this test multiple times in parallel, and so to prevent + * unnecessary failures, this test currently runs only in the nightly build. * *

* Original data in the index will be lost during the test. diff --git a/pinecone/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/runtime/PineconeConfig.java b/pinecone/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/runtime/PineconeConfig.java index ececc116b..8d9c9d129 100644 --- a/pinecone/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/runtime/PineconeConfig.java +++ b/pinecone/runtime/src/main/java/io/quarkiverse/langchain4j/pinecone/runtime/PineconeConfig.java @@ -1,6 +1,6 @@ package io.quarkiverse.langchain4j.pinecone.runtime; -import static io.quarkus.runtime.annotations.ConfigPhase.BUILD_AND_RUN_TIME_FIXED; +import static io.quarkus.runtime.annotations.ConfigPhase.RUN_TIME; import java.time.Duration; import java.util.Optional; @@ -9,7 +9,7 @@ import io.smallrye.config.ConfigMapping; import io.smallrye.config.WithDefault; -@ConfigRoot(phase = BUILD_AND_RUN_TIME_FIXED) +@ConfigRoot(phase = RUN_TIME) @ConfigMapping(prefix = "quarkus.langchain4j.pinecone") public interface PineconeConfig {