openfeature-provider-flagd 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

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

@@ -5,13 +5,13 @@ from openfeature.contrib.provider.flagd.resolvers.process.connector.file_watcher
 )
 from openfeature.evaluation_context import EvaluationContext
 from openfeature.event import ProviderEventDetails
-from openfeature.exception import FlagNotFoundError, ParseError
+from openfeature.exception import ErrorCode, FlagNotFoundError, GeneralError, ParseError
 from openfeature.flag_evaluation import FlagResolutionDetails, Reason
 
 from ..config import Config
 from .process.connector import FlagStateConnector
 from .process.connector.grpc_watcher import GrpcWatcher
-from .process.flags import FlagStore
+from .process.flags import Flag, FlagStore
 from .process.targeting import targeting
 
 T = typing.TypeVar("T")
@@ -128,26 +128,30 @@ class InProcessResolver:
             )
 
         if not flag.targeting:
-            variant, value = flag.default
-            return FlagResolutionDetails(
-                value, variant=variant, flag_metadata=metadata, reason=Reason.STATIC
-            )
+            return _default_resolve(flag, metadata, Reason.STATIC)
 
-        variant = targeting(flag.key, flag.targeting, evaluation_context)
+        try:
+            variant = targeting(flag.key, flag.targeting, evaluation_context)
+            if variant is None:
+                return _default_resolve(flag, metadata, Reason.DEFAULT)
 
-        if variant is None:
-            variant, value = flag.default
-            return FlagResolutionDetails(
-                value, variant=variant, flag_metadata=metadata, reason=Reason.DEFAULT
-            )
-        if not isinstance(variant, (str, bool)):
-            raise ParseError(
-                "Parsed JSONLogic targeting did not return a string or bool"
-            )
+            # convert to string to support shorthand (boolean in python is with capital T hence the special case)
+            if isinstance(variant, bool):
+                variant = str(variant).lower()
+            elif not isinstance(variant, str):
+                variant = str(variant)
+
+            if variant not in flag.variants:
+                raise GeneralError(
+                    f"Resolved variant {variant} not in variants config."
+                )
+
+        except ReferenceError:
+            raise ParseError(f"Invalid targeting {targeting}") from ReferenceError
 
         variant, value = flag.get_variant(variant)
         if value is None:
-            raise ParseError(f"Resolved variant {variant} not in variants config.")
+            raise GeneralError(f"Resolved variant {variant} not in variants config.")
 
         return FlagResolutionDetails(
             value,
@@ -155,3 +159,24 @@ class InProcessResolver:
             reason=Reason.TARGETING_MATCH,
             flag_metadata=metadata,
         )
+
+
+def _default_resolve(
+    flag: Flag,
+    metadata: typing.Mapping[str, typing.Union[float, int, str, bool]],
+    reason: Reason,
+) -> FlagResolutionDetails:
+    variant, value = flag.default
+    if variant is None:
+        return FlagResolutionDetails(
+            value,
+            variant=variant,
+            reason=Reason.ERROR,
+            error_code=ErrorCode.FLAG_NOT_FOUND,
+            flag_metadata=metadata,
+        )
+    if variant not in flag.variants:
+        raise GeneralError(f"Resolved variant {variant} not in variants config.")
+    return FlagResolutionDetails(
+        value, variant=variant, flag_metadata=metadata, reason=reason
+    )

openfeature/contrib/provider/flagd/resolvers/process/flags.py

@@ -72,30 +72,22 @@ class Flag:
     key: str
     state: str
     variants: typing.Mapping[str, typing.Any]
-    default_variant: typing.Union[bool, str]
+    default_variant: typing.Optional[typing.Union[bool, str]] = None
     targeting: typing.Optional[dict] = None
     metadata: typing.Optional[
         typing.Mapping[str, typing.Union[float, int, str, bool]]
     ] = None
 
     def __post_init__(self) -> None:
-        if not self.state or not isinstance(self.state, str):
+        if not self.state or not (self.state == "ENABLED" or self.state == "DISABLED"):
             raise ParseError("Incorrect 'state' value provided in flag config")
 
         if not self.variants or not isinstance(self.variants, dict):
             raise ParseError("Incorrect 'variants' value provided in flag config")
 
