tinybird-cli 5.5.1.dev4__tar.gz → 5.5.1.dev5__tar.gz

{tinybird-cli-5.5.1.dev4 → tinybird-cli-5.5.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.5.1.dev4
+Version: 5.5.1.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.5.1.dev5
+**********
+
+- `Fixed` region list for AWS and custom regions when usign `tb auth --interactive`
+
 5.5.1.dev4
 **********
 

{tinybird-cli-5.5.1.dev4 → tinybird-cli-5.5.1.dev5}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.5.1.dev4'
-__revision__ = 'b16f004'
+__version__ = '5.5.1.dev5'
+__revision__ = '3811426'

{tinybird-cli-5.5.1.dev4 → tinybird-cli-5.5.1.dev5}/tinybird/client.py

@@ -13,7 +13,6 @@ from urllib3 import Retry
 
 from tinybird.ch_utils.constants import COPY_ENABLED_TABLE_FUNCTIONS
 from tinybird.syncasync import sync_to_async
-from tinybird.tb_cli_modules.regions import fill_with_public_regions
 from tinybird.tb_cli_modules.telemetry import add_telemetry_event
 
 HOST = "https://api.tinybird.co"
@@ -1101,8 +1100,7 @@ class TinyB(object):
 
     async def regions(self):
         regions = await self._req("/v0/regions")
-        regions_superset = fill_with_public_regions(regions)
-        return regions_superset
+        return regions
 
     async def datasource_query_copy(self, datasource_name: str, sql_query: str):
         params = {"copy_to": datasource_name}

{tinybird-cli-5.5.1.dev4 → tinybird-cli-5.5.1.dev5}/tinybird/tb_cli_modules/common.py

@@ -1765,7 +1765,8 @@ async def get_regions_temp(config: CLIConfig) -> List[Region]:
     regions: List[Region] = []
 
     try:
-        regions = await config.get_client().regions()
+        response = await config.get_client().regions()
+        regions = response.get("regions", [])
     except Exception:
         pass
 
@@ -1782,7 +1783,7 @@ async def get_regions_temp(config: CLIConfig) -> List[Region]:
                 regions.append(
                     {
                         "api_host": format_host(key, subdomain="api"),
-                        "host": format_host(key, subdomain="ui"),
+                        "host": get_display_host(key),
                         "name": key,
                         "default_password": config["tokens"][key],
                         "provider": "",

tinybird-cli-5.5.1.dev5/tinybird/tb_cli_modules/regions.py

@@ -0,0 +1,9 @@
+from typing import Optional, TypedDict
+
+
+class Region(TypedDict):
+    name: str
+    provider: str
+    api_host: str
+    host: str
+    default_password: Optional[str]

{tinybird-cli-5.5.1.dev4 → tinybird-cli-5.5.1.dev5}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.5.1.dev4
+Version: 5.5.1.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.5.1.dev5
+**********
+
+- `Fixed` region list for AWS and custom regions when usign `tb auth --interactive`
+
 5.5.1.dev4
 **********
 

tinybird-cli-5.5.1.dev4/tinybird/tb_cli_modules/regions.py

@@ -1,79 +0,0 @@
-from typing import List, Optional, TypedDict
-
-
-class Region(TypedDict):
-    name: str
-    provider: str
-    api_host: str
-    host: str
-    default_password: Optional[str]
-
-
-# Maintain in sync with `production.ts`
-
-regions_list: List[Region] = [
-    {
-        "name": "europe-west3",
-        "provider": "gcp",
-        "api_host": "https://api.tinybird.co",
-        "host": "https://app.tinybird.co/gcp/europe-west3",
-        "default_password": "",
-    },
-    {
-        "name": "us-east4",
-        "provider": "gcp",
-        "api_host": "https://api.us-east.tinybird.co",
-        "host": "https://app.tinybird.co/gcp/us-east4",
-        "default_password": "",
-    },
-    {
-        "name": "us-east-1",
-        "provider": "aws",
-        "api_host": "https://api.us-east.aws.tinybird.co",
-        "host": "https://app.tinybird.co/aws/us-east-1",
-        "default_password": "",
-    },
-    {
-        "name": "us-west-2",
-        "provider": "aws",
-        "api_host": "https://api.us-west-2.aws.tinybird.co",
-        "host": "https://app.tinybird.co/aws/us-west-2",
-        "default_password": "",
-    },
-    {
-        "name": "eu-central-1",
-        "provider": "aws",
-        "api_host": "https://api.eu-central-1.aws.tinybird.co",
-        "host": "https://app.tinybird.co/aws/eu-central-1",
-        "default_password": "",
-    },
-]
-
-
-def regions_has_a_public_region(public_regions: List[Region], initial_regions: List[Region]) -> bool:
-    in_a_public_region = False
-
-    for region in initial_regions:
-        existing_region = next(
-            (
-                public_region
-                for public_region in public_regions
-                if region["api_host"] == public_region["api_host"] or region["host"] == public_region["host"]
-            ),
-            None,
-        )
-        if existing_region:
-            in_a_public_region = True
-            break
-
-    return in_a_public_region
-
-
-def fill_with_public_regions(regions) -> List[Region]:
-    initial_regions = regions.get("regions", [])
-    if regions_has_a_public_region(regions_list, initial_regions):
-        initial_regions += [
-            region for region in regions_list if region["api_host"] not in [r["api_host"] for r in initial_regions]
-        ]
-
-    return initial_regions