一波优化

app.py

@@ -3,7 +3,7 @@ Author: SpenserCai
 Date: 2023-07-28 15:49:52
 version: 
 LastEditors: SpenserCai
-LastEditTime: 2023-08-02 10:12:03
+LastEditTime: 2023-08-03 15:04:13
 Description: file content
 '''
 from deoldify import device
@@ -30,7 +30,7 @@ def image_to_base64(image_path):
     return image_b64
 
 def ColorizeImage(base64str, render_factor=50, artistic=False):
-    vis = get_image_colorizer(render_factor=render_factor, artistic=artistic)
+    vis = get_image_colorizer(root_folder=Path("models"),render_factor=render_factor, artistic=artistic)
     # 把base64转换成图片 PIL.Image
     img = Image.open(BytesIO(base64.b64decode(base64str)))
     print("loaded image")

fastai/basic_train.py

@@ -157,7 +157,7 @@ class Learner():
     wd:Floats=defaults.wd
     train_bn:bool=True
     path:str = None
-    model_dir:PathOrStr = 'models'
+    model_dir:PathOrStr = 'deoldify'
     callback_fns:Collection[Callable]=None
     callbacks:Collection[Callback]=field(default_factory=list)
     layer_groups:Collection[nn.Module]=None

install.py

@@ -3,7 +3,7 @@ Author: SpenserCai
 Date: 2023-07-28 14:37:09
 version: 
 LastEditors: SpenserCai
-LastEditTime: 2023-08-03 14:31:04
+LastEditTime: 2023-08-03 14:53:27
 Description: file content
 '''
 import os

scripts/api.py

@@ -3,7 +3,7 @@ Author: SpenserCai
 Date: 2023-07-28 14:37:40
 version: 
 LastEditors: SpenserCai
-LastEditTime: 2023-08-03 14:41:58
+LastEditTime: 2023-08-03 15:06:53
 Description: file content
 '''
 # DeOldify API
@@ -30,7 +30,7 @@ def deoldify_api(_: gr.Blocks, app: FastAPI):
         render_factor: int = Body(35,title="render factor"),
         artistic: bool = Body(False,title="artistic")
     ):
-        vis = get_image_colorizer(root_folder=Path("models/deoldify"),render_factor=render_factor, artistic=artistic)
+        vis = get_image_colorizer(root_folder=Path("models"),render_factor=render_factor, artistic=artistic)
         # 把base64转换成图片 PIL.Image
         img = Image.open(BytesIO(base64.b64decode(input_image)))
         outImg = vis.get_transformed_image_from_image(img, render_factor=render_factor)

scripts/postprocessing_deoldify.py

@@ -3,7 +3,7 @@ Author: SpenserCai
 Date: 2023-07-28 14:41:28
 version: 
 LastEditors: SpenserCai
-LastEditTime: 2023-08-03 14:40:50
+LastEditTime: 2023-08-03 15:11:07
 Description: file content
 '''
 # DeOldify UI & Processing
@@ -44,7 +44,7 @@ class ScriptPostprocessingUpscale(scripts_postprocessing.ScriptPostprocessing):
         }
     
     def process_image(self, image, render_factor, artistic):
-        vis = get_image_colorizer(root_folder=Path("models/deoldify"),render_factor=render_factor, artistic=artistic)
+        vis = get_image_colorizer(root_folder=Path("models"),render_factor=render_factor, artistic=artistic)
         outImg = vis.get_transformed_image_from_image(image, render_factor=render_factor)
         return outImg
 
@@ -52,5 +52,7 @@ class ScriptPostprocessingUpscale(scripts_postprocessing.ScriptPostprocessing):
         if not is_enabled or is_enabled is False:
             return
         
+        print(type(pp.image))
+
         pp.image = self.process_image(pp.image, render_factor, artistic)
         pp.info["deoldify"] = f"render_factor={render_factor}, artistic={artistic}"