va/int-layer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX BUG_679

Browse Source
This commit is contained in:
PAVEL PALMA
2025-10-23 10:11:20 -06:00
parent 6448d88b7a
commit 4169858861
2 changed files with 204 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/main/java/com/example/service/conversation/ConversationManagerService.java
View File

@@ -301,83 +301,82 @@ public class ConversationManagerService {
} }
public Mono<DetectIntentResponseDTO> startNotificationConversation(ConversationContext context, public Mono<DetectIntentResponseDTO> startNotificationConversation(ConversationContext context,
DetectIntentRequestDTO request, NotificationDTO notification) { DetectIntentRequestDTO request, NotificationDTO notification) {
final String userId = context.userId(); final String userId = context.userId();
final String userMessageText = context.userMessageText(); final String userMessageText = context.userMessageText();
final String userPhoneNumber = context.primaryPhoneNumber(); final String userPhoneNumber = context.primaryPhoneNumber();
return memoryStoreNotificationService.getSessionByTelefono(userPhoneNumber) return memoryStoreConversationService.getSessionByTelefono(userPhoneNumber)
.switchIfEmpty(Mono.defer(() -> { .switchIfEmpty(Mono.defer(() -> {
String newSessionId = SessionIdGenerator.generateStandardSessionId(); String newSessionId = SessionIdGenerator.generateStandardSessionId();
logger.info("No existing notification session found for phone number {}. Creating new session: {}", logger.warn("No existing conversation session found for notification reply on phone {}. This is unexpected. Creating new session: {}",
userPhoneNumber, newSessionId); userPhoneNumber, newSessionId);
return Mono.just(ConversationSessionDTO.create(newSessionId, userId, userPhoneNumber)); return Mono.just(ConversationSessionDTO.create(newSessionId, userId, userPhoneNumber));
})) }))
.flatMap(session -> { .flatMap(session -> {
final String sessionId = session.sessionId(); final String sessionId = session.sessionId();
String conversationHistory = conversationContextMapper.toTextWithLimits(session); String conversationHistory = conversationContextMapper.toTextWithLimits(session);
String notificationText = notificationContextMapper.toText(notification); String notificationText = notificationContextMapper.toText(notification);
Map<String, Object> filteredParams = notification.parametros().entrySet().stream() Map<String, Object> filteredParams = notification.parametros().entrySet().stream()
.filter(entry -> entry.getKey().startsWith("notification_po_")) .filter(entry -> entry.getKey().startsWith("notification_po_"))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
String resolvedContext = notificationContextResolver.resolveContext(userMessageText, String resolvedContext = notificationContextResolver.resolveContext(userMessageText,
notificationText, conversationHistory, filteredParams.toString(), userId, sessionId, notificationText, conversationHistory, filteredParams.toString(), userId, sessionId,
userPhoneNumber); userPhoneNumber);
if (!NotificationContextResolver.CATEGORY_DIALOGFLOW.equals(resolvedContext)) { if (!resolvedContext.trim().toUpperCase().contains(NotificationContextResolver.CATEGORY_DIALOGFLOW)) {
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
llmResponseTunerService.setValue(uuid, resolvedContext).subscribe(); llmResponseTunerService.setValue(uuid, resolvedContext).subscribe();
ConversationEntryDTO userEntry = ConversationEntryDTO.forUser(userMessageText, ConversationEntryDTO userEntry = ConversationEntryDTO.forUser(userMessageText,
notification.parametros()); notification.parametros());
ConversationEntryDTO llmEntry = ConversationEntryDTO.forLlmConversation(resolvedContext, ConversationEntryDTO llmEntry = ConversationEntryDTO.forLlmConversation(resolvedContext,
notification.parametros()); notification.parametros());
return persistNotificationTurn(userId, sessionId, userEntry, userPhoneNumber) return persistConversationTurn(userId, sessionId, userEntry, userPhoneNumber)
.then(persistNotificationTurn(userId, sessionId, llmEntry, userPhoneNumber)) .then(persistConversationTurn(userId, sessionId, llmEntry, userPhoneNumber))
.then(Mono.defer(() -> { .then(Mono.defer(() -> {
EventInputDTO eventInput = new EventInputDTO("LLM_RESPONSE_PROCESSED"); EventInputDTO eventInput = new EventInputDTO("LLM_RESPONSE_PROCESSED");
QueryInputDTO queryInput = new QueryInputDTO(null, eventInput, QueryInputDTO queryInput = new QueryInputDTO(null, eventInput,
request.queryInput().languageCode()); request.queryInput().languageCode());
DetectIntentRequestDTO newRequest = new DetectIntentRequestDTO(queryInput, DetectIntentRequestDTO newRequest = new DetectIntentRequestDTO(queryInput,
request.queryParams()) request.queryParams())
.withParameter("llm_reponse_uuid", uuid); .withParameter("llm_reponse_uuid", uuid);
return dialogflowServiceClient.detectIntent(sessionId, newRequest)
.flatMap(response -> {
ConversationEntryDTO agentEntry = ConversationEntryDTO
.forAgent(response.queryResult());
return persistNotificationTurn(userId, sessionId, agentEntry,
userPhoneNumber)
.thenReturn(response);
});
}));
}
ConversationEntryDTO userEntry = ConversationEntryDTO.forUser(userMessageText, return dialogflowServiceClient.detectIntent(sessionId, newRequest)
notification.parametros()); .flatMap(response -> {
ConversationEntryDTO agentEntry = ConversationEntryDTO
.forAgent(response.queryResult());
return persistConversationTurn(userId, sessionId, agentEntry,
userPhoneNumber)
.thenReturn(response);
});
}));
} else {
ConversationEntryDTO userEntry = ConversationEntryDTO.forUser(userMessageText,
notification.parametros());
DetectIntentRequestDTO finalRequest; DetectIntentRequestDTO finalRequest;
Instant now = Instant.now(); Instant now = Instant.now();
if (Duration.between(session.lastModified(), now).toMinutes() < SESSION_RESET_THRESHOLD_MINUTES) { if (Duration.between(session.lastModified(), now).toMinutes() < SESSION_RESET_THRESHOLD_MINUTES) {
finalRequest = request.withParameters(notification.parametros()); finalRequest = request.withParameters(notification.parametros());
} else { } else {
finalRequest = request.withParameter(CONV_HISTORY_PARAM, conversationHistory) finalRequest = request.withParameter(CONV_HISTORY_PARAM, conversationHistory)
.withParameters(notification.parametros()); .withParameters(notification.parametros());
} }
return persistConversationTurn(userId, sessionId, userEntry, userPhoneNumber)
return memoryStoreNotificationService.saveEntry(userId, sessionId, userEntry, userPhoneNumber) .then(dialogflowServiceClient.detectIntent(sessionId, finalRequest)
.then(dialogflowServiceClient.detectIntent(sessionId, finalRequest) .flatMap(response -> {
.flatMap(response -> { ConversationEntryDTO agentEntry = ConversationEntryDTO
ConversationEntryDTO agentEntry = ConversationEntryDTO .forAgent(response.queryResult());
.forAgent(response.queryResult()); return persistConversationTurn(userId, sessionId, agentEntry, userPhoneNumber)
return memoryStoreNotificationService .thenReturn(response);
.saveEntry(userId, sessionId, agentEntry, userPhoneNumber) }));
.thenReturn(response); }
})); });
}); }
}
private Mono<Void> persistConversationTurn(String userId, String sessionId, ConversationEntryDTO entry, private Mono<Void> persistConversationTurn(String userId, String sessionId, ConversationEntryDTO entry,
String userPhoneNumber) { String userPhoneNumber) {
@@ -397,19 +396,4 @@ public class ConversationManagerService {
.doOnError(e -> logger.error("Error during primary Redis write for session {}. Type: {}: {}", sessionId, .doOnError(e -> logger.error("Error during primary Redis write for session {}. Type: {}: {}", sessionId,
entry.type().name(), e.getMessage(), e)); entry.type().name(), e.getMessage(), e));
} }
private Mono<Void> persistNotificationTurn(String userId, String sessionId, ConversationEntryDTO entry,
String userPhoneNumber) {
logger.debug("Starting Write-Back persistence for notification session {}. Type: {}. Writing to Redis first.",
sessionId,
entry.type().name());
return memoryStoreNotificationService.saveEntry(userId, sessionId, entry, userPhoneNumber)
.doOnSuccess(v -> logger.info(
"Entry saved to Redis for notification session {}. Type: {}. Kicking off async Firestore write-back.",
sessionId, entry.type().name()))
.doOnError(e -> logger.error(
"Error during primary Redis write for notification session {}. Type: {}: {}", sessionId,
entry.type().name(), e.getMessage(), e));
}
} }

