torchx-nightly 2024.4.11__py3-none-any.whl → 2024.4.13__py3-none-any.whl

torchx/specs/builders.py

@@ -18,8 +18,6 @@ from torchx.util.types import decode, decode_optional, get_argparse_param_type,
 
 from .api import AppDef, DeviceMount
 
-ENV_TORCHX_COMPONENT_ARGS = "TORCHX_COMPONENT_ARGS"
-
 
 def _create_args_parser(
     cmpnt_fn: Callable[..., AppDef],
@@ -136,7 +134,6 @@ def materialize_appdef(
     cmpnt_args: List[str],
     cmpnt_defaults: Optional[Dict[str, Any]] = None,
     config: Optional[Dict[str, Any]] = None,
-    component_args_string: Optional[str] = None,
 ) -> AppDef:
     """
     Creates an application by running user defined ``app_fn``.
@@ -191,10 +188,6 @@ def materialize_appdef(
 
     appdef = cmpnt_fn(*function_args, *var_arg, **kwargs)
 
-    if component_args_string:
-        for role in appdef.roles:
-            role.env[ENV_TORCHX_COMPONENT_ARGS] = component_args_string
-
     return appdef
 
 

torchx/workspace/docker_workspace.py

@@ -18,6 +18,7 @@ from typing import Dict, IO, Iterable, Mapping, Optional, TextIO, Tuple, TYPE_CH
 import fsspec
 
 import torchx
+from docker.errors import BuildError
 from torchx.specs import AppDef, CfgVal, Role, runopts
 from torchx.workspace.api import walk_workspace, WorkspaceMixin
 
@@ -93,6 +94,12 @@ class DockerWorkspaceMixin(WorkspaceMixin[Dict[str, Tuple[str, str]]]):
             type_=str,
             help="(remote jobs) the image repository to use when pushing patched images, must have push access. Ex: example.com/your/container",
         )
+        opts.add(
+            "quiet",
+            type_=bool,
+            default=False,
+            help="whether to suppress verbose output for image building. Defaults to ``False``.",
+        )
         return opts
 
     def build_workspace_and_update_role(
@@ -121,7 +128,7 @@ class DockerWorkspaceMixin(WorkspaceMixin[Dict[str, Tuple[str, str]]]):
                     f"failed to pull image {role.image}, falling back to local: {e}"
                 )
             log.info("Building workspace docker image (this may take a while)...")
-            image, _ = self._docker_client.images.build(
+            build_events = self._docker_client.api.build(
                 fileobj=context,
                 custom_context=True,
                 dockerfile=TORCHX_DOCKERFILE,
@@ -131,12 +138,26 @@ class DockerWorkspaceMixin(WorkspaceMixin[Dict[str, Tuple[str, str]]]):
                 },
                 pull=False,
                 rm=True,
+                decode=True,
                 labels={
                     self.LABEL_VERSION: torchx.__version__,
                 },
             )
+            image_id = None
+            for event in build_events:
+                if message := event.get("stream"):
+                    if not cfg.get("quiet", False):
+                        message = message.strip("\r\n").strip("\n")
+                        if message:
+                            log.info(message)
+                if aux := event.get("aux"):
+                    image_id = aux["ID"]
+                if error := event.get("error"):
+                    raise BuildError(reason=error, build_log=None)
             if len(old_imgs) == 0 or role.image not in old_imgs:
-                role.image = image.id
+                assert image_id, "image id was not found"
+                role.image = image_id
+
         finally:
             context.close()
 

{torchx_nightly-2024.4.11.dist-info → torchx_nightly-2024.4.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: torchx-nightly
-Version: 2024.4.11
+Version: 2024.4.13
 Summary: TorchX SDK and Components
 Home-page: https://github.com/pytorch/torchx
 Author: TorchX Devs

{torchx_nightly-2024.4.11.dist-info → torchx_nightly-2024.4.13.dist-info}/RECORD

@@ -83,7 +83,7 @@ torchx/schedulers/ray/ray_common.py,sha256=pyNYFvTKVwdjDAeCBNbPwAWwVNmlLOJWExfn9
 torchx/schedulers/ray/ray_driver.py,sha256=Wl-1jldL8veVKzmYDEeR2va3JSlAjZpFE1h8HWE9YVE,12286
 torchx/specs/__init__.py,sha256=vF-WUu_4NZP30lCtNYg0YVenY6wRQ8k7K36fOxqbOKc,5477
 torchx/specs/api.py,sha256=_euy2mCO-P7qQSxt_476GlePXEa_7H4BAzJQHX3fANY,34736
-torchx/specs/builders.py,sha256=UqNvVrJ3ZMbvv6qcfp1ZNxBpjcwQSvle29EVw1TMzUM,10178
+torchx/specs/builders.py,sha256=QDcQrnCO4bdSaiP0216XbCgTsnLutO_1_FW5jDiEIWI,9939
 torchx/specs/file_linter.py,sha256=IeiomB1BgHUlT-ZsvGxar3llY63NOupfLBrOrD_---A,11860
 torchx/specs/finder.py,sha256=MnwxG_UC4a-3X2wQ37ANEQR6D1TvriCLyuVYBh_-wuI,16249
 torchx/specs/named_resources_aws.py,sha256=8jsbFZFTa1ZkdpZmBrqhVfSVuZonrXbADhTPmIRdtEQ,7743
@@ -111,10 +111,10 @@ torchx/util/types.py,sha256=ynRZWRhmyLboRmz6XcCcu8617YhMh63NPC_6ysysyx8,7379
 torchx/workspace/__init__.py,sha256=FqN8AN4VhR1C_SBY10MggQvNZmyanbbuPuE-JCjkyUY,798
 torchx/workspace/api.py,sha256=1heBmPgB-W5Zf9gwViM7NrqvHpZlVYeMN7jpY8Qkytc,5479
 torchx/workspace/dir_workspace.py,sha256=npNW_IjUZm_yS5r-8hrRkH46ndDd9a_eApT64m1S1T4,2268
-torchx/workspace/docker_workspace.py,sha256=-utUxu1DFVJ5nAXTERDxz4Rr8CzdKO7Tkqfzap1HvHo,9425
-torchx_nightly-2024.4.11.dist-info/LICENSE,sha256=WVHfXhFC0Ia8LTKt_nJVYobdqTJVg_4J3Crrfm2A8KQ,1721
-torchx_nightly-2024.4.11.dist-info/METADATA,sha256=FKvlFUTDFZvqLTi1kNR_qwj9wPsyxtBlEjTsd_FPD_Q,6053
-torchx_nightly-2024.4.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-torchx_nightly-2024.4.11.dist-info/entry_points.txt,sha256=3JYZFlX9aWzR-Gs_qsx1zq7mlqbFz6Mi9rQUULW8caI,170
-torchx_nightly-2024.4.11.dist-info/top_level.txt,sha256=pxew3bc2gsiViS0zADs0jb6kC5v8o_Yy_85fhHj_J1A,7
-torchx_nightly-2024.4.11.dist-info/RECORD,,
+torchx/workspace/docker_workspace.py,sha256=PFu2KQNVC-0p2aKJ-W_BKA9ZOmXdCY2ABEkCExp3udQ,10269
+torchx_nightly-2024.4.13.dist-info/LICENSE,sha256=WVHfXhFC0Ia8LTKt_nJVYobdqTJVg_4J3Crrfm2A8KQ,1721
+torchx_nightly-2024.4.13.dist-info/METADATA,sha256=Gqwinwo_BIR4uMjdP_BiTZ-FGiVI55kzI8mm51r0lJs,6053
+torchx_nightly-2024.4.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+torchx_nightly-2024.4.13.dist-info/entry_points.txt,sha256=3JYZFlX9aWzR-Gs_qsx1zq7mlqbFz6Mi9rQUULW8caI,170
+torchx_nightly-2024.4.13.dist-info/top_level.txt,sha256=pxew3bc2gsiViS0zADs0jb6kC5v8o_Yy_85fhHj_J1A,7
+torchx_nightly-2024.4.13.dist-info/RECORD,,