From 32d79a6eea555261af492a48e96a174ab8684741 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Thu, 9 Nov 2023 22:40:37 +0000 Subject: [PATCH 1/4] Using 'GetShortTagname' method instead --- server/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/images.go b/server/images.go index 7bda6bf0..f0a55d3b 100644 --- a/server/images.go +++ b/server/images.go @@ -918,7 +918,7 @@ func ShowModelfile(model *Model) (string, error) { mt.From = model.ModelPath if model.OriginalModel != "" { - mt.From = model.OriginalModel + mt.From = ParseModelPath(model.OriginalModel).GetShortTagname() } modelFile := `# Modelfile generated by "ollama show" From d17730356a2dac57d61a158d3d43431e23f833c6 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Thu, 9 Nov 2023 22:44:26 +0000 Subject: [PATCH 2/4] Removed inline parse model path --- server/images.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/images.go b/server/images.go index f0a55d3b..e16f4bb4 100644 --- a/server/images.go +++ b/server/images.go @@ -918,7 +918,8 @@ func ShowModelfile(model *Model) (string, error) { mt.From = model.ModelPath if model.OriginalModel != "" { - mt.From = ParseModelPath(model.OriginalModel).GetShortTagname() + mp := ParseModelPath(model.OriginalModel) + mt.From = mp.GetShortTagname() } modelFile := `# Modelfile generated by "ollama show" From 6e46338d44930130f5d62489c9b568d7c29c5b52 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Fri, 10 Nov 2023 20:21:35 +0000 Subject: [PATCH 3/4] Reverting previous changes --- server/images.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/images.go b/server/images.go index e16f4bb4..7bda6bf0 100644 --- a/server/images.go +++ b/server/images.go @@ -918,8 +918,7 @@ func ShowModelfile(model *Model) (string, error) { mt.From = model.ModelPath if model.OriginalModel != "" { - mp := ParseModelPath(model.OriginalModel) - mt.From = mp.GetShortTagname() + mt.From = model.OriginalModel } modelFile := `# Modelfile generated by "ollama show" From 7c438f2c53cbb77529067a8f08568cbe69c91e05 Mon Sep 17 00:00:00 2001 From: Daniel Reis Date: Fri, 10 Nov 2023 20:22:03 +0000 Subject: [PATCH 4/4] Replaced method --- server/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/images.go b/server/images.go index 7bda6bf0..8d784fef 100644 --- a/server/images.go +++ b/server/images.go @@ -397,7 +397,7 @@ func CreateModel(ctx context.Context, name string, path string, fn func(resp api if err != nil { return err } - newLayer.From = mp.GetNamespaceRepository() + newLayer.From = mp.GetShortTagname() layers = append(layers, newLayer) } }