@datawheel/bespoke 0.3.21 → 0.4.0

package/dist/server.js

@@ -11,7 +11,7 @@ import { formatAbbreviate } from 'd3plus-format';
 import { date } from 'd3plus-axis';
 import { assign, closest, merge, isObject } from 'd3plus-common';
 import { strip, titleCase } from 'd3plus-text';
-import axios5 from 'axios';
+import axios6 from 'axios';
 import slugifyFn from 'slugify';
 import lunr from 'lunr';
 import lunrStemmer from 'lunr-languages/lunr.stemmer.support';
@@ -24,6 +24,7 @@ import { createContext, createElement } from 'react';
 import { renderToString } from 'react-dom/server';
 import * as allIcons from '@tabler/icons-react';
 import NextCors from 'nextjs-cors';
+import imageType from 'image-type';
 import formidable from 'formidable';
 import puppeteer from 'puppeteer';
 import DomParser from 'dom-parser';
@@ -1338,10 +1339,10 @@ var getDB = () => {
 // libs/configs/getLocales.ts
 var getLocales_default = () => {
   const localeDefault11 = process.env.NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT || "en";
-  const locales9 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault11];
-  if (!locales9.includes(localeDefault11))
-    locales9.push(localeDefault11);
-  return { localeDefault: localeDefault11, locales: locales9 };
+  const locales10 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault11];
+  if (!locales10.includes(localeDefault11))
+    locales10.push(localeDefault11);
+  return { localeDefault: localeDefault11, locales: locales10 };
 };
 
 // libs/js/stripHTML.ts
@@ -1390,14 +1391,25 @@ function slugify(str) {
 }
 var slugify_default = slugify;
 
