devcycle-python-server-sdk 3.11.3__py3-none-any.whl → 3.12.0__py3-none-any.whl

devcycle_python_sdk/protobuf/utils.py

@@ -5,6 +5,7 @@ import math
 from typing import Any, Optional
 
 from devcycle_python_sdk.models.variable import TypeEnum, Variable
+from devcycle_python_sdk.models.eval_reason import EvalReason
 from devcycle_python_sdk.models.user import DevCycleUser
 
 import devcycle_python_sdk.protobuf.variableForUserParams_pb2 as pb2
@@ -82,7 +83,20 @@ def create_dvcuser_pb(user: DevCycleUser) -> pb2.DVCUser_PB:  # type: ignore
     )
 
 
+def create_eval_reason_from_pb(eval_reason_pb: pb2.EvalReason_PB) -> EvalReason:  # type: ignore
+    """Convert EvalReason_PB protobuf message to EvalReason object"""
+    return EvalReason(
+        reason=eval_reason_pb.reason,
+        details=eval_reason_pb.details if eval_reason_pb.details else None,
+        target_id=eval_reason_pb.target_id if eval_reason_pb.target_id else None,
+    )
+
+
 def create_variable(sdk_variable: pb2.SDKVariable_PB, default_value: Any) -> Variable:  # type: ignore
+    eval_reason_obj = None
+    if sdk_variable.HasField("eval"):
+        eval_reason_obj = create_eval_reason_from_pb(sdk_variable.eval)
+
     if sdk_variable.type == pb2.VariableType_PB.Boolean:  # type: ignore
         return Variable(
             _id=None,
@@ -91,6 +105,7 @@ def create_variable(sdk_variable: pb2.SDKVariable_PB, default_value: Any) -> Var
             type=TypeEnum.BOOLEAN,
             isDefaulted=False,
             defaultValue=default_value,
+            eval=eval_reason_obj,
         )
 
     elif sdk_variable.type == pb2.VariableType_PB.String:  # type: ignore
@@ -101,6 +116,7 @@ def create_variable(sdk_variable: pb2.SDKVariable_PB, default_value: Any) -> Var
             type=TypeEnum.STRING,
             isDefaulted=False,
             defaultValue=default_value,
+            eval=eval_reason_obj,
         )
 
     elif sdk_variable.type == pb2.VariableType_PB.Number:  # type: ignore
@@ -111,6 +127,7 @@ def create_variable(sdk_variable: pb2.SDKVariable_PB, default_value: Any) -> Var
             type=TypeEnum.NUMBER,
             isDefaulted=False,
             defaultValue=default_value,
+            eval=eval_reason_obj,
         )
 
     elif sdk_variable.type == pb2.VariableType_PB.JSON:  # type: ignore
@@ -123,6 +140,7 @@ def create_variable(sdk_variable: pb2.SDKVariable_PB, default_value: Any) -> Var
             type=TypeEnum.JSON,
             isDefaulted=False,
             defaultValue=default_value,
+            eval=eval_reason_obj,
         )
 
     else:

devcycle_python_sdk/protobuf/variableForUserParams_pb2.py

