✨ feat: Improvements from review

LauraRandl · LauraRandl · commit 75330ba0f09a · 2026-02-17T17:10:03.000+01:00
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -279,7 +279,6 @@ microblogService:
         OPENTRACING_JAEGER_ENABLED: false
         REDIS_SERVICE_ADDRESS: unguard-redis
         USER_AUTH_SERVICE_ADDRESS: unguard-user-auth-service
-        RAG_SERVICE_ENABLED: "{{ .Values.ragService.enabled }}"
         RAG_SERVICE_ADDRESS: unguard-rag-service
         RAG_SERVICE_PORT: 8000
 
diff --git a/src/frontend-nextjs/app/api/post/[postId]/spam-prediction-user-rating/route.ts b/src/frontend-nextjs/app/api/post/[postId]/spam-prediction-user-rating/route.ts
@@ -14,5 +14,5 @@ export async function GET(req: Request, { params }: { params: Promise<PostParams
     const { postId } = await params;
     const res = await fetchSpamPredictionUserRating(postId);
 
-    return NextResponse.json(res.data);
+    return NextResponse.json(res.data, { status: res.status });
 }
diff --git a/src/frontend-nextjs/components/Timeline/PostSpamPrediction.tsx b/src/frontend-nextjs/components/Timeline/PostSpamPrediction.tsx
@@ -29,7 +29,9 @@ export function PostSpamPrediction(props: Readonly<PostSpamPredictionProps>) {
                             {props.isSpamPredictedLabel ? 'Potential Spam Detected' : 'No Spam Detected'}
                         </div>
                         {isLoggedIn && (
-                            <ErrorBoundary fallbackRender={(props) => <ErrorCard message={props.error.message} />}>
+                            <ErrorBoundary
+                                fallbackRender={(errorProps) => <ErrorCard message={errorProps.error.message} />}
+                            >
                                 <SpamPredictionUserRating
                                     isSpamPredictedLabel={props.isSpamPredictedLabel}
                                     postId={props.postId}
diff --git a/src/frontend-nextjs/hooks/queries/useSpamPredictionUserRating.ts b/src/frontend-nextjs/hooks/queries/useSpamPredictionUserRating.ts
@@ -7,7 +7,7 @@ import { BASE_PATH } from '@/constants';
 
 type SpamPredictionUserRating = {
     spamPredictionUserUpvotes: number;
-    spamPredictionUserDownvotes: boolean;
+    spamPredictionUserDownvotes: number;
     isUpvotedByUser?: boolean;
     isDownvotedByUser?: boolean;
 };
diff --git a/src/frontend-nextjs/services/api/SpamPredictionVotesService.ts b/src/frontend-nextjs/services/api/SpamPredictionVotesService.ts
@@ -26,7 +26,7 @@ export async function fetchSpamPredictionUserRating(postId: string): Promise<any
 
 export async function addSpamPredictionUserRatingUpvote(postId: string): Promise<any> {
     return await getMicroblogApi()
-        .post(`/spam-prediction-user-rating/${postId}/upvote/`, {}, await withJwtCookie())
+        .post(`/spam-prediction-user-rating/${postId}/upvote`, {}, await withJwtCookie())
         .then((response) => {
             return response;
         })
@@ -37,7 +37,7 @@ export async function addSpamPredictionUserRatingUpvote(postId: string): Promise
 
 export async function addSpamPredictionUserRatingDownvote(postId: string): Promise<any> {
     return await getMicroblogApi()
-        .post(`/spam-prediction-user-rating/${postId}/downvote/`, {}, await withJwtCookie())
+        .post(`/spam-prediction-user-rating/${postId}/downvote`, {}, await withJwtCookie())
         .then((response) => {
             return response;
         })
diff --git a/src/microblog-service/README.md b/src/microblog-service/README.md
@@ -51,14 +51,15 @@ Running the application should start a webserver accessible on [localhost:8080](
 
 To get more information about the JAEGER config options, see https://www.jaegertracing.io/docs/1.19/client-features/
 
-| Name                      | Example Value             | Description                                                  |
-|---------------------------|---------------------------|--------------------------------------------------------------|
-| SERVER_PORT               | 8080                      | The port that the server will run on                         |
-| REDIS_SERVICE_ADDRESS     | localhost                 | Change to hostname/IP of your Redis instance                 |
-| JAEGER_AGENT_HOST         | localhost                 | Change to hostname/IP of your Jaeger agent                   |
-| JAEGER_SERVICE_NAME       | microblog-service         | Name that will be used for the service in the Jaeger traces  |
-| JAEGER_SAMPLER_TYPE       | const                     | (optional) Set to const to get all traces                    |
-| JAEGER_SAMPLER_PARAM      | 1                         | (optional) Set to 1 while sampler is const to get all traces |
-| USER_AUTH_SERVICE_ADDRESS | unguard-user-auth-service | Change to hostname/IP of user-auth-service instance          |
-| RAG_SERVICE_ADDRESS       | unguard-rag-service       | Change to hostname/IP of rag-service instance                |
-| RAG_SERVICE_PORT          | 8000                      | Change to port number of rag-service instance                |
+| Name                      | Example Value             | Description                                                                                                                                                               |
+|---------------------------|---------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| SERVER_PORT               | 8080                      | The port that the server will run on                                                                                                                                      |
+| REDIS_SERVICE_ADDRESS     | localhost                 | Change to hostname/IP of your Redis instance                                                                                                                              |
+| JAEGER_AGENT_HOST         | localhost                 | Change to hostname/IP of your Jaeger agent                                                                                                                                |
+| JAEGER_SERVICE_NAME       | microblog-service         | Name that will be used for the service in the Jaeger traces                                                                                                               |
+| JAEGER_SAMPLER_TYPE       | const                     | (optional) Set to const to get all traces                                                                                                                                 |
+| JAEGER_SAMPLER_PARAM      | 1                         | (optional) Set to 1 while sampler is const to get all traces                                                                                                              |
+| USER_AUTH_SERVICE_ADDRESS | unguard-user-auth-service | Change to hostname/IP of user-auth-service instance                                                                                                                       |
+| RAG_SERVICE_ADDRESS       | unguard-rag-service       | Change to hostname/IP of rag-service instance                                                                                                                             |
+| RAG_SERVICE_PORT          | 8000                      | Change to port number of rag-service instance                                                                                                                             |
+| RAG_SERVICE_ENABLED       | true                      | Configure whether the RAG service for Spam Detection should be deployed, including other necessary services such as the Ollama service and the Feedback Ingestion Service |
diff --git a/src/microblog-service/src/main/java/org/dynatrace/microblog/MicroblogController.java b/src/microblog-service/src/main/java/org/dynatrace/microblog/MicroblogController.java
@@ -43,6 +43,8 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 
+import javax.annotation.PreDestroy;
+import java.util.concurrent.TimeUnit;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
@@ -119,6 +121,19 @@ public MicroblogController(Tracer tracer, PostSerializer postSerializer) {
         this.ragServiceEnabled = isRagServiceEnabled;
     }
 
+    @PreDestroy
+    public void shutdownRagExecutor() {
+        ragExecutor.shutdown();
+        try {
+            if (!ragExecutor.awaitTermination(30, TimeUnit.SECONDS)) {
+                ragExecutor.shutdownNow();
+            }
+        } catch (InterruptedException e) {
+            ragExecutor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+    }
+
     @RequestMapping("/timeline")
     public List<Post> timeline() {
         return redisClient.getTimeline();
diff --git a/src/microblog-service/src/main/java/org/dynatrace/microblog/exceptions/EmptySpamClassificationException.java b/src/microblog-service/src/main/java/org/dynatrace/microblog/exceptions/EmptySpamClassificationException.java
@@ -0,0 +1,7 @@
+package org.dynatrace.microblog.exceptions;
+
+public class EmptySpamClassificationException extends RuntimeException {
+    public EmptySpamClassificationException(String message) {
+        super(message);
+    }
+}
diff --git a/src/microblog-service/src/main/java/org/dynatrace/microblog/exceptions/InvalidPostException.java b/src/microblog-service/src/main/java/org/dynatrace/microblog/exceptions/InvalidPostException.java
@@ -0,0 +1,7 @@
+package org.dynatrace.microblog.exceptions;
+
+public class InvalidPostException extends RuntimeException {
+    public InvalidPostException(String message) {
+        super(message);
+    }
+}
diff --git a/src/microblog-service/src/main/java/org/dynatrace/microblog/ragservice/RAGServiceClient.java b/src/microblog-service/src/main/java/org/dynatrace/microblog/ragservice/RAGServiceClient.java
@@ -5,8 +5,7 @@
 import io.opentracing.contrib.okhttp3.TracingInterceptor;
 import io.opentracing.util.GlobalTracer;
 import okhttp3.*;
-import org.dynatrace.microblog.exceptions.InvalidJwtException;
-import org.dynatrace.microblog.exceptions.UserNotFoundException;
+import org.dynatrace.microblog.exceptions.EmptySpamClassificationException;
 import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,9 +22,9 @@ public class RAGServiceClient {
     private final String ragServiceHost;
     private final int ragServicePort;
 
-    public RAGServiceClient(String ragServiceHost, String ragsServicePort) {
+    public RAGServiceClient(String ragServiceHost, String ragServicePort) {
         this.ragServiceHost = ragServiceHost;
-        this.ragServicePort = Integer.parseInt(ragsServicePort);
+        this.ragServicePort = Integer.parseInt(ragServicePort);
 
         TracingInterceptor tracingInterceptor = new TracingInterceptor(
             GlobalTracer.get(),
@@ -41,7 +40,7 @@ public RAGServiceClient(String ragServiceHost, String ragsServicePort) {
 
     }
 
-    public String getSpamClassification(String postText) throws InvalidJwtException, UserNotFoundException, IOException {
+    public String getSpamClassification(String postText) throws IOException, EmptySpamClassificationException {
         JsonObject obj = new JsonObject();
         obj.addProperty("text", postText);
         String jsonRequest = obj.toString();
@@ -66,10 +65,12 @@ public String getSpamClassification(String postText) throws InvalidJwtException,
         try (Response response = call.execute()) {
 
             if (response.code() == 200) {
-                JSONObject responseObject = new JSONObject(response.body().string());
+                ResponseBody responseBody = response.body();
+                if (responseBody == null) {
+                    throw new EmptySpamClassificationException("Error retrieving spam classification from RAG service: empty response body");
+                }
+                JSONObject responseObject = new JSONObject(responseBody.string());
                 return responseObject.getString("classification");
-            } else if (response.code() == 401) {
-                throw new InvalidJwtException();
             } else {
                 throw new RuntimeException("Error retrieving spam classification from RAG service: " + response.code() + " - " + response.message());
             }
diff --git a/src/microblog-service/src/main/java/org/dynatrace/microblog/redis/RedisClient.java b/src/microblog-service/src/main/java/org/dynatrace/microblog/redis/RedisClient.java
@@ -24,6 +24,7 @@
 import org.dynatrace.microblog.dto.SpamPredictionRatings;
 import org.dynatrace.microblog.dto.User;
 import org.dynatrace.microblog.exceptions.InvalidJwtException;
+import org.dynatrace.microblog.exceptions.InvalidPostException;
 import org.dynatrace.microblog.exceptions.UserNotFoundException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -150,6 +151,11 @@ public SpamPredictionRatings getSpamPredictionUserRatings(@NotNull String postId
 
     public void handleSpamPredictionUpvote(@NotNull String postId, @NotNull String userId) {
         try (Jedis jedis = jedisPool.getResource()) {
+            if (Boolean.FALSE.equals(jedis.exists(getCombinedKey(POST_KEY_PREFIX, postId)))) {
+                logger.warn("Could not find post with id {} for spam prediction upvote", postId);
+                throw new InvalidPostException("Post with this id does not exist.");
+            }
+
             if (Boolean.TRUE.equals(jedis.sismember(getSpamPredictionUpvotersKey(postId), userId))) {
                 // remove the user from the upvoters if already contained
                 jedis.srem(getSpamPredictionUpvotersKey(postId), userId);
@@ -164,6 +170,10 @@ public void handleSpamPredictionUpvote(@NotNull String postId, @NotNull String u
 
     public void handleSpamPredictionDownvote(@NotNull String postId, @NotNull String userId) {
         try (Jedis jedis = jedisPool.getResource()) {
+            if (Boolean.FALSE.equals(jedis.exists(getCombinedKey(POST_KEY_PREFIX, postId)))) {
+                logger.warn("Could not find post with id {} for spam prediction upvote", postId);
+                throw new InvalidPostException("Post with this id does not exist.");
+            }
             if (Boolean.TRUE.equals(jedis.sismember(getSpamPredictionDownvotersKey(postId), userId))) {
                 // remove the user from the downvoters if already contained
                 jedis.srem(getSpamPredictionDownvotersKey(postId), userId);
diff --git a/src/rag-service/README.md b/src/rag-service/README.md
@@ -11,19 +11,19 @@ A microservice for spam classification using Retrieval-Augmented Generation (RAG
 - **[Ollama](https://ollama.com/)**: Local open-source LLM and embeddings
 
 ## Environment Variables
-| Name                                            | Example Value                    | Description                                                                       |
-|-------------------------------------------------|----------------------------------|-----------------------------------------------------------------------------------|
-| LLM_MODEL                                       | llama3.2:latest                  | The LLM model that will be used by the RAG service                                |
-| EMBEDDINGS_MODEL                                | nomic-embed-text                 | The embeddings model that will be used by the RAG service                         |
-| MODEL_PROVIDER                                  | Ollama                           | Can be either "Ollama" or "LangDock"                                              |
-| MODEL_PROVIDER_BASE_URL                         | http://localhost:11434           | Base url to your model                                                            |
-| LANGDOCK_API_KEY                                | <your_langdock_api_key>          | (optional) Langdock API key, only needed when using LangDock                      |
-| EVALUATE_AFTER_ATTACK                           | false                            | Configure whether the RAG service performance should be evaluated after an attack |
-| LIMIT_EVALUATION_SAMPLES                        | 0                                |                                                                                   |
-| LIMIT_KEYWORD_ATTACK_SUCCESS_EVALUATION_SAMPLES | 0                                | Change to hostname/IP of rag-service instance                                     |
-| USE_DATA_POISONING_DETECTION                    | falses                           | Change to port number of rag-service instance                                     |
-| DATA_POISONING_DETECTION_STRATEGY               | embedding_similarity_entry_level | The data poisoning detection strategy to use                                      |
-| LABEL_CONSISTENCY_DETECTION_DECISION_VARIANT    | majority_voting                  | The variant of the label consistency detection strategy to use                    |
+| Name                                            | Example Value                    | Description                                                                                                  |
+|-------------------------------------------------|----------------------------------|--------------------------------------------------------------------------------------------------------------|
+| LLM_MODEL                                       | llama3.2:latest                  | The LLM model that will be used by the RAG service                                                           |
+| EMBEDDINGS_MODEL                                | nomic-embed-text                 | The embeddings model that will be used by the RAG service                                                    |
+| MODEL_PROVIDER                                  | Ollama                           | Can be either "Ollama" or "LangDock"                                                                         |
+| MODEL_PROVIDER_BASE_URL                         | http://localhost:11434           | Base url to your model                                                                                       |
+| LANGDOCK_API_KEY                                | <your_langdock_api_key>          | (optional) Langdock API key, only needed when using LangDock                                                 |
+| EVALUATE_AFTER_ATTACK                           | false                            | Configure whether the RAG service performance should be evaluated after an attack                            |
+| LIMIT_EVALUATION_SAMPLES                        | 0                                | Configure the size of the evaluation set, set 0 for no limit.                                                |
+| LIMIT_KEYWORD_ATTACK_SUCCESS_EVALUATION_SAMPLES | 0                                | Configure the size of the evaluation set for the keyword attack success rate evaluation. Set 0 for no limit. |
+| USE_DATA_POISONING_DETECTION                    | false                            | Configure whether data poisoning detection should be used before ingesting new data into the Knowledge Base. |
+| DATA_POISONING_DETECTION_STRATEGY               | embedding_similarity_entry_level | The data poisoning detection strategy to use                                                                 |
+| LABEL_CONSISTENCY_DETECTION_DECISION_VARIANT    | majority_voting                  | The variant of the label consistency detection strategy to use                                               |
 
 
 ## Getting Started for running the RAG Service locally

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ export async function GET(req: Request, { params }: { params: Promise<PostParams`
`14`	`14`	`const { postId } = await params;`
`15`	`15`	`const res = await fetchSpamPredictionUserRating(postId);`
`16`	`16`
`17`		`- return NextResponse.json(res.data);`
	`17`	`+ return NextResponse.json(res.data, { status: res.status });`
`18`	`18`	`}`