From 9f185e8df6b94645ffbc0507847e5e977116f8ce Mon Sep 17 00:00:00 2001
From: RF-Tar-Railt <rf_tar_railt@qq.com>
Date: Sat, 28 Sep 2024 14:33:06 +0800
Subject: [PATCH] :bug: remove module cached file (.pyc)

---
 arclet/entari/plugin/model.py  |  9 +++++++++
 arclet/entari/plugin/module.py | 11 +++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/arclet/entari/plugin/model.py b/arclet/entari/plugin/model.py
index be3f89c..d03b4fa 100644
--- a/arclet/entari/plugin/model.py
+++ b/arclet/entari/plugin/model.py
@@ -3,6 +3,8 @@
 from collections.abc import Awaitable
 from contextvars import ContextVar
 from dataclasses import dataclass, field
+from pathlib import Path
+import sys
 from types import ModuleType
 from typing import TYPE_CHECKING, Any, Callable, TypeVar
 from weakref import finalize
@@ -152,6 +154,13 @@ def dispose(self):
         if self._is_disposed:
             return
         self._is_disposed = True
+        if self.module.__spec__ and self.module.__spec__.cached:
+            Path(self.module.__spec__.cached).unlink(missing_ok=True)
+        sys.modules.pop(self.module.__name__, None)
+        for submod in self.submodules.values():
+            sys.modules.pop(submod.__name__, None)
+            if submod.__spec__ and submod.__spec__.cached:
+                Path(submod.__spec__.cached).unlink(missing_ok=True)
         self.submodules.clear()
         for disp in self.dispatchers.values():
             disp.dispose()
diff --git a/arclet/entari/plugin/module.py b/arclet/entari/plugin/module.py
index 9af5f81..9dd2289 100644
--- a/arclet/entari/plugin/module.py
+++ b/arclet/entari/plugin/module.py
@@ -18,8 +18,9 @@ def package(*names: str):
 
 
 class PluginLoader(SourceFileLoader):
-    def __init__(self, fullname: str, path: str) -> None:
+    def __init__(self, fullname: str, path: str, parent_plugin_id: Optional[str] = None) -> None:
         self.loaded = False
+        self.parent_plugin_id = parent_plugin_id
         super().__init__(fullname, path)
 
     def create_module(self, spec) -> Optional[ModuleType]:
@@ -29,7 +30,9 @@ def create_module(self, spec) -> Optional[ModuleType]:
         return super().create_module(spec)
 
     def exec_module(self, module: ModuleType) -> None:
-        if plugin := _current_plugin.get(None):
+        if plugin := _current_plugin.get(
+            service.plugins.get(self.parent_plugin_id) if self.parent_plugin_id else None
+        ):
             if module.__name__ == plugin.module.__name__:  # from . import xxxx
                 return
             setattr(module, "__plugin__", plugin)
@@ -129,6 +132,10 @@ def find_spec(
         if module_spec.name in service.plugins:
             module_spec.loader = PluginLoader(fullname, module_origin)
             return module_spec
+        for plug in service.plugins.values():
+            if module_spec.name in plug.submodules:
+                module_spec.loader = PluginLoader(fullname, module_origin, plug.id)
+                return module_spec
         return