youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-03 17:08:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/rag-2

Browse Source
This commit is contained in:
twwu
2025-08-22 17:40:34 +08:00
parent 570b644a7e 2a43e634e8
commit 8c44151e6f
113 changed files with 1945 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/core/rag/datasource/vdb/analyticdb/analyticdb_vector_sql.py
View File

@ -105,9 +105,11 @@ class AnalyticdbVectorBySql:
conn.close()
self.pool = self._create_connection_pool()
with self._get_cursor() as cur:
conn = cur.connection
try:
cur.execute("CREATE EXTENSION IF NOT EXISTS zhparser;")
except Exception as e:
conn.rollback()
raise RuntimeError(
"Failed to create zhparser extension. Please ensure it is available in your AnalyticDB."
) from e
@ -115,6 +117,7 @@ class AnalyticdbVectorBySql:
cur.execute("CREATE TEXT SEARCH CONFIGURATION zh_cn (PARSER = zhparser)")
cur.execute("ALTER TEXT SEARCH CONFIGURATION zh_cn ADD MAPPING FOR n,v,a,i,e,l,x WITH simple")
except Exception as e:
conn.rollback()
if "already exists" not in str(e):
raise e
cur.execute(

21
api/core/rag/datasource/vdb/clickzetta/clickzetta_vector.py
View File

@ -1,3 +1,4 @@
import contextlib
import json
import logging
import queue
@ -214,10 +215,8 @@ class ClickzettaConnectionPool:
return connection
else:
# Connection expired or invalid, close it
try:
with contextlib.suppress(Exception):
connection.close()
except Exception:
pass
# No valid connection found, create new one
return self._create_connection(config)
@ -228,10 +227,8 @@ class ClickzettaConnectionPool:
if config_key not in self._pool_locks:
# Pool was cleaned up, just close the connection
try:
with contextlib.suppress(Exception):
connection.close()
except Exception:
pass
return
with self._pool_locks[config_key]:
@ -243,10 +240,8 @@ class ClickzettaConnectionPool:
logger.debug("Returned ClickZetta connection to pool")
else:
# Pool full or connection invalid, close it
try:
with contextlib.suppress(Exception):
connection.close()
except Exception:
pass
def _cleanup_expired_connections(self) -> None:
"""Clean up expired connections from all pools."""
@ -265,10 +260,8 @@ class ClickzettaConnectionPool:
if current_time - last_used < self._connection_timeout:
valid_connections.append((connection, last_used))
else:
try:
with contextlib.suppress(Exception):
connection.close()
except Exception:
pass
self._pools[config_key] = valid_connections
@ -299,10 +292,8 @@ class ClickzettaConnectionPool:
with self._pool_locks[config_key]:
pool = self._pools[config_key]
for connection, _ in pool:
try:
with contextlib.suppress(Exception):
connection.close()
except Exception:
pass
pool.clear()