backend.ai-cli 24.12.0__py3-none-any.whl → 25.1.1__py3-none-any.whl

ai/backend/cli/VERSION

@@ -1 +1 @@
-24.12.0
+25.1.1

ai/backend/cli/interaction.py

@@ -73,12 +73,12 @@ def ask_string_in_array(prompt: str, choices: list, default: str) -> Optional[st
 
     if default:
         question = (
-            f"{prompt} (choices: {"/".join(choices)}, "
+            f"{prompt} (choices: {'/'.join(choices)}, "
             f"if left empty, this will use default value: {default}): "
         )
     else:
         question = (
-            f"{prompt} (choices: {"/".join(choices)}, if left empty, this will remove this key): "
+            f"{prompt} (choices: {'/'.join(choices)}, if left empty, this will remove this key): "
         )
 
     while True:
@@ -92,7 +92,7 @@ def ask_string_in_array(prompt: str, choices: list, default: str) -> Optional[st
         elif user_reply.lower() in choices:
             break
         else:
-            print(f"Please answer in {"/".join(choices)}.")
+            print(f"Please answer in {'/'.join(choices)}.")
     return user_reply
 
 

ai/backend/cli/params.py

@@ -1,7 +1,15 @@
 import json
 import re
+from collections.abc import Mapping, Sequence
 from decimal import Decimal
-from typing import Any, Generic, Mapping, Optional, Protocol, TypeVar, Union
+from typing import (
+    Any,
+    Generic,
+    Optional,
+    Protocol,
+    TypeVar,
+    override,
+)
 
 import click
 import trafaret
@@ -12,7 +20,13 @@ from .types import Undefined, undefined
 class BoolExprType(click.ParamType):
     name = "boolean"
 
-    def convert(self, value, param, ctx):
+    @override
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> bool:
         if isinstance(value, bool):
             return value
         try:
@@ -34,7 +48,13 @@ class ByteSizeParamType(click.ParamType):
         "e": 2**60,
     }
 
-    def convert(self, value, param, ctx):
+    @override
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> Any:
         if isinstance(value, int):
             return value
         if not isinstance(value, str):
@@ -54,7 +74,13 @@ class ByteSizeParamType(click.ParamType):
 class ByteSizeParamCheckType(ByteSizeParamType):
     name = "byte-check"
 
-    def convert(self, value, param, ctx):
+    @override
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> str:
         if isinstance(value, int):
             return value
         if not isinstance(value, str):
@@ -72,7 +98,13 @@ class ByteSizeParamCheckType(ByteSizeParamType):
 class CommaSeparatedKVListParamType(click.ParamType):
     name = "comma-seperated-KVList-check"
 
-    def convert(self, value: Union[str, Mapping[str, str]], param, ctx) -> Mapping[str, str]:
+    @override
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> Mapping[str, str]:
         if isinstance(value, dict):
             return value
         if not isinstance(value, str):
@@ -111,9 +143,10 @@ class JSONParamType(click.ParamType):
         super().__init__()
         self._parsed = False
 
+    @override
     def convert(
         self,
-        value: Optional[str],
+        value: str,
         param: Optional[click.Parameter],
         ctx: Optional[click.Context],
     ) -> Any:
@@ -151,8 +184,14 @@ class RangeExprOptionType(click.ParamType):
     _rx_range_key = re.compile(r"^[a-zA-Z_][a-zA-Z0-9_]*$")
     name = "Range Expression"
 
-    def convert(self, arg, param, ctx):
-        key, value = arg.split("=", maxsplit=1)
+    @override
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> Any:
+        key, value = value.split("=", maxsplit=1)
         assert self._rx_range_key.match(key), "The key must be a valid slug string."
         try:
             if value.startswith("case:"):
@@ -172,12 +211,18 @@ class RangeExprOptionType(click.ParamType):
 class CommaSeparatedListType(click.ParamType):
     name = "List Expression"
 
-    def convert(self, arg, param, ctx):
+    @override
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> Sequence[str]:
         try:
-            if isinstance(arg, int):
-                return arg
-            elif isinstance(arg, str):
-                return arg.split(",")
+            if isinstance(value, int):
+                return value
+            elif isinstance(value, str):
+                return value.split(",")
         except ValueError as e:
             self.fail(repr(e), param, ctx)
 
@@ -189,22 +234,31 @@ class SingleValueConstructorType(Protocol):
     def __init__(self, value: Any) -> None: ...
 
 
-TScalar = TypeVar("TScalar", bound=SingleValueConstructorType)
+TScalar = TypeVar("TScalar", bound=SingleValueConstructorType | click.ParamType)
 
 
 class OptionalType(click.ParamType, Generic[TScalar]):
     name = "Optional Type Wrapper"
 
-    def __init__(self, type_: type[TScalar] | type[click.ParamType]) -> None:
+    def __init__(self, type_: type[TScalar] | click.ParamType) -> None:
         super().__init__()
         self.type_ = type_
 
-    def convert(self, value: Any, param, ctx) -> TScalar | Undefined:
+    def convert(
+        self,
+        value: str,
+        param: Optional[click.Parameter],
+        ctx: Optional[click.Context],
+    ) -> TScalar | Undefined:
         try:
             if value is undefined:
                 return undefined
-            if issubclass(self.type_, click.ParamType):
-                return self.type_()(value)
-            return self.type_(value)
+            match self.type_:
+                case click.ParamType():
+                    return self.type_(value)
+                case type() if issubclass(self.type_, click.ParamType):
+                    return self.type_()(value)
+                case _:
+                    return self.type_(value)
         except ValueError:
             self.fail(f"{value!r} is not valid `{self.type_}` or `undefined`", param, ctx)

{backend.ai_cli-24.12.0.dist-info → backend.ai_cli-25.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: backend.ai-cli
-Version: 24.12.0
+Version: 25.1.1
 Summary: Backend.AI Command Line Interface Helper
 Home-page: https://github.com/lablup/backend.ai
 Author: Lablup Inc. and contributors
@@ -21,7 +21,7 @@ Classifier: License :: OSI Approved :: MIT License
 Requires-Python: >=3.12,<3.13
 Description-Content-Type: text/markdown
 Requires-Dist: attrs>=24.2
-Requires-Dist: backend.ai-plugin==24.12.0
+Requires-Dist: backend.ai-plugin==25.1.1
 Requires-Dist: click~=8.1.7
 Requires-Dist: trafaret~=2.1
 

backend.ai_cli-25.1.1.dist-info/RECORD

@@ -0,0 +1,16 @@
+ai/backend/cli/VERSION,sha256=MWTWBShfNdB-wZgctarAHHDrXGZkWatLBGloNv71PJg,6
+ai/backend/cli/__init__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
+ai/backend/cli/__main__.py,sha256=Rp61ckhVRXFk_0BywIRgbiOzkR_gLq2cyyiDyLsB8UI,291
+ai/backend/cli/extensions.py,sha256=twjloigQl4VTBU8gP6YMZNGi3dUDW4V_i-yVX12HRH0,5125
+ai/backend/cli/interaction.py,sha256=L-6kvJbxMw9YeO_NT78wortS_Db0Qx9W8XiY56JgorI,4982
+ai/backend/cli/loader.py,sha256=yWyNyvFJORtFFQfcL-vqwD5NbRxAHxS_uH1878r9EIA,1140
+ai/backend/cli/main.py,sha256=8HpGUH5k0uv6lKVqKoctW3vd9hm1xo_j06HSCvyRvgw,707
+ai/backend/cli/params.py,sha256=DpgxQpRR2U1GC5mmod00neHne77VDunXIGo_hL4bUgU,7468
+ai/backend/cli/py.typed,sha256=QJeIkjairybCkwM_65ZMTPEYwCJODQY_7AqJ6dBWnvI,11
+ai/backend/cli/types.py,sha256=mThxfeGD6MsHt0OkMdw1LvjufENHYbYZXcgRVNpmD5o,734
+backend.ai_cli-25.1.1.dist-info/METADATA,sha256=n7v0GsUU8Uht1mx-_rtVzB6Bkr6INW5WnoxBN6WM1CE,1730
+backend.ai_cli-25.1.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+backend.ai_cli-25.1.1.dist-info/entry_points.txt,sha256=lOiEpT48ETF_ht5fFVQugAjZSuZr-wkGYZzfC5YTnuY,60
+backend.ai_cli-25.1.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+backend.ai_cli-25.1.1.dist-info/top_level.txt,sha256=TJAp5TUfTUztZSUatbygths7CWRrFfnOMCtZ-DIcw6c,3
+backend.ai_cli-25.1.1.dist-info/RECORD,,

backend.ai_cli-24.12.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-ai/backend/cli/VERSION,sha256=JfC4XOJ8U90ct3quVEPEw9O9UpWZKlgkf6FvYWG9D_0,7
-ai/backend/cli/__init__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
-ai/backend/cli/__main__.py,sha256=Rp61ckhVRXFk_0BywIRgbiOzkR_gLq2cyyiDyLsB8UI,291
-ai/backend/cli/extensions.py,sha256=twjloigQl4VTBU8gP6YMZNGi3dUDW4V_i-yVX12HRH0,5125
-ai/backend/cli/interaction.py,sha256=wdRa5aBWebW_bffGwRSBs3lVB4CJtc0gNAx1u6084Ss,4982
-ai/backend/cli/loader.py,sha256=yWyNyvFJORtFFQfcL-vqwD5NbRxAHxS_uH1878r9EIA,1140
-ai/backend/cli/main.py,sha256=8HpGUH5k0uv6lKVqKoctW3vd9hm1xo_j06HSCvyRvgw,707
-ai/backend/cli/params.py,sha256=hnZNXGKTsNDOlPHXDB3Tnk1p8xtWIDFM649U8WPSv38,6436
-ai/backend/cli/py.typed,sha256=QJeIkjairybCkwM_65ZMTPEYwCJODQY_7AqJ6dBWnvI,11
-ai/backend/cli/types.py,sha256=mThxfeGD6MsHt0OkMdw1LvjufENHYbYZXcgRVNpmD5o,734
-backend.ai_cli-24.12.0.dist-info/METADATA,sha256=cIenv01jbp2nyUyN35B72hCc175MCU1kwCRCne5zmB8,1732
-backend.ai_cli-24.12.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-backend.ai_cli-24.12.0.dist-info/entry_points.txt,sha256=lOiEpT48ETF_ht5fFVQugAjZSuZr-wkGYZzfC5YTnuY,60
-backend.ai_cli-24.12.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-backend.ai_cli-24.12.0.dist-info/top_level.txt,sha256=TJAp5TUfTUztZSUatbygths7CWRrFfnOMCtZ-DIcw6c,3
-backend.ai_cli-24.12.0.dist-info/RECORD,,