@@ -1,11 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: variableForUserParams.proto
+# Protobuf Python Version: 5.29.3
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    29,
+    3,
+    '',
+    'variableForUserParams.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,34 +24,36 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bvariableForUserParams.proto\"/\n\x0eNullableString\x12\r\n\x05value\x18\x01 \x01(\t\x12\x0e\n\x06isNull\x18\x02 \x01(\x08\"/\n\x0eNullableDouble\x12\r\n\x05value\x18\x01 \x01(\x01\x12\x0e\n\x06isNull\x18\x02 \x01(\x08\"m\n\x0f\x43ustomDataValue\x12\x1d\n\x04type\x18\x01 \x01(\x0e\x32\x0f.CustomDataType\x12\x11\n\tboolValue\x18\x02 \x01(\x08\x12\x13\n\x0b\x64oubleValue\x18\x03 \x01(\x01\x12\x13\n\x0bstringValue\x18\x04 \x01(\t\"\x93\x01\n\x12NullableCustomData\x12-\n\x05value\x18\x01 \x03(\x0b\x32\x1e.NullableCustomData.ValueEntry\x12\x0e\n\x06isNull\x18\x02 \x01(\x08\x1a>\n\nValueEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1f\n\x05value\x18\x02 \x01(\x0b\x32\x10.CustomDataValue:\x02\x38\x01\"\x9c\x01\n\x18VariableForUserParams_PB\x12\x0e\n\x06sdkKey\x18\x01 \x01(\t\x12\x13\n\x0bvariableKey\x18\x02 \x01(\t\x12&\n\x0cvariableType\x18\x03 \x01(\x0e\x32\x10.VariableType_PB\x12\x19\n\x04user\x18\x04 \x01(\x0b\x32\x0b.DVCUser_PB\x12\x18\n\x10shouldTrackEvent\x18\x05 \x01(\x08\"\xe8\x02\n\nDVCUser_PB\x12\x0f\n\x07user_id\x18\x01 \x01(\t\x12\x1e\n\x05\x65mail\x18\x02 \x01(\x0b\x32\x0f.NullableString\x12\x1d\n\x04name\x18\x03 \x01(\x0b\x32\x0f.NullableString\x12!\n\x08language\x18\x04 \x01(\x0b\x32\x0f.NullableString\x12 \n\x07\x63ountry\x18\x05 \x01(\x0b\x32\x0f.NullableString\x12!\n\x08\x61ppBuild\x18\x06 \x01(\x0b\x32\x0f.NullableDouble\x12#\n\nappVersion\x18\x07 \x01(\x0b\x32\x0f.NullableString\x12$\n\x0b\x64\x65viceModel\x18\x08 \x01(\x0b\x32\x0f.NullableString\x12\'\n\ncustomData\x18\t \x01(\x0b\x32\x13.NullableCustomData\x12.\n\x11privateCustomData\x18\n \x01(\x0b\x32\x13.NullableCustomData\"\xac\x01\n\x0eSDKVariable_PB\x12\x0b\n\x03_id\x18\x01 \x01(\t\x12\x1e\n\x04type\x18\x02 \x01(\x0e\x32\x10.VariableType_PB\x12\x0b\n\x03key\x18\x03 \x01(\t\x12\x11\n\tboolValue\x18\x04 \x01(\x08\x12\x13\n\x0b\x64oubleValue\x18\x05 \x01(\x01\x12\x13\n\x0bstringValue\x18\x06 \x01(\t\x12#\n\nevalReason\x18\x07 \x01(\x0b\x32\x0f.NullableString*@\n\x0fVariableType_PB\x12\x0b\n\x07\x42oolean\x10\x00\x12\n\n\x06Number\x10\x01\x12\n\n\x06String\x10\x02\x12\x08\n\x04JSON\x10\x03*6\n\x0e\x43ustomDataType\x12\x08\n\x04\x42ool\x10\x00\x12\x07\n\x03Num\x10\x01\x12\x07\n\x03Str\x10\x02\x12\x08\n\x04Null\x10\x03\x42X\n&com.devcycle.sdk.server.local.protobufP\x01Z\x07./proto\xaa\x02\"DevCycle.SDK.Server.Local.Protobufb\x06proto3')
-
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'variableForUserParams_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1bvariableForUserParams.proto\"/\n\x0eNullableString\x12\r\n\x05value\x18\x01 \x01(\t\x12\x0e\n\x06isNull\x18\x02 \x01(\x08\"/\n\x0eNullableDouble\x12\r\n\x05value\x18\x01 \x01(\x01\x12\x0e\n\x06isNull\x18\x02 \x01(\x08\"m\n\x0f\x43ustomDataValue\x12\x1d\n\x04type\x18\x01 \x01(\x0e\x32\x0f.CustomDataType\x12\x11\n\tboolValue\x18\x02 \x01(\x08\x12\x13\n\x0b\x64oubleValue\x18\x03 \x01(\x01\x12\x13\n\x0bstringValue\x18\x04 \x01(\t\"\x93\x01\n\x12NullableCustomData\x12-\n\x05value\x18\x01 \x03(\x0b\x32\x1e.NullableCustomData.ValueEntry\x12\x0e\n\x06isNull\x18\x02 \x01(\x08\x1a>\n\nValueEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1f\n\x05value\x18\x02 \x01(\x0b\x32\x10.CustomDataValue:\x02\x38\x01\"\x9c\x01\n\x18VariableForUserParams_PB\x12\x0e\n\x06sdkKey\x18\x01 \x01(\t\x12\x13\n\x0bvariableKey\x18\x02 \x01(\t\x12&\n\x0cvariableType\x18\x03 \x01(\x0e\x32\x10.VariableType_PB\x12\x19\n\x04user\x18\x04 \x01(\x0b\x32\x0b.DVCUser_PB\x12\x18\n\x10shouldTrackEvent\x18\x05 \x01(\x08\"\xe8\x02\n\nDVCUser_PB\x12\x0f\n\x07user_id\x18\x01 \x01(\t\x12\x1e\n\x05\x65mail\x18\x02 \x01(\x0b\x32\x0f.NullableString\x12\x1d\n\x04name\x18\x03 \x01(\x0b\x32\x0f.NullableString\x12!\n\x08language\x18\x04 \x01(\x0b\x32\x0f.NullableString\x12 \n\x07\x63ountry\x18\x05 \x01(\x0b\x32\x0f.NullableString\x12!\n\x08\x61ppBuild\x18\x06 \x01(\x0b\x32\x0f.NullableDouble\x12#\n\nappVersion\x18\x07 \x01(\x0b\x32\x0f.NullableString\x12$\n\x0b\x64\x65viceModel\x18\x08 \x01(\x0b\x32\x0f.NullableString\x12\'\n\ncustomData\x18\t \x01(\x0b\x32\x13.NullableCustomData\x12.\n\x11privateCustomData\x18\n \x01(\x0b\x32\x13.NullableCustomData\"\xed\x01\n\x0eSDKVariable_PB\x12\x0b\n\x03_id\x18\x01 \x01(\t\x12\x1e\n\x04type\x18\x02 \x01(\x0e\x32\x10.VariableType_PB\x12\x0b\n\x03key\x18\x03 \x01(\t\x12\x11\n\tboolValue\x18\x04 \x01(\x08\x12\x13\n\x0b\x64oubleValue\x18\x05 \x01(\x01\x12\x13\n\x0bstringValue\x18\x06 \x01(\t\x12#\n\nevalReason\x18\x07 \x01(\x0b\x32\x0f.NullableString\x12!\n\x08_feature\x18\x08 \x01(\x0b\x32\x0f.NullableString\x12\x1c\n\x04\x65val\x18\t \x01(\x0b\x32\x0e.EvalReason_PB\"C\n\rEvalReason_PB\x12\x0e\n\x06reason\x18\x01 \x01(\t\x12\x0f\n\x07\x64\x65tails\x18\x02 \x01(\t\x12\x11\n\ttarget_id\x18\x03 \x01(\t*@\n\x0fVariableType_PB\x12\x0b\n\x07\x42oolean\x10\x00\x12\n\n\x06Number\x10\x01\x12\n\n\x06String\x10\x02\x12\x08\n\x04JSON\x10\x03*6\n\x0e\x43ustomDataType\x12\x08\n\x04\x42ool\x10\x00\x12\x07\n\x03Num\x10\x01\x12\x07\n\x03Str\x10\x02\x12\x08\n\x04Null\x10\x03\x42X\n&com.devcycle.sdk.server.local.protobufP\x01Z\x07./proto\xaa\x02\"DevCycle.SDK.Server.Local.Protobufb\x06proto3')
 
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n&com.devcycle.sdk.server.local.protobufP\001Z\007./proto\252\002\"DevCycle.SDK.Server.Local.Protobuf'
-  _NULLABLECUSTOMDATA_VALUEENTRY._options = None
-  _NULLABLECUSTOMDATA_VALUEENTRY._serialized_options = b'8\001'
-  _VARIABLETYPE_PB._serialized_start=1087
-  _VARIABLETYPE_PB._serialized_end=1151
-  _CUSTOMDATATYPE._serialized_start=1153
-  _CUSTOMDATATYPE._serialized_end=1207
-  _NULLABLESTRING._serialized_start=31
-  _NULLABLESTRING._serialized_end=78
-  _NULLABLEDOUBLE._serialized_start=80
-  _NULLABLEDOUBLE._serialized_end=127
-  _CUSTOMDATAVALUE._serialized_start=129
-  _CUSTOMDATAVALUE._serialized_end=238
-  _NULLABLECUSTOMDATA._serialized_start=241
-  _NULLABLECUSTOMDATA._serialized_end=388
-  _NULLABLECUSTOMDATA_VALUEENTRY._serialized_start=326
-  _NULLABLECUSTOMDATA_VALUEENTRY._serialized_end=388
-  _VARIABLEFORUSERPARAMS_PB._serialized_start=391
-  _VARIABLEFORUSERPARAMS_PB._serialized_end=547
-  _DVCUSER_PB._serialized_start=550
-  _DVCUSER_PB._serialized_end=910
-  _SDKVARIABLE_PB._serialized_start=913
-  _SDKVARIABLE_PB._serialized_end=1085
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'variableForUserParams_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n&com.devcycle.sdk.server.local.protobufP\001Z\007./proto\252\002\"DevCycle.SDK.Server.Local.Protobuf'
+  _globals['_NULLABLECUSTOMDATA_VALUEENTRY']._loaded_options = None
+  _globals['_NULLABLECUSTOMDATA_VALUEENTRY']._serialized_options = b'8\001'
+  _globals['_VARIABLETYPE_PB']._serialized_start=1221
+  _globals['_VARIABLETYPE_PB']._serialized_end=1285
+  _globals['_CUSTOMDATATYPE']._serialized_start=1287
+  _globals['_CUSTOMDATATYPE']._serialized_end=1341
+  _globals['_NULLABLESTRING']._serialized_start=31
+  _globals['_NULLABLESTRING']._serialized_end=78
+  _globals['_NULLABLEDOUBLE']._serialized_start=80
+  _globals['_NULLABLEDOUBLE']._serialized_end=127
+  _globals['_CUSTOMDATAVALUE']._serialized_start=129
+  _globals['_CUSTOMDATAVALUE']._serialized_end=238
+  _globals['_NULLABLECUSTOMDATA']._serialized_start=241
+  _globals['_NULLABLECUSTOMDATA']._serialized_end=388
+  _globals['_NULLABLECUSTOMDATA_VALUEENTRY']._serialized_start=326
+  _globals['_NULLABLECUSTOMDATA_VALUEENTRY']._serialized_end=388
+  _globals['_VARIABLEFORUSERPARAMS_PB']._serialized_start=391
+  _globals['_VARIABLEFORUSERPARAMS_PB']._serialized_end=547
+  _globals['_DVCUSER_PB']._serialized_start=550
+  _globals['_DVCUSER_PB']._serialized_end=910
+  _globals['_SDKVARIABLE_PB']._serialized_start=913
+  _globals['_SDKVARIABLE_PB']._serialized_end=1150
+  _globals['_EVALREASON_PB']._serialized_start=1152
+  _globals['_EVALREASON_PB']._serialized_end=1219
 # @@protoc_insertion_point(module_scope)

