From 6dfbaf1b886e87ff3a504560ca8f8210ed82a924 Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Tue, 10 Sep 2024 01:57:13 -0400
Subject: [PATCH] bugfixes

---
 .coverage                         | Bin 0 -> 53248 bytes
 dashboard/server.py               |   4 ++--
 model/command/internal_handler.py |  13 +++++++------
 model/platform/qq_aiocqhttp.py    |   2 +-
 model/platform/qq_nakuru.py       |   2 +-
 model/platform/qq_official.py     |   2 +-
 tests/test_message.py             |   9 +++++++--
 type/types.py                     |   2 +-
 util/cmd_config.py                |   7 +++++--
 9 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 .coverage

diff --git a/.coverage b/.coverage
new file mode 100644
index 0000000000000000000000000000000000000000..439ed81bb3736293f18c8ea1646ebe595a8e25d8
GIT binary patch
literal 53248
zcmeHQdvqMtd7s&t-Pza7T|L)&StI!&$$G40OY#fw+Qfi?1`{~YhQfNa8c7SgJJQZb
zwgBs4oIoiqNn1i`32n~F<Bv2X?K$mfXe|32(gQR-(4;3RrQioCF%1bW4qzAC+J4{N
z9qme%w4<KWlN0xjwcmH=&i(H9-QWH0<J0Pn@3{TexT&cFdO8_3)lFQ0<9RNusvO68
z;3LDwx+F-5)(vpJAiY%5!*#@XncT(sT}L=_pL`o>_dhGI_x;eH^gQl+PKtVB@PJ(m
z0fqoWfFbbz8-eND{Zg>1ia&JFjP@loGaZd-=`5A6|IF^4ckWj2+_~%4-D);ZZT6~g
zwYRG~)wI4}9oEw7Ks=$T@l=027B%CkLDd}6tkR=~){hGv<iS#h1v{ubrXulvkTSJF
zsA4!BPe#+@>I2$%8!eF2W@-n_Yz9=K#RpSZLT%28x2S1tKuc?>m}X?HXpZ-{cv~Ks
z^h&|9GX7DGwkev9!H;iVYak=vlsyAbQA|(wqxF61Xeu_O8EtBGu7xoj>^xv*TbtIC
zAyZcq@f2-l%7~kBJ*8>~wAiSr^)K4MHU!PO0KCH1KwbN=LHn|jIb8+l<b@ZJ%oWcG
z4}ftg-GVhQh^j%D+MF6q_5tMgk0yt)b3h`i*wmMjTuRo|bB(p#H;eRTzP<Ch(}Em(
zG%GclijRzHbDiI&<|W%`Gg5k+ij4pdSm$#Ex0dl7c%^p07)ii>D-s<wb$TCx&X05f
z@gFX6OTqej{?QTYC<sraFK!xh3C}#Inaf_nb@2JpeuJZAzLVf6N+eW$fDRdyR<oT0
z-ds3lLKYa&G!8UX&lLnqf34nz#)1uMUqbJj?`za!3=IYd%mr4lfzeb9hl+u1i0NZm
zIy$Iz<ep}yg<rQLf$Ma6T*2M-OS#UR3q-o+lHTbmmlUk2;SYJJ8|8W{$E0~KWcB1C
z)2Q_*sYQ*^v^9||H%VF&`B~B$Be^HgoOa0-+*z|!b8_V(UAcsNS`wvTMFl^d9T7M$
z;m0|z5tx%70t*%b`{oZv%^~$l+c6sqZ*sbV+bfnb98HLHA$2`+kAs^0Xca|236nm4
zgn1@oPTu5OwDI<_XaZ)F;b=S!Ll)-X><XY_!Tu-|j`r!JCiP#urS6GqPu|{a1^Igm
zdnnaHi^K5Vs~bifmQ`G~jBQq~+B6h3a27I})IMELXwg)5Z2*Zq2I!0%Dz)LtRcS}Q
z4r3ha7#wS&Hd%`cPV;xdptHsoB$CN!sz0}0;WC`973O{%oTw)|iGZNm1cTCmA-bSW
ztJ2(4oUyF>JB9%htTh?!&klF&l!6-f4{29amtBoM6*V<8p43z<LXDx0wLfa8v9tyc
zVJ&TG5|(oV?5#)_QjC(_xRsl(=cQn4D?dG&8;sd`CSt&%o{U;%=WZSIoMgenyuaKA
z6E5s_3jGAJD}V!Uvl?)6%l2Sj76q$RZm;8Q!2q8p7diN07ejy{zz|>vFa#I^3;~7!
zLx3T`5MT%}1Q-HW9|8jJ;3bUz9pp4e&H`Z<Lx3T`5MT%}1Q-Gg0fqoWfFZyTU<fb-
z7y`eU2>2aB9kKqzqm%GLO)&RI0Gm5{JG#8kDhGL&Bkz)relr`$tY!!>1Q-Gg0fqoW
zfFZyTU<fb-7y=9dh5$prLclN7@z!qv9A2TullvtAe*fPq{4qyfCcjVaAhpU#<;zM`
zSu6ji{9XC;@*bJ^-}3*Zf4~0*Kk>cpd&>7)KGFNH-Y2|wdCNRM_B`wPtVebK%>BIE
zbZ?d}NiRx|Nw-Pmt~Xs@cMZGRoadb1a*jB6INjn);^)M$@S!jR%GkvaU<fRUKy$Ca
z-5pBnx*0O`(S)g`L&ItPel2E(b{b}S7vv|S@f4hP>h2LZefg53W;_vslhKBrio(&;
zage&XTjZvzmKRIv{aOOfdeZY+A$?d&MdJ~DU?3igM-!1DIK-9E(oom+o1iYAow}e2
zWAT1y%Yw?FlJG{T#A&ONMAU@isL9aCNF*B9V<SVRISe)I=z<!AmDXUj2P)|46u6P)
z<tdVIHgO<67{RmwVx1v@8?+$?r^3?l7)osG5V(hym&js2Y&8{5%)!}I3U<3)u&s{6
zb6#oa_<|nW(k5{G?HMpS7*Bz#S?YJSf_l&LqFHxKpk$<98w*8;<Ds!GJTwfjLG!ye
z6!qBts4>*1N7MbGAuR!(i&8BskTSG1EN&px+bnR#^5*7sMI!N3+>As(ZfldkjV~`p
zo4H@>Gc-6kITRYy^+7mjI6S_2y}*sGNYu~=b=0|Tr8>0~U`%zcU8&AKc((xRT(eT0
zbKSVTQQ!{RXeT&s$_xQekt|ZQU$!*Z^gzpthofoeRIs>LE!v~z_^=jAYK8%-Bib0K
z2e~cvMK#hM&6<m6!y~b1B7u^ti%MF<m5!F2$sif7D?X`FrK7`e?p235K09i1w@}08
zT6-M}ud9Hzjt(buIQEJ#T~i})lQw$C()?h27{sX+Aic9143}0Q9)(4zPd5vy=&mX{
zUTM?KjdAOJ0-$)$Do`A>p%}$LC!ES1jB7?HrJ4Kn^aGJx7A|qEL4mv1Mon=XdpA~s
z-ZC4d7wAps;3S1wZ>WHZN>*M`U)0bF>)Bauvj-L!R4|A2l-XO)um*T(3HS~5oSstq
zVg=elB?6}{-)=fC=jM-10f9>{FF+k6mh6wr35AF~E!lwt9owlCU7d4g(QOV$Y>|r&
zcPe4Id~Tuv$?g84Gom$7<hC#c_;vXN4*Fra9UoPj28TCbMF)KyUV)3*5J5TIcWm_(
zo$TlD`SR=jcDLQ8SzA17uLpX!Nk#WNIWXxi6`Ge{_QNh12SxUUmT;~oLZh(JFe5M@
z^kb{HJBymWu!8*Fwnr>F7%X9UbApM}5AH>Kh2o2pW|&4OsmC5LLhu3=m^{%|M^RhN
z0y)?L7wlhqd7DbHib&pV@%#T?;VF*PDW{a@ls?y6t`XNagr}U(%Rd)Ba*xV4JJaIl
z#g{z|&R>Z;m38D!@&tKB4){;_Z*+g#|1J4Z`33hG_ZI&Fr^oYU@9WO6aLm>24|wnP
z{hRMgzEAs{-Xq>}&pn=>NZ*$(OTQ;oNPCwIeAokq07HP|T7<j#<)`*s{NLLn=tWA>
zWpsZ0-*byNT~$PE{#vjgWG{#&yFVpP`)t)^tqF_7|C@G-(@uMpSV8fE_<v(qoEBDG
zL&5yn)hmn?k<V^O7R3Ku!k`_oeEc8UE<993V!=KkzYurW2HT397K#7cw+j1h8n7V#
zZ@XTc_7oA#y4%w6e`|4%&Bx?(@&AUENX^CnEt>_Sh`D)P1-r54ZNhjFIoixc;{T>C
z!syCGbMgQB73-Xf|JSWpXD<F<yJDSlTk$p52nX%7bJ6&}(XIztUOX57Hx%ztx=&sh
z|Et9{(jL7s{;w}CX${u}@&9TYlNwcOMd4S(|8+Jy_KNtw_F7@mPVZQn=g0pwyToZ}
zCE~eFa6$ZEU3|RKrepL8K85csgAH)i&Ej;>j^YJj?;`R4sy5+XJ2lbxKX{WkU1q2B
z0=-wn|CKk2(<T3liWbKI6?S`Ifk6dxSh>yh3~MNe|I1b&R-mo4Q_zaEn~ux5`J<#;
zNEQ*G4l*zP57^W)7ypyut8>mQEB;rC4|ghIxqLp5l8euX)<kh-{O{i=#EZZ|)fUA6
zzK{^JBZ6`m344oA_Vf3A`E7^CcGDJ#|J}v+J5~^lyVQB{zhq+ywS*Us|6RpRUsypt
z{&yB143=<V{4d&AqzdBrx%giwZtK$VzoS<$ihMPb6<!ekv-kh8fRiD>5MT%}1Q-Gg
z0fqoWfFZyTU<fb-7y?%{0s{QWfQ;Y&^W+i-KkQ-%Fa#I^3;~7!Lx3T`5MT%}1Q-Gg
z0fqoW;3`Bw5M&R2|KH>LD~^0X-XU+2e<072Bcz|)MZ%<s)Do{UtNaq)3Gmm-gfgZi
z6-~KUxkI^D=~h~mYB?i+EdN42Ex#rom;YA&s{Cj2lk${o$Z>g}tjZ;_!~cf=JO1bV
zNBoEVxBA!k{@r&JRI!U8zz|>vFa#I^3;~7!Lx3T`5U`7Yw@2hXl|7d-nGC7zhV-`X
z*{9z-<`lUpPUS@U|Bj11)TZ9B$;o@B{hMZwMlNS2-~aQmV}D<_SA;@bU<y8BAg2=l
zxAJ4TbdIS|8N3%9o=n|T+O!e0?A<t<`RL-e-}{<;VaN9%`(^3xMlQVb+6~wIDYxyV
zlLC|%r+T}fV5)2O^5oVA_pZ#$S>ZM(cj2s1^UohlJ$Y#Vx&Qdl6CYl<??>aSy_~>t
z!#wBz93SSmo1{*V3v}Kkk`N@+(22`V(9Utk9f1zWXzcg|&SO!F0^#O%$oWkBC!w=w
zvYVrgz*_JEd$Wz2g7o?}DEaBO*~{<wAQM`va$Fc|X_yLg*^9y?w?etv)((6Q^700}
z-7xzO+8{cvYk}K|7HHGC^FR5MXP)7?eH>W7k2}sy@sL=>aW4Eh&T*aa!E`6U6IQ1<
zx0_QBOU)o3XnsR-H$kGbY3yC6Z#|?|tsi^0EG)X^b#PO=?hnrV;J_X(;P$SC+sd`u
z9_B?}S_A38n(Kr>BP1Fd-_JZ9gcgETVRr-Mlr~hKJ|wG<s#Rwq8UEDClaqmZELxxH
zd%GR1;COM$vl?>BSI=BJ?{L?lRNW^(XqRds6{sEKt7;(8U2|WkUqtBE@|;6OjKD=m
zH9S(QCys(6gdN~dQWXkSy&y`fFtKVZQXYiFhTv=mA5b|cg5dLEcO~SOR*pFXt_nyg
z7290p$jcR}40xbyX2w;D8KsVmCBO$tKKc0a#Rxd`<rg!TPrjySG81o}y+ksZ$;`yj
z$=S?~%xjl`oIaEJ@6#EfH2^Zd9hi7%^5R71=;UPP{Mqv-4rV6*=)W#qia?{)4Ud<3
z!@ujhiBqR|KY_y4<b?6?<G;G4ktlGdD(@fospJp?YFPEkkWnemod2gxWxx;VM*qZ#
zQ~Np}%Y0>u+vo8?PPuQ!7*T>=NOpQ>Gfzw&KX$qvni}5A9r_}tmV4mA2G8u|<%_e^
z=R!{KqK94A_}!3O?SAlg0<(NL+$6!>UTNl7$PI3Bofim)DL~A@IRash3&TGL_?`<2
z*18ZzxWpzW$~k8;k=eJu@RszL&nceD+;_-%_!X{k*Q>P5R0GGI;wwZb*e1?qLTB#%
z+Qfq=p%+d~p14I4AUhzu(d%_UqSEokLucP>m3h(QS)H0Z`u@d>{G|!}{=Y|gk|P(%
zhvb*!XXGS#o&1peBYBa0kNgdJo_vG+1$l=2A-o;%FgZxZh)#w`lzbN66?iMzO|B!G
zNhfI`jiiQ@6PdV_jB-KwK>4}yQ{_$N$I7e9OUiNOyYTyiZz^AfHw%6VRI!U8zz|>v
zFa#I^3;~7!Lx3T`5MT%}1Q-Gs0P{UPly!GgwrLY(8#hwc)kRrnCuN}!WgQ)qwYO8&
z)<#)tD`gutP}b5yS#vXGO-+=oUr*V(b(F1LOWB$=lr=U|*3dwis!~>8Puc3#l-1Qy
zR$EJ1O$}w$)s$6LQMPIoWx*h2m6eoLR8Ur4PFYzQWu>K*m6T8x2v9}{Wr{+XOn*PX
z`~CFJ=cCN)rOe}@%<ZO3k|=YzD04a~6Gh4dfij0fgkJ>E@BeeZG-KY!5MT%}1Q-Gg
z0fqoWfFZyTU<fb-7y=9dhQL*d0Dk|^;{U6(b6K+(0t^9$07HNwzz|>vFa#I^3;~7!
zLx3TWLjceJ_bTV`@BcrBcL4l?oFQ+Mx8MxGzmQkSE9Cp+7<mEC0epvilYE_g1>O$u
zG@J!ELLMWJkO?wQOgIm4KhelOau2*S;C46@a3k48t|eQ@Cei`t0@jjxQcWsIfcS`u
z@X96SJSbxqLx3T`5MT%}1Q-Gg0fqoWfFZyTU<fb-{?8E*df~PALJyK|B%6?IMAC(%
z6G;e32a<LqZAe;?Y(Ub2q!~#QlJ!W|Az6!L4U$GA4M<cZ^+;ADsY6nWqy|Yfk}4#t
zkOYxbBB?-9j-(7pDUuQ-0VD*8f<#8*N8&@`MdCr?Mj|0`A#oxRkqAf}Nbvpt{{z_Y
B2q6Ff

literal 0
HcmV?d00001

diff --git a/dashboard/server.py b/dashboard/server.py
index f1675b1b2..87e9d25c4 100644
--- a/dashboard/server.py
+++ b/dashboard/server.py
@@ -383,14 +383,14 @@ class AstrBotDashBoard():
     def save_astrbot_configs(self, post_configs: dict):
         try:
             self.dashboard_helper.save_astrbot_config(post_configs)
-            threading.Thread(target=self.astrbot_updator._reboot, args=(3, ), daemon=True).start()
+            threading.Thread(target=self.astrbot_updator._reboot, args=(3, self.context), daemon=True).start()
         except Exception as e:
             raise e
     
     def save_extension_configs(self, post_configs: dict):
         try:
             self.dashboard_helper.save_extension_config(post_configs)
-            threading.Thread(target=self.astrbot_updator._reboot, args=(3, ), daemon=True).start()
+            threading.Thread(target=self.astrbot_updator._reboot, args=(3, self.context), daemon=True).start()
         except Exception as e:
             raise e
         
diff --git a/model/command/internal_handler.py b/model/command/internal_handler.py
index 8245f984f..e4e120f79 100644
--- a/model/command/internal_handler.py
+++ b/model/command/internal_handler.py
@@ -8,7 +8,6 @@ from type.types import Context
 from type.config import VERSION
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
-from nakuru.entities.components import Image
 from util.agent.web_searcher import search_from_bing, fetch_website_content
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot')
@@ -208,10 +207,11 @@ class InternalCommandHandler:
             return CommandResult(
                 hit=True,
                 success=True,
-                message_chain=f"网页搜索功能当前状态: {context.web_search}",
+                message_chain=f"网页搜索功能当前状态: {context.config_helper.llm_settings.web_search}",
             )
         elif l[1] == 'on':
-            context.web_search = True
+            context.config_helper.llm_settings.web_search = True
+            context.config_helper.save_config()
             context.register_llm_tool("web_search", [{
                 "type": "string",
                 "name": "keyword",
@@ -235,7 +235,8 @@ class InternalCommandHandler:
                 message_chain="已开启网页搜索",
             )
         elif l[1] == 'off':
-            context.web_search = False
+            context.config_helper.llm_settings.web_search = False
+            context.config_helper.save_config()
             context.unregister_llm_tool("web_search")
             context.unregister_llm_tool("fetch_website_content")
             
@@ -254,15 +255,15 @@ class InternalCommandHandler:
     def t2i_toggle(self, message: AstrMessageEvent, context: Context):
         p = context.config_helper.t2i
         if p:
-            context.config_helper.put("qq_pic_mode", False)
             context.config_helper.t2i = False
+            context.config_helper.save_config()
             return CommandResult(
                 hit=True,
                 success=True,
                 message_chain="已关闭文本转图片模式。",
             )
-        context.config_helper.put("qq_pic_mode", True)
         context.config_helper.t2i = True
+        context.config_helper.save_config()
         
         return CommandResult(
             hit=True,
diff --git a/model/platform/qq_aiocqhttp.py b/model/platform/qq_aiocqhttp.py
index b79f28ff8..c6f4164f8 100644
--- a/model/platform/qq_aiocqhttp.py
+++ b/model/platform/qq_aiocqhttp.py
@@ -188,7 +188,7 @@ class AIOCQHTTP(Platform):
             res = [Plain(text=res), ]
             
         # if image mode, put all Plain texts into a new picture.
-        if use_t2i or (use_t2i == None and self.context.base_config.get("qq_pic_mode", False)) and isinstance(res, list):
+        if use_t2i or (use_t2i == None and self.context.config_helper.t2i) and isinstance(result_message, list):
             rendered_images = await self.convert_to_t2i_chain(res)
             if rendered_images:
                 try:
diff --git a/model/platform/qq_nakuru.py b/model/platform/qq_nakuru.py
index 3edb69d7a..9b06526b6 100644
--- a/model/platform/qq_nakuru.py
+++ b/model/platform/qq_nakuru.py
@@ -185,7 +185,7 @@ class QQNakuru(Platform):
             res = [Plain(text=res), ]
 
         # if image mode, put all Plain texts into a new picture.
-        if use_t2i or (use_t2i == None and self.context.base_config.get("qq_pic_mode", False)) and isinstance(res, list):
+        if use_t2i or (use_t2i == None and self.context.config_helper.t2i) and isinstance(result_message, list):
             rendered_images = await self.convert_to_t2i_chain(res)
             if rendered_images:
                 try:
diff --git a/model/platform/qq_official.py b/model/platform/qq_official.py
index e6716532f..f3b97dcb4 100644
--- a/model/platform/qq_official.py
+++ b/model/platform/qq_official.py
@@ -243,7 +243,7 @@ class QQOfficial(Platform):
         msg_ref = None
         rendered_images = []
         
-        if use_t2i or (use_t2i == None and self.context.base_config.get("qq_pic_mode", False)) and isinstance(res, list):
+        if use_t2i or (use_t2i == None and self.context.config_helper.t2i) and isinstance(result_message, list):
             rendered_images = await self.convert_to_t2i_chain(result_message)
         
         if isinstance(result_message, list):
diff --git a/tests/test_message.py b/tests/test_message.py
index a5fc4578a..809b87164 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -13,6 +13,8 @@ from type.message_event import *
 from SparkleLogging.utils.core import LogManager
 from logging import Formatter
 
+from util.cmd_config import QQOfficialPlatformConfig, AiocqhttpPlatformConfig
+
 logger = LogManager.GetLogger(
 log_name='astrbot',
     out_to_console=True,
@@ -24,8 +26,11 @@ os.environ['TEST_MODE'] = 'on'
 bootstrap = AstrBotBootstrap()
 asyncio.run(bootstrap.run())
 
-qq_official = QQOfficial(bootstrap.context, bootstrap.message_handler)
-aiocqhttp = AIOCQHTTP(bootstrap.context, bootstrap.message_handler)
+for p_config in bootstrap.context.config_helper.platform:
+    if isinstance(p_config, QQOfficialPlatformConfig):
+        qq_official = QQOfficial(bootstrap.context, bootstrap.message_handler, p_config)
+    elif isinstance(p_config, AiocqhttpPlatformConfig):
+        aiocqhttp = AIOCQHTTP(bootstrap.context, bootstrap.message_handler, p_config)
 
 class TestBasicMessageHandle():
     @pytest.mark.asyncio
diff --git a/type/types.py b/type/types.py
index a0dace291..a29e15045 100644
--- a/type/types.py
+++ b/type/types.py
@@ -21,8 +21,8 @@ class Context:
     '''
 
     def __init__(self):
+        self.running = True
         self.logger: Logger = None
-        self.base_config: dict = None  # 配置（期望启动机器人后是不变的）
         self.config_helper: AstrBotConfig = None
         self.cached_plugins: List[RegisteredPlugin] = []  # 缓存的插件
         self.platforms: List[RegisteredPlatform] = []
diff --git a/util/cmd_config.py b/util/cmd_config.py
index befc5e9b8..cf85bdb25 100644
--- a/util/cmd_config.py
+++ b/util/cmd_config.py
@@ -202,6 +202,10 @@ class AstrBotConfig():
             json.dump(config if config else DEFAULT_CONFIG_VERSION_2, f, indent=2, ensure_ascii=False)
             f.flush()
     
+    def save_config(self):
+        '''将现存配置写入文件'''
+        self.flush_config(self.to_dict())
+    
     def init_configs(self):
         '''初始化必需的配置项'''
         config = None
@@ -228,7 +232,7 @@ class AstrBotConfig():
 
         self.load_from_dict(config)
 
-    def get(self, key, default=None):
+    def get(self, key: str, default=None):
         '''
         从文件系统中直接获取配置
         '''
@@ -288,6 +292,5 @@ class AstrBotConfig():
             if key not in self:
                 raise KeyError(f"Key {key} not found in config.")
 
-
     def check_exist(self) -> bool:
         return os.path.exists(ASTRBOT_CONFIG_PATH)
\ No newline at end of file