Add style name to metadata

RikudouSage · Mar 28, 2024 · 22bbb51 · 22bbb51
1 parent bad3c21
commit 22bbb51
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 1 deletion.
diff --git a/src/app/pages/generate-image/generate-image.component.ts b/src/app/pages/generate-image/generate-image.component.ts
@@ -476,6 +476,7 @@ export class GenerateImageComponent implements OnInit, OnDestroy {
       allowDowngrade: value.allowDowngrade ?? false,
       clipSkip: value.clipSkip ?? 1,
       loraList: value.loraList ?? [],
+      styleName: this.chosenStyle()?.name ?? null,
     };
   }
 

diff --git a/src/app/pages/images/images.component.html b/src/app/pages/images/images.component.html
@@ -81,6 +81,9 @@
                     </strong>
                   </p>
                 }
+                @if (image.styleName) {
+                  <p>{{'app.generate.style_name' | transloco}}: <strong>{{image.styleName}}</strong></p>
+                }
               </div>
               <div class="buttons">
                 <button class="btn btn-danger" (click)="deleteImage(image)">{{'app.delete' | transloco}}</button>

diff --git a/src/app/services/database.service.ts b/src/app/services/database.service.ts
@@ -117,6 +117,7 @@ export class DatabaseService {
       allowDowngrade: <boolean>valuesMap['allowDowngrade'] ?? DefaultGenerationOptions.allowDowngrade,
       clipSkip: <number>valuesMap['clipSkip'] ?? DefaultGenerationOptions.clipSkip,
       loraList: <LoraGenerationOption[]>valuesMap['loraList'] ?? DefaultGenerationOptions.loraList,
+      styleName: <string>valuesMap['styleName'] ?? DefaultGenerationOptions.styleName,
     };
   }
 

diff --git a/src/app/services/image-storage/dropbox.data-storage.ts b/src/app/services/image-storage/dropbox.data-storage.ts
@@ -78,6 +78,7 @@ export class DropboxDataStorage extends AbstractExternalDataStorage<DropboxCrede
           nsfw: Boolean(Number(metadata.nsfw ?? 0)),
           allowDowngrade: Boolean(Number(metadata.allowDowngrade ?? 0)),
           clipSkip: Number(metadata.clipSkip ?? 0),
+          styleName: metadata.styleName || null,
         };
       }));
     } catch (e) {
@@ -119,6 +120,7 @@ export class DropboxDataStorage extends AbstractExternalDataStorage<DropboxCrede
       width: String(image.width),
       id: image.id!,
       worker: `${image.worker.name},${image.worker.id}`,
+      styleName: String(image.styleName),
     };
     await Promise.all([
       this.uploadFile(`images/${image.id}.webp`, image.data, metadata),

diff --git a/src/app/services/image-storage/google-drive.data-storage.ts b/src/app/services/image-storage/google-drive.data-storage.ts
@@ -107,6 +107,7 @@ export class GoogleDriveDataStorage extends AbstractExternalDataStorage<GoogleDr
       loras: JSON.stringify(image.loraList),
       googleApiId: result.id,
       clipSkip: String(image.clipSkip),
+      styleName: String(image.styleName),
     };
 
     await this.storeOption(`image.metadata.${image.id}`, metadata);
@@ -174,6 +175,7 @@ export class GoogleDriveDataStorage extends AbstractExternalDataStorage<GoogleDr
         nsfw: Boolean(Number(metadata['nsfw'] ?? 0)),
         allowDowngrade: Boolean(Number(metadata['allowDowngrade'] ?? 0)),
         clipSkip: Number(metadata['clipSkip'] ?? 0),
+        styleName: metadata['styleName'] || null,
       }
     }));
   }

diff --git a/src/app/services/image-storage/s3.data-storage.ts b/src/app/services/image-storage/s3.data-storage.ts
@@ -59,6 +59,7 @@ export const S3CorsConfig = [
       "x-amz-meta-nsfw",
       "x-amz-meta-clipskip",
       "x-amz-meta-loras",
+      "x-amz-meta-stylename",
     ],
   },
 ];
@@ -182,6 +183,7 @@ export class S3DataStorage extends AbstractExternalDataStorage<S3Credentials> {
         nsfw: Boolean(Number(image.Metadata!['nsfw'] ?? 0)),
         allowDowngrade: Boolean(Number(image.Metadata!['allowdowngrade'] ?? 0)),
         clipSkip: Number(image.Metadata!['clipskip'] ?? 1),
+        styleName: image.Metadata!['stylename'] || null,
       }
     });
   }
@@ -225,6 +227,7 @@ export class S3DataStorage extends AbstractExternalDataStorage<S3Credentials> {
       trustedWorkers: String(Number(image.trustedWorkers)),
       nsfw: String(Number(image.nsfw)),
       clipSkip: String(image.clipSkip),
+      styleName: String(image.styleName),
     }
 
     await client.send(new PutObjectCommand({

diff --git a/src/app/types/db/generation-options.ts b/src/app/types/db/generation-options.ts
@@ -31,6 +31,7 @@ export interface GenerationOptions {
   allowDowngrade: boolean;
   clipSkip: number;
   loraList: LoraGenerationOption[];
+  styleName: string | null;
 }
 
 export const DefaultGenerationOptions: GenerationOptions = {
@@ -55,4 +56,5 @@ export const DefaultGenerationOptions: GenerationOptions = {
   allowDowngrade: false,
   clipSkip: 1,
   loraList: [],
+  styleName: null,
 };
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -209,5 +209,6 @@
   "app.generate.no_commercial": "This model does not allow commercial use, please make sure you only use it in a non-commercial way.",
   "app.worker.pause": "Pause worker",
   "app.worker.resume": "Resume worker",
-  "app.lora.broken": "The CivitAI api is currently broken and you can only see the latest version of a LoRa. This needs to be fixed on CivitAI's side and there's nothing we can do."
+  "app.lora.broken": "The CivitAI api is currently broken and you can only see the latest version of a LoRa. This needs to be fixed on CivitAI's side and there's nothing we can do.",
+  "app.generate.style_name": "Style name"
 }