devcycle_python_sdk/protobuf/variableForUserParams_pb2.pyi

@@ -4,117 +4,139 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
-Bool: CustomDataType
-Boolean: VariableType_PB
 DESCRIPTOR: _descriptor.FileDescriptor
+
+class VariableType_PB(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    Boolean: _ClassVar[VariableType_PB]
+    Number: _ClassVar[VariableType_PB]
+    String: _ClassVar[VariableType_PB]
+    JSON: _ClassVar[VariableType_PB]
+
+class CustomDataType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    Bool: _ClassVar[CustomDataType]
+    Num: _ClassVar[CustomDataType]
+    Str: _ClassVar[CustomDataType]
+    Null: _ClassVar[CustomDataType]
+Boolean: VariableType_PB
+Number: VariableType_PB
+String: VariableType_PB
 JSON: VariableType_PB
-Null: CustomDataType
+Bool: CustomDataType
 Num: CustomDataType
-Number: VariableType_PB
 Str: CustomDataType
-String: VariableType_PB
+Null: CustomDataType
+
+class NullableString(_message.Message):
+    __slots__ = ("value", "isNull")
+    VALUE_FIELD_NUMBER: _ClassVar[int]
+    ISNULL_FIELD_NUMBER: _ClassVar[int]
+    value: str
+    isNull: bool
+    def __init__(self, value: _Optional[str] = ..., isNull: bool = ...) -> None: ...
+
+class NullableDouble(_message.Message):
+    __slots__ = ("value", "isNull")
+    VALUE_FIELD_NUMBER: _ClassVar[int]
+    ISNULL_FIELD_NUMBER: _ClassVar[int]
+    value: float
+    isNull: bool
+    def __init__(self, value: _Optional[float] = ..., isNull: bool = ...) -> None: ...
 
 class CustomDataValue(_message.Message):
-    __slots__ = ["boolValue", "doubleValue", "stringValue", "type"]
+    __slots__ = ("type", "boolValue", "doubleValue", "stringValue")
+    TYPE_FIELD_NUMBER: _ClassVar[int]
     BOOLVALUE_FIELD_NUMBER: _ClassVar[int]
     DOUBLEVALUE_FIELD_NUMBER: _ClassVar[int]
     STRINGVALUE_FIELD_NUMBER: _ClassVar[int]
-    TYPE_FIELD_NUMBER: _ClassVar[int]
+    type: CustomDataType
     boolValue: bool
     doubleValue: float
     stringValue: str
-    type: CustomDataType
     def __init__(self, type: _Optional[_Union[CustomDataType, str]] = ..., boolValue: bool = ..., doubleValue: _Optional[float] = ..., stringValue: _Optional[str] = ...) -> None: ...
 
-class DVCUser_PB(_message.Message):
-    __slots__ = ["appBuild", "appVersion", "country", "customData", "deviceModel", "email", "language", "name", "privateCustomData", "user_id"]
-    APPBUILD_FIELD_NUMBER: _ClassVar[int]
-    APPVERSION_FIELD_NUMBER: _ClassVar[int]
-    COUNTRY_FIELD_NUMBER: _ClassVar[int]
-    CUSTOMDATA_FIELD_NUMBER: _ClassVar[int]
-    DEVICEMODEL_FIELD_NUMBER: _ClassVar[int]
-    EMAIL_FIELD_NUMBER: _ClassVar[int]
-    LANGUAGE_FIELD_NUMBER: _ClassVar[int]
-    NAME_FIELD_NUMBER: _ClassVar[int]
-    PRIVATECUSTOMDATA_FIELD_NUMBER: _ClassVar[int]
-    USER_ID_FIELD_NUMBER: _ClassVar[int]
-    appBuild: NullableDouble
-    appVersion: NullableString
-    country: NullableString
-    customData: NullableCustomData
-    deviceModel: NullableString
-    email: NullableString
-    language: NullableString
-    name: NullableString
-    privateCustomData: NullableCustomData
-    user_id: str
-    def __init__(self, user_id: _Optional[str] = ..., email: _Optional[_Union[NullableString, _Mapping]] = ..., name: _Optional[_Union[NullableString, _Mapping]] = ..., language: _Optional[_Union[NullableString, _Mapping]] = ..., country: _Optional[_Union[NullableString, _Mapping]] = ..., appBuild: _Optional[_Union[NullableDouble, _Mapping]] = ..., appVersion: _Optional[_Union[NullableString, _Mapping]] = ..., deviceModel: _Optional[_Union[NullableString, _Mapping]] = ..., customData: _Optional[_Union[NullableCustomData, _Mapping]] = ..., privateCustomData: _Optional[_Union[NullableCustomData, _Mapping]] = ...) -> None: ...
-
 class NullableCustomData(_message.Message):
-    __slots__ = ["isNull", "value"]
+    __slots__ = ("value", "isNull")
     class ValueEntry(_message.Message):
-        __slots__ = ["key", "value"]
+        __slots__ = ("key", "value")
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
         value: CustomDataValue
         def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[CustomDataValue, _Mapping]] = ...) -> None: ...
-    ISNULL_FIELD_NUMBER: _ClassVar[int]
     VALUE_FIELD_NUMBER: _ClassVar[int]
-    isNull: bool
+    ISNULL_FIELD_NUMBER: _ClassVar[int]
     value: _containers.MessageMap[str, CustomDataValue]
+    isNull: bool
     def __init__(self, value: _Optional[_Mapping[str, CustomDataValue]] = ..., isNull: bool = ...) -> None: ...
 
-class NullableDouble(_message.Message):
-    __slots__ = ["isNull", "value"]
-    ISNULL_FIELD_NUMBER: _ClassVar[int]
-    VALUE_FIELD_NUMBER: _ClassVar[int]
-    isNull: bool
-    value: float
-    def __init__(self, value: _Optional[float] = ..., isNull: bool = ...) -> None: ...
+class VariableForUserParams_PB(_message.Message):
+    __slots__ = ("sdkKey", "variableKey", "variableType", "user", "shouldTrackEvent")
+    SDKKEY_FIELD_NUMBER: _ClassVar[int]
+    VARIABLEKEY_FIELD_NUMBER: _ClassVar[int]
+    VARIABLETYPE_FIELD_NUMBER: _ClassVar[int]
+    USER_FIELD_NUMBER: _ClassVar[int]
+    SHOULDTRACKEVENT_FIELD_NUMBER: _ClassVar[int]
+    sdkKey: str
+    variableKey: str
+    variableType: VariableType_PB
+    user: DVCUser_PB
+    shouldTrackEvent: bool
+    def __init__(self, sdkKey: _Optional[str] = ..., variableKey: _Optional[str] = ..., variableType: _Optional[_Union[VariableType_PB, str]] = ..., user: _Optional[_Union[DVCUser_PB, _Mapping]] = ..., shouldTrackEvent: bool = ...) -> None: ...
 
-class NullableString(_message.Message):
-    __slots__ = ["isNull", "value"]
-    ISNULL_FIELD_NUMBER: _ClassVar[int]
-    VALUE_FIELD_NUMBER: _ClassVar[int]
-    isNull: bool
-    value: str
-    def __init__(self, value: _Optional[str] = ..., isNull: bool = ...) -> None: ...
+class DVCUser_PB(_message.Message):
+    __slots__ = ("user_id", "email", "name", "language", "country", "appBuild", "appVersion", "deviceModel", "customData", "privateCustomData")
+    USER_ID_FIELD_NUMBER: _ClassVar[int]
+    EMAIL_FIELD_NUMBER: _ClassVar[int]
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    LANGUAGE_FIELD_NUMBER: _ClassVar[int]
+    COUNTRY_FIELD_NUMBER: _ClassVar[int]
+    APPBUILD_FIELD_NUMBER: _ClassVar[int]
+    APPVERSION_FIELD_NUMBER: _ClassVar[int]
+    DEVICEMODEL_FIELD_NUMBER: _ClassVar[int]
+    CUSTOMDATA_FIELD_NUMBER: _ClassVar[int]
+    PRIVATECUSTOMDATA_FIELD_NUMBER: _ClassVar[int]
+    user_id: str
+    email: NullableString
+    name: NullableString
+    language: NullableString
+    country: NullableString
+    appBuild: NullableDouble
+    appVersion: NullableString
+    deviceModel: NullableString
+    customData: NullableCustomData
+    privateCustomData: NullableCustomData
+    def __init__(self, user_id: _Optional[str] = ..., email: _Optional[_Union[NullableString, _Mapping]] = ..., name: _Optional[_Union[NullableString, _Mapping]] = ..., language: _Optional[_Union[NullableString, _Mapping]] = ..., country: _Optional[_Union[NullableString, _Mapping]] = ..., appBuild: _Optional[_Union[NullableDouble, _Mapping]] = ..., appVersion: _Optional[_Union[NullableString, _Mapping]] = ..., deviceModel: _Optional[_Union[NullableString, _Mapping]] = ..., customData: _Optional[_Union[NullableCustomData, _Mapping]] = ..., privateCustomData: _Optional[_Union[NullableCustomData, _Mapping]] = ...) -> None: ...
 
 class SDKVariable_PB(_message.Message):
