mirror of
https://github.com/leonvanzyl/autocoder.git
synced 2026-01-30 14:22:04 +00:00
fix: address critical issues in PR #75 agent scheduling feature
This commit fixes several issues identified in the agent scheduling feature from PR #75: Frontend Fixes: - Add day boundary handling in timeUtils.ts for timezone conversions - Add utcToLocalWithDayShift/localToUTCWithDayShift functions - Add shiftDaysForward/shiftDaysBackward helpers for bitfield adjustment - Update ScheduleModal to correctly adjust days_of_week when crossing day boundaries during UTC conversion (fixes schedules running on wrong days for users in extreme timezones like UTC+9) Backend Fixes: - Add MAX_SCHEDULES_PER_PROJECT (50) limit to prevent resource exhaustion - Wire up crash recovery callback in scheduler_service._start_agent() - Convert schedules.py endpoints to use context manager for DB sessions - Fix race condition in override creation with atomic delete-then-create - Replace deprecated datetime.utcnow with datetime.now(timezone.utc) - Add DB-level CHECK constraints for Schedule model fields Files Modified: - api/database.py: Add _utc_now helper, CheckConstraint imports, constraints - progress.py: Replace deprecated datetime.utcnow - server/routers/schedules.py: Add context manager, schedule limits - server/services/assistant_database.py: Replace deprecated datetime.utcnow - server/services/scheduler_service.py: Wire crash recovery, fix race condition - ui/src/components/ScheduleModal.tsx: Use day shift functions - ui/src/lib/timeUtils.ts: Add day boundary handling functions Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,8 +14,9 @@ import {
|
||||
useToggleSchedule,
|
||||
} from '../hooks/useSchedules'
|
||||
import {
|
||||
utcToLocal,
|
||||
localToUTC,
|
||||
utcToLocalWithDayShift,
|
||||
localToUTCWithDayShift,
|
||||
adjustDaysForDayShift,
|
||||
formatDuration,
|
||||
DAYS,
|
||||
isDayActive,
|
||||
@@ -109,10 +110,18 @@ export function ScheduleModal({ projectName, isOpen, onClose }: ScheduleModalPro
|
||||
return
|
||||
}
|
||||
|
||||
// Convert local time to UTC
|
||||
// Convert local time to UTC and get day shift
|
||||
const { time: utcTime, dayShift } = localToUTCWithDayShift(newSchedule.start_time)
|
||||
|
||||
// Adjust days_of_week based on day shift
|
||||
// If UTC is on the next day (dayShift = 1), shift days forward
|
||||
// If UTC is on the previous day (dayShift = -1), shift days backward
|
||||
const adjustedDays = adjustDaysForDayShift(newSchedule.days_of_week, dayShift)
|
||||
|
||||
const scheduleToCreate = {
|
||||
...newSchedule,
|
||||
start_time: localToUTC(newSchedule.start_time),
|
||||
start_time: utcTime,
|
||||
days_of_week: adjustedDays,
|
||||
}
|
||||
|
||||
await createSchedule.mutateAsync(scheduleToCreate)
|
||||
@@ -203,8 +212,12 @@ export function ScheduleModal({ projectName, isOpen, onClose }: ScheduleModalPro
|
||||
{!isLoading && schedules.length > 0 && (
|
||||
<div className="space-y-3 mb-6 max-h-[300px] overflow-y-auto">
|
||||
{schedules.map((schedule) => {
|
||||
const localTime = utcToLocal(schedule.start_time)
|
||||
// Convert UTC time to local and get day shift for display
|
||||
const { time: localTime, dayShift } = utcToLocalWithDayShift(schedule.start_time)
|
||||
const duration = formatDuration(schedule.duration_minutes)
|
||||
// Adjust displayed days: if local is next day (dayShift=1), shift forward
|
||||
// if local is prev day (dayShift=-1), shift backward
|
||||
const displayDays = adjustDaysForDayShift(schedule.days_of_week, dayShift)
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -223,7 +236,7 @@ export function ScheduleModal({ projectName, isOpen, onClose }: ScheduleModalPro
|
||||
{/* Days */}
|
||||
<div className="flex gap-1 mb-2">
|
||||
{DAYS.map((day) => {
|
||||
const isActive = isDayActive(schedule.days_of_week, day.bit)
|
||||
const isActive = isDayActive(displayDays, day.bit)
|
||||
return (
|
||||
<span
|
||||
key={day.label}
|
||||
|
||||
@@ -4,38 +4,135 @@
|
||||
*
|
||||
* Utilities for converting between UTC and local time for schedule management.
|
||||
* All times in the database are stored in UTC and displayed in the user's local timezone.
|
||||
*
|
||||
* IMPORTANT: When converting times, day boundaries may be crossed. For example:
|
||||
* - Tokyo (UTC+9) user sets 02:00 local → 17:00 UTC previous day
|
||||
* - New York (UTC-5) user sets 22:00 local → 03:00 UTC next day
|
||||
*
|
||||
* The days_of_week bitfield must be adjusted accordingly using shiftDaysForward/shiftDaysBackward.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Result of time conversion including day shift information.
|
||||
*/
|
||||
export interface TimeConversionResult {
|
||||
time: string
|
||||
dayShift: -1 | 0 | 1 // -1 = previous day, 0 = same day, 1 = next day
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert "HH:MM" UTC time to user's local time.
|
||||
* @param utcTime Time string in "HH:MM" format (UTC)
|
||||
* @returns Time string in "HH:MM" format (local)
|
||||
* @returns Object with local time string and day shift indicator
|
||||
*/
|
||||
export function utcToLocal(utcTime: string): string {
|
||||
export function utcToLocalWithDayShift(utcTime: string): TimeConversionResult {
|
||||
const [hours, minutes] = utcTime.split(':').map(Number)
|
||||
const utcDate = new Date()
|
||||
utcDate.setUTCHours(hours, minutes, 0, 0)
|
||||
|
||||
// Use a fixed reference date to calculate the shift
|
||||
const utcDate = new Date(Date.UTC(2000, 0, 15, hours, minutes, 0, 0)) // Jan 15, 2000
|
||||
const localDay = utcDate.getDate()
|
||||
|
||||
let dayShift: -1 | 0 | 1 = 0
|
||||
if (localDay === 14) dayShift = -1 // Went to previous day
|
||||
if (localDay === 16) dayShift = 1 // Went to next day
|
||||
|
||||
const localHours = utcDate.getHours()
|
||||
const localMinutes = utcDate.getMinutes()
|
||||
|
||||
return `${String(localHours).padStart(2, '0')}:${String(localMinutes).padStart(2, '0')}`
|
||||
return {
|
||||
time: `${String(localHours).padStart(2, '0')}:${String(localMinutes).padStart(2, '0')}`,
|
||||
dayShift,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert "HH:MM" UTC time to user's local time (legacy function for backwards compatibility).
|
||||
* @param utcTime Time string in "HH:MM" format (UTC)
|
||||
* @returns Time string in "HH:MM" format (local)
|
||||
*/
|
||||
export function utcToLocal(utcTime: string): string {
|
||||
return utcToLocalWithDayShift(utcTime).time
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert "HH:MM" local time to UTC for storage.
|
||||
* @param localTime Time string in "HH:MM" format (local)
|
||||
* @returns Time string in "HH:MM" format (UTC)
|
||||
* @returns Object with UTC time string and day shift indicator
|
||||
*/
|
||||
export function localToUTC(localTime: string): string {
|
||||
export function localToUTCWithDayShift(localTime: string): TimeConversionResult {
|
||||
const [hours, minutes] = localTime.split(':').map(Number)
|
||||
const localDate = new Date()
|
||||
localDate.setHours(hours, minutes, 0, 0)
|
||||
|
||||
// Use a fixed reference date to calculate the shift
|
||||
// Set local time on Jan 15, then check UTC date
|
||||
const localDate = new Date(2000, 0, 15, hours, minutes, 0, 0) // Jan 15, 2000 local
|
||||
const utcDay = localDate.getUTCDate()
|
||||
|
||||
let dayShift: -1 | 0 | 1 = 0
|
||||
if (utcDay === 14) dayShift = -1 // UTC is previous day
|
||||
if (utcDay === 16) dayShift = 1 // UTC is next day
|
||||
|
||||
const utcHours = localDate.getUTCHours()
|
||||
const utcMinutes = localDate.getUTCMinutes()
|
||||
|
||||
return `${String(utcHours).padStart(2, '0')}:${String(utcMinutes).padStart(2, '0')}`
|
||||
return {
|
||||
time: `${String(utcHours).padStart(2, '0')}:${String(utcMinutes).padStart(2, '0')}`,
|
||||
dayShift,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert "HH:MM" local time to UTC for storage (legacy function for backwards compatibility).
|
||||
* @param localTime Time string in "HH:MM" format (local)
|
||||
* @returns Time string in "HH:MM" format (UTC)
|
||||
*/
|
||||
export function localToUTC(localTime: string): string {
|
||||
return localToUTCWithDayShift(localTime).time
|
||||
}
|
||||
|
||||
/**
|
||||
* Shift days_of_week bitfield forward by one day.
|
||||
* Used when UTC time is on the next day relative to local time.
|
||||
* Example: Mon(1) -> Tue(2), Sun(64) -> Mon(1)
|
||||
*/
|
||||
export function shiftDaysForward(bitfield: number): number {
|
||||
let shifted = 0
|
||||
if (bitfield & 1) shifted |= 2 // Mon -> Tue
|
||||
if (bitfield & 2) shifted |= 4 // Tue -> Wed
|
||||
if (bitfield & 4) shifted |= 8 // Wed -> Thu
|
||||
if (bitfield & 8) shifted |= 16 // Thu -> Fri
|
||||
if (bitfield & 16) shifted |= 32 // Fri -> Sat
|
||||
if (bitfield & 32) shifted |= 64 // Sat -> Sun
|
||||
if (bitfield & 64) shifted |= 1 // Sun -> Mon
|
||||
return shifted
|
||||
}
|
||||
|
||||
/**
|
||||
* Shift days_of_week bitfield backward by one day.
|
||||
* Used when UTC time is on the previous day relative to local time.
|
||||
* Example: Tue(2) -> Mon(1), Mon(1) -> Sun(64)
|
||||
*/
|
||||
export function shiftDaysBackward(bitfield: number): number {
|
||||
let shifted = 0
|
||||
if (bitfield & 1) shifted |= 64 // Mon -> Sun
|
||||
if (bitfield & 2) shifted |= 1 // Tue -> Mon
|
||||
if (bitfield & 4) shifted |= 2 // Wed -> Tue
|
||||
if (bitfield & 8) shifted |= 4 // Thu -> Wed
|
||||
if (bitfield & 16) shifted |= 8 // Fri -> Thu
|
||||
if (bitfield & 32) shifted |= 16 // Sat -> Fri
|
||||
if (bitfield & 64) shifted |= 32 // Sun -> Sat
|
||||
return shifted
|
||||
}
|
||||
|
||||
/**
|
||||
* Adjust days_of_week bitfield based on day shift from time conversion.
|
||||
* @param bitfield Original days_of_week bitfield
|
||||
* @param dayShift Day shift from time conversion (-1, 0, or 1)
|
||||
* @returns Adjusted bitfield
|
||||
*/
|
||||
export function adjustDaysForDayShift(bitfield: number, dayShift: -1 | 0 | 1): number {
|
||||
if (dayShift === 1) return shiftDaysForward(bitfield)
|
||||
if (dayShift === -1) return shiftDaysBackward(bitfield)
|
||||
return bitfield
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user