enhance: use workspace file revisions to avoid clobbering the database #437
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
njhale
commented
Feb 12, 2025
njhale
force-pushed
the
enhance/database-optimistic-concurrency
branch
from
69e6681 to
ed9f368
Compare
njhale
requested review from
thedadams,
ibuildthecloud,
tybalex,
StrongMonkey,
iwilltry42 and
g-linville
njhale
force-pushed
the
enhance/database-optimistic-concurrency
branch
from
ed9f368 to
e09f799
Compare
njhale
commented
Feb 21, 2025
database/go.mod
Outdated
| @@ -2,21 +2,23 @@ module obot-platform/database | |||
|
|
|||
| go 1.23.3 | |||
|
|
|||
| replace github.com/gptscript-ai/go-gptscript => github.com/thedadams/go-gptscript v0.0.0-20250219113618-25d959a071ff | |||
There was a problem hiding this comment.
I need gptscript-ai/go-gptscript#93 to merge before we can remove this and merge this PR.
thedadams
reviewed
Feb 21, 2025
Comment on lines
+139
to
+138
| lastRevisionIndex := slices.IndexFunc(revisions, func(rev gptscript.FileInfo) bool { | ||
| return rev.RevisionID == revisionID | ||
| }) | ||
|
|
There was a problem hiding this comment.
Revisions should come out in order.
| return nil | ||
| } | ||
|
|
||
| for _, rev := range revisions[:lastRevisionIndex+1] { |
There was a problem hiding this comment.
This seems to be delete ALL revisions. Is that the intention?
There was a problem hiding this comment.
Iiuc, this drops all revisions up-to and including the previous revision (not the one we just created).
workspace-files/main.go
Outdated
| @@ -174,17 +174,17 @@ func read(ctx context.Context, filename string) error { | |||
| return err | |||
| } | |||
|
|
|||
| data, err := client.ReadFileInWorkspace(ctx, path.Join(FilesDir, filename)) | |||
| response, err := client.ReadFileInWorkspace(ctx, path.Join(FilesDir, filename)) | |||
There was a problem hiding this comment.
In the latest version of the go-gptscript changes, this function returns []byte instead of the data structure.
There was a problem hiding this comment.
Ah, meant to drop this. Thanks for catching.
njhale
force-pushed
the
enhance/database-optimistic-concurrency
branch
from
e09f799 to
45df4c8
Compare
thedadams
approved these changes
Feb 22, 2025
| if err := g.DeleteRevisionForFileInWorkspace(ctx, dbWorkspacePath, rev.RevisionID, gptscript.DeleteRevisionForFileInWorkspaceOptions{ | ||
| WorkspaceID: workspaceID, | ||
| }); err != nil { | ||
| fmt.Fprintf(os.Stderr, "Error deleting revision %s: %v\n", rev.RevisionID, err) |
StrongMonkey
approved these changes
Feb 24, 2025
Signed-off-by: Nick Hale <[email protected]>
njhale
force-pushed
the
enhance/database-optimistic-concurrency
branch
from
45df4c8 to
24f984e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses obot-platform/obot#1813