Merge pull request #138 from unicef/feature/tweaks

tweaks

Author: domdinicola

pyproject.toml

@@ -59,40 +59,40 @@ scripts.celery-monitor = "country_workspace.__monitor__:run"
 
 [dependency-groups]
 dev = [
-  "bump2version>=1.0.1",
-  "djade>=1.3.2",
-  "django-browser-reload>=1.17",
-  "django-webtest>=1.9.11",
-  "factory-boy>=3.3",
-  "freezegun>=1.5.1",
-  "ipython>=8.29",
-  "mypy>=1.11.2",
-  "pdbpp>=0.10.3",
-  "pip>=24.3.1",
-  "pre-commit>=3.7.1",
-  "pyquery>=2.0.1",
-  "pytest>=8.2.2",
-  "pytest-celery>=1",
-  "pytest-coverage>=0",
-  "pytest-django>=4.8",
-  "pytest-echo>=1.7.3",
-  "pytest-factoryboy>=2.7",
-  "pytest-mock>=3.14",
-  "pytest-recording>=0.13.2",
-  "pytest-xdist>=3.6.1",
-  "responses>=0.25.3",
-  "ruff>=0.9.3",
-  "seleniumbase>=4.35.7",
-  "types-python-dateutil>=2.9.0.20241003",
-  "types-requests>=2.31.0.6",
-  "vcrpy>=6.0.2",
+  "bump2version",
+  "djade",
+  "django-browser-reload",
+  "django-webtest",
+  "factory-boy",
+  "freezegun",
+  "ipython",
+  "mypy",
+  "pdbpp",
+  "pip",
+  "pre-commit",
+  "pyquery",
+  "pytest<8.4",            # temp fix for pytest_factoryboy AttributeError: 'FixtureFunctionDefinition' object has no attribute '__pytest_wrapped__'
+  "pytest-celery",
+  "pytest-coverage",
+  "pytest-django",
+  "pytest-echo",
+  "pytest-factoryboy",
+  "pytest-mock",
+  "pytest-recording",
+  "pytest-xdist",
+  "responses",
+  "ruff",
+  "seleniumbase",
+  "types-python-dateutil",
+  "types-requests",
+  "vcrpy",
 ]
 
 docs = [
-  "mkdocs>=1.6.1",
-  "mkdocs-awesome-pages-plugin>=2.9.3",
-  "mkdocs-gen-files>=0.5",
-  "mkdocs-material>=9.5.36",
+  "mkdocs",
+  "mkdocs-awesome-pages-plugin",
+  "mkdocs-gen-files",
+  "mkdocs-material",
   "mkdocstrings-python",
 ]
 

src/country_workspace/contrib/hope/ddt.py

@@ -13,7 +13,7 @@ class ApiCall:
     def __init__(self, panel: "WSHopePanel", data: dict[str, Any]) -> None:
         self.panel = panel
         self.url = data["url"]
-        self.params = data["params"]
+        self.params = data.get("params", {})
         self.signature = data["signature"]
 
     def timing(self) -> Any:

src/country_workspace/contrib/kobo/api/client/helpers.py

@@ -46,11 +46,11 @@ def handle_paginated_response[T, U](
 
 
 def get_raw_asset_list(data: raw_common.ListResponse) -> list[raw_asset_list.Asset]:
-    return [datum for datum in cast(raw_asset_list.AssetList, data)["results"] if datum["has_deployment"]]
+    return [datum for datum in cast("raw_asset_list.AssetList", data)["results"] if datum["has_deployment"]]
 
 
 def get_raw_submission_list(data: raw_common.ListResponse) -> list[raw_submission_list.Submission]:
-    return cast(raw_submission_list.SubmissionList, data)["results"]
+    return cast("raw_submission_list.SubmissionList", data)["results"]
 
 
 def get_asset_list(data_getter: DataGetter, url: str) -> Generator[Asset, None, None]:

src/country_workspace/contrib/kobo/sync.py

@@ -79,7 +79,7 @@ def create_household(batch: Batch, submission: Submission, config: Config) -> Ho
     raw_household_fields = extract_household_data(submission, config["individual_records_field"])
     household_fields = normalize_json(raw_household_fields)
     return cast(
-        Household,
+        "Household",
         batch.program.households.create(
             batch=batch,
             flex_fields=clean_field_names(household_fields),

src/country_workspace/datasources/rdi.py

@@ -83,7 +83,7 @@ def process_households(sheet: Sheet, job: AsyncJob, batch: Batch, config: Config
 
         try:
             mapping[household_key] = cast(
-                Household,
+                "Household",
                 job.program.households.create(
                     batch=batch,
                     name=label,

src/country_workspace/migrations/0015_alter_asyncjob_file.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.2.1 on 2025-06-17 09:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "country_workspace",
+            "0014_office_enabled_program_enabled_alter_office_active",
+        ),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="asyncjob",
+            name="file",
+            field=models.FileField(blank=True, null=True, upload_to="updates"),
+        ),
+    ]

src/country_workspace/models/jobs.py

@@ -6,8 +6,6 @@
 from django.utils.module_loading import import_string
 from django_celery_boost.models import CeleryTaskModel
 
-from country_workspace.storages import MEDIA_STORAGE
-
 
 class AsyncJob(CeleryTaskModel, models.Model):
     class JobType(models.TextChoices):
@@ -18,7 +16,7 @@ class JobType(models.TextChoices):
     type = models.CharField(max_length=50, choices=JobType.choices)
     program = models.ForeignKey("Program", related_name="jobs", on_delete=models.CASCADE, null=True, blank=True)
     batch = models.ForeignKey("Batch", related_name="jobs", on_delete=models.CASCADE, null=True, blank=True)
-    file = models.FileField(storage=MEDIA_STORAGE, upload_to="updates", null=True, blank=True)
+    file = models.FileField(upload_to="updates", null=True, blank=True)
     config = models.JSONField(default=dict, blank=True)
     action = models.CharField(max_length=500, blank=True, null=True)
     description = models.CharField(max_length=255, blank=True, null=True)
@@ -39,7 +37,7 @@ def queue_position(self) -> int:
 
     @property
     def started(self) -> str:
-        return self.task_info["started_at"]
+        return self.task_info.get("started_at", None)
 
     def execute(self) -> Any:
         sid = None

src/country_workspace/utils/flags.py

@@ -53,7 +53,7 @@ def hostname(value: str, request: "HttpRequest|None", **kwargs: "Any") -> bool:
 def env_var(value: str, **kwargs: Any) -> bool:
     if "=" in value:
         key, value = value.split("=")
-        return os.environ.get(key, -1) == value
+        return os.environ.get(key, "-1") == value
     return value.strip() in os.environ
 
 

src/country_workspace/workspaces/models.py

@@ -24,7 +24,7 @@ class Meta:
 
     @cached_property
     def program(self) -> "CountryProgram":
-        return cast(CountryProgram, self.batch.program)
+        return cast("CountryProgram", self.batch.program)
 
     @cached_property
     def country_office(self) -> "DataChecker":

src/country_workspace/workspaces/templatetags/workspace_list.py

@@ -113,7 +113,7 @@ def result_headers(cl: "WorkspaceChangeList | ChangeList") -> "Generator[dict[st
                     "text": mark_safe(  # noqa: S308
                         f'<input type="checkbox" id="action-toggle" aria-label="{aria_label}">',
                     ),
-                    "class_attrib": mark_safe(' class="action-checkbox-column"'),  # noqa: S308
+                    "class_attrib": ' class="action-checkbox-column"',
                     "sortable": False,
                 }
                 continue