anyscale 0.26.47__py3-none-any.whl → 0.26.49__py3-none-any.whl

anyscale/_private/docgen/__main__.py

@@ -11,11 +11,19 @@ from anyscale import scripts
 from anyscale._private.docgen.generator import MarkdownGenerator, Module
 from anyscale.aggregated_instance_usage.models import DownloadCSVFilters
 from anyscale.cloud.models import (
+    AWSConfig,
     Cloud,
+    CloudDeployment,
     CloudPermissionLevel,
     CloudProvider,
     ComputeStack,
     CreateCloudCollaborator,
+    FileStorage,
+    GCPConfig,
+    KubernetesConfig,
+    NetworkingMode,
+    NFSMountTarget,
+    ObjectStorage,
 )
 from anyscale.commands import (
     aggregated_instance_usage_commands,
@@ -39,9 +47,8 @@ from anyscale.commands import (
     workspace_commands,
     workspace_commands_v2,
 )
-from anyscale.commands.llm import dataset_commands, models_commands
 from anyscale.compute_config.models import (
-    CloudDeployment,
+    CloudDeployment as CloudDeploymentSelector,
     ComputeConfig,
     ComputeConfigVersion,
     HeadNodeConfig,
@@ -61,12 +68,6 @@ from anyscale.job.models import (
     JobState,
     JobStatus,
 )
-from anyscale.llm.dataset._private.models import Dataset
-from anyscale.llm.model.models import (
-    DeletedFineTunedModel,
-    FineTunedModel,
-    FineTuningType,
-)
 from anyscale.organization_invitation.models import OrganizationInvitation
 from anyscale.project.models import CreateProjectCollaborator, ProjectPermissionLevel
 from anyscale.resource_quota.models import CreateResourceQuota, Quota, ResourceQuota
@@ -315,10 +316,11 @@ ALL_MODULES = [
         ],
         models=[
             ComputeConfig,
+            MultiDeploymentComputeConfig,
             HeadNodeConfig,
             WorkerNodeGroupConfig,
             MarketType,
-            CloudDeployment,
+            CloudDeploymentSelector,
             MultiDeploymentComputeConfig,
             ComputeConfigVersion,
         ],
@@ -433,7 +435,10 @@ ALL_MODULES = [
             cloud_commands.cloud_delete,
             cloud_commands.cloud_verify,
             cloud_commands.list_cloud,
-            cloud_commands.cloud_add_deployment,
+            cloud_commands.cloud_deployment_create,
+            cloud_commands.cloud_deployment_get,
+            cloud_commands.cloud_deployment_update,
+            cloud_commands.cloud_deployment_delete,
             cloud_commands.cloud_config_update,
             cloud_commands.cloud_set_default,
             cloud_commands.add_collaborators,
@@ -449,13 +454,27 @@ ALL_MODULES = [
             anyscale.cloud.terminate_system_cluster,
         ],
         models=[
+            Cloud,
             CloudPermissionLevel,
             CreateCloudCollaborator,
-            Cloud,
+            CloudDeployment,
             ComputeStack,
             CloudProvider,
-        ],
-        cli_command_group_prefix={cloud_commands.cloud_config_update: "config"},
+            NetworkingMode,
+            ObjectStorage,
+            FileStorage,
+            NFSMountTarget,
+            AWSConfig,
+            GCPConfig,
+            KubernetesConfig,
+        ],
+        cli_command_group_prefix={
+            cloud_commands.cloud_deployment_create: "deployment",
+            cloud_commands.cloud_deployment_get: "deployment",
+            cloud_commands.cloud_deployment_update: "deployment",
+            cloud_commands.cloud_deployment_delete: "deployment",
+            cloud_commands.cloud_config_update: "config",
+        },
         legacy_sdk_commands={
             # limited support, no replacement yet
             "get_cloud": None,
@@ -582,40 +601,6 @@ ALL_MODULES = [
             "UpdateCluster",
         ],
     ),
-    Module(
-        title="LLM Model",
-        filename="llm_models.md",
-        cli_prefix="anyscale llm model",
-        cli_commands=[
-            models_commands.get_model,
-            models_commands.list_models,
-            models_commands.delete_model,
-        ],
-        sdk_prefix="anyscale.llm.model",
-        sdk_commands=[
-            anyscale.llm.model.get,
-            anyscale.llm.model.list,
-            anyscale.llm.model.delete,
-        ],
-        models=[FineTunedModel, FineTuningType, DeletedFineTunedModel],
-    ),
-    Module(
-        title="LLM Dataset",
-        filename="llm_dataset.md",
-        cli_prefix="anyscale llm dataset",
-        cli_commands=[
-            dataset_commands.get_dataset,
-            dataset_commands.upload_dataset,
-            dataset_commands.download_dataset,
-        ],
-        sdk_prefix="anyscale.llm.dataset",
-        sdk_commands=[
-            anyscale.llm.dataset.get,
-            anyscale.llm.dataset.upload,
-            anyscale.llm.dataset.download,
-        ],
-        models=[Dataset],
-    ),
     Module(
         title="Resource quotas",
         filename="resource-quotas.md",

anyscale/_private/docgen/generator.py

@@ -46,6 +46,20 @@ CUSTOMER_HOSTED_QUALIFIER = (
 )
 
 
+def _escape_mdx_content(text: str) -> str:
+    """Escape content for MDX compatibility.
+    
+    This function escapes angle brackets that could be interpreted as HTML tags
+    by MDX, converting them to escaped versions.
+    """
+    import re
+
+    # Escape angle brackets that look like HTML tags but are meant as literal text
+    # This pattern matches <word> or <word-with-hyphens> but not actual markdown/HTML
+    text = re.sub(r"<([a-zA-Z][a-zA-Z0-9\-]*?)>", r"\\<\1\\>", text)
+    return text
+
+
 @dataclass
 class Module:
     title: str
@@ -276,12 +290,13 @@ class MarkdownGenerator:
             - __doc_py_example__ (required in sdks)
             - __doc_cli_example__ (required for models and cli commands)
         """
+        skip_py_example: bool = getattr(t, "__skip_py_example__", False)
         yaml_example: Optional[str] = getattr(t, "__doc_yaml_example__", None)
         py_example: Optional[str] = getattr(t, "__doc_py_example__", None)
         cli_example: Optional[str] = getattr(t, "__doc_cli_example__", None)
 
         if isinstance(t, ModelBaseType):
-            if not py_example:
+            if not skip_py_example and not py_example:
                 raise ValueError(
                     f"Model '{t.__name__}' is missing a '__doc_py_example__'."
                 )
@@ -370,24 +385,25 @@ class MarkdownGenerator:
                         f"Model '{t.__name__}' is missing a docstring for field '{field.name}'"
                     )
 
-                md += f"- **`{field.name}` ({self._model_type_to_string(field.type)})**: {docstring}\n"
+                md += f"- **`{field.name}` ({self._model_type_to_string(field.type)})**: {_escape_mdx_content(docstring)}\n"
 
                 customer_hosted_only = field.metadata.get("customer_hosted_only", False)
                 if customer_hosted_only:
                     md += f"  - {CUSTOMER_HOSTED_QUALIFIER}\n"
             md += "\n\n"
 
-            md += "#### Python Methods\n\n"
-            md += "```python\n"
-            if t.__name__.endswith("Config"):
-                # Only include constructor docs for config models.
-                md += f"def __init__(self, **fields) -> {t.__name__}\n"
-                md += '    """Construct a model with the provided field values set."""\n\n'
-                md += f"def options(self, **fields) -> {t.__name__}\n"
-                md += '    """Return a copy of the model with the provided field values overwritten."""\n\n'
-            md += "def to_dict(self) -> Dict[str, Any]\n"
-            md += '    """Return a dictionary representation of the model."""\n'
-            md += "```\n"
+            if not getattr(t, "__skip_py_example__", False):
+                md += "#### Python Methods\n\n"
+                md += "```python\n"
+                if t.__name__.endswith("Config"):
+                    # Only include constructor docs for config models.
+                    md += f"def __init__(self, **fields) -> {t.__name__}\n"
+                    md += '    """Construct a model with the provided field values set."""\n\n'
+                    md += f"def options(self, **fields) -> {t.__name__}\n"
+                    md += '    """Return a copy of the model with the provided field values overwritten."""\n\n'
+                md += "def to_dict(self) -> Dict[str, Any]\n"
+                md += '    """Return a dictionary representation of the model."""\n'
+                md += "```\n"
 
             md += self._gen_example_tabs(t)
         elif isinstance(t, ModelEnumType):
@@ -545,7 +561,7 @@ class MarkdownGenerator:
             md += ":::warning[Limited support]\n"
             md += "This command is not actively maintained. Use with caution.\n"
         md += ":::\n"
-        md += legacy_sdk.docstring + "\n"
+        md += _escape_mdx_content(legacy_sdk.docstring) + "\n"
 
         return md
 
@@ -555,7 +571,7 @@ class MarkdownGenerator:
         The sections will be:
             - All fields and their types
         """
-        md = f"### `{legacy_model.name}` <span class='label-h3 label-legacy'>Legacy</span>\n"
-        md += legacy_model.docstring + "\n"
+        md = f"### `{legacy_model.name}` <span class='label-h3 label-legacy'>Legacy</span> {{#{legacy_model.name.lower()}-legacy}}\n"
+        md += _escape_mdx_content(legacy_model.docstring) + "\n"
 
         return md

anyscale/_private/docgen/generator_legacy.py

@@ -1,5 +1,5 @@
 import re
-from typing import List, Tuple
+from typing import Dict, List, Tuple
 
 
 ANYSCALE_SDK_INTRO = """\
@@ -18,6 +18,57 @@ sdk = AnyscaleSDK()
 """
 
 
+def _build_model_to_module_mapping() -> Dict[str, str]:
+    """Build mapping from model name (lowercase) to module filename.
+    
+    This dynamically discovers the mapping from ALL_MODULES configuration,
+    eliminating the need for hardcoded constants.
+    """
+    # Import here to avoid circular imports
+    from anyscale._private.docgen.__main__ import ALL_MODULES
+
+    model_name_to_file = {}
+
+    for module in ALL_MODULES:
+        # Current models (Python types)
+        for model_type in module.models:
+            model_name_to_file[model_type.__name__.lower()] = module.filename
+
+        # Legacy models (strings)
+        if module.legacy_sdk_models:
+            for model_name in module.legacy_sdk_models:
+                model_name_to_file[model_name.lower()] = module.filename
+
+    return model_name_to_file
+
+
+def _transform_legacy_links(text: str) -> str:
+    """Transform legacy model links to include proper cross-module references."""
+    # Build the mapping dynamically
+    model_mapping = _build_model_to_module_mapping()
+
+    def replace_link(match):
+        model_name = match.group(1)
+        if model_name in model_mapping:
+            module_file = model_mapping[model_name]
+            return f"({module_file}#{model_name}-legacy)"
+        else:
+            # Fallback for unmapped models (stay in same file)
+            return f"(#{model_name}-legacy)"
+
+    # Transform links from (#modelname) to proper cross-module references
+    text = re.sub(r"\(#([a-z]+)\)", replace_link, text)
+
+    # Transform workspace command references to point to workspaces.md
+    text = re.sub(
+        r"\(#anyscale-workspace_v2-([a-z]+)\)",
+        r"(workspaces.md#anyscale-workspace_v2-\1)",
+        text,
+    )
+
+    return text
+
+
 class LegacySDK:
     def __init__(self, name: str, docstring: str):
         self.name = name
@@ -35,9 +86,10 @@ class LegacySDK:
             if line.startswith("### "):
                 name = line[4:]
             else:
-                docstring += (
-                    re.sub("\\(./models.md#([a-z]+)\\)", "(#\\1-legacy)", line) + "\n"
-                )
+                # First transform ./models.md links, then transform local links
+                line = re.sub(r"\(./models\.md#([a-z]+)\)", r"(#\1-legacy)", line)
+                line = _transform_legacy_links(line)
+                docstring += line + "\n"
 
         return cls(name=name, docstring=docstring.strip())
 
@@ -50,7 +102,7 @@ class LegacyModel:
     @classmethod
     def from_md(cls, md: str) -> "LegacyModel":
         """
-        Convert a blob of markdown into a LegacySDK object.
+        Convert a blob of markdown into a LegacyModel object.
         """
         name = ""
         docstring = ""
@@ -59,7 +111,7 @@ class LegacyModel:
             if line.startswith("## "):
                 name = line[3:]
             else:
-                docstring += re.sub("\\(#([a-z]+)\\)", "(#\\1-legacy)", line) + "\n"
+                docstring += _transform_legacy_links(line) + "\n"
 
         return cls(name=name, docstring=docstring.strip())