sqlmodel 0.0.22__tar.gz → 0.0.24__tar.gz

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlmodel
-Version: 0.0.22
+Version: 0.0.24
 Summary: SQLModel, SQL databases in Python, designed for simplicity, compatibility, and robustness.
 Author-Email: =?utf-8?q?Sebasti=C3=A1n_Ram=C3=ADrez?= <tiangolo@gmail.com>
 Classifier: Development Status :: 4 - Beta
@@ -16,6 +16,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Database
 Classifier: Topic :: Database :: Database Engines/Servers
 Classifier: Topic :: Internet
@@ -40,11 +41,11 @@ Description-Content-Type: text/markdown
     <em>SQLModel, SQL databases in Python, designed for simplicity, compatibility, and robustness.</em>
 </p>
 <p align="center">
-<a href="https://github.com/fastapi/sqlmodel/actions?query=workflow%3ATest" target="_blank">
-    <img src="https://github.com/fastapi/sqlmodel/workflows/Test/badge.svg" alt="Test">
+<a href="https://github.com/fastapi/sqlmodel/actions?query=workflow%3ATest+event%3Apush+branch%3Amain" target="_blank">
+    <img src="https://github.com/fastapi/sqlmodel/actions/workflows/test.yml/badge.svg?event=push&branch=main" alt="Test">
 </a>
 <a href="https://github.com/fastapi/sqlmodel/actions?query=workflow%3APublish" target="_blank">
-    <img src="https://github.com/fastapi/sqlmodel/workflows/Publish/badge.svg" alt="Publish">
+    <img src="https://github.com/fastapi/sqlmodel/actions/workflows/publish.yml/badge.svg" alt="Publish">
 </a>
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/sqlmodel" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/sqlmodel.svg" alt="Coverage">

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/README.md

@@ -6,11 +6,11 @@
     <em>SQLModel, SQL databases in Python, designed for simplicity, compatibility, and robustness.</em>
 </p>
 <p align="center">
-<a href="https://github.com/fastapi/sqlmodel/actions?query=workflow%3ATest" target="_blank">
-    <img src="https://github.com/fastapi/sqlmodel/workflows/Test/badge.svg" alt="Test">
+<a href="https://github.com/fastapi/sqlmodel/actions?query=workflow%3ATest+event%3Apush+branch%3Amain" target="_blank">
+    <img src="https://github.com/fastapi/sqlmodel/actions/workflows/test.yml/badge.svg?event=push&branch=main" alt="Test">
 </a>
 <a href="https://github.com/fastapi/sqlmodel/actions?query=workflow%3APublish" target="_blank">
-    <img src="https://github.com/fastapi/sqlmodel/workflows/Publish/badge.svg" alt="Publish">
+    <img src="https://github.com/fastapi/sqlmodel/actions/workflows/publish.yml/badge.svg" alt="Publish">
 </a>
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/fastapi/sqlmodel" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/fastapi/sqlmodel.svg" alt="Coverage">

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/pyproject.toml

@@ -27,6 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Database",
     "Topic :: Database :: Database Engines/Servers",
     "Topic :: Internet",
@@ -38,7 +39,7 @@ dependencies = [
     "SQLAlchemy >=2.0.14,<2.1.0",
     "pydantic >=1.10.13,<3.0.0",
 ]
-version = "0.0.22"
+version = "0.0.24"
 
 [project.urls]
 Homepage = "https://github.com/fastapi/sqlmodel"

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/requirements-docs.txt

@@ -7,7 +7,7 @@ pyyaml >=5.3.1,<7.0.0
 # For Material for MkDocs, Chinese search
 # jieba==0.42.1
 # For image processing by Material for MkDocs
-pillow==10.3.0
+pillow==11.0.0
 # For image processing by Material for MkDocs
 cairosvg==2.7.1
 # mkdocstrings[python]==0.25.1
@@ -16,3 +16,4 @@ cairosvg==2.7.1
 # For griffe, it formats with black
 typer == 0.12.3
 mkdocs-macros-plugin==1.0.5
+markdown-include-variants==0.0.4

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/requirements-github-actions.txt

@@ -2,3 +2,4 @@ PyGithub>=2.3.0,<3.0.0
 pydantic>=2.5.3,<3.0.0
 pydantic-settings>=2.1.0,<3.0.0
 httpx>=0.27.0,<0.28.0
