Support reasoning for ollama models that support think

Author: ericdallo

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Support reasoning for ollama models that support think.
+
 ## 0.12.7
 
 - Fix ollama tool calls.

docs/configuration.md

@@ -160,6 +160,7 @@ interface Config {
         host: string;
         port: string;
         useTools: boolean;
+        think: boolean;
     };
     chat?: {
         welcomeMessage: string;
@@ -192,7 +193,8 @@ interface Config {
   "ollama" : {
     "host" : "http://localhost",
     "port" : 11434,
-    "useTools": false
+    "useTools": false,
+    "think": true
   },
   "chat" : {
     "welcomeMessage" : "Welcome to ECA! What you have in mind?\n\n"

src/eca/config.clj

@@ -27,7 +27,8 @@
    :mcpServers {}
    :ollama {:host "http://localhost"
             :port 11434
-            :useTools true}
+            :useTools true
+            :think true}
    :chat {:welcomeMessage "Welcome to ECA!\n\nType '/' for commands\n\n"}
    :customProviders {}
    :index {:ignoreFiles [{:type :gitignore}]}})

src/eca/handlers.clj

@@ -33,7 +33,8 @@
             (fn [models {:keys [model]}]
               (assoc models
                      (str config/ollama-model-prefix model)
-                     {:tools (get-in config [:ollama :useTools] false)}))
+                     {:tools (get-in config [:ollama :useTools] false)
+                      :think (get-in config [:ollama :think] false)}))
             {}
             ollama-models))))
 

src/eca/llm_api.clj

@@ -145,7 +145,7 @@
       (llm-providers.ollama/completion!
        {:host (-> config :ollama :host)
         :port (-> config :ollama :port)
-        :reason? reason?
+        :reason? (and reason? (:think model-config))
         :model (string/replace-first model config/ollama-model-prefix "")
         :instructions instructions
         :user-messages user-messages

src/eca/llm_providers/ollama.clj

@@ -37,26 +37,28 @@
 
 (defn ^:private base-completion-request! [{:keys [rid url body on-error on-response]}]
   (llm-util/log-request logger-tag rid url body)
-  (http/post
-   url
-   {:body (json/generate-string body)
-    :throw-exceptions? false
-    :async? true
-    :as :stream}
-   (fn [{:keys [status body]}]
-     (try
-       (if (not= 200 status)
-         (let [body-str (slurp body)]
-           (logger/warn logger-tag "Unexpected response status: %s body: %s" status body-str)
-           (on-error {:message (format "Ollama response status: %s body: %s" status body-str)}))
-         (with-open [rdr (io/reader body)]
-           (doseq [[event data] (llm-util/event-data-seq rdr)]
-             (llm-util/log-response logger-tag rid event data)
-             (on-response rid event data))))
-       (catch Exception e
-         (on-error {:exception e}))))
-   (fn [e]
-     (on-error {:exception e}))))
+  (let [reason-id (str (random-uuid))
+        reasoning?* (atom false)]
+    (http/post
+     url
+     {:body (json/generate-string body)
+      :throw-exceptions? false
+      :async? true
+      :as :stream}
+     (fn [{:keys [status body]}]
+       (try
+         (if (not= 200 status)
+           (let [body-str (slurp body)]
+             (logger/warn logger-tag "Unexpected response status: %s body: %s" status body-str)
+             (on-error {:message (format "Ollama response status: %s body: %s" status body-str)}))
+           (with-open [rdr (io/reader body)]
+             (doseq [[event data] (llm-util/event-data-seq rdr)]
+               (llm-util/log-response logger-tag rid event data)
+               (on-response rid event data reasoning?* reason-id))))
+         (catch Exception e
+           (on-error {:exception e}))))
+     (fn [e]
+       (on-error {:exception e})))))
 
 (defn ^:private ->tools [tools]
   (mapv (fn [tool]
@@ -70,22 +72,24 @@
             "tool_call" {:role "assistant" :tool-calls [{:type "function"
                                                          :function content}]}
             "tool_call_output" {:role "tool" :content (llm-util/stringfy-tool-result content)}
+            "reason" {:role "assistant" :content (:text content)}
             msg))
         past-messages))
 
-(defn completion! [{:keys [model user-messages instructions host port past-messages tools]}
-                   {:keys [on-message-received on-error on-prepare-tool-call on-tool-called]}]
+(defn completion! [{:keys [model user-messages reason? instructions host port past-messages tools]}
+                   {:keys [on-message-received on-error on-prepare-tool-call on-tool-called
+                           on-reason]}]
   (let [messages (concat
                   (normalize-messages (concat [{:role "system" :content instructions}] past-messages))
                   (normalize-messages user-messages))
         body {:model model
               :messages messages
-              :think false
+              :think reason?
               :tools (->tools tools)
               :stream true}
         url (format chat-url (base-url host port))
         tool-calls* (atom {})
-        on-response-fn (fn handle-response [rid _event data]
+        on-response-fn (fn handle-response [rid _event data reasoning?* reason-id]
                          (let [{:keys [message done_reason]} data]
                            (cond
                              (seq (:tool_calls message))
@@ -111,8 +115,22 @@
                                                      :finish-reason done_reason}))
 
                              message
-                             (on-message-received {:type :text
-                                                   :text (:content message)}))))]
+                             (if (:thinking message)
+                               (do
+                                 (when-not @reasoning?*
+                                   (on-reason {:status :started
+                                               :id reason-id})
+                                   (reset! reasoning?* true))
+                                 (on-reason {:status :thinking
+                                             :id reason-id
+                                             :text (:thinking message)}))
+                               (do
+                                 (when @reasoning?*
+                                   (on-reason {:status :finished
+                                               :id reason-id})
+                                   (reset! reasoning?* false))
+                                 (on-message-received {:type :text
+                                                       :text (:content message)}))))))]
     (base-completion-request!
      {:rid (llm-util/gen-rid)
       :url url

test/eca/llm_providers/anthropic_test.clj

@@ -4,7 +4,7 @@
    [eca.llm-providers.anthropic :as llm-providers.anthropic]
    [matcher-combinators.test :refer [match?]]))
 
-(deftest ->messages-with-history-test
+(deftest ->normalize-messages-test
   (testing "no previous history"
     (is (match?
          []

test/eca/llm_providers/ollama_test.clj

@@ -4,7 +4,7 @@
    [eca.llm-providers.ollama :as llm-providers.ollama]
    [matcher-combinators.test :refer [match?]]))
 
-(deftest ->messages-with-history-test
+(deftest ->normalize-messages-test
   (testing "no previous history"
     (is (match?
          []

test/eca/llm_providers/openai_test.clj

@@ -4,7 +4,7 @@
    [eca.llm-providers.openai :as llm-providers.openai]
    [matcher-combinators.test :refer [match?]]))
 
-(deftest ->messages-with-history-test
+(deftest ->normalize-messages-test
   (testing "no previous history"
     (is (match?
          []