mirror of
https://github.com/slhaf/Partner.git
synced 2026-06-29 02:29:16 +08:00
Compare commits
8 Commits
buildable/
...
70a94d9c30
| Author | SHA1 | Date | |
|---|---|---|---|
| 70a94d9c30 | |||
| ef096e76b3 | |||
| ed743521ec | |||
| cb8ddfe4e2 | |||
| 756c0a12ad | |||
| 8a5b844a4a | |||
|
|
8d29ea4c9e | ||
|
|
4770eaf42f |
@@ -50,70 +50,70 @@ final class ActionPoolStateCodec {
|
||||
}
|
||||
|
||||
private static StateValue.Obj encodeExecutableAction(ExecutableAction action) {
|
||||
Map<String, StateValue> actionMap = new LinkedHashMap<>();
|
||||
actionMap.put("kind", StateValue.str(action instanceof SchedulableExecutableAction ? "schedulable" : "immediate"));
|
||||
actionMap.put("uuid", StateValue.str(action.getUuid()));
|
||||
actionMap.put("source", StateValue.str(action.getSource()));
|
||||
actionMap.put("reason", StateValue.str(action.getReason()));
|
||||
actionMap.put("description", StateValue.str(action.getDescription()));
|
||||
actionMap.put("status", StateValue.str(action.getStatus().name()));
|
||||
actionMap.put("tendency", StateValue.str(action.getTendency()));
|
||||
actionMap.put("executing_stage", StateValue.num(action.getExecutingStage()));
|
||||
Map<String, Object> actionMap = new LinkedHashMap<>();
|
||||
actionMap.put("kind", action instanceof SchedulableExecutableAction ? "schedulable" : "immediate");
|
||||
actionMap.put("uuid", action.getUuid());
|
||||
actionMap.put("source", action.getSource());
|
||||
actionMap.put("reason", action.getReason());
|
||||
actionMap.put("description", action.getDescription());
|
||||
actionMap.put("status", action.getStatus().name());
|
||||
actionMap.put("tendency", action.getTendency());
|
||||
actionMap.put("executing_stage", action.getExecutingStage());
|
||||
|
||||
String result = resolveExecutableResult(action);
|
||||
if (result != null) {
|
||||
actionMap.put("result", StateValue.str(result));
|
||||
actionMap.put("result", result);
|
||||
}
|
||||
if (action instanceof SchedulableExecutableAction schedulableAction) {
|
||||
actionMap.put("schedule_type", StateValue.str(schedulableAction.getScheduleType().name()));
|
||||
actionMap.put("schedule_content", StateValue.str(schedulableAction.getScheduleContent()));
|
||||
actionMap.put("enabled", StateValue.bool(schedulableAction.getEnabled()));
|
||||
actionMap.put("schedule_histories", StateValue.arr(encodeScheduleHistories(schedulableAction)));
|
||||
actionMap.put("schedule_type", schedulableAction.getScheduleType().name());
|
||||
actionMap.put("schedule_content", schedulableAction.getScheduleContent());
|
||||
actionMap.put("enabled", schedulableAction.getEnabled());
|
||||
actionMap.put("schedule_histories", encodeScheduleHistories(schedulableAction));
|
||||
}
|
||||
|
||||
List<StateValue> chainStates = action.getActionChain().entrySet().stream()
|
||||
List<StateValue.Obj> chainStates = action.getActionChain().entrySet().stream()
|
||||
.sorted(Map.Entry.comparingByKey())
|
||||
.<StateValue>map(entry -> {
|
||||
Map<String, StateValue> stageMap = new LinkedHashMap<>();
|
||||
stageMap.put("stage", StateValue.num(entry.getKey()));
|
||||
.map(entry -> {
|
||||
Map<String, Object> stageMap = new LinkedHashMap<>();
|
||||
stageMap.put("stage", entry.getKey());
|
||||
String stageDescription = action.getStageDescriptions().get(entry.getKey());
|
||||
if (stageDescription != null && !stageDescription.isBlank()) {
|
||||
stageMap.put("description", StateValue.str(stageDescription));
|
||||
stageMap.put("description", stageDescription);
|
||||
}
|
||||
stageMap.put("actions", StateValue.arr(entry.getValue().stream()
|
||||
.map(metaAction -> (StateValue) encodeMetaAction(metaAction))
|
||||
.toList()));
|
||||
stageMap.put("actions", entry.getValue().stream()
|
||||
.map(ActionPoolStateCodec::encodeMetaAction)
|
||||
.toList());
|
||||
return StateValue.obj(stageMap);
|
||||
}).toList();
|
||||
actionMap.put("action_chain", StateValue.arr(chainStates));
|
||||
actionMap.put("action_chain", chainStates);
|
||||
|
||||
actionMap.put("history", StateValue.arr(encodeHistoryStages(action.getHistory())));
|
||||
actionMap.put("history", encodeHistoryStages(action.getHistory()));
|
||||
|
||||
return StateValue.obj(actionMap);
|
||||
}
|
||||
|
||||
private static StateValue.Obj encodeMetaAction(MetaAction metaAction) {
|
||||
Map<String, StateValue> metaMap = new LinkedHashMap<>();
|
||||
metaMap.put("name", StateValue.str(metaAction.getName()));
|
||||
metaMap.put("io", StateValue.bool(metaAction.getIo()));
|
||||
Map<String, Object> metaMap = new LinkedHashMap<>();
|
||||
metaMap.put("name", metaAction.getName());
|
||||
metaMap.put("io", metaAction.getIo());
|
||||
if (metaAction.getLauncher() != null) {
|
||||
metaMap.put("launcher", StateValue.str(metaAction.getLauncher()));
|
||||
metaMap.put("launcher", metaAction.getLauncher());
|
||||
}
|
||||
metaMap.put("type", StateValue.str(metaAction.getType().name()));
|
||||
metaMap.put("location", StateValue.str(metaAction.getLocation()));
|
||||
metaMap.put("params_json", StateValue.str(JSONObject.toJSONString(metaAction.getParams())));
|
||||
metaMap.put("result_status", StateValue.str(metaAction.getResult().getStatus().name()));
|
||||
metaMap.put("type", metaAction.getType().name());
|
||||
metaMap.put("location", metaAction.getLocation());
|
||||
metaMap.put("params_json", JSONObject.toJSONString(metaAction.getParams()));
|
||||
metaMap.put("result_status", metaAction.getResult().getStatus().name());
|
||||
if (metaAction.getResult().getData() != null) {
|
||||
metaMap.put("result_data", StateValue.str(metaAction.getResult().getData()));
|
||||
metaMap.put("result_data", metaAction.getResult().getData());
|
||||
}
|
||||
return StateValue.obj(metaMap);
|
||||
}
|
||||
|
||||
private static StateValue.Obj encodeHistoryAction(HistoryAction historyAction) {
|
||||
Map<String, StateValue> historyMap = new LinkedHashMap<>();
|
||||
historyMap.put("action_key", StateValue.str(historyAction.actionKey()));
|
||||
historyMap.put("description", StateValue.str(historyAction.description()));
|
||||
historyMap.put("result", StateValue.str(historyAction.result()));
|
||||
Map<String, Object> historyMap = new LinkedHashMap<>();
|
||||
historyMap.put("action_key", historyAction.actionKey());
|
||||
historyMap.put("description", historyAction.description());
|
||||
historyMap.put("result", historyAction.result());
|
||||
return StateValue.obj(historyMap);
|
||||
}
|
||||
|
||||
@@ -288,26 +288,26 @@ final class ActionPoolStateCodec {
|
||||
return restored;
|
||||
}
|
||||
|
||||
private static List<StateValue> encodeHistoryStages(Map<Integer, ? extends List<HistoryAction>> historyMap) {
|
||||
private static List<StateValue.Obj> encodeHistoryStages(Map<Integer, ? extends List<HistoryAction>> historyMap) {
|
||||
return historyMap.entrySet().stream()
|
||||
.sorted(Map.Entry.comparingByKey())
|
||||
.<StateValue>map(entry -> {
|
||||
Map<String, StateValue> stageMap = new LinkedHashMap<>();
|
||||
stageMap.put("stage", StateValue.num(entry.getKey()));
|
||||
stageMap.put("actions", StateValue.arr(entry.getValue().stream()
|
||||
.map(historyAction -> (StateValue) encodeHistoryAction(historyAction))
|
||||
.toList()));
|
||||
.map(entry -> {
|
||||
Map<String, Object> stageMap = new LinkedHashMap<>();
|
||||
stageMap.put("stage", entry.getKey());
|
||||
stageMap.put("actions", entry.getValue().stream()
|
||||
.map(ActionPoolStateCodec::encodeHistoryAction)
|
||||
.toList());
|
||||
return StateValue.obj(stageMap);
|
||||
}).toList();
|
||||
}
|
||||
|
||||
private static List<StateValue> encodeScheduleHistories(SchedulableExecutableAction schedulableAction) {
|
||||
private static List<StateValue.Obj> encodeScheduleHistories(SchedulableExecutableAction schedulableAction) {
|
||||
return schedulableAction.getScheduleHistories().stream()
|
||||
.<StateValue>map(scheduleHistory -> {
|
||||
Map<String, StateValue> historyMap = new LinkedHashMap<>();
|
||||
historyMap.put("end_time", StateValue.str(scheduleHistory.getEndTime().toString()));
|
||||
historyMap.put("result", StateValue.str(scheduleHistory.getResult()));
|
||||
historyMap.put("history", StateValue.arr(encodeHistoryStages(scheduleHistory.getHistory())));
|
||||
.map(scheduleHistory -> {
|
||||
Map<String, Object> historyMap = new LinkedHashMap<>();
|
||||
historyMap.put("end_time", scheduleHistory.getEndTime().toString());
|
||||
historyMap.put("result", scheduleHistory.getResult());
|
||||
historyMap.put("history", encodeHistoryStages(scheduleHistory.getHistory()));
|
||||
return StateValue.obj(historyMap);
|
||||
})
|
||||
.toList();
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package work.slhaf.partner.core.cognition;
|
||||
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.Capability;
|
||||
import work.slhaf.partner.framework.agent.model.pojo.Message;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package work.slhaf.partner.core.cognition;
|
||||
package work.slhaf.partner.core.cognition.context;
|
||||
|
||||
import com.alibaba.fastjson2.JSONArray;
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
@@ -27,7 +27,7 @@ import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
@Slf4j
|
||||
@CapabilityCore(value = "cognition")
|
||||
public class CognitionCore implements StateSerializable {
|
||||
public class ContextCore implements StateSerializable {
|
||||
|
||||
private static final String RECENT_CHAT_MESSAGE_NOTES = """
|
||||
消息格式:
|
||||
@@ -58,7 +58,7 @@ public class CognitionCore implements StateSerializable {
|
||||
|
||||
private final ContextWorkspace contextWorkspace = new ContextWorkspace();
|
||||
|
||||
public CognitionCore() {
|
||||
public ContextCore() {
|
||||
register();
|
||||
}
|
||||
|
||||
@@ -200,13 +200,12 @@ public class CognitionCore implements StateSerializable {
|
||||
public @NotNull State convert() {
|
||||
State state = new State();
|
||||
|
||||
List<StateValue.Obj> convertedMessageList = chatMessages.stream().map(message -> {
|
||||
Map<String, StateValue> convertedMap = Map.of(
|
||||
"role", StateValue.str(message.roleValue()),
|
||||
"content", StateValue.str(message.getContent())
|
||||
);
|
||||
return StateValue.obj(convertedMap);
|
||||
}).toList();
|
||||
List<StateValue.Obj> convertedMessageList = chatMessages.stream()
|
||||
.map(message -> StateValue.obj(Map.of(
|
||||
"role", message.roleValue(),
|
||||
"content", message.getContent()
|
||||
)))
|
||||
.toList();
|
||||
state.append("chat_messages", StateValue.arr(convertedMessageList));
|
||||
|
||||
return state;
|
||||
@@ -1,4 +1,4 @@
|
||||
package work.slhaf.partner.core.cognition
|
||||
package work.slhaf.partner.core.cognition.context
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject
|
||||
import org.w3c.dom.Document
|
||||
@@ -1,4 +1,4 @@
|
||||
package work.slhaf.partner.core.cognition
|
||||
package work.slhaf.partner.core.cognition.context
|
||||
|
||||
import org.w3c.dom.Document
|
||||
import work.slhaf.partner.framework.agent.model.pojo.Message
|
||||
@@ -175,8 +175,7 @@ public class MemoryCore implements StateSerializable {
|
||||
State state = new State();
|
||||
state.append("memory_session_id", StateValue.str(memorySessionId));
|
||||
|
||||
List<StateValue.Str> unitOverview = memoryUnits.keySet().stream()
|
||||
.map(StateValue::str)
|
||||
List<String> unitOverview = memoryUnits.keySet().stream()
|
||||
.toList();
|
||||
state.append("memory_unit_uuid_set", StateValue.arr(unitOverview));
|
||||
return state;
|
||||
|
||||
@@ -95,25 +95,23 @@ public class MemoryUnit implements StateSerializable {
|
||||
state.append("id", StateValue.str(id));
|
||||
state.append("update_timestamp", StateValue.num(timestamp));
|
||||
|
||||
List<StateValue.Obj> convertedMessageList = conversationMessages.stream().map(message -> {
|
||||
Map<String, StateValue> convertedMap = Map.of(
|
||||
"role", StateValue.str(message.roleValue()),
|
||||
"content", StateValue.str(message.getContent())
|
||||
);
|
||||
return StateValue.obj(convertedMap);
|
||||
}).toList();
|
||||
List<StateValue.Obj> convertedMessageList = conversationMessages.stream()
|
||||
.map(message -> StateValue.obj(Map.of(
|
||||
"role", message.roleValue(),
|
||||
"content", message.getContent()
|
||||
)))
|
||||
.toList();
|
||||
state.append("conversation_messages", StateValue.arr(convertedMessageList));
|
||||
|
||||
List<StateValue.Obj> convertedSliceList = slices.stream().map(slice -> {
|
||||
Map<String, StateValue> convertedMap = Map.of(
|
||||
"id", StateValue.str(slice.getId()),
|
||||
"start_index", StateValue.num(slice.getStartIndex()),
|
||||
"end_index", StateValue.num(slice.getEndIndex()),
|
||||
"summary", StateValue.str(slice.getSummary()),
|
||||
"created_timestamp", StateValue.num(slice.getTimestamp())
|
||||
);
|
||||
return StateValue.obj(convertedMap);
|
||||
}).toList();
|
||||
List<StateValue.Obj> convertedSliceList = slices.stream()
|
||||
.map(slice -> StateValue.obj(Map.of(
|
||||
"id", slice.getId(),
|
||||
"start_index", slice.getStartIndex(),
|
||||
"end_index", slice.getEndIndex(),
|
||||
"summary", slice.getSummary(),
|
||||
"created_timestamp", slice.getTimestamp()
|
||||
)))
|
||||
.toList();
|
||||
state.append("memory_slices", StateValue.arr(convertedSliceList));
|
||||
return state;
|
||||
}
|
||||
|
||||
@@ -6,9 +6,9 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.entity.MetaActionInfo;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.memory.MemoryCapability;
|
||||
import work.slhaf.partner.core.memory.pojo.MemorySlice;
|
||||
import work.slhaf.partner.core.memory.pojo.MemoryUnit;
|
||||
|
||||
@@ -12,7 +12,11 @@ import work.slhaf.partner.core.action.entity.MetaAction;
|
||||
import work.slhaf.partner.core.action.entity.MetaActionInfo;
|
||||
import work.slhaf.partner.core.action.entity.intervention.InterventionType;
|
||||
import work.slhaf.partner.core.action.entity.intervention.MetaIntervention;
|
||||
import work.slhaf.partner.core.cognition.*;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.CommunicationBlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace;
|
||||
import work.slhaf.partner.framework.agent.exception.AgentRuntimeException;
|
||||
import work.slhaf.partner.framework.agent.exception.ExceptionReporterHandler;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
|
||||
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.model.ActivateModel;
|
||||
|
||||
@@ -6,7 +6,7 @@ import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.ActionCapability;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.model.ActivateModel;
|
||||
|
||||
@@ -6,9 +6,9 @@ import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.entity.*;
|
||||
import work.slhaf.partner.core.action.entity.intervention.MetaIntervention;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.ContextWorkspace;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace;
|
||||
import work.slhaf.partner.module.StateHintContent;
|
||||
import work.slhaf.partner.module.action.executor.entity.HistoryAction;
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.entity.MetaActionInfo;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.model.ActivateModel;
|
||||
|
||||
@@ -8,9 +8,9 @@ import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.ActionCapability;
|
||||
import work.slhaf.partner.core.action.ActionCore;
|
||||
import work.slhaf.partner.core.action.entity.*;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.exception.AgentRuntimeException;
|
||||
import work.slhaf.partner.framework.agent.exception.ExceptionReporterHandler;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
|
||||
@@ -6,10 +6,10 @@ import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.ActionCapability;
|
||||
import work.slhaf.partner.core.action.ActionCore;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.ResolvedContext;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ResolvedContext;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.factory.component.annotation.Init;
|
||||
|
||||
@@ -2,7 +2,7 @@ package work.slhaf.partner.module.action.planner.extractor;
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.exception.AgentRuntimeException;
|
||||
import work.slhaf.partner.framework.agent.exception.ModuleExecutionException;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
|
||||
@@ -3,8 +3,8 @@ package work.slhaf.partner.module
|
||||
import org.w3c.dom.Document
|
||||
import org.w3c.dom.Element
|
||||
import work.slhaf.partner.common.base.Block
|
||||
import work.slhaf.partner.core.cognition.CommunicationBlockContent
|
||||
import work.slhaf.partner.core.cognition.ContextBlock
|
||||
import work.slhaf.partner.core.cognition.context.CommunicationBlockContent
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock
|
||||
import work.slhaf.partner.framework.agent.model.pojo.Message
|
||||
|
||||
abstract class TaskBlock @JvmOverloads constructor(
|
||||
|
||||
@@ -5,7 +5,11 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.Node;
|
||||
import work.slhaf.partner.core.cognition.*;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.CommunicationBlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ResolvedContext;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.factory.component.annotation.Init;
|
||||
|
||||
@@ -9,9 +9,9 @@ import work.slhaf.partner.core.action.ActionCapability;
|
||||
import work.slhaf.partner.core.action.ActionCore;
|
||||
import work.slhaf.partner.core.action.entity.Schedulable;
|
||||
import work.slhaf.partner.core.action.entity.StateAction;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.memory.MemoryCapability;
|
||||
import work.slhaf.partner.core.memory.pojo.MemorySlice;
|
||||
import work.slhaf.partner.core.memory.pojo.MemoryUnit;
|
||||
|
||||
@@ -69,8 +69,8 @@ final class MemoryRuntimeStateCodec {
|
||||
List<StateValue.Obj> dateIndexStates = dateIndex.entries().entrySet().stream()
|
||||
.sorted(Map.Entry.comparingByKey())
|
||||
.map(entry -> StateValue.obj(Map.of(
|
||||
"date", StateValue.str(entry.getKey().toString()),
|
||||
"refs", StateValue.arr(encodeSliceRefs(entry.getValue()))
|
||||
"date", entry.getKey().toString(),
|
||||
"refs", encodeSliceRefs(entry.getValue())
|
||||
)))
|
||||
.toList();
|
||||
state.append("date_index", StateValue.arr(dateIndexStates));
|
||||
@@ -82,8 +82,8 @@ final class MemoryRuntimeStateCodec {
|
||||
TopicMemoryIndex.TopicTreeNode topicNode,
|
||||
List<StateValue.Obj> topicStates) {
|
||||
topicStates.add(StateValue.obj(Map.of(
|
||||
"topic_path", StateValue.str(path),
|
||||
"bindings", StateValue.arr(encodeTopicBindings(topicNode.bindings()))
|
||||
"topic_path", path,
|
||||
"bindings", encodeTopicBindings(topicNode.bindings())
|
||||
)));
|
||||
for (Map.Entry<String, TopicMemoryIndex.TopicTreeNode> childEntry : topicNode.children().entrySet()) {
|
||||
collectTopicStates(path + "->" + childEntry.getKey(), childEntry.getValue(), topicStates);
|
||||
@@ -93,18 +93,16 @@ final class MemoryRuntimeStateCodec {
|
||||
private List<StateValue> encodeTopicBindings(List<TopicMemoryIndex.TopicBinding> bindings) {
|
||||
return bindings.stream()
|
||||
.map(binding -> (StateValue) StateValue.obj(Map.of(
|
||||
"unit_id", StateValue.str(binding.sliceRef().getUnitId()),
|
||||
"slice_id", StateValue.str(binding.sliceRef().getSliceId()),
|
||||
"timestamp", StateValue.num(binding.timestamp()),
|
||||
"unit_id", binding.sliceRef().getUnitId(),
|
||||
"slice_id", binding.sliceRef().getSliceId(),
|
||||
"timestamp", binding.timestamp(),
|
||||
"activation_profile", StateValue.obj(Map.of(
|
||||
"activation_weight", StateValue.num(binding.activationProfile().getActivationWeight()),
|
||||
"diffusion_weight", StateValue.num(binding.activationProfile().getDiffusionWeight()),
|
||||
"activation_weight", binding.activationProfile().getActivationWeight(),
|
||||
"diffusion_weight", binding.activationProfile().getDiffusionWeight(),
|
||||
"context_independence_weight",
|
||||
StateValue.num(binding.activationProfile().getContextIndependenceWeight())
|
||||
binding.activationProfile().getContextIndependenceWeight()
|
||||
)),
|
||||
"related_topic_paths", StateValue.arr(binding.relatedTopicPaths().stream()
|
||||
.map(StateValue::str)
|
||||
.toList())
|
||||
"related_topic_paths", binding.relatedTopicPaths()
|
||||
)))
|
||||
.toList();
|
||||
}
|
||||
@@ -156,8 +154,8 @@ final class MemoryRuntimeStateCodec {
|
||||
private List<StateValue> encodeSliceRefs(List<SliceRef> refs) {
|
||||
return refs.stream()
|
||||
.map(ref -> (StateValue) StateValue.obj(Map.of(
|
||||
"unit_id", StateValue.str(ref.getUnitId()),
|
||||
"slice_id", StateValue.str(ref.getSliceId())
|
||||
"unit_id", ref.getUnitId(),
|
||||
"slice_id", ref.getSliceId()
|
||||
)))
|
||||
.toList();
|
||||
}
|
||||
|
||||
@@ -7,9 +7,9 @@ import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.ActionCapability;
|
||||
import work.slhaf.partner.core.action.ActionCore;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule;
|
||||
|
||||
@@ -7,7 +7,7 @@ import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.action.ActionCapability;
|
||||
import work.slhaf.partner.core.action.ActionCore;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.factory.component.annotation.Init;
|
||||
|
||||
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.framework.agent.factory.component.annotation.InjectModule;
|
||||
|
||||
@@ -3,10 +3,10 @@ package work.slhaf.partner.module.perceive;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.CommunicationBlockContent;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.CommunicationBlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.perceive.PerceiveCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
|
||||
@@ -4,9 +4,9 @@ import kotlin.Unit;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.factory.capability.annotation.InjectCapability;
|
||||
import work.slhaf.partner.framework.agent.factory.component.abstracts.AbstractAgentModule;
|
||||
import work.slhaf.partner.runtime.PartnerRunningFlowContext;
|
||||
|
||||
@@ -3,9 +3,9 @@ package work.slhaf.partner.runtime.exception;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.framework.agent.exception.AgentException;
|
||||
import work.slhaf.partner.framework.agent.exception.ExceptionReport;
|
||||
import work.slhaf.partner.framework.agent.exception.ExceptionReporter;
|
||||
|
||||
@@ -3,6 +3,8 @@ package work.slhaf.partner.core.cognition;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock;
|
||||
import work.slhaf.partner.core.cognition.context.ContextCore;
|
||||
import work.slhaf.partner.framework.agent.model.pojo.Message;
|
||||
|
||||
import java.nio.file.Path;
|
||||
@@ -20,15 +22,15 @@ class CognitionCoreTest {
|
||||
|
||||
@Test
|
||||
void shouldRenderRecentChatMessagesWithWrapperAndNotes() {
|
||||
CognitionCore cognitionCore = new CognitionCore();
|
||||
cognitionCore.getChatMessages().addAll(List.of(
|
||||
ContextCore contextCore = new ContextCore();
|
||||
contextCore.getChatMessages().addAll(List.of(
|
||||
new Message(Message.Character.USER, "[[USER]: user-1]: hello"),
|
||||
new Message(Message.Character.ASSISTANT, "[NOT_REPLIED]: wait"),
|
||||
new Message(Message.Character.ASSISTANT, "latest message")
|
||||
));
|
||||
|
||||
cognitionCore.refreshRecentChatMessagesContext();
|
||||
String content = cognitionCore.contextWorkspace()
|
||||
contextCore.refreshRecentChatMessagesContext();
|
||||
String content = contextCore.contextWorkspace()
|
||||
.resolve(List.of(ContextBlock.FocusedDomain.COMMUNICATION))
|
||||
.encodeToMessage()
|
||||
.getContent();
|
||||
|
||||
@@ -2,6 +2,9 @@ package work.slhaf.partner.core.cognition
|
||||
|
||||
import org.junit.jupiter.api.Assertions.*
|
||||
import org.junit.jupiter.api.Test
|
||||
import work.slhaf.partner.core.cognition.context.BlockContent
|
||||
import work.slhaf.partner.core.cognition.context.ContextBlock
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace
|
||||
|
||||
class ContextWorkspaceTest {
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import work.slhaf.partner.core.action.ActionCore;
|
||||
import work.slhaf.partner.core.action.entity.*;
|
||||
import work.slhaf.partner.core.action.runner.RunnerClient;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextWorkspace;
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace;
|
||||
import work.slhaf.partner.framework.agent.support.Result;
|
||||
import work.slhaf.partner.module.action.executor.entity.ExtractorResult;
|
||||
import work.slhaf.partner.module.action.executor.entity.HistoryAction;
|
||||
|
||||
@@ -3,7 +3,7 @@ package work.slhaf.partner.module.communication;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.ContextWorkspace;
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace;
|
||||
import work.slhaf.partner.framework.agent.model.pojo.Message;
|
||||
import work.slhaf.partner.runtime.PartnerRunningFlowContext;
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
import org.w3c.dom.Element;
|
||||
import work.slhaf.partner.core.cognition.CognitionCapability;
|
||||
import work.slhaf.partner.core.cognition.context.ContextWorkspace;
|
||||
import work.slhaf.partner.core.memory.MemoryCapability;
|
||||
import work.slhaf.partner.core.memory.pojo.MemorySlice;
|
||||
import work.slhaf.partner.core.memory.pojo.MemoryUnit;
|
||||
@@ -65,8 +66,8 @@ class MemoryRuntimeTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
public work.slhaf.partner.core.cognition.ContextWorkspace contextWorkspace() {
|
||||
return new work.slhaf.partner.core.cognition.ContextWorkspace();
|
||||
public ContextWorkspace contextWorkspace() {
|
||||
return new ContextWorkspace();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -148,10 +148,130 @@ sealed interface StateValue {
|
||||
fun str(value: String) = Str(value)
|
||||
|
||||
@JvmStatic
|
||||
fun arr(value: List<StateValue>) = Arr(value)
|
||||
fun arr(value: List<*>): Arr {
|
||||
val visiting = java.util.IdentityHashMap<Any, Unit>()
|
||||
return Arr(convertList(value, visiting))
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun obj(value: Map<String, StateValue>) = Obj(value)
|
||||
fun obj(value: Map<String, *>): Obj {
|
||||
val visiting = java.util.IdentityHashMap<Any, Unit>()
|
||||
return Obj(convertMap(value, visiting))
|
||||
}
|
||||
|
||||
private fun convertValue(
|
||||
value: Any?,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): StateValue {
|
||||
return when (value) {
|
||||
null -> error("StateValue does not support null")
|
||||
is StateValue -> normalizeStateValue(value, visiting)
|
||||
is String -> Str(value)
|
||||
is Number -> Num(value)
|
||||
is Boolean -> Bool(value)
|
||||
is List<*> -> Arr(convertList(value, visiting))
|
||||
is Map<*, *> -> Obj(convertGenericMap(value, visiting))
|
||||
else -> error("Unsupported state value type: ${value::class.qualifiedName}")
|
||||
}
|
||||
}
|
||||
|
||||
private fun normalizeStateValue(
|
||||
value: StateValue,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): StateValue {
|
||||
return when (value) {
|
||||
is Num -> value
|
||||
is Bool -> value
|
||||
is Str -> value
|
||||
is Arr -> Arr(convertStateValueList(value.value, visiting))
|
||||
is Obj -> Obj(convertStateValueMap(value.value, visiting))
|
||||
}
|
||||
}
|
||||
|
||||
private fun convertList(
|
||||
value: List<*>,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): List<StateValue> {
|
||||
enterContainer(value, visiting)
|
||||
try {
|
||||
return value.map { convertValue(it, visiting) }
|
||||
} finally {
|
||||
leaveContainer(value, visiting)
|
||||
}
|
||||
}
|
||||
|
||||
private fun convertMap(
|
||||
value: Map<String, *>,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): Map<String, StateValue> {
|
||||
enterContainer(value, visiting)
|
||||
try {
|
||||
return value.entries.associateTo(LinkedHashMap()) { (key, mapValue) ->
|
||||
key to convertValue(mapValue, visiting)
|
||||
}
|
||||
} finally {
|
||||
leaveContainer(value, visiting)
|
||||
}
|
||||
}
|
||||
|
||||
private fun convertGenericMap(
|
||||
value: Map<*, *>,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): Map<String, StateValue> {
|
||||
enterContainer(value, visiting)
|
||||
try {
|
||||
return value.entries.associateTo(LinkedHashMap()) { (key, mapValue) ->
|
||||
check(key is String) {
|
||||
"StateValue object key must be String, but got: ${key?.let { it::class.qualifiedName }}"
|
||||
}
|
||||
key to convertValue(mapValue, visiting)
|
||||
}
|
||||
} finally {
|
||||
leaveContainer(value, visiting)
|
||||
}
|
||||
}
|
||||
|
||||
private fun convertStateValueList(
|
||||
value: List<StateValue>,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): List<StateValue> {
|
||||
enterContainer(value, visiting)
|
||||
try {
|
||||
return value.map { normalizeStateValue(it, visiting) }
|
||||
} finally {
|
||||
leaveContainer(value, visiting)
|
||||
}
|
||||
}
|
||||
|
||||
private fun convertStateValueMap(
|
||||
value: Map<String, StateValue>,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
): Map<String, StateValue> {
|
||||
enterContainer(value, visiting)
|
||||
try {
|
||||
return value.entries.associateTo(LinkedHashMap()) { (key, mapValue) ->
|
||||
key to normalizeStateValue(mapValue, visiting)
|
||||
}
|
||||
} finally {
|
||||
leaveContainer(value, visiting)
|
||||
}
|
||||
}
|
||||
|
||||
private fun enterContainer(
|
||||
container: Any,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
) {
|
||||
check(visiting.put(container, Unit) == null) {
|
||||
"Circular reference detected while constructing StateValue"
|
||||
}
|
||||
}
|
||||
|
||||
private fun leaveContainer(
|
||||
container: Any,
|
||||
visiting: java.util.IdentityHashMap<Any, Unit>
|
||||
) {
|
||||
visiting.remove(container)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
package work.slhaf.partner.framework.agent.state
|
||||
|
||||
fun main() {
|
||||
testNormalStateJson()
|
||||
println()
|
||||
testCircularReference()
|
||||
}
|
||||
|
||||
private fun testNormalStateJson() {
|
||||
val nestedMap = linkedMapOf(
|
||||
"name" to "partner",
|
||||
"enabled" to true,
|
||||
"count" to 3,
|
||||
"tags" to listOf("agent", "runtime", "state-center"),
|
||||
"meta" to linkedMapOf(
|
||||
"version" to "0.1.0",
|
||||
"experimental" to false
|
||||
)
|
||||
)
|
||||
|
||||
val state = State()
|
||||
state.append("root", StateValue.obj(nestedMap))
|
||||
state.append(
|
||||
"arr",
|
||||
StateValue.arr(
|
||||
listOf(
|
||||
"hello",
|
||||
123,
|
||||
true,
|
||||
linkedMapOf(
|
||||
"nested" to "value"
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
println("=== normal state ===")
|
||||
println(state.toString())
|
||||
}
|
||||
|
||||
private fun testCircularReference() {
|
||||
val cyclicMap = linkedMapOf<String, Any>()
|
||||
cyclicMap["name"] = "cyclic"
|
||||
cyclicMap["self"] = cyclicMap
|
||||
|
||||
println("=== circular reference ===")
|
||||
|
||||
try {
|
||||
val state = State()
|
||||
state.append("cyclic", StateValue.obj(cyclicMap))
|
||||
|
||||
// 如果前面没有抛错,这里再触发最终 JSON 输出
|
||||
println(state.toString())
|
||||
error("Expected circular reference detection, but no exception was thrown.")
|
||||
} catch (e: IllegalStateException) {
|
||||
println("circular reference detected as expected:")
|
||||
println(e.message)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
</parent>
|
||||
|
||||
<artifactId>partnerctl</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>1.0.1</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>21</maven.compiler.source>
|
||||
@@ -123,6 +123,7 @@
|
||||
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
|
||||
<buildArg>--initialize-at-build-time=kotlin.DeprecationLevel</buildArg>
|
||||
<buildArg>-H:IncludeResourceBundles=i18n.messages</buildArg>
|
||||
<buildArg>-H:IncludeLocales=zh-CN</buildArg>
|
||||
</buildArgs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
@@ -2,13 +2,12 @@ package work.slhaf.partner.ctl.commands
|
||||
|
||||
import kotlinx.serialization.json.*
|
||||
import picocli.CommandLine
|
||||
import work.slhaf.partner.ctl.commands.InitCommand.InstallChoice.BUILD_FROM_SOURCE
|
||||
import work.slhaf.partner.ctl.commands.InitCommand.InstallChoice.DOWNLOAD_JAR
|
||||
import work.slhaf.partner.ctl.commands.data.GatewayConfig
|
||||
import work.slhaf.partner.ctl.commands.data.OpenAiCompatible
|
||||
import work.slhaf.partner.ctl.commands.data.ProviderConfig
|
||||
import work.slhaf.partner.ctl.commands.init.buildFromSource
|
||||
import work.slhaf.partner.ctl.commands.init.configureExternalGateway
|
||||
import work.slhaf.partner.ctl.commands.init.configureOpenAiCompatible
|
||||
import work.slhaf.partner.ctl.commands.init.configureWebSocketGateway
|
||||
import work.slhaf.partner.ctl.commands.init.*
|
||||
import work.slhaf.partner.ctl.i18n.I18n.text
|
||||
import work.slhaf.partner.ctl.support.CommandInterrupted
|
||||
import work.slhaf.partner.ctl.support.inheritCommand
|
||||
@@ -176,11 +175,15 @@ class InitCommand : Runnable {
|
||||
|
||||
val installChoice = prompt.select(
|
||||
label = text("init.install.method.label"),
|
||||
choices = listOf(Choice(text("init.install.method.buildFromSource"), InstallChoice.BUILD_FROM_SOURCE))
|
||||
choices = listOf(
|
||||
Choice(text("init.install.method.buildFromSource"), BUILD_FROM_SOURCE),
|
||||
Choice(text("init.install.method.downloadFromRelease"), DOWNLOAD_JAR)
|
||||
)
|
||||
)
|
||||
|
||||
when (installChoice) {
|
||||
InstallChoice.BUILD_FROM_SOURCE -> buildFromSource(home, prompt)
|
||||
BUILD_FROM_SOURCE -> buildFromSource(home, prompt)
|
||||
DOWNLOAD_JAR -> downloadFromRelease(home, prompt)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -348,7 +351,8 @@ class InitCommand : Runnable {
|
||||
}
|
||||
|
||||
private enum class InstallChoice {
|
||||
BUILD_FROM_SOURCE
|
||||
BUILD_FROM_SOURCE,
|
||||
DOWNLOAD_JAR
|
||||
}
|
||||
|
||||
private enum class ModelProviderChoice(val display: String) {
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package work.slhaf.partner.ctl.commands.init
|
||||
|
||||
import work.slhaf.partner.ctl.i18n.I18n.text
|
||||
import work.slhaf.partner.ctl.support.SourceBuildInstallSpec
|
||||
import work.slhaf.partner.ctl.support.buildAndInstallFromSource
|
||||
import work.slhaf.partner.ctl.support.downloadTo
|
||||
import work.slhaf.partner.ctl.support.registryIndex
|
||||
import work.slhaf.partner.ctl.ui.Prompt
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.Paths
|
||||
import kotlin.io.path.exists
|
||||
import kotlin.io.path.isDirectory
|
||||
import kotlin.io.path.name
|
||||
|
||||
@@ -40,3 +44,41 @@ private fun findLargestJar(directory: Path): Path? {
|
||||
.orElse(null)
|
||||
}
|
||||
}
|
||||
|
||||
fun downloadFromRelease(home: Path, prompt: Prompt) {
|
||||
prompt.info(text("init.install.method.downloadFromRelease.startDownloading"))
|
||||
val path = home.resolve("resources/partner-core.jar").toAbsolutePath().normalize()
|
||||
downloadTo(registryIndex.partner.latestRelease.url, path) { downloaded, total ->
|
||||
if (total != null && total > 0) {
|
||||
val percent = downloaded * 100 / total
|
||||
updateLine(
|
||||
text(
|
||||
"init.install.method.downloadFromRelease.progress.percent",
|
||||
percent
|
||||
)
|
||||
)
|
||||
} else {
|
||||
updateLine(
|
||||
text(
|
||||
"init.install.method.downloadFromRelease.progress.size",
|
||||
downloaded / 1024
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
finishLine(text("init.install.method.downloadFromRelease.done"))
|
||||
if (!path.exists()) {
|
||||
throw IllegalStateException("Unable to find downloaded partner release at $path")
|
||||
}
|
||||
prompt.success(text("init.install.method.downloadFromRelease.success"))
|
||||
}
|
||||
|
||||
fun updateLine(text: String) {
|
||||
print("\r\u001B[2K$text")
|
||||
System.out.flush()
|
||||
}
|
||||
|
||||
fun finishLine(text: String) {
|
||||
updateLine(text)
|
||||
println()
|
||||
}
|
||||
@@ -6,7 +6,7 @@ import kotlinx.serialization.json.Json
|
||||
private const val registryUrl = "https://raw.githubusercontent.com/slhaf/Partner/refs/heads/master/registry"
|
||||
private const val indexUrl = "$registryUrl/index.json"
|
||||
|
||||
private val registryIndex = run {
|
||||
val registryIndex = run {
|
||||
Json.decodeFromString<RegistryIndex>(fetchText(indexUrl))
|
||||
}
|
||||
|
||||
|
||||
@@ -5,11 +5,15 @@ import java.net.InetSocketAddress
|
||||
import java.net.ProxySelector
|
||||
import java.net.URI
|
||||
import java.net.http.*
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.Path
|
||||
import java.nio.file.StandardCopyOption
|
||||
import java.time.Duration
|
||||
import kotlin.io.path.isDirectory
|
||||
|
||||
private val httpClient: HttpClient = HttpClient.newBuilder()
|
||||
.connectTimeout(Duration.ofSeconds(20))
|
||||
.followRedirects(HttpClient.Redirect.NEVER)
|
||||
.followRedirects(HttpClient.Redirect.NORMAL)
|
||||
.apply {
|
||||
proxySelectorFromEnv()?.let(::proxy)
|
||||
}
|
||||
@@ -72,3 +76,60 @@ fun fetchText(url: String): String {
|
||||
|
||||
throw IOException("Failed to fetch $url after retries", lastError)
|
||||
}
|
||||
|
||||
fun downloadTo(
|
||||
url: String,
|
||||
targetPath: Path,
|
||||
onProgress: (downloaded: Long, total: Long?) -> Unit = { _, _ -> }
|
||||
) {
|
||||
if (targetPath.isDirectory()) {
|
||||
throw IllegalArgumentException("Target path must be a file")
|
||||
}
|
||||
val targetPath = targetPath.toAbsolutePath().normalize()
|
||||
val targetFile = targetPath.toFile()
|
||||
val temp = Files.createTempFile(
|
||||
"${targetFile.name}-${System.currentTimeMillis()}", ".${targetFile.extension}.download"
|
||||
)
|
||||
|
||||
try {
|
||||
val request = HttpRequest.newBuilder()
|
||||
.uri(URI.create(url))
|
||||
.GET()
|
||||
.build()
|
||||
|
||||
val response = httpClient.send(
|
||||
request,
|
||||
HttpResponse.BodyHandlers.ofInputStream()
|
||||
)
|
||||
|
||||
if (response.statusCode() !in 200..299) {
|
||||
throw IllegalStateException("Failed to download from $url: HTTP ${response.statusCode()}")
|
||||
}
|
||||
|
||||
val totalBytes = response.headers()
|
||||
.firstValue("Content-Length")
|
||||
.orElse(null)
|
||||
?.toLongOrNull()
|
||||
|
||||
response.body().use { input ->
|
||||
Files.newOutputStream(temp).use { output ->
|
||||
val buffer = ByteArray(8192)
|
||||
var downloaded = 0L
|
||||
|
||||
while (true) {
|
||||
val read = input.read(buffer)
|
||||
if (read < 0) break
|
||||
|
||||
output.write(buffer, 0, read)
|
||||
downloaded += read
|
||||
onProgress(downloaded, totalBytes)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Files.move(temp, targetPath, StandardCopyOption.REPLACE_EXISTING)
|
||||
} catch (e: Exception) {
|
||||
Files.deleteIfExists(temp)
|
||||
throw e
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,6 +31,12 @@ init.home.overwrite.refuseBroadDirectory=Refuse to overwrite suspiciously broad
|
||||
init.install.section=Install Partner
|
||||
init.install.method.label=Choose an installation method
|
||||
init.install.method.buildFromSource=Build Partner from source
|
||||
init.install.method.downloadFromRelease=Download Partner release
|
||||
init.install.method.downloadFromRelease.startDownloading=Downloading Partner release...
|
||||
init.install.method.downloadFromRelease.success=Partner release downloaded successfully.
|
||||
init.install.method.downloadFromRelease.progress.percent=Downloading Partner release... {0}%
|
||||
init.install.method.downloadFromRelease.progress.size=Downloading Partner release... {0} KB
|
||||
init.install.method.downloadFromRelease.done=Downloading Partner release... Done
|
||||
init.gateway.section=Configure Gateway
|
||||
init.gateway.select.label=Select gateway
|
||||
init.gateway.websocket.choice=WebSocket Gateway
|
||||
|
||||
@@ -31,6 +31,12 @@ init.home.overwrite.refuseBroadDirectory=拒绝覆盖范围过大的目录:{0}
|
||||
init.install.section=安装 Partner
|
||||
init.install.method.label=选择安装方式
|
||||
init.install.method.buildFromSource=从源码构建 Partner
|
||||
init.install.method.downloadFromRelease=下载 Partner 发布包
|
||||
init.install.method.downloadFromRelease.startDownloading=正在下载 Partner 发布包...
|
||||
init.install.method.downloadFromRelease.success=Partner 发布包下载完成。
|
||||
init.install.method.downloadFromRelease.progress.percent=正在下载 Partner 发布包... {0}%
|
||||
init.install.method.downloadFromRelease.progress.size=正在下载 Partner 发布包... {0} KB
|
||||
init.install.method.downloadFromRelease.done=正在下载 Partner 发布包... 完成
|
||||
init.gateway.section=配置网关
|
||||
init.gateway.select.label=选择网关
|
||||
init.gateway.websocket.choice=WebSocket Gateway
|
||||
|
||||
49
README.md
49
README.md
@@ -25,12 +25,54 @@ Partner 分为 `Partner-Framework` 与 `Partner-Core` 两层。前者提供配
|
||||
|
||||
## 项目启动
|
||||
|
||||
**环境要求**
|
||||
### 环境要求
|
||||
|
||||
**基础运行要求**
|
||||
|
||||
- JDK 21
|
||||
- Maven 3.x
|
||||
|
||||
### 手动准备环境并启动
|
||||
**仅在从源码构建 Partner Runtime 或外部模块时需要**
|
||||
|
||||
- Maven 3.x
|
||||
- Git
|
||||
|
||||
### 推荐方式:PartnerCtl
|
||||
|
||||
`PartnerCtl` 用于完成 Partner 的首次初始化、运行时安装与启动管理。相比手动准备运行目录和配置文件,使用它可以更快完成最小可运行环境的搭建。
|
||||
|
||||
#### 初始化
|
||||
|
||||
```bash
|
||||
partnerctl init
|
||||
```
|
||||
|
||||
初始化流程会引导完成:
|
||||
|
||||
- 选择 `PARTNER_HOME`
|
||||
- 安装 Partner Runtime
|
||||
- 从源码构建
|
||||
- 下载发布版 jar
|
||||
- 配置 Gateway
|
||||
- 配置模型 Provider
|
||||
- 可选立即启动 Partner
|
||||
|
||||
#### 启动
|
||||
|
||||
如果初始化完成后未选择立即启动,可执行:
|
||||
|
||||
```bash
|
||||
partnerctl run
|
||||
```
|
||||
|
||||
如需后台运行:
|
||||
|
||||
```bash
|
||||
partnerctl run -d
|
||||
```
|
||||
|
||||
PartnerCtl 默认读取 `PARTNER_HOME` 指定的运行目录;若未设置,则使用 `~/.partner`。
|
||||
|
||||
### 手动方式:从源码构建并启动
|
||||
|
||||
#### 克隆项目并构建
|
||||
|
||||
@@ -162,4 +204,3 @@ Partner/
|
||||
## License
|
||||
|
||||
暂未指定。
|
||||
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
"partner": {
|
||||
"latestBuildable": {
|
||||
"url": "https://github.com/slhaf/Partner.git",
|
||||
"ref": "buildable/0.5.0"
|
||||
"ref": "buildable/0.9.0-preview"
|
||||
},
|
||||
"latestRelease": {
|
||||
"url": "https://github.com/slhaf/Partner/releases/download/release-core%2F0.5.0/partner-core-0.5.0.jar",
|
||||
"version": "0.5.0"
|
||||
"url": "https://github.com/slhaf/Partner/releases/download/release-core%2F0.9.0-preview/partner-core-0.9.0-preview.jar",
|
||||
"version": "0.9.0-preview"
|
||||
}
|
||||
},
|
||||
"externalModules": [
|
||||
|
||||
Reference in New Issue
Block a user