+smokeshow

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/requirements-tests.txt

@@ -3,13 +3,15 @@
 pytest >=7.0.1,<8.0.0
 coverage[toml] >=6.2,<8.0
 mypy ==1.4.1
-ruff ==0.6.2
+ruff ==0.9.6
 # For FastAPI tests
 fastapi >=0.103.2
 httpx ==0.24.1
 # TODO: upgrade when deprecating Python 3.7
-dirty-equals ==0.6.0
+dirty-equals ==0.6.0; python_version < "3.8"
+dirty-equals ==0.9.0; python_version >= "3.8"
 jinja2 ==3.1.4
 # Pin typing-extensions until Python 3.8 is deprecated or the issue with dirty-equals
 # is fixed, maybe fixed after dropping Python 3.7 and upgrading dirty-equals
-typing-extensions ==4.6.1
+typing-extensions ==4.6.1; python_version < "3.8"
+typing-extensions ==4.12.2; python_version >= "3.8"

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/scripts/deploy_docs_status.py

@@ -2,9 +2,11 @@ import logging
 import re
 
 from github import Github
-from pydantic import SecretStr
+from pydantic import BaseModel, SecretStr
 from pydantic_settings import BaseSettings
 
+site_domain = "sqlmodel.tiangolo.com"
+
 
 class Settings(BaseSettings):
     github_repository: str
@@ -15,7 +17,12 @@ class Settings(BaseSettings):
     is_done: bool = False
 
 
-def main():
+class LinkData(BaseModel):
+    previous_link: str
+    preview_link: str
+
+
+def main() -> None:
     logging.basicConfig(level=logging.INFO)
     settings = Settings()
 
@@ -60,24 +67,31 @@ def main():
     docs_files = [f for f in files if f.filename.startswith("docs/")]
 
     deploy_url = settings.deploy_url.rstrip("/")
-    links: list[str] = []
+    links: list[LinkData] = []
     for f in docs_files:
         match = re.match(r"docs/(.*)", f.filename)
-        assert match
+        if not match:
+            continue
         path = match.group(1)
         if path.endswith("index.md"):
-            path = path.replace("index.md", "")
+            use_path = path.replace("index.md", "")
         else:
-            path = path.replace(".md", "/")
-        link = f"{deploy_url}/{path}"
+            use_path = path.replace(".md", "/")
+        link = LinkData(
+            previous_link=f"https://{site_domain}/{use_path}",
+            preview_link=f"{deploy_url}/{use_path}",
+        )
         links.append(link)
-    links.sort()
+        links.sort(key=lambda x: x.preview_link)
 
     message = f"📝 Docs preview for commit {settings.commit_sha} at: {deploy_url}"
 
     if links:
         message += "\n\n### Modified Pages\n\n"
-        message += "\n".join([f"* {link}" for link in links])
+        for link in links:
+            message += f"* {link.preview_link}"
+            message += f" - ([before]({link.previous_link}))"
+            message += "\n"
 
     print(message)
     use_pr.as_issue().create_comment(message)

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/scripts/format.sh

@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/usr/bin/env bash
+
+set -e
 set -x
 
 ruff check sqlmodel tests docs_src scripts --fix

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/sqlmodel/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.22"
+__version__ = "0.0.24"
 
 # Re-export from SQLAlchemy
 from sqlalchemy.engine import create_engine as create_engine

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/sqlmodel/_compat.py

@@ -25,7 +25,8 @@ from typing_extensions import Annotated, get_args, get_origin
 
 # Reassign variable to make it reexported for mypy
 PYDANTIC_VERSION = P_VERSION
-IS_PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
+PYDANTIC_MINOR_VERSION = tuple(int(i) for i in P_VERSION.split(".")[:2])
+IS_PYDANTIC_V2 = PYDANTIC_MINOR_VERSION[0] == 2
 
 
 if TYPE_CHECKING:

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/sqlmodel/main.py

@@ -52,11 +52,11 @@ from sqlalchemy.orm.decl_api import DeclarativeMeta
 from sqlalchemy.orm.instrumentation import is_instrumented
 from sqlalchemy.sql.schema import MetaData
 from sqlalchemy.sql.sqltypes import LargeBinary, Time, Uuid
