diff --git a/gptel-ollama.el b/gptel-ollama.el index f5e5fd1..ee15c12 100644 --- a/gptel-ollama.el +++ b/gptel-ollama.el @@ -121,7 +121,7 @@ Example: (gptel-make-ollama \"Ollama\" :host \"localhost:11434\" - :models '(\"mistral:latest\") + :models \\='(\"mistral:latest\") :stream t)" (let ((backend (gptel--make-ollama :name name diff --git a/gptel-openai.el b/gptel-openai.el index b8bcd42..188b7d3 100644 --- a/gptel-openai.el +++ b/gptel-openai.el @@ -24,6 +24,22 @@ ;;; Code: (require 'cl-generic) +(require 'map) + +(defvar gptel-model) +(defvar gptel-stream) +(defvar gptel-use-curl) +(defvar gptel-backend) +(defvar gptel-temperature) +(defvar gptel-max-tokens) +(defvar gptel--system-message) +(defvar gptel--known-backends) +(defvar json-object-type) + +(declare-function gptel--get-api-key "gptel") +(declare-function prop-match-value "text-property-search") +(declare-function text-property-search-backward "text-property-search") +(declare-function json-read "json") ;;; Common backend struct for LLM support (cl-defstruct @@ -174,10 +190,11 @@ Example: (gptel-make-azure \"Azure-1\" :protocol \"https\" - :host \"YOUR_RESOURCE_NAME.openai.azure.com\" - :endpoint \"/openai/deployments/YOUR_DEPLOYMENT_NAME/completions?api-version=2023-05-15\" + :host \"RESOURCE_NAME.openai.azure.com\" + :endpoint + \"/openai/deployments/DEPLOYMENT_NAME/completions?api-version=2023-05-15\" :stream t - :models '(\"gpt-3.5-turbo\" \"gpt-4\"))" + :models \\='(\"gpt-3.5-turbo\" \"gpt-4\"))" (let ((backend (gptel--make-openai :name name :host host @@ -230,7 +247,7 @@ Example: \"GPT4All\" :protocol \"http\" :host \"localhost:4891\" - :models '(\"mistral-7b-openorca.Q4_0.gguf\"))") + :models \\='(\"mistral-7b-openorca.Q4_0.gguf\"))") (provide 'gptel-openai) ;;; gptel-backends.el ends here diff --git a/gptel-transient.el b/gptel-transient.el index 00e58e8..bb1e3f1 100644 --- a/gptel-transient.el +++ b/gptel-transient.el @@ -361,6 +361,7 @@ will get progressively longer!" (let ((stream gptel-stream) (in-place (and (member "i" args) t)) (output-to-other-buffer-p) + (backend gptel-backend) (backend-name (gptel-backend-name gptel-backend)) (buffer) (position) (callback) (gptel-buffer-name) @@ -398,7 +399,10 @@ will get progressively longer!" (gptel--get-api-key) ((error user-error) (setq gptel-api-key - (read-passwd "OpenAI API key: ")))) + (read-passwd + (format "%s API key: " + (gptel-backend-name + gptel-backend)))))) (or prompt (if (use-region-p) (buffer-substring-no-properties (region-beginning) @@ -413,6 +417,7 @@ will get progressively longer!" (point)) (point)))))) (with-current-buffer buffer + (setq gptel-backend backend) (gptel--update-header-line " Waiting..." 'warning) (setq position (point))) (setq output-to-other-buffer-p t)) diff --git a/gptel.el b/gptel.el index 3116753..a72bca3 100644 --- a/gptel.el +++ b/gptel.el @@ -110,6 +110,7 @@ (require 'json) (require 'map) (require 'text-property-search) +(require 'cl-generic) (require 'gptel-openai) (defgroup gptel nil