openfeature-provider-flagd 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

openfeature/contrib/provider/flagd/config.py

@@ -3,6 +3,8 @@ import os
 import typing
 from enum import Enum
 
+import grpc
+
 
 class ResolverType(Enum):
     RPC = "rpc"
@@ -45,9 +47,11 @@ ENV_VAR_RETRY_BACKOFF_MS = "FLAGD_RETRY_BACKOFF_MS"
 ENV_VAR_RETRY_BACKOFF_MAX_MS = "FLAGD_RETRY_BACKOFF_MAX_MS"
 ENV_VAR_RETRY_GRACE_PERIOD_SECONDS = "FLAGD_RETRY_GRACE_PERIOD"
 ENV_VAR_SELECTOR = "FLAGD_SOURCE_SELECTOR"
+ENV_VAR_PROVIDER_ID = "FLAGD_SOURCE_PROVIDER_ID"
 ENV_VAR_STREAM_DEADLINE_MS = "FLAGD_STREAM_DEADLINE_MS"
 ENV_VAR_TLS = "FLAGD_TLS"
 ENV_VAR_TLS_CERT = "FLAGD_SERVER_CERT_PATH"
+ENV_VAR_DEFAULT_AUTHORITY = "FLAGD_DEFAULT_AUTHORITY"
 
 T = typing.TypeVar("T")
 
@@ -81,6 +85,7 @@ class Config:
         port: typing.Optional[int] = None,
         tls: typing.Optional[bool] = None,
         selector: typing.Optional[str] = None,
+        provider_id: typing.Optional[str] = None,
         resolver: typing.Optional[ResolverType] = None,
         offline_flag_source_path: typing.Optional[str] = None,
         offline_poll_interval_ms: typing.Optional[int] = None,
@@ -93,6 +98,8 @@ class Config:
         cache: typing.Optional[CacheType] = None,
         max_cache_size: typing.Optional[int] = None,
         cert_path: typing.Optional[str] = None,
+        default_authority: typing.Optional[str] = None,
+        channel_credentials: typing.Optional[grpc.ChannelCredentials] = None,
     ):
         self.host = env_or_default(ENV_VAR_HOST, DEFAULT_HOST) if host is None else host
 
@@ -227,3 +234,17 @@ class Config:
         self.selector = (
             env_or_default(ENV_VAR_SELECTOR, None) if selector is None else selector
         )
+
+        self.provider_id = (
+            env_or_default(ENV_VAR_PROVIDER_ID, None)
+            if provider_id is None
+            else provider_id
+        )
+
+        self.default_authority = (
+            env_or_default(ENV_VAR_DEFAULT_AUTHORITY, None)
+            if default_authority is None
+            else default_authority
+        )
+
+        self.channel_credentials = channel_credentials

openfeature/contrib/provider/flagd/provider.py

@@ -24,13 +24,18 @@
 import typing
 import warnings
 
+import grpc
+
 from openfeature.evaluation_context import EvaluationContext
+from openfeature.event import ProviderEventDetails
 from openfeature.flag_evaluation import FlagResolutionDetails
+from openfeature.hook import Hook
 from openfeature.provider import AbstractProvider
 from openfeature.provider.metadata import Metadata
 
 from .config import CacheType, Config, ResolverType
 from .resolvers import AbstractResolver, GrpcResolver, InProcessResolver
+from .sync_metadata_hook import SyncMetadataHook
 
 T = typing.TypeVar("T")
 
@@ -47,6 +52,7 @@ class FlagdProvider(AbstractProvider):
         timeout: typing.Optional[int] = None,
         retry_backoff_ms: typing.Optional[int] = None,
         selector: typing.Optional[str] = None,
+        provider_id: typing.Optional[str] = None,
         resolver_type: typing.Optional[ResolverType] = None,
         offline_flag_source_path: typing.Optional[str] = None,
         stream_deadline_ms: typing.Optional[int] = None,
