activemodel 0.24.0__tar.gz → 0.24.2__tar.gz

{activemodel-0.24.0 → activemodel-0.24.2}/PKG-INFO

@@ -1,27 +1,16 @@
 Metadata-Version: 2.3
 Name: activemodel
-Version: 0.24.0
+Version: 0.24.2
 Summary: SQLModel with developer ergonomics. Make SQLModel act like ActiveRecord.
 Keywords: sqlmodel,orm,activerecord,activemodel,sqlalchemy
 Author: Michael Bianco
 Author-email: Michael Bianco <iloveitaly@gmail.com>
-Requires-Dist: sqlmodel==0.0.38
-Requires-Dist: typeid-python==0.3.9
-Requires-Dist: whenever>=0.10.0
-Requires-Dist: sphinx>=7.1.2 ; extra == 'docs'
-Requires-Dist: shibuya ; extra == 'docs'
-Requires-Dist: myst-parser>=2.0.0 ; extra == 'docs'
-Requires-Dist: sphinx-design>=0.5.0 ; extra == 'docs'
-Requires-Dist: sphinx-copybutton>=0.5.2 ; extra == 'docs'
-Requires-Dist: sphinx-autobuild ; extra == 'docs'
-Requires-Dist: sphinx-autoapi ; extra == 'docs'
-Requires-Dist: sphinx-autodoc-typehints ; extra == 'docs'
-Requires-Dist: sphinx-paramlinks ; extra == 'docs'
-Requires-Dist: sphinx-llm ; extra == 'docs'
+Requires-Dist: sqlmodel==0.0.39
+Requires-Dist: typeid-python==0.3.10
+Requires-Dist: whenever>=0.10.3
 Requires-Python: >=3.13
 Project-URL: Repository, https://github.com/iloveitaly/activemodel
 Project-URL: Documentation, https://iloveitaly.github.io/activemodel/
