Integrate chat-store on agent

Author: jasperblues

pom.xml

@@ -49,21 +49,13 @@
             <version>0.0.22</version>
         </dependency>
 
-        <!-- Chat session storage library -->
+        <!-- Chat session storage with autoconfiguration -->
         <dependency>
             <groupId>com.embabel.agent</groupId>
-            <artifactId>embabel-chat-store</artifactId>
+            <artifactId>embabel-agent-starter-chat-store</artifactId>
             <version>0.2.0-SNAPSHOT</version>
         </dependency>
 
-        <!-- Chat store autoconfigure - provides ConversationFactoryProvider -->
-        <dependency>
-            <groupId>com.embabel.agent</groupId>
-            <artifactId>embabel-agent-chatstore-autoconfigure</artifactId>
-            <version>${embabel-agent.version}</version>
-        </dependency>
-
-
         <dependency>
             <groupId>com.embabel.agent</groupId>
             <artifactId>embabel-agent-starter-openai</artifactId>

src/main/java/com/embabel/guide/ChatActions.java

@@ -61,8 +61,10 @@ private GuideUser getGuideUser(@Nullable User user) {
                             var guideUserData = new GuideUserData(
                                     java.util.UUID.randomUUID().toString(),
                                     displayName != null ? displayName : "",
-                                    null,
-                                    null
+                                    discordInfo.getUsername() != null ? discordInfo.getUsername() : "",
+                                    null,  // email
+                                    null,  // persona
+                                    null   // customPrompt
                             );
                             var discordUserInfo = new DiscordUserInfoData(
                                     discordInfo.getId(),

src/main/kotlin/com/embabel/guide/chat/model/DeliveredMessage.kt

@@ -1,6 +1,6 @@
 package com.embabel.guide.chat.model
 
-import com.embabel.chat.store.model.StoredMessage
+import com.embabel.chat.store.model.SimpleStoredMessage
 import java.time.Instant
 
 /**
@@ -16,13 +16,13 @@ data class DeliveredMessage(
     val title: String? = null
 ) {
     companion object {
-        fun createFrom(msg: StoredMessage, sessionId: String, title: String? = null): DeliveredMessage {
+        fun createFrom(msg: SimpleStoredMessage, sessionId: String, title: String? = null): DeliveredMessage {
             return DeliveredMessage(
                 id = msg.messageId,
                 sessionId = sessionId,
                 role = msg.role.name.lowercase(),
                 body = msg.content,
-                ts = msg.createdAt,
+                ts = msg.message.createdAt,
                 authorId = msg.author?.id,
                 title = title
             )

src/main/kotlin/com/embabel/guide/chat/service/ChatSessionService.kt

@@ -5,16 +5,17 @@ import com.embabel.chat.ConversationFactoryProvider
 import com.embabel.chat.ConversationStoreType
 import com.embabel.chat.Role
 import com.embabel.chat.UserMessage
-import com.embabel.chat.store.adapter.StoredConversationFactory
+import com.embabel.chat.event.MessageEvent
 import com.embabel.chat.store.model.MessageData
-import com.embabel.chat.store.model.SessionUser
-import com.embabel.chat.store.model.StoredMessage
+import com.embabel.chat.store.model.SimpleStoredMessage
 import com.embabel.chat.store.model.StoredSession
+import com.embabel.chat.store.model.StoredUser
 import com.embabel.chat.store.repository.ChatSessionRepository
 import com.embabel.guide.domain.GuideUserRepository
 import com.embabel.guide.util.UUIDv7
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import java.time.Instant
 import java.util.Optional
@@ -24,7 +25,8 @@ class ChatSessionService(
     private val chatSessionRepository: ChatSessionRepository,
     private val conversationFactoryProvider: ConversationFactoryProvider,
     private val ragAdapter: RagServiceAdapter,
-    private val guideUserRepository: GuideUserRepository
+    private val guideUserRepository: GuideUserRepository,
+    private val eventPublisher: ApplicationEventPublisher
 ) {
 
     companion object {
@@ -251,13 +253,11 @@ class ChatSessionService(
         sessionId: String,
         text: String,
         role: Role,
-        user: SessionUser,
-        agent: SessionUser?,
+        user: StoredUser,
+        agent: StoredUser?,
         title: String? = null
     ) {
         val factory = conversationFactoryProvider.getFactory(ConversationStoreType.STORED)
-            as StoredConversationFactory
-
         val conversation = factory.createForParticipants(sessionId, user, agent, title)
 
         val message = when (role) {
@@ -285,7 +285,7 @@ class ChatSessionService(
         text: String,
         role: Role,
         authorId: String? = null
-    ): StoredMessage {
+    ): SimpleStoredMessage {
         val messageData = MessageData(
             messageId = UUIDv7.generateString(),
             role = role,

src/main/kotlin/com/embabel/guide/chat/service/JesseService.kt

@@ -1,7 +1,7 @@
 package com.embabel.guide.chat.service
 
 import com.embabel.chat.Role
-import com.embabel.chat.store.model.SessionUser
+import com.embabel.chat.store.model.StoredUser
 import com.embabel.guide.chat.model.StatusMessage
 import com.embabel.guide.domain.GuideUserData
 import com.embabel.guide.domain.GuideUserRepository
@@ -67,9 +67,9 @@ class JesseService(
     }
 
     /**
-     * Get Jesse's SessionUser for use as agent in conversations.
+     * Get Jesse's StoredUser for use as agent in conversations.
      */
-    fun getJesseUser(): SessionUser = jesseUser
+    fun getJesseUser(): StoredUser = jesseUser
 
     private fun sendStatusToUser(toUserId: String, status: String) {
         logger.debug("Jesse sending status to user {}: {}", toUserId, status)

src/main/kotlin/com/embabel/guide/config/ChatStoreConfig.kt

@@ -1,6 +1,6 @@
 package com.embabel.guide.config
 
-import com.embabel.chat.store.model.SessionUser
+import com.embabel.chat.store.model.StoredUser
 import com.embabel.chat.store.repository.ChatSessionRepository
 import com.embabel.chat.store.repository.ChatSessionRepositoryImpl
 import com.embabel.guide.domain.GuideUserData
@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Primary
 
 /**
  * Configuration for embabel-chat-store integration.
- * Registers GuideUserData as the SessionUser implementation for polymorphic deserialization,
+ * Registers GuideUserData as the StoredUser implementation for polymorphic deserialization,
  * and wires up the ChatSessionRepository bean.
  */
 @Configuration
@@ -24,11 +24,11 @@ class ChatStoreConfig {
     @Primary
     fun persistenceManager(factory: PersistenceManagerFactory): PersistenceManager {
         val pm = factory.get("neo")
-        // Register GuideUserData as implementation of SessionUser interface.
+        // Register GuideUserData as implementation of StoredUser interface.
         // Composite label key is sorted alphabetically with pipe separator.
         pm.registerSubtype(
-            SessionUser::class.java,
-            "GuideUser|SessionUser",
+            StoredUser::class.java,
+            "GuideUser|User",
             GuideUserData::class.java
         )
         return pm

src/main/kotlin/com/embabel/guide/domain/GuideUserData.kt

@@ -1,23 +1,25 @@
 package com.embabel.guide.domain
 
-import com.embabel.chat.store.model.SessionUser
+import com.embabel.chat.store.model.StoredUser
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import org.drivine.annotation.NodeFragment
 import org.drivine.annotation.NodeId
 
 /**
  * Node fragment representing a GuideUser in the graph.
- * Implements SessionUser to enable integration with embabel-chat-store library.
+ * Implements StoredUser to enable integration with embabel-chat-store library.
  */
-@NodeFragment(labels = ["GuideUser", "SessionUser"])
+@NodeFragment(labels = ["GuideUser", "User"])
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class GuideUserData(
     @NodeId
     override var id: String,
     override var displayName: String = "",
+    override var username: String = displayName,
+    override var email: String? = null,
     var persona: String? = null,
     var customPrompt: String? = null
-) : HasGuideUserData, SessionUser {
+) : HasGuideUserData, StoredUser {
 
     override fun guideUserData(): GuideUserData = this
 }