Merge pull request #147 from NeurProjects/feature/dynamic-action-scheduling

Dynamic action scheduling

Author: backwardsmap

prisma/migrations/20250120202224_add_action_starttime/migration.sql

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "actions" ADD COLUMN     "startTime" TIMESTAMP(3);
+ALTER TABLE "actions" ADD COLUMN     "name"      VARCHAR(255);
+UPDATE "actions" SET name = description;

prisma/schema.prisma

@@ -105,6 +105,7 @@ model Action {
   stoppedBy      Int[] // Array of rule IDs required to stop this action
   frequency      Int? // Frequency in seconds (e.g., 3600 for 1 hour, 86400 for 1 day)
   maxExecutions  Int? // Times to execute before stopping
+  name           String?   @db.VarChar(255) // User defined name for the action
   description    String    @db.VarChar(255) // Human readable description of the action, or message to send to AI
   actionType     String    @db.VarChar(255) // Type of action (e.g., "call_function", "invoke_api")
   params         Json? // JSON object for action parameters (e.g., inputs for the function)
@@ -118,6 +119,7 @@ model Action {
   priority       Int       @default(0) // Priority level for execution, higher numbers execute first
   createdAt      DateTime  @default(now())
   updatedAt      DateTime  @updatedAt
+  startTime      DateTime? // Time to start executing the action
 
   user         User         @relation(fields: [userId], references: [id])
   conversation Conversation @relation(fields: [conversationId], references: [id])

src/ai/generic/action.tsx

@@ -4,12 +4,14 @@ import { ActionEmitter } from '@/components/action-emitter';
 import { Card } from '@/components/ui/card';
 import { verifyUser } from '@/server/actions/user';
 import { dbCreateAction } from '@/server/db/queries';
+import { NO_CONFIRMATION_MESSAGE } from '@/lib/constants';
 
 interface CreateActionResultProps {
   id: string;
   description: string;
   frequency: number;
   maxExecutions: number | null;
+  startTime: number | null;
 }
 
 function getFrequencyLabel(frequency: number): string {
@@ -29,37 +31,31 @@ function getFrequencyLabel(frequency: number): string {
   }
 }
 
-const NO_CONFIRMATION_MESSAGE = ' (Does not require confirmation)';
-function getNextExecutionTime(frequency: number): string {
-  // TODO: improve this - currently server executes actions every 15 minutes
-  const now = new Date();
+function getNextExecutionTime(startTime: number | null): string {
+  if (startTime) {
+    return new Date(startTime).toLocaleString();
+  }
 
-  // Set to next 15 minute interval
-  const next15 = new Date(now);
-  next15.setMilliseconds(0);
-  next15.setSeconds(0);
+  // Set to the next minute interval
+  const nextMinute = new Date();
+  nextMinute.setMilliseconds(0); // Reset milliseconds
+  nextMinute.setSeconds(0); // Reset seconds
 
-  const minutes = next15.getMinutes();
-  const remainder = minutes % 15;
+  const currentMinutes = nextMinute.getMinutes();
+  nextMinute.setMinutes(currentMinutes + 1); // Move to the next minute
 
-  if (remainder === 0) {
-    // Already on a quarter-hour mark; move to the next one
-    next15.setMinutes(minutes + 15);
-  } else {
-    // Round up to the next quarter-hour
-    next15.setMinutes(minutes + (15 - remainder));
-  }
-  return next15.toLocaleString();
+  return nextMinute.toLocaleString();
 }
 
 function CreateActionResult({
   id,
   description,
   frequency,
   maxExecutions,
+  startTime
 }: CreateActionResultProps) {
   const frequencyLabel = getFrequencyLabel(frequency);
-  const nextExecution = getNextExecutionTime(frequency);
+  const nextExecution = getNextExecutionTime(startTime);
 
   return (
     <Card className="bg-card p-6">
@@ -114,6 +110,11 @@ const createActionTool = {
     conversationId: z
       .string()
       .describe('Conversation that the action belongs to'),
+    name: z
+      .string()
+      .describe(
+        'Shorthand human readable name to classify the action.',
+      ),
     description: z
       .string()
       .describe(
@@ -128,6 +129,10 @@ const createActionTool = {
       .number()
       .optional()
       .describe('Max number of times the action can be executed'),
+    startTimeOffset: z
+      .number()
+      .optional()
+      .describe('Offset in milliseconds for how long to wait before starting the action. Useful for scheduling actions in the future, e.g. 1 hour from now = 3600000'),
   }),
   execute: async function (
     params: z.infer<typeof this.parameters>,
@@ -140,9 +145,13 @@ const createActionTool = {
         return { success: false, error: 'Unauthorized' };
       }
 
+      console.log('action params');
+      console.dir(params);
+
       const action = await dbCreateAction({
         userId,
         conversationId: params.conversationId,
+        name: params.name,
         description: `${params.description}${NO_CONFIRMATION_MESSAGE}`,
         actionType: 'default',
         frequency: params.frequency,
@@ -160,6 +169,7 @@ const createActionTool = {
         lastExecutedAt: null,
         lastFailureAt: null,
         lastSuccessAt: null,
+        startTime: params.startTimeOffset ? new Date(Date.now() + params.startTimeOffset) : null,
       });
 
       if (!action) {
@@ -197,11 +207,12 @@ const createActionTool = {
       );
     }
 
-    const { id, description, frequency, maxExecutions } = typedResult.data as {
+    const { id, description, frequency, maxExecutions, startTime } = typedResult.data as {
       id: string;
       description: string;
       frequency: number;
       maxExecutions: number | null;
+      startTime: number | null;
     };
 
     return (
@@ -212,6 +223,7 @@ const createActionTool = {
           description={description}
           frequency={frequency}
           maxExecutions={maxExecutions}
+          startTime={startTime}
         />
       </>
     );

src/app/api/cron/15-min/route.ts renamed to src/app/api/cron/minute/route.ts

@@ -12,7 +12,7 @@ export async function GET(request: Request) {
     });
   }
 
-  // Quarter-hour cron job
+  // Minute cron job
   // Get all Actions that are not completed or paused
   const actions = await dbGetActions({
     triggered: true,
@@ -22,7 +22,7 @@ export async function GET(request: Request) {
 
   console.log(`[cron/action] Fetched ${actions.length} actions`);
 
-  // This job runs every 15 minutes, but we only need to process actions that are ready to be processed, based on their frequency
+  // This job runs every minute minute, but we only need to process actions that are ready to be processed, based on their frequency
   // Filter the actions to only include those that are ready to be processed based on their lastExecutedAt and frequency
   const now = new Date();
   const actionsToProcess = actions.filter((action) => {

src/components/dashboard/app-sidebar-automations.tsx

@@ -48,6 +48,7 @@ import { useActions } from '@/hooks/use-actions';
 import { useUser } from '@/hooks/use-user';
 import { EVENTS } from '@/lib/events';
 import { cn } from '@/lib/utils';
+import { NO_CONFIRMATION_MESSAGE } from '@/lib/constants';
 
 interface ActionMenuItemProps {
   action: Action;
@@ -62,10 +63,12 @@ const ActionMenuItem = ({ action, onDelete, onEdit }: ActionMenuItemProps) => {
   const router = useRouter();
   const [isEditing, setIsEditing] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
+
   const [formData, setFormData] = useState({
-    description: action.description,
-    frequency: action.frequency || 0,
-    maxExecutions: action.maxExecutions || 0,
+    name: action.name || action.description,
+    description: action.description.replace(NO_CONFIRMATION_MESSAGE, ''),
+    frequency: action.frequency ?? null,
+    maxExecutions: action.maxExecutions ?? null,
   });
 
   const handleDelete = async () => {
@@ -93,9 +96,10 @@ const ActionMenuItem = ({ action, onDelete, onEdit }: ActionMenuItemProps) => {
 
     try {
       const result = await onEdit(action.id, {
-        description: formData.description,
-        frequency: formData.frequency || null,
-        maxExecutions: formData.maxExecutions || null,
+        name: formData.name,
+        description: formData.description + NO_CONFIRMATION_MESSAGE,
+        frequency: formData.frequency,
+        maxExecutions: formData.maxExecutions,
       });
 
       if (result?.success) {
@@ -118,7 +122,7 @@ const ActionMenuItem = ({ action, onDelete, onEdit }: ActionMenuItemProps) => {
       <SidebarMenuItem>
         <SidebarMenuButton asChild>
           <Link href={`/chat/${action.conversationId}`}>
-            <span>{action.description}</span>
+            <span>{action.name}</span>
           </Link>
         </SidebarMenuButton>
         <DropdownMenu>
@@ -153,6 +157,21 @@ const ActionMenuItem = ({ action, onDelete, onEdit }: ActionMenuItemProps) => {
             <DialogTitle>Edit Automation</DialogTitle>
           </DialogHeader>
           <div className="space-y-4 py-4">
+            <div className="space-y-2">
+              <Label htmlFor="name">Name</Label>
+              <Input
+                id="name"
+                value={formData.name}
+                onChange={(e) =>
+                  setFormData((prev) => ({
+                    ...prev,
+                    name: e.target.value,
+                  }))
+                }
+                placeholder="Enter action name"
+                disabled={isLoading}
+              />
+            </div>
             <div className="space-y-2">
               <Label htmlFor="description">Message</Label>
               <Input
@@ -173,11 +192,11 @@ const ActionMenuItem = ({ action, onDelete, onEdit }: ActionMenuItemProps) => {
               <Input
                 id="frequency"
                 type="number"
-                value={formData.frequency}
+                value={formData.frequency ?? ''}
                 onChange={(e) =>
                   setFormData((prev) => ({
                     ...prev,
-                    frequency: parseInt(e.target.value),
+                    frequency: e.target.value ? parseInt(e.target.value, 10) : null, // Parse or null
                   }))
                 }
                 placeholder="Enter frequency in seconds"
@@ -189,11 +208,11 @@ const ActionMenuItem = ({ action, onDelete, onEdit }: ActionMenuItemProps) => {
               <Input
                 id="maxExecutions"
                 type="number"
-                value={formData.maxExecutions}
+                value={formData.maxExecutions ?? ''}
                 onChange={(e) =>
                   setFormData((prev) => ({
                     ...prev,
-                    maxExecutions: parseInt(e.target.value),
+                    maxExecutions: e.target.value ? parseInt(e.target.value, 10) : null, // Parse or null
                   }))
                 }
                 placeholder="Enter max executions"

src/lib/constants.ts

@@ -8,3 +8,5 @@ export const RPC_URL =
   'https://api.mainnet-beta.solana.com';
 
 export const MAX_TOKEN_MESSAGES = 10;
+
+export const NO_CONFIRMATION_MESSAGE = ' (Does not require confirmation)';

src/server/db/queries.ts

@@ -221,9 +221,9 @@ export async function dbGetConversations({ userId }: { userId: string }) {
  * @returns {Promise<Action[]>} Array of actions
  */
 export async function dbGetActions({
-  triggered,
-  paused,
-  completed,
+  triggered = true,
+  paused = false,
+  completed = false,
 }: {
   triggered: boolean;
   paused: boolean;
@@ -235,6 +235,10 @@ export async function dbGetActions({
         triggered,
         paused,
         completed,
+        OR: [
+          { startTime: { lte: new Date() } },
+          { startTime: null }
+        ]
       },
       orderBy: { createdAt: 'desc' },
       include: { user: { include: { wallets: true } } },
@@ -401,6 +405,7 @@ export async function dbUpdateAction({
   try {
     // Validate and clean the data before update
     const validData = {
+      name: data.name,
       description: data.description,
       frequency: data.frequency === 0 ? null : data.frequency,
       maxExecutions: data.maxExecutions === 0 ? null : data.maxExecutions,

vercel.json

@@ -1,8 +1,8 @@
 {
   "crons": [
     {
-      "path": "/api/cron/15-min",
-      "schedule": "*/15 * * * *"
+      "path": "/api/cron/minute",
+      "schedule": "* * * * *"
     }
   ]
 }