fix: strip / from base_url when making request

ej52 · Nov 4, 2023 · 848a69b · 848a69b
1 parent 8ad6299
commit 848a69b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/custom_components/ollama_conversation/config_flow.py b/custom_components/ollama_conversation/config_flow.py
@@ -84,12 +84,8 @@ async def async_step_user(
 
         errors = {}
         try:
-            # Cannot use cv.url validation in the schema itself, so
-            # apply extra validation here.
-            cv.url_no_path(user_input[CONF_BASE_URL])
-
             client = OllamaApiClient(
-                base_url=user_input[CONF_BASE_URL],
+                base_url=cv.url_no_path(user_input[CONF_BASE_URL]).rstrip("/"),
                 session=async_create_clientsession(self.hass),
             )
             await client.async_get_heartbeat()
@@ -132,12 +128,8 @@ async def async_step_init(
             return self.async_create_entry(title="Ollama Conversation", data=user_input)
 
         try:
-            # Cannot use cv.url validation in the schema itself, so
-            # apply extra validation here.
-            cv.url_no_path(self.config_entry.data[CONF_BASE_URL])
-
             client = OllamaApiClient(
-                base_url=self.config_entry.data[CONF_BASE_URL],
+                base_url=cv.url_no_path(self.config_entry.data[CONF_BASE_URL]).rstrip("/"),
                 session=async_create_clientsession(self.hass),
             )
             response = await client.async_get_models()

diff --git a/custom_components/ollama_conversation/manifest.json b/custom_components/ollama_conversation/manifest.json
@@ -12,5 +12,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/ej52/hass-ollama-conversatio/issues",
-  "version": "0.1.4"
+  "version": "0.1.5"
 }