Skip to content

enhance: add option to return revision ID when reading file in workspace #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2025
Merged

enhance: add option to return revision ID when reading file in workspace #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03e013e
enhance: add option to return revision ID when reading file in workspace
thedadams Feb 13, 2025
30300a3
Read with revision updates
thedadams Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/sdkserver/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func (s *server) addRoutes(mux *http.ServeMux) {
mux.HandleFunc("POST /workspaces/write-file", s.writeFileInWorkspace)
mux.HandleFunc("POST /workspaces/delete-file", s.removeFileInWorkspace)
mux.HandleFunc("POST /workspaces/read-file", s.readFileInWorkspace)
mux.HandleFunc("POST /workspaces/read-file-with-revision", s.readFileWithRevisionInWorkspace)
mux.HandleFunc("POST /workspaces/stat-file", s.statFileInWorkspace)
mux.HandleFunc("POST /workspaces/list-revisions", s.listRevisions)
mux.HandleFunc("POST /workspaces/get-revision", s.getRevisionForFileInWorkspace)
Expand Down
42 changes: 37 additions & 5 deletions pkg/sdkserver/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ type writeFileInWorkspaceRequest struct {
FilePath string `json:"filePath"`
Contents string `json:"contents"`
CreateRevision *bool `json:"createRevision"`
LatestRevision string `json:"latestRevision"`
LatestRevisionID string `json:"latestRevisionID"`
}

func (s *server) writeFileInWorkspace(w http.ResponseWriter, r *http.Request) {
Expand All @@ -209,8 +209,8 @@ func (s *server) writeFileInWorkspace(w http.ResponseWriter, r *http.Request) {
prg,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s", "body": "%s", "create_revision": %t, "latest_revision": "%s"}`,
reqObject.ID, reqObject.FilePath, reqObject.Contents, reqObject.CreateRevision == nil || *reqObject.CreateRevision, reqObject.LatestRevision,
`{"workspace_id": "%s", "file_path": "%s", "body": "%s", "create_revision": %t, "latest_revision_id": "%s"}`,
reqObject.ID, reqObject.FilePath, reqObject.Contents, reqObject.CreateRevision == nil || *reqObject.CreateRevision, reqObject.LatestRevisionID,
),
)
if err != nil {
Expand Down Expand Up @@ -293,9 +293,41 @@ func (s *server) readFileInWorkspace(w http.ResponseWriter, r *http.Request) {
writeResponse(logger, w, map[string]any{"stdout": out})
}

func (s *server) readFileWithRevisionInWorkspace(w http.ResponseWriter, r *http.Request) {
logger := gcontext.GetLogger(r.Context())
var reqObject readFileInWorkspaceRequest
if err := json.NewDecoder(r.Body).Decode(&reqObject); err != nil {
writeError(logger, w, http.StatusBadRequest, fmt.Errorf("invalid request body: %w", err))
return
}

prg, err := loader.Program(r.Context(), s.getWorkspaceTool(reqObject.workspaceCommonRequest), "Read File With Revision In Workspace", loader.Options{Cache: s.client.Cache})
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to load program: %w", err))
return
}

out, err := s.client.Run(
r.Context(),
prg,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s", "with_latest_revision_id": "true"}`,
reqObject.ID, reqObject.FilePath,
),
)
if err != nil {
writeError(logger, w, http.StatusInternalServerError, fmt.Errorf("failed to run program: %w", err))
return
}

writeResponse(logger, w, map[string]any{"stdout": out})
}

type statFileInWorkspaceRequest struct {
workspaceCommonRequest `json:",inline"`
FilePath string `json:"filePath"`
WithLatestRevisionID bool `json:"withLatestRevisionID"`
}

func (s *server) statFileInWorkspace(w http.ResponseWriter, r *http.Request) {
Expand All @@ -317,8 +349,8 @@ func (s *server) statFileInWorkspace(w http.ResponseWriter, r *http.Request) {
prg,
s.getServerToolsEnv(reqObject.Env),
fmt.Sprintf(
`{"workspace_id": "%s", "file_path": "%s"}`,
reqObject.ID, reqObject.FilePath,
`{"workspace_id": "%s", "file_path": "%s", "with_latest_revision_id": "%v"}`,
reqObject.ID, reqObject.FilePath, reqObject.WithLatestRevisionID,
),
)
if err != nil {
Expand Down