Merge branch 'develop' into feature/upgrade-ng-18

Author: XanderVertegaal

backend/problem/management/commands/import_fracas.py

@@ -101,25 +101,24 @@ def import_fracas_problems(self, fracas_path: str) -> None:
             premise_nodes = problem.findall("p")
             premises = [node.text.strip() for node in premise_nodes if node.text]
 
-            with transaction.atomic():
-                Problem.objects.create(
-                    type=Problem.ProblemType.FRACAS,
-                    content=json.dumps(
-                        {
-                            "fracas_id": int(problem_id),
-                            "question": question,
-                            "hypothesis": hypothesis,
-                            "answer": answer,
-                            "fracas_answer": fracas_answer,
-                            "fracas_non_standard": fracas_nonstandard,
-                            "note": note,
-                            "section_name": section,
-                            "subsection_name": subsection,
-                            "premises": premises,
-                        }
-                    ),
-                )
-                created += 1
+            Problem.objects.create(
+                type=Problem.ProblemType.FRACAS,
+                content=json.dumps(
+                    {
+                        "fracas_id": int(problem_id),
+                        "question": question,
+                        "hypothesis": hypothesis,
+                        "answer": answer,
+                        "fracas_answer": fracas_answer,
+                        "fracas_non_standard": fracas_nonstandard,
+                        "note": note,
+                        "section_name": section,
+                        "subsection_name": subsection,
+                        "premises": premises,
+                    }
+                ),
+            )
+            created += 1
 
         logger.info(
             f"FraCaS problems import complete! Total: {created} | Skipped: {skipped}"

backend/problem/services.py

@@ -1,4 +1,6 @@
 import json
+
+from langpro_annotator.logger import logger
 from .models import Problem
 from .types import FracasProblem, SickProblem
 
@@ -9,11 +11,11 @@ def get_sick_problems() -> list[SickProblem]:
     and converts them into SickProblem instances.
     """
     sick_problems: list[SickProblem] = []
-    problem_objects = Problem.objects.filter(type=Problem.ProblemType.SICK)
+    sick_objects = Problem.objects.filter(type=Problem.ProblemType.SICK)
 
-    for problem_obj in problem_objects:
+    for sick_obj in sick_objects:
         try:
-            problem_data = json.loads(problem_obj.content)
+            problem_data = json.loads(sick_obj.content)
             problem = SickProblem(
                     pair_id=problem_data["pair_ID"],
                     sentence_one=problem_data["sentence_A"],
@@ -23,13 +25,15 @@ def get_sick_problems() -> list[SickProblem]:
                 )
             sick_problems.append(problem)
         except json.JSONDecodeError:
-            print(
-                f"Warning: Could not parse JSON content for Problem ID {problem_obj.id}"
+            logger.warning(
+                f"Warning: Could not parse JSON content for Problem ID {sick_obj.id}"
             )
+            continue
         except TypeError as e:
-            print(
-                f"Warning: Could not create SickProblem for Problem ID {problem_obj.id}: {e}"
+            logger.warning(
+                f"Warning: Could not create SickProblem for Problem ID {sick_obj.id}: {e}"
             )
+            continue
 
     return sick_problems
 
@@ -59,12 +63,14 @@ def get_fracas_problems() -> list[FracasProblem]:
             )
             fracas_problems.append(problem)
         except json.JSONDecodeError:
-            print(
+            logger.warning(
                 f"Warning: Could not parse JSON content for Problem ID {problem_obj.id}"
             )
+            continue
         except TypeError as e:
-            print(
+            logger.warning(
                 f"Warning: Could not create FracasProblem for Problem ID {problem_obj.id}: {e}"
             )
+            continue
 
     return fracas_problems

backend/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile '.\requirements.in'
+#    pip-compile
 #
 asgiref==3.8.1
     # via
@@ -17,24 +17,24 @@ colorama==0.4.6
     #   pytest
     #   tqdm
 dj-rest-auth==7.0.1
-    # via -r .\requirements.in
+    # via -r requirements.in
 django==4.2.20
     # via
-    #   -r .\requirements.in
+    #   -r requirements.in
     #   dj-rest-auth
     #   django-allauth
     #   django-livereload-server
     #   django-revproxy
     #   djangorestframework
 django-allauth==65.5.0
-    # via -r .\requirements.in
+    # via -r requirements.in
 django-livereload-server==0.5.1
-    # via -r .\requirements.in
+    # via -r requirements.in
 django-revproxy==0.13.0
-    # via -r .\requirements.in
+    # via -r requirements.in
 djangorestframework==3.15.2
     # via
-    #   -r .\requirements.in
+    #   -r requirements.in
     #   dj-rest-auth
 execnet==2.1.1
     # via pytest-xdist
@@ -49,26 +49,26 @@ packaging==24.2
 pluggy==1.5.0
     # via pytest
 psycopg2==2.9.10
-    # via -r .\requirements.in
+    # via -r requirements.in
 pytest==8.3.5
     # via
-    #   -r .\requirements.in
+    #   -r requirements.in
     #   pytest-django
     #   pytest-xdist
 pytest-django==4.10.0
-    # via -r .\requirements.in
+    # via -r requirements.in
 pytest-xdist==3.6.1
-    # via -r .\requirements.in
+    # via -r requirements.in
 requests==2.32.3
     # via requests-oauthlib
 requests-oauthlib==2.0.0
-    # via -r .\requirements.in
+    # via -r requirements.in
 sqlparse==0.5.3
     # via django
 tornado==6.4.2
     # via django-livereload-server
 tqdm==4.67.1
-    # via -r .\requirements.in
+    # via -r requirements.in
 tzdata==2025.1
     # via django
 urllib3==2.3.0