Minor refactor
This commit is contained in:
parent
74a6e32538
commit
87b087f295
|
@ -415,7 +415,7 @@ func (c *Controller) getEmbeddingObject(ctx context.Context, objectKey string, d
|
||||||
cancel()
|
cancel()
|
||||||
return ente.EmbeddingObject{}, stacktrace.Propagate(ctx.Err(), "")
|
return ente.EmbeddingObject{}, stacktrace.Propagate(ctx.Err(), "")
|
||||||
default:
|
default:
|
||||||
obj, err := c.downloadObject(fetchCtx, objectKey, downloader)
|
obj, err := c.downloadObject(fetchCtx, objectKey, downloader, c.embeddingBucket)
|
||||||
cancel() // Ensure cancel is called to release resources
|
cancel() // Ensure cancel is called to release resources
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return obj, nil
|
return obj, nil
|
||||||
|
@ -438,11 +438,11 @@ func (c *Controller) getEmbeddingObject(ctx context.Context, objectKey string, d
|
||||||
return ente.EmbeddingObject{}, stacktrace.Propagate(errors.New("failed to fetch object"), "")
|
return ente.EmbeddingObject{}, stacktrace.Propagate(errors.New("failed to fetch object"), "")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Controller) downloadObject(ctx context.Context, objectKey string, downloader *s3manager.Downloader) (ente.EmbeddingObject, error) {
|
func (c *Controller) downloadObject(ctx context.Context, objectKey string, downloader *s3manager.Downloader, bucket *string) (ente.EmbeddingObject, error) {
|
||||||
var obj ente.EmbeddingObject
|
var obj ente.EmbeddingObject
|
||||||
buff := &aws.WriteAtBuffer{}
|
buff := &aws.WriteAtBuffer{}
|
||||||
_, err := downloader.DownloadWithContext(ctx, buff, &s3.GetObjectInput{
|
_, err := downloader.DownloadWithContext(ctx, buff, &s3.GetObjectInput{
|
||||||
Bucket: c.embeddingBucket,
|
Bucket: bucket,
|
||||||
Key: &objectKey,
|
Key: &objectKey,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in a new issue