Skip to content

feat: SillyTavern parity Phase 0（角色卡分段存储 / Persona / 世界书字段 / 多聊天数据层） #2

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.

Sign up for GitHub

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

Merged
Cassiur merged 5 commits into from
Sep 18, 2026
Merged

feat: SillyTavern parity Phase 0（角色卡分段存储 / Persona / 世界书字段 / 多聊天数据层） #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
061d534
refactor: 角色卡分段字段存储
Cassiur Sep 17, 2026
29c6d5e
feat: Persona 实体和 Repository
Cassiur Sep 17, 2026
98357b8
feat: 世界书字段补全对齐 SillyTavern
Cassiur Sep 17, 2026
5d86b56
feat: 一角色多聊天数据层（Phase 0.4）
Cassiur Sep 18, 2026
f96840d
fix: 补上 upgradeToVersion8 的 onUpgrade 调用和 onCreate 缺失列
Cassiur Sep 18, 2026
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
132 changes: 109 additions & 23 deletions app/src/main/java/com/zcz/javatavern/data/CharacterRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ public List<CharacterProfile> getCharacters() {
List<CharacterProfile> characters = new ArrayList<>();
try (Cursor cursor = database.getReadableDatabase().query(
TavernDatabase.TABLE_CHARACTERS,
new String[]{"id", "name", "description", "greeting", "system_prompt", "accent_color", "avatar"},
new String[]{
"id", "name", "description", "personality", "scenario", "greeting",
"system_prompt", "post_history_instructions", "creator_notes",
"character_version", "mes_example", "alternate_greetings_json",
"accent_color", "avatar"
},
null,
null,
null,
Expand All @@ -51,7 +56,12 @@ public List<CharacterProfile> getCharacters() {
public CharacterProfile findById(String id) {
try (Cursor cursor = database.getReadableDatabase().query(
TavernDatabase.TABLE_CHARACTERS,
new String[]{"id", "name", "description", "greeting", "system_prompt", "accent_color", "avatar"},
new String[]{
"id", "name", "description", "personality", "scenario", "greeting",
"system_prompt", "post_history_instructions", "creator_notes",
"character_version", "mes_example", "alternate_greetings_json",
"accent_color", "avatar"
},
"id = ?",
new String[]{id},
null,
Expand Down Expand Up @@ -90,8 +100,16 @@ public CharacterProfile importCard(CharacterCardData card) {
characterValues.put("id", characterId);
characterValues.put("name", card.getName());
characterValues.put("description", card.getDescription());
characterValues.put("personality", card.getPersonality());
characterValues.put("scenario", card.getScenario());
characterValues.put("greeting", card.getGreeting());
characterValues.put("system_prompt", card.getSystemPrompt());
characterValues.put("post_history_instructions", card.getPostHistoryInstructions());
characterValues.put("creator_notes", card.getCreatorNotes());
characterValues.put("character_version", card.getCharacterVersion());
characterValues.put("mes_example", card.getMesExample());
characterValues.put("alternate_greetings_json",
new JSONArray(card.getAlternateGreetings()).toString());
characterValues.put("accent_color", accentColor);
characterValues.put("source_hash", card.getSourceHash());
characterValues.put("avatar", card.getAvatar() == null ? "" : card.getAvatar());
Expand All @@ -107,9 +125,16 @@ public CharacterProfile importCard(CharacterCardData card) {
characterId,
card.getName(),
card.getDescription(),
card.getPersonality(),
card.getScenario(),
card.getGreeting(),
accentColor,
card.getSystemPrompt(),
card.getPostHistoryInstructions(),
card.getCreatorNotes(),
card.getCharacterVersion(),
card.getMesExample(),
card.getAlternateGreetings(),
card.getAvatar() == null ? "" : card.getAvatar(),
card.getWorldEntries()
);
Expand All @@ -130,8 +155,15 @@ public CharacterProfile createCharacter(
values.put("id", characterId);
values.put("name", name);
values.put("description", description);
values.put("personality", "");
values.put("scenario", "");
values.put("greeting", greeting);
values.put("system_prompt", systemPrompt);
values.put("post_history_instructions", "");
values.put("creator_notes", "");
values.put("character_version", "");
values.put("mes_example", "");
values.put("alternate_greetings_json", "[]");
values.put("accent_color", accentColor);
values.put("source_hash", characterId);
values.put("avatar", "");
Expand All @@ -141,10 +173,17 @@ public CharacterProfile createCharacter(
characterId,
name,
description,
"",
"",
greeting,
accentColor,
systemPrompt,
"",
"",
"",
"",
List.of(),
"",
List.of()
);
}
Expand Down Expand Up @@ -177,13 +216,20 @@ public CharacterProfile updateCharacter(

private CharacterProfile readCharacter(Cursor cursor, List<WorldBookEntry> worldEntries) {
return new CharacterProfile(
cursor.getString(0),
cursor.getString(1),
cursor.getString(2),
cursor.getString(3),
cursor.getInt(5),
cursor.getString(4),
cursor.getString(6),
cursor.getString(0), // id
cursor.getString(1), // name
cursor.getString(2), // description
cursor.getString(3), // personality
cursor.getString(4), // scenario
cursor.getString(5), // greeting
cursor.getInt(12), // accent_color
cursor.getString(6), // system_prompt
cursor.getString(7), // post_history_instructions
cursor.getString(8), // creator_notes
cursor.getString(9), // character_version
cursor.getString(10), // mes_example
parseAlternateGreetings(cursor.getString(11)), // alternate_greetings_json
cursor.getString(13), // avatar
worldEntries
);
}
Expand All @@ -193,8 +239,10 @@ private List<WorldBookEntry> loadWorldEntries(String characterId) {
try (Cursor cursor = database.getReadableDatabase().query(
TavernDatabase.TABLE_WORLD_ENTRIES,
new String[]{
"id", "keywords_json", "content", "enabled", "constant_entry",
"position", "sort_order", "priority", "depth", "probability",
"id", "keywords_json", "secondary_keys_json", "content", "enabled", "constant_entry",
"position", "sort_order", "priority", "depth", "scan_depth",
"case_sensitive", "match_whole_words", "use_group_scoring", "automation_id",
"role", "vectorized", "sticky", "cooldown", "probability",
"exclude_recursion", "prevent_recursion"
},
"character_id = ?",
Expand All @@ -205,18 +253,28 @@ private List<WorldBookEntry> loadWorldEntries(String characterId) {
)) {
while (cursor.moveToNext()) {
entries.add(new WorldBookEntry(
cursor.getLong(0),
parseKeywords(cursor.getString(1)),
cursor.getString(2),
cursor.getInt(3) == 1,
cursor.getInt(4) == 1,
cursor.getInt(5),
cursor.getInt(6),
cursor.getInt(7),
cursor.getInt(8),
cursor.getInt(9),
cursor.getInt(10) == 1,
cursor.getInt(11) == 1
cursor.getLong(0), // id
parseKeywords(cursor.getString(1)), // keywords_json
parseKeywords(cursor.getString(2)), // secondary_keys_json
cursor.getString(3), // content
cursor.getInt(4) == 1, // enabled
cursor.getInt(5) == 1, // constant_entry
cursor.getInt(6), // position
cursor.getInt(7), // sort_order
cursor.getInt(8), // priority
cursor.getInt(9), // depth
cursor.getInt(10), // scan_depth
cursor.getInt(11) == 1, // case_sensitive
cursor.getInt(12) == 1, // match_whole_words
cursor.getInt(13) == 1, // use_group_scoring
cursor.getString(14), // automation_id
cursor.getString(15), // role
cursor.getInt(16) == 1, // vectorized
cursor.getInt(17), // sticky
cursor.getInt(18), // cooldown
cursor.getInt(19), // probability
cursor.getInt(20) == 1, // exclude_recursion
cursor.getInt(21) == 1 // prevent_recursion
));
}
}
Expand Down Expand Up @@ -254,13 +312,23 @@ private ContentValues worldEntryValues(String characterId, WorldBookEntry entry)
values.put("character_id", characterId);
}
values.put("keywords_json", new JSONArray(entry.getKeywords()).toString());
values.put("secondary_keys_json", new JSONArray(entry.getSecondaryKeys()).toString());
values.put("content", entry.getContent());
values.put("enabled", entry.isEnabled() ? 1 : 0);
values.put("constant_entry", entry.isConstant() ? 1 : 0);
values.put("position", entry.getPosition());
values.put("sort_order", entry.getOrder());
values.put("priority", entry.getPriority());
values.put("depth", entry.getDepth());
values.put("scan_depth", entry.getScanDepth());
values.put("case_sensitive", entry.isCaseSensitive() ? 1 : 0);
values.put("match_whole_words", entry.isMatchWholeWords() ? 1 : 0);
values.put("use_group_scoring", entry.isUseGroupScoring() ? 1 : 0);
values.put("automation_id", entry.getAutomationId());
values.put("role", entry.getRole());
values.put("vectorized", entry.isVectorized() ? 1 : 0);
values.put("sticky", entry.getSticky());
values.put("cooldown", entry.getCooldown());
values.put("probability", entry.getProbability());
values.put("exclude_recursion", entry.isExcludeRecursion() ? 1 : 0);
values.put("prevent_recursion", entry.isPreventRecursion() ? 1 : 0);
Expand All @@ -282,6 +350,24 @@ private List<String> parseKeywords(String json) {
return keywords;
}

private List<String> parseAlternateGreetings(String json) {
List<String> greetings = new ArrayList<>();
if (json == null || json.trim().isEmpty() || "[]".equals(json.trim())) {
return greetings;
}
try {
JSONArray array = new JSONArray(json);
for (int index = 0; index < array.length(); index++) {
String greeting = array.optString(index).trim();
if (!greeting.isEmpty()) {
greetings.add(greeting);
}
}
} catch (JSONException ignored) {
}
return greetings;
}

private String findIdBySourceHash(SQLiteDatabase writable, String sourceHash) {
try (Cursor cursor = writable.query(
TavernDatabase.TABLE_CHARACTERS,
Expand Down
142 changes: 142 additions & 0 deletions app/src/main/java/com/zcz/javatavern/data/ChatSessionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
package com.zcz.javatavern.data;

import android.content.ContentValues;
import android.database.Cursor;
import com.zcz.javatavern.model.Chat;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

public class ChatSessionRepository {
private final TavernDatabase database;

public ChatSessionRepository(TavernDatabase database) {
this.database = database;
}

public List<Chat> getChats(String characterId) {
List<Chat> chats = new ArrayList<>();
try (Cursor cursor = database.getReadableDatabase().query(
TavernDatabase.TABLE_CHATS,
new String[]{"id", "character_id", "name", "created_at"},
"character_id = ?",
new String[]{characterId},
null,
null,
"created_at DESC"
)) {
while (cursor.moveToNext()) {
chats.add(new Chat(
cursor.getString(0),
cursor.getString(1),
cursor.getString(2),
cursor.getLong(3)
));
}
}
return chats;
}

public Chat getDefaultChat(String characterId) {
String defaultChatId = "default-" + characterId;
try (Cursor cursor = database.getReadableDatabase().query(
TavernDatabase.TABLE_CHATS,
new String[]{"id", "character_id", "name", "created_at"},
"id = ?",
new String[]{defaultChatId},
null,
null,
null,
"1"
)) {
if (cursor.moveToFirst()) {
return new Chat(
cursor.getString(0),
cursor.getString(1),
cursor.getString(2),
cursor.getLong(3)
);
}
}
return createDefaultChat(characterId);
}

private Chat createDefaultChat(String characterId) {
String chatId = "default-" + characterId;
ContentValues values = new ContentValues();
values.put("id", chatId);
values.put("character_id", characterId);
values.put("name", "默认聊天");
values.put("created_at", System.currentTimeMillis());
database.getWritableDatabase().insertOrThrow(TavernDatabase.TABLE_CHATS, null, values);
return new Chat(chatId, characterId, "默认聊天", System.currentTimeMillis());
}

public Chat createChat(String characterId, String name) {
String chatId = "chat-" + UUID.randomUUID();
ContentValues values = new ContentValues();
values.put("id", chatId);
values.put("character_id", characterId);
values.put("name", name);
long createdAt = System.currentTimeMillis();
values.put("created_at", createdAt);
database.getWritableDatabase().insertOrThrow(TavernDatabase.TABLE_CHATS, null, values);
return new Chat(chatId, characterId, name, createdAt);
}

public void renameChat(String chatId, String newName) {
ContentValues values = new ContentValues();
values.put("name", newName);
database.getWritableDatabase().update(
TavernDatabase.TABLE_CHATS,
values,
"id = ?",
new String[]{chatId}
);
}

public void deleteChat(String chatId) {
if (chatId.startsWith("default-")) {
throw new IllegalStateException("Cannot delete default chat");
}
database.getWritableDatabase().beginTransaction();
try {
database.getWritableDatabase().delete(
TavernDatabase.TABLE_MESSAGES,
"chat_id = ?",
new String[]{chatId}
);
database.getWritableDatabase().delete(
TavernDatabase.TABLE_CHATS,
"id = ?",
new String[]{chatId}
);
database.getWritableDatabase().setTransactionSuccessful();
} finally {
database.getWritableDatabase().endTransaction();
}
}

public Chat findById(String chatId) {
try (Cursor cursor = database.getReadableDatabase().query(
TavernDatabase.TABLE_CHATS,
new String[]{"id", "character_id", "name", "created_at"},
"id = ?",
new String[]{chatId},
null,
null,
null,
"1"
)) {
if (cursor.moveToFirst()) {
return new Chat(
cursor.getString(0),
cursor.getString(1),
cursor.getString(2),
cursor.getLong(3)
);
}
}
return null;
}
}
Loading
Loading