From c2f50f27ba06cd378ee4255c50d1c2a099cbf1a9 Mon Sep 17 00:00:00 2001
From: extio-de <github@extio.de>
Date: Sun, 23 Feb 2025 20:11:08 +0100
Subject: [PATCH] Upgraded to lm-lib 1.1.0;

---
 pom.xml                                                | 10 +++++++---
 .../lmdatasetprep/LmDatasetPreparerApplication.java    |  8 ++++++++
 src/main/resources/alpaca-cold.properties              |  2 ++
 src/main/resources/chatml-cold.properties              |  2 ++
 src/main/resources/gemma.properties                    |  2 ++
 src/main/resources/llama3-cold.properties              |  2 ++
 src/main/resources/llama3-hot.properties               |  2 ++
 src/main/resources/mistral-cold.properties             |  2 ++
 8 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 605fc84..4c0044e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,15 @@
 	<artifactId>lm-dataset-preparer</artifactId>
 	<groupId>de.extio</groupId>
 	<name>lm-dataset-preparer</name>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.1.0-SNAPSHOT</version>
 	
 	<properties>
 		<java.version>21</java.version>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>		
 		<springdoc.version>2.5.0</springdoc.version>
-		<spring-boot.version>3.4.1</spring-boot.version>
-		<lmlib.version>1.0.0</lmlib.version>
+		<spring-boot.version>3.4.2</spring-boot.version>
+		<lmlib.version>1.1.0</lmlib.version>
 	</properties>
 	
 	<repositories>
@@ -44,6 +44,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>		
 		<dependency>
 			<groupId>com.github.ben-manes.caffeine</groupId>
 			<artifactId>caffeine</artifactId>
diff --git a/src/main/java/de/extio/lmdatasetprep/LmDatasetPreparerApplication.java b/src/main/java/de/extio/lmdatasetprep/LmDatasetPreparerApplication.java
index d7dad11..91b7499 100755
--- a/src/main/java/de/extio/lmdatasetprep/LmDatasetPreparerApplication.java
+++ b/src/main/java/de/extio/lmdatasetprep/LmDatasetPreparerApplication.java
@@ -17,10 +17,13 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 
 import de.extio.lmdatasetprep.tools.DatasetTool;
@@ -109,4 +112,9 @@ public class LmDatasetPreparerApplication implements CommandLineRunner, Applicat
 		applicationContext = appContext;
 	}
 	
+	@Bean
+	public CacheManager cacheManager() {
+		return new CaffeineCacheManager();
+	}
+	
 }
diff --git a/src/main/resources/alpaca-cold.properties b/src/main/resources/alpaca-cold.properties
index 5bd41bf..b3d42f3 100755
--- a/src/main/resources/alpaca-cold.properties
+++ b/src/main/resources/alpaca-cold.properties
@@ -9,3 +9,5 @@ modelProvider=OAI_TEXT_COMPLETION
 modelName=
 url=http://localhost:5001
 apiKey=
+cost1MInTokens=0.3
+cost1MOutTokens=0.61
diff --git a/src/main/resources/chatml-cold.properties b/src/main/resources/chatml-cold.properties
index ed7c159..8501842 100755
--- a/src/main/resources/chatml-cold.properties
+++ b/src/main/resources/chatml-cold.properties
@@ -9,3 +9,5 @@ modelProvider=OAI_TEXT_COMPLETION
 modelName=
 url=http://localhost:5001
 apiKey=
+cost1MInTokens=0.3
+cost1MOutTokens=0.61
diff --git a/src/main/resources/gemma.properties b/src/main/resources/gemma.properties
index 9d9cb60..4b88f2e 100755
--- a/src/main/resources/gemma.properties
+++ b/src/main/resources/gemma.properties
@@ -9,3 +9,5 @@ modelProvider=OAI_TEXT_COMPLETION
 modelName=
 url=http://localhost:5001
 apiKey=
+cost1MInTokens=0.3
+cost1MOutTokens=0.61
diff --git a/src/main/resources/llama3-cold.properties b/src/main/resources/llama3-cold.properties
index e1a458c..3058b73 100755
--- a/src/main/resources/llama3-cold.properties
+++ b/src/main/resources/llama3-cold.properties
@@ -9,3 +9,5 @@ modelProvider=OAI_TEXT_COMPLETION
 modelName=
 url=http://localhost:5001
 apiKey=
+cost1MInTokens=0.3
+cost1MOutTokens=0.61
diff --git a/src/main/resources/llama3-hot.properties b/src/main/resources/llama3-hot.properties
index 4f1186c..680755c 100755
--- a/src/main/resources/llama3-hot.properties
+++ b/src/main/resources/llama3-hot.properties
@@ -9,3 +9,5 @@ modelProvider=OAI_TEXT_COMPLETION
 modelName=
 url=http://localhost:5001
 apiKey=
+cost1MInTokens=0.3
+cost1MOutTokens=0.61
diff --git a/src/main/resources/mistral-cold.properties b/src/main/resources/mistral-cold.properties
index e194782..8633ce8 100755
--- a/src/main/resources/mistral-cold.properties
+++ b/src/main/resources/mistral-cold.properties
@@ -9,3 +9,5 @@ modelProvider=OAI_TEXT_COMPLETION
 modelName=
 url=http://localhost:5001
 apiKey=
+cost1MInTokens=0.3
+cost1MOutTokens=0.61