From cd578de80dd24c0c3e7537426f9a380924a129c1 Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Mon, 1 Jun 2026 16:20:59 +0800
Subject: [PATCH] feat: add invalidate_all_caches() and GET /__hot_reload__
 endpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

invalidate_all_caches() clears module-level caches:
- rbac: UserPermissions.ur_caches + rp_caches
- pricing: PricingProgram.pricing_data
- uapi: UAPIData.apidata + org_users
- llmage: _uapi_cache + _uapiio_cache

GET /__hot_reload__ endpoint (registered only when hot_reload enabled):
- Manual trigger for cache flush during development
- Returns JSON with list of cleared caches

Automatic trigger:
- config.json change → invalidate_all_caches() called automatically

Each module cache is cleared independently with try/except so one
module's import failure doesn't block others.
---
 .../configuredServer.cpython-310.pyc          | Bin 6601 -> 6716 bytes
 ahserver/configuredServer.py                  |   6 +-
 ahserver/hotreload.py                         |  80 +++++++++++++++++-
 3 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/ahserver/__pycache__/configuredServer.cpython-310.pyc b/ahserver/__pycache__/configuredServer.cpython-310.pyc
index 689be3dac7520934bd82a560cc4f6f64fc4a8d57..574d7fa784866a512711be98cb2027c2c0bc1994 100644
GIT binary patch
delta 1996
zcmZuyO>7%g5Z<?IJFXo&PGUE0lQc<F+H8}ib^jaslQy(zRYcmR1tn5hmVIk`UDsZ{
zU5B<filCuMDG1P0kpNXnq;iPV1CSf)4K7r0Kte)#M>rsET#&dRG4nPgZornmoi}gx
zn|U*D#^3FKav)hrBw`ADo(^{wL+Ou_9fW?_-$PE{*gLuRMs_kwl)N&z4}SY;hHjiy
zCJ)dyx(S{KM-{r6Zkbi+7CTxzbVr*!44QV@0h*3G>g18-yJUorFn_8J_KTK6#W$E;
zs+iO$m}OeBnaDWhDYN8I)3*(?R5C2nD%c+XOC2XW_>0;Q>Em-+=cR6lj`aZOsz_NS
z+bmaI%fD$@6;|<BFYazf*s%&bK@v%mQe({=37C%1zx=0mjl`unTCyy^7QT8|dLV2c
zXmpJogohy41({mU8})48fSAqQ_^!@>51;4@qLc5kJxHKR0ycyub#d{r$k_fYDvu!?
z2M`GZqBK3vvLOXVo%InkkpT|yA0rtuu>4yjN7@HLtrLdc^;QuxtA4?_js$Fk7otbw
zxFIytb=d%a934K0Ct)ujj3AuDZ54LU;z}Bme4W=IBg;J-vZPz)48vbig*v!bklYdx
znhRMElE+!>wl#)4tCs8{F2@l98<egBOrY>GfF224kAf`1uIU#%p_S}1Ye0(#T112N
zN4#n-=iFoyd@SA-)JqcY<hSC#WTYeMqs|d`8!vR2z_CPv3am3Y&wp+_M_%XMiSFGN
z`lARo!vFHY#%s8l=Qk3^dJ8Bz2<vDsfX+aDk$<1~B#SwgDHj{yvQ*tuP@{kEl*)1<
zghi|8;2$R^$UOfe`IvmgA2#g){Gn-RW}Xz=iyaG{w8`JPs1jvP$q|~O&9l+zIBlV=
zv&wX%wCP&tuEiG#QRJ!zR*ksw6Et0G_)MXhhuR%nZ!7lBlZEYzN=+?l#pm27bYqRw
z!nF`>dp}GRs*Ef8rk9)#yRbBG@Tt^=VLU0sF0W0jQZ_u_WN;+ecS|a}1lxjGby<-Y
z2rGUQvykVcdGr)Rv7RZu(wGJ`a?rv)nylq^mE~5za<BRM=G#qs45Mz282sC2dPqhV
z@=fo$PDC^qF*aMfeWJDgot5z4<FB?nx?BTpJtR9;L@cumEy$)pCz2y_QL^b7#wv`>
zU=YvN{8`$S<9xucw0a$OnYtCH>>nRJbESKI$iKE`x9(sY&`Zp!lygr0BD4V8gdVUZ
z*c{)N&TZR<;w}W7CnDx}P8ni{5JiYOmJiMTb^5@JJbZ*zsy@uq2Ap_#+h<$xJr6-n
z$0?LTNYlWoWdlcpi>kW-dLrnPIaHiQ8)CA1xR}R9vM$|LF3)b`4$ct~$Kd%Zne?u=
zQTGmltgy=7LRpR-tfJ7sDHhhd%pYV<swtKKl=)^xo>dNoRy2Qv@Hqk=iG2znnwgz<
zJUAKrad?#~vur&a@M56s8rno$X2XmCC-%xz!XSdN`7THc@bgjtDH0_riQxC|R4BwZ
zw{?x<)Y9YZ1U%SDgkgj<f*jH~NZ5G<Z15myizp#;-F;Ydd79sEYmXgfr@=r!${z49
z+R~BxXg$6Bv~7x<k)?t5QrKFB`*7J0AmXQ7x8zu+?^Mcc0M$tJA5Z+v&BO3V9a2Li
Lsz$XIt)=N7IxW`x

delta 1894
zcmZux-A^1<6rVe@EW<9lEG!EYmUf|~WvDGsN@<~1uvBb}rKT7yYPQ4N*=3e>cY0^G
z(iVad`k_hvx=*I5p-~fQ`k>;2G5X|F6CaF^H!&vu0saT3o^z+r4Z558-Sc(NIrp4<
z?oUS_4aLi`SVV!JbE>m2m;5B2CU1Uwu#1cmC9lj5z&A)!v}H}1JwjV)8>~Z93f)E9
z*A&`r>xHAM+Uzh$I%pas=~Z?1*ye}iG$9)QT|LZy)^_npZItZeD}ej?k6LGVH$-E5
z_#ax^P#2Qj2>Z672PhFYDa~3%+bmUF%U_gs2hhaW><zs|qS72KSwH`{=GBosKpKP%
z;G(f1SOi%R<jPLJx@Y@YYWn6O+<Snh!>4-XURCa8C^l5-fE`DZs=WAn;pwyeC>%u?
z0}!z+WNCVyWfzOtY?bvfG?5AR0fk;X9Y9y=iLNI!*0<SSn<E|1fDH0Jh)YsL%!)ss
zT|kFyg5T9oL{T9$({))N|5G0y#*?w<5hf5`K(z|mN#vw4$ya3&RA_UiZjfZ~m{PT&
z3ia@SAh``9G`H*p_C5To$h8wMqtUh{JBREmTN{J(TmbeWie><ea1i<oe?6K$F6$ol
zD!H7q$X)}rP;;Ijt_Zm%^M&qJ=3LXC_k`-XK~(9xhd+$|m6EZl%8el|@Gt6LN@s!G
zAVE`h7)<d<?8VwkU|@vK@ym^=BbXjD5#|sqg#UF7ic6@p`FiZ+-W-y7gdGvif(#R2
z^Zaq_vq7x5Y=EePt5k6(pkrG%PGva}!WLHh;E&=L$s*s|@Q^&<zcuue2cITJbGMWn
zp$#;#rY}cnBW+q!mg{emLPsIJ-nkULPlzJ9-N4l&=f`MrsrIfyo9}6>$nPm+Zj<${
z`^u79&<fq|_cXOcmTHzlwB=3>QK)i3F<SXIiJ5Uc4`e8>N~B!MdOq}`;xe464V6v9
zB8XLWc6n*AjEnF=c_tgDCR`+|Jw=}kXBMVYx?&7Xo>p+%%hkZkuZ?5aAAYE5`k2fm
z<eT1tL4?liV%elN3#x|uL^3;H_OpRvE8!3LcTHcOxCUw?B<ECwEwcoJ$FAd+_-V-$
zZF+{WGGogawyKx>qhuSo!@o{?Y1g5dcbsA|W6j&vLdGdk+qD5oe(@?FX&&6Ym(`)m
zh*d7-ocwvXvaAi=ok6(4Z#L(;Gf4I#;FBRDj^~u1vXGAmQOELOe&ea5m*jQ1jArr)
z^N|YShFVrBWpS=cC|UzBV!;i+fr3f2Att+p%uQtCRTZ&vc_y1P!GB0~_PvWns|a{r
zc)nJU#$l8bD>R7Z0Oy_Ok5kX_@s?j!<VkQsSrTC#;XZ<FO_-G{zRg4<v-6Gz6tu!C
zSD0lRHGyBukG%mP!Y;F6+#!hl<R!r*f~Vp(P@lu+B>)mcCn^c!{~x~6+P#9$j1grg
zVPVfAoI+?ukgu$qx+!FF27^M~Lkitiwf1SeaZuo~Wjq}truBMV)3r!#{V+qVF~T@3
zLi4UBJ*FZV@}0MB_CAp8`sPsE6*87VTK0B7QU-vCPPlH-u}t47ml!_j(%pZu;D7HL
Rk2jN$8X~%?YfV~H!@p`5r<ni%

