anyscale 0.24.20__tar.gz → 0.24.22__tar.gz

{anyscale-0.24.20 → anyscale-0.24.22}/PKG-INFO

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

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/_private/anyscale_client/fake_anyscale_client.py

@@ -394,11 +394,10 @@ class FakeAnyscaleClient(AnyscaleClientInterface):
         overwrite_existing_file: bool = False,  # noqa: ARG002
     ) -> str:
         # Ensure that URIs are consistent for the same passed directory.
-        if local_dir in self._upload_uri_mapping:
-            uri = self._upload_uri_mapping[local_dir]
-        else:
-            uri = str(uuid.uuid4())
-            self._upload_uri_mapping[local_dir] = uri
-
         bucket = self.CLOUD_BUCKET.format(cloud_id=cloud_id)
-        return f"{bucket}/fake_pkg_{uri}.zip"
+        if local_dir not in self._upload_uri_mapping:
+            self._upload_uri_mapping[
+                local_dir
+            ] = f"{bucket}/fake_pkg_{str(uuid.uuid4())}.zip"
+
+        return self._upload_uri_mapping[local_dir]

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/_private/workload/workload_config.py

@@ -124,3 +124,18 @@ class WorkloadConfig(ModelBase):
             )
         ):
             raise TypeError("'env_vars' must be a Dict[str, str].")
+
+    py_modules: Optional[List[str]] = field(
+        default=None,
+        repr=True,
+        metadata={
+            "docstring": "A list of local directories that will be uploaded and added to the Python path."
+        },
+    )
+
+    def _validate_py_modules(self, py_modules: Optional[List[str]]):
+        if py_modules is not None and (
+            not isinstance(py_modules, list)
+            or not all(isinstance(m, str) for m in py_modules)
+        ):
+            raise TypeError("'py_modules' must be a list of strings.")

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/_private/workload/workload_sdk.py

@@ -121,6 +121,7 @@ class WorkloadSDK(BaseSDK):
         excludes_override: Optional[List[str]],
         cloud_id: Optional[str] = None,
         autopopulate_in_workspace: bool = True,
