admin/prop-ai-hr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(agent): decouple media analysis from knowledge scope

Browse Source
This commit is contained in:
admin
2026-07-24 23:37:46 +08:00
parent 5b7c5613f5
commit fdd98049e5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/knowledge/service/AihrKnowledgeQueryService.java
+3 -2
View File
@@ -195,8 +195,9 @@ public class AihrKnowledgeQueryService {
} }
AihrKnowledgePrincipal principal = projectPrincipal(principalResolver.current(), request.projectCode()); AihrKnowledgePrincipal principal = projectPrincipal(principalResolver.current(), request.projectCode());
AuthenticatedApp app = appService.requireSessionApp(principal.tenantId(), principal.clientKey()); AuthenticatedApp app = appService.requireSessionApp(principal.tenantId(), principal.clientKey());
Set<Long> spaceIds = accessService.resolveInternalSpaceIds( Set<Long> spaceIds = mode == MediaMode.MEDIA_ONLY
principal, app, request.spaceCodes(), "READ"); ? Set.of()
: accessService.resolveInternalSpaceIds(principal, app, request.spaceCodes(), "READ");
ConversationContext context = conversationContext(principal, app, request); ConversationContext context = conversationContext(principal, app, request);
String extracted = sopService.extractQuestionMedia(file, request.queryText()); String extracted = sopService.extractQuestionMedia(file, request.queryText());
String extractedContext = extracted == null ? "" : extracted.trim(); String extractedContext = extracted == null ? "" : extracted.trim();
backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/knowledge/AihrKnowledgeQueryServiceTest.java
+1 -1
View File
@@ -218,7 +218,6 @@ class AihrKnowledgeQueryServiceTest {
var media = new MockMultipartFile("file", "pet.jpg", "image/jpeg", new byte[]{1}); var media = new MockMultipartFile("file", "pet.jpg", "image/jpeg", new byte[]{1});
when(resolver.current()).thenReturn(principal); when(resolver.current()).thenReturn(principal);
when(appService.requireSessionApp("000000", "app")).thenReturn(app); when(appService.requireSessionApp("000000", "app")).thenReturn(app);
when(access.resolveInternalSpaceIds(principal, app, List.of(), "READ")).thenReturn(Set.of(9L));
when(conversations.prepare(principal, app, request)).thenReturn(context); when(conversations.prepare(principal, app, request)).thenReturn(context);
when(conversations.append(any(), any(), any(), anyString(), anyString(), any())).thenReturn(1L); when(conversations.append(any(), any(), any(), anyString(), anyString(), any())).thenReturn(1L);
when(sop.extractQuestionMedia(media, "图中是什么宠物")).thenReturn("图中是一只金毛犬"); when(sop.extractQuestionMedia(media, "图中是什么宠物")).thenReturn("图中是一只金毛犬");
@@ -231,6 +230,7 @@ class AihrKnowledgeQueryServiceTest {
assertFalse(result.noEvidence()); assertFalse(result.noEvidence());
assertTrue(result.answer().contains("图中是一只金毛犬")); assertTrue(result.answer().contains("图中是一只金毛犬"));
verify(sop, never()).searchAuthorized(any(), any(), any()); verify(sop, never()).searchAuthorized(any(), any(), any());
verify(access, never()).resolveInternalSpaceIds(any(), any(), any(), anyString());
var appendedAnswer = ArgumentCaptor.forClass(String.class); var appendedAnswer = ArgumentCaptor.forClass(String.class);
verify(conversations).append(any(), any(), any(), anyString(), appendedAnswer.capture(), any()); verify(conversations).append(any(), any(), any(), anyString(), appendedAnswer.capture(), any());
assertTrue(appendedAnswer.getValue().contains("图中是一只金毛犬")); assertTrue(appendedAnswer.getValue().contains("图中是一只金毛犬"));