Remove ClassVar suggestion/usage on model query QuerySet types

Author: davegaeddert

example/app/users/models.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import ClassVar
-
 from plain import models
 from plain.models import types
 from plain.passwords.types import PasswordField
@@ -13,4 +11,4 @@ class User(models.Model):
     password: str = PasswordField()
     is_admin: bool = types.BooleanField(default=False)
 
-    query: ClassVar[models.QuerySet[User]] = models.QuerySet()
+    query: models.QuerySet[User] = models.QuerySet()

plain-admin/tests/app/users/models.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import ClassVar
-
 from plain import models
 from plain.models import types
 
@@ -11,4 +9,4 @@ class User(models.Model):
     username: str = types.CharField(max_length=255)
     is_admin: bool = types.BooleanField(default=False)
 
-    query: ClassVar[models.QuerySet[User]] = models.QuerySet()
+    query: models.QuerySet[User] = models.QuerySet()

plain-api/plain/api/models.py

@@ -4,7 +4,6 @@
 import os
 import uuid
 from datetime import datetime
-from typing import ClassVar
 from uuid import UUID
 
 from plain import models
@@ -29,7 +28,7 @@ class APIKey(models.Model):
 
     api_version: str = types.CharField(max_length=255, required=False)
 
-    query: ClassVar[models.QuerySet[APIKey]] = models.QuerySet()
+    query: models.QuerySet[APIKey] = models.QuerySet()
 
     model_options = models.Options(
         constraints=[

plain-cache/plain/cache/models.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any, ClassVar, Self
+from typing import Any, Self
 
 from plain import models
 from plain.models import types
@@ -27,7 +27,7 @@ class CachedItem(models.Model):
     created_at: datetime = types.DateTimeField(auto_now_add=True)
     updated_at: datetime = types.DateTimeField(auto_now=True)
 
-    query: ClassVar[CachedItemQuerySet] = CachedItemQuerySet()
+    query: CachedItemQuerySet = CachedItemQuerySet()
 
     model_options = models.Options(
         indexes=[

plain-flags/plain/flags/models.py

@@ -2,7 +2,6 @@
 
 import re
 from datetime import datetime
-from typing import ClassVar
 
 from plain import models
 from plain.exceptions import ValidationError
@@ -22,7 +21,7 @@ class FlagResult(models.Model):
     key: str = types.CharField(max_length=255)
     value = types.JSONField()
 
-    query: ClassVar[models.QuerySet[FlagResult]] = models.QuerySet()
+    query: models.QuerySet[FlagResult] = models.QuerySet()
 
     model_options = models.Options(
         constraints=[
@@ -52,7 +51,7 @@ class Flag(models.Model):
     # To provide an easier way to see if a flag is still being used
     used_at: datetime | None = types.DateTimeField(required=False, allow_null=True)
 
-    query: ClassVar[models.QuerySet[Flag]] = models.QuerySet()
+    query: models.QuerySet[Flag] = models.QuerySet()
 
     model_options = models.Options(
         constraints=[

plain-jobs/plain/jobs/models.py

@@ -3,7 +3,7 @@
 import datetime
 import logging
 import traceback
-from typing import TYPE_CHECKING, Any, ClassVar, Self
+from typing import TYPE_CHECKING, Any, Self
 from uuid import UUID, uuid4
 
 from opentelemetry import trace
@@ -72,7 +72,7 @@ class JobRequest(models.Model):
 
     # expires_at = models.DateTimeField(required=False, allow_null=True)
 
-    query: ClassVar[models.QuerySet[JobRequest]] = models.QuerySet()
+    query: models.QuerySet[JobRequest] = models.QuerySet()
 
     model_options = models.Options(
         ordering=["priority", "-created_at"],
@@ -182,7 +182,7 @@ class JobProcess(models.Model):
         max_length=18, required=False, allow_null=True
     )
 
-    query: ClassVar[JobQuerySet] = JobQuerySet()
+    query: JobQuerySet = JobQuerySet()
 
     model_options = models.Options(
         ordering=["-created_at"],
@@ -501,7 +501,7 @@ class JobResult(models.Model):
         max_length=18, required=False, allow_null=True
     )
 
-    query: ClassVar[JobResultQuerySet] = JobResultQuerySet()
+    query: JobResultQuerySet = JobResultQuerySet()
 
     model_options = models.Options(
         ordering=["-created_at"],

plain-models/plain/models/README.md

@@ -264,13 +264,11 @@ Reverse relationships can also be typed - see the [Reverse relationships](#rever
 
 ### Typing QuerySets
 
-For better type checking of query results, you can explicitly type the `query` attribute using `ClassVar`:
+For better type checking of query results, you can explicitly type the `query` attribute:
 
 ```python
 from __future__ import annotations
 
-from typing import ClassVar
-
 from plain import models
 from plain.models import types
 
@@ -279,10 +277,10 @@ class User(models.Model):
     email: str = types.EmailField()
     is_admin: bool = types.BooleanField(default=False)
 
-    query: ClassVar[models.QuerySet[User]] = models.QuerySet()
+    query: models.QuerySet[User] = models.QuerySet()
 ```
 
-With this annotation, type checkers will know that `User.query.get()` returns a `User` instance and `User.query.filter()` returns `QuerySet[User]`. The `ClassVar` annotation tells type checkers that `query` is a class-level attribute, not an instance field. This is optional - the query attribute works without the annotation, but adding it improves IDE autocomplete and type checking.
+With this annotation, type checkers will know that `User.query.get()` returns a `User` instance and `User.query.filter()` returns `QuerySet[User]`. This is optional - the query attribute works without the annotation, but adding it improves IDE autocomplete and type checking.
 
 ## Validation
 

plain-oauth/plain/oauth/models.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import datetime
-from typing import TYPE_CHECKING, Any, ClassVar
+from typing import TYPE_CHECKING, Any
 
 from plain import models
 from plain.auth import get_user_model
@@ -43,7 +43,7 @@ class OAuthConnection(models.Model):
         required=False, allow_null=True
     )
 
-    query: ClassVar[models.QuerySet[OAuthConnection]] = models.QuerySet()
+    query: models.QuerySet[OAuthConnection] = models.QuerySet()
 
     model_options = models.Options(
         constraints=[

plain-oauth/tests/app/users/models.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar
+from typing import TYPE_CHECKING
 
 from plain import models
 from plain.models import types
@@ -19,7 +19,7 @@ class User(models.Model):
         types.ReverseForeignKey(to="plainoauth.OAuthConnection", field="user")
     )
 
-    query: ClassVar[models.QuerySet[User]] = models.QuerySet()
+    query: models.QuerySet[User] = models.QuerySet()
 
     model_options = models.Options(
         constraints=[

plain-observer/plain/observer/models.py

@@ -6,7 +6,7 @@
 from collections.abc import Iterable, Mapping, Sequence
 from datetime import UTC, datetime
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, ClassVar, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import sqlparse
 from opentelemetry.sdk.trace import ReadableSpan
@@ -68,7 +68,7 @@ class Trace(models.Model):
         to="Log", field="trace"
     )
 
-    query: ClassVar[models.QuerySet[Trace]] = models.QuerySet()
+    query: models.QuerySet[Trace] = models.QuerySet()
 
     model_options = models.Options(
         ordering=["-start_time"],
@@ -340,7 +340,7 @@ class Span(models.Model):
     # Explicit reverse relation
     logs: types.ReverseForeignKey[Log] = types.ReverseForeignKey(to="Log", field="span")
 
-    query: ClassVar[SpanQuerySet] = SpanQuerySet()
+    query: SpanQuerySet = SpanQuerySet()
 
     model_options = models.Options(
         ordering=["-start_time"],
@@ -525,7 +525,7 @@ class Log(models.Model):
     level: str = types.CharField(max_length=20)
     message: str = types.TextField()
 
-    query: ClassVar[models.QuerySet[Log]] = models.QuerySet()
+    query: models.QuerySet[Log] = models.QuerySet()
 
     model_options = models.Options(
         ordering=["timestamp"],