Add improved FAL regionality & convert trigger type from HTTPS to blocking

spec/v2/providers/ai.spec.ts

@@ -255,4 +255,25 @@
       });
     });
   });
+  describe("Typings", () => {
+    it("should allow regional webhooks to specify multiple locations", () => {
+      ai.beforeGenerateContent(
+        { regionalWebhook: true, location: ["us-central1", "europe-west1"] },
+        () => { }
+      );
+    });
+
+    it("should allow global webhooks to specify a single location", () => {
+      ai.beforeGenerateContent({ region: "us-central1" }, () => { });
+    });
+
+    it("should allow regional webhooks to specify a single location", () => {
+      ai.beforeGenerateContent({ regionalWebhook: true, region: "us-central1" }, () => { });
+    });
+
+    // Compilation failure tests (commented out):
+    // it("should NOT allow global webhooks to specify multiple locations", () => {
+    //   ai.beforeGenerateContent({ region: ["us-central1", "europe-west1"] }, () => {});
+    // });
+  });
 });

src/v2/providers/ai/index.ts

@@ -80,8 +80,12 @@
   GeminiV1BetaGenerateContentRequest,
   GeminiV1BetaGenerateContentResponse,
 };
-export interface WebhookOptions extends Omit<EventHandlerOptions, "location"> {
-  location?: string | string[] | Expression<string> | ResetValue;
+type MultipleLocationsIf<Allowed extends boolean> = Allowed extends true ? string[] : never;
+
+export interface WebhookOptions<Regional extends boolean = false>
+  extends Omit<EventHandlerOptions, "location"> {
+  location?: string | Expression<string> | MultipleLocationsIf<Regional> | ResetValue;
+  regionalWebhook?: Regional;
 }
 
 export interface PromptTemplateInfo {
@@ -153,8 +157,8 @@
   ) => MaybeAsync<void | Partial<AnyValidAIRequest>>
 ): BlockingFunction;
 
-export function beforeGenerateContent(
-  options: WebhookOptions,
+export function beforeGenerateContent<Regional extends boolean = false>(
+  options: WebhookOptions<Regional>,
   callback: (
     event: AIBlockingEvent<BeforeGenerateContentData>
   ) => MaybeAsync<void | Partial<AnyValidAIRequest>>
@@ -164,8 +168,8 @@
   optsOrCb:
     | WebhookOptions
     | ((
-        event: AIBlockingEvent<BeforeGenerateContentData>
-      ) => MaybeAsync<void | Partial<AnyValidAIRequest>>),
+      event: AIBlockingEvent<BeforeGenerateContentData>
+    ) => MaybeAsync<void | Partial<AnyValidAIRequest>>),
   cb?: (
     event: AIBlockingEvent<BeforeGenerateContentData>
   ) => MaybeAsync<void | Partial<AnyValidAIRequest>>
@@ -243,7 +247,12 @@
       ...baseOpts?.labels,
       ...specificOpts?.labels,
     },
-    httpsTrigger: {},
+    blockingTrigger: {
+      eventType: beforeGenerateEventType,
+      options: {
+        regionalWebhook: opts.regionalWebhook,
+      },
+    },
   };
 
   return func as BlockingFunction;
@@ -255,8 +264,8 @@
   ) => MaybeAsync<void | Partial<AnyValidAIResponse>>
 ): BlockingFunction;
 
-export function afterGenerateContent(
-  options: WebhookOptions,
+export function afterGenerateContent<Regional extends boolean = false>(
+  options: WebhookOptions<Regional>,
   callback: (
     event: AIBlockingEvent<AfterGenerateContentData>
   ) => MaybeAsync<void | Partial<AnyValidAIResponse>>
@@ -266,8 +275,8 @@
   optsOrCb:
     | WebhookOptions
     | ((
-        event: AIBlockingEvent<AfterGenerateContentData>
-      ) => MaybeAsync<void | Partial<AnyValidAIResponse>>),
+      event: AIBlockingEvent<AfterGenerateContentData>
+    ) => MaybeAsync<void | Partial<AnyValidAIResponse>>),
   cb?: (
     event: AIBlockingEvent<AfterGenerateContentData>
   ) => MaybeAsync<void | Partial<AnyValidAIResponse>>
@@ -345,7 +354,12 @@
       ...baseOpts?.labels,
       ...specificOpts?.labels,
     },
-    httpsTrigger: {},
+    blockingTrigger: {
+      eventType: afterGenerateEventType,
+      options: {
+        regionalWebhook: opts.regionalWebhook,
+      },
+    },
   };
 
   return func as BlockingFunction;