anyscale 0.5.182__tar.gz → 0.24.0__tar.gz

{anyscale-0.5.182 → anyscale-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.5.182
+Version: 0.24.0
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.5.182 → anyscale-0.24.0}/anyscale/commands/service_commands.py

@@ -87,6 +87,14 @@ def _convert_arguments_to_dict(args: Tuple[str]) -> Dict[str, str]:
     type=str,
     help="Path to a local directory that will be the working directory for the service. The files in the directory will be automatically uploaded to cloud storage. When running in a workspace, this defaults to the current working directory.",
 )
+@click.option(
+    "-e",
+    "--exclude",
+    required=False,
+    type=str,
+    multiple=True,
+    help="File pattern to exclude when uploading local directories. This argument can be specified multiple times and the patterns will be appended to the 'excludes' list in the config file (if any).",
+)
 @click.option(
     "-r",
     "--requirements",
@@ -124,6 +132,7 @@ def deploy(  # noqa: PLR0913
     image: Optional[str],
     compute_config: Optional[str],
     working_dir: Optional[str],
+    exclude: Tuple[str],
     requirements: Optional[str],
     in_place: bool,
     canary_percent: Optional[int],
@@ -157,6 +166,7 @@ def deploy(  # noqa: PLR0913
             image=image,
             compute_config=compute_config,
             working_dir=working_dir,
+            excludes=[e for e in exclude] if exclude else None,
             requirements=requirements,
         ),
         in_place=in_place,

{anyscale-0.5.182 → anyscale-0.24.0}/anyscale/service/_private/anyscale_client.py

@@ -190,7 +190,7 @@ class AnyscaleClientWrapper(ABC):
 
     @abstractmethod
     def upload_local_dir_to_cloud_storage(
-        self, local_dir: str, *, cloud_id: str
+        self, local_dir: str, *, cloud_id: str, excludes: Optional[List[str]] = None
     ) -> str:
         """Upload the provided directory to cloud storage and return a URI for it.
 
@@ -389,7 +389,11 @@ class FakeAnyscaleClient(AnyscaleClientWrapper):
         return service
 
     def upload_local_dir_to_cloud_storage(
-        self, local_dir: str, *, cloud_id: str  # noqa: ARG002
+        self,
+        local_dir: str,  # noqa: ARG002
+        *,
+        cloud_id: str,
+        excludes: Optional[List[str]] = None,  # noqa: ARG002
     ) -> str:
         bucket = self.CLOUD_BUCKET.format(cloud_id=cloud_id)
         return f"{bucket}/fake_pkg_{uuid.uuid4()}.zip"
@@ -624,12 +628,16 @@ class RealAnyscaleClient(AnyscaleClientWrapper):
         return result
 
     def upload_local_dir_to_cloud_storage(
-        self, local_dir: str, *, cloud_id: str
+        self, local_dir: str, *, cloud_id: str, excludes: Optional[List[str]] = None
     ) -> str:
         if not pathlib.Path(local_dir).is_dir():
             raise RuntimeError(f"Path '{local_dir}' is not a valid directory.")
 
-        with zip_local_dir(local_dir) as (_, zip_file_bytes, content_hash):
+        with zip_local_dir(local_dir, excludes=excludes) as (
+            _,
+            zip_file_bytes,
+            content_hash,
+        ):
             request = CloudDataBucketPresignedUploadRequest(
                 file_type=CloudDataBucketFileType.RUNTIME_ENV_PACKAGES,
                 file_name=RUNTIME_ENV_PACKAGE_FORMAT.format(content_hash=content_hash),

{anyscale-0.5.182 → anyscale-0.24.0}/anyscale/service/_private/sdk.py

@@ -113,7 +113,7 @@ class ServiceSDK:
 
         local_path_to_uri: Dict[str, str] = {}
 
-        def _upload_dir_memoized(target: str) -> str:
+        def _upload_dir_memoized(target: str, *, excludes: Optional[List[str]]) -> str:
             if is_dir_remote_uri(target):
                 return target
             if target in local_path_to_uri:
@@ -121,27 +121,32 @@ class ServiceSDK:
 
             logger.info(f"Uploading local dir '{target}' to cloud storage.")
             uri = self._client.upload_local_dir_to_cloud_storage(
-                target, cloud_id=cloud_id
+                target, cloud_id=cloud_id, excludes=excludes,
             )
             local_path_to_uri[target] = uri
             return uri
 
         for application in new_applications:
             runtime_env = application.get("runtime_env", {})
+            excludes = runtime_env.pop("excludes", None)
             if "working_dir" in runtime_env:
                 # Allow `None` to be used as a signal not to override.
                 if runtime_env["working_dir"] is not None:
                     runtime_env["working_dir"] = _upload_dir_memoized(
-                        runtime_env["working_dir"]
+                        runtime_env["working_dir"], excludes=excludes
                     )
             elif autopopulate_in_workspace and self._client.inside_workspace():
-                runtime_env["working_dir"] = _upload_dir_memoized(".")
+                runtime_env["working_dir"] = _upload_dir_memoized(
+                    ".", excludes=excludes,
+                )
 
             py_modules = runtime_env.get("py_modules", None)
             if py_modules is not None:
                 new_py_modules = []
                 for py_module in py_modules:
-                    new_py_modules.append(_upload_dir_memoized(py_module))
+                    new_py_modules.append(
+                        _upload_dir_memoized(py_module, excludes=excludes)
+                    )
 
                 application["runtime_env"]["py_modules"] = new_py_modules
 
@@ -275,12 +280,11 @@ class ServiceSDK:
                 f"View the service in the UI: {self._client.get_service_ui_url(service.id)}"
             )
 
-        # Use the /-/routes URL so the request is always expected to work.
         logger.info(
             "Query the service once it's running using the following curl command:"
         )
         logger.info(
-            f"curl -H 'Authorization: Bearer {service.auth_token}' {service.base_url}/-/routes"
+            f"curl -H 'Authorization: Bearer {service.auth_token}' {service.base_url}/"
         )
 
     def _strip_none_values_from_dict(self, d: Dict) -> Dict:

{anyscale-0.5.182 → anyscale-0.24.0}/anyscale/service/models.py

@@ -14,6 +14,7 @@ class ServiceConfig:
         image: Optional[str] = None,
         compute_config: Optional[Union[Dict, str]] = None,
         working_dir: Optional[str] = None,
+        excludes: Optional[List[str]] = None,
         requirements: Optional[Union[str, List[str]]] = None,
         **kwargs,
     ):
@@ -29,6 +30,15 @@ class ServiceConfig:
         if compute_config is not None and not isinstance(compute_config, (str, dict)):
             raise TypeError("'compute_config' must be a string or dictionary.")
 
+        if working_dir is not None and not isinstance(working_dir, str):
+            raise TypeError("'working_dir' must be a string.")
+
+        if excludes is not None and (
+            not isinstance(excludes, list)
+            or not all(isinstance(e, str) for e in excludes)
+        ):
+            raise TypeError("'excludes' must be a list of strings.")
+
         if not isinstance(applications, list):
             raise TypeError("'applications' must be a list.")
         elif len(applications) == 0:
@@ -40,6 +50,7 @@ class ServiceConfig:
         self._applications = self._override_application_runtime_envs(
             applications=applications,
             working_dir=working_dir,
+            excludes=excludes,
             requirements=requirements,
         )
 
@@ -48,11 +59,15 @@ class ServiceConfig:
         applications: List[Dict[str, Any]],
         *,
         working_dir: Optional[str],
+        excludes: Optional[List[str]],
         requirements: Union[None, str, List[str]],
     ) -> List[Dict[str, Any]]:
         """Override the runtime_env field of the provided applications.
 
-        Only the working_dir and requirements fields will be modified.
+        Fields that are modified:
+            - 'working_dir' is overwritten with the passed working_dir.
+            - 'pip' is overwritten with the passed requirements.
+            - 'excludes' is extended with the passed excludes list.
         """
         applications = copy.deepcopy(applications)
         for application in applications:
@@ -60,6 +75,10 @@ class ServiceConfig:
             if working_dir is not None:
                 runtime_env["working_dir"] = working_dir
 
+            if excludes is not None:
+                # Extend the list of excludes rather than overwriting it.
+                runtime_env["excludes"] = runtime_env.get("excludes", []) + excludes
+
             if requirements is not None:
                 runtime_env["pip"] = requirements
 
@@ -102,13 +121,14 @@ class ServiceConfig:
     def applications(self) -> List[Dict[str, Any]]:
         return self._applications
 
-    def options(
+    def options(  # noqa: PLR0913
         self,
         applications: Optional[List[Dict[str, Any]]] = None,
         name: Optional[str] = None,
         image: Optional[str] = None,
         compute_config: Optional[str] = None,
         working_dir: Optional[str] = None,
+        excludes: Optional[List[str]] = None,
         requirements: Optional[Union[str, List[str]]] = None,
     ) -> "ServiceConfig":
         return ServiceConfig(
@@ -117,6 +137,7 @@ class ServiceConfig:
             image=image or self.image,
             compute_config=compute_config or self.compute_config,
             working_dir=working_dir,
+            excludes=excludes,
             requirements=requirements,
         )
 

anyscale-0.24.0/anyscale/version.py

@@ -0,0 +1 @@
+__version__ = "0.24.0"

{anyscale-0.5.182 → anyscale-0.24.0}/anyscale.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: anyscale
-Version: 0.5.182
+Version: 0.24.0
 Summary: Command Line Interface for Anyscale
 Author: Anyscale Inc.
 License: AS License

{anyscale-0.5.182 → anyscale-0.24.0}/tests/service/test_anyscale_client.py

@@ -908,6 +908,48 @@ class TestUploadLocalDirToCloudStorage:
         )
         assert uri1 != uri3 and uri2 != uri3
 
+    def test_excludes(
+        self,
+        setup_anyscale_client: Tuple[
+            RealAnyscaleClient, FakeExternalAPIClient, FakeInternalAPIClient
+        ],
+        fake_requests: FakeRequests,
+    ):
+        anyscale_client, _, _ = setup_anyscale_client
+
+        # No exclusions.
+        uri1 = anyscale_client.upload_local_dir_to_cloud_storage(
+            NESTED_WORKING_DIR, cloud_id="test-cloud-id",
+        )
+
+        # Exclusions that don't match anything.
+        uri2 = anyscale_client.upload_local_dir_to_cloud_storage(
+            NESTED_WORKING_DIR, cloud_id="test-cloud-id", excludes=["does-not-exist"],
+        )
+
+        assert uri1 == uri2
+
+        # Exclude a subdirectory.
+        uri3 = anyscale_client.upload_local_dir_to_cloud_storage(
+            NESTED_WORKING_DIR, cloud_id="test-cloud-id", excludes=["subdir"],
+        )
+
+        assert uri3 != uri1
+
+        # Exclude requirements.txt by name.
+        uri4 = anyscale_client.upload_local_dir_to_cloud_storage(
+            NESTED_WORKING_DIR, cloud_id="test-cloud-id", excludes=["requirements.txt"],
+        )
+
+        assert uri4 != uri3 and uri4 != uri1
+
+        # Exclude requirements.txt by wildcard.
+        uri5 = anyscale_client.upload_local_dir_to_cloud_storage(
+            NESTED_WORKING_DIR, cloud_id="test-cloud-id", excludes=["*.txt"],
+        )
+
+        assert uri5 == uri4
+
 
 class TestGetService:
     def _make_service_model(self, name: str,) -> ServiceModel:

{anyscale-0.5.182 → anyscale-0.24.0}/tests/service/test_cli.py

@@ -179,6 +179,46 @@ class TestDeploy:
             "max_surge_percent": 50,
         }
 
+    def test_deploy_excludes(self, fake_service_sdk):
+        runner = CliRunner()
+        result = runner.invoke(deploy, ["main:app"])
+        assert result.exit_code == 0
+        assert fake_service_sdk.deployed_config is not None
+
+        expected_config = ServiceConfig(applications=[{"import_path": "main:app"}])
+        assert (
+            fake_service_sdk.deployed_config.applications
+            == expected_config.applications
+        )
+
+        # Pass a single exclusion.
+        result = runner.invoke(deploy, ["--exclude", "path1", "main:app"])
+        assert result.exit_code == 0, result.stdout
+        assert fake_service_sdk.deployed_config is not None
+
+        expected_config = ServiceConfig(
+            applications=[{"import_path": "main:app"}], excludes=["path1"]
+        )
+        assert (
+            fake_service_sdk.deployed_config.applications
+            == expected_config.applications
+        )
+
+        # Pass multiple exclusions.
+        result = runner.invoke(
+            deploy, ["--exclude", "path1", "-e", "path2", "main:app"]
+        )
+        assert result.exit_code == 0, result.stdout
+        assert fake_service_sdk.deployed_config is not None
+
+        expected_config = ServiceConfig(
+            applications=[{"import_path": "main:app"}], excludes=["path1", "path2"]
+        )
+        assert (
+            fake_service_sdk.deployed_config.applications
+            == expected_config.applications
+        )
+
     def test_deploy_from_file_override_options(self, fake_service_sdk):
         runner = CliRunner()
 
@@ -193,6 +233,7 @@ class TestDeploy:
             image="test-image",
             compute_config="test-compute-config",
             working_dir="test-working-dir",
+            excludes=["test"],
             requirements=["pip-install-test"],
         )
         assert fake_service_sdk.deployed_config == expected_config
@@ -208,6 +249,7 @@ class TestDeploy:
             image="test-image",
             compute_config="test-compute-config",
             working_dir="test-working-dir",
+            excludes=["test"],
             requirements=["pip-install-test"],
         )
         assert fake_service_sdk.deployed_config == expected_config
@@ -223,6 +265,7 @@ class TestDeploy:
             image="override-image",
             compute_config="test-compute-config",
             working_dir="test-working-dir",
+            excludes=["test"],
             requirements=["pip-install-test"],
         )
         assert fake_service_sdk.deployed_config == expected_config
@@ -240,6 +283,7 @@ class TestDeploy:
             image="test-image",
             compute_config="override-compute-config",
             working_dir="test-working-dir",
+            excludes=["test"],
             requirements=["pip-install-test"],
         )
         assert fake_service_sdk.deployed_config == expected_config
@@ -257,6 +301,7 @@ class TestDeploy:
             image="test-image",
             compute_config="test-compute-config",
             working_dir="override-working-dir",
+            excludes=["test"],
             requirements=["pip-install-test"],
         )
         assert fake_service_sdk.deployed_config == expected_config
@@ -274,6 +319,7 @@ class TestDeploy:
             image="test-image",
             compute_config="test-compute-config",
             working_dir="test-working-dir",
+            excludes=["test"],
             requirements=MULTI_LINE_REQUIREMENTS_PATH,
         )
         assert fake_service_sdk.deployed_config == expected_config

{anyscale-0.5.182 → anyscale-0.24.0}/tests/service/test_config_files/full.yaml

@@ -4,4 +4,5 @@ applications:
   - import_path: main:app
 compute_config: test-compute-config
 working_dir: test-working-dir
+excludes: [test]
 requirements: [pip-install-test]

{anyscale-0.5.182 → anyscale-0.24.0}/tests/service/test_models.py

@@ -36,6 +36,7 @@ TEST_CONFIG_FILES = [
             image="test-image",
             compute_config="test-compute-config",
             working_dir="test-working-dir",
+            excludes=["test"],
             requirements=["pip-install-test"],
         ),
     ),
@@ -143,6 +144,7 @@ class TestServiceConfig:
             "compute_config": "test-compute-config",
             "requirements": ["pip-install-test"],
             "working_dir": ".",
+            "excludes": ["some-path"],
         }
 
         # Test setting fields one at a time.
@@ -160,23 +162,35 @@ class TestServiceConfig:
             applications=[{"import_path": "main:app"}], **options
         )
 
-    @pytest.mark.parametrize("working_dir", [None, ".", "s3://path.zip"])
-    def test_override_working_dir_import_path(self, working_dir: Optional[str]):
-        config = ServiceConfig(
-            applications=[{"import_path": "main:app"}], working_dir=working_dir,
-        )
+    def test_working_dir_excludes_bad_types(self):
+        with pytest.raises(TypeError, match="'working_dir' must be a string."):
+            ServiceConfig(
+                applications=[{"import_path": "main:app"}], working_dir=1,
+            )
 
-        if working_dir is None:
-            assert "runtime_env" not in config.applications[0]
-        else:
-            config.applications[0]["runtime_env"] = {
-                "working_dir": working_dir,
-            }
+        with pytest.raises(TypeError, match="'excludes' must be a list of strings."):
+            ServiceConfig(
+                applications=[{"import_path": "main:app"}], excludes="hi",
+            )
 
-    @pytest.mark.parametrize("working_dir", [None, ".", "s3://path.zip"])
-    def test_override_working_dir_applications(self, working_dir: Optional[str]):
+        with pytest.raises(TypeError, match="'excludes' must be a list of strings."):
+            ServiceConfig(
+                applications=[{"import_path": "main:app"}], excludes=["hi", 1],
+            )
+
+    @pytest.mark.parametrize(
+        ("working_dir", "excludes"),
+        [
+            (None, None),
+            (".", ["path1/", "path2"]),
+            ("s3://path.zip", ["path1/", "path2"]),
+        ],
+    )
+    def test_override_working_dir_excludes(
+        self, working_dir: Optional[str], excludes: Optional[List[str]]
+    ):
         applications: List[Dict[str, Any]] = [
-            {"name": "no_runtime_env", "import_path": "main:app",},
+            {"name": "no_runtime_env", "import_path": "main:app"},
             {
                 "name": "empty_runtime_env",
                 "import_path": "main:app",
@@ -186,34 +200,41 @@ class TestServiceConfig:
                 "name": "has_runtime_env",
                 "import_path": "main:app",
                 "runtime_env": {
+                    "excludes": ["something-else"],
                     "working_dir": "s3://somewhere.zip",
                     "env_vars": {"abc": "123"},
                 },
             },
         ]
 
-        config = ServiceConfig(applications=applications, working_dir=working_dir)
+        config = ServiceConfig(
+            applications=applications, working_dir=working_dir, excludes=excludes
+        )
 
         if working_dir is None:
+            assert excludes is None
             assert config.applications == applications
         else:
+            assert isinstance(excludes, list)
             assert len(config.applications) == 3
             assert config.applications[0] == {
                 "name": "no_runtime_env",
                 "import_path": "main:app",
-                "runtime_env": {"working_dir": working_dir,},
+                "runtime_env": {"working_dir": working_dir, "excludes": excludes},
             }
 
             assert config.applications[1] == {
                 "name": "empty_runtime_env",
                 "import_path": "main:app",
-                "runtime_env": {"working_dir": working_dir,},
+                "runtime_env": {"working_dir": working_dir, "excludes": excludes},
             }
             assert config.applications[2] == {
                 "name": "has_runtime_env",
                 "import_path": "main:app",
                 "runtime_env": {
                     "working_dir": working_dir,
+                    # Existing `excludes` field should be extended.
+                    "excludes": ["something-else", *excludes],
                     "env_vars": {"abc": "123"},
                 },
             }

anyscale-0.5.182/anyscale/version.py

@@ -1 +0,0 @@
-__version__ = "0.5.182"