From 11a4ab127150c5d5910b9a2af25da2cc4ef03cbc Mon Sep 17 00:00:00 2001 From: extio-de Date: Fri, 27 Jun 2025 16:46:56 +0200 Subject: [PATCH] Moved oai client packages --- pom.xml | 2 +- .../client/{textcompletion => oai}/ModelNameLoader.java | 7 +++---- .../{textcompletion => oai}/ModelNameSupplier.java | 4 ++-- .../{ => oai}/textcompletion/TextCompletionClient.java | 9 +++++---- .../client/{ => oai}/textcompletion/dto/Choice.java | 2 +- .../{ => oai}/textcompletion/dto/CompletionRequest.java | 2 +- .../{ => oai}/textcompletion/dto/CompletionResponse.java | 2 +- .../lmlib/client/{ => oai}/textcompletion/dto/Model.java | 2 +- .../{ => oai}/textcompletion/dto/ModelsResponse.java | 2 +- .../TextCompletionClientTest.java | 5 +++-- src/test/resources/local-completion.properties | 2 +- 11 files changed, 20 insertions(+), 19 deletions(-) rename src/main/java/de/extio/lmlib/client/{textcompletion => oai}/ModelNameLoader.java (91%) rename src/main/java/de/extio/lmlib/client/{textcompletion => oai}/ModelNameSupplier.java (94%) rename src/main/java/de/extio/lmlib/client/{ => oai}/textcompletion/TextCompletionClient.java (97%) rename src/main/java/de/extio/lmlib/client/{ => oai}/textcompletion/dto/Choice.java (95%) rename src/main/java/de/extio/lmlib/client/{ => oai}/textcompletion/dto/CompletionRequest.java (95%) rename src/main/java/de/extio/lmlib/client/{ => oai}/textcompletion/dto/CompletionResponse.java (97%) rename src/main/java/de/extio/lmlib/client/{ => oai}/textcompletion/dto/Model.java (95%) rename src/main/java/de/extio/lmlib/client/{ => oai}/textcompletion/dto/ModelsResponse.java (93%) rename src/test/java/de/extio/lmlib/client/{textcompletion => oai}/TextCompletionClientTest.java (97%) diff --git a/pom.xml b/pom.xml index 2d3c924..a933ac0 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ lm-lib de.extio lm-lib - 1.5.7 + 1.6.0 21 diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/ModelNameLoader.java b/src/main/java/de/extio/lmlib/client/oai/ModelNameLoader.java similarity index 91% rename from src/main/java/de/extio/lmlib/client/textcompletion/ModelNameLoader.java rename to src/main/java/de/extio/lmlib/client/oai/ModelNameLoader.java index b70d432..9e393a3 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/ModelNameLoader.java +++ b/src/main/java/de/extio/lmlib/client/oai/ModelNameLoader.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion; +package de.extio.lmlib.client.oai; import java.time.Duration; import java.util.function.Consumer; @@ -9,9 +9,8 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpMethod; import org.springframework.web.reactive.function.client.WebClient; -import de.extio.lmlib.client.textcompletion.dto.Model; -import de.extio.lmlib.client.textcompletion.dto.ModelsResponse; - +import de.extio.lmlib.client.oai.textcompletion.dto.Model; +import de.extio.lmlib.client.oai.textcompletion.dto.ModelsResponse; import reactor.util.retry.Retry; class ModelNameLoader implements Runnable { diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/ModelNameSupplier.java b/src/main/java/de/extio/lmlib/client/oai/ModelNameSupplier.java similarity index 94% rename from src/main/java/de/extio/lmlib/client/textcompletion/ModelNameSupplier.java rename to src/main/java/de/extio/lmlib/client/oai/ModelNameSupplier.java index f4caf75..8702f69 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/ModelNameSupplier.java +++ b/src/main/java/de/extio/lmlib/client/oai/ModelNameSupplier.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion; +package de.extio.lmlib.client.oai; import java.util.Map; import java.util.concurrent.CompletableFuture; @@ -15,7 +15,7 @@ import de.extio.lmlib.profile.ModelProfileService; import de.extio.lmlib.profile.ModelProfile.ModelProvider; @Component -class ModelNameSupplier implements InitializingBean { +public class ModelNameSupplier implements InitializingBean { @Autowired @Qualifier("lmLibWebClientBuilder") diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/TextCompletionClient.java b/src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java similarity index 97% rename from src/main/java/de/extio/lmlib/client/textcompletion/TextCompletionClient.java rename to src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java index 5050048..cd2761c 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/TextCompletionClient.java +++ b/src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion; +package de.extio.lmlib.client.oai.textcompletion; import java.math.BigDecimal; import java.text.DecimalFormat; @@ -25,9 +25,10 @@ import de.extio.lmlib.client.Client; import de.extio.lmlib.client.Completion; import de.extio.lmlib.client.Conversation; import de.extio.lmlib.client.Conversation.Turn; -import de.extio.lmlib.client.textcompletion.dto.Choice; -import de.extio.lmlib.client.textcompletion.dto.CompletionRequest; -import de.extio.lmlib.client.textcompletion.dto.CompletionResponse; +import de.extio.lmlib.client.oai.ModelNameSupplier; +import de.extio.lmlib.client.oai.textcompletion.dto.Choice; +import de.extio.lmlib.client.oai.textcompletion.dto.CompletionRequest; +import de.extio.lmlib.client.oai.textcompletion.dto.CompletionResponse; import de.extio.lmlib.profile.ModelCategory; import de.extio.lmlib.profile.ModelProfile; import de.extio.lmlib.profile.ModelProfile.ModelProvider; diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/dto/Choice.java b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Choice.java similarity index 95% rename from src/main/java/de/extio/lmlib/client/textcompletion/dto/Choice.java rename to src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Choice.java index 41cc2eb..a7c1e6c 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/dto/Choice.java +++ b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Choice.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion.dto; +package de.extio.lmlib.client.oai.textcompletion.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionRequest.java b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionRequest.java similarity index 95% rename from src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionRequest.java rename to src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionRequest.java index 6f7d969..f23b5cf 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionRequest.java +++ b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionRequest.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion.dto; +package de.extio.lmlib.client.oai.textcompletion.dto; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionResponse.java b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionResponse.java similarity index 97% rename from src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionResponse.java rename to src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionResponse.java index d9ed1f5..910ff84 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionResponse.java +++ b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionResponse.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion.dto; +package de.extio.lmlib.client.oai.textcompletion.dto; import java.util.List; diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/dto/Model.java b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Model.java similarity index 95% rename from src/main/java/de/extio/lmlib/client/textcompletion/dto/Model.java rename to src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Model.java index 286331e..b2ba1ed 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/dto/Model.java +++ b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Model.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion.dto; +package de.extio.lmlib.client.oai.textcompletion.dto; import java.util.List; diff --git a/src/main/java/de/extio/lmlib/client/textcompletion/dto/ModelsResponse.java b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/ModelsResponse.java similarity index 93% rename from src/main/java/de/extio/lmlib/client/textcompletion/dto/ModelsResponse.java rename to src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/ModelsResponse.java index 9d30e54..e45a9ca 100755 --- a/src/main/java/de/extio/lmlib/client/textcompletion/dto/ModelsResponse.java +++ b/src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/ModelsResponse.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion.dto; +package de.extio.lmlib.client.oai.textcompletion.dto; import java.util.List; diff --git a/src/test/java/de/extio/lmlib/client/textcompletion/TextCompletionClientTest.java b/src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java similarity index 97% rename from src/test/java/de/extio/lmlib/client/textcompletion/TextCompletionClientTest.java rename to src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java index 6268301..0327159 100755 --- a/src/test/java/de/extio/lmlib/client/textcompletion/TextCompletionClientTest.java +++ b/src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java @@ -1,4 +1,4 @@ -package de.extio.lmlib.client.textcompletion; +package de.extio.lmlib.client.oai; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -21,9 +21,10 @@ import org.springframework.context.annotation.PropertySource; import de.extio.lmlib.client.Conversation; import de.extio.lmlib.client.Conversation.Turn; import de.extio.lmlib.client.Conversation.TurnType; +import de.extio.lmlib.client.oai.textcompletion.TextCompletionClient; import de.extio.lmlib.profile.ModelCategory; -@Disabled("This test requires a running Llama server") +//@Disabled("This test requires a running Llama server") @SpringBootTest(webEnvironment = WebEnvironment.NONE) @SpringBootConfiguration @ComponentScan(basePackages = "de.extio.lmlib") diff --git a/src/test/resources/local-completion.properties b/src/test/resources/local-completion.properties index 6fc5944..b4d8fe6 100755 --- a/src/test/resources/local-completion.properties +++ b/src/test/resources/local-completion.properties @@ -1,4 +1,4 @@ -prompts=chatml +prompts=gemma2 tokenEncoding=cl100k_base maxTokens=2000 maxContextLength=8000