You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/03/30 06:08:05 UTC
(camel) branch main updated (4b89046d701 -> 0912d0d85eb)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 4b89046d701 Fixup catalog: make catalog more type safe (#13665)
add 0912d0d85eb CAMEL-20611 : rename camel Langchain to camel Langchain4j (#13664)
No new revisions were added by this update.
Summary of changes:
bom/camel-bom/pom.xml | 4 +-
catalog/camel-allcomponents/pom.xml | 4 +-
.../org/apache/camel/catalog/components.properties | 4 +-
.../camel/catalog/components/langchain4j-chat.json | 22 ++---
...embeddings.json => langchain4j-embeddings.json} | 26 +++---
.../org/apache/camel/component/langchain-chat | 2 -
.../camel/configurer/langchain-chat-component | 2 -
.../camel/configurer/langchain-chat-endpoint | 2 -
...camel.component.chat.LangChainChatConfiguration | 2 -
...camel.component.chat.LangchainChatConfiguration | 2 -
.../camel/urifactory/langchain-chat-endpoint | 2 -
.../services/org/apache/camel/TypeConverterLoader | 2 -
.../apache/camel/component/langchain-embeddings | 2 -
.../configurer/langchain-embeddings-component | 2 -
.../camel/configurer/langchain-embeddings-endpoint | 2 -
...ain.embeddings.LangChainEmbeddingsConfiguration | 2 -
...ain.embeddings.LangchainEmbeddingsConfiguration | 2 -
.../camel/urifactory/langchain-embeddings-endpoint | 2 -
.../pom.xml | 4 +-
.../chat/LangChain4jChatComponentConfigurer.java} | 20 ++---
.../LangChain4jChatConfigurationConfigurer.java} | 14 ++--
.../chat/LangChain4jChatEndpointConfigurer.java} | 12 +--
.../chat/LangChain4jChatEndpointUriFactory.java} | 6 +-
.../langchain4j/chat/langchain4j-chat.json | 22 ++---
.../services/org/apache/camel/component.properties | 6 +-
.../org/apache/camel/component/langchain4j-chat | 2 +
.../camel/configurer/langchain4j-chat-component | 2 +
.../camel/configurer/langchain4j-chat-endpoint | 2 +
...t.langchain4j.chat.LangChain4jChatConfiguration | 2 +
.../camel/urifactory/langchain4j-chat-endpoint | 2 +
.../src/main/docs/langchain4j-chat-component.adoc} | 28 +++----
.../langchain4j/chat/LangChain4jChat.java} | 10 +--
.../chat/LangChain4jChatComponent.java} | 22 ++---
.../chat/LangChain4jChatConfiguration.java} | 18 ++---
.../langchain4j/chat/LangChain4jChatEndpoint.java} | 22 ++---
.../chat/LangChain4jChatOperations.java} | 4 +-
.../langchain4j/chat/LangChain4jChatProducer.java} | 18 ++---
.../langchain4j.chat/LangChain4jChatIT.java} | 16 ++--
.../langchain4j.chat}/OllamaTestSupport.java | 2 +-
.../src/test/resources/log4j2.properties | 6 +-
.../pom.xml | 4 +-
.../LangChain4jEmbeddingsComponentConfigurer.java} | 16 ++--
...gChain4jEmbeddingsConfigurationConfigurer.java} | 10 +--
.../LangChain4jEmbeddingsConverterLoader.java} | 12 +--
.../LangChain4jEmbeddingsEndpointConfigurer.java} | 8 +-
.../LangChain4jEmbeddingsEndpointUriFactory.java} | 6 +-
.../embeddings/langchain4j-embeddings.json} | 26 +++---
.../services/org/apache/camel/TypeConverterLoader | 2 +
.../services/org/apache/camel/component.properties | 6 +-
.../apache/camel/component/langchain4j-embeddings | 2 +
.../configurer/langchain4j-embeddings-component | 2 +
.../configurer/langchain4j-embeddings-endpoint | 2 +
...j.embeddings.LangChain4jEmbeddingsConfiguration | 2 +
.../urifactory/langchain4j-embeddings-endpoint | 2 +
.../docs/langchain4j-embeddings-component.adoc} | 10 +--
.../embeddings/LangChain4jEmbeddings.java} | 18 ++---
.../LangChain4jEmbeddingsComponent.java} | 22 ++---
.../LangChain4jEmbeddingsConfiguration.java} | 8 +-
.../LangChain4jEmbeddingsConverter.java} | 4 +-
.../embeddings/LangChain4jEmbeddingsEndpoint.java} | 24 +++---
.../embeddings/LangChain4jEmbeddingsProducer.java} | 20 ++---
...gChain4jEmbeddingsComponentMilvusTargetIT.java} | 6 +-
...gChain4jEmbeddingsComponentQdrantTargetIT.java} | 6 +-
.../LangChain4jEmbeddingsComponentTest.java} | 16 ++--
.../src/test/resources/log4j2.properties | 6 +-
components/camel-ai/pom.xml | 4 +-
.../MilvusEmbeddingsDataTypeTransformer.java | 5 +-
.../QdrantEmbeddingsDataTypeTransformer.java | 4 +-
.../org/apache/camel/main/components.properties | 4 +-
.../modules/ROOT/examples/json/langchain-chat.json | 1 -
.../ROOT/examples/json/langchain-embeddings.json | 1 -
.../ROOT/examples/json/langchain4j-chat.json | 1 +
.../ROOT/examples/json/langchain4j-embeddings.json | 1 +
docs/components/modules/ROOT/nav.adoc | 4 +-
.../ROOT/pages/langchain-chat-component.adoc | 1 -
.../ROOT/pages/langchain-embeddings-component.adoc | 1 -
.../ROOT/pages/langchain4j-chat-component.adoc | 1 +
.../pages/langchain4j-embeddings-component.adoc | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 26 ++++++
.../component/ComponentsBuilderFactory.java | 16 ++--
...=> Langchain4jChatComponentBuilderFactory.java} | 62 +++++++-------
...gchain4jEmbeddingsComponentBuilderFactory.java} | 52 ++++++------
.../src/generated/resources/metadata.json | 24 +++---
.../builder/endpoint/EndpointBuilderFactory.java | 4 +-
.../camel/builder/endpoint/EndpointBuilders.java | 4 +-
.../builder/endpoint/StaticEndpointBuilders.java | 40 ++++-----
... => LangChain4jChatEndpointBuilderFactory.java} | 86 ++++++++++----------
...ngChain4jEmbeddingsEndpointBuilderFactory.java} | 94 +++++++++++-----------
.../camel-component-known-dependencies.properties | 4 +-
...chainChatUriDsl.kt => Langchain4jChatUriDsl.kt} | 10 +--
...ngsUriDsl.kt => Langchain4jEmbeddingsUriDsl.kt} | 8 +-
parent/pom.xml | 4 +-
.../apache/camel/maven/packaging/MojoHelper.java | 2 +-
93 files changed, 528 insertions(+), 503 deletions(-)
rename components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/org/apache/camel/component/chat/langchain-chat.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/langchain4j-chat.json (65%)
rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/{langchain-embeddings.json => langchain4j-embeddings.json} (57%)
delete mode 100644 components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/services/org/apache/camel/component/langchain-chat
delete mode 100644 components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain-chat-component
delete mode 100644 components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain-chat-endpoint
delete mode 100644 components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.chat.LangChainChatConfiguration
delete mode 100644 components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.chat.LangchainChatConfiguration
delete mode 100644 components/camel-ai/camel-langchain-chat/src/generated/resources/META-INF/services/org/apache/camel/urifactory/langchain-chat-endpoint
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/component/langchain-embeddings
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain-embeddings-component
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain-embeddings-endpoint
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.langchain.embeddings.LangChainEmbeddingsConfiguration
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.langchain.embeddings.LangchainEmbeddingsConfiguration
delete mode 100644 components/camel-ai/camel-langchain-embeddings/src/generated/resources/META-INF/services/org/apache/camel/urifactory/langchain-embeddings-endpoint
rename components/camel-ai/{camel-langchain-chat => camel-langchain4j-chat}/pom.xml (96%)
rename components/camel-ai/{camel-langchain-chat/src/generated/java/org/apache/camel/component/chat/LangChainChatComponentConfigurer.java => camel-langchain4j-chat/src/generated/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatComponentConfigurer.java} (78%)
rename components/camel-ai/{camel-langchain-chat/src/generated/java/org/apache/camel/component/chat/LangChainChatConfigurationConfigurer.java => camel-langchain4j-chat/src/generated/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatConfigurationConfigurer.java} (68%)
rename components/camel-ai/{camel-langchain-chat/src/generated/java/org/apache/camel/component/chat/LangChainChatEndpointConfigurer.java => camel-langchain4j-chat/src/generated/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatEndpointConfigurer.java} (81%)
rename components/camel-ai/{camel-langchain-chat/src/generated/java/org/apache/camel/component/chat/LangChainChatEndpointUriFactory.java => camel-langchain4j-chat/src/generated/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatEndpointUriFactory.java} (87%)
rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/langchain-chat.json => components/camel-ai/camel-langchain4j-chat/src/generated/resources/META-INF/org/apache/camel/component/langchain4j/chat/langchain4j-chat.json (65%)
rename components/camel-ai/{camel-langchain-chat => camel-langchain4j-chat}/src/generated/resources/META-INF/services/org/apache/camel/component.properties (59%)
create mode 100644 components/camel-ai/camel-langchain4j-chat/src/generated/resources/META-INF/services/org/apache/camel/component/langchain4j-chat
create mode 100644 components/camel-ai/camel-langchain4j-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain4j-chat-component
create mode 100644 components/camel-ai/camel-langchain4j-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain4j-chat-endpoint
create mode 100644 components/camel-ai/camel-langchain4j-chat/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.langchain4j.chat.LangChain4jChatConfiguration
create mode 100644 components/camel-ai/camel-langchain4j-chat/src/generated/resources/META-INF/services/org/apache/camel/urifactory/langchain4j-chat-endpoint
rename components/camel-ai/{camel-langchain-chat/src/main/docs/langchain-chat-component.adoc => camel-langchain4j-chat/src/main/docs/langchain4j-chat-component.adoc} (76%)
rename components/camel-ai/{camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangChainChat.java => camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/LangChain4jChat.java} (83%)
rename components/camel-ai/{camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangChainChatComponent.java => camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatComponent.java} (66%)
rename components/camel-ai/{camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangChainChatConfiguration.java => camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatConfiguration.java} (76%)
rename components/camel-ai/{camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangChainChatEndpoint.java => camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatEndpoint.java} (73%)
rename components/camel-ai/{camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangChainChatOperations.java => camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatOperations.java} (90%)
rename components/camel-ai/{camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangChainChatProducer.java => camel-langchain4j-chat/src/main/java/org/apache/camel/component/langchain4j/chat/LangChain4jChatProducer.java} (88%)
rename components/camel-ai/{camel-langchain-chat/src/test/java/org/apache/camel/component/chat/LangChainChatIT.java => camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j.chat/LangChain4jChatIT.java} (92%)
rename components/camel-ai/{camel-langchain-chat/src/test/java/org/apache/camel/component/chat => camel-langchain4j-chat/src/test/java/org/apache/camel/component/langchain4j.chat}/OllamaTestSupport.java (97%)
rename components/camel-ai/{camel-langchain-chat => camel-langchain4j-chat}/src/test/resources/log4j2.properties (88%)
rename components/camel-ai/{camel-langchain-embeddings => camel-langchain4j-embeddings}/pom.xml (97%)
rename components/camel-ai/{camel-langchain-embeddings/src/generated/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsComponentConfigurer.java => camel-langchain4j-embeddings/src/generated/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentConfigurer.java} (77%)
rename components/camel-ai/{camel-langchain-embeddings/src/generated/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsConfigurationConfigurer.java => camel-langchain4j-embeddings/src/generated/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsConfigurationConfigurer.java} (67%)
rename components/camel-ai/{camel-langchain-embeddings/src/generated/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsConverterLoader.java => camel-langchain4j-embeddings/src/generated/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsConverterLoader.java} (80%)
rename components/camel-ai/{camel-langchain-embeddings/src/generated/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsEndpointConfigurer.java => camel-langchain4j-embeddings/src/generated/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsEndpointConfigurer.java} (84%)
rename components/camel-ai/{camel-langchain-embeddings/src/generated/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsEndpointUriFactory.java => camel-langchain4j-embeddings/src/generated/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsEndpointUriFactory.java} (87%)
rename components/camel-ai/{camel-langchain-embeddings/src/generated/resources/META-INF/org/apache/camel/component/langchain/embeddings/langchain-embeddings.json => camel-langchain4j-embeddings/src/generated/resources/META-INF/org/apache/camel/component/langchain4j/embeddings/langchain4j-embeddings.json} (57%)
create mode 100644 components/camel-ai/camel-langchain4j-embeddings/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
rename components/camel-ai/{camel-langchain-embeddings => camel-langchain4j-embeddings}/src/generated/resources/META-INF/services/org/apache/camel/component.properties (55%)
create mode 100644 components/camel-ai/camel-langchain4j-embeddings/src/generated/resources/META-INF/services/org/apache/camel/component/langchain4j-embeddings
create mode 100644 components/camel-ai/camel-langchain4j-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain4j-embeddings-component
create mode 100644 components/camel-ai/camel-langchain4j-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/langchain4j-embeddings-endpoint
create mode 100644 components/camel-ai/camel-langchain4j-embeddings/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddingsConfiguration
create mode 100644 components/camel-ai/camel-langchain4j-embeddings/src/generated/resources/META-INF/services/org/apache/camel/urifactory/langchain4j-embeddings-endpoint
rename components/camel-ai/{camel-langchain-embeddings/src/main/docs/langchain-embeddings-component.adoc => camel-langchain4j-embeddings/src/main/docs/langchain4j-embeddings-component.adoc} (70%)
rename components/camel-ai/{camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddings.java => camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddings.java} (78%)
rename components/camel-ai/{camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsComponent.java => camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponent.java} (65%)
rename components/camel-ai/{camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsConfiguration.java => camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsConfiguration.java} (86%)
rename components/camel-ai/{camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsConverter.java => camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsConverter.java} (93%)
rename components/camel-ai/{camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsEndpoint.java => camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsEndpoint.java} (71%)
rename components/camel-ai/{camel-langchain-embeddings/src/main/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsProducer.java => camel-langchain4j-embeddings/src/main/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsProducer.java} (65%)
rename components/camel-ai/{camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsComponentMilvusTargetIT.java => camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentMilvusTargetIT.java} (97%)
rename components/camel-ai/{camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsComponentQdrantTargetIT.java => camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentQdrantTargetIT.java} (95%)
rename components/camel-ai/{camel-langchain-embeddings/src/test/java/org/apache/camel/component/langchain/embeddings/LangChainEmbeddingsComponentTest.java => camel-langchain4j-embeddings/src/test/java/org/apache/camel/component/langchain4j/embeddings/LangChain4jEmbeddingsComponentTest.java} (77%)
rename components/camel-ai/{camel-langchain-embeddings => camel-langchain4j-embeddings}/src/test/resources/log4j2.properties (86%)
delete mode 120000 docs/components/modules/ROOT/examples/json/langchain-chat.json
delete mode 120000 docs/components/modules/ROOT/examples/json/langchain-embeddings.json
create mode 120000 docs/components/modules/ROOT/examples/json/langchain4j-chat.json
create mode 120000 docs/components/modules/ROOT/examples/json/langchain4j-embeddings.json
delete mode 120000 docs/components/modules/ROOT/pages/langchain-chat-component.adoc
delete mode 120000 docs/components/modules/ROOT/pages/langchain-embeddings-component.adoc
create mode 120000 docs/components/modules/ROOT/pages/langchain4j-chat-component.adoc
create mode 120000 docs/components/modules/ROOT/pages/langchain4j-embeddings-component.adoc
rename dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/{LangchainChatComponentBuilderFactory.java => Langchain4jChatComponentBuilderFactory.java} (67%)
rename dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/{LangchainEmbeddingsComponentBuilderFactory.java => Langchain4jEmbeddingsComponentBuilderFactory.java} (67%)
rename dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{LangChainChatEndpointBuilderFactory.java => LangChain4jChatEndpointBuilderFactory.java} (70%)
rename dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{LangChainEmbeddingsEndpointBuilderFactory.java => LangChain4jEmbeddingsEndpointBuilderFactory.java} (69%)
rename dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/{LangchainChatUriDsl.kt => Langchain4jChatUriDsl.kt} (92%)
rename dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/{LangchainEmbeddingsUriDsl.kt => Langchain4jEmbeddingsUriDsl.kt} (92%)