From 254c29b1d76a412885713f0573a6271d027c7507 Mon Sep 17 00:00:00 2001 From: Olivier Tremblay Date: Mon, 10 Nov 2025 10:09:42 -0500 Subject: [PATCH] feat: add flag to pass custom prompt with default prompt as fallback Co-authored-by: aider (openai/qwen3-coder:30b-a3b-q4_K_M) --- cmd/acb/main.go | 26 ++++++++++++++------------ cmd/acb/summarize.go | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/cmd/acb/main.go b/cmd/acb/main.go index e45f1b0..6c1d1ce 100644 --- a/cmd/acb/main.go +++ b/cmd/acb/main.go @@ -20,6 +20,7 @@ func main() { var start = flag.String("start", "", "Start date") var end = flag.String("end", "", "End date") var employeename = flag.String("employeename", "", "Employee name") + var prompt = flag.String("prompt", defaultPrompt, "Custom prompt to use for summarization") flag.Parse() @@ -54,7 +55,7 @@ func main() { vikunjaTasks = DoVikunja(*start, *end) } - summ, err := SummarizeData(*employeename, prs, issues, vikunjaTasks) + summ, err := SummarizeData(*employeename, prs, issues, vikunjaTasks, *prompt) if err != nil { fmt.Println(fmt.Errorf("error getting PRs: %w", err)) os.Exit(1) @@ -83,28 +84,29 @@ func DoPrs(proj, ghusername, start, end string) map[string][]contributions.PullR return prs } -func DoJira(start, end, jiraUser string) []issues.Issue { - host := os.Getenv("JIRA_HOST") - issues, err := issues.GetIssues(host, jiraUser, start, end) +func DoJira(start, end string) []issues.Issue { + host := os.Getenv("VIKUNJA_HOST") + user := os.Getenv("VIKUNJA_USER") + tasks, err := vikunja.GetTasks(host, user, start, end) if err != nil { - fmt.Println(fmt.Errorf("error getting PRs: %w", err)) + fmt.Println(fmt.Errorf("error getting Vikunja tasks: %w", err)) os.Exit(1) } - jf, err := os.Create(fmt.Sprintf("jira-%s-%s-%s-%s-%d.json", host, jiraUser, start, end, time.Now().Unix())) + vf, err := os.Create(fmt.Sprintf("vikunja-%s-%s-%s-%s-%d.json", host, user, start, end, time.Now().Unix())) if err != nil { - fmt.Println(fmt.Errorf("error creating JIRA file: %w", err)) + fmt.Println(fmt.Errorf("error creating Vikunja file: %w", err)) os.Exit(1) } - defer jf.Close() + defer vf.Close() - enc := json.NewEncoder(jf) - err = enc.Encode(issues) + enc := json.NewEncoder(vf) + err = enc.Encode(tasks) if err != nil { - fmt.Println(fmt.Errorf("error writing out JIRA issues: %w", err)) + fmt.Println(fmt.Errorf("error writing out Vikunja tasks: %w", err)) os.Exit(1) } - return issues + return tasks } func DoVikunja(start, end string) []vikunja.Task { diff --git a/cmd/acb/summarize.go b/cmd/acb/summarize.go index 28d2a9d..21ba84c 100644 --- a/cmd/acb/summarize.go +++ b/cmd/acb/summarize.go @@ -19,21 +19,21 @@ I'd like you to summarize the employee's accomplishments for the quarter I'd like the summary for the accomplishments to be in prose form, in a few paragraphs separated based on areas of work. Keep answers to 500 words for the summary.` // SummarizeData takes GitHub PRs and Jira issues data and sends it to an OpenAI-compatible endpoint for summarization. -func SummarizeData(employeename string, prs map[string][]contributions.PullRequest, issues []issues.Issue, tasks []vikunja.Task) (string, error) { +func SummarizeData(employeename string, prs map[string][]contributions.PullRequest, issues []issues.Issue, tasks []vikunja.Task, prompt string) (string, error) { // Build a prompt string - prompt := defaultPrompt + fmt.Sprintf("\n\nHere's the PRs and Tickets for the employee %s:\n\n", employeename) + fullPrompt := prompt + fmt.Sprintf("\n\nHere's the PRs and Tickets for the employee %s:\n\n", employeename) for repo, prList := range prs { - prompt += fmt.Sprintf("Repository: %s\n", repo) + fullPrompt += fmt.Sprintf("Repository: %s\n", repo) for _, pr := range prList { - prompt += fmt.Sprintf("- Title: %s\n", pr.Title) - prompt += fmt.Sprintf(" Body: %s\n", pr.Body) + fullPrompt += fmt.Sprintf("- Title: %s\n", pr.Title) + fullPrompt += fmt.Sprintf(" Body: %s\n", pr.Body) } } - prompt += fmt.Sprintf("Issues:") + fullPrompt += fmt.Sprintf("Issues:") for _, issue := range issues { - prompt += fmt.Sprintf("Summary: %s\n", issue.Summary) - prompt += fmt.Sprintf("Description: %s\n", issue.Description) - prompt += fmt.Sprintf("--------") + fullPrompt += fmt.Sprintf("Summary: %s\n", issue.Summary) + fullPrompt += fmt.Sprintf("Description: %s\n", issue.Description) + fullPrompt += fmt.Sprintf("--------") } // Get OpenAI endpoint and token from environment variables @@ -57,7 +57,7 @@ func SummarizeData(employeename string, prs map[string][]contributions.PullReque Messages: []struct { Role string `json:"role"` Content string `json:"content"` - }{{Role: "system", Content: prompt}}, + }{{Role: "system", Content: fullPrompt}}, } jsonPayload, err := json.Marshal(payload)