activemodel 0.14.0__tar.gz → 0.15.0__tar.gz

{activemodel-0.14.0 → activemodel-0.15.0}/.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
     schedule:
       interval: "weekly"
 
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "weekly"

{activemodel-0.14.0 → activemodel-0.15.0}/.github/workflows/build_and_publish.yml

@@ -32,25 +32,39 @@ jobs:
 
   publish:
     runs-on: ubuntu-latest
-    needs: [release-please]
+    needs: release-please
     if: needs.release-please.outputs.release_created
+    permissions:
+      id-token: write
+      contents: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: jdx/mise-action@v3
-      - run: direnv allow . && direnv export gha >> "$GITHUB_ENV"
+      - uses: iloveitaly/github-action-direnv-load-and-mask@master
+      - run: uv sync
       - run: uv build
-      - run: uv publish --token ${{ secrets.PYPI_API_TOKEN }}
+      - run: uv publish
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: jdx/mise-action@v3
+        env:
+          MISE_ENV: ci
+      - uses: iloveitaly/github-action-direnv-load-and-mask@master
+      - run: uv sync
+      # - run: just lint
 
   matrix-test:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        # TODO test on macos-latest, does not have docker by default :/
         # unfortunately, some of the typing stuff we use requires new python versions
-        python-version: ["3.13", "3.12"]
+        python-version: ["3.14", "3.13", "3.12"]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: jdx/mise-action@v3
       - run: mise use python@${{ matrix.python-version }}
       - run: docker compose up -d --wait

{activemodel-0.14.0 → activemodel-0.15.0}/.github/workflows/repo-sync.yml

@@ -8,9 +8,7 @@ jobs:
   repo_sync:
     runs-on: ubuntu-latest
     steps:
-      - name: Fetching Local Repository
-        uses: actions/checkout@v5
-      - name: Repository Metadata Sync
-        uses: iloveitaly/github-actions-metadata-sync@main
+      - uses: actions/checkout@v6
+      - uses: iloveitaly/github-actions-metadata-sync@main
         with:
           TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}

