Remove more advanced imports from models/__init__.py

Author: davegaeddert

plain-admin/plain/admin/cards/charts.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 from plain.admin.dates import DatetimeRangeAliases
-from plain.models import Count
+from plain.models.aggregates import Count
 from plain.models.functions import (
     TruncDate,
     TruncMonth,

plain-flags/plain/flags/preflight.py

@@ -1,4 +1,4 @@
-from plain.models import OperationalError, ProgrammingError
+from plain.models.db import OperationalError, ProgrammingError
 from plain.preflight import PreflightCheck, PreflightResult, register_check
 from plain.runtime import settings
 

plain-jobs/plain/jobs/admin.py

@@ -12,6 +12,7 @@
     register_viewset,
 )
 from plain.http import ResponseRedirect
+from plain.models.expressions import Case, When
 from plain.runtime import settings
 
 from .models import JobProcess, JobRequest, JobResult
@@ -200,13 +201,13 @@ class ListView(AdminModelListView):
         def get_initial_queryset(self) -> Any:
             queryset = super().get_initial_queryset()
             queryset = queryset.annotate(
-                retried=models.Case(
-                    models.When(retry_job_request_uuid__isnull=False, then=True),
+                retried=Case(
+                    When(retry_job_request_uuid__isnull=False, then=True),
                     default=False,
                     output_field=models.BooleanField(),
                 ),
-                is_retry=models.Case(
-                    models.When(retry_attempt__gt=0, then=True),
+                is_retry=Case(
+                    When(retry_attempt__gt=0, then=True),
                     default=False,
                     output_field=models.BooleanField(),
                 ),

plain-jobs/plain/jobs/models.py

@@ -24,6 +24,7 @@
 
 from plain import models
 from plain.models import transaction
+from plain.models.expressions import F
 from plain.runtime import settings
 from plain.utils import timezone
 
@@ -410,7 +411,7 @@ def retryable(self) -> Self:
         return self.failed().filter(
             retry_job_request_uuid__isnull=True,
             retries__gt=0,
-            retry_attempt__lt=models.F("retries"),
+            retry_attempt__lt=F("retries"),
         )
 
     def retry_failed_jobs(self) -> None:

plain-models/plain/models/__init__.py

@@ -1,56 +1,14 @@
+from .registry import models_registry, register_model  # noqa  Create the registry first
 from . import (
-    preflight,  # noqa
-)
-from .aggregates import (
-    Aggregate,
-    Avg,
-    Count,
-    Max,
-    Min,
-    StdDev,
-    Sum,
-    Variance,
-)
-from .constraints import (
-    BaseConstraint,
-    CheckConstraint,
-    Deferrable,
-    UniqueConstraint,
-)
-from .db import (
-    DatabaseError,
-    DataError,
-    Error,
-    IntegrityError,
-    InterfaceError,
-    InternalError,
-    NotSupportedError,
-    OperationalError,
-    ProgrammingError,
-    db_connection,
-)
-from .deletion import (
-    CASCADE,
-    DO_NOTHING,
-    PROTECT,
-    RESTRICT,
-    SET,
-    SET_DEFAULT,
-    SET_NULL,
-    ProtectedError,
-    RestrictedError,
-)
-from .enums import Choices, IntegerChoices, TextChoices
-from .expressions import (
-    Case,
-    Exists,
-    F,
-    OuterRef,
-    Subquery,
-    Value,
-    When,
-    Window,
+    preflight,  # noqa  Imported for side effects (registers preflight checks)
 )
+
+# Imports that would create circular imports if sorted
+from .base import Model
+from .constraints import CheckConstraint, UniqueConstraint
+from .db import IntegrityError, db_connection
+from .deletion import CASCADE, DO_NOTHING, PROTECT, RESTRICT, SET, SET_DEFAULT, SET_NULL
+from .enums import IntegerChoices, TextChoices
 from .fields import (
     BigIntegerField,
     BinaryField,
@@ -75,37 +33,24 @@
     UUIDField,
 )
 from .fields.json import JSONField
-from .indexes import Index
-from .query import Prefetch, QuerySet, prefetch_related_objects
-from .query_utils import FilteredRelation, Q
-from .registry import models_registry, register_model
-
-# Imports that would create circular imports if sorted
-from .base import Model  # isort:skip
-from .options import Options  # isort:skip
-from .fields.related import (  # isort:skip
+from .fields.related import (
     ForeignKey,
     ManyToManyField,
 )
+from .indexes import Index
+from .options import Options
+from .query import QuerySet
+from .query_utils import Q
 
-
+# This module exports the user-facing API for defining model classes,
+# with a secondary focus on the most common query utilities like Q.
+# Advanced query-time features (aggregates, expressions, etc.) should be
+# imported from their specific modules (e.g., plain.models.aggregates).
 __all__ = [
-    # From aggregates
-    "Aggregate",
-    "Avg",
-    "Count",
-    "Max",
-    "Min",
-    "StdDev",
-    "Sum",
-    "Variance",
     # From constraints
-    "BaseConstraint",
     "CheckConstraint",
-    "Deferrable",
     "UniqueConstraint",
     # From enums
-    "Choices",
     "IntegerChoices",
     "TextChoices",
     # From fields
@@ -130,6 +75,8 @@
     "TimeField",
     "URLField",
     "UUIDField",
+    # From fields.json
+    "JSONField",
     # From indexes
     "Index",
     # From deletion
@@ -140,27 +87,11 @@
     "SET",
     "SET_DEFAULT",
     "SET_NULL",
-    "ProtectedError",
-    "RestrictedError",
-    # From expressions
-    "Case",
-    "Exists",
-    "F",
-    "OuterRef",
-    "Subquery",
-    "Value",
-    "When",
-    "Window",
-    # From fields.json
-    "JSONField",
     # From options
     "Options",
     # From query
-    "Prefetch",
     "QuerySet",
-    "prefetch_related_objects",
     # From query_utils
-    "FilteredRelation",
     "Q",
     # From base
     "Model",
@@ -169,15 +100,7 @@
     "ManyToManyField",
     # From db
     "db_connection",
-    "DatabaseError",
     "IntegrityError",
-    "InternalError",
-    "ProgrammingError",
-    "DataError",
-    "NotSupportedError",
-    "Error",
-    "InterfaceError",
-    "OperationalError",
     # From registry
     "register_model",
     "models_registry",

plain-models/plain/models/backends/sqlite3/operations.py

@@ -8,6 +8,7 @@
 from typing import TYPE_CHECKING, Any
 
 from plain import models
+from plain.models.aggregates import Aggregate, Avg, StdDev, Sum, Variance
 from plain.models.backends.base.operations import BaseDatabaseOperations
 from plain.models.constants import OnConflict
 from plain.models.db import DatabaseError, NotSupportedError
@@ -48,7 +49,7 @@ def bulk_batch_size(self, fields: list[Any], objs: list[Any]) -> int:
 
     def check_expression_support(self, expression: Any) -> None:
         bad_fields = (models.DateField, models.DateTimeField, models.TimeField)
-        bad_aggregates = (models.Sum, models.Avg, models.Variance, models.StdDev)
+        bad_aggregates = (Sum, Avg, Variance, StdDev)
         if isinstance(expression, bad_aggregates):
             for expr in expression.get_source_expressions():
                 try:
@@ -65,7 +66,7 @@ def check_expression_support(self, expression: Any) -> None:
                             "since date/time is saved as text."
                         )
         if (
-            isinstance(expression, models.Aggregate)
+            isinstance(expression, Aggregate)
             and expression.distinct
             and len(expression.source_expressions) > 1
         ):

plain-models/tests/test_delete_behaviors.py

@@ -8,10 +8,7 @@
     DeleteParent,
 )
 
-from plain.models import (
-    ProtectedError,
-    RestrictedError,
-)
+from plain.models.deletion import ProtectedError, RestrictedError
 
 
 def _create_parents():

plain-oauth/plain/oauth/admin.py

@@ -5,7 +5,7 @@
     AdminViewset,
     register_viewset,
 )
-from plain.models import Count
+from plain.models.aggregates import Count
 
 from .models import OAuthConnection
 

plain-oauth/plain/oauth/preflight.py

@@ -1,4 +1,4 @@
-from plain.models import OperationalError, ProgrammingError
+from plain.models.db import OperationalError, ProgrammingError
 from plain.preflight import PreflightCheck, PreflightResult, register_check