Add Spring Boot starter

Author: Robert Winkler

.github/workflows/gradle-publish.yml

@@ -13,9 +13,9 @@ name: Java CI with Gradle
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "master" ]
 
 jobs:
   validation:

.github/workflows/gradle.yml

@@ -60,7 +60,7 @@ open class HttpProtocolServer(
     // Stop the server
     override suspend fun stop() {
         if (!started) throw ProtocolServerException("Server has not started yet")
-        log.info("Stopping on '{}' port '{}'", bindHost, bindPort)
+        log.info("Stopping HttpProtocolServer")
         server?.stop(1000, 2000)
         started = false
     }
@@ -69,7 +69,7 @@ open class HttpProtocolServer(
     override suspend fun expose(thing: ExposedThing) {
         if (!started) throw ProtocolServerException("Server has not started yet")
 
-        log.info("Exposing thing '{}'", thing.id)
+        log.info("Exposing thing '{}' on HttpProtocolServer", thing.id)
         things[thing.id] = thing
 
         for (address in actualAddresses) {

kotlin-wot-binding-http/src/main/kotlin/http/HttpProtocolServer.kt

@@ -6,6 +6,5 @@ data class MqttClientConfig(val host: String,
                             val port: Int,
                             val clientId: String = UUID.randomUUID().toString(),
                             private val username: String? = null,
-                            private val password: String? = null) {
-}
+                            private val password: String? = null)
 

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttClientConfig.kt

@@ -56,7 +56,7 @@ class MqttProtocolServer(
         if (!started) throw ProtocolServerException("Server has not started yet")
 
         val baseUrl = createUrl()
-        log.info("MqttServer exposes '{}' at '{}{}/*'", thing.id, baseUrl, thing.id)
+        log.debug("MqttServer exposes '{}' at '{}{}/*'", thing.id, baseUrl, thing.id)
 
         things[thing.id] = thing
         exposeProperties(thing, baseUrl)

kotlin-wot-binding-mqtt/src/main/kotlin/mqtt/MqttProtocolServer.kt

@@ -9,13 +9,8 @@ dependencies {
     api(project(":kotlin-wot-binding-http"))
     api(project(":kotlin-wot-binding-mqtt"))
     api(project(":kotlin-wot-reflection"))
-    implementation("ai.ancf.lmos:arc-agents:0.111.0")
-    //implementation("ai.ancf.lmos:arc-langchain4j-client:0.111.0")
-    implementation("org.springframework.boot:spring-boot-starter")
-    implementation("org.springframework.boot:spring-boot-starter-logging")
-
+    api(project(":kotlin-wot-spring-boot-starter"))
     implementation("ai.ancf.lmos:arc-azure-client:0.111.0")
-    implementation("ai.ancf.lmos:arc-spring-boot-starter:0.111.0")
 
     //implementation("dev.langchain4j:langchain4j-azure-open-ai:0.35.0")
     //implementation("dev.langchain4j:langchain4j:0.35.0")

kotlin-wot-integration-tests/build.gradle.kts

@@ -1,7 +1,6 @@
 package ai.ancf.lmos.wot.integration
 
 import ai.ancf.lmos.arc.spring.Agents
-import ai.ancf.lmos.wot.Wot
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
@@ -15,12 +14,4 @@ class AgentConfiguration {
         prompt { "you are a helpful weather agent." }
         model = { "GPT-4o" }
     }
-
-    @Bean
-    fun servient() = createServient("HTTP")
-
-    @Bean
-    fun wot() = Wot.create(servient())
-
-
 }

kotlin-wot-integration-tests/src/main/kotlin/integration/AgentConfiguration.kt

@@ -1,63 +1,15 @@
 package ai.ancf.lmos.wot.integration
 
-import ai.ancf.lmos.wot.Servient
-import ai.ancf.lmos.wot.Wot
-import ai.ancf.lmos.wot.reflection.ExposedThingBuilder
-import ai.ancf.lmos.wot.thing.schema.WoTExposedThing
-import jakarta.annotation.PreDestroy
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.runBlocking
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import spring.ThingRuntime
 
 
 fun main(args: Array<String>) {
     runApplication<ThingAgentApplication>(*args)
 }
 
 @SpringBootApplication
-class ThingAgentApplication : CommandLineRunner {
+class ThingAgentApplication : ThingRuntime() {
 
-    @Autowired
-    private lateinit var servient: Servient
-
-    @Autowired
-    private lateinit var wot: Wot
-
-    @Autowired
-    private lateinit var agent: ThingAgent
-
-    companion object {
-        private val log: Logger = LoggerFactory.getLogger(ThingAgentApplication::class.java)
-    }
-
-    @PreDestroy
-    fun onExit() {
-        // Register a shutdown hook
-        log.debug("Application is shutting down. Performing cleanup...")
-        runBlocking { servient.shutdown() }
-    }
-
-    override fun run(vararg args: String?) = runBlocking {
-
-        // Protocol can be "HTTP" or "MQTT"
-        val servient = createServient("HTTP")
-
-        val wot = Wot.create(servient)
-        val exposedThing = ExposedThingBuilder.createExposedThing(wot, agent, ThingAgent::class)
-
-        // Start `servient` in a separate coroutine
-        servient.start()
-        // Add and expose the thing after `start()` has had time to begin
-        servient.addThing(exposedThing as WoTExposedThing)
-        servient.expose("agent")
-
-        println("Exposed Agent on HTTP Server")
-        Job().join()
-    }
 }
-

kotlin-wot-integration-tests/src/main/kotlin/integration/SpringApplication.kt

@@ -2,10 +2,9 @@ package ai.ancf.lmos.wot.integration
 
 import ai.ancf.lmos.arc.agents.AgentProvider
 import ai.ancf.lmos.arc.agents.ChatAgent
-import ai.ancf.lmos.arc.agents.User
 import ai.ancf.lmos.arc.agents.conversation.AssistantMessage
+import ai.ancf.lmos.arc.agents.conversation.Conversation
 import ai.ancf.lmos.arc.agents.conversation.latest
-import ai.ancf.lmos.arc.agents.conversation.toConversation
 import ai.ancf.lmos.arc.agents.getAgentByName
 import ai.ancf.lmos.arc.core.getOrThrow
 import ai.ancf.lmos.wot.reflection.annotations.*
@@ -19,11 +18,12 @@ import org.springframework.stereotype.Component
     description= "A simple agent.")
 @VersionInfo(instance = "1.0.0")
 @Component
-class ThingAgent(val agentProvider: AgentProvider, @Property(name = "modelTemperature", readOnly = true)
+class ThingAgent(agentProvider: AgentProvider, @Property(name = "modelTemperature", readOnly = true)
                  val modelConfiguration: ModelConfiguration = ModelConfiguration(0.5, 50)) {
 
     private val messageFlow = MutableSharedFlow<String>(replay = 1) // Replay last emitted value
 
+    val agent = agentProvider.getAgentByName("My Agent") as ChatAgent
 
     /*
     private val model: AzureOpenAiChatModel = AzureOpenAiChatModel.builder()
@@ -38,9 +38,7 @@ class ThingAgent(val agentProvider: AgentProvider, @Property(name = "modelTemper
     val observableProperty : MutableStateFlow<String> = MutableStateFlow("Hello World")
 
     @Action(name = "ask", title = "Ask", description = "Ask the agent a question.")
-    suspend fun ask(message : String) : String {
-        val agent = agentProvider.getAgentByName("My Agent") as ChatAgent? ?: error("Agent not found!")
-        val conversation = message.toConversation(User("anonymous"))
+    suspend fun ask(conversation : Conversation) : String {
         val assistantMessage = agent.execute(conversation).getOrThrow().latest<AssistantMessage>() ?:
             throw RuntimeException("No Assistant response")
         messageFlow.emit(assistantMessage.content)

kotlin-wot-integration-tests/src/main/kotlin/integration/ThingAgent.kt

@@ -1,14 +1,10 @@
 package ai.ancf.lmos.wot.integration
 
 import ai.ancf.lmos.wot.Servient
-import ai.ancf.lmos.wot.Wot
 import ai.ancf.lmos.wot.binding.http.HttpProtocolClientFactory
 import ai.ancf.lmos.wot.binding.http.HttpProtocolServer
 import ai.ancf.lmos.wot.binding.mqtt.MqttClientConfig
 import ai.ancf.lmos.wot.binding.mqtt.MqttProtocolServer
-import ai.ancf.lmos.wot.thing.ExposedThing
-import ai.ancf.lmos.wot.thing.Type
-import ai.ancf.lmos.wot.thing.schema.*
 
 private const val PROPERTY_NAME = "property1"
 private const val PROPERTY_NAME_2 = "property2"
@@ -32,40 +28,3 @@ fun createServient(protocol: String): Servient {
         else -> throw IllegalArgumentException("Unsupported protocol: $protocol")
     }
 }
-
-fun createExposedThing(wot: Wot, agent: ThingAgent): ExposedThing {
-    return wot.produce {
-        id = "agent"
-        title = "Agent"
-        objectType = Type("Agent")
-        intProperty(PROPERTY_NAME) { observable = true }
-        intProperty(PROPERTY_NAME_2) { observable = true }
-        action<String, Map<*, *>>(ACTION_NAME) {
-            title = ACTION_NAME
-            description = "Ask a question to the agent"
-            input = stringSchema {
-                title = "Action Input"
-                description = "Question"
-                minLength = 10
-                default = "test"
-            }
-            output = objectSchema {
-                stringProperty("response") {
-                    description = "Answer of the agent"
-                }
-            }
-        }
-        event<String, Nothing, Nothing>(EVENT_NAME) { data = StringSchema() }
-    }.apply {
-        setPropertyReadHandler(PROPERTY_NAME) { 10.toInteractionInputValue() }
-        setPropertyReadHandler(PROPERTY_NAME_2) { 5.toInteractionInputValue() }
-        setPropertyWriteHandler(PROPERTY_NAME) { input, _ ->
-            val inputInt = input.value() as DataSchemaValue.IntegerValue
-            inputInt.value.toInteractionInputValue()
-        }
-        setActionHandler(ACTION_NAME) { input, _ ->
-            val inputString = input.value() as DataSchemaValue.StringValue
-            agent.ask(inputString.value).toInteractionInputValue()
-        }
-    }
-}