etlplus 0.11.1__tar.gz → 0.11.3__tar.gz

{etlplus-0.11.1/etlplus.egg-info → etlplus-0.11.3}/PKG-INFO

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

{etlplus-0.11.1 → etlplus-0.11.3}/etlplus/enums.py

@@ -26,9 +26,6 @@ __all__ = [
     'HttpMethod',
     'OperatorName',
     'PipelineStep',
-    # Functions
-    'coerce_data_connector_type',
-    'coerce_http_method',
 ]
 
 
@@ -341,30 +338,3 @@ _PIPELINE_ORDER_INDEX: dict[PipelineStep, int] = {
     PipelineStep.SORT: 3,
     PipelineStep.AGGREGATE: 4,
 }
-
-
-# SECTION: FUNCTIONS ======================================================== #
-
-
-def coerce_data_connector_type(
-    connector: DataConnectorType | str,
-) -> DataConnectorType:
-    """
-    Normalize textual data connector values to :class:`DataConnectorType`.
-
-    This thin wrapper is kept for backward compatibility; prefer
-    :meth:`DataConnectorType.coerce` going forward.
-    """
-    return DataConnectorType.coerce(connector)
-
-
-def coerce_http_method(
-    http_method: HttpMethod | str,
-) -> HttpMethod:
-    """
-    Normalize textual HTTP method values to :class:`HttpMethod`.
-
-    This thin wrapper is kept for backward compatibility; prefer
-    :meth:`HttpMethod.coerce` going forward.
-    """
-    return HttpMethod.coerce(http_method)

{etlplus-0.11.1 → etlplus-0.11.3}/etlplus/extract.py

@@ -14,10 +14,8 @@ import requests  # type: ignore[import]
 
 from .enums import DataConnectorType
 from .enums import HttpMethod
-from .enums import coerce_data_connector_type
 from .file import File
 from .file import FileFormat
-from .file import coerce_file_format
 from .types import JSONData
 from .types import JSONDict
 from .types import JSONList
