twc-cli 2.7.0__tar.gz → 2.9.0__tar.gz

{twc_cli-2.7.0 → twc_cli-2.9.0}/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 В этом файле описаны все значимые изменения в Timeweb Cloud CLI. В выпусках мы придерживается правил [семантического версионирования](https://semver.org/lang/ru/).
 
+# Версия 2.9.0 (2025.03.06)
+
+## Добавлено
+
+- Поддержка заказа серверов с GPU
+- Поддержка заказа серверов линейки Dedicated CPU
+- Добавлены новые опции для команды `twc server create`: `--disable-ssh-password-auth`, `--gpus`, `--type`, `--configurator-id`.
+
+## Изменено
+
+- Мелкие улучшения в коде.
+
+# Версия 2.8.0 (2025.02.13)
+
+## Добавлено
+
+- Поддержка SRV-записей для доменов.
+- Теперь можно задавать TTL для DNS-записей.
+
 # Версия 2.7.0 (2024.11.02)
 
 ## Добавлено

{twc_cli-2.7.0 → twc_cli-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twc-cli
-Version: 2.7.0
+Version: 2.9.0
 Summary: Timeweb Cloud Command Line Interface.
 Home-page: https://github.com/timeweb-cloud/twc
 License: MIT
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 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: 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.7.0 → twc_cli-2.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twc-cli"
-version = "2.7.0"
+version = "2.9.0"
 description = "Timeweb Cloud Command Line Interface."
 authors = ["ge <dev@timeweb.cloud>"]
 homepage = "https://github.com/timeweb-cloud/twc"

{twc_cli-2.7.0 → twc_cli-2.9.0}/twc/__version__.py

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

{twc_cli-2.7.0 → twc_cli-2.9.0}/twc/api/client.py

@@ -76,6 +76,7 @@ class TimewebCloud(TimewebCloudBase):
         is_ddos_guard: bool = False,
         network: Optional[dict] = None,
         availability_zone: Optional[ServiceAvailabilityZone] = None,
+        is_root_password_required: Optional[bool] = None,
     ):
         """Create new Cloud Server. Note:
 
@@ -113,6 +114,11 @@ class TimewebCloud(TimewebCloudBase):
                 if availability_zone
                 else {}
             ),
+            **(
+                {"is_root_password_required": is_root_password_required}
+                if is_root_password_required is not None
+                else {}
+            ),
         }
 
         return self._request("POST", f"{self.api_url}/servers", json=payload)
@@ -186,6 +192,10 @@ class TimewebCloud(TimewebCloudBase):
             "POST", f"{self.api_url}/servers/{server_id}/clone", json={}
         )
 
+    def get_server_preset_types(self):
+        """List all available preset and configurator IDs by their types."""
+        return self._request("GET", f"{self.api_url}/presets/types/servers")
+
     def get_server_configurators(self):
         """List configurators."""
         return self._request("GET", f"{self.api_url}/configurator/servers")
@@ -1410,18 +1420,28 @@ class TimewebCloud(TimewebCloudBase):
         self,
         fqdn: str,
         dns_record_type: DNSRecordType,
-        value: str,
+        value: Optional[str] = None,
         subdomain: Optional[str] = None,
         priority: Optional[int] = None,
+        ttl: Optional[int] = None,
+        protocol: Optional[str] = None,
+        service: Optional[str] = None,
+        host: Optional[str] = None,
+        port: Optional[int] = None,
         *,
         null_subdomain: bool = False,
     ):
         """Add DNS record to domain."""
         payload = {
             "type": dns_record_type,
-            "value": value,
+            **({"value": value} if value else {}),
             **({"subdomain": subdomain} if subdomain else {}),
-            **({"priority": priority} if priority else {}),
+            **({"priority": priority} if priority is not None else {}),
+            **({"ttl": ttl} if ttl else {}),
+            **({"protocol": protocol} if protocol else {}),
+            **({"service": service} if service else {}),
+            **({"host": host} if host else {}),
+            **({"port": port} if port else {}),
         }
         if null_subdomain:
             payload["subdomain"] = None

{twc_cli-2.7.0 → twc_cli-2.9.0}/twc/commands/domain.py

@@ -2,6 +2,7 @@
 
 import re
 import sys
+from enum import Enum
 from typing import Optional, List
 from pathlib import Path
 
@@ -316,6 +317,14 @@ def domain_remove_dns_record(
 # ------------------------------------------------------------- #
 
 
+class SRVProtocol(str, Enum):
+    """Supported protocols for SRV records."""
+
+    TCP = "TCP"
+    UPD = "UDP"
+    TLS = "TLS"
+
+
 @domain_record.command("add", "create")
 def domain_add_dns_record(
     domain_name: str,
@@ -331,12 +340,40 @@ def domain_add_dns_record(
         metavar="TYPE",
         help=f"[{'|'.join([k.value for k in DNSRecordType])}]",
     ),
-    value: Optional[str] = typer.Option(...),
+    value: Optional[str] = typer.Option(
+        None,
+        help="Record value. Skip it for SRV records.",
+    ),
     priority: Optional[int] = typer.Option(
         None,
         "--prio",
         help="Record priority. Supported for MX, SRV records.",
     ),
+    service: Optional[str] = typer.Option(
+        None,
+        "--service",
+        help="Service for SRV record e.g '_matrix'.",
+    ),
+    proto: Optional[SRVProtocol] = typer.Option(
+        None,
+        "--proto",
+        help="Protocol for SRV record.",
+    ),
+    host: Optional[str] = typer.Option(
+        None,
+        "--host",
+        help="Host for SRV record.",
+    ),
+    port: Optional[int] = typer.Option(
+        None,
+        "--port",
+        help="Port for SRV record.",
+        min=1,
+        max=65535,
+    ),
+    ttl: Optional[int] = typer.Option(
+        None, "--ttl", help="Time-To-Live for DNS record."
+    ),
     second_ld: Optional[bool] = typer.Option(
         False,
         "--2ld",
@@ -346,6 +383,9 @@ def domain_add_dns_record(
     """Add dns record for domain or subdomain."""
     client = create_client(config, profile)
 
+    if record_type != "SRV" and not value:
+        sys.exit("Error: --value is expected for non-SRV DNS records")
+
     null_subdomain = False
 
     if second_ld:
@@ -372,14 +412,21 @@ def domain_add_dns_record(
             domain_name = original_domain_name
             subdomain = None
 
-    response = client.add_domain_dns_record(
-        domain_name,
-        record_type,
-        value,
-        subdomain,
-        priority,
-        null_subdomain=null_subdomain,
-    )
+    payload = {
+        "fqdn": domain_name,
+        "dns_record_type": record_type,
+        "value": value,
+        "subdomain": subdomain,
+        "priority": priority,
+        "ttl": ttl,
+        "protocol": "_" + proto if proto else None,
+        "service": service,
+        "host": host,
+        "port": port,
+        "null_subdomain": null_subdomain,
+    }
+
+    response = client.add_domain_dns_record(**payload)
     fmt.printer(
         response,
         output_format=output_format,

{twc_cli-2.7.0 → twc_cli-2.9.0}/twc/commands/server.py

@@ -3,6 +3,7 @@
 import re
 import sys
 import webbrowser
+from enum import Enum
 from logging import debug
 from typing import Optional, List, Union
 from pathlib import Path
@@ -466,15 +467,31 @@ def process_ssh_key(client: TimewebCloud, ssh_key: str) -> int:
     sys.exit(f"Error: SSH-key '{ssh_key}' not found.")
 
 
-def select_configurator(client: TimewebCloud, region: str) -> int:
+def select_configurator(client: TimewebCloud, kind: str, region: str) -> int:
     """Find and return configurator_id by location name."""
-    configurators = client.get_server_configurators().json()[
-        "server_configurators"
+    kind = kind.replace("-", "_")
+    configurators_by_type = client.get_server_preset_types().json()[
+        "configurators"
     ]
-    for configurator in configurators:
+    available_configurators = configurators_by_type.get(kind, None)
+    if not available_configurators:
+        sys.exit(
+            f"Error: Unable to select server configurator_id: no configurators with type '{kind}'"
+        )
+    for configurator in available_configurators:
         if configurator["location"] == region:
             return configurator["id"]
-    sys.exit(f"Unable to select location: '{region}' not found.")
+    sys.exit(
+        f"Error: Unable to select configurator_id: no configurators for region {region}"
+    )
+
+
+class InstanceKind(str, Enum):
+    """Instance types used to select configurator."""
+
+    STANDARD = "standard"
+    PREMIUM = "premium"
+    DEDICATED_CPU = "dedicated-cpu"
 
 
 @server.command("create")
@@ -491,7 +508,17 @@ def server_create(
         None,
         help="Cloud Server configuration preset ID. "
         "NOTE: This argument is mutually exclusive with arguments: "
-        "['--cpu', '--ram', '--disk'].",
+        "['--cpu', '--ram', '--disk', '--gpus'].",
+    ),
+    configurator_id: int = typer.Option(
+        None, help="ID of configuration constraints set."
+    ),
+    instance_kind: Optional[InstanceKind] = typer.Option(
+        InstanceKind.PREMIUM,
+        "--type",
+        help="Cloud Server type. "
+        "Servers with GPU always is 'premium'. "
+        "This option will be ignored if '--gpus' or '--preset-id' is set.",
     ),
     cpu: int = typer.Option(None, help="Number of vCPUs."),
     ram: str = typer.Option(
@@ -500,6 +527,12 @@ def server_create(
     disk: str = typer.Option(
         None, metavar="SIZE", help="System disk size, e.g. 10240M, 10G."
     ),
+    gpus: Optional[int] = typer.Option(
+        None,
+        min=0,
+        max=4,
+        help="Number of GPUs to attach.",
+    ),
     bandwidth: int = typer.Option(
         None, callback=bandwidth_callback, help="Network bandwidth."
     ),
@@ -549,6 +582,11 @@ def server_create(
         callback=load_from_config_callback,
         help="Add server to specific project.",
     ),
+    disable_ssh_password_auth: Optional[bool] = typer.Option(
+        False,
+        "--disable-ssh-password-auth",
+        help="Disable sshd password authentication.",
+    ),
 ):
     """Create Cloud Server."""
     client = create_client(config, profile)
@@ -560,13 +598,28 @@ def server_create(
         "is_ddos_guard": ddos_protection,
         "availability_zone": availability_zone,
         "network": {},
-        **(
-            {"is_local_network": local_network}
-            if local_network is not None
-            else {}
-        ),
     }
 
+    if local_network is not None:
+        print(
+            "Option --local-network is deprecated and will be removed soon",
+            file=sys.stderr,
+        )
+        payload["is_local_network"] = local_network
+
+    if disable_ssh_password_auth:
+        if not ssh_keys:
+            print(
+                "You applied --disable-ssh-password-auth, but no ssh keys is set. "
+                "Pass keys to --ssh-key option or setup master ssh key.",
+                file=sys.stderr,
+            )
+        payload["is_root_password_required"] = False
+
+    instance_kind = instance_kind.value
+    if gpus:
+        instance_kind = "gpu"
+
     # Check availability zone
     usable_zones = ServiceRegion.get_zones(region)
     if availability_zone is not None and availability_zone not in usable_zones:
@@ -587,7 +640,7 @@ def server_create(
             if IPv4Address(private_ip) >= net.network_address + 4:
                 payload["network"]["ip"] = private_ip
             else:
-                # First 3 addresses is reserved for networks OVN based networks
+                # First 3 addresses is reserved by Timeweb Cloud for gateway and future use.
                 sys.exit(
                     f"Error: Private address '{private_ip}' is not allowed. "
                     "IP must be at least the fourth in order in the network."
@@ -600,15 +653,15 @@ def server_create(
             sys.exit(f"Error: '{public_ip}' is not valid IPv4 address.")
     else:
         # New public IPv4 address will be automatically requested with
-        # correct availability zone. This is official dirty hack.
+        # correct availability zone. This is an official dirty hack.
         if no_public_ip is False:
             payload["network"]["floating_ip"] = "create_ip"
 
     # Set server configuration parameters
-    if preset_id and (cpu or ram or disk):
+    if preset_id and (cpu or ram or disk or gpus):
         raise UsageError(
             "'--preset-id' is mutually exclusive with: "
-            + "['--cpu', '--ram', '--disk']."
+            + "['--cpu', '--ram', '--disk', '--gpus']."
         )
     if not preset_id and not (cpu or ram or disk):
         raise UsageError(
@@ -620,7 +673,10 @@ def server_create(
             if not locals()[param]:
                 raise UsageError(f"Missing parameter: '--{param}'.")
         # Select configurator_id by region
-        configurator_id = select_configurator(client, region)
+        if not configurator_id:
+            configurator_id = select_configurator(
+                client, kind=instance_kind, region=region
+            )
         requirements = get_requirements(client, configurator_id)
         payload["configuration"] = {
             "configurator_id": configurator_id,
@@ -628,6 +684,8 @@ def server_create(
             "ram": validate_ram(requirements, size_to_mb(ram)),
             "disk": validate_disk(requirements, size_to_mb(disk)),
         }
+        if gpus:
+            payload["configuration"]["gpus"] = gpus
         if bandwidth:
             payload["bandwidth"] = validate_bandwidth(requirements, bandwidth)
         else:
@@ -655,24 +713,13 @@ def server_create(
     if user_data:
         payload["cloud_init"] = user_data.read()
 
-    # Check project_id before creating server
     if project_id:
-        if not project_id in [
-            prj["id"] for prj in client.get_projects().json()["projects"]
-        ]:
-            sys.exit(f"Wrong project ID: Project '{project_id}' not found.")
+        payload["project_id"] = project_id
 
     # Create Cloud Server
     debug("Create Cloud Server...")
     response = client.create_server(**payload)
 
-    if project_id:
-        debug(f"Add Server to project '{project_id}'...")
-        client.add_server_to_project(
-            response.json()["server"]["id"],
-            project_id,
-        )
-
     if nat_mode:
         debug(f"Set NAT mode to '{nat_mode}'")
         client.set_server_nat_mode(
@@ -793,7 +840,9 @@ def server_resize(
         debug("Get configurator_id...")
         if not configurator_id:
             configurator_id = select_configurator(
-                client, old_state["location"]
+                client,
+                region=old_state["location"],
+                kind="premium",
             )
 
         # Get configurator by configurator_id