-        if not self.default_variant or not isinstance(
-            self.default_variant, (str, bool)
-        ):
+        if self.default_variant and not isinstance(self.default_variant, (str, bool)):
             raise ParseError("Incorrect 'defaultVariant' value provided in flag config")
 
-        if self.targeting and not isinstance(self.targeting, dict):
-            raise ParseError("Incorrect 'targeting' value provided in flag config")
-
-        if self.default_variant not in self.variants:
-            raise ParseError("Default variant does not match set of variants")
-
         if self.metadata:
             if not isinstance(self.metadata, dict):
                 raise ParseError("Flag metadata is not a valid json object")
@@ -106,6 +98,8 @@ class Flag:
     def from_dict(cls, key: str, data: dict) -> "Flag":
         if "defaultVariant" in data:
             data["default_variant"] = data["defaultVariant"]
+            if data["default_variant"] == "":
+                data["default_variant"] = None
             del data["defaultVariant"]
 
         data.pop("source", None)
@@ -119,13 +113,16 @@ class Flag:
             raise ParseError from err
 
     @property
-    def default(self) -> tuple[str, typing.Any]:
+    def default(self) -> tuple[typing.Optional[str], typing.Any]:
         return self.get_variant(self.default_variant)
 
     def get_variant(
-        self, variant_key: typing.Union[str, bool]
-    ) -> tuple[str, typing.Any]:
+        self, variant_key: typing.Union[str, bool, None]
+    ) -> tuple[typing.Optional[str], typing.Any]:
         if isinstance(variant_key, bool):
             variant_key = str(variant_key).lower()
 
+        if not variant_key:
+            return None, None
+
         return variant_key, self.variants.get(variant_key)

openfeature/contrib/provider/flagd/resolvers/process/targeting.py

@@ -5,6 +5,7 @@ from json_logic import builtins, jsonLogic
 from json_logic.types import JsonValue
 
 from openfeature.evaluation_context import EvaluationContext
