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

Remove default model logic

Browse Source
This commit is contained in:
Sergey Borisov 2023-06-20 03:13:10 +03:00 committed by psychedelicious
parent d3dec59cc3
commit aceadacad4
3 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,19 +69,6 @@ class ModelManagerServiceBase(ABC):
) -> bool: ) -> bool:
pass pass
@abstractmethod
def default_model(self) -> Optional[Tuple[str, BaseModelType, ModelType]]:
"""
Returns the name and typeof the default model, or None
if none is defined.
"""
pass
@abstractmethod
def set_default_model(self, model_name: str, base_model: BaseModelType, model_type: ModelType):
"""Sets the default model to the indicated name."""
pass
@abstractmethod @abstractmethod
def model_info(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict: def model_info(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict:
""" """
@ -270,17 +257,6 @@ class ModelManagerService(ModelManagerServiceBase):
model_type, model_type,
) )
def default_model(self) -> Optional[Tuple[str, BaseModelType, ModelType]]:
"""
Returns the name of the default model, or None
if none is defined.
"""
return self.mgr.default_model()
def set_default_model(self, model_name: str, base_model: BaseModelType, model_type: ModelType):
"""Sets the default model to the indicated name."""
self.mgr.set_default_model(model_name, base_model, model_type)
def model_info(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict: def model_info(self, model_name: str, base_model: BaseModelType, model_type: ModelType) -> dict:
""" """
Given a model name returns a dict-like (OmegaConf) object describing it. Given a model name returns a dict-like (OmegaConf) object describing it.

32
invokeai/backend/model_management/model_manager.py
View File

@ -445,38 +445,6 @@ class ModelManager(object):
_cache = self.cache, _cache = self.cache,
) )
def default_model(self) -> Optional[Tuple[str, BaseModelType, ModelType]]:
"""
Returns the name of the default model, or None
if none is defined.
"""
for model_key, model_config in self.models.items():
if model_config.default:
return self.parse_key(model_key)
for model_key, _ in self.models.items():
return self.parse_key(model_key)
else:
return None # TODO: or redo as (None, None, None)
def set_default_model(
self,
model_name: str,
base_model: BaseModelType,
model_type: ModelType,
) -> None:
"""
Set the default model. The change will not take
effect until you call model_manager.commit()
"""
model_key = self.model_key(model_name, base_model, model_type)
if model_key not in self.models:
raise Exception(f"Unknown model: {model_key}")
for cur_model_key, config in self.models.items():
config.default = cur_model_key == model_key
def model_info( def model_info(
self, self,
model_name: str, model_name: str,

2
invokeai/backend/model_management/models/base.py
View File

@ -48,10 +48,8 @@ class ModelError(str, Enum):
class ModelConfigBase(BaseModel): class ModelConfigBase(BaseModel):
path: str # or Path path: str # or Path
#name: str # not included as present in model key
description: Optional[str] = Field(None) description: Optional[str] = Field(None)
format: Optional[str] = Field(None) format: Optional[str] = Field(None)
default: Optional[bool] = Field(False)
# do not save to config # do not save to config
error: Optional[ModelError] = Field(None) error: Optional[ModelError] = Field(None)