sqlmodel 0.0.17.dev1__tar.gz → 0.0.18.dev1__tar.gz

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlmodel
-Version: 0.0.17.dev1
+Version: 0.0.18.dev1
 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

sqlmodel-0.0.18.dev1/pdm_build.py

@@ -0,0 +1,39 @@
+import os
+from typing import Any, Dict, List
+
+from pdm.backend.hooks import Context
+
+TIANGOLO_BUILD_PACKAGE = os.getenv("TIANGOLO_BUILD_PACKAGE", "sqlmodel")
+
+
+def pdm_build_initialize(context: Context) -> None:
+    metadata = context.config.metadata
+    # Get custom config for the current package, from the env var
+    config: Dict[str, Any] = context.config.data["tool"]["tiangolo"][
+        "_internal-slim-build"
+    ]["packages"][TIANGOLO_BUILD_PACKAGE]
+    project_config: Dict[str, Any] = config["project"]
+    # Get main optional dependencies, extras
+    optional_dependencies: Dict[str, List[str]] = metadata.get(
+        "optional-dependencies", {}
+    )
+    # Get custom optional dependencies name to always include in this (non-slim) package
+    include_optional_dependencies: List[str] = config.get(
+        "include-optional-dependencies", []
+    )
+    # Override main [project] configs with custom configs for this package
+    for key, value in project_config.items():
+        metadata[key] = value
+    # Get custom build config for the current package
+    build_config: Dict[str, Any] = (
+        config.get("tool", {}).get("pdm", {}).get("build", {})
+    )
+    # Override PDM build config with custom build config for this package
+    for key, value in build_config.items():
+        context.config.build_config[key] = value
+    # Get main dependencies
+    dependencies: List[str] = metadata.get("dependencies", [])
+    # Add optional dependencies to the default dependencies for this (non-slim) package
+    for include_optional in include_optional_dependencies:
+        optional_dependencies_group = optional_dependencies.get(include_optional, [])
+        dependencies.extend(optional_dependencies_group)

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/pyproject.toml

@@ -38,13 +38,15 @@ dependencies = [
     "SQLAlchemy >=2.0.0,<2.1.0",
     "pydantic >=1.10.13,<3.0.0",
 ]
-version = "0.0.17.dev1"
+version = "0.0.18.dev1"
 
 [project.urls]
 Homepage = "https://github.com/tiangolo/sqlmodel"
 Documentation = "https://sqlmodel.tiangolo.com"
 Repository = "https://github.com/tiangolo/sqlmodel"
 
+[project.optional-dependencies]
+
 [tool.pdm]
 distribution = true
 
@@ -61,6 +63,11 @@ source-includes = [
     "sqlmodel/sql/expression.py.jinja2",
 ]
 
+[tool.tiangolo._internal-slim-build.packages.sqlmodel-slim.project]
+name = "sqlmodel-slim"
+
+[tool.tiangolo._internal-slim-build.packages.sqlmodel.project.optional-dependencies]
+
 [tool.coverage.run]
 parallel = true
 source = [

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/requirements-tests.txt

@@ -9,3 +9,4 @@ fastapi >=0.103.2
 httpx ==0.24.1
 # TODO: upgrade when deprecating Python 3.7
 dirty-equals ==0.6.0
+jinja2 ==3.1.3

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/scripts/format.sh

@@ -1,5 +1,5 @@
 #!/bin/sh -e
 set -x
 
-ruff sqlmodel tests docs_src scripts --fix
+ruff check sqlmodel tests docs_src scripts --fix
 ruff format sqlmodel tests docs_src scripts

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/scripts/lint.sh

@@ -4,5 +4,5 @@ set -e
 set -x
 
 mypy sqlmodel
-ruff sqlmodel tests docs_src scripts
+ruff check sqlmodel tests docs_src scripts
 ruff format sqlmodel tests docs_src --check

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/sqlmodel/__init__.py

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

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/sqlmodel/_compat.py

@@ -18,11 +18,13 @@ from typing import (
     Union,
 )
 
-from pydantic import VERSION as PYDANTIC_VERSION
+from pydantic import VERSION as P_VERSION
 from pydantic import BaseModel
 from pydantic.fields import FieldInfo
 from typing_extensions import get_args, get_origin
 
+# Reassign variable to make it reexported for mypy
+PYDANTIC_VERSION = P_VERSION
 IS_PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
 
 

{sqlmodel-0.0.17.dev1 → sqlmodel-0.0.18.dev1}/sqlmodel/main.py

@@ -6,6 +6,7 @@ from decimal import Decimal
 from enum import Enum
 from pathlib import Path
 from typing import (
+    TYPE_CHECKING,
     AbstractSet,
     Any,
     Callable,
@@ -55,6 +56,7 @@ from typing_extensions import Literal, deprecated, get_origin
 
 from ._compat import (  # type: ignore[attr-defined]
     IS_PYDANTIC_V2,
+    PYDANTIC_VERSION,
     BaseConfig,
     ModelField,
     ModelMetaclass,
@@ -80,6 +82,12 @@ from ._compat import (  # type: ignore[attr-defined]
 )
 from .sql.sqltypes import GUID, AutoString
 
+if TYPE_CHECKING:
+    from pydantic._internal._model_construction import ModelMetaclass as ModelMetaclass
+    from pydantic._internal._repr import Representation as Representation
+    from pydantic_core import PydanticUndefined as Undefined
+    from pydantic_core import PydanticUndefinedType as UndefinedType
+
 _T = TypeVar("_T")
 NoArgAnyCallable = Callable[[], Any]
 IncEx = Union[Set[int], Set[str], Dict[int, Any], Dict[str, Any], None]
@@ -764,13 +772,22 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
         mode: Union[Literal["json", "python"], str] = "python",
         include: IncEx = None,
         exclude: IncEx = None,
+        context: Union[Dict[str, Any], None] = None,
         by_alias: bool = False,
         exclude_unset: bool = False,
         exclude_defaults: bool = False,
         exclude_none: bool = False,
         round_trip: bool = False,
-        warnings: bool = True,
+        warnings: Union[bool, Literal["none", "warn", "error"]] = True,
+        serialize_as_any: bool = False,
     ) -> Dict[str, Any]:
+        if PYDANTIC_VERSION >= "2.7.0":
+            extra_kwargs: Dict[str, Any] = {
+                "context": context,
+                "serialize_as_any": serialize_as_any,
+            }
+        else:
+            extra_kwargs = {}
         if IS_PYDANTIC_V2:
             return super().model_dump(
                 mode=mode,
@@ -782,6 +799,7 @@ class SQLModel(BaseModel, metaclass=SQLModelMetaclass, registry=default_registry
                 exclude_none=exclude_none,
                 round_trip=round_trip,
                 warnings=warnings,
+                **extra_kwargs,
             )
         else:
             return super().dict(

sqlmodel-0.0.17.dev1/scripts/docs-live.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-export DYLD_FALLBACK_LIBRARY_PATH="/opt/homebrew/lib"
-
-LINENUMS="true" mkdocs serve --dev-addr 127.0.0.1:8008

sqlmodel-0.0.17.dev1/scripts/publish.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-python -m poetry publish --build

sqlmodel-0.0.17.dev1/scripts/test-files.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -x
-
-# Check README.md is up to date
-diff --brief docs/index.md README.md

sqlmodel-0.0.17.dev1/scripts/zip-docs.sh

@@ -1,11 +0,0 @@
-#! /usr/bin/env bash
-
-set -x
-set -e
-
-cd ./site
-
-if [ -f docs.zip ]; then
-    rm -rf docs.zip
-fi
-zip -r docs.zip ./