@@ -56,6 +62,8 @@ class FlagdProvider(AbstractProvider):
         retry_backoff_max_ms: typing.Optional[int] = None,
         retry_grace_period: typing.Optional[int] = None,
         cert_path: typing.Optional[str] = None,
+        default_authority: typing.Optional[str] = None,
+        channel_credentials: typing.Optional[grpc.ChannelCredentials] = None,
     ):
         """
         Create an instance of the FlagdProvider
@@ -88,6 +96,7 @@ class FlagdProvider(AbstractProvider):
             retry_backoff_max_ms=retry_backoff_max_ms,
             retry_grace_period=retry_grace_period,
             selector=selector,
+            provider_id=provider_id,
             resolver=resolver_type,
             offline_flag_source_path=offline_flag_source_path,
             stream_deadline_ms=stream_deadline_ms,
@@ -95,9 +104,19 @@ class FlagdProvider(AbstractProvider):
             cache=cache,
             max_cache_size=max_cache_size,
             cert_path=cert_path,
+            default_authority=default_authority,
+            channel_credentials=channel_credentials,
         )
+        self.enriched_context: dict = {}
 
         self.resolver = self.setup_resolver()
+        self.hooks: list[Hook] = [SyncMetadataHook(self.get_enriched_context)]
+
+    def get_enriched_context(self) -> EvaluationContext:
+        return EvaluationContext(attributes=self.enriched_context)
+
+    def get_provider_hooks(self) -> list[Hook]:
+        return self.hooks
 
     def setup_resolver(self) -> AbstractResolver:
         if self.config.resolver == ResolverType.RPC:
@@ -114,7 +133,7 @@ class FlagdProvider(AbstractProvider):
         ):
             return InProcessResolver(
                 self.config,
-                self.emit_provider_ready,
+                self.emit_provider_ready_with_context,
                 self.emit_provider_error,
                 self.emit_provider_stale,
                 self.emit_provider_configuration_changed,
@@ -184,3 +203,10 @@ class FlagdProvider(AbstractProvider):
         return self.resolver.resolve_object_details(
             key, default_value, evaluation_context
         )
+
+    def emit_provider_ready_with_context(
+        self, details: ProviderEventDetails, context: dict
+    ) -> None:
+        self.enriched_context = context
+        self.emit_provider_ready(details)
+        pass

openfeature/contrib/provider/flagd/resolvers/grpc.py

@@ -137,7 +137,10 @@ class GrpcResolver:
 
     def _state_change_callback(self, new_state: ChannelConnectivity) -> None:
         logger.debug(f"gRPC state change: {new_state}")
-        if new_state == ChannelConnectivity.READY:
+        if (
+            new_state == grpc.ChannelConnectivity.READY
+            or new_state == grpc.ChannelConnectivity.IDLE
+        ):
             if not self.thread or not self.thread.is_alive():
                 self.thread = threading.Thread(
                     target=self.listen,
@@ -276,7 +279,7 @@ class GrpcResolver:
             return cached_flag
 
         context = self._convert_context(evaluation_context)
-        call_args = {"timeout": self.deadline}
+        call_args = {"timeout": self.deadline, "wait_for_ready": True}
         try:
             request: Message
             if flag_type == FlagType.BOOLEAN:

openfeature/contrib/provider/flagd/resolvers/in_process.py

@@ -21,7 +21,7 @@ class InProcessResolver:
     def __init__(
         self,
         config: Config,
-        emit_provider_ready: typing.Callable[[ProviderEventDetails], None],
+        emit_provider_ready: typing.Callable[[ProviderEventDetails, dict], None],
         emit_provider_error: typing.Callable[[ProviderEventDetails], None],
         emit_provider_stale: typing.Callable[[ProviderEventDetails], None],
         emit_provider_configuration_changed: typing.Callable[

openfeature/contrib/provider/flagd/resolvers/process/connector/file_watcher.py

@@ -24,7 +24,7 @@ class FileWatcher(FlagStateConnector):
         self,
         config: Config,
         flag_store: FlagStore,
-        emit_provider_ready: typing.Callable[[ProviderEventDetails], None],
+        emit_provider_ready: typing.Callable[[ProviderEventDetails, dict], None],
         emit_provider_error: typing.Callable[[ProviderEventDetails], None],
     ):
         if config.offline_flag_source_path is None:
@@ -94,7 +94,8 @@ class FileWatcher(FlagStateConnector):
                 self.emit_provider_ready(
                     ProviderEventDetails(
                         message="Reloading file contents recovered from error state"
-                    )
+                    ),
+                    {},
                 )
                 self.should_emit_ready_on_success = False
 

openfeature/contrib/provider/flagd/resolvers/process/connector/grpc_watcher.py

@@ -5,6 +5,7 @@ import time
 import typing
 
 import grpc
+from google.protobuf.json_format import MessageToDict
 
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.event import ProviderEventDetails
@@ -26,7 +27,7 @@ class GrpcWatcher(FlagStateConnector):
         self,
         config: Config,
         flag_store: FlagStore,
-        emit_provider_ready: typing.Callable[[ProviderEventDetails], None],
+        emit_provider_ready: typing.Callable[[ProviderEventDetails, dict], None],
         emit_provider_error: typing.Callable[[ProviderEventDetails], None],
         emit_provider_stale: typing.Callable[[ProviderEventDetails], None],
     ):
@@ -41,6 +42,7 @@ class GrpcWatcher(FlagStateConnector):
         self.streamline_deadline_seconds = config.stream_deadline_ms * 0.001
         self.deadline = config.deadline_ms * 0.001
         self.selector = config.selector
+        self.provider_id = config.provider_id
         self.emit_provider_ready = emit_provider_ready
         self.emit_provider_error = emit_provider_error
         self.emit_provider_stale = emit_provider_stale
@@ -54,13 +56,23 @@ class GrpcWatcher(FlagStateConnector):
     def _generate_channel(self, config: Config) -> grpc.Channel:
         target = f"{config.host}:{config.port}"
         # Create the channel with the service config
-        options = [
+        options: list[tuple[str, typing.Any]] = [
             ("grpc.keepalive_time_ms", config.keep_alive_time),
             ("grpc.initial_reconnect_backoff_ms", config.retry_backoff_ms),
             ("grpc.max_reconnect_backoff_ms", config.retry_backoff_max_ms),
             ("grpc.min_reconnect_backoff_ms", config.stream_deadline_ms),
         ]
-        if config.tls:
+        if config.default_authority is not None:
+            options.append(("grpc.default_authority", config.default_authority))
+
+        if config.channel_credentials is not None:
+            channel_args = {
+                "options": options,
+                "credentials": config.channel_credentials,
+            }
+            channel = grpc.secure_channel(target, **channel_args)
+
+        elif config.tls:
             channel_args = {
                 "options": options,
                 "credentials": grpc.ssl_channel_credentials(),
@@ -106,7 +118,10 @@ class GrpcWatcher(FlagStateConnector):
 
     def _state_change_callback(self, new_state: grpc.ChannelConnectivity) -> None:
         logger.debug(f"gRPC state change: {new_state}")
-        if new_state == grpc.ChannelConnectivity.READY:
+        if (
+            new_state == grpc.ChannelConnectivity.READY
+            or new_state == grpc.ChannelConnectivity.IDLE
+        ):
             if not self.thread or not self.thread.is_alive():
                 self.thread = threading.Thread(
                     target=self.listen,
@@ -153,10 +168,20 @@ class GrpcWatcher(FlagStateConnector):
             if self.streamline_deadline_seconds > 0
             else {}
         )
-        request_args = {"selector": self.selector} if self.selector is not None else {}
+        request_args = {}
+        if self.selector is not None:
+            request_args["selector"] = self.selector
+        if self.provider_id is not None:
+            request_args["provider_id"] = self.provider_id
 
         while self.active:
             try:
+                context_values_request = sync_pb2.GetMetadataRequest()
+                context_values_response: sync_pb2.GetMetadataResponse = (
+                    self.stub.GetMetadata(context_values_request, wait_for_ready=True)
+                )
+                context_values = MessageToDict(context_values_response)
+
                 request = sync_pb2.SyncFlagsRequest(**request_args)
 
                 logger.debug("Setting up gRPC sync flags connection")
@@ -173,7 +198,8 @@ class GrpcWatcher(FlagStateConnector):
                         self.emit_provider_ready(
                             ProviderEventDetails(
                                 message="gRPC sync connection established"
-                            )
+                            ),
+                            context_values["metadata"],
                         )
                         self.connected = True
 

openfeature/contrib/provider/flagd/sync_metadata_hook.py

@@ -0,0 +1,14 @@
+import typing
+
+from openfeature.evaluation_context import EvaluationContext
+from openfeature.hook import Hook, HookContext, HookHints
+
+
+class SyncMetadataHook(Hook):
+    def __init__(self, context_supplier: typing.Callable[[], EvaluationContext]):
+        self.context_supplier = context_supplier
+
+    def before(
+        self, hook_context: HookContext, hints: HookHints
+    ) -> typing.Optional[EvaluationContext]:
+        return self.context_supplier()

{openfeature_provider_flagd-0.2.0.dist-info → openfeature_provider_flagd-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openfeature-provider-flagd
-Version: 0.2.0
+Version: 0.2.1
 Summary: OpenFeature provider for the flagd flag evaluation engine
 Project-URL: Homepage, https://github.com/open-feature/python-sdk-contrib
 Author-email: OpenFeature <openfeature-core@groups.io>

{openfeature_provider_flagd-0.2.0.dist-info → openfeature_provider_flagd-0.2.1.dist-info}/RECORD

@@ -1,18 +1,19 @@
 openfeature/.gitignore,sha256=1ZPH4VtVL4bMQmBJXQJxeAyUa74LCtqV1a_yjeDIzSQ,8
 openfeature/contrib/provider/flagd/__init__.py,sha256=WlrcPaCH31dEG1IvrvpeuhAaQ8Ni8LEzDpNM_x-qKOA,65
-openfeature/contrib/provider/flagd/config.py,sha256=ObWUUMVaRf199AWjfg4xrTOR7qcx5venyTNPUJkSTmA,7024
+openfeature/contrib/provider/flagd/config.py,sha256=6a3bA_Kaq_Jfku91vdq3MIcES-Gnh12r_MsvWGJsveg,7720
 openfeature/contrib/provider/flagd/flag_type.py,sha256=rZYfmqQEmtqVVTb8e-d8Wt8ZCnHtf7xPSmYxyU8w0R0,158
-openfeature/contrib/provider/flagd/provider.py,sha256=n0sRslXEOhFkXZnFXQguC5HkC18ekTFLKEmj7WSTJ50,6795
+openfeature/contrib/provider/flagd/provider.py,sha256=e9yCN2QZ92Wz7Z2VWa_j5ibOvw-ck6eOPwgJpNrctj8,7810
+openfeature/contrib/provider/flagd/sync_metadata_hook.py,sha256=fd3uRtwDhVlCW9vZhS35p9qENkl6wDHwlFH-L48aPDM,456
 openfeature/contrib/provider/flagd/resolvers/__init__.py,sha256=CzsnsfxJCaD_S1gBf15kkJBVD-gVLKIwDi4W1nE-dXw,181
-openfeature/contrib/provider/flagd/resolvers/grpc.py,sha256=lVwznNS8WU41xIBjazxhhpJKfCLTEgnon4CHDh0DY-g,13470
-openfeature/contrib/provider/flagd/resolvers/in_process.py,sha256=fUE6Q1dzwE4V7KYYpdp2_qKj7vrkL47fG906kyxubr8,4618
+openfeature/contrib/provider/flagd/resolvers/grpc.py,sha256=KJTrwZM-XF2-Xw-O4YvrN-Xvn_KqsO9T29lBAjiDS-4,13581
+openfeature/contrib/provider/flagd/resolvers/in_process.py,sha256=ek4T5MsG1YcceyZ1p2yVMawxfnrBFwT1qCCpQqh_coE,4624
 openfeature/contrib/provider/flagd/resolvers/protocol.py,sha256=Wc7oUH6ytPuKg8Lj_3y-_LLkQkuvsow9IiSfmlM8I2o,1402
 openfeature/contrib/provider/flagd/resolvers/process/custom_ops.py,sha256=bZX1At0dRxhghhWz4g-8N-YPobcVfYSv9PTsYh-lZDc,4549
 openfeature/contrib/provider/flagd/resolvers/process/flags.py,sha256=nDXkl80DiJBlSrz0l7xT-DAr6zzZSS0mwOSjvUAV2gY,3255
 openfeature/contrib/provider/flagd/resolvers/process/targeting.py,sha256=qjYgfoJK9B1ghh19cUq7f-VEql7Hh1J7sh0BhnNc_h0,905
 openfeature/contrib/provider/flagd/resolvers/process/connector/__init__.py,sha256=hyYYxRYEnSho5F28M2hbhhtkG4DQTwJjD36ddI0Xs7M,289
-openfeature/contrib/provider/flagd/resolvers/process/connector/file_watcher.py,sha256=m_hscNJ0tHQgY5xuOriK20SiYKjz5FpLPoDfNJDDXKs,3889
-openfeature/contrib/provider/flagd/resolvers/process/connector/grpc_watcher.py,sha256=ZTHLpMZSIMl7doK75-rZF64XfxGCNmocr4Vf8UhLHTY,7276
+openfeature/contrib/provider/flagd/resolvers/process/connector/file_watcher.py,sha256=f4jg9tHj94R_PJ4sCZ2f6B1r7Fgm1NqEZr68qH9pYYk,3920
+openfeature/contrib/provider/flagd/resolvers/process/connector/grpc_watcher.py,sha256=l-GgF3MpIEkjrtHyuuSZgOZvgOuBKqgx_NOZImNAyDQ,8392
 openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2.py,sha256=YPBimdlVBCfnVqxq9uek3H4nyaIR0MhggCAaR0XtIt4,7527
 openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2.pyi,sha256=afh-fdsmyfS62C-iq7EQsqr_5yZP_QxJXp81Q0Lcllk,18333
 openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2_grpc.py,sha256=AFwLCOCunFSWGnlt8Asj3pxORfcx168r4jVmt9CLB0I,17189
@@ -29,7 +30,7 @@ openfeature/schemas/protobuf/sync/v1/sync_service_pb2.py,sha256=Sw0kLvO0wIRXsaFi
 openfeature/schemas/protobuf/sync/v1/sync_service_pb2.pyi,sha256=o3YpW_5iQJWjU7IFEsyspeqLyBDC4C_psBNErwziumE,7986
 openfeature/schemas/protobuf/sync/v1/sync_service_pb2_grpc.py,sha256=cAbP4qfaS2Dpze8BH3w-PAJfL7LCA7xZYJfFro5b_2I,6185
 openfeature/schemas/protobuf/sync/v1/sync_service_pb2_grpc.pyi,sha256=4NoAkGicVNxx4yVK5_JvvPn1OGlRdPhqM2wCpkwCjEI,3024
-openfeature_provider_flagd-0.2.0.dist-info/METADATA,sha256=aWH2j09cJBu_IzuRgwufwnMUs9DA0jBhncib01UIOHg,21635
-openfeature_provider_flagd-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-openfeature_provider_flagd-0.2.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openfeature_provider_flagd-0.2.0.dist-info/RECORD,,
+openfeature_provider_flagd-0.2.1.dist-info/METADATA,sha256=MwEbcjspmlvG0b1RkL4iigjJmd8P0dUg-bJiymkM-Kk,21635
+openfeature_provider_flagd-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+openfeature_provider_flagd-0.2.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openfeature_provider_flagd-0.2.1.dist-info/RECORD,,