fix imports

Author: domdinicola

src/country_workspace/contrib/aurora/pipeline.py

@@ -1,10 +1,11 @@
-from typing import Any, Final, Mapping, NotRequired
+from typing import Any, Mapping, NotRequired
 
 from django.db.transaction import atomic
 
 from country_workspace.contrib.aurora.client import AuroraClient
 from country_workspace.contrib.aurora.exceptions import TooManyBeneficiaryError
 from country_workspace.models import AsyncJob, Batch, Household, Individual
+from country_workspace.models.household import RELATIONSHIP_HEAD, RELATIONSHIP_FIELDNAME
 from country_workspace.utils.config import BatchNameConfig, FailIfAlienConfig
 from country_workspace.utils.fields import clean_field_names
 from country_workspace.validators.beneficiaries import validate_beneficiaries
@@ -18,13 +19,6 @@ class Config(BatchNameConfig, FailIfAlienConfig):
     household_label_column: NotRequired[str]
 
 
-RELATIONSHIP_HEAD: Final[str] = "HEAD"
-RELATIONSHIP_FIELDNAME: Final[str] = "relationship"
-
-ROLE_PRIMARY = "PRIMARY"
-ROLE_ALTERNATE = "ALTERNATE"
-
-
 def import_from_aurora(job: AsyncJob) -> dict[str, int]:
     """Import data from the Aurora system into the database within an atomic transaction.
 

src/country_workspace/models/household.py

@@ -1,12 +1,11 @@
 from functools import cached_property
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Final
 
 import pghistory
 from django.db import models
 from django.utils import timezone
 
 from .base import BaseModel, Validable
-from ..contrib.aurora.pipeline import ROLE_PRIMARY, ROLE_ALTERNATE
 
 if TYPE_CHECKING:
     from django.db.models import QuerySet
@@ -17,6 +16,13 @@
     from .program import Program
 
 
+RELATIONSHIP_HEAD: Final[str] = "HEAD"
+RELATIONSHIP_FIELDNAME: Final[str] = "relationship"
+
+ROLE_PRIMARY: Final[str] = "PRIMARY"
+ROLE_ALTERNATE: Final[str] = "ALTERNATE"
+
+
 @pghistory.track(pghistory.UpdateEvent(condition=pghistory.AnyChange("flex_fields", "flex_files", "removed")))
 class Household(Validable, BaseModel):
     system_fields = models.JSONField(default=dict, blank=True)

tests/contrib/hope/test_h_validators.py

@@ -4,8 +4,8 @@
 import pytest
 from faker import Faker
 
-from country_workspace.contrib.aurora.pipeline import ROLE_ALTERNATE, ROLE_PRIMARY
 from country_workspace.contrib.hope.validators import FullHouseholdValidator
+from country_workspace.models.household import ROLE_PRIMARY, ROLE_ALTERNATE
 
 if TYPE_CHECKING:
     from country_workspace.models import Household

tests/functional/integration/test_hope_push_lax.py

@@ -6,8 +6,8 @@
 import pytest
 from django_celery_results.models import TaskResult
 
-from country_workspace.contrib.aurora.pipeline import ROLE_PRIMARY
 from country_workspace.models import AsyncJob
+from country_workspace.models.household import ROLE_PRIMARY
 from testutils.factories import CountryHouseholdFactory
 from testutils.factories.program import BeneficiaryGroupFactory, CountryProgramFactory