Merge branch 'master' into joanne-tutorialagent

1 files changed, 135 insertions, 89 deletions

diff --git a/src/server/ApiManagers/FireflyManager.ts b/src/server/ApiManagers/FireflyManager.ts
index e75ede9df..e934e635b 100644
--- a/src/server/ApiManagers/FireflyManager.ts
+++ b/src/server/ApiManagers/FireflyManager.ts
@@ -6,6 +6,7 @@ import * as path from 'path';
 import { DashUserModel } from '../authentication/DashUserModel';
 import { DashUploadUtils } from '../DashUploadUtils';
 import { _error, _invalid, _success, Method } from '../RouteManager';
+import { Upload } from '../SharedMediaTypes';
 import { Directory, filesDirectory } from '../SocketData';
 import ApiManager, { Registration } from './ApiManager';
 
@@ -70,54 +71,44 @@ export default class FireflyManager extends ApiManager {
         );
 
     uploadImageToDropbox = (fileUrl: string, user: DashUserModel | undefined, dbx = new Dropbox({ accessToken: user?.dropboxToken || '' })) =>
-        new Promise<string | Error>((res, rej) =>
+        new Promise<string>((resolve, reject) => {
             fs.readFile(path.join(filesDirectory, `${Directory.images}/${path.basename(fileUrl)}`), undefined, (err, contents) => {
                 if (err) {
-                    console.log('Error: ', err);
-                    rej();
-                } else {
-                    dbx.filesUpload({ path: `/Apps/browndash/${path.basename(fileUrl)}`, contents })
-                        .then(response => {
-                            dbx.filesGetTemporaryLink({ path: response.result.path_display ?? '' })
-                                .then(link => res(link.result.link))
-                                .catch(e => res(new Error(e.toString())));
-                        })
-                        .catch(e => {
+                    return reject(new Error('Error reading file:' + err.message));
+                }
+
+                const uploadToDropbox = (dropboxClient: Dropbox) =>
+                    dropboxClient
+                        .filesUpload({ path: `/Apps/browndash/${path.basename(fileUrl)}`, contents })
+                        .then(response =>
+                            dropboxClient
+                                .filesGetTemporaryLink({ path: response.result.path_display ?? '' })
+                                .then(link => resolve(link.result.link))
+                                .catch(linkErr => reject(new Error('Failed to get temporary link: ' + linkErr.message)))
+                        )
+                        .catch(uploadErr => {
                             if (user?.dropboxRefresh) {
-                                console.log('*********** try refresh dropbox for: ' + user.email + ' ***********');
-                                this.refreshDropboxToken(user).then(token => {
-                                    if (!token) {
-                                        console.log('Dropbox error: cannot refresh token');
-                                        res(new Error(e.toString()));
-                                    } else {
-                                        const dbxNew = new Dropbox({ accessToken: user.dropboxToken || '' });
-                                        dbxNew
-                                            .filesUpload({ path: `/Apps/browndash/${path.basename(fileUrl)}`, contents })
-                                            .then(response => {
-                                                dbxNew
-                                                    .filesGetTemporaryLink({ path: response.result.path_display ?? '' })
-                                                    .then(link => res(link.result.link))
-                                                    .catch(linkErr => res(new Error(linkErr.toString())));
-                                            })
-                                            .catch(uploadErr => {
-                                                console.log('Dropbox error:', uploadErr);
-                                                res(new Error(uploadErr.toString()));
-                                            });
-                                    }
-                                });
+                                console.log('Attempting to refresh Dropbox token for user:', user.email);
+                                this.refreshDropboxToken(user)
+                                    .then(token => {
+                                        if (!token) return reject(new Error('Failed to refresh Dropbox token.' + user.email));
+
+                                        const dbxNew = new Dropbox({ accessToken: token });
+                                        uploadToDropbox(dbxNew).catch(finalErr => reject(new Error('Failed to refresh Dropbox token:' + finalErr.message)));
+                                    })
+                                    .catch(refreshErr => reject(new Error('Failed to refresh Dropbox token: ' + refreshErr.message)));
                             } else {
-                                console.log('Dropbox error:', e);
-                                res(new Error(e.toString()));
+                                reject(new Error('Dropbox error: ' + uploadErr.message));
                             }
                         });
-                }
-            })
-        );
+
+                uploadToDropbox(dbx);
+            });
+        });
 
     generateImage = (prompt: string = 'a realistic illustration of a cat coding', width: number = 2048, height: number = 2048, seed?: number) => {
         let body = `{  "prompt": "${prompt}", "size": { "width": ${width}, "height": ${height}} }`;
         if (seed) {
-            console.log('RECEIVED SEED', seed);
             body = `{  "prompt": "${prompt}", "size": { "width": ${width}, "height": ${height}}, "seeds": [${seed}]}`;
         }
         const fetched = this.getBearerToken().then(response =>
@@ -290,44 +281,116 @@ export default class FireflyManager extends ApiManager {
         register({
             method: Method.POST,
             subscription: '/queryFireflyImageFromStructure',
+            secureHandler: ({ req, res }) => 
+                new Promise<void>(resolver =>
+                    (req.body.styleUrl 
+                        ? this.uploadImageToDropbox(req.body.styleUrl, req.user as DashUserModel) 
+                        : Promise.resolve(undefined)
+                    )
+                    .then(styleUrl => 
+                         this.uploadImageToDropbox(req.body.structureUrl, req.user as DashUserModel)
+                            .then(dropboxStructureUrl => 
+                                 ({ styleUrl, structureUrl: dropboxStructureUrl })
+                            )
+                            
+                    )
+                    .then(uploads =>
+                        this.generateImageFromStructure(
+                            req.body.prompt, req.body.width, req.body.height, uploads.structureUrl, req.body.strength, req.body.presets, uploads.styleUrl
+                        ).then(images =>
+                            Promise.all((images ?? [new Error('no images were generated')]).map(fire => (fire instanceof Error ? fire : DashUploadUtils.UploadImage(fire.url))))
+                            .then(dashImages =>
+                               (dashImages.every(img => img instanceof Error))
+                                ? _invalid(res, dashImages[0]!.message)
+                                : _success(res, JSON.stringify(dashImages.filter(img => !(img instanceof Error))))
+                            )
+                        )
+                    )
+                    .catch(e => {
+                        _invalid(res, e.message);
+                        resolver();
+                    })
+            ), // prettier-ignore
+        });
+
+        register({
+            method: Method.POST,
+            subscription: '/outpaintImage',
             secureHandler: ({ req, res }) =>
-                new Promise<void>(resolver => {
-                    (req.body.styleUrl ? this.uploadImageToDropbox(req.body.styleUrl, req.user as DashUserModel) : Promise.resolve(undefined))
-                        .then(styleUrl => {
-                            if (styleUrl instanceof Error) {
-                                _invalid(res, styleUrl.message);
-                                throw new Error('Error uploading images to dropbox');
-                            }
-                            this.uploadImageToDropbox(req.body.structureUrl, req.user as DashUserModel)
-                                .then(dropboxStructureUrl => {
-                                    if (dropboxStructureUrl instanceof Error) {
-                                        _invalid(res, dropboxStructureUrl.message);
-                                        throw new Error('Error uploading images to dropbox');
-                                    }
-                                    return { styleUrl, structureUrl: dropboxStructureUrl };
-                                })
-                                .then(uploads =>
-                                    this.generateImageFromStructure(req.body.prompt, req.body.width, req.body.height, uploads.structureUrl, req.body.strength, req.body.presets, uploads.styleUrl)
-                                        .then(images => {
-                                            Promise.all((images ?? [new Error('no images were generated')]).map(fire => (fire instanceof Error ? fire : DashUploadUtils.UploadImage(fire.url))))
-                                                .then(dashImages => {
-                                                    if (dashImages.every(img => img instanceof Error)) _invalid(res, dashImages[0]!.message);
-                                                    else _success(res, JSON.stringify(dashImages.filter(img => !(img instanceof Error))));
-                                                })
-                                                .then(resolver);
-                                        })
-                                        .catch(e => {
-                                            _invalid(res, e.message);
-                                            resolver();
+                new Promise<void>(resolver =>
+                    this.uploadImageToDropbox(req.body.imageUrl, req.user as DashUserModel)
+                        .then(uploadUrl =>
+                            this.getBearerToken()
+                                .then(tokenResponse => tokenResponse?.json())
+                                .then((tokenData: { access_token: string }) =>
+                                    fetch('https://firefly-api.adobe.io/v3/images/expand', {
+                                        method: 'POST',
+                                        headers: [
+                                            ['Content-Type', 'application/json'],
+                                            ['Accept', 'application/json'],
+                                            ['x-api-key', process.env._CLIENT_FIREFLY_CLIENT_ID ?? ''],
+                                            ['Authorization', `Bearer ${tokenData.access_token}`],
+                                        ],
+                                        body: JSON.stringify({
+                                            image: {
+                                                source: { url: uploadUrl },
+                                            },
+                                            size: {
+                                                width: Math.round(req.body.newDimensions.width),
+                                                height: Math.round(req.body.newDimensions.height),
+                                            },
+                                            prompt: req.body.prompt ?? '',
+                                            numVariations: 1,
+                                            placement: {
+                                                inset: {
+                                                    left: 0, // Math.round((req.body.newDimensions.width - req.body.originalDimensions.width) / 2),
+                                                    top: 0, // Math.round((req.body.newDimensions.height - req.body.originalDimensions.height) / 2),
+                                                    right: 0, // Math.round((req.body.newDimensions.width - req.body.originalDimensions.width) / 2),
+                                                    bottom: 0, // Math.round((req.body.newDimensions.height - req.body.originalDimensions.height) / 2),
+                                                },
+                                                alignment: {
+                                                    horizontal: req.body.halignment || 'center',
+                                                    vertical: req.body.valignment || 'center',
+                                                },
+                                            },
+                                        }),
+                                    })
+                                        .then(expandResp => expandResp?.json())
+                                        .then(expandData => {
+                                            if (expandData.error_code || !expandData.outputs?.[0]?.image?.url) {
+                                                console.error('Firefly validation error:', expandData);
+                                                _error(res, expandData.message ?? 'Failed to generate image');
+                                            } else {
+                                                return DashUploadUtils.UploadImage(expandData.outputs[0].image.url)
+                                                    .then((info: Upload.ImageInformation | Error) => {
+                                                        if (info instanceof Error) {
+                                                            _invalid(res, info.message);
+                                                        } else {
+                                                            _success(res, { url: info.accessPaths.agnostic.client });
+                                                        }
+                                                    })
+                                                    .catch(uploadErr => {
+                                                        console.error('DashUpload Error:', uploadErr);
+                                                        _error(res, 'Failed to upload generated image.');
+                                                    });
+                                            }
                                         })
-                                );
-                        })
-                        .catch(() => {
-                            /* do nothing */
+                                )
+                        )
+                        .catch(e => {
+                            _invalid(res, e.message);
                             resolver();
-                        });
-                }),
+                        })
+                ),
         });
+
+        /*  register({
+            method: Method.POST
+            subscription: '/queryFireflyOutpaint',
+            secureHandler: ({req, res}) =>
+                this.outpaintImage()
+        })*/
+
         register({
             method: Method.POST,
             subscription: '/queryFireflyImage',
@@ -354,23 +417,6 @@ export default class FireflyManager extends ApiManager {
                     )
                 ),
         });
-        register({
-            method: Method.POST,
-            subscription: '/expandImage',
-            secureHandler: ({ req, res }) =>
-                this.uploadImageToDropbox(req.body.file, req.user as DashUserModel).then(uploadUrl =>
-                    uploadUrl instanceof Error
-                        ? _invalid(res, uploadUrl.message)
-                        : this.expandImage(uploadUrl, req.body.prompt).then(text => {
-                              if (text.error_code) _error(res, text.message);
-                              else
-                                  DashUploadUtils.UploadImage(text.outputs[0].image.url).then(info => {
-                                      if (info instanceof Error) _invalid(res, info.message);
-                                      else _success(res, info);
-                                  });
-                          })
-                ),
-        });
 
         // construct this url and send user to it.  It will allow them to authorize their dropbox account and will send the resulting token to our endpoint /refreshDropbox
         // https://www.dropbox.com/oauth2/authorize?client_id=DROPBOX_CLIENT_ID&response_type=code&token_access_type=offline&redirect_uri=http://localhost:1050/refreshDropbox