etlplus 0.3.17__tar.gz → 0.3.19__tar.gz

{etlplus-0.3.17/etlplus.egg-info → etlplus-0.3.19}/PKG-INFO

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

{etlplus-0.3.17 → etlplus-0.3.19/etlplus.egg-info}/PKG-INFO

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

{etlplus-0.3.17 → etlplus-0.3.19}/etlplus.egg-info/SOURCES.txt

@@ -110,6 +110,7 @@ tests/unit/api/test_u_rate_limiter.py
 tests/unit/api/test_u_request_manager.py
 tests/unit/api/test_u_retry_manager.py
 tests/unit/api/test_u_transport.py
+tests/unit/api/test_u_types.py
 tests/unit/config/test_u_connector.py
 tests/unit/config/test_u_pipeline.py
 tests/unit/validation/test_u_validation_utils.py

{etlplus-0.3.17 → etlplus-0.3.19}/tests/integration/test_i_cli.py

@@ -21,8 +21,8 @@ from typing import TYPE_CHECKING
 import pytest
 
 if TYPE_CHECKING:  # pragma: no cover - typing helpers only
-    from tests._typing import CliInvoke
-    from tests._typing import JsonFactory
+    from tests.conftest import CliInvoke
+    from tests.conftest import JsonFactory
 
 
 # SECTION: HELPERS ========================================================== #

{etlplus-0.3.17 → etlplus-0.3.19}/tests/unit/api/test_u_endpoint_client.py

@@ -41,6 +41,12 @@ pytestmark = pytest.mark.unit
 
 EXAMPLE_BASE_URL = 'https://example.test'
 
+type CursorConfigFactory = Callable[..., CursorPaginationConfigMap]
+type StubRequestManager = Callable[
+    [Sequence[dict[str, Any]]],
+    list[dict[str, Any]],
+]
+
 # Optional Hypothesis import with safe stubs when missing.
 try:  # pragma: no try
     from hypothesis import given  # type: ignore[import-not-found]
@@ -110,6 +116,7 @@ def _page_responder(
     Callable[..., list[dict[str, Any]]]
         Handler compatible with ``patch_request_once``.
     """
+    # pylint: disable=unused-argument
 
     def _handler(
         self: EndpointClient,
@@ -155,6 +162,7 @@ def _stub_request_manager(
     ValueError
         If ``responses`` is empty.
     """
+    # pylint: disable=unused-argument
 
     if not responses:
         msg = 'responses must contain at least one payload'
@@ -375,12 +383,9 @@ class TestCursorPagination:
     )
     def test_page_size_normalizes(
         self,
-        cursor_cfg: Callable[..., CursorPaginationConfigMap],
+        cursor_cfg: CursorConfigFactory,
         client_factory: Callable[..., EndpointClient],
-        stub_request_manager: Callable[
-            [Sequence[dict[str, Any]]],
-            list[dict[str, Any]],
-        ],
+        stub_request_manager: StubRequestManager,
         raw_page_size: Any,
         expected_limit: int,
     ) -> None:
@@ -389,12 +394,11 @@ class TestCursorPagination:
 
         Parameters
         ----------
-        cursor_cfg : Callable[..., CursorPaginationConfigMap]
+        cursor_cfg : CursorConfigFactory
             Factory for cursor pagination config.
         client_factory : Callable[..., EndpointClient]
             Factory fixture used to construct :class:`EndpointClient`.
-        stub_request_manager : Callable[[Sequence[dict[str, Any]]],
-                                       list[dict[str, Any]]]
+        stub_request_manager : StubRequestManager
             Fixture that patches the underlying :class:`RequestManager`.
         raw_page_size : Any
             Raw page size input.
@@ -473,6 +477,7 @@ class TestRequestOptionIntegration:
         client_factory: Callable[..., EndpointClient],
     ) -> None:
         """Paginated iterations override RequestOptions params per call."""
+        # pylint: disable=unused-argument
 
         client = client_factory(base_url=EXAMPLE_BASE_URL, endpoints={})
         observed: list[RequestOptions] = []
