Merge pull request #165 from ggozad/fix/fix-parameter-passing

Fix passing options to ollama client.

Author: ggozad

CHANGES.txt

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+0.8.2 - 2025-02-03
+------------------
+
+- Fix merging chat and additional options properly.
+  [ggozad]
+
 0.8.1 - 2025-01-29
 ------------------
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "oterm"
-version = "0.8.1"
+version = "0.8.2"
 description = "A text-based terminal client for Ollama."
 authors = [{ name = "Yiorgis Gozadinos", email = "[email protected]" }]
 license = { text = "MIT" }

src/oterm/ollamaclient.py

@@ -147,11 +147,15 @@ async def stream(
             user_prompt.images = images  # type: ignore
 
         self.history.append(user_prompt)
+        options = {
+            k: v for k, v in self.options.model_dump().items() if v is not None
+        } | {k: v for k, v in additional_options.model_dump().items() if v is not None}
+
         stream: AsyncIterator[ChatResponse] = await client.chat(
             model=self.model,
             messages=self.history,
             stream=True,
-            options={**self.options.model_dump(), **additional_options.model_dump()},
+            options=options,
             keep_alive=f"{self.keep_alive}m",
             format=parse_format(self.format),
             tools=self.tools,