!model_import autocompletes in ROOTDIR

This commit is contained in:
Lincoln Stein 2022-11-28 17:44:32 +00:00
parent 71c4f401b0
commit a3121b8137
2 changed files with 10 additions and 4 deletions

View File

@ -178,11 +178,11 @@ class ModelCache(object):
method will return True. Will fail with an assertion error if provided
attributes are incorrect or the model name is missing.
'''
omega = self.config
for field in ('description','weights','height','width','config'):
assert field in model_attributes, f'required field {field} is missing'
assert (clobber or model_name not in omega), f'attempt to overwrite existing model definition "{model_name}"'
omega = self.config
config = omega[model_name] if model_name in omega else {}
for field in model_attributes:
config[field] = model_attributes[field]

View File

@ -12,6 +12,7 @@ import os
import re
import atexit
from ldm.invoke.args import Args
from ldm.invoke.globals import Globals
# ---------------readline utilities---------------------
try:
@ -127,7 +128,12 @@ class Completer(object):
self.matches= self._model_completions(text, state)
elif re.search(weight_regexp,buffer):
self.matches = self._path_completions(text, state, WEIGHT_EXTENSIONS)
self.matches = self._path_completions(
text,
state,
WEIGHT_EXTENSIONS,
default_dir=Globals.root,
)
elif re.search(text_regexp,buffer):
self.matches = self._path_completions(text, state, TEXT_EXTENSIONS)
@ -278,7 +284,7 @@ class Completer(object):
readline.redisplay()
self.linebuffer = None
def _path_completions(self, text, state, extensions, shortcut_ok=True):
def _path_completions(self, text, state, extensions, shortcut_ok=True, default_dir:str=''):
# separate the switch from the partial path
match = re.search('^(-\w|--\w+=?)(.*)',text)
if match is None:
@ -297,7 +303,7 @@ class Completer(object):
elif os.path.dirname(path) != '':
dir = os.path.dirname(path)
else:
dir = ''
dir = default_dir if os.path.exists(default_dir) else ''
path= os.path.join(dir,path)
dir_list = os.listdir(dir or '.')