Builder-style API
This commit is contained in:
44
taskcp.go
44
taskcp.go
@@ -80,8 +80,8 @@ func (s *Service) GetProject(id int) (*Project, error) {
|
|||||||
return s.projects[id], nil
|
return s.projects[id], nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Project) InsertTaskBefore(beforeID int, title string, instructions string, completionCallback func(project *Project, task *Task) error) *Task {
|
func (p *Project) InsertTaskBefore(beforeID int) *Task {
|
||||||
newTask := p.newTask(title, instructions, completionCallback, beforeID)
|
newTask := p.newTask(beforeID)
|
||||||
|
|
||||||
if p.nextTaskID == -1 && beforeID == -1 {
|
if p.nextTaskID == -1 && beforeID == -1 {
|
||||||
p.nextTaskID = newTask.ID
|
p.nextTaskID = newTask.ID
|
||||||
@@ -143,21 +143,15 @@ func (p *Project) SetTaskFailure(id int, error string, notes string) (*Task, err
|
|||||||
return p.GetNextTask(), nil
|
return p.GetNextTask(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Project) newTask(title string, instructions string, completionCallback func(project *Project, task *Task) error, nextTaskID int) *Task {
|
func (p *Project) newTask(nextTaskID int) *Task {
|
||||||
task := &Task{
|
task := &Task{
|
||||||
ID: len(p.Tasks),
|
ID: len(p.Tasks),
|
||||||
State: TaskStatePending,
|
State: TaskStatePending,
|
||||||
NextTaskID: nextTaskID,
|
NextTaskID: nextTaskID,
|
||||||
Title: title,
|
Data: map[string]any{},
|
||||||
Instructions: instructions,
|
project: p,
|
||||||
Data: map[string]any{},
|
|
||||||
completionCallback: completionCallback,
|
|
||||||
project: p,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
task.Instructions = strings.ReplaceAll(task.Instructions, "{SUCCESS_PROMPT}", task.SuccessPrompt())
|
|
||||||
task.Instructions = strings.ReplaceAll(task.Instructions, "{FAILURE_PROMPT}", task.FailurePrompt())
|
|
||||||
|
|
||||||
p.Tasks = append(p.Tasks, task)
|
p.Tasks = append(p.Tasks, task)
|
||||||
return task
|
return task
|
||||||
}
|
}
|
||||||
@@ -188,6 +182,28 @@ func (p *Project) Summary() ProjectSummary {
|
|||||||
return ProjectSummary{Tasks: tasks}
|
return ProjectSummary{Tasks: tasks}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (t *Task) WithTitle(title string) *Task {
|
||||||
|
t.Title = title
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Task) WithInstructions(instructions string) *Task {
|
||||||
|
t.Instructions = instructions
|
||||||
|
t.Instructions = strings.ReplaceAll(t.Instructions, "{SUCCESS_PROMPT}", t.SuccessPrompt())
|
||||||
|
t.Instructions = strings.ReplaceAll(t.Instructions, "{FAILURE_PROMPT}", t.FailurePrompt())
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Task) WithData(key string, value any) *Task {
|
||||||
|
t.Data[key] = value
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *Task) Then(completionCallback func(project *Project, task *Task) error) *Task {
|
||||||
|
t.completionCallback = completionCallback
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
func (t *Task) SuccessPrompt() string {
|
func (t *Task) SuccessPrompt() string {
|
||||||
return fmt.Sprintf(`To mark this task as successful, use the MCP tool:
|
return fmt.Sprintf(`To mark this task as successful, use the MCP tool:
|
||||||
%s.set_task_success(project_id=%d, task_id=%d, result="<your result>", notes="<optional notes>")`,
|
%s.set_task_success(project_id=%d, task_id=%d, result="<your result>", notes="<optional notes>")`,
|
||||||
|
|||||||
@@ -12,7 +12,12 @@ func TestTaskPrompts(t *testing.T) {
|
|||||||
service := taskcp.New("my_service")
|
service := taskcp.New("my_service")
|
||||||
project := service.AddProject()
|
project := service.AddProject()
|
||||||
|
|
||||||
task := project.InsertTaskBefore(-1, "Write unit tests", "", func(project *taskcp.Project, task *taskcp.Task) error { return nil })
|
task := project.InsertTaskBefore(-1).
|
||||||
|
WithTitle("Write unit tests").
|
||||||
|
WithInstructions("This is a test task.").
|
||||||
|
Then(func(project *taskcp.Project, task *taskcp.Task) error {
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
successPrompt := task.SuccessPrompt()
|
successPrompt := task.SuccessPrompt()
|
||||||
require.Contains(t, successPrompt, "my_service.set_task_success")
|
require.Contains(t, successPrompt, "my_service.set_task_success")
|
||||||
@@ -29,11 +34,21 @@ func TestPlaceholderExpansion(t *testing.T) {
|
|||||||
service := taskcp.New("my_service")
|
service := taskcp.New("my_service")
|
||||||
project := service.AddProject()
|
project := service.AddProject()
|
||||||
|
|
||||||
task1 := project.InsertTaskBefore(-1, "Please complete this task.", "{SUCCESS_PROMPT}", func(project *taskcp.Project, task *taskcp.Task) error { return nil })
|
task1 := project.InsertTaskBefore(-1).
|
||||||
|
WithTitle("Please complete this task.").
|
||||||
|
WithInstructions("{SUCCESS_PROMPT}").
|
||||||
|
Then(func(project *taskcp.Project, task *taskcp.Task) error {
|
||||||
|
return nil
|
||||||
|
})
|
||||||
require.Contains(t, task1.Instructions, "my_service.set_task_success")
|
require.Contains(t, task1.Instructions, "my_service.set_task_success")
|
||||||
require.NotContains(t, task1.Instructions, "{SUCCESS_PROMPT}")
|
require.NotContains(t, task1.Instructions, "{SUCCESS_PROMPT}")
|
||||||
|
|
||||||
task2 := project.InsertTaskBefore(-1, "Try this risky operation.", "{FAILURE_PROMPT}", func(project *taskcp.Project, task *taskcp.Task) error { return nil })
|
task2 := project.InsertTaskBefore(-1).
|
||||||
|
WithTitle("Try this risky operation.").
|
||||||
|
WithInstructions("{FAILURE_PROMPT}").
|
||||||
|
Then(func(project *taskcp.Project, task *taskcp.Task) error {
|
||||||
|
return nil
|
||||||
|
})
|
||||||
require.Contains(t, task2.Instructions, "my_service.set_task_failure")
|
require.Contains(t, task2.Instructions, "my_service.set_task_failure")
|
||||||
require.NotContains(t, task2.Instructions, "{FAILURE_PROMPT}")
|
require.NotContains(t, task2.Instructions, "{FAILURE_PROMPT}")
|
||||||
}
|
}
|
||||||
@@ -44,15 +59,19 @@ func TestTaskFlow(t *testing.T) {
|
|||||||
|
|
||||||
var completed []int
|
var completed []int
|
||||||
|
|
||||||
task1 := project.InsertTaskBefore(-1, "First task", "", func(project *taskcp.Project, task *taskcp.Task) error {
|
task1 := project.InsertTaskBefore(-1).
|
||||||
completed = append(completed, task.ID)
|
WithTitle("First task").
|
||||||
return nil
|
Then(func(project *taskcp.Project, task *taskcp.Task) error {
|
||||||
})
|
completed = append(completed, task.ID)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
task2 := project.InsertTaskBefore(-1, "Second task", "", func(project *taskcp.Project, task *taskcp.Task) error {
|
task2 := project.InsertTaskBefore(-1).
|
||||||
completed = append(completed, task.ID)
|
WithTitle("Second task").
|
||||||
return nil
|
Then(func(project *taskcp.Project, task *taskcp.Task) error {
|
||||||
})
|
completed = append(completed, task.ID)
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
current := project.GetNextTask()
|
current := project.GetNextTask()
|
||||||
require.NotNil(t, current)
|
require.NotNil(t, current)
|
||||||
@@ -79,9 +98,13 @@ func TestCallbackError(t *testing.T) {
|
|||||||
|
|
||||||
expectedErr := fmt.Errorf("callback error")
|
expectedErr := fmt.Errorf("callback error")
|
||||||
|
|
||||||
task := project.InsertTaskBefore(-1, "Task with error callback", "", func(project *taskcp.Project, task *taskcp.Task) error {
|
task := project.InsertTaskBefore(-1).
|
||||||
return expectedErr
|
WithTitle("Task with error callback").
|
||||||
})
|
WithInstructions("This is a test task.").
|
||||||
|
WithData("key", "value").
|
||||||
|
Then(func(project *taskcp.Project, task *taskcp.Task) error {
|
||||||
|
return expectedErr
|
||||||
|
})
|
||||||
|
|
||||||
current := project.GetNextTask()
|
current := project.GetNextTask()
|
||||||
require.NotNil(t, current)
|
require.NotNil(t, current)
|
||||||
|
|||||||
Reference in New Issue
Block a user