Use tz aware datetimes for sqlalchemy filters

Author: r4victor

src/dstack/_internal/server/background/tasks/process_fleets.py

@@ -14,7 +14,7 @@
 )
 from dstack._internal.server.services.locking import get_locker
 from dstack._internal.server.services.placement import schedule_fleet_placement_groups_deletion
-from dstack._internal.utils.common import get_current_datetime, get_current_tz_naive_datetime
+from dstack._internal.utils.common import get_current_datetime
 from dstack._internal.utils.logging import get_logger
 
 logger = get_logger(__name__)
@@ -40,7 +40,7 @@ async def _process_next_fleet():
                     FleetModel.deleted == False,
                     FleetModel.id.not_in(lockset),
                     FleetModel.last_processed_at
-                    < get_current_tz_naive_datetime() - MIN_PROCESSING_INTERVAL,
+                    < get_current_datetime() - MIN_PROCESSING_INTERVAL,
                 )
                 .order_by(FleetModel.last_processed_at.asc())
                 .limit(1)

src/dstack/_internal/server/background/tasks/process_instances.py

@@ -106,7 +106,6 @@
 from dstack._internal.server.services.runner.ssh import runner_ssh_tunnel
 from dstack._internal.utils.common import (
     get_current_datetime,
-    get_current_tz_naive_datetime,
     run_async,
 )
 from dstack._internal.utils.logging import get_logger
@@ -153,7 +152,7 @@ async def _process_next_instance():
                     ),
                     InstanceModel.id.not_in(lockset),
                     InstanceModel.last_processed_at
-                    < get_current_tz_naive_datetime() - MIN_PROCESSING_INTERVAL,
+                    < get_current_datetime() - MIN_PROCESSING_INTERVAL,
                 )
                 .options(lazyload(InstanceModel.jobs))
                 .order_by(InstanceModel.last_processed_at.asc())

src/dstack/_internal/server/background/tasks/process_running_jobs.py

@@ -108,7 +108,7 @@ async def _process_next_running_job():
                     RunModel.status.not_in([RunStatus.TERMINATING]),
                     JobModel.id.not_in(lockset),
                     JobModel.last_processed_at
-                    < common_utils.get_current_tz_naive_datetime() - MIN_PROCESSING_INTERVAL,
+                    < common_utils.get_current_datetime() - MIN_PROCESSING_INTERVAL,
                 )
                 .order_by(JobModel.last_processed_at.asc())
                 .limit(1)

src/dstack/_internal/server/background/tasks/process_runs.py

@@ -56,7 +56,7 @@ async def process_runs(batch_size: int = 1):
 async def _process_next_run():
     run_lock, run_lockset = get_locker(get_db().dialect_name).get_lockset(RunModel.__tablename__)
     job_lock, job_lockset = get_locker(get_db().dialect_name).get_lockset(JobModel.__tablename__)
-    now = common.get_current_tz_naive_datetime()
+    now = common.get_current_datetime()
     async with get_session_ctx() as session:
         async with run_lock, job_lock:
             res = await session.execute(

src/dstack/_internal/server/background/tasks/process_terminating_jobs.py

@@ -20,7 +20,6 @@
 from dstack._internal.server.services.logging import fmt
 from dstack._internal.utils.common import (
     get_current_datetime,
-    get_current_tz_naive_datetime,
     get_or_error,
 )
 from dstack._internal.utils.logging import get_logger
@@ -49,7 +48,7 @@ async def _process_next_terminating_job():
                     JobModel.status == JobStatus.TERMINATING,
                     or_(
                         JobModel.remove_at.is_(None),
-                        JobModel.remove_at < get_current_tz_naive_datetime(),
+                        JobModel.remove_at < get_current_datetime(),
                     ),
                 )
                 .order_by(JobModel.last_processed_at.asc())

src/dstack/_internal/utils/common.py

@@ -29,10 +29,6 @@ def get_current_datetime() -> datetime:
     return datetime.now(tz=timezone.utc)
 
 
-def get_current_tz_naive_datetime() -> datetime:
-    return datetime.now(tz=None)
-
-
 def get_milliseconds_since_epoch() -> int:
     return int(round(time.time() * 1000))