moves

SimiaCryptus · Nov 12, 2023 · db3abc7 · db3abc7
1 parent caa5574
commit db3abc7
Show file tree

Hide file tree

Showing 26 changed files with 34 additions and 34 deletions.
diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/AppServerBase.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/AppServerBase.kt
@@ -6,10 +6,10 @@ import com.simiacryptus.skyenet.OutputInterceptor
 import com.simiacryptus.skyenet.util.AwsUtil.decryptResource
 import com.simiacryptus.skyenet.servlet.AuthenticatedWebsite
 import com.simiacryptus.skyenet.servlet.UsageServlet
-import com.simiacryptus.skyenet.webui.ApplicationBase
+import com.simiacryptus.skyenet.sessions.ApplicationBase
 import com.simiacryptus.skyenet.servlet.UserInfoServlet
 import com.simiacryptus.skyenet.servlet.UserSettingsServlet
-import com.simiacryptus.skyenet.webui.WebSocketServer
+import com.simiacryptus.skyenet.sessions.WebSocketServer
 import jakarta.servlet.DispatcherType
 import jakarta.servlet.Servlet
 import jakarta.servlet.http.HttpServlet

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/CodingActorTestApp.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/CodingActorTestApp.kt
@@ -2,10 +2,10 @@ package com.simiacryptus.skyenet.servers
 
 import com.simiacryptus.skyenet.actors.CodingActor
 import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown
-import com.simiacryptus.skyenet.webui.PersistentSessionBase
-import com.simiacryptus.skyenet.webui.SessionDiv
-import com.simiacryptus.skyenet.webui.MacroChat
-import com.simiacryptus.skyenet.webui.MessageWebSocket
+import com.simiacryptus.skyenet.sessions.PersistentSessionBase
+import com.simiacryptus.skyenet.sessions.SessionDiv
+import com.simiacryptus.skyenet.sessions.MacroChat
+import com.simiacryptus.skyenet.sessions.MessageWebSocket
 import org.slf4j.LoggerFactory
 import java.util.*
 

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/EmbeddingVisualizer.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/EmbeddingVisualizer.kt
@@ -1,7 +1,7 @@
 package com.simiacryptus.skyenet.servers
 
 import com.simiacryptus.openai.OpenAIClient
