diff --git a/argilla-server/src/argilla_server/_app.py b/argilla-server/src/argilla_server/_app.py index 88e3147b17..5a58596096 100644 --- a/argilla-server/src/argilla_server/_app.py +++ b/argilla-server/src/argilla_server/_app.py @@ -171,8 +171,8 @@ async def ping_search_engine(): async for search_engine in get_search_engine(): if not await search_engine.ping(): raise ConnectionError( - f"Your {settings.humanized_search_engine} endpoint at {settings.obfuscated_elasticsearch()} is not available or not responding.\n" - f"Please make sure your {settings.humanized_search_engine} instance is launched and correctly running and\n" + f"Your {settings.search_engine} endpoint at {settings.obfuscated_elasticsearch()} is not available or not responding.\n" + f"Please make sure your {settings.search_engine} instance is launched and correctly running and\n" "you have the necessary access permissions. Once you have verified this, restart the argilla server.\n" ) diff --git a/argilla-server/src/argilla_server/settings.py b/argilla-server/src/argilla_server/settings.py index 1d3604710d..32ba6c4778 100644 --- a/argilla-server/src/argilla_server/settings.py +++ b/argilla-server/src/argilla_server/settings.py @@ -21,7 +21,7 @@ import re import warnings from pathlib import Path -from typing import List, Literal, Optional, Union +from typing import List, Optional from urllib.parse import urlparse from argilla_server.constants import ( @@ -99,10 +99,7 @@ class Settings(BaseSettings): es_mapping_total_fields_limit: int = 2000 - search_engine: Union[ - Literal[SEARCH_ENGINE_ELASTICSEARCH], - Literal[SEARCH_ENGINE_OPENSEARCH], - ] = SEARCH_ENGINE_ELASTICSEARCH + search_engine: str = SEARCH_ENGINE_ELASTICSEARCH vectors_fields_limit: int = Field( default=5, @@ -230,13 +227,6 @@ def search_engine_is_elasticsearch(self) -> bool: def search_engine_is_opensearch(self) -> bool: return self.search_engine == SEARCH_ENGINE_OPENSEARCH - @property - def humanized_search_engine(self) -> str: - if self.search_engine_is_elasticsearch: - return "Elasticsearch" - elif self.search_engine_is_opensearch: - return "OpenSearch" - def obfuscated_elasticsearch(self) -> str: """Returns configured elasticsearch url obfuscating the provided password, if any""" parsed = urlparse(self.elasticsearch)