Updating imports and constants

Author: mrm9084

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

@@ -24,20 +24,6 @@
 ETAG_KEY = "ETag"
 FEATURE_FLAG_REFERENCE_KEY = "FeatureFlagReference"
 
-PERCENTAGE_FILTER_NAMES = ["Percentage", "PercentageFilter", "Microsoft.Percentage", "Microsoft.PercentageFilter"]
-TIME_WINDOW_FILTER_NAMES = ["TimeWindow", "TimeWindowFilter", "Microsoft.TimeWindow", "Microsoft.TimeWindowFilter"]
-TARGETING_FILTER_NAMES = ["Targeting", "TargetingFilter", "Microsoft.Targeting", "Microsoft.TargetingFilter"]
-
-CUSTOM_FILTER_KEY = "CSTM"  # cspell:disable-line
-PERCENTAGE_FILTER_KEY = "PRCNT"  # cspell:disable-line
-TIME_WINDOW_FILTER_KEY = "TIME"
-TARGETING_FILTER_KEY = "TRGT"  # cspell:disable-line
-
-FEATURE_FLAG_USES_TELEMETRY_TAG = "Telemetry"
-FEATURE_FLAG_USES_SEED_TAG = "Seed"
-FEATURE_FLAG_MAX_VARIANTS_KEY = "MaxVariants"
-FEATURE_FLAG_FEATURES_KEY = "FFFeatures"
-
 # Mime profiles
 APP_CONFIG_AI_MIME_PROFILE = "https://azconfig.io/mime-profiles/ai/"
 APP_CONFIG_AICC_MIME_PROFILE = "https://azconfig.io/mime-profiles/ai/chat-completion"

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

@@ -13,17 +13,27 @@
     AzureWebAppEnvironmentVariable,
     ContainerAppEnvironmentVariable,
     KubernetesEnvironmentVariable,
-    CUSTOM_FILTER_KEY,
-    PERCENTAGE_FILTER_KEY,
-    TIME_WINDOW_FILTER_KEY,
-    TARGETING_FILTER_KEY,
-    PERCENTAGE_FILTER_NAMES,
-    TIME_WINDOW_FILTER_NAMES,
-    TARGETING_FILTER_NAMES,
-    FEATURE_FLAG_USES_SEED_TAG,
-    FEATURE_FLAG_USES_TELEMETRY_TAG,
+    APP_CONFIG_AI_MIME_PROFILE,
 )
 
+# Feature flag filter names
+PERCENTAGE_FILTER_NAMES = ["Percentage", "PercentageFilter", "Microsoft.Percentage", "Microsoft.PercentageFilter"]
+TIME_WINDOW_FILTER_NAMES = ["TimeWindow", "TimeWindowFilter", "Microsoft.TimeWindow", "Microsoft.TimeWindowFilter"]
+TARGETING_FILTER_NAMES = ["Targeting", "TargetingFilter", "Microsoft.Targeting", "Microsoft.TargetingFilter"]
+
+CUSTOM_FILTER_KEY = "CSTM"  # cspell:disable-line
+PERCENTAGE_FILTER_KEY = "PRCNT"  # cspell:disable-line
+TIME_WINDOW_FILTER_KEY = "TIME"
+TARGETING_FILTER_KEY = "TRGT"  # cspell:disable-line
+
+FEATURE_FLAG_USES_TELEMETRY_TAG = "Telemetry"
+FEATURE_FLAG_USES_SEED_TAG = "Seed"
+FEATURE_FLAG_MAX_VARIANTS_KEY = "MaxVariants"
+FEATURE_FLAG_FEATURES_KEY = "FFFeatures"
+
+CHAT_COMPLETION_PROFILE = "chat-completion"
+
+
 # Feature flag constants for telemetry
 LOAD_BALANCING_FEATURE = "LB"
 AI_CONFIGURATION_FEATURE = "AI"
@@ -33,10 +43,6 @@
 # Package name constants
 AZURE_AI_PROJECTS_PACKAGE = "azure-ai-projects"
 
-# MIME profile constants
-AI_MIME_PROFILE = "https://azconfig.io/mime-profiles/ai"
-CHAT_COMPLETION_PROFILE = "chat-completion"
-
 # Correlation context constants
 FEATUREMANAGEMENT_PACKAGE = "featuremanagement"
 CORRELATION_CONTEXT_HEADER = "Correlation-Context"
@@ -199,7 +205,7 @@ def update_ai_configuration_tracing(self, content_type: Optional[str]) -> None:
             return
 
         # Check for AI mime profiles in content type
-        if AI_MIME_PROFILE in content_type:
+        if APP_CONFIG_AI_MIME_PROFILE in content_type:
             self.uses_ai_configuration = True
             if CHAT_COMPLETION_PROFILE in content_type:
                 self.uses_aicc_configuration = True
