Noah/NeuroDock
1
0
Fork 0
forked from neurodock/NeuroDock
Code Pull Requests Activity

Moved versions of the "public facing" modules to the gradle.properties

Browse Source 
Core:
- Fixed my promis of making Core work with multiple OllamaObjects
This commit is contained in:
Zacharias
2026-07-30 21:24:06 +02:00
parent b8280e6ec5
commit 5ae5920478
5 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/build.gradle
+3 -1
View File
@@ -2,11 +2,13 @@ plugins {
id 'java-library'
}
version = '1.10.0'
version = coreVersion
dependencies {
implementation project(":Plugin-API")
api "org.json:json:20250107"
implementation 'org.graalvm.polyglot:polyglot:25.1.3'
implementation 'org.graalvm.polyglot:js:25.1.3'
}
java {
Core/src/main/java/me/neurodock/core/Core.java
+16 -26
View File
@@ -326,25 +326,20 @@ public class Core {
* @param ollamaObject The OllamaObject to use
*/
public void setOllamaObject(OllamaObject ollamaObject) {
if(this.ollamaObject == null) {
this.ollamaObject = ollamaObject;
this.ollamaObject = ollamaObject;
for(Pair<OllamaTool, String> tool : ollamaObject.getTools()) {
if(tool.getKey() instanceof OllamaFunctionTool functionTool)
{
funtionTools.add(new Pair<>(functionTool, tool.getValue()));
}
for(Pair<OllamaTool, String> tool : ollamaObject.getTools()) {
if(tool.getKey() instanceof OllamaFunctionTool functionTool)
{
funtionTools.add(new Pair<>(functionTool, tool.getValue()));
}
}
addTool(new AddMemoryFunction(), Source.CORE);
addTool(new RemoveMemoryFunction(), Source.CORE);
addTool(new GetMemoryFunction(), Source.CORE);
addTool(new GetMemoriesFunction(), Source.CORE);
addTool(new GetMemoryIdentitiesFunction(), Source.CORE);
}
else {
throw new IllegalArgumentException("Ollama object is already set");
}
addTool(new AddMemoryFunction(), Source.CORE);
addTool(new RemoveMemoryFunction(), Source.CORE);
addTool(new GetMemoryFunction(), Source.CORE);
addTool(new GetMemoriesFunction(), Source.CORE);
addTool(new GetMemoryIdentitiesFunction(), Source.CORE);
}
/**
@@ -353,18 +348,13 @@ public class Core {
* @param ollamaObject The OllamaObject to use
*/
public void setOllamaObjectNoMemory(OllamaObject ollamaObject) {
if(this.ollamaObject == null) {
this.ollamaObject = ollamaObject;
for(Pair<OllamaTool, String> tool : ollamaObject.getTools()) {
if(tool.getKey() instanceof OllamaFunctionTool functionTool)
{
funtionTools.add(new Pair<>(functionTool, tool.getValue()));
}
this.ollamaObject = ollamaObject;
for(Pair<OllamaTool, String> tool : ollamaObject.getTools()) {
if(tool.getKey() instanceof OllamaFunctionTool functionTool)
{
funtionTools.add(new Pair<>(functionTool, tool.getValue()));
}
}
else {
throw new IllegalArgumentException("Ollama object is already set");
}
}
/**