Skip to content

fix(image_generate,resource_copy): add fallback for attachment key mi… #92

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
qqqqqf-q merged 1 commit into from
Aug 20, 2026
Merged

fix(image_generate,resource_copy): add fallback for attachment key mi… #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions src/services/worker/internal/tools/builtin/image_generate/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ const (
)

type ToolExecutor struct {
store objectstore.Store
db workerdata.QueryDB
config sharedconfig.Resolver
routingLoader *routing.ConfigLoader
generate func(context.Context, llm.ResolvedGatewayConfig, llm.ImageGenerationRequest) (llm.GeneratedImage, error)
store objectstore.Store
messageAttachmentStore objectstore.Store
db workerdata.QueryDB
config sharedconfig.Resolver
routingLoader *routing.ConfigLoader
generate func(context.Context, llm.ResolvedGatewayConfig, llm.ImageGenerationRequest) (llm.GeneratedImage, error)
}

func NewToolExecutor(
Expand All @@ -49,6 +50,11 @@ func NewToolExecutor(
}
}

func (e *ToolExecutor) WithMessageAttachmentStore(s objectstore.Store) *ToolExecutor {
e.messageAttachmentStore = s
return e
}
Comment on lines +53 to +56

@chatgpt-codex-connector chatgpt-codex-connector Bot May 28, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Wire the attachment store into image generation

This setter is never used by the production registration path: registerStoredArtifactTools still constructs imagegeneratetool.NewToolExecutor(...) without chaining WithMessageAttachmentStore(attachmentStore). As a result, in normal worker/desktop composition messageAttachmentStore remains nil, so the fallback added below for unprefixed attachment keys is dead code and input_images that only exist in the message-attachment bucket still fail.

Useful? React with 👍 / 👎.


func (e *ToolExecutor) Execute(
ctx context.Context,
_ string,
Expand Down Expand Up @@ -251,6 +257,12 @@ func (e *ToolExecutor) loadInputImages(ctx context.Context, args map[string]any,
return nil, fmt.Errorf("input_images[%d] is outside the current account", idx)
}
data, contentType, err := e.store.GetWithContentType(ctx, key)
if err != nil && e.messageAttachmentStore != nil {
data, contentType, err = e.messageAttachmentStore.GetWithContentType(ctx, key)
}
if err != nil && e.messageAttachmentStore != nil && !strings.HasPrefix(key, "attachments/") {
data, contentType, err = e.messageAttachmentStore.GetWithContentType(ctx, "attachments/"+key)
}
if err != nil {
return nil, fmt.Errorf("input_images[%d] not found", idx)
}
Expand Down
3 changes: 3 additions & 0 deletions src/services/worker/internal/tools/builtin/resource_copy/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ func authorizeObjectKey(ctx context.Context, store objectstore.Store, key string
return nil
}
info, err := store.Head(ctx, key)
if err != nil && objectstore.IsNotFound(err) && attachment && !strings.HasPrefix(key, "attachments/") {
info, err = store.Head(ctx, "attachments/"+key)
}
Comment on lines +126 to +128

@chatgpt-codex-connector chatgpt-codex-connector Bot May 28, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Fetch the same fallback key that was authorized

When an attachment is passed as attachment:<account_id>/... and the object exists only at attachments/<account_id>/..., this fallback can authorize the prefixed object, but fetch then calls getObject(ctx, e.AttachmentStore, key) with the original unprefixed key. In real stores where GetWithContentType returns not-found for the unprefixed key, the copy still fails after authorization succeeds; the resolved fallback key needs to be used for the subsequent read as well.

Useful? React with 👍 / 👎.

if err != nil {
return &tools.ExecutionError{ErrorClass: errorFetchFailed, Message: fmt.Sprintf("read resource metadata failed: %s", err.Error())}
}
Expand Down
Loading