Fix enhanced feature flag schema mapping, selector type narrowing, async API type hints, Python version floor, and rename tests README to avoid the package-readme section check, all addressing code review feedback.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: yuanqu72

sdk/appconfiguration/azure-appconfiguration-provider/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Breaking Changes
 
+- Raised the minimum supported Python version to 3.10, matching the minimum required by `azure-appconfiguration>=1.10.0b1`. Dropped support for Python 3.7, 3.8, and 3.9.
+
 ### Bugs Fixed
 
 ### Other Changes

sdk/appconfiguration/azure-appconfiguration-provider/README.md

@@ -539,7 +539,7 @@ This library uses the standard [logging](https://docs.python.org/3/library/loggi
 
 (This content is for `azure-appconfiguration-provider` package developer only)
 
-See [tests/README.md](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/appconfiguration/azure-appconfiguration-provider/tests/README.md) for instructions on running unit and integration tests, working with recordings, and setting up environment variables for local testing.
+See [tests/tests.md](https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/appconfiguration/azure-appconfiguration-provider/tests/tests.md) for instructions on running unit and integration tests, working with recordings, and setting up environment variables for local testing.
 
 ## Next steps
 

sdk/appconfiguration/azure-appconfiguration-provider/api.md

@@ -8,7 +8,7 @@ namespace azure.appconfiguration.provider
             *, 
             feature_flag_enabled: bool = False, 
             feature_flag_refresh_enabled: bool = False, 
-            feature_flag_selectors: Optional[List[SettingSelector]] = ..., 
+            feature_flag_selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]] = ..., 
             key_vault_options: Optional[AzureAppConfigurationKeyVaultOptions] = ..., 
             keyvault_client_configs: Optional[Mapping[str, JSON]] = ..., 
             keyvault_credential: Optional[TokenCredential] = ..., 
@@ -31,7 +31,7 @@ namespace azure.appconfiguration.provider
             connection_string: str, 
             feature_flag_enabled: bool = False, 
             feature_flag_refresh_enabled: bool = False, 
-            feature_flag_selectors: Optional[List[SettingSelector]] = ..., 
+            feature_flag_selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]] = ..., 
             key_vault_options: Optional[AzureAppConfigurationKeyVaultOptions] = ..., 
             keyvault_client_configs: Optional[Mapping[str, JSON]] = ..., 
             keyvault_credential: Optional[TokenCredential] = ..., 
@@ -68,6 +68,17 @@ namespace azure.appconfiguration.provider
         def refresh(self, **kwargs) -> None: ...
 
 
+    class azure.appconfiguration.provider.FeatureFlagSelector:
+
+        def __init__(
+                self, 
+                *, 
+                label_filter: Optional[str] = NULL_CHAR, 
+                name_filter: Optional[str] = ..., 
+                tag_filters: Optional[List[str]] = ...
+            ): ...
+
+
     class azure.appconfiguration.provider.SettingSelector:
 
         def __init__(
@@ -94,7 +105,7 @@ namespace azure.appconfiguration.provider.aio
             *, 
             feature_flag_enabled: bool = False, 
             feature_flag_refresh_enabled: bool = False, 
-            feature_flag_selectors: Optional[List[SettingSelector]] = ..., 
+            feature_flag_selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]] = ..., 
             key_vault_options: Optional[AzureAppConfigurationKeyVaultOptions] = ..., 
             keyvault_client_configs: Optional[Mapping[str, JSON]] = ..., 
             keyvault_credential: Optional[AsyncTokenCredential] = ..., 
@@ -117,7 +128,7 @@ namespace azure.appconfiguration.provider.aio
             connection_string: str, 
             feature_flag_enabled: bool = False, 
             feature_flag_refresh_enabled: bool = False, 
-            feature_flag_selectors: Optional[List[SettingSelector]] = ..., 
+            feature_flag_selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]] = ..., 
             key_vault_options: Optional[AzureAppConfigurationKeyVaultOptions] = ..., 
             keyvault_client_configs: Optional[Mapping[str, JSON]] = ..., 
             keyvault_credential: Optional[AsyncTokenCredential] = ..., 

