style: fix issues reported by ruff check

Signed-off-by: Kiki L Hakiem <[email protected]>

Author: kikihakiem

providers/openfeature-provider-unleash/src/openfeature/contrib/provider/unleash/__init__.py

@@ -1,7 +1,9 @@
-from typing import Any, Callable, List, Mapping, Optional, Sequence, Union
+from collections.abc import Mapping, Sequence
+from typing import Any, Callable, Optional, Union
 
 from UnleashClient import UnleashClient
 from UnleashClient.events import BaseEvent, UnleashReadyEvent
+
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.event import ProviderEvent
 from openfeature.exception import ErrorCode, GeneralError
@@ -39,7 +41,7 @@ def __init__(
         self.client: Optional[UnleashClient] = None
         self._status = ProviderStatus.NOT_READY
         self._last_context: Optional[EvaluationContext] = None
-        self._event_handlers: dict[ProviderEvent, List[Callable]] = {
+        self._event_handlers: dict[ProviderEvent, list[Callable]] = {
             ProviderEvent.PROVIDER_READY: [],
             ProviderEvent.PROVIDER_ERROR: [],
             ProviderEvent.PROVIDER_CONFIGURATION_CHANGED: [],
@@ -85,7 +87,7 @@ def get_metadata(self) -> Metadata:
         """Get provider metadata."""
         return Metadata(name="Unleash Provider")
 
-    def get_provider_hooks(self) -> List[Hook]:
+    def get_provider_hooks(self) -> list[Hook]:
         """Get provider hooks."""
         return []
 

providers/openfeature-provider-unleash/src/openfeature/contrib/provider/unleash/events.py

@@ -1,8 +1,10 @@
 """Events functionality for Unleash provider."""
 
-from typing import Any, Callable, List, Protocol
+from contextlib import suppress
+from typing import Any, Callable, Protocol
 
 from UnleashClient.events import BaseEvent, UnleashFetchedEvent, UnleashReadyEvent
+
 from openfeature.event import ProviderEvent
 from openfeature.provider import Metadata
 
@@ -11,7 +13,7 @@ class UnleashProvider(Protocol):
     """Protocol defining the interface expected from UnleashProvider for events."""
 
     @property
-    def _event_handlers(self) -> dict[ProviderEvent, List[Callable]]:
+    def _event_handlers(self) -> dict[ProviderEvent, list[Callable]]:
         """Event handlers dictionary."""
         ...
 
@@ -67,11 +69,8 @@ def emit_event(self, event_type: ProviderEvent, **kwargs: Any) -> None:
                 **kwargs,
             }
             for handler in self._provider._event_handlers[event_type]:
-                try:
+                with suppress(Exception):
                     handler(event_details)
-                except Exception:
-                    # Ignore handler errors to prevent breaking other handlers
-                    pass
 
     def handle_unleash_event(self, event: BaseEvent) -> None:
         """Handle UnleashClient events and translate them to OpenFeature events.

providers/openfeature-provider-unleash/src/openfeature/contrib/provider/unleash/flag_evaluation.py

@@ -1,8 +1,11 @@
 """Flag evaluation functionality for Unleash provider."""
 
+import json
 from typing import Any, Callable, Optional, Protocol
 
+import requests
 from UnleashClient import UnleashClient
+
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.exception import (
     FlagNotFoundError,
@@ -11,7 +14,6 @@
     TypeMismatchError,
 )
 from openfeature.flag_evaluation import FlagResolutionDetails, Reason
-import requests
 
 
 class UnleashProvider(Protocol):
@@ -76,13 +78,12 @@ def resolve_boolean_details(
             )
         except requests.exceptions.HTTPError as e:
             if e.response and e.response.status_code == 404:
-                raise FlagNotFoundError(f"Flag not found: {flag_key}")
-            raise GeneralError(f"HTTP error: {e}")
+                raise FlagNotFoundError(f"Flag not found: {flag_key}") from e
+            raise GeneralError(f"HTTP error: {e}") from e
         except (FlagNotFoundError, TypeMismatchError, ParseError, GeneralError):
-            # Re-raise specific OpenFeature exceptions
             raise
         except Exception as e:
-            raise GeneralError(f"Unexpected error: {e}")
+            raise GeneralError(f"Unexpected error: {e}") from e
 
     def resolve_string_details(
         self,
@@ -186,11 +187,9 @@ def _resolve_variant_flag(
             raise GeneralError("Provider not initialized. Call initialize() first.")
 
         try:
-            # Use get_variant to get the variant payload
             context = self._provider._build_unleash_context(evaluation_context)
             variant = self._provider.client.get_variant(flag_key, context=context)
 
-            # Check if the feature is enabled and has a payload
             if variant.get("enabled", False) and "payload" in variant:
                 try:
                     payload_value = variant["payload"].get("value", default_value)
@@ -209,10 +208,8 @@ def _resolve_variant_flag(
                         },
                     )
                 except (ValueError, TypeError) as e:
-                    # If payload value can't be converted, raise TypeMismatchError
-                    raise TypeMismatchError(str(e))
+                    raise TypeMismatchError(str(e)) from e
                 except ParseError:
-                    # Re-raise ParseError directly
                     raise
             else:
                 return FlagResolutionDetails(
@@ -229,13 +226,12 @@ def _resolve_variant_flag(
                 )
         except requests.exceptions.HTTPError as e:
             if e.response and e.response.status_code == 404:
-                raise FlagNotFoundError(f"Flag not found: {flag_key}")
-            raise GeneralError(f"HTTP error: {e}")
+                raise FlagNotFoundError(f"Flag not found: {flag_key}") from e
+            raise GeneralError(f"HTTP error: {e}") from e
         except (FlagNotFoundError, TypeMismatchError, ParseError, GeneralError):
-            # Re-raise specific OpenFeature exceptions
             raise
         except Exception as e:
-            raise GeneralError(f"Unexpected error: {e}")
+            raise GeneralError(f"Unexpected error: {e}") from e
 
     def _parse_json(self, value: Any) -> Any:
         """Parse JSON value for object flags.
@@ -249,11 +245,9 @@ def _parse_json(self, value: Any) -> Any:
         Raises:
             ParseError: If JSON parsing fails
         """
-        import json
-
         if isinstance(value, str):
             try:
                 return json.loads(value)
             except json.JSONDecodeError as e:
-                raise ParseError(f"Invalid JSON: {e}")
+                raise ParseError(f"Invalid JSON: {e}") from e
         return value

providers/openfeature-provider-unleash/src/openfeature/contrib/provider/unleash/tracking.py

@@ -1,10 +1,11 @@
 """Tracking functionality for Unleash provider."""
 
-from typing import Any, Optional, Protocol
 import uuid
+from typing import Any, Optional, Protocol
 
 from UnleashClient import UnleashClient
 from UnleashClient.events import UnleashEvent, UnleashEventType
+
 from openfeature.evaluation_context import EvaluationContext
 
 

providers/openfeature-provider-unleash/tests/test_events.py

@@ -1,18 +1,19 @@
 """Tests for events functionality."""
 
-from unittest.mock import Mock, patch
 import uuid
+from unittest.mock import Mock, patch
 
+import pytest
 from UnleashClient.events import (
     UnleashEventType,
     UnleashFetchedEvent,
     UnleashReadyEvent,
 )
+
 from openfeature.contrib.provider.unleash import UnleashProvider
 from openfeature.event import ProviderEvent
 from openfeature.exception import GeneralError
 from openfeature.provider import ProviderStatus
-import pytest
 
 
 def test_events():
@@ -71,8 +72,6 @@ def on_config_changed(event_details):
         provider.remove_handler(ProviderEvent.PROVIDER_READY, on_ready)
         provider.shutdown()  # Should not trigger ready event again
 
-        provider.shutdown()
-
 
 def test_unleash_event_callback():
     """Test that UnleashProvider handles UnleashClient events correctly."""

providers/openfeature-provider-unleash/tests/test_flag_evaluation.py

@@ -2,6 +2,9 @@
 
 from unittest.mock import Mock, patch
 
+import pytest
+import requests
+
 from openfeature.contrib.provider.unleash import UnleashProvider
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.exception import (
@@ -11,8 +14,6 @@
     TypeMismatchError,
 )
 from openfeature.flag_evaluation import Reason
-import pytest
-import requests
 
 
 def test_resolve_boolean_details():
@@ -128,7 +129,6 @@ def test_with_evaluation_context():
         flag = provider.resolve_boolean_details("test_flag", False, context)
         assert flag.value is True
 
-        # Verify that context was passed to UnleashClient
         mock_client.is_enabled.assert_called_with(
             "test_flag",
             context={"userId": "user123", "email": "[email protected]", "country": "US"},

providers/openfeature-provider-unleash/tests/test_integration.py

@@ -1,17 +1,18 @@
 """Integration tests for Unleash provider using testcontainers."""
 
-from datetime import datetime, timezone
 import time
+from datetime import datetime, timezone
 
-from openfeature import api
-from openfeature.contrib.provider.unleash import UnleashProvider
-from openfeature.evaluation_context import EvaluationContext
 import psycopg2
 import pytest
 import requests
 from testcontainers.core.container import DockerContainer
 from testcontainers.postgres import PostgresContainer
 
+from openfeature import api
+from openfeature.contrib.provider.unleash import UnleashProvider
+from openfeature.evaluation_context import EvaluationContext
+
 # Configuration for the running Unleash instance (will be set by fixtures)
 UNLEASH_URL = None
 API_TOKEN = "default:development.unleash-insecure-api-token"
@@ -288,7 +289,6 @@ def unleash_container(postgres_container):
 
         while time.time() - start_time < max_wait_time:
             try:
-                # Get the exposed port
                 try:
                     exposed_port = container.get_exposed_port(4242)
                     unleash_url = f"http://localhost:{exposed_port}"
@@ -298,7 +298,6 @@ def unleash_container(postgres_container):
                     time.sleep(2)
                     continue
 
-                # Try to connect to health endpoint
                 response = requests.get(f"{unleash_url}/health", timeout=5)
                 if response.status_code == 200:
                     print("Unleash container is healthy!")
@@ -341,14 +340,12 @@ def unleash_provider(setup_test_flags):
     )
     provider.initialize()
     yield provider
-    # Clean up the provider to avoid multiple UnleashClient instances
     provider.shutdown()
 
 
 @pytest.fixture(scope="session")
 def client(unleash_provider):
     """Create an OpenFeature client with the Unleash provider."""
-    # Set the provider globally
     api.set_provider(unleash_provider)
     return api.get_client()
 

providers/openfeature-provider-unleash/tests/test_tracking.py

@@ -22,13 +22,11 @@ def test_track_basic():
         )
         provider.initialize()
 
-        # Set the event callback
         provider._unleash_event_callback = mock_event_callback
 
         # Track a basic event
         provider.track("user_action")
 
-        # Verify the tracking event was created and passed to callback
         assert mock_event_callback.call_count == 1
         tracking_event = mock_event_callback.call_args[0][0]
         assert tracking_event.feature_name == "user_action"