Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(api): resolve aliases in remote settings sources (#41463)
JackSmithe34b2f90452c
diff --git a/api/configs/remote_settings_sources/apollo/__init__.py b/api/configs/remote_settings_sources/apollo/__init__.pyindex d017b86ad5f..1c8c42cd3d2 100644--- a/api/configs/remote_settings_sources/apollo/__init__.py+++ b/api/configs/remote_settings_sources/apollo/__init__.py@@ -52,5 +52,4 @@ class ApolloSettingsSource(RemoteSettingsSource):def get_field_value(self, field: FieldInfo, field_name: str) -> tuple[Any, str, bool]:if not isinstance(self.remote_configs, dict):raise ValueError(f"remote configs is not dict, but {type(self.remote_configs)}")- field_value = self.remote_configs.get(field_name)- return field_value, field_name, False+ return self.resolve_field_value(self.remote_configs, field, field_name)diff --git a/api/configs/remote_settings_sources/base.py b/api/configs/remote_settings_sources/base.pyindex 44ac2acd064..c7f5e8828fb 100644--- a/api/configs/remote_settings_sources/base.py+++ b/api/configs/remote_settings_sources/base.py@@ -1,6 +1,7 @@from collections.abc import Mappingfrom typing import Any+from pydantic import AliasChoicesfrom pydantic.fields import FieldInfo@@ -11,5 +12,28 @@ class RemoteSettingsSource:def get_field_value(self, field: FieldInfo, field_name: str) -> tuple[Any, str, bool]:raise NotImplementedError+ @staticmethod+ def resolve_field_value(+ remote_configs: Mapping[str, Any], field: FieldInfo, field_name: str+ ) -> tuple[Any, str, bool]:+ field_value = remote_configs.get(field_name)+ if field_value is not None:+ return field_value, field_name, False++ validation_alias = field.validation_alias+ if isinstance(validation_alias, str):+ aliases = [validation_alias]+ elif isinstance(validation_alias, AliasChoices):+ aliases = [alias for alias in validation_alias.choices if isinstance(alias, str)]+ else:+ aliases = []++ for alias in aliases:+ field_value = remote_configs.get(alias)+ if field_value is not None:+ return field_value, alias, False++ return None, field_name, False+def prepare_field_value(self, field_name: str, field: FieldInfo, value: Any, value_is_complex: bool):return valuediff --git a/api/configs/remote_settings_sources/nacos/__init__.py b/api/configs/remote_settings_sources/nacos/__init__.pyindex ddef8a5f49d..96731342f73 100644--- a/api/configs/remote_settings_sources/nacos/__init__.py+++ b/api/configs/remote_settings_sources/nacos/__init__.py@@ -43,8 +43,4 @@ class NacosSettingsSource(RemoteSettingsSource):@overridedef get_field_value(self, field: FieldInfo, field_name: str) -> tuple[Any, str, bool]:- field_value = self.remote_configs.get(field_name)- if field_value is None:- return None, field_name, False-- return field_value, field_name, False+ return self.resolve_field_value(self.remote_configs, field, field_name)diff --git a/api/tests/unit_tests/configs/test_remote_settings_sources.py b/api/tests/unit_tests/configs/test_remote_settings_sources.pynew file mode 100644index 00000000000..e747de46a29--- /dev/null+++ b/api/tests/unit_tests/configs/test_remote_settings_sources.py@@ -0,0 +1,39 @@+import pytest+from pydantic import AliasChoices+from pydantic.fields import FieldInfo++from configs.remote_settings_sources.apollo import ApolloSettingsSource+from configs.remote_settings_sources.nacos import NacosSettingsSource++[email protected]("source_cls", [NacosSettingsSource, ApolloSettingsSource])+def test_get_field_value_prefers_field_name(+ source_cls: type[NacosSettingsSource] | type[ApolloSettingsSource],+) -> None:+ source = object.__new__(source_cls)+ source.remote_configs = {"SETTING": "direct", "ALIAS": "aliased"}+ field = FieldInfo(validation_alias="ALIAS")++ assert source.get_field_value(field, "SETTING") == ("direct", "SETTING", False)++[email protected]("source_cls", [NacosSettingsSource, ApolloSettingsSource])+def test_get_field_value_falls_back_to_single_validation_alias(+ source_cls: type[NacosSettingsSource] | type[ApolloSettingsSource],+) -> None:+ source = object.__new__(source_cls)+ source.remote_configs = {"ALIAS": "aliased"}+ field = FieldInfo(validation_alias="ALIAS")++ assert source.get_field_value(field, "SETTING") == ("aliased", "ALIAS", False)++[email protected]("source_cls", [NacosSettingsSource, ApolloSettingsSource])+def test_get_field_value_falls_back_to_alias_choices_in_order(+ source_cls: type[NacosSettingsSource] | type[ApolloSettingsSource],+) -> None:+ source = object.__new__(source_cls)+ source.remote_configs = {"SECOND_ALIAS": "second"}+ field = FieldInfo(validation_alias=AliasChoices("FIRST_ALIAS", "SECOND_ALIAS"))++ assert source.get_field_value(field, "SETTING") == ("second", "SECOND_ALIAS", False)