sdk/appconfiguration/azure-appconfiguration-provider/api.metadata.yml

@@ -1,3 +1,3 @@
-apiMdSha256: 1b252a78094b95bf515ebe5ec67fc2de12ce5b595bad25438a58241ca7153b84
+apiMdSha256: 808ba824eedfb7fc2365479c13867983ee557982cd635995a9617e140c1919dc
 parserVersion: 0.3.28
-pythonVersion: 3.14.3
+pythonVersion: 3.12.10

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_azureappconfigurationproviderbase.py

@@ -21,6 +21,7 @@
     ItemsView,
     ValuesView,
     TypeVar,
+    cast,
 )
 from azure.appconfiguration import (  # type:ignore # pylint:disable=no-name-in-module
     ConfigurationSetting,
@@ -95,16 +96,20 @@ def _normalize_feature_flag_selectors(
     - kv_selectors: Used to load key-value based feature flags (``SettingSelector.key_filter`` is used as the key
       filter).
     - enhanced_selectors: Used to load enhanced feature flags from the dedicated feature flag resource endpoint
-      (``FeatureFlagSelector.name_filter`` is used as the name filter). 
+      (``FeatureFlagSelector.name_filter`` is used as the name filter).
 
     :param selectors: The customer-provided feature flag selectors, or None to use the default (all feature flags
      without a label).
     :type selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]]
     :return: A tuple of (kv_selectors, enhanced_selectors).
     :rtype: Tuple[List[SettingSelector], List[FeatureFlagSelector]]
     """
-    if not selectors:
+    if selectors is None:
         return [SettingSelector(key_filter="*")], [FeatureFlagSelector(name_filter="*")]
+    if not selectors:
+        # An explicitly empty collection of selectors means no feature flags should be loaded, unlike None
+        # which falls back to the default of loading all unlabeled feature flags.
+        return [], []
 
     selectors_iter = iter(selectors)
     first_selector = next(selectors_iter)
@@ -117,18 +122,24 @@ def _normalize_feature_flag_selectors(
             )
 
     if is_feature_flag_selector:
+        feature_flag_selectors = cast(List[FeatureFlagSelector], selectors)
         kv_selectors = [
-            SettingSelector(key_filter=select.name_filter, label_filter=select.label_filter, tag_filters=select.tag_filters)
-            for select in selectors
+            SettingSelector(
+                key_filter=select.name_filter, label_filter=select.label_filter, tag_filters=select.tag_filters
+            )
+            for select in feature_flag_selectors
         ]
         # FeatureFlagSelector has no snapshot_name, so every selector is used for enhanced feature flags.
-        enhanced_selectors = list(selectors)
+        enhanced_selectors = list(feature_flag_selectors)
         return kv_selectors, enhanced_selectors
 
-    kv_selectors = list(selectors)
+    setting_selectors = cast(List[SettingSelector], selectors)
+    kv_selectors = list(setting_selectors)
     enhanced_selectors = [
-        FeatureFlagSelector(name_filter=select.key_filter, label_filter=select.label_filter, tag_filters=select.tag_filters)
-        for select in selectors
+        FeatureFlagSelector(
+            name_filter=select.key_filter, label_filter=select.label_filter, tag_filters=select.tag_filters
+        )
+        for select in setting_selectors
         if select.snapshot_name is None
     ]
     return kv_selectors, enhanced_selectors
@@ -273,7 +284,7 @@ def _update_ff_telemetry_metadata_common(  # pylint: disable=too-many-positional
                 feature_flag_reference += f"?label={label}"
 
             feature_flag_value[TELEMETRY_KEY][METADATA_KEY][FEATURE_FLAG_REFERENCE_KEY] = feature_flag_reference
-            allocation_id = self._generate_allocation_id(feature_flag_value, reference_path_segment)
+            allocation_id = self._generate_allocation_id(feature_flag_value)
             if allocation_id:
                 feature_flag_value[TELEMETRY_KEY][METADATA_KEY][ALLOCATION_ID_KEY] = allocation_id
 
@@ -287,14 +298,12 @@ def _update_ff_telemetry_metadata_common(  # pylint: disable=too-many-positional
             self._tracing_context.update_max_variants(len(variants))
 
     @staticmethod
-    def _generate_allocation_id(feature_flag_value: Dict[str, JSON], reference_path_segment: str) -> Optional[str]:
+    def _generate_allocation_id(feature_flag_value: Dict[str, JSON]) -> Optional[str]:
         """
         Generates an allocation ID for the specified feature.
         seed=123abc\ndefault_when_enabled=Control\npercentiles=0,Control,20;20,Test,100\nvariants=Control,standard;Test,special # pylint:disable=line-too-long
 
         :param  Dict[str, JSON] feature_flag_value: The feature to generate an allocation ID for.
