pali112
/
ollama
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parser: add SKILL command for Agentfiles 

Add SKILL command to the Modelfile/Agentfile parser.

Supports both local paths and registry references:
  SKILL ./path/to/skill       # Local skill bundled with agent
  SKILL skill/calc:1.0.0      # Registry skill reference
  SKILL alice/skill/calc:1.0  # User skill from registry
This commit is contained in:
ParthSareen 2025-12-29 00:13:56 -05:00
parent fc62078ba4
commit 6f9fc4e1bf
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
parser/parser.go
View File

@ -58,6 +58,7 @@ func (f Modelfile) CreateRequest(relativeDir string) (*api.CreateRequest, error)
var messages []api.Message var messages []api.Message
var licenses []string var licenses []string
var skills []api.SkillRef
params := make(map[string]any) params := make(map[string]any)
for _, c := range f.Commands { for _, c := range f.Commands {
@ -118,6 +119,10 @@ func (f Modelfile) CreateRequest(relativeDir string) (*api.CreateRequest, error)
case "message": case "message":
role, msg, _ := strings.Cut(c.Args, ": ") role, msg, _ := strings.Cut(c.Args, ": ")
messages = append(messages, api.Message{Role: role, Content: msg}) messages = append(messages, api.Message{Role: role, Content: msg})
case "skill":
skills = append(skills, api.SkillRef{Name: c.Args})
case "agent_type":
req.AgentType = c.Args
default: default:
if slices.Contains(deprecatedParameters, c.Name) { if slices.Contains(deprecatedParameters, c.Name) {
fmt.Printf("warning: parameter %s is deprecated\n", c.Name) fmt.Printf("warning: parameter %s is deprecated\n", c.Name)
@ -150,6 +155,9 @@ func (f Modelfile) CreateRequest(relativeDir string) (*api.CreateRequest, error)
if len(licenses) > 0 { if len(licenses) > 0 {
req.License = licenses req.License = licenses
} }
if len(skills) > 0 {
req.Skills = skills
}
return req, nil return req, nil
} }
@ -333,7 +341,7 @@ func (c Command) String() string {
switch c.Name { switch c.Name {
case "model": case "model":
fmt.Fprintf(&sb, "FROM %s", c.Args) fmt.Fprintf(&sb, "FROM %s", c.Args)
case "license", "template", "system", "adapter", "renderer", "parser", "requires": case "license", "template", "system", "adapter", "renderer", "parser", "requires", "skill", "agent_type":
fmt.Fprintf(&sb, "%s %s", strings.ToUpper(c.Name), quote(c.Args)) fmt.Fprintf(&sb, "%s %s", strings.ToUpper(c.Name), quote(c.Args))
case "message": case "message":
role, message, _ := strings.Cut(c.Args, ": ") role, message, _ := strings.Cut(c.Args, ": ")
@ -359,7 +367,7 @@ const (
var ( var (
errMissingFrom = errors.New("no FROM line") errMissingFrom = errors.New("no FROM line")
errInvalidMessageRole = errors.New("message role must be one of \"system\", \"user\", or \"assistant\"") errInvalidMessageRole = errors.New("message role must be one of \"system\", \"user\", or \"assistant\"")
errInvalidCommand = errors.New("command must be one of \"from\", \"license\", \"template\", \"system\", \"adapter\", \"renderer\", \"parser\", \"parameter\", \"message\", or \"requires\"") errInvalidCommand = errors.New("command must be one of \"from\", \"license\", \"template\", \"system\", \"adapter\", \"renderer\", \"parser\", \"parameter\", \"message\", \"requires\", \"skill\", or \"agent_type\"")
) )
type ParserError struct { type ParserError struct {
@ -518,7 +526,7 @@ func parseRuneForState(r rune, cs state) (state, rune, error) {
} }
case stateName: case stateName:
switch { switch {
case isAlpha(r): case isAlpha(r), r == '_':
return stateName, r, nil return stateName, r, nil
case isSpace(r): case isSpace(r):
return stateValue, 0, nil return stateValue, 0, nil
@ -619,7 +627,7 @@ func isValidMessageRole(role string) bool {
func isValidCommand(cmd string) bool { func isValidCommand(cmd string) bool {
switch strings.ToLower(cmd) { switch strings.ToLower(cmd) {
case "from", "license", "template", "system", "adapter", "renderer", "parser", "parameter", "message", "requires": case "from", "license", "template", "system", "adapter", "renderer", "parser", "parameter", "message", "requires", "skill", "agent_type":
return true return true
default: default:
return false return false