This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 906a84ac04e CAMEL-21843 - camel-kamelet - Move kamelet utils to
corresponding components - Langchain4j (#17451)
906a84ac04e is described below
commit 906a84ac04e2959f81373e68912a8a6055a274a5
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Mar 13 13:10:01 2025 +0100
CAMEL-21843 - camel-kamelet - Move kamelet utils to corresponding
components - Langchain4j (#17451)
Signed-off-by: Andrea Cosentino <[email protected]>
---
components/camel-ai/camel-langchain4j-chat/pom.xml | 13 ++++++++++++-
.../HugginFaceChatLanguageModelBuilder.java | 2 +-
.../chat/openai}/OpenAiChatLanguageModelBuilder.java | 2 +-
.../camel-ai/camel-langchain4j-embeddings/pom.xml | 10 ++++++++++
.../huggingface}/HuggingFaceEmbeddingModelBuilder.java | 2 +-
.../embeddings/openai}/OpenAiEmbeddingModelBuilder.java | 2 +-
components/camel-kamelet/pom.xml | 17 -----------------
7 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/components/camel-ai/camel-langchain4j-chat/pom.xml
b/components/camel-ai/camel-langchain4j-chat/pom.xml
index c03722b488b..03300bca053 100644
--- a/components/camel-ai/camel-langchain4j-chat/pom.xml
+++ b/components/camel-ai/camel-langchain4j-chat/pom.xml
@@ -45,7 +45,12 @@
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
- <artifactId>langchain4j</artifactId>
+ <artifactId>langchain4j-open-ai</artifactId>
+ <version>${langchain4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dev.langchain4j</groupId>
+ <artifactId>langchain4j-hugging-face</artifactId>
<version>${langchain4j-version}</version>
</dependency>
<dependency>
@@ -84,6 +89,12 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>dev.langchain4j</groupId>
+ <artifactId>langchain4j-open-ai</artifactId>
+ <version>0.36.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/chat/HugginFaceChatLanguageModelBuilder.java
b/components/camel-ai/camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/huggingface/HugginFaceChatLanguageModelBuilder.java
similarity index 97%
rename from
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/chat/HugginFaceChatLanguageModelBuilder.java
rename to
components/camel-ai/camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/huggingface/HugginFaceChatLanguageModelBuilder.java
index 3844efee4ea..f5c883d6374 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/chat/HugginFaceChatLanguageModelBuilder.java
+++
b/components/camel-ai/camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/huggingface/HugginFaceChatLanguageModelBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kamelet.utils.langchain4j.chat;
+package org.apache.camel.component.langchain4j.chat.huggingface;
import dev.langchain4j.model.huggingface.HuggingFaceLanguageModel;
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/chat/OpenAiChatLanguageModelBuilder.java
b/components/camel-ai/camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/openai/OpenAiChatLanguageModelBuilder.java
similarity index 97%
rename from
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/chat/OpenAiChatLanguageModelBuilder.java
rename to
components/camel-ai/camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/openai/OpenAiChatLanguageModelBuilder.java
index bde9dd6bcb7..b4e9bdc8ebb 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/chat/OpenAiChatLanguageModelBuilder.java
+++
b/components/camel-ai/camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/openai/OpenAiChatLanguageModelBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kamelet.utils.langchain4j.chat;
+package org.apache.camel.component.langchain4j.chat.openai;
import dev.langchain4j.model.chat.ChatLanguageModel;
import dev.langchain4j.model.openai.OpenAiChatModel;
diff --git a/components/camel-ai/camel-langchain4j-embeddings/pom.xml
b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
index 2a858d44d6e..c55a225d159 100644
--- a/components/camel-ai/camel-langchain4j-embeddings/pom.xml
+++ b/components/camel-ai/camel-langchain4j-embeddings/pom.xml
@@ -51,6 +51,16 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-langchain4j-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>dev.langchain4j</groupId>
+ <artifactId>langchain4j-open-ai</artifactId>
+ <version>${langchain4j-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dev.langchain4j</groupId>
+ <artifactId>langchain4j-hugging-face</artifactId>
+ <version>${langchain4j-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/embeddings/HuggingFaceEmbeddingModelBuilder.java
b/components/camel-ai/camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/huggingface/HuggingFaceEmbeddingModelBuilder.java
similarity index 96%
rename from
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/embeddings/HuggingFaceEmbeddingModelBuilder.java
rename to
components/camel-ai/camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/huggingface/HuggingFaceEmbeddingModelBuilder.java
index 0f8ea42bab5..bd1a5c83d4b 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/embeddings/HuggingFaceEmbeddingModelBuilder.java
+++
b/components/camel-ai/camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/huggingface/HuggingFaceEmbeddingModelBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kamelet.utils.langchain4j.embeddings;
+package org.apache.camel.component.langchain4j.embeddings.huggingface;
import dev.langchain4j.model.huggingface.HuggingFaceEmbeddingModel;
diff --git
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/embeddings/OpenAiEmbeddingModelBuilder.java
b/components/camel-ai/camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/openai/OpenAiEmbeddingModelBuilder.java
similarity index 97%
rename from
components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/embeddings/OpenAiEmbeddingModelBuilder.java
rename to
components/camel-ai/camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/openai/OpenAiEmbeddingModelBuilder.java
index 0900376370c..9e4855d3a16 100644
---
a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/utils/langchain4j/embeddings/OpenAiEmbeddingModelBuilder.java
+++
b/components/camel-ai/camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/openai/OpenAiEmbeddingModelBuilder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.kamelet.utils.langchain4j.embeddings;
+package org.apache.camel.component.langchain4j.embeddings.openai;
import dev.langchain4j.model.embedding.EmbeddingModel;
import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
diff --git a/components/camel-kamelet/pom.xml b/components/camel-kamelet/pom.xml
index 829d984f141..21d6058c125 100644
--- a/components/camel-kamelet/pom.xml
+++ b/components/camel-kamelet/pom.xml
@@ -42,23 +42,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-model</artifactId>
</dependency>
- <dependency>
- <groupId>dev.langchain4j</groupId>
- <artifactId>langchain4j-open-ai</artifactId>
- <version>${langchain4j-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-djl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>dev.langchain4j</groupId>
- <artifactId>langchain4j-hugging-face</artifactId>
- <version>${langchain4j-version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jackson</artifactId>
