change triggers api to use new server format (#376)

Co-authored-by: Brace Sproul <[email protected]>

Author: samecrowder

apps/web-v2/src/components/config-fields/triggers.tsx

@@ -17,7 +17,10 @@ import {
 } from "@/components/ui/popover";
 import { Button } from "@/components/ui/button";
 import { cn } from "@/lib/utils";
-import { useTriggers, ListUserTriggersData } from "@/hooks/use-triggers";
+import {
+  useTriggers,
+  ListTriggerRegistrationsData,
+} from "@/hooks/use-triggers";
 import { groupUserRegisteredTriggersByProvider } from "@/lib/triggers";
 import { Badge } from "@/components/ui/badge";
 import { toast } from "sonner";
@@ -36,7 +39,7 @@ export function ConfigFieldTriggers({
   const { listUserTriggers } = useTriggers();
 
   const [userTriggers, setUserTriggers] = React.useState<
-    ListUserTriggersData[]
+    ListTriggerRegistrationsData[]
   >([]);
   const [loading, setLoading] = React.useState(false);
   const [open, setOpen] = React.useState(false);
@@ -94,7 +97,7 @@ export function ConfigFieldTriggers({
             variant="secondary"
             className="text-xs"
           >
-            {trigger.provider_id}:{JSON.stringify(trigger.resource)}
+            {trigger.template_id}:{JSON.stringify(trigger.resource)}
           </Badge>
         ))}
         {selectedTriggers.length > 2 && (
@@ -183,7 +186,7 @@ export function ConfigFieldTriggers({
                 className="flex items-center gap-1 text-xs"
               >
                 <>
-                  {trigger.provider_id}:{JSON.stringify(trigger.resource)}
+                  {trigger.template_id}:{JSON.stringify(trigger.resource)}
                   <TooltipIconButton
                     tooltip="Remove trigger"
                     onClick={() => handleTriggerToggle(trigger.id)}

apps/web-v2/src/features/triggers/components/trigger-card.tsx

@@ -12,15 +12,17 @@ import {
 import { TriggerForm } from "./trigger-form";
 import type { Trigger } from "@/types/triggers";
 import { Zap, ChevronDown } from "lucide-react";
-import { ListUserTriggersData } from "@/hooks/use-triggers";
+import { ListTriggerRegistrationsData } from "@/hooks/use-triggers";
 import { ResourceRenderer } from "./resource-renderer";
 
 interface TriggerCardProps {
   trigger: Trigger;
-  userTriggers: ListUserTriggersData[];
+  userTriggers: ListTriggerRegistrationsData[];
 }
 
-function ConfiguredAccounts(props: { userTriggers: ListUserTriggersData[] }) {
+function ConfiguredAccounts(props: {
+  userTriggers: ListTriggerRegistrationsData[];
+}) {
   const { userTriggers } = props;
   const [isAccountsExpanded, setIsAccountsExpanded] = useState(false);
 

apps/web-v2/src/features/triggers/components/trigger-form.tsx

@@ -79,9 +79,9 @@ export function TriggerForm({ trigger, onCancel }: TriggerFormProps) {
         return;
       }
 
-      // Check for auth URL in response
-      if (!registerResponse.registered && registerResponse.authUrl) {
-        setAuthUrl(registerResponse.authUrl);
+      // Handle response based on auth requirements
+      if ("auth_url" in registerResponse) {
+        setAuthUrl(registerResponse.auth_url);
         setIsAuthenticating(true);
       } else {
         toast.success(

apps/web-v2/src/features/triggers/index.tsx

@@ -10,7 +10,10 @@ import {
   CardTitle,
 } from "@/components/ui/card";
 import { Zap } from "lucide-react";
-import { ListUserTriggersData, useTriggers } from "@/hooks/use-triggers";
+import {
+  ListTriggerRegistrationsData,
+  useTriggers,
+} from "@/hooks/use-triggers";
 import { useEffect, useState } from "react";
 import type { Trigger } from "@/types/triggers";
 import { toast } from "sonner";
@@ -19,7 +22,9 @@ import { groupUserRegisteredTriggersByProvider } from "@/lib/triggers";
 export default function TriggersInterface() {
   const [triggersLoading, setTriggersLoading] = useState(true);
   const [triggers, setTriggers] = useState<Trigger[]>([]);
-  const [userTriggers, setUserTriggers] = useState<ListUserTriggersData[]>([]);
+  const [userTriggers, setUserTriggers] = useState<
+    ListTriggerRegistrationsData[]
+  >([]);
   const auth = useAuthContext();
   const { listTriggers, listUserTriggers } = useTriggers();
 
@@ -141,7 +146,7 @@ export default function TriggersInterface() {
             trigger={trigger}
             userTriggers={
               groupUserRegisteredTriggersByProvider(userTriggers)?.[
-                trigger.providerId
+                trigger.id
               ] || []
             }
           />

apps/web-v2/src/hooks/use-triggers.tsx

@@ -3,17 +3,21 @@ import { toast } from "sonner";
 
 type RegisterTriggerResponse =
   | {
-      authUrl: string;
+      success: boolean;
       registered: false;
+      auth_required: true;
+      auth_url: string;
+      auth_id: string;
     }
   | {
+      success: boolean;
       registered: true;
     };
 
-export interface ListUserTriggersData {
+export interface ListTriggerRegistrationsData {
   id: string;
   user_id: string;
-  provider_id: string;
+  template_id: string;
   resource: unknown;
   linked_assistant_ids?: string[];
   created_at: string;
@@ -76,10 +80,10 @@ export function useTriggers() {
     return triggers.data;
   };
 
-  const listUserTriggers = async (
+  const listTriggerRegistrations = async (
     accessToken: string,
-  ): Promise<ListUserTriggersData[] | undefined> => {
-    const triggersApiUrl = constructTriggerUrl("/api/user-triggers");
+  ): Promise<ListTriggerRegistrationsData[] | undefined> => {
+    const triggersApiUrl = constructTriggerUrl("/api/triggers/registrations");
     if (!triggersApiUrl) {
       return;
     }
@@ -122,8 +126,11 @@ export function useTriggers() {
       },
       body:
         Object.keys(args.payload).length > 0
-          ? JSON.stringify(args.payload)
-          : undefined,
+          ? JSON.stringify({
+              type: args.id,
+              ...args.payload,
+            })
+          : JSON.stringify({ type: args.id }),
     });
 
     if (!response.ok) {
@@ -143,29 +150,29 @@ export function useTriggers() {
       agentId: string;
     },
   ): Promise<boolean> => {
-    const triggerApiUrl = constructTriggerUrl(
-      "/api/user-triggers/linked-assistants",
-    );
-    if (!triggerApiUrl) {
-      return false;
-    }
-
-    const response = await fetch(triggerApiUrl, {
-      method: "PATCH",
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify({
-        trigger_ids: args.selectedTriggerIds,
-        assistant_id: args.agentId,
-      }),
-    });
-
-    if (!response.ok) {
-      toast.error("Failed to setup agent trigger", {
-        richColors: true,
+    // Link the agent to each selected trigger individually
+    for (const triggerId of args.selectedTriggerIds) {
+      const triggerApiUrl = constructTriggerUrl(
+        `/api/triggers/registrations/${triggerId}/agents/${args.agentId}`,
+      );
+      if (!triggerApiUrl) {
+        return false;
+      }
+
+      const response = await fetch(triggerApiUrl, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Content-Type": "application/json",
+        },
       });
-      return false;
+
+      if (!response.ok) {
+        toast.error("Failed to setup agent trigger", {
+          richColors: true,
+        });
+        return false;
+      }
     }
 
     return true;
@@ -178,37 +185,40 @@ export function useTriggers() {
       selectedTriggerIds: string[];
     },
   ): Promise<boolean> => {
-    const triggerApiUrl = constructTriggerUrl(
-      "/api/user-triggers/edit-assistant",
-    );
-    if (!triggerApiUrl) {
-      return false;
-    }
-
-    const response = await fetch(triggerApiUrl, {
-      method: "PUT",
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-      body: JSON.stringify({
-        trigger_ids: args.selectedTriggerIds,
-        assistant_id: args.agentId,
-      }),
-    });
-
-    if (!response.ok) {
-      toast.error("Failed to update agent triggers", {
-        richColors: true,
+    // For RESTful API, we need to update each registration individually
+    for (const triggerId of args.selectedTriggerIds) {
+      const triggerApiUrl = constructTriggerUrl(
+        `/api/triggers/registrations/${triggerId}/assistants`,
+      );
+      if (!triggerApiUrl) {
+        return false;
+      }
+
+      const response = await fetch(triggerApiUrl, {
+        method: "PUT",
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          assistant_id: args.agentId,
+        }),
       });
-      return false;
+
+      if (!response.ok) {
+        toast.error("Failed to update agent triggers", {
+          richColors: true,
+        });
+        return false;
+      }
     }
 
     return true;
   };
 
   return {
     listTriggers,
-    listUserTriggers,
+    listUserTriggers: listTriggerRegistrations,
     registerTrigger,
     setupAgentTrigger,
     updateAgentTriggers,

apps/web-v2/src/lib/agent-utils.ts

@@ -125,5 +125,5 @@ export function isDefaultGraph(
   deployment: Deployment,
   graphId: string,
 ): boolean {
-  return deployment.agents.find((a) => a.isDefault)?.graphId === graphId;
+  return deployment.graphs.find((g) => g.isDefault)?.id === graphId;
 }

apps/web-v2/src/lib/environment/deployments.ts

@@ -9,9 +9,10 @@ export function getDeployments(): Deployment[] {
   const deployments: Deployment[] = JSON.parse(
     process.env.NEXT_PUBLIC_DEPLOYMENTS || "[]",
   );
+
   for (const deployment of deployments) {
     if (deployment.isDefault && !defaultExists) {
-      if (!deployment.agents.find((a) => a.isDefault)) {
+      if (!deployment.graphs.find((g) => g.isDefault)) {
         throw new Error("Default deployment must have a default graph ID");
       }
       defaultExists = true;

apps/web-v2/src/lib/triggers.ts

@@ -1,4 +1,4 @@
-import { ListUserTriggersData } from "@/hooks/use-triggers";
+import { ListTriggerRegistrationsData } from "@/hooks/use-triggers";
 
 export function generateFormFields(schema: Record<string, any>) {
   const fields: Array<{
@@ -23,15 +23,15 @@ export function generateFormFields(schema: Record<string, any>) {
 }
 
 export function groupUserRegisteredTriggersByProvider(
-  triggers: ListUserTriggersData[],
-): Record<string, ListUserTriggersData[]> {
-  const groupedTriggers: Record<string, ListUserTriggersData[]> = {};
+  triggers: ListTriggerRegistrationsData[],
+): Record<string, ListTriggerRegistrationsData[]> {
+  const groupedTriggers: Record<string, ListTriggerRegistrationsData[]> = {};
 
   triggers.forEach((trigger) => {
-    if (!groupedTriggers[trigger.provider_id]) {
-      groupedTriggers[trigger.provider_id] = [];
+    if (!groupedTriggers[trigger.template_id]) {
+      groupedTriggers[trigger.template_id] = [];
     }
-    groupedTriggers[trigger.provider_id].push(trigger);
+    groupedTriggers[trigger.template_id].push(trigger);
   });
 
   return groupedTriggers;

apps/web-v2/src/types/deployment.ts

@@ -31,7 +31,7 @@ export interface Graph {
   /**
    * The ID of the graph.
    */
-  graphId: string;
+  id: string;
   /**
    * Whether or not this graph is the default graph for this deployment.
    * This should only be set to true for one graph per deployment.

apps/web-v2/src/types/triggers.ts

@@ -1,10 +1,6 @@
 export interface Trigger {
   /**
-   * The provider ID of the trigger
-   */
-  providerId: string;
-  /**
-   * A unique UUID v4 to identify the trigger by
+   * A unique identifier for the trigger (e.g., "gmail-email-received")
    */
   id: string;
   /**