fix: base_url and config lfow

ej52 · Nov 4, 2023 · 619cb52 · 619cb52
1 parent 6b9f1c4
commit 619cb52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/custom_components/ollama_conversation/api.py b/custom_components/ollama_conversation/api.py
@@ -33,9 +33,6 @@ def __init__(
         session: aiohttp.ClientSession,
     ) -> None:
         """Sample API Client."""
-        if not base_url.endswith("/"):
-            base_url = f"{base_url}/"
-
         self._base_url = base_url
         self._session = session
 

diff --git a/custom_components/ollama_conversation/config_flow.py b/custom_components/ollama_conversation/config_flow.py
@@ -131,7 +131,6 @@ async def async_step_init(
         if user_input is not None:
             return self.async_create_entry(title="Ollama Conversation", data=user_input)
 
-        errors = {}
         try:
             # Cannot use cv.url validation in the schema itself, so
             # apply extra validation here.
@@ -142,21 +141,15 @@ async def async_step_init(
                 session=async_create_clientsession(self.hass),
             )
             response = await client.async_get_models()
-        except vol.Invalid:
-            errors["base"] = "invalid_url"
-        except OllamaApiClientAuthenticationError:
-            errors["base"] = "invalid_auth"
-        except OllamaApiClientCommunicationError:
-            errors["base"] = "cannot_connect"
+            models = response["models"]
         except OllamaApiClientError as exception:
             LOGGER.exception("Unexpected exception: %s", exception)
-            errors["base"] = "unknown"
+            models = []
 
-        schema = ollama_config_option_schema(self.config_entry.options, [model["name"] for model in response["models"]])
+        schema = ollama_config_option_schema(self.config_entry.options, [model["name"] for model in models])
         return self.async_show_form(
             step_id="init",
-            data_schema=vol.Schema(schema),
-            errors=errors
+            data_schema=vol.Schema(schema)
         )