diff --git a/ahserver/configuredServer.py b/ahserver/configuredServer.py
index 42589bf..770e1ca 100644
--- a/ahserver/configuredServer.py
+++ b/ahserver/configuredServer.py
@@ -22,7 +22,7 @@ from .serverenv import ServerEnv
 from .filestorage import TmpFileRecord
 from .loadplugins import load_plugins
 from .real_ip import real_ip_middleware
-from .hotreload import HotReloader, get_i18n_paths, hot_reload_task
+from .hotreload import HotReloader, get_i18n_paths, hot_reload_task, hot_reload_handler, invalidate_all_caches
 
 startup_coros = []
 cleanupctx_coros = []
@@ -135,6 +135,8 @@ class ConfiguredServer:
 				i18n_paths = get_i18n_paths(workdir)
 				reloader = HotReloader(config_path, i18n_paths)
 				reloader.set_interval(interval)
+				# Register HTTP endpoint for manual cache flush
+				self.app.router.add_get('/__hot_reload__', hot_reload_handler)
 				async def _hot_reload_startup(app):
 					task = asyncio.create_task(hot_reload_task(app, reloader))
 					app['hot_reload_task'] = task
@@ -148,7 +150,7 @@ class ConfiguredServer:
 							pass
 				self.app.on_startup.append(_hot_reload_startup)
 				self.app.cleanup_ctx.append(_hot_reload_cleanup)
