twc-cli 2.13.1__tar.gz → 2.14.0__tar.gz

{twc_cli-2.13.1 → twc_cli-2.14.0}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 В этом файле описаны все значимые изменения в Timeweb Cloud CLI. В выпусках мы придерживается правил [семантического версионирования](https://semver.org/lang/ru/).
 
+# Версия 2.14.0 (2025.09.15)
+
+## Добавлено
+
+- Добавлена новая команда `twc server list-configurators` с помощью которой можно просмотреть список доступных конфигураторов облачных серверов. Конфигуратор это набор ограничений для параметров виртуальной машины (CPU, RAM, диск и т.п.).
+
+# Версия 2.13.2 (2025.06.19)
+
+## Исправлено
+
+- Исправлена ошибка фильтрации списка пресетов с опцией `--region` в команде `twc server list-presets`
+
 # Версия 2.13.1 (2025.06.19)
 
 ## Исправлено

{twc_cli-2.13.1 → twc_cli-2.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: twc-cli
-Version: 2.13.1
+Version: 2.14.0
 Summary: Timeweb Cloud Command Line Interface.
 License: MIT
 Author: ge
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: click (<8.2.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
 Requires-Dist: pygments (>=2.18.0,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)

{twc_cli-2.13.1 → twc_cli-2.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twc-cli"
-version = "2.13.1"
+version = "2.14.0"
 description = "Timeweb Cloud Command Line Interface."
 authors = ["ge <dev@timeweb.cloud>"]
 homepage = "https://github.com/timeweb-cloud/twc"
@@ -19,6 +19,7 @@ colorama = "^0.4.6"
 toml = "^0.10.2"
 pyyaml = "^6.0.1"
 pygments = "^2.18.0"
+click = "<8.2.0" # force old click to avoid typer/click compatibility issue
 
 [tool.poetry.group.dev.dependencies]
 black = "^24.4.2"
@@ -48,4 +49,5 @@ disable = [
     "duplicate-code",
     "invalid-name",
     "missing-function-docstring",
+    "too-many-positional-arguments",
 ]

{twc_cli-2.13.1 → twc_cli-2.14.0}/twc/__version__.py

@@ -12,5 +12,5 @@
 import sys
 
 
-__version__ = "2.13.1"
+__version__ = "2.14.0"
 __pyversion__ = sys.version.replace("\n", "")

{twc_cli-2.13.1 → twc_cli-2.14.0}/twc/commands/server.py

@@ -1270,7 +1270,10 @@ def server_list_presets(
 ):
     """List configuration presets."""
     if region:
-        filters = f"{filters},location:{region}"
+        if filters:
+            filters = f"{filters},location:{region.value}"
+        else:
+            filters = f"location:{region.value}"
     client = create_client(config, profile)
     response = client.get_server_presets()
     fmt.printer(
@@ -1281,6 +1284,72 @@ def server_list_presets(
     )
 
 
+# ------------------------------------------------------------- #
+# $ twc server list-configurators                               #
+# ------------------------------------------------------------- #
+
+
+def _print_configurators(response: Response, filters: Optional[str] = None):
+    confs = response.json()["server_configurators"]
+    if filters:
+        confs = fmt.filter_list(confs, filters)
+    table = fmt.Table()
+    table.header(
+        [
+            "ID",
+            "REGION",
+            "TYPE",
+            "CPU(MIN/MAX)",
+            "RAM(MIN/MAX)",
+            "DISK(MIN/MAX)",
+            "BW(MIN/MAX)",
+        ]
+    )
+    for conf in confs:
+        table.row(
+            [
+                conf["id"],
+                conf["location"],
+                conf["disk_type"],
+                f"{conf['requirements']['cpu_min']}/{conf['requirements']['cpu_max']}",
+                f"{conf['requirements']['ram_min']}/{conf['requirements']['ram_max']}",
+                f"{conf['requirements']['disk_min']}/{conf['requirements']['disk_max']}",
+                (
+                    f"{conf['requirements']['network_bandwidth_min']}/"
+                    f"{conf['requirements']['network_bandwidth_max']}"
+                ),
+            ]
+        )
+    table.print()
+
+
+@server.command("list-configurators", "lc")
+def server_list_configurators(
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+    filters: Optional[str] = filter_option,
+    region: Optional[ServiceRegion] = typer.Option(
+        None, help="Use region (location)."
+    ),
+):
+    """List Cloud Server configurators (sets of configuration constraints)."""
+    if region:
+        if filters:
+            filters = f"{filters},location:{region.value}"
+        else:
+            filters = f"location:{region.value}"
+    client = create_client(config, profile)
+    response = client.get_server_configurators()
+    fmt.printer(
+        response,
+        output_format=output_format,
+        filters=filters,
+        func=_print_configurators,
+    )
+
+
 # ------------------------------------------------------------- #
 # $ twc server list-os-images                                   #
 # ------------------------------------------------------------- #