Merge pull request #100 from PiotrIw/prompt_ext

v1.5.18

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
 minimum_pre_commit_version: "1.20.0"
 repos:
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.18.0
+    rev: 1.19.0
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
@@ -28,7 +28,7 @@ repos:
           - --skip-glob
           - "**/migrations/*.py"
   - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.28.6
+    rev: 0.29.0
     hooks:
       - id: check-github-workflows
       - id: check-readthedocs

feder/__init__.py

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

feder/letters/models.py

@@ -608,9 +608,14 @@ def normalized_answer_is_up_to_date(self):
             and self.case.monitoring.normalized_response_template_created is not None
             and self.normalized_answer_created
             > self.case.monitoring.normalized_response_template_created
-            and self.normalized_answer_created
-            > self.case.monitoring.letter_normalization_prompt_extension_modified
         ):
+            if (
+                self.case.monitoring.letter_normalization_prompt_extension_modified
+                is not None
+                and self.case.monitoring.letter_normalization_prompt_extension_modified
+                > self.normalized_answer_created
+            ):
+                return False
             return True
         return False
 

feder/monitorings/views.py

@@ -774,20 +774,12 @@ def get_excel_workbook(self, monitoring_responses_data):
                     r_data["answer"] = questions[key].get(
                         NORMALIZED_RESPONSE_ANSWER_KEY, ""
                     )
-                    r_data["manual_answer"] = ""
-                    r_data["final_answer"] = ""
                     r_data["answer_category"] = questions[key].get(
                         NORMALIZED_RESPONSE_ANSWER_CATEGORY_KEY, ""
                     )
-                    r_data["manual_answer_category"] = ""
-                    r_data["final_answer_category"] = ""
-                    ws.append([r_data[k] for k in (info_keys + question_keys)])
+                    ws.append([r_data.get(k, "") for k in (info_keys + question_keys)])
             else:
-                r_data["question_no"] = ""
-                r_data["question"] = ""
-                r_data["answer"] = ""
-                r_data["answer_category"] = ""
-                ws.append([r_data[k] for k in (info_keys + question_keys)])
+                ws.append([r_data.get(k, "") for k in (info_keys + question_keys)])
         ws.auto_filter.ref = ws.dimensions
         return wb
 

package.json

@@ -12,7 +12,7 @@
     "datatables.net-plugins": "^1.13.6",
     "font-awesome": "^4.7.0",
     "jquery": "^3.7.0",
-    "postcss": "8.4.38"
+    "postcss": "8.4.39"
   },
   "devDependencies": {
     "gulp": "^4.0.0",

requirements/base.txt

@@ -1,5 +1,5 @@
 # Production and staging Django
-Django==4.2.13
+Django==4.2.14
 
 # Database adapter
 mysqlclient==2.2.4
@@ -15,7 +15,7 @@ django-crispy-forms==1.14.0
 django-model-utils==4.5.1
 
 # Images
-Pillow==10.3.0
+Pillow==10.4.0
 
 # For user registration, either via email or social
 # Well-built with regular release cycles!
@@ -92,9 +92,9 @@ html2text==2024.2.26
 openpyxl==3.1.3
 
 # LLM exvaluation
-langchain==0.2.6
-langchain-community==0.2.6
+langchain==0.2.9
+langchain-community==0.2.7
 #langchain[llms]==0.1.5
-openai==1.35.6
-langchain-openai==0.1.10
+openai==1.35.14
+langchain-openai==0.1.17
 tiktoken==0.7.0

requirements/dev.txt

@@ -1,9 +1,9 @@
 # Local development dependencies go here
 -r base.txt
-Sphinx==7.3.7
+Sphinx==7.4.5
 sphinx-rtd-theme==2.0.0
 Werkzeug==3.0.3
-django-debug-toolbar==4.4.2
+django-debug-toolbar==4.4.6
 ipdb==0.13.13
 factory-boy==3.3.0
 django-coverage-plugin==3.1.0

requirements/production.txt

@@ -4,4 +4,4 @@
 # Django==3.2.23
 gevent==24.2.1
 gunicorn==22.0.0
-sentry-sdk==2.7.1
+sentry-sdk==2.10.0