From 71ab84865d55e0a8a5067110ee72bbbd5719c614 Mon Sep 17 00:00:00 2001 From: SEZ <941655392@qq.com> Date: Fri, 3 Jan 2025 09:48:52 +0800 Subject: [PATCH] fix transforms-v2 nlpmodel typo (#8430) --- .../EmbeddingMultiCatalogTransform.java | 2 +- .../{embadding => embedding}/EmbeddingTransform.java | 12 ++++++------ .../EmbeddingTransformConfig.java | 2 +- .../EmbeddingTransformFactory.java | 2 +- .../remote/AbstractModel.java | 2 +- .../{embadding => embedding}/remote/Model.java | 2 +- .../remote/custom/CustomModel.java | 4 ++-- .../remote/doubao/DoubaoModel.java | 4 ++-- .../remote/openai/OpenAIModel.java | 4 ++-- .../remote/qianfan/QianfanModel.java | 4 ++-- .../transform/EmbeddingTransformFactoryTest.java | 2 +- .../embedding/EmbeddingRequestJsonTest.java | 8 ++++---- 12 files changed, 24 insertions(+), 24 deletions(-) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/EmbeddingMultiCatalogTransform.java (96%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/EmbeddingTransform.java (96%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/EmbeddingTransformConfig.java (96%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/EmbeddingTransformFactory.java (98%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/remote/AbstractModel.java (97%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/remote/Model.java (94%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/remote/custom/CustomModel.java (97%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/remote/doubao/DoubaoModel.java (97%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/remote/openai/OpenAIModel.java (97%) rename seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/{embadding => embedding}/remote/qianfan/QianfanModel.java (98%) diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingMultiCatalogTransform.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingMultiCatalogTransform.java similarity index 96% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingMultiCatalogTransform.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingMultiCatalogTransform.java index 652e9591484..b32181d0678 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingMultiCatalogTransform.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingMultiCatalogTransform.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding; +package org.apache.seatunnel.transform.nlpmodel.embedding; import org.apache.seatunnel.api.configuration.ReadonlyConfig; import org.apache.seatunnel.api.table.catalog.CatalogTable; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransform.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransform.java similarity index 96% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransform.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransform.java index ce6d864da6f..c699c6bfe82 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransform.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransform.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding; +package org.apache.seatunnel.transform.nlpmodel.embedding; import org.apache.seatunnel.api.configuration.ReadonlyConfig; import org.apache.seatunnel.api.table.catalog.CatalogTable; @@ -28,11 +28,11 @@ import org.apache.seatunnel.transform.exception.TransformCommonError; import org.apache.seatunnel.transform.nlpmodel.ModelProvider; import org.apache.seatunnel.transform.nlpmodel.ModelTransformConfig; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.Model; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.custom.CustomModel; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.doubao.DoubaoModel; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.openai.OpenAIModel; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.qianfan.QianfanModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.Model; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.custom.CustomModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.doubao.DoubaoModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.openai.OpenAIModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.qianfan.QianfanModel; import org.apache.seatunnel.transform.nlpmodel.llm.LLMTransformConfig; import lombok.NonNull; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransformConfig.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransformConfig.java similarity index 96% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransformConfig.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransformConfig.java index 0309363abd8..a4b0c7a2536 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransformConfig.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransformConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding; +package org.apache.seatunnel.transform.nlpmodel.embedding; import org.apache.seatunnel.api.configuration.Option; import org.apache.seatunnel.api.configuration.Options; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransformFactory.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransformFactory.java similarity index 98% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransformFactory.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransformFactory.java index 702790b43f5..56e252e1bb7 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/EmbeddingTransformFactory.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/EmbeddingTransformFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding; +package org.apache.seatunnel.transform.nlpmodel.embedding; import org.apache.seatunnel.shade.com.google.common.collect.Lists; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/AbstractModel.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/AbstractModel.java similarity index 97% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/AbstractModel.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/AbstractModel.java index 2e8665559b0..0803dfd7adc 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/AbstractModel.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/AbstractModel.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding.remote; +package org.apache.seatunnel.transform.nlpmodel.embedding.remote; import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.ObjectMapper; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/Model.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/Model.java similarity index 94% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/Model.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/Model.java index d02dec7718e..2cd3afb5f40 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/Model.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/Model.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding.remote; +package org.apache.seatunnel.transform.nlpmodel.embedding.remote; import java.io.Closeable; import java.io.IOException; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/custom/CustomModel.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/custom/CustomModel.java similarity index 97% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/custom/CustomModel.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/custom/CustomModel.java index 063d1f5b651..179315f9562 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/custom/CustomModel.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/custom/CustomModel.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding.remote.custom; +package org.apache.seatunnel.transform.nlpmodel.embedding.remote.custom; import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference; import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.JsonNode; @@ -24,7 +24,7 @@ import org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting; import org.apache.seatunnel.transform.nlpmodel.CustomConfigPlaceholder; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.AbstractModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.AbstractModel; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/doubao/DoubaoModel.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/doubao/DoubaoModel.java similarity index 97% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/doubao/DoubaoModel.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/doubao/DoubaoModel.java index 1b2d28796dd..f2b1e348c76 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/doubao/DoubaoModel.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/doubao/DoubaoModel.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding.remote.doubao; +package org.apache.seatunnel.transform.nlpmodel.embedding.remote.doubao; import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference; import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.JsonNode; @@ -23,7 +23,7 @@ import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.AbstractModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.AbstractModel; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/openai/OpenAIModel.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/openai/OpenAIModel.java similarity index 97% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/openai/OpenAIModel.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/openai/OpenAIModel.java index 3b625a6fb15..2a45cc829fb 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/openai/OpenAIModel.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/openai/OpenAIModel.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding.remote.openai; +package org.apache.seatunnel.transform.nlpmodel.embedding.remote.openai; import org.apache.seatunnel.shade.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference; @@ -23,7 +23,7 @@ import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.AbstractModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.AbstractModel; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/qianfan/QianfanModel.java b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/qianfan/QianfanModel.java similarity index 98% rename from seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/qianfan/QianfanModel.java rename to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/qianfan/QianfanModel.java index a15a9eb7f86..f85619eb3e6 100644 --- a/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embadding/remote/qianfan/QianfanModel.java +++ b/seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/nlpmodel/embedding/remote/qianfan/QianfanModel.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.seatunnel.transform.nlpmodel.embadding.remote.qianfan; +package org.apache.seatunnel.transform.nlpmodel.embedding.remote.qianfan; import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference; import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.JsonNode; @@ -23,7 +23,7 @@ import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.seatunnel.shade.com.google.common.annotations.VisibleForTesting; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.AbstractModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.AbstractModel; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/EmbeddingTransformFactoryTest.java b/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/EmbeddingTransformFactoryTest.java index 4d054329069..b851f8c6e5c 100644 --- a/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/EmbeddingTransformFactoryTest.java +++ b/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/EmbeddingTransformFactoryTest.java @@ -17,7 +17,7 @@ package org.apache.seatunnel.transform; -import org.apache.seatunnel.transform.nlpmodel.embadding.EmbeddingTransformFactory; +import org.apache.seatunnel.transform.nlpmodel.embedding.EmbeddingTransformFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/embedding/EmbeddingRequestJsonTest.java b/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/embedding/EmbeddingRequestJsonTest.java index 1e04aa0ed90..dc43cdeb236 100644 --- a/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/embedding/EmbeddingRequestJsonTest.java +++ b/seatunnel-transforms-v2/src/test/java/org/apache/seatunnel/transform/embedding/EmbeddingRequestJsonTest.java @@ -22,10 +22,10 @@ import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.seatunnel.shade.com.google.common.collect.Lists; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.custom.CustomModel; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.doubao.DoubaoModel; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.openai.OpenAIModel; -import org.apache.seatunnel.transform.nlpmodel.embadding.remote.qianfan.QianfanModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.custom.CustomModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.doubao.DoubaoModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.openai.OpenAIModel; +import org.apache.seatunnel.transform.nlpmodel.embedding.remote.qianfan.QianfanModel; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test;