base-api-utils 1.1.111.dev10__tar.gz → 1.1.113__tar.gz

{base_api_utils-1.1.111.dev10/src/base_api_utils.egg-info → base_api_utils-1.1.113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.111.dev10
+Version: 1.1.113
 Summary: Django Rest Framework micro services common utilities
 Author-email: Román Gutierrez <roman@tipit.net>, Sebastian Marcet <sebastian@tipit.net>
 Project-URL: Homepage, https://github.com/fntechgit/base-api-utils

{base_api_utils-1.1.111.dev10 → base_api_utils-1.1.113}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "base-api-utils"
-version = "1.1.111.dev10"
+version = "1.1.113"
 dependencies = [
     "boto3",
     "celery",

{base_api_utils-1.1.111.dev10 → base_api_utils-1.1.113}/src/base_api_utils/utils/circuit_breaker.py

@@ -1,5 +1,6 @@
 import pybreaker
 import requests
+from rest_framework.exceptions import NotFound, ValidationError
 
 from .external_errors import NamedCircuitBreakerError
 
@@ -18,10 +19,15 @@ class NamedCircuitBreaker(pybreaker.CircuitBreaker):
             if isinstance(exception, requests.exceptions.HTTPError):
                 status_code = exception.response.status_code
                 return 400 <= status_code < 500
+            # invoke_with_retry converts HTTP 404 → DRF NotFound and HTTP 412 → DRF
+            # ValidationError before the exception reaches the breaker. These are still
+            # 4xx business errors and must not count as circuit breaker failures.
+            if isinstance(exception, (NotFound, ValidationError)):
+                return True
             return False
 
-        # Get existing exclude or create new one
-        exclude = kwargs.get('exclude', []) or []
+        # Pop existing exclude from kwargs to avoid passing it twice to super()
+        exclude = kwargs.pop('exclude', []) or []
         if not isinstance(exclude, list):
             exclude = list(exclude)
 

base_api_utils-1.1.113/src/base_api_utils/utils/oauth2_custom_schema_base.py

@@ -0,0 +1,34 @@
+from drf_spectacular.extensions import OpenApiAuthenticationExtension
+from oauthlib.openid.connect.core.grant_types import refresh_token
+
+from .config import config
+
+class OAuth2CustomSchemaBase(OpenApiAuthenticationExtension):
+    name = config('OPEN_API_SECURITY_SCHEMA_NAME')
+
+    def get_security_definition(self, auto_schema):
+        unique_scopes = set()
+
+        endpoints = config("OAUTH2.CLIENT.ENDPOINTS")
+
+        for endpoint, methods in endpoints.items():
+            for method, details in methods.items():
+                scopes = details.get("scopes")
+                if scopes:
+                    unique_scopes.update(scopes.split())
+
+        base_url = config("OAUTH2.IDP.BASE_URL").rstrip("/")
+        token_endpoint = config("OAUTH2.IDP.TOKEN_ENDPOINT").lstrip("/")
+        refresh_token_endpoint = config("OAUTH2.IDP.REFRESH_TOKEN_ENDPOINT").lstrip("/")
+
+        return {
+            "type": "oauth2",
+            "flows": {
+                'clientCredentials': {
+                    "tokenUrl": f"{base_url}/{token_endpoint}",
+                    'refreshUrl':  f"{base_url}/{refresh_token_endpoint}",
+                    "scopes": {scope: "" for scope in sorted(unique_scopes)},
+                },
+            },
+            "description": "OAuth2 client credentials authentication.",
+        }

{base_api_utils-1.1.111.dev10 → base_api_utils-1.1.113/src/base_api_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: base-api-utils
-Version: 1.1.111.dev10
+Version: 1.1.113
 Summary: Django Rest Framework micro services common utilities
 Author-email: Román Gutierrez <roman@tipit.net>, Sebastian Marcet <sebastian@tipit.net>
 Project-URL: Homepage, https://github.com/fntechgit/base-api-utils

{base_api_utils-1.1.111.dev10 → base_api_utils-1.1.113}/tests/test_circuit_breaker.py

@@ -7,6 +7,7 @@ import time
 import pybreaker
 import pytest
 import requests
+from rest_framework.exceptions import NotFound, ValidationError
 
 
 def _load_module(name, file_path):
@@ -148,6 +149,52 @@ class TestNamedCircuitBreaker:
         # Breaker should still be closed
         assert breaker.current_state == "closed"
 
+    def test_drf_not_found_does_not_trip_breaker(self):
+        """DRF NotFound (converted from HTTP 404 by invoke_with_retry) must not trip the breaker."""
+        breaker = self._make_breaker(fail_max=2)
+
+        def raise_not_found():
+            raise NotFound("Resource not found")
+
+        for _ in range(5):
+            with pytest.raises(NotFound):
+                breaker.call(raise_not_found)
+
+        assert breaker.current_state == "closed"
+
+    def test_drf_validation_error_does_not_trip_breaker(self):
+        """DRF ValidationError (converted from HTTP 412 by invoke_with_retry) must not trip the breaker."""
+        breaker = self._make_breaker(fail_max=2)
+
+        def raise_validation_error():
+            raise ValidationError("Precondition failed")
+
+        for _ in range(5):
+            with pytest.raises(ValidationError):
+                breaker.call(raise_validation_error)
+
+        assert breaker.current_state == "closed"
+
+    def test_exclude_kwarg_not_passed_twice(self):
+        """Passing exclude= to NamedCircuitBreaker should not cause TypeError."""
+        custom_exclude = [lambda e: isinstance(e, ValueError)]
+        breaker = NamedCircuitBreaker(
+            name="test_service",
+            fail_max=2,
+            reset_timeout=1,
+            exclude=custom_exclude,
+        )
+
+        # Custom exclusion should work alongside built-in 4xx exclusion
+        def raise_value_error():
+            raise ValueError("excluded")
+
+        for _ in range(5):
+            with pytest.raises(ValueError):
+                breaker.call(raise_value_error)
+
+        assert breaker.current_state == "closed"
+
 
 @pytest.mark.unit
 class TestCallWithBreaker:

base_api_utils-1.1.111.dev10/src/base_api_utils/utils/oauth2_custom_schema_base.py

@@ -1,30 +0,0 @@
-from drf_spectacular.extensions import OpenApiAuthenticationExtension
-
-from .config import config
-
-class OAuth2CustomSchemaBase(OpenApiAuthenticationExtension):
-    name = config('OPEN_API_SECURITY_SCHEMA_NAME')
-
-    def get_security_definition(self, auto_schema):
-        unique_scopes = set()
-
-        endpoints = config('OAUTH2.CLIENT.ENDPOINTS')
-
-        for endpoint, methods in endpoints.items():
-            for method, details in methods.items():
-                if 'scopes' in details and details['scopes']:
-                    scopes_list = details['scopes'].split()
-                    unique_scopes.update(scopes_list)
-
-        return {
-            'type': 'oauth2',
-            'flows': {
-                'implicit': {
-                    'authorizationUrl': f'{config('OAUTH2.IDP.BASE_URL')}/{config('OAUTH2.IDP.AUTHORIZATION_ENDPOINT')}',
-                    'tokenUrl': f'{config('OAUTH2.IDP.BASE_URL')}/{config('OAUTH2.IDP.TOKEN_ENDPOINT')}',
-                    'refreshUrl': f'{config('OAUTH2.IDP.BASE_URL')}/{config('OAUTH2.IDP.REFRESH_TOKEN_ENDPOINT')}',
-                    'scopes': {scope: '' for scope in unique_scopes}
-                },
-            },
-            'description': 'OAuth2 authentication.'
-        }