From 8a420842084d2e5bf0fcc8ab444206a503cc06cd Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Fri, 27 Jun 2025 15:06:02 +0800
Subject: [PATCH] 'commit'

---
 dsRag/ElasticSearch/T6_XiangLiangQuery.py     |   6 +----
 dsRag/Util/EsSearchUtil.py                    |  23 +++++++++---------
 .../__pycache__/EsSearchUtil.cpython-310.pyc  | Bin 4089 -> 4002 bytes
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/dsRag/ElasticSearch/T6_XiangLiangQuery.py b/dsRag/ElasticSearch/T6_XiangLiangQuery.py
index 492b6ca9..642866fd 100644
--- a/dsRag/ElasticSearch/T6_XiangLiangQuery.py
+++ b/dsRag/ElasticSearch/T6_XiangLiangQuery.py
@@ -1,16 +1,12 @@
 import logging
 
 from Config.Config import ES_CONFIG
+from Util.EsSearchUtil import EsSearchUtil
 
 # 初始化日志
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
-
-
-# 导入EsSearchUtil
-from Util.EsSearchUtil import EsSearchUtil
-
 # 初始化EsSearchUtil
 es_search_util = EsSearchUtil(ES_CONFIG)
 
diff --git a/dsRag/Util/EsSearchUtil.py b/dsRag/Util/EsSearchUtil.py
index 177a2e45..6bd9a7b9 100644
--- a/dsRag/Util/EsSearchUtil.py
+++ b/dsRag/Util/EsSearchUtil.py
@@ -3,6 +3,8 @@ import os
 from logging.handlers import RotatingFileHandler
 import jieba
 from elasticsearch import Elasticsearch
+from gensim.models import KeyedVectors
+from Config.Config import MS_MODEL_PATH, MS_MODEL_LIMIT
 
 from ElasticSearch.Utils.ElasticsearchConnectionPool import ElasticsearchConnectionPool
 
