Merge pull request #1387 from watchdogpolska/develop

v1.3.2 Llm evaluation - fixes

feder/__init__.py

@@ -1,5 +1,5 @@
 # PEP 396: The __version__ attribute's value SHOULD be a string.
-__version__ = "1.3.1"
+__version__ = "1.3.2"
 
 
 # Compatibility to eg. django-rest-framework

feder/llm_evaluation/tasks.py

@@ -62,7 +62,9 @@ def get_monitoring_normalized_response_template(monitoring_pk):
         .order_by("-created")
     )
 
-    if (
+    # TODO: make sure to update when introducing more LlmMonitoringRequest methods
+    # TODO: or find better solution
+    if len(monitoring_llm_requests) == 1 or (
         len(monitoring_llm_requests) > 1
         and monitoring_llm_requests[0].response != monitoring_llm_requests[1].response
     ):

feder/main/utils.py

@@ -1,4 +1,5 @@
 import json
+import logging
 
 from django.contrib.admin.models import ADDITION, CHANGE, DELETION, LogEntry
 from django.contrib.contenttypes.models import ContentType
@@ -9,6 +10,8 @@
 from django.utils.safestring import mark_safe
 from rest_framework_csv.renderers import CSVStreamingRenderer
 
+logger = logging.getLogger(__name__)
+
 
 def get_numeric_param(request, key):
     """Get numeric param from request"""
@@ -63,13 +66,17 @@ def get_email_domain(email: str) -> str:
 def render_normalized_response_html_table(normalized_response):
     html = "<table class='table table-bordered compact'>\n"
     html += "<tr><th>Nr</th><th>Pytanie</th><th>Odpowiedź</th></tr>\n"
-    for key, subdict in json.loads(normalized_response).items():
-        html += (
-            f"<tr><td>{key}</td><td>{subdict.get('Pytanie', '')}</td>"
-            + f"<td>{subdict.get('Odpowiedź', '')}</td></tr>\n"
-        )
-    html += "</table>"
-    return mark_safe(html)
+    try:
+        for key, subdict in json.loads(normalized_response).items():
+            html += (
+                f"<tr><td>{key}</td><td>{subdict.get('Pytanie', '')}</td>"
+                + f"<td>{subdict.get('Odpowiedź', '')}</td></tr>\n"
+            )
+        html += "</table>"
+        return mark_safe(html)
+    except json.JSONDecodeError:
+        logger.warning(f"Normalized response is not valid JSON: {normalized_response}")
+        return mark_safe("<p>Normalized response is not valid JSON.</p>")
 
 
 class PaginatedCSVStreamingRenderer(CSVStreamingRenderer):