Compare commits

...

3 Commits

2 changed files with 8 additions and 4 deletions

View File

@@ -74,7 +74,7 @@
# #
# export AQUAAI_OLLAMA_URL='192.168.1.156:11434' # export AQUAAI_OLLAMA_URL='192.168.1.156:11434'
# #
ollama_url=${AQUAAI_OLLAMA_URL:='https://ai.aquamorph.com'} ollama_url=${AQUAAI_OLLAMA_URL:='https://ai.aquamorph.com/api'}
# #
# Set the default model. # Set the default model.
# #
@@ -178,6 +178,9 @@ function set_better_conversions() {
system_prompt+=" For personal matters ${AGENT_NAME} is encouraging" system_prompt+=" For personal matters ${AGENT_NAME} is encouraging"
system_prompt+=' but brutally honest.' system_prompt+=' but brutally honest.'
system_prompt+=' Never sycophantic.' system_prompt+=' Never sycophantic.'
system_prompt+=' Do not use em dashes. If an em dash would normally appear,'
system_prompt+=' use a comma for continuing thoughts or a period if it'
system_prompt+=' should be a separate sentence.'
} }
# Set the formatting for all reponses. # Set the formatting for all reponses.
@@ -369,9 +372,9 @@ function check_requirements() {
function get_models() { function get_models() {
local model_path='' local model_path=''
if [ "${openai_api}" == true ]; then if [ "${openai_api}" == true ]; then
model_path='/api/models' model_path='/models'
else else
model_path='/api/tags' model_path='/tags'
fi fi
curl "${CURL_FLAGS[@]}" "${OLLAMA_URL}${model_path}" curl "${CURL_FLAGS[@]}" "${OLLAMA_URL}${model_path}"
} }
@@ -801,7 +804,7 @@ function chat() {
local filter='' local filter=''
if [ "${openai_api}" == true ]; then if [ "${openai_api}" == true ]; then
flags+=(-H "Content-Type: application/json") flags+=(-H "Content-Type: application/json")
chat_path='/api/chat/completions' chat_path='/chat/completions'
filter='.choices[].delta.content // empty' filter='.choices[].delta.content // empty'
else else
chat_path='/api/chat' chat_path='/api/chat'

View File

@@ -32,6 +32,7 @@ alias dot='cd ~/.local/share/chezmoi'
export DOT_PROGRAM='chezmoi' export DOT_PROGRAM='chezmoi'
alias dota="${DOT_PROGRAM} add" alias dota="${DOT_PROGRAM} add"
alias dotd="${DOT_PROGRAM} diff" alias dotd="${DOT_PROGRAM} diff"
alias dote="${DOT_PROGRAM} edit --apply"
alias dotu="${DOT_PROGRAM} update" alias dotu="${DOT_PROGRAM} update"
# Other # Other