+from openfeature.exception import ParseError
 
 from .custom_ops import (
     ends_with,
@@ -27,6 +28,9 @@ def targeting(
     targeting: dict,
     evaluation_context: typing.Optional[EvaluationContext] = None,
 ) -> JsonValue:
+    if not isinstance(targeting, dict):
+        raise ParseError(f"Invalid 'targeting' value in flag: {targeting}")
+
     json_logic_context = evaluation_context.attributes if evaluation_context else {}
     json_logic_context["$flagd"] = {"flagKey": key, "timestamp": int(time.time())}
     json_logic_context["targetingKey"] = (

openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation.proto
-# Protobuf Python Version: 6.31.0
+# Protobuf Python Version: 5.29.0
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    6,
-    31,
+    5,
+    29,
     0,
     '',
     'openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation.proto'

openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from openfeature.schemas.protobuf.flagd.evaluation.v1 import evaluation_pb2 as openfeature_dot_schemas_dot_protobuf_dot_flagd_dot_evaluation_dot_v1_dot_evaluation__pb2
 
-GRPC_GENERATED_VERSION = '1.73.1'
+GRPC_GENERATED_VERSION = '1.71.2'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: openfeature/schemas/protobuf/flagd/sync/v1/sync.proto
-# Protobuf Python Version: 6.31.0
+# Protobuf Python Version: 5.29.0
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    6,
-    31,
+    5,
+    29,
     0,
     '',
     'openfeature/schemas/protobuf/flagd/sync/v1/sync.proto'

openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from openfeature.schemas.protobuf.flagd.sync.v1 import sync_pb2 as openfeature_dot_schemas_dot_protobuf_dot_flagd_dot_sync_dot_v1_dot_sync__pb2
 
-GRPC_GENERATED_VERSION = '1.73.1'
+GRPC_GENERATED_VERSION = '1.71.2'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

openfeature/schemas/protobuf/schema/v1/schema_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: openfeature/schemas/protobuf/schema/v1/schema.proto
-# Protobuf Python Version: 6.31.0
+# Protobuf Python Version: 5.29.0
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    6,
-    31,
+    5,
+    29,
     0,
     '',
     'openfeature/schemas/protobuf/schema/v1/schema.proto'

openfeature/schemas/protobuf/schema/v1/schema_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from openfeature.schemas.protobuf.schema.v1 import schema_pb2 as openfeature_dot_schemas_dot_protobuf_dot_schema_dot_v1_dot_schema__pb2
 
-GRPC_GENERATED_VERSION = '1.73.1'
+GRPC_GENERATED_VERSION = '1.71.2'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

openfeature/schemas/protobuf/sync/v1/sync_service_pb2.py

@@ -2,7 +2,7 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # NO CHECKED-IN PROTOBUF GENCODE
 # source: openfeature/schemas/protobuf/sync/v1/sync_service.proto
-# Protobuf Python Version: 6.31.0
+# Protobuf Python Version: 5.29.0
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,8 +11,8 @@ from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
 _runtime_version.ValidateProtobufRuntimeVersion(
     _runtime_version.Domain.PUBLIC,
-    6,
-    31,
+    5,
+    29,
     0,
     '',
     'openfeature/schemas/protobuf/sync/v1/sync_service.proto'

openfeature/schemas/protobuf/sync/v1/sync_service_pb2_grpc.py

@@ -5,7 +5,7 @@ import warnings
 
 from openfeature.schemas.protobuf.sync.v1 import sync_service_pb2 as openfeature_dot_schemas_dot_protobuf_dot_sync_dot_v1_dot_sync__service__pb2
 
-GRPC_GENERATED_VERSION = '1.73.1'
+GRPC_GENERATED_VERSION = '1.71.2'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

{openfeature_provider_flagd-0.2.5.dist-info → openfeature_provider_flagd-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openfeature-provider-flagd
-Version: 0.2.5
+Version: 0.2.6
 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>
@@ -215,7 +215,7 @@ Requires-Dist: grpcio>=1.68.1
 Requires-Dist: mmh3>=4.1.0
 Requires-Dist: openfeature-sdk>=0.6.0
 Requires-Dist: panzi-json-logic>=1.0.1
-Requires-Dist: protobuf>=4.29.2
+Requires-Dist: protobuf>=5.26.1
 Requires-Dist: pyyaml>=6.0.1
 Requires-Dist: semver<4,>=3
 Description-Content-Type: text/markdown

{openfeature_provider_flagd-0.2.5.dist-info → openfeature_provider_flagd-0.2.6.dist-info}/RECORD

@@ -6,31 +6,31 @@ openfeature/contrib/provider/flagd/provider.py,sha256=qGLWvpYEfvf5RrvYb2vTvzc8CD
 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=dIRuCgHrqCwPzpXdfL1cEPss08-LwZcy_gIUe0xLeqY,15380
-openfeature/contrib/provider/flagd/resolvers/in_process.py,sha256=Oqj3Ak-zqjvWnlnsg5ElXXHn-YIPZRItbyfzakCd8O0,5433
+openfeature/contrib/provider/flagd/resolvers/in_process.py,sha256=R3fy2AE4iLOzFv0KExH0chTIeZsMipXGLaxGN-nSvUU,6328
 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=znDHo84b4-vQswoHSo0807AvK84mqhiJjlC-_vMehdE,4759
-openfeature/contrib/provider/flagd/resolvers/process/targeting.py,sha256=qjYgfoJK9B1ghh19cUq7f-VEql7Hh1J7sh0BhnNc_h0,905
+openfeature/contrib/provider/flagd/resolvers/process/flags.py,sha256=PPD99ebcRlZ08rbzqP6TY-433rW5xyMvmLTavSib2FU,4689
+openfeature/contrib/provider/flagd/resolvers/process/targeting.py,sha256=DQdtBMzLCoNAwtV25fRonVlR3JjE4Fds7StckZ2LnFs,1067
 openfeature/contrib/provider/flagd/resolvers/process/connector/__init__.py,sha256=hyYYxRYEnSho5F28M2hbhhtkG4DQTwJjD36ddI0Xs7M,289
 openfeature/contrib/provider/flagd/resolvers/process/connector/file_watcher.py,sha256=abj6DhAyu2nP-P5EAHB9GyceJMym21rO8tKr8nQhmKM,4241
 openfeature/contrib/provider/flagd/resolvers/process/connector/grpc_watcher.py,sha256=wfcG2aks5Za0bptnNfEagQuuR7rEUwELG6uPqSApIsY,10622
-openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2.py,sha256=-K4_Kmx2JRgLAZG2jf5LqmDjY7ewrJKHGebqv3RqPwE,7527
+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=CMBqGsCqTVaAgKwJ8Ht7Or7PfjPQsVVoA-kg-5XjHNI,17189
+openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2_grpc.py,sha256=1wiz2MWh4OuUCeqaC3ihMzvY_NXZmIDghihymLCb35A,17189
 openfeature/schemas/protobuf/flagd/evaluation/v1/evaluation_pb2_grpc.pyi,sha256=tQm-QOlsMdhdN_7i5LsrtLtBPu4qpL0qzTE7DbSvXFs,7731
-openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2.py,sha256=m3-pL_dTFAGUzDVhOl-HjcfykIOqMP61spiq41W-UHU,3528
+openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2.py,sha256=OIhVrNkhXtwuCdvbahXiOx-mQ3XVVPx5gh0UHzKN0_M,3528
 openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2.pyi,sha256=Qsqe0vz5AJRAAjARXhjiaPKyIFbLttr4gTWae2zyJfM,5967
-openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2_grpc.py,sha256=sJEO2Qr_tohCDpg2_W5V6gtlpmOAgCcG4l0K0kGUIEM,8335
+openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2_grpc.py,sha256=llMjiiVc-lM7LgKo_qsOkHNZYviVAikGA7nA2qwKwgs,8335
 openfeature/schemas/protobuf/flagd/sync/v1/sync_pb2_grpc.pyi,sha256=APjDd-Yo6i6FE_kOusWhTqk-8B_0wIEMXcImCuGpQt8,3782
-openfeature/schemas/protobuf/schema/v1/schema_pb2.py,sha256=LIQjZ-jrzHULHYpFefuB0KRgtp0c9xwjXl0VDxrZsuY,7255
+openfeature/schemas/protobuf/schema/v1/schema_pb2.py,sha256=dfGpiAYJ2VuRBrctH7s21KkdrIr9rzIaWibUZ3So3g4,7255
 openfeature/schemas/protobuf/schema/v1/schema_pb2.pyi,sha256=14Z6i0kRpCAQO8aCpc4Qwre1OJ7_d_ZIPq8V1vTuYzU,18369
-openfeature/schemas/protobuf/schema/v1/schema_pb2_grpc.py,sha256=81k5RwIA-FlPPu9lT3Q9xIbS12thbJx2f-M2akSX-Z8,16227
+openfeature/schemas/protobuf/schema/v1/schema_pb2_grpc.py,sha256=2IPt3a8K4vczpNerePAJO8v7tlLWijgraXYnrzpULRE,16227
 openfeature/schemas/protobuf/schema/v1/schema_pb2_grpc.pyi,sha256=EJ55jvso2Uzx50XryC7fsKGEOBi1bMOGCXaShl1TcJ4,7067
-openfeature/schemas/protobuf/sync/v1/sync_service_pb2.py,sha256=pK8BPYQQmWihQYd-4jI84htTqmp6Jf7kk_w4MGG8Qgg,3327
+openfeature/schemas/protobuf/sync/v1/sync_service_pb2.py,sha256=Sw0kLvO0wIRXsaFic8qmTuScMdf1-1WOHGWP4FOIB_s,3327
 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=8eKM7pR4wMzDlD9vNVH5C4uYq6nbnJGozFAIjWawWGQ,6185
+openfeature/schemas/protobuf/sync/v1/sync_service_pb2_grpc.py,sha256=gk-VooxRZ-GBWOWsDK1j985OVmdghW-4Wiuv-6YD_84,6185
 openfeature/schemas/protobuf/sync/v1/sync_service_pb2_grpc.pyi,sha256=4NoAkGicVNxx4yVK5_JvvPn1OGlRdPhqM2wCpkwCjEI,3024
-openfeature_provider_flagd-0.2.5.dist-info/METADATA,sha256=Xhd43YdbELLg_g94p-st3WC9S7ss9dnxTMtjJ9_5XAo,21635
-openfeature_provider_flagd-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-openfeature_provider_flagd-0.2.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-openfeature_provider_flagd-0.2.5.dist-info/RECORD,,
+openfeature_provider_flagd-0.2.6.dist-info/METADATA,sha256=8KC1l9D9AhkkqQlDpEbmpE-wox9cq0j7O9tnB8Vb2b8,21635
+openfeature_provider_flagd-0.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+openfeature_provider_flagd-0.2.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+openfeature_provider_flagd-0.2.6.dist-info/RECORD,,