Mirrors/modelscope
1
0
Fork 0
mirror of https://github.com/modelscope/modelscope.git synced 2026-02-24 20:19:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
suluyana
2024-10-25 19:51:31 +08:00
parent b8faaabd69
commit 4e368ad623
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
modelscope/preprocessors/templates/loader.py
View File

@@ -694,26 +694,28 @@ class TemplateLoader:
f'Please make sure you model_id: {model_id} '
f'and template_name: {template_name} is supported.')
logger.info('Exporting to ollama:')
gguf_header_name = gguf_meta.get("general.name", None)
names = [gguf_header_name, model_id]
names = []
if gguf_meta:
gguf_header_name = gguf_meta.get("general.name", None)
names.append(gguf_header_name)
if model_id:
names.append(model_id)
for name in names:
if name:
for _info in template_info:
if re.fullmatch(_info.template_regex, name):
if _info.modelfile_prefix and not kwargs.get('ignore_oss_model_file', False):
template_str = TemplateLoader._read_content_from_url(
_info.modelfile_prefix + '.template')
params = TemplateLoader._read_content_from_url(_info.modelfile_prefix + '.params')
if params:
params = json.loads(params)
else:
logger.info(f'name {name} in has no params file.')
for _info in template_info:
if re.fullmatch(_info.template_regex, name):
if _info.modelfile_prefix and not kwargs.get('ignore_oss_model_file', False):
template_str = TemplateLoader._read_content_from_url(
_info.modelfile_prefix + '.template')
params = TemplateLoader._read_content_from_url(_info.modelfile_prefix + '.params')
if params:
params = json.loads(params)
else:
logger.info(f'name {name} in has no params file.')
format_out = TemplateLoader._format_return(template_str, params, split)
if debug:
return format_out, _info
return format_out
format_out = TemplateLoader._format_return(template_str, params, split)
if debug:
return format_out, _info
return format_out
if template_name:
template = TemplateLoader.load_by_template_name(
template_name, **kwargs)

2
tests/tools/test_to_ollama.py
View File

@@ -142,7 +142,7 @@ class TestToOllama(unittest.TestCase):
ollama, info = TemplateLoader.to_ollama(
'QuantFactory/dolphin-2.9-llama3-70b-GGUF', debug=True)
assert info.__dict__.get('modelfile_prefix').split(
'/')[-1] == 'llama2', info
'/')[-1] == 'dolphin-llama3', info
if __name__ == '__main__':