refactor: enhance envs

Signed-off-by: thxCode <[email protected]>

Author: thxCode

gpustack_runner/cmds/images.py

@@ -1094,7 +1094,7 @@ def list_images(**kwargs) -> list[PlatformedImage]:
             name = img.name
             if not name:
                 continue
-            if namespace := envs.GPUSTACK_RUNNER_DEFAULT_IMAGE_NAMESPACE:
+            if namespace := envs.GPUSTACK_RUNNER_DEFAULT_CONTAINER_NAMESPACE:
                 name = name.replace("gpustack/", f"{namespace}/")
                 img.name = name
             if name not in image_names_index:

gpustack_runner/envs.py

@@ -9,21 +9,24 @@
 
     # Global
 
-    GPUSTACK_RUNNER_DEFAULT_IMAGE_NAMESPACE: str | None = None
+    GPUSTACK_RUNNER_DEFAULT_CONTAINER_NAMESPACE: str | None = None
     """
-    Namespace for default runner images.
+    Namespace for default runner container images.
     If not set, it should be "gpustack".
     """
 
 # --8<-- [start:env-vars-definition]
 
 variables: dict[str, Callable[[], Any]] = {
     # Global
-    "GPUSTACK_RUNNER_DEFAULT_IMAGE_NAMESPACE": lambda: trim_str(
+    "GPUSTACK_RUNNER_DEFAULT_CONTAINER_NAMESPACE": lambda: trim_str(
         getenvs(
             keys=[
-                "GPUSTACK_RUNNER_DEFAULT_IMAGE_NAMESPACE",
+                "GPUSTACK_RUNNER_DEFAULT_CONTAINER_NAMESPACE",
                 ## Compatible with gpustack/gpustack_runtime.
+                "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_CONTAINER_NAMESPACE",
+                ## Legacy compatibility.
+                "GPUSTACK_RUNNER_DEFAULT_IMAGE_NAMESPACE",
                 "GPUSTACK_RUNTIME_DEPLOY_DEFAULT_IMAGE_NAMESPACE",
             ],
         ),

gpustack_runner/runner.py

@@ -239,7 +239,7 @@ def list_runners(**kwargs) -> Runners | list[dict]:
         json_list = json.load(f)
         runners = []
         for item in json_list:
-            if namespace := envs.GPUSTACK_RUNNER_DEFAULT_IMAGE_NAMESPACE:
+            if namespace := envs.GPUSTACK_RUNNER_DEFAULT_CONTAINER_NAMESPACE:
                 docker_image = item["docker_image"]
                 docker_image = docker_image.replace("gpustack/", f"{namespace}/")
                 item["docker_image"] = docker_image