anyscale 0.26.68__py3-none-any.whl → 0.26.70__py3-none-any.whl

anyscale/commands/service_commands.py

@@ -79,8 +79,9 @@ def _read_name_from_config_file(path: str):
     "-f",
     "--config-file",
     required=False,
-    default=None,
+    default=[],
     type=str,
+    multiple=True,
     help="Path to a YAML config file to deploy. When deploying from a file, import path and arguments cannot be provided. Command-line flags will overwrite values read from the file.",
 )
 @click.option(
@@ -202,8 +203,15 @@ def _read_name_from_config_file(path: str):
     type=str,
     help="Named project to use for the service. If not provided, the default project for the cloud will be used (or, if running in a workspace, the project of the workspace).",
 )
+@click.option(
+    "--versions",
+    required=False,
+    default=None,
+    type=str,
+    help="Defines the traffic and capacity percents per version. Capacity defaults to traffic.",
+)
 def deploy(  # noqa: PLR0912, PLR0913 C901
-    config_file: Optional[str],
+    config_file: List[str],
     import_path: Optional[str],
     arguments: Tuple[str],
     name: Optional[str],
@@ -222,6 +230,7 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     py_module: Tuple[str],
     cloud: Optional[str],
     project: Optional[str],
+    versions: Optional[str],
 ):
     """Deploy or update a service.
 
@@ -238,102 +247,156 @@ def deploy(  # noqa: PLR0912, PLR0913 C901
     Command-line flags override values in the config file.
     """
 
-    if config_file is not None:
-        if import_path is not None or len(arguments) > 0:
+    if versions is None:
+        if len(config_file) == 1:
+            if import_path is not None or len(arguments) > 0:
+                raise click.ClickException(
+                    "When a config file is provided, import path and application arguments can't be."
+                )
+
+            if not pathlib.Path(config_file[0]).is_file():
+                raise click.ClickException(f"Config file '{config_file[0]}' not found.")
+
+            config = ServiceConfig.from_yaml(config_file[0])
+        elif len(config_file) > 1:
             raise click.ClickException(
-                "When a config file is provided, import path and application arguments can't be."
+                "Multiple config files can be provided only when deploying multiple versions with --versions."
             )
+        else:
+            # when config_file is not provided.
+            if import_path is None:
+                raise click.ClickException(
+                    "Either config file or import path must be provided."
+                )
+
+            if (
+                import_path.endswith((".yaml", ".yml"))
+                or pathlib.Path(import_path).is_file()
+            ):
+                log.warning(
+                    f"The provided import path '{import_path}' looks like a config file. Did you mean to use '-f config.yaml'?"
+                )
 
-        if not pathlib.Path(config_file).is_file():
-            raise click.ClickException(f"Config file '{config_file}' not found.")
+            app: Dict[str, Any] = {"import_path": import_path}
+            arguments_dict = convert_kv_strings_to_dict(arguments)
+            if arguments_dict:
+                app["args"] = arguments_dict
 
-        config = ServiceConfig.from_yaml(config_file)
-    else:
-        if import_path is None:
+            config = ServiceConfig(applications=[app])
+
+        if containerfile and image_uri:
+            raise click.ClickException(
+                "Only one of '--containerfile' and '--image-uri' can be provided."
+            )
+
+        if ray_version and (not image_uri and not containerfile):
             raise click.ClickException(
-                "Either config file or import path must be provided."
+                "Ray version can only be used with an image or containerfile.",
             )
 
