feat(qaas): wip timezone

Author: vmscw

requirements.txt

@@ -4,6 +4,4 @@ randomname>=0.2.1
 httpx>=0.27.0
 pytimeparse>=1.1.8
 attrs>=22.2.0
-python-dateutil>=2.8.0
-pytz>=2024.1
-tzlocal>=5.3.1
+python-dateutil>=2.8.0

scaleway_qaas_client/v1alpha1/client.py

@@ -127,8 +127,6 @@
     Response,
 )
 
-from scaleway_qaas_client.v1alpha1.utils import get_local_iana_timezone, is_valid_iana
-
 _DEFAULT_URL = "https://api.scaleway.com"
 
 
@@ -253,7 +251,6 @@ def create_session(
         booking_demand_started_at: Optional[datetime] = None,
         booking_demand_finished_at: Optional[datetime] = None,
         booking_demand_description: Optional[str] = None,
-        booking_demand_time_zone: Optional[str] = None,
     ) -> ScalewayQaasV1Alpha1Session:
         """Create a session
 
@@ -267,10 +264,9 @@ def create_session(
             max_duration (Union[None, Unset, str]): Maximum duration before the session ends. (in seconds) Example: 20m.
             deduplication_id (Union[None, Unset, str]): Deduplication ID of the session.
             model_id (Union[None, Unset, str]): Default computation model ID to be executed by job assigned to this session.
-            booking_demand_started_at (Union[None, Unset, datetime.datetime]): Wished started time for an exclusive session over a QPU, only works if the platform is_bookable (RFC 3339 format) Example: 2022-03-22T12:34:56.123456Z.
-            booking_demand_finished_at (Union[None, Unset, datetime.datetime]): Wished finished time for an exclusive session over a QPU, only works if the platform is_bookable (RFC 3339 format) Example: 2022-03-22T12:34:56.123456Z.
+            booking_demand_started_at (Union[None, Unset, datetime.datetime]): Wished started UTC time for an exclusive session over a QPU, only works if the platform is_bookable (RFC 3339 format) Example: 2022-03-22T12:34:56.123456Z.
+            booking_demand_finished_at (Union[None, Unset, datetime.datetime]): Wished finished UTC time for an exclusive session over a QPU, only works if the platform is_bookable (RFC 3339 format) Example: 2022-03-22T12:34:56.123456Z.
             booking_demand_description (Union[None, Unset, str]): User description of the booking
-            booking_demand_time_zone (Union[None, Unset, str]): Time zone of the demanded booking (eg: Europe/Paris, America/New_York...)
 
         Raises:
             errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -309,25 +305,11 @@ def create_session(
         booking_demand = UNSET
 
         if booking_demand_started_at and booking_demand_finished_at:
-            booking_demand_started_at_timestamp = booking_demand_started_at.timestamp()
-            booking_demand_finished_at_timestamp = (
-                booking_demand_finished_at.timestamp()
-            )
-
-            if booking_demand_time_zone is not None and not is_valid_iana(
-                booking_demand_time_zone
-            ):
-                raise Exception(
-                    f"create_session: invalid time zone {booking_demand_time_zone} as IANA format"
-                )
-            else:
-                time_zone = get_local_iana_timezone()
-
             booking_demand = CreateSessionBodyBookingDemand(
-                started_at=booking_demand_started_at_timestamp,
-                finished_at=booking_demand_finished_at_timestamp,
+                started_at=booking_demand_started_at,
+                finished_at=booking_demand_finished_at,
                 description=booking_demand_description,
-                time_zone=time_zone,
+                time_zone="UTC",
             )
 
         response = _create_session_sync(

scaleway_qaas_client/v1alpha1/utils.py

@@ -1,4 +1,5 @@
 pytest
 pytest-dependency
 pytest-progress
-pytest-httpx
+pytest-httpx
+pytz

tests/requirements.txt

@@ -13,6 +13,7 @@
 # limitations under the License.
 import os
 import time
+import pytz
 
 from datetime import datetime, timedelta, timezone
 
@@ -21,6 +22,14 @@
 _TEST_PLATFORM_NAME = os.environ.get("TEST_PLATFORM_NAME", "aer_simulation_pop_c16m128")
 
 
+def _get_now_utc() -> datetime:
+    return datetime.now(timezone.utc)
+
+
+def _get_now_paris() -> datetime:
+    return datetime.now(pytz.timezone("Europe/Paris"))
+
+
 def _get_client() -> QaaSClient:
     client = QaaSClient(
         project_id=os.environ["SCALEWAY_PROJECT_ID"],
@@ -41,8 +50,8 @@ def test_create_and_cancel_booking():
     target_platform = platforms[0]
 
     try:
-        now = datetime.now(timezone.utc)
-        booking_start = now + timedelta(seconds=15)
+        now = _get_now_paris()
+        booking_start = now + timedelta(seconds=16)
         booking_finish = booking_start + timedelta(seconds=20)
         booking_description = "my lovely booking"
 
@@ -100,7 +109,7 @@ def test_create_overlaping_booking():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(days=1)
     booking_finish = booking_start + timedelta(hours=1)
     booking_description = "my overlaping booking"
@@ -127,7 +136,7 @@ def test_create_too_long_booking():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(minutes=1)
     booking_finish = booking_start + timedelta(hours=10)
     booking_description = "my too long booking"
@@ -152,7 +161,7 @@ def test_create_too_short_booking():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(minutes=1)
     booking_finish = booking_start + timedelta(seconds=10)
     booking_description = "my lovely booking"
@@ -177,7 +186,7 @@ def test_create_too_far_booking():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(days=30)
     booking_finish = booking_start + timedelta(hours=2)
     booking_description = "my lovely booking"
@@ -202,7 +211,7 @@ def test_create_too_close_booking():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(seconds=10)
     booking_finish = booking_start + timedelta(hours=2)
     booking_description = "my lovely booking"
@@ -227,7 +236,7 @@ def test_stop_too_close_booking():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(seconds=20)
     booking_finish = booking_start + timedelta(seconds=30)
     booking_description = "my lovely booking"
@@ -273,7 +282,7 @@ def test_cannot_start_not_booked_session_during_booked_session_is_running():
 
     target_platform = platforms[0]
 
-    now = datetime.now(timezone.utc)
+    now = _get_now_paris()
     booking_start = now + timedelta(seconds=20)
     booking_finish = booking_start + timedelta(seconds=20)
     booking_description = "my booking"
@@ -347,7 +356,7 @@ def test_not_booked_session_is_killed_when_booked_session_starts():
 
         assert not_booked_session_2
 
-        now = datetime.now(timezone.utc)
+        now = _get_now_paris()
         booking_start = now + timedelta(seconds=20)
         booking_finish = booking_start + timedelta(seconds=20)
         booking_description = "my booking"