@@ -512,24 +517,20 @@ class TestRequestOptionIntegration:
 
     def test_adds_limit_and_advances_cursor(
         self,
-        cursor_cfg: Callable[..., CursorPaginationConfigMap],
+        cursor_cfg: CursorConfigFactory,
         client_factory: Callable[..., EndpointClient],
-        stub_request_manager: Callable[
-            [Sequence[dict[str, Any]]],
-            list[dict[str, Any]],
-        ],
+        stub_request_manager: StubRequestManager,
     ) -> None:
         """
         Test that limit is added and cursor advances correctly.
 
         Parameters
         ----------
-        cursor_cfg : Callable[..., CursorPaginationConfigMap]
+        cursor_cfg : CursorConfigFactory
             Factory for cursor pagination config.
         client_factory : Callable[..., EndpointClient]
             Factory fixture used to construct :class:`EndpointClient`.
-        stub_request_manager : Callable[[Sequence[dict[str, Any]]],
-                                       list[dict[str, Any]]]
+        stub_request_manager : StubRequestManager
             Fixture that patches :class:`RequestManager` responses.
         """
         calls = stub_request_manager(
@@ -561,7 +562,7 @@ class TestRequestOptionIntegration:
         self,
         base_url: str,
         patch_request_once: Callable[[Callable[..., Any]], Callable[..., Any]],
-        cursor_cfg: Callable[..., CursorPaginationConfigMap],
+        cursor_cfg: CursorConfigFactory,
         client_factory: Callable[..., EndpointClient],
     ) -> None:
         """
@@ -577,7 +578,7 @@ class TestRequestOptionIntegration:
             Common base URL used across tests.
         patch_request_once : Callable[[Callable[..., Any]], Callable[..., Any]]
             Helper that patches the request helper for deterministic failures.
-        cursor_cfg : Callable[..., CursorPaginationConfigMap]
+        cursor_cfg : CursorConfigFactory
             Factory for cursor pagination config.
         client_factory : Callable[..., EndpointClient]
             Factory fixture used to construct :class:`EndpointClient`.
@@ -700,7 +701,7 @@ class TestRequestOptionIntegration:
 
     def test_retry_backoff_sleeps(
         self,
-        cursor_cfg: Callable[..., CursorPaginationConfigMap],
+        cursor_cfg: CursorConfigFactory,
         capture_sleeps: list[float],
         jitter: Callable[[list[float]], list[float]],
         patch_request_once: Callable[[Callable[..., Any]], Callable[..., Any]],
@@ -713,7 +714,7 @@ class TestRequestOptionIntegration:
 
         Parameters
         ----------
-        cursor_cfg : Callable[..., CursorPaginationConfigMap]
+        cursor_cfg : CursorConfigFactory
             Factory for cursor pagination config.
         capture_sleeps : list[float]
             List to capture sleep durations.

{etlplus-0.3.17 → etlplus-0.3.19}/tests/unit/api/test_u_request_manager.py

@@ -36,7 +36,7 @@ class DummySession:
 def test_request_manager_builds_adapter_session(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    """Ensure adapter configs yield a managed session that gets closed."""
+    """Test that adapter configs yield a managed session that gets closed."""
     captured: dict[str, Any] = {}
     dummy_session = DummySession()
 
@@ -82,7 +82,7 @@ def test_request_manager_builds_adapter_session(
 def test_request_manager_context_reuses_adapter_session(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    """Context manager should reuse one adapter-backed session."""
+    """Test that context manager reuses one adapter-backed session."""
     dummy_session = DummySession()
     builder_calls: list[Any] = []
     sessions_used: list[Any] = []
@@ -133,3 +133,69 @@ def test_request_manager_context_reuses_adapter_session(
     assert sessions_used == [dummy_session, dummy_session]
     assert timeouts == [manager.default_timeout, manager.default_timeout]
     assert extra_kwargs == [{}, {}]
+
+
+def test_request_manager_invalid_session_adapters(
+    monkeypatch,
+):
+    """Test that invalid session_adapters do not raise on context enter."""
+    # Should not raise if session_adapters is invalid
+    manager = RequestManager(
+        session_adapters=[{'prefix': 'https://', 'pool_connections': 'bad'}],
+    )
+
+    def fake_builder(cfg: Any) -> None:
+        raise ValueError('bad config')
+
+    monkeypatch.setattr(
+        'etlplus.api.request_manager.build_session_with_adapters',
+        fake_builder,
+    )
+
+    try:
+        with manager:
+            pass
+    except Exception:  # pylint: disable=broad-except
+        pytest.fail('RequestManager context should not raise on bad adapters')
+
+
+def test_request_manager_request_callable(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Test that request_callable is invoked and its result returned."""
+    manager = RequestManager()
+    called: dict[str, Any] = {}
+
+    def fake_request_once(
+        method: str,
+        url: str,
+        *,
+        session: Any,
+        timeout: Any,
+        request_callable: Any | None = None,
+        **kwargs: Any,
+    ) -> dict[str, Any]:
+        called['method'] = method
+        called['url'] = url
+        called['session'] = session
+        called['timeout'] = timeout
+        called['request_callable'] = request_callable
+        called['kwargs'] = kwargs
+        return {'ok': True}
+
+    monkeypatch.setattr(
+        type(manager),
+        'request_once',
+        staticmethod(fake_request_once),
+    )
+
+    result = manager.request(
+        'POST',
+        'http://test',
+        request_callable=lambda *a, **k: {'ok': 'cb'},
+    )
+
+    assert result == {'ok': True}
+    assert called['method'] == 'POST'
+    assert called['url'] == 'http://test'
+    assert callable(called['request_callable'])

