branch: externals/ellama
commit 0a4c357e21d7d336f2775810a1749a3b939070a9
Author: Sergey Kostyaev <[email protected]>
Commit: Sergey Kostyaev <[email protected]>
Move to GNU Elpa
---
README.md | 8 ++++++++
ellama.el | 37 +++++++++++++++++--------------------
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index c205fea184..1f168519cc 100644
--- a/README.md
+++ b/README.md
@@ -179,3 +179,11 @@ ideas from
[gen.nvim](https://github.com/David-Kunz/gen.nvim).
Thanks [Andrew Hyatt](https://github.com/ahyatt) for `llm` library.
Without it only `ollama` would be supported.
+
+# Contributions
+
+If you are interested in creating a provider, please send a pull
+request, or open a bug. This library is part of GNU ELPA, so any major
+provider that we include in this module needs to be written by someone
+with FSF papers. However, you can always write a module and put it on
+a different package archive, such as MELPA.
diff --git a/ellama.el b/ellama.el
index 4f575f3c1a..455085a745 100644
--- a/ellama.el
+++ b/ellama.el
@@ -1,12 +1,13 @@
;;; ellama.el --- Tool for interacting with LLMs -*- lexical-binding: t -*-
-;; Copyright (C) 2023 Sergey Kostyaev
+;; Copyright (C) 2023 Free Software Foundation, Inc.
;; Author: Sergey Kostyaev <[email protected]>
;; URL: http://github.com/s-kostyaev/ellama
;; Keywords: help local tools
;; Package-Requires: ((emacs "28.1") (llm "0.6.0") (spinner "1.7.4"))
-;; Version: 0.1.0
+;; Version: 0.2.0
+;; SPDX-License-Identifier: GPL-3.0-or-later
;; Created: 8th Oct 2023
;; This file is free software; you can redistribute it and/or modify
@@ -20,7 +21,7 @@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
@@ -39,35 +40,31 @@
(require 'spinner)
(eval-when-compile (require 'rx))
-(defgroup ellama nil
- "Tool for interacting with LLMs for Emacs."
- :group 'ellama)
-
(defcustom ellama-buffer "*ellama*"
- "Default ellama buffer."
- :group 'ellama
+ "Default ellama buffer."
+ :group 'tools
:type 'string)
(defcustom ellama-user-nick "User"
- "User nick in logs."
- :group 'ellama
+ "User nick in logs."
+ :group 'tools
:type 'string)
(defcustom ellama-assistant-nick "Ellama"
- "Assistant nick in logs."
- :group 'ellama
+ "Assistant nick in logs."
+ :group 'tools
:type 'string)
(defcustom ellama-buffer-mode (if (fboundp 'markdown-mode)
'markdown-mode
'text-mode)
- "Major mode for ellama logs."
- :group 'ellama
+ "Major mode for ellama logs."
+ :group 'tools
:type 'function)
(defcustom ellama-language "English"
- "Language for ellama translation."
- :group 'ellama
+ "Language for ellama translation."
+ :group 'tools
:type 'string)
(defcustom ellama-provider
@@ -77,12 +74,12 @@
(make-llm-ollama
:chat-model "zephyr" :embedding-model "zephyr"))
"Backend LLM provider."
- :group 'ellama
+ :group 'tools
:type '(sexp :validate 'cl-struct-p))
(defcustom ellama-spinner-type 'progress-bar
- "Spinner type for ellama."
- :group 'ellama
+ "Spinner type for ellama."
+ :group 'tools
:type `(choice ,@(mapcar
(lambda (type)
`(const ,(car type)))
