From 67c8d497571510d7c29f9cadc1e7c2d09c2f690e Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Wed, 19 Jul 2023 07:16:38 -0700 Subject: [PATCH 1/3] Updated modelfile doc to include license and attributed midjourneyprompt Signed-off-by: Matt Williams --- docs/modelfile.md | 14 ++++++++++++-- examples/midjourneyprompter | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/modelfile.md b/docs/modelfile.md index f1155103..8450eac6 100644 --- a/docs/modelfile.md +++ b/docs/modelfile.md @@ -25,14 +25,24 @@ FROM [:] This defines the base model to be used. An image can be a known image on the Ollama Hub, or a fully-qualified path to a model file on your system -## PARAMETER +## LICENSE -The PARAMETER instruction defines a parameter that can be set when the model is run. +```modelfile +LICENSE """ + +""" +``` + +Some models need to be distributed with a license agreement. For example, the distribution clause for the Llama2 license requires including the license with the model. + +## PARAMETER ```modelfile PARAMETER ``` +The PARAMETER instruction defines a parameter that can be set when the model is run. + ### Valid Parameters and Values | Parameter | Description | Value Type | Value Range | diff --git a/examples/midjourneyprompter b/examples/midjourneyprompter index 52f77219..e648cd28 100644 --- a/examples/midjourneyprompter +++ b/examples/midjourneyprompter @@ -1,4 +1,5 @@ # Modelfile for creating a Midjourney prompts from a topic +# This prompt was adapted from the original at https://www.greataiprompts.com/guide/midjourney/best-chatgpt-prompt-for-midjourney/ # Run `ollama create mj -f pathtofile` and then `ollama run mj` and enter a topic FROM library/nous-hermes:latest From 7a62b2d2ab77c585f3aaadf7d33049f3e19c17a2 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Wed, 19 Jul 2023 07:39:40 -0700 Subject: [PATCH 2/3] Update the FROM instructions Signed-off-by: Matt Williams --- examples/midjourneyprompter | 2 +- examples/recipemaker | 2 +- examples/tweetwriter | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/midjourneyprompter b/examples/midjourneyprompter index e648cd28..b86d98d0 100644 --- a/examples/midjourneyprompter +++ b/examples/midjourneyprompter @@ -2,7 +2,7 @@ # This prompt was adapted from the original at https://www.greataiprompts.com/guide/midjourney/best-chatgpt-prompt-for-midjourney/ # Run `ollama create mj -f pathtofile` and then `ollama run mj` and enter a topic -FROM library/nous-hermes:latest +FROM nous-hermes:latest PROMPT """ {{- if not .Context }} ### System: diff --git a/examples/recipemaker b/examples/recipemaker index 53d0d372..f4ae1753 100644 --- a/examples/recipemaker +++ b/examples/recipemaker @@ -1,6 +1,6 @@ # Modelfile for creating a recipe from a list of ingredients # Run `ollama create recipemaker -f pathtofile` and then `ollama run recipemaker` and feed it lists of ingredients to create recipes around. -FROM library/nous-hermes:latest +FROM nous-hermes:latest PROMPT """ {{- if not .Context }} ### System: diff --git a/examples/tweetwriter b/examples/tweetwriter index 733ad1c3..7b1d6b8c 100644 --- a/examples/tweetwriter +++ b/examples/tweetwriter @@ -1,7 +1,7 @@ # Modelfile for creating a tweet from a topic # Run `ollama create tweetwriter -f pathtofile` and then `ollama run tweetwriter` and enter a topic -FROM library/nous-hermes:latest +FROM nous-hermes:latest PROMPT """ {{- if not .Context }} ### System: From bbb67002c3eda50dd9f83e58d154eb64345209e9 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Wed, 19 Jul 2023 07:40:40 -0700 Subject: [PATCH 3/3] get rid of latest Signed-off-by: Matt Williams --- examples/midjourneyprompter | 2 +- examples/recipemaker | 2 +- examples/tweetwriter | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/midjourneyprompter b/examples/midjourneyprompter index b86d98d0..12edf41e 100644 --- a/examples/midjourneyprompter +++ b/examples/midjourneyprompter @@ -2,7 +2,7 @@ # This prompt was adapted from the original at https://www.greataiprompts.com/guide/midjourney/best-chatgpt-prompt-for-midjourney/ # Run `ollama create mj -f pathtofile` and then `ollama run mj` and enter a topic -FROM nous-hermes:latest +FROM nous-hermes PROMPT """ {{- if not .Context }} ### System: diff --git a/examples/recipemaker b/examples/recipemaker index f4ae1753..cc7d5cd7 100644 --- a/examples/recipemaker +++ b/examples/recipemaker @@ -1,6 +1,6 @@ # Modelfile for creating a recipe from a list of ingredients # Run `ollama create recipemaker -f pathtofile` and then `ollama run recipemaker` and feed it lists of ingredients to create recipes around. -FROM nous-hermes:latest +FROM nous-hermes PROMPT """ {{- if not .Context }} ### System: diff --git a/examples/tweetwriter b/examples/tweetwriter index 7b1d6b8c..b5fce6f9 100644 --- a/examples/tweetwriter +++ b/examples/tweetwriter @@ -1,7 +1,7 @@ # Modelfile for creating a tweet from a topic # Run `ollama create tweetwriter -f pathtofile` and then `ollama run tweetwriter` and enter a topic -FROM nous-hermes:latest +FROM nous-hermes PROMPT """ {{- if not .Context }} ### System: