diff --git a/modules/modelloader.py b/modules/modelloader.py index 19229701e..45e41315f 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -173,7 +173,7 @@ def directory_mtime(dir:str, *, recursive:bool=True) -> float: return float(max(0, *[mtime for mtime, _ in directory_directories(dir, recursive=recursive).values()])) def directories_file_paths(directories:dict) -> list[str]: - return sum([[fp for fp in dat[1]] for dat in directories.values()], []) + return sum([fp for fp in dat[1] for dat in directories.values()], []) def filter_paths(paths:list[str], *, filter:callable=None) -> list[str]: return [fp for fp in paths if not (os.path.islink(fp) and not os.path.exists(fp)) and filter(fp)] @@ -190,7 +190,7 @@ def unique_paths(paths:list[str]) -> list[str]: return { fp: True for fp in paths }.keys() def directory_files(*directories:list[str], recursive:bool=True) -> list[str]: - return unique_paths(sum([[fp for fp in directories_file_paths(directory_directories(dir, recursive=recursive))] for dir in unique_directories(directories, recursive=recursive)],[])) + return unique_paths(sum([fp for fp in directories_file_paths(directory_directories(dir, recursive=recursive)) for dir in unique_directories(directories, recursive=recursive)],[])) def extension_filter(ext_filter=None, ext_blacklist=None): if ext_filter: diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 20c2a2111..4240da4e4 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -193,11 +193,11 @@ class ExtraNetworksPage: htmls = [] with Progress( SpinnerColumn(), - TextColumn('[cyan]Creating Extra Network '+self.title+' HTML - {task.description}'), + TextColumn('[cyan]Creating Extra Network '+self.title+' HTML - {task.description}'), BarColumn(), TaskProgressColumn(), TextColumn('({task.completed}/{task.total})'), TimeRemainingColumn(), TimeElapsedColumn(), transient=not shared.log.isEnabledFor(DEBUG), expand=True ) as progress: - task = progress.add_task(description=f'Initializing Items') + task = progress.add_task(description='Initializing Items') items = self.items progress.update(task, total=len(items)) __t = time()