modAL 1.2.7.dev7__py3-none-any.whl → 1.2.7.dev9__py3-none-any.whl

modal/_utils/blob_utils.py

@@ -152,12 +152,13 @@ async def perform_multipart_upload(
     part_etags = await TaskContext.gather(*upload_coros)
 
     # The body of the complete_multipart_upload command needs some data in xml format:
-    completion_body = "<CompleteMultipartUpload>\n"
+    completion_parts = ["<CompleteMultipartUpload>"]
     for part_number, etag in enumerate(part_etags, 1):
-        completion_body += f"""<Part>\n<PartNumber>{part_number}</PartNumber>\n<ETag>"{etag}"</ETag>\n</Part>\n"""
-    completion_body += "</CompleteMultipartUpload>"
+        completion_parts.append(f"""<Part>\n<PartNumber>{part_number}</PartNumber>\n<ETag>"{etag}"</ETag>\n</Part>""")
+    completion_parts.append("</CompleteMultipartUpload>")
+    completion_body = "\n".join(completion_parts)
 
-    # etag of combined object should be md5 hex of concatendated md5 *bytes* from parts + `-{num_parts}`
+    # etag of combined object should be md5 hex of concatenated md5 *bytes* from parts + `-{num_parts}`
     bin_hash_parts = [bytes.fromhex(etag) for etag in part_etags]
 
     expected_multipart_etag = hashlib.md5(b"".join(bin_hash_parts)).hexdigest() + f"-{len(part_etags)}"

modal/client.pyi

@@ -32,7 +32,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.7.dev7",
+        version: str = "1.2.7.dev9",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.7.dev7",
+        version: str = "1.2.7.dev9",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/file_io.py

@@ -190,7 +190,7 @@ class _FileIO(Generic[T]):
 
     async def _wait(self, exec_id: str) -> bytes:
         # The logic here is similar to how output is read from `exec`
-        output = b""
+        output_buffer = io.BytesIO()
         completed = False
         retries_remaining = 10
         while not completed:
@@ -201,7 +201,7 @@ class _FileIO(Generic[T]):
                         break
                     if isinstance(data, Exception):
                         raise data
-                    output += data
+                    output_buffer.write(data)
             except (GRPCError, StreamTerminatedError) as exc:
                 if retries_remaining > 0:
                     retries_remaining -= 1
@@ -212,7 +212,7 @@ class _FileIO(Generic[T]):
                     elif isinstance(exc, StreamTerminatedError):
                         continue
                 raise
-        return output
+        return output_buffer.getvalue()
 
     def _validate_type(self, data: Union[bytes, str]) -> None:
         if self._binary and isinstance(data, str):
@@ -421,10 +421,22 @@ class _FileIO(Generic[T]):
                 task_id=self._task_id,
             ),
         )
+
+        def end_of_event(item: bytes, buffer: io.BytesIO, boundary_token: bytes) -> bool:
+            if not item.endswith(b"\n"):
+                return False
+            boundary_token_size = len(boundary_token)
+            if buffer.tell() < boundary_token_size:
+                return False
+            buffer.seek(-boundary_token_size, io.SEEK_END)
+            if buffer.read(boundary_token_size) == boundary_token:
+                return True
+            return False
+
         async with TaskContext() as tc:
             tc.create_task(self._consume_watch_output(resp.exec_id))
 
-            buffer = b""
+            item_buffer = io.BytesIO()
             while True:
                 if len(self._watch_output_buffer) > 0:
                     item = self._watch_output_buffer.pop(0)
@@ -432,12 +444,12 @@ class _FileIO(Generic[T]):
                         break
                     if isinstance(item, Exception):
                         raise item
-                    buffer += item
-                    # a single event may be split across multiple messages
-                    # the end of an event is marked by two newlines
-                    if buffer.endswith(b"\n\n"):
+                    item_buffer.write(item)
+                    assert isinstance(item, bytes)
+                    # Single events may span multiple messages so we need to check for a special event boundary token
+                    if end_of_event(item, item_buffer, boundary_token=b"\n\n"):
                         try:
