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

prevent "!switch state gets confused if model switching fails"

Browse Source 
- If !switch were to fail on a particular model, then generate got
  confused and wouldn't try again until you switch to a different working
  model and back again.

- This commit fixes and closes #1547
This commit is contained in:
Lincoln Stein 2022-11-26 15:15:10 +00:00
parent a341297b0c
commit 9adaf8f8ad
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ldm/generate.py
View File

@ -832,6 +832,7 @@ class Generate:
model_data = cache.get_model(model_name) model_data = cache.get_model(model_name)
if model_data is None: # restore previous if model_data is None: # restore previous
model_data = cache.get_model(self.model_name) model_data = cache.get_model(self.model_name)
model_name = self.model_name # addresses Issue #1547
self.model = model_data['model'] self.model = model_data['model']
self.width = model_data['width'] self.width = model_data['width']

11
ldm/invoke/model_cache.py
View File

@ -78,11 +78,12 @@ class ModelCache(object):
else: # we're about to load a new model, so potentially offload the least recently used one else: # we're about to load a new model, so potentially offload the least recently used one
try: try:
requested_model, width, height, hash = self._load_model(model_name) requested_model, width, height, hash = self._load_model(model_name)
self.models[model_name] = {} self.models[model_name] = {
self.models[model_name]['model'] = requested_model 'model': requested_model,
self.models[model_name]['width'] = width 'width': width,
self.models[model_name]['height'] = height 'height': height,
self.models[model_name]['hash'] = hash 'hash': hash,
}
except Exception as e: except Exception as e:
print(f'** model {model_name} could not be loaded: {str(e)}') print(f'** model {model_name} could not be loaded: {str(e)}')