Remove unnecessary actor_name argument

Author: Pijukatel

src/apify_client/clients/resource_clients/actor.py

@@ -337,9 +337,7 @@ def call(
 
         run_client = self.root_client.run(run_id=started_run['id'])
         if logger == 'default':
-            actor_data = self.get()
-            actor_name = actor_data.get('name', '') if actor_data else ''
-            log_context = run_client.get_streamed_log(actor_name=actor_name)
+            log_context = run_client.get_streamed_log()
         else:
             log_context = run_client.get_streamed_log(to_logger=logger)
 
@@ -745,9 +743,7 @@ async def call(
 
         run_client = self.root_client.run(run_id=started_run['id'])
         if logger == 'default':
-            actor_data = await self.get()
-            actor_name = actor_data.get('name', '') if actor_data else ''
-            log_context = await run_client.get_streamed_log(actor_name=actor_name)
+            log_context = await run_client.get_streamed_log()
         else:
             log_context = await run_client.get_streamed_log(to_logger=logger)
 

src/apify_client/clients/resource_clients/run.py

@@ -255,16 +255,13 @@ def log(self) -> LogClient:
             **self._sub_resource_init_options(resource_path='log'),
         )
 
-    def get_streamed_log(
-        self, to_logger: logging.Logger | None = None, *, actor_name: str = '', from_start: bool = True
-    ) -> StreamedLogSync:
+    def get_streamed_log(self, to_logger: logging.Logger | None = None, *, from_start: bool = True) -> StreamedLogSync:
         """Get `StreamedLog` instance that can be used to redirect logs.
 
          `StreamedLog` can be directly called or used as a context manager.
 
         Args:
             to_logger: `Logger` used for logging the redirected messages. If not provided, a new logger is created
-            actor_name: Optional component of default logger name.
             from_start: If `True`, all logs from the start of the actor run will be redirected. If `False`, only newly
                 arrived logs will be redirected. This can be useful for redirecting only a small portion of relevant
                 logs for long-running actors in stand-by.
@@ -275,6 +272,10 @@ def get_streamed_log(
         run_data = self.get()
         run_id = run_data.get('id', '') if run_data else ''
 
+        actor_id = run_data.get('actId', '') if run_data else ''
+        actor_data = self.root_client.actor(actor_id=actor_id).get() or {}
+        actor_name = actor_data.get('name', '') if run_data else ''
+
         if not to_logger:
             name = '-'.join(part for part in (actor_name, run_id) if part)
             to_logger = create_redirect_logger(f'apify.{name}')
@@ -549,15 +550,14 @@ def log(self) -> LogClientAsync:
         )
 
     async def get_streamed_log(
-        self, to_logger: logging.Logger | None = None, *, actor_name: str = '', from_start: bool = True
+        self, to_logger: logging.Logger | None = None, *, from_start: bool = True
     ) -> StreamedLogAsync:
         """Get `StreamedLog` instance that can be used to redirect logs.
 
          `StreamedLog` can be directly called or used as a context manager.
 
         Args:
             to_logger: `Logger` used for logging the redirected messages. If not provided, a new logger is created
-            actor_name: Optional component of default logger name.
             from_start: If `True`, all logs from the start of the actor run will be redirected. If `False`, only newly
                 arrived logs will be redirected. This can be useful for redirecting only a small portion of relevant
                 logs for long-running actors in stand-by.
@@ -568,6 +568,10 @@ async def get_streamed_log(
         run_data = await self.get()
         run_id = run_data.get('id', '') if run_data else ''
 
+        actor_id = run_data.get('actId', '') if run_data else ''
+        actor_data = await self.root_client.actor(actor_id=actor_id).get() or {}
+        actor_name = actor_data.get('name', '') if run_data else ''
+
         if not to_logger:
             name = '-'.join(part for part in (actor_name, run_id) if part)
             to_logger = create_redirect_logger(f'apify.{name}')

tests/unit/test_logging.py

@@ -53,13 +53,21 @@ def mock_api() -> None:
     actor_runs_responses = iter(
         (
             httpx.Response(
-                content=json.dumps({'data': {'id': _MOCKED_RUN_ID, 'status': ActorJobStatus.RUNNING}}), status_code=200
+                content=json.dumps(
+                    {'data': {'id': _MOCKED_RUN_ID, 'actId': _MOCKED_ACTOR_ID, 'status': ActorJobStatus.RUNNING}}
+                ),
+                status_code=200,
             ),
             httpx.Response(
-                content=json.dumps({'data': {'id': _MOCKED_RUN_ID, 'status': ActorJobStatus.RUNNING}}), status_code=200
+                content=json.dumps(
+                    {'data': {'id': _MOCKED_RUN_ID, 'actId': _MOCKED_ACTOR_ID, 'status': ActorJobStatus.RUNNING}}
+                ),
+                status_code=200,
             ),
             httpx.Response(
-                content=json.dumps({'data': {'id': _MOCKED_RUN_ID, 'status': ActorJobStatus.SUCCEEDED}}),
+                content=json.dumps(
+                    {'data': {'id': _MOCKED_RUN_ID, 'actId': _MOCKED_ACTOR_ID, 'status': ActorJobStatus.SUCCEEDED}}
+                ),
                 status_code=200,
             ),
         )
@@ -137,15 +145,15 @@ async def test_redirected_logs_async(
     with patch('apify_client.clients.resource_clients.log.datetime') as mocked_datetime:
         # Mock `now()` so that it has timestamp bigger than the first 3 logs
         mocked_datetime.now.return_value = datetime.fromisoformat('2025-05-13T07:24:14.132+00:00')
-        streamed_log = await run_client.get_streamed_log(actor_name=_MOCKED_ACTOR_NAME, from_start=log_from_start)
+        streamed_log = await run_client.get_streamed_log(from_start=log_from_start)
 
     # Set `propagate=True` during the tests, so that caplog can see the logs..
     logger_name = f'apify.{_MOCKED_ACTOR_NAME}-{_MOCKED_RUN_ID}'
 
     with caplog.at_level(logging.DEBUG, logger=logger_name):
         async with streamed_log:
             # Do stuff while the log from the other actor is being redirected to the logs.
-            await asyncio.sleep(1)
+            await asyncio.sleep(2)
 
     assert len(caplog.records) == expected_log_count
     for expected_message_and_level, record in zip(_EXPECTED_MESSAGES_AND_LEVELS[-expected_log_count:], caplog.records):
@@ -172,14 +180,14 @@ def test_redirected_logs_sync(
     with patch('apify_client.clients.resource_clients.log.datetime') as mocked_datetime:
         # Mock `now()` so that it has timestamp bigger than the first 3 logs
         mocked_datetime.now.return_value = datetime.fromisoformat('2025-05-13T07:24:14.132+00:00')
-        streamed_log = run_client.get_streamed_log(actor_name=_MOCKED_ACTOR_NAME, from_start=log_from_start)
+        streamed_log = run_client.get_streamed_log(from_start=log_from_start)
 
     # Set `propagate=True` during the tests, so that caplog can see the logs..
     logger_name = f'apify.{_MOCKED_ACTOR_NAME}-{_MOCKED_RUN_ID}'
 
     with caplog.at_level(logging.DEBUG, logger=logger_name), streamed_log:
         # Do stuff while the log from the other actor is being redirected to the logs.
-        time.sleep(1)
+        time.sleep(2)
 
     assert len(caplog.records) == expected_log_count
     for expected_message_and_level, record in zip(_EXPECTED_MESSAGES_AND_LEVELS[-expected_log_count:], caplog.records):