mirror of
https://gitee.com/mateos/mateclaw.git
synced 2026-09-13 03:13:41 +08:00
feat(memory): dream-v2 E3-E5 — Forget + Contradictions + Feedback API
This commit is contained in:
matevip
parent
d983a1e02e
commit
eece5e96f5
@ -0,0 +1,196 @@
|
||||
package vip.mate.memory.fact.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.security.core.Authentication;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import vip.mate.common.result.R;
|
||||
import vip.mate.memory.MemoryProperties;
|
||||
import vip.mate.memory.fact.model.FactContradictionEntity;
|
||||
import vip.mate.memory.fact.model.FactEntity;
|
||||
import vip.mate.memory.fact.projection.FactProjectionBuilder;
|
||||
import vip.mate.memory.fact.query.FactQueryService;
|
||||
import vip.mate.memory.fact.repository.FactContradictionMapper;
|
||||
import vip.mate.memory.fact.repository.FactMapper;
|
||||
import vip.mate.workspace.core.annotation.RequireWorkspaceRole;
|
||||
import vip.mate.workspace.document.WorkspaceFileService;
|
||||
import vip.mate.workspace.document.model.WorkspaceFileEntity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Fact management API — forget, feedback, contradiction resolution.
|
||||
*
|
||||
* @author MateClaw Team
|
||||
*/
|
||||
@Tag(name = "Facts")
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/api/v1/memory/{agentId}/facts")
|
||||
@RequiredArgsConstructor
|
||||
public class FactController {
|
||||
|
||||
private final FactMapper factMapper;
|
||||
private final FactContradictionMapper contradictionMapper;
|
||||
private final FactProjectionBuilder projectionBuilder;
|
||||
private final WorkspaceFileService workspaceFileService;
|
||||
private final MemoryProperties properties;
|
||||
|
||||
@Operation(summary = "List facts for an agent")
|
||||
@GetMapping
|
||||
@RequireWorkspaceRole("viewer")
|
||||
public R<List<FactEntity>> listFacts(@PathVariable Long agentId,
|
||||
@RequestParam(required = false) String keyword) {
|
||||
LambdaQueryWrapper<FactEntity> query = new LambdaQueryWrapper<FactEntity>()
|
||||
.eq(FactEntity::getAgentId, agentId)
|
||||
.eq(FactEntity::getDeleted, 0);
|
||||
if (keyword != null && !keyword.isBlank()) {
|
||||
query.and(w -> w.like(FactEntity::getSubject, keyword)
|
||||
.or().like(FactEntity::getObjectValue, keyword));
|
||||
}
|
||||
query.orderByDesc(FactEntity::getTrust).last("LIMIT 50");
|
||||
return R.ok(factMapper.selectList(query));
|
||||
}
|
||||
|
||||
@Operation(summary = "Forget a fact — writes canonical metadata, rebuilds projection")
|
||||
@PostMapping("/{factId}/forget")
|
||||
@RequireWorkspaceRole("member")
|
||||
public R<Void> forgetFact(@PathVariable Long agentId,
|
||||
@PathVariable Long factId,
|
||||
Authentication auth) {
|
||||
if (!properties.getFact().isProjectionEnabled()) {
|
||||
return R.fail("Fact projection is disabled");
|
||||
}
|
||||
|
||||
FactEntity fact = factMapper.selectById(factId);
|
||||
if (fact == null || !fact.getAgentId().equals(agentId) || fact.getDeleted() == 1) {
|
||||
return R.fail("Fact not found");
|
||||
}
|
||||
|
||||
// Write forget metadata to canonical source
|
||||
String sourceRef = fact.getSourceRef();
|
||||
String[] parts = sourceRef.split("#", 2);
|
||||
String filename = parts[0];
|
||||
String userId = auth != null ? auth.getName() : "unknown";
|
||||
|
||||
WorkspaceFileEntity file = workspaceFileService.getFile(agentId, filename);
|
||||
if (file != null && file.getContent() != null) {
|
||||
String marker = "> Forgotten: " + LocalDate.now() + " by " + userId;
|
||||
String sectionKey = parts.length > 1 ? parts[1] : null;
|
||||
|
||||
String content = file.getContent();
|
||||
if (sectionKey != null) {
|
||||
// Append marker after the matching section
|
||||
String sectionHeader = "## " + sectionKey;
|
||||
int idx = content.indexOf(sectionHeader);
|
||||
if (idx >= 0) {
|
||||
int nextSection = content.indexOf("\n## ", idx + sectionHeader.length());
|
||||
int insertAt = nextSection > 0 ? nextSection : content.length();
|
||||
content = content.substring(0, insertAt) + "\n" + marker + "\n" + content.substring(insertAt);
|
||||
} else {
|
||||
content = content + "\n" + marker + "\n";
|
||||
}
|
||||
} else {
|
||||
content = content + "\n" + marker + "\n";
|
||||
}
|
||||
workspaceFileService.saveFile(agentId, filename, content);
|
||||
}
|
||||
|
||||
// Trigger projection rebuild — the forgotten fact will be excluded
|
||||
// because FactProjectionBuilder skips sections with Forgotten: metadata
|
||||
projectionBuilder.rebuildOne(agentId, filename,
|
||||
file != null ? file.getContent() : "");
|
||||
|
||||
// Soft-delete the fact immediately (rebuild will also handle it)
|
||||
fact.setDeleted(1);
|
||||
fact.setUpdateTime(LocalDateTime.now());
|
||||
factMapper.updateById(fact);
|
||||
|
||||
log.info("[Fact] Forgotten fact {} for agent={} by {}", factId, agentId, userId);
|
||||
return R.ok(null);
|
||||
}
|
||||
|
||||
@Operation(summary = "Submit feedback on a fact (HELPFUL/UNHELPFUL)")
|
||||
@PostMapping("/{factId}/feedback")
|
||||
@RequireWorkspaceRole("member")
|
||||
public R<Void> feedbackFact(@PathVariable Long agentId,
|
||||
@PathVariable Long factId,
|
||||
@RequestBody Map<String, String> body) {
|
||||
String kind = body.get("kind"); // HELPFUL or UNHELPFUL
|
||||
if (kind == null || (!kind.equals("HELPFUL") && !kind.equals("UNHELPFUL"))) {
|
||||
return R.fail("kind must be HELPFUL or UNHELPFUL");
|
||||
}
|
||||
|
||||
FactEntity fact = factMapper.selectById(factId);
|
||||
if (fact == null || !fact.getAgentId().equals(agentId) || fact.getDeleted() == 1) {
|
||||
return R.fail("Fact not found");
|
||||
}
|
||||
|
||||
// Write feedback metadata to canonical source
|
||||
String sourceRef = fact.getSourceRef();
|
||||
String[] parts = sourceRef.split("#", 2);
|
||||
String filename = parts[0];
|
||||
WorkspaceFileEntity file = workspaceFileService.getFile(agentId, filename);
|
||||
if (file != null && file.getContent() != null) {
|
||||
String marker = "> UserFeedback: " + kind + " " + LocalDate.now();
|
||||
workspaceFileService.saveFile(agentId, filename, file.getContent() + "\n" + marker + "\n");
|
||||
}
|
||||
|
||||
// Adjust trust score
|
||||
double delta = kind.equals("HELPFUL") ? 0.1 : -0.2;
|
||||
double newTrust = Math.max(0.0, Math.min(1.0, (fact.getTrust() != null ? fact.getTrust() : 0.5) + delta));
|
||||
fact.setTrust(newTrust);
|
||||
fact.setUpdateTime(LocalDateTime.now());
|
||||
factMapper.updateById(fact);
|
||||
|
||||
log.info("[Fact] Feedback {} on fact {} for agent={}, trust={}", kind, factId, agentId, newTrust);
|
||||
return R.ok(null);
|
||||
}
|
||||
|
||||
// ==================== Contradictions ====================
|
||||
|
||||
@Operation(summary = "List unresolved contradictions")
|
||||
@GetMapping("/contradictions")
|
||||
@RequireWorkspaceRole("viewer")
|
||||
public R<List<FactContradictionEntity>> listContradictions(@PathVariable Long agentId) {
|
||||
return R.ok(contradictionMapper.selectList(
|
||||
new LambdaQueryWrapper<FactContradictionEntity>()
|
||||
.eq(FactContradictionEntity::getAgentId, agentId)
|
||||
.isNull(FactContradictionEntity::getResolution)
|
||||
.eq(FactContradictionEntity::getDeleted, 0)
|
||||
.orderByDesc(FactContradictionEntity::getCreateTime)));
|
||||
}
|
||||
|
||||
@Operation(summary = "Resolve a contradiction (KEEP_A / KEEP_B / MERGE / IGNORE)")
|
||||
@PostMapping("/contradictions/{contradictionId}/resolve")
|
||||
@RequireWorkspaceRole("member")
|
||||
public R<Void> resolveContradiction(@PathVariable Long agentId,
|
||||
@PathVariable Long contradictionId,
|
||||
@RequestBody Map<String, String> body,
|
||||
Authentication auth) {
|
||||
String resolution = body.get("resolution");
|
||||
if (resolution == null || !List.of("KEEP_A", "KEEP_B", "MERGE", "IGNORE").contains(resolution)) {
|
||||
return R.fail("resolution must be KEEP_A, KEEP_B, MERGE, or IGNORE");
|
||||
}
|
||||
|
||||
FactContradictionEntity c = contradictionMapper.selectById(contradictionId);
|
||||
if (c == null || !c.getAgentId().equals(agentId)) {
|
||||
return R.fail("Contradiction not found");
|
||||
}
|
||||
|
||||
c.setResolution(resolution);
|
||||
c.setResolvedAt(LocalDateTime.now());
|
||||
c.setResolvedBy(auth != null ? auth.getName() : "unknown");
|
||||
c.setUpdateTime(LocalDateTime.now());
|
||||
contradictionMapper.updateById(c);
|
||||
|
||||
log.info("[Fact] Contradiction {} resolved as {} for agent={}", contradictionId, resolution, agentId);
|
||||
return R.ok(null);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user