Merge branch 'master' of LmeSzinc

module/submodule/submodule.py

@@ -1,6 +1,5 @@
 import importlib
 
-from module.config.config import AzurLaneConfig
 from module.logger import logger
 from module.submodule.utils import *
 
@@ -15,6 +14,8 @@ def load_mod(name):
 
 
 def load_config(config_name):
+    from module.config.config import AzurLaneConfig
+
     mod_name = get_config_mod(config_name)
     if mod_name == 'alas':
         return AzurLaneConfig(config_name, '')

module/webui/app.py

@@ -1,13 +1,19 @@
 import re
-import argparse
+import sys
 import json
-import queue
-import threading
 import time
+import queue
+import argparse
+import threading
+
 from datetime import datetime
 from functools import partial
 from typing import Dict, List, Optional
 
+# Import fake module before import pywebio to avoid importing unnecessary module PIL
+from module.webui.fake_pil_module import import_fake_pil_module
+import_fake_pil_module()
+
 from pywebio import config as webconfig
 from pywebio.input import file_upload, input, input_group, select
 from pywebio.output import (

module/webui/fake_pil_module.py

@@ -0,0 +1,15 @@
+import sys
+from types import ModuleType
+
+
+def import_fake_pil_module():
+    fake_pil_module = ModuleType('PIL')
+    fake_pil_module.Image = ModuleType('PIL.Image')
+    fake_pil_module.Image.Image = type('MockPILImage', (), dict(__init__=None))
+    sys.modules['PIL'] = fake_pil_module
+    sys.modules['PIL.Image'] = fake_pil_module.Image
+
+
+def remove_fake_pil_module():
+    sys.modules.pop('PIL', None)
+    sys.modules.pop('PIL.Image', None)

module/webui/process_manager.py

@@ -1,6 +1,7 @@
-import argparse
 import os
+import sys
 import queue
+import argparse
 import threading
 from multiprocessing import Process
 from typing import Dict, List, Union
@@ -9,6 +10,12 @@ import inflection
 from filelock import FileLock
 from rich.console import Console, ConsoleRenderable
 
+# Since this file does not run under the same process or subprocess of app.py
+# the following code needs to be repeated
+# Import fake module before import pywebio to avoid importing unnecessary module PIL
+from module.webui.fake_pil_module import *
+import_fake_pil_module()
+
 from module.config.utils import filepath_config
 from module.logger import logger, set_file_logger, set_func_logger
 from module.submodule.submodule import load_mod
@@ -141,6 +148,9 @@ class ProcessManager:
 
         from module.config.config import AzurLaneConfig
 
+        # Remove fake PIL module, because subprocess will use it
+        remove_fake_pil_module()
+
         AzurLaneConfig.stop_event = e
         try:
             # Run alas