Skip to content

Commit

Permalink
working with llama 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Tadashi-Hikari committed Jan 13, 2025
1 parent a03b8de commit 3e8717c
Show file tree
Hide file tree
Showing 41 changed files with 976 additions and 951 deletions.
99 changes: 60 additions & 39 deletions .calva/output-window/output.calva-repl
Original file line number Diff line number Diff line change
@@ -1,39 +1,60 @@
; This is the Calva REPL Window.
; It's just a file, really, with some special treatment from Calva.
; Use it as a REPL input prompt if you like. (When the REPL is connected.)
; TIPS: The keyboard shortcut `ctrl+alt+o r` shows and focuses this window
; Please see https://calva.io/repl-window/ for more info.
; Happy coding! ♥️

; TIPS: As with any Clojure file when the REPL is connected:
; - `alt+enter` evaluates the current top level form.
; - `ctrl+enter` evaluates the current form.
; Special for this file:
; - `alt+up` and `alt+down` traverse up and down the REPL command history
; when the cursor is after the last contents at the prompt
;
; See also the Calva Inspector: https://calva.io/inspector/

PLEASE NOTE
We will update the default location of this file.
The new default location will be
"<projectRootPath>/.calva/repl.calva-repl"
For now the legacy path is used by default.
To give yourself a smooth transition, you can opt in
to the change, by configuring this setting as false:
"calva.useLegacyReplWindowPath"
and then add "**/.calva/repl.calva-repl" to your ".gitignore" file.


This file is configured as the output destination for all REPL output.
You can configure this with the setting:
"calva.outputDestinations"


; Jacking in...
; Connecting using "Leiningen" project type.
; You can make Calva auto-select this.
; - See https://calva.io/connect-sequences/
;

; Starting Jack-in Terminal: pushd c:\Users\ccarr\Lab\sandbox\Navi & cmd.exe /d /c lein update-in :dependencies conj [nrepl,"1.1.1"] -- update-in :plugins conj [cider/cider-nrepl,"0.47.1"] -- update-in [:repl-options,:nrepl-middleware] conj '["cider.nrepl/cider-middleware"]' -- repl :headless & popd
; This is the Calva REPL Window.
; It's just a file, really, with some special treatment from Calva.
; Use it as a REPL input prompt if you like. (When the REPL is connected.)
; TIPS: The keyboard shortcut `ctrl+alt+o r` shows and focuses this window
; Please see https://calva.io/repl-window/ for more info.
; Happy coding! ♥️

; TIPS: As with any Clojure file when the REPL is connected:
; - `alt+enter` evaluates the current top level form.
; - `ctrl+enter` evaluates the current form.
; Special for this file:
; - `alt+up` and `alt+down` traverse up and down the REPL command history
; when the cursor is after the last contents at the prompt
;
; See also the Calva Inspector: https://calva.io/inspector/

PLEASE NOTE
We will update the default location of this file.
The new default location will be
"<projectRootPath>/.calva/repl.calva-repl"
For now the legacy path is used by default.
To give yourself a smooth transition, you can opt in
to the change, by configuring this setting as false:
"calva.useLegacyReplWindowPath"
and then add "**/.calva/repl.calva-repl" to your ".gitignore" file.


This file is configured as the output destination for all REPL output.
You can configure this with the setting:
"calva.outputDestinations"


; Jacking in...
; Connecting using "Babashka" project type.
; You can make Calva auto-select this.
; - See https://calva.io/connect-sequences/
;

; Starting Jack-in: (cd /home/chris/Lab/Assistant/reference/Navi; bb --nrepl-server 42633)
; Jacking in...
; Connecting using "Leiningen" project type.
; You can make Calva auto-select this.
; - See https://calva.io/connect-sequences/
;

; Starting Jack-in: (cd /home/chris/Lab/Assistant/reference/Navi; lein update-in :dependencies conj '[nrepl,"1.1.1"]' -- update-in :plugins conj '[cider/cider-nrepl,"0.47.1"]' -- update-in '[:repl-options,:nrepl-middleware]' conj '["cider.nrepl/cider-middleware"]' -- repl :headless)
; Using host:port 127.0.0.1:38737 ...
; Hooking up nREPL sessions ...
; Connected session: clj
; Evaluating code from settings: 'calva.autoEvaluateCode.onConnect.clj'
nil
clj꞉navi.core꞉> 
"Please see https://calva.io/output/#about-stdout-in-the-repl-window
about why stdout printed to this file is prepended with `;` to be line comments."
clj꞉navi.core꞉> 
; Jack-in done.
clj꞉navi.core꞉> 
#'navi.base.chatbot.core/chat
clj꞉navi.base.chatbot.core꞉> 
; nREPL Connection was closed
34 changes: 17 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
.cpcache/
/.clj-kondo
/.lsp
portal/*
pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
.cpcache/
/.clj-kondo
/.lsp
portal/*
memory
42 changes: 21 additions & 21 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MIT License

Copyright (c) 2023 Christopher Carroll

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
MIT License
Copyright (c) 2023 Christopher Carroll
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
42 changes: 21 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Navi
A generic command line assistant built using the Sapphire Framework and written in Clojure. Can be called for one off questions, or a live conversation session. Features can be discovered by typing "help"

# Requirements
- OpenAI API Subscription
- OpenJDK 17+
- Leiningen
- Clojure

# How To Use

To run it in a build environment, use:
- `lein run` or
- `lein run -q "Your question here"`

If it has been built as an uberjar, you can use:
- `java -jar navi.jar` or
- `java -jar navi.jar -q "Your question here"`


# History
# Navi
A generic command line assistant built using the Sapphire Framework and written in Clojure. Can be called for one off questions, or a live conversation session. Features can be discovered by typing "help"

# Requirements
- OpenAI API Subscription
- OpenJDK 17+
- Leiningen
- Clojure

# How To Use

To run it in a build environment, use:
- `lein run` or
- `lein run -q "Your question here"`

If it has been built as an uberjar, you can use:
- `java -jar navi.jar` or
- `java -jar navi.jar -q "Your question here"`


# History
This project is the continuation of the Sapphire Framework project
20 changes: 10 additions & 10 deletions doc/intro.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Introduction to netnavi

TODO: write [great documentation](http://jacobian.org/writing/what-to-write/)

TODO: If run w/o parameters, default loop. else flag out
- rework the system for in/out pipelines
-- is this needed to accomplish the goal of externalization

TODO: Passing assistants should be an optional parameter, cause then I can work on assistants with all the same functions

# Introduction to netnavi

TODO: write [great documentation](http://jacobian.org/writing/what-to-write/)

TODO: If run w/o parameters, default loop. else flag out
- rework the system for in/out pipelines
-- is this needed to accomplish the goal of externalization

TODO: Passing assistants should be an optional parameter, cause then I can work on assistants with all the same functions

TODO: rework GPT/External/features to remove circular dependencies
4 changes: 2 additions & 2 deletions memory/desktop.memory
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{:role "system", :content "You are a helpful assistant named Navi.jar. your purpose is to help me manage my schedule, projects, and ADHD"}

{:role "system", :content "You are a helpful assistant named Navi.jar. your purpose is to help me manage my schedule, projects, and ADHD"}
40 changes: 20 additions & 20 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
(defproject netnavi "0.0.1-CLI"
:description "FIXME: write description"
:url "http://example.com/FIXME"
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"}
:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/data.json "0.2.6"]
[net.clojars.wkok/openai-clojure "0.9.0"]
[org.clojure/tools.cli "1.0.219"]
[clj-http "3.13.0"]
;; https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client
[com.google.oauth-client/google-oauth-client "1.36.0"]
;; https://mvnrepository.com/artifact/com.google.api-client/google-api-client
[com.google.api-client/google-api-client "2.5.0"]
;; https://mvnrepository.com/artifact/com.google.api-client/google-api-client
[com.google.api-client/google-api-client "2.5.0"]]
:main ^:skip-aot navi.core
:target-path "target/%s"
:profiles {:uberjar {:aot :all
:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}})
(defproject netnavi "0.0.1-CLI"
:description "FIXME: write description"
:url "http://example.com/FIXME"
:license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"
:url "https://www.eclipse.org/legal/epl-2.0/"}
:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/data.json "0.2.6"]
[net.clojars.wkok/openai-clojure "0.9.0"]
[org.clojure/tools.cli "1.0.219"]
[clj-http "3.13.0"]
;; https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client
[com.google.oauth-client/google-oauth-client "1.36.0"]
;; https://mvnrepository.com/artifact/com.google.api-client/google-api-client
[com.google.api-client/google-api-client "2.5.0"]
;; https://mvnrepository.com/artifact/com.google.api-client/google-api-client
[com.google.api-client/google-api-client "2.5.0"]]
:main ^:skip-aot navi.core
:target-path "target/%s"
:profiles {:uberjar {:aot :all
:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}})
2 changes: 1 addition & 1 deletion shadow-cljs-server.org
Original file line number Diff line number Diff line change
@@ -1 +1 @@

Loading

0 comments on commit 3e8717c

Please sign in to comment.