-Provides-Extra: docs
 Description-Content-Type: text/markdown
 
 [![Release Notes](https://img.shields.io/github/release/iloveitaly/activemodel)](https://github.com/iloveitaly/activemodel/releases)
@@ -31,10 +20,6 @@ Description-Content-Type: text/markdown
 
 # ActiveModel: ORM Wrapper for SQLModel
 
-<p align="center">
-  <img src="docs/_static/logo.png" alt="ActiveModel Logo" width="600"/>
-</p>
-
 No, this isn't *really* [ActiveModel](https://guides.rubyonrails.org/active_model_basics.html). It's just a wrapper around SQLModel that provides a ActiveRecord-like interface.
 
 SQLModel is *not* an ORM. It's a SQL query builder and a schema definition tool. This drives me nuts because the developer ergonomics are terrible because of this.

{activemodel-0.24.0 → activemodel-0.24.2}/README.md

@@ -5,10 +5,6 @@
 
 # ActiveModel: ORM Wrapper for SQLModel
 
-<p align="center">
-  <img src="docs/_static/logo.png" alt="ActiveModel Logo" width="600"/>
-</p>
-
 No, this isn't *really* [ActiveModel](https://guides.rubyonrails.org/active_model_basics.html). It's just a wrapper around SQLModel that provides a ActiveRecord-like interface.
 
 SQLModel is *not* an ORM. It's a SQL query builder and a schema definition tool. This drives me nuts because the developer ergonomics are terrible because of this.

{activemodel-0.24.0 → activemodel-0.24.2}/activemodel/base_model.py

@@ -487,6 +487,10 @@ class BaseModel(SQLModel):
     def one(cls, *args: t.Any, **kwargs: t.Any):
         """
         Gets a single record from the database. Pass an PK ID or a kwarg to filter by.
+
+        Raises:
+            sqlalchemy.exc.NoResultFound: If no record is found.
+            sqlalchemy.exc.MultipleResultsFound: If more than one record is found.
         """
 
         args, kwargs = cls.__process_filter_args__(*args, **kwargs)

{activemodel-0.24.0 → activemodel-0.24.2}/activemodel/patches/get_column_from_field_patch.py

@@ -40,16 +40,16 @@ if TYPE_CHECKING:
     from pydantic_core import PydanticUndefinedType as UndefinedType
 
 
-# https://github.com/fastapi/sqlmodel/blob/5c2dbe419edc2d15200eee5269c9508987944ed8/sqlmodel/main.py#L691
+# https://github.com/fastapi/sqlmodel/blob/0.0.39/sqlmodel/main.py#L740
 assert (
     hash_function_code(sqlmodel.main.get_column_from_field)
-    == "eaa5cd8a3a0119209154f04dfece6253c0d24b5bd365b16bbbd09704e1ffc57d"
+    == "cddbf17b0ffec0615bf726962e62dfb3fb83ab1b81a175de72ec697b0fb21632"
 ), (
     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: Any) -> Column:  # type: ignore
+def get_column_from_field(field: Any) -> Column:
     field_info = field
     sa_column = _get_sqlmodel_field_value(field_info, "sa_column", Undefined)
     if isinstance(sa_column, Column):
@@ -88,7 +88,7 @@ def get_column_from_field(field: Any) -> Column:  # type: ignore
         assert isinstance(foreign_key, str)
         assert isinstance(ondelete_value, (str, type(None)))  # for typing
         args.append(ForeignKey(foreign_key, ondelete=ondelete_value))
-    kwargs = {
+    kwargs: dict[str, Any] = {
         "primary_key": primary_key,
         "nullable": nullable,
         "index": index,

{activemodel-0.24.0 → activemodel-0.24.2}/activemodel/patches/get_sqlalchemy_type_patch.py

@@ -24,7 +24,7 @@ from activemodel.types.whenever import (
 )
 from activemodel.utils import hash_function_code
 
-# https://github.com/fastapi/sqlmodel/blob/5c2dbe419edc2d15200eee5269c9508987944ed8/sqlmodel/main.py#L691
+# https://github.com/fastapi/sqlmodel/blob/0.0.39/sqlmodel/main.py#L686
 assert (
     hash_function_code(sqlmodel.main.get_sqlalchemy_type)
     == "ac1225457303bb04a41d72382161914047b03891b76a427bdcc6668af5570933"

{activemodel-0.24.0 → activemodel-0.24.2}/activemodel/pytest/factories.py

@@ -135,4 +135,6 @@ class ActiveModelFactory[T](SQLModelFactory[T]):
 
 ActiveModelFactory.add_provider(Instant, lambda: Instant.now())
 ActiveModelFactory.add_provider(ZonedDateTime, lambda: ZonedDateTime.now_in_system_tz())
-ActiveModelFactory.add_provider(PlainDateTime, lambda: ZonedDateTime.now_in_system_tz().to_plain())
+ActiveModelFactory.add_provider(
+    PlainDateTime, lambda: ZonedDateTime.now_in_system_tz().to_plain()
+)

{activemodel-0.24.0 → activemodel-0.24.2}/activemodel/session_manager.py

@@ -33,7 +33,7 @@ def _serialize_pydantic_model(model: BaseModel | list[BaseModel] | None) -> str
         # not everything in a list is a pydantic model
         def dump_if_model(m):
             if isinstance(m, BaseModel):
-                return m.model_dump()
+                return m.model_dump(mode="json")
             return m
 
         return json.dumps([dump_if_model(m) for m in model])

activemodel-0.24.2/activemodel/types/__init__.py

@@ -0,0 +1,24 @@
+from .typeid import TypeIDType
+
+__all__ = [
+    "TypeIDType",
+]
+
+try:
+    from .whenever import (
+        DateType,
+        InstantType,
+        PlainDateTimeType,
+        TimeType,
+        ZonedDateTimeType,
+    )
+
+    __all__ += [
+        "DateType",
+        "InstantType",
+        "PlainDateTimeType",
+        "TimeType",
+        "ZonedDateTimeType",
+    ]
+except ImportError:
+    pass

{activemodel-0.24.0 → activemodel-0.24.2}/activemodel/types/whenever/__init__.py

@@ -4,4 +4,10 @@ from .plain_date_time_type import PlainDateTimeType
 from .time_type import TimeType
 from .zoned_date_time_type import ZonedDateTimeType
 
-__all__ = ["DateType", "InstantType", "PlainDateTimeType", "TimeType", "ZonedDateTimeType"]
+__all__ = [
+    "DateType",
+    "InstantType",
+    "PlainDateTimeType",
+    "TimeType",
+    "ZonedDateTimeType",
+]

{activemodel-0.24.0 → activemodel-0.24.2}/pyproject.toml

@@ -1,37 +1,23 @@
 [project]
 name = "activemodel"
-version = "0.24.0"
+version = "0.24.2"
 description = "SQLModel with developer ergonomics. Make SQLModel act like ActiveRecord."
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
-    "sqlmodel==0.0.38",
-    "typeid-python==0.3.9",
-    "whenever>=0.10.0",
+    "sqlmodel==0.0.39",
+    "typeid-python==0.3.10",
+    "whenever>=0.10.3",
 ]
 authors = [{ name = "Michael Bianco", email = "iloveitaly@gmail.com" }]
 keywords = ["sqlmodel", "orm", "activerecord", "activemodel", "sqlalchemy"]
 urls = { "Repository" = "https://github.com/iloveitaly/activemodel", "Documentation" = "https://iloveitaly.github.io/activemodel/" }
 
-[project.optional-dependencies]
-docs = [
-    "sphinx>=7.1.2",
-    "shibuya",
-    "myst-parser>=2.0.0",
-    "sphinx-design>=0.5.0",
-    "sphinx-copybutton>=0.5.2",
-    "sphinx-autobuild",
-    "sphinx-autoapi",
-    "sphinx-autodoc-typehints",
-    "sphinx-paramlinks",
-    "sphinx-llm",
-]
-
 [project.entry-points.pytest11]
 activemodel = "activemodel.pytest.plugin"
 
 [build-system]
-requires = ["uv_build>=0.11.0,<0.12"]
+requires = ["uv_build>=0.11.0,<0.13"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]
@@ -62,6 +48,17 @@ dev = [
     "covdefaults>=2.3.0",
     "factory-boy>=3.3.3",
 ]
+# Sphinx toolchain for local/CI docs builds — not a published package extra
+docs = [
+    "sphinx>=7.1.2",
+    "shibuya",
+    "myst-parser>=2.0.0",
+    "sphinx-design>=0.5.0",
+    "sphinx-copybutton>=0.5.2",
+    "sphinx-autobuild",
+    "sphinx-autoapi",
+    "sphinx-llm",
+]
 
 [tool.pyright]
 exclude = [

activemodel-0.24.0/activemodel/types/__init__.py

@@ -1,12 +0,0 @@
-from .typeid import TypeIDType
-
-__all__ = [
-    "TypeIDType",
-]
-
-try:
-    from .whenever import DateType, InstantType, PlainDateTimeType, TimeType, ZonedDateTimeType
-
-    __all__ += ["DateType", "InstantType", "PlainDateTimeType", "TimeType", "ZonedDateTimeType"]
-except ImportError:
-    pass