Review call changes

Author: Pijukatel

src/apify/_actor.py

@@ -197,7 +197,7 @@ def apify_client(self) -> ApifyClientAsync:
 
     @property
     def configuration(self) -> Configuration:
-        """The Configuration instance the Actor instance uses."""
+        """The Configuration instance the Actor instance uses. Deprecated."""
         return self.config
 
     @property
@@ -225,7 +225,7 @@ def _finalize_implicit_configuration(self) -> Configuration:
             )
         # Use the configuration from the service locator
         self._configuration = Configuration.get_global_configuration()
-        return self.configuration
+        return self.config
 
     def _finalize_implicit_local_storage_client(self) -> StorageClient:
         """Set implicit local storage client in the actor and return it.
@@ -304,7 +304,7 @@ async def init(self) -> None:
         """
         if self._configuration:
             # Set explicitly the configuration in the service locator
-            service_locator.set_configuration(self.configuration)
+            service_locator.set_configuration(self.config)
         else:
             self._finalize_implicit_configuration()
 
@@ -496,6 +496,7 @@ async def open_dataset(
             id=id,
             alias=alias,
             name=name,
+            configuration=self.config,
             storage_client=storage_client,
         )
 
@@ -533,6 +534,7 @@ async def open_key_value_store(
             id=id,
             alias=alias,
             name=name,
+            configuration=self.config,
             storage_client=storage_client,
         )
 
@@ -573,6 +575,7 @@ async def open_request_queue(
             id=id,
             alias=alias,
             name=name,
+            configuration=self.config,
             storage_client=storage_client,
         )
 
@@ -867,13 +870,13 @@ async def start(
 
     def _get_remaining_time(self) -> timedelta | None:
         """Get time remaining from the actor timeout. Returns `None` if not on an Apify platform."""
-        if self.is_at_home() and self.configuration.timeout_at:
-            return self.configuration.timeout_at - datetime.now(tz=timezone.utc)
+        if self.is_at_home() and self.config.timeout_at:
+            return self.config.timeout_at - datetime.now(tz=timezone.utc)
 
         self.log.warning(
             'Returning `None` instead of remaining time. Using `RemainingTime` argument is only possible when the Actor'
             ' is running on the Apify platform and when the timeout for the Actor run is set. '
-            f'{self.is_at_home()=}, {self.configuration.timeout_at=}'
+            f'{self.is_at_home()=}, {self.config.timeout_at=}'
         )
         return None
 

tests/integration/test_actor_call_timeouts.py

@@ -30,7 +30,7 @@ async def main() -> None:
 
             # Start another run of this actor with timeout set to the time remaining in this actor run
             other_run_data = await Actor.call(
-                actor_id=Actor.configuration.actor_id or '',
+                actor_id=Actor.config.actor_id or '',
                 run_input={'called_from_another_actor': True},
                 timeout='RemainingTime',
             )
@@ -39,13 +39,13 @@ async def main() -> None:
                 # To make sure that the actor is started
                 await asyncio.sleep(5)
                 assert other_run_data.options is not None
-                assert Actor.configuration.timeout_at is not None
-                assert Actor.configuration.started_at is not None
+                assert Actor.config.timeout_at is not None
+                assert Actor.config.started_at is not None
 
-                remaining_time_after_actor_start = Actor.configuration.timeout_at - datetime.now(tz=timezone.utc)
+                remaining_time_after_actor_start = Actor.config.timeout_at - datetime.now(tz=timezone.utc)
 
                 assert other_run_data.options.timeout > remaining_time_after_actor_start
-                assert other_run_data.options.timeout < Actor.configuration.timeout_at - Actor.configuration.started_at
+                assert other_run_data.options.timeout < Actor.config.timeout_at - Actor.config.started_at
             finally:
                 # Make sure the other actor run is aborted
                 await Actor.apify_client.run(other_run_data.id).abort()
@@ -77,7 +77,7 @@ async def main() -> None:
 
             # Start another run of this actor with timeout set to the time remaining in this actor run
             other_run_data = await Actor.call(
-                actor_id=Actor.configuration.actor_id or '',
+                actor_id=Actor.config.actor_id or '',
                 run_input={'called_from_another_actor': True},
                 timeout='RemainingTime',
             )
@@ -88,13 +88,13 @@ async def main() -> None:
                 await asyncio.sleep(5)
 
                 assert other_run_data.options is not None
-                assert Actor.configuration.timeout_at is not None
-                assert Actor.configuration.started_at is not None
+                assert Actor.config.timeout_at is not None
+                assert Actor.config.started_at is not None
 
-                remaining_time_after_actor_start = Actor.configuration.timeout_at - datetime.now(tz=timezone.utc)
+                remaining_time_after_actor_start = Actor.config.timeout_at - datetime.now(tz=timezone.utc)
 
                 assert other_run_data.options.timeout > remaining_time_after_actor_start
-                assert other_run_data.options.timeout < Actor.configuration.timeout_at - Actor.configuration.started_at
+                assert other_run_data.options.timeout < Actor.config.timeout_at - Actor.config.started_at
             finally:
                 # Make sure the other actor run is aborted
                 await Actor.apify_client.run(other_run_data.id).abort()

tests/integration/test_actor_request_queue.py

@@ -334,7 +334,7 @@ async def main() -> None:
             await rq_1.fetch_next_request()
 
             # Accessed with client created explicitly with `client_key=None` should appear as distinct client
-            api_client = ApifyClientAsync(token=Actor.configuration.token).request_queue(
+            api_client = ApifyClientAsync(token=Actor.config.token).request_queue(
                 request_queue_id=rq_1.id, client_key=None
             )
             await api_client.list_head()

tests/integration/test_request_queue.py

@@ -1038,7 +1038,7 @@ async def test_rq_isolation(
     async def main() -> None:
         async with Actor:
             # Get the unique actor name for creating unique queue names
-            actor_name = Actor.configuration.actor_id
+            actor_name = Actor.config.actor_id
 
             # Open multiple queues with unique names
             rq1 = await Actor.open_request_queue(name=f'{actor_name}-rq-1')

tests/unit/actor/test_actor_non_default_instance.py

@@ -16,4 +16,4 @@ async def test_actor_global_works() -> None:
     non_default_configuration = Configuration(actor_full_name='Actor McActorson, esq.')
 
     async with Actor(configuration=non_default_configuration):
-        assert Actor.configuration is non_default_configuration
+        assert Actor.config is non_default_configuration