[Developer] #569 plain text vector Top-K probe
This commit is contained in:
@@ -0,0 +1,9 @@
|
||||
package com.cloudhandson.vpdbackoffice.domain.vector;
|
||||
|
||||
public record VectorQueryEmbedding(
|
||||
String query,
|
||||
String embeddingMode,
|
||||
String embeddingModel,
|
||||
String requestBody
|
||||
) {
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import com.cloudhandson.vpdbackoffice.domain.vector.VectorChunk;
|
||||
import com.cloudhandson.vpdbackoffice.domain.vector.VectorIngestCommand;
|
||||
import com.cloudhandson.vpdbackoffice.domain.vector.VectorIngestResult;
|
||||
import com.cloudhandson.vpdbackoffice.domain.vector.VectorKnowledgeSummary;
|
||||
import com.cloudhandson.vpdbackoffice.domain.vector.VectorQueryEmbedding;
|
||||
import com.cloudhandson.vpdbackoffice.domain.vector.VectorSearchResult;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import java.util.ArrayList;
|
||||
@@ -73,6 +74,16 @@ public class VectorKnowledgeService {
|
||||
return embeddingClient.embeddingConfigured();
|
||||
}
|
||||
|
||||
public VectorQueryEmbedding vectorizeQuery(String query, String embeddingMode) {
|
||||
String normalizedQuery = required(query, "검색 질문");
|
||||
String mode = normalizeMode(embeddingMode);
|
||||
return new VectorQueryEmbedding(
|
||||
normalizedQuery,
|
||||
mode,
|
||||
embeddingModel(mode),
|
||||
"{\"embedding\":" + json(embed(normalizedQuery, mode)) + "}");
|
||||
}
|
||||
|
||||
@Transactional
|
||||
public VectorIngestResult ingest(VectorIngestCommand command) {
|
||||
String documentId = requiredDocumentId(command.documentId());
|
||||
@@ -112,19 +123,19 @@ public class VectorKnowledgeService {
|
||||
}
|
||||
|
||||
public VectorSearchResult search(long userId, String query, int limit, String embeddingMode) {
|
||||
String normalizedQuery = required(query, "검색 질문");
|
||||
ProtectedObject vectorObject = protectedObjectService.findEnabled().stream()
|
||||
.filter(object -> VECTOR_OBJECT.equalsIgnoreCase(object.objectName()))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new AppException(
|
||||
"CB_VECTOR_SEARCH_DOCUMENTS 보호 객체가 없습니다. 28_agent_ords_vector_tag_vpd_setup.sql을 먼저 실행하세요."));
|
||||
String mode = normalizeMode(embeddingMode);
|
||||
String requestBody = "{\"embedding\":" + json(embed(normalizedQuery, mode)) + "}";
|
||||
VectorQueryEmbedding vectorQuery = vectorizeQuery(query, embeddingMode);
|
||||
IssuedToken temporary = tokenService.issueTemporaryToken(userId, "지식 검색 검증 세션");
|
||||
try {
|
||||
ProbeResult probe = ordsProbeService.runProbe(new ProbeCommand(
|
||||
temporary.keyId(), vectorObject.objectId(), temporary.plainToken(), normalizeLimit(limit), requestBody));
|
||||
return new VectorSearchResult(normalizedQuery, mode, embeddingModel(mode), probe);
|
||||
temporary.keyId(), vectorObject.objectId(), temporary.plainToken(), normalizeLimit(limit),
|
||||
vectorQuery.requestBody()));
|
||||
return new VectorSearchResult(
|
||||
vectorQuery.query(), vectorQuery.embeddingMode(), vectorQuery.embeddingModel(), probe);
|
||||
} finally {
|
||||
tokenService.revokeToken(temporary.keyId(), "temporary vector search completed");
|
||||
}
|
||||
|
||||
@@ -2,9 +2,12 @@ package com.cloudhandson.vpdbackoffice.web;
|
||||
|
||||
import com.cloudhandson.vpdbackoffice.domain.probe.ProbeCommand;
|
||||
import com.cloudhandson.vpdbackoffice.domain.protectedobject.ProtectedObject;
|
||||
import com.cloudhandson.vpdbackoffice.domain.vector.VectorQueryEmbedding;
|
||||
import com.cloudhandson.vpdbackoffice.service.AppException;
|
||||
import com.cloudhandson.vpdbackoffice.service.BearerTokenService;
|
||||
import com.cloudhandson.vpdbackoffice.service.OrdsProbeService;
|
||||
import com.cloudhandson.vpdbackoffice.service.ProtectedObjectService;
|
||||
import com.cloudhandson.vpdbackoffice.service.VectorKnowledgeService;
|
||||
import com.cloudhandson.vpdbackoffice.service.VpdPolicyService;
|
||||
import com.cloudhandson.vpdbackoffice.mapper.UserMapper;
|
||||
import java.util.Comparator;
|
||||
@@ -25,19 +28,22 @@ public class ProbeController {
|
||||
private final BearerTokenService tokenService;
|
||||
private final VpdPolicyService vpdPolicyService;
|
||||
private final UserMapper userMapper;
|
||||
private final VectorKnowledgeService vectorKnowledgeService;
|
||||
|
||||
public ProbeController(
|
||||
OrdsProbeService probeService,
|
||||
ProtectedObjectService protectedObjectService,
|
||||
BearerTokenService tokenService,
|
||||
VpdPolicyService vpdPolicyService,
|
||||
UserMapper userMapper
|
||||
UserMapper userMapper,
|
||||
VectorKnowledgeService vectorKnowledgeService
|
||||
) {
|
||||
this.probeService = probeService;
|
||||
this.protectedObjectService = protectedObjectService;
|
||||
this.tokenService = tokenService;
|
||||
this.vpdPolicyService = vpdPolicyService;
|
||||
this.userMapper = userMapper;
|
||||
this.vectorKnowledgeService = vectorKnowledgeService;
|
||||
}
|
||||
|
||||
@GetMapping("/probe")
|
||||
@@ -53,6 +59,7 @@ public class ProbeController {
|
||||
model.addAttribute("objects", objects);
|
||||
model.addAttribute("defaultObjectKeys", defaultObjectKeys);
|
||||
model.addAttribute("users", userMapper.findAll());
|
||||
model.addAttribute("aiEmbeddingConfigured", vectorKnowledgeService.aiEmbeddingConfigured());
|
||||
return "probe";
|
||||
}
|
||||
|
||||
@@ -63,9 +70,17 @@ public class ProbeController {
|
||||
@RequestParam(required = false) Long tempUserId,
|
||||
@RequestParam(defaultValue = "50") int limit,
|
||||
@RequestParam(required = false) String requestBody,
|
||||
@RequestParam(defaultValue = "DEMO") String embeddingMode,
|
||||
Model model
|
||||
) {
|
||||
String normalizedToken = bearerToken == null ? "" : bearerToken.trim();
|
||||
ProtectedObject selectedObject = protectedObjectService.findEnabled().stream()
|
||||
.filter(object -> object.objectId() == objectId)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
boolean vectorSearch = selectedObject != null
|
||||
&& VectorKnowledgeService.VECTOR_OBJECT.equalsIgnoreCase(selectedObject.objectName());
|
||||
model.addAttribute("vectorSearch", vectorSearch);
|
||||
Long temporaryKeyId = null;
|
||||
if (tempUserId != null) {
|
||||
var issued = tokenService.issueTemporaryToken(tempUserId, "ORDS 검증 임시 실행");
|
||||
@@ -73,18 +88,24 @@ public class ProbeController {
|
||||
temporaryKeyId = issued.keyId();
|
||||
}
|
||||
try {
|
||||
if (vectorSearch) {
|
||||
VectorQueryEmbedding vectorQuery = vectorKnowledgeService.vectorizeQuery(requestBody, embeddingMode);
|
||||
requestBody = vectorQuery.requestBody();
|
||||
model.addAttribute("vectorQuery", vectorQuery.query());
|
||||
model.addAttribute("vectorEmbeddingMode", vectorQuery.embeddingMode());
|
||||
model.addAttribute("vectorEmbeddingModel", vectorQuery.embeddingModel());
|
||||
}
|
||||
model.addAttribute("result", probeService.runProbe(
|
||||
new ProbeCommand(temporaryKeyId, objectId, normalizedToken, limit, requestBody)));
|
||||
model.addAttribute("tokenContext", tokenService.findTokenContextByPlainToken(normalizedToken));
|
||||
} catch (AppException exception) {
|
||||
model.addAttribute("errorMessage", exception.getMessage());
|
||||
} finally {
|
||||
if (temporaryKeyId != null) {
|
||||
tokenService.revokeToken(temporaryKeyId, "temporary probe completed");
|
||||
}
|
||||
}
|
||||
model.addAttribute("selectedObject", protectedObjectService.findEnabled().stream()
|
||||
.filter(object -> object.objectId() == objectId)
|
||||
.findFirst()
|
||||
.orElse(null));
|
||||
model.addAttribute("selectedObject", selectedObject);
|
||||
return "fragments/probe-result :: result";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user