tweak(llm): minor refactoring

Author: abougouffa

modules/me-ai.el

@@ -8,46 +8,52 @@
 
 ;;; Code:
 
+(use-package llm
+  :straight t)
+
 (use-package llm-ollama
   :straight llm
-  :autoload make-llm-ollama)
+  :autoload make-llm-ollama +ollama-serve +ollama-kill-server +ollama-list-installed-models
+  :config
+  (defvar +ollama-process-name "ellama-server")
+  (defvar +ollama-server-buffer-name " *ellama-server*")
 
-(use-package ellama
-  :straight t
-  :init
-  (defvar +ellama-process-name "ellama-server")
-  (defvar +ellama-server-buffer-name " *ellama-server*")
-  (defun +ellama-serve ()
+  (defun +ollama-serve ()
     "Start Ellama server."
     (interactive)
     (if (executable-find "ollama")
-        (if (get-process +ellama-process-name)
-            (message "The Ollama server is already running, call `+ellama-kill-server' to stop it.")
-          (if (make-process :name +ellama-process-name :buffer +ellama-server-buffer-name :command '("ollama" "serve"))
+        (if (get-process +ollama-process-name)
+            (message "The Ollama server is already running, call `+ollama-kill-server' to stop it.")
+          (if (make-process :name +ollama-process-name :buffer +ollama-server-buffer-name :command '("ollama" "serve"))
               (message "Successfully started Ollama server.")
             (user-error "Cannot start the Ollama server"))
           (with-eval-after-load 'ellama (+ellama-set-providers)))
       (user-error "Cannot find the \"ollama\" executable")))
-  (defun +ellama-kill-server ()
+
+  (defun +ollama-kill-server ()
     "Kill Ellama server."
     (interactive)
-    (let ((ollama (get-process +ellama-process-name)))
+    (let ((ollama (get-process +ollama-process-name)))
       (if ollama
           (if (kill-process ollama)
               (message "Killed Ollama server.")
             (user-error "Cannot kill the Ollama server"))
         (message "No running Ollama server."))))
-  :config
-  (defun +ellama-list-installed-models ()
+
+  (defun +ollama-list-installed-models ()
     "Return the installed models"
     (let* ((ret (shell-command-to-string "ollama list"))
            (models (cdr (string-lines ret))))
       (if (and (string-match-p "NAME[[:space:]]*ID[[:space:]]*SIZE[[:space:]]*MODIFIED" ret) (length> models 0))
           (mapcar (lambda (m) (car (string-split m))) models)
-        (user-error "Cannot detect installed models, please make sure Ollama server is started"))))
+        (user-error "Cannot detect installed models, please make sure Ollama server is started")))))
+
+(use-package ellama
+  :straight t
+  :config
   (defun +ellama-set-providers ()
     (setopt ellama-providers
-            (cl-loop for model in (+ellama-list-installed-models)
+            (cl-loop for model in (+ollama-list-installed-models)
                      collect (cons model (make-llm-ollama :chat-model model :embedding-model model)))
             ellama-provider (cdr (car ellama-providers)))))