From db3abc7895fdcecde1cbb5f2bb2ecd9f41e7f228 Mon Sep 17 00:00:00 2001 From: Andrew Charneski Date: Sat, 11 Nov 2023 22:19:19 -0500 Subject: [PATCH] moves --- .../com/simiacryptus/skyenet/servers/AppServerBase.kt | 4 ++-- .../simiacryptus/skyenet/servers/CodingActorTestApp.kt | 8 ++++---- .../simiacryptus/skyenet/servers/EmbeddingVisualizer.kt | 2 +- .../simiacryptus/skyenet/servers/ParsedActorTestApp.kt | 8 ++++---- .../com/simiacryptus/skyenet/servers/ReadOnlyApp.kt | 2 +- .../simiacryptus/skyenet/servers/SimpleActorTestApp.kt | 2 +- .../com/simiacryptus/skyenet/servlet/FileServlet.kt | 4 ++-- .../com/simiacryptus/skyenet/servlet/NewSessionServlet.kt | 2 +- .../com/simiacryptus/skyenet/servlet/SessionServlet.kt | 2 +- .../skyenet/servlet/SessionSettingsServlet.kt | 2 +- .../kotlin/com/simiacryptus/skyenet/servlet/ZipServlet.kt | 2 +- .../skyenet/{webui => sessions}/ApplicationBase.kt | 2 +- .../simiacryptus/skyenet/{webui => sessions}/BasicChat.kt | 2 +- .../skyenet/{webui => sessions}/BasicChatSession.kt | 2 +- .../skyenet/{webui => sessions}/ChatSession.kt | 2 +- .../simiacryptus/skyenet/{webui => sessions}/MacroChat.kt | 2 +- .../skyenet/{webui => sessions}/MacroChatSession.kt | 2 +- .../skyenet/{webui => sessions}/MessageWebSocket.kt | 2 +- .../skyenet/{webui => sessions}/MutableSessionHandler.kt | 2 +- .../skyenet/{webui => sessions}/PersistentSessionBase.kt | 2 +- .../skyenet/{webui => sessions}/SessionBase.kt | 2 +- .../skyenet/{webui => sessions}/SessionDataStorage.kt | 2 +- .../skyenet/{webui => sessions}/SessionInterface.kt | 2 +- .../skyenet/{webui => sessions}/WebSocketServer.kt | 2 +- .../test/kotlin/com/simiacryptus/skyenet/BasicChatTest.kt | 2 +- .../com/simiacryptus/skyenet/SessionDataStorageTest.kt | 2 +- 26 files changed, 34 insertions(+), 34 deletions(-) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/ApplicationBase.kt (99%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/BasicChat.kt (94%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/BasicChatSession.kt (96%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/ChatSession.kt (98%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/MacroChat.kt (96%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/MacroChatSession.kt (98%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/MessageWebSocket.kt (98%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/MutableSessionHandler.kt (96%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/PersistentSessionBase.kt (98%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/SessionBase.kt (97%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/SessionDataStorage.kt (99%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/SessionInterface.kt (84%) rename webui/src/main/kotlin/com/simiacryptus/skyenet/{webui => sessions}/WebSocketServer.kt (98%) diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/AppServerBase.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/servers/AppServerBase.kt index 0e1f6ad2..8a52cc2d 100644 --- 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 index c0b2b9f4..96301049 100644 --- 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 index db4c9c1c..18ce2c77 100644 --- 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 index 75a3dd6f..5e1b2685 100644 --- 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 index 79c1e94e..415da5e4 100644 --- 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 index d22622cc..a4429e9b 100644 --- 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 index a7f3cbc1..7774e28c 100644 --- 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 index c6cfc56b..2d668eda 100644 --- 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 index 7ed9b875..7ef4ac95 100644 --- 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 index 28c20d18..6713bb8a 100644 --- 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 index 2e5ad56c..86ce03df 100644 --- 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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/ApplicationBase.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/ApplicationBase.kt similarity index 99% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/ApplicationBase.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/ApplicationBase.kt index 30da884e..6021a79d 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/ApplicationBase.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/BasicChat.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/BasicChat.kt similarity index 94% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/BasicChat.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/BasicChat.kt index e6ba41cd..0373289d 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/BasicChat.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/BasicChatSession.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/BasicChatSession.kt similarity index 96% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/BasicChatSession.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/BasicChatSession.kt index bc22ac0b..9bfd3a6b 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/BasicChatSession.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/ChatSession.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/ChatSession.kt similarity index 98% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/ChatSession.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/ChatSession.kt index 51c3829f..4fd28486 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/ChatSession.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MacroChat.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MacroChat.kt similarity index 96% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MacroChat.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MacroChat.kt index 66c9ae27..1d13bdaa 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MacroChat.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MacroChatSession.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MacroChatSession.kt similarity index 98% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MacroChatSession.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MacroChatSession.kt index 6925a0b1..907851c2 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MacroChatSession.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MessageWebSocket.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MessageWebSocket.kt similarity index 98% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MessageWebSocket.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MessageWebSocket.kt index 9ea688c9..93cb3888 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MessageWebSocket.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MutableSessionHandler.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MutableSessionHandler.kt similarity index 96% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MutableSessionHandler.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/MutableSessionHandler.kt index 135cf855..b27d1145 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/MutableSessionHandler.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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 = mutableListOf() diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/PersistentSessionBase.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/PersistentSessionBase.kt similarity index 98% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/PersistentSessionBase.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/PersistentSessionBase.kt index b2f9cffe..e6ef0f3b 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/PersistentSessionBase.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionBase.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/SessionBase.kt similarity index 97% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionBase.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/SessionBase.kt index b4fd4f06..17f13e4c 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionBase.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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 = mutableSetOf() diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionDataStorage.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/SessionDataStorage.kt similarity index 99% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionDataStorage.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/SessionDataStorage.kt index 7f8bfd34..1b8fc0c2 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionDataStorage.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionInterface.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/SessionInterface.kt similarity index 84% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionInterface.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/SessionInterface.kt index cdd2a1ec..fbece6cc 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/SessionInterface.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/WebSocketServer.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/WebSocketServer.kt similarity index 98% rename from webui/src/main/kotlin/com/simiacryptus/skyenet/webui/WebSocketServer.kt rename to webui/src/main/kotlin/com/simiacryptus/skyenet/sessions/WebSocketServer.kt index 76b5dbd1..75d4a2ac 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/WebSocketServer.kt +++ b/webui/src/main/kotlin/com/simiacryptus/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 index 3f72c807..3ffcb3a7 100644 --- 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 index cc3e29e0..27d22157 100644 --- 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