rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

Browse Source
This commit is contained in:
SillyLossy
2023-06-01 10:52:34 +03:00
parent 8328fe9886 83c875d8dc
commit b8a49c58ac
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -23,7 +23,7 @@ COPY . ./
# Copy default chats, characters and user avatars to <folder>.default folder # Copy default chats, characters and user avatars to <folder>.default folder
RUN \ RUN \
IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,settings.json" && \ IFS="," RESOURCES="characters,chats,groups,group chats,User Avatars,worlds,settings.json" && \
\ \
echo "*** Store default $RESOURCES in <folder>.default ***" && \ echo "*** Store default $RESOURCES in <folder>.default ***" && \
for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done && \ for R in $RESOURCES; do mv "public/$R" "public/$R.default"; done && \

2
docker/docker-compose.yml
View File

@ -4,7 +4,7 @@ services:
build: .. build: ..
container_name: sillytavern container_name: sillytavern
hostname: sillytavern hostname: sillytavern
image: cohee1207/sillytavern:latest image: sillytavern/sillytavern:latest
ports: ports:
- "8000:8000" - "8000:8000"
volumes: volumes:

2
public/scripts/extensions/infinity-context/index.js
View File

@ -503,7 +503,7 @@ jQuery(async () => {
<span>Purge Chat from the DB</span> <span>Purge Chat from the DB</span>
</div> </div>
</div> </div>
<small><i>Since ChromaDB state is not persisted to disk by default, you'll need to inject text data every time the Extras API server is restarted.</i></small> <small><i>Local ChromaDB now persists to disk by default. The default folder is .chroma_db, and you can set a different folder with the --chroma-folder argument. If you are using the Extras Colab notebook, you will need to inject the text data every time the Extras API server is restarted.</i></small>
</div> </div>
<form><input id="chromadb_inject_file" type="file" accept="text/plain" hidden></form> <form><input id="chromadb_inject_file" type="file" accept="text/plain" hidden></form>
<form><input id="chromadb_import_file" type="file" accept="application/json" hidden></form> <form><input id="chromadb_import_file" type="file" accept="application/json" hidden></form>

4
public/scripts/group-chats.js
View File

@ -516,6 +516,8 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
setCharacterId(chId); setCharacterId(chId);
setCharacterName(characters[chId].name) setCharacterName(characters[chId].name)
Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
if (type !== "swipe" && type !== "impersonate" && !isMultigenEnabled() && !isStreamingEnabled()) { if (type !== "swipe" && type !== "impersonate" && !isMultigenEnabled() && !isStreamingEnabled()) {
// update indicator and scroll down // update indicator and scroll down
typingIndicator typingIndicator
@ -527,8 +529,6 @@ async function generateGroupWrapper(by_auto_mode, type = null, params = {}) {
}); });
} }
Generate(generateType, { automatic_trigger: by_auto_mode, ...(params || {}) });
// TODO: This is awful. Refactor this // TODO: This is awful. Refactor this
while (true) { while (true) {
deactivateSendButtons(); deactivateSendButtons();

4
public/scripts/utils.js
View File

@ -162,7 +162,7 @@ export function saveCaretPosition(element) {
end: range.endOffset end: range.endOffset
}; };
console.log('Caret saved', position); console.debug('Caret saved', position);
return position; return position;
} }
@ -174,7 +174,7 @@ export function restoreCaretPosition(element, position) {
return; return;
} }
console.log('Caret restored', position); console.debug('Caret restored', position);
// Create a new range object // Create a new range object
const range = new Range(); const range = new Range();