257
src/main/java/com/example/service/notification/NotificationManagerService.java
View File

@@ -14,13 +14,14 @@ import com.example.dto.dialogflow.notification.NotificationDTO;
import com.example.mapper.notification.ExternalNotRequestMapper; import com.example.mapper.notification.ExternalNotRequestMapper;
import com.example.service.base.DialogflowClientService; import com.example.service.base.DialogflowClientService;
import com.example.service.conversation.DataLossPrevention; import com.example.service.conversation.DataLossPrevention;
import com.example.service.conversation.FirestoreConversationService;
import com.example.service.conversation.MemoryStoreConversationService;
import com.example.util.SessionIdGenerator; import com.example.util.SessionIdGenerator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -29,142 +30,146 @@ import java.util.Objects;
@Service @Service
public class NotificationManagerService { public class NotificationManagerService {
private static final Logger logger = LoggerFactory.getLogger(NotificationManagerService.class); private static final Logger logger = LoggerFactory.getLogger(NotificationManagerService.class);
private static final String eventName = "notificacion"; private static final String eventName = "notificacion";
private static final String PREFIX_PO_PARAM = "notification_po_"; private static final String PREFIX_PO_PARAM = "notification_po_";
private final DialogflowClientService dialogflowClientService; private final DialogflowClientService dialogflowClientService;
private final FirestoreNotificationService firestoreNotificationService; private final FirestoreNotificationService firestoreNotificationService;
private final MemoryStoreNotificationService memoryStoreNotificationService; private final MemoryStoreNotificationService memoryStoreNotificationService;
private final FirestoreNotificationConvService firestoreConversationService; private final ExternalNotRequestMapper externalNotRequestMapper;
private final ExternalNotRequestMapper externalNotRequestMapper; private final MemoryStoreConversationService memoryStoreConversationService;
private final FirestoreConversationService firestoreConversationService;
private final DataLossPrevention dataLossPrevention;
private final String dlpTemplateCompleteFlow;
private final DataLossPrevention dataLossPrevention; @Value("${dialogflow.default-language-code:es}")
private final String dlpTemplateCompleteFlow; private String defaultLanguageCode;
@Value("${dialogflow.default-language-code:es}") public NotificationManagerService(
private String defaultLanguageCode; DialogflowClientService dialogflowClientService,
FirestoreNotificationService firestoreNotificationService,
MemoryStoreNotificationService memoryStoreNotificationService,
MemoryStoreConversationService memoryStoreConversationService,
FirestoreConversationService firestoreConversationService,
public NotificationManagerService( ExternalNotRequestMapper externalNotRequestMapper,
DialogflowClientService dialogflowClientService, DataLossPrevention dataLossPrevention,
FirestoreNotificationService firestoreNotificationService, @Value("${google.cloud.dlp.dlpTemplateCompleteFlow}") String dlpTemplateCompleteFlow) {
MemoryStoreNotificationService memoryStoreNotificationService,
FirestoreNotificationConvService firestoreConversationService,
ExternalNotRequestMapper externalNotRequestMapper,
DataLossPrevention dataLossPrevention,
@Value("${google.cloud.dlp.dlpTemplateCompleteFlow}") String dlpTemplateCompleteFlow) {
this.dialogflowClientService = dialogflowClientService;
this.firestoreNotificationService = firestoreNotificationService;
this.memoryStoreNotificationService = memoryStoreNotificationService;
this.firestoreConversationService = firestoreConversationService;
this.externalNotRequestMapper = externalNotRequestMapper;
this.dataLossPrevention = dataLossPrevention;
this.dlpTemplateCompleteFlow = dlpTemplateCompleteFlow;
}
public Mono<DetectIntentResponseDTO> processNotification(ExternalNotRequestDTO externalRequest) { this.dialogflowClientService = dialogflowClientService;
Objects.requireNonNull(externalRequest, "ExternalNotRequestDTO cannot be null."); this.firestoreNotificationService = firestoreNotificationService;
this.memoryStoreNotificationService = memoryStoreNotificationService;
this.externalNotRequestMapper = externalNotRequestMapper;
this.dataLossPrevention = dataLossPrevention;
this.dlpTemplateCompleteFlow = dlpTemplateCompleteFlow;
this.memoryStoreConversationService = memoryStoreConversationService;
this.firestoreConversationService = firestoreConversationService;
}
String telefono = externalRequest.phoneNumber(); public Mono<DetectIntentResponseDTO> processNotification(ExternalNotRequestDTO externalRequest) {
if (telefono == null || telefono.isBlank()) { Objects.requireNonNull(externalRequest, "ExternalNotRequestDTO cannot be null.");
logger.warn("No phone number provided in ExternalNotRequestDTO. Cannot process notification.");
return Mono.error(new IllegalArgumentException("Phone number is required."));
}
return dataLossPrevention.getObfuscatedString(externalRequest.text(), dlpTemplateCompleteFlow) String telefono = externalRequest.phoneNumber();
.flatMap(obfuscatedMessage -> { if (telefono == null || telefono.isBlank()) {
ExternalNotRequestDTO obfuscatedRequest = new ExternalNotRequestDTO( logger.warn("No phone number provided in ExternalNotRequestDTO. Cannot process notification.");
obfuscatedMessage, return Mono.error(new IllegalArgumentException("Phone number is required."));
externalRequest.phoneNumber(), }
externalRequest.hiddenParameters()
);
// 1. Persist the incoming notification entry
String newNotificationId = SessionIdGenerator.generateStandardSessionId();
Map<String, Object> parameters = new HashMap<>();
if (obfuscatedRequest.hiddenParameters() != null) {
obfuscatedRequest.hiddenParameters().forEach((key, value) -> parameters.put(PREFIX_PO_PARAM + key, value));
}
NotificationDTO newNotificationEntry = new NotificationDTO(newNotificationId, telefono, Instant.now(), return dataLossPrevention.getObfuscatedString(externalRequest.text(), dlpTemplateCompleteFlow)
obfuscatedRequest.text(), eventName, defaultLanguageCode, parameters, "active"); .flatMap(obfuscatedMessage -> {
Mono<Void> persistenceMono = memoryStoreNotificationService.saveOrAppendNotificationEntry(newNotificationEntry) ExternalNotRequestDTO obfuscatedRequest = new ExternalNotRequestDTO(
.doOnSuccess(v -> { obfuscatedMessage,
logger.info("Notification for phone cached. Kicking off async Firestore write-back."); externalRequest.phoneNumber(),
firestoreNotificationService.saveOrAppendNotificationEntry(newNotificationEntry) externalRequest.hiddenParameters()
.subscribe( );
ignored -> logger.debug(
"Background: Notification entry persistence initiated for phone in Firestore."),
e -> logger.error(
"Background: Error during notification entry persistence for phone in Firestore: {}", e.getMessage(), e));
});
// 2. Resolve or create a conversation session String newNotificationId = SessionIdGenerator.generateStandardSessionId();
Mono<ConversationSessionDTO> sessionMono = memoryStoreNotificationService.getSessionByTelefono(telefono) Map<String, Object> parameters = new HashMap<>();
.doOnNext(session -> logger.info("Found existing conversation session {} for phone number", if (obfuscatedRequest.hiddenParameters() != null) {
session.sessionId())) obfuscatedRequest.hiddenParameters().forEach((key, value) -> parameters.put(PREFIX_PO_PARAM + key, value));
.flatMap(session -> { }
Map<String, Object> prefixedParameters = new HashMap<>();
if (obfuscatedRequest.hiddenParameters() != null) {
obfuscatedRequest.hiddenParameters()
.forEach((key, value) -> prefixedParameters.put(PREFIX_PO_PARAM + key, value));
}
ConversationEntryDTO systemEntry = ConversationEntryDTO.forSystem(obfuscatedRequest.text(),
prefixedParameters);
return persistConversationTurn(session.userId(), session.sessionId(), systemEntry, telefono)
.thenReturn(session);
})
.switchIfEmpty(Mono.defer(() -> {
String newSessionId = SessionIdGenerator.generateStandardSessionId();
logger.info("No existing conversation session found for phone number. Creating new session: {}", newSessionId);
String userId = "user_by_phone_" + telefono;
Map<String, Object> prefixedParameters = new HashMap<>();
if (obfuscatedRequest.hiddenParameters() != null) {
obfuscatedRequest.hiddenParameters()
.forEach((key, value) -> prefixedParameters.put(PREFIX_PO_PARAM + key, value));
}
ConversationEntryDTO systemEntry = ConversationEntryDTO.forSystem(obfuscatedRequest.text(),
prefixedParameters);
return persistConversationTurn(userId, newSessionId, systemEntry, telefono)
.then(Mono.just(ConversationSessionDTO.create(newSessionId, userId, telefono)));
}));
// 3. Send notification text to Dialogflow using the resolved conversation NotificationDTO newNotificationEntry = new NotificationDTO(newNotificationId, telefono, Instant.now(),
// session obfuscatedRequest.text(), eventName, defaultLanguageCode, parameters, "active");
return persistenceMono.then(sessionMono) Mono<Void> persistenceMono = memoryStoreNotificationService.saveOrAppendNotificationEntry(newNotificationEntry)
.flatMap(session -> { .doOnSuccess(v -> {
final String sessionId = session.sessionId(); logger.info("Notification for phone {} cached. Kicking off async Firestore write-back.", telefono);
logger.info("Sending notification text to Dialogflow using conversation session: {}", sessionId); firestoreNotificationService.saveOrAppendNotificationEntry(newNotificationEntry)
.subscribe(
DetectIntentRequestDTO detectIntentRequest = externalNotRequestMapper.map(obfuscatedRequest); ignored -> logger.debug(
"Background: Notification entry persistence initiated for phone {} in Firestore.", telefono),
return dialogflowClientService.detectIntent(sessionId, detectIntentRequest); e -> logger.error(
}) "Background: Error during notification entry persistence for phone {} in Firestore: {}",
.doOnSuccess(response -> logger telefono, e.getMessage(), e));
.info("Finished processing notification. Dialogflow response received for phone"))
.doOnError(e -> logger.error("Overall error in NotificationManagerService: {}", e.getMessage(), e));
}); });
}
private Mono<Void> persistConversationTurn(String userId, String sessionId, ConversationEntryDTO entry, Mono<ConversationSessionDTO> sessionMono = memoryStoreConversationService.getSessionByTelefono(telefono)
String userPhoneNumber) { .doOnNext(session -> logger.info("Found existing conversation session {} for phone number {}",
logger.debug("Starting Write-Back persistence for session {}. Type: {}. Writing to Redis first.", sessionId, session.sessionId(), telefono))
entry.type().name()); .flatMap(session -> {
Map<String, Object> prefixedParameters = new HashMap<>();
if (obfuscatedRequest.hiddenParameters() != null) {
obfuscatedRequest.hiddenParameters()
.forEach((key, value) -> prefixedParameters.put(PREFIX_PO_PARAM + key, value));
}
ConversationEntryDTO systemEntry = ConversationEntryDTO.forSystem(obfuscatedRequest.text(),
prefixedParameters);
return persistConversationTurn(session.userId(), session.sessionId(), systemEntry, telefono)
.thenReturn(session);
})
.switchIfEmpty(Mono.defer(() -> {
String newSessionId = SessionIdGenerator.generateStandardSessionId();
logger.info("No existing conversation session found for phone number {}. Creating new session: {}",
telefono, newSessionId);
String userId = "user_by_phone_" + telefono;
Map<String, Object> prefixedParameters = new HashMap<>();
if (obfuscatedRequest.hiddenParameters() != null) {
obfuscatedRequest.hiddenParameters()
.forEach((key, value) -> prefixedParameters.put(PREFIX_PO_PARAM + key, value));
}
ConversationEntryDTO systemEntry = ConversationEntryDTO.forSystem(obfuscatedRequest.text(),
prefixedParameters);
return persistConversationTurn(userId, newSessionId, systemEntry, telefono)
.then(Mono.just(ConversationSessionDTO.create(newSessionId, userId, telefono)));
}));
return memoryStoreNotificationService.saveEntry(userId, sessionId, entry, userPhoneNumber) return persistenceMono.then(sessionMono)
.doOnSuccess(v -> { .flatMap(session -> {
logger.info( final String sessionId = session.sessionId();
"Entry saved to Redis for session {}. Type: {}. Kicking off async Firestore write-back.", logger.info("Sending notification text to Dialogflow using conversation session: {}", sessionId);
sessionId, entry.type().name());
firestoreConversationService.saveEntry(userId, sessionId, entry, userPhoneNumber) DetectIntentRequestDTO detectIntentRequest = externalNotRequestMapper.map(obfuscatedRequest);
.subscribe(
fsVoid -> logger.debug( return dialogflowClientService.detectIntent(sessionId, detectIntentRequest);
"Asynchronously (Write-Back): Entry successfully saved to Firestore for session {}. Type: {}.", })
sessionId, entry.type().name()), .doOnSuccess(response -> logger
fsError -> logger.error( .info("Finished processing notification. Dialogflow response received for phone {}.", telefono))
"Asynchronously (Write-Back): Failed to save entry to Firestore for session {}. Type: {}: {}", .doOnError(e -> logger.error("Overall error in NotificationManagerService: {}", e.getMessage(), e));
sessionId, entry.type().name(), fsError.getMessage(), fsError)); });
}) }
.doOnError(e -> logger.error("Error during primary Redis write for session {}. Type: {}: {}", sessionId,
entry.type().name(), e.getMessage(), e)); private Mono<Void> persistConversationTurn(String userId, String sessionId, ConversationEntryDTO entry,
} String userPhoneNumber) {
logger.debug("Starting Write-Back persistence for session {}. Type: {}. Writing to Redis first.", sessionId,
entry.type().name());
return memoryStoreConversationService.saveEntry(userId, sessionId, entry, userPhoneNumber)
.doOnSuccess(v -> {
logger.info(
"Entry saved to Redis for session {}. Type: {}. Kicking off async Firestore write-back.",
sessionId, entry.type().name());
firestoreConversationService.saveEntry(userId, sessionId, entry, userPhoneNumber)
.subscribe(
fsVoid -> logger.debug(
"Asynchronously (Write-Back): Entry successfully saved to Firestore for session {}. Type: {}.",
sessionId, entry.type().name()),
fsError -> logger.error(
"Asynchronously (Write-Back): Failed to save entry to Firestore for session {}. Type: {}: {}",
sessionId, entry.type().name(), fsError.getMessage(), fsError));
})
.doOnError(e -> logger.error("Error during primary Redis write for session {}. Type: {}: {}", sessionId,
entry.type().name(), e.getMessage(), e));
}
} }