{activemodel-0.14.0 → activemodel-0.15.0}/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.15.0](https://github.com/iloveitaly/activemodel/compare/v0.14.1...v0.15.0) (2026-02-04)
+
+
+### Features
+
+* sqlmodel 0.0.32 support ([#33](https://github.com/iloveitaly/activemodel/issues/33)) ([e2a104a](https://github.com/iloveitaly/activemodel/commit/e2a104a11cd1f530e52aa0d6b2e951752ef2bb92))
+
+## [0.14.1](https://github.com/iloveitaly/activemodel/compare/v0.14.0...v0.14.1) (2026-01-14)
+
+
+### Bug Fixes
+
+* work with latest sqlmodel which drops v1 ([79920c6](https://github.com/iloveitaly/activemodel/commit/79920c63913b0a1d6824efc84719e6ea41b483eb))
+
+
+### Documentation
+
+* add pydantic v2 compatibility notes to typeid_patch.py ([7d3f43a](https://github.com/iloveitaly/activemodel/commit/7d3f43a0b1a3c2c51d46ef0530aabee7392f75ec))
+* add warning log for missing session in ActiveModelFactory ([317dd22](https://github.com/iloveitaly/activemodel/commit/317dd22b4abe5d9261d8c7f69a7b32b9c7b2d4de))
+
 ## [0.14.0](https://github.com/iloveitaly/activemodel/compare/v0.13.0...v0.14.0) (2025-10-16)
 
 

activemodel-0.15.0/Justfile

@@ -0,0 +1,105 @@
+set unstable := true
+
+[macos]
+db_play:
+	uv tool run pgcli $DATABASE_URL
+
+up:
+	docker compose up -d
+
+# Run linting checks
+[script]
+lint FILES=".":
+    set +e
+    exit_code=0
+
+    if [ -n "${CI:-}" ]; then
+        # CI mode: GitHub-friendly output
+        uv run ruff check --output-format=github {{FILES}} || exit_code=$?
+        uv run ruff format --check {{FILES}} || exit_code=$?
+
+        uv run pyright {{FILES}} --outputjson > pyright_report.json || exit_code=$?
+        jq -r \
+            --arg root "$GITHUB_WORKSPACE/" \
+            '
+                .generalDiagnostics[] |
+                .file as $file |
+                ($file | sub("^\\Q\($root)\\E"; "")) as $rel_file |
+                "::\(.severity) file=\($rel_file),line=\(.range.start.line),endLine=\(.range.end.line),col=\(.range.start.character),endColumn=\(.range.end.character)::\($rel_file):\(.range.start.line): \(.message)"
+            ' < pyright_report.json
+        rm pyright_report.json
+    else
+        # Local mode: regular output
+        uv run ruff check {{FILES}} || exit_code=$?
+        uv run ruff format --check {{FILES}} || exit_code=$?
+        uv run pyright {{FILES}} || exit_code=$?
+    fi
+
+    if [ $exit_code -ne 0 ]; then
+        echo "One or more linting checks failed"
+        exit 1
+    fi
+
+# Automatically fix linting errors
+lint-fix:
+    uv run ruff check . --fix
+    uv run ruff format .
+
+clean:
+    rm -rf *.egg-info .venv
+    find . -type d -name "__pycache__" -prune -exec rm -rf {} \; 2>/dev/null || true
+
+# TODO what exactly was this used for?
+gh_configure:
+	repo_path=$(gh repo view --json nameWithOwner --jq '.nameWithOwner') && \
+		gh api --method PUT "/repos/${repo_path}/actions/permissions/workflow" \
+			-f default_workflow_permissions=write \
+			-F can_approve_pull_request_reviews=true && \
+		gh api "/repos/${repo_path}/actions/permissions/workflow"
+
+GITHUB_PROTECT_MASTER_RULESET := """
+{
+	"name": "Protect master from force pushes",
+	"target": "branch",
+	"enforcement": "active",
+	"conditions": {
+		"ref_name": {
+			"include": ["refs/heads/master"],
+			"exclude": []
+		}
+	},
+	"rules": [
+		{
+			"type": "non_fast_forward"
+		}
+	]
+}
+"""
+
+_github_repo:
+	gh repo view --json nameWithOwner -q .nameWithOwner
+
+# TODO this only supports deleting the single ruleset specified above
+github_ruleset_protect_master_delete:
+	repo=$(just _github_repo) && \
+	  ruleset_name=$(echo '{{GITHUB_PROTECT_MASTER_RULESET}}' | jq -r .name) && \
+		ruleset_id=$(gh api repos/$repo/rulesets --jq ".[] | select(.name == \"$ruleset_name\") | .id") && \
+		(([ -n "${ruleset_id}" ] || (echo "No ruleset found" && exit 0)) || gh api --method DELETE repos/$repo/rulesets/$ruleset_id)
+
+# adds github ruleset to prevent --force and other destructive actions on the github main branch
+github_ruleset_protect_master_create: github_ruleset_protect_master_delete
+	gh api --method POST repos/$(just _github_repo)/rulesets --input - <<< '{{GITHUB_PROTECT_MASTER_RULESET}}'
+
+INVESTIGATE_PATCHES_PROMPT := '''
+Take a look at this patched function from an external package. The assertion that is in place is breaking because the upstream package was mutated.
+
+I want you to investigate the changes in that function between The current version of that package that is used in this project and the most recent version. Take a look at our patch and:
+
+1. Check the latest version of the package in pypi and update the version reference in pyproject.toml and `uv sync`
+2. Update the patch if necessary to be compatible with the latest logic in the upstream package.
+3. Provide a summary of the changes made in the latest version of that function.
+'''
+
+# Output the investigate patches prompt
+investigate-patches-prompt:
+	@echo '{{INVESTIGATE_PATCHES_PROMPT}}'

{activemodel-0.14.0 → activemodel-0.15.0}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.4
 Name: activemodel
-Version: 0.14.0
+Version: 0.15.0
 Summary: Make SQLModel more like an a real ORM
 Project-URL: Repository, https://github.com/iloveitaly/activemodel
 Author-email: Michael Bianco <iloveitaly@gmail.com>
 License-File: LICENSE
 Keywords: activemodel,activerecord,orm,sqlalchemy,sqlmodel
-Requires-Python: >=3.10
+Requires-Python: >=3.12
 Requires-Dist: python-decouple-typed>=3.11.0
-Requires-Dist: sqlmodel>=0.0.22
+Requires-Dist: sqlmodel==0.0.32
 Requires-Dist: textcase>=0.4.0
-Requires-Dist: typeid-python>=0.3.1
+Requires-Dist: typeid-python==0.3.3
 Description-Content-Type: text/markdown
 
 # ActiveModel: ORM Wrapper for SQLModel

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/base_model.py

@@ -15,7 +15,7 @@ from sqlalchemy.orm import declared_attr
 from activemodel.mixins.pydantic_json import PydanticJSONMixin
 
 # NOTE: this patches a core method in sqlmodel to support db comments
-from . import get_column_from_field_patch  # noqa: F401
+from .patches import get_column_from_field_patch  # noqa: F401
 from .query_wrapper import QueryWrapper
 from .session_manager import get_session
 
@@ -72,11 +72,9 @@ class BaseModel(SQLModel):
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
 
-        from sqlmodel._compat import set_config_value
-
         # Enables field-level docstrings on the pydantic `description` field, which we
         # copy into table/column comments by patching SQLModel internals elsewhere.
-        set_config_value(model=cls, parameter="use_attribute_docstrings", value=True)
+        cls.model_config["use_attribute_docstrings"] = True
 
         cls._apply_class_doc()
 
@@ -290,7 +288,7 @@ class BaseModel(SQLModel):
     # TODO where is this actually used? shoudl prob remove this
     # TODO should we even do this? Can we specify a better json rendering class?
     def json(self, **kwargs):
-        return json.dumps(self.dict(), default=str, **kwargs)
+        return json.dumps(self.model_dump(), default=str, **kwargs)
 
     # TODO should move this to the wrapper
     @classmethod
@@ -325,7 +323,7 @@ class BaseModel(SQLModel):
         assert len(args) > 0, "Must pass at least one field name"
 
         for field_name in args:
-            if field_name not in self.__fields__:
+            if field_name not in self.model_fields:
                 raise ValueError(f"Field '{field_name}' does not exist in the model.")
 
             # check if the field exists

activemodel-0.15.0/activemodel/patches/__init__.py

@@ -0,0 +1,2 @@
+# NOTE: this patches a core method in sqlmodel to support db comments
+from . import get_column_from_field_patch  # noqa: F401

{activemodel-0.14.0/activemodel → activemodel-0.15.0/activemodel/patches}/get_column_from_field_patch.py

@@ -13,26 +13,23 @@ Some ideas for this originally sourced from: https://github.com/fastapi/sqlmodel
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
     Sequence,
     cast,
 )
 
 import sqlmodel
-from pydantic.fields import FieldInfo as PydanticFieldInfo
 from sqlalchemy import (
     Column,
     ForeignKey,
 )
 from sqlmodel._compat import (  # type: ignore[attr-defined]
-    IS_PYDANTIC_V2,
     ModelMetaclass,
     Representation,
     Undefined,
     UndefinedType,
     is_field_noneable,
 )
-from sqlmodel.main import FieldInfo, get_sqlalchemy_type
+from sqlmodel.main import get_sqlalchemy_type, _get_sqlmodel_field_value
 
 from activemodel.utils import hash_function_code
 
@@ -43,67 +40,60 @@ if TYPE_CHECKING:
     from pydantic_core import PydanticUndefinedType as UndefinedType
 
 
+# https://github.com/fastapi/sqlmodel/blob/5c2dbe419edc2d15200eee5269c9508987944ed8/sqlmodel/main.py#L691
 assert (
     hash_function_code(sqlmodel.main.get_column_from_field)
-    == "398006ef8fd8da191ca1a271ef25b6e135da0f400a80df2f29526d8674f9ec51"
+    == "c64e50f8ca8a345ad2543690849a284d5436515835e41c56638cfaba251bc406"
+), (
+    f"get_column_from_field has changed, please verify the patch is still valid: {hash_function_code(sqlmodel.main.get_column_from_field)}"
 )
 
 
-def get_column_from_field(field: PydanticFieldInfo | FieldInfo) -> Column:  # type: ignore
-    """
-    Takes a field definition, which can either come from the sqlmodel FieldInfo class or the pydantic variant of that class,
-    and converts it into a sqlalchemy Column object.
-    """
-    if IS_PYDANTIC_V2:
-        field_info = field
-    else:
-        field_info = field.field_info
-
-    sa_column = getattr(field_info, "sa_column", Undefined)
+def get_column_from_field(field: Any) -> Column:  # type: ignore
+    field_info = field
+    sa_column = _get_sqlmodel_field_value(field_info, "sa_column", Undefined)
     if isinstance(sa_column, Column):
-        # IMPORTANT: change from the original function
+        # <Change>
         if not sa_column.comment and (field_comment := field_info.description):
             sa_column.comment = field_comment
+        # </Change>
         return sa_column
-
-    primary_key = getattr(field_info, "primary_key", Undefined)
+    sa_type = get_sqlalchemy_type(field)
+    primary_key = _get_sqlmodel_field_value(field_info, "primary_key", Undefined)
     if primary_key is Undefined:
         primary_key = False
-
-    index = getattr(field_info, "index", Undefined)
+    index = _get_sqlmodel_field_value(field_info, "index", Undefined)
     if index is Undefined:
         index = False
-
     nullable = not primary_key and is_field_noneable(field)
     # Override derived nullability if the nullable property is set explicitly
     # on the field
-    field_nullable = getattr(field_info, "nullable", Undefined)  # noqa: B009
+    field_nullable = _get_sqlmodel_field_value(field_info, "nullable", Undefined)  # noqa: B009
     if field_nullable is not Undefined:
         assert not isinstance(field_nullable, UndefinedType)
         nullable = field_nullable
     args = []
-    foreign_key = getattr(field_info, "foreign_key", Undefined)
+    foreign_key = _get_sqlmodel_field_value(field_info, "foreign_key", Undefined)
     if foreign_key is Undefined:
         foreign_key = None
-    unique = getattr(field_info, "unique", Undefined)
+    unique = _get_sqlmodel_field_value(field_info, "unique", Undefined)
     if unique is Undefined:
         unique = False
     if foreign_key:
-        if field_info.ondelete == "SET NULL" and not nullable:
+        ondelete_value = _get_sqlmodel_field_value(field_info, "ondelete", Undefined)
+        if ondelete_value is Undefined:
+            ondelete_value = None
+        if ondelete_value == "SET NULL" and not nullable:
             raise RuntimeError('ondelete="SET NULL" requires nullable=True')
         assert isinstance(foreign_key, str)
-        ondelete = getattr(field_info, "ondelete", Undefined)
-        if ondelete is Undefined:
-            ondelete = None
-        assert isinstance(ondelete, (str, type(None)))  # for typing
-        args.append(ForeignKey(foreign_key, ondelete=ondelete))
+        assert isinstance(ondelete_value, (str, type(None)))  # for typing
+        args.append(ForeignKey(foreign_key, ondelete=ondelete_value))
     kwargs = {
         "primary_key": primary_key,
         "nullable": nullable,
         "index": index,
         "unique": unique,
     }
-
     sa_default = Undefined
     if field_info.default_factory:
         sa_default = field_info.default_factory
@@ -111,14 +101,14 @@ def get_column_from_field(field: PydanticFieldInfo | FieldInfo) -> Column:  # ty
         sa_default = field_info.default
     if sa_default is not Undefined:
         kwargs["default"] = sa_default
-
-    sa_column_args = getattr(field_info, "sa_column_args", Undefined)
+    sa_column_args = _get_sqlmodel_field_value(field_info, "sa_column_args", Undefined)
     if sa_column_args is not Undefined:
         args.extend(list(cast(Sequence[Any], sa_column_args)))
+    sa_column_kwargs = _get_sqlmodel_field_value(
+        field_info, "sa_column_kwargs", Undefined
+    )
 
-    sa_column_kwargs = getattr(field_info, "sa_column_kwargs", Undefined)
-
-    # IMPORTANT: change from the original function
+    # <Change>
     if field_info.description:
         if sa_column_kwargs is Undefined:
             sa_column_kwargs = {}
@@ -128,11 +118,10 @@ def get_column_from_field(field: PydanticFieldInfo | FieldInfo) -> Column:  # ty
         # only update comments if not already set
         if "comment" not in sa_column_kwargs:
             sa_column_kwargs["comment"] = field_info.description
+    # </Change>
 
     if sa_column_kwargs is not Undefined:
-        kwargs.update(cast(Dict[Any, Any], sa_column_kwargs))
-
-    sa_type = get_sqlalchemy_type(field)
+        kwargs.update(cast(dict[Any, Any], sa_column_kwargs))
     return Column(sa_type, *args, **kwargs)  # type: ignore
 
 

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/pytest/factories.py

@@ -12,6 +12,7 @@ from polyfactory.field_meta import FieldMeta
 from typeid import TypeID
 
 from activemodel.session_manager import global_session
+from activemodel.logger import logger
 
 # TODO not currently used
 # def type_id_provider(cls, field_meta):
@@ -56,11 +57,20 @@ class ActiveModelFactory[T](SQLModelFactory[T]):
     @classmethod
     def save(cls, *args, **kwargs) -> T:
         """
+        Builds and persists a new model to the database.
+
         Where this gets tricky, is this can be called multiple times within the same callstack. This can happen when
-        a factory uses other factories to create relationships.
+        a factory uses other factories to create relationships. This is fine if `__sqlalchemy_session__` is set, but
+        if it's not (in the case of a truncation DB strategy) you'll run into issues.
 
         In a truncation strategy, the __sqlalchemy_session__ is set to None.
         """
+
+        if cls.__sqlalchemy_session__ is None:
+            logger.warning(
+                "No __sqlalchemy_session__ set on factory class, nested factory save() will fail. Use `db_session` or `db_truncate_session` to avoid this."
+            )
+
         with global_session(cls.__sqlalchemy_session__):
             return cls.build(*args, **kwargs).save()
 
@@ -74,6 +84,7 @@ class ActiveModelFactory[T](SQLModelFactory[T]):
         # TODO right now assumes the model is typeid, maybe we should assert against this?
         primary_key_name = cls.__model__.primary_key_column().name
         return TypeID(
+            # gets the prefix associated with the pk field
             cls.__model__.model_fields[primary_key_name].sa_column.type.prefix
         )
 

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/pytest/plugin.py

@@ -2,8 +2,8 @@
 
 Currently provides:
 
-* ``db_session`` fixture – quick access to a database session (see ``test_session``)
-* ``activemodel_preserve_tables`` ini option – configure tables to preserve when using
+* ``db_session`` fixture - quick access to a database session (see ``test_session``)
+* ``activemodel_preserve_tables`` ini option - configure tables to preserve when using
   ``database_reset_truncate`` (comma separated list or multiple lines depending on config style)
 
 Configuration examples:
@@ -28,7 +28,10 @@ The list always implicitly includes ``alembic_version`` even if not specified.
 from activemodel.session_manager import global_session
 import pytest
 
-from .transaction import set_factory_session, set_polyfactory_session, test_session
+from .transaction import (
+    set_factory_sessions,
+    test_session,
+)
 
 
 def pytest_addoption(
@@ -53,7 +56,7 @@ def pytest_addoption(
 @pytest.fixture(scope="function")
 def db_session():
     """
-    Helpful for tests that are more similar to unit tests. If you doing a routing or integration test, you
+    Helpful for tests that are similar to unit tests. If you doing a routing or integration test, you
     probably don't need this. If your unit test is simple (you are just creating a couple of models) you
     can most likely skip this.
 
@@ -71,11 +74,12 @@ def db_truncate_session():
     """
     Provides a database session for testing when using a truncation cleaning strategy.
 
-    When not using a transaction cleaning strategy, no global test session is set
+    When using a truncation cleaning strategy, no global test session is set. This means all models that are created
+    are tied to a detached session, which makes it hard to mutate models after creation. This fixture fixes that problem
+    by setting the session used by all model factories to a global session.
     """
     with global_session() as session:
         # set global database sessions for model factories to avoid lazy loading issues
-        set_factory_session(session)
-        set_polyfactory_session(session)
+        set_factory_sessions(session)
 
         yield session

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/pytest/transaction.py

@@ -41,6 +41,13 @@ def set_polyfactory_session(session):
     ActiveModelFactory.__sqlalchemy_session__ = session
 
 
+def set_factory_sessions(session):
+    "set all supported model factories to use the provided session"
+
+    set_factory_session(session)
+    set_polyfactory_session(session)
+
+
 @contextlib.contextmanager
 def test_session():
     """

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/pytest/truncate.py

@@ -1,7 +1,6 @@
 import os
 from typing import Iterable
 
-import pytest
 from sqlmodel import SQLModel
 
 from ..logger import logger

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/types/sqlalchemy_protocol.py

@@ -1,9 +1,7 @@
 # IMPORTANT: This file is auto-generated. Do not edit directly.
 
-from typing import Protocol, TypeVar, Any, Generic
+from typing import Protocol
 import sqlmodel as sm
-from sqlalchemy.sql.base import _NoArg
-from typing import TYPE_CHECKING
 
 
 class SQLAlchemyQueryMethods[T: sm.SQLModel](Protocol):

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/types/sqlalchemy_protocol.pyi

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is auto-generated. Do not edit directly.
 
-from typing import Protocol, TypeVar, Any, Generic
+from typing import Protocol, Any
 import sqlmodel as sm
 from sqlalchemy.sql.base import _NoArg
 

{activemodel-0.14.0 → activemodel-0.15.0}/activemodel/types/typeid_patch.py

@@ -1,3 +1,9 @@
+"""
+Pydantic v2 support for TypeID.
+
+TODO should push this upstream to the typeid package
+"""
+
 from typing import Any, Type
 
 from pydantic import GetCoreSchemaHandler

{activemodel-0.14.0 → activemodel-0.15.0}/docker-compose.yml

@@ -10,14 +10,14 @@ services:
     ports:
       - ${CI:+5432}:5432
     volumes:
-      - package_postgres_data:/var/lib/postgresql/data/
+      - package_postgres_data:/var/lib/postgresql/
     healthcheck:
       # if you customize the default user at all, this healthcheck with clutter your logs
       # since the default username + database does not match up
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
       interval: 2s
       timeout: 5s
-      retries: 3
+      retries: 5
 
 volumes:
   # NOTE redis data is not persisted, assumed to be ephemeral

{activemodel-0.14.0 → activemodel-0.15.0}/pyproject.toml

@@ -1,14 +1,14 @@
 [project]
 name = "activemodel"
-version = "0.14.0"
+version = "0.15.0"
 description = "Make SQLModel more like an a real ORM"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = [
     "python-decouple-typed>=3.11.0",
-    "sqlmodel>=0.0.22",
+    "sqlmodel==0.0.32",
     "textcase>=0.4.0",
-    "typeid-python>=0.3.1",
+    "typeid-python==0.3.3",
 ]
 authors = [{ name = "Michael Bianco", email = "iloveitaly@gmail.com" }]
 keywords = ["sqlmodel", "orm", "activerecord", "activemodel", "sqlalchemy"]
@@ -38,13 +38,15 @@ dev = [
     "pydantic>=2.10.0",
     "fastapi[standard]>=0.115.6",
     "alembic>=1.14.1",
-    "pyright>=1.1.398",
+    "pyright[nodejs]>=1.1.398",
     "polyfactory>=2.22.1",
 ]
 
 [tool.ruff]
-extend-exclude = ["playground.py"]
-force-exclude = true
+extend-exclude = ["playground.py", "playground/"]
+
+[tool.pyright]
+exclude = ["playground/", "tmp/", ".venv/", "tests/"]
 
 # https://github.com/astral-sh/uv/issues/9513
 [build-system]

{activemodel-0.14.0 → activemodel-0.15.0}/test/models.py

@@ -4,7 +4,7 @@ Example models to test various ORM cases
 
 from pydantic import computed_field
 from sqlalchemy import UniqueConstraint
-from sqlmodel import Column, Field, Integer, Relationship
+from sqlmodel import Field, Relationship
 
 from activemodel import BaseModel
 from activemodel.mixins import TypeIDMixin

{activemodel-0.14.0 → activemodel-0.15.0}/test/orm/test_upsert.py

@@ -1,9 +1,4 @@
-import pytest
-from sqlalchemy import UniqueConstraint
-from sqlmodel import Field
 
-from activemodel import BaseModel
-from activemodel.mixins.typeid import TypeIDMixin
 from test.models import UpsertTestModel
 
 
@@ -45,6 +40,7 @@ def test_upsert_single_unique_field(create_and_wipe_database):
 
     assert UpsertTestModel.count() == 1
     record = UpsertTestModel.get(name="test1")
+    assert record is not None
     # 1. Double-check that DB record matches what was returned
     assert record.id == updated_result.id
     assert record.category == "B"
@@ -68,6 +64,7 @@ def test_upsert_multiple_unique_fields(create_and_wipe_database):
 
     # 1. Check that returned model's ID matches the DB record
     db_record1 = UpsertTestModel.get(name="multi1", category="X")
+    assert db_record1 is not None
     assert db_record1.id == result1.id
 
     result2 = UpsertTestModel.upsert(
@@ -139,6 +136,7 @@ def test_upsert_single_update_field(create_and_wipe_database):
 
     # Get record to verify field was updated
     record = UpsertTestModel.get(name="update1")
+    assert record is not None
     # 1. Check that DB record matches what was returned
     assert record.id == updated_result.id
     assert record.value == 25  # Updated
@@ -178,6 +176,7 @@ def test_upsert_multiple_update_fields(create_and_wipe_database):
 
     # Get record to verify all fields were updated
     record = UpsertTestModel.get(name="update2")
+    assert record is not None
     # 1. Check that DB record matches what was returned
     assert record.id == updated_result.id
     assert record.value == 99