-				print(f'hot_reload enabled, interval={interval}s, pid will check independently')
+				print(f'hot_reload enabled, interval={interval}s, endpoint=GET /__hot_reload__')
 
 		web.run_app(self.build_app(),host=config.website.host or '0.0.0.0',
 						port=port,
diff --git a/ahserver/hotreload.py b/ahserver/hotreload.py
index 8716b4c..38a364d 100644
--- a/ahserver/hotreload.py
+++ b/ahserver/hotreload.py
@@ -6,6 +6,10 @@ Watches file mtimes and triggers reload of cached resources:
 - i18n files (MiniI18N singleton)
 - Jinja2 template cache (auto_reload already handles this)
 
+Module caches (rbac/pricing/uapi/llmage) can be cleared via:
+- HTTP endpoint: GET /__hot_reload__
+- Automatic when config.json changes
+
 Multi-process safe: each process independently checks mtimes via stat(),
 no cross-process coordination needed. When a file changes on disk,
 all processes detect it on their next check cycle.
@@ -112,12 +116,16 @@ class HotReloader:
         return reloaded
 
     def _reload_config(self):
-        """Clear JsonConfig singleton so next getConfig() call reloads from disk."""
+        """Clear JsonConfig singleton so next getConfig() call reloads from disk.
+        Also clear all module caches since config changes may affect them.
+        """
         try:
             from appPublic.jsonConfig import JsonConfig
             # SingletonDecorator stores instance as .instance
             JsonConfig.instance = None
             info('[hot_reload] config.json changed, cache cleared')
+            # Also clear module caches since config may affect module_cache settings
+            invalidate_all_caches()
         except Exception as e:
             warning(f'[hot_reload] failed to reload config: {e}')
 
@@ -168,3 +176,73 @@ async def hot_reload_task(app, reloader):
     except asyncio.CancelledError:
         info('[hot_reload] stopped')
         raise
+
+
+def invalidate_all_caches():
+    """Clear all module caches (rbac/pricing/uapi/llmage).
+    
+    Called automatically when config.json changes, or manually via
+    GET /__hot_reload__ endpoint.
+    
+    Each module cache is cleared independently with try/except to
+    prevent one module's failure from blocking others.
+    """
+    cleared = []
+    
+    # rbac: UserPermissions singleton with LRU caches
+    try:
+        from rbac.userperm import UserPermissions
+        up = UserPermissions()
+        up.ur_caches.clear()
+        up.invalidate_rp_cache()
+        cleared.append('rbac')
+    except Exception as e:
+        debug(f'[hot_reload] rbac cache clear skipped: {e}')
+    
+    # pricing: PricingProgram class-level pricing_data dict
+    try:
+        from pricing.pricing import PricingProgram
+        PricingProgram.pricing_data.clear()
+        cleared.append('pricing')
+    except Exception as e:
+        debug(f'[hot_reload] pricing cache clear skipped: {e}')
+    
+    # uapi: UAPIData singleton with apidata and org_users dicts
+    try:
+        from uapi.apidata import UAPIData
+        ud = UAPIData()
+        ud.apidata.clear()
+        ud.org_users.clear()
+        cleared.append('uapi')
+    except Exception as e:
+        debug(f'[hot_reload] uapi cache clear skipped: {e}')
+    
+    # llmage: module-level _uapi_cache and _uapiio_cache
+    try:
+        from llmage.utils import invalidate_uapi_cache
+        invalidate_uapi_cache()  # clears both _uapi_cache and _uapiio_cache
+        cleared.append('llmage')
+    except Exception as e:
+        debug(f'[hot_reload] llmage cache clear skipped: {e}')
+    
+    if cleared:
+        info(f'[hot_reload] cleared caches: {cleared}')
+    return cleared
+
+
+async def hot_reload_handler(request):
+    """HTTP endpoint handler for GET /__hot_reload__.
+    
+    Manually triggers cache invalidation. Useful for development
+    when database changes aren't detected automatically.
+    
+    Returns JSON with list of cleared caches.
+    """
+    from aiohttp import web
+    cleared = invalidate_all_caches()
+    return web.json_response({
+        'status': 'ok',
+        'cleared': cleared,
+        'timestamp': time.time()
+    })
+