Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove never-used schema for named, email, and person #168

Merged
merged 3 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/ekg.org
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ triples library is already installed.
* Changelog
** Version 0.6.3
- Fix issue in trying to get a single-valued item to show up in the metadata line.
- Remove the never-used named, email, and person schema.
- Fix issue with tag completions triggering incorrectly if they contained spaces.
- Fix error when displaying unknown schema.
- Improve JSONification of notes when sending context to LLMs.
Expand Down
2 changes: 2 additions & 0 deletions doc/ekg.texi
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ triples library is already installed.
@item
Fix issue in trying to get a single-valued item to show up in the metadata line.
@item
Remove the never-used named, email, and person schema.
@item
Fix issue with tag completions triggering incorrectly if they contained spaces.
@item
Fix error when displaying unknown schema.
Expand Down
15 changes: 9 additions & 6 deletions ekg.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

;; Author: Andrew Hyatt <[email protected]>
;; Homepage: https://github.com/ahyatt/ekg
;; Package-Requires: ((triples "0.3.5") (emacs "28.1") (llm "0.17.0"))
;; Package-Requires: ((triples "0.4.0") (emacs "28.1") (llm "0.17.0"))
;; Keywords: outlines, hypermedia
;; Version: 0.6.2
;; SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -361,10 +361,6 @@ callers have already called this function")
'(for-text :base/unique t))
(triples-add-schema ekg-db 'tag
'(tagged :base/virtual-reversed tagged/tag))
(triples-add-schema ekg-db 'named 'name)
(triples-add-schema ekg-db 'email 'address)
;; Person is just a marker
(triples-add-schema ekg-db 'person)
;; A URL can be a subject too, and has data, including the title. The title is
;; something that can be used to select the subject via completion.
(triples-add-schema ekg-db 'titled '(title :base/type string))
Expand Down Expand Up @@ -2278,9 +2274,16 @@ the database after the upgrade, in list form."
;; We have done upgrades to 0.3.1, but we want to re-do them for
;; additional bugfixes. There should be no downside to doing the
;; upgrade many times.
(version-list-< from-version '(0 3 2)))))
(version-list-< from-version '(0 3 2))))
(need-type-removal-upgrade
(or (null from-version)
(version-list-< from-version '(0 6 3)))))
(ekg-connect)
;; In the future, we can separate out the backup from the upgrades.
(when need-type-removal-upgrade
(ekg-backup t)
(triples-remove-schema-type ekg-db 'person)
(triples-remove-schema-type ekg-db 'email))
(when need-triple-0.3-upgrade
(ekg-backup t)
;; This converts all string integers in subjects and objects to real integers.
Expand Down