-                            event_json = json.loads(buffer.strip().decode())
+                            event_json = json.loads(item_buffer.getvalue().strip().decode())
                             event = FileWatchEvent(
                                 type=FileWatchEventType(event_json["event_type"]),
                                 paths=event_json["paths"],
@@ -447,7 +459,7 @@ class _FileIO(Generic[T]):
                         except (json.JSONDecodeError, KeyError, ValueError):
                             # skip invalid events
                             pass
-                        buffer = b""
+                        item_buffer = io.BytesIO()
                 else:
                     await asyncio.sleep(0.1)
 

modal/io_streams.py

@@ -23,7 +23,7 @@ from grpclib.exceptions import GRPCError, StreamTerminatedError
 from modal.exception import ClientClosed, ExecTimeoutError, InvalidError
 from modal_proto import api_pb2
 
-from ._utils.async_utils import aclosing, synchronize_api
+from ._utils.async_utils import aclosing, synchronize_api, synchronizer
 from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES
 from ._utils.task_command_router_client import TaskCommandRouterClient
 from .client import _Client
@@ -153,17 +153,17 @@ class _StreamReaderThroughServer(Generic[T]):
         """Fetch the entire contents of the stream until EOF."""
         logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read starting")
         if self._text:
-            data_str = ""
+            buffer = io.StringIO()
             async for message in _decode_bytes_stream_to_str(self._get_logs()):
-                data_str += message
+                buffer.write(message)
             logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read completed after EOF")
-            return cast(T, data_str)
+            return cast(T, buffer.getvalue())
         else:
-            data_bytes = b""
+            buffer = io.BytesIO()
             async for message in self._get_logs():
-                data_bytes += message
+                buffer.write(message)
             logger.debug(f"{self._object_id} StreamReader fd={self._file_descriptor} read completed after EOF")
-            return cast(T, data_bytes)
+            return cast(T, buffer.getvalue())
 
     async def _consume_container_process_stream(self):
         """Consume the container process stream and store messages in the buffer."""
@@ -566,6 +566,9 @@ class _StreamReader(Generic[T]):
         task_id: Optional[str] = None,
     ) -> None:
         """mdmd:hidden"""
+        # we can remove this once we ensure no constructors use async code
+        assert asyncio.get_running_loop() == synchronizer._get_loop(start=False)
+
         if by_line and not text:
             raise ValueError("line-buffering is only supported when text=True")
 

{modal-1.2.7.dev7.dist-info → modal-1.2.7.dev9.dist-info}/METADATA

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

{modal-1.2.7.dev7.dist-info → modal-1.2.7.dev9.dist-info}/RECORD

@@ -26,7 +26,7 @@ modal/app.pyi,sha256=rL-UAzRkwoQp-PA96fQAS4YfmjWBDyfasziCMq6NrHI,51015
 modal/billing.py,sha256=zmQ3bcCJlwa4KD1IA_QgdWpm1pn13c-7qfy79iEauYI,195
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=k1CqQ_0t4-vHylkqYZgYCnClg-FT0QrTPAKivL01A_k,14354
-modal/client.pyi,sha256=iDYFbDtM2tc7Sx9WkenkYajql1W5XCmwYk5QETBzolU,13146
+modal/client.pyi,sha256=vBmss5dgofpPZ-_mCYAZRaMenwB4uTsrogebAm7pQ0Y,13146
 modal/cloud_bucket_mount.py,sha256=cvVj5Rt4nDHoQbTneoJPTaAcnl_Ab_mrsjnnzd0v9OI,6013
 modal/cloud_bucket_mount.pyi,sha256=vXusGMOUk9HjCs4lhxteuCK4xLQclPfugGWKo7LECEA,7539
 modal/cls.py,sha256=PIGe4ED28jcxC2HeKtMD3odMIb4qNmlRt3tj1dZstRo,41738
@@ -39,7 +39,7 @@ modal/dict.pyi,sha256=yQHHZe98M6gB2ahzrmqlq8KUXvqFy6vamsijI2H0RdE,32002
 modal/environments.py,sha256=wMiMNpPkvIl_BdxRb81CY9Djzhczp_y4GEYKWp0JyBc,6135
 modal/environments.pyi,sha256=bMIxvwahckgaolGD3-hP2iovRHDXewvgbVs_nx4ze0o,3808
 modal/exception.py,sha256=8QeIE6XcuAc1moa1hSgQTxFFjfEyIdiuKiAyCS3RS4M,10210
-modal/file_io.py,sha256=lfcQAWeuujQol_e1mYlm331Uesh__yWsv-u19gQV7wc,19308
+modal/file_io.py,sha256=hqK7ZXo7iEidXRriBAU2Es08HC-rGKmMjMbcT5FaASI,19939
 modal/file_io.pyi,sha256=MpO5-EA6KuBbOQV0zXV_nPDD5Aw5dfYVa8q9SGBsAVM,14666
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
@@ -47,7 +47,7 @@ modal/functions.pyi,sha256=CeSVZcrjsjh8Gqo5PK7QkbpfSlrKvnFzm3HLYqGEePw,38107
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=Pm26DwuD7RqfrxscAHxhoA9LGJYTt_k0wcsHRqbwnzE,107945
 modal/image.pyi,sha256=grkqK9BfyKDXmJYNme-lGa0O3u7pOU5GifyLOAhG3sc,78202