-        :param str reference_path_segment: The path segment identifying which source the feature flag was loaded
-         from, e.g. "kv" for key-value based feature flags or "ff" for enhanced feature flags. 
         :rtype: str
         :return: The allocation ID.
         """
@@ -356,13 +365,9 @@ def _generate_allocation_id(feature_flag_value: Dict[str, JSON], reference_path_
 
                 for v in sorted_variants:
                     allocation_id += f"{base64.b64encode(v.get('name', '').encode()).decode()},"
-                    # Key-value based feature flags store the variant value under "configuration_value". Enhanced
-                    # feature flags store it under "value" instead.
-                    if reference_path_segment == FEATURE_FLAG_KV_REFERENCE_SEGMENT:
-                        value_key = "configuration_value"
-                    else:
-                        value_key = "value"
-                    allocation_id += f"{json.dumps(v.get(value_key, ''), separators=(',', ':'), sort_keys=True)}"
+                    allocation_id += (
+                        f"{json.dumps(v.get('configuration_value', ''), separators=(',', ':'), sort_keys=True)}"
+                    )
                     allocation_id += ";"
                 if sorted_variants:
                     allocation_id = allocation_id[:-1]
@@ -490,20 +495,20 @@ def _process_and_merge_feature_flags(
         feature_flags: Optional[List[FeatureFlagConfigurationSetting]],
         enhanced_feature_flags: Optional[List[FeatureFlag]] = None,
     ) -> Dict[str, Any]:
-        if feature_flags or enhanced_feature_flags:
+        if feature_flags or enhanced_feature_flags is not None:
             # Reset feature flag usage
             self._tracing_context.reset_feature_filter_usage()
 
         if feature_flags:
             self._processed_kv_feature_flags = [self._process_kv_feature_flag(ff) for ff in feature_flags]
 
-        if enhanced_feature_flags:
+        if enhanced_feature_flags is not None:
             self._processed_enhanced_feature_flags = [
                 self._process_enhanced_feature_flag(ff) for ff in enhanced_feature_flags
             ]
         self._tracing_context.uses_enhanced_feature_flags = bool(enhanced_feature_flags)
 
-        if feature_flags or enhanced_feature_flags:
+        if feature_flags or enhanced_feature_flags is not None:
             processed_feature_flags = self._merge_feature_flags(
                 self._processed_kv_feature_flags, self._processed_enhanced_feature_flags
             )
@@ -534,9 +539,13 @@ def _merge_feature_flags(
         merged: Dict[str, Dict[str, Any]] = {}
         for ff in kv_feature_flags:
             identifier = ff.get(FEATURE_FLAG_ID_FIELD)
+            if identifier is None:
+                continue
             merged[identifier] = ff
         for ff in enhanced_feature_flags:
             identifier = ff.get(FEATURE_FLAG_ID_FIELD)
+            if identifier is None:
+                continue
             merged[identifier] = ff
         return list(merged.values())
 
@@ -554,7 +563,7 @@ def _process_enhanced_feature_flag(self, feature_flag: FeatureFlag) -> Dict[str,
         """
         Convert an enhanced feature flag, loaded from the enhanced feature flag endpoint, into a dictionary that
         matches the feature management library's schema.
