1 files changed, 71 insertions, 32 deletions
diff --git a/src/server/ApiManagers/FireflyManager.ts b/src/server/ApiManagers/FireflyManager.ts
index d757a23fe..e73795e41 100644
--- a/src/server/ApiManagers/FireflyManager.ts
+++ b/src/server/ApiManagers/FireflyManager.ts
@@ -1,4 +1,4 @@
-import { Dropbox, files } from 'dropbox';
+import { Dropbox } from 'dropbox';
 import * as fs from 'fs';
 import * as multipart from 'parse-multipart-data';
 import * as path from 'path';
@@ -19,6 +19,52 @@ export default class FireflyManager extends ApiManager {
             console.error('Error:', error);
             return undefined;
         });
+
+    generateImageFromStructure = (prompt: string = 'a realistic illustration of a cat coding', structureUrl: string, strength: number) =>
+        this.getBearerToken().then(response =>
+            response?.json().then((data: { access_token: string }) =>
+                fetch('https://firefly-api.adobe.io/v3/images/generate', {
+                    method: 'POST',
+                    headers: [
+                        ['Content-Type', 'application/json'],
+                        ['Accept', 'application/json'],
+                        ['x-api-key', process.env._CLIENT_FIREFLY_CLIENT_ID ?? ''],
+                        ['Authorization', `Bearer ${data.access_token}`],
+                    ],
+                    body: JSON.stringify({
+                        prompt,
+                        structure: !structureUrl
+                            ? undefined
+                            : {
+                                  strength,
+                                  imageReference: {
+                                      source: { url: structureUrl },
+                                  },
+                              },
+                    }),
+                })
+                    .then(response2 => response2.json().then(json => JSON.stringify((json.outputs?.[0] as { image: { url: string } })?.image)))
+                    .catch(error => {
+                        console.error('Error:', error);
+                        return '';
+                    })
+            )
+        );
+
+    uploadImageToDropbox = (fileUrl: string, dbx = new Dropbox({ accessToken: process.env.DROPBOX_TOKEN })) =>
+        new Promise<string>((res, rej) =>
+            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));
+                    });
+                }
+            })
+        );
+
     generateImage = (prompt: string = 'a realistic illustration of a cat coding') => {
         const fetched = this.getBearerToken().then(response =>
             response?.json().then((data: { access_token: string }) =>
@@ -165,6 +211,19 @@ export default class FireflyManager extends ApiManager {
     protected initialize(register: Registration): void {
         register({
             method: Method.POST,
+            subscription: '/queryFireflyImageFromStructure',
+            secureHandler: async ({ req, res }) =>
+                this.uploadImageToDropbox(req.body.structureUrl).then(uploadUrl =>
+                    this.generateImageFromStructure(req.body.prompt, uploadUrl, req.body.strength).then(fire =>
+                        DashUploadUtils.UploadImage(JSON.parse(fire ?? '').url).then(info => {
+                            if (info instanceof Error) _invalid(res, info.message);
+                            else _success(res, info);
+                        })
+                    )
+                ),
+        });
+        register({
+            method: Method.POST,
             subscription: '/queryFireflyImage',
             secureHandler: ({ req, res }) =>
                 this.generateImage(req.body.prompt).then(url =>
@@ -180,7 +239,7 @@ export default class FireflyManager extends ApiManager {
             subscription: '/queryFireflyImageText',
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             secureHandler: ({ req, res }) =>
-                fetch('http://localhost:1050/files/images/testshot.png').then(json =>
+                fetch(req.body.file).then(json =>
                     json.blob().then(file =>
                         this.getImageText(file).then(text => {
                             _success(res, text);
@@ -192,36 +251,16 @@ export default class FireflyManager extends ApiManager {
             method: Method.POST,
             subscription: '/expandImage',
             secureHandler: ({ req, res }) =>
-                new Promise<void>((resolve, reject) => {
-                    const dbx = new Dropbox({ accessToken: process.env.DROPBOX_TOKEN });
-                    fs.readFile(path.join(filesDirectory, `${Directory.images}/${path.basename(req.body.file)}`), undefined, (err, contents) => {
-                        if (err) {
-                            console.log('Error: ', err);
-                            reject();
-                        } else {
-                            dbx.filesUpload({ path: `/Apps/browndash/${path.basename(req.body.file)}`, contents })
-                                .then(response => {
-                                    dbx.filesGetTemporaryLink({ path: response.result.path_display ?? '' }).then(link => {
-                                        console.log(link.result);
-                                        this.expandImage(link.result.link, 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);
-                                                    resolve();
-                                                });
-                                        });
-                                    });
-                                })
-                                .catch(uploadErr => {
-                                    console.log(uploadErr);
-                                    _error(res, 'upload to dropbox failed');
-                                    reject();
-                                });
-                        }
-                    });
-                }),
+                this.uploadImageToDropbox(req.body.file).then(uploadUrl =>
+                    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);
+                            });
+                    })
+                ),
         });
     }
 }