+        additional_py_modules: Optional[List[str]] = None,
     ) -> List[Dict[str, Any]]:
         """Returns modified runtime_envs with all local dirs converted to remote URIs.
 
@@ -168,11 +169,15 @@ class WorkloadSDK(BaseSDK):
                     new_working_dir, excludes=final_excludes
                 )
 
-            py_modules = runtime_env.get("py_modules", None)
-            if py_modules is not None:
+            if additional_py_modules:
+                existing_py_modules = runtime_env.get("py_modules", [])
+                runtime_env["py_modules"] = existing_py_modules + additional_py_modules
+
+            final_py_modules = runtime_env.get("py_modules", None)
+            if final_py_modules is not None:
                 runtime_env["py_modules"] = [
                     _upload_dir_memoized(py_module, excludes=final_excludes)
-                    for py_module in py_modules
+                    for py_module in final_py_modules
                 ]
 
         return new_runtime_envs

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/aws_iam_policies.py

@@ -214,6 +214,7 @@ ANYSCALE_IAM_PERMISSIONS_SERVICE_STEADY_STATE = {
                 "cloudformation:DescribeStackEvents",
                 "cloudformation:DescribeStackResources",
                 "cloudformation:DescribeStacks",
+                "cloudformation:GetTemplate",
             ],
             "Resource": "*",
         },

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/client/openapi_client/api/default_api.py

@@ -12809,6 +12809,7 @@ class DefaultApi(object):
         :param str session_id: (required)
         :param int start_index: (required)
         :param int end_index: (required)
+        :param datetime start_time:
         :param _preload_content: if False, the urllib3.HTTPResponse object will
                                  be returned without reading/decoding response
                                  data. Default is True.
@@ -12836,6 +12837,7 @@ class DefaultApi(object):
         :param str session_id: (required)
         :param int start_index: (required)
         :param int end_index: (required)
+        :param datetime start_time:
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -12855,7 +12857,8 @@ class DefaultApi(object):
         all_params = [
             'session_id',
             'start_index',
-            'end_index'
+            'end_index',
+            'start_time'
         ]
         all_params.extend(
             [
@@ -12900,6 +12903,8 @@ class DefaultApi(object):
             query_params.append(('start_index', local_var_params['start_index']))  # noqa: E501
         if 'end_index' in local_var_params and local_var_params['end_index'] is not None:  # noqa: E501
             query_params.append(('end_index', local_var_params['end_index']))  # noqa: E501
+        if 'start_time' in local_var_params and local_var_params['start_time'] is not None:  # noqa: E501
+            query_params.append(('start_time', local_var_params['start_time']))  # noqa: E501
 
         header_params = {}
 
@@ -24515,6 +24520,7 @@ class DefaultApi(object):
         :param ArchiveStatus archive_status: Archive status to filter by. If absent, archived jobs are excluded.
         :param str project_id: Project to filter by. If absent, no filtering is done.
         :param str workspace_id: Workspace to filter by. If absent, no filtering is done.
+        :param str cloud_id: Search for job with cloud_id
         :param UnifiedJobSortField sort_field: If absent, jobs will be ordered by status (active first). See order declared in `UnifiedJobSortField`
         :param SortOrder sort_order: If sort_field is absent, this field is ignored.If sort_order is absent, this field defaults to descending.
         :param str paging_token:
@@ -24549,6 +24555,7 @@ class DefaultApi(object):
         :param ArchiveStatus archive_status: Archive status to filter by. If absent, archived jobs are excluded.
         :param str project_id: Project to filter by. If absent, no filtering is done.
         :param str workspace_id: Workspace to filter by. If absent, no filtering is done.
+        :param str cloud_id: Search for job with cloud_id
         :param UnifiedJobSortField sort_field: If absent, jobs will be ordered by status (active first). See order declared in `UnifiedJobSortField`
         :param SortOrder sort_order: If sort_field is absent, this field is ignored.If sort_order is absent, this field defaults to descending.
         :param str paging_token:
@@ -24576,6 +24583,7 @@ class DefaultApi(object):
             'archive_status',
             'project_id',
             'workspace_id',
+            'cloud_id',
             'sort_field',
             'sort_order',
             'paging_token',
@@ -24621,6 +24629,8 @@ class DefaultApi(object):
             query_params.append(('project_id', local_var_params['project_id']))  # noqa: E501
         if 'workspace_id' in local_var_params and local_var_params['workspace_id'] is not None:  # noqa: E501
             query_params.append(('workspace_id', local_var_params['workspace_id']))  # noqa: E501
+        if 'cloud_id' in local_var_params and local_var_params['cloud_id'] is not None:  # noqa: E501
+            query_params.append(('cloud_id', local_var_params['cloud_id']))  # noqa: E501
         if 'sort_field' in local_var_params and local_var_params['sort_field'] is not None:  # noqa: E501
             query_params.append(('sort_field', local_var_params['sort_field']))  # noqa: E501
         if 'sort_order' in local_var_params and local_var_params['sort_order'] is not None:  # noqa: E501
@@ -29488,6 +29498,7 @@ class DefaultApi(object):
         :param str redirect_to: A path within Anyscale console to redirect to after the user logs in. This only supports paths and not full urls.
         :param bool no_sso: If true, do not use SSO to log in.
         :param bool force_send: If true, we always send a magic link. Even if there is only one org the user belongs to.
+        :param bool is_oa: If true, we use to the OA registration flow, where self-service is enabled.
         :param _preload_content: if False, the urllib3.HTTPResponse object will
                                  be returned without reading/decoding response
                                  data. Default is True.
@@ -29516,6 +29527,7 @@ class DefaultApi(object):
         :param str redirect_to: A path within Anyscale console to redirect to after the user logs in. This only supports paths and not full urls.
         :param bool no_sso: If true, do not use SSO to log in.
         :param bool force_send: If true, we always send a magic link. Even if there is only one org the user belongs to.
+        :param bool is_oa: If true, we use to the OA registration flow, where self-service is enabled.
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -29536,7 +29548,8 @@ class DefaultApi(object):
             'email_address',
             'redirect_to',
             'no_sso',
-            'force_send'
+            'force_send',
+            'is_oa'
         ]
         all_params.extend(
             [
@@ -29573,6 +29586,8 @@ class DefaultApi(object):
             query_params.append(('no_sso', local_var_params['no_sso']))  # noqa: E501
         if 'force_send' in local_var_params and local_var_params['force_send'] is not None:  # noqa: E501
             query_params.append(('force_send', local_var_params['force_send']))  # noqa: E501
+        if 'is_oa' in local_var_params and local_var_params['is_oa'] is not None:  # noqa: E501
+            query_params.append(('is_oa', local_var_params['is_oa']))  # noqa: E501
 
         header_params = {}
 

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/client/openapi_client/models/create_user.py

@@ -42,7 +42,8 @@ class CreateUser(object):
         'invitation_id': 'str',
         'lastname': 'str',
         'magic_token': 'str',
-        'title': 'str'
+        'title': 'str',
+        'is_oa': 'bool'
     }
 
     attribute_map = {
@@ -55,10 +56,11 @@ class CreateUser(object):
         'invitation_id': 'invitation_id',
         'lastname': 'lastname',
         'magic_token': 'magic_token',
-        'title': 'title'
+        'title': 'title',
+        'is_oa': 'is_oa'
     }
 
-    def __init__(self, name=None, username=None, email=None, password=None, invite_code=None, organization_name=None, invitation_id=None, lastname=None, magic_token=None, title=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, name=None, username=None, email=None, password=None, invite_code=None, organization_name=None, invitation_id=None, lastname=None, magic_token=None, title=None, is_oa=False, local_vars_configuration=None):  # noqa: E501
         """CreateUser - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -74,6 +76,7 @@ class CreateUser(object):
         self._lastname = None
         self._magic_token = None
         self._title = None
