Merge branch 'litestar-org:main' into feat/sqlalchemy-defaults

Author: AlexPetul

.pre-commit-config.yaml

@@ -2,12 +2,12 @@ default_language_version:
   python: "3.13"
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v4.0.0
+    rev: v4.4.0
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-ast
       - id: check-case-conflict
@@ -17,18 +17,24 @@ repos:
       - id: end-of-file-fixer
       - id: mixed-line-ending
       - id: trailing-whitespace
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.11.0"
+  - repo: local
     hooks:
       - id: ruff
-        args: ["--fix"]
+        name: ruff
+        entry: uv run ruff check --fix
+        language: system
+        types: [python]
       - id: ruff-format
+        name: ruff-format
+        entry: uv run ruff format
+        language: system
+        types: [python]
   - repo: https://github.com/crate-ci/typos
-    rev: v1.30.3
+    rev: v1.44.0
     hooks:
       - id: typos
   - repo: https://github.com/pycontribs/mirrors-prettier
-    rev: "v3.5.3"
+    rev: v3.6.2
     hooks:
       - id: prettier
         exclude: ".all-contributorsrc"
@@ -53,6 +59,6 @@ repos:
         entry: uv run --all-groups pyright
         types: [python]
   - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: "v1.0.0"
+    rev: v1.0.2
     hooks:
       - id: sphinx-lint

docs/examples/handling_custom_types/test_example_2.py

@@ -21,7 +21,7 @@ def __str__(self) -> str:
 
 
 # we create a custom base factory to handle dataclasses, with an extended provider map
-class CustomDataclassFactory(Generic[T], DataclassFactory[T]):
+class CustomDataclassFactory(DataclassFactory[T], Generic[T]):
     __is_base_factory__ = True
 
     @classmethod

polyfactory/factories/attrs_factory.py

@@ -23,7 +23,7 @@
 T = TypeVar("T", bound=AttrsInstance)
 
 
-class AttrsFactory(Generic[T], BaseFactory[T]):
+class AttrsFactory(BaseFactory[T], Generic[T]):
     """Base factory for attrs classes."""
 
     __model__: type[T]

polyfactory/factories/base.py

@@ -1245,8 +1245,8 @@ def _register_builtin_factories() -> None:
 
     :returns: None
     """
-    import polyfactory.factories.dataclass_factory
-    import polyfactory.factories.typed_dict_factory  # noqa: F401
+    import polyfactory.factories.dataclass_factory  # noqa: PLC0415
+    import polyfactory.factories.typed_dict_factory  # noqa: F401, PLC0415
 
     for module in [
         "polyfactory.factories.pydantic_factory",

polyfactory/factories/beanie_odm_factory.py

@@ -24,7 +24,7 @@
 T = TypeVar("T", bound=Document)
 
 
-class BeaniePersistenceHandler(Generic[T], AsyncPersistenceProtocol[T]):
+class BeaniePersistenceHandler(AsyncPersistenceProtocol[T], Generic[T]):
     """Persistence Handler using beanie logic"""
 
     async def save(self, data: T) -> T:
@@ -40,7 +40,7 @@ async def save_many(self, data: list[T]) -> list[T]:
         return [await doc.insert() for doc in data]  # pyright: ignore[reportGeneralTypeIssues]
 
 
-class BeanieDocumentFactory(Generic[T], ModelFactory[T]):
+class BeanieDocumentFactory(ModelFactory[T], Generic[T]):
     """Base factory for Beanie Documents"""
 
     __async_persistence__ = BeaniePersistenceHandler

polyfactory/factories/dataclass_factory.py

@@ -9,7 +9,7 @@
 from polyfactory.field_meta import FieldMeta, Null
 
 
-class DataclassFactory(Generic[T], BaseFactory[T]):
+class DataclassFactory(BaseFactory[T], Generic[T]):
     """Dataclass base factory"""
 
     __is_base_factory__ = True

polyfactory/factories/msgspec_factory.py

@@ -22,7 +22,7 @@
 T = TypeVar("T", bound=msgspec.Struct)
 
 
-class MsgspecFactory(Generic[T], BaseFactory[T]):
+class MsgspecFactory(BaseFactory[T], Generic[T]):
     """Base factory for msgspec Structs."""
 
     __is_base_factory__ = True

polyfactory/factories/odmantic_odm_factory.py

@@ -23,7 +23,7 @@
     from typing_extensions import TypeGuard
 
 
-class OdmanticModelFactory(Generic[T], ModelFactory[T]):
+class OdmanticModelFactory(ModelFactory[T], Generic[T]):
     """Base factory for odmantic models"""
 
     __is_base_factory__ = True

polyfactory/factories/pydantic_factory.py

@@ -355,7 +355,7 @@ def get_constraints_metadata(cls, annotation: Any) -> Sequence[Any]:
             return metadata
 
 
-class ModelFactory(Generic[T], BaseFactory[T]):
+class ModelFactory(BaseFactory[T], Generic[T]):
     """Base factory for pydantic models"""
 
     __forward_ref_resolution_type_mapping__: ClassVar[Mapping[str, type]] = {}

polyfactory/factories/sqlalchemy_factory.py

@@ -128,7 +128,7 @@ class _SessionMaker(Protocol[_T_co]):
     def __call__() -> _T_co: ...
 
 
-class SQLAlchemyFactory(Generic[T], BaseFactory[T]):
+class SQLAlchemyFactory(BaseFactory[T], Generic[T]):
     """Base factory for SQLAlchemy models."""
 
     __is_base_factory__ = True