feat: add flag to pass custom prompt with default prompt as fallback
Co-authored-by: aider (openai/qwen3-coder:30b-a3b-q4_K_M) <aider@aider.chat>
This commit is contained in:
parent
3e39e519dd
commit
254c29b1d7
2 changed files with 24 additions and 22 deletions
|
|
@ -20,6 +20,7 @@ func main() {
|
||||||
var start = flag.String("start", "", "Start date")
|
var start = flag.String("start", "", "Start date")
|
||||||
var end = flag.String("end", "", "End date")
|
var end = flag.String("end", "", "End date")
|
||||||
var employeename = flag.String("employeename", "", "Employee name")
|
var employeename = flag.String("employeename", "", "Employee name")
|
||||||
|
var prompt = flag.String("prompt", defaultPrompt, "Custom prompt to use for summarization")
|
||||||
|
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
|
|
@ -54,7 +55,7 @@ func main() {
|
||||||
vikunjaTasks = DoVikunja(*start, *end)
|
vikunjaTasks = DoVikunja(*start, *end)
|
||||||
}
|
}
|
||||||
|
|
||||||
summ, err := SummarizeData(*employeename, prs, issues, vikunjaTasks)
|
summ, err := SummarizeData(*employeename, prs, issues, vikunjaTasks, *prompt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(fmt.Errorf("error getting PRs: %w", err))
|
fmt.Println(fmt.Errorf("error getting PRs: %w", err))
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|
@ -83,28 +84,29 @@ func DoPrs(proj, ghusername, start, end string) map[string][]contributions.PullR
|
||||||
return prs
|
return prs
|
||||||
}
|
}
|
||||||
|
|
||||||
func DoJira(start, end, jiraUser string) []issues.Issue {
|
func DoJira(start, end string) []issues.Issue {
|
||||||
host := os.Getenv("JIRA_HOST")
|
host := os.Getenv("VIKUNJA_HOST")
|
||||||
issues, err := issues.GetIssues(host, jiraUser, start, end)
|
user := os.Getenv("VIKUNJA_USER")
|
||||||
|
tasks, err := vikunja.GetTasks(host, user, start, end)
|
||||||
if err != nil {
|
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)
|
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 {
|
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)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
defer jf.Close()
|
defer vf.Close()
|
||||||
|
|
||||||
enc := json.NewEncoder(jf)
|
enc := json.NewEncoder(vf)
|
||||||
err = enc.Encode(issues)
|
err = enc.Encode(tasks)
|
||||||
if err != nil {
|
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)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
return issues
|
return tasks
|
||||||
}
|
}
|
||||||
|
|
||||||
func DoVikunja(start, end string) []vikunja.Task {
|
func DoVikunja(start, end string) []vikunja.Task {
|
||||||
|
|
|
||||||
|
|
@ -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.`
|
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.
|
// 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
|
// 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 {
|
for repo, prList := range prs {
|
||||||
prompt += fmt.Sprintf("Repository: %s\n", repo)
|
fullPrompt += fmt.Sprintf("Repository: %s\n", repo)
|
||||||
for _, pr := range prList {
|
for _, pr := range prList {
|
||||||
prompt += fmt.Sprintf("- Title: %s\n", pr.Title)
|
fullPrompt += fmt.Sprintf("- Title: %s\n", pr.Title)
|
||||||
prompt += fmt.Sprintf(" Body: %s\n", pr.Body)
|
fullPrompt += fmt.Sprintf(" Body: %s\n", pr.Body)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
prompt += fmt.Sprintf("Issues:")
|
fullPrompt += fmt.Sprintf("Issues:")
|
||||||
for _, issue := range issues {
|
for _, issue := range issues {
|
||||||
prompt += fmt.Sprintf("Summary: %s\n", issue.Summary)
|
fullPrompt += fmt.Sprintf("Summary: %s\n", issue.Summary)
|
||||||
prompt += fmt.Sprintf("Description: %s\n", issue.Description)
|
fullPrompt += fmt.Sprintf("Description: %s\n", issue.Description)
|
||||||
prompt += fmt.Sprintf("--------")
|
fullPrompt += fmt.Sprintf("--------")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get OpenAI endpoint and token from environment variables
|
// Get OpenAI endpoint and token from environment variables
|
||||||
|
|
@ -57,7 +57,7 @@ func SummarizeData(employeename string, prs map[string][]contributions.PullReque
|
||||||
Messages: []struct {
|
Messages: []struct {
|
||||||
Role string `json:"role"`
|
Role string `json:"role"`
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
}{{Role: "system", Content: prompt}},
|
}{{Role: "system", Content: fullPrompt}},
|
||||||
}
|
}
|
||||||
|
|
||||||
jsonPayload, err := json.Marshal(payload)
|
jsonPayload, err := json.Marshal(payload)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue