diff --git a/go.mod b/go.mod index ef64a46..b28b318 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.6 require ( code.gitea.io/sdk/gitea v0.20.0 github.com/a-h/templ v0.3.833 - github.com/bornholm/genai v0.0.0-20250227201654-4c93b20ee628 + github.com/bornholm/genai v0.0.0-20250306213046-5477c1ed7fb6 github.com/caarlos0/env/v11 v11.2.2 github.com/gabriel-vasile/mimetype v1.4.7 github.com/google/go-github/v69 v69.2.0 @@ -54,3 +54,5 @@ require ( google.golang.org/protobuf v1.34.1 // indirect honnef.co/go/tools v0.3.1 // indirect ) + +replace github.com/revrost/go-openrouter => github.com/bornholm/go-openrouter v0.0.0-20250306205247-645443da53e2 diff --git a/go.sum b/go.sum index 70f124a..c814ce7 100644 --- a/go.sum +++ b/go.sum @@ -12,10 +12,10 @@ github.com/RealAlexandreAI/json-repair v0.0.14 h1:4kTqotVonDVTio5n2yweRUELVcNe2x github.com/RealAlexandreAI/json-repair v0.0.14/go.mod h1:GKJi5borR78O8c7HCVbgqjhoiVibZ6hJldxbc6dGrAI= github.com/a-h/templ v0.3.833 h1:L/KOk/0VvVTBegtE0fp2RJQiBm7/52Zxv5fqlEHiQUU= github.com/a-h/templ v0.3.833/go.mod h1:cAu4AiZhtJfBjMY0HASlyzvkrtjnHWPeEsyGK2YYmfk= -github.com/bornholm/genai v0.0.0-20250222092500-1076426da67c h1:bI0ebsgO1/7Jx6+ZQdDF/I6tTZxyB5hODYz7x/XxwK8= -github.com/bornholm/genai v0.0.0-20250222092500-1076426da67c/go.mod h1:MnuvwSsBEWv/joeK/WgUyfZfOLcLTpd81NJdWoRpRfI= -github.com/bornholm/genai v0.0.0-20250227201654-4c93b20ee628 h1:YsrF9+NUdwYPLfpJUUfD0h/yH0jvpnaMxtM/sPsFsPg= -github.com/bornholm/genai v0.0.0-20250227201654-4c93b20ee628/go.mod h1:kgZb50LiE3cLjyGdUzNwDtpxL5QRllZIsWT2Ub24fIM= +github.com/bornholm/genai v0.0.0-20250306213046-5477c1ed7fb6 h1:v3mDgFesJogm0V90TS4yzv9nbpU0A1Vix8YU4X0AtdQ= +github.com/bornholm/genai v0.0.0-20250306213046-5477c1ed7fb6/go.mod h1:B0WYgWZvs9MRyy/Vm9y9HD409EJlHpqPM4IQeZeO1AU= +github.com/bornholm/go-openrouter v0.0.0-20250306205247-645443da53e2 h1:ruSYBHwfp5mmakcFlnNZW/EPE1TFul+ib95jLAOR0so= +github.com/bornholm/go-openrouter v0.0.0-20250306205247-645443da53e2/go.mod h1:UIrJIZBygNz1DygZPImp56zCjv5IJNNkdp2hNUgn9H4= github.com/caarlos0/env/v11 v11.2.2 h1:95fApNrUyueipoZN/EhA8mMxiNxrBwDa+oAZrMWl3Kg= github.com/caarlos0/env/v11 v11.2.2/go.mod h1:JBfcdeQiBoI3Zh1QRAWfe+tpiNTmDtcCj/hHHHMx0vc= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -60,8 +60,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/revrost/go-openrouter v0.0.0-20250128091643-3d014d57014d h1:3PCl9WWy1S3YpCzlXrDoBJqPJ59IsiqKSf8d3tHDYn0= -github.com/revrost/go-openrouter v0.0.0-20250128091643-3d014d57014d/go.mod h1:UIrJIZBygNz1DygZPImp56zCjv5IJNNkdp2hNUgn9H4= github.com/samber/slog-http v1.4.4 h1:NuENLy39Lk6b7wfj9cG9R5C/JLZR4t6pb9cwlyroybI= github.com/samber/slog-http v1.4.4/go.mod h1:PAcQQrYFo5KM7Qbk50gNNwKEAMGCyfsw6GN5dI0iv9g= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/internal/adapter/gitea/forge.go b/internal/adapter/gitea/forge.go index a7db510..50207a0 100644 --- a/internal/adapter/gitea/forge.go +++ b/internal/adapter/gitea/forge.go @@ -16,6 +16,128 @@ type Forge struct { client *gitea.Client } +// UpdatePullRequest implements port.Forge. +func (f *Forge) UpdatePullRequest(ctx context.Context, rawProjectID string, rawPullRequestID string, title string, body string) (string, error) { + project, err := f.getProject(rawProjectID) + if err != nil { + return "", errors.WithStack(err) + } + + pullRequestID, err := strconv.ParseInt(rawPullRequestID, 10, 64) + if err != nil { + return "", errors.Wrapf(err, "could not parse pull request id '%v'", rawPullRequestID) + } + + pr, _, err := f.client.EditPullRequest(project.Owner.UserName, project.Name, pullRequestID, gitea.EditPullRequestOption{ + Title: title, + Body: body, + }) + if err != nil { + return "", errors.WithStack(err) + } + + return pr.HTMLURL, nil +} + +// GetPullRequestTemplate implements port.Forge. +func (f *Forge) GetPullRequestTemplate(ctx context.Context, rawProjectID string) (string, error) { + data, err := f.GetFile(ctx, rawProjectID, ".gitea/pull_request_template.md") + if err != nil { + return "", errors.WithStack(err) + } + + return string(data), nil +} + +// GetPullRequests implements port.Forge. +func (f *Forge) GetPullRequests(ctx context.Context, rawProjectID string, pullRequestIDs ...string) ([]*model.PullRequest, error) { + project, err := f.getProject(rawProjectID) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests := make([]*model.PullRequest, 0) + for _, rawID := range pullRequestIDs { + id, err := strconv.ParseInt(rawID, 10, 64) + if err != nil { + return nil, errors.Wrapf(err, "could not parse pull request id '%v'", rawID) + } + + pr, _, err := f.client.GetPullRequest(project.Owner.UserName, project.Name, id) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests = append(pullRequests, &model.PullRequest{ + ID: strconv.FormatInt(pr.ID, 10), + Title: pr.Title, + Body: pr.Body, + }) + } + + return pullRequests, nil +} + +// GetPullRequestDiff implements port.Forge. +func (f *Forge) GetPullRequestDiff(ctx context.Context, rawProjectID string, rawPullRequestID string) (string, error) { + project, err := f.getProject(rawProjectID) + if err != nil { + return "", errors.WithStack(err) + } + + pullRequestID, err := strconv.ParseInt(rawPullRequestID, 10, 64) + if err != nil { + return "", errors.Wrapf(err, "could not parse pull request id '%v'", rawPullRequestID) + } + + diff, _, err := f.client.GetPullRequestDiff(project.Owner.UserName, project.Name, pullRequestID, gitea.PullRequestDiffOptions{ + Binary: false, + }) + if err != nil { + return "", errors.WithStack(err) + } + + return string(diff), nil +} + +// ListOpenedPullRequests implements port.Forge. +func (f *Forge) ListOpenedPullRequests(ctx context.Context, rawProjectID string) ([]*model.PullRequest, error) { + project, err := f.getProject(rawProjectID) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests := make([]*model.PullRequest, 0) + + page := 1 + for { + repoPullRequests, res, err := f.client.ListRepoPullRequests(project.Owner.UserName, project.Name, gitea.ListPullRequestsOptions{ + State: gitea.StateOpen, + ListOptions: gitea.ListOptions{ + Page: page, + PageSize: 100, + }, + }) + if err != nil { + return nil, errors.WithStack(err) + } + + for _, pr := range repoPullRequests { + pullRequests = append(pullRequests, &model.PullRequest{ + ID: strconv.FormatInt(pr.Index, 10), + Title: pr.Title, + Body: pr.Body, + }) + } + + if res.NextPage == 0 { + return pullRequests, nil + } + + page = res.NextPage + } +} + // GetFile implements port.Forge. func (f *Forge) GetFile(ctx context.Context, rawProjectID string, path string) ([]byte, error) { project, err := f.getProject(rawProjectID) @@ -132,8 +254,8 @@ func (f *Forge) GetIssues(ctx context.Context, rawProjectID string, issueIDs ... return issues, nil } -// GetAllProjects implements port.Forge. -func (f *Forge) GetAllProjects(ctx context.Context) ([]*model.Project, error) { +// ListProjects implements port.Forge. +func (f *Forge) ListProjects(ctx context.Context) ([]*model.Project, error) { projects := make([]*model.Project, 0) page := 1 diff --git a/internal/adapter/github/forge.go b/internal/adapter/github/forge.go index fbc48c2..c220d6d 100644 --- a/internal/adapter/github/forge.go +++ b/internal/adapter/github/forge.go @@ -18,6 +18,168 @@ type Forge struct { client *github.Client } +// UpdatePullRequest implements port.Forge. +func (f *Forge) UpdatePullRequest(ctx context.Context, rawProjectID string, rawPullRequestID string, title string, body string) (string, error) { + repo, err := f.getRepository(ctx, rawProjectID) + if err != nil { + return "", errors.WithStack(err) + } + + pullRequestID, err := strconv.ParseInt(rawPullRequestID, 10, 64) + if err != nil { + return "", errors.Wrapf(err, "could not parse pull request id '%v'", rawPullRequestID) + } + + pr, res, err := f.client.PullRequests.Edit(ctx, *repo.Owner.Login, *repo.Name, int(pullRequestID), &github.PullRequest{ + Title: &title, + Body: &body, + }) + if err != nil { + if res != nil && (res.StatusCode == http.StatusForbidden || res.StatusCode == http.StatusUnauthorized) { + slog.ErrorContext(ctx, "could not edit pull request", slog.Any("error", errors.WithStack(err))) + return "", errors.WithStack(service.ErrForgeNotAvailable) + } + + return "", errors.WithStack(err) + } + + return *pr.HTMLURL, nil +} + +// GetPullRequestTemplate implements port.Forge. +func (f *Forge) GetPullRequestTemplate(ctx context.Context, projectID string) (string, error) { + data, err := f.GetFile(ctx, projectID, ".github/PULL_REQUEST_TEMPLATE/pull_request_template.md") + if err != nil { + return "", errors.WithStack(err) + } + + return string(data), nil +} + +// GetPullRequestDiff implements port.Forge. +func (f *Forge) GetPullRequests(ctx context.Context, projectID string, pullRequestIDs ...string) ([]*model.PullRequest, error) { + repo, err := f.getRepository(ctx, projectID) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests := make([]*model.PullRequest, 0) + for _, rawID := range pullRequestIDs { + id, err := strconv.ParseInt(rawID, 10, 64) + if err != nil { + return nil, errors.Wrapf(err, "could not parse pull request id '%v'", rawID) + } + + pr, res, err := f.client.PullRequests.Get(ctx, *repo.Owner.Login, *repo.Name, int(id)) + if err != nil { + if res != nil && (res.StatusCode == http.StatusForbidden || res.StatusCode == http.StatusUnauthorized) { + slog.ErrorContext(ctx, "could not retrieve repository pull requests", slog.Any("error", errors.WithStack(err))) + return nil, errors.WithStack(service.ErrForgeNotAvailable) + } + + return nil, errors.WithStack(err) + } + + var body string + if pr.Body != nil { + body = *pr.Body + } + + var title string + if pr.Title != nil { + title = *pr.Title + } + + pullRequests = append(pullRequests, &model.PullRequest{ + ID: strconv.FormatInt(*pr.ID, 10), + Title: title, + Body: body, + }) + } + + return pullRequests, nil +} + +// GetPullRequestDiff implements port.Forge. +func (f *Forge) GetPullRequestDiff(ctx context.Context, projectID string, rawPullRequestID string) (string, error) { + repo, err := f.getRepository(ctx, projectID) + if err != nil { + return "", errors.WithStack(err) + } + + pullRequestID, err := strconv.ParseInt(rawPullRequestID, 10, 64) + if err != nil { + return "", errors.Wrapf(err, "could not parse pull request id '%v'", pullRequestID) + } + + diff, res, err := f.client.PullRequests.GetRaw(ctx, *repo.Owner.Login, *repo.Name, int(pullRequestID), github.RawOptions{ + Type: github.Diff, + }) + if err != nil { + if res != nil && (res.StatusCode == http.StatusForbidden || res.StatusCode == http.StatusUnauthorized) { + slog.ErrorContext(ctx, "could not retrieve pull request diff", slog.Any("error", errors.WithStack(err))) + return "", errors.WithStack(service.ErrForgeNotAvailable) + } + + return "", errors.WithStack(err) + } + + return diff, nil +} + +// ListOpenedPullRequests implements port.Forge. +func (f *Forge) ListOpenedPullRequests(ctx context.Context, projectID string) ([]*model.PullRequest, error) { + repo, err := f.getRepository(ctx, projectID) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests := make([]*model.PullRequest, 0) + + page := 1 + for { + repoPullRequests, res, err := f.client.PullRequests.List(ctx, *repo.Owner.Login, *repo.Name, &github.PullRequestListOptions{ + State: "opened", + ListOptions: github.ListOptions{ + Page: page, + PerPage: 100, + }, + }) + if err != nil { + if res != nil && (res.StatusCode == http.StatusForbidden || res.StatusCode == http.StatusUnauthorized) { + slog.ErrorContext(ctx, "could not retrieve repository pull requests", slog.Any("error", errors.WithStack(err))) + return nil, errors.WithStack(service.ErrForgeNotAvailable) + } + + return nil, errors.WithStack(err) + } + + for _, pr := range repoPullRequests { + var body string + if pr.Body != nil { + body = *pr.Body + } + + var title string + if pr.Title != nil { + title = *pr.Title + } + + pullRequests = append(pullRequests, &model.PullRequest{ + ID: strconv.FormatInt(*pr.ID, 10), + Title: title, + Body: body, + }) + } + + if res.NextPage == 0 { + return pullRequests, nil + } + + page = res.NextPage + } +} + // CreateIssue implements port.Forge. func (f *Forge) CreateIssue(ctx context.Context, projectID string, title string, body string) (string, error) { repo, err := f.getRepository(ctx, projectID) @@ -41,8 +203,8 @@ func (f *Forge) CreateIssue(ctx context.Context, projectID string, title string, return *issue.HTMLURL, nil } -// GetAllProjects implements port.Forge. -func (f *Forge) GetAllProjects(ctx context.Context) ([]*model.Project, error) { +// ListProjects implements port.Forge. +func (f *Forge) ListProjects(ctx context.Context) ([]*model.Project, error) { projects := make([]*model.Project, 0) page := 1 diff --git a/internal/core/model/pull_request.go b/internal/core/model/pull_request.go new file mode 100644 index 0000000..0d7eabb --- /dev/null +++ b/internal/core/model/pull_request.go @@ -0,0 +1,7 @@ +package model + +type PullRequest struct { + ID string + Title string + Body string +} diff --git a/internal/core/port/forge.go b/internal/core/port/forge.go index c742252..a1c8d2d 100644 --- a/internal/core/port/forge.go +++ b/internal/core/port/forge.go @@ -8,11 +8,17 @@ import ( ) var ( - ErrFileNotFound = errors.New("file not found") + ErrFileNotFound = errors.New("file not found") + ErrPullRequestNotFound = errors.New("pull request not found") ) type Forge interface { - GetAllProjects(ctx context.Context) ([]*model.Project, error) + ListProjects(ctx context.Context) ([]*model.Project, error) + ListOpenedPullRequests(ctx context.Context, projectID string) ([]*model.PullRequest, error) + GetPullRequestDiff(ctx context.Context, projectID string, pullRequestID string) (string, error) + GetPullRequestTemplate(ctx context.Context, projectID string) (string, error) + GetPullRequests(ctx context.Context, projectID string, pullRequestIDs ...string) ([]*model.PullRequest, error) + UpdatePullRequest(ctx context.Context, projectID string, pullRequestID string, title string, body string) (string, error) CreateIssue(ctx context.Context, projectID string, title string, body string) (string, error) GetIssues(ctx context.Context, projectID string, issueIDs ...string) ([]*model.Issue, error) GetIssueTemplate(ctx context.Context, projectID string) (string, error) diff --git a/internal/core/service/issue_manager.go b/internal/core/service/forge_manager.go similarity index 55% rename from internal/core/service/issue_manager.go rename to internal/core/service/forge_manager.go index a9380e3..f65b878 100644 --- a/internal/core/service/issue_manager.go +++ b/internal/core/service/forge_manager.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log/slog" + "net/url" "path/filepath" "regexp" "slices" @@ -23,28 +24,51 @@ var ( ErrForgeNotAvailable = errors.New("forge not available") ) -//go:embed issue_system_prompt.gotmpl +//go:embed prompts/issue_system_prompt.gotmpl var issueSystemPromptRawTemplate string -//go:embed issue_user_prompt.gotmpl +//go:embed prompts/issue_user_prompt.gotmpl var issueUserPromptRawTemplate string -//go:embed issue_default_template.txt +//go:embed prompts/issue_default_template.txt var issueDefaultTemplate string +//go:embed prompts/pull_request_system_prompt.gotmpl +var pullRequestSystemPromptRawTemplate string + +//go:embed prompts/pull_request_user_prompt.gotmpl +var pullRequestUserPromptRawTemplate string + +//go:embed prompts/pull_request_default_template.txt +var pullRequestDefaultTemplate string + type ForgeFactory interface { Match(user *model.User) bool Create(ctx context.Context, user *model.User) (port.Forge, error) } -type IssueManager struct { +type ForgeManager struct { forgeFactories []ForgeFactory llmClient llm.Client projectCache *cache.Cache[[]*model.Project] forgeCache *cache.Cache[port.Forge] } -func (m *IssueManager) CreateIssue(ctx context.Context, user *model.User, projectID string, title string, body string) (string, error) { +func (m *ForgeManager) UpdatePullRequest(ctx context.Context, user *model.User, projectID string, pullRequestID string, title string, body string) (string, error) { + forge, err := m.getUserForge(ctx, user) + if err != nil { + return "", errors.WithStack(err) + } + + pullRequestURL, err := forge.UpdatePullRequest(ctx, projectID, pullRequestID, title, body) + if err != nil { + return "", errors.WithStack(err) + } + + return pullRequestURL, nil +} + +func (m *ForgeManager) CreateIssue(ctx context.Context, user *model.User, projectID string, title string, body string) (string, error) { forge, err := m.getUserForge(ctx, user) if err != nil { return "", errors.WithStack(err) @@ -58,7 +82,21 @@ func (m *IssueManager) CreateIssue(ctx context.Context, user *model.User, projec return issueURL, nil } -func (m *IssueManager) GetUserProjects(ctx context.Context, user *model.User) ([]*model.Project, error) { +func (m *ForgeManager) GetUserProjectOpenedPullRequests(ctx context.Context, user *model.User, projectID string) ([]*model.PullRequest, error) { + forge, err := m.getUserForge(ctx, user) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests, err := forge.ListOpenedPullRequests(ctx, projectID) + if err != nil { + return nil, errors.WithStack(err) + } + + return pullRequests, nil +} + +func (m *ForgeManager) GetUserProjects(ctx context.Context, user *model.User) ([]*model.Project, error) { cacheKey := fmt.Sprintf("%s/%s", user.Provider, user.ID) projects, exists := m.projectCache.Get(cacheKey) @@ -68,7 +106,7 @@ func (m *IssueManager) GetUserProjects(ctx context.Context, user *model.User) ([ return nil, errors.WithStack(err) } - refreshedProjects, err := forge.GetAllProjects(ctx) + refreshedProjects, err := forge.ListProjects(ctx) if err != nil { return nil, errors.WithStack(err) } @@ -85,12 +123,157 @@ func (m *IssueManager) GetUserProjects(ctx context.Context, user *model.User) ([ return projects, nil } +func (m *ForgeManager) GetUserProjectPullRequest(ctx context.Context, user *model.User, projectID string, pullRequestID string) (*model.PullRequest, error) { + forge, err := m.getUserForge(ctx, user) + if err != nil { + return nil, errors.WithStack(err) + } + + pullRequests, err := forge.GetPullRequests(ctx, projectID, pullRequestID) + if err != nil { + return nil, errors.WithStack(err) + } + + if len(pullRequests) == 0 { + return nil, errors.WithStack(port.ErrPullRequestNotFound) + } + + return pullRequests[0], nil +} + type GeneratIssueOptions struct { IssueSummary string IssueTemplate string } -func (m *IssueManager) GenerateIssue(ctx context.Context, user *model.User, projectID string, issueSummary string, overwrittenIssueTemplate string) (string, string, string, error) { +func (m *ForgeManager) GeneratePullRequest(ctx context.Context, user *model.User, projectID string, pullRequestID string, summary string, overwrittenTemplate string) (string, string, string, error) { + systemPrompt, err := m.getPullRequestSystemPrompt(ctx, user, projectID, pullRequestID, overwrittenTemplate) + if err != nil { + return "", "", "", errors.WithStack(err) + } + + slog.DebugContext(ctx, "using system prompt", slog.String("systemPrompt", systemPrompt)) + + userPrompt, err := m.getPullRequestUserPrompt(ctx, user, projectID, pullRequestID, summary) + if err != nil { + return "", "", "", errors.WithStack(err) + } + + slog.DebugContext(ctx, "using user prompt", slog.String("userPrompt", userPrompt)) + + messages := []llm.Message{ + llm.NewMessage(llm.RoleSystem, systemPrompt), + llm.NewMessage(llm.RoleUser, userPrompt), + } + + res, err := m.llmClient.ChatCompletion(ctx, llm.WithMessages(messages...)) + if err != nil { + return "", "", "", errors.WithStack(err) + } + + body := res.Message().Content() + + messages = append(messages, res.Message()) + messages = append(messages, llm.NewMessage(llm.RoleUser, "Generate a title for this issue. Keep it descriptive, simple and short. Do not write anything else.")) + + res, err = m.llmClient.ChatCompletion(ctx, llm.WithMessages(messages...)) + if err != nil { + return "", "", "", errors.WithStack(err) + } + + title := toTitle(res.Message().Content()) + + messages = append(messages, res.Message()) + messages = append(messages, llm.NewMessage(llm.RoleUser, "Give me a list of questions as Markdown that could help clarify the request. Only write the list without additional headings.")) + + res, err = m.llmClient.ChatCompletion(ctx, llm.WithMessages(messages...)) + if err != nil { + return "", "", "", errors.WithStack(err) + } + + tips := res.Message().Content() + + return title, body, tips, nil +} + +func (m *ForgeManager) getPullRequestSystemPrompt(ctx context.Context, user *model.User, projectID string, pullRequestID string, prTemplate string) (string, error) { + if prTemplate == "" { + forge, err := m.getUserForge(ctx, user) + if err != nil { + return "", errors.WithStack(err) + } + + repoPullRequestTemplate, err := forge.GetPullRequestTemplate(ctx, projectID) + if err != nil && !errors.Is(err, port.ErrFileNotFound) { + return "", errors.WithStack(err) + } + + prTemplate = repoPullRequestTemplate + } + + if prTemplate == "" { + prTemplate = pullRequestDefaultTemplate + } + + systemPrompt, err := llm.PromptTemplate(pullRequestSystemPromptRawTemplate, struct { + PullRequestTemplate string + }{ + PullRequestTemplate: prTemplate, + }) + if err != nil { + return "", errors.WithStack(err) + } + + return systemPrompt, nil +} + +func (m *ForgeManager) getPullRequestUserPrompt(ctx context.Context, user *model.User, projectID string, pullRequestID string, summary string) (string, error) { + forge, err := m.getUserForge(ctx, user) + if err != nil { + return "", errors.WithStack(err) + } + + project, err := forge.GetProject(ctx, projectID) + if err != nil { + return "", errors.WithStack(err) + } + + projectLanguages, err := forge.GetProjectLanguages(ctx, projectID) + if err != nil { + return "", errors.WithStack(err) + } + + diff, err := forge.GetPullRequestDiff(ctx, projectID, pullRequestID) + if err != nil { + return "", errors.WithStack(err) + } + + resources, err := m.extractResources(ctx, forge, projectID, summary) + if err != nil { + return "", errors.WithStack(err) + } + + userPrompt, err := llm.PromptTemplate(pullRequestUserPromptRawTemplate, struct { + Summary string + Project *model.Project + ProjectLanguages []string + Resources []*model.Resource + Diff string + }{ + Summary: summary, + Project: project, + ProjectLanguages: projectLanguages, + Resources: resources, + Diff: diff, + }) + if err != nil { + return "", errors.WithStack(err) + } + + return userPrompt, nil +} + +func (m *ForgeManager) GenerateIssue(ctx context.Context, user *model.User, projectID string, issueSummary string, overwrittenIssueTemplate string) (string, string, string, error) { systemPrompt, err := m.getIssueSystemPrompt(ctx, user, projectID, overwrittenIssueTemplate) if err != nil { return "", "", "", errors.WithStack(err) @@ -140,7 +323,7 @@ func (m *IssueManager) GenerateIssue(ctx context.Context, user *model.User, proj return title, body, tips, nil } -func (m *IssueManager) getIssueSystemPrompt(ctx context.Context, user *model.User, projectID string, issueTemplate string) (string, error) { +func (m *ForgeManager) getIssueSystemPrompt(ctx context.Context, user *model.User, projectID string, issueTemplate string) (string, error) { if issueTemplate == "" { forge, err := m.getUserForge(ctx, user) if err != nil { @@ -171,7 +354,7 @@ func (m *IssueManager) getIssueSystemPrompt(ctx context.Context, user *model.Use return systemPrompt, nil } -func (m *IssueManager) getIssueUserPrompt(ctx context.Context, user *model.User, projectID string, issueSummary string) (string, error) { +func (m *ForgeManager) getIssueUserPrompt(ctx context.Context, user *model.User, projectID string, issueSummary string) (string, error) { forge, err := m.getUserForge(ctx, user) if err != nil { return "", errors.WithStack(err) @@ -210,7 +393,7 @@ func (m *IssueManager) getIssueUserPrompt(ctx context.Context, user *model.User, return userPrompt, nil } -func (m *IssueManager) getUserForge(ctx context.Context, user *model.User) (port.Forge, error) { +func (m *ForgeManager) getUserForge(ctx context.Context, user *model.User) (port.Forge, error) { forge, exists := m.forgeCache.Get(user.AccessToken) if exists { return forge, nil @@ -235,7 +418,7 @@ func (m *IssueManager) getUserForge(ctx context.Context, user *model.User) (port return nil, errors.New("no forge matching user found") } -func (m *IssueManager) extractResources(ctx context.Context, forge port.Forge, projectID string, issueSummary string) ([]*model.Resource, error) { +func (m *ForgeManager) extractResources(ctx context.Context, forge port.Forge, projectID string, issueSummary string) ([]*model.Resource, error) { resources := make([]*model.Resource, 0) issues, err := m.extractIssues(ctx, forge, projectID, issueSummary) @@ -257,7 +440,7 @@ func (m *IssueManager) extractResources(ctx context.Context, forge port.Forge, p var issueRefRegExp = regexp.MustCompile(`#([0-9]+)`) -func (m *IssueManager) extractIssues(ctx context.Context, forge port.Forge, projectID string, issueSummary string) ([]*model.Resource, error) { +func (m *ForgeManager) extractIssues(ctx context.Context, forge port.Forge, projectID string, issueSummary string) ([]*model.Resource, error) { issueRefMatches := issueRefRegExp.FindAllStringSubmatch(issueSummary, -1) issueIDs := make([]string, 0, len(issueRefMatches)) @@ -290,7 +473,7 @@ func (m *IssueManager) extractIssues(ctx context.Context, forge port.Forge, proj var fileRefRegExp = regexp.MustCompile(`(?i)(?:\/[^\/]+)+\/?[^\s]+(?:\.[^\s]+)+|[^\s]+(?:\.[^\s]+)+`) -func (m *IssueManager) extractFiles(ctx context.Context, forge port.Forge, projectID string, issueSummary string) ([]*model.Resource, error) { +func (m *ForgeManager) extractFiles(ctx context.Context, forge port.Forge, projectID string, issueSummary string) ([]*model.Resource, error) { fileRefMatches := fileRefRegExp.FindAllStringSubmatch(issueSummary, -1) paths := make([]string, 0, len(fileRefMatches)) @@ -301,6 +484,10 @@ func (m *IssueManager) extractFiles(ctx context.Context, forge port.Forge, proje resources := make([]*model.Resource, 0) for _, p := range paths { + if isURL(p) { + continue + } + data, err := forge.GetFile(ctx, projectID, p) if err != nil { slog.ErrorContext(ctx, "could not retrieve file", slog.Any("error", errors.WithStack(err)), slog.String("path", p)) @@ -318,8 +505,8 @@ func (m *IssueManager) extractFiles(ctx context.Context, forge port.Forge, proje return resources, nil } -func NewIssueManager(llmClient llm.Client, forgeFactories ...ForgeFactory) *IssueManager { - return &IssueManager{ +func NewForgeManager(llmClient llm.Client, forgeFactories ...ForgeFactory) *ForgeManager { + return &ForgeManager{ llmClient: llmClient, forgeFactories: forgeFactories, projectCache: cache.New[[]*model.Project](time.Minute*5, (time.Minute*5)/2), @@ -331,3 +518,8 @@ func toTitle(str string) string { str = strings.ToLower(str) return strings.ToUpper(string(str[0])) + str[1:] } + +func isURL(str string) bool { + _, err := url.ParseRequestURI(str) + return err == nil +} diff --git a/internal/core/service/issue_default_template.txt b/internal/core/service/prompts/issue_default_template.txt similarity index 100% rename from internal/core/service/issue_default_template.txt rename to internal/core/service/prompts/issue_default_template.txt diff --git a/internal/core/service/issue_system_prompt.gotmpl b/internal/core/service/prompts/issue_system_prompt.gotmpl similarity index 100% rename from internal/core/service/issue_system_prompt.gotmpl rename to internal/core/service/prompts/issue_system_prompt.gotmpl diff --git a/internal/core/service/issue_user_prompt.gotmpl b/internal/core/service/prompts/issue_user_prompt.gotmpl similarity index 100% rename from internal/core/service/issue_user_prompt.gotmpl rename to internal/core/service/prompts/issue_user_prompt.gotmpl diff --git a/internal/core/service/prompts/pull_request_default_template.txt b/internal/core/service/prompts/pull_request_default_template.txt new file mode 100644 index 0000000..784fc3b --- /dev/null +++ b/internal/core/service/prompts/pull_request_default_template.txt @@ -0,0 +1,7 @@ +## Description + +Description générale des objectifs liés à cette pull request. + +## Changements + +Liste des changements apportés. \ No newline at end of file diff --git a/internal/core/service/prompts/pull_request_system_prompt.gotmpl b/internal/core/service/prompts/pull_request_system_prompt.gotmpl new file mode 100644 index 0000000..cb133c3 --- /dev/null +++ b/internal/core/service/prompts/pull_request_system_prompt.gotmpl @@ -0,0 +1,29 @@ +You are an expert software developer with extensive experience in writing clear and comprehensive pull requests for software forges. Your task is to create well-structured pull request based on the provided contextual information, following a predefined Markdown layout. + +**Instructions:** + +1. **Pull Request Description**: + - Provide a detailed description of the pull request, including: + - Background information. + - Steps to reproduce the issue. + - Expected behavior. + - Actual behavior. + - Any relevant error messages or logs. + - Always use the user prompt summary main language. + +2. **Additional Context**: + - Include any other relevant information that might help in understanding or resolving the pull request. + +3. Keep resources references when available. + +4. Do not include the raw diff in your response. + +5. Do not include general informations about the project. Keep the description focused on the current changes. + +6. Let think step by step. + +**Markdown Layout:** + +```markdown +{{ .PullRequestTemplate }} +``` \ No newline at end of file diff --git a/internal/core/service/prompts/pull_request_user_prompt.gotmpl b/internal/core/service/prompts/pull_request_user_prompt.gotmpl new file mode 100644 index 0000000..c36d885 --- /dev/null +++ b/internal/core/service/prompts/pull_request_user_prompt.gotmpl @@ -0,0 +1,38 @@ +Write a formatted pull request based on the following informations: + +## Pull Request Summary + +{{ .Summary }} + +## General Project Informations + +- Name: {{ .Project.Name }} +- Description: {{ .Project.Description }} +- Languages: +{{- range .ProjectLanguages }} + - {{ . -}} +{{ end }} + +## Changelog + +``` +{{ .Diff }} +``` + +{{ if gt (len .Resources) 0 }} +## Additional Resources + +{{ range .Resources }} +### {{ .Name }} + +**Type:** + +{{ .Type }} + +**Content:** + +```{{ .Syntax }} +{{ .Content }} +``` +{{end}} +{{end}} \ No newline at end of file diff --git a/internal/http/form/form.go b/internal/http/form/form.go index 78fbabb..5e431f3 100644 --- a/internal/http/form/form.go +++ b/internal/http/form/form.go @@ -101,7 +101,7 @@ func (f *Form) Field(name string) *Field { } } - return nil + panic(errors.Errorf("no form field named '%s'", name)) } func (f *Form) Error(name string) (ValidationError, bool) { diff --git a/internal/http/handler/webui/common/component/app_page.templ b/internal/http/handler/webui/common/component/app_page.templ new file mode 100644 index 0000000..e0f8900 --- /dev/null +++ b/internal/http/handler/webui/common/component/app_page.templ @@ -0,0 +1,51 @@ +package component + +type AppPageOptions struct { + PageOptions []PageOptionFunc +} + +type AppPageOptionFunc func(opts *AppPageOptions) + +func WithPageOptions(funcs ...PageOptionFunc) AppPageOptionFunc { + return func(opts *AppPageOptions) { + opts.PageOptions = funcs + } +} + +func NewAppPageOptions(funcs ...AppPageOptionFunc) *AppPageOptions { + opts := &AppPageOptions{ + PageOptions: make([]PageOptionFunc, 0), + } + for _, fn := range funcs { + fn(opts) + } + return opts +} + +templ AppPage(funcs ...AppPageOptionFunc) { + {{ opts := NewAppPageOptions(funcs...) }} + @Page(opts.PageOptions...) { +
+
+
+
+

ClearCase

+
+
+
+ +
+
+
+
+ +
+ { children... } +
+
+ } +} diff --git a/internal/http/handler/webui/common/component/app_page_templ.go b/internal/http/handler/webui/common/component/app_page_templ.go new file mode 100644 index 0000000..edaf516 --- /dev/null +++ b/internal/http/handler/webui/common/component/app_page_templ.go @@ -0,0 +1,160 @@ +// Code generated by templ - DO NOT EDIT. + +// templ: version: v0.3.819 +package component + +//lint:file-ignore SA4006 This context is only used if a nested component is present. + +import "github.com/a-h/templ" +import templruntime "github.com/a-h/templ/runtime" + +type AppPageOptions struct { + PageOptions []PageOptionFunc +} + +type AppPageOptionFunc func(opts *AppPageOptions) + +func WithPageOptions(funcs ...PageOptionFunc) AppPageOptionFunc { + return func(opts *AppPageOptions) { + opts.PageOptions = funcs + } +} + +func NewAppPageOptions(funcs ...AppPageOptionFunc) *AppPageOptions { + opts := &AppPageOptions{ + PageOptions: make([]PageOptionFunc, 0), + } + for _, fn := range funcs { + fn(opts) + } + return opts +} + +func AppPage(funcs ...AppPageOptionFunc) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + opts := NewAppPageOptions(funcs...) + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "

