Add raw=True

Author: Pijukatel

src/apify_client/clients/resource_clients/log.py

@@ -29,7 +29,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         resource_path = kwargs.pop('resource_path', 'logs')
         super().__init__(*args, resource_path=resource_path, **kwargs)
 
-    def get(self) -> str | None:
+    def get(self, raw: str = False) -> str | None:
         """Retrieve the log as text.
 
         https://docs.apify.com/api/v2#/reference/logs/log/get-log
@@ -41,7 +41,7 @@ def get(self) -> str | None:
             response = self.http_client.call(
                 url=self.url,
                 method='GET',
-                params=self._params(),
+                params=self._params(raw=raw),
             )
 
             return response.text  # noqa: TRY300
@@ -51,7 +51,7 @@ def get(self) -> str | None:
 
         return None
 
-    def get_as_bytes(self) -> bytes | None:
+    def get_as_bytes(self, raw: str = False) -> bytes | None:
         """Retrieve the log as raw bytes.
 
         https://docs.apify.com/api/v2#/reference/logs/log/get-log
@@ -63,7 +63,7 @@ def get_as_bytes(self) -> bytes | None:
             response = self.http_client.call(
                 url=self.url,
                 method='GET',
-                params=self._params(),
+                params=self._params(raw=raw),
                 parse_response=False,
             )
 
@@ -75,7 +75,7 @@ def get_as_bytes(self) -> bytes | None:
         return None
 
     @contextmanager
-    def stream(self) -> Iterator[httpx.Response | None]:
+    def stream(self, raw: str = False) -> Iterator[httpx.Response | None]:
         """Retrieve the log as a stream.
 
         https://docs.apify.com/api/v2#/reference/logs/log/get-log
@@ -88,7 +88,7 @@ def stream(self) -> Iterator[httpx.Response | None]:
             response = self.http_client.call(
                 url=self.url,
                 method='GET',
-                params=self._params(stream=True),
+                params=self._params(stream=True, raw=raw),
                 stream=True,
                 parse_response=False,
             )
@@ -110,7 +110,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         resource_path = kwargs.pop('resource_path', 'logs')
         super().__init__(*args, resource_path=resource_path, **kwargs)
 
-    async def get(self) -> str | None:
+    async def get(self, raw: str = False) -> str | None:
         """Retrieve the log as text.
 
         https://docs.apify.com/api/v2#/reference/logs/log/get-log
@@ -122,7 +122,7 @@ async def get(self) -> str | None:
             response = await self.http_client.call(
                 url=self.url,
                 method='GET',
-                params=self._params(),
+                params=self._params(raw=raw),
             )
 
             return response.text  # noqa: TRY300
@@ -132,7 +132,7 @@ async def get(self) -> str | None:
 
         return None
 
-    async def get_as_bytes(self) -> bytes | None:
+    async def get_as_bytes(self, raw: str = False) -> bytes | None:
         """Retrieve the log as raw bytes.
 
         https://docs.apify.com/api/v2#/reference/logs/log/get-log
@@ -144,7 +144,7 @@ async def get_as_bytes(self) -> bytes | None:
             response = await self.http_client.call(
                 url=self.url,
                 method='GET',
-                params=self._params(),
+                params=self._params(raw=raw),
                 parse_response=False,
             )
 
@@ -156,7 +156,7 @@ async def get_as_bytes(self) -> bytes | None:
         return None
 
     @asynccontextmanager
-    async def stream(self) -> AsyncIterator[httpx.Response | None]:
+    async def stream(self, raw: str = False) -> AsyncIterator[httpx.Response | None]:
         """Retrieve the log as a stream.
 
         https://docs.apify.com/api/v2#/reference/logs/log/get-log
@@ -169,13 +169,13 @@ async def stream(self) -> AsyncIterator[httpx.Response | None]:
             response = await self.http_client.call(
                 url=self.url,
                 method='GET',
-                params=self._params(stream=True),
+                params=self._params(stream=True, raw=raw),
                 stream=True,
                 parse_response=False,
             )
 
             yield response
-        except ApifyApiError as exc:
+        except Exception as exc:
             catch_not_found_or_throw(exc)
             yield None
         finally:
