moved scheduler to batch job

Author: willschipp

embabel-database-agent/pom.xml

@@ -16,10 +16,8 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <jgit.version>7.3.0.202506031305-r</jgit.version>
-        <spring.ai.version>1.1.0</spring.ai.version>
     </properties>
 
-
     <!-- ================ AWS Bedrock Support ================ -->
 
     <dependencyManagement>
@@ -37,7 +35,6 @@
 
     <dependencies>
 
-
         <dependency>
             <groupId>com.embabel.database</groupId>
             <artifactId>embabel-database-core</artifactId>
@@ -120,8 +117,6 @@
             <artifactId>bedrockruntime</artifactId>
         </dependency>
 
-        <!-- ================ Hugging Face =============== -->
-
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-reactive-httpclient</artifactId>

embabel-database-batch/pom.xml

@@ -18,7 +18,6 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.ai.version>1.1.0</spring.ai.version>
     </properties>
 
     <dependencies>
@@ -39,7 +38,6 @@
             <artifactId>spring-boot-starter-batch</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -53,7 +51,6 @@
             <version>2.20.1</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-ollama</artifactId>
@@ -91,7 +88,6 @@
         </dependency>
 
         <!-- ================ Test Support ================ -->
-
         <dependency>
             <groupId>org.springframework.batch</groupId>
             <artifactId>spring-batch-test</artifactId>

embabel-database-core/pom.xml

@@ -24,7 +24,6 @@
         </dependency>
 
         <!-- ================ JPA Implementation  =============== -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -34,6 +33,7 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
+        <!-- ================ JPA Implementation  =============== -->
 
     </dependencies>
 
@@ -77,7 +77,7 @@
                 <executions>
                     <execution>
                         <id>compile</id>
-                        <phase>compile</phase>
+                        <phase>process-sources</phase>
                         <goals><goal>compile</goal></goals>
                     </execution>
                 </executions>

embabel-database-server/src/main/kotlin/com/embabel/database/server/controller/ModelSuggestionController.kt

@@ -27,14 +27,11 @@ import org.springframework.batch.core.JobParametersBuilder
 import org.springframework.batch.core.explore.JobExplorer
 import org.springframework.batch.core.launch.JobLauncher
 import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import java.util.UUID
 
-private const val sessionKey = "x-embabel-request-id"
-
 @RestController
 @RequestMapping("/api/v1/models")
 class ModelSuggestionController(
@@ -52,6 +49,9 @@ class ModelSuggestionController(
 
     private val expectedAuthId: String = UUID.randomUUID().toString()
 
+    private val sessionKey = "x-embabel-request-id"
+
+
     init {
         logger.info("Generated x-embabel-auth-id for this instance: $expectedAuthId")
     }
@@ -73,16 +73,13 @@ class ModelSuggestionController(
                 .body(resultMap)
         } else {
             //new conversation
-//            val sessionContext : SessionContext = modelSuggestionService.getProviderSuggestions(prompt)
             val sessionContext: SessionContext? = modelSuggestionService.getProviderSuggestions(prompt)
             //set the header
-//            val resultMap = mapOf("providers" to sessionContext.providers())
             val resultMap = if (sessionContext != null) {
                 mapOf("providers" to sessionContext.providers())
             } else {
                 mapOf("providers" to emptyList<Any>())
             }
-
             logger.info(resultMap.toString());
 
             val sessionId = sessionContext?.sessionid() ?: ""
@@ -146,6 +143,4 @@ class ModelSuggestionController(
         return ResponseEntity.ok()
             .body(currentCountMap)
     }
-
-
 }

…server/service/AgentSchedulingService.kt …/database/server/service/ModelRefresh.ktembabel-database-server/src/main/kotlin/com/embabel/database/server/service/AgentSchedulingService.kt renamed to embabel-database-server/src/main/kotlin/com/embabel/database/server/service/ModelRefresh.kt embabel-database-server/src/main/kotlin/com/embabel/database/server/service/AgentSchedulingService.kt renamed to embabel-database-server/src/main/kotlin/com/embabel/database/server/service/ModelRefresh.kt

@@ -16,20 +16,38 @@
 package com.embabel.database.server.service
 
 import org.slf4j.LoggerFactory
+import org.springframework.batch.core.Job
+import org.springframework.batch.core.JobParametersBuilder
+import org.springframework.batch.core.explore.JobExplorer
+import org.springframework.batch.core.launch.JobLauncher
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.context.annotation.Profile
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 
 @Profile("scheduled")
 @Component
-class AgentSchedulingService() {
+class ModelRefresh(
+    @Qualifier("asyncJobLauncher") private val jobLauncher: JobLauncher,
+    private val jobExplorer: JobExplorer,
+    @Qualifier("parserAgentJob") private val job: Job
+) {
 
-    private val logger = LoggerFactory.getLogger(AgentSchedulingService::class.java)
+    private val logger = LoggerFactory.getLogger(ModelRefresh::class.java)
 
     //initial delay 30 seconds to allow for startup
     @Scheduled(initialDelayString = "\${embabel.agent.scheduling.initial-delay-ms:30000}", fixedRateString = "\${embabel.agent.scheduling.fixed-rate-ms:86400000}") //Default is 24hrs in milliseconds
-    fun runAgent() {
+    fun refreshModels() {
         logger.info("running batch loader process id")
-    }
+        try {
+            val params = JobParametersBuilder()
+                .addLong("run.id", System.currentTimeMillis())
+                .toJobParameters()
 
+            val execution = jobLauncher.run(job, params)
+            logger.info("Started parseAgentJob with status=${execution.status}")
+        } catch (ex: Exception) {
+            logger.error("Failed to start refreshJob", ex)
+        }
+    }
 }

pom.xml

@@ -15,9 +15,10 @@
     <description>Common dependencies shared by child modules.</description>
 
     <properties>
-        <embabel.version>0.1.6</embabel.version>
+        <embabel.version>0.1.7</embabel.version>
         <embabel.agent.depenedencies.version>0.3.0</embabel.agent.depenedencies.version>
         <mockk.version>1.13.3</mockk.version>
+        <spring.ai.version>1.1.2</spring.ai.version>
     </properties>
 
     <modules>