Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

use as_posix() instead of str()

Browse Source
This commit is contained in:
Lincoln Stein 2023-08-14 21:17:46 -04:00 committed by Kent Keirsey
parent eab67b6a01
commit b2934be6ba
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
invokeai/app/api/routers/models.py
View File

@ -267,11 +267,12 @@ async def convert_model(
logger = ApiDependencies.invoker.services.logger logger = ApiDependencies.invoker.services.logger
try: try:
logger.info(f"Converting model: {model_name}") logger.info(f"Converting model: {model_name}")
dest = pathlib.Path(convert_dest_directory) if convert_dest_directory else None
ApiDependencies.invoker.services.model_manager.convert_model( ApiDependencies.invoker.services.model_manager.convert_model(
model_name, model_name,
base_model=base_model, base_model=base_model,
model_type=model_type, model_type=model_type,
convert_dest_directory=convert_dest_directory, convert_dest_directory=dest,
) )
model_raw = ApiDependencies.invoker.services.model_manager.list_model( model_raw = ApiDependencies.invoker.services.model_manager.list_model(
model_name, base_model=base_model, model_type=model_type model_name, base_model=base_model, model_type=model_type

2
invokeai/app/services/model_manager_service.py
View File

@ -577,7 +577,7 @@ class ModelManagerService(ModelManagerServiceBase):
alpha: float = 0.5, alpha: float = 0.5,
interp: Optional[MergeInterpolationMethod] = None, interp: Optional[MergeInterpolationMethod] = None,
force: bool = False, force: bool = False,
merge_dest_directory: Optional[str] = Field( merge_dest_directory: Optional[Path] = Field(
default=None, description="Optional directory location for merged model" default=None, description="Optional directory location for merged model"
), ),
) -> AddModelResult: ) -> AddModelResult:

8
invokeai/backend/model_management/model_merge.py
View File

@ -31,7 +31,7 @@ class ModelMerger(object):
def merge_diffusion_models( def merge_diffusion_models(
self, self,
model_paths: List[str], model_paths: List[Path],
alpha: float = 0.5, alpha: float = 0.5,
interp: Optional[MergeInterpolationMethod] = None, interp: Optional[MergeInterpolationMethod] = None,
force: bool = False, force: bool = False,
@ -75,7 +75,7 @@ class ModelMerger(object):
alpha: float = 0.5, alpha: float = 0.5,
interp: Optional[MergeInterpolationMethod] = None, interp: Optional[MergeInterpolationMethod] = None,
force: bool = False, force: bool = False,
merge_dest_directory: Optional[str] = None, merge_dest_directory: Optional[Path] = None,
**kwargs, **kwargs,
) -> AddModelResult: ) -> AddModelResult:
""" """
@ -109,7 +109,7 @@ class ModelMerger(object):
# pick up the first model's vae # pick up the first model's vae
if mod == model_names[0]: if mod == model_names[0]:
vae = info.get("vae") vae = info.get("vae")
model_paths.extend([str(config.root_path / info["path"])]) model_paths.extend([(config.root_path / info["path"]).as_posix()])
merge_method = None if interp == "weighted_sum" else MergeInterpolationMethod(interp) merge_method = None if interp == "weighted_sum" else MergeInterpolationMethod(interp)
logger.debug(f"interp = {interp}, merge_method={merge_method}") logger.debug(f"interp = {interp}, merge_method={merge_method}")
@ -120,7 +120,7 @@ class ModelMerger(object):
else config.models_path / base_model.value / ModelType.Main.value else config.models_path / base_model.value / ModelType.Main.value
) )
dump_path.mkdir(parents=True, exist_ok=True) dump_path.mkdir(parents=True, exist_ok=True)
dump_path = str(dump_path / merged_model_name) dump_path = (dump_path / merged_model_name).as_posix()
merged_pipe.save_pretrained(dump_path, safe_serialization=True) merged_pipe.save_pretrained(dump_path, safe_serialization=True)
attributes = dict( attributes = dict(