pjdev-postgres 3.5.0__tar.gz

pjdev_postgres-3.5.0/.gitignore

@@ -0,0 +1,165 @@
+.DS_Store
+.idea
+
+!**/.gitkeep
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

pjdev_postgres-3.5.0/LICENSE.txt

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024-present Chris O'Neill <chris@purplejay.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

pjdev_postgres-3.5.0/PKG-INFO

@@ -0,0 +1,47 @@
+Metadata-Version: 2.3
+Name: pjdev-postgres
+Version: 3.5.0
+Project-URL: Documentation, https://gitlab.purplejay.net/keystone/python/-/tree/main/keystone-postgres/README.md
+Project-URL: Issues, https://gitlab.purplejay.net/keystone/python/-/issues
+Project-URL: Source, https://gitlab.purplejay.net/keystone/python
+Author-email: Purple Jay LLC <it@purplejay.io>
+License-Expression: MIT
+License-File: LICENSE.txt
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.12
+Requires-Dist: loguru
+Requires-Dist: psycopg[binary,pool]>=3.1.19
+Requires-Dist: pydantic-settings>=2.3.1
+Requires-Dist: sqlmodel>=0.0.19
+Provides-Extra: dev
+Requires-Dist: ruff; extra == 'dev'
+Provides-Extra: test
+Requires-Dist: coverage; extra == 'test'
+Requires-Dist: pytest; extra == 'test'
+Description-Content-Type: text/markdown
+
+# keystone-postgres
+
+[![PyPI - Version](https://img.shields.io/pypi/v/pjdev-postgres.svg)](https://pypi.org/project/pjdev-postgres)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pjdev-postgres.svg)](https://pypi.org/project/pjdev-postgres)
+
+-----
+
+**Table of Contents**
+
+- [Installation](#installation)
+- [License](#license)
+
+## Installation
+
+```console
+pip install pjdev-postgres
+```
+
+## License
+
+`pjdev-postgres` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.

pjdev_postgres-3.5.0/README.md

@@ -0,0 +1,21 @@
+# keystone-postgres
+
+[![PyPI - Version](https://img.shields.io/pypi/v/pjdev-postgres.svg)](https://pypi.org/project/pjdev-postgres)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pjdev-postgres.svg)](https://pypi.org/project/pjdev-postgres)
+
+-----
+
+**Table of Contents**
+
+- [Installation](#installation)
+- [License](#license)
+
+## Installation
+
+```console
+pip install pjdev-postgres
+```
+
+## License
+
+`pjdev-postgres` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.

pjdev_postgres-3.5.0/pyproject.toml

@@ -0,0 +1,92 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "pjdev-postgres"
+dynamic = ["version"]
+description = ''
+readme = "README.md"
+requires-python = ">=3.12"
+license = "MIT"
+keywords = []
+authors = [
+  { name = "Purple Jay LLC", email = "it@purplejay.io" },
+]
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: Implementation :: CPython",
+  "Programming Language :: Python :: Implementation :: PyPy",
+]
+dependencies = [
+  "pydantic-settings>=2.3.1",
+  "sqlmodel>=0.0.19",
+  "psycopg[binary,pool]>=3.1.19",
+  "loguru"
+]
+
+[project.optional-dependencies]
+dev = [
+    "ruff",
+]
+
+test = [
+    "pytest",
+    "coverage"
+]
+
+[project.urls]
+Documentation = "https://gitlab.purplejay.net/keystone/python/-/tree/main/keystone-postgres/README.md"
+Issues = "https://gitlab.purplejay.net/keystone/python/-/issues"
+Source = "https://gitlab.purplejay.net/keystone/python"
+
+[tool.hatch.version]
+path = "src/pjdev_postgres/__about__.py"
+
+[tool.hatch.envs.default]
+dependencies = [
+  "coverage[toml]>=6.5",
+  "pytest",
+]
+[tool.hatch.envs.default.scripts]
+test = "pytest {args:tests}"
+test-cov = "coverage run -m pytest {args:tests}"
+cov-report = [
+  "- coverage combine",
+  "coverage report",
+]
+cov = [
+  "test-cov",
+  "cov-report",
+]
+
+[[tool.hatch.envs.all.matrix]]
+python = ["3.12"]
+
+[tool.hatch.envs.types]
+dependencies = [
+  "mypy>=1.0.0",
+]
+[tool.hatch.envs.types.scripts]
+check = "mypy --install-types --non-interactive {args:src/pjdev_postgres tests}"
+
+[tool.coverage.run]
+source_pkgs = ["pjdev_postgres", "tests"]
+branch = true
+parallel = true
+omit = [
+  "src/pjdev_postgres/__about__.py",
+]
+
+[tool.coverage.paths]
+pjdev_postgres = ["src/pjdev_postgres", "*/pjdev-postgres/src/pjdev_postgres"]
+tests = ["tests", "*/pjdev-postgres/tests"]
+
+[tool.coverage.report]
+exclude_lines = [
+  "no cov",
+  "if __name__ == .__main__.:",
+  "if TYPE_CHECKING:",
+]

pjdev_postgres-3.5.0/requirements-dev.txt

@@ -0,0 +1,45 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --no-emit-index-url --extra=test --extra=dev --output-file=requirements-dev.txt pyproject.toml
+annotated-types==0.7.0
+    # via pydantic
+coverage==7.5.3
+    # via keystone-postgres (pyproject.toml)
+iniconfig==2.0.0
+    # via pytest
+loguru==0.7.2
+    # via keystone-postgres (pyproject.toml)
+packaging==24.1
+    # via pytest
+pluggy==1.5.0
+    # via pytest
+psycopg==3.1.19
+    # via keystone-postgres (pyproject.toml)
+psycopg-binary==3.1.19
+    # via psycopg
+psycopg-pool==3.2.2
+    # via psycopg
+pydantic==2.7.3
+    # via
+    #   pydantic-settings
+    #   sqlmodel
+pydantic-core==2.18.4
+    # via pydantic
+pydantic-settings==2.3.2
+    # via keystone-postgres (pyproject.toml)
+pytest==8.2.2
+    # via keystone-postgres (pyproject.toml)
+python-dotenv==1.0.1
+    # via pydantic-settings
+ruff==0.4.8
+    # via keystone-postgres (pyproject.toml)
+sqlalchemy==2.0.30
+    # via sqlmodel
+sqlmodel==0.0.19
+    # via keystone-postgres (pyproject.toml)
+typing-extensions==4.12.2
+    # via
+    #   psycopg
+    #   psycopg-pool
+    #   pydantic
+    #   pydantic-core
+    #   sqlalchemy

pjdev_postgres-3.5.0/requirements-test.txt

@@ -0,0 +1,43 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --no-emit-index-url --extra=test --output-file=requirements-test.txt pyproject.toml
+annotated-types==0.7.0
+    # via pydantic
+coverage==7.5.3
+    # via keystone-postgres (pyproject.toml)
+iniconfig==2.0.0
+    # via pytest
+loguru==0.7.2
+    # via keystone-postgres (pyproject.toml)
+packaging==24.1
+    # via pytest
+pluggy==1.5.0
+    # via pytest
+psycopg==3.1.19
+    # via keystone-postgres (pyproject.toml)
+psycopg-binary==3.1.19
+    # via psycopg
+psycopg-pool==3.2.2
+    # via psycopg
+pydantic==2.7.3
+    # via
+    #   pydantic-settings
+    #   sqlmodel
+pydantic-core==2.18.4
+    # via pydantic
+pydantic-settings==2.3.2
+    # via keystone-postgres (pyproject.toml)
+pytest==8.2.2
+    # via keystone-postgres (pyproject.toml)
+python-dotenv==1.0.1
+    # via pydantic-settings
+sqlalchemy==2.0.30
+    # via sqlmodel
+sqlmodel==0.0.19
+    # via keystone-postgres (pyproject.toml)
+typing-extensions==4.12.2
+    # via
+    #   psycopg
+    #   psycopg-pool
+    #   pydantic
+    #   pydantic-core
+    #   sqlalchemy

pjdev_postgres-3.5.0/requirements.txt

@@ -0,0 +1,33 @@
+# This file was autogenerated by uv via the following command:
+#    uv pip compile --no-emit-index-url --strip-extras --output-file=requirements.txt pyproject.toml
+annotated-types==0.7.0
+    # via pydantic
+loguru==0.7.2
+    # via keystone-postgres (pyproject.toml)
+psycopg==3.1.19
+    # via keystone-postgres (pyproject.toml)
+psycopg-binary==3.1.19
+    # via psycopg
+psycopg-pool==3.2.2
+    # via psycopg
+pydantic==2.7.3
+    # via
+    #   pydantic-settings
+    #   sqlmodel
+pydantic-core==2.18.4
+    # via pydantic
+pydantic-settings==2.3.2
+    # via keystone-postgres (pyproject.toml)
+python-dotenv==1.0.1
+    # via pydantic-settings
+sqlalchemy==2.0.30
+    # via sqlmodel
+sqlmodel==0.0.19
+    # via keystone-postgres (pyproject.toml)
+typing-extensions==4.12.2
+    # via
+    #   psycopg
+    #   psycopg-pool
+    #   pydantic
+    #   pydantic-core
+    #   sqlalchemy

pjdev_postgres-3.5.0/src/pjdev_postgres/__about__.py

@@ -0,0 +1,4 @@
+# SPDX-FileCopyrightText: 2024-present Chris O'Neill <chris@purplejay.io>
+#
+# SPDX-License-Identifier: MIT
+__version__ = "3.5.0"

pjdev_postgres-3.5.0/src/pjdev_postgres/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2024-present Chris O'Neill <chris@purplejay.io>
+#
+# SPDX-License-Identifier: MIT

pjdev_postgres-3.5.0/src/pjdev_postgres/concurrency_service.py

@@ -0,0 +1,33 @@
+from typing import TypeVar, Optional
+from uuid import UUID, uuid4
+from loguru import logger
+
+from pjdev_postgres.models import Versioned, ConcurrencyException
+
+T = TypeVar("T", bound=Versioned)
+
+
+def parse_concurrency_token(token: str) -> Optional[UUID]:
+    try:
+        concurrency_token = UUID(token) if token is not None else None
+        return concurrency_token
+    except TypeError as e:
+        logger.warning(f"{e}")
+        logger.warning(f"Tried parsing invalid uuid: {token}")
+
+
+def increment_version(obj: T) -> T:
+    obj.concurrency_token = uuid4()
+
+    return obj
+
+
+def validate_version(obj: T, token: Optional[str | UUID] = None) -> T:
+    concurrency_token = token
+    if not isinstance(token, UUID):
+        concurrency_token = parse_concurrency_token(token)
+
+    if obj.concurrency_token is not None and obj.concurrency_token != concurrency_token:
+        raise ConcurrencyException("Stale data detected")
+
+    return increment_version(obj)

pjdev_postgres-3.5.0/src/pjdev_postgres/model_validators.py

@@ -0,0 +1,58 @@
+from datetime import date, datetime, UTC
+from typing import Callable, List, Optional, Type, Any
+from loguru import logger
+from pydantic import BeforeValidator
+
+
+def make_date_validator(
+    date_format: str, date_obj_type: Type[date | datetime] = datetime
+) -> Callable[[str], Optional[date]]:
+    def validator(v: Optional[Any]) -> Optional[date]:
+        if not v:
+            return None
+
+        if isinstance(v, datetime):
+            formatted_value = v
+            if date_format == "iso":
+                formatted_value = v.astimezone(UTC)
+            return (
+                formatted_value if date_obj_type is datetime else formatted_value.date()
+            )
+
+        if isinstance(v, date):
+            return v
+
+        if not isinstance(v, str):
+            return None
+
+        stripped_value = v.strip()
+
+        if stripped_value in ["-", ""]:
+            return None
+
+        if date_format == "iso":
+            value = datetime.fromisoformat(v).replace(tzinfo=UTC)
+        else:
+            value = datetime.strptime(v, date_format)
+        return value.date() if date_obj_type is date else value
+
+    return validator
+
+
+def make_date_validator_for_formats(
+    date_formats: List[str], date_obj_type: Type[date | datetime] = datetime
+) -> Callable[[str], Optional[date]]:
+    def validator(v: Optional[Any]) -> Optional[date]:
+        for fmt in date_formats:
+            try:
+                return make_date_validator(fmt, date_obj_type)(v)
+            except ValueError as e:
+                logger.warning(e)
+                continue
+
+        return None
+
+    return validator
+
+
+date_validator = BeforeValidator(make_date_validator_for_formats(["iso"], date))

pjdev_postgres-3.5.0/src/pjdev_postgres/models.py

@@ -0,0 +1,57 @@
+from datetime import datetime, UTC
+from typing import Optional, Annotated
+from uuid import UUID
+
+from pydantic import BaseModel
+from sqlmodel import SQLModel, Field, Index
+
+from pjdev_postgres.model_validators import date_validator
+
+
+class ConnectionOptions(BaseModel):
+    echo: bool = False
+    pool_size: int = 5
+    max_overflow: int = 10
+
+
+class Versioned(BaseModel):
+    concurrency_token: Optional[UUID] = None
+
+
+class Auditable(BaseModel):
+    created_by_id: Optional[str] = None
+    created_by: Optional[str] = None
+    created_datetime: Annotated[
+        datetime, date_validator, Field(default_factory=lambda: datetime.now(UTC))
+    ]
+    last_modified_by_id: Optional[str] = None
+    last_modified_by: Optional[str] = None
+    last_modified_datetime: Annotated[Optional[datetime], date_validator] = None
+
+
+class TableModel(SQLModel):
+    row_id: Optional[int] = Field(default=None, primary_key=True)
+
+
+class Savable(Versioned, Auditable, TableModel):
+    pass
+
+
+class History(TableModel, table=True):
+    entity_name: str
+    entity_id: int
+    value: str
+    timestamp: Annotated[
+        datetime, date_validator, Field(default_factory=lambda: datetime.now(UTC))
+    ]
+
+    __table_args__ = (
+        Index("ix_history_entity_id", "entity_id"),
+        Index("ix_history_entity_name", "entity_name"),
+        Index("ix_history_timestamp", "timestamp"),
+    )
+
+
+class ConcurrencyException(BaseException):
+    def __init__(self, message: str):
+        super().__init__(message)

pjdev_postgres-3.5.0/src/pjdev_postgres/postgres_service.py

@@ -0,0 +1,95 @@
+from contextlib import contextmanager
+from datetime import datetime, UTC
+from typing import List, Optional, Type, TypeVar, Callable, Tuple
+from uuid import UUID
+
+from sqlalchemy import Engine
+from sqlmodel import SQLModel, create_engine, Session as SQLModelSession
+
+from pjdev_postgres import postgres_settings, concurrency_service
+from pjdev_postgres.models import ConnectionOptions, Savable, History
+
+T = TypeVar("T", bound=Savable)
+
+
+class Context:
+    engine: Optional[Engine] = None
+
+
+__ctx = Context()
+
+
+def initialize_engine(
+    tables: List[Type[SQLModel]],
+    options: Optional[ConnectionOptions] = None,
+) -> Engine:
+    if options is None:
+        options = ConnectionOptions()
+
+    settings = postgres_settings.get_settings()
+
+    if len(tables) == 0:
+        raise ValueError("Must specify at least one table")
+
+    db_url = f"postgresql+psycopg://{settings.username}:{settings.password}@{settings.host}/{settings.name}"
+
+    engine = create_engine(
+        db_url,
+        echo=options.echo,
+        pool_size=options.pool_size,
+        max_overflow=options.max_overflow,
+    )
+
+    for t in tables:
+        t.__table__.create(bind=engine, checkfirst=True)
+
+    return engine
+
+
+def configure_single_context(
+    tables: List[Type[SQLModel]], options: Optional[ConnectionOptions] = None
+):
+    __ctx.engine = initialize_engine(tables, options)
+
+
+@contextmanager
+def session_context() -> SQLModelSession:
+    with SQLModelSession(__ctx.engine) as session:
+        try:
+            yield session
+        finally:
+            session.close()
+
+
+def get_session() -> SQLModelSession:
+    with SQLModelSession(__ctx.engine) as session:
+        yield session
+
+
+def save(
+    obj: T,
+    user_resolver: Callable[[], Tuple[Optional[str], str]],
+    session: SQLModelSession,
+    concurrency_token: Optional[UUID] = None,
+    commit: bool = True,
+) -> T:
+    updated_obj = concurrency_service.validate_version(obj, concurrency_token)
+    updated_obj.last_modified_datetime = datetime.now(UTC)
+    user_oid, username = user_resolver()
+    updated_obj.last_modified_by_id = user_oid
+    updated_obj.last_modified_by = username
+
+    session.flush([updated_obj])
+
+    history = History(
+        entity_name=updated_obj.__class__.__name__.lower(),
+        entity_id=updated_obj.row_id,
+        value=updated_obj.model_dump_json(),
+    )
+    session.add(history)
+
+    if commit:
+        session.commit()
+        session.refresh(updated_obj)
+
+    return updated_obj

pjdev_postgres-3.5.0/src/pjdev_postgres/postgres_settings.py

@@ -0,0 +1,35 @@
+from pathlib import Path
+from typing import Optional
+
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class PostgresSettings(BaseSettings):
+    host: str = "localhost"
+    name: str
+    password: Optional[str] = None
+    username: Optional[str] = None
+    model_config = SettingsConfigDict(
+        case_sensitive=False,
+        extra="ignore",
+        env_nested_delimiter="__",
+        env_prefix="db_",
+    )
+
+
+class Context:
+    settings: Optional[PostgresSettings] = None
+
+
+__ctx = Context()
+
+
+def init_settings(root: Path):
+    __ctx.settings = PostgresSettings(_env_file=root / ".env")
+
+
+def get_settings() -> PostgresSettings:
+    if __ctx.settings is None:
+        msg = "Settings are not initialized -- call init_settings()"
+        raise Exception(msg)
+    return __ctx.settings

pjdev_postgres-3.5.0/test.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export PYTHONPATH=./src:./tests
+#coverage run -m pytest tests
+pytest tests/*.py -vv

pjdev_postgres-3.5.0/tests/__init__.py

@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2024-present Chris O'Neill <chris@purplejay.io>
+#
+# SPDX-License-Identifier: MIT

pjdev_postgres-3.5.0/tests/tests_for_history.py

@@ -0,0 +1,43 @@
+from pjdev_postgres import postgres_service
+from pjdev_postgres.models import Savable, History
+from sqlmodel import Session, select
+from utilities import init_test_db
+
+
+def test_history_item_is_created_and_saved():
+    class MockObj(Savable):
+        pass
+
+    class MockTable(MockObj, table=True):
+        pass
+
+    engine = init_test_db([MockTable.__table__, History.__table__])
+
+    with Session(engine) as session:
+        obj = MockTable()
+        session.add(obj)
+        saved_obj = postgres_service.save(
+            obj, session=session, user_resolver=lambda: ("mock_oid", "mock_user")
+        )
+
+        assert saved_obj.last_modified_datetime is not None
+        assert saved_obj.last_modified_by is not None
+        assert saved_obj.last_modified_by_id is not None
+
+    with Session(engine) as session2:
+        mock_row = session2.exec(
+            select(MockTable).where(MockTable.row_id == obj.row_id)
+        ).one_or_none()
+        history_mock = session2.exec(select(History)).all()
+        assert len(history_mock) == 1
+        assert mock_row is not None
+        assert history_mock[0].entity_name == mock_row.__tablename__
+
+        # Must use the base model (not the model with table=True) to validate due to this:
+        #   https://github.com/tiangolo/sqlmodel/issues/52#issuecomment-1311987732
+
+        historical_mock_row = MockObj.model_validate_json(history_mock[0].value)
+        assert historical_mock_row == MockObj.model_validate(mock_row)
+        assert mock_row.last_modified_datetime is not None
+        assert mock_row.last_modified_by is not None
+        assert mock_row.last_modified_by_id is not None

pjdev_postgres-3.5.0/tests/utilities.py

@@ -0,0 +1,11 @@
+from typing import List
+
+from sqlalchemy import create_engine, Engine, Table
+
+
+def init_test_db(tables: List[Table]) -> Engine:
+    engine = create_engine("sqlite:///", echo=False)
+    for t in tables:
+        t.create(bind=engine, checkfirst=True)
+
+    return engine