-    __slots__ = ["_id", "boolValue", "doubleValue", "evalReason", "key", "stringValue", "type"]
+    __slots__ = ("_id", "type", "key", "boolValue", "doubleValue", "stringValue", "evalReason", "_feature", "eval")
+    _ID_FIELD_NUMBER: _ClassVar[int]
+    TYPE_FIELD_NUMBER: _ClassVar[int]
+    KEY_FIELD_NUMBER: _ClassVar[int]
     BOOLVALUE_FIELD_NUMBER: _ClassVar[int]
     DOUBLEVALUE_FIELD_NUMBER: _ClassVar[int]
-    EVALREASON_FIELD_NUMBER: _ClassVar[int]
-    KEY_FIELD_NUMBER: _ClassVar[int]
     STRINGVALUE_FIELD_NUMBER: _ClassVar[int]
-    TYPE_FIELD_NUMBER: _ClassVar[int]
-    _ID_FIELD_NUMBER: _ClassVar[int]
+    EVALREASON_FIELD_NUMBER: _ClassVar[int]
+    _FEATURE_FIELD_NUMBER: _ClassVar[int]
+    EVAL_FIELD_NUMBER: _ClassVar[int]
     _id: str
+    type: VariableType_PB
+    key: str
     boolValue: bool
     doubleValue: float
-    evalReason: NullableString
-    key: str
     stringValue: str
