Fix relative date in CLI for weeks and months (#2481)

1 weeks -> 1 week
1 months -> 1 month

Author: jvstme

src/dstack/_internal/utils/common.py

@@ -67,9 +67,15 @@ def pretty_date(time: datetime) -> str:
     if diff.days < 7:
         return str(diff.days) + " days ago"
     if diff.days < 31:
-        return str(round(diff.days / 7)) + " weeks ago"
+        weeks = round(diff.days / 7)
+        if weeks == 1:
+            return str(weeks) + " week ago"
+        return str(weeks) + " weeks ago"
     if diff.days < 365:
-        return str(round(diff.days / 30)) + " months ago"
+        months = round(diff.days / 30)
+        if months == 1:
+            return str(months) + " month ago"
+        return str(months) + " months ago"
     years = round(diff.days / 365)
     if years == 1:
         return str(years) + " year ago"

src/tests/_internal/utils/test_common.py

@@ -67,21 +67,36 @@ def test_days_ago(self):
         past_time = now - timedelta(days=5)
         assert pretty_date(past_time) == "5 days ago"
 
+    def test_week_ago(self):
+        now = datetime.now(tz=timezone.utc)
+        past_time = now - timedelta(days=7)
+        assert pretty_date(past_time) == "1 week ago"
+
     def test_weeks_ago(self):
         now = datetime.now(tz=timezone.utc)
         past_time = now - timedelta(days=21)
         assert pretty_date(past_time) == "3 weeks ago"
 
+    def test_month_ago(self):
+        now = datetime.now(tz=timezone.utc)
+        past_time = now - timedelta(days=31)
+        assert pretty_date(past_time) == "1 month ago"
+
     def test_months_ago(self):
         now = datetime.now(tz=timezone.utc)
         past_time = now - timedelta(days=90)
         assert pretty_date(past_time) == "3 months ago"
 
-    def test_years_ago(self):
+    def test_year_ago(self):
         now = datetime.now(tz=timezone.utc)
         past_time = now - timedelta(days=400)
         assert pretty_date(past_time) == "1 year ago"
 
+    def test_years_ago(self):
+        now = datetime.now(tz=timezone.utc)
+        past_time = now - timedelta(days=700)
+        assert pretty_date(past_time) == "2 years ago"
+
     def test_future_time(self):
         now = datetime.now(tz=timezone.utc)
         future_time = now + timedelta(hours=1)