From 99b6310d601bda6649a19d74a1dea8f25abab195 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Wed, 4 Sep 2024 12:45:18 +0200 Subject: [PATCH] RED-9995: fix queue names --- .../build.gradle.kts | 2 +- .../configuration/MessagingConfiguration.java | 35 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts index a08c00cb1..be723feaa 100644 --- a/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts +++ b/persistence-service-v1/persistence-service-processor-v1/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { exclude(group = "com.iqser.red.service", module = "persistence-service-internal-api-v1") exclude(group = "com.iqser.red.service", module = "persistence-service-shared-api-v1") } - implementation("com.knecon.fforesight:llm-service-api:1.13.0") + implementation("com.knecon.fforesight:llm-service-api:1.17.0") api("com.knecon.fforesight:jobs-commons:0.10.0") api("com.knecon.fforesight:tenant-commons:0.30.0") api("com.knecon.fforesight:database-tenant-commons:0.24.0") { diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/MessagingConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/MessagingConfiguration.java index 94175b126..ef8e881fa 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/MessagingConfiguration.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/MessagingConfiguration.java @@ -66,10 +66,6 @@ public class MessagingConfiguration { public static final String CHUNKING_RESPONSE_EXCHANGE = "chunking_response_exchange"; public static final String CHUNKING_DLQ = "chunking_error"; - public static final String LLM_NER_RESPONSE_QUEUE_PREFIX = QueueNames.LLM_NER_RESPONSE_QUEUE_PREFIX; - public static final String LLM_NER_RESPONSE_EXCHANGE = QueueNames.LLM_NER_RESPONSE_EXCHANGE; - public static final String LLM_NER_DLQ = QueueNames.LLM_NER_DLQ; - public static final String CV_ANALYSIS_RESPONSE_QUEUE_PREFIX = "cv_analysis_response"; public static final String CV_ANALYSIS_RESPONSE_EXCHANGE = "cv_analysis_response_exchange"; @@ -130,6 +126,9 @@ public class MessagingConfiguration { //llm-ner-service public static final String LLM_NER_REQUEST_EXCHANGE = QueueNames.LLM_NER_REQUEST_EXCHANGE; + public static final String LLM_NER_RESPONSE_QUEUE_PREFIX = QueueNames.LLM_NER_RESPONSE_QUEUE_PREFIX; + public static final String LLM_NER_RESPONSE_EXCHANGE = QueueNames.LLM_NER_RESPONSE_EXCHANGE; + public static final String LLM_NER_DLQ = QueueNames.LLM_NER_DLQ; public static final String X_ERROR_INFO_HEADER = "x-error-message"; public static final String X_ERROR_INFO_TIMESTAMP_HEADER = "x-error-message-timestamp"; @@ -232,20 +231,6 @@ public class MessagingConfiguration { } - @Bean - public DirectExchange llmNerResponseExchange() { - - return new DirectExchange(LLM_NER_RESPONSE_EXCHANGE); - } - - - @Bean - public Queue llmNerDLQ() { - - return QueueBuilder.durable(LLM_NER_DLQ).build(); - } - - @Bean public Queue reportResponseDLQ() { @@ -546,6 +531,20 @@ public class MessagingConfiguration { } + @Bean + public DirectExchange llmNerResponseExchange() { + + return new DirectExchange(LLM_NER_RESPONSE_EXCHANGE); + } + + + @Bean + public Queue llmNerDLQ() { + + return QueueBuilder.durable(LLM_NER_DLQ).build(); + } + + // ---- Saas Migration ---- @Bean public Queue migrationQueue() {