From f50c04c8288fdddb9fbab9a6d82373bdd78be202 Mon Sep 17 00:00:00 2001 From: Zacharias Date: Wed, 27 May 2026 23:34:22 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20me.zacharias.chat=20=E2=86=92=20me.?= =?UTF-8?q?neurodock,=20org=20rename=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Renamed package from me.zacharias.chat to me.neurodock across all 8 modules - Updated Gradle group from me.zacharias.neurodock to me.neurodock - Updated README and other files to reflect new Gitea org URL (Chat_things → neurodock) Dev note: 95 files touched. The Great Refactor is complete, long may it rest. --- API/build.gradle | 1 - .../api/APIApplication.java | 14 +++++----- .../chat => neurodock}/api/APITool.java | 18 ++++++------- .../api/QuerryResponceEndpoint.java | 5 ++-- .../api/condations/EnableIfNotDisplay.java | 4 +-- .../api/controllers/Message.java | 12 ++++----- .../api/controllers/Tool.java | 9 +++---- .../api/payload/MessageResponce.java | 2 +- .../api/payload/ToolArgument.java | 4 +-- .../api/payload/ToolRequest.java | 2 +- .../payload/request/NewQurryResponceHook.java | 2 +- .../api/payload/request/NewToolRequest.java | 4 +-- .../api/payload/response/NewToolResponse.java | 2 +- .../api/payload/webhook/WebhookError.java | 2 +- .../webhook/responce/APIToolResponse.java | 2 +- Core/build.gradle | 1 - .../chat => neurodock}/core/Core.java | 14 +++++----- .../core/GlobalObjects.java | 2 +- .../core/LaunchOptions.java | 2 +- .../chat => neurodock}/core/Pair.java | 2 +- .../core/PrintAdvanceMessageHandler.java | 6 ++--- .../core/PrintMessageHandler.java | 9 ++++--- .../core/files/FileHandler.java | 15 +++++------ .../core/files/FileHandlerException.java | 2 +- .../core/files/FileHandlerLocation.java | 4 +-- .../me/neurodock/core/files/ListFiles.java | 4 +++ .../core/files/tools/ReadFileTool.java | 14 +++++----- .../core/memory/AddMemoryFunction.java | 12 ++++----- .../core/memory/CoreMemory.java | 4 +-- .../core/memory/GetMemoriesFunction.java | 10 +++---- .../core/memory/GetMemoryFunction.java | 10 +++---- .../memory/GetMemoryIdentitiesFunction.java | 10 +++---- .../core/memory/RemoveMemoryFunction.java | 12 ++++----- .../core/memory/array/AddArrayMemory.java | 16 ++++++------ .../core/memory/array/GetArrayMemory.java | 14 +++++----- .../core/memory/array/GetArrayedMemories.java | 12 ++++----- .../core/memory/package-info.java | 2 +- .../ollama/OllamaFunctionArgument.java | 2 +- .../ollama/OllamaFunctionTool.java | 6 ++--- .../ollama/OllamaFunctionTools.java | 6 ++--- .../ollama/OllamaMessage.java | 2 +- .../ollama/OllamaMessageRole.java | 2 +- .../ollama/OllamaMessageToolCall.java | 2 +- .../ollama/OllamaObject.java | 12 ++++----- .../ollama/OllamaPerameter.java | 2 +- .../chat => neurodock}/ollama/OllamaTool.java | 2 +- .../ollama/OllamaToolError.java | 2 +- .../ollama/OllamaToolResponse.java | 2 +- .../exceptions/OllamaToolErrorException.java | 4 +-- .../ollama/utils/SystemMessage.java | 6 ++--- .../plugin/loader/Loader.java | 15 ++++++----- .../zacharias/chat/core/files/ListFiles.java | 4 --- Core/src/test/java/FileTest.java | 4 +-- Core/src/test/java/plugin/Test.java | 2 +- Core/src/test/java/plugin/Tool.java | 8 +++--- Display/build.gradle | 1 - .../chat => neurodock}/display/Display.java | 26 +++++++++---------- .../display/PythonRunner.java | 14 ++++++---- .../chat => neurodock}/display/TimeTool.java | 10 +++---- GeniusAPI/build.gradle | 1 - .../genius/GeniusEndpoint.java | 2 +- .../genius/GeniusEndpointTool.java | 4 +-- .../genius/GeniusTools.java | 8 +++--- .../genius}/ParameterStringBuilder.java | 2 +- .../genius/endpoints/FindSong.java | 18 ++++++------- .../genius/endpoints/GetLyrics.java | 18 ++++++------- GeniusAPI/src/test/java/LyricsFetch.java | 3 --- MALAPITool/build.gradle | 1 - .../mal/api/MALAPITool.java | 8 +++--- .../mal/api/MALEndpoint.java | 2 +- .../mal/api/MALEndpointTool.java | 4 +-- .../mal/api}/ParameterStringBuilder.java | 2 +- .../mal/api/endpoints/GetAnimeDetails.java | 16 ++++++------ .../mal/api/endpoints/GetAnimeList.java | 16 ++++++------ .../mal/api/endpoints/GetManagDetails.java | 16 ++++++------ .../mal/api/endpoints/GetMangaList.java | 16 ++++++------ Plugin-API/build.gradle | 1 - .../chat => neurodock}/plugin/Data.java | 2 +- .../plugin/LoadedPlugins.java | 2 +- .../chat => neurodock}/plugin/Plugin.java | 7 +++-- .../plugin/PluginMetadata.java | 2 +- .../annotations/InjectPluginMetadata.java | 2 +- .../plugin/annotations/PluginEntryPoint.java | 2 +- .../exceptions/PluginLoadingException.java | 2 +- .../exceptions/ToolRuntimeException.java | 4 +-- .../chat => neurodock}/plugin/tool/Tool.java | 6 ++--- .../neurodock/plugin/tool/ToolArguments.java | 4 +++ .../plugin/tool/ToolParameters.java | 2 +- .../plugin/tool/ToolResponse.java | 2 +- .../chat/plugin/tool/ToolArguments.java | 4 --- README.md | 10 +++---- WikipediaTool/build.gradle | 1 - .../wikipedia/GetWikiPageText.java | 10 +++---- .../wikipedia/WikipediaTool.java | 6 ++--- build.gradle | 5 ++-- launcher/build.gradle | 1 - .../chat => neurodock}/launcher/Launcher.java | 10 +++---- 97 files changed, 301 insertions(+), 315 deletions(-) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/APIApplication.java (93%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/APITool.java (85%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/QuerryResponceEndpoint.java (83%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/condations/EnableIfNotDisplay.java (82%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/controllers/Message.java (87%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/controllers/Tool.java (85%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/MessageResponce.java (90%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/ToolArgument.java (88%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/ToolRequest.java (89%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/request/NewQurryResponceHook.java (95%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/request/NewToolRequest.java (93%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/response/NewToolResponse.java (95%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/webhook/WebhookError.java (94%) rename API/src/main/java/me/{zacharias/chat => neurodock}/api/payload/webhook/responce/APIToolResponse.java (92%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/Core.java (98%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/GlobalObjects.java (96%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/LaunchOptions.java (99%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/Pair.java (97%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/PrintAdvanceMessageHandler.java (87%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/PrintMessageHandler.java (90%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/files/FileHandler.java (90%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/files/FileHandlerException.java (79%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/files/FileHandlerLocation.java (58%) create mode 100644 Core/src/main/java/me/neurodock/core/files/ListFiles.java rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/files/tools/ReadFileTool.java (85%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/AddMemoryFunction.java (85%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/CoreMemory.java (98%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/GetMemoriesFunction.java (70%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/GetMemoryFunction.java (81%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/GetMemoryIdentitiesFunction.java (73%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/RemoveMemoryFunction.java (78%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/array/AddArrayMemory.java (78%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/array/GetArrayMemory.java (71%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/array/GetArrayedMemories.java (64%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/core/memory/package-info.java (83%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaFunctionArgument.java (98%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaFunctionTool.java (94%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaFunctionTools.java (97%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaMessage.java (97%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaMessageRole.java (97%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaMessageToolCall.java (96%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaObject.java (98%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaPerameter.java (99%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaTool.java (64%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaToolError.java (95%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/OllamaToolResponse.java (98%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/exceptions/OllamaToolErrorException.java (93%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/ollama/utils/SystemMessage.java (67%) rename Core/src/main/java/me/{zacharias/chat => neurodock}/plugin/loader/Loader.java (84%) delete mode 100644 Core/src/main/java/me/zacharias/chat/core/files/ListFiles.java rename Display/src/main/java/me/{zacharias/chat => neurodock}/display/Display.java (92%) rename Display/src/main/java/me/{zacharias/chat => neurodock}/display/PythonRunner.java (98%) rename Display/src/main/java/me/{zacharias/chat => neurodock}/display/TimeTool.java (75%) rename GeniusAPI/src/main/java/me/{zacharias/neuro/dock => neurodock}/genius/GeniusEndpoint.java (86%) rename GeniusAPI/src/main/java/me/{zacharias/neuro/dock => neurodock}/genius/GeniusEndpointTool.java (73%) rename GeniusAPI/src/main/java/me/{zacharias/neuro/dock => neurodock}/genius/GeniusTools.java (96%) rename {MALAPITool/src/main/java/me/zacharias/chat/mal/api => GeniusAPI/src/main/java/me/neurodock/genius}/ParameterStringBuilder.java (96%) rename GeniusAPI/src/main/java/me/{zacharias/neuro/dock => neurodock}/genius/endpoints/FindSong.java (78%) rename GeniusAPI/src/main/java/me/{zacharias/neuro/dock => neurodock}/genius/endpoints/GetLyrics.java (89%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/MALAPITool.java (96%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/MALEndpoint.java (88%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/MALEndpointTool.java (73%) rename {GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius => MALAPITool/src/main/java/me/neurodock/mal/api}/ParameterStringBuilder.java (95%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/endpoints/GetAnimeDetails.java (86%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/endpoints/GetAnimeList.java (86%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/endpoints/GetManagDetails.java (86%) rename MALAPITool/src/main/java/me/{zacharias/chat => neurodock}/mal/api/endpoints/GetMangaList.java (86%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/Data.java (85%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/LoadedPlugins.java (61%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/Plugin.java (90%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/PluginMetadata.java (96%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/annotations/InjectPluginMetadata.java (85%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/annotations/PluginEntryPoint.java (88%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/exceptions/PluginLoadingException.java (81%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/exceptions/ToolRuntimeException.java (91%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/tool/Tool.java (94%) create mode 100644 Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolArguments.java rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/tool/ToolParameters.java (87%) rename Plugin-API/src/main/java/me/{zacharias/chat => neurodock}/plugin/tool/ToolResponse.java (85%) delete mode 100644 Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolArguments.java rename WikipediaTool/src/main/java/me/{zacharias/neuro/dock => neurodock}/wikipedia/GetWikiPageText.java (77%) rename WikipediaTool/src/main/java/me/{zacharias/neuro/dock => neurodock}/wikipedia/WikipediaTool.java (80%) rename launcher/src/main/java/me/{zacharias/chat => neurodock}/launcher/Launcher.java (95%) diff --git a/API/build.gradle b/API/build.gradle index e168004..4d6f181 100644 --- a/API/build.gradle +++ b/API/build.gradle @@ -5,7 +5,6 @@ plugins { id 'io.spring.dependency-management' version '1.1.4' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' dependencies { diff --git a/API/src/main/java/me/zacharias/chat/api/APIApplication.java b/API/src/main/java/me/neurodock/api/APIApplication.java similarity index 93% rename from API/src/main/java/me/zacharias/chat/api/APIApplication.java rename to API/src/main/java/me/neurodock/api/APIApplication.java index 37a47d7..9928cbe 100644 --- a/API/src/main/java/me/zacharias/chat/api/APIApplication.java +++ b/API/src/main/java/me/neurodock/api/APIApplication.java @@ -1,11 +1,11 @@ -package me.zacharias.chat.api; +package me.neurodock.api; -import me.zacharias.chat.api.payload.request.NewQurryResponceHook; -import me.zacharias.chat.api.payload.request.NewToolRequest; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.core.GlobalObjects; -import me.zacharias.chat.core.PrintMessageHandler; -import me.zacharias.chat.ollama.OllamaObject; +import me.neurodock.api.payload.request.NewQurryResponceHook; +import me.neurodock.api.payload.request.NewToolRequest; +import me.neurodock.core.Core; +import me.neurodock.core.GlobalObjects; +import me.neurodock.core.PrintMessageHandler; +import me.neurodock.ollama.OllamaObject; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; diff --git a/API/src/main/java/me/zacharias/chat/api/APITool.java b/API/src/main/java/me/neurodock/api/APITool.java similarity index 85% rename from API/src/main/java/me/zacharias/chat/api/APITool.java rename to API/src/main/java/me/neurodock/api/APITool.java index f55d49a..65c0d6c 100644 --- a/API/src/main/java/me/zacharias/chat/api/APITool.java +++ b/API/src/main/java/me/neurodock/api/APITool.java @@ -1,13 +1,13 @@ -package me.zacharias.chat.api; +package me.neurodock.api; -import me.zacharias.chat.api.payload.ToolArgument; -import me.zacharias.chat.api.payload.request.NewToolRequest; -import me.zacharias.chat.api.payload.webhook.responce.APIToolResponse; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.api.payload.ToolArgument; +import me.neurodock.api.payload.request.NewToolRequest; +import me.neurodock.api.payload.webhook.responce.APIToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import org.jspecify.annotations.NonNull; import org.springframework.http.ResponseEntity; diff --git a/API/src/main/java/me/zacharias/chat/api/QuerryResponceEndpoint.java b/API/src/main/java/me/neurodock/api/QuerryResponceEndpoint.java similarity index 83% rename from API/src/main/java/me/zacharias/chat/api/QuerryResponceEndpoint.java rename to API/src/main/java/me/neurodock/api/QuerryResponceEndpoint.java index e08160f..afb5fd7 100644 --- a/API/src/main/java/me/zacharias/chat/api/QuerryResponceEndpoint.java +++ b/API/src/main/java/me/neurodock/api/QuerryResponceEndpoint.java @@ -1,8 +1,7 @@ -package me.zacharias.chat.api; +package me.neurodock.api; -import me.zacharias.chat.api.payload.webhook.WebhookError; +import me.neurodock.api.payload.webhook.WebhookError; import org.springframework.http.MediaType; -import org.springframework.web.client.RestTemplate; import org.springframework.web.reactive.function.client.WebClient; public class QuerryResponceEndpoint { diff --git a/API/src/main/java/me/zacharias/chat/api/condations/EnableIfNotDisplay.java b/API/src/main/java/me/neurodock/api/condations/EnableIfNotDisplay.java similarity index 82% rename from API/src/main/java/me/zacharias/chat/api/condations/EnableIfNotDisplay.java rename to API/src/main/java/me/neurodock/api/condations/EnableIfNotDisplay.java index d4cbea1..bf56090 100644 --- a/API/src/main/java/me/zacharias/chat/api/condations/EnableIfNotDisplay.java +++ b/API/src/main/java/me/neurodock/api/condations/EnableIfNotDisplay.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.api.condations; +package me.neurodock.api.condations; -import me.zacharias.chat.core.LaunchOptions; +import me.neurodock.core.LaunchOptions; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/API/src/main/java/me/zacharias/chat/api/controllers/Message.java b/API/src/main/java/me/neurodock/api/controllers/Message.java similarity index 87% rename from API/src/main/java/me/zacharias/chat/api/controllers/Message.java rename to API/src/main/java/me/neurodock/api/controllers/Message.java index 6fdecc9..f6e2f7c 100644 --- a/API/src/main/java/me/zacharias/chat/api/controllers/Message.java +++ b/API/src/main/java/me/neurodock/api/controllers/Message.java @@ -1,11 +1,11 @@ -package me.zacharias.chat.api.controllers; +package me.neurodock.api.controllers; import io.swagger.v3.oas.annotations.responses.ApiResponses; -import me.zacharias.chat.api.APIApplication; -import me.zacharias.chat.api.condations.EnableIfNotDisplay; -import me.zacharias.chat.api.payload.request.NewQurryResponceHook; -import me.zacharias.chat.ollama.OllamaMessage; -import me.zacharias.chat.ollama.OllamaMessageRole; +import me.neurodock.api.APIApplication; +import me.neurodock.api.condations.EnableIfNotDisplay; +import me.neurodock.api.payload.request.NewQurryResponceHook; +import me.neurodock.ollama.OllamaMessage; +import me.neurodock.ollama.OllamaMessageRole; import org.springframework.context.annotation.Conditional; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/API/src/main/java/me/zacharias/chat/api/controllers/Tool.java b/API/src/main/java/me/neurodock/api/controllers/Tool.java similarity index 85% rename from API/src/main/java/me/zacharias/chat/api/controllers/Tool.java rename to API/src/main/java/me/neurodock/api/controllers/Tool.java index e890f6b..ac538de 100644 --- a/API/src/main/java/me/zacharias/chat/api/controllers/Tool.java +++ b/API/src/main/java/me/neurodock/api/controllers/Tool.java @@ -1,10 +1,9 @@ -package me.zacharias.chat.api.controllers; +package me.neurodock.api.controllers; import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; -import me.zacharias.chat.api.APIApplication; -import me.zacharias.chat.api.payload.request.NewToolRequest; -import me.zacharias.chat.api.payload.response.NewToolResponse; +import me.neurodock.api.APIApplication; +import me.neurodock.api.payload.request.NewToolRequest; +import me.neurodock.api.payload.response.NewToolResponse; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/MessageResponce.java b/API/src/main/java/me/neurodock/api/payload/MessageResponce.java similarity index 90% rename from API/src/main/java/me/zacharias/chat/api/payload/MessageResponce.java rename to API/src/main/java/me/neurodock/api/payload/MessageResponce.java index fa36d27..2c4ad59 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/MessageResponce.java +++ b/API/src/main/java/me/neurodock/api/payload/MessageResponce.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.api.payload; +package me.neurodock.api.payload; public class MessageResponce { private final String message; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/ToolArgument.java b/API/src/main/java/me/neurodock/api/payload/ToolArgument.java similarity index 88% rename from API/src/main/java/me/zacharias/chat/api/payload/ToolArgument.java rename to API/src/main/java/me/neurodock/api/payload/ToolArgument.java index cab2076..1ad4ef4 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/ToolArgument.java +++ b/API/src/main/java/me/neurodock/api/payload/ToolArgument.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.api.payload; +package me.neurodock.api.payload; -import me.zacharias.chat.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaPerameter; public class ToolArgument { String name; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/ToolRequest.java b/API/src/main/java/me/neurodock/api/payload/ToolRequest.java similarity index 89% rename from API/src/main/java/me/zacharias/chat/api/payload/ToolRequest.java rename to API/src/main/java/me/neurodock/api/payload/ToolRequest.java index 4b4f7b7..670f4fa 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/ToolRequest.java +++ b/API/src/main/java/me/neurodock/api/payload/ToolRequest.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.api.payload; +package me.neurodock.api.payload; public class ToolRequest { private final String name; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/request/NewQurryResponceHook.java b/API/src/main/java/me/neurodock/api/payload/request/NewQurryResponceHook.java similarity index 95% rename from API/src/main/java/me/zacharias/chat/api/payload/request/NewQurryResponceHook.java rename to API/src/main/java/me/neurodock/api/payload/request/NewQurryResponceHook.java index 607e8db..4a673ff 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/request/NewQurryResponceHook.java +++ b/API/src/main/java/me/neurodock/api/payload/request/NewQurryResponceHook.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.api.payload.request; +package me.neurodock.api.payload.request; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/request/NewToolRequest.java b/API/src/main/java/me/neurodock/api/payload/request/NewToolRequest.java similarity index 93% rename from API/src/main/java/me/zacharias/chat/api/payload/request/NewToolRequest.java rename to API/src/main/java/me/neurodock/api/payload/request/NewToolRequest.java index 19d0b60..570985e 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/request/NewToolRequest.java +++ b/API/src/main/java/me/neurodock/api/payload/request/NewToolRequest.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.api.payload.request; +package me.neurodock.api.payload.request; -import me.zacharias.chat.api.payload.ToolArgument; +import me.neurodock.api.payload.ToolArgument; public class NewToolRequest { /** diff --git a/API/src/main/java/me/zacharias/chat/api/payload/response/NewToolResponse.java b/API/src/main/java/me/neurodock/api/payload/response/NewToolResponse.java similarity index 95% rename from API/src/main/java/me/zacharias/chat/api/payload/response/NewToolResponse.java rename to API/src/main/java/me/neurodock/api/payload/response/NewToolResponse.java index 0480ab0..3052b6d 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/response/NewToolResponse.java +++ b/API/src/main/java/me/neurodock/api/payload/response/NewToolResponse.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.api.payload.response; +package me.neurodock.api.payload.response; public class NewToolResponse { private String name; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/webhook/WebhookError.java b/API/src/main/java/me/neurodock/api/payload/webhook/WebhookError.java similarity index 94% rename from API/src/main/java/me/zacharias/chat/api/payload/webhook/WebhookError.java rename to API/src/main/java/me/neurodock/api/payload/webhook/WebhookError.java index 234eeba..482d1e5 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/webhook/WebhookError.java +++ b/API/src/main/java/me/neurodock/api/payload/webhook/WebhookError.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.api.payload.webhook; +package me.neurodock.api.payload.webhook; public class WebhookError { private final String originalUrl; diff --git a/API/src/main/java/me/zacharias/chat/api/payload/webhook/responce/APIToolResponse.java b/API/src/main/java/me/neurodock/api/payload/webhook/responce/APIToolResponse.java similarity index 92% rename from API/src/main/java/me/zacharias/chat/api/payload/webhook/responce/APIToolResponse.java rename to API/src/main/java/me/neurodock/api/payload/webhook/responce/APIToolResponse.java index 54b66e0..d455db2 100644 --- a/API/src/main/java/me/zacharias/chat/api/payload/webhook/responce/APIToolResponse.java +++ b/API/src/main/java/me/neurodock/api/payload/webhook/responce/APIToolResponse.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.api.payload.webhook.responce; +package me.neurodock.api.payload.webhook.responce; public class APIToolResponse { private final String response; diff --git a/Core/build.gradle b/Core/build.gradle index d512bf3..f0396fe 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java-library' } -group = 'me.zacharias.neurodock' version = '1.6' dependencies { diff --git a/Core/src/main/java/me/zacharias/chat/core/Core.java b/Core/src/main/java/me/neurodock/core/Core.java similarity index 98% rename from Core/src/main/java/me/zacharias/chat/core/Core.java rename to Core/src/main/java/me/neurodock/core/Core.java index 3a1f1ca..3916956 100644 --- a/Core/src/main/java/me/zacharias/chat/core/Core.java +++ b/Core/src/main/java/me/neurodock/core/Core.java @@ -1,10 +1,10 @@ -package me.zacharias.chat.core; +package me.neurodock.core; -import me.zacharias.chat.core.memory.*; -import me.zacharias.chat.ollama.*; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; -import me.zacharias.chat.plugin.loader.Loader; -import me.zacharias.chat.plugin.exceptions.PluginLoadingException; +import me.neurodock.core.memory.*; +import me.neurodock.ollama.*; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.plugin.loader.Loader; +import me.neurodock.plugin.exceptions.PluginLoadingException; import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; @@ -23,7 +23,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static me.zacharias.chat.ollama.OllamaFunctionArgument.deconstructOllamaFunctionArguments; +import static me.neurodock.ollama.OllamaFunctionArgument.deconstructOllamaFunctionArguments; /** * The Main class for the System, responsible for managing the OllamaObject, tools, and the Ollama API. diff --git a/Core/src/main/java/me/zacharias/chat/core/GlobalObjects.java b/Core/src/main/java/me/neurodock/core/GlobalObjects.java similarity index 96% rename from Core/src/main/java/me/zacharias/chat/core/GlobalObjects.java rename to Core/src/main/java/me/neurodock/core/GlobalObjects.java index 442ba39..2aa36e2 100644 --- a/Core/src/main/java/me/zacharias/chat/core/GlobalObjects.java +++ b/Core/src/main/java/me/neurodock/core/GlobalObjects.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.core; +package me.neurodock.core; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/me/zacharias/chat/core/LaunchOptions.java b/Core/src/main/java/me/neurodock/core/LaunchOptions.java similarity index 99% rename from Core/src/main/java/me/zacharias/chat/core/LaunchOptions.java rename to Core/src/main/java/me/neurodock/core/LaunchOptions.java index 10bed7b..d63d971 100644 --- a/Core/src/main/java/me/zacharias/chat/core/LaunchOptions.java +++ b/Core/src/main/java/me/neurodock/core/LaunchOptions.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.core; +package me.neurodock.core; /** * The Configuration class, where arguments are stored and retrieved. This is used to configure the running of the program from the Launcher. diff --git a/Core/src/main/java/me/zacharias/chat/core/Pair.java b/Core/src/main/java/me/neurodock/core/Pair.java similarity index 97% rename from Core/src/main/java/me/zacharias/chat/core/Pair.java rename to Core/src/main/java/me/neurodock/core/Pair.java index e6b222d..1defd1d 100644 --- a/Core/src/main/java/me/zacharias/chat/core/Pair.java +++ b/Core/src/main/java/me/neurodock/core/Pair.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.core; +package me.neurodock.core; /** * A simple Pair class. diff --git a/Core/src/main/java/me/zacharias/chat/core/PrintAdvanceMessageHandler.java b/Core/src/main/java/me/neurodock/core/PrintAdvanceMessageHandler.java similarity index 87% rename from Core/src/main/java/me/zacharias/chat/core/PrintAdvanceMessageHandler.java rename to Core/src/main/java/me/neurodock/core/PrintAdvanceMessageHandler.java index 0b77b8f..52f2ce2 100644 --- a/Core/src/main/java/me/zacharias/chat/core/PrintAdvanceMessageHandler.java +++ b/Core/src/main/java/me/neurodock/core/PrintAdvanceMessageHandler.java @@ -1,7 +1,7 @@ -package me.zacharias.chat.core; +package me.neurodock.core; -import me.zacharias.chat.ollama.OllamaMessage; -import me.zacharias.chat.ollama.OllamaMessageRole; +import me.neurodock.ollama.OllamaMessage; +import me.neurodock.ollama.OllamaMessageRole; /** * Represents a {@link PrintAdvanceMessageHandler}. diff --git a/Core/src/main/java/me/zacharias/chat/core/PrintMessageHandler.java b/Core/src/main/java/me/neurodock/core/PrintMessageHandler.java similarity index 90% rename from Core/src/main/java/me/zacharias/chat/core/PrintMessageHandler.java rename to Core/src/main/java/me/neurodock/core/PrintMessageHandler.java index 38c26a2..8963555 100644 --- a/Core/src/main/java/me/zacharias/chat/core/PrintMessageHandler.java +++ b/Core/src/main/java/me/neurodock/core/PrintMessageHandler.java @@ -1,8 +1,9 @@ -package me.zacharias.chat.core; +package me.neurodock.core; -import me.zacharias.chat.ollama.OllamaMessage; +import me.neurodock.ollama.OllamaMessage; +import me.neurodock.ollama.OllamaMessageRole; -import static me.zacharias.chat.ollama.OllamaFunctionArgument.deconstructOllamaFunctionArguments; +import static me.neurodock.ollama.OllamaFunctionArgument.deconstructOllamaFunctionArguments; /** * Represents a PrintMessageHandler. @@ -20,7 +21,7 @@ public interface PrintMessageHandler extends PrintAdvanceMessageHandler { * This is a default implementation when wrapping {@link PrintAdvanceMessageHandler} to this "simpler" {@link PrintMessageHandler} * * - * @param message The {@link OllamaMessage} requested to be printed from a veriity of sources, see {@link me.zacharias.chat.ollama.OllamaMessageRole} + * @param message The {@link OllamaMessage} requested to be printed from a veriity of sources, see {@link OllamaMessageRole} */ default void printMessage(OllamaMessage message) { printMessage(switch (message.getRole()) { diff --git a/Core/src/main/java/me/zacharias/chat/core/files/FileHandler.java b/Core/src/main/java/me/neurodock/core/files/FileHandler.java similarity index 90% rename from Core/src/main/java/me/zacharias/chat/core/files/FileHandler.java rename to Core/src/main/java/me/neurodock/core/files/FileHandler.java index f9cd9df..69c192e 100644 --- a/Core/src/main/java/me/zacharias/chat/core/files/FileHandler.java +++ b/Core/src/main/java/me/neurodock/core/files/FileHandler.java @@ -1,17 +1,14 @@ -package me.zacharias.chat.core.files; +package me.neurodock.core.files; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.core.Pair; -import me.zacharias.chat.core.files.tools.ReadFileTool; -import me.zacharias.chat.ollama.OllamaTool; +import me.neurodock.core.Core; +import me.neurodock.core.Pair; +import me.neurodock.core.files.tools.ReadFileTool; +import me.neurodock.ollama.OllamaTool; import org.intellij.lang.annotations.MagicConstant; import java.io.*; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Arrays; /** * Base class responsible for the {@link me.zacharias.chat.core.files} related systems @@ -51,7 +48,7 @@ public class FileHandler { } /** - * Returns a list of all {@link me.zacharias.chat.ollama.OllamaTool}'s this module adds + * Returns a list of all {@link OllamaTool}'s this module adds * @return */ public static ArrayList> getTools() { diff --git a/Core/src/main/java/me/zacharias/chat/core/files/FileHandlerException.java b/Core/src/main/java/me/neurodock/core/files/FileHandlerException.java similarity index 79% rename from Core/src/main/java/me/zacharias/chat/core/files/FileHandlerException.java rename to Core/src/main/java/me/neurodock/core/files/FileHandlerException.java index b86830d..b133d2f 100644 --- a/Core/src/main/java/me/zacharias/chat/core/files/FileHandlerException.java +++ b/Core/src/main/java/me/neurodock/core/files/FileHandlerException.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.core.files; +package me.neurodock.core.files; public class FileHandlerException extends RuntimeException { public FileHandlerException(String message) { diff --git a/Core/src/main/java/me/zacharias/chat/core/files/FileHandlerLocation.java b/Core/src/main/java/me/neurodock/core/files/FileHandlerLocation.java similarity index 58% rename from Core/src/main/java/me/zacharias/chat/core/files/FileHandlerLocation.java rename to Core/src/main/java/me/neurodock/core/files/FileHandlerLocation.java index b93be34..8ea9c48 100644 --- a/Core/src/main/java/me/zacharias/chat/core/files/FileHandlerLocation.java +++ b/Core/src/main/java/me/neurodock/core/files/FileHandlerLocation.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.core.files; +package me.neurodock.core.files; -import me.zacharias.chat.core.Core; +import me.neurodock.core.Core; public class FileHandlerLocation { public static final String DATA_FILES = Core.DATA+"/files"; diff --git a/Core/src/main/java/me/neurodock/core/files/ListFiles.java b/Core/src/main/java/me/neurodock/core/files/ListFiles.java new file mode 100644 index 0000000..2079e16 --- /dev/null +++ b/Core/src/main/java/me/neurodock/core/files/ListFiles.java @@ -0,0 +1,4 @@ +package me.neurodock.core.files; + +public class ListFiles { +} diff --git a/Core/src/main/java/me/zacharias/chat/core/files/tools/ReadFileTool.java b/Core/src/main/java/me/neurodock/core/files/tools/ReadFileTool.java similarity index 85% rename from Core/src/main/java/me/zacharias/chat/core/files/tools/ReadFileTool.java rename to Core/src/main/java/me/neurodock/core/files/tools/ReadFileTool.java index 1ebdfb3..9530a05 100644 --- a/Core/src/main/java/me/zacharias/chat/core/files/tools/ReadFileTool.java +++ b/Core/src/main/java/me/neurodock/core/files/tools/ReadFileTool.java @@ -1,11 +1,11 @@ -package me.zacharias.chat.core.files.tools; +package me.neurodock.core.files.tools; -import me.zacharias.chat.core.files.FileHandler; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.core.files.FileHandler; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import java.io.*; diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/AddMemoryFunction.java b/Core/src/main/java/me/neurodock/core/memory/AddMemoryFunction.java similarity index 85% rename from Core/src/main/java/me/zacharias/chat/core/memory/AddMemoryFunction.java rename to Core/src/main/java/me/neurodock/core/memory/AddMemoryFunction.java index 131e1c4..ef64ad0 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/AddMemoryFunction.java +++ b/Core/src/main/java/me/neurodock/core/memory/AddMemoryFunction.java @@ -1,10 +1,10 @@ -package me.zacharias.chat.core.memory; +package me.neurodock.core.memory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; /** diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/CoreMemory.java b/Core/src/main/java/me/neurodock/core/memory/CoreMemory.java similarity index 98% rename from Core/src/main/java/me/zacharias/chat/core/memory/CoreMemory.java rename to Core/src/main/java/me/neurodock/core/memory/CoreMemory.java index 3eb42fd..e56eec3 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/CoreMemory.java +++ b/Core/src/main/java/me/neurodock/core/memory/CoreMemory.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.core.memory; +package me.neurodock.core.memory; -import me.zacharias.chat.core.Core; +import me.neurodock.core.Core; import org.json.JSONArray; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/GetMemoriesFunction.java b/Core/src/main/java/me/neurodock/core/memory/GetMemoriesFunction.java similarity index 70% rename from Core/src/main/java/me/zacharias/chat/core/memory/GetMemoriesFunction.java rename to Core/src/main/java/me/neurodock/core/memory/GetMemoriesFunction.java index 8cb7495..d9f84a0 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/GetMemoriesFunction.java +++ b/Core/src/main/java/me/neurodock/core/memory/GetMemoriesFunction.java @@ -1,9 +1,9 @@ -package me.zacharias.chat.core.memory; +package me.neurodock.core.memory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import org.jetbrains.annotations.NotNull; public class GetMemoriesFunction extends OllamaFunctionTool { diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/GetMemoryFunction.java b/Core/src/main/java/me/neurodock/core/memory/GetMemoryFunction.java similarity index 81% rename from Core/src/main/java/me/zacharias/chat/core/memory/GetMemoryFunction.java rename to Core/src/main/java/me/neurodock/core/memory/GetMemoryFunction.java index 013727b..fe136e2 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/GetMemoryFunction.java +++ b/Core/src/main/java/me/neurodock/core/memory/GetMemoryFunction.java @@ -1,9 +1,9 @@ -package me.zacharias.chat.core.memory; +package me.neurodock.core.memory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import org.jetbrains.annotations.NotNull; /** diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/GetMemoryIdentitiesFunction.java b/Core/src/main/java/me/neurodock/core/memory/GetMemoryIdentitiesFunction.java similarity index 73% rename from Core/src/main/java/me/zacharias/chat/core/memory/GetMemoryIdentitiesFunction.java rename to Core/src/main/java/me/neurodock/core/memory/GetMemoryIdentitiesFunction.java index e7e595b..a1d8ac6 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/GetMemoryIdentitiesFunction.java +++ b/Core/src/main/java/me/neurodock/core/memory/GetMemoryIdentitiesFunction.java @@ -1,9 +1,9 @@ -package me.zacharias.chat.core.memory; +package me.neurodock.core.memory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/RemoveMemoryFunction.java b/Core/src/main/java/me/neurodock/core/memory/RemoveMemoryFunction.java similarity index 78% rename from Core/src/main/java/me/zacharias/chat/core/memory/RemoveMemoryFunction.java rename to Core/src/main/java/me/neurodock/core/memory/RemoveMemoryFunction.java index 5574e17..4928c27 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/RemoveMemoryFunction.java +++ b/Core/src/main/java/me/neurodock/core/memory/RemoveMemoryFunction.java @@ -1,10 +1,10 @@ -package me.zacharias.chat.core.memory; +package me.neurodock.core.memory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; /** diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/array/AddArrayMemory.java b/Core/src/main/java/me/neurodock/core/memory/array/AddArrayMemory.java similarity index 78% rename from Core/src/main/java/me/zacharias/chat/core/memory/array/AddArrayMemory.java rename to Core/src/main/java/me/neurodock/core/memory/array/AddArrayMemory.java index be8b189..86562d3 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/array/AddArrayMemory.java +++ b/Core/src/main/java/me/neurodock/core/memory/array/AddArrayMemory.java @@ -1,12 +1,12 @@ -package me.zacharias.chat.core.memory.array; +package me.neurodock.core.memory.array; -import me.zacharias.chat.core.memory.CoreMemory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaPerameter.OllamaPerameterBuilder.Type; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.core.memory.CoreMemory; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaPerameter.OllamaPerameterBuilder.Type; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; public class AddArrayMemory extends OllamaFunctionTool { diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/array/GetArrayMemory.java b/Core/src/main/java/me/neurodock/core/memory/array/GetArrayMemory.java similarity index 71% rename from Core/src/main/java/me/zacharias/chat/core/memory/array/GetArrayMemory.java rename to Core/src/main/java/me/neurodock/core/memory/array/GetArrayMemory.java index eb8e430..18ca92b 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/array/GetArrayMemory.java +++ b/Core/src/main/java/me/neurodock/core/memory/array/GetArrayMemory.java @@ -1,11 +1,11 @@ -package me.zacharias.chat.core.memory.array; +package me.neurodock.core.memory.array; -import me.zacharias.chat.core.memory.CoreMemory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.OllamaPerameter.OllamaPerameterBuilder.Type; +import me.neurodock.core.memory.CoreMemory; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaPerameter.OllamaPerameterBuilder.Type; import org.jetbrains.annotations.NotNull; public class GetArrayMemory extends OllamaFunctionTool { diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/array/GetArrayedMemories.java b/Core/src/main/java/me/neurodock/core/memory/array/GetArrayedMemories.java similarity index 64% rename from Core/src/main/java/me/zacharias/chat/core/memory/array/GetArrayedMemories.java rename to Core/src/main/java/me/neurodock/core/memory/array/GetArrayedMemories.java index 10b0bd1..5a83928 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/array/GetArrayedMemories.java +++ b/Core/src/main/java/me/neurodock/core/memory/array/GetArrayedMemories.java @@ -1,10 +1,10 @@ -package me.zacharias.chat.core.memory.array; +package me.neurodock.core.memory.array; -import me.zacharias.chat.core.memory.CoreMemory; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.core.memory.CoreMemory; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import org.jetbrains.annotations.NotNull; public class GetArrayedMemories extends OllamaFunctionTool { diff --git a/Core/src/main/java/me/zacharias/chat/core/memory/package-info.java b/Core/src/main/java/me/neurodock/core/memory/package-info.java similarity index 83% rename from Core/src/main/java/me/zacharias/chat/core/memory/package-info.java rename to Core/src/main/java/me/neurodock/core/memory/package-info.java index 53e3e82..cbe80d6 100644 --- a/Core/src/main/java/me/zacharias/chat/core/memory/package-info.java +++ b/Core/src/main/java/me/neurodock/core/memory/package-info.java @@ -2,4 +2,4 @@ * A memory module for the AI Assistent to have the abilit to store memories between conversations, and over longer time * TODO: Key-Value map memory bank alongside of the array based. */ -package me.zacharias.chat.core.memory; \ No newline at end of file +package me.neurodock.core.memory; \ No newline at end of file diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionArgument.java b/Core/src/main/java/me/neurodock/ollama/OllamaFunctionArgument.java similarity index 98% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionArgument.java rename to Core/src/main/java/me/neurodock/ollama/OllamaFunctionArgument.java index 15cd8cc..82e11e7 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionArgument.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaFunctionArgument.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; import java.util.ArrayList; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTool.java b/Core/src/main/java/me/neurodock/ollama/OllamaFunctionTool.java similarity index 94% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTool.java rename to Core/src/main/java/me/neurodock/ollama/OllamaFunctionTool.java index c75db23..03ad0a2 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTool.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaFunctionTool.java @@ -1,7 +1,7 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.core.Core; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTools.java b/Core/src/main/java/me/neurodock/ollama/OllamaFunctionTools.java similarity index 97% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTools.java rename to Core/src/main/java/me/neurodock/ollama/OllamaFunctionTools.java index b281a2e..83140b9 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTools.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaFunctionTools.java @@ -1,7 +1,7 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.core.Pair; +import me.neurodock.core.Core; +import me.neurodock.core.Pair; import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaMessage.java b/Core/src/main/java/me/neurodock/ollama/OllamaMessage.java similarity index 97% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaMessage.java rename to Core/src/main/java/me/neurodock/ollama/OllamaMessage.java index c60b7c2..70bcea2 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaMessage.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaMessage.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaMessageRole.java b/Core/src/main/java/me/neurodock/ollama/OllamaMessageRole.java similarity index 97% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaMessageRole.java rename to Core/src/main/java/me/neurodock/ollama/OllamaMessageRole.java index b4be62c..83d672a 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaMessageRole.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaMessageRole.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; /** * Represents the role of a message. diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaMessageToolCall.java b/Core/src/main/java/me/neurodock/ollama/OllamaMessageToolCall.java similarity index 96% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaMessageToolCall.java rename to Core/src/main/java/me/neurodock/ollama/OllamaMessageToolCall.java index b75e9af..934976c 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaMessageToolCall.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaMessageToolCall.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; import org.json.JSONArray; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaObject.java b/Core/src/main/java/me/neurodock/ollama/OllamaObject.java similarity index 98% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaObject.java rename to Core/src/main/java/me/neurodock/ollama/OllamaObject.java index 2611204..ec2c0a5 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaObject.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaObject.java @@ -1,10 +1,10 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.core.LaunchOptions; -import me.zacharias.chat.core.Pair; -import me.zacharias.chat.core.files.FileHandlerLocation; -import me.zacharias.chat.core.files.FileHandler; +import me.neurodock.core.Core; +import me.neurodock.core.LaunchOptions; +import me.neurodock.core.Pair; +import me.neurodock.core.files.FileHandlerLocation; +import me.neurodock.core.files.FileHandler; import org.intellij.lang.annotations.MagicConstant; import org.json.JSONArray; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaPerameter.java b/Core/src/main/java/me/neurodock/ollama/OllamaPerameter.java similarity index 99% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaPerameter.java rename to Core/src/main/java/me/neurodock/ollama/OllamaPerameter.java index 3bce633..0d491b0 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaPerameter.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaPerameter.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaTool.java b/Core/src/main/java/me/neurodock/ollama/OllamaTool.java similarity index 64% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaTool.java rename to Core/src/main/java/me/neurodock/ollama/OllamaTool.java index 77eb96f..a3f1d7e 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaTool.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaTool.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; /** * Represents a tool. diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaToolError.java b/Core/src/main/java/me/neurodock/ollama/OllamaToolError.java similarity index 95% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaToolError.java rename to Core/src/main/java/me/neurodock/ollama/OllamaToolError.java index 3723877..656c0d7 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaToolError.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaToolError.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/OllamaToolResponse.java b/Core/src/main/java/me/neurodock/ollama/OllamaToolResponse.java similarity index 98% rename from Core/src/main/java/me/zacharias/chat/ollama/OllamaToolResponse.java rename to Core/src/main/java/me/neurodock/ollama/OllamaToolResponse.java index 7dec366..e623dc7 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/OllamaToolResponse.java +++ b/Core/src/main/java/me/neurodock/ollama/OllamaToolResponse.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.ollama; +package me.neurodock.ollama; import org.json.JSONObject; diff --git a/Core/src/main/java/me/zacharias/chat/ollama/exceptions/OllamaToolErrorException.java b/Core/src/main/java/me/neurodock/ollama/exceptions/OllamaToolErrorException.java similarity index 93% rename from Core/src/main/java/me/zacharias/chat/ollama/exceptions/OllamaToolErrorException.java rename to Core/src/main/java/me/neurodock/ollama/exceptions/OllamaToolErrorException.java index abfb846..11fc5eb 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/exceptions/OllamaToolErrorException.java +++ b/Core/src/main/java/me/neurodock/ollama/exceptions/OllamaToolErrorException.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.ollama.exceptions; +package me.neurodock.ollama.exceptions; -import me.zacharias.chat.core.Core; +import me.neurodock.core.Core; import org.json.JSONObject; /** diff --git a/Core/src/main/java/me/zacharias/chat/ollama/utils/SystemMessage.java b/Core/src/main/java/me/neurodock/ollama/utils/SystemMessage.java similarity index 67% rename from Core/src/main/java/me/zacharias/chat/ollama/utils/SystemMessage.java rename to Core/src/main/java/me/neurodock/ollama/utils/SystemMessage.java index 2f2da2e..0dc4a58 100644 --- a/Core/src/main/java/me/zacharias/chat/ollama/utils/SystemMessage.java +++ b/Core/src/main/java/me/neurodock/ollama/utils/SystemMessage.java @@ -1,7 +1,7 @@ -package me.zacharias.chat.ollama.utils; +package me.neurodock.ollama.utils; -import me.zacharias.chat.ollama.OllamaMessage; -import me.zacharias.chat.ollama.OllamaMessageRole; +import me.neurodock.ollama.OllamaMessage; +import me.neurodock.ollama.OllamaMessageRole; public class SystemMessage extends OllamaMessage { /** diff --git a/Core/src/main/java/me/zacharias/chat/plugin/loader/Loader.java b/Core/src/main/java/me/neurodock/plugin/loader/Loader.java similarity index 84% rename from Core/src/main/java/me/zacharias/chat/plugin/loader/Loader.java rename to Core/src/main/java/me/neurodock/plugin/loader/Loader.java index 0367f36..f841217 100644 --- a/Core/src/main/java/me/zacharias/chat/plugin/loader/Loader.java +++ b/Core/src/main/java/me/neurodock/plugin/loader/Loader.java @@ -1,13 +1,14 @@ -package me.zacharias.chat.plugin.loader; +package me.neurodock.plugin.loader; import jdk.jshell.spi.ExecutionControl; -import me.zacharias.chat.core.Pair; +import me.neurodock.core.Pair; +import me.neurodock.ollama.*; import me.zacharias.chat.ollama.*; -import me.zacharias.chat.plugin.Plugin; -import me.zacharias.chat.plugin.PluginMetadata; -import me.zacharias.chat.plugin.exceptions.ToolRuntimeException; -import me.zacharias.chat.plugin.tool.Tool; -import me.zacharias.chat.plugin.tool.ToolResponse; +import me.neurodock.plugin.Plugin; +import me.neurodock.plugin.PluginMetadata; +import me.neurodock.plugin.exceptions.ToolRuntimeException; +import me.neurodock.plugin.tool.Tool; +import me.neurodock.plugin.tool.ToolResponse; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/Core/src/main/java/me/zacharias/chat/core/files/ListFiles.java b/Core/src/main/java/me/zacharias/chat/core/files/ListFiles.java deleted file mode 100644 index ab50a29..0000000 --- a/Core/src/main/java/me/zacharias/chat/core/files/ListFiles.java +++ /dev/null @@ -1,4 +0,0 @@ -package me.zacharias.chat.core.files; - -public class ListFiles { -} diff --git a/Core/src/test/java/FileTest.java b/Core/src/test/java/FileTest.java index e338b82..e2fc916 100644 --- a/Core/src/test/java/FileTest.java +++ b/Core/src/test/java/FileTest.java @@ -1,5 +1,5 @@ -import me.zacharias.chat.core.files.FileHandler; -import me.zacharias.chat.core.files.FileHandlerException; +import me.neurodock.core.files.FileHandler; +import me.neurodock.core.files.FileHandlerException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/Core/src/test/java/plugin/Test.java b/Core/src/test/java/plugin/Test.java index 6fdb2b2..28eafba 100644 --- a/Core/src/test/java/plugin/Test.java +++ b/Core/src/test/java/plugin/Test.java @@ -1,6 +1,6 @@ package plugin; -import me.zacharias.chat.plugin.Plugin; +import me.neurodock.plugin.Plugin; public class Test extends Plugin { } diff --git a/Core/src/test/java/plugin/Tool.java b/Core/src/test/java/plugin/Tool.java index 9b30e33..be6a017 100644 --- a/Core/src/test/java/plugin/Tool.java +++ b/Core/src/test/java/plugin/Tool.java @@ -2,10 +2,10 @@ package plugin; //// This class is broken due to the current refactoring on the RPCP part of this project. -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import me.zacharias.chat.plugin.annotation.OllamaTool; import me.zacharias.chat.plugin.annotation.injectons.InjectPlugin; import org.jetbrains.annotations.NotNull; diff --git a/Display/build.gradle b/Display/build.gradle index 2807642..7cf7568 100644 --- a/Display/build.gradle +++ b/Display/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' dependencies { diff --git a/Display/src/main/java/me/zacharias/chat/display/Display.java b/Display/src/main/java/me/neurodock/display/Display.java similarity index 92% rename from Display/src/main/java/me/zacharias/chat/display/Display.java rename to Display/src/main/java/me/neurodock/display/Display.java index 081c3d0..8c73ff0 100644 --- a/Display/src/main/java/me/zacharias/chat/display/Display.java +++ b/Display/src/main/java/me/neurodock/display/Display.java @@ -1,24 +1,22 @@ -package me.zacharias.chat.display; +package me.neurodock.display; -import me.zacharias.chat.api.APIApplication; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.core.Pair; -import me.zacharias.chat.core.PrintMessageHandler; -import me.zacharias.chat.core.files.FileHandlerLocation; -import me.zacharias.chat.core.memory.CoreMemory; -import me.zacharias.chat.mal.api.MALAPITool; +import me.neurodock.core.Core; +import me.neurodock.core.Pair; +import me.neurodock.core.PrintMessageHandler; +import me.neurodock.core.files.FileHandlerLocation; +import me.neurodock.core.memory.CoreMemory; +import me.neurodock.mal.api.MALAPITool; +import me.neurodock.ollama.*; import me.zacharias.chat.ollama.*; -import me.zacharias.chat.ollama.utils.SystemMessage; -import me.zacharias.neuro.dock.genius.GeniusTools; -import me.zacharias.neuro.dock.wikipedia.WikipediaTool; +import me.neurodock.ollama.utils.SystemMessage; +import me.neurodock.genius.GeniusTools; +import me.neurodock.wikipedia.WikipediaTool; import org.json.JSONObject; import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.*; -import static me.zacharias.chat.core.Core.writeLog; +import static me.neurodock.core.Core.writeLog; /** * The main class of the Display.
diff --git a/Display/src/main/java/me/zacharias/chat/display/PythonRunner.java b/Display/src/main/java/me/neurodock/display/PythonRunner.java similarity index 98% rename from Display/src/main/java/me/zacharias/chat/display/PythonRunner.java rename to Display/src/main/java/me/neurodock/display/PythonRunner.java index 443f997..3d8128b 100644 --- a/Display/src/main/java/me/zacharias/chat/display/PythonRunner.java +++ b/Display/src/main/java/me/neurodock/display/PythonRunner.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.display; +package me.neurodock.display; import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.HostConfig; @@ -6,10 +6,14 @@ import com.github.dockerjava.core.DefaultDockerClientConfig; import com.github.dockerjava.core.DockerClientImpl; import com.github.dockerjava.httpclient5.ApacheDockerHttpClient; import com.github.dockerjava.transport.DockerHttpClient; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.core.Pair; +import me.neurodock.core.Core; +import me.neurodock.core.Pair; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import me.zacharias.chat.ollama.*; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.apache.commons.io.IOUtils; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; @@ -28,7 +32,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import static me.zacharias.chat.core.Core.writeLog; +import static me.neurodock.core.Core.writeLog; /** * A tool that runs python code. diff --git a/Display/src/main/java/me/zacharias/chat/display/TimeTool.java b/Display/src/main/java/me/neurodock/display/TimeTool.java similarity index 75% rename from Display/src/main/java/me/zacharias/chat/display/TimeTool.java rename to Display/src/main/java/me/neurodock/display/TimeTool.java index db03241..2829f0b 100644 --- a/Display/src/main/java/me/zacharias/chat/display/TimeTool.java +++ b/Display/src/main/java/me/neurodock/display/TimeTool.java @@ -1,9 +1,9 @@ -package me.zacharias.chat.display; +package me.neurodock.display; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import org.jetbrains.annotations.NotNull; import org.jspecify.annotations.NonNull; diff --git a/GeniusAPI/build.gradle b/GeniusAPI/build.gradle index 88795a9..bed7c5e 100644 --- a/GeniusAPI/build.gradle +++ b/GeniusAPI/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' repositories { diff --git a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusEndpoint.java b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusEndpoint.java similarity index 86% rename from GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusEndpoint.java rename to GeniusAPI/src/main/java/me/neurodock/genius/GeniusEndpoint.java index 9f935b9..d811cc2 100644 --- a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusEndpoint.java +++ b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusEndpoint.java @@ -1,4 +1,4 @@ -package me.zacharias.neuro.dock.genius; +package me.neurodock.genius; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusEndpointTool.java b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusEndpointTool.java similarity index 73% rename from GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusEndpointTool.java rename to GeniusAPI/src/main/java/me/neurodock/genius/GeniusEndpointTool.java index 8f2d09e..7c89c01 100644 --- a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusEndpointTool.java +++ b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusEndpointTool.java @@ -1,6 +1,6 @@ -package me.zacharias.neuro.dock.genius; +package me.neurodock.genius; -import me.zacharias.chat.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaFunctionTool; public abstract class GeniusEndpointTool extends OllamaFunctionTool { protected GeniusTools geniusToolsInstance; diff --git a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusTools.java b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java similarity index 96% rename from GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusTools.java rename to GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java index 6094f80..14ef89c 100644 --- a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/GeniusTools.java +++ b/GeniusAPI/src/main/java/me/neurodock/genius/GeniusTools.java @@ -1,12 +1,12 @@ -package me.zacharias.neuro.dock.genius; +package me.neurodock.genius; import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassInfo; import io.github.classgraph.ClassInfoList; import io.github.classgraph.ScanResult; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaFunctionTools; +import me.neurodock.core.Core; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaFunctionTools; import org.json.JSONObject; import java.io.BufferedReader; diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/ParameterStringBuilder.java b/GeniusAPI/src/main/java/me/neurodock/genius/ParameterStringBuilder.java similarity index 96% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/ParameterStringBuilder.java rename to GeniusAPI/src/main/java/me/neurodock/genius/ParameterStringBuilder.java index d95ac5e..2e82def 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/ParameterStringBuilder.java +++ b/GeniusAPI/src/main/java/me/neurodock/genius/ParameterStringBuilder.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.mal.api; +package me.neurodock.genius; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/endpoints/FindSong.java b/GeniusAPI/src/main/java/me/neurodock/genius/endpoints/FindSong.java similarity index 78% rename from GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/endpoints/FindSong.java rename to GeniusAPI/src/main/java/me/neurodock/genius/endpoints/FindSong.java index 7562f98..5a2dd2a 100644 --- a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/endpoints/FindSong.java +++ b/GeniusAPI/src/main/java/me/neurodock/genius/endpoints/FindSong.java @@ -1,19 +1,19 @@ -package me.zacharias.neuro.dock.genius.endpoints; +package me.neurodock.genius.endpoints; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; -import me.zacharias.neuro.dock.genius.GeniusEndpoint; -import me.zacharias.neuro.dock.genius.GeniusEndpointTool; -import me.zacharias.neuro.dock.genius.GeniusTools; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.genius.GeniusEndpoint; +import me.neurodock.genius.GeniusEndpointTool; +import me.neurodock.genius.GeniusTools; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONObject; import java.util.Map; -import static me.zacharias.chat.ollama.OllamaPerameter.OllamaPerameterBuilder.Type.STRING; +import static me.neurodock.ollama.OllamaPerameter.OllamaPerameterBuilder.Type.STRING; @GeniusEndpoint public class FindSong extends GeniusEndpointTool { diff --git a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/endpoints/GetLyrics.java b/GeniusAPI/src/main/java/me/neurodock/genius/endpoints/GetLyrics.java similarity index 89% rename from GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/endpoints/GetLyrics.java rename to GeniusAPI/src/main/java/me/neurodock/genius/endpoints/GetLyrics.java index 9b67f02..1705217 100644 --- a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/endpoints/GetLyrics.java +++ b/GeniusAPI/src/main/java/me/neurodock/genius/endpoints/GetLyrics.java @@ -1,12 +1,12 @@ -package me.zacharias.neuro.dock.genius.endpoints; +package me.neurodock.genius.endpoints; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; -import me.zacharias.neuro.dock.genius.GeniusEndpoint; -import me.zacharias.neuro.dock.genius.GeniusEndpointTool; -import me.zacharias.neuro.dock.genius.GeniusTools; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.genius.GeniusEndpoint; +import me.neurodock.genius.GeniusEndpointTool; +import me.neurodock.genius.GeniusTools; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; import org.jsoup.Jsoup; @@ -16,7 +16,7 @@ import org.jsoup.nodes.Node; import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; -import static me.zacharias.chat.core.Core.writeLog; +import static me.neurodock.core.Core.writeLog; /** * This class is an Ollama tool that fetches the lyrics of a song by its ID from the Genius API. diff --git a/GeniusAPI/src/test/java/LyricsFetch.java b/GeniusAPI/src/test/java/LyricsFetch.java index 9da6973..1458aee 100644 --- a/GeniusAPI/src/test/java/LyricsFetch.java +++ b/GeniusAPI/src/test/java/LyricsFetch.java @@ -6,11 +6,8 @@ import org.jsoup.nodes.TextNode; import org.jsoup.select.Elements; import org.junit.jupiter.api.Test; -import javax.swing.text.html.HTML; -import java.util.regex.MatchResult; import java.util.regex.Pattern; -import static me.zacharias.chat.core.Core.writeLog; import static org.junit.jupiter.api.Assertions.assertNotNull; public class LyricsFetch { diff --git a/MALAPITool/build.gradle b/MALAPITool/build.gradle index 1f50762..e674960 100644 --- a/MALAPITool/build.gradle +++ b/MALAPITool/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' repositories { diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALAPITool.java b/MALAPITool/src/main/java/me/neurodock/mal/api/MALAPITool.java similarity index 96% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALAPITool.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/MALAPITool.java index f87a414..34758b9 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALAPITool.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/MALAPITool.java @@ -1,15 +1,16 @@ -package me.zacharias.chat.mal.api; +package me.neurodock.mal.api; import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassInfo; import io.github.classgraph.ClassInfoList; import io.github.classgraph.ScanResult; -import me.zacharias.chat.core.Core; +import me.neurodock.core.Core; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaFunctionTools; import me.zacharias.chat.ollama.*; import org.json.JSONObject; import java.io.BufferedReader; -import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.InvocationTargetException; @@ -18,7 +19,6 @@ import java.net.URI; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; import java.util.HashMap; public class MALAPITool { diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALEndpoint.java b/MALAPITool/src/main/java/me/neurodock/mal/api/MALEndpoint.java similarity index 88% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALEndpoint.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/MALEndpoint.java index baba13d..86f11ca 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALEndpoint.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/MALEndpoint.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.mal.api; +package me.neurodock.mal.api; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALEndpointTool.java b/MALAPITool/src/main/java/me/neurodock/mal/api/MALEndpointTool.java similarity index 73% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALEndpointTool.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/MALEndpointTool.java index 5b8eaaf..ae6ab83 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/MALEndpointTool.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/MALEndpointTool.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.mal.api; +package me.neurodock.mal.api; -import me.zacharias.chat.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaFunctionTool; public abstract class MALEndpointTool extends OllamaFunctionTool { protected MALAPITool MALAPIToolInstance; diff --git a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/ParameterStringBuilder.java b/MALAPITool/src/main/java/me/neurodock/mal/api/ParameterStringBuilder.java similarity index 95% rename from GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/ParameterStringBuilder.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/ParameterStringBuilder.java index 3088a0a..09bea65 100644 --- a/GeniusAPI/src/main/java/me/zacharias/neuro/dock/genius/ParameterStringBuilder.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/ParameterStringBuilder.java @@ -1,4 +1,4 @@ -package me.zacharias.neuro.dock.genius; +package me.neurodock.mal.api; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetAnimeDetails.java b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetAnimeDetails.java similarity index 86% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetAnimeDetails.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetAnimeDetails.java index 1835903..fa0968b 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetAnimeDetails.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetAnimeDetails.java @@ -1,12 +1,12 @@ -package me.zacharias.chat.mal.api.endpoints; +package me.neurodock.mal.api.endpoints; -import me.zacharias.chat.mal.api.MALAPITool; -import me.zacharias.chat.mal.api.MALEndpoint; -import me.zacharias.chat.mal.api.MALEndpointTool; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.mal.api.MALAPITool; +import me.neurodock.mal.api.MALEndpoint; +import me.neurodock.mal.api.MALEndpointTool; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONObject; diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetAnimeList.java b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetAnimeList.java similarity index 86% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetAnimeList.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetAnimeList.java index cbac31c..0b4ed3d 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetAnimeList.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetAnimeList.java @@ -1,12 +1,12 @@ -package me.zacharias.chat.mal.api.endpoints; +package me.neurodock.mal.api.endpoints; -import me.zacharias.chat.mal.api.MALAPITool; -import me.zacharias.chat.mal.api.MALEndpoint; -import me.zacharias.chat.mal.api.MALEndpointTool; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.mal.api.MALAPITool; +import me.neurodock.mal.api.MALEndpoint; +import me.neurodock.mal.api.MALEndpointTool; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONObject; diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetManagDetails.java b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetManagDetails.java similarity index 86% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetManagDetails.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetManagDetails.java index 4f4edb0..f78a020 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetManagDetails.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetManagDetails.java @@ -1,12 +1,12 @@ -package me.zacharias.chat.mal.api.endpoints; +package me.neurodock.mal.api.endpoints; -import me.zacharias.chat.mal.api.MALAPITool; -import me.zacharias.chat.mal.api.MALEndpoint; -import me.zacharias.chat.mal.api.MALEndpointTool; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.mal.api.MALAPITool; +import me.neurodock.mal.api.MALEndpoint; +import me.neurodock.mal.api.MALEndpointTool; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONObject; diff --git a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetMangaList.java b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetMangaList.java similarity index 86% rename from MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetMangaList.java rename to MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetMangaList.java index b36bdb4..034d4f2 100644 --- a/MALAPITool/src/main/java/me/zacharias/chat/mal/api/endpoints/GetMangaList.java +++ b/MALAPITool/src/main/java/me/neurodock/mal/api/endpoints/GetMangaList.java @@ -1,12 +1,12 @@ -package me.zacharias.chat.mal.api.endpoints; +package me.neurodock.mal.api.endpoints; -import me.zacharias.chat.mal.api.MALAPITool; -import me.zacharias.chat.mal.api.MALEndpoint; -import me.zacharias.chat.mal.api.MALEndpointTool; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; -import me.zacharias.chat.ollama.exceptions.OllamaToolErrorException; +import me.neurodock.mal.api.MALAPITool; +import me.neurodock.mal.api.MALEndpoint; +import me.neurodock.mal.api.MALEndpointTool; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; +import me.neurodock.ollama.exceptions.OllamaToolErrorException; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONObject; diff --git a/Plugin-API/build.gradle b/Plugin-API/build.gradle index b6a6834..0c884df 100644 --- a/Plugin-API/build.gradle +++ b/Plugin-API/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java-library' } -group = 'me.zacharias.neurodock' version = '0.1.0' repositories { diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/Data.java b/Plugin-API/src/main/java/me/neurodock/plugin/Data.java similarity index 85% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/Data.java rename to Plugin-API/src/main/java/me/neurodock/plugin/Data.java index 73285d7..3a04092 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/Data.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/Data.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin; +package me.neurodock.plugin; import java.io.File; diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/LoadedPlugins.java b/Plugin-API/src/main/java/me/neurodock/plugin/LoadedPlugins.java similarity index 61% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/LoadedPlugins.java rename to Plugin-API/src/main/java/me/neurodock/plugin/LoadedPlugins.java index 3678c92..e32e52e 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/LoadedPlugins.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/LoadedPlugins.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin; +package me.neurodock.plugin; public class LoadedPlugins { // TODO: Implement diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/Plugin.java b/Plugin-API/src/main/java/me/neurodock/plugin/Plugin.java similarity index 90% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/Plugin.java rename to Plugin-API/src/main/java/me/neurodock/plugin/Plugin.java index fa4f229..9288eb5 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/Plugin.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/Plugin.java @@ -1,9 +1,8 @@ -package me.zacharias.chat.plugin; +package me.neurodock.plugin; -import me.zacharias.chat.plugin.annotations.InjectPluginMetadata; -import me.zacharias.chat.plugin.annotations.PluginEntryPoint; -import me.zacharias.chat.plugin.tool.Tool; +import me.neurodock.plugin.annotations.PluginEntryPoint; +import me.neurodock.plugin.tool.Tool; import org.jetbrains.annotations.NotNull; /** diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/PluginMetadata.java b/Plugin-API/src/main/java/me/neurodock/plugin/PluginMetadata.java similarity index 96% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/PluginMetadata.java rename to Plugin-API/src/main/java/me/neurodock/plugin/PluginMetadata.java index eeb93a8..e032e07 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/PluginMetadata.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/PluginMetadata.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin; +package me.neurodock.plugin; import org.jetbrains.annotations.NotNull; diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/annotations/InjectPluginMetadata.java b/Plugin-API/src/main/java/me/neurodock/plugin/annotations/InjectPluginMetadata.java similarity index 85% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/annotations/InjectPluginMetadata.java rename to Plugin-API/src/main/java/me/neurodock/plugin/annotations/InjectPluginMetadata.java index 04fcdf3..f49d095 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/annotations/InjectPluginMetadata.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/annotations/InjectPluginMetadata.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin.annotations; +package me.neurodock.plugin.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/annotations/PluginEntryPoint.java b/Plugin-API/src/main/java/me/neurodock/plugin/annotations/PluginEntryPoint.java similarity index 88% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/annotations/PluginEntryPoint.java rename to Plugin-API/src/main/java/me/neurodock/plugin/annotations/PluginEntryPoint.java index 496c08b..61d07d5 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/annotations/PluginEntryPoint.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/annotations/PluginEntryPoint.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin.annotations; +package me.neurodock.plugin.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/exceptions/PluginLoadingException.java b/Plugin-API/src/main/java/me/neurodock/plugin/exceptions/PluginLoadingException.java similarity index 81% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/exceptions/PluginLoadingException.java rename to Plugin-API/src/main/java/me/neurodock/plugin/exceptions/PluginLoadingException.java index b9466e9..5720a7d 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/exceptions/PluginLoadingException.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/exceptions/PluginLoadingException.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin.exceptions; +package me.neurodock.plugin.exceptions; public class PluginLoadingException extends RuntimeException { public PluginLoadingException(String message, String pluginName) { diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/exceptions/ToolRuntimeException.java b/Plugin-API/src/main/java/me/neurodock/plugin/exceptions/ToolRuntimeException.java similarity index 91% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/exceptions/ToolRuntimeException.java rename to Plugin-API/src/main/java/me/neurodock/plugin/exceptions/ToolRuntimeException.java index 47c8159..935bf6b 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/exceptions/ToolRuntimeException.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/exceptions/ToolRuntimeException.java @@ -1,6 +1,6 @@ -package me.zacharias.chat.plugin.exceptions; +package me.neurodock.plugin.exceptions; -import me.zacharias.chat.plugin.tool.Tool; +import me.neurodock.plugin.tool.Tool; public class ToolRuntimeException extends Exception { String toolName; diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/Tool.java b/Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java similarity index 94% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/Tool.java rename to Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java index 070f5a0..993f8b7 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/Tool.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/tool/Tool.java @@ -1,7 +1,7 @@ -package me.zacharias.chat.plugin.tool; +package me.neurodock.plugin.tool; -import me.zacharias.chat.plugin.Plugin; -import me.zacharias.chat.plugin.exceptions.ToolRuntimeException; +import me.neurodock.plugin.Plugin; +import me.neurodock.plugin.exceptions.ToolRuntimeException; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; diff --git a/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolArguments.java b/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolArguments.java new file mode 100644 index 0000000..f65a5ff --- /dev/null +++ b/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolArguments.java @@ -0,0 +1,4 @@ +package me.neurodock.plugin.tool; + +public class ToolArguments { +} diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolParameters.java b/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolParameters.java similarity index 87% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolParameters.java rename to Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolParameters.java index ecb50fa..9a1fed6 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolParameters.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolParameters.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin.tool; +package me.neurodock.plugin.tool; public class ToolParameters { /** diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolResponse.java b/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolResponse.java similarity index 85% rename from Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolResponse.java rename to Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolResponse.java index 201844a..8745b3b 100644 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolResponse.java +++ b/Plugin-API/src/main/java/me/neurodock/plugin/tool/ToolResponse.java @@ -1,4 +1,4 @@ -package me.zacharias.chat.plugin.tool; +package me.neurodock.plugin.tool; public class ToolResponse { public static ToolResponse empty(Tool tool) { diff --git a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolArguments.java b/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolArguments.java deleted file mode 100644 index 277908e..0000000 --- a/Plugin-API/src/main/java/me/zacharias/chat/plugin/tool/ToolArguments.java +++ /dev/null @@ -1,4 +0,0 @@ -package me.zacharias.chat.plugin.tool; - -public class ToolArguments { -} diff --git a/README.md b/README.md index 0ddd701..f35c3f3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Well it's basically a font end for Ollama like [Open-WebUI](https://openwebui.co ## Use cases? While the primary goal is providing a somewhat more modular frontend for Ollama, you can also use this system to integrate AI into your own application, For example AI could act as a player in a game or interact with external system with the use of tools via the API -simple examples are in the Display module where i gave it the ability to access python through docker and get the current date and time both with the [OllamaFunctionTool](https://server.4zellen.se:3000/Zacharias/chat_thing/src/branch/master/Core/src/main/java/me/zacharias/chat/ollama/OllamaFunctionTool.java) thru my Ollama framework +simple examples are in the Display module where i gave it the ability to access python through docker and get the current date and time both with the [OllamaFunctionTool](https://git.server.4zellen.se/neurodock/NeuroDock/src/branch/master/Core/src/main/java/me/neurodock/ollama/OllamaFunctionTool.java) thru my Ollama framework ## Legal Notice Regarding Scraping @@ -19,7 +19,7 @@ The author **does not endorse or encourage** scraping or any other use that viol Use this software **at your own risk**. The author disclaims any liability for legal or technical consequences arising from its use. ## API -The documentation for the API is available at the gitea wiki under [API docs](https://server.4zellen.se:3000/Chat_things/NeuroDock/wiki/API-Docs) +The documentation for the API is available at the gitea wiki under [API docs](https://git.server.4zellen.se/neurodock/NeuroDock/wiki/API-Docs) ## How to run? To run you need to build the `launcher` module
@@ -45,11 +45,11 @@ If you only want to build a specific module, you can use the same command as lis - Core: `$ ./gradlew :Core:shadowJar` - However, this one is kinda useless unless you want to directly implement the system into your application - MALAPITool: `$ ./gradlew :MALAPITool:shadowJar` - - Please read MALAPITool [README.md](https://server.4zellen.se:3000/Chat_things/NeuroDock/src/branch/master/MALAPITool/README.md) + - Please read MALAPITool [README.md](https://git.server.4zellen.se/neurodock/NeuroDock/src/branch/master/MALAPITool/README.md) - Launcher: `$ ./gradlew :launcher:shadowJar` - Depends on `API`, `Display` and `Core` - This is the main module that runs the application and starts the API server ## Maven dependency avalible! -- Core: [Gitea](https://git.server.4zellen.se/Chat_things/-/packages/maven/me.zacharias.neurodock:core) -- Plugin-API: [Gitea](https://git.server.4zellen.se/Chat_things/-/packages/maven/me.zacharias.neurodock:plugin-api) \ No newline at end of file +- Core: [Gitea](https://git.server.4zellen.se/neurodock/-/packages/maven/me.zacharias.neurodock:core) +- Plugin-API: [Gitea](https://git.server.4zellen.se/neurodock/-/packages/maven/me.zacharias.neurodock:plugin-api) \ No newline at end of file diff --git a/WikipediaTool/build.gradle b/WikipediaTool/build.gradle index ce71caf..7deb642 100644 --- a/WikipediaTool/build.gradle +++ b/WikipediaTool/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' repositories { diff --git a/WikipediaTool/src/main/java/me/zacharias/neuro/dock/wikipedia/GetWikiPageText.java b/WikipediaTool/src/main/java/me/neurodock/wikipedia/GetWikiPageText.java similarity index 77% rename from WikipediaTool/src/main/java/me/zacharias/neuro/dock/wikipedia/GetWikiPageText.java rename to WikipediaTool/src/main/java/me/neurodock/wikipedia/GetWikiPageText.java index 317a213..e72bcda 100644 --- a/WikipediaTool/src/main/java/me/zacharias/neuro/dock/wikipedia/GetWikiPageText.java +++ b/WikipediaTool/src/main/java/me/neurodock/wikipedia/GetWikiPageText.java @@ -1,10 +1,10 @@ -package me.zacharias.neuro.dock.wikipedia; +package me.neurodock.wikipedia; import io.github.fastily.jwiki.core.Wiki; -import me.zacharias.chat.ollama.OllamaFunctionArgument; -import me.zacharias.chat.ollama.OllamaFunctionTool; -import me.zacharias.chat.ollama.OllamaPerameter; -import me.zacharias.chat.ollama.OllamaToolResponse; +import me.neurodock.ollama.OllamaFunctionArgument; +import me.neurodock.ollama.OllamaFunctionTool; +import me.neurodock.ollama.OllamaPerameter; +import me.neurodock.ollama.OllamaToolResponse; import org.jetbrains.annotations.NotNull; public class GetWikiPageText extends OllamaFunctionTool { diff --git a/WikipediaTool/src/main/java/me/zacharias/neuro/dock/wikipedia/WikipediaTool.java b/WikipediaTool/src/main/java/me/neurodock/wikipedia/WikipediaTool.java similarity index 80% rename from WikipediaTool/src/main/java/me/zacharias/neuro/dock/wikipedia/WikipediaTool.java rename to WikipediaTool/src/main/java/me/neurodock/wikipedia/WikipediaTool.java index 8d51e5e..e9b1285 100644 --- a/WikipediaTool/src/main/java/me/zacharias/neuro/dock/wikipedia/WikipediaTool.java +++ b/WikipediaTool/src/main/java/me/neurodock/wikipedia/WikipediaTool.java @@ -1,8 +1,8 @@ -package me.zacharias.neuro.dock.wikipedia; +package me.neurodock.wikipedia; import io.github.fastily.jwiki.core.Wiki; -import me.zacharias.chat.core.Core; -import me.zacharias.chat.ollama.OllamaFunctionTools; +import me.neurodock.core.Core; +import me.neurodock.ollama.OllamaFunctionTools; public class WikipediaTool { private OllamaFunctionTools wikipediaToolsInstance; diff --git a/build.gradle b/build.gradle index 4a44540..af706c4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,12 @@ plugins { id 'com.gradleup.shadow' version '9.0.0-beta7' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' allprojects { + group = 'me.neurodock' + apply plugin: 'maven-publish' repositories { @@ -82,7 +83,7 @@ subprojects { repositories { maven { name = "gitea" - url = "https://git.server.4zellen.se/api/packages/Chat_things/maven" + url = "https://git.server.4zellen.se/api/packages/neurodock/maven" credentials { username = project.findProperty("giteaUser") password = project.findProperty("giteaToken") diff --git a/launcher/build.gradle b/launcher/build.gradle index cab1a7a..47c1d4f 100644 --- a/launcher/build.gradle +++ b/launcher/build.gradle @@ -2,7 +2,6 @@ plugins { id 'java' } -group = 'me.zacharias' version = '1.0-SNAPSHOT' dependencies { diff --git a/launcher/src/main/java/me/zacharias/chat/launcher/Launcher.java b/launcher/src/main/java/me/neurodock/launcher/Launcher.java similarity index 95% rename from launcher/src/main/java/me/zacharias/chat/launcher/Launcher.java rename to launcher/src/main/java/me/neurodock/launcher/Launcher.java index 1269157..04c6afa 100644 --- a/launcher/src/main/java/me/zacharias/chat/launcher/Launcher.java +++ b/launcher/src/main/java/me/neurodock/launcher/Launcher.java @@ -1,10 +1,8 @@ -package me.zacharias.chat.launcher; +package me.neurodock.launcher; -//import me.zacharias.chat.api.APIApplication; -import me.zacharias.chat.core.LaunchOptions; -import me.zacharias.chat.display.Display; - -import java.lang.reflect.Method; +//import api.me.neurodock.APIApplication; +import me.neurodock.core.LaunchOptions; +import me.neurodock.display.Display; /** * The launcher for AI_chat.