-    type: VariableType_PB
-    def __init__(self, _id: _Optional[str] = ..., type: _Optional[_Union[VariableType_PB, str]] = ..., key: _Optional[str] = ..., boolValue: bool = ..., doubleValue: _Optional[float] = ..., stringValue: _Optional[str] = ..., evalReason: _Optional[_Union[NullableString, _Mapping]] = ...) -> None: ...
-
-class VariableForUserParams_PB(_message.Message):
-    __slots__ = ["sdkKey", "shouldTrackEvent", "user", "variableKey", "variableType"]
-    SDKKEY_FIELD_NUMBER: _ClassVar[int]
-    SHOULDTRACKEVENT_FIELD_NUMBER: _ClassVar[int]
-    USER_FIELD_NUMBER: _ClassVar[int]
-    VARIABLEKEY_FIELD_NUMBER: _ClassVar[int]
-    VARIABLETYPE_FIELD_NUMBER: _ClassVar[int]
-    sdkKey: str
-    shouldTrackEvent: bool
-    user: DVCUser_PB
-    variableKey: str
-    variableType: VariableType_PB
-    def __init__(self, sdkKey: _Optional[str] = ..., variableKey: _Optional[str] = ..., variableType: _Optional[_Union[VariableType_PB, str]] = ..., user: _Optional[_Union[DVCUser_PB, _Mapping]] = ..., shouldTrackEvent: bool = ...) -> None: ...
-
-class VariableType_PB(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
-    __slots__ = []
+    evalReason: NullableString
+    _feature: NullableString
+    eval: EvalReason_PB
+    def __init__(self, _id: _Optional[str] = ..., type: _Optional[_Union[VariableType_PB, str]] = ..., key: _Optional[str] = ..., boolValue: bool = ..., doubleValue: _Optional[float] = ..., stringValue: _Optional[str] = ..., evalReason: _Optional[_Union[NullableString, _Mapping]] = ..., _feature: _Optional[_Union[NullableString, _Mapping]] = ..., eval: _Optional[_Union[EvalReason_PB, _Mapping]] = ...) -> None: ...
 
-class CustomDataType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
-    __slots__ = []
+class EvalReason_PB(_message.Message):
+    __slots__ = ("reason", "details", "target_id")
+    REASON_FIELD_NUMBER: _ClassVar[int]
+    DETAILS_FIELD_NUMBER: _ClassVar[int]
+    TARGET_ID_FIELD_NUMBER: _ClassVar[int]
+    reason: str
+    details: str
+    target_id: str
+    def __init__(self, reason: _Optional[str] = ..., details: _Optional[str] = ..., target_id: _Optional[str] = ...) -> None: ...

{devcycle_python_server_sdk-3.11.3.dist-info → devcycle_python_server_sdk-3.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devcycle-python-server-sdk
-Version: 3.11.3
+Version: 3.12.0
 Summary: DevCycle Python SDK
 Home-page: https://github.com/devcycleHQ/python-server-sdk
 Author-email: 

{devcycle_python_server_sdk-3.11.3.dist-info → devcycle_python_server_sdk-3.12.0.dist-info}/RECORD

@@ -1,52 +1,56 @@
-devcycle_python_sdk/VERSION.txt,sha256=d1xhx3dr9s7udwqwC9Ror9dezVvaZJs3QrpAoLjlHTs,7
+devcycle_python_sdk/VERSION.txt,sha256=TuPL9BzJKZqNU-jwsDtquUrxVYO4LjhqEL1HqlHKDZU,7
 devcycle_python_sdk/__init__.py,sha256=30TcYb9PbvVi97gwk16omCGG1UoUI9lmmU7xpvxNMvc,336
-devcycle_python_sdk/bucketing-lib.release.wasm,sha256=FGGO3YnZHVs-ZY4XJM6FWpQwnPwHzFhBjQmrKPwWbtU,215612
-devcycle_python_sdk/cloud_client.py,sha256=VVV3O8Fbrp3LrhKp0BNCF-pMqOuCA6TEEABBmjpfpOY,7586
+devcycle_python_sdk/bucketing-lib.release.wasm,sha256=wpbXlOj_TVIO2OcOD781sW5ICmGsYe9pvxG6DwYw6FY,223167
+devcycle_python_sdk/cloud_client.py,sha256=LMKB6gEuQNn5YePUPO0t1QIAUXot4OyshSUlUbuu07U,9413
 devcycle_python_sdk/devcycle_client.py,sha256=OqNza7OXOSRmMQq2kmyivljmH1GyN4dTiz0EhvDvt8w,1069
 devcycle_python_sdk/exceptions.py,sha256=Et7fS8pEFbHkFY86T2pJoEUstwjh4_rzhJxVH8fzAns,1053
-devcycle_python_sdk/local_client.py,sha256=cC9N144DY-WWatcSwVQh-e_07mnncjC3NG88Eo9wX0g,9814
-devcycle_python_sdk/options.py,sha256=WOpeI9U_9Gsf3OFWvoRIBRgJVZEqFxuEYTII71r5L24,4939
+devcycle_python_sdk/local_client.py,sha256=obZlHBJ9MS79sntdpPb4JTwC29e58Q5PzzEtei3m9F0,11684
+devcycle_python_sdk/options.py,sha256=W3vNZfV6QNnQyaOuRf6Z5cK6ut6fWtlGqlUfhzWX0_c,5253
 devcycle_python_sdk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devcycle_python_sdk/api/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 devcycle_python_sdk/api/backoff.py,sha256=F6WYCloaZD9CjNu6mKBMq7K20S8-i2WVU6X05ZRoawE,303
-devcycle_python_sdk/api/bucketing_client.py,sha256=-S0y9uAffippCTfjYgxI5j4j7YNfMxQJYUba1219nps,5111
+devcycle_python_sdk/api/bucketing_client.py,sha256=BRQWtTnIyLdWoFT7sPHPGg8kstDtW-jx1N4og3_SEgI,5565
 devcycle_python_sdk/api/config_client.py,sha256=73aQAq130rTHpQrVDX6n_DwFKz0WuKxRoLDiE3vSoAM,5077
 devcycle_python_sdk/api/event_client.py,sha256=WxkuV6geEC9MgG4FN36HeEQQa22ilq2mkOVMZkpiEk4,3356
-devcycle_python_sdk/api/local_bucketing.py,sha256=_MAMCHviIS1n4GiU-CnnLBeEVX8BUFRqwNbA1IQi84U,16470
+devcycle_python_sdk/api/local_bucketing.py,sha256=IXOP-680OmaO1XoX31YwY8FychAD5aqeyFFGe9SE_u4,15949
 devcycle_python_sdk/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 devcycle_python_sdk/managers/config_manager.py,sha256=AIGY9jXEhUzhEeaKIA1P5F2q6GaclrezAoGHgYU4dLQ,5634
+devcycle_python_sdk/managers/eval_hooks_manager.py,sha256=skOGK_hyZNpgkdeNXTTa-d1GVRITjoi8T6dO5I_Cqfk,2679
 devcycle_python_sdk/managers/event_queue_manager.py,sha256=uPy1vO6OAisZjUNAhWELE_g17alTiOcPv42z-WwkGck,8110
-devcycle_python_sdk/managers/sse_manager.py,sha256=PElIsmmjUvLDHABikLxUq6CVjIJDnmqkY3psPILCTS8,2590
+devcycle_python_sdk/managers/sse_manager.py,sha256=hSGpnZ6gNbQXGotqNxjogoB82znAyMMFhqdlqeCc5bI,2586
 devcycle_python_sdk/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devcycle_python_sdk/models/bucketed_config.py,sha256=NsdT-6RbEuDy5QuK5qlr6UqNKQQnwjoXVYN-uQp0P-E,3999
+devcycle_python_sdk/models/bucketed_config.py,sha256=qTfhIViX7m2WS2oDBBCmKKzPsJG6DEav3zCEXwP27nA,3980
 devcycle_python_sdk/models/error_response.py,sha256=r_dRUDAbral9UGaMYcnBsZOr9Hmkyi1SQbhGmZilgpA,442
+devcycle_python_sdk/models/eval_hook.py,sha256=_mDoEa8gkzMq-XpFRZrcXu_ldtpUzv5tlh-PghLpMMI,590
+devcycle_python_sdk/models/eval_hook_context.py,sha256=uBa8t0XxbcPBYAewNPFC2902qCjGhVoqUzZOZbGZ3n0,267
+devcycle_python_sdk/models/eval_reason.py,sha256=nMXcbR1DM8eriCQ1NNnIRQKkhJSYAbY8_9GgBfj7P8k,943
 devcycle_python_sdk/models/event.py,sha256=Sj3eEopuPp8QwQl_Oz8E6Y9Ph6nLG0HxU7eR7xSbA7g,3722
 devcycle_python_sdk/models/feature.py,sha256=m3wxxIjC5jxhKpPLI4RcsBaNLuy-zsMqoAgc8ySPe0I,852
 devcycle_python_sdk/models/platform_data.py,sha256=nyQsgI6pcTd1FL3Y2ACmpvTYb08R_UtWul25OWZstps,849
-devcycle_python_sdk/models/user.py,sha256=-tt-LQV-sBxNNfAKAlbNkHpsS01Gi0w37ZJQDARtve8,6422
-devcycle_python_sdk/models/variable.py,sha256=qp00SyCNyfYiMlTwnDSDJ4ZetRF35JHTbYZQOBxFIqY,1711
+devcycle_python_sdk/models/user.py,sha256=mhEk-mnKJRg_tydpBlAVhGDj9rDCacJ-jNwiGeSpZiE,7027
+devcycle_python_sdk/models/variable.py,sha256=NXubhYWXYRAUEh4kDe2Tu9T5QnZmQ3roYVPbP-u2H3s,3030
 devcycle_python_sdk/open_feature_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devcycle_python_sdk/open_feature_provider/provider.py,sha256=nLqyW4n9_NrJqgaz6cUt3YHDoZQzorjTYPiyT4UjFdc,5255
+devcycle_python_sdk/open_feature_provider/provider.py,sha256=l-psKU5m6jSBE53VwX3fBBas-TztekFDlfYTyTJQm6c,5558
 devcycle_python_sdk/protobuf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-devcycle_python_sdk/protobuf/utils.py,sha256=zi-kVx6yvgS2c04cUobLd2IDc_ZqKkWduay9YcpjoGc,4684
-devcycle_python_sdk/protobuf/variableForUserParams_pb2.py,sha256=Zf4-8n67UnulC0Sz90aqLYsXCFEgywOqfiSHuXZomLk,4244
-devcycle_python_sdk/protobuf/variableForUserParams_pb2.pyi,sha256=gjTD1KkBe5NaXixSq78eNTNbjdDjBQ0h5L4dUKKgDWQ,5659
+devcycle_python_sdk/protobuf/utils.py,sha256=6cBL8GZ5nCZw6JoO7lAdgCj9wM1u0lp6QFQMnGE1fiM,5414
+devcycle_python_sdk/protobuf/variableForUserParams_pb2.py,sha256=yawFsQ7m-6OB7DxrjXo2FLLkHhiTv6lDnjubhjAgw_8,5198
+devcycle_python_sdk/protobuf/variableForUserParams_pb2.pyi,sha256=tfN0zBapUPA9WGqUG5lU5XXgH_BsHTt5mgXKGsyS4-I,6623
 devcycle_python_sdk/util/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 devcycle_python_sdk/util/strings.py,sha256=gH0Xm3gIXNqn6hczKPk10Jn5_9knuD7OB5MrB7bqztw,252
 devcycle_python_sdk/util/version.py,sha256=Cz7Us_EuXP-T8GI47g2WHYdBJj_zKo-5y545IDHJAjI,253
-devcycle_python_server_sdk-3.11.3.dist-info/licenses/LICENSE,sha256=tHQMqu-Jic2UpMGqb-vNFbGygysl8IG4l1clnnh0OFo,1071
+devcycle_python_server_sdk-3.12.0.dist-info/licenses/LICENSE,sha256=tHQMqu-Jic2UpMGqb-vNFbGygysl8IG4l1clnnh0OFo,1071
 example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 example/cloud_client_example.py,sha256=YD8ZsTv3dPYfbFUKraRpRT0VsJGrPwjm8ZCuA5H54yI,2463
 example/local_bucketing_client_example.py,sha256=TaIfy3VnW9fXii9NPYs5UOuP4fLKruXMjnZApveqzl4,2796
 example/openfeature_example.py,sha256=kO6F-Xk20l6CPiMfIxSRreshEGmHMFHRg3zbeLXa3AI,2410
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-test/test_cloud_client.py,sha256=zjk302m7qKMCQryolkc1WKLFmbGWUxA0VtHlZk0rY-0,11442
-test/test_local_client.py,sha256=GpuN9eTYKpacol7BtsB_uiviyPUxiKtxBdRcuI1m9qA,13065
+test/test_cloud_client.py,sha256=oqOWh4aa07ObJOJeEjXMon0O2jPW_lYZMVInbFR-uzI,14586
+test/test_local_client.py,sha256=d0D0h2vqSiZItiqGXrlFXRRmuZG-TNg8MT84dY6w0Ks,16250
 test/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/api/test_bucketing_client.py,sha256=M2mjACowLvbsIjXdP-w8-fwY02xqv1X1r_h9v-pXa7A,7739
 test/api/test_config_client.py,sha256=3BwMm4y-4NQcdW2DDGppoJLIF-ffgjlUJti2Qjw1D1M,5129
 test/api/test_event_client.py,sha256=v4Xoum-PdywfczrfMV1llM5vrIJoqHybzxPLVokh09g,3310
-test/api/test_local_bucketing.py,sha256=0mReZ4bsFUoJWPAIcQrWXDZ9UoC5mF9MuI-9BVB6qjM,15561
+test/api/test_local_bucketing.py,sha256=0cbD8kiRYCVadvU-ldMES-sr7rV9Ld4H1q62HCx4AHU,15970
 test/fixture/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/fixture/data.py,sha256=6ReLxWPMhCDbJ5Ex24_iR0PJNjKzPFV1I9j_v0FVbBU,1462
 test/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -54,15 +58,15 @@ test/managers/test_config_manager.py,sha256=2TUnt8501KM7UlJNH7srIhvC-izehD7nOfqZ
 test/managers/test_event_queue_manager.py,sha256=z850atk8zAlD7sYaA1OJwgCFcfC0ps4NEk4XUnNCq1U,11629
 test/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/models/test_bucketed_config.py,sha256=8wCEyxaHxY21nl7ZbiFzp-IzZQBZIPIVPPzeREjumQk,858
-test/models/test_user.py,sha256=W1HaNtpuzfM2Tfm3XVMD7yDcekjtLH-b7_NZG5ovkUY,6738
+test/models/test_user.py,sha256=ZUbFUndYrnefyGl8rxZgG3HdHPZs4BosQWimkT7etJc,10540
 test/openfeature_test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-test/openfeature_test/test_provider.py,sha256=UPxAD5e7NvpIhmqNFCrTY_yrKrMyYxBc2xuMAgdSGvw,7653
-test/openfeature_test/test_provider_local_sdk.py,sha256=ad0QizKSS-lbqlIjiQvwtKHP7PCFfYam3OKHtvsFBkU,4426
+test/openfeature_test/test_provider.py,sha256=hIzdqqBTulGRODeTcRJUP93v76WEolUC2QRe3DccF3U,10932
+test/openfeature_test/test_provider_local_sdk.py,sha256=ExkA1LYLuvW-dD4Bw2BKggzDQ8GpnIp3WyNK4rUZgJQ,5696
 test/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/util/test_strings.py,sha256=T5H5U0af7_ld1yJC8IdDmay_Mx-iJQ5Fi5fbvKcAc7A,862
 test/util/test_utils.py,sha256=tVBJm_qnqg-4PssLpXIxqlk0JehuiAIPs4zpi2oNVnY,6671
 test/util/test_version.py,sha256=3Xg0_84m0bdHXz6pxd2Z85Oz9DoUC1T0Ol_WqEH_jac,335
-devcycle_python_server_sdk-3.11.3.dist-info/METADATA,sha256=7imNswc1zd_qIiCCAtUY6b6asiSXxrEyz3sEvflHtuU,723
-devcycle_python_server_sdk-3.11.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-devcycle_python_server_sdk-3.11.3.dist-info/top_level.txt,sha256=34f8zDzihAHoH7siAFlmscyO_QLNWWq9HApFlwtYL4k,33
-devcycle_python_server_sdk-3.11.3.dist-info/RECORD,,
+devcycle_python_server_sdk-3.12.0.dist-info/METADATA,sha256=-bA66ayqIdC5UFrsLx0jZ9m4eNSHzcdTuFvA-sY-IQE,723
+devcycle_python_server_sdk-3.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+devcycle_python_server_sdk-3.12.0.dist-info/top_level.txt,sha256=34f8zDzihAHoH7siAFlmscyO_QLNWWq9HApFlwtYL4k,33
+devcycle_python_server_sdk-3.12.0.dist-info/RECORD,,

test/api/test_local_bucketing.py

@@ -10,6 +10,7 @@ from devcycle_python_sdk.models.bucketed_config import (
     Project,
     ProjectSettings,
 )
+from devcycle_python_sdk.models.eval_reason import EvalReason
 from devcycle_python_sdk.models.feature import Feature
 from devcycle_python_sdk.models.variable import Variable
 from devcycle_python_sdk.models.platform_data import default_platform_data
@@ -155,6 +156,11 @@ class LocalBucketingTest(unittest.TestCase):
                 evalReason=None,
             )
         }
