modal 1.5.4.dev7__tar.gz → 1.5.4.dev8__tar.gz

{modal-1.5.4.dev7 → modal-1.5.4.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.4.dev7
+Version: 1.5.4.dev8
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.4.dev7 → modal-1.5.4.dev8}/modal/_functions.py

@@ -45,7 +45,7 @@ from ._utils.async_utils import (
     synchronizer,
     warn_if_generator_is_not_consumed,
 )
-from ._utils.blob_utils import MAX_OBJECT_SIZE_BYTES
+from ._utils.blob_utils import MAX_ASYNC_OBJECT_SIZE_BYTES, MAX_OBJECT_SIZE_BYTES
 from ._utils.function_utils import (
     ATTEMPT_TIMEOUT_GRACE_PERIOD,
     OUTPUTS_TIMEOUT,
@@ -424,6 +424,7 @@ class _InputPlaneInvocation:
         client: _Client,
         input_plane_url: str,
         input_plane_region: str,
+        function_call_invocation_type: "api_pb2.FunctionCallInvocationType.ValueType",
     ) -> "_InputPlaneInvocation":
         stub = await client.get_stub(input_plane_url)
 
@@ -435,6 +436,7 @@ class _InputPlaneInvocation:
             kwargs,
             control_plane_stub,
             function=function,