+// libs/settings/variant.tsx
+var getVariantSettingsDefaults = (settings) => ({
+  overrideNames: settings && typeof settings.overrideNames !== "undefined" ? settings.overrideNames : false,
+  overrideRelevance: settings && typeof settings.overrideRelevance !== "undefined" ? settings.overrideRelevance : false,
+  regenerateSlugs: settings && typeof settings.regenerateSlugs !== "undefined" ? settings.regenerateSlugs : false,
+  keepOldMembers: settings && typeof settings.keepOldMembers !== "undefined" ? settings.keepOldMembers : true,
+  doIngest: settings && typeof settings.doIngest !== "undefined" ? settings.doIngest : false,
+  overrideAttributes: settings && typeof settings.overrideAttributes !== "undefined" ? settings.overrideAttributes : false
+});
+
 // api/db/member/ingestMembers.ts
 var { localeDefault } = getLocales_default();
 function ingestMembersFactory(db) {
   const { search: Search, search_content: SearchContent } = db;
   return ingestMembers;
   async function ingestMembers(variant) {
-    const { id, config = {} } = variant;
+    const { id, config = {}, settings = {} } = variant;
     const defaultLocale = config[localeDefault] ? localeDefault : Object.keys(config)[0];
+    const { overrideNames, overrideAttributes } = getVariantSettingsDefaults(settings);
     const {
       accessor,
       path,
@@ -1406,15 +1418,24 @@ function ingestMembersFactory(db) {
     } = config[localeDefault];
     if (!path || !idKey || !labelKey)
       return;
-    const memberFetch = await axios5.get(path).catch((e) => ({ data: [], error: e }));
+    const memberFetch = await axios6.get(path).catch((e) => ({ data: [], error: e }));
     const members = keyDiver(memberFetch.data, accessor);
+    let toUpdateContent = [];
     try {
-      await ingestDefaultMembers(variant, defaultLocale, members);
+      toUpdateContent = await ingestDefaultMembers(variant, defaultLocale, members);
     } catch (error) {
       const errorMsg = `[ERROR] Ingesting default member items for ${defaultLocale}`;
       console.error(errorMsg, error);
       throw new BackendError(500, errorMsg);
     }
+    const contentHash = await Search.findAll({ where: { variant_id: id } }).then((arr) => Object.fromEntries(
+      arr.map(
+        (content) => [
+          content.id,
+          { content_id: content.content_id, needsUpdate: toUpdateContent.includes(content.content_id) }
+        ]
+      )
+    ));
     const ingestions = Object.entries(config).map(async ([locale, config2]) => {
       const {
         path: path2,
@@ -1425,24 +1446,45 @@ function ingestMembersFactory(db) {
       } = config2;
       if (!path2 || !idKey2 || !labelKey2)
         return;
-      const memberFetch2 = await axios5.get(path2).catch((e) => ({ data: [], error: e }));
+      const memberFetch2 = await axios6.get(path2).catch((e) => ({ data: [], error: e }));
       const members2 = keyDiver(memberFetch2.data, accessor2);
-      const contentHash = await Search.findAll({ where: { variant_id: id } }).then((arr) => Object.fromEntries(
-        arr.map((content) => [content.id, content.content_id])
-      ));
-      const contentMembers = members2.filter((member) => member[idKey2] && member[idKey2] !== "" && member[labelKey2] && member[labelKey2] !== "").map((d) => ({
-        id: contentHash[d[idKey2]],
-        locale,
-        name: d[labelKey2],
-        attributes: Object.fromEntries(
+      const oldIngestedContents = await SearchContent.findAll({
+        // attributes: ["id", "zvalue", "slug"],
+        where: { id: toUpdateContent, locale }
+      }).then((arr) => Object.fromEntries(arr.map((item) => {
+        return [item.id, item.toJSON()];
+      })));
+      const contentMembers = members2.filter((member) => member[idKey2] && member[idKey2] !== "" && member[labelKey2] && member[labelKey2] !== "").map((d) => {
+        const searchElement = contentHash[d[idKey2]];
+        let contentMember;
+        const calculatedAttributes = Object.fromEntries(
           attributes.map((attr) => [
             attr.name,
             attr.type === "constant" ? attr.value : d[attr.value] || ""
           ])
-        )
-      }));
+        );
+        if (searchElement.needsUpdate && oldIngestedContents[searchElement.content_id]) {
+          contentMember = {
+            ...oldIngestedContents[searchElement.content_id]
+          };
+          if (overrideNames) {
+            contentMember.name = d[labelKey2];
+          }
+          if (overrideAttributes) {
+            contentMember.attributes = calculatedAttributes;
+          }
+        } else {
+          contentMember = {
+            id: searchElement.content_id,
+            locale,
+            name: d[labelKey2],
+            attributes: calculatedAttributes
+          };
+        }
+        return contentMember;
+      });
       try {
-        await SearchContent.bulkCreate(contentMembers);
+        return SearchContent.bulkCreate(contentMembers, { updateOnDuplicate: ["name", "attributes"] });
       } catch (error) {
         const errorMsg = `[ERROR] Ingesting search content items for ${locale}`;
         console.error(errorMsg, error);
@@ -1455,7 +1497,14 @@ function ingestMembersFactory(db) {
     const { id, dimension_id, slug } = variant;
     const { report_id } = variant.dimension;
     const { idKey, labelKey, zValueKey } = variant.config[locale];
-    const allSlugsFromOtherMembers = await Search.findAll({
+    const {
+      overrideNames,
+      regenerateSlugs,
+      keepOldMembers,
+      overrideRelevance,
+      overrideAttributes
+    } = getVariantSettingsDefaults(variant.settings);
+    const allSlugsFromOtherMembersQuery = Search.findAll({
       attributes: ["slug", [fn("COUNT", col("variant.id")), "slugCount"]],
       include: {
         association: "variant",
@@ -1469,6 +1518,17 @@ function ingestMembersFactory(db) {
       const count = item.getDataValue("slugCount");
       return [item.slug, Number.parseInt(`${count}`, 10)];
     })));
+    const oldIngestedMembersQuery = Search.findAll({
+      // attributes: ["id", "zvalue", "slug"],
+      where: { variant_id: id }
+    }).then((arr) => Object.fromEntries(arr.map((item) => {
+      return [item.id, item.toJSON()];
+    })));
+    const [allSlugsFromOtherMembers, oldIngestedMembers] = await Promise.all([
+      allSlugsFromOtherMembersQuery,
+      oldIngestedMembersQuery
+    ]);
+    const oldIngestedSlugs = Object.values(oldIngestedMembers).map((m) => m.slug);
     const toIngestSlugs = [];
     let minValue = null;
     let maxValue = null;
@@ -1485,16 +1545,15 @@ function ingestMembersFactory(db) {
         }
       }
     }
-    const searchMembers = members.map((member) => {
+    const toInsert = [];
+    const toUpdate = [];
+    const toUpdateContent = [];
+    let toUpdateFlag = false;
+    members.forEach((member) => {
       const memberId = member[idKey];
       const slug2 = slugify_default(member[labelKey]);
-      const hasDuplicateSlug = allSlugsFromOtherMembers[slug2] || toIngestSlugs.includes(slug2);
-      if (hasDuplicateSlug) {
-        console.log("Duplicate slug!", slug2, "replaced by", `${slug2}-${memberId}`);
-      }
-      const validateSlug = hasDuplicateSlug ? `${slug2}-${memberId}` : slug2;
-      toIngestSlugs.push(slug2);
-      let zvalue = Math.random();
+      toUpdateFlag = false;
+      let zvalue = parseFloat(Math.random().toPrecision(5));
       if (zValueKey && zValueKey !== "" && minValue && maxValue && member[zValueKey]) {
         let value;
         try {
@@ -1505,18 +1564,79 @@ function ingestMembersFactory(db) {
         const indexedValue = maxValue !== null && minValue !== null && maxValue !== minValue ? (value - minValue) / (maxValue - minValue) : 0;
         zvalue = maxValue === minValue ? 1 : parseFloat(indexedValue.toPrecision(5));
       }
-      return {
-        id: memberId,
-        slug: validateSlug,
-        variant_id: id,
-        dimension_id,
-        report_id,
-        zvalue
-      };
+      if (oldIngestedMembers[memberId]) {
+        if (overrideNames || regenerateSlugs || overrideRelevance || overrideAttributes) {
+          const memberToBeUpdated = oldIngestedMembers[memberId];
+          if (overrideNames || overrideAttributes) {
+            toUpdateContent.push(memberToBeUpdated.content_id);
+          }
+          if (overrideNames) {
+            if (regenerateSlugs) {
+              const oldIngestedSlugsButNotCurrent = Object.values(oldIngestedMembers).filter((m) => m.id !== memberId).map((m) => m.slug);
+              const hasDuplicateSlug = allSlugsFromOtherMembers[slug2] || oldIngestedSlugsButNotCurrent.includes[slug2] || toIngestSlugs.includes(slug2);
+              if (hasDuplicateSlug) {
+                console.log("Duplicate slug!", slug2, "replaced by", `${slug2}-${memberId}`);
+              }
+              const validateSlug = hasDuplicateSlug ? `${slug2}-${memberId}` : slug2;
+              if (memberToBeUpdated.slug !== validateSlug) {
+                memberToBeUpdated.slug = validateSlug;
+                toIngestSlugs.push(slug2);
+                toUpdateFlag = true;
+                console.log("UPDATE SLUG", memberId, slug2);
+              }
+            }
+          }
+          if (zValueKey && zValueKey !== "" && overrideRelevance) {
+            if (memberToBeUpdated.zvalue !== zvalue) {
+              memberToBeUpdated.zvalue = zvalue;
+              toUpdateFlag = true;
+              console.log("UPDATE ZVALUE", memberId, zvalue);
+            }
+          }
+          if (toUpdateFlag) {
+            toUpdate.push(memberToBeUpdated);
+          }
+        }
+      } else {
+        console.log("INSERT ID", memberId);
+        const hasDuplicateSlug = allSlugsFromOtherMembers[slug2] || oldIngestedSlugs.includes[slug2] || toIngestSlugs.includes(slug2);
+        if (hasDuplicateSlug) {
+          console.log("Duplicate slug!", slug2, "replaced by", `${slug2}-${memberId}`);
+        }
+        const validateSlug = hasDuplicateSlug ? `${slug2}-${memberId}` : slug2;
+        toIngestSlugs.push(slug2);
+        toInsert.push({
+          id: memberId,
+          slug: validateSlug,
+          variant_id: id,
+          dimension_id,
+          report_id,
+          zvalue
+        });
+      }
     });
+    let toDelete = [];
+    if (!keepOldMembers) {
+      const newMembersIds = members.map((m) => m[idKey]);
+      toDelete = Object.keys(oldIngestedMembers).filter((id2) => !newMembersIds.includes(id2));
+    }
     try {
-      await Search.destroy({ where: { variant_id: id } });
-      await Search.bulkCreate(searchMembers);
+      if (toInsert.length > 0 || toUpdate.length > 0) {
+        await Search.bulkCreate([...toInsert, ...toUpdate], { updateOnDuplicate: ["slug", "zvalue"] });
+        console.log("New members ingested:", toInsert.length);
+        console.log("New members updated:", toUpdate.length);
+      }
+      if (toDelete.length > 0) {
+        await Search.destroy({
+          where: {
+            id: {
+              [Op.in]: toDelete
+            }
+          }
+        });
+        console.log("Old members deleted:", toDelete.length);
+      }
+      return toUpdateContent;
     } catch (error) {
       console.error(`[ERROR] Ingesting search members for ${locale}`, error);
       throw new Error(error);
@@ -2093,12 +2213,12 @@ function dbBlockFactory(db) {
     deleteBlock
   };
   async function createBlock(data) {
-    const { locales: locales9, ...blockData } = data;
+    const { locales: locales10, ...blockData } = data;
     const entity = await Block.create({
       ...blockData,
       consumers: [],
       inputs: [],
-      contentByLocale: locales9.map((locale) => ({ locale }))
+      contentByLocale: locales10.map((locale) => ({ locale }))
     }, {
       include: blockQuery.include
     });
@@ -2266,7 +2386,7 @@ function dbReportFactory(db) {
   async function readReport({
     id,
     include,
-    locales: locales9 = reportLocales
+    locales: locales10 = reportLocales
   } = {}) {
     const allIdsList = id == null ? [] : [].concat(id);
     const idList = allIdsList.reduce((uniques, currentValue) => {
@@ -2290,7 +2410,7 @@ function dbReportFactory(db) {
               ...block,
               contentByLocale: Object.keys(block.contentByLocale).reduce((filteredContent, locale) => ({
                 ...filteredContent,
-                ...[...locales9, "logic"].includes(locale) ? { [locale]: block.contentByLocale[locale] } : {}
+                ...[...locales10, "logic"].includes(locale) ? { [locale]: block.contentByLocale[locale] } : {}
               }), {})
             }))
           }))
@@ -2410,9 +2530,14 @@ function dbVariantFactory(db, crud) {
       include: [{ association: "dimension" }],
       rejectOnEmpty: true
     });
-    entity.update(variantData);
-    await crud.ingestMembers(entity);
-    await search_default2(db, true);
+    variantData.settings = getVariantSettingsDefaults(variantData.settings);
+    const doIngest = variantData.settings.doIngest;
+    variantData.settings.doIngest = false;
+    await entity.update(variantData);
+    if (doIngest) {
+      await crud.ingestMembers(entity);
+      await search_default2(db, true);
+    }
     await entity.reload();
     return entity.toJSON();
   }
@@ -2508,12 +2633,16 @@ var uploadImage = async (db, id, imageData) => {
     { type: "thumb", res: thumbWidth }
   ];
   for (const config of configs) {
-    const buffer = await sharp(imageData).resize(config.res).toFormat("jpeg").jpeg({ force: true }).toBuffer().catch(catcher);
+    const buffer = await sharp(imageData).resize(config.res).toFormat("webp").webp({ lossless: true }).toBuffer().catch(catcher);
     await db.image.update({ [config.type]: buffer }, { where: { id } }).catch(catcher);
   }
 };
 var uploadImage_default = uploadImage;
 
+// libs/consts.ts
+var apiSeparator = "|||";
+var imagesPageSize = 24;
+
 // api/db/image/providers/flickr.ts
 var validLicenses = ["4", "5", "7", "8", "9", "10"];
 var validLicensesString = validLicenses.join();
@@ -2527,10 +2656,11 @@ if (process.env.FLICKR_API_KEY) {
     throw new Error(e.message);
   }
 }
-async function searchFlickrProvider(db, params) {
+async function searchFlickrProvider(_db, params) {
   try {
     const searchParams = {
-      prompt: params.prompt || ""
+      prompt: params.prompt || "",
+      page: params.page || 1
     };
     if (!flickr) {
       console.log("Flickr is not initialized. Check the credentials");
@@ -2540,7 +2670,11 @@ async function searchFlickrProvider(db, params) {
     const result = await flickr.photos.search({
       text: q,
       license: validLicensesString,
-      sort: "relevance"
+      sort: "relevance",
+      per_page: imagesPageSize,
+      page: searchParams.page,
+      content_types: "0",
+      orientation: "landscape"
     }).then((resp) => resp.body);
     const photos = result.photos.photo;
     const fetches = photos.reduce(
@@ -2560,7 +2694,8 @@ async function searchFlickrProvider(db, params) {
     }, []);
     return {
       meta: {
-        prompt: stripHTML(searchParams.prompt)
+        prompt: stripHTML(searchParams.prompt),
+        page: stripHTML(`${searchParams.page}`)
       },
       results: imagesResults
     };
@@ -2608,7 +2743,7 @@ async function saveFlickrProvider(db, params) {
             if (!image || !image.source) {
               throw new Error("Flickr Source Error, try another image.");
             }
-            const imageData = await axios5.get(image.source, { responseType: "arraybuffer" }).then((d) => d.data);
+            const imageData = await axios6.get(image.source, { responseType: "arraybuffer" }).then((d) => d.data);
             const allLicenses = await flickr.photos.licenses.getInfo().then((resp) => resp.body.licenses.license);
             const currentPhotoLicense = allLicenses.find((l) => l.id === parseInt(info.photo.license, 10));
             const payload = {
@@ -2732,9 +2867,9 @@ function endpointMemberFactory(operations) {
     /*
      *  Get image file itself
      *  Example queries:
-     *  /api/cms/member/image.png?member=1&format=thumb
+     *  /api/cms/member/image?member=1&format=thumb
      */
-    endpoint("GET", "member/image.png", (req) => {
+    endpoint("GET", "member/image", (req) => {
       const size = normalizeList(req.query.size)[0];
       return readMemberImage({
         member: parseFiniteNumber(req.query.member),
@@ -2847,7 +2982,7 @@ async function searchLocalProvider(db, params) {
   const resultsFromProfiles = await dbSearchMember(searchParams);
   const imagesResults = resultsFromProfiles.results.filter((member) => member.image_id).map((member) => ({
     id: member.image_id,
-    source: `/api/cms/member/image.png?member=${member.content_id}&size=thumb`
+    source: `/api/cms/member/image?member=${member.content_id}&size=thumb`
   }));
   return {
     meta: {
@@ -2895,10 +3030,11 @@ if (process.env.UNSPLASH_API_KEY) {
     throw new Error(e.message);
   }
 }
-async function searchUnsplashProvider(db, params) {
+async function searchUnsplashProvider(_db, params) {
   try {
     const searchParams = {
-      prompt: params.prompt || ""
+      prompt: params.prompt || "",
+      page: params.page || 1
     };
     if (!unsplash) {
       throw new Error("Unsplash API Key not configured");
@@ -2906,8 +3042,9 @@ async function searchUnsplashProvider(db, params) {
     const q = searchParams.prompt;
     const result = await unsplash.search.getPhotos({
       query: q,
-      perPage: 30
-      // max
+      perPage: imagesPageSize,
+      page: searchParams.page,
+      orientation: "landscape"
     }).then((resp) => resp.response.results);
     const imagesResults = result.map((image) => ({
       id: image.id,
@@ -2915,7 +3052,8 @@ async function searchUnsplashProvider(db, params) {
     }));
     return {
       meta: {
-        prompt: stripHTML(searchParams.prompt)
+        prompt: stripHTML(searchParams.prompt),
+        page: stripHTML(`${searchParams.page}`)
       },
       results: imagesResults
     };
@@ -2946,7 +3084,7 @@ async function saveUnsplashProvider(db, params) {
           if (imageRow) {
             await db.search.update({ image_id: imageRow.id }, { where: { content_id } });
           } else {
-            const imageData = await axios5.get(info.urls.full, { responseType: "arraybuffer" }).then((d) => d.data);
+            const imageData = await axios6.get(info.urls.full, { responseType: "arraybuffer" }).then((d) => d.data);
             const payload = {
               url,
               author: info.user.name || info.user.username,
@@ -3033,13 +3171,156 @@ async function saveUploadProvider(db, params) {
     throw new Error("Error in save upload provider");
   }
 }
+var { locales: locales5 } = getLocales_default();
+var getHeaders = async (token) => {
+  const baseHeaders = {
+    "x-api-key": process.env.ADOBE_STOCK_API_KEY || "EMPTY_ADOBE_KEY",
+    "X-Product": "BespokeApp/0.1"
+  };
+  if (token) {
+    baseHeaders["Authorization"] = `Bearer ${token}`;
+  }
+  return baseHeaders;
+};
+var adobe;
+if (process.env.ADOBE_STOCK_API_KEY) {
+  try {
+    adobe = {
+      search: async (terms, page) => await axios6.get("https://stock.adobe.io/Rest/Media/1/Search/Files", {
+        headers: await getHeaders(false),
+        params: {
+          locale: "en_US",
+          "search_parameters[limit]": imagesPageSize,
+          "search_parameters[offset]": page * imagesPageSize,
+          "search_parameters[words]": terms,
+          "search_parameters[filters][content_type:photo]": "1",
+          "search_parameters[filters][content_type:image]": "1",
+          "search_parameters[filters][orientation]": "horizontal",
+          result_columns: ["id", "stock_id", "thumbnail_url", "is_licensed"]
+        }
+      }).then((resp) => resp.data.files),
+      get: async (imageId) => {
+        return await axios6.get("https://stock.adobe.io/Rest/Media/1/Files", {
+          headers: await getHeaders(false),
+          params: {
+            locale: "en_US",
+            ids: imageId,
+            result_columns: [
+              "id",
+              "thumbnail_url",
+              "creator_name",
+              "title",
+              "thumbnail_1000_url",
+              "details_url",
+              "category"
+            ]
+          }
+        }).then((resp) => resp.data.files[0]);
+      }
+    };
+  } catch (e) {
+  }
+}
+async function searchAdobeProvider(_db, params) {
+  try {
+    const searchParams = {
+      prompt: params.prompt || "",
+      page: params.page || 1
+    };
+    if (!adobe) {
+      throw new Error("Adobe API Key not configured");
+    }
+    const result = await adobe.search(searchParams.prompt, searchParams.page);
+    const imagesResults = result.map((image) => ({
+      id: image.id,
+      source: image.thumbnail_url
+    }));
+    return {
+      meta: {
+        prompt: stripHTML(searchParams.prompt),
+        page: stripHTML(`${searchParams.page}`)
+      },
+      results: imagesResults
+    };
+  } catch (error) {
+    console.log(error);
+    throw new Error("Error in search Adobe provider");
+  }
+}
+async function saveAdobeProvider(db, params) {
+  try {
+    const { content_id, image_id } = params;
+    const saveParams = {
+      content_id: stripHTML(`${content_id}`) || "",
+      id: stripHTML(`${image_id}`) || ""
+    };
+    if (!adobe) {
+      console.log("Adobe is not initialized. Check the credentials");
+      throw new Error("Adobe is not initialized. Check the credentials");
+    }
+    const info = await adobe.get(image_id);
+    let newRow;
+    if (info) {
+      if (true) {
+        const searchRow = await db.search.findOne({ where: { content_id } });
+        const url = info.details_url;
+        const imageRow = await db.image.findOne({ where: { url } });
+        if (searchRow) {
+          if (imageRow) {
+            await db.search.update({ image_id: imageRow.id }, { where: { content_id } });
+          } else {
+            const imageData = await axios6.get(info.thumbnail_1000_url, { responseType: "arraybuffer" }).then((d) => d.data);
+            const payload = {
+              url,
+              author: info.creator_name,
+              license: "ADOBE, TO-DO"
+              // TO-DO add authorization to be able to filter by license and save the full picture with no watermark
+            };
+            const newImage = await db.image.create(payload);
+            await db.image_content.destroy({ where: { id: newImage.id } });
+            const contentPayload = locales5.map((locale) => ({
+              id: newImage.id,
+              locale,
+              meta: info.title || info.description
+              // TODO include tags
+            }));
+            await db.image_content.bulkCreate(contentPayload);
+            await db.search.update({ image_id: newImage.id }, { where: { content_id } });
+            await uploadImage_default(db, newImage.id, imageData);
+          }
+          const newRow2 = await db.search.findOne({
+            where: { content_id },
+            include: imageQueryThumbOnly
+          });
+          if (newRow2 && newRow2.image) {
+            newRow2.image.thumb = Boolean(newRow2.image.thumb);
+          }
+        } else {
+          throw new Error("Error updating Search");
+        }
+      }
+    } else {
+      throw new Error("Malformed URL");
+    }
+    return {
+      meta: {
+        ...saveParams
+      },
+      results: newRow
+    };
+  } catch (error) {
+    console.log(error);
+    throw new Error("Error in save adobe provider");
+  }
+}
 
 // api/db/image/imageSave.ts
 var saveProviders = {
   local: saveLocalProvider,
   flickr: saveFlickrProvider,
   unsplash: saveUnsplashProvider,
-  upload: saveUploadProvider
+  upload: saveUploadProvider,
+  adobe: saveAdobeProvider
 };
 function dbImageSaveFactory(db, provider) {
   const saveProvider = saveProviders[provider];
@@ -3053,7 +3334,8 @@ function dbImageSaveFactory(db, provider) {
 var searchProviders = {
   local: searchLocalProvider,
   flickr: searchFlickrProvider,
-  unsplash: searchUnsplashProvider
+  unsplash: searchUnsplashProvider,
+  adobe: searchAdobeProvider
 };
 function dbImageSearchFactory(db, provider) {
   const searchProvider = searchProviders[provider];
@@ -3101,7 +3383,7 @@ function dbRegenerateSearchFactory(db) {
 }
 
 // api/db/searchReport.ts
-var { locales: locales5, localeDefault: localeDefault4 } = getLocales_default();
+var { locales: locales6, localeDefault: localeDefault4 } = getLocales_default();
 var addProfilesData = (items, metadata) => {
   if (!items)
     return [];
@@ -3168,7 +3450,7 @@ function dbSearchReportFactory(db) {
   return dbSearchReport;
   async function dbSearchReport(params) {
     const format = params.format || "results";
-    const locale = locales5.includes(params.locale) ? params.locale : localeDefault4;
+    const locale = locales6.includes(params.locale) ? params.locale : localeDefault4;
     const memberSearchResponse = await dbSearchMember({
       ...params,
       format: "plain",
@@ -3194,7 +3476,7 @@ function dbUrlProxyFactory() {
   return async (request) => {
     const config = typeof request === "string" ? { url: request } : request;
     try {
-      const response = await axios5.request(config);
+      const response = await axios6.request(config);
       return {
         ok: true,
         status: response.status,
@@ -3396,10 +3678,12 @@ function apiFactory(dbModels) {
     imageFlickrSearch: dbImageSearchFactory(dbModels, "flickr"),
     imageLocalSearch: dbImageSearchFactory(dbModels, "local"),
     imageUnsplashSearch: dbImageSearchFactory(dbModels, "unsplash"),
+    imageAdobeSearch: dbImageSearchFactory(dbModels, "adobe"),
     imageFlickrSave: dbImageSaveFactory(dbModels, "flickr"),
     imageLocalSave: dbImageSaveFactory(dbModels, "local"),
     imageUnsplashSave: dbImageSaveFactory(dbModels, "unsplash"),
     imageUploadSave: dbImageSaveFactory(dbModels, "upload"),
+    imageAdobeSave: dbImageSaveFactory(dbModels, "adobe"),
     urlProxy: dbUrlProxyFactory(),
     searchRole: resultWrapper(dbSearchRole()),
     searchUser: resultWrapper(dbSearchUser()),
@@ -3498,7 +3782,7 @@ function endpointImageSearchFactory(operations, provider) {
     if (!prompt) {
       throw new BackendError(400, "Empty 'prompt' param.");
     }
-    return searchMethod({ prompt });
+    return searchMethod({ prompt, page: parseFiniteNumber(req.query.page) });
   }, [CMS_ROLES.EDITOR]);
 }
 
@@ -3921,9 +4205,11 @@ function getEndpointMap(db) {
     endpointImageSaveFactory(api, "local"),
     endpointImageSaveFactory(api, "unsplash"),
     endpointImageSaveFactory(api, "upload"),
+    endpointImageSaveFactory(api, "adobe"),
     endpointImageSearchFactory(api, "flickr"),
     endpointImageSearchFactory(api, "local"),
     endpointImageSearchFactory(api, "unsplash"),
+    endpointImageSearchFactory(api, "adobe"),
     endpointUrlProxyFactory(api),
     endpointGetRolesFactory(api),
     endpointGetUsersFactory(api),
@@ -3968,15 +4254,23 @@ async function endpointNextJsHandlerFactory(req, res) {
         if (["POST", "DELETE"].includes(method)) {
           req.body = await parseBody(req);
         }
-        return Promise.resolve(req).then((req2) => handlerObj.handler(req2, res, session ? session : void 0)).then((result) => {
+        return Promise.resolve(req).then((req2) => handlerObj.handler(req2, res, session ? session : void 0)).then(async (result) => {
           if (result && "error" in result) {
             throw new BackendError(result.status, result.error);
           }
-          if (result.ok && req.url) {
+          if (result.ok) {
             if (result.data instanceof Buffer) {
-              const image = result.data;
-              res.writeHead(result.status, { "Content-Type": "image/png" }).end(image, "binary");
-            } else if (req.url.indexOf("/icon.svg?name=") > 0) {
+              const type = await imageType(result.data);
+              const contentLength = Buffer.byteLength(result.data);
+              res.writeHead(
+                result.status,
+                {
+                  "Content-Type": type ? type.mime : "image/jpeg",
+                  // Default for legacy
+                  "Content-Length": contentLength.toString()
+                }
+              ).send(result.data);
+            } else if (req.url && req.url.indexOf("/icon.svg?name=") > 0) {
               res.setHeader("Content-Type", "image/svg+xml");
               res.status(result.status).send(result.data);
             } else {
@@ -4041,8 +4335,8 @@ __export(actions_exports, {
 });
 
 // api/http/lib.ts
-function http(axios6, config) {
-  return axios6.request(config).then((response) => {
+function http(axios7, config) {
+  return axios7.request(config).then((response) => {
     const { status, data } = response;
     return "error" in data ? { ok: false, status, error: data.error } : { ok: true, status, data: data.data };
   }, (err) => {
@@ -4053,26 +4347,26 @@ function http(axios6, config) {
     return { ok: false, status: 500, error: err.message };
   });
 }
-function httpGET(axios6, request, transformParams) {
+function httpGET(axios7, request, transformParams) {
   const config = typeof request === "string" ? { url: request } : request;
-  return (params) => http(axios6, {
+  return (params) => http(axios7, {
     ...config,
     method: "GET",
     params: transformParams ? transformParams(params) : params
   });
 }
-function httpPOST(axios6, request, transformPayload) {
+function httpPOST(axios7, request, transformPayload) {
   const config = typeof request === "string" ? { url: request } : request;
-  return (payload) => http(axios6, {
+  return (payload) => http(axios7, {
     ...config,
     method: "POST",
     data: transformPayload ? transformPayload(payload) : payload
   });
 }
-function httpDELETE(axios6, request, transformPayload) {
+function httpDELETE(axios7, request, transformPayload) {
   const config = typeof request === "string" ? { url: request } : request;
   return (payload) => {
-    return http(axios6, {
+    return http(axios7, {
       ...config,
       method: "DELETE",
       params: transformPayload ? transformPayload(payload) : payload
@@ -4081,26 +4375,26 @@ function httpDELETE(axios6, request, transformPayload) {
 }
 
 // api/http/image/imageSave.ts
-function httpImageSaveFactory(axios6, provider) {
-  return (params) => http(axios6, {
-    method: "GET",
-    url: `search/images/${provider}`,
+function httpImageSaveFactory(axios7, provider) {
+  return (params) => http(axios7, {
+    method: "POST",
+    url: `images/save/${provider}`,
     params: { prompt: params.prompt, provider }
   });
 }
 
 // api/http/image/imageSearch.ts
-function httpImageSearchFactory(axios6, provider) {
-  return (params) => http(axios6, {
+function httpImageSearchFactory(axios7, provider) {
+  return (params) => http(axios7, {
     method: "GET",
-    url: `search/images/${provider}`,
-    params: { prompt: params.prompt, provider }
+    url: `images/search/${provider}`,
+    params: { prompt: params.prompt, page: params.page, provider }
   });
 }
 
 // api/http/icon/listIcons.ts
-function httpListIconsFactory(axios6, provider) {
-  return () => http(axios6, {
+function httpListIconsFactory(axios7, provider) {
+  return () => http(axios7, {
     method: "GET",
     url: `list/icons/${provider}`,
     params: { provider }
@@ -4108,8 +4402,8 @@ function httpListIconsFactory(axios6, provider) {
 }
 
 // api/http/icon/readIcon.ts
-function httpReadIconFactory(axios6, provider) {
-  return (params) => http(axios6, {
+function httpReadIconFactory(axios7, provider) {
+  return (params) => http(axios7, {
     method: "GET",
     url: `read/icons/${provider}/icon.svg`,
     params: { name: params.name }
@@ -4133,61 +4427,63 @@ var transformReadMembers = (params) => {
   return { ...params, [params.mode]: params[params.mode].join(",") };
 };
 function apiFactory2(baseURL) {
-  const axios6 = axios5.create({ baseURL });
+  const axios7 = axios6.create({ baseURL });
   return {
-    createBlock: httpPOST(axios6, "create/block"),
-    createDimension: httpPOST(axios6, "create/dimension"),
-    createFormatter: httpPOST(axios6, "create/formatter"),
-    createReport: httpPOST(axios6, "create/report"),
-    createSection: httpPOST(axios6, "create/section"),
-    createVariant: httpPOST(axios6, "create/variant"),
-    deleteBlock: httpDELETE(axios6, "delete/block", transformDeletePayload),
-    deleteDimension: httpDELETE(axios6, "delete/dimension", transformDeletePayload),
-    deleteFormatter: httpDELETE(axios6, "delete/formatter", transformDeletePayload),
-    deleteReport: httpDELETE(axios6, "delete/report", transformDeletePayload),
-    deleteSection: httpDELETE(axios6, "delete/section", transformDeletePayload),
-    deleteVariant: httpDELETE(axios6, "delete/variant", transformDeletePayload),
-    readBlock: httpGET(axios6, "read/block"),
-    readDimension: httpGET(axios6, "read/dimension"),
-    readFormatter: httpGET(axios6, "read/formatter"),
-    readReport: httpGET(axios6, "read/report"),
-    readSection: httpGET(axios6, "read/section"),
-    readVariant: httpGET(axios6, "read/variant"),
-    updateBlock: httpPOST(axios6, "update/block"),
-    updateDimension: httpPOST(axios6, "update/dimension"),
-    updateFormatter: httpPOST(axios6, "update/formatter"),
-    updateReport: httpPOST(axios6, "update/report"),
-    updateSection: httpPOST(axios6, "update/section"),
-    updateVariant: httpPOST(axios6, "update/variant"),
-    searchReport: httpGET(axios6, "search/reports"),
-    validateVariantSlug: httpGET(axios6, "validate/variant"),
-    readMember: httpGET(axios6, "read/members", transformReadMembers),
-    readMemberImage: httpGET(axios6, {
-      url: "member/image.png",
+    createBlock: httpPOST(axios7, "create/block"),
+    createDimension: httpPOST(axios7, "create/dimension"),
+    createFormatter: httpPOST(axios7, "create/formatter"),
+    createReport: httpPOST(axios7, "create/report"),
+    createSection: httpPOST(axios7, "create/section"),
+    createVariant: httpPOST(axios7, "create/variant"),
+    deleteBlock: httpDELETE(axios7, "delete/block", transformDeletePayload),
+    deleteDimension: httpDELETE(axios7, "delete/dimension", transformDeletePayload),
+    deleteFormatter: httpDELETE(axios7, "delete/formatter", transformDeletePayload),
+    deleteReport: httpDELETE(axios7, "delete/report", transformDeletePayload),
+    deleteSection: httpDELETE(axios7, "delete/section", transformDeletePayload),
+    deleteVariant: httpDELETE(axios7, "delete/variant", transformDeletePayload),
+    readBlock: httpGET(axios7, "read/block"),
+    readDimension: httpGET(axios7, "read/dimension"),
+    readFormatter: httpGET(axios7, "read/formatter"),
+    readReport: httpGET(axios7, "read/report"),
+    readSection: httpGET(axios7, "read/section"),
+    readVariant: httpGET(axios7, "read/variant"),
+    updateBlock: httpPOST(axios7, "update/block"),
+    updateDimension: httpPOST(axios7, "update/dimension"),
+    updateFormatter: httpPOST(axios7, "update/formatter"),
+    updateReport: httpPOST(axios7, "update/report"),
+    updateSection: httpPOST(axios7, "update/section"),
+    updateVariant: httpPOST(axios7, "update/variant"),
+    searchReport: httpGET(axios7, "search/reports"),
+    validateVariantSlug: httpGET(axios7, "validate/variant"),
+    readMember: httpGET(axios7, "read/members", transformReadMembers),
+    readMemberImage: httpGET(axios7, {
+      url: "member/image",
       responseType: "blob"
     }),
-    searchMember: httpGET(axios6, "search/members"),
-    updateMember: httpGET(axios6, "update/members"),
-    imageLocalSearch: httpImageSearchFactory(axios6, "local"),
-    imageLocalSave: httpImageSaveFactory(axios6, "local"),
-    imageFlickrSearch: httpImageSearchFactory(axios6, "flickr"),
-    imageFlickrSave: httpImageSaveFactory(axios6, "flickr"),
-    imageUnsplashSearch: httpImageSearchFactory(axios6, "unsplash"),
-    imageUnsplashSave: httpImageSaveFactory(axios6, "unsplash"),
-    imageUploadSave: httpImageSaveFactory(axios6, "upload"),
-    readMetadata: httpGET(axios6, "read/metadata"),
-    regenerateSearch: httpPOST(axios6, "search/regenerate"),
-    urlProxy: httpGET(axios6, "url/proxy"),
-    searchRole: httpGET(axios6, "auth/search/roles"),
-    searchUser: httpGET(axios6, "auth/search/users"),
-    readUser: httpGET(axios6, "auth/read/user"),
-    updateUser: httpPOST(axios6, "auth/update/user"),
-    addNewReportToCurrentUser: httpPOST(axios6, "auth/update/me"),
-    revalidateReport: httpGET(axios6, "revalidate/report"),
-    revalidateUrl: httpGET(axios6, "revalidate/url"),
-    readPrivateBlocks: httpPOST(axios6, "read/blocks/private"),
-    listTablerIcons: httpListIconsFactory(axios6, "tabler"),
-    readTablerIcon: httpReadIconFactory(axios6, "tabler")
+    searchMember: httpGET(axios7, "search/members"),
+    updateMember: httpGET(axios7, "update/members"),
+    imageLocalSearch: httpImageSearchFactory(axios7, "local"),
+    imageLocalSave: httpImageSaveFactory(axios7, "local"),
+    imageFlickrSearch: httpImageSearchFactory(axios7, "flickr"),
+    imageFlickrSave: httpImageSaveFactory(axios7, "flickr"),
+    imageUnsplashSearch: httpImageSearchFactory(axios7, "unsplash"),
+    imageUnsplashSave: httpImageSaveFactory(axios7, "unsplash"),
+    imageUploadSave: httpImageSaveFactory(axios7, "upload"),
+    imageAdobeSearch: httpImageSearchFactory(axios7, "adobe"),
+    imageAdobeSave: httpImageSaveFactory(axios7, "adobe"),
+    readMetadata: httpGET(axios7, "read/metadata"),
+    regenerateSearch: httpPOST(axios7, "search/regenerate"),
+    urlProxy: httpGET(axios7, "url/proxy"),
+    searchRole: httpGET(axios7, "auth/search/roles"),
+    searchUser: httpGET(axios7, "auth/search/users"),
+    readUser: httpGET(axios7, "auth/read/user"),
+    updateUser: httpPOST(axios7, "auth/update/user"),
+    addNewReportToCurrentUser: httpPOST(axios7, "auth/update/me"),
+    revalidateReport: httpGET(axios7, "revalidate/report"),
+    revalidateUrl: httpGET(axios7, "revalidate/url"),
+    readPrivateBlocks: httpPOST(axios7, "read/blocks/private"),
+    listTablerIcons: httpListIconsFactory(axios7, "tabler"),
+    readTablerIcon: httpReadIconFactory(axios7, "tabler")
   };
 }
 
@@ -4402,9 +4698,9 @@ var selectorQueryToVariable = (id, query, config) => {
 var selectorQueryToVariable_default = selectorQueryToVariable;
 
 // libs/blocks/getBlockContent.ts
-var { localeDefault: localeDefault7, locales: locales6 } = getLocales_default();
+var { localeDefault: localeDefault7, locales: locales7 } = getLocales_default();
 var logicTypes = Object.values(BLOCK_LOGIC_TYPES);
-var getLocaleDerived = (block, locale = localeDefault7) => block && logicTypes.includes(block.type) ? { locale: BLOCK_LOGIC_LOCALE, locales: [BLOCK_LOGIC_LOCALE] } : { locale, locales: locales6 };
+var getLocaleDerived = (block, locale = localeDefault7) => block && logicTypes.includes(block.type) ? { locale: BLOCK_LOGIC_LOCALE, locales: [BLOCK_LOGIC_LOCALE] } : { locale, locales: locales7 };
 var getBlockContent = (block, _locale = localeDefault7) => {
   if (!block)
     return {};
@@ -4425,12 +4721,9 @@ function getRootBlocksForSection(sid, blocks) {
   );
 }
 var getRootBlocksForSection_default = getRootBlocksForSection;
-
-// libs/consts.ts
-var apiSeparator = "|||";
 var debug = yn2(process.env.NEXT_PUBLIC_REPORTS_DEBUG);
 var ORIGIN = process.env.REPORTS_ORIGIN || "";
-axiosRetry(axios5, {
+axiosRetry(axios6, {
   retries: 3,
   retryDelay: axiosRetry.exponentialDelay,
   onRetry: (retryCount, error, requestConfig) => {
@@ -4439,11 +4732,11 @@ axiosRetry(axios5, {
     console.log(error.message);
   }
 });
-axios5.interceptors.request.use((config) => ({
+axios6.interceptors.request.use((config) => ({
   ...config,
   requestStart: Date.now()
 }));
-axios5.interceptors.response.use((d) => ({
+axios6.interceptors.response.use((d) => ({
   ...d,
   requestDuration: (/* @__PURE__ */ new Date()).getTime() - d.config.requestStart
 }), (e) => Promise.reject(e));
@@ -4482,7 +4775,7 @@ async function apiFetch(url, settings, readMemberFn, locale = "en") {
     }
   } else {
     try {
-      const response = await axios5({
+      const response = await axios6({
         url: finalUrl,
         timeout: apiFetchTimeout
       });
@@ -5100,14 +5393,14 @@ var funcifyFormattersByLocale = (formatters = [], locale = localeDefault8) => fo
 
 // store/envvars.ts
 var localeDefault9 = process.env.NEXT_PUBLIC_REPORTS_LOCALE_DEFAULT || "en";
-var locales7 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault9];
-if (!locales7.includes(localeDefault9))
-  locales7.push(localeDefault9);
+var locales8 = process.env.NEXT_PUBLIC_REPORTS_LOCALES?.split(",") || [localeDefault9];
+if (!locales8.includes(localeDefault9))
+  locales8.push(localeDefault9);
 
 // store/statusSlice.ts
 var initialState = {
   localeDefault: localeDefault9,
-  locales: locales7,
+  locales: locales8,
   currentLocale: localeDefault9,
   showToolbar: false,
   activeSection: null,
@@ -5896,10 +6189,10 @@ function parseReportId(value) {
   const [, reportId] = Array.isArray(value) ? value : [value];
   return Number.parseInt(reportId) || void 0;
 }
-var { locales: locales8 } = getLocales_default();
+var { locales: locales9 } = getLocales_default();
 var initialContext = {
   pathSegment: "path",
-  formatterFunctions: locales8.reduce((acc, d) => ({ ...acc, [d]: {} }), {}),
+  formatterFunctions: locales9.reduce((acc, d) => ({ ...acc, [d]: {} }), {}),
   profilePrefix: "path",
   siteProps: {}
 };
@@ -5925,11 +6218,11 @@ function BespokeRendererStaticPaths(options) {
   return async (context) => {
     const {
       defaultLocale = localeDefault9,
-      locales: locales9 = []
+      locales: locales10 = []
     } = context;
     let paths = [];
     if (limit > 0) {
-      const locale = locales9.find((token) => token === defaultLocale);
+      const locale = locales10.find((token) => token === defaultLocale);
       const { searchMember: searchMember2 } = await getDB().then(apiFactory);
       const req = await searchMember2({
         query: "",
@@ -5946,7 +6239,7 @@ function BespokeRendererStaticPaths(options) {
       });
       if (req.ok === true) {
         paths = req.data.results.map((item) => ({
-          locale: locales9.find((token) => token === item.locale),
+          locale: locales10.find((token) => token === item.locale),
           params: {
             bespoke: [item.variant.slug, item.slug]
             // TODO: fix SearchResult definition