Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'RED-9995' into 'master'

Browse Source 
RED-9995: fix queue names

Closes RED-9995

See merge request redactmanager/persistence-service!719
This commit is contained in:
Kilian Schüttler 2024-09-04 14:00:47 +02:00
commit e37947fb7a
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-processor-v1/build.gradle.kts
View File

@ -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-internal-api-v1")
exclude(group = "com.iqser.red.service", module = "persistence-service-shared-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:jobs-commons:0.10.0")
api("com.knecon.fforesight:tenant-commons:0.30.0") api("com.knecon.fforesight:tenant-commons:0.30.0")
api("com.knecon.fforesight:database-tenant-commons:0.24.0") { api("com.knecon.fforesight:database-tenant-commons:0.24.0") {

35
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/configuration/MessagingConfiguration.java
View File

@ -66,10 +66,6 @@ public class MessagingConfiguration {
public static final String CHUNKING_RESPONSE_EXCHANGE = "chunking_response_exchange"; public static final String CHUNKING_RESPONSE_EXCHANGE = "chunking_response_exchange";
public static final String CHUNKING_DLQ = "chunking_error"; 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_QUEUE_PREFIX = "cv_analysis_response";
public static final String CV_ANALYSIS_RESPONSE_EXCHANGE = "cv_analysis_response_exchange"; public static final String CV_ANALYSIS_RESPONSE_EXCHANGE = "cv_analysis_response_exchange";
@ -130,6 +126,9 @@ public class MessagingConfiguration {
//llm-ner-service //llm-ner-service
public static final String LLM_NER_REQUEST_EXCHANGE = QueueNames.LLM_NER_REQUEST_EXCHANGE; 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_HEADER = "x-error-message";
public static final String X_ERROR_INFO_TIMESTAMP_HEADER = "x-error-message-timestamp"; 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 @Bean
public Queue reportResponseDLQ() { 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 ---- // ---- Saas Migration ----
@Bean @Bean
public Queue migrationQueue() { public Queue migrationQueue() {