@@ -55,7 +53,7 @@ def extract_from_file(
     # If no explicit format is provided, let File infer from extension.
     if file_format is None:
         return File(path, None).read()
-    fmt = coerce_file_format(file_format)
+    fmt = FileFormat.coerce(file_format)
 
     # Let file module perform existence and format validation.
     return File(path, fmt).read()
@@ -202,7 +200,7 @@ def extract(
     ValueError
         If `source_type` is not one of the supported values.
     """
-    match coerce_data_connector_type(source_type):
+    match DataConnectorType.coerce(source_type):
         case DataConnectorType.FILE:
             # Prefer explicit format if provided, else infer from filename.
             return extract_from_file(source, file_format)
@@ -213,6 +211,6 @@ def extract(
             # ``file_format`` is ignored for APIs.
             return extract_from_api(str(source), **kwargs)
         case _:
-            # ``coerce_data_connector_type`` covers invalid entries, but keep
-            # explicit guard for defensive programming.
+            # :meth:`coerce` already raises for invalid connector types, but
+            # keep explicit guard for defensive programming.
             raise ValueError(f'Invalid source type: {source_type}')

{etlplus-0.11.1 → etlplus-0.11.3}/etlplus/file/__init__.py

@@ -9,7 +9,6 @@ from __future__ import annotations
 from .core import File
 from .enums import CompressionFormat
 from .enums import FileFormat
-from .enums import coerce_file_format
 from .enums import infer_file_format_and_compression
 
 # SECTION: EXPORTS ========================================================== #
@@ -22,6 +21,5 @@ __all__ = [
     'CompressionFormat',
     'FileFormat',
     # Functions
-    'coerce_file_format',
     'infer_file_format_and_compression',
 ]

{etlplus-0.11.1 → etlplus-0.11.3}/etlplus/file/enums.py

@@ -16,8 +16,6 @@ from ..types import StrStrMap
 __all__ = [
     'CompressionFormat',
     'FileFormat',
-    'coerce_compression_format',
-    'coerce_file_format',
     'infer_file_format_and_compression',
 ]
 
@@ -164,32 +162,6 @@ _COMPRESSION_FILE_FORMATS: set[FileFormat] = {
 # SECTION: FUNCTIONS ======================================================== #
 
 
-# TODO: Deprecate in favor of using the enum methods directly.
-def coerce_compression_format(
-    compression_format: CompressionFormat | str,
-) -> CompressionFormat:
-    """
-    Normalize textual compression format values to :class:`CompressionFormat`.
-
-    This thin wrapper is kept for backward compatibility; prefer
-    :meth:`CompressionFormat.coerce` going forward.
-    """
-    return CompressionFormat.coerce(compression_format)
-
-
-# TODO: Deprecate in favor of using the enum methods directly.
-def coerce_file_format(
-    file_format: FileFormat | str,
-) -> FileFormat:
-    """
-    Normalize textual file format values to :class:`FileFormat`.
-
-    This thin wrapper is kept for backward compatibility; prefer
-    :meth:`FileFormat.coerce` going forward.
-    """
-    return FileFormat.coerce(file_format)
-
-
 # TODO: Convert to a method on FileFormat or CompressionFormat?
 def infer_file_format_and_compression(
     value: object,

{etlplus-0.11.1 → etlplus-0.11.3}/etlplus/load.py

@@ -16,11 +16,8 @@ import requests  # type: ignore[import]
 
 from .enums import DataConnectorType
 from .enums import HttpMethod
-from .enums import coerce_data_connector_type
-from .enums import coerce_http_method
 from .file import File
 from .file import FileFormat
-from .file import coerce_file_format
 from .types import JSONData
 from .types import JSONDict
 from .types import JSONList
@@ -155,9 +152,9 @@ def load_to_file(
     if file_format is None:
         records = File(path).write(data)
         ext = path.suffix.lstrip('.').lower()
-        fmt = coerce_file_format(ext) if ext else FileFormat.JSON
+        fmt = FileFormat.coerce(ext) if ext else FileFormat.JSON
     else:
-        fmt = coerce_file_format(file_format)
+        fmt = FileFormat.coerce(file_format)
         records = File(path, fmt).write(data)
     if fmt is FileFormat.CSV and records == 0:
         message = 'No data to write'
@@ -242,7 +239,7 @@ def load_to_api(
     TypeError
         If the session object is not valid.
     """
-    http_method = coerce_http_method(method)
+    http_method = HttpMethod.coerce(method)
 
     # Apply a conservative timeout to guard against hanging requests.
     timeout = kwargs.pop('timeout', 10.0)
@@ -316,7 +313,7 @@ def load(
     """
     data = load_data(source)
 
-    match coerce_data_connector_type(target_type):
+    match DataConnectorType.coerce(target_type):
         case DataConnectorType.FILE:
             # Prefer explicit format if provided, else infer from filename.
             return load_to_file(data, target, file_format)
@@ -331,6 +328,6 @@ def load(
                 **kwargs,
             )
         case _:
-            # `coerce_data_connector_type` covers invalid entries, but keep
-            # explicit guard.
+            # :meth:`coerce` already raises for invalid connector types, but
+            # keep explicit guard for defensive programming.
             raise ValueError(f'Invalid target type: {target_type}')

{etlplus-0.11.1 → etlplus-0.11.3}/etlplus/run.py

@@ -23,7 +23,6 @@ from .api import RetryPolicy
 from .api import Url
 from .config import load_pipeline_config
 from .enums import DataConnectorType
-from .enums import coerce_data_connector_type
 from .extract import extract
 from .load import load
 from .run_helpers import compose_api_request_env
@@ -185,8 +184,7 @@ def run(
 
     data: Any
     stype_raw = getattr(source_obj, 'type', None)
-    stype = coerce_data_connector_type(stype_raw or '')
-    match stype:
+    match DataConnectorType.coerce(stype_raw or ''):
         case DataConnectorType.FILE:
             path = getattr(source_obj, 'path', None)
             fmt = ex_opts.get('format') or getattr(
@@ -261,8 +259,8 @@ def run(
                     sleep_seconds=cast(float, env.get('sleep_seconds', 0.0)),
                 )
         case _:
-            # ``coerce_data_connector_type`` already raises for invalid
-            # connector types; this branch is defensive only.
+            # :meth:`coerce` already raises for invalid connector types, but
+            # keep explicit guard for defensive programming.
             raise ValueError(f'Unsupported source type: {stype_raw}')
 
     # DRY: unified validation helper (pre/post transform)
@@ -318,8 +316,7 @@ def run(
     overrides = job_obj.load.overrides or {}
 
     ttype_raw = getattr(target_obj, 'type', None)
-    ttype = coerce_data_connector_type(ttype_raw or '')
-    match ttype:
+    match DataConnectorType.coerce(ttype_raw or ''):
         case DataConnectorType.FILE:
             path = overrides.get('path') or getattr(target_obj, 'path', None)
             fmt = overrides.get('format') or getattr(
@@ -357,8 +354,8 @@ def run(
             )
             result = load(data, 'database', str(conn))
         case _:
-            # ``coerce_data_connector_type`` already raises for invalid
-            # connector types; this branch is defensive only.
+            # :meth:`coerce` already raises for invalid connector types, but
+            # keep explicit guard for defensive programming.
             raise ValueError(f'Unsupported target type: {ttype_raw}')
 
     # Return the terminal load result directly; callers (e.g., CLI) can wrap

{etlplus-0.11.1 → etlplus-0.11.3/etlplus.egg-info}/PKG-INFO

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

{etlplus-0.11.1 → etlplus-0.11.3}/tests/unit/test_u_enums.py

@@ -13,10 +13,6 @@ from etlplus.enums import DataConnectorType
 from etlplus.enums import HttpMethod
 from etlplus.enums import OperatorName
 from etlplus.enums import PipelineStep
-from etlplus.enums import coerce_data_connector_type
-from etlplus.enums import coerce_http_method
-from etlplus.file import FileFormat
-from etlplus.file import coerce_file_format
 
 # SECTION: HELPERS ========================================================== #
 
@@ -43,7 +39,6 @@ class TestAggregateName:
         assert AggregateName.AVG.func(nums, len(nums)) == pytest.approx(2.0)
 
 
-@pytest.mark.unit
 class TestDataConnectorType:
     """Unit test suite for :class:`etlplus.enums.DataConnectorType`."""
 
@@ -62,41 +57,14 @@ class TestDataConnectorType:
         expected: DataConnectorType,
     ) -> None:
         """Test alias coercions."""
-        assert coerce_data_connector_type(value) is expected
+        assert DataConnectorType.coerce(value) is expected
 
     def test_invalid_value(self) -> None:
         """Test that invalid values raise ValueError."""
         with pytest.raises(ValueError, match='Invalid DataConnectorType'):
-            coerce_data_connector_type('queue')
-
-
-@pytest.mark.unit
-class TestFileFormat:
-    """Unit test suite for :class:`etlplus.enums.FileFormat`."""
-
-    @pytest.mark.parametrize(
-        'value,expected',
-        [
-            ('JSON', FileFormat.JSON),
-            ('application/xml', FileFormat.XML),
-            ('yml', FileFormat.YAML),
-        ],
-    )
-    def test_aliases(
-        self,
-        value: str,
-        expected: FileFormat,
-    ) -> None:
-        """Test alias coercions."""
-        assert coerce_file_format(value) is expected
-
-    def test_invalid_value(self) -> None:
-        """Test that invalid values raise ValueError."""
-        with pytest.raises(ValueError, match='Invalid FileFormat'):
-            coerce_file_format('ini')
+            DataConnectorType.coerce('queue')
 
 
-@pytest.mark.unit
 class TestHttpMethod:
     """Unit test suite for :class:`etlplus.enums.HttpMethod`."""
 
@@ -107,12 +75,11 @@ class TestHttpMethod:
         assert HttpMethod.PATCH.allows_body is True
         assert HttpMethod.GET.allows_body is False
 
-    def test_coerce_wrapper(self) -> None:
-        """Test the :func:`coerce_http_method` helper."""
-        assert coerce_http_method('delete') is HttpMethod.DELETE
+    def test_coerce(self) -> None:
+        """Test :meth:`coerce`."""
+        assert HttpMethod.coerce('delete') is HttpMethod.DELETE
 
 
-@pytest.mark.unit
 class TestOperatorName:
     """Unit test suite for :class:`etlplus.enums.OperatorName`."""
 
@@ -126,7 +93,6 @@ class TestOperatorName:
         assert OperatorName.CONTAINS.func('alphabet', 'bet') is True
 
 
-@pytest.mark.unit
 class TestPipelineStep:
     """Unit test suite for :class:`etlplus.enums.PipelineStep`."""
 

{etlplus-0.11.1 → etlplus-0.11.3}/tests/unit/test_u_file.py

@@ -73,41 +73,6 @@ def yaml_stub_fixture() -> Generator[_StubYaml]:
 # SECTION: TESTS ============================================================ #
 
 
-class TestInferFileFormatAndCompression:
-    """Unit test suite for :func:`infer_file_format_and_compression`."""
-
-    @pytest.mark.parametrize(
-        'value,filename,expected_format,expected_compression',
-        [
-            ('data.csv.gz', None, FileFormat.CSV, CompressionFormat.GZ),
-            ('data.jsonl.gz', None, FileFormat.NDJSON, CompressionFormat.GZ),
-            ('data.zip', None, None, CompressionFormat.ZIP),
-            ('application/json; charset=utf-8', None, FileFormat.JSON, None),
-            ('application/gzip', None, None, CompressionFormat.GZ),
-            (
-                'application/octet-stream',
-                'payload.csv.gz',
-                FileFormat.CSV,
-                CompressionFormat.GZ,
-            ),
-            ('application/octet-stream', None, None, None),
-            (FileFormat.GZ, None, None, CompressionFormat.GZ),
-            (CompressionFormat.ZIP, None, None, CompressionFormat.ZIP),
-        ],
-    )
-    def test_infers_format_and_compression(
-        self,
-        value: object,
-        filename: object | None,
-        expected_format: FileFormat | None,
-        expected_compression: CompressionFormat | None,
-    ) -> None:
-        """Test mixed inputs for format and compression inference."""
-        fmt, compression = infer_file_format_and_compression(value, filename)
-        assert fmt is expected_format
-        assert compression is expected_compression
-
-
 class TestFile:
     """
     Unit test suite for :class:`etlplus.file.File`.
@@ -340,6 +305,70 @@ class TestFile:
         assert '<records>' in text
 
 
+class TestFileFormat:
+    """Unit test suite for :class:`etlplus.enums.FileFormat`."""
+
+    @pytest.mark.parametrize(
+        'value,expected',
+        [
+            ('JSON', FileFormat.JSON),
+            ('application/xml', FileFormat.XML),
+            ('yml', FileFormat.YAML),
+        ],
+    )
+    def test_aliases(
+        self,
+        value: str,
+        expected: FileFormat,
+    ) -> None:
+        """Test alias coercions."""
+        assert FileFormat.coerce(value) is expected
+
+    def test_coerce(self) -> None:
+        """Test :meth:`coerce`."""
+        assert FileFormat.coerce('csv') is FileFormat.CSV
+
+    def test_invalid_value(self) -> None:
+        """Test that invalid values raise ValueError."""
+        with pytest.raises(ValueError, match='Invalid FileFormat'):
+            FileFormat.coerce('ini')
+
+
+class TestInferFileFormatAndCompression:
+    """Unit test suite for :func:`infer_file_format_and_compression`."""
+
+    @pytest.mark.parametrize(
+        'value,filename,expected_format,expected_compression',
+        [
+            ('data.csv.gz', None, FileFormat.CSV, CompressionFormat.GZ),
+            ('data.jsonl.gz', None, FileFormat.NDJSON, CompressionFormat.GZ),
+            ('data.zip', None, None, CompressionFormat.ZIP),
+            ('application/json; charset=utf-8', None, FileFormat.JSON, None),
+            ('application/gzip', None, None, CompressionFormat.GZ),
+            (
+                'application/octet-stream',
+                'payload.csv.gz',
+                FileFormat.CSV,
+                CompressionFormat.GZ,
+            ),
+            ('application/octet-stream', None, None, None),
+            (FileFormat.GZ, None, None, CompressionFormat.GZ),
+            (CompressionFormat.ZIP, None, None, CompressionFormat.ZIP),
+        ],
+    )
+    def test_infers_format_and_compression(
+        self,
+        value: object,
+        filename: object | None,
+        expected_format: FileFormat | None,
+        expected_compression: CompressionFormat | None,
+    ) -> None:
+        """Test mixed inputs for format and compression inference."""
+        fmt, compression = infer_file_format_and_compression(value, filename)
+        assert fmt is expected_format
+        assert compression is expected_compression
+
+
 @pytest.mark.unit
 class TestYamlSupport:
     """Unit tests exercising YAML read/write helpers without PyYAML."""