klinsmaya/SQLBot
1
0
Fork 0
mirror of https://gh-proxy.org/https://github.com/klinsmaya/SQLBot.git synced 2026-11-08 01:06:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: transaction error after run assistant chat

Browse Source
This commit is contained in:
ulleo
2025-09-29 19:08:36 +08:00
committed by ulleo
parent feece9cf9a
commit a4f9dfc8d4
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/apps/terminology/curd/terminology.py
+27 -7
View File
@@ -390,10 +390,23 @@ FROM
FROM terminology AS child
) TEMP
WHERE similarity > {settings.EMBEDDING_TERMINOLOGY_SIMILARITY} AND oid = :oid
AND (specific_ds = false OR specific_ds IS NULL)
ORDER BY similarity DESC
LIMIT {settings.EMBEDDING_TERMINOLOGY_TOP_COUNT}
"""
embedding_sql_with_datasource = f"""
SELECT id, pid, word, similarity
FROM
(SELECT id, pid, word, oid, specific_ds, datasource_ids,
( 1 - (embedding <=> :embedding_array) ) AS similarity
FROM terminology AS child
) TEMP
WHERE similarity > {settings.EMBEDDING_TERMINOLOGY_SIMILARITY} AND oid = :oid
AND (
(:datasource IS NULL AND (specific_ds = false OR specific_ds IS NULL))
OR
(:datasource IS NOT NULL AND ((specific_ds = false OR specific_ds IS NULL) OR (specific_ds = true AND datasource_ids IS NOT NULL AND datasource_ids @> jsonb_build_array(:datasource))))
(specific_ds = false OR specific_ds IS NULL)
OR
(specific_ds = true AND datasource_ids IS NOT NULL AND datasource_ids @> jsonb_build_array(:datasource))
)
ORDER BY similarity DESC
LIMIT {settings.EMBEDDING_TERMINOLOGY_TOP_COUNT}
@@ -447,14 +460,21 @@ def select_terminology_by_word(session: SessionDep, word: str, oid: int, datasou
embedding = model.embed_query(word)
results = session.execute(text(embedding_sql), {'embedding_array': str(embedding), 'oid': oid,
'datasource': datasource}).fetchall()
with session.begin():
if datasource is not None:
results = session.execute(text(embedding_sql_with_datasource),
{'embedding_array': str(embedding), 'oid': oid,
'datasource': datasource}).fetchall()
else:
results = session.execute(text(embedding_sql),
{'embedding_array': str(embedding), 'oid': oid}).fetchall()
for row in results:
_list.append(Terminology(id=row.id, word=row.word, pid=row.pid))
for row in results:
_list.append(Terminology(id=row.id, word=row.word, pid=row.pid))
except Exception:
traceback.print_exc()
session.rollback()
_map: dict = {}
_ids: list[int] = []