2.0.0

core/src/main/kotlin/com/simiacryptus/cognotik/core/platform/ClientManager.kt

@@ -69,21 +69,13 @@ open class ClientManager {
     session: Session,
     user: User?,
   ): ChatClient? {
-    log.debug("Creating client for session: {}, user: {}", session, user)
+    log.debug("Creating chat client for session: {}, user: {}", session, user)
     val sessionDir = dataStorageFactory(dataStorageRoot).getDataDir(user, session).apply { mkdirs() }
     if (user != null) {
       val userSettings = userSettingsManager.getUserSettings(user)
       val userApi =
         if (userSettings.apiKeys.isNotEmpty()) {
-          ChatClient(
-            key = userSettings.apiKeys,
-            apiBase = userSettings.apiBase,
-            workPool = getPool(session, user),
-          ).apply {
-            this.session = session
-            this.user = user
-            logStreams += sessionDir.resolve("openai.log").outputStream().buffered()
-          }
+          getChatClient(session, user)
         } else null
       if (userApi != null) return userApi
     }
@@ -109,7 +101,7 @@ open class ClientManager {
     session: Session,
     user: User?,
   ): OpenAIClient? {
-    log.debug("Creating client for session: {}, user: {}", session, user)
+    log.debug("Creating ai client for session: {}, user: {}", session, user)
     val sessionDir = dataStorageFactory(dataStorageRoot).getDataDir(user, session).apply { mkdirs() }
     if (user != null) {
       val userSettings = userSettingsManager.getUserSettings(user)

webui/src/main/kotlin/com/simiacryptus/cognotik/apps/parse/DocumentParserApp.kt

@@ -4,6 +4,8 @@ import com.google.common.util.concurrent.Futures
 import com.simiacryptus.cognotik.TabbedDisplay
 import com.simiacryptus.cognotik.apps.parse.ParsingModel.DocumentData
 import com.simiacryptus.cognotik.apps.parse.ProgressState.Companion.progressBar
+import com.simiacryptus.cognotik.core.platform.ApplicationServices
+import com.simiacryptus.cognotik.core.platform.ClientManager
 import com.simiacryptus.cognotik.core.platform.Session
 import com.simiacryptus.cognotik.core.platform.model.User
 import com.simiacryptus.cognotik.util.MarkdownUtil
@@ -27,7 +29,6 @@ import kotlin.math.min
 open class DocumentParserApp(
   applicationName: String = "Document Extractor",
   path: String = "/pdfExtractor",
-  val api: API = ChatClient(),
   val parsingModel: ParsingModel<DocumentData>,
   val reader: (File) -> DocumentReader = {
     when {
@@ -65,6 +66,7 @@ open class DocumentParserApp(
           settings = settings,
           pagesPerBatch = settings.pagesPerBatch,
           progressBar = progressBar,
+          api = ApplicationServices.clientManager.getChatClient(session, user),
         )
       }
     }
@@ -81,6 +83,7 @@ open class DocumentParserApp(
         maxPages = settings.maxPages.coerceAtMost(Int.MAX_VALUE),
         settings = settings,
         pagesPerBatch = settings.pagesPerBatch,
+        api = ApplicationServices.clientManager.getChatClient(session, user),
       )
     }
   }
@@ -92,6 +95,7 @@ open class DocumentParserApp(
     maxPages: Int,
     settings: Settings,
     pagesPerBatch: Int,
+    api: ChatClient,
     progressBar: ProgressState? = null
   ) {
     try {
@@ -101,7 +105,7 @@ open class DocumentParserApp(
       }
 
       task.header("Knowledge Extractor", 2)
-      val api = (api as ChatClient).getChildClient(task)
+      val api = api.getChildClient(task)
       // Create output directory
       val outputDir = root.resolve("output").apply<File> { mkdirs() }
       if (!outputDir.exists()) {

webui/src/main/kotlin/com/simiacryptus/cognotik/webui/chat/BasicChatApp.kt

@@ -1,5 +1,6 @@
 package com.simiacryptus.cognotik.webui.chat
 
+import com.simiacryptus.cognotik.core.platform.ApplicationServices
 import com.simiacryptus.cognotik.core.platform.Session
 import com.simiacryptus.cognotik.core.platform.file.DataStorage
 import com.simiacryptus.cognotik.core.platform.model.User
@@ -10,7 +11,6 @@ import java.io.File
 
 class BasicChatApp(
   root: File,
-  val api: ChatClient,
   val model: ChatModel,
   val parsingModel: ChatModel,
   applicationName: String = "Chat"
@@ -30,7 +30,7 @@ class BasicChatApp(
     parsingModel = parsingModel,
     initialAssistantPrompt = "",
     systemPrompt = "",
-    api = api,
+    api = ApplicationServices.clientManager.getChatClient(session, user),
     temperature = 0.0,
     applicationClass = this::class.java,
     storage = DataStorage(root),

webui/src/test/kotlin/com/simiacryptus/cognotik/webui/ActorTestAppServer.kt

@@ -39,7 +39,7 @@ object ActorTestAppServer : com.simiacryptus.cognotik.webui.application.Applicat
     val model = OpenAIModels.GPT4oMini
     val parsingModel = OpenAIModels.GPT4oMini
     listOf(
-      ChildWebApp("/chat", BasicChatApp(File("."), ChatClient(), model, parsingModel)),
+      ChildWebApp("/chat", BasicChatApp(File("."), model, parsingModel)),
       ChildWebApp(
         "/test_simple",
         SimpleActorTestApp(