+            function_call_invocation_type=function_call_invocation_type,
         )
 
         request = api_pb2.AttemptStartRequest(
@@ -1449,6 +1451,11 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         self._max_object_size_bytes = (
             metadata.max_object_size_bytes if metadata.HasField("max_object_size_bytes") else MAX_OBJECT_SIZE_BYTES
         )
+        self._max_async_object_size_bytes = (
+            metadata.max_async_object_size_bytes
+            if metadata.HasField("max_async_object_size_bytes")
+            else MAX_ASYNC_OBJECT_SIZE_BYTES
+        )
         self._experimental_flash_urls = metadata._experimental_flash_urls
         self._app_id = metadata.app_id or None
 
@@ -1473,6 +1480,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             input_plane_url=self._input_plane_url,
             input_plane_region=self._input_plane_region,
             max_object_size_bytes=self._max_object_size_bytes,
+            max_async_object_size_bytes=self._max_async_object_size_bytes,
             _experimental_flash_urls=self._experimental_flash_urls,
             supported_input_formats=self._metadata.supported_input_formats if self._metadata else [],
             supported_output_formats=self._metadata.supported_output_formats if self._metadata else [],
@@ -1736,6 +1744,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 client=self.client,
                 input_plane_url=self._input_plane_url,
                 input_plane_region=self._input_plane_region,
+                function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_SYNC,
             )
         else:
             invocation = await _Invocation.create(
@@ -1777,6 +1786,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 client=self.client,
                 input_plane_url=self._input_plane_url,
                 input_plane_region=self._input_plane_region,
+                function_call_invocation_type=api_pb2.FUNCTION_CALL_INVOCATION_TYPE_SYNC_LEGACY,
             )
         else:
             invocation = await _Invocation.create(

{modal-1.5.4.dev7 → modal-1.5.4.dev8}/modal/_logs_manager.py

@@ -121,7 +121,7 @@ class _LogsManager:
             if self._stop_stream is not None and await self._stop_stream():
                 return _StreamStopReason.STOP_STREAM
 
-            sleep_time = _STREAM_POLL_INTERVAL_SECONDS
+            sleep_time: float = _STREAM_POLL_INTERVAL_SECONDS
             if deadline.value is not None:
                 sleep_time = min(sleep_time, max(0.0, deadline.value - time.monotonic()))
             await asyncio.sleep(sleep_time)
@@ -317,15 +317,12 @@ class _LogsManager:
             pass
 
 
-LogsManager = synchronize_api(_LogsManager, target_module=__name__)
-
-
-class _FunctionLogsManager(_LogsManager):
+class _FunctionLogsManager:
     """mdmd:namespace"""
 
     def __init__(self, source: _SupportsLogs):
         """mdmd:hidden"""
-        super().__init__(source)
+        self._manager = _LogsManager(source)
 
     async def fetch(
         self,
@@ -338,7 +335,8 @@ class _FunctionLogsManager(_LogsManager):
         """Fetch Function logs corresponding to the date range and filters.
 
         Args:
-            since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+            since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                which is interpreted as local time.
             until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                 as local time.
             source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -359,7 +357,7 @@ class _FunctionLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().fetch(since=since, until=until, source=source, search_text=search_text):
+        async for log_entry in self._manager.fetch(since=since, until=until, source=source, search_text=search_text):
             yield log_entry
 
     async def tail(
@@ -386,7 +384,7 @@ class _FunctionLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().tail(entries, source=source):
+        async for log_entry in self._manager.tail(entries, source=source):
             yield log_entry
 
     async def stream(self, timeout: float | None = None) -> AsyncGenerator[LogEntry, None]:
@@ -408,19 +406,19 @@ class _FunctionLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().stream(timeout=timeout):
+        async for log_entry in self._manager.stream(timeout=timeout):
             yield log_entry
 
 
 FunctionLogsManager = synchronize_api(_FunctionLogsManager, target_module=__name__)
 
 
-class _ServerLogsManager(_LogsManager):
+class _ServerLogsManager:
     """mdmd:namespace"""
 
     def __init__(self, source: _SupportsLogs):
         """mdmd:hidden"""
-        super().__init__(source)
+        self._manager = _LogsManager(source)
 
     async def fetch(
         self,
@@ -433,7 +431,8 @@ class _ServerLogsManager(_LogsManager):
         """Fetch Server logs corresponding to the date range and filters.
 
         Args:
-            since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+            since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                which is interpreted as local time.
             until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                 as local time.
             source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -454,7 +453,7 @@ class _ServerLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().fetch(since=since, until=until, source=source, search_text=search_text):
+        async for log_entry in self._manager.fetch(since=since, until=until, source=source, search_text=search_text):
             yield log_entry
 
     async def tail(
@@ -481,7 +480,7 @@ class _ServerLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().tail(entries, source=source):
+        async for log_entry in self._manager.tail(entries, source=source):
             yield log_entry
 
     async def stream(self, timeout: float | None = None) -> AsyncGenerator[LogEntry, None]:
@@ -503,34 +502,29 @@ class _ServerLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().stream(timeout=timeout):
+        async for log_entry in self._manager.stream(timeout=timeout):
             yield log_entry
 
 
 ServerLogsManager = synchronize_api(_ServerLogsManager, target_module=__name__)
 
 
-class _FunctionCallLogsManager(_LogsManager):
+class _FunctionCallLogsManager:
     """mdmd:namespace"""
 
     def __init__(self, source: _SupportsLogs):
         """mdmd:hidden"""
-        super().__init__(source, stop_stream=self._determine_function_call_stop)
+        self._source = source
         self._function_id: str | None = None
-
-    async def _params(self) -> _LogQueryData:
-        params = await super()._params()
-        if self._function_id is None:
-            self._function_id = getattr(self._source, "_function_id", None)
-        return params
+        self._manager = _LogsManager(source, stop_stream=self._determine_function_call_stop)
 
     async def _get_function_call_info(self) -> api_pb2.FunctionCallInfo:
         for i in range(5):
             try:
-                params = await self._params()
-                assert hasattr(self, "_function_id") and self._function_id is not None, (
-                    "Function ID should be set during hydration"
-                )
+                params = await self._manager._params()
+                if self._function_id is None:
+                    self._function_id = getattr(self._source, "_function_id", None)
+                assert self._function_id is not None, "Function ID should be set during hydration"
                 request = api_pb2.FunctionCallGetInfoRequest(
                     function_id=self._function_id,
                     function_call_id=params.filters.function_call_id,
@@ -542,6 +536,7 @@ class _FunctionCallLogsManager(_LogsManager):
                     await asyncio.sleep(1)
                     continue
                 raise
+        raise NotFoundError(f"Function call {self._source.object_id} not found after retries.")
 
     async def _determine_function_call_stop(self) -> bool:
         try:
@@ -553,7 +548,7 @@ class _FunctionCallLogsManager(_LogsManager):
         except NotFoundError:
             return False
         except (ServiceError, InternalError, StreamTerminatedError, socket.gaierror, AttributeError) as exc:
-            if self._is_transient_stream_error(exc):
+            if self._manager._is_transient_stream_error(exc):
                 logger.debug("Function call status check interrupted. Retrying ...")
                 return False
             raise
@@ -592,7 +587,7 @@ class _FunctionCallLogsManager(_LogsManager):
                 print(entry.message, end="")
             ```
         """
-        async for log_entry in super().stream(timeout=timeout):
+        async for log_entry in self._manager.stream(timeout=timeout):
             yield log_entry
 
     async def tail(
@@ -620,7 +615,7 @@ class _FunctionCallLogsManager(_LogsManager):
                 print(entry.timestamp, entry.message, end="")
             ```
         """
-        async for log_entry in super().tail(entries, source=source):
+        async for log_entry in self._manager.tail(entries, source=source):
             yield log_entry
 
     async def fetch(
@@ -634,7 +629,8 @@ class _FunctionCallLogsManager(_LogsManager):
         """Fetch all associated logs corresponding to the date range and filters.
 
         Args:
-            since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+            since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                which is interpreted as local time.
                 By default, this will fetch logs from the start of the function call.
             until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                 as local time.
@@ -667,7 +663,7 @@ class _FunctionCallLogsManager(_LogsManager):
         if since_was_defaulted and until_was_defaulted and since > until:
             until = since
 
-        async for log_entry in super().fetch(since=since, until=until, source=source, search_text=search_text):
+        async for log_entry in self._manager.fetch(since=since, until=until, source=source, search_text=search_text):
             yield log_entry
 
 

{modal-1.5.4.dev7 → modal-1.5.4.dev8}/modal/_logs_manager.pyi

@@ -101,143 +101,7 @@ class _LogsManager:
     @staticmethod
     async def _suppress_cancelled(task: asyncio.Task) -> None: ...
 
-class LogsManager:
-    """mdmd:namespace"""
-    def __init__(
-        self,
-        source: modal._supports_logs._SupportsLogs,
-        stop_stream: typing.Optional[collections.abc.Callable[[], bool]] = None,
-    ):
-        """mdmd:hidden"""
-        ...
-
-    class ___params_spec(typing_extensions.Protocol):
-        def __call__(self, /) -> modal._supports_logs._LogQueryData: ...
-        async def aio(self, /) -> modal._supports_logs._LogQueryData: ...
-
-    _params: ___params_spec
-
-    @staticmethod
-    def _resolve_source(source: typing.Optional[typing.Literal["stdout", "stderr", "system"]]) -> int: ...
-    @staticmethod
-    def _normalize_utc_datetime(value: datetime.datetime, name: str) -> datetime.datetime: ...
-    @staticmethod
-    def _entry_source(file_descriptor: int) -> typing.Literal["stdout", "stderr", "system"]: ...
-    @staticmethod
-    def _entry_timestamp(item: modal_proto.api_pb2.TaskLogs) -> datetime.datetime: ...
-    def _entry_context_ids(
-        self, item: modal_proto.api_pb2.TaskLogs, batch: modal_proto.api_pb2.TaskLogsBatch
-    ) -> list[str]: ...
-    def _entry_from_item(
-        self, item: modal_proto.api_pb2.TaskLogs, batch: modal_proto.api_pb2.TaskLogsBatch
-    ) -> modal.types.LogEntry: ...
-
-    class ___watch_stream_stop_spec(typing_extensions.Protocol):
-        def __call__(self, /, deadline: _Deadline) -> typing.Optional[_StreamStopReason]: ...
-        async def aio(self, /, deadline: _Deadline) -> typing.Optional[_StreamStopReason]: ...
-
-    _watch_stream_stop: ___watch_stream_stop_spec
-
-    class __fetch_spec(typing_extensions.Protocol):
-        def __call__(
-            self,
-            /,
-            *,
-            since: datetime.datetime,
-            until: typing.Optional[datetime.datetime] = None,
-            source: typing.Optional[typing.Literal["stdout", "stderr", "system"]] = None,
-            search_text: str = "",
-        ) -> typing.Generator[modal.types.LogEntry, None, None]:
-            """Fetch all associated logs corresponding to the date range and filters."""
-            ...
-
-        def aio(
-            self,
-            /,
-            *,
-            since: datetime.datetime,
-            until: typing.Optional[datetime.datetime] = None,
-            source: typing.Optional[typing.Literal["stdout", "stderr", "system"]] = None,
-            search_text: str = "",
-        ) -> collections.abc.AsyncGenerator[modal.types.LogEntry, None]:
-            """Fetch all associated logs corresponding to the date range and filters."""
-            ...
-
-    fetch: __fetch_spec
-
-    class __tail_spec(typing_extensions.Protocol):
-        def __call__(
-            self, /, entries: int = 100, *, source: typing.Optional[typing.Literal["stdout", "stderr", "system"]] = None
-        ) -> typing.Generator[modal.types.LogEntry, None, None]:
-            """Fetch the most recent logs."""
-            ...
-
-        def aio(
-            self, /, entries: int = 100, *, source: typing.Optional[typing.Literal["stdout", "stderr", "system"]] = None
-        ) -> collections.abc.AsyncGenerator[modal.types.LogEntry, None]:
-            """Fetch the most recent logs."""
-            ...
-
-    tail: __tail_spec
-
-    class ___create_log_stream_spec(typing_extensions.Protocol):
-        def __call__(
-            self, /, params: modal._supports_logs._LogQueryData, last_entry_id: str, timeout: float
-        ) -> typing.Generator[modal_proto.api_pb2.TaskLogsBatch, None, None]:
-            """Helper for creating the log stream RPC."""
-            ...
-
-        def aio(
-            self, /, params: modal._supports_logs._LogQueryData, last_entry_id: str, timeout: float
-        ) -> collections.abc.AsyncGenerator[modal_proto.api_pb2.TaskLogsBatch, None]:
-            """Helper for creating the log stream RPC."""
-            ...
-
-    _create_log_stream: ___create_log_stream_spec
-
-    def _stream_entries(self, batch: modal_proto.api_pb2.TaskLogsBatch): ...
-    @staticmethod
-    def _advance_batch(batch: modal_proto.api_pb2.TaskLogsBatch, last_entry_id: str) -> tuple[str, bool]: ...
-    @staticmethod
-    def _is_transient_stream_error(exc: Exception) -> bool: ...
-
-    class ___drain_stream_spec(typing_extensions.Protocol):
-        def __call__(
-            self, /, params: modal._supports_logs._LogQueryData, last_entry_id: str, timeout: float
-        ) -> typing.Generator[modal.types.LogEntry, None, None]:
-            """Do a final bounded drain in the logs to catch any remaining logs after the stop condition is met."""
-            ...
-
-        def aio(
-            self, /, params: modal._supports_logs._LogQueryData, last_entry_id: str, timeout: float
-        ) -> collections.abc.AsyncGenerator[modal.types.LogEntry, None]:
-            """Do a final bounded drain in the logs to catch any remaining logs after the stop condition is met."""
-            ...
-
-    _drain_stream: ___drain_stream_spec
-
-    class __stream_spec(typing_extensions.Protocol):
-        def __call__(
-            self, /, timeout: typing.Optional[float] = None
-        ) -> typing.Generator[modal.types.LogEntry, None, None]:
-            """Stream new logs until no logs arrive within the timeout."""
-            ...
-
-        def aio(
-            self, /, timeout: typing.Optional[float] = None
-        ) -> collections.abc.AsyncGenerator[modal.types.LogEntry, None]:
-            """Stream new logs until no logs arrive within the timeout."""
-            ...
-
-    stream: __stream_spec
-
-    class ___suppress_cancelled_spec(typing_extensions.Protocol):
-        def __call__(self, /, task: asyncio.Task) -> None: ...
-        async def aio(self, /, task: asyncio.Task) -> None: ...
-
-    _suppress_cancelled: typing.ClassVar[___suppress_cancelled_spec]
-
-class _FunctionLogsManager(_LogsManager):
+class _FunctionLogsManager:
     """mdmd:namespace"""
     def __init__(self, source: modal._supports_logs._SupportsLogs):
         """mdmd:hidden"""
@@ -254,7 +118,8 @@ class _FunctionLogsManager(_LogsManager):
         """Fetch Function logs corresponding to the date range and filters.
 
         Args:
-            since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+            since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                which is interpreted as local time.
             until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                 as local time.
             source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -323,7 +188,7 @@ class _FunctionLogsManager(_LogsManager):
         """
         ...
 
-class FunctionLogsManager(LogsManager):
+class FunctionLogsManager:
     """mdmd:namespace"""
     def __init__(self, source: modal._supports_logs._SupportsLogs):
         """mdmd:hidden"""
@@ -342,7 +207,8 @@ class FunctionLogsManager(LogsManager):
             """Fetch Function logs corresponding to the date range and filters.
 
             Args:
-                since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+                since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                    which is interpreted as local time.
                 until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                     as local time.
                 source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -377,7 +243,8 @@ class FunctionLogsManager(LogsManager):
             """Fetch Function logs corresponding to the date range and filters.
 
             Args:
-                since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+                since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                    which is interpreted as local time.
                 until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                     as local time.
                 source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -500,7 +367,7 @@ class FunctionLogsManager(LogsManager):
 
     stream: __stream_spec
 
-class _ServerLogsManager(_LogsManager):
+class _ServerLogsManager:
     """mdmd:namespace"""
     def __init__(self, source: modal._supports_logs._SupportsLogs):
         """mdmd:hidden"""
@@ -517,7 +384,8 @@ class _ServerLogsManager(_LogsManager):
         """Fetch Server logs corresponding to the date range and filters.
 
         Args:
-            since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+            since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                which is interpreted as local time.
             until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                 as local time.
             source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -586,7 +454,7 @@ class _ServerLogsManager(_LogsManager):
         """
         ...
 
-class ServerLogsManager(LogsManager):
+class ServerLogsManager:
     """mdmd:namespace"""
     def __init__(self, source: modal._supports_logs._SupportsLogs):
         """mdmd:hidden"""
@@ -605,7 +473,8 @@ class ServerLogsManager(LogsManager):
             """Fetch Server logs corresponding to the date range and filters.
 
             Args:
-                since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+                since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                    which is interpreted as local time.
                 until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                     as local time.
                 source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -640,7 +509,8 @@ class ServerLogsManager(LogsManager):
             """Fetch Server logs corresponding to the date range and filters.
 
             Args:
-                since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+                since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                    which is interpreted as local time.
                 until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                     as local time.
                 source: Filter by source: 'stdout', 'stderr', or 'system'.
@@ -763,13 +633,12 @@ class ServerLogsManager(LogsManager):
 
     stream: __stream_spec
 
-class _FunctionCallLogsManager(_LogsManager):
+class _FunctionCallLogsManager:
     """mdmd:namespace"""
     def __init__(self, source: modal._supports_logs._SupportsLogs):
         """mdmd:hidden"""
         ...
 
-    async def _params(self) -> modal._supports_logs._LogQueryData: ...
     async def _get_function_call_info(self) -> modal_proto.api_pb2.FunctionCallInfo: ...
     async def _determine_function_call_stop(self) -> bool: ...
     def stream(
@@ -835,7 +704,8 @@ class _FunctionCallLogsManager(_LogsManager):
         """Fetch all associated logs corresponding to the date range and filters.
 
         Args:
-            since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+            since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                which is interpreted as local time.
                 By default, this will fetch logs from the start of the function call.
             until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                 as local time.
@@ -857,18 +727,12 @@ class _FunctionCallLogsManager(_LogsManager):
         """
         ...
 
-class FunctionCallLogsManager(LogsManager):
+class FunctionCallLogsManager:
     """mdmd:namespace"""
     def __init__(self, source: modal._supports_logs._SupportsLogs):
         """mdmd:hidden"""
         ...
 
-    class ___params_spec(typing_extensions.Protocol):
-        def __call__(self, /) -> modal._supports_logs._LogQueryData: ...
-        async def aio(self, /) -> modal._supports_logs._LogQueryData: ...
-
-    _params: ___params_spec
-
     class ___get_function_call_info_spec(typing_extensions.Protocol):
         def __call__(self, /) -> modal_proto.api_pb2.FunctionCallInfo: ...
         async def aio(self, /) -> modal_proto.api_pb2.FunctionCallInfo: ...
@@ -1004,7 +868,8 @@ class FunctionCallLogsManager(LogsManager):
             """Fetch all associated logs corresponding to the date range and filters.
 
             Args:
-                since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+                since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                    which is interpreted as local time.
                     By default, this will fetch logs from the start of the function call.
                 until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                     as local time.
@@ -1038,7 +903,8 @@ class FunctionCallLogsManager(LogsManager):
             """Fetch all associated logs corresponding to the date range and filters.
 
             Args:
-                since: Start date to fetch logs from. Must be in UTC or timezone-naive, which is interpreted as local time.
+                since: Start date to fetch logs from. Must be in UTC or timezone-naive,
+                    which is interpreted as local time.
                     By default, this will fetch logs from the start of the function call.
                 until: Defaults to current date if None. Must be in UTC or timezone-naive, which is interpreted
                     as local time.

{modal-1.5.4.dev7 → modal-1.5.4.dev8}/modal/_output/pty.py

@@ -32,11 +32,11 @@ def get_pty_info(shell: bool, no_terminate_on_idle_stdin: bool = False) -> api_p
     rows, cols = get_winsz()
     return api_pb2.PTYInfo(
         enabled=True,  # TODO(erikbern): deprecated
-        winsz_rows=rows,
-        winsz_cols=cols,
-        env_term=os.environ.get("TERM"),
-        env_colorterm=os.environ.get("COLORTERM"),
-        env_term_program=os.environ.get("TERM_PROGRAM"),
+        winsz_rows=rows or 0,
+        winsz_cols=cols or 0,
+        env_term=os.environ.get("TERM", ""),
+        env_colorterm=os.environ.get("COLORTERM", ""),
+        env_term_program=os.environ.get("TERM_PROGRAM", ""),
         pty_type=api_pb2.PTYInfo.PTY_TYPE_SHELL if shell else api_pb2.PTYInfo.PTY_TYPE_FUNCTION,
         no_terminate_on_idle_stdin=no_terminate_on_idle_stdin,
     )
@@ -158,10 +158,12 @@ async def get_app_logs_loop(
                 log_prefix = _build_log_prefix(log_batch, log, _prefixes)
                 await output_mgr.put_streaming_log(log, prefix=log_prefix)
 
-    async def _get_logs():
+    async def _get_logs() -> bool:
+        """Fetch a batch of logs, returning True once the app signals that its logs are complete."""
         nonlocal last_log_batch_entry_id
         nonlocal pty_shell_finish_event, pty_shell_task_id, pty_shell_input_task
 
+        app_done = False
         request = api_pb2.AppGetLogsRequest(
             app_id=app_id or "",
             task_id=task_id or "",
@@ -179,7 +181,7 @@ async def get_app_logs_loop(
                 last_log_batch_entry_id = log_batch.entry_id
             if log_batch.app_done:
                 logger.debug("App logs are done")
-                last_log_batch_entry_id = None
+                app_done = True
                 break
             elif log_batch.image_id and not output_mgr._show_image_logs:
                 # Ignore image logs while app is creating objects.
@@ -212,10 +214,11 @@ async def get_app_logs_loop(
                 await stop_pty_shell()
 
         output_mgr.flush_lines()
+        return app_done
 
     while True:
         try:
-            await _get_logs()
+            app_done = await _get_logs()
         except (ServiceError, InternalError, StreamTerminatedError, socket.gaierror, AttributeError) as exc:
             if isinstance(exc, (ServiceError, InternalError)):
                 # Try again if we had a temporary connection drop, for example if computer went to sleep.
@@ -237,7 +240,7 @@ async def get_app_logs_loop(
                     continue
             raise
 
-        if last_log_batch_entry_id is None or not follow:
+        if app_done or not follow:
             break
 
     await stop_pty_shell()