+        expected_eval = EvalReason(
+            reason="TARGETING_MATCH",
+            details="All Users",
+            target_id="63125321d31c601f992288bc",
+        )
         expected_variables = {
             "a-cool-new-feature": Variable(
                 _id="62fbf6566f1ba302829f9e34",
@@ -164,6 +170,7 @@ class LocalBucketingTest(unittest.TestCase):
                 isDefaulted=None,
                 defaultValue=None,
                 evalReason=None,
+                eval=expected_eval,
             ),
             "string-var": Variable(
                 _id="63125320a4719939fd57cb2b",
@@ -173,6 +180,7 @@ class LocalBucketingTest(unittest.TestCase):
                 isDefaulted=None,
                 defaultValue=None,
                 evalReason=None,
+                eval=expected_eval,
             ),
             "json-var": Variable(
                 _id="64372363125123fca69d3f7b",
@@ -186,6 +194,7 @@ class LocalBucketingTest(unittest.TestCase):
                 isDefaulted=None,
                 defaultValue=None,
                 evalReason=None,
+                eval=expected_eval,
             ),
             "num-var": Variable(
                 _id="65272363125123fca69d3a7d",
@@ -195,6 +204,7 @@ class LocalBucketingTest(unittest.TestCase):
                 isDefaulted=None,
                 defaultValue=None,
                 evalReason=None,
+                eval=expected_eval,
             ),
             "float-var": Variable(
                 _id="61200363125123fca69d3a7a",
@@ -204,6 +214,7 @@ class LocalBucketingTest(unittest.TestCase):
                 isDefaulted=None,
                 defaultValue=None,
                 evalReason=None,
+                eval=expected_eval,
             ),
         }
 

