Add tools config

Author: ericdallo

docs/configuration.md

@@ -76,6 +76,7 @@ interface Config {
     ollama?: {
         host: string;
         port: string;
+        useTools: boolean;
     }
     chat?: {
         welcomeMessage: string;
@@ -99,7 +100,8 @@ interface Config {
   "mcpServers" : [ ],
   "ollama" : {
     "host" : "http://localhost",
-    "port" : 11434
+    "port" : 11434,
+    "useTools": false
   },
   "chat" : {
     "welcomeMessage" : "Welcome to ECA! What you have in mind?\n\n"

src/eca/config.clj

@@ -22,7 +22,8 @@
    :mcp-timeout-seconds 10
    :mcp-servers []
    :ollama {:host "http://localhost"
-            :port 11434}
+            :port 11434
+            :use-tools false}
    :chat {:welcome-message "Welcome to ECA! What you have in mind?\n\n"}
    :index {:ignore-files [{:type :gitignore}]}})
 

src/eca/db.clj

@@ -9,11 +9,11 @@
    :chats {}
    :chat-behaviors ["agent" "chat"]
    :chat-default-behavior "chat"
-   :models ["o4-mini"
-            "gpt-4.1"
-            "claude-sonnet-4-0"
-            "claude-opus-4-0"
-            "claude-3-5-haiku-latest"] ;; + ollama local models
+   :models {"o4-mini" {:tools true}
+            "gpt-4.1" {:tools true}
+            "claude-sonnet-4-0" {:tools true}
+            "claude-opus-4-0" {:tools true}
+            "claude-3-5-haiku-latest" {:tools true}} ;; + ollama local models
    :default-model "o4-mini" ;; unless a ollama model is running.
    })
 

src/eca/features/chat.clj

@@ -102,7 +102,8 @@
         chosen-model (or model (default-model db))
         past-messages (get-in db [:chats chat-id :messages] [])
         user-prompt message
-        mcp-tools (all-mcp-tools! chat-id request-id messenger db*)
+        mcp-tools (when (get-in db [:models chosen-model :use-tools])
+                    (all-mcp-tools! chat-id request-id messenger db*))
         received-msgs* (atom "")]
     (swap! db* update-in [:chats chat-id :messages] (fnil conj []) {:role "user" :content user-prompt})
     (messenger/chat-content-received

src/eca/handlers.clj

@@ -12,7 +12,12 @@
 (defn ^:private initialize-extra-models! [db*]
   (let [config (config/all @db*)]
     (when-let [ollama-models (seq (llm-api/extra-models config))]
-      (swap! db* update :models concat (map #(str config/ollama-model-prefix (:model %)) ollama-models)))))
+      (swap! db* update :models merge
+             (reduce
+              (fn [models {:keys [model]}]
+                (assoc models (str config/ollama-model-prefix model) {:tools (get-in config [:ollama :use-tools] false)}))
+              {}
+              ollama-models)))))
 
 (defn initialize [{:keys [db*]} params]
   (logger/logging-task
@@ -26,7 +31,7 @@
      (initialize-extra-models! db*)
      ;; TODO initialize async with progress support
      (f.mcp/initialize! db* config)
-     {:models (:models @db*)
+     {:models (keys (:models @db*))
       :chat-default-model (f.chat/default-model @db*)
       :chat-behaviors (:chat-behaviors @db*)
       :chat-default-behavior (:chat-default-behavior @db*)

src/eca/llm_api.clj

@@ -65,9 +65,11 @@
         :model (string/replace-first model config/ollama-model-prefix "")
         :past-messages past-messages
         :context context
+        :tools tools
         :user-prompt user-prompt}
        {:on-message-received on-message-received-wrapper
-        :on-error on-error})
+        :on-error on-error
+        :on-tool-called on-tool-called})
 
       :else
       (on-error {:msg (str "ECA Unsupported model: " model)}))))

src/eca/llm_providers/ollama.clj

@@ -31,39 +31,54 @@
       (logger/warn logger-tag "Error listing running models:" (ex-message e))
       [])))
 
-(defn ^:private raw-data->messages [data]
-  (let [{:keys [message done_reason]} (json/parse-string data true)]
-    (cond-> {}
-      message (assoc :message (:content message))
-      done_reason (assoc :finish-reason done_reason))))
-
 (defn ^:private ->message-with-context [context user-prompt]
   (format "%s\nThe user is asking: '%s'" context user-prompt))
 
-(defn completion! [{:keys [model user-prompt context host port past-messages]}
-                   {:keys [on-message-received on-error]}]
-  (let [body {:model model
-              :messages (if (empty? past-messages)
-                          [{:role "user" :content (->message-with-context context user-prompt)}]
-                          (conj past-messages {:role "user" :content user-prompt}))
-              :stream true}]
-    (http/post
-     (format chat-url (base-url host port))
-     {:body (json/generate-string body)
-      :throw-exceptions? false
-      :async? true
-      :as :stream}
-     (fn [{:keys [status body]}]
-       (try
+(defn ^:private base-completion-request! [{:keys [url body on-error on-response]}]
+  (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 [line (line-seq rdr)]
-             (if (not= 200 status)
-               (let [msg line]
-                 (logger/warn logger-tag "Unexpected response status" status "." msg)
-                 (on-error {:message (str "Ollama response status: " status)}))
-               (when-let [message (raw-data->messages line)]
-                 (on-message-received message)))))
-         (catch Exception e
-           (on-error {:exception e}))))
-     (fn [e]
-       (on-error {:exception e})))))
+             (on-response (json/parse-string line true)))))
+       (catch Exception e
+         (on-error {:exception e}))))
+   (fn [e]
+     (on-error {:exception e}))))
+
+(defn ^:private ->tools [tools]
+  (mapv (fn [tool]
+          {:type "function"
+           :function (select-keys tool [:name :description :parameters])})
+        tools))
+
+(defn completion! [{:keys [model user-prompt context host port past-messages tools]}
+                   {:keys [on-message-received on-error _on-tool-called]}]
+  (let [messagess (if (empty? past-messages)
+                    [{:role "user" :content (->message-with-context context user-prompt)}]
+                    (conj past-messages {:role "user" :content user-prompt}))
+        body {:model model
+              :messages messagess
+              :tools (->tools tools)
+              :stream true}
+        url (format chat-url (base-url host port))
+        on-response-fn (fn handle-response [data]
+                         (let [{:keys [message done_reason]} data]
+                           (on-message-received
+                            (cond-> {}
+                              message (assoc :message (:content message))
+                              done_reason (assoc :finish-reason done_reason)))))]
+    (base-completion-request!
+     {:url url
+      :body body
+      :on-error on-error
+      :on-response on-response-fn})))