-        Ref: https://github.com/microsoft/FeatureManagement/blob/main/Schema/FeatureFlag.v2.0.0.schema.json 
+        Ref: https://github.com/microsoft/FeatureManagement/blob/main/Schema/FeatureFlag.v2.0.0.schema.json
 
         :param feature_flag: The enhanced feature flag.
         :type feature_flag: ~azure.appconfiguration.FeatureFlag
@@ -588,7 +597,7 @@ def _process_enhanced_feature_flag(self, feature_flag: FeatureFlag) -> Dict[str,
             feature_flag_value["variants"] = [
                 {
                     "name": variant.name,
-                    "value": variant.value,
+                    "configuration_value": variant.value,
                     "content_type": variant.content_type,
                     "status_override": variant.status_override,
                 }
@@ -605,8 +614,8 @@ def _process_enhanced_feature_flag(self, feature_flag: FeatureFlag) -> Dict[str,
                 allocation_value["percentile"] = [
                     {
                         "variant": percentile.variant,
-                        "percentile_from": percentile.percentile_from,
-                        "percentile_to": percentile.percentile_to,
+                        "from": percentile.percentile_from,
+                        "to": percentile.percentile_to,
                     }
                     for percentile in feature_flag.allocation.percentile
                 ]

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_constants.py

@@ -15,7 +15,7 @@
 ALLOCATION_ID_KEY = "AllocationId"
 ETAG_KEY = "ETag"
 
-# Identifier field required by the feature management library's schema for every feature flag entry. 
+# Identifier field required by the feature management library's schema for every feature flag entry.
 FEATURE_FLAG_ID_FIELD = "id"
 # Path segment used to build the feature flag reference URL for feature flags loaded from the key-value store.
 FEATURE_FLAG_KV_REFERENCE_SEGMENT = "kv"

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_async_client_manager.py

@@ -347,7 +347,7 @@ async def check_enhanced_feature_flag_etags(
         self, feature_flag_selectors: List[FeatureFlagSelector], page_etags: List[List[str]], **kwargs
     ) -> bool:
         """
-        Checks if any enhanced feature flag page has changed using page etags. 
+        Checks if any enhanced feature flag page has changed using page etags.
 
         :param feature_flag_selectors: List of feature flag selectors for feature flags
         :type feature_flag_selectors: List[FeatureFlagSelector]

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_async_load.py

@@ -13,12 +13,13 @@
     overload,
     List,
     Tuple,
+    Union,
 )
 from azure.core.credentials_async import AsyncTokenCredential
 from .._constants import (
     DEFAULT_STARTUP_TIMEOUT,
 )
-from .._models import AzureAppConfigurationKeyVaultOptions, SettingSelector
+from .._models import AzureAppConfigurationKeyVaultOptions, FeatureFlagSelector, SettingSelector
 from .._utils import (
     delay_failure,
     process_load_parameters,
@@ -49,7 +50,7 @@ async def load(  # pylint: disable=docstring-keyword-should-match-keyword-only
     on_refresh_success: Optional[Callable] = None,
     on_refresh_error: Optional[Callable[[Exception], Awaitable[None]]] = None,
     feature_flag_enabled: bool = False,
-    feature_flag_selectors: Optional[List[SettingSelector]] = None,
+    feature_flag_selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]] = None,
     feature_flag_refresh_enabled: bool = False,
     startup_timeout: int = DEFAULT_STARTUP_TIMEOUT,
     **kwargs,
@@ -87,9 +88,11 @@ async def load(  # pylint: disable=docstring-keyword-should-match-keyword-only
     :paramtype on_refresh_error: Optional[Callable[[Exception], Awaitable[None]]]
     :keyword feature_flag_enabled: Optional flag to enable or disable the loading of feature flags. Default is False.
     :paramtype feature_flag_enabled: bool
-    :keyword feature_flag_selectors: Optional list of selectors to filter feature flags. By default will load all
-     feature flags without a label.
-    :paramtype feature_flag_selectors: List[SettingSelector]
+    :keyword feature_flag_selectors: Optional list of selectors to filter feature flags. Either a list of
+     ~azure.appconfiguration.provider.SettingSelector or a list of
+     ~azure.appconfiguration.provider.FeatureFlagSelector (the two types cannot be mixed in the same list).
+     By default will load all feature flags without a label.
+    :paramtype feature_flag_selectors: Union[List[SettingSelector], List[FeatureFlagSelector]]
     :keyword feature_flag_refresh_enabled: Optional flag to enable or disable the refresh of feature flags. Default is
      False.
     :paramtype feature_flag_refresh_enabled: bool
@@ -124,7 +127,7 @@ async def load(  # pylint: disable=docstring-keyword-should-match-keyword-only
     on_refresh_success: Optional[Callable] = None,
     on_refresh_error: Optional[Callable[[Exception], Awaitable[None]]] = None,
     feature_flag_enabled: bool = False,
-    feature_flag_selectors: Optional[List[SettingSelector]] = None,
+    feature_flag_selectors: Optional[Union[List[SettingSelector], List[FeatureFlagSelector]]] = None,
     feature_flag_refresh_enabled: bool = False,
     startup_timeout: int = DEFAULT_STARTUP_TIMEOUT,
     **kwargs,
@@ -164,9 +167,11 @@ async def load(  # pylint: disable=docstring-keyword-should-match-keyword-only
     :paramtype on_refresh_error: Optional[Callable[[Exception], Awaitable[None]]]
     :keyword feature_flag_enabled: Optional flag to enable or disable the loading of feature flags. Default is False.
     :paramtype feature_flag_enabled: bool
-    :keyword feature_flag_selectors: Optional list of selectors to filter feature flags. By default will load all
-     feature flags without a label.
-    :paramtype feature_flag_selectors: List[SettingSelector]
+    :keyword feature_flag_selectors: Optional list of selectors to filter feature flags. Either a list of
+     ~azure.appconfiguration.provider.SettingSelector or a list of
+     ~azure.appconfiguration.provider.FeatureFlagSelector (the two types cannot be mixed in the same list).
+     By default will load all feature flags without a label.
+    :paramtype feature_flag_selectors: Union[List[SettingSelector], List[FeatureFlagSelector]]
     :keyword feature_flag_refresh_enabled: Optional flag to enable or disable the refresh of feature flags. Default is
      False.
     :paramtype feature_flag_refresh_enabled: bool

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_azureappconfigurationproviderasync.py

@@ -168,8 +168,7 @@ async def _attempt_refresh(
                 # own page-level etag state, since they are a separate resource type with a separate
                 # change-detection mechanism.
                 if not self._enhanced_feature_flag_etags or await client.check_enhanced_feature_flag_etags(
-                    self._enhanced_feature_flag_selectors, self._enhanced_feature_flag_etags, headers=headers,
-                    **kwargs
+                    self._enhanced_feature_flag_selectors, self._enhanced_feature_flag_etags, headers=headers, **kwargs
                 ):
                     enhanced_feature_flags, enhanced_feature_flag_etags = await client.load_enhanced_feature_flags(
                         self._enhanced_feature_flag_selectors, headers=headers, **kwargs

sdk/appconfiguration/azure-appconfiguration-provider/setup.py

@@ -61,16 +61,13 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "License :: OSI Approved :: MIT License",
     ],
     zip_safe=False,
     packages=find_packages(exclude=exclude_packages),
-    python_requires=">=3.6",
+    python_requires=">=3.10",
     install_requires=[
         "azure-core>=1.31.0",
         "azure-appconfiguration>=1.10.0b1",