fix: simplify primary key mixin id column (#20)

Author: mplemay

src/brussels/__tests__/mixins/test_primary_key_mixin.py

@@ -32,8 +32,6 @@ def test_id_column_definition() -> None:
     column = table.c.id
 
     assert column.primary_key is True
-    assert column.unique is True
-    assert any("id" in index.columns for index in table.indexes)
 
     server_default = column.server_default
     assert server_default is not None

src/brussels/__tests__/types/file/test_file.py

@@ -18,7 +18,7 @@
     pytest.skip("files optional dependencies not installed", allow_module_level=True)
 
 if TYPE_CHECKING:
-    from obstore import Attributes, GetOptions, PutMode
+    from obstore import GetOptions, PutMode
     from sqlalchemy import Engine
 
     from brussels.types.file._types import RemoteMetadataField
@@ -202,7 +202,7 @@ async def test_put_async_without_sqlalchemy_session_raises_and_does_not_call_sto
     with pytest.raises(RuntimeError, match="requires a resolvable SQLAlchemy session"):
         await _file_handle(model).put_async(
             b"hello",
-            attributes=cast("Attributes", {"cache_control": "max-age=60"}),
+            attributes={"cache_control": "max-age=60"},
             tags={"kind": "avatar"},
             mode=cast("PutMode", "overwrite"),
             use_multipart=True,
@@ -225,7 +225,7 @@ async def test_put_async_propagates_upload_options_with_attached_session(engine:
         session.flush()
         await _file_handle(model).put_async(
             b"hello",
-            attributes=cast("Attributes", {"cache_control": "max-age=60"}),
+            attributes={"cache_control": "max-age=60"},
             tags={"kind": "avatar"},
             mode=cast("PutMode", "overwrite"),
             use_multipart=True,

src/brussels/__tests__/types/file/test_lifecycle_integration.py

@@ -734,7 +734,7 @@ def read(self) -> str:
 
 @pytest.mark.asyncio
 async def test_snapshot_put_payload_async_supports_async_iterable() -> None:
-    async def chunks() -> AsyncIterator[object]:
+    async def chunks() -> AsyncIterator[bytes | bytearray | memoryview]:
         yield b"a"
         yield bytearray(b"b")
         yield memoryview(b"c")

src/brussels/__tests__/types/file/test_metadata.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime, timedelta, timezone
+from typing import TYPE_CHECKING
 
 import pytest
 from pydantic import ValidationError
@@ -10,6 +11,9 @@
 except ImportError:
     pytest.skip("files optional dependencies not installed", allow_module_level=True)
 
+if TYPE_CHECKING:
+    from brussels.types.file.metadata import RemoteMetadataDict
+
 
 def test_to_dict_and_from_dict_round_trip_with_aliases() -> None:
     created_at = datetime(2025, 1, 1, 12, 0, tzinfo=UTC)
@@ -33,7 +37,7 @@ def test_to_dict_and_from_dict_round_trip_with_aliases() -> None:
 
 
 def test_schema_alias_is_accepted_and_serialized() -> None:
-    data = {
+    data: RemoteMetadataDict = {
         "schema": 1,
         "key": "alias/file.txt",
         "status": "pending",
@@ -64,11 +68,13 @@ def test_datetime_fields_are_normalized_to_utc() -> None:
 
 def test_invalid_status_is_rejected() -> None:
     with pytest.raises(ValidationError, match="status"):
-        RemoteMetadata(
-            key="example/file.txt",
-            status="deleted",  # type: ignore[arg-type]
-            created_at=datetime(2025, 1, 1, 12, 0, tzinfo=UTC),
-            updated_at=datetime(2025, 1, 1, 12, 0, tzinfo=UTC),
+        RemoteMetadata.model_validate(
+            {
+                "key": "example/file.txt",
+                "status": "deleted",
+                "created_at": datetime(2025, 1, 1, 12, 0, tzinfo=UTC),
+                "updated_at": datetime(2025, 1, 1, 12, 0, tzinfo=UTC),
+            },
         )
 
 

src/brussels/__tests__/types/file/test_storage.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import UTC, datetime
+from typing import TYPE_CHECKING
 
 import pytest
 from sqlalchemy.dialects.postgresql import dialect as postgres_dialect
@@ -13,6 +14,9 @@
 except ImportError:
     pytest.skip("files optional dependencies not installed", allow_module_level=True)
 
+if TYPE_CHECKING:
+    from brussels.types.file.metadata import RemoteMetadataDict
+
 
 class ModelWithMetadataField:
     def __init__(self, file: object) -> None:
@@ -64,7 +68,7 @@ def test_process_bind_param_serializes_metadata() -> None:
 
 
 def test_process_bind_param_accepts_dict_payload() -> None:
-    raw = {
+    raw: RemoteMetadataDict = {
         "schema": 1,
         "key": "example/file.txt",
         "status": "pending",

src/brussels/mixins/primary_key.py

@@ -24,14 +24,11 @@ class MyModel(DataclassBase, PrimaryKeyMixin, TimestampMixin):
     The UUID is:
     - Generated client-side by default (uuid4)
     - Has server-side fallback (gen_random_uuid() for PostgreSQL)
-    - Indexed and unique for efficient lookups
     """
 
     id: Mapped[UUID] = mapped_column(
         primary_key=True,
         default_factory=uuid4,
         server_default=func.gen_random_uuid(),
-        index=True,
-        unique=True,
         init=False,
     )

src/brussels/types/file/utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING, TypeVar
+from typing import TYPE_CHECKING
 
 from brussels.types.file.file import RemoteFile
 from brussels.utils import utc
@@ -16,8 +16,6 @@
     from brussels.types.file._types import RemoteMetadataField
     from brussels.types.file.metadata import RemoteMetadata
 
-T = TypeVar("T")
-
 
 def is_cleanup_candidate(
     metadata: RemoteMetadata | None,
@@ -37,7 +35,7 @@ def is_cleanup_candidate(
     return utc(metadata.updated_at) <= cutoff
 
 
-def find_cleanup_candidates(
+def find_cleanup_candidates[T](
     items: list[T],
     *,
     extractor: Callable[[T], RemoteMetadata | None],