Add args for Dataset and improve

This commit is contained in:
litagin02
2024-01-02 14:11:01 +09:00
parent a1069c73d2
commit f9c9c765fc
8 changed files with 154 additions and 60 deletions

View File

@@ -7,7 +7,7 @@ from .stdout_wrapper import SAFE_STDOUT
python = sys.executable
def run_script_with_log(cmd: list[str]) -> tuple[bool, str]:
def run_script_with_log(cmd: list[str], ignore_warning=False) -> tuple[bool, str]:
logger.info(f"Running: {' '.join(cmd)}")
result = subprocess.run(
[python] + cmd,
@@ -19,7 +19,7 @@ def run_script_with_log(cmd: list[str]) -> tuple[bool, str]:
logger.error(f"Error: {' '.join(cmd)}")
print(result.stderr)
return False, result.stderr
elif result.stderr:
elif result.stderr and not ignore_warning:
logger.warning(f"Warning: {' '.join(cmd)}")
print(result.stderr)
return True, result.stderr

View File

@@ -189,9 +189,9 @@ class ModelHolder:
self, model_name: str, model_path: str
) -> tuple[gr.Dropdown, gr.Button]:
if model_name not in self.model_files_dict:
raise Exception(f"モデル名{model_name}は存在しません")
raise ValueError(f"Model `{model_name}` is not found")
if model_path not in self.model_files_dict[model_name]:
raise Exception(f"pthファイル{model_path}は存在しません")
raise ValueError(f"Model file `{model_path}` is not found")
self.current_model = Model(
model_path=model_path,
config_path=os.path.join(self.root_dir, model_name, "config.json"),