-import com.simiacryptus.skyenet.webui.*
+import com.simiacryptus.skyenet.sessions.*
 import com.simiacryptus.util.JsonUtil
 
 class EmbeddingVisualizer(

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/ParsedActorTestApp.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/ParsedActorTestApp.kt
@@ -2,10 +2,10 @@ package com.simiacryptus.skyenet.servers
 
 import com.simiacryptus.skyenet.actors.ParsedActor
 import com.simiacryptus.skyenet.util.MarkdownUtil.renderMarkdown
-import com.simiacryptus.skyenet.webui.PersistentSessionBase
-import com.simiacryptus.skyenet.webui.SessionDiv
-import com.simiacryptus.skyenet.webui.MacroChat
-import com.simiacryptus.skyenet.webui.MessageWebSocket
+import com.simiacryptus.skyenet.sessions.PersistentSessionBase
+import com.simiacryptus.skyenet.sessions.SessionDiv
+import com.simiacryptus.skyenet.sessions.MacroChat
+import com.simiacryptus.skyenet.sessions.MessageWebSocket
 import com.simiacryptus.util.JsonUtil
 import org.slf4j.LoggerFactory
 

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/ReadOnlyApp.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/ReadOnlyApp.kt
@@ -1,7 +1,7 @@
 package com.simiacryptus.skyenet.servers
 
 import com.simiacryptus.openai.OpenAIClient
-import com.simiacryptus.skyenet.webui.*
+import com.simiacryptus.skyenet.sessions.*
 import org.slf4j.LoggerFactory
 
 open class ReadOnlyApp(

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/SimpleActorTestApp.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/SimpleActorTestApp.kt
@@ -1,7 +1,7 @@
 package com.simiacryptus.skyenet.servers
 
 import com.simiacryptus.skyenet.actors.SimpleActor
-import com.simiacryptus.skyenet.webui.*
+import com.simiacryptus.skyenet.sessions.*
 import com.simiacryptus.skyenet.util.MarkdownUtil
 import org.slf4j.LoggerFactory
 

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/FileServlet.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/FileServlet.kt
@@ -1,7 +1,7 @@
 package com.simiacryptus.skyenet.servlet
 
-import com.simiacryptus.skyenet.webui.ApplicationBase
-import com.simiacryptus.skyenet.webui.SessionDataStorage
+import com.simiacryptus.skyenet.sessions.ApplicationBase
+import com.simiacryptus.skyenet.sessions.SessionDataStorage
 import jakarta.servlet.http.HttpServlet
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/NewSessionServlet.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/NewSessionServlet.kt
@@ -1,6 +1,6 @@
 package com.simiacryptus.skyenet.servlet
 
-import com.simiacryptus.skyenet.webui.SessionDataStorage
+import com.simiacryptus.skyenet.sessions.SessionDataStorage
 import jakarta.servlet.http.HttpServlet
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/SessionServlet.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/SessionServlet.kt
@@ -1,6 +1,6 @@
 package com.simiacryptus.skyenet.servlet
 
-import com.simiacryptus.skyenet.webui.SessionDataStorage
+import com.simiacryptus.skyenet.sessions.SessionDataStorage
 import jakarta.servlet.http.HttpServlet
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/SessionSettingsServlet.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/SessionSettingsServlet.kt
@@ -1,6 +1,6 @@
 package com.simiacryptus.skyenet.servlet
 
-import com.simiacryptus.skyenet.webui.ApplicationBase
+import com.simiacryptus.skyenet.sessions.ApplicationBase
 import com.simiacryptus.util.JsonUtil
 import jakarta.servlet.http.HttpServlet
 import jakarta.servlet.http.HttpServletRequest

diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/ZipServlet.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servlet/ZipServlet.kt
@@ -1,6 +1,6 @@
 package com.simiacryptus.skyenet.servlet
 
-import com.simiacryptus.skyenet.webui.SessionDataStorage
+import com.simiacryptus.skyenet.sessions.SessionDataStorage
 import jakarta.servlet.http.HttpServlet
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse

diff --git a/...acryptus/skyenet/webui/ApplicationBase.kt → ...yptus/skyenet/sessions/ApplicationBase.kt b/...acryptus/skyenet/webui/ApplicationBase.kt → ...yptus/skyenet/sessions/ApplicationBase.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.skyenet.servlet.*
 import com.simiacryptus.util.JsonUtil

diff --git a/...m/simiacryptus/skyenet/webui/BasicChat.kt → ...imiacryptus/skyenet/sessions/BasicChat.kt b/...m/simiacryptus/skyenet/webui/BasicChat.kt → ...imiacryptus/skyenet/sessions/BasicChat.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.openai.OpenAIClient
 

diff --git a/...cryptus/skyenet/webui/BasicChatSession.kt → ...ptus/skyenet/sessions/BasicChatSession.kt b/...cryptus/skyenet/webui/BasicChatSession.kt → ...ptus/skyenet/sessions/BasicChatSession.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.openai.OpenAIClient
 

diff --git a/...simiacryptus/skyenet/webui/ChatSession.kt → ...iacryptus/skyenet/sessions/ChatSession.kt b/...simiacryptus/skyenet/webui/ChatSession.kt → ...iacryptus/skyenet/sessions/ChatSession.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.openai.OpenAIClient
 

diff --git a/...m/simiacryptus/skyenet/webui/MacroChat.kt → ...imiacryptus/skyenet/sessions/MacroChat.kt b/...m/simiacryptus/skyenet/webui/MacroChat.kt → ...imiacryptus/skyenet/sessions/MacroChat.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import java.util.function.Consumer
 

diff --git a/...cryptus/skyenet/webui/MacroChatSession.kt → ...ptus/skyenet/sessions/MacroChatSession.kt b/...cryptus/skyenet/webui/MacroChatSession.kt → ...ptus/skyenet/sessions/MacroChatSession.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import java.util.concurrent.Semaphore
 import java.util.function.Consumer

diff --git a/...cryptus/skyenet/webui/MessageWebSocket.kt → ...ptus/skyenet/sessions/MessageWebSocket.kt b/...cryptus/skyenet/webui/MessageWebSocket.kt → ...ptus/skyenet/sessions/MessageWebSocket.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.openai.OpenAIClient
 import com.simiacryptus.skyenet.servlet.AuthenticatedWebsite

diff --git a/...us/skyenet/webui/MutableSessionHandler.kt → ...skyenet/sessions/MutableSessionHandler.kt b/...us/skyenet/webui/MutableSessionHandler.kt → ...skyenet/sessions/MutableSessionHandler.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 class MutableSessionHandler(initialDelegate: SessionInterface?) : SessionInterface {
     private var priorDelegates: MutableList<SessionInterface> = mutableListOf()

diff --git a/...us/skyenet/webui/PersistentSessionBase.kt → ...skyenet/sessions/PersistentSessionBase.kt b/...us/skyenet/webui/PersistentSessionBase.kt → ...skyenet/sessions/PersistentSessionBase.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.google.common.util.concurrent.MoreExecutors
 import java.util.concurrent.Executors

diff --git a/...simiacryptus/skyenet/webui/SessionBase.kt → ...iacryptus/skyenet/sessions/SessionBase.kt b/...simiacryptus/skyenet/webui/SessionBase.kt → ...iacryptus/skyenet/sessions/SessionBase.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 abstract class SessionBase(val sessionId: String) : SessionInterface {
     private val sockets: MutableSet<MessageWebSocket> = mutableSetOf()

diff --git a/...yptus/skyenet/webui/SessionDataStorage.kt → ...us/skyenet/sessions/SessionDataStorage.kt b/...yptus/skyenet/webui/SessionDataStorage.kt → ...us/skyenet/sessions/SessionDataStorage.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.util.JsonUtil
 import java.io.File

diff --git a/...cryptus/skyenet/webui/SessionInterface.kt → ...ptus/skyenet/sessions/SessionInterface.kt b/...cryptus/skyenet/webui/SessionInterface.kt → ...ptus/skyenet/sessions/SessionInterface.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 interface SessionInterface {
     fun removeSocket(socket: MessageWebSocket)

diff --git a/...acryptus/skyenet/webui/WebSocketServer.kt → ...yptus/skyenet/sessions/WebSocketServer.kt b/...acryptus/skyenet/webui/WebSocketServer.kt → ...yptus/skyenet/sessions/WebSocketServer.kt
@@ -1,4 +1,4 @@
-package com.simiacryptus.skyenet.webui
+package com.simiacryptus.skyenet.sessions
 
 import com.simiacryptus.skyenet.servlet.NewSessionServlet
 import org.eclipse.jetty.server.Server

diff --git a/webui/src/test/kotlin/com/simiacryptus/skyenet/BasicChatTest.kt b/webui/src/test/kotlin/com/simiacryptus/skyenet/BasicChatTest.kt
@@ -2,7 +2,7 @@
 package com.simiacryptus.skyenet
 
 import com.simiacryptus.openai.OpenAIClient
-import com.simiacryptus.skyenet.webui.BasicChat
+import com.simiacryptus.skyenet.sessions.BasicChat
 import org.eclipse.jetty.server.Server
 import java.awt.Desktop
 import java.net.URI

diff --git a/webui/src/test/kotlin/com/simiacryptus/skyenet/SessionDataStorageTest.kt b/webui/src/test/kotlin/com/simiacryptus/skyenet/SessionDataStorageTest.kt
@@ -1,6 +1,6 @@
 package com.simiacryptus.skyenet
 
-import com.simiacryptus.skyenet.webui.SessionDataStorage
+import com.simiacryptus.skyenet.sessions.SessionDataStorage
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue