refactor(store): replace project and skill models with generated models
Some checks failed
CI / build-and-test (push) Failing after -31m25s
Some checks failed
CI / build-and-test (push) Failing after -31m25s
* Update project creation and retrieval to use generated models * Modify skill addition and listing to utilize generated models * Refactor thought handling to incorporate generated models * Adjust tool annotations to align with new model structure * Update API calls in the UI to use new ResolveSpec-based endpoints * Enhance stats retrieval logic to aggregate thought metadata
This commit is contained in:
@@ -9,6 +9,7 @@ import (
|
||||
"github.com/google/uuid"
|
||||
"github.com/jackc/pgx/v5"
|
||||
|
||||
"git.warky.dev/wdevs/amcs/internal/generatedmodels"
|
||||
thoughttypes "git.warky.dev/wdevs/amcs/internal/types"
|
||||
)
|
||||
|
||||
@@ -19,24 +20,24 @@ func (db *DB) InsertStoredFile(ctx context.Context, file thoughttypes.StoredFile
|
||||
returning guid, thought_id, project_id, name, media_type, kind, encoding, size_bytes, sha256, created_at, updated_at
|
||||
`, file.ThoughtID, file.ProjectID, file.Name, file.MediaType, file.Kind, file.Encoding, file.SizeBytes, file.SHA256, file.Content)
|
||||
|
||||
var created thoughttypes.StoredFile
|
||||
var model generatedmodels.ModelPublicStoredFiles
|
||||
if err := row.Scan(
|
||||
&created.ID,
|
||||
&created.ThoughtID,
|
||||
&created.ProjectID,
|
||||
&created.Name,
|
||||
&created.MediaType,
|
||||
&created.Kind,
|
||||
&created.Encoding,
|
||||
&created.SizeBytes,
|
||||
&created.SHA256,
|
||||
&created.CreatedAt,
|
||||
&created.UpdatedAt,
|
||||
&model.GUID,
|
||||
&model.ThoughtID,
|
||||
&model.ProjectID,
|
||||
&model.Name,
|
||||
&model.MediaType,
|
||||
&model.Kind,
|
||||
&model.Encoding,
|
||||
&model.SizeBytes,
|
||||
&model.Sha256,
|
||||
&model.CreatedAt,
|
||||
&model.UpdatedAt,
|
||||
); err != nil {
|
||||
return thoughttypes.StoredFile{}, fmt.Errorf("insert stored file: %w", err)
|
||||
}
|
||||
|
||||
return created, nil
|
||||
return storedFileFromModel(model), nil
|
||||
}
|
||||
|
||||
func (db *DB) GetStoredFile(ctx context.Context, id uuid.UUID) (thoughttypes.StoredFile, error) {
|
||||
@@ -46,20 +47,20 @@ func (db *DB) GetStoredFile(ctx context.Context, id uuid.UUID) (thoughttypes.Sto
|
||||
where guid = $1
|
||||
`, id)
|
||||
|
||||
var file thoughttypes.StoredFile
|
||||
var model generatedmodels.ModelPublicStoredFiles
|
||||
if err := row.Scan(
|
||||
&file.ID,
|
||||
&file.ThoughtID,
|
||||
&file.ProjectID,
|
||||
&file.Name,
|
||||
&file.MediaType,
|
||||
&file.Kind,
|
||||
&file.Encoding,
|
||||
&file.SizeBytes,
|
||||
&file.SHA256,
|
||||
&file.Content,
|
||||
&file.CreatedAt,
|
||||
&file.UpdatedAt,
|
||||
&model.GUID,
|
||||
&model.ThoughtID,
|
||||
&model.ProjectID,
|
||||
&model.Name,
|
||||
&model.MediaType,
|
||||
&model.Kind,
|
||||
&model.Encoding,
|
||||
&model.SizeBytes,
|
||||
&model.Sha256,
|
||||
&model.Content,
|
||||
&model.CreatedAt,
|
||||
&model.UpdatedAt,
|
||||
); err != nil {
|
||||
if err == pgx.ErrNoRows {
|
||||
return thoughttypes.StoredFile{}, err
|
||||
@@ -67,7 +68,7 @@ func (db *DB) GetStoredFile(ctx context.Context, id uuid.UUID) (thoughttypes.Sto
|
||||
return thoughttypes.StoredFile{}, fmt.Errorf("get stored file: %w", err)
|
||||
}
|
||||
|
||||
return file, nil
|
||||
return storedFileFromModel(model), nil
|
||||
}
|
||||
|
||||
func (db *DB) ListStoredFiles(ctx context.Context, filter thoughttypes.StoredFileFilter) ([]thoughttypes.StoredFile, error) {
|
||||
@@ -106,23 +107,23 @@ func (db *DB) ListStoredFiles(ctx context.Context, filter thoughttypes.StoredFil
|
||||
|
||||
files := make([]thoughttypes.StoredFile, 0, filter.Limit)
|
||||
for rows.Next() {
|
||||
var file thoughttypes.StoredFile
|
||||
var model generatedmodels.ModelPublicStoredFiles
|
||||
if err := rows.Scan(
|
||||
&file.ID,
|
||||
&file.ThoughtID,
|
||||
&file.ProjectID,
|
||||
&file.Name,
|
||||
&file.MediaType,
|
||||
&file.Kind,
|
||||
&file.Encoding,
|
||||
&file.SizeBytes,
|
||||
&file.SHA256,
|
||||
&file.CreatedAt,
|
||||
&file.UpdatedAt,
|
||||
&model.GUID,
|
||||
&model.ThoughtID,
|
||||
&model.ProjectID,
|
||||
&model.Name,
|
||||
&model.MediaType,
|
||||
&model.Kind,
|
||||
&model.Encoding,
|
||||
&model.SizeBytes,
|
||||
&model.Sha256,
|
||||
&model.CreatedAt,
|
||||
&model.UpdatedAt,
|
||||
); err != nil {
|
||||
return nil, fmt.Errorf("scan stored file: %w", err)
|
||||
}
|
||||
files = append(files, file)
|
||||
files = append(files, storedFileFromModel(model))
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("iterate stored files: %w", err)
|
||||
|
||||
Reference in New Issue
Block a user