-modal/io_streams.py,sha256=ziMQ1VNxxj0tJPYl9QpJZCWd72jyQ9BJ1mmanPXvxv0,30615
+modal/io_streams.py,sha256=jhBdJH080kPkNdkYyvtxJumcJt2nEDozsKDF5I0o3hM,30818
 modal/io_streams.pyi,sha256=GGRPHumOaTwr11GzmZPf4_aSXGGKsMvB6NoSGHp_F7Q,18633
 modal/mount.py,sha256=NYWmSqK842qmYUQZqaacwCdMRRyfj8stA3DvsChjGRc,33838
 modal/mount.pyi,sha256=cJ4HPB7Oa7vl_AkBWQ0cKaty36ZcO8fNLE48DYUa9eQ,15807
@@ -98,7 +98,7 @@ modal/_utils/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/_utils/app_utils.py,sha256=88BT4TPLWfYAQwKTHcyzNQRHg8n9B-QE2UyJs96iV-0,108
 modal/_utils/async_utils.py,sha256=PnwHfaHcqjLwMnlGC2kn8nqubxpXcSKcy4jHx6477dg,30625
 modal/_utils/auth_token_manager.py,sha256=QsDokl1c1dN9m6Z9N-Se-8cY3laphByjJtNdRXUTieI,5151
-modal/_utils/blob_utils.py,sha256=4z0qH5txEUvfmfIYnZnvIG6G4BwiTpn3fsfI24ppD6M,23316
+modal/_utils/blob_utils.py,sha256=L4lEL-rvZwoxCxrGaa8zWVoaHjhq1eQfO4SLrvt4g8k,23376
 modal/_utils/bytes_io_segment_payload.py,sha256=vaXPq8b52-x6G2hwE7SrjS58pg_aRm7gV3bn3yjmTzQ,4261
 modal/_utils/deprecation.py,sha256=-Bgg7jZdcJU8lROy18YyVnQYbM8hue-hVmwJqlWAGH0,5504
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
@@ -158,7 +158,7 @@ modal/experimental/__init__.py,sha256=GOuo3t4-Le0ZVddiHIOw0MQxkdTJge-bVbhDvgnblm
 modal/experimental/flash.py,sha256=GJZwSr-4OHlP6gCIZdcbsSb8D8WX9xJwMphjwcfsRoU,31262
 modal/experimental/flash.pyi,sha256=q4a3mdgL0jzATPL2tS7LpuyulYzF1vUSE453S9xc8n8,16965
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.2.7.dev7.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.2.7.dev9.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -180,10 +180,10 @@ modal_proto/task_command_router_pb2.py,sha256=2Y8wRvnq4_7RiQ-5ZAPIgXaxrHv_MXzgS5
 modal_proto/task_command_router_pb2.pyi,sha256=yI4tFteErLlonFA2HyaWtONfhY_VGSe7KCWFIspvmkE,16323
 modal_proto/task_command_router_pb2_grpc.py,sha256=q2VWfK2-4uDcPaPLhAqPZkgxhuQRYnWmwUcnEbPbGuk,13895
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=e1MM10VGUgDkm041v53QeTglGQPzTpA0FUsFtezjp74,4536
-modal_version/__init__.py,sha256=EIU8WY6zGrQ5WjfZUZ42Hl3spbaZh3QHRY0P_2zdMb8,120
+modal_version/__init__.py,sha256=Nj3_Nk88t3yPscVokW4lp7tcogFqwHgva5YAz4Zww3Y,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.2.7.dev7.dist-info/METADATA,sha256=FpCHbZMv2nPWKfnWIBQ7nXtlMtihMgF0eImXNNBNFK8,2491
-modal-1.2.7.dev7.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.2.7.dev7.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.2.7.dev7.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.2.7.dev7.dist-info/RECORD,,
+modal-1.2.7.dev9.dist-info/METADATA,sha256=R8W0pUmCnIhbGcyymb9v_tlZiuQiUX--xbI-f39wpq0,2491
+modal-1.2.7.dev9.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.2.7.dev9.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.2.7.dev9.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.2.7.dev9.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.7.dev7"
+__version__ = "1.2.7.dev9"