twc-cli 2.11.0__tar.gz → 2.13.0__tar.gz

{twc_cli-2.11.0 → twc_cli-2.13.0}/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 В этом файле описаны все значимые изменения в Timeweb Cloud CLI. В выпусках мы придерживается правил [семантического версионирования](https://semver.org/lang/ru/).
 
+# Версия 2.13.0 (2025.06.17)
+
+## Добавлено
+
+- Добавлена новая команда `twc apps` для управления сервисом Cloud Apps.
+
+# Версия 2.12.0 (2025.04.11)
+
+## Добавлено
+
+- Добавлены опции `--max-connections`, `--connect-timeout`, `--client-timeout`, `--server-timeout` в команды `twc balancer create`, `twc balancer set`.
+- В регионе `kz-1` для облачных серверов теперь доступен IPv6.
+
+## Изменено
+
+- Стандартный ендпоинт объектного хранилища изменён с `s3.timeweb.cloud` на `s3.twcstorage.ru`.
+
 # Версия 2.11.0 (2025.04.01)
 
 ## Добавлено

{twc_cli-2.11.0 → twc_cli-2.13.0}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: twc-cli
-Version: 2.11.0
+Version: 2.13.0
 Summary: Timeweb Cloud Command Line Interface.
-Home-page: https://github.com/timeweb-cloud/twc
 License: MIT
 Author: ge
 Author-email: dev@timeweb.cloud
@@ -17,10 +16,11 @@ 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)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
+Requires-Dist: requests (>=2.32.4,<3.0.0)
 Requires-Dist: shellingham (>=1.5.4,<2.0.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typer-slim (>=0.12.3,<0.13.0)
+Project-URL: Homepage, https://github.com/timeweb-cloud/twc
 Project-URL: Repository, https://github.com/timeweb-cloud/twc
 Description-Content-Type: text/markdown
 

{twc_cli-2.11.0 → twc_cli-2.13.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "twc-cli"
-version = "2.11.0"
+version = "2.13.0"
 description = "Timeweb Cloud Command Line Interface."
 authors = ["ge <dev@timeweb.cloud>"]
 homepage = "https://github.com/timeweb-cloud/twc"
@@ -12,7 +12,7 @@ packages = [{ include = "twc", from = "." }]
 
 [tool.poetry.dependencies]
 python = "^3.8.19"
-requests = "^2.32.3"
+requests = "^2.32.4"
 typer-slim = "^0.12.3"
 shellingham = "^1.5.4"
 colorama = "^0.4.6"

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/__main__.py

@@ -22,6 +22,7 @@ from .commands import (
     firewall,
     floating_ip,
     whoami,
+    apps,
 )
 from .commands.common import version_callback, version_option, verbose_option
 
@@ -33,6 +34,7 @@ cli = TyperAlias(
 )
 cli.add_typer(config, name="config")
 cli.add_typer(account, name="account")
+cli.add_typer(apps, name="apps")
 cli.add_typer(server, name="server", aliases=["servers", "s"])
 cli.add_typer(ssh_key, name="ssh-key", aliases=["ssh-keys", "k"])
 cli.add_typer(image, name="image", aliases=["images", "i"])

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/__version__.py

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

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/api/client.py

@@ -2,10 +2,12 @@
 
 from __future__ import annotations
 
+from ipaddress import IPv4Address, IPv6Address, IPv4Network, IPv6Network
 from typing import Optional, Union, List
-from uuid import UUID
 from pathlib import Path
-from ipaddress import IPv4Address, IPv6Address, IPv4Network, IPv6Network
+from uuid import UUID
+
+import yaml
 
 from .base import TimewebCloudBase
 from .types import (
@@ -34,6 +36,43 @@ from .types import (
 class TimewebCloud(TimewebCloudBase):
     """Timeweb Cloud API client class."""
 
+    # -----------------------------------------------------------------------
+    # Apps
+
+    def get_apps(self):
+        """Return Timeweb Cloud apps list."""
+        return self._request("GET", f"{self.api_url}/apps")
+
+    def create_app(self, yaml_config_path: str):
+        """Create Timeweb Cloud app."""
+
+        with open(yaml_config_path, "r", encoding="utf-8") as f:
+            payload = yaml.safe_load(f)
+        payload = payload["app"]
+        return self._request("POST", f"{self.api_url}/apps", json=payload)
+
+    def get_app(self, app_id: int):
+        """Return Timeweb Cloud app."""
+        return self._request("GET", f"{self.api_url}/apps/{app_id}")
+
+    def get_vcs_providers(self):
+        """Return Timeweb Cloud vcs providers."""
+        return self._request("GET", f"{self.api_url}/vcs-provider")
+
+    def get_repositories(self, vcs_provider_id: str):
+        """Return Timeweb Cloud user vcs repositories."""
+        return self._request(
+            "GET", f"{self.api_url}/vcs-provider/{vcs_provider_id}"
+        )
+
+    def get_apps_tarifs(self):
+        """Return Timeweb Cloud Apps tarifs"""
+        return self._request("GET", f"{self.api_url}/presets/apps")
+
+    def delete_app(self, app_id: int):
+        """Delete Timeweb Cloud app."""
+        return self._request("DELETE", f"{self.api_url}/apps/{app_id}")
+
     # -----------------------------------------------------------------------
     # Account
 
@@ -1162,6 +1201,11 @@ class TimewebCloud(TimewebCloudBase):
         comment: Optional[str] = None,
         project_id: Optional[int] = None,
         certificates: Optional[dict] = None,
+        max_connections: Optional[int] = None,
+        connect_timeout: Optional[int] = None,
+        client_timeout: Optional[int] = None,
+        server_timeout: Optional[int] = None,
+        http_timeout: Optional[int] = None,
     ):
         """Create load balancer."""
         payload = {
@@ -1183,6 +1227,31 @@ class TimewebCloud(TimewebCloudBase):
             **({"comment": comment} if comment else {}),
             **({"project_id": project_id} if project_id else {}),
             **({"certificates": certificates} if certificates else {}),
+            **(
+                {"maxconn": max_connections}
+                if max_connections is not None
+                else {}
+            ),
+            **(
+                {"connect_timeout": connect_timeout}
+                if connect_timeout is not None
+                else {}
+            ),
+            **(
+                {"client_timeout": client_timeout}
+                if client_timeout is not None
+                else {}
+            ),
+            **(
+                {"server_timeout": server_timeout}
+                if server_timeout is not None
+                else {}
+            ),
+            **(
+                {"httprequest_timeout": http_timeout}
+                if http_timeout is not None
+                else {}
+            ),
         }
         return self._request("POST", f"{self.api_url}/balancers", json=payload)
 
@@ -1203,6 +1272,11 @@ class TimewebCloud(TimewebCloudBase):
         proxy_protocol: Optional[bool] = None,
         force_https: Optional[bool] = None,
         backend_keepalive: Optional[bool] = None,
+        max_connections: Optional[int] = None,
+        connect_timeout: Optional[int] = None,
+        client_timeout: Optional[int] = None,
+        server_timeout: Optional[int] = None,
+        http_timeout: Optional[int] = None,
     ):
         """Update load balancer settings."""
         payload = {
@@ -1228,6 +1302,31 @@ class TimewebCloud(TimewebCloudBase):
                 if backend_keepalive is not None
                 else {}
             ),
+            **(
+                {"maxconn": max_connections}
+                if max_connections is not None
+                else {}
+            ),
+            **(
+                {"connect_timeout": connect_timeout}
+                if connect_timeout is not None
+                else {}
+            ),
+            **(
+                {"client_timeout": client_timeout}
+                if client_timeout is not None
+                else {}
+            ),
+            **(
+                {"server_timeout": server_timeout}
+                if server_timeout is not None
+                else {}
+            ),
+            **(
+                {"httprequest_timeout": http_timeout}
+                if http_timeout is not None
+                else {}
+            ),
         }
         return self._request(
             "PATCH", f"{self.api_url}/balancers/{balancer_id}", json=payload

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/commands/__init__.py

@@ -1,6 +1,7 @@
 """Commands."""
 
 from .account import account, whoami
+from .apps import apps
 from .config import config
 from .server import server
 from .ssh_key import ssh_key

twc_cli-2.13.0/twc/commands/apps.py

@@ -0,0 +1,337 @@
+"""Manage apps."""
+
+from typing import Optional
+from pathlib import Path
+
+import typer
+from requests import Response
+
+from twc import fmt
+from twc.typerx import TyperAlias
+from twc.apiwrap import create_client
+from .common import (
+    verbose_option,
+    config_option,
+    profile_option,
+    filter_option,
+    output_format_option,
+)
+
+
+apps = TyperAlias(help=__doc__)
+
+
+# ------------------------------------------------------------- #
+# $ twc apps list                                           #
+# ------------------------------------------------------------- #
+
+
+def print_apps(response: Response, filters: Optional[str]):
+    """Print table with apps list."""
+    # pylint: disable=invalid-name
+    _apps = response.json()["apps"]
+    if filters:
+        _apps = fmt.filter_list(_apps, filters)
+    table = fmt.Table()
+    table.header(
+        [
+            "ID",
+            "NAME",
+            "STATUS",
+            "TYPE",
+            "IPV4",
+        ]
+    )
+    for app in _apps:
+        table.row(
+            [
+                app["id"],
+                app["name"],
+                app["status"],
+                app["type"],
+                app["ip"],
+            ]
+        )
+    table.print()
+
+
+@apps.command("list", "ls")
+def apps_list(
+    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,
+):
+    """List apps."""
+    client = create_client(config, profile)
+    response = client.get_apps()
+    fmt.printer(
+        response,
+        output_format=output_format,
+        filters=filters,
+        func=print_apps,
+    )
+
+
+@apps.command("create")
+def app_create(
+    yml_config_path: str,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+    status: Optional[bool] = typer.Option(
+        False,
+        "--status",
+        help="Display status and exit with 0 if status is 'started'.",
+    ),
+):
+    """Create app"""
+    client = create_client(config, profile)
+    response = client.create_app(yml_config_path)
+    fmt.printer(
+        response,
+        output_format=output_format,
+        func=lambda response: print(response.json()["app"]["id"]),
+    )
+
+
+def print_vcs_providers(response: Response):
+    """Print table with vcs list."""
+    # pylint: disable=invalid-name
+    providers = response.json()["providers"]
+    table = fmt.Table()
+    table.header(
+        [
+            "LOGIN",
+            "PROVIDER",
+            "PROVIDER_ID",
+        ]
+    )
+    for provider in providers:
+        table.row(
+            [
+                provider["login"],
+                provider["provider"],
+                provider["provider_id"],
+            ]
+        )
+    table.print()
+
+
+@apps.command("get-vcs-providers")
+def app_get_vcs_providers(
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """Get VCS providers."""
+    client = create_client(config, profile)
+    response = client.get_vcs_providers()
+    fmt.printer(
+        response, output_format=output_format, func=print_vcs_providers
+    )
+
+
+def print_vcs_repositories(response: Response):
+    """Print table with vcs list."""
+    # pylint: disable=invalid-name
+    providers = response.json()["repositories"]
+    table = fmt.Table()
+    table.header(["FULL NAME", "ID", "NAME", "URL", "IS PRIVATE"])
+    for provider in providers:
+        table.row(
+            [
+                provider["full_name"],
+                provider["id"],
+                provider["name"],
+                provider["url"],
+                provider["is_private"],
+            ]
+        )
+    table.print()
+
+
+@apps.command("get-repositories")
+def app_get_repositories(
+    vcs_provider_id: str,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """Get repositories."""
+    client = create_client(config, profile)
+    response = client.get_repositories(vcs_provider_id)
+    fmt.printer(
+        response, output_format=output_format, func=print_vcs_repositories
+    )
+
+
+def print_apps_tarifs(response: Response, typ: str):
+    """Print Timeweb Cloud Apps tarifs."""
+    # pylint: disable=invalid-name
+    if typ == "backend":
+        key = "backend_presets"
+    elif typ == "frontend":
+        key = "frontend_presets"
+    else:
+        raise KeyError("Tarifs can be only backend or frontend")
+
+    providers = response.json()[key]
+    table = fmt.Table()
+    if key == "backend_presets":
+        table.header(
+            [
+                "CPU",
+                "CPU FREQUENCY",
+                "DESCRIPTION",
+                "DESCRIPTION SHORT",
+                "DISK",
+                "ID",
+                "LOCATION",
+                "PRICE",
+                "RAM",
+            ]
+        )
+        for provider in providers:
+            table.row(
+                [
+                    provider["cpu"],
+                    provider["cpu_frequency"],
+                    provider["description"],
+                    provider["description_short"],
+                    provider["disk"],
+                    provider["id"],
+                    provider["location"],
+                    provider["price"],
+                    provider["ram"],
+                ]
+            )
+    elif key == "frontend_presets":
+        table.header(
+            [
+                "DESCRIPTION",
+                "DESCRIPTION_SHORT",
+                "DISK",
+                "ID",
+                "LOCATION",
+                "PRICE",
+                "REQUESTS",
+            ]
+        )
+        for provider in providers:
+            table.row(
+                [
+                    provider["description"],
+                    provider["description_short"],
+                    provider["disk"],
+                    provider["id"],
+                    provider["location"],
+                    provider["price"],
+                    provider["requests"],
+                ]
+            )
+    table.print()
+
+
+@apps.command("list-presets")
+def get_apps_tarifs(
+    _type: str = typer.Argument(..., metavar="TYPE"),
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """Get tarifs; backend or frontend"""
+    client = create_client(config, profile)
+    response = client.get_apps_tarifs()
+    fmt.printer(
+        response,
+        output_format=output_format,
+        typ=_type,
+        func=print_apps_tarifs,
+    )
+
+
+def print_app_delete_response(response: Response, app_id: int):
+    """Print table with apps list."""
+    # pylint: disable=invalid-name
+    table = fmt.Table()
+    table.header(
+        [
+            "ID",
+        ]
+    )
+    table.row(
+        [
+            app_id,
+        ]
+    )
+    table.print()
+
+
+@apps.command("delete")
+def delete_app(
+    app_id: int,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+):
+    """Delete apps."""
+    client = create_client(config, profile)
+    response = client.delete_app(app_id)
+    fmt.printer(
+        response,
+        output_format=output_format,
+        app_id=app_id,
+        func=print_app_delete_response,
+    )
+
+
+def get_app(response: Response):
+    """Print table with apps list."""
+    # pylint: disable=invalid-name
+    app = response.json()["app"]
+    table = fmt.Table()
+    table.header(
+        [
+            "ID",
+            "LOCATION",
+            "STATUS",
+            "TYPE",
+            "IPV4",
+        ]
+    )
+    table.row(
+        [
+            app["id"],
+            app["location"],
+            app["status"],
+            app["type"],
+            app["ip"],
+        ]
+    )
+    table.print()
+
+
+@apps.command("get")
+def app_get(
+    app_id: int,
+    verbose: Optional[bool] = verbose_option,
+    config: Optional[Path] = config_option,
+    profile: Optional[str] = profile_option,
+    output_format: Optional[str] = output_format_option,
+    status: Optional[bool] = typer.Option(
+        False,
+        "--status",
+        help="Display status and exit with 0 if status is 'started'.",
+    ),
+):
+    """Get database info."""
+    client = create_client(config, profile)
+    response = client.get_app(app_id)
+    fmt.printer(response, output_format=output_format, func=get_app)

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/commands/balancer.py

@@ -198,6 +198,22 @@ def balancer_create(
     proxy_protocol: bool = typer.Option(False),
     force_https: bool = typer.Option(False),
     backend_keepalive: bool = typer.Option(False),
+    max_connections: Optional[int] = typer.Option(
+        None, help="Backend server's maximum number of concurrent connections."
+    ),
+    connect_timeout: Optional[int] = typer.Option(
+        None,
+        help="Maximum time to wait for a connection attempt to a backend server to succeed.",
+    ),
+    client_timeout: Optional[int] = typer.Option(
+        None, help="Maximum inactivity time on the client side."
+    ),
+    server_timeout: Optional[int] = typer.Option(
+        None, help="Maximum time for pending data staying into output buffer."
+    ),
+    http_timeout: Optional[int] = typer.Option(
+        None, help="Maximum allowed time to wait for a complete HTTP request."
+    ),
     project_id: Optional[int] = typer.Option(
         None,
         envvar="TWC_PROJECT",
@@ -259,6 +275,11 @@ def balancer_create(
         "network": {},
         "project_id": project_id,
         "certificates": {},
+        "max_connections": max_connections,
+        "connect_timeout": connect_timeout,
+        "client_timeout": client_timeout,
+        "server_timeout": server_timeout,
+        "http_timeout": http_timeout,
     }
 
     if cert_type == CertType.CUSTOM:
@@ -412,6 +433,22 @@ def balancer_set(
     proxy_protocol: Optional[bool] = typer.Option(None),
     force_https: Optional[bool] = typer.Option(None),
     backend_keepalive: Optional[bool] = typer.Option(None),
+    max_connections: Optional[int] = typer.Option(
+        None, help="Backend server's maximum number of concurrent connections."
+    ),
+    connect_timeout: Optional[int] = typer.Option(
+        None,
+        help="Maximum time to wait for a connection attempt to a backend server to succeed.",
+    ),
+    client_timeout: Optional[int] = typer.Option(
+        None, help="Maximum inactivity time on the client side."
+    ),
+    server_timeout: Optional[int] = typer.Option(
+        None, help="Maximum time for pending data staying into output buffer."
+    ),
+    http_timeout: Optional[int] = typer.Option(
+        None, help="Maximum allowed time to wait for a complete HTTP request."
+    ),
 ):
     """Change load balancer parameters."""
     client = create_client(config, profile)
@@ -442,6 +479,11 @@ def balancer_set(
         proxy_protocol=proxy_protocol,
         force_https=force_https,
         backend_keepalive=backend_keepalive,
+        max_connections=max_connections,
+        connect_timeout=connect_timeout,
+        client_timeout=client_timeout,
+        server_timeout=server_timeout,
+        http_timeout=http_timeout,
     )
 
     fmt.printer(

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/commands/storage.py

@@ -611,7 +611,7 @@ def storage_genconfig(
         "rclone": RCLONE_CONFIG_TEMPLATE.strip(),
     }
 
-    endpoint = "s3.timeweb.cloud"
+    endpoint = "s3.twcstorage.ru"
     if not access_key.isupper():
         # Legacy object storage service have lowercase usernames only.
         # New storage, on the contrary, always has keys in uppercase.

{twc_cli-2.11.0 → twc_cli-2.13.0}/twc/vars.py

@@ -8,7 +8,7 @@ expand or other infrastructure or product changes occur.
 CONTROL_PANEL_URL = "https://timeweb.cloud/my"
 
 # Location specific parameters. May change later.
-REGIONS_WITH_IPV6 = ["ru-1", "ru-3", "pl-1", "nl-1"]
+REGIONS_WITH_IPV6 = ["ru-1", "ru-3", "pl-1", "nl-1", "kz-1"]
 REGIONS_WITH_IMAGES = ["ru-1", "ru-3", "kz-1", "pl-1", "nl-1"]
 REGIONS_WITH_LAN = ["ru-1", "ru-3", "nl-1", "pl-1", "de-1"]
 ZONES_WITH_LAN = [