Improve ollama integration + context

Author: ericdallo

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - Add native tools: filesystem
 - Add MCP/tool support for ollama models.
+- Improve ollama integration only requiring `ollama serve` to be running.
+- Improve chat history and context passed to ollama.
 
 ## 0.1.0
 

src/eca/llm_api.clj

@@ -10,8 +10,8 @@
 (set! *warn-on-reflection* true)
 
 (defn extra-models [config]
-  (llm-providers.ollama/list-running-models {:host (:host (:ollama config))
-                                             :port (:port (:ollama config))}))
+  (llm-providers.ollama/list-models {:host (:host (:ollama config))
+                                     :port (:port (:ollama config))}))
 
 (defn refine-file-context [path]
   ;; TODO ask LLM for the most relevant parts of the path

src/eca/llm_providers/anthropic.clj

@@ -62,7 +62,7 @@
     :or {max-tokens 1024
          temperature 1.0}}
    {:keys [on-message-received on-error on-prepare-tool-call on-tool-called]}]
-  (let [messages (vec (conj past-messages {:role "user" :content user-prompt}))
+  (let [messages (conj (vec past-messages) {:role "user" :content user-prompt})
         body {:model model
               :messages messages
               :max_tokens max-tokens

src/eca/llm_providers/ollama.clj

@@ -11,21 +11,21 @@
 (def ^:private logger-tag "[OLLAMA]")
 
 (def ^:private chat-url "%s/api/chat")
-(def ^:private list-running-models-url "%s/api/ps")
+(def ^:private list-models-url "%s/api/tags")
 
 (defn ^:private base-url [host port]
   (or (System/getenv "OLLAMA_API_BASE")
       (str host ":" port)))
 
-(defn list-running-models [{:keys [host port]}]
+(defn list-models [{:keys [host port]}]
   (try
     (let [{:keys [status body]} (http/get
-                                 (format list-running-models-url (base-url host port))
+                                 (format list-models-url (base-url host port))
                                  {:throw-exceptions? false
                                   :as :json})]
       (if (= 200 status)
         (do
-          (llm-util/log-response logger-tag "api_ps" body)
+          (llm-util/log-response logger-tag "api/tags" body)
           (:models body))
         (do
           (logger/warn logger-tag "Unknown status code:" status)
@@ -34,9 +34,6 @@
       (logger/warn logger-tag "Error listing running models:" (ex-message e))
       [])))
 
-(defn ^:private ->message-with-context [context user-prompt]
-  (format "%s\nThe user is asking: '%s'" context user-prompt))
-
 (defn ^:private base-completion-request! [{:keys [url body on-error on-response]}]
   (logger/debug logger-tag (format "Sending body: '%s', url: '%s'" body url))
   (http/post
@@ -67,9 +64,10 @@
 
 (defn completion! [{:keys [model user-prompt context host port past-messages tools]}
                    {:keys [on-message-received on-error on-prepare-tool-call on-tool-called]}]
-  (let [messages (if (empty? past-messages)
-                   [{:role "user" :content (->message-with-context context user-prompt)}]
-                   (conj past-messages {:role "user" :content user-prompt}))
+  (let [messages (concat
+                  [{:role "system" :content context}]
+                  past-messages
+                  [{:role "user" :content user-prompt}])
         body {:model model
               :messages messages
               :think false

src/eca/llm_providers/openai.clj

@@ -49,7 +49,7 @@
 (defn completion! [{:keys [model user-prompt context temperature api-key past-messages tools web-search]
                     :or {temperature 1.0}}
                    {:keys [on-message-received on-error on-prepare-tool-call on-tool-called on-reason]}]
-  (let [input (conj past-messages {:role "user" :content user-prompt})
+  (let [input (conj (vec past-messages) {:role "user" :content user-prompt})
         tools (cond-> tools
                 web-search (conj {:type "web_search_preview"}))
         body {:model model