-        if (
-            import_path.endswith((".yaml", ".yml"))
-            or pathlib.Path(import_path).is_file()
+        if registry_login_secret and (
+            not image_uri or ImageURI.from_str(image_uri).is_cluster_env_image()
         ):
-            log.warning(
-                f"The provided import path '{import_path}' looks like a config file. Did you mean to use '-f config.yaml'?"
+            raise click.ClickException(
+                "Registry login secret can only be used with an image that is not hosted on Anyscale."
             )
 
-        app: Dict[str, Any] = {"import_path": import_path}
-        arguments_dict = convert_kv_strings_to_dict(arguments)
-        if arguments_dict:
-            app["args"] = arguments_dict
+        if name is not None:
+            config = config.options(name=name)
 
-        config = ServiceConfig(applications=[app])
+        if image_uri is not None:
+            config = config.options(image_uri=image_uri)
 
-    if containerfile and image_uri:
-        raise click.ClickException(
-            "Only one of '--containerfile' and '--image-uri' can be provided."
-        )
+        if registry_login_secret is not None:
+            config = config.options(registry_login_secret=registry_login_secret)
 
-    if ray_version and (not image_uri and not containerfile):
-        raise click.ClickException(
-            "Ray version can only be used with an image or containerfile.",
-        )
+        if ray_version is not None:
+            config = config.options(ray_version=ray_version)
 
-    if registry_login_secret and (
-        not image_uri or ImageURI.from_str(image_uri).is_cluster_env_image()
-    ):
-        raise click.ClickException(
-            "Registry login secret can only be used with an image that is not hosted on Anyscale."
-        )
+        if containerfile is not None:
+            config = config.options(containerfile=containerfile)
 
-    if name is not None:
-        config = config.options(name=name)
+        if compute_config is not None:
+            config = config.options(compute_config=compute_config)
 
-    if image_uri is not None:
-        config = config.options(image_uri=image_uri)
+        if working_dir is not None:
+            config = config.options(working_dir=working_dir)
 
-    if registry_login_secret is not None:
-        config = config.options(registry_login_secret=registry_login_secret)
+        if exclude:
+            config = config.options(excludes=[e for e in exclude])
 
-    if ray_version is not None:
-        config = config.options(ray_version=ray_version)
+        if requirements is not None:
+            config = config.options(requirements=requirements)
 
-    if containerfile is not None:
-        config = config.options(containerfile=containerfile)
+        if env:
+            config = override_env_vars(config, convert_kv_strings_to_dict(env))
 
-    if compute_config is not None:
-        config = config.options(compute_config=compute_config)
+        if py_module:
+            for module in py_module:
+                if not pathlib.Path(module).is_dir():
+                    raise click.ClickException(
+                        f"Python module path '{module}' does not exist or is not a directory."
+                    )
+            config = config.options(py_modules=[*py_module])
 
-    if working_dir is not None:
-        config = config.options(working_dir=working_dir)
+        if cloud is not None:
+            config = config.options(cloud=cloud)
+        if project is not None:
+            config = config.options(project=project)
 
-    if exclude:
-        config = config.options(excludes=[e for e in exclude])
+        configs = config
+    else:
+        # When multiple versions are being deployed.
+        configs = [ServiceConfig.from_yaml(config) for config in config_file]
+        for config in configs:
+            if name is not None:
+                config = config.options(name=name)
 
-    if requirements is not None:
-        config = config.options(requirements=requirements)
+            if cloud is not None:
+                config = config.options(cloud=cloud)
 
-    if env:
-        config = override_env_vars(config, convert_kv_strings_to_dict(env))
+            if project is not None:
+                config = config.options(project=project)
 
-    if py_module:
-        for module in py_module:
-            if not pathlib.Path(module).is_dir():
-                raise click.ClickException(
-                    f"Python module path '{module}' does not exist or is not a directory."
-                )
-        config = config.options(py_modules=[*py_module])
+            if image_uri is not None:
+                log.warning("--image-uri is ignored.")
+
+            if registry_login_secret is not None:
+                log.warning("--registry-login-secret is ignored.")
+
+            if ray_version is not None:
+                log.warning("--ray-version is ignored.")
+
+            if containerfile is not None:
+                log.warning("--containerfile is ignored.")
+
+            if compute_config is not None:
+                log.warning("--compute-config is ignored.")
 
-    if cloud is not None:
-        config = config.options(cloud=cloud)
-    if project is not None:
-        config = config.options(project=project)
+            if working_dir is not None:
+                log.warning("--working-dir is ignored.")
+
+            if exclude:
+                log.warning("--exclude is ignored.")
+
+            if requirements is not None:
+                log.warning("--requirements is ignored.")
+
+            if env:
+                log.warning("--env is ignored.")
+
+            if py_module:
+                log.warning("--py-module is ignored.")
 
     anyscale.service.deploy(
-        config,
+        configs,
         in_place=in_place,
         canary_percent=canary_percent,
         max_surge_percent=max_surge_percent,
+        versions=versions,
+        name=name,
+        cloud=cloud,
+        project=project,
     )