More updates

requirements.txt

@@ -8,7 +8,7 @@ easygui==0.98.3
 einops==0.6.0
 fairscale==0.4.13
 ftfy==6.1.1
-gradio==3.32.0
+gradio==3.33.1
 huggingface-hub>=0.13.3
 lion-pytorch==0.0.6
 lycoris_lora==0.1.6

setup/setup_common.py

@@ -251,7 +251,7 @@ def git(arg: str, folder: str = None, ignore: bool = False):
         errors += 1
         log.error(f'Error running git: {folder} / {arg}')
         if 'or stash them' in txt:
-            log.error(f'Local changes detected: check log for details: {log_file}')
+            log.error(f'Local changes detected: check log for details...')
         log.debug(f'Git output: {txt}')
     return txt
 
@@ -361,14 +361,14 @@ def process_requirements_line(line):
     install(line, package_name)
 
 
-def install_requirements(requirements_file, verify=False):
-    if verify:
+def install_requirements(requirements_file, check_no_verify_flag=False):
+    if check_no_verify_flag:
         log.info(f'Verifying modules instalation status from {requirements_file}...')
     else:
         log.info(f'Installing modules from {requirements_file}...')
     with open(requirements_file, 'r', encoding='utf8') as f:
         # Read lines from the requirements file, strip whitespace, and filter out empty lines, comments, and lines starting with '.'
-        if verify:
+        if check_no_verify_flag:
             lines = [
                 line.strip()
                 for line in f.readlines()
@@ -393,7 +393,7 @@ def install_requirements(requirements_file, verify=False):
                 # Get the path to the included requirements file
                 included_file = line[2:].strip()
                 # Expand the included requirements file recursively
-                install_requirements(included_file, verify=verify)
+                install_requirements(included_file, check_no_verify_flag=check_no_verify_flag)
             else:
                 process_requirements_line(line)
 

setup/setup_linux.py

@@ -16,7 +16,7 @@ def install_kohya_ss(platform_requirements_file):
 
     # Upgrade pip if needed
     setup_common.install('--upgrade pip')
-    setup_common.install_requirements(platform_requirements_file, verify=False)
+    setup_common.install_requirements(platform_requirements_file, check_no_verify_flag=False)
     # setup_common.configure_accelerate()
     # run_cmd(f'accelerate config')
 

setup/validate_requirements.py

@@ -86,13 +86,13 @@ def main():
     parser.add_argument('--debug', action='store_true', help='Debug on')
     args = parser.parse_args()
 
-    if not args.requirements:
+    if args.requirements:
+        setup_common.install_requirements(args.requirements, check_no_verify_flag=True)
+    else:
         if check_torch() == 1:
-            setup_common.install_requirements('requirements_windows_torch1.txt')
+            setup_common.install_requirements('requirements_windows_torch1.txt', check_no_verify_flag=True)
         else:
-            setup_common.install_requirements('requirements_windows_torch2.txt')
-    else:
-        setup_common.install_requirements(args.requirements, verify=True)
+            setup_common.install_requirements('requirements_windows_torch2.txt', check_no_verify_flag=True)
 
 
 if __name__ == '__main__':