Main changes:

Removed the validate_endpoint function
Optimized the validate_api_connection function
Simplified API connection verification
Preserved all error handling and retry logic
Improved exception handling
The integration should now correctly verify the
OpenAI API connection without false endpoint_not_available errors.
This commit is contained in:
SMKRV
2024-11-19 17:33:27 +03:00
parent 30a9b53ba1
commit 9f93f1ee18
+44 -70
View File
@@ -62,24 +62,6 @@ STEP_USER_DATA_SCHEMA = vol.Schema({
), ),
}) })
async def validate_endpoint(endpoint: str) -> Tuple[bool, str]:
"""Validate API endpoint accessibility."""
try:
parsed_url = urlparse(endpoint)
if parsed_url.scheme not in ('http', 'https'):
return False, "invalid_endpoint_scheme"
connector = aiohttp.TCPConnector(ssl=SSL_CONTEXT)
async with timeout(5):
async with aiohttp.ClientSession(connector=connector) as session:
async with session.get(endpoint) as response:
if response.status != 200:
return False, "endpoint_not_available"
return True, ""
except Exception as e:
_LOGGER.error("Error validating endpoint: %s", str(e))
return False, "endpoint_error"
async def validate_api_connection( async def validate_api_connection(
api_key: str, api_key: str,
endpoint: str, endpoint: str,
@@ -87,64 +69,56 @@ async def validate_api_connection(
retry_count: int = 3, retry_count: int = 3,
retry_delay: float = 1.0 retry_delay: float = 1.0
) -> Tuple[bool, str, list]: ) -> Tuple[bool, str, list]:
"""Validate API connection with improved retry logic.""" """Validate API connection with retry logic."""
# Validate endpoint first for attempt in range(retry_count):
endpoint_valid, endpoint_error = await validate_endpoint(endpoint) try:
if not endpoint_valid: async with timeout(10):
return False, endpoint_error, [] client = AsyncOpenAI(
api_key=api_key,
connector = aiohttp.TCPConnector(ssl=SSL_CONTEXT) base_url=endpoint,
async with aiohttp.ClientSession(connector=connector) as session:
for attempt in range(retry_count):
try:
async with timeout(10):
client = AsyncOpenAI(
api_key=api_key,
base_url=endpoint,
http_client=session
)
models = await client.models.list()
model_ids = [model.id for model in models.data]
if model not in model_ids:
_LOGGER.warning(
"Model %s not found in available models: %s",
model,
", ".join(model_ids)
)
return False, "invalid_model", model_ids
return True, "", model_ids
except asyncio.TimeoutError:
_LOGGER.warning(
"Timeout during API validation (attempt %d/%d)",
attempt + 1,
retry_count
) )
if attempt == retry_count - 1:
return False, "timeout", []
await asyncio.sleep(retry_delay)
except AuthenticationError as err: models = await client.models.list()
_LOGGER.error("Authentication error: %s", str(err)) model_ids = [model.id for model in models.data]
return False, "invalid_auth", []
except RateLimitError as err: if model not in model_ids:
_LOGGER.error("Rate limit exceeded: %s", str(err)) _LOGGER.warning(
return False, "rate_limit", [] "Model %s not found in available models: %s",
model,
", ".join(model_ids)
)
return False, "invalid_model", model_ids
return True, "", model_ids
except APIConnectionError as err: except asyncio.TimeoutError:
_LOGGER.error("API connection error: %s", str(err)) _LOGGER.warning(
return False, "cannot_connect", [] "Timeout during API validation (attempt %d/%d)",
attempt + 1,
retry_count
)
if attempt == retry_count - 1:
return False, "timeout", []
await asyncio.sleep(retry_delay)
except APIError as err: except AuthenticationError as err:
_LOGGER.error("API error: %s", str(err)) _LOGGER.error("Authentication error: %s", str(err))
return False, "api_error", [] return False, "invalid_auth", []
except Exception as err: except RateLimitError as err:
_LOGGER.exception("Unexpected error during validation: %s", str(err)) _LOGGER.error("Rate limit exceeded: %s", str(err))
return False, "unknown", [] return False, "rate_limit", []
except APIConnectionError as err:
_LOGGER.error("API connection error: %s", str(err))
return False, "cannot_connect", []
except APIError as err:
_LOGGER.error("API error: %s", str(err))
return False, "api_error", []
except Exception as err:
_LOGGER.exception("Unexpected error during validation: %s", str(err))
return False, "unknown", []
class HATextAIConfigFlow(config_entries.ConfigFlow, domain=DOMAIN): class HATextAIConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
"""Handle a config flow for HA text AI.""" """Handle a config flow for HA text AI."""