ClearCase

    ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 = []any{templ.KV("is-active", MatchPath(ctx, "/issue/"))} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var4...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "
  • Nouvelle demande
    • ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var7 = []any{templ.KV("is-active", MatchPath(ctx, "/pullrequest/"))} + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var7...) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "
  • Éditer une PR
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = Page(opts.PageOptions...).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +var _ = templruntime.GeneratedTemplate diff --git a/internal/http/handler/webui/issue/component/issue_page.templ b/internal/http/handler/webui/issue/component/issue_page.templ index 54c2df1..511c8a8 100644 --- a/internal/http/handler/webui/issue/component/issue_page.templ +++ b/internal/http/handler/webui/issue/component/issue_page.templ @@ -40,7 +40,7 @@ func NewIssueSummaryForm() *form.Form { form.NewField( "project", form.Attrs{}, - form.NonEmpty("Ce champs ne doit pas être vide."), + form.NonEmpty("Ce champ ne doit pas être vide."), ), form.NewField( "summary", @@ -85,31 +85,21 @@ func NewIssueForm() *form.Form { } templ IssuePage(vmodel IssuePageVModel) { - @common.Page(common.WithTitle("Nouvelle demande")) { -
-
-
-
-

ClearCase

-
-
-
- -
-
+ @common.AppPage(common.WithPageOptions( + common.WithTitle("Nouvelle demande"), + )) { + if vmodel.IssueURL != "" { +
+
+

Demande créée !

+
- if vmodel.IssueURL != "" { -
-
-

Demande créée !

- -
-
- Votre demande a été créée et est disponible à l'adresse suivante: - { vmodel.IssueURL }. -
-
- - @templ.JSFuncCall("clearSummary", vmodel.SelectedProjectID) - @templ.JSFuncCall("openIssue", vmodel.IssueURL) - } -
-
-
-

Résumé de la demande

- @common.FormSelect( - vmodel.SummaryForm, "issue-project", "project", "Projet", - common.WithOptions(projectsToOptions(vmodel.Projects)...), - common.WithAttrs( - "hx-get", string(common.CurrentURL(ctx, common.WithoutValues("project", "*"))), - "hx-target", "body", - "hx-push-url", "true", - ), - ) - @common.FormTextarea( - vmodel.SummaryForm, "issue-summary", "summary", "Résumé", - common.WithTextareaAttrs( - "hx-on:change", "onSummaryChange(event)", - ), - ) -
- Paramètres avancés - @common.FormTextarea( - vmodel.SummaryForm, "issue-template", "template", "Surcharger le modèle de demande", - common.WithTextareaAttrs( - "hx-on:change", "onIssueTemplateChange(event)", - ), - ) -
-
- -
-
+ @templ.JSFuncCall("clearSummary", vmodel.SelectedProjectID) + @templ.JSFuncCall("openIssue", vmodel.IssueURL) + } +
+
+
+

Résumé de la demande

+ @common.FormSelect( + vmodel.SummaryForm, "issue-project", "project", "Projet", + common.WithOptions(projectsToOptions(vmodel.Projects)...), + common.WithAttrs( + "hx-get", string(common.CurrentURL(ctx, common.WithoutValues("project", "*"))), + "hx-target", "body", + "hx-push-url", "true", + ), + ) + @common.FormTextarea( + vmodel.SummaryForm, "issue-summary", "summary", "Résumé", + common.WithTextareaAttrs( + "hx-on:change", "onSummaryChange(event)", + ), + ) +
+ Paramètres avancés + @common.FormTextarea( + vmodel.SummaryForm, "issue-template", "template", "Surcharger le modèle de demande", + common.WithTextareaAttrs( + "hx-on:change", "onIssueTemplateChange(event)", + ), + ) +
+
+
-
-

Votre demande

- - @common.FormField(vmodel.IssueForm, "issue-title", "title", "Titre") - @common.FormTextarea(vmodel.IssueForm, "issue-body", "body", "Corps") -
- -
- + +
+
+

Votre demande

+
+ @common.FormField(vmodel.IssueForm, "issue-title", "title", "Titre") + @common.FormTextarea(vmodel.IssueForm, "issue-body", "body", "Corps") +
+
-
- - if vmodel.IssueTips != "" { - {{ html := markdownToHTML(ctx, vmodel.IssueTips) }} - if html != "" { -
-
-

Questionnements

- -
-
-
-

Utilisez ces quelques questions pour réfléchir aux éléments d'informations nécessaire à la bonne rédaction de votre demande:

- @templ.Raw(html) -
-
-
- } - } -
+ +
+ + if vmodel.IssueTips != "" { + {{ html := markdownToHTML(ctx, vmodel.IssueTips) }} + if html != "" { +
+
+

Questionnements

+ +
+
+
+

Utilisez ces quelques questions pour réfléchir aux éléments d'informations nécessaire à la bonne rédaction de votre demande:

+ @templ.Raw(html) +
+
+
+ } + } ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, ". ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -169,7 +156,7 @@ func IssuePage(vmodel IssuePageVModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, " ") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -178,16 +165,16 @@ func IssuePage(vmodel IssuePageVModel) templ.Component { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "

Résumé de la demande

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\" method=\"put\" hx-disabled-elt=\"textarea, input, select, button\" hx-on:htmx:before-send=\"savePreferredProject()\" hx-indicator=\"#generation-progress\">

Résumé de la demande

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -212,7 +199,7 @@ func IssuePage(vmodel IssuePageVModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "
Paramètres avancés") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "
Paramètres avancés") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -225,16 +212,16 @@ func IssuePage(vmodel IssuePageVModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "

Votre demande

Votre demande

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\" method=\"post\" hx-disabled-elt=\"textarea, input, select, button\" hx-indicator=\"#generation-progress\">") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -246,14 +233,14 @@ func IssuePage(vmodel IssuePageVModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if vmodel.IssueTips != "" { html := markdownToHTML(ctx, vmodel.IssueTips) if html != "" { - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "

Questionnements

Utilisez ces quelques questions pour réfléchir aux éléments d'informations nécessaire à la bonne rédaction de votre demande:

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Questionnements

Utilisez ces quelques questions pour réfléchir aux éléments d'informations nécessaire à la bonne rédaction de votre demande:

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -261,19 +248,21 @@ func IssuePage(vmodel IssuePageVModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "
") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, " ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } return nil }) - templ_7745c5c3_Err = common.Page(common.WithTitle("Nouvelle demande")).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + templ_7745c5c3_Err = common.AppPage(common.WithPageOptions( + common.WithTitle("Nouvelle demande"), + )).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/internal/http/handler/webui/issue/handler.go b/internal/http/handler/webui/issue/handler.go index 26391bd..74282d8 100644 --- a/internal/http/handler/webui/issue/handler.go +++ b/internal/http/handler/webui/issue/handler.go @@ -7,8 +7,8 @@ import ( ) type Handler struct { - mux *http.ServeMux - issueManager *service.IssueManager + mux *http.ServeMux + forge *service.ForgeManager } // ServeHTTP implements http.Handler. @@ -16,10 +16,10 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { h.mux.ServeHTTP(w, r) } -func NewHandler(issueManager *service.IssueManager) *Handler { +func NewHandler(forge *service.ForgeManager) *Handler { h := &Handler{ - mux: http.NewServeMux(), - issueManager: issueManager, + mux: http.NewServeMux(), + forge: forge, } h.mux.HandleFunc("GET /", h.getIssuePage) diff --git a/internal/http/handler/webui/issue/issue_page.go b/internal/http/handler/webui/issue/issue_page.go index f60792c..bbca4a2 100644 --- a/internal/http/handler/webui/issue/issue_page.go +++ b/internal/http/handler/webui/issue/issue_page.go @@ -47,7 +47,7 @@ func (h *Handler) fillIssuePageVModel(r *http.Request) (*component.IssuePageVMod func (h *Handler) fillIssuePageProjects(ctx context.Context, vmodel *component.IssuePageVModel, r *http.Request) error { user := httpCtx.User(ctx) - projects, err := h.issueManager.GetUserProjects(ctx, user) + projects, err := h.forge.GetUserProjects(ctx, user) if err != nil { return errors.WithStack(err) } @@ -114,7 +114,7 @@ func (h *Handler) handleIssueSummaryForm(w http.ResponseWriter, r *http.Request) issueTemplate = strings.TrimSpace(issueTemplate) - issueTitle, issueBody, issueTips, err := h.issueManager.GenerateIssue(ctx, httpCtx.User(ctx), projectID, issueSummary, issueTemplate) + issueTitle, issueBody, issueTips, err := h.forge.GenerateIssue(ctx, httpCtx.User(ctx), projectID, issueSummary, issueTemplate) if err != nil { h.handleError(w, r, errors.WithStack(err)) return @@ -168,7 +168,7 @@ func (h *Handler) handleIssueForm(w http.ResponseWriter, r *http.Request) { ctx := r.Context() user := httpCtx.User(ctx) - issueURL, err := h.issueManager.CreateIssue(ctx, user, projectID, title, body) + issueURL, err := h.forge.CreateIssue(ctx, user, projectID, title, body) if err != nil { h.handleError(w, r, errors.WithStack(err)) return diff --git a/internal/http/handler/webui/pullrequest/component/pullrequest_page.templ b/internal/http/handler/webui/pullrequest/component/pullrequest_page.templ new file mode 100644 index 0000000..c2f14ee --- /dev/null +++ b/internal/http/handler/webui/pullrequest/component/pullrequest_page.templ @@ -0,0 +1,313 @@ +package component + +import ( + "bytes" + "context" + "forge.cadoles.com/wpetit/clearcase/internal/core/model" + "forge.cadoles.com/wpetit/clearcase/internal/http/form" + common "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui/common/component" + "github.com/pkg/errors" + "github.com/yuin/goldmark" + "log/slog" + "strings" +) + +type PullRequestPageVModel struct { + PullRequestURL string + SummaryForm *form.Form + PullRequestForm *form.Form + PullRequestTips string + Projects []*model.Project + PullRequests []*model.PullRequest + SelectedProjectID string + SelectedPullRequestID string +} + +const summaryPlaceholder = ` +Décrivez rapidement les modifications apportées par la PR, ClearCase utilisera le modèle de PR présent dans le dépôt (ou un modèle par défaut) afin de générer une version mise en forme et complétée. + +Afin de fournir plus d'information de contexte au LLM, vous pouvez faire référence à d'autres tickets du dépôt via un ou plusieurs '#' et/ou des chemins vers des fichiers présents dans celui ci. +` + +const bodyPlaceholder = ` +Une fois votre PR générée, vous pourrez l'éditer puis la créer directement en cliquant sur le bouton 'Mettre à jour' ci-dessous. +` + +const prTemplatePlaceholder = ` +Vous pouvez surcharger le modèle de PR fourni par le projet en remplissant ce champ. +` + +func NewPullRequestSummaryForm() *form.Form { + return form.New( + form.NewField( + "project", + form.Attrs{}, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "pullrequest", + form.Attrs{}, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "summary", + form.Attrs{ + "type": "textarea", + "rows": "20", + "placeholder": strings.TrimSpace(summaryPlaceholder), + }, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "template", + form.Attrs{ + "type": "textarea", + "rows": "20", + "placeholder": strings.TrimSpace(prTemplatePlaceholder), + }, + ), + ) +} + +func NewPullRequestForm() *form.Form { + return form.New( + form.NewField( + "title", + form.Attrs{ + "type": "text", + "placeholder": "Écrivez le résumé de votre demande et cliquez sur 'Générer' pour remplir automatiquement ces champs.", + }, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "body", + form.Attrs{ + "type": "textarea", + "rows": "20", + "placeholder": strings.TrimSpace(bodyPlaceholder), + }, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + ) +} + +templ PullRequestPage(vmodel PullRequestPageVModel) { + @common.AppPage(common.WithPageOptions( + common.WithTitle("Éditer une PR"), + )) { + if vmodel.PullRequestURL != "" { +
+
+

Pull Request modifiée !

+ +
+
+ Votre PR a été mise à jour et est disponible à l'adresse suivante: + { vmodel.PullRequestURL }. +
+
+ + @templ.JSFuncCall("clearSummary", vmodel.SelectedProjectID) + @templ.JSFuncCall("openPR", vmodel.PullRequestURL) + } +
+
+
+

Résumé de la PR

+ @common.FormSelect( + vmodel.SummaryForm, "pr-project", "project", "Projet", + common.WithOptions(projectsToOptions(vmodel.Projects)...), + common.WithAttrs( + "hx-get", string(common.CurrentURL(ctx, common.WithoutValues("project", "*"))), + "hx-target", "body", + "hx-push-url", "true", + ), + ) + @common.FormSelect( + vmodel.SummaryForm, "pr-pullrequest", "pullrequest", "PR", + common.WithOptions(pullRequestsToOptions(vmodel.PullRequests)...), + common.WithAttrs( + "hx-get", string(common.CurrentURL(ctx, common.WithoutValues("pullrequest", "*"))), + "hx-target", "body", + "hx-push-url", "true", + ), + ) + @common.FormTextarea( + vmodel.SummaryForm, "pr-summary", "summary", "Résumé", + common.WithTextareaAttrs( + "hx-on:change", "onSummaryChange(event)", + ), + ) +
+ Paramètres avancés + @common.FormTextarea( + vmodel.SummaryForm, "pr-template", "template", "Surcharger le modèle de demande", + common.WithTextareaAttrs( + "hx-on:change", "onPullRequestTemplateChange(event)", + ), + ) +
+
+ +
+
+
+
+

Votre PR

+
+ @common.FormField(vmodel.PullRequestForm, "pr-title", "title", "Titre") + @common.FormTextarea(vmodel.PullRequestForm, "pr-body", "body", "Corps") +
+ +
+
+
+
+ + if vmodel.PullRequestTips != "" { + {{ html := markdownToHTML(ctx, vmodel.PullRequestTips) }} + if html != "" { +
+
+

Questionnements

+ +
+
+
+

Utilisez ces quelques questions pour réfléchir aux éléments d'informations nécessaire à la bonne rédaction de votre PR:

+ @templ.Raw(html) +
+
+
+ } + } + + } +} + +func projectsToOptions(projects []*model.Project) []string { + options := make([]string, 0, len(projects)) + options = append(options, "", "") + for _, p := range projects { + options = append(options, p.Name, p.ID) + } + return options +} + +func pullRequestsToOptions(pullRequests []*model.PullRequest) []string { + options := make([]string, 0, len(pullRequests)) + options = append(options, "", "") + for _, pr := range pullRequests { + options = append(options, pr.Title, pr.ID) + } + return options +} + +func markdownToHTML(ctx context.Context, text string) string { + var buff bytes.Buffer + if err := goldmark.Convert([]byte(text), &buff); err != nil { + slog.ErrorContext(ctx, "could not convert markdown to html", slog.Any("error", errors.WithStack(err))) + return "" + } + + return buff.String() +} diff --git a/internal/http/handler/webui/pullrequest/component/pullrequest_page_templ.go b/internal/http/handler/webui/pullrequest/component/pullrequest_page_templ.go new file mode 100644 index 0000000..44fba3e --- /dev/null +++ b/internal/http/handler/webui/pullrequest/component/pullrequest_page_templ.go @@ -0,0 +1,320 @@ +// Code generated by templ - DO NOT EDIT. + +// templ: version: v0.3.819 +package component + +//lint:file-ignore SA4006 This context is only used if a nested component is present. + +import "github.com/a-h/templ" +import templruntime "github.com/a-h/templ/runtime" + +import ( + "bytes" + "context" + "forge.cadoles.com/wpetit/clearcase/internal/core/model" + "forge.cadoles.com/wpetit/clearcase/internal/http/form" + common "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui/common/component" + "github.com/pkg/errors" + "github.com/yuin/goldmark" + "log/slog" + "strings" +) + +type PullRequestPageVModel struct { + PullRequestURL string + SummaryForm *form.Form + PullRequestForm *form.Form + PullRequestTips string + Projects []*model.Project + PullRequests []*model.PullRequest + SelectedProjectID string + SelectedPullRequestID string +} + +const summaryPlaceholder = ` +Décrivez rapidement les modifications apportées par la PR, ClearCase utilisera le modèle de PR présent dans le dépôt (ou un modèle par défaut) afin de générer une version mise en forme et complétée. + +Afin de fournir plus d'information de contexte au LLM, vous pouvez faire référence à d'autres tickets du dépôt via un ou plusieurs '#' et/ou des chemins vers des fichiers présents dans celui ci. +` + +const bodyPlaceholder = ` +Une fois votre PR générée, vous pourrez l'éditer puis la créer directement en cliquant sur le bouton 'Mettre à jour' ci-dessous. +` + +const prTemplatePlaceholder = ` +Vous pouvez surcharger le modèle de PR fourni par le projet en remplissant ce champ. +` + +func NewPullRequestSummaryForm() *form.Form { + return form.New( + form.NewField( + "project", + form.Attrs{}, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "pullrequest", + form.Attrs{}, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "summary", + form.Attrs{ + "type": "textarea", + "rows": "20", + "placeholder": strings.TrimSpace(summaryPlaceholder), + }, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "template", + form.Attrs{ + "type": "textarea", + "rows": "20", + "placeholder": strings.TrimSpace(prTemplatePlaceholder), + }, + ), + ) +} + +func NewPullRequestForm() *form.Form { + return form.New( + form.NewField( + "title", + form.Attrs{ + "type": "text", + "placeholder": "Écrivez le résumé de votre demande et cliquez sur 'Générer' pour remplir automatiquement ces champs.", + }, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + form.NewField( + "body", + form.Attrs{ + "type": "textarea", + "rows": "20", + "placeholder": strings.TrimSpace(bodyPlaceholder), + }, + form.NonEmpty("Ce champ ne doit pas être vide."), + ), + ) +} + +func PullRequestPage(vmodel PullRequestPageVModel) templ.Component { + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { + return templ_7745c5c3_CtxErr + } + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + templ_7745c5c3_Var1 := templ.GetChildren(ctx) + if templ_7745c5c3_Var1 == nil { + templ_7745c5c3_Var1 = templ.NopComponent + } + ctx = templ.ClearChildren(ctx) + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) + if !templ_7745c5c3_IsBuffer { + defer func() { + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) + if templ_7745c5c3_Err == nil { + templ_7745c5c3_Err = templ_7745c5c3_BufErr + } + }() + } + ctx = templ.InitializeContext(ctx) + if vmodel.PullRequestURL != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "

Pull Request modifiée !

Votre PR a été mise à jour et est disponible à l'adresse suivante: ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(vmodel.PullRequestURL) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/http/handler/webui/pullrequest/component/pullrequest_page.templ`, Line: 106, Col: 99} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, ".
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.JSFuncCall("clearSummary", vmodel.SelectedProjectID).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.JSFuncCall("openPR", vmodel.PullRequestURL).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "

Résumé de la PR

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = common.FormSelect( + vmodel.SummaryForm, "pr-project", "project", "Projet", + common.WithOptions(projectsToOptions(vmodel.Projects)...), + common.WithAttrs( + "hx-get", string(common.CurrentURL(ctx, common.WithoutValues("project", "*"))), + "hx-target", "body", + "hx-push-url", "true", + ), + ).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = common.FormSelect( + vmodel.SummaryForm, "pr-pullrequest", "pullrequest", "PR", + common.WithOptions(pullRequestsToOptions(vmodel.PullRequests)...), + common.WithAttrs( + "hx-get", string(common.CurrentURL(ctx, common.WithoutValues("pullrequest", "*"))), + "hx-target", "body", + "hx-push-url", "true", + ), + ).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = common.FormTextarea( + vmodel.SummaryForm, "pr-summary", "summary", "Résumé", + common.WithTextareaAttrs( + "hx-on:change", "onSummaryChange(event)", + ), + ).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "
Paramètres avancés") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = common.FormTextarea( + vmodel.SummaryForm, "pr-template", "template", "Surcharger le modèle de demande", + common.WithTextareaAttrs( + "hx-on:change", "onPullRequestTemplateChange(event)", + ), + ).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

Votre PR

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = common.FormField(vmodel.PullRequestForm, "pr-title", "title", "Titre").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = common.FormTextarea(vmodel.PullRequestForm, "pr-body", "body", "Corps").Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if vmodel.PullRequestTips != "" { + html := markdownToHTML(ctx, vmodel.PullRequestTips) + if html != "" { + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "

Questionnements

Utilisez ces quelques questions pour réfléchir aux éléments d'informations nécessaire à la bonne rédaction de votre PR:

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templ.Raw(html).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + } + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, " ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) + templ_7745c5c3_Err = common.AppPage(common.WithPageOptions( + common.WithTitle("Éditer une PR"), + )).Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + return nil + }) +} + +func projectsToOptions(projects []*model.Project) []string { + options := make([]string, 0, len(projects)) + options = append(options, "", "") + for _, p := range projects { + options = append(options, p.Name, p.ID) + } + return options +} + +func pullRequestsToOptions(pullRequests []*model.PullRequest) []string { + options := make([]string, 0, len(pullRequests)) + options = append(options, "", "") + for _, pr := range pullRequests { + options = append(options, pr.Title, pr.ID) + } + return options +} + +func markdownToHTML(ctx context.Context, text string) string { + var buff bytes.Buffer + if err := goldmark.Convert([]byte(text), &buff); err != nil { + slog.ErrorContext(ctx, "could not convert markdown to html", slog.Any("error", errors.WithStack(err))) + return "" + } + + return buff.String() +} + +var _ = templruntime.GeneratedTemplate diff --git a/internal/http/handler/webui/pullrequest/handler.go b/internal/http/handler/webui/pullrequest/handler.go new file mode 100644 index 0000000..ce79381 --- /dev/null +++ b/internal/http/handler/webui/pullrequest/handler.go @@ -0,0 +1,46 @@ +package pullrequest + +import ( + "net/http" + + "forge.cadoles.com/wpetit/clearcase/internal/core/service" + httpCtx "forge.cadoles.com/wpetit/clearcase/internal/http/context" + "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui/common" + "forge.cadoles.com/wpetit/clearcase/internal/http/url" + "github.com/pkg/errors" +) + +type Handler struct { + mux *http.ServeMux + forge *service.ForgeManager +} + +// ServeHTTP implements http.Handler. +func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { + h.mux.ServeHTTP(w, r) +} + +func NewHandler(forge *service.ForgeManager) *Handler { + h := &Handler{ + mux: http.NewServeMux(), + forge: forge, + } + + h.mux.HandleFunc("GET /", h.getPullRequestPage) + h.mux.HandleFunc("PUT /", h.handlePullRequestSummaryForm) + h.mux.HandleFunc("POST /", h.handlePullRequestForm) + + return h +} + +func (h *Handler) handleError(w http.ResponseWriter, r *http.Request, err error) { + if errors.Is(err, service.ErrForgeNotAvailable) { + baseURL := url.Mutate(httpCtx.BaseURL(r.Context()), url.WithPath("/auth/logout")) + http.Redirect(w, r, baseURL.String(), http.StatusSeeOther) + return + } + + common.HandleError(w, r, errors.WithStack(err)) +} + +var _ http.Handler = &Handler{} diff --git a/internal/http/handler/webui/pullrequest/pullrequest_page.go b/internal/http/handler/webui/pullrequest/pullrequest_page.go new file mode 100644 index 0000000..3e45f59 --- /dev/null +++ b/internal/http/handler/webui/pullrequest/pullrequest_page.go @@ -0,0 +1,242 @@ +package pullrequest + +import ( + "context" + "log/slog" + "net/http" + "strings" + + httpCtx "forge.cadoles.com/wpetit/clearcase/internal/http/context" + "forge.cadoles.com/wpetit/clearcase/internal/http/form" + "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui/common" + "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui/pullrequest/component" + + "github.com/a-h/templ" + "github.com/pkg/errors" +) + +func (h *Handler) getPullRequestPage(w http.ResponseWriter, r *http.Request) { + vmodel, err := h.fillPullRequestPageVModel(r) + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + pr := component.PullRequestPage(*vmodel) + templ.Handler(pr).ServeHTTP(w, r) +} + +func (h *Handler) fillPullRequestPageVModel(r *http.Request) (*component.PullRequestPageVModel, error) { + vmodel := &component.PullRequestPageVModel{ + SummaryForm: component.NewPullRequestSummaryForm(), + PullRequestForm: component.NewPullRequestForm(), + } + + err := common.FillViewModel( + r.Context(), vmodel, r, + h.fillPullRequestPageSelectedProject, + h.fillPullRequestPagePullRequests, + h.fillPullRequestPageProjects, + h.fillPullRequestPageSelectedPullRequest, + h.fillPullRequestPageSummary, + ) + if err != nil { + return nil, errors.WithStack(err) + } + + return vmodel, nil +} + +func (h *Handler) fillPullRequestPageProjects(ctx context.Context, vmodel *component.PullRequestPageVModel, r *http.Request) error { + user := httpCtx.User(ctx) + + projects, err := h.forge.GetUserProjects(ctx, user) + if err != nil { + return errors.WithStack(err) + } + + vmodel.Projects = projects + + return nil +} + +func (h *Handler) fillPullRequestPagePullRequests(ctx context.Context, vmodel *component.PullRequestPageVModel, r *http.Request) error { + if vmodel.SelectedProjectID == "" { + return nil + } + + user := httpCtx.User(ctx) + + pullRequests, err := h.forge.GetUserProjectOpenedPullRequests(ctx, user, vmodel.SelectedProjectID) + if err != nil { + return errors.WithStack(err) + } + + vmodel.PullRequests = pullRequests + + return nil +} + +func (h *Handler) fillPullRequestPageSelectedProject(ctx context.Context, vmodel *component.PullRequestPageVModel, r *http.Request) error { + project := r.URL.Query().Get("project") + if project == "" { + return nil + } + + vmodel.SelectedProjectID = project + vmodel.SummaryForm.Field("project").Set("value", project) + + return nil +} + +func (h *Handler) fillPullRequestPageSelectedPullRequest(ctx context.Context, vmodel *component.PullRequestPageVModel, r *http.Request) error { + pullRequest := r.URL.Query().Get("pullrequest") + if pullRequest == "" { + return nil + } + + vmodel.SelectedPullRequestID = pullRequest + vmodel.SummaryForm.Field("pullrequest").Set("value", pullRequest) + + return nil +} + +func (h *Handler) fillPullRequestPageSummary(ctx context.Context, vmodel *component.PullRequestPageVModel, r *http.Request) error { + if vmodel.SelectedProjectID == "" || vmodel.SelectedPullRequestID == "" { + return nil + } + + user := httpCtx.User(ctx) + + pullRequest, err := h.forge.GetUserProjectPullRequest(ctx, user, vmodel.SelectedProjectID, vmodel.SelectedPullRequestID) + if err != nil { + slog.ErrorContext(ctx, "could not retrieve selected pull request", slog.Any("error", errors.WithStack(err))) + return nil + } + + vmodel.SummaryForm.Field("summary").Set("value", pullRequest.Body) + + return nil +} + +func (h *Handler) handlePullRequestSummaryForm(w http.ResponseWriter, r *http.Request) { + ctx := r.Context() + + pullRequestSummaryForm := component.NewPullRequestSummaryForm() + + if err := pullRequestSummaryForm.Handle(r); err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + vmodel, err := h.fillPullRequestPageVModel(r) + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + vmodel.SummaryForm = pullRequestSummaryForm + + if errs := pullRequestSummaryForm.Validate(); errs != nil { + page := component.PullRequestPage(*vmodel) + templ.Handler(page).ServeHTTP(w, r) + + return + } + + projectID, err := form.FormFieldAttr[string](pullRequestSummaryForm, "project", "value") + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + pullRequestID, err := form.FormFieldAttr[string](pullRequestSummaryForm, "pullrequest", "value") + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + prSummary, err := form.FormFieldAttr[string](pullRequestSummaryForm, "summary", "value") + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + prTemplate, err := form.FormFieldAttr[string](pullRequestSummaryForm, "template", "value") + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + prTemplate = strings.TrimSpace(prTemplate) + + prTitle, prBody, prTips, err := h.forge.GeneratePullRequest(ctx, httpCtx.User(ctx), projectID, pullRequestID, prSummary, prTemplate) + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + vmodel.PullRequestTips = prTips + vmodel.PullRequestForm.Field("title").Set("value", prTitle) + vmodel.PullRequestForm.Field("body").Set("value", prBody) + + page := component.PullRequestPage(*vmodel) + templ.Handler(page).ServeHTTP(w, r) +} + +func (h *Handler) handlePullRequestForm(w http.ResponseWriter, r *http.Request) { + pullRequestForm := component.NewPullRequestForm() + + if err := pullRequestForm.Handle(r); err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + vmodel, err := h.fillPullRequestPageVModel(r) + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + if errs := pullRequestForm.Validate(); errs != nil { + vmodel.PullRequestForm = pullRequestForm + + page := component.PullRequestPage(*vmodel) + templ.Handler(page).ServeHTTP(w, r) + + return + } + + projectID := r.URL.Query().Get("project") + pullRequestID := r.URL.Query().Get("pullrequest") + + title, err := form.FormFieldAttr[string](pullRequestForm, "title", "value") + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + body, err := form.FormFieldAttr[string](pullRequestForm, "body", "value") + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + ctx := r.Context() + user := httpCtx.User(ctx) + + issueURL, err := h.forge.UpdatePullRequest(ctx, user, projectID, pullRequestID, title, body) + if err != nil { + h.handleError(w, r, errors.WithStack(err)) + return + } + + vmodel.PullRequestURL = issueURL + + vmodel.SummaryForm.Field("summary").Set("value", "") + vmodel.PullRequestForm.Field("title").Set("value", "") + vmodel.PullRequestForm.Field("body").Set("value", "") + + page := component.PullRequestPage(*vmodel) + templ.Handler(page).ServeHTTP(w, r) +} diff --git a/internal/setup/issue_handler.go b/internal/setup/issue_handler.go index 0428dd7..71777f9 100644 --- a/internal/setup/issue_handler.go +++ b/internal/setup/issue_handler.go @@ -12,12 +12,12 @@ import ( ) func NewIssueHandlerFromConfig(ctx context.Context, conf *config.Config) (*issue.Handler, error) { - issueManager, err := NewIssueManagerFromConfig(ctx, conf) + forgeManager, err := NewForgeManagerFromConfig(ctx, conf) if err != nil { return nil, errors.WithStack(err) } - return issue.NewHandler(issueManager), nil + return issue.NewHandler(forgeManager), nil } type authProviderBasedForgeFactory struct { diff --git a/internal/setup/issue_manager.go b/internal/setup/issue_manager.go index febecdd..f060b24 100644 --- a/internal/setup/issue_manager.go +++ b/internal/setup/issue_manager.go @@ -5,14 +5,16 @@ import ( "forge.cadoles.com/wpetit/clearcase/internal/config" "forge.cadoles.com/wpetit/clearcase/internal/core/service" + "github.com/bornholm/genai/llm" "github.com/bornholm/genai/llm/provider" "github.com/pkg/errors" _ "github.com/bornholm/genai/llm/provider/openai" + "github.com/bornholm/genai/llm/provider/openrouter" _ "github.com/bornholm/genai/llm/provider/openrouter" ) -func NewIssueManagerFromConfig(ctx context.Context, conf *config.Config) (*service.IssueManager, error) { +func NewForgeManagerFromConfig(ctx context.Context, conf *config.Config) (*service.ForgeManager, error) { client, err := provider.Create(ctx, provider.WithConfig(&provider.Config{ Provider: provider.Name(conf.LLM.Provider.Name), @@ -24,12 +26,42 @@ func NewIssueManagerFromConfig(ctx context.Context, conf *config.Config) (*servi return nil, errors.Wrapf(err, "could not create llm client '%s'", conf.LLM.Provider.Name) } + if conf.LLM.Provider.Name == string(openrouter.Name) { + client = &extendedContextClient{ + client: client, + extend: func(ctx context.Context) context.Context { + // Automatically "compress" prompts when using openrouter + // See https://openrouter.ai/docs/features/message-transforms + ctx = openrouter.WithTransforms(ctx, []string{"middle-out"}) + return ctx + }, + } + } + forgeFactories, err := getForgeFactories(conf) if err != nil { return nil, errors.Wrap(err, "could not get forge factories") } - issueManager := service.NewIssueManager(client, forgeFactories...) + forgeManager := service.NewForgeManager(client, forgeFactories...) - return issueManager, nil + return forgeManager, nil } + +type extendedContextClient struct { + client llm.Client + extend func(ctx context.Context) context.Context +} + +// ChatCompletion implements llm.Client. +func (c *extendedContextClient) ChatCompletion(ctx context.Context, funcs ...llm.ChatCompletionOptionFunc) (llm.CompletionResponse, error) { + ctx = c.extend(ctx) + return c.client.ChatCompletion(ctx, funcs...) +} + +// Model implements llm.Client. +func (c *extendedContextClient) Model() string { + return c.Model() +} + +var _ llm.Client = &extendedContextClient{} diff --git a/internal/setup/pullrequest_handler.go b/internal/setup/pullrequest_handler.go new file mode 100644 index 0000000..519e6e6 --- /dev/null +++ b/internal/setup/pullrequest_handler.go @@ -0,0 +1,18 @@ +package setup + +import ( + "context" + + "forge.cadoles.com/wpetit/clearcase/internal/config" + "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui/pullrequest" + "github.com/pkg/errors" +) + +func NewPullRequestHandlerFromConfig(ctx context.Context, conf *config.Config) (*pullrequest.Handler, error) { + forgeManager, err := NewForgeManagerFromConfig(ctx, conf) + if err != nil { + return nil, errors.WithStack(err) + } + + return pullrequest.NewHandler(forgeManager), nil +} diff --git a/internal/setup/webui_handler.go b/internal/setup/webui_handler.go index 4282c10..09edaf3 100644 --- a/internal/setup/webui_handler.go +++ b/internal/setup/webui_handler.go @@ -2,6 +2,7 @@ package setup import ( "context" + "net/http" "forge.cadoles.com/wpetit/clearcase/internal/config" "forge.cadoles.com/wpetit/clearcase/internal/http/handler/webui" @@ -22,13 +23,27 @@ func NewWebUIHandlerFromConfig(ctx context.Context, conf *config.Config) (*webui opts = append(opts, webui.WithMount("/auth/", authHandler)) + // Configure index redirect + + opts = append(opts, webui.WithMount("/", authMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + http.Redirect(w, r, "/issue", http.StatusTemporaryRedirect) + })))) + // Configure issue handler issueHandler, err := NewIssueHandlerFromConfig(ctx, conf) if err != nil { return nil, errors.Wrap(err, "could not configure issue handler from config") } - opts = append(opts, webui.WithMount("/", authMiddleware(issueHandler))) + opts = append(opts, webui.WithMount("/issue/", authMiddleware(issueHandler))) + + // Configure pull request handler + pullRequestHandler, err := NewPullRequestHandlerFromConfig(ctx, conf) + if err != nil { + return nil, errors.Wrap(err, "could not configure pull request handler from config") + } + + opts = append(opts, webui.WithMount("/pullrequest/", authMiddleware(pullRequestHandler))) // Configure common handler commonHandler, err := NewCommonHandlerFromConfig(ctx, conf)