@@ -16,14 +18,13 @@ handler.setFormatter(logging.Formatter('%(asctime)s - %(levelname)s - %(message)
 logger.addHandler(handler)
 
 class EsSearchUtil:
-
     def __init__(self, es_config):
         """
-        初始化Elasticsearch搜索工具
-        :param es_config: Elasticsearch配置字典，包含hosts, username, password, index_name等
-        """
+                初始化Elasticsearch搜索工具
+                :param es_config: Elasticsearch配置字典，包含hosts, username, password, index_name等
+                """
         self.es_config = es_config
-        
+
         # 初始化连接池
         self.es_pool = ElasticsearchConnectionPool(
             hosts=es_config['hosts'],
@@ -31,7 +32,7 @@ class EsSearchUtil:
             verify_certs=es_config.get('verify_certs', False),
             max_connections=50
         )
-        
+
         # 保留直接连接用于兼容
         from elasticsearch import Elasticsearch
         self.es = Elasticsearch(
@@ -39,14 +40,14 @@ class EsSearchUtil:
             basic_auth=es_config['basic_auth'],
             verify_certs=es_config.get('verify_certs', False)
         )
-        
+
         # 确保es_conn属性存在以兼容旧代码
         self.es_conn = self.es
 
-    def __init__(self, es_config):
-        from gensim.models import KeyedVectors
-        from Config.Config import MS_MODEL_PATH, MS_MODEL_LIMIT
-        
+        # 确保es_conn属性存在以兼容旧代码
+        self.es_conn = self.es
+
+
         # 加载预训练模型
         self.model = KeyedVectors.load_word2vec_format(MS_MODEL_PATH, binary=False, limit=MS_MODEL_LIMIT)
         logger.info(f"模型加载成功，词向量维度: {self.model.vector_size}")
diff --git a/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc b/dsRag/Util/__pycache__/EsSearchUtil.cpython-310.pyc
index 7982447700a58cfeef97dd115f93765df51fd406..beccbf3924bc2a4e076c33c3690d9b6e2f91b8a7 100644
GIT binary patch
delta 1367
zcmZ8g&2Jk;6rY*>^m=#gxK2o_IBpdx>Xce2knqto0Rn=ehzpz+(Ut3&*lT&c(d?#8
zt4LIk1D714;Z`9z+{%e65(iHF16+GpaYo{R#DN0{A@SZi3ZyITZ{EC*-|x-aoxhsj
zG`+<090JdeZ{O}eJn|a!`=e_cpK-#CVJUV3CoTtNN?>me-Pj8}N(34EqH;`ws;G{q
z1R2zhDR}AN0=Kx$ONR`08h3b^yWBg}g1V@Wr=e<w`^U7%t&X1)b+q0iyuzyogjc^{
z!7QgAk=E3&gdF|UR=?=&qd&j>;2r2qkbrU$Fitr;Ac4j;uEVPHDmS@xKm!9TPzK8c
z3zWgK_!RfJ50=d<z*|#)(5v)2)nFmtCj)bzgjQw`N}0p;tjwK54Lok<jeTB*xI3sk
zB40CXa-Z!}PUi?9n<HF@BVw)zdl$SUta1+o{M{$et8?k}QD3r`)d`E$thW4y3lZrd
z_y9pA?(Bu#WHb`pEJ{YHq!`iwTADnctEP>$`P_*{T<nFTPAoobP30w#V)=H|leYRw
zTfQO<q^%E=4iE1ok}uyC-EcdRaVL`|a$5lEiLrRGR*2+!Du&zg0)}*e$3!lupS7Fj
zG;GqgYU+);ZP{8)uT!R()TE5s|M-Sl*PmB6%ttE=NJHfuE-Yv5mvS9-!PNkl#IS4v
z<j&eKO0#Yf@2qdCvh{hrsARd8?#8(`6r&cCm({UVzj0P07oqSLyeR{iCoLm429dba
z3G`uiH!DQtJd$e<qMep58|rtfQJWA?^k0CeY^tU`LpM%V?RV)0p8K(u8^s{yGFIzp
z^guxQi<mr%9y1jk+3go|X&DnLOqHwZhtlFg(cxK}xd%he5*bd4w$$IHho7KKZot^P
z{oL72g$$$74)pvA_~F~4ihLCTM-Pr-S`!KMKBG|1#9nsFfBWRA^C{hY9n;pZ_*{SJ
zy@{}n@C=RDzkf$Y{FF$X+;#8K_m_}ElV^N#1066-B*2b>^5kG)c7I36Rdk={Ee?{Y
z75|!d9c!6<6O*p1*kAhi5}L(i&nrw${~u9d;h!SQ0Cjj%ydpNSslDWQPR+6WN)c<#
zso(r7uU*C583g=s1Ft7WX%x5Pgo|NX+=JZPEbc~ovYcK3)u^n@*ie#}dLr9OdOacK
xTgY=!^($MqQ2u`hJnJjB*MNI>DAw_krs&7!T#BzttJGzV=2D;eU^}$N{sp_WAhQ4f

delta 1437
zcmZ8h&u<$=6rLaZ%e&sS<G6vOga9EDo1&CJ3#}RwNK{%uR3Ra8Fe*;snK)~C?PzvQ
z)5;MD!U3TiqB#LVN;tJAkaFh2oqu4taDr>E9FTZ#HzZ9h?c29+-uHd;zTNRpQ~yl)
zecyKp{9auCbZhg#pQPU(Tv}R_<gg^&Biit!cUYFB;~!B<B<%#k6qc~}89Z^}h>~!H
zx6d0DSvjl%YDAQeXx{4`)?@{<TSWLG*drqNiZw<B{fLB>gTLnKMg2!`Q49JlUDc22
z*bTNv8eAB{gu5X|ge{ys+Atvl5y&jaJW+<s7Bvxw3S^F`0^O*-&R(HwdV@8~!i9o2
z_zp&L^$dSQuW_k==d<sZprUY8<w0mv;`N<otKaL%RvPttiK4i~Aw1&heD9sm$x1T8
z?#-yJO#O}V`dG*_Baz)r6(G()98nkar1`d0hlk`jy=G3bvaJuymp?b5g4YVJY(WrI
zur7(|F8ByJ@3NTh^4QolC>gSjIRqnyV8uQklBSi~hmNp@q+@kTKad|8x|+H}D(rCr
z(HSRTTPg4L;Ms*L0VfDLaR&xtgy=e*r|;=`W8u~l)A_KK%#C_N?lgPru?+o&-<G{3
zis$0KkljQ*iyi(-KKWd6Q{zxm6Z%(UT>oiIH*j`U!!QXUG!@QY*n;SjcFZoEhB3^Z
zfiMSGf`Bru(i*Q*#w}`5MxB2HQ$I8xUPVwy)fC=X#^zqjjC*}0pp@(6oJg0s3*9J5
zTm5)@aan(Defd_7WEoEeamKr{7cw=Cja)==NHhC0c=dgi6x+&oGy}`G^`bpdLpk+Q
z-u)oj4h>b;9eXk?C=2BfTXN-*RPLnBwBMBRh7=;|wHJ?nv2W5PG~^M_%-msh1?h|=
zdLV%h2Unw5u@bqiT3fke|GS5+>YBb%ntnbX@N7!I*mbi2eV_-WFFrw;%#7F5)>h^Y
z5~-R|Z+nocH=!Q#Tt!_+M*LQxkQ-M>VD%{lFQ2C1zkB?ldzY@<z_vvMpS;~O@DeV)
zgW)L}f9w8+ip0rA#qneB9=-i4a&UFZr{2W^xQhfx+VBeDW_o{Hs%uz2&zldD=%4*d
z{$<26wTw-d_22&N$M{7R&Yo8&ravRfv;2)afWU7zsX}mw!<-4H>iTZYwS$Vn)v&H*
zFyqZaszxvv`nTZf7#`=W)RyULzulHf;n7wvXuq<06H!m>`cy1)7T{D3x^fZ!Ymx~F
Vph(LUuQGFanFcI?bKue%`wxYYB>?~c