Removed unnecessary changes and refactor implementations

Author: haydnli-shopify

src/dstack/_internal/cli/services/profile.py

@@ -159,7 +159,7 @@ def apply_profile_args(
     if args.idle_duration is not None:
         profile_settings.idle_duration = args.idle_duration
     elif args.dont_destroy:
-        profile_settings.idle_duration = False
+        profile_settings.idle_duration = "off"
     if args.creation_policy_reuse:
         profile_settings.creation_policy = CreationPolicy.REUSE
 

src/dstack/_internal/core/models/profiles.py

@@ -74,11 +74,9 @@ def parse_off_duration(v: Optional[Union[int, str, bool]]) -> Optional[Union[str
     return parse_duration(v)
 
 
-def parse_idle_duration(v: Optional[Union[int, str, bool]]) -> Optional[Union[str, int, bool]]:
-    if v is False:
+def parse_idle_duration(v: Optional[Union[int, str]]) -> Optional[Union[str, int]]:
+    if v == "off" or v == -1:
         return -1
-    if v is True:
-        return None
     return parse_duration(v)
 
 

src/dstack/_internal/core/models/volumes.py

@@ -45,13 +45,13 @@ class VolumeConfiguration(CoreModel):
         Optional[str],
         Field(description="The volume ID. Must be specified when registering external volumes"),
     ] = None
-    idle_duration: Annotated[
-        Optional[Union[str, int, bool]],
+    auto_cleanup_duration: Annotated[
+        Optional[Union[str, int]],
         Field(
             description=(
                 "Time to wait after volume is no longer used by any job before deleting it. "
                 "Defaults to keep the volume indefinitely. "
-                "Use the value 'off' to disable auto-cleanup."
+                "Use the value 'off' or -1 to disable auto-cleanup."
             )
         ),
     ] = None
@@ -67,9 +67,9 @@ class VolumeConfiguration(CoreModel):
     ] = None
 
     _validate_tags = validator("tags", pre=True, allow_reuse=True)(tags_validator)
-    _validate_idle_duration = validator("idle_duration", pre=True, allow_reuse=True)(
-        parse_idle_duration
-    )
+    _validate_auto_cleanup_duration = validator(
+        "auto_cleanup_duration", pre=True, allow_reuse=True
+    )(parse_idle_duration)
 
     @property
     def size_gb(self) -> int:

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

@@ -55,13 +55,13 @@ async def process_idle_volumes():
 def _should_delete_volume(volume: VolumeModel) -> bool:
     config = get_volume_configuration(volume)
 
-    if not config.idle_duration:
+    if not config.auto_cleanup_duration:
         return False
 
-    if isinstance(config.idle_duration, int) and config.idle_duration < 0:
+    if isinstance(config.auto_cleanup_duration, int) and config.auto_cleanup_duration < 0:
         return False
 
-    duration_seconds = parse_duration(config.idle_duration)
+    duration_seconds = parse_duration(config.auto_cleanup_duration)
     if not duration_seconds or duration_seconds <= 0:
         return False
 
@@ -100,5 +100,5 @@ async def _delete_volumes(session: AsyncSession, volumes: List[VolumeModel]):
     for project, names in by_project.items():
         try:
             await delete_volumes(session, project, names)
-        except Exception as e:
-            logger.error("Failed to delete volumes for project %s: %s", project.name, str(e))
+        except Exception:
+            logger.exception("Failed to delete volumes for project %s", project.name)

src/dstack/_internal/server/testing/common.py

@@ -820,15 +820,15 @@ def get_volume_configuration(
     region: str = "eu-west-1",
     size: Optional[Memory] = Memory(100),
     volume_id: Optional[str] = None,
-    idle_duration: Optional[Union[str, int, bool]] = None,
+    auto_cleanup_duration: Optional[Union[str, int]] = None,
 ) -> VolumeConfiguration:
     return VolumeConfiguration(
         name=name,
         backend=backend,
         region=region,
         size=size,
         volume_id=volume_id,
-        idle_duration=idle_duration,
+        auto_cleanup_duration=auto_cleanup_duration,
     )
 
 

src/tests/_internal/server/background/tasks/test_process_idle_volumes.py

@@ -46,7 +46,7 @@ async def test_idle_duration_disabled(self, test_db, session: AsyncSession):
         user = await create_user(session=session)
 
         config = get_volume_configuration(name="test-volume")
-        config.idle_duration = -1
+        config.auto_cleanup_duration = -1
 
         volume = await create_volume(
             session=session,
@@ -65,7 +65,7 @@ async def test_volume_attached(self, test_db, session: AsyncSession):
         user = await create_user(session=session)
 
         config = get_volume_configuration(name="test-volume")
-        config.idle_duration = "1h"
+        config.auto_cleanup_duration = "1h"
 
         volume = await create_volume(
             session=session,
@@ -90,7 +90,7 @@ async def test_idle_duration_threshold(self, test_db, session: AsyncSession):
         user = await create_user(session=session)
 
         config = get_volume_configuration(name="test-volume")
-        config.idle_duration = "1h"
+        config.auto_cleanup_duration = "1h"
 
         volume = await create_volume(
             session=session,
@@ -138,7 +138,7 @@ async def test_integration(self, test_db, session: AsyncSession):
         user = await create_user(session=session)
 
         config = get_volume_configuration(name="test-volume")
-        config.idle_duration = "1h"
+        config.auto_cleanup_duration = "1h"
 
         volume = await create_volume(
             session=session,