Bring back proper handling of env variables OLLAMA_HOST, OLLAMA_URL, …

…OTERM_VERIFY_SSL after migrating to the official Ollama client

Closes ggozad#71

CHANGES.txt

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.2.6 - 
+------------------
+
+- Fix handling of OLLAMA_HOST, OLLAMA_URL, OTERM_VERIFY_SSL env variables.
+  [ggozad]
+
 0.2.5 - 2024-04-02
 ------------------
 

README.md

@@ -26,7 +26,7 @@ pip install oterm
 
 ## Using
 
-In order to use `oterm` you will need to have the Ollama server running. By default it expects to find the Ollama API running on `http://0.0.0.0:11434/api`. If you are running Ollama inside docker or on a different host/port, use the `OLLAMA_HOST` environment variable to customize the host/port. Alternatively you can use `OLLAMA_URL` to specify the full http(s) url. Setting `OTERM_VERIFY_SSL` to `False` will disable SSL verification.
+In order to use `oterm` you will need to have the Ollama server running. By default it expects to find the Ollama API running on `http://0.0.0.0:11434`. If you are running Ollama inside docker or on a different host/port, use the `OLLAMA_HOST` environment variable to customize the host/port. Alternatively you can use `OLLAMA_URL` to specify the full http(s) url. Setting `OTERM_VERIFY_SSL` to `False` will disable SSL verification.
 
 ```bash
 OLLAMA_URL=http://host:port/api

oterm/config.py

@@ -62,7 +62,7 @@ def __init__(self, env):
                     )
                 )
         if self.OLLAMA_URL == "":
-            self.OLLAMA_URL = f"http://{self.OLLAMA_HOST}/api"
+            self.OLLAMA_URL = f"http://{self.OLLAMA_HOST}"
 
     def __repr__(self):
         return str(self.__dict__)

oterm/ollama.py

@@ -19,7 +19,9 @@ def __init__(
         self.format = format
 
     async def completion(self, prompt: str, images: list[str] = []) -> str:
-        client = AsyncClient(host=envConfig.OLLAMA_HOST)
+        client = AsyncClient(
+            host=envConfig.OLLAMA_URL, verify=envConfig.OTERM_VERIFY_SSL
+        )
         response: dict = await client.generate(
             model=self.model,
             prompt=prompt,
@@ -34,7 +36,9 @@ async def completion(self, prompt: str, images: list[str] = []) -> str:
     async def stream(
         self, prompt: str, images: list[str] = []
     ) -> AsyncGenerator[str, Any]:
-        client = AsyncClient(host=envConfig.OLLAMA_HOST)
+        client = AsyncClient(
+            host=envConfig.OLLAMA_URL, verify=envConfig.OTERM_VERIFY_SSL
+        )
         stream: AsyncIterator[dict] = await client.generate(
             model=self.model,
             prompt=prompt,