+        self._is_oa = None
         self.discriminator = None
 
         self.name = name
@@ -93,6 +96,8 @@ class CreateUser(object):
             self.magic_token = magic_token
         if title is not None:
             self.title = title
+        if is_oa is not None:
+            self.is_oa = is_oa
 
     @property
     def name(self):
@@ -314,6 +319,27 @@ class CreateUser(object):
 
         self._title = title
 
+    @property
+    def is_oa(self):
+        """Gets the is_oa of this CreateUser.  # noqa: E501
+
+
+        :return: The is_oa of this CreateUser.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_oa
+
+    @is_oa.setter
+    def is_oa(self, is_oa):
+        """Sets the is_oa of this CreateUser.
+
+
+        :param is_oa: The is_oa of this CreateUser.  # noqa: E501
+        :type: bool
+        """
+
+        self._is_oa = is_oa
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/client/openapi_client/models/organization.py

@@ -41,6 +41,7 @@ class Organization(object):
         'sso_required': 'bool',
         'is_general_platform_enabled': 'bool',
         'is_private_endpoints_enabled': 'bool',
+        'is_usage_blocked': 'bool',
         'endpoints_user_id': 'str',
         'endpoints_stripe_customer_id': 'str',
         'endpoints_metronome_customer_id': 'str',
@@ -56,13 +57,14 @@ class Organization(object):
         'sso_required': 'sso_required',
         'is_general_platform_enabled': 'is_general_platform_enabled',
         'is_private_endpoints_enabled': 'is_private_endpoints_enabled',
+        'is_usage_blocked': 'is_usage_blocked',
         'endpoints_user_id': 'endpoints_user_id',
         'endpoints_stripe_customer_id': 'endpoints_stripe_customer_id',
         'endpoints_metronome_customer_id': 'endpoints_metronome_customer_id',
         'endpoints_is_free_credit_used_up': 'endpoints_is_free_credit_used_up'
     }
 
-    def __init__(self, id=None, name=None, public_identifier=None, default_cloud_id=None, sso_config_id=None, sso_required=False, is_general_platform_enabled=None, is_private_endpoints_enabled=None, endpoints_user_id=None, endpoints_stripe_customer_id=None, endpoints_metronome_customer_id=None, endpoints_is_free_credit_used_up=None, local_vars_configuration=None):  # noqa: E501
+    def __init__(self, id=None, name=None, public_identifier=None, default_cloud_id=None, sso_config_id=None, sso_required=False, is_general_platform_enabled=None, is_private_endpoints_enabled=None, is_usage_blocked=None, endpoints_user_id=None, endpoints_stripe_customer_id=None, endpoints_metronome_customer_id=None, endpoints_is_free_credit_used_up=None, local_vars_configuration=None):  # noqa: E501
         """Organization - a model defined in OpenAPI"""  # noqa: E501
         if local_vars_configuration is None:
             local_vars_configuration = Configuration()
@@ -76,6 +78,7 @@ class Organization(object):
         self._sso_required = None
         self._is_general_platform_enabled = None
         self._is_private_endpoints_enabled = None
+        self._is_usage_blocked = None
         self._endpoints_user_id = None
         self._endpoints_stripe_customer_id = None
         self._endpoints_metronome_customer_id = None
@@ -93,6 +96,7 @@ class Organization(object):
             self.sso_required = sso_required
         self.is_general_platform_enabled = is_general_platform_enabled
         self.is_private_endpoints_enabled = is_private_endpoints_enabled
+        self.is_usage_blocked = is_usage_blocked
         if endpoints_user_id is not None:
             self.endpoints_user_id = endpoints_user_id
         if endpoints_stripe_customer_id is not None:
@@ -280,6 +284,29 @@ class Organization(object):
 
         self._is_private_endpoints_enabled = is_private_endpoints_enabled
 
+    @property
+    def is_usage_blocked(self):
+        """Gets the is_usage_blocked of this Organization.  # noqa: E501
+
+
+        :return: The is_usage_blocked of this Organization.  # noqa: E501
+        :rtype: bool
+        """
+        return self._is_usage_blocked
+
+    @is_usage_blocked.setter
+    def is_usage_blocked(self, is_usage_blocked):
+        """Sets the is_usage_blocked of this Organization.
+
+
+        :param is_usage_blocked: The is_usage_blocked of this Organization.  # noqa: E501
+        :type: bool
+        """
+        if self.local_vars_configuration.client_side_validation and is_usage_blocked is None:  # noqa: E501
+            raise ValueError("Invalid value for `is_usage_blocked`, must not be `None`")  # noqa: E501
+
+        self._is_usage_blocked = is_usage_blocked
+
     @property
     def endpoints_user_id(self):
         """Gets the endpoints_user_id of this Organization.  # noqa: E501

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/commands/job_commands.py

@@ -79,6 +79,14 @@ def job_cli() -> None:
     type=str,
     help="Path to a local directory that will be the working directory for the job. 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(
+    "--py-module",
+    required=False,
+    default=None,
+    multiple=True,
+    type=str,
+    help="Python modules to be available for import in the Ray workers. Each entry must be a path to a local directory.",
+)
 @click.argument("entrypoint", required=False, nargs=-1, type=click.UNPROCESSED)
 def submit(  # noqa: PLR0912 PLR0913 C901
     entrypoint: Tuple[str],
@@ -90,6 +98,7 @@ def submit(  # noqa: PLR0912 PLR0913 C901
     containerfile: Optional[str],
     env: Tuple[str],
     working_dir: Optional[str],
+    py_module: Tuple[str],
 ):
     """Submit a job.
 
@@ -186,6 +195,13 @@ and override the entrypoint with `python main.py`.
             env_dict = convert_kv_strings_to_dict(env)
             if env_dict:
                 config = config.options(env_vars=env_dict)
+        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])
         log.info(f"Submitting job with config {config}.")
         job_id = anyscale.job.submit(config)
 

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/commands/service_commands.py

@@ -136,7 +136,15 @@ def _read_name_from_config_file(path: str):
     type=str,
     help="Environment variables to set for the service. The format is 'key=value'. This argument can be specified multiple times. When the same key is also specified in the config file, the value from the command-line flag will overwrite the value from the config file.",
 )
-def deploy(  # noqa: PLR0912, PLR0913
+@click.option(
+    "--py-module",
+    required=False,
+    default=None,
+    multiple=True,
+    type=str,
+    help="Python modules to be available for import in the Ray workers. Each entry must be a path to a local directory.",
+)
+def deploy(  # noqa: PLR0912, PLR0913 C901
     config_file: Optional[str],
     import_path: Optional[str],
     arguments: Tuple[str],
@@ -151,6 +159,7 @@ def deploy(  # noqa: PLR0912, PLR0913
     canary_percent: Optional[int],
     max_surge_percent: Optional[int],
     env: Optional[Tuple[str]],
+    py_module: Tuple[str],
 ):
     """Deploy or update a service.
 
@@ -229,6 +238,14 @@ def deploy(  # noqa: PLR0912, PLR0913
         if env_dict:
             config = config.options(env_vars=env_dict)
 
+    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])
+
     anyscale.service.deploy(
         config,
         in_place=in_place,

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/job/_private/job_sdk.py

@@ -44,6 +44,7 @@ class JobSDK(WorkloadSDK):
             excludes_override=config.excludes,
             cloud_id=cloud_id,
             autopopulate_in_workspace=autopopulate_in_workspace,
+            additional_py_modules=config.py_modules,
         )
         [runtime_env] = self.override_and_load_requirements_files(
             [runtime_env],

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale/service/_private/service_sdk.py

@@ -62,6 +62,7 @@ class ServiceSDK(WorkloadSDK):
             excludes_override=config.excludes,
             cloud_id=cloud_id,
             autopopulate_in_workspace=autopopulate_in_workspace,
+            additional_py_modules=config.py_modules,
         )
         new_runtime_envs = self.override_and_load_requirements_files(
             new_runtime_envs,

anyscale-0.24.22/anyscale/version.py

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

{anyscale-0.24.20 → anyscale-0.24.22}/anyscale.egg-info/PKG-INFO

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

{anyscale-0.24.20 → anyscale-0.24.22}/tests/conftest.py

@@ -263,6 +263,7 @@ def userinfo_test_data() -> UserInfo:
                 sso_required=False,
                 is_general_platform_enabled=True,
                 is_private_endpoints_enabled=False,
+                is_usage_blocked=False,
             )
         ],
         ld_hash="mock_ld_hash",

{anyscale-0.24.20 → anyscale-0.24.22}/tests/unit/test_job_sdk.py

@@ -282,6 +282,39 @@ class TestDeployWorkspaceDefaults:
 
 
 class TestOverrideApplicationRuntimeEnvs:
+    @pytest.mark.parametrize(
+        "new_py_modules", [None, [], ["A"], ["C", "D"]],
+    )
+    def test_update_py_modules(
+        self,
+        sdk_with_fake_client: Tuple[JobSDK, FakeAnyscaleClient],
+        new_py_modules: Optional[List[str]],
+    ):
+        sdk, fake_client = sdk_with_fake_client
+        job = JobConfig(
+            name="test-job-name",
+            entrypoint="python hello.py",
+            py_modules=new_py_modules,
+        )
+
+        sdk.submit(job)
+        submitted_runtime_env = fake_client.submitted_job.config.runtime_env
+        if new_py_modules:
+            uploaded_py_modules = [
+                fake_client._upload_uri_mapping[local_dir]
+                for local_dir in new_py_modules
+            ]
+        else:
+            uploaded_py_modules = None
+
+        if uploaded_py_modules:
+            assert submitted_runtime_env.get("py_modules") == uploaded_py_modules
+        else:
+            assert (
+                submitted_runtime_env is None
+                or "py_modules" not in submitted_runtime_env
+            )
+
     @pytest.mark.parametrize("excludes_override", [None, ["override"]])
     @pytest.mark.parametrize(
         "working_dir_override", [None, "./some-local-path", "s3://some-remote-path.zip"]

{anyscale-0.24.20 → anyscale-0.24.22}/tests/unit/test_service_sdk.py

@@ -769,6 +769,44 @@ class TestDeployWorkspaceDefaults:
 
 
 class TestOverrideApplicationRuntimeEnvs:
+    @pytest.mark.parametrize(
+        "new_py_modules", [None, [], ["A"], ["C", "D"]],
+    )
+    @pytest.mark.parametrize("existing_py_modules", [None, [], ["A"], ["B"]])
+    def test_update_py_modules(
+        self,
+        sdk_with_fake_client: Tuple[ServiceSDK, FakeAnyscaleClient, TestLogger],
+        new_py_modules: Optional[List[str]],
+        existing_py_modules: Optional[List[str]],
+    ):
+        sdk, fake_client, _ = sdk_with_fake_client
+        app: Dict[str, Any] = {"import_path": "main:app"}
+        if existing_py_modules:
+            app["runtime_env"] = {"py_modules": existing_py_modules}
+        config = ServiceConfig(
+            applications=[app], name="test-service-name", py_modules=new_py_modules,
+        )
+        sdk.deploy(config)
+        applications = fake_client.rolled_out_model.ray_serve_config["applications"]
+
+        if new_py_modules or existing_py_modules:
+            if existing_py_modules is None:
+                existing_py_modules = []
+            if new_py_modules is None:
+                new_py_modules = []
+            uploaded_py_modules = [
+                fake_client._upload_uri_mapping[local_dir]
+                for local_dir in existing_py_modules + new_py_modules
+            ]
+        else:
+            uploaded_py_modules = None
+
+        if uploaded_py_modules:
+            for app in applications:
+                assert app["runtime_env"].get("py_modules") == uploaded_py_modules
+        else:
+            assert "py_modules" not in app.get("runtime_env", {})
+
     @pytest.mark.parametrize(
         "new_env_vars",
         [None, {}, {"A": "B"}, {"C": "D", "E": "F"}, {"K": "V1", "C": "D"}],

anyscale-0.24.20/anyscale/version.py

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