{etlplus-0.3.17 → etlplus-0.3.19}/tests/unit/api/test_u_transport.py

@@ -20,6 +20,7 @@ import pytest
 import requests  # type: ignore[import]
 
 from etlplus.api.transport import build_http_adapter
+from etlplus.api.transport import build_session_with_adapters
 
 # SECTION: HELPERS ========================================================== #
 
@@ -67,6 +68,51 @@ class TestBuildHttpAdapter:
             total = getattr(mr, 'total', None)
             assert total in (0, 3)
 
+    def test_build_http_adapter_invalid_config(self):
+        """
+        Test that invalid config does not raise and returns a usable adapter.
+        """
+        cfg = {
+            'pool_connections': 'not-an-int',
+            'max_retries': {'total': 'bad'},
+        }
+        adapter = build_http_adapter(cfg)
+        assert isinstance(adapter, requests.adapters.HTTPAdapter)
+
+    def test_build_http_adapter_missing_keys(self):
+        """Test that missing keys are handled gracefully."""
+        cfg = {}
+        adapter = build_http_adapter(cfg)
+        assert isinstance(adapter, requests.adapters.HTTPAdapter)
+
+    def test_build_http_adapter_retry_dict_edge(self):
+        """Test retry dict with unknown keys is ignored."""
+        cfg = {
+            'max_retries': {'total': 2, 'unknown_key': 123},
+        }
+        adapter = build_http_adapter(cfg)
+        mr = adapter.max_retries
+        if isinstance(mr, int):
+            assert mr in (0, 2)
+        else:
+            assert getattr(mr, 'total', None) in (0, 2)
+
+    def test_build_session_with_adapters_invalid(self):
+        """
+        Test that invalid adapter configs are skipped but session is usable.
+        """
+        adapters_cfg = [
+            {'prefix': 'https://', 'pool_connections': 'bad'},
+            {'prefix': 'http://', 'max_retries': {'total': 'bad'}},
+        ]
+        session = requests.Session()
+        # Should not raise
+        try:
+            session = build_session_with_adapters(adapters_cfg)
+        except Exception:
+            pytest.fail('build_session_with_adapters should not raise')
+        assert isinstance(session, requests.Session)
+
     def test_integer_retries_fallback(self) -> None:
         """Test handling integer max_retries fallback."""
         cfg = {

etlplus-0.3.19/tests/unit/api/test_u_types.py

@@ -0,0 +1,136 @@
+"""
+:mod:`tests.unit.api.test_u_types` module.
+
+Unit tests for custom type aliases and data structures in
+:mod:`etlplus.api.types`.
+"""
+
+import pytest
+
+from etlplus.api.types import FetchPageCallable
+from etlplus.api.types import Headers
+from etlplus.api.types import Params
+from etlplus.api.types import RequestOptions
+from etlplus.api.types import Url
+
+# SECTION: HELPERS ========================================================== #
+
+
+pytestmark = pytest.mark.unit
+
+
+# SECTION: TESTS ============================================================ #
+
+
+def test_request_options_as_kwargs():
+    """Test that :meth:`RequestOptions.as_kwargs` produces correct dict."""
+    opts = RequestOptions(params={'a': 1}, headers={'X': 'y'}, timeout=5.0)
+    kw = opts.as_kwargs()
+    assert kw['params'] == {'a': 1}
+    assert kw['headers'] == {'X': 'y'}
+    assert kw['timeout'] == 5.0
+
+
+def test_request_options_as_kwargs_edge_cases():
+    """Test :meth:`RequestOptions.as_kwargs` with unset and ``None`` fields."""
+    opts = RequestOptions()
+    kw = opts.as_kwargs()
+    assert not kw
+
+    opts2 = RequestOptions(params={'x': 1})
+    kw2 = opts2.as_kwargs()
+    assert kw2['params'] == {'x': 1}
+    assert 'headers' not in kw2
+    assert 'timeout' not in kw2
+
+
+def test_request_options_defaults():
+    """Test that :class:`RequestOptions` defaults to None fields."""
+    opts = RequestOptions()
+    assert opts.params is None
+    assert opts.headers is None
+    assert opts.timeout is None
+
+
+def test_request_options_evolve():
+    """
+    Test that :meth:`RequestOptions.evolve` creates modified copies correctly.
+    """
+    opts = RequestOptions(params={'a': 1}, headers={'X': 'y'}, timeout=5.0)
+    evolved = opts.evolve(params={'b': 2}, headers=None, timeout=None)
+    assert evolved.params == {'b': 2}
+    assert evolved.headers is None
+    assert evolved.timeout is None
+
+
+def test_request_options_evolve_edge_cases():
+    """Test :meth:`RequestOptions.evolve` with unset and ``None`` fields."""
+    opts = RequestOptions(params={'a': 1}, headers={'X': 'y'}, timeout=5.0)
+
+    # Evolve with _UNSET (should preserve existing).
+    evolved = opts.evolve()
+    assert evolved.params == {'a': 1}
+    assert evolved.headers == {'X': 'y'}
+    assert evolved.timeout == 5.0
+
+    # Evolve with None (should clear).
+    evolved2 = opts.evolve(params=None, headers=None, timeout=None)
+    assert evolved2.params is None
+    assert evolved2.headers is None
+    assert evolved2.timeout is None
+
+
+def test_request_options_invalid_params_headers():
+    """
+    Test that :class:`RequestOptions` coerces mapping-like objects to dict.
+    """
+
+    # Should coerce mapping-like objects to dict.
+    class DummyMap(dict):
+        """Dummy mapping-like class for testing."""
+
+    opts = RequestOptions(params=DummyMap(a=1), headers=DummyMap(X='y'))
+    assert isinstance(opts.params, dict)
+    assert isinstance(opts.headers, dict)
+
+    # Should handle None gracefully.
+    opts2 = RequestOptions(params=None, headers=None)
+    assert opts2.params is None
+    assert opts2.headers is None
+
+
+def test_type_aliases():
+    """Test that type aliases are correct."""
+    # pylint: disable=unused-argument
+
+    # url: Url = 'https://api.example.com/data'
+    # headers: Headers = {'Authorization': 'token'}
+    # params: Params = {'q': 'search'}
+
+    def fetch(url: Url, opts: RequestOptions, page: int | None):
+        return {'data': [1, 2, 3]}
+
+    cb: FetchPageCallable = fetch
+    assert callable(cb)
+
+
+def test_type_aliases_edge_cases():
+    """Test type aliases with edge case values."""
+    # pylint: disable=unused-argument
+
+    # Url must be str.
+    url: Url = 'http://test/'
+    assert isinstance(url, str)
+    # Headers must be dict[str, str].
+    headers: Headers = {'A': 'B'}
+    assert isinstance(headers, dict)
+    # Params must be dict[str, Any].
+    params: Params = {'A': 1, 'B': [1, 2]}
+    assert isinstance(params, dict)
+
+    # FetchPageCallable must accept correct signature.
+    def fetch(url: Url, opts: RequestOptions, page: int | None):
+        return {'data': []}
+
+    cb: FetchPageCallable = fetch
+    assert callable(cb)

{etlplus-0.3.17 → etlplus-0.3.19}/tests/unit/test_u_file.py

@@ -56,10 +56,9 @@ class _StubYaml:
 
 
 @pytest.fixture
-def yaml_stub(
-    monkeypatch: pytest.MonkeyPatch,
-) -> Generator[_StubYaml]:
+def yaml_stub() -> Generator[_StubYaml]:
     """Install a stub PyYAML module for YAML tests."""
+    # pylint: disable=protected-access
 
     stub = _StubYaml()
     file_module._YAML_CACHE.clear()

{etlplus-0.3.17 → etlplus-0.3.19}/tests/unit/test_u_run.py

@@ -184,6 +184,7 @@ class TestRun:
         monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Test a file-to-file ETL pipeline execution."""
+        # pylint: disable=unused-argument
         job = _make_job(name='file_job', source='file_src', target='file_tgt')
         cfg = _base_config(
             job,

{etlplus-0.3.17 → etlplus-0.3.19}/tests/unit/test_u_validate.py

@@ -48,7 +48,8 @@ class TestValidateField:
     def test_enum_rule_requires_list(self) -> None:
         """Test non-list enum rules adding an error entry."""
 
-        result = validate_field('a', {'enum': 'abc'})
+        # Test expects the value for key ``enum`` to not be a list.
+        result = validate_field('a', {'enum': 'abc'})  # type: ignore
         assert result['valid'] is False
         assert any('enum' in err for err in result['errors'])