Moved oai client packages

pom.xml

@@ -4,7 +4,7 @@
 	<artifactId>lm-lib</artifactId>
 	<groupId>de.extio</groupId>
 	<name>lm-lib</name>
-	<version>1.5.7</version>
+	<version>1.6.0</version>
 	
 	<properties>
 		<java.version>21</java.version>

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.oai.textcompletion.dto.Model;
-import de.extio.lmlib.client.textcompletion.dto.ModelsResponse;
+import de.extio.lmlib.client.oai.textcompletion.dto.ModelsResponse;
-
 import reactor.util.retry.Retry;
 
 class ModelNameLoader implements Runnable {

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

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.oai.ModelNameSupplier;
-import de.extio.lmlib.client.textcompletion.dto.CompletionRequest;
+import de.extio.lmlib.client.oai.textcompletion.dto.Choice;
-import de.extio.lmlib.client.textcompletion.dto.CompletionResponse;
+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;

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;
 

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;
 

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;
 

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;
 

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;
 

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

src/test/resources/local-completion.properties

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