etlplus 0.7.0__tar.gz → 0.7.2__tar.gz

{etlplus-0.7.0/etlplus.egg-info → etlplus-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: etlplus
-Version: 0.7.0
+Version: 0.7.2
 Summary: A Swiss Army knife for simple ETL operations
 Home-page: https://github.com/Dagitali/ETLPlus
 Author: ETLPlus Team

{etlplus-0.7.0 → etlplus-0.7.2}/etlplus/database/__init__.py

@@ -18,6 +18,7 @@ from .engine import engine
 from .engine import load_database_url_from_config
 from .engine import make_engine
 from .engine import session
+from .orm import Base
 from .orm import build_models
 from .orm import load_and_build_models
 from .schema import load_table_specs
@@ -36,6 +37,7 @@ __all__ = [
     'render_table_sql',
     'render_tables',
     'render_tables_to_string',
+    'Base',
     # Singletons
     'engine',
     'session',

{etlplus-0.7.0 → etlplus-0.7.2}/etlplus/database/ddl.py

@@ -15,7 +15,6 @@ import os
 from collections.abc import Iterable
 from collections.abc import Mapping
 from pathlib import Path
-from typing import Any
 from typing import Final
 
 from jinja2 import DictLoader
@@ -24,6 +23,9 @@ from jinja2 import FileSystemLoader
 from jinja2 import StrictUndefined
 
 from ..file import File
+from ..types import StrAnyMap
+from ..types import StrPath
+from .types import TemplateKey
 
 # SECTION: EXPORTS ========================================================== #
 
@@ -52,7 +54,7 @@ _SUPPORTED_SPEC_SUFFIXES: Final[frozenset[str]] = frozenset(
 # SECTION: CONSTANTS ======================================================== #
 
 
-TEMPLATES: Final[dict[str, str]] = {
+TEMPLATES: Final[dict[TemplateKey, str]] = {
     'ddl': 'ddl.sql.j2',
     'view': 'view.sql.j2',
 }
@@ -64,7 +66,8 @@ TEMPLATES: Final[dict[str, str]] = {
 def _load_template_text(
     filename: str,
 ) -> str:
-    """Return the bundled template text.
+    """
+    Return the bundled template text.
 
     Parameters
     ----------
@@ -99,16 +102,17 @@ def _load_template_text(
 
 def _resolve_template(
     *,
-    template_key: str | None,
-    template_path: str | None,
+    template_key: TemplateKey | None,
+    template_path: StrPath | None,
 ) -> tuple[Environment, str]:
-    """Return environment and template name for rendering.
+    """
+    Return environment and template name for rendering.
 
     Parameters
     ----------
-    template_key : str | None
+    template_key : TemplateKey | None
         Named template key bundled with the package.
-    template_path : str | None
+    template_path : StrPath | None
         Explicit template file override.
 
     Returns
@@ -123,7 +127,11 @@ def _resolve_template(
     ValueError
         If the template key is unknown.
     """
-    file_override = template_path or os.environ.get('TEMPLATE_NAME')
+    file_override = (
+        str(template_path)
+        if template_path is not None
+        else os.environ.get('TEMPLATE_NAME')
+    )
     if file_override:
         path = Path(file_override)
         if not path.exists():
@@ -137,14 +145,14 @@ def _resolve_template(
         )
         return env, path.name
 
-    key = (template_key or 'ddl').strip()
+    key: TemplateKey = template_key or 'ddl'
     if key not in TEMPLATES:
         choices = ', '.join(sorted(TEMPLATES))
         raise ValueError(
             f'Unknown template key "{key}". Choose from: {choices}',
         )
 
-    # Load template from package data
+    # Load template from package data.
     template_filename = TEMPLATES[key]
     template_source = _load_template_text(template_filename)
 
@@ -161,19 +169,19 @@ def _resolve_template(
 
 
 def load_table_spec(
-    path: Path | str,
-) -> dict[str, Any]:
+    path: StrPath,
+) -> StrAnyMap:
     """
     Load a table specification from disk.
 
     Parameters
     ----------
-    path : Path | str
+    path : StrPath
         Path to the JSON or YAML specification file.
 
     Returns
     -------
-    dict[str, Any]
+    StrAnyMap
         Parsed table specification mapping.
 
     Raises
@@ -210,9 +218,9 @@ def load_table_spec(
 
 
 def render_table_sql(
-    spec: Mapping[str, Any],
+    spec: StrAnyMap,
     *,
-    template: str | None = 'ddl',
+    template: TemplateKey | None = 'ddl',
     template_path: str | None = None,
 ) -> str:
     """
@@ -220,9 +228,9 @@ def render_table_sql(
 
     Parameters
     ----------
-    spec : Mapping[str, Any]
+    spec : StrAnyMap
         Table specification mapping.
-    template : str | None, optional
+    template : TemplateKey | None, optional
         Template key to use (default: 'ddl').
     template_path : str | None, optional
         Path to a custom template file (overrides ``template``).
@@ -241,9 +249,9 @@ def render_table_sql(
 
 
 def render_tables(
-    specs: Iterable[Mapping[str, Any]],
+    specs: Iterable[StrAnyMap],
     *,
-    template: str | None = 'ddl',
+    template: TemplateKey | None = 'ddl',
     template_path: str | None = None,
 ) -> list[str]:
     """
@@ -251,9 +259,9 @@ def render_tables(
 
     Parameters
     ----------
-    specs : Iterable[Mapping[str, Any]]
+    specs : Iterable[StrAnyMap]
         Table specification mappings.
-    template : str | None, optional
+    template : TemplateKey | None, optional
         Template key to use (default: 'ddl').
     template_path : str | None, optional
         Path to a custom template file (overrides ``template``).
@@ -271,21 +279,21 @@ def render_tables(
 
 
 def render_tables_to_string(
-    spec_paths: Iterable[Path | str],
+    spec_paths: Iterable[StrPath],
     *,
-    template: str | None = 'ddl',
-    template_path: Path | str | None = None,
+    template: TemplateKey | None = 'ddl',
+    template_path: StrPath | None = None,
 ) -> str:
     """
     Render one or more specs and concatenate the SQL payloads.
 
     Parameters
     ----------
-    spec_paths : Iterable[Path | str]
+    spec_paths : Iterable[StrPath]
         Paths to table specification files.
-    template : str | None, optional
+    template : TemplateKey | None, optional
         Template key bundled with ETLPlus. Defaults to ``'ddl'``.
-    template_path : Path | str | None, optional
+    template_path : StrPath | None, optional
         Custom Jinja template to override the bundled templates.
 
     Returns

{etlplus-0.7.0 → etlplus-0.7.2}/etlplus/database/engine.py

@@ -10,12 +10,15 @@ import os
 from collections.abc import Mapping
 from pathlib import Path
 from typing import Any
+from typing import Final
 
 from sqlalchemy import create_engine
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker
 
 from ..file import File
+from ..types import StrAnyMap
+from ..types import StrPath
 
 # SECTION: EXPORTS ========================================================== #
 
@@ -33,7 +36,7 @@ __all__ = [
 # SECTION: INTERNAL CONSTANTS =============================================== #
 
 
-DATABASE_URL: str = (
+DATABASE_URL: Final[str] = (
     os.getenv('DATABASE_URL')
     or os.getenv('DATABASE_DSN')
     or 'sqlite+pysqlite:///:memory:'
@@ -43,13 +46,15 @@ DATABASE_URL: str = (
 # SECTION: INTERNAL FUNCTIONS =============================================== #
 
 
-def _resolve_url_from_mapping(cfg: Mapping[str, Any]) -> str | None:
+def _resolve_url_from_mapping(
+    cfg: StrAnyMap,
+) -> str | None:
     """
     Return a URL/DSN from a mapping if present.
 
     Parameters
     ----------
-    cfg : Mapping[str, Any]
+    cfg : StrAnyMap
         Configuration mapping potentially containing connection fields.
 
     Returns
@@ -74,7 +79,7 @@ def _resolve_url_from_mapping(cfg: Mapping[str, Any]) -> str | None:
 
 
 def load_database_url_from_config(
-    path: str | Path,
+    path: StrPath,
     *,
     name: str | None = None,
 ) -> str:
@@ -88,7 +93,7 @@ def load_database_url_from_config(
 
     Parameters
     ----------
-    path : str | Path
+    path : StrPath
         Location of the configuration file.
     name : str | None, optional
         Named database entry under the ``databases`` map (default:

{etlplus-0.7.0 → etlplus-0.7.2}/etlplus/database/orm.py

@@ -13,9 +13,8 @@ Usage
 from __future__ import annotations
 
 import re
-from collections.abc import Callable
-from pathlib import Path
 from typing import Any
+from typing import Final
 
 from sqlalchemy import Boolean
 from sqlalchemy import CheckConstraint
@@ -41,11 +40,15 @@ from sqlalchemy.orm import DeclarativeBase
 from sqlalchemy.orm import mapped_column
 from sqlalchemy.types import TypeEngine
 
+from ..types import StrPath
 from .schema import ForeignKeySpec
 from .schema import TableSpec
 from .schema import load_table_specs
+from .types import ModelRegistry
+from .types import TypeFactory
+
+# SECTION: EXPORTS ========================================================== #
 
-# SECTION: INTERNAL CONSTANTS =============================================== #
 
 __all__ = [
     # Classes
@@ -57,7 +60,9 @@ __all__ = [
 ]
 
 
-_TYPE_MAPPING: dict[str, Callable[[list[int]], TypeEngine]] = {
+# SECTION: INTERNAL CONSTANTS =============================================== #
+
+_TYPE_MAPPING: Final[dict[str, TypeFactory]] = {
     'int': lambda _: Integer(),
     'integer': lambda _: Integer(),
     'bigint': lambda _: Integer(),
@@ -102,6 +107,8 @@ _TYPE_MAPPING: dict[str, Callable[[list[int]], TypeEngine]] = {
 class Base(DeclarativeBase):
     """Base class for all ORM models."""
 
+    __abstract__ = True
+
 
 # SECTION: INTERNAL FUNCTIONS =============================================== #
 
@@ -191,7 +198,7 @@ def build_models(
     specs: list[TableSpec],
     *,
     base: type[DeclarativeBase] = Base,
-) -> dict[str, type[DeclarativeBase]]:
+) -> ModelRegistry:
     """
     Build SQLAlchemy ORM models from table specifications.
     Parameters
@@ -202,10 +209,10 @@ def build_models(
         Base class for the ORM models (default: :class:`Base`).
     Returns
     -------
-    dict[str, type[DeclarativeBase]]
+    ModelRegistry
         Registry mapping fully qualified table names to ORM model classes.
     """
-    registry: dict[str, type[DeclarativeBase]] = {}
+    registry: ModelRegistry = {}
 
     for spec in specs:
         table_args: list[object] = []
@@ -302,23 +309,23 @@ def build_models(
 
 
 def load_and_build_models(
-    path: str | Path,
+    path: StrPath,
     *,
     base: type[DeclarativeBase] = Base,
-) -> dict[str, type[DeclarativeBase]]:
+) -> ModelRegistry:
     """
     Load table specifications from a file and build SQLAlchemy models.
 
     Parameters
     ----------
-    path : str | Path
+    path : StrPath
         Path to the YAML file containing table specifications.
     base : type[DeclarativeBase], optional
         Base class for the ORM models (default: :class:`Base`).
 
     Returns
     -------
-    dict[str, type[DeclarativeBase]]
+    ModelRegistry
         Registry mapping fully qualified table names to ORM model classes.
     """
     return build_models(load_table_specs(path), base=base)

{etlplus-0.7.0 → etlplus-0.7.2}/etlplus/database/schema.py

@@ -16,6 +16,7 @@ from pydantic import ConfigDict
 from pydantic import Field
 
 from ..file import File
+from ..types import StrPath
 
 # SECTION: EXPORTS ========================================================== #
 
@@ -244,14 +245,14 @@ class TableSpec(BaseModel):
 
 
 def load_table_specs(
-    path: str | Path,
+    path: StrPath,
 ) -> list[TableSpec]:
     """
     Load table specifications from a YAML file.
 
     Parameters
     ----------
-    path : str | Path
+    path : StrPath
         Path to the YAML file containing table specifications.
 
     Returns

etlplus-0.7.2/etlplus/database/types.py

@@ -0,0 +1,38 @@
+"""
+:mod:`etlplus.database.types` module.
+
+Shared type aliases leveraged across :mod:`etlplus.database` modules.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from typing import Literal
+
+from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.types import TypeEngine
+
+# SECTION: EXPORTS ========================================================== #
+
+
+__all__ = [
+    # Type Aliases
+    'ModelRegistry',
+    'TemplateKey',
+    'TypeFactory',
+]
+
+
+# SECTION: TYPE ALIASES ===================================================== #
+
+
+# pylint: disable=invalid-name
+
+# Registry mapping fully qualified table names to declarative classes.
+type ModelRegistry = dict[str, type[DeclarativeBase]]
+
+# Allowed template keys for bundled DDL rendering.
+type TemplateKey = Literal['ddl', 'view']
+
+# Callable producing a SQLAlchemy TypeEngine from parsed parameters.
+type TypeFactory = Callable[[list[int]], TypeEngine]

{etlplus-0.7.0 → etlplus-0.7.2/etlplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: etlplus
-Version: 0.7.0
+Version: 0.7.2
 Summary: A Swiss Army knife for simple ETL operations
 Home-page: https://github.com/Dagitali/ETLPlus
 Author: ETLPlus Team

{etlplus-0.7.0 → etlplus-0.7.2}/etlplus.egg-info/SOURCES.txt

@@ -73,6 +73,7 @@ etlplus/database/ddl.py
 etlplus/database/engine.py
 etlplus/database/orm.py
 etlplus/database/schema.py
+etlplus/database/types.py
 etlplus/templates/__init__.py
 etlplus/templates/ddl.sql.j2
 etlplus/templates/view.sql.j2

{etlplus-0.7.0 → etlplus-0.7.2}/tests/unit/database/test_u_database_engine.py

@@ -7,6 +7,7 @@ Unit tests for :mod:`etlplus.database.engine`.
 from __future__ import annotations
 
 import importlib
+from collections.abc import Callable
 from typing import Any
 from typing import cast
 
@@ -26,11 +27,45 @@ engine_mod = importlib.import_module('etlplus.database.engine')
 
 
 class TestLoadDatabaseUrlFromConfig:
-    """Unit tests for :func:`load_database_url_from_config`."""
+    """
+    Unit test suite for :func:`load_database_url_from_config`.
 
-    def test_loads_default_and_named_entries(
+    Notes
+    -----
+    Patches :class:`etlplus.file.File` to avoid disk IO and uses helper
+    fixtures to keep tests DRY.
+    """
+
+    @pytest.fixture()
+    def patch_read_file(
         self,
         monkeypatch: pytest.MonkeyPatch,
+    ) -> Callable[[Any], None]:
+        """Return a helper that patches ``File.read_file`` with a payload.
+
+        Parameters
+        ----------
+        monkeypatch : pytest.MonkeyPatch
+            Pytest monkeypatch fixture for applying patches.
+
+        Returns
+        -------
+        Callable[[Any], None]
+            Function that patches ``File.read_file`` to return the payload.
+        """
+
+        def _apply(payload: Any) -> None:
+            monkeypatch.setattr(
+                engine_mod.File,
+                'read_file',
+                staticmethod(lambda path: payload),
+            )
+
+        return _apply
+
+    def test_loads_default_and_named_entries(
+        self,
+        patch_read_file: Callable[[Any], None],
     ) -> None:
         """
         Test extracting URLs from default and named entries including nested
@@ -47,11 +82,7 @@ class TestLoadDatabaseUrlFromConfig:
             },
         }
 
-        monkeypatch.setattr(
-            engine_mod.File,
-            'read_file',
-            staticmethod(lambda path: config),
-        )
+        patch_read_file(config)
 
         assert (
             load_database_url_from_config('cfg.yml') == 'sqlite:///default.db'
@@ -74,32 +105,37 @@ class TestLoadDatabaseUrlFromConfig:
     )
     def test_invalid_configs_raise(
         self,
-        monkeypatch: pytest.MonkeyPatch,
+        patch_read_file: Callable[[Any], None],
         payload: Any,
         expected_exc: type[Exception],
     ) -> None:
         """Test that invalid structures surface helpful errors."""
-
-        monkeypatch.setattr(
-            engine_mod.File,
-            'read_file',
-            staticmethod(lambda path: payload),
-        )
+        patch_read_file(payload)
 
         with pytest.raises(expected_exc):
             load_database_url_from_config('bad.yml')
 
 
 class TestMakeEngine:
-    """Unit tests for :func:`make_engine` and module defaults."""
+    """Unit test suite for :func:`make_engine` and module defaults."""
 
-    def test_make_engine_uses_explicit_url(
+    @pytest.fixture()
+    def capture_create_engine(
         self,
         monkeypatch: pytest.MonkeyPatch,
-    ) -> None:
+    ) -> Callable[..., dict[str, Any]]:
         """
-        Test that explicit URL is forwarded to create_engine with pre-ping
-        enabled.
+        Patch ``create_engine`` to capture calls.
+
+        Parameters
+        ----------
+        monkeypatch : pytest.MonkeyPatch
+            Pytest monkeypatch fixture for applying patches.
+
+        Returns
+        -------
+        Callable[..., dict[str, Any]]
+            Fake ``create_engine`` that records arguments.
         """
         captured: list[tuple[str, dict[str, Any]]] = []
 
@@ -109,10 +145,25 @@ class TestMakeEngine:
 
         monkeypatch.setattr(engine_mod, 'create_engine', _fake_create_engine)
 
+        def _factory(url: str, **kwargs: Any) -> dict[str, Any]:
+            return _fake_create_engine(url, **kwargs)
+
+        _factory.captured = captured  # type: ignore[attr-defined]
+        return _factory
+
+    def test_make_engine_uses_explicit_url(
+        self,
+        capture_create_engine: Callable[[str, Any], dict[str, Any]],
+    ) -> None:
+        """
+        Test that explicit URL is forwarded to create_engine with pre-ping
+        enabled.
+        """
         eng = engine_mod.make_engine('sqlite:///explicit.db', echo=True)
         eng_dict = cast(dict[str, Any], eng)
 
         assert eng_dict['url'] == 'sqlite:///explicit.db'
+        captured = capture_create_engine.captured  # type: ignore[attr-defined]
         assert captured[0][1]['pool_pre_ping'] is True
         assert captured[0][1]['echo'] is True
 

{etlplus-0.7.0 → etlplus-0.7.2}/tests/unit/database/test_u_database_schema.py

@@ -24,6 +24,8 @@ from etlplus.database.schema import TableSpec
 
 pytestmark = pytest.mark.unit
 
+PayloadFactory = Callable[[dict[str, object]], object]
+
 
 # SECTION: FIXTURES ========================================================= #
 
@@ -69,19 +71,54 @@ def sample_spec_fixture() -> dict[str, object]:
 
 
 class TestLoadTableSpecs:
-    """Unit test suite for :func:`etlplus.database.schema.load_table_specs`."""
+    """
+    Unit test suite for :func:`etlplus.database.schema.load_table_specs`.
 
-    def test_empty_payload(
+    Notes
+    -----
+    Reuses a helper fixture to patch ``File.read_file`` and avoid disk IO.
+    """
+
+    @pytest.fixture()
+    def patch_read_file(
         self,
         monkeypatch: pytest.MonkeyPatch,
+    ) -> Callable[[Any], None]:
+        """Return helper that patches ``File.read_file`` to return payload.
+
+        Parameters
+        ----------
+        monkeypatch : pytest.MonkeyPatch
+            Pytest monkeypatch fixture.
+
+        Returns
+        -------
+        Callable[[Any], None]
+            Function that applies the patch when invoked with a payload.
+        """
+
+        def _apply(payload: Any) -> None:
+            if callable(payload):
+                monkeypatch.setattr(
+                    schema_mod.File,
+                    'read_file',
+                    staticmethod(payload),
+                )
+            else:
+                monkeypatch.setattr(
+                    schema_mod.File,
+                    'read_file',
+                    staticmethod(lambda path: payload),
+                )
+
+        return _apply
+
+    def test_empty_payload(
+        self,
+        patch_read_file: Callable[[Any], None],
     ) -> None:
         """Test that an empty list is returned when the file is empty."""
-        monkeypatch.setattr(
-            schema_mod.File,
-            'read_file',
-            staticmethod(lambda path: None),
-        )
-
+        patch_read_file(None)
         assert schema_mod.load_table_specs('missing.yml') == []
 
     @pytest.mark.parametrize(
@@ -101,13 +138,10 @@ class TestLoadTableSpecs:
     )
     def test_shapes(
         self,
-        monkeypatch: pytest.MonkeyPatch,
-        payload_factory: Callable[..., dict[str, list]]
-        | Callable[..., list]
-        | Callable[..., Any]
-        | Callable[..., dict],
+        payload_factory: PayloadFactory,
         expected_names: list[str],
         sample_spec: dict[str, object],
+        patch_read_file: Callable[[Any], None],
     ) -> None:
         """
         Test that supported input shapes coerce to :class:`TableSpec` list.
@@ -118,11 +152,7 @@ class TestLoadTableSpecs:
             captured_paths.append(path)
             return payload_factory(deepcopy(sample_spec))
 
-        monkeypatch.setattr(
-            schema_mod.File,
-            'read_file',
-            staticmethod(_fake_read_file),
-        )
+        patch_read_file(_fake_read_file)  # type: ignore[arg-type]
 
         specs = schema_mod.load_table_specs('input.yml')