Добавлен tomtom
This commit is contained in:
@@ -19,6 +19,7 @@ address_suggestions:
|
||||
country_to_provider:
|
||||
RU: "dadata"
|
||||
AM: "yandex_geosuggest"
|
||||
DE: "tomtom"
|
||||
dadata:
|
||||
url: "https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address"
|
||||
api_key: "default-dadata-key"
|
||||
@@ -26,6 +27,10 @@ address_suggestions:
|
||||
url: "https://suggest-maps.yandex.ru/v1/suggest"
|
||||
api_key: "default-yandex-key"
|
||||
timeout_seconds: 4.0
|
||||
tomtom:
|
||||
url: "https://api.tomtom.com/search/2/search"
|
||||
api_key: "default-tomtom-key"
|
||||
timeout_seconds: 4.25
|
||||
|
||||
observability:
|
||||
enabled: false
|
||||
|
||||
@@ -19,6 +19,7 @@ address_suggestions:
|
||||
country_to_provider:
|
||||
RU: "dadata"
|
||||
AM: "yandex_geosuggest"
|
||||
DE: "tomtom"
|
||||
dadata:
|
||||
url: "https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address"
|
||||
api_key: "override-dadata-key"
|
||||
@@ -27,6 +28,10 @@ address_suggestions:
|
||||
url: "https://suggest-maps.yandex.ru/v1/suggest"
|
||||
api_key: "override-yandex-key"
|
||||
timeout_seconds: 4.5
|
||||
tomtom:
|
||||
url: "https://api.tomtom.com/search/2/search"
|
||||
api_key: "override-tomtom-key"
|
||||
timeout_seconds: 5.25
|
||||
|
||||
observability:
|
||||
enabled: true
|
||||
|
||||
@@ -41,6 +41,51 @@ MISSING_OBSERVABILITY_ENDPOINT_CONFIG_FILE = (
|
||||
/ "fixtures"
|
||||
/ "config.missing_observability_endpoint.yaml"
|
||||
)
|
||||
_DADATA_COUNTRIES = ("RU", "BY", "KZ")
|
||||
_YANDEX_COUNTRIES = ("AM", "AZ", "KG", "MD", "TJ", "TM", "UZ")
|
||||
_TOMTOM_COUNTRIES = (
|
||||
"AL",
|
||||
"AT",
|
||||
"BE",
|
||||
"BG",
|
||||
"CH",
|
||||
"CZ",
|
||||
"DE",
|
||||
"DK",
|
||||
"EE",
|
||||
"ES",
|
||||
"FI",
|
||||
"FR",
|
||||
"GB",
|
||||
"GR",
|
||||
"HR",
|
||||
"HU",
|
||||
"IE",
|
||||
"IT",
|
||||
"LT",
|
||||
"LV",
|
||||
"NL",
|
||||
"NO",
|
||||
"PL",
|
||||
"PT",
|
||||
"RO",
|
||||
"RS",
|
||||
"SE",
|
||||
"SI",
|
||||
"SK",
|
||||
"UA",
|
||||
)
|
||||
|
||||
|
||||
def _expected_country_mapping() -> dict[str, str]:
|
||||
return {
|
||||
**{country_code: "dadata" for country_code in _DADATA_COUNTRIES},
|
||||
**{
|
||||
country_code: "yandex_geosuggest"
|
||||
for country_code in _YANDEX_COUNTRIES
|
||||
},
|
||||
**{country_code: "tomtom" for country_code in _TOMTOM_COUNTRIES},
|
||||
}
|
||||
|
||||
|
||||
def _use_runtime_config_files(
|
||||
@@ -81,18 +126,7 @@ def test_configuration_sections_are_loaded_from_yaml_file(
|
||||
assert settings.adapter.cdek_retry_backoff_seconds == 0.2
|
||||
assert settings.adapter.cdek_timeout_seconds == 10.0
|
||||
assert settings.adapter.cdek_cache_ttl_seconds == 900
|
||||
assert settings.address_suggestions.country_to_provider == {
|
||||
"RU": "dadata",
|
||||
"BY": "dadata",
|
||||
"KZ": "dadata",
|
||||
"AM": "yandex_geosuggest",
|
||||
"AZ": "yandex_geosuggest",
|
||||
"KG": "yandex_geosuggest",
|
||||
"MD": "yandex_geosuggest",
|
||||
"TJ": "yandex_geosuggest",
|
||||
"TM": "yandex_geosuggest",
|
||||
"UZ": "yandex_geosuggest",
|
||||
}
|
||||
assert settings.address_suggestions.country_to_provider == _expected_country_mapping()
|
||||
assert (
|
||||
settings.address_suggestions.dadata.url
|
||||
== "https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address"
|
||||
@@ -108,6 +142,9 @@ def test_configuration_sections_are_loaded_from_yaml_file(
|
||||
== "test-yandex-geosuggest-api-key"
|
||||
)
|
||||
assert settings.address_suggestions.yandex_geosuggest.timeout_seconds == 6.5
|
||||
assert settings.address_suggestions.tomtom.url == "https://api.tomtom.com/search/2/search"
|
||||
assert settings.address_suggestions.tomtom.api_key == "test-tomtom-api-key"
|
||||
assert settings.address_suggestions.tomtom.timeout_seconds == 5.5
|
||||
assert settings.observability.enabled is False
|
||||
assert settings.observability.service_name == "g2s-aggregator-test"
|
||||
assert settings.observability.otlp_endpoint == "http://localhost:4317"
|
||||
@@ -178,11 +215,14 @@ def test_get_settings_uses_config_test_yaml_in_pytest_environment(
|
||||
assert settings.address_suggestions.country_to_provider == {
|
||||
"RU": "dadata",
|
||||
"AM": "yandex_geosuggest",
|
||||
"DE": "tomtom",
|
||||
}
|
||||
assert settings.address_suggestions.dadata.api_key == "override-dadata-key"
|
||||
assert settings.address_suggestions.dadata.timeout_seconds == 3.0
|
||||
assert settings.address_suggestions.yandex_geosuggest.api_key == "override-yandex-key"
|
||||
assert settings.address_suggestions.yandex_geosuggest.timeout_seconds == 4.5
|
||||
assert settings.address_suggestions.tomtom.api_key == "override-tomtom-key"
|
||||
assert settings.address_suggestions.tomtom.timeout_seconds == 5.25
|
||||
assert settings.observability.enabled is True
|
||||
assert settings.observability.service_name == "override-config-service"
|
||||
assert settings.observability.otlp_endpoint == "http://override-collector:4317"
|
||||
|
||||
Reference in New Issue
Block a user