yumoqing/rag
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 所有id统一32字节 — init.py去掉[:16], DSPY文件改用getID(32)去import uuid

Browse Source
This commit is contained in:
ymq 2026-08-07 16:47:50 +08:00
parent 0fff825331
commit 24bc017e1f
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rag/init.py
View File

@ -322,7 +322,7 @@ async def doc_upload_handler(request, params_kw, *args, **kwargs):
"message": "存储配额超限：机构已用 " + _fmt_bytes(used) + "，限额 " + _fmt_bytes(quota_limit) + "，本文件 " + _fmt_bytes(file_size)}, ensure_ascii=False) "message": "存储配额超限：机构已用 " + _fmt_bytes(used) + "，限额 " + _fmt_bytes(quota_limit) + "，本文件 " + _fmt_bytes(file_size)}, ensure_ascii=False)
# Save file via FileStorage (layered dir layout, returns web path e.g. /191/193/197/97/xxx.txt) # Save file via FileStorage (layered dir layout, returns web path e.g. /191/193/197/97/xxx.txt)
doc_id = uuid.uuid4().hex[:16] doc_id = uuid.uuid4().hex
web_path = await env.save_file(file_data, file_name) web_path = await env.save_file(file_data, file_name)
file_type = _detect_file_type(file_name, "application/octet-stream") file_type = _detect_file_type(file_name, "application/octet-stream")
@ -615,7 +615,7 @@ async def dir_create_handler(request, params_kw, *args, **kwargs):
if not kb_id or not dir_name: if not kb_id or not dir_name:
return json.dumps({"error": "kb_id and dir_name required"}) return json.dumps({"error": "kb_id and dir_name required"})
async with get_sor_context(env, 'rag') as sor: async with get_sor_context(env, 'rag') as sor:
dir_id = uuid.uuid4().hex[:16] dir_id = uuid.uuid4().hex
await sor.sqlExe( await sor.sqlExe(
"INSERT INTO document_chunks (id, doc_id, kb_id, chunk_index, chunk_type, content, description, created_at) " "INSERT INTO document_chunks (id, doc_id, kb_id, chunk_index, chunk_type, content, description, created_at) "
"VALUES (${id}$, '', ${kb_id}$, 0, 'directory', ${name}$, ${parent}$, NOW())", "VALUES (${id}$, '', ${kb_id}$, 0, 'directory', ${name}$, ${parent}$, NOW())",
@ -685,7 +685,7 @@ async def tag_create_handler(request, params_kw, *args, **kwargs):
if existing: if existing:
return json.dumps({"status": "SUCCEEDED", "tag_id": existing[0].id, "name": name, return json.dumps({"status": "SUCCEEDED", "tag_id": existing[0].id, "name": name,
"color": existing[0].color, "duplicate": True}, ensure_ascii=False) "color": existing[0].color, "duplicate": True}, ensure_ascii=False)
tag_id = uuid.uuid4().hex[:16] tag_id = uuid.uuid4().hex
await sor.sqlExe( await sor.sqlExe(
"INSERT INTO tags (id, kb_id, name, color, org_id, created_at) " "INSERT INTO tags (id, kb_id, name, color, org_id, created_at) "
"VALUES (${id}$, ${kb_id}$, ${name}$, ${color}$, ${org_id}$, NOW())", "VALUES (${id}$, ${kb_id}$, ${name}$, ${color}$, ${org_id}$, NOW())",
@ -742,7 +742,7 @@ async def tag_assign_handler(request, params_kw, *args, **kwargs):
if media_type not in ("document", "face", "voice"): if media_type not in ("document", "face", "voice"):
return json.dumps({"error": "media_type must be document/face/voice"}) return json.dumps({"error": "media_type must be document/face/voice"})
async with get_sor_context(env, 'rag') as sor: async with get_sor_context(env, 'rag') as sor:
mt_id = uuid.uuid4().hex[:16] mt_id = uuid.uuid4().hex
await sor.sqlExe( await sor.sqlExe(
"INSERT INTO media_tags (id, kb_id, media_type, media_id, tag_id, created_at) " "INSERT INTO media_tags (id, kb_id, media_type, media_id, tag_id, created_at) "
"VALUES (${id}$, ${kb_id}$, ${type}$, ${mid}$, ${tid}$, NOW())", "VALUES (${id}$, ${kb_id}$, ${type}$, ${mid}$, ${tid}$, NOW())",
@ -897,7 +897,7 @@ async def tag_sync_handler(request, params_kw, *args, **kwargs):
added = 0 added = 0
for tid in wanted_ids: for tid in wanted_ids:
if tid not in current: if tid not in current:
mt_id = uuid.uuid4().hex[:16] mt_id = uuid.uuid4().hex
await sor.sqlExe( await sor.sqlExe(
"INSERT INTO media_tags (id, kb_id, media_type, media_id, tag_id, created_at) " "INSERT INTO media_tags (id, kb_id, media_type, media_id, tag_id, created_at) "
"VALUES (${id}$, ${kb_id}$, ${type}$, ${mid}$, ${tid}$, NOW())", "VALUES (${id}$, ${kb_id}$, ${type}$, ${mid}$, ${tid}$, NOW())",

3
wwwroot/knowledge_bases_list/create_kb.dspy
View File

@ -2,10 +2,9 @@ ns = params_kw.copy()
db = DBPools() db = DBPools()
dbname = get_module_dbname('rag') dbname = get_module_dbname('rag')
async with db.sqlorContext(dbname) as sor: async with db.sqlorContext(dbname) as sor:
import uuid
env = request._run_ns env = request._run_ns
userorgid = await env.get_userorgid() userorgid = await env.get_userorgid()
kb_id = uuid.uuid4().hex[:12] kb_id = getID(32)
name = ns.get("name", "") name = ns.get("name", "")
desc = ns.get("description", "") desc = ns.get("description", "")
await sor.sqlExe( await sor.sqlExe(

3
wwwroot/knowledge_bases_list/new_tree_item.dspy
View File

@ -2,8 +2,7 @@ ns = params_kw.copy()
db = DBPools() db = DBPools()
dbname = get_module_dbname('rag') dbname = get_module_dbname('rag')
async with db.sqlorContext(dbname) as sor: async with db.sqlorContext(dbname) as sor:
import uuid dir_id = getID(32)
dir_id = uuid.uuid4().hex[:16]
name = ns.get("name", "") name = ns.get("name", "")
parent_id = ns.get("parentid", "") parent_id = ns.get("parentid", "")
kb_id = ns.get("kb_id", "") kb_id = ns.get("kb_id", "")