@@ -223,7 +223,7 @@ async def __aexit__(
         self._streaming_task = None
 
     async def _stream_log(self, to_logger: logging.Logger) -> None:
-        async with self._log_client.stream() as log_stream:
+        async with self._log_client.stream(raw=True) as log_stream:
             if not log_stream:
                 return
             async for data in log_stream.aiter_bytes():

tests/unit/test_logging.py

@@ -24,6 +24,10 @@
     b'2025-05-13T07:24:14.132Z [apify] INFO multiline \n log',
     b'2025-05-13T07:25:14.132Z [apify] WARNING some warning',
     b'2025-05-13T07:26:14.132Z [apify] DEBUG c',
+    b'2025-05-13T0', # Chunked log that got split in the marker, part 1
+    b'7:26:14.132Z [apify] DEBUG d' # Chunked log that got split in the marker, part 2
+    b'2025-05-13T07:26:14.132Z [apify] DEB', # Chunked log that got split outside of marker, part 1
+    b'UG e', # Chunked log that got split outside of marker, part 1
 )
 
 _EXPECTED_MESSAGES_AND_LEVELS = (
@@ -33,6 +37,8 @@
     ('2025-05-13T07:24:14.132Z [apify] INFO multiline \n log', logging.INFO),
     ('2025-05-13T07:25:14.132Z [apify] WARNING some warning', logging.WARNING),
     ('2025-05-13T07:26:14.132Z [apify] DEBUG c', logging.DEBUG),
+    ('2025-05-13T07:26:14.132Z [apify] DEBUG d', logging.DEBUG),
+    ('2025-05-13T07:26:14.132Z [apify] DEBUG e', logging.DEBUG),
 )
 
 
@@ -42,7 +48,7 @@ class AsyncByteStream(httpx._types.AsyncByteStream):
         async def __aiter__(self) -> AsyncIterator[bytes]:
             for i in _MOCKED_ACTOR_LOGS:
                 yield i
-                await asyncio.sleep(0.1)
+                await asyncio.sleep(0.01)
 
         async def aclose(self) -> None:
             pass
@@ -63,7 +69,7 @@ async def aclose(self) -> None:
     )
 
     async def actor_runs_side_effect(_: httpx.Request) -> httpx.Response:
-        await asyncio.sleep(0.5)
+        await asyncio.sleep(0.1)
         return next(actor_runs_responses)
 
     respx.get(url=f'{_MOCKED_API_URL}/v2/actor-runs/{_MOCKED_RUN_ID}').mock(side_effect=actor_runs_side_effect)
@@ -76,7 +82,7 @@ async def actor_runs_side_effect(_: httpx.Request) -> httpx.Response:
         return_value=httpx.Response(content=json.dumps({'data': {'id': _MOCKED_RUN_ID}}), status_code=200)
     )
 
-    respx.get(url=f'{_MOCKED_API_URL}/v2/actor-runs/{_MOCKED_RUN_ID}/log?stream=1').mock(
+    respx.get(url=f'{_MOCKED_API_URL}/v2/actor-runs/{_MOCKED_RUN_ID}/log?stream=1&raw=1').mock(
         return_value=httpx.Response(stream=AsyncByteStream(), status_code=200)
     )
 
@@ -106,7 +112,7 @@ async def test_redirected_logs(
             # Do stuff while the log from the other actor is being redirected to the logs.
             await asyncio.sleep(1)
 
-    assert len(caplog.records) == 6
+    assert len(caplog.records) == 8
     for expected_message_and_level, record in zip(_EXPECTED_MESSAGES_AND_LEVELS, caplog.records):
         assert expected_message_and_level[0] == record.message
         assert expected_message_and_level[1] == record.levelno
@@ -133,7 +139,7 @@ async def test_actor_call_redirect_logs_to_default_logger(
     assert isinstance(logger.handlers[0], logging.StreamHandler)
 
     # Ensure logs are propagated
-    assert len(caplog.records) == 6
+    assert len(caplog.records) == 8
     for expected_message_and_level, record in zip(_EXPECTED_MESSAGES_AND_LEVELS, caplog.records):
         assert expected_message_and_level[0] == record.message
         assert expected_message_and_level[1] == record.levelno
@@ -168,7 +174,7 @@ async def test_actor_call_redirect_logs_to_custom_logger(
     with caplog.at_level(logging.DEBUG, logger=logger_name):
         await run_client.call(logger=logger)
 
-    assert len(caplog.records) == 6
+    assert len(caplog.records) == 8
     for expected_message_and_level, record in zip(_EXPECTED_MESSAGES_AND_LEVELS, caplog.records):
         assert expected_message_and_level[0] == record.message
         assert expected_message_and_level[1] == record.levelno