feat: add frozen flag (#15)

.github/workflows/Release-pypi.yml

@@ -35,7 +35,7 @@ jobs:
 
       - name: Build package
         run: |
-          pdm install
+          pdm install --skip download_models
           pdm build
 
       - name: Publish a Python distribution to PyPI

src/Final2x_core/__main__.py

@@ -8,8 +8,11 @@
 from Final2x_core.src.SRqueue import SR_queue
 from Final2x_core.src.utils.getConfig import SRCONFIG
 
+_IS_FROZEN_ = False
+
 if getattr(sys, "frozen", False):
     # frozen
+    _IS_FROZEN_ = True
     projectPATH = Path(sys.executable).parent.absolute()
 else:
     # unfrozen
@@ -62,6 +65,8 @@ def main() -> None:
     else:
         config.getConfigfromYaml(str(projectPATH / "config.yaml"), str(projectPATH / "models"))
 
+    config.isfrozen = _IS_FROZEN_
+
     logger.info("config loaded")
     logger.debug(config.outputpath)
 

src/Final2x_core/src/SRFactory/REALCUGAN.py

@@ -10,7 +10,10 @@ def __init__(self) -> None:
 
     @logger.catch(reraise=True)
     def _init_SR_class(self) -> None:
-        from Final2x_core.src.SRncnn.REALCUGANncnn import REALCUGANncnn
+        if self._isfrozen:
+            from Final2x_core.src.SRncnn.REALCUGANncnn import REALCUGANncnn
+        else:
+            from realcugan_ncnn_py import Realcugan as REALCUGANncnn  # type: ignore
 
         if self._model == "RealCUGAN-se":
             model_i = "models-se"

src/Final2x_core/src/SRFactory/REALESRGAN.py

@@ -10,8 +10,10 @@ def __init__(self) -> None:
 
     @logger.catch(reraise=True)
     def _init_SR_class(self) -> None:
-        from Final2x_core.src.SRncnn.REALESRGANncnn import REALESRGANncnn
-
+        if self._isfrozen:
+            from Final2x_core.src.SRncnn.REALESRGANncnn import REALESRGANncnn
+        else:
+            from realesrgan_ncnn_py import Realesrgan as REALESRGANncnn  # type: ignore
         # model_dict = {
         #     0: {"param": "realesr-animevideov3-x2.param", "bin": "realesr-animevideov3-x2.bin", "scale": 2},
         #     1: {"param": "realesr-animevideov3-x3.param", "bin": "realesr-animevideov3-x3.bin", "scale": 3},

src/Final2x_core/src/SRFactory/SRBaseClass.py

@@ -12,6 +12,9 @@
 class SRBaseClass(ABC):
     def __init__(self) -> None:
         config = SRCONFIG()
+
+        self._isfrozen: bool = config.isfrozen  # freeze model
+
         self._targetscale: float = config.targetscale  # user upscale factor
         self._gpuid: int = config.gpuid  # gpu id, -1 for cpu
         self._tta: bool = config.tta  # use tta

src/Final2x_core/src/SRFactory/WAIFU2X.py

@@ -10,8 +10,10 @@ def __init__(self) -> None:
 
     @logger.catch(reraise=True)
     def _init_SR_class(self) -> None:
-        from Final2x_core.src.SRncnn.WAIFU2Xncnn import WAIFU2Xncnn
-
+        if self._isfrozen:
+            from Final2x_core.src.SRncnn.WAIFU2Xncnn import WAIFU2Xncnn
+        else:
+            from waifu2x_ncnn_py import Waifu2x as WAIFU2Xncnn  # type: ignore
         # waifu2x model name, can be "models-cunet",
         # "models-upconv_7_anime_style_art_rgb" and
         # "models-upconv_7_photo", default: models-cunet

src/Final2x_core/src/utils/getConfig.py

@@ -20,6 +20,7 @@ def __init__(self) -> None:
         self._modelscale: int = 2
         self._modelnoise: int = 0
         self._inputpath: List[str] = []
+        self.isfrozen: bool = False
 
     @logger.catch(reraise=True)
     def getConfigfromYaml(self, configpath: str = "", modelpath: str = "") -> None: