New client commit - use datetime fields

Author: vdusek

src/apify/storage_clients/_apify/_dataset_client.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import warnings
-from datetime import datetime
 from logging import getLogger
 from typing import TYPE_CHECKING, Any
 
@@ -73,9 +72,9 @@ async def get_metadata(self) -> DatasetMetadata:
         return DatasetMetadata(
             id=metadata.id,
             name=metadata.name,
-            created_at=datetime.fromisoformat(metadata.created_at.replace('Z', '+00:00')),
-            modified_at=datetime.fromisoformat(metadata.modified_at.replace('Z', '+00:00')),
-            accessed_at=datetime.fromisoformat(metadata.accessed_at.replace('Z', '+00:00')),
+            created_at=metadata.created_at,
+            modified_at=metadata.modified_at,
+            accessed_at=metadata.accessed_at,
             item_count=int(metadata.item_count),
         )
 

src/apify/storage_clients/_apify/_key_value_store_client.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import warnings
-from datetime import datetime
 from logging import getLogger
 from typing import TYPE_CHECKING, Any
 
@@ -62,9 +61,9 @@ async def get_metadata(self) -> ApifyKeyValueStoreMetadata:
         return ApifyKeyValueStoreMetadata(
             id=metadata.id,
             name=metadata.name,
-            created_at=datetime.fromisoformat(metadata.created_at.replace('Z', '+00:00')),
-            modified_at=datetime.fromisoformat(metadata.modified_at.replace('Z', '+00:00')),
-            accessed_at=datetime.fromisoformat(metadata.accessed_at.replace('Z', '+00:00')),
+            created_at=metadata.created_at,
+            modified_at=metadata.modified_at,
+            accessed_at=metadata.accessed_at,
             url_signing_secret_key=metadata.url_signing_secret_key,
         )
 

src/apify/storage_clients/_apify/_request_queue_client.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from datetime import datetime
 from logging import getLogger
 from typing import TYPE_CHECKING, Final, Literal
 
@@ -86,9 +85,6 @@ async def get_metadata(self) -> ApifyRequestQueueMetadata:
         total_request_count = int(metadata.total_request_count)
         handled_request_count = int(metadata.handled_request_count)
         pending_request_count = int(metadata.pending_request_count)
-        created_at = datetime.fromisoformat(metadata.created_at.replace('Z', '+00:00'))
-        modified_at = datetime.fromisoformat(metadata.modified_at.replace('Z', '+00:00'))
-        accessed_at = datetime.fromisoformat(metadata.accessed_at.replace('Z', '+00:00'))
 
         # Enhance API response with local estimations to account for propagation delays (API data can be delayed
         # by a few seconds, while local estimates are immediately accurate).
@@ -98,9 +94,9 @@ async def get_metadata(self) -> ApifyRequestQueueMetadata:
             total_request_count=max(total_request_count, self._implementation.metadata.total_request_count),
             handled_request_count=max(handled_request_count, self._implementation.metadata.handled_request_count),
             pending_request_count=pending_request_count,
-            created_at=min(created_at, self._implementation.metadata.created_at),
-            modified_at=max(modified_at, self._implementation.metadata.modified_at),
-            accessed_at=max(accessed_at, self._implementation.metadata.accessed_at),
+            created_at=min(metadata.created_at, self._implementation.metadata.created_at),
+            modified_at=max(metadata.modified_at, self._implementation.metadata.modified_at),
+            accessed_at=max(metadata.accessed_at, self._implementation.metadata.accessed_at),
             had_multiple_clients=metadata.had_multiple_clients or self._implementation.metadata.had_multiple_clients,
             stats=RequestQueueStats.model_validate(
                 metadata.stats.model_dump(by_alias=True) if metadata.stats else {},

src/apify/storage_clients/_apify/_request_queue_single_client.py

@@ -290,8 +290,7 @@ async def _list_head(self) -> None:
         # Should warn once? This might be outside expected context if the other consumers consumes at the same time
 
         if response.queue_modified_at:
-            modified_at = datetime.fromisoformat(response.queue_modified_at.replace('Z', '+00:00'))
-            self.metadata.modified_at = max(self.metadata.modified_at, modified_at)
+            self.metadata.modified_at = max(self.metadata.modified_at, response.queue_modified_at)
 
         # Update the cached data
         for request_data in response.items:

tests/integration/actor/test_actor_api_helpers.py

@@ -4,7 +4,7 @@
 import json
 from typing import TYPE_CHECKING
 
-from apify_client._models import ActorJobStatus, ActorPermissionLevel
+from apify_client._models import ActorPermissionLevel
 from crawlee._utils.crypto import crypto_random_object_id
 
 from .._utils import generate_unique_resource_name
@@ -303,7 +303,7 @@ async def main_outer() -> None:
     inner_actor_run_dict = inner_actor_run.model_dump(by_alias=True)
     inner_actor_last_run = ActorRun.model_validate(inner_actor_run_dict)
 
-    assert inner_actor_last_run.status.value == ActorJobStatus.ABORTED
+    assert inner_actor_last_run.status.value == 'ABORTED'
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is None

tests/unit/actor/test_actor_helpers.py

@@ -25,7 +25,7 @@ def fake_actor_run() -> Run:
             'actId': 'actor_id',
             'actorId': 'actor_id',
             'userId': 'user_id',
-            'startedAt': '2024-08-08 12:12:44',
+            'startedAt': '2024-08-08T12:12:44Z',
             'status': 'RUNNING',
             'meta': {'origin': 'API'},
             'containerUrl': 'http://0.0.0.0:3333',