ref: small refactors

.github/workflows/ci.yaml

@@ -6,11 +6,11 @@ env:
 
 on:
   push:
-    branches: [main, ci/*, dependabot/*, renovate/*]
+    branches: [ main, ci/*, dependabot/*, renovate/* ]
     tags:
       - "v*.*.*"
   pull_request:
-    branches: [main]
+    branches: [ main ]
 
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
@@ -57,7 +57,7 @@ jobs:
 
   tests:
     name: 🔬 ${{ matrix.session.job_name }}
-    needs: [pre, generate-jobs-tests]
+    needs: [ pre, generate-jobs-tests ]
     if: github.ref_type == 'tag' || needs.pre.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
     strategy:
@@ -121,7 +121,7 @@ jobs:
 
   upload-coverage:
     name: 🆙 Upload Coverage
-    needs: [tests, generate-jobs-tests]
+    needs: [ tests, generate-jobs-tests ]
     runs-on: ubuntu-latest
 
     steps:
@@ -155,7 +155,7 @@ jobs:
 
   upload-test-results:
     name: 📊 Upload test results
-    needs: [tests, generate-jobs-tests]
+    needs: [ tests, generate-jobs-tests ]
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -196,6 +196,9 @@ jobs:
           cache: true
           log_level: debug
 
+      - name: Install dependencies
+        run: mise run install
+
       - name: Run linting
         run: mise run lint
 

.gitignore

@@ -192,3 +192,5 @@ mise.local.toml
 .windsurf
 
 CLAUDE.md
+
+.serena

mise.toml

@@ -46,10 +46,6 @@ description = "Install dependencies"
 hide = true
 run = "uv sync --all-extras --dev"
 
-[tasks."_install:geo"]
-description = "Install dependencies with geo extras"
-hide = true
-run = "uv sync --extra=geo --dev"
 
 [tasks.install]
 description = "Install dependencies and pre-commit hooks"
@@ -194,7 +190,6 @@ run = "uv run nox --json -t tests -l | jq 'map(.name) | unique'"
 
 [tasks."ruff:check"]
 description = "Check ruff formatting"
-depends = "_install"
 run = "uv run ruff check"
 
 [tasks."ruff:fix"]
@@ -211,7 +206,6 @@ run = "uv run ruff format --check"
 
 [tasks.pyright]
 description = "Run basedpyright"
-depends = "_install"
 run = "uv run basedpyright"
 
 [tasks.vulture]
@@ -221,7 +215,7 @@ run = "uv run --only-group lint vulture"
 [tasks.lint]
 description = "Lint the code"
 alias = "l"
-depends = ["vulture", "pyright", "ruff:check", "ruff:format:check"]
+depends = ["vulture", "pyright", "ruff:check", "ruff:format:check", "slotscheck"]
 
 [tasks."lint:pre-commit"]
 description = "Lint the code in pre-commit hook"
@@ -232,6 +226,10 @@ description = "Run pre-commit checks"
 depends = "install:pre-commit"
 run = "pre-commit run --color=always --all-files"
 
+[tasks.slotscheck]
+description = "Run slotscheck"
+run = "uv run slotscheck src/strawchemy"
+
 # ###############
 # Tools
 # ###############
@@ -247,14 +245,14 @@ description = "Clean working directory"
 alias = "c"
 confirm = "Are you sure you want to clean the working directory? This will remove test caches, build artifacts, and other temporary files."
 run = [
-  "rm -rf {{vars.cleanable_paths}} >/dev/null 2>&1",
-  "find . -name '*.egg-info' -exec rm -rf {} + >/dev/null 2>&1",
-  "find . -type f -name '*.egg' -exec rm -f {} + >/dev/null 2>&1",
-  "find . -name '*.pyc' -exec rm -f {} + >/dev/null 2>&1",
-  "find . -name '*.pyo' -exec rm -f {} + >/dev/null 2>&1",
-  "find . -name '*~' -exec rm -f {} + >/dev/null 2>&1",
-  "find . -name '__pycache__' -exec rm -rf {} + >/dev/null 2>&1",
-  "find . -name '.ipynb_checkpoints' -exec rm -rf {} + >/dev/null 2>&1",
+    "rm -rf {{vars.cleanable_paths}} >/dev/null 2>&1",
+    "find . -name '*.egg-info' -exec rm -rf {} + >/dev/null 2>&1",
+    "find . -type f -name '*.egg' -exec rm -f {} + >/dev/null 2>&1",
+    "find . -name '*.pyc' -exec rm -f {} + >/dev/null 2>&1",
+    "find . -name '*.pyo' -exec rm -f {} + >/dev/null 2>&1",
+    "find . -name '*~' -exec rm -f {} + >/dev/null 2>&1",
+    "find . -name '__pycache__' -exec rm -rf {} + >/dev/null 2>&1",
+    "find . -name '.ipynb_checkpoints' -exec rm -rf {} + >/dev/null 2>&1",
 ]
 
 [tasks."render:usage"]

pyproject.toml

@@ -63,7 +63,7 @@ dev = [
 ]
 codeflash = ["codeflash"]
 doc = ["git-cliff>=2.6.1"]
-lint = ["basedpyright", "ruff", "vulture"]
+lint = ["basedpyright", "ruff", "vulture", "slotscheck>=0.16.5"]
 mysql = ["asyncmy", "cryptography"]
 postgres = ["asyncpg>=0.29.0", "psycopg[binary,pool]>=3.2.3"]
 test = [
@@ -309,7 +309,6 @@ asyncio_default_fixture_loop_scope = "function"
 
 [tool.ruff]
 line-length = 120
-fix = true
 target-version = "py310"
 exclude = [
     ".bzr",
@@ -378,6 +377,24 @@ known-first-party = ["strawchemy", "tests"]
 [tool.ruff.lint.flake8-tidy-imports]
 ban-relative-imports = "all"
 
+[tool.slotscheck]
+exclude-modules = '''
+(
+  (^|\.)test_
+  |^tests\.*
+  |^tools\.*
+  |^docs\.*
+  |^examples\.*
+  |^sqlalchemy\.(
+    testing
+    |ext\.mypy  # see slotscheck/issues/178
+  )
+)
+'''
+include-modules = "strawchemy.*"
+require-superclass = false
+strict-imports = true
+
 [tool.unasyncd]
 add_editors_note = true
 ruff_fix = true

src/strawchemy/factories.py

@@ -0,0 +1,135 @@
+"""Factory container for organizing Strawchemy DTO factories."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from functools import partial
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from strawchemy.mapper import Strawchemy
+    from strawchemy.strawberry.factories.aggregations import EnumDTOFactory
+    from strawchemy.strawberry.factories.inputs import AggregateFilterDTOFactory, BooleanFilterDTOFactory
+    from strawchemy.strawberry.factories.types import (
+        DistinctOnFieldsDTOFactory,
+        InputFactory,
+        OrderByDTOFactory,
+        RootAggregateTypeDTOFactory,
+        TypeDTOFactory,
+        UpsertConflictFieldsDTOFactory,
+    )
+
+
+@dataclass
+class StrawchemyFactories:
+    """Container for all Strawchemy DTO factories.
+
+    This class encapsulates the initialization and management of all factory
+    instances used by Strawchemy, providing a cleaner separation of concerns
+    and easier testing.
+
+    Attributes:
+        aggregate_filter: Factory for aggregate filter DTOs.
+        order_by: Factory for order by DTOs.
+        distinct_on_enum: Factory for distinct on enum DTOs.
+        type_factory: Factory for output type DTOs.
+        input_factory: Factory for input type DTOs.
+        aggregation: Factory for root aggregate type DTOs.
+        enum_factory: Factory for enum DTOs.
+        filter_factory: Factory for boolean filter DTOs.
+        upsert_conflict: Factory for upsert conflict fields DTOs.
+    """
+
+    aggregate_filter: AggregateFilterDTOFactory
+    order_by: OrderByDTOFactory
+    distinct_on_enum: DistinctOnFieldsDTOFactory
+    type_factory: TypeDTOFactory  # type: ignore[type-arg]
+    input_factory: InputFactory  # type: ignore[type-arg]
+    aggregation: RootAggregateTypeDTOFactory  # type: ignore[type-arg]
+    enum_factory: EnumDTOFactory
+    filter_factory: BooleanFilterDTOFactory
+    upsert_conflict: UpsertConflictFieldsDTOFactory
+
+    @classmethod
+    def create(cls, mapper: Strawchemy) -> StrawchemyFactories:
+        """Create all factories with proper dependencies.
+
+        Args:
+            mapper: The Strawchemy instance that will own these factories.
+
+        Returns:
+            A StrawchemyFactories instance with all factories initialized.
+        """
+        # Imports inside method to avoid circular dependencies at module load time
+        from strawchemy.dto.backend.strawberry import StrawberrryDTOBackend  # noqa: PLC0415
+        from strawchemy.strawberry.dto import MappedStrawberryGraphQLDTO  # noqa: PLC0415
+        from strawchemy.strawberry.factories.aggregations import EnumDTOFactory  # noqa: PLC0415
+        from strawchemy.strawberry.factories.enum import (  # noqa: PLC0415
+            EnumDTOBackend,
+            UpsertConflictFieldsEnumDTOBackend,
+        )
+        from strawchemy.strawberry.factories.inputs import (  # noqa: PLC0415
+            AggregateFilterDTOFactory,
+            BooleanFilterDTOFactory,
+        )
+        from strawchemy.strawberry.factories.types import (  # noqa: PLC0415
+            DistinctOnFieldsDTOFactory,
+            InputFactory,
+            OrderByDTOFactory,
+            RootAggregateTypeDTOFactory,
+            TypeDTOFactory,
+            UpsertConflictFieldsDTOFactory,
+        )
+
+        config = mapper.config
+
+        # Create backend instances
+        strawberry_backend = StrawberrryDTOBackend(MappedStrawberryGraphQLDTO)
+        enum_backend = EnumDTOBackend(config.auto_snake_case)
+        upsert_conflict_fields_enum_backend = UpsertConflictFieldsEnumDTOBackend(
+            config.inspector, config.auto_snake_case
+        )
+
+        # Create factory instances
+        aggregate_filter = AggregateFilterDTOFactory(mapper)
+        order_by = OrderByDTOFactory(mapper)
+        distinct_on_enum = DistinctOnFieldsDTOFactory(config.inspector)
+        type_factory = TypeDTOFactory(mapper, strawberry_backend, order_by_factory=order_by)
+        input_factory = InputFactory(mapper, strawberry_backend)
+        aggregation = RootAggregateTypeDTOFactory(mapper, strawberry_backend, type_factory=type_factory)
+        enum_factory = EnumDTOFactory(config.inspector, enum_backend)
+        filter_factory = BooleanFilterDTOFactory(mapper, aggregate_filter_factory=aggregate_filter)
+        upsert_conflict = UpsertConflictFieldsDTOFactory(config.inspector, upsert_conflict_fields_enum_backend)
+
+        return cls(
+            aggregate_filter=aggregate_filter,
+            order_by=order_by,
+            distinct_on_enum=distinct_on_enum,
+            type_factory=type_factory,
+            input_factory=input_factory,
+            aggregation=aggregation,
+            enum_factory=enum_factory,
+            filter_factory=filter_factory,
+            upsert_conflict=upsert_conflict,
+        )
+
+    def create_public_api(self) -> dict[str, Any]:
+        """Create the public API mappings for factory methods.
+
+        Returns:
+            A dictionary mapping public API names to factory methods.
+        """
+        return {
+            "filter": self.filter_factory.input,
+            "aggregate_filter": partial(self.aggregate_filter.input, mode="aggregate_filter"),
+            "distinct_on": self.distinct_on_enum.decorator,
+            "input": self.input_factory.input,
+            "create_input": partial(self.input_factory.input, mode="create_input"),
+            "pk_update_input": partial(self.input_factory.input, mode="update_by_pk_input"),
+            "filter_update_input": partial(self.input_factory.input, mode="update_by_filter_input"),
+            "order": partial(self.order_by.input, mode="order_by"),
+            "type": self.type_factory.type,
+            "aggregate": partial(self.aggregation.type, mode="aggregate_type"),
+            "upsert_update_fields": self.enum_factory.input,
+            "upsert_conflict_fields": self.upsert_conflict.input,
+        }