Fix annna output when stable diffusion fails. Fix sd model. - annna - Annna the nice friendly bot.
(HTM) git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/annna/
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Tags
(DIR) README
---
(DIR) commit 60acb07430a8a4ac42a27ea51085461799c45f2d
(DIR) parent 29233d1d1d40e10b7e9d6fc497cfb561f6b03bcb
(HTM) Author: Annna Robert-Houdin <annna@bitreich.org>
Date: Wed, 1 Jan 2025 16:57:33 +0100
Fix annna output when stable diffusion fails. Fix sd model.
Diffstat:
M annna-message-common | 20 +++++++++++++-------
M stable-diffusion | 5 +++--
M stable-diffusion-emoji | 2 +-
3 files changed, 17 insertions(+), 10 deletions(-)
---
(DIR) diff --git a/annna-message-common b/annna-message-common
@@ -54,13 +54,19 @@ case "${text}" in
then
annna-say -s "${server}" -c "${channel}" "${user}, sorry, gophers://bitreich.org/I/memecache/bitreich-burning.png"
else
- query=${text#**::} query=${query%%::*}
- if [ -n "${user}" ] && [ "${user}" != "annna-cmd" ];
- then
- annna-say -s "${server}" -c "${channel}" "${user}, $(stable-diffusion-emoji "${query}")" &
- else
- annna-say -s "${server}" -c "${channel}" "$(stable-diffusion-emoji "${query}")" &
- fi
+ {
+ query=${text#**::} query=${query%%::*}
+ emojiuri="$(stable-diffusion-emoji "${query}")"
+ if [ -n "${emojiuri}" ];
+ then
+ if [ -n "${user}" ] && [ "${user}" != "annna-cmd" ];
+ then
+ annna-say -s "${server}" -c "${channel}" "${user}, ${emojiuri}"
+ else
+ annna-say -s "${server}" -c "${channel}" "${emojiuri}"
+ fi
+ fi
+ } &
fi
;;
*http*://*|*ytdl://*)
(DIR) diff --git a/stable-diffusion b/stable-diffusion
@@ -9,10 +9,11 @@ fi
sdbase="/br/ai/stable-diffusion.cpp"
sdcmd="${sdbase}/build/bin/sd -t 16 --steps 20 -s -1 -H 512 -W 512 --cfg-scale 8.0"
-sdmodel="${SD_MODEL:-${sdbase}/models/v2-1_768-nonema-pruned-ggml-model-f16.bin}"
+sdmodel="${SD_MODEL:-${sdbase}/models/epicphotogasm_x.f16.gguf}"
sdnegative='nipples, busty, nude, lowres, (worst quality, low quality, normal quality:2), cropped, infant, blur, haze, tiling, poorly drawn hands, poorly drawn feet, poorly drawn face, out of frame, extra limbs, disfigured, deformed, body out of frame, bad anatomy, watermark, signature, cut off, low contrast, underexposed, overexposed, bad art, beginner, amateur, distorted face, blurry, draft, grainy, nsfw'
outputf="${1}"
shift 1
-${sdcmd} -m ${sdmodel} -o "${outputf}" -p "$@" -n "${sdnegative}" >/dev/null 2>&1
+${sdcmd} --type f16 -m ${sdmodel} -o "${outputf}" -p "$@" -n "${sdnegative}" >/dev/null 2>&1
+#${sdcmd} -m ${sdmodel} -o "${outputf}" -p "$@" -n "${sdnegative}" -v
(DIR) diff --git a/stable-diffusion-emoji b/stable-diffusion-emoji
@@ -36,7 +36,7 @@ emojiorig="${emojifilebase}.orig"
if [ ! -e "${emojidb}/${emojifile}" ];
then
- SD_MODEL="/br/ai/stable-diffusion.cpp/models/epicphotogasm_x-ggml-model-f16.bin" \
+ SD_MODEL="/br/ai/stable-diffusion.cpp/models/epicphotogasm_x.f16.gguf" \
stable-diffusion "${emojidb}/${emojifile}" "${emojiprompt}"
if [ -e "${emojidb}/${emojifile}" ];
then