@@ -269,21 +275,19 @@ def update_correlation_context_header(
             key_values.append((MAX_VARIANTS_KEY, str(self.max_variants)))
 
         # Add feature flag features if present
-        if self.uses_seed or self.uses_telemetry:
-            ff_features_string = self._create_features_string()
-            if ff_features_string:
-                key_values.append((FF_FEATURES_KEY, ff_features_string))
+        ff_features_string = self._create_features_string()
+        if ff_features_string:
+            key_values.append((FF_FEATURES_KEY, ff_features_string))
+
+        # Add general features if present
+        features_string = self._get_features_string()
+        if features_string:
+            key_values.append((FEATURES_KEY, features_string))
 
         # Add version information
         if self.feature_management_version:
             key_values.append((FM_PY_VER_KEY, self.feature_management_version))
 
-        # Add general features if present
-        if self.uses_load_balancing or self.uses_ai_configuration or self.uses_aicc_configuration:
-            features_string = self._get_features_string()
-            if features_string:
-                key_values.append((FEATURES_KEY, features_string))
-
         # Add tags
         if self.is_key_vault_configured:
             tags.append(USES_KEY_VAULT_TAG)

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_azureappconfigurationproviderbase.py

@@ -22,19 +22,10 @@
 from azure.appconfiguration.provider._models import SettingSelector
 from azure.appconfiguration.provider._constants import (
     NULL_CHAR,
-    CUSTOM_FILTER_KEY,
-    PERCENTAGE_FILTER_KEY,
-    TIME_WINDOW_FILTER_KEY,
-    TARGETING_FILTER_KEY,
-    PERCENTAGE_FILTER_NAMES,
-    TIME_WINDOW_FILTER_NAMES,
-    TARGETING_FILTER_NAMES,
     TELEMETRY_KEY,
     METADATA_KEY,
     ETAG_KEY,
     FEATURE_FLAG_REFERENCE_KEY,
-    APP_CONFIG_AI_MIME_PROFILE,
-    APP_CONFIG_AICC_MIME_PROFILE,
 )
 from azure.appconfiguration.provider._refresh_timer import _RefreshTimer
 

sdk/appconfiguration/azure-appconfiguration-provider/tests/test_request_tracing_context.py

@@ -11,14 +11,6 @@
     _RequestTracingContext,
     HostType,
     RequestType,
-)
-from azure.appconfiguration.provider._constants import (
-    REQUEST_TRACING_DISABLED_ENVIRONMENT_VARIABLE,
-    ServiceFabricEnvironmentVariable,
-    AzureFunctionEnvironmentVariable,
-    AzureWebAppEnvironmentVariable,
-    ContainerAppEnvironmentVariable,
-    KubernetesEnvironmentVariable,
     CUSTOM_FILTER_KEY,
     PERCENTAGE_FILTER_KEY,
     TIME_WINDOW_FILTER_KEY,
@@ -29,6 +21,16 @@
     FEATURE_FLAG_USES_SEED_TAG,
     FEATURE_FLAG_USES_TELEMETRY_TAG,
 )
+from azure.appconfiguration.provider._constants import (
+    REQUEST_TRACING_DISABLED_ENVIRONMENT_VARIABLE,
+    ServiceFabricEnvironmentVariable,
+    AzureFunctionEnvironmentVariable,
+    AzureWebAppEnvironmentVariable,
+    ContainerAppEnvironmentVariable,
+    KubernetesEnvironmentVariable,
+    APP_CONFIG_AI_MIME_PROFILE,
+    APP_CONFIG_AICC_MIME_PROFILE,
+)
 
 
 class TestRequestTracingContext(unittest.TestCase):
@@ -168,15 +170,15 @@ def test_reset_ai_configuration_tracing(self):
 
     def test_update_ai_configuration_tracing_ai_profile(self):
         """Test update_ai_configuration_tracing with AI profile."""
-        content_type = "application/json; https://azconfig.io/mime-profiles/ai"
+        content_type = "application/json; " + APP_CONFIG_AI_MIME_PROFILE
         self.context.update_ai_configuration_tracing(content_type)
 
         self.assertTrue(self.context.uses_ai_configuration)
         self.assertFalse(self.context.uses_aicc_configuration)
 
     def test_update_ai_configuration_tracing_aicc_profile(self):
         """Test update_ai_configuration_tracing with AI Chat Completion profile."""
-        content_type = "application/json; https://azconfig.io/mime-profiles/ai+chat-completion"
+        content_type = "application/json; " + APP_CONFIG_AICC_MIME_PROFILE
         self.context.update_ai_configuration_tracing(content_type)
 
         self.assertTrue(self.context.uses_ai_configuration)