test/models/test_user.py

@@ -53,6 +53,96 @@ class DevCycleUserTest(unittest.TestCase):
         self.assertIsNotNone(user)
         self.assertEqual(user.user_id, test_user_id)
 
+    def test_create_user_from_context_with_user_id_attribute(self):
+        """Comprehensive test for userId attribute support including priority, functionality, and error cases"""
+        targeting_key_id = "targeting-12345"
+        user_id = "user_id-12345"
+        user_id_attr = "userId-12345"
+
+        # Test 1: userId as the only user ID source
+        context = EvaluationContext(
+            targeting_key=None, attributes={"userId": user_id_attr}
+        )
+        user = DevCycleUser.create_user_from_context(context)
+        self.assertIsNotNone(user)
+        self.assertEqual(user.user_id, user_id_attr)
+
+        # Test 2: Priority order - targeting_key > user_id > userId
+        context = EvaluationContext(
+            targeting_key=targeting_key_id,
+            attributes={"user_id": user_id, "userId": user_id_attr},
+        )
+        user = DevCycleUser.create_user_from_context(context)
+        self.assertEqual(user.user_id, targeting_key_id)
+
+        context = EvaluationContext(
+            targeting_key=None, attributes={"user_id": user_id, "userId": user_id_attr}
+        )
+        user = DevCycleUser.create_user_from_context(context)
+        self.assertEqual(user.user_id, user_id)
+
+        # Test 3: Error cases - invalid userId types
+        with self.assertRaises(TargetingKeyMissingError):
+            DevCycleUser.create_user_from_context(
+                EvaluationContext(targeting_key=None, attributes={"userId": 12345})
+            )
+
+        with self.assertRaises(TargetingKeyMissingError):
+            DevCycleUser.create_user_from_context(
+                EvaluationContext(targeting_key=None, attributes={"userId": None})
+            )
+
+    def test_create_user_from_context_user_id_exclusion(self):
+        """Test that all user ID fields (targeting_key, user_id, userId) are excluded from custom data"""
+        targeting_key_id = "targeting-12345"
+        user_id = "user_id-12345"
+        user_id_attr = "userId-12345"
+
+        # Test exclusion when targeting_key is used
+        context = EvaluationContext(
+            targeting_key=targeting_key_id,
+            attributes={
+                "user_id": user_id,
+                "userId": user_id_attr,
+                "targeting_key": "should-be-excluded",
+                "other_field": "value",
+            },
+        )
+        user = DevCycleUser.create_user_from_context(context)
+        self.assertEqual(user.user_id, targeting_key_id)
+        self.assertIsNotNone(user.customData)
+        self.assertNotIn("user_id", user.customData)
+        self.assertNotIn("userId", user.customData)
+        self.assertNotIn("targeting_key", user.customData)
+        self.assertEqual(user.customData["other_field"], "value")
+
+        # Test exclusion when user_id is used
+        context = EvaluationContext(
+            targeting_key=None,
+            attributes={
+                "user_id": user_id,
+                "userId": user_id_attr,
+                "other_field": "value",
+            },
+        )
+        user = DevCycleUser.create_user_from_context(context)
+        self.assertEqual(user.user_id, user_id)
+        self.assertIsNotNone(user.customData)
+        self.assertNotIn("user_id", user.customData)
+        self.assertNotIn("userId", user.customData)
+        self.assertEqual(user.customData["other_field"], "value")
+
+        # Test exclusion when userId is used
+        context = EvaluationContext(
+            targeting_key=None,
+            attributes={"userId": user_id_attr, "other_field": "value"},
+        )
+        user = DevCycleUser.create_user_from_context(context)
+        self.assertEqual(user.user_id, user_id_attr)
+        self.assertIsNotNone(user.customData)
+        self.assertNotIn("userId", user.customData)
+        self.assertEqual(user.customData["other_field"], "value")
+
     def test_create_user_from_context_with_attributes(self):
         test_user_id = "12345"
         context = EvaluationContext(