exo/lm-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved oai client packages

Browse Source
This commit is contained in:
extio-de
2025-06-27 16:46:56 +02:00
parent 6595075846
commit 11a4ab1271
11 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/extio/lmlib/client/textcompletion/ModelNameLoader.java → src/main/java/de/extio/lmlib/client/oai/ModelNameLoader.java
View File

@@ -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 {

4
src/main/java/de/extio/lmlib/client/textcompletion/ModelNameSupplier.java → src/main/java/de/extio/lmlib/client/oai/ModelNameSupplier.java
View File

@@ -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")

9
src/main/java/de/extio/lmlib/client/textcompletion/TextCompletionClient.java → src/main/java/de/extio/lmlib/client/oai/textcompletion/TextCompletionClient.java
View File

@@ -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;

2
src/main/java/de/extio/lmlib/client/textcompletion/dto/Choice.java → src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Choice.java
View File

@@ -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;

2
src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionRequest.java → src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionRequest.java
View File

@@ -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;

2
src/main/java/de/extio/lmlib/client/textcompletion/dto/CompletionResponse.java → src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/CompletionResponse.java
View File

@@ -1,4 +1,4 @@
package de.extio.lmlib.client.textcompletion.dto;
package de.extio.lmlib.client.oai.textcompletion.dto;
import java.util.List;

2
src/main/java/de/extio/lmlib/client/textcompletion/dto/Model.java → src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/Model.java
View File

@@ -1,4 +1,4 @@
package de.extio.lmlib.client.textcompletion.dto;
package de.extio.lmlib.client.oai.textcompletion.dto;
import java.util.List;

2
src/main/java/de/extio/lmlib/client/textcompletion/dto/ModelsResponse.java → src/main/java/de/extio/lmlib/client/oai/textcompletion/dto/ModelsResponse.java
View File

@@ -1,4 +1,4 @@
package de.extio.lmlib.client.textcompletion.dto;
package de.extio.lmlib.client.oai.textcompletion.dto;
import java.util.List;

5
src/test/java/de/extio/lmlib/client/textcompletion/TextCompletionClientTest.java → src/test/java/de/extio/lmlib/client/oai/TextCompletionClientTest.java
View File

@@ -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")

2
src/test/resources/local-completion.properties
View File

@@ -1,4 +1,4 @@
prompts=chatml
prompts=gemma2
tokenEncoding=cl100k_base
maxTokens=2000
maxContextLength=8000