-from typing_extensions import Literal, deprecated, get_origin
+from typing_extensions import Literal, TypeAlias, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     IS_PYDANTIC_V2,
-    PYDANTIC_VERSION,
+    PYDANTIC_MINOR_VERSION,
     BaseConfig,
     ModelField,
     ModelMetaclass,
@@ -90,7 +90,12 @@ if TYPE_CHECKING:
 
 _T = TypeVar("_T")
 NoArgAnyCallable = Callable[[], Any]
-IncEx = Union[Set[int], Set[str], Dict[int, Any], Dict[str, Any], None]
+IncEx: TypeAlias = Union[
+    Set[int],
+    Set[str],
+    Mapping[int, Union["IncEx", bool]],
+    Mapping[str, Union["IncEx", bool]],
+]
 OnDeleteType = Literal["CASCADE", "SET NULL", "RESTRICT"]
 
 
@@ -129,8 +134,7 @@ class FieldInfo(PydanticFieldInfo):
                 )
             if primary_key is not Undefined:
                 raise RuntimeError(
-                    "Passing primary_key is not supported when "
-                    "also passing a sa_column"
+                    "Passing primary_key is not supported when also passing a sa_column"
                 )
             if nullable is not Undefined:
                 raise RuntimeError(
@@ -138,8 +142,7 @@ class FieldInfo(PydanticFieldInfo):
                 )
             if foreign_key is not Undefined:
                 raise RuntimeError(
-                    "Passing foreign_key is not supported when "
-                    "also passing a sa_column"
+                    "Passing foreign_key is not supported when also passing a sa_column"
                 )
             if ondelete is not Undefined:
                 raise RuntimeError(
@@ -336,7 +339,7 @@ def Field(
     regex: Optional[str] = None,
     discriminator: Optional[str] = None,
     repr: bool = True,
-    sa_column: Union[Column, UndefinedType] = Undefined,  # type: ignore
+    sa_column: Union[Column[Any], UndefinedType] = Undefined,
     schema_extra: Optional[Dict[str, Any]] = None,
 ) -> Any: ...
 
@@ -474,7 +477,7 @@ def Relationship(
 class SQLModelMetaclass(ModelMetaclass, DeclarativeMeta):
     __sqlmodel_relationships__: Dict[str, RelationshipInfo]
     model_config: SQLModelConfig
-    model_fields: Dict[str, FieldInfo]
+    model_fields: Dict[str, FieldInfo]  # type: ignore[assignment]
     __config__: Type[SQLModelConfig]
     __fields__: Dict[str, ModelField]  # type: ignore[assignment]
 
@@ -858,8 +861,8 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
         self,
         *,
         mode: Union[Literal["json", "python"], str] = "python",
-        include: IncEx = None,
-        exclude: IncEx = None,
+        include: Union[IncEx, None] = None,
+        exclude: Union[IncEx, None] = None,
         context: Union[Dict[str, Any], None] = None,
         by_alias: bool = False,
         exclude_unset: bool = False,
@@ -869,7 +872,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
         warnings: Union[bool, Literal["none", "warn", "error"]] = True,
         serialize_as_any: bool = False,
     ) -> Dict[str, Any]:
-        if PYDANTIC_VERSION >= "2.7.0":
+        if PYDANTIC_MINOR_VERSION >= (2, 7):
             extra_kwargs: Dict[str, Any] = {
                 "context": context,
                 "serialize_as_any": serialize_as_any,
@@ -908,8 +911,8 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
     def dict(
         self,
         *,
-        include: IncEx = None,
-        exclude: IncEx = None,
+        include: Union[IncEx, None] = None,
+        exclude: Union[IncEx, None] = None,
         by_alias: bool = False,
         exclude_unset: bool = False,
         exclude_defaults: bool = False,

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/tests/test_tutorial/test_fastapi/test_update/test_tutorial001.py

@@ -49,16 +49,16 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero2_data["name"], "The name should not be set to none"
-        assert (
-            data["secret_name"] == "Spider-Youngster"
-        ), "The secret name should be updated"
+        assert data["secret_name"] == "Spider-Youngster", (
+            "The secret name should be updated"
+        )
 
         response = client.patch(f"/heroes/{hero3_id}", json={"age": None})
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero3_data["name"]
         assert data["age"] is None, (
-            "A field should be updatable to None, even if " "that's the default"
+            "A field should be updatable to None, even if that's the default"
         )
 
         response = client.patch("/heroes/9001", json={"name": "Dragon Cube X"})

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py310.py

@@ -52,16 +52,16 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero2_data["name"], "The name should not be set to none"
-        assert (
-            data["secret_name"] == "Spider-Youngster"
-        ), "The secret name should be updated"
+        assert data["secret_name"] == "Spider-Youngster", (
+            "The secret name should be updated"
+        )
 
         response = client.patch(f"/heroes/{hero3_id}", json={"age": None})
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero3_data["name"]
         assert data["age"] is None, (
-            "A field should be updatable to None, even if " "that's the default"
+            "A field should be updatable to None, even if that's the default"
         )
 
         response = client.patch("/heroes/9001", json={"name": "Dragon Cube X"})

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/tests/test_tutorial/test_fastapi/test_update/test_tutorial001_py39.py

@@ -52,16 +52,16 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero2_data["name"], "The name should not be set to none"
-        assert (
-            data["secret_name"] == "Spider-Youngster"
-        ), "The secret name should be updated"
+        assert data["secret_name"] == "Spider-Youngster", (
+            "The secret name should be updated"
+        )
 
         response = client.patch(f"/heroes/{hero3_id}", json={"age": None})
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero3_data["name"]
         assert data["age"] is None, (
-            "A field should be updatable to None, even if " "that's the default"
+            "A field should be updatable to None, even if that's the default"
         )
 
         response = client.patch("/heroes/9001", json={"name": "Dragon Cube X"})

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/tests/test_tutorial/test_fastapi/test_update/test_tutorial002.py

@@ -80,9 +80,9 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero2_data["name"], "The name should not be set to none"
-        assert (
-            data["secret_name"] == "Spider-Youngster"
-        ), "The secret name should be updated"
+        assert data["secret_name"] == "Spider-Youngster", (
+            "The secret name should be updated"
+        )
         assert "password" not in data
         assert "hashed_password" not in data
         with Session(mod.engine) as session:
@@ -95,9 +95,9 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero3_data["name"]
-        assert (
-            data["age"] is None
-        ), "A field should be updatable to None, even if that's the default"
+        assert data["age"] is None, (
+            "A field should be updatable to None, even if that's the default"
+        )
         assert "password" not in data
         assert "hashed_password" not in data
         with Session(mod.engine) as session:

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py310.py

@@ -83,9 +83,9 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero2_data["name"], "The name should not be set to none"
-        assert (
-            data["secret_name"] == "Spider-Youngster"
-        ), "The secret name should be updated"
+        assert data["secret_name"] == "Spider-Youngster", (
+            "The secret name should be updated"
+        )
         assert "password" not in data
         assert "hashed_password" not in data
         with Session(mod.engine) as session:
@@ -98,9 +98,9 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero3_data["name"]
-        assert (
-            data["age"] is None
-        ), "A field should be updatable to None, even if that's the default"
+        assert data["age"] is None, (
+            "A field should be updatable to None, even if that's the default"
+        )
         assert "password" not in data
         assert "hashed_password" not in data
         with Session(mod.engine) as session:

{sqlmodel-0.0.22 → sqlmodel-0.0.24}/tests/test_tutorial/test_fastapi/test_update/test_tutorial002_py39.py

@@ -83,9 +83,9 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero2_data["name"], "The name should not be set to none"
-        assert (
-            data["secret_name"] == "Spider-Youngster"
-        ), "The secret name should be updated"
+        assert data["secret_name"] == "Spider-Youngster", (
+            "The secret name should be updated"
+        )
         assert "password" not in data
         assert "hashed_password" not in data
         with Session(mod.engine) as session:
@@ -98,9 +98,9 @@ def test_tutorial(clear_sqlmodel):
         data = response.json()
         assert response.status_code == 200, response.text
         assert data["name"] == hero3_data["name"]
-        assert (
-            data["age"] is None
-        ), "A field should be updatable to None, even if that's the default"
+        assert data["age"] is None, (
+            "A field should be updatable to None, even if that's the default"
+        )
         assert "password" not in data
         assert "hashed_password" not in data
         with Session(mod.engine) as session: