merge from main

Signed-off-by: sirutBuasai <sirutbuasai27@outlook.com>

Author: sirutBuasai

.github/workflows/pr-sglang.yml

@@ -16,7 +16,7 @@ env:
   # Common
   CONTAINER_TYPE: "general"
   FRAMEWORK: "sglang"
-  SGLANG_VERSION: "0.5.7"
+  SGLANG_VERSION: "0.5.8"
   PYTHON_VERSION: "py312"
   CUDA_VERSION: "cu129"
   OS_VERSION: "ubuntu22.04"

docker/sglang/Dockerfile

@@ -1,6 +1,6 @@
 # Declare the argument as default to use as input
 # base image: https://hub.docker.com/r/lmsysorg/sglang/tags
-ARG BASE_IMAGE=lmsysorg/sglang:v0.5.7-cu129-amd64
+ARG BASE_IMAGE=lmsysorg/sglang:v0.5.8-cu129-amd64
 
 # Use input argument as base image
 FROM $BASE_IMAGE AS base

docs/src/image_config.py

@@ -32,12 +32,6 @@ class ImageConfig:
     def __init__(self, repository: str, **kwargs: Any) -> None:
         self._repository = repository
         self._data = kwargs
-        # Compute framework_group from GLOBAL_CONFIG, default to repository
-        self._framework_group = repository
-        for group_key, repos in GLOBAL_CONFIG.get("framework_groups", {}).items():
-            if repository in repos:
-                self._framework_group = group_key
-                break
 
     @classmethod
     def from_yaml(cls, path: Path, repository: str) -> "ImageConfig":
@@ -66,7 +60,10 @@ def repository(self) -> str:
     @property
     def framework_group(self) -> str:
         """Framework group key (or repository if not in a group)."""
-        return self._framework_group
+        for group_key, repos in GLOBAL_CONFIG.get("framework_groups", {}).items():
+            if self._repository in repos:
+                return group_key
+        return self._repository
 
     @property
     def is_supported(self) -> bool:
@@ -121,27 +118,27 @@ def display_repository(self) -> str:
             raise KeyError(f"Display name not found for: {self._repository}")
         return display_names[self._repository]
 
+    @property
+    def display_tag(self) -> str:
+        """Get first tag for display (used in available_images.md). Tags must be a list."""
+        tags = self.get("tags", [])
+        if not isinstance(tags, list):
+            raise ValueError(f"'tags' field must be a list in {self._repository}")
+        return tags[0] if tags else ""
+
     @property
     def display_framework_group(self) -> str:
         """Get human-readable display name for the framework group."""
         display_names = GLOBAL_CONFIG.get("display_names", {})
-        if self._framework_group not in display_names:
-            raise KeyError(f"Display name not found for: {self._framework_group}")
-        return display_names[self._framework_group]
+        if self.framework_group not in display_names:
+            raise KeyError(f"Display name not found for: {self.framework_group}")
+        return display_names[self.framework_group]
 
     @property
     def display_framework_version(self) -> str:
         """Framework and version combined for table display."""
         return f"{self.get('framework', '')} {self.get('version', '')}"
 
-    @property
-    def display_tag(self) -> str:
-        """Get first tag for display (used in available_images.md). Tags must be a list."""
-        tags = self.get("tags", [])
-        if not isinstance(tags, list):
-            raise ValueError(f"'tags' field must be a list in {self._repository}")
-        return tags[0] if tags else ""
-
     @property
     def display_example_url(self) -> str:
         """Example ECR URL for table display."""

test/docs/mock_data/data/mock-repo/1.0-cpu-ec2.yml

@@ -4,7 +4,9 @@ accelerator: cpu
 python: py311
 os: ubuntu22.04
 platform: ec2
-tag: "1.0.0-cpu-py311-ubuntu22.04-ec2"
 ga: "2024-01-01"
 eop: "2025-01-01"
 public_registry: false
+
+tags:
+  - "1.0.0-cpu-py311-ubuntu22.04-ec2"

test/docs/mock_data/data/mock-repo/1.5-neuronx-ec2.yml

@@ -5,4 +5,6 @@ python: py311
 sdk: "2.20.0"
 os: ubuntu22.04
 platform: ec2
-tag: "1.5.0-neuronx-py311-sdk2.20.0-ubuntu22.04-ec2"
+
+tags:
+  - "1.5.0-neuronx-py311-sdk2.20.0-ubuntu22.04-ec2"

test/docs/mock_data/data/mock-repo/2.0-gpu-ec2.yml

@@ -5,7 +5,9 @@ python: py312
 cuda: cu121
 os: ubuntu22.04
 platform: ec2
-tag: "2.0.0-gpu-py312-cu121-ubuntu22.04-ec2"
 ga: "2025-01-01"
 eop: "2027-01-01"
 public_registry: true
+
+tags:
+  - "2.0.0-gpu-py312-cu121-ubuntu22.04-ec2"

test/docs/mock_data/data/mock-repo/2.0-gpu-sagemaker.yml

@@ -5,7 +5,9 @@ python: py312
 cuda: cu121
 os: ubuntu22.04
 platform: sagemaker
-tag: "2.0.0-gpu-py312-cu121-ubuntu22.04-sagemaker"
 ga: "2025-01-01"
 eop: "2027-01-01"
 public_registry: true
+
+tags:
+  - "2.0.0-gpu-py312-cu121-ubuntu22.04-sagemaker"

test/docs/mock_data/tables/support_policy.yml

@@ -1,6 +1,5 @@
 columns:
-  - field: framework
-    data: framework_group
+  - field: framework_group
     header: "Framework"
   - field: version
     header: "Version"

test/docs/test_image_config.py

@@ -20,7 +20,7 @@
     ImageConfig,
     build_image_row,
     check_public_registry,
-    get_latest_image,
+    get_latest_image_uri,
     load_legacy_images,
     load_repository_images,
     sort_by_version,
@@ -187,12 +187,7 @@ class TestBuildImageRow:
                 ],
                 ["PyTorch 2.0", "py312"],
             ),
-            (
-                [{"field": "version", "data": "framework_version", "header": "Framework"}],
-                ["PyTorch 2.0"],
-            ),
         ],
-        ids=["basic_columns", "data_override"],
     )
     def test_build_row(self, columns, expected):
         img = ImageConfig("repo", framework="PyTorch", version="2.0", python="py312")
@@ -278,12 +273,12 @@ def test_mixed(self, caplog):
 
 class TestGetLatestImage:
     def test_success(self, mock_paths):
-        LOGGER.debug("Testing get_latest_image for valid repo/platform")
-        uri = get_latest_image("mock-repo", "ec2")
+        LOGGER.debug("Testing get_latest_image_uri for valid repo/platform")
+        uri = get_latest_image_uri("mock-repo", "ec2")
         LOGGER.debug(f"Latest image URI: {uri}")
         assert "mock-repo" in uri
         assert "2.0.0-gpu-py312" in uri
-        LOGGER.info("get_latest_image test passed")
+        LOGGER.info("get_latest_image_uri test passed")
 
     @pytest.mark.parametrize(
         "repo,platform",
@@ -292,4 +287,4 @@ def test_success(self, mock_paths):
     )
     def test_not_found(self, mock_paths, repo, platform):
         with pytest.raises(ValueError, match="Image not found"):
-            get_latest_image(repo, platform)
+            get_latest_image_uri(repo, platform)