@zodic/shared 0.0.424 → 0.0.426

package/app/api/index.ts

@@ -143,9 +143,10 @@ export const Api = (env: BackendBindings) => ({
         ? negPrompt
         : 'blurry, boring, dark, low quality, lowres, grainy, distorted, overexposed, oversaturated, flat, rough, noisy, abstract, monochrome, dull, cracked, chipped, uneven, asymmetrical, deformed, pixelated, cartoonish, out of focus, messy, dull lighting, rough texture, unbalanced, low contrast, poorly drawn, faded colors, chaotic, unnatural metals, overly sharp colors, text, writing, letters, symbols, logos, watermark, calligraphy, caption, bad anatomy, malformed hands, extra fingers, missing fingers, poorly drawn face, distorted eyes, crossed eyes, out-of-proportion eyes, deformed limbs, floating limbs, disconnected limbs, mutated hands, elongated neck, unrealistic body proportions, disfigured, extra limbs, unnatural skin texture, melted features, unnatural fingers, poorly rendered hands, blurry face';
 
+      const leonardoApiKey = await env.LEONARDO_API_KEY.get();
       const endpoint = 'https://cloud.leonardo.ai/api/rest/v1/generations';
       const headers = {
-        Authorization: `Bearer ${env.LEONARDO_API_KEY}`,
+        Authorization: `Bearer ${leonardoApiKey}`,
         'Content-Type': 'application/json',
       };
 
@@ -182,25 +183,54 @@ export const Api = (env: BackendBindings) => ({
         body['init_strength'] = initStrength;
       }
 
-      try {
-        const response = await fetch(endpoint, {
-          method: 'POST',
-          headers,
-          body: JSON.stringify(body),
-        });
+      const maxRetries = 3;
+      const baseDelayMs = 2000;
 
-        if (!response.ok) {
-          const error = await response.json();
-          console.error('❌ Error from Leonardo API:', error);
-          throw new Error(`Leonardo API Error: ${response.status}`);
-        }
+      for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            headers,
+            body: JSON.stringify(body),
+          });
 
-        const data = (await response.json()) as LeonardoGenerateImageResponse;
-        return data;
-      } catch (err: any) {
-        console.error('❌ Error calling Leonardo API:', err.message);
-        throw err;
+          if (!response.ok) {
+            const error = await response.json().catch(() => ({}));
+            const isRetryable = response.status >= 500 || response.status === 429;
+
+            if (isRetryable && attempt < maxRetries) {
+              const delayMs = baseDelayMs * Math.pow(2, attempt - 1);
+              console.warn(
+                `Leonardo API ${response.status} (attempt ${attempt}/${maxRetries}), retrying in ${delayMs}ms`,
+                error
+              );
+              await new Promise((resolve) => setTimeout(resolve, delayMs));
+              continue;
+            }
+
+            console.error('❌ Error from Leonardo API:', error);
+            throw new Error(`Leonardo API Error: ${response.status}`);
+          }
+
+          const data = (await response.json()) as LeonardoGenerateImageResponse;
+          return data;
+        } catch (err: any) {
+          const isNetworkError = !err.message?.startsWith('Leonardo API Error');
+          if (isNetworkError && attempt < maxRetries) {
+            const delayMs = baseDelayMs * Math.pow(2, attempt - 1);
+            console.warn(
+              `Leonardo API network error (attempt ${attempt}/${maxRetries}), retrying in ${delayMs}ms:`,
+              err.message
+            );
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+            continue;
+          }
+          console.error('❌ Error calling Leonardo API:', err.message);
+          throw err;
+        }
       }
+
+      throw new Error('Leonardo API: max retries exhausted');
     },
 
     generatePresignedUrl: async (
@@ -211,9 +241,10 @@ export const Api = (env: BackendBindings) => ({
       key: string;
       url: string;
     }> => {
+      const leonardoApiKey = await env.LEONARDO_API_KEY.get();
       const endpoint = 'https://cloud.leonardo.ai/api/rest/v1/init-image';
       const headers = {
-        Authorization: `Bearer ${env.LEONARDO_API_KEY}`,
+        Authorization: `Bearer ${leonardoApiKey}`,
         'Content-Type': 'application/json',
       };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.424",
+  "version": "0.0.426",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {

package/types/scopes/cloudflare.ts

@@ -23,7 +23,7 @@ export type CentralBindings = {
   CONCEPTS_BUCKET: R2Bucket;
   PHOTOS_BUCKET: R2Bucket;
   WHEEL_BUCKET: R2Bucket;
-  LEONARDO_API_KEY: string;
+  LEONARDO_API_KEY: SECRETS_STORE_SECRET;
   KV_ASTRO: KVNamespace;
   KV_CONCEPT_FAILURES: KVNamespace;
   KV_API_USAGE: KVNamespace;
@@ -52,7 +52,7 @@ export type CentralBindings = {
   REDIRECT_PREFIX: string;
   ASTROLOGY_WESTERN_USER_ID: string;
   ASTROLOGY_WESTERN_API_KEY: string;
-  PIAPI_API_KEY: string;
+  PIAPI_API_KEY: SECRETS_STORE_SECRET;
   DEEPSEEK_API_KEY: SECRETS_STORE_SECRET;
   ENV: Environment;
 

package/utils/faceSwapHelpers.ts

@@ -78,9 +78,10 @@ export const sendRequest = async (
 ): Promise<ApidogModel> => {
   const maxRetries = 3;
   const retryDelay = 1000; // 1 second delay between retries
+  const piapiApiKey = await env.PIAPI_API_KEY.get();
   const endpoint = 'https://api.piapi.ai/api/v1/task';
   const headers = {
-    'x-api-key': `${env.PIAPI_API_KEY}`,
+    'x-api-key': piapiApiKey,
     'Content-Type': 'application/json',
   };