tinybird-cli 5.8.1.dev1__tar.gz → 5.8.2.dev0__tar.gz

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.8.1.dev1
+Version: 5.8.2.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -17,7 +17,8 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 
 Changelog
 ----------
-5.8.1.dev1
+
+5.8.1
 ***********
 
 - `Improved` error message of `tb push` when pushing .datasource files

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/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.8.1.dev1'
-__revision__ = 'cbea551'
+__version__ = '5.8.2.dev0'
+__revision__ = 'c7a6831'

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/client.py

@@ -1237,12 +1237,10 @@ class TinyB(object):
     async def check_auth_login(self) -> Dict[str, Any]:
         return await self._req("/v0/auth")
 
-    async def get_all_tags(self, token: Optional[str] = None) -> Dict[str, Any]:
-        return await self._req("/v0/tags", use_token=token)
+    async def get_all_tags(self) -> Dict[str, Any]:
+        return await self._req("/v0/tags")
 
-    async def create_tag_with_resource(
-        self, name: str, resource_id: str, resource_name: str, resource_type: str, token: Optional[str] = None
-    ):
+    async def create_tag_with_resource(self, name: str, resource_id: str, resource_name: str, resource_type: str):
         return await self._req(
             "/v0/tags",
             method="POST",
@@ -1253,19 +1251,17 @@ class TinyB(object):
                     "resources": [{"id": resource_id, "name": resource_name, "type": resource_type}],
                 }
             ),
-            use_token=token,
         )
 
-    async def create_tag(self, name: str, token: Optional[str] = None):
+    async def create_tag(self, name: str):
         return await self._req(
             "/v0/tags",
             method="POST",
             headers={"Content-Type": "application/json"},
             data=json.dumps({"name": name}),
-            use_token=token,
         )
 
-    async def update_tag(self, name: str, resources: List[Dict[str, Any]], token: Optional[str] = None):
+    async def update_tag(self, name: str, resources: List[Dict[str, Any]]):
         await self._req(
             f"/v0/tags/{name}",
             method="PUT",
@@ -1275,8 +1271,7 @@ class TinyB(object):
                     "resources": resources,
                 }
             ),
-            use_token=token,
         )
 
-    async def delete_tag(self, name: str, token: Optional[str] = None):
-        await self._req(f"/v0/tags/{name}", method="DELETE", use_token=token)
+    async def delete_tag(self, name: str):
+        await self._req(f"/v0/tags/{name}", method="DELETE")

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/datafile.py

@@ -568,7 +568,7 @@ class Deployment:
         self,
         filenames: List[str],
         only_changes: bool = False,
-        config: Optional[Dict[str, Any]] = None,
+        config: Optional[CLIConfig] = None,
         use_main: bool = False,
         check_outdated: bool = True,
     ):
@@ -2714,10 +2714,8 @@ async def update_tags(resource_id: str, resource_name: str, resource_type: str,
         tags_to_remove = list(set(current_tags) - set(new_tags))
         return tags_to_add, tags_to_remove
 
-    token_from_main = await get_token_from_main_branch(tb_client)
-
     try:
-        all_tags = await tb_client.get_all_tags(token=token_from_main)
+        all_tags = await tb_client.get_all_tags()
     except Exception as e:
         raise Exception(FeedbackManager.error_getting_tags(error=str(e)))
 
@@ -2739,7 +2737,6 @@ async def update_tags(resource_id: str, resource_name: str, resource_type: str,
                     resource_id=resource_id,
                     resource_name=resource_name,
                     resource_type=resource_type,
-                    token=token_from_main,
                 )
             except Exception as e:
                 raise Exception(FeedbackManager.error_creating_tag(error=str(e)))
@@ -2748,7 +2745,7 @@ async def update_tags(resource_id: str, resource_name: str, resource_type: str,
             resources = tag.get("resources", [])
             resources.append({"id": resource_id, "name": resource_name, "type": resource_type})
             try:
-                await tb_client.update_tag(tag.get("name", tag_name), resources, token=token_from_main)
+                await tb_client.update_tag(tag.get("name", tag_name), resources)
             except Exception as e:
                 raise Exception(FeedbackManager.error_updating_tag(error=str(e)))
 
@@ -2760,7 +2757,7 @@ async def update_tags(resource_id: str, resource_name: str, resource_type: str,
             resources = tag.get("resources", [])
             resources = [resource for resource in resources if resource.get("name") != resource_name]
             try:
-                await tb_client.update_tag(tag.get("name", tag_name), resources, token=token_from_main)
+                await tb_client.update_tag(tag.get("name", tag_name), resources)
             except Exception as e:
                 raise Exception(FeedbackManager.error_updating_tag(error=str(e)))
 
@@ -3501,7 +3498,6 @@ async def new_token(token: Dict[str, Any], client: TinyB, force: bool = False):
 
 
 async def exec_file(
-    config: Optional[Dict[str, Any]],
     r: Dict[str, Any],
     tb_client: TinyB,
     force: bool,
@@ -4053,7 +4049,7 @@ async def build_graph(
 async def get_changes_from_main(
     only_changes: bool,
     client: TinyB,
-    config: Optional[Dict[str, Any]] = None,
+    config: Optional[CLIConfig] = None,
     current_ws: Optional[Dict[str, Any]] = None,
     filenames: Optional[List[str]] = None,
 ):
@@ -4064,7 +4060,7 @@ async def get_changes_from_main(
     if current_ws and not current_ws.get("is_branch"):
         changed = await diff_command(filenames, True, client, no_color=True, with_print=False)
     elif config and config.get("host"):
-        workspace = await get_current_main_workspace(client, config)
+        workspace = await get_current_main_workspace(config)
 
         if workspace:
             ws_client = _get_tb_client(workspace["token"], config["host"])
@@ -4159,7 +4155,7 @@ async def folder_push(
     tests_ignore_order: bool = False,
     tests_validate_processed_bytes: bool = False,
     tests_check_requests_from_branch: bool = False,
-    config: Optional[Dict[str, Any]] = None,
+    config: Optional[CLIConfig] = None,
     user_token: Optional[str] = None,
     fork_downstream: Optional[bool] = False,
     fork: Optional[bool] = False,
@@ -4324,7 +4320,6 @@ async def folder_push(
                         )
                     try:
                         await exec_file(
-                            config,
                             to_run[name],
                             tb_client,
                             force,

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/git_settings.py

@@ -57,25 +57,12 @@ DEFAULT_BRANCH = "main"
 CI_WORKFLOW_VERSION = WORKFLOW_VERSION
 
 DEFAULT_TINYENV_FILE = """
-# VERSION format is major.minor.patch-post where major, minor, patch and post are integer numbers
-# bump post to deploy to the current live Release, rollback to previous post version is not available
-# bump patch or minor to deploy a new Release and auto-promote it to live. Add TB_AUTO_PROMOTE=0 to create the Release in preview status
-# bump major to deploy a new Release in preview status
 VERSION=0.0.0
 
 
 
 ##########
 # OPTIONAL env vars
-# Deploy a new Release in preview status (default is 1)
-# TB_AUTO_PROMOTE=0
-
-# Check if deploy requires backfilling on preview (default is 1)
-# TB_CHECK_BACKFILL_REQUIRED=0
-
-# Force old Releases deletion on promote (default is 0)
-# Setting it to 1 will remove oldest rollback Releases even when some resource is still in use
-# TB_FORCE_REMOVE_OLDEST_ROLLBACK=0
 
 # Don't print CLI version warning message if there's a new available version
 # TB_VERSION_WARNING=0

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/auth.py

@@ -16,8 +16,8 @@ from tinybird.tb_cli_modules.common import (
     configure_connector,
     coro,
     echo_safe_humanfriendly_tables_format_smart_table,
-    get_host_from_region_temp,
-    get_regions_temp,
+    get_host_from_region,
+    get_regions,
     try_authenticate,
     try_update_config_with_remote,
 )
@@ -80,7 +80,7 @@ async def auth(ctx: click.Context, token: str, host: str, region: str, connector
     try_all_regions = True
 
     if region:
-        regions, host = await get_host_from_region_temp(config, region, config.get_host())
+        regions, host = await get_host_from_region(config, region, config.get_host())
         config.set_host(host)
         if token:
             config.set_token_for_host(token, host)
@@ -194,7 +194,7 @@ async def auth_ls() -> None:
     _ = await try_update_config_with_remote(config, raise_on_errors=False)
 
     table: List[List[Any]] = []
-    regions: List[Region] = await get_regions_temp(config)
+    regions: List[Region] = await get_regions(config)
     if regions:
 
         def is_current(region: Region) -> bool:
@@ -237,7 +237,7 @@ async def auth_use(region_name_or_host_or_id: str) -> None:
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, raise_on_errors=False)
 
-    regions, host = await get_host_from_region_temp(config, region_name_or_host_or_id, config.get_host())
+    regions, host = await get_host_from_region(config, region_name_or_host_or_id, config.get_host())
     config.set_host(host)
 
     if not await try_authenticate(config, regions):

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/branch.py

@@ -19,9 +19,9 @@ from tinybird.tb_cli_modules.common import (
     coro,
     create_workspace_branch,
     echo_safe_humanfriendly_tables_format_smart_table,
-    get_current_main_workspace_temp,
+    get_current_main_workspace,
+    get_current_workspace,
     get_current_workspace_branches,
-    get_current_workspace_temp,
     get_oldest_rollback,
     getenv_bool,
     print_branch_regression_tests_summary,
@@ -283,7 +283,7 @@ async def branch_ls(sort: bool) -> None:
 
     client = config.get_client()
 
-    current_main_workspace = await get_current_main_workspace_temp(config)
+    current_main_workspace = await get_current_main_workspace(config)
     assert isinstance(current_main_workspace, dict)
 
     if current_main_workspace["id"] != config["id"]:
@@ -323,7 +323,7 @@ async def branch_use(branch_name_or_id: str) -> None:
     _ = await try_update_config_with_remote(config, only_if_needed=True)
 
     if branch_name_or_id == MAIN_BRANCH:
-        current_main_workspace = await get_current_main_workspace_temp(config)
+        current_main_workspace = await get_current_main_workspace(config)
         assert isinstance(current_main_workspace, dict)
         await switch_to_workspace_by_user_workspace_data(config, current_main_workspace)
     else:
@@ -473,7 +473,7 @@ async def data_branch(last_partition: bool, all: bool, ignore_datasources: List[
     config = CLIConfig.get_project_config()
     client = config.get_client()
 
-    current_main_workspace = await get_current_main_workspace_temp(config)
+    current_main_workspace = await get_current_main_workspace(config)
     assert isinstance(current_main_workspace, dict)
 
     if current_main_workspace["id"] == config["id"]:
@@ -563,7 +563,7 @@ async def regression_tests(
         config = CLIConfig.get_project_config()
         client = config.get_client()
 
-        current_main_workspace = await get_current_main_workspace_temp(config)
+        current_main_workspace = await get_current_main_workspace(config)
         assert isinstance(current_main_workspace, dict)
 
         if current_main_workspace["id"] == config["id"]:
@@ -611,7 +611,7 @@ async def _run_regression(
     config = CLIConfig.get_project_config()
     client = config.get_client()
 
-    current_main_workspace = await get_current_main_workspace_temp(config)
+    current_main_workspace = await get_current_main_workspace(config)
     assert isinstance(current_main_workspace, dict)
 
     if current_main_workspace["id"] == config["id"]:
@@ -985,7 +985,7 @@ async def datasource_copy_from_main(datasource_name: str, sql: str, sql_from_mai
 
     config = CLIConfig.get_project_config()
 
-    current_main_workspace = await get_current_main_workspace_temp(config)
+    current_main_workspace = await get_current_main_workspace(config)
     assert isinstance(current_main_workspace, dict)
 
     if current_main_workspace["id"] == config["id"] and sql_from_main:
@@ -1014,7 +1014,7 @@ async def warn_if_in_live(semver: str) -> None:
         return
 
     config = CLIConfig.get_project_config()
-    current_workspace = await get_current_workspace_temp(config)
+    current_workspace = await get_current_workspace(config)
     assert isinstance(current_workspace, dict)
 
     is_branch = current_workspace.get("is_branch", False)

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/cicd.py

@@ -400,8 +400,6 @@ def ask_provider_interactively():
 
 async def init_cicd(
     client: TinyB,
-    workspace: Dict[str, Any],
-    config: Dict[str, Any],
     path: Optional[str] = None,
     data_project_dir: Optional[str] = None,
 ):

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/cli.py

@@ -58,13 +58,13 @@ from tinybird.tb_cli_modules.common import (
     create_tb_client,
     echo_safe_humanfriendly_tables_format_smart_table,
     folder_init,
-    get_config_and_hosts,
     get_current_main_workspace,
     getenv_bool,
     is_major_semver,
     is_post_semver,
     load_connector_config,
     remove_release,
+    try_update_config_with_remote,
 )
 from tinybird.tb_cli_modules.config import CLIConfig
 from tinybird.tb_cli_modules.telemetry import add_telemetry_event
@@ -180,6 +180,8 @@ async def cli(
         config_temp.set_host(host)
     if semver:
         config_temp.set_semver(semver)
+    if token or host or semver:
+        await try_update_config_with_remote(config_temp, auto_persist=False, raise_on_errors=False)
 
     # Overwrite token and host with env vars manually, without resorting to click.
     #
@@ -306,7 +308,9 @@ async def init(
 ) -> None:
     """Initialize folder layout."""
     client: TinyB = ctx.ensure_object(dict)["client"]
-    config, _, _ = await get_config_and_hosts(ctx, check_token_exists=True)
+    config = CLIConfig.get_project_config()
+    if config.get("token") is None:
+        raise AuthNoTokenException
     folder = folder if folder else getcwd()
 
     workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
@@ -430,9 +434,7 @@ async def init(
         else:
             if cicd:
                 data_project_dir = os.path.relpath(folder, cli_git_release.working_dir())
-                await init_cicd(
-                    client, current_ws, config, path=cli_git_release.working_dir(), data_project_dir=data_project_dir
-                )
+                await init_cicd(client, path=cli_git_release.working_dir(), data_project_dir=data_project_dir)
 
     if final_response:
         if error:
@@ -670,7 +672,7 @@ async def push(
         tests_validate_processed_bytes=validate_processed_bytes,
         tests_check_requests_from_branch=check_requests_from_main,
         folder=folder,
-        config=ctx.ensure_object(dict)["config"],
+        config=CLIConfig.get_project_config(),
         user_token=user_token,
         is_internal=is_internal,
     )
@@ -782,7 +784,7 @@ async def diff(
             list(filename) if filename else None, fmt, client, no_color, with_print=not only_resources_changed
         )
     else:
-        config, _, _ = await get_config_and_hosts(ctx)
+        config = CLIConfig.get_project_config()
 
         response = await client.user_workspaces_and_branches()
         ws_client = None
@@ -792,7 +794,7 @@ async def diff(
                     raise CLIException(FeedbackManager.error_not_a_branch())
 
                 origin = workspace["main"]
-                workspace = await get_current_main_workspace(client, config)
+                workspace = await get_current_main_workspace(config)
 
                 if not workspace:
                     raise CLIException(FeedbackManager.error_workspace(workspace=origin))
@@ -1506,7 +1508,7 @@ async def deploy(
                 workspace_lib_paths=workspace,
                 run_tests=False,
                 folder=folder,
-                config=ctx.ensure_object(dict)["config"],
+                config=config,
                 user_token=user_token,
                 fork_downstream=fork_downstream,
                 fork=fork,

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/common.py

@@ -19,7 +19,7 @@ from functools import wraps
 from os import chmod, environ, getcwd, getenv
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
-from urllib.parse import urljoin, urlparse
+from urllib.parse import urlparse
 
 import click
 import click.formatting
@@ -42,7 +42,6 @@ from tinybird.client import (
 )
 from tinybird.config import (
     DEFAULT_API_HOST,
-    DEFAULT_LOCALHOST,
     DEFAULT_UI_HOST,
     DEPRECATED_PROJECT_PATHS,
     PROJECT_PATHS,
@@ -173,39 +172,12 @@ def generate_datafile(
         click.echo(FeedbackManager.error_file_already_exists(file=f))
 
 
-async def get_config_and_hosts(ctx: Context, check_token_exists: bool = False) -> Tuple[Dict[str, Any], str, str]:
-    """Returns (config, host, ui_host)"""
-
-    config = ctx.ensure_object(dict)["config"]
-
-    if check_token_exists:
-        if config.get("token") is None:
-            raise AuthNoTokenException
-
-    if "id" not in config:
-        config = await _get_config(config["host"], config["token"], load_tb_file=False)
-
-    host = config["host"]
-    ui_host = DEFAULT_UI_HOST if host == DEFAULT_API_HOST else host
-
-    return config, host, ui_host
-
-
-async def get_current_workspace_temp(config: CLIConfig) -> Optional[Dict[str, Any]]:
-    """Pending to remove the _temp suffix once we fully integrate the class CLIConfig.
-    Please, don't work with the previous version any more and make any changes here
-    """
-
+async def get_current_workspace(config: CLIConfig) -> Optional[Dict[str, Any]]:
     client = config.get_client()
     workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
     return _get_current_workspace_common(workspaces, config["id"])
 
 
-async def get_current_workspace(client: TinyB, config: Dict[str, Any]) -> Optional[Dict[str, Any]]:
-    workspaces: List[Dict[str, Any]] = (await client.user_workspaces()).get("workspaces", [])
-    return _get_current_workspace_common(workspaces, config["id"])
-
-
 def _get_current_workspace_common(
     workspaces: List[Dict[str, Any]], current_workspace_id: str
 ) -> Optional[Dict[str, Any]]:
@@ -218,7 +190,7 @@ async def get_current_environment(client, config):
 
 
 async def get_current_workspace_branches(config: CLIConfig) -> List[Dict[str, Any]]:
-    current_main_workspace: Optional[Dict[str, Any]] = await get_current_main_workspace_temp(config)
+    current_main_workspace: Optional[Dict[str, Any]] = await get_current_main_workspace(config)
     if not current_main_workspace:
         raise CLIException(FeedbackManager.error_unable_to_identify_main_workspace())
 
@@ -553,135 +525,6 @@ async def configure_connector(connector):
         click.echo(FeedbackManager.success_connector_config(connector=connector, file_name=file_name))
 
 
-async def _get_config(host: str, token: str, load_tb_file: bool = True, semver: Optional[str] = None):
-    config = {}
-
-    try:
-        client = _get_tb_client(token, host)
-        response = await client.workspace_info()
-    except Exception:
-        raise CLIAuthException(FeedbackManager.error_invalid_token_for_host(host=host))
-
-    if semver:
-        release_exists = any(release["semver"] == semver for release in response["releases"])
-        if not release_exists:
-            raise CLIAuthException(
-                FeedbackManager.error_invalid_release_for_workspace(semver=semver, workspace=response["name"])
-            )
-
-    from_response = load_tb_file
-
-    try:
-        config_file = Path(getcwd()) / ".tinyb"
-        with open(config_file) as file:
-            config = json.loads(file.read())
-    except Exception:
-        from_response = True
-
-    if not from_response:
-        return config
-
-    config.update({"host": host, "token": token, "id": response["id"], "name": response["name"]})
-
-    if "user_email" in response:
-        config["user_email"] = response["user_email"]
-    if "user_id" in response:
-        config["user_id"] = response["user_id"]
-    if "scope" in response:
-        config["scope"] = response["scope"]
-    if "id" in response:
-        config["id"] = response["id"]
-
-    tokens = config.get("tokens", {})
-
-    tokens.update({host: token})
-    config["tokens"] = tokens
-    config["token"] = tokens[host]
-    config["host"] = host
-
-    return config
-
-
-async def get_regions(client: TinyB, config_file: Path) -> List[Dict[str, str]]:
-    regions: List[Dict[str, str]] = []
-    try:
-        response = await client.regions()
-        regions = response["regions"]
-    except Exception:
-        pass
-
-    try:
-        with open(config_file) as file:
-            config = json.loads(file.read())
-            if "tokens" not in config:
-                return regions
-
-            for key in config["tokens"]:
-                region = next(
-                    (region for region in regions if key == region["api_host"] or key == region["host"]), None
-                )
-                if region:
-                    region["default_password"] = config["tokens"][key]
-                else:
-                    regions.append(
-                        {
-                            "api_host": format_host(key, subdomain="api"),
-                            "host": format_host(key, subdomain="ui"),
-                            "name": key,
-                            "default_password": config["tokens"][key],
-                        }
-                    )
-
-    except Exception:
-        pass
-
-    return regions
-
-
-def _compare_hosts(region: Dict[str, Any], config: Dict[str, Any]) -> bool:
-    return region["host"] == config["host"] or region["api_host"] == config["host"]
-
-
-async def get_host_from_region(region_name_or_host_or_id: str, host: Optional[str] = None):
-    is_localhost = FeatureFlags.is_localhost()
-
-    if not host:
-        host = DEFAULT_API_HOST if not is_localhost else DEFAULT_LOCALHOST
-
-    client = _get_tb_client(token="", host=host)
-
-    try:
-        response = await client.regions()
-        regions = response["regions"]
-    except Exception:
-        regions = []
-
-    if not regions:
-        click.echo(f"No regions available, using host: {host}")
-        return [], host
-
-    try:
-        index = int(region_name_or_host_or_id)
-        try:
-            host = regions[index - 1]["api_host"]
-        except Exception:
-            raise CLIException(FeedbackManager.error_getting_region_by_index())
-    except Exception:
-        region_name_or_host_or_id = region_name_or_host_or_id.lower()
-        try:
-            region = next(
-                (region for region in regions if _compare_region_host(region_name_or_host_or_id, region)), None
-            )
-            host = region["api_host"] if region else None
-        except Exception:
-            raise CLIException(FeedbackManager.error_getting_region_by_name_or_url())
-
-    if not host:
-        raise CLIException(FeedbackManager.error_getting_region_by_name_or_url())
-
-    return regions, host
-
-
 def _compare_region_host(region_name_or_host: str, region: Dict[str, Any]) -> bool:
     if region["name"].lower() == region_name_or_host:
         return True
@@ -771,93 +614,6 @@ def region_from_host(region_name_or_host, regions):
     return next((r for r in regions if _compare_region_host(region_name_or_host, r)), None)
 
 
-async def try_get_config(host, token):
-    try:
-        return await _get_config(host, token)
-    except Exception:
-        return None
-
-
-async def authenticate(ctx, host, token=None, regions=None, interactive=False, try_all_regions=False):
-    is_localhost = FeatureFlags.is_localhost()
-    check_host = DEFAULT_API_HOST if not host and not is_localhost else DEFAULT_LOCALHOST
-
-    client = _get_tb_client(token="", host=check_host)
-    config_file = Path(getcwd()) / ".tinyb"
-    default_password: Optional[str] = None
-
-    if not regions and interactive:
-        regions = await get_regions(client, config_file)
-
-    selected_region = None
-
-    if regions and interactive:
-        selected_region = ask_for_region_interactively(regions)
-        if selected_region is None:
-            return None
-
-        host = selected_region["api_host"]
-        default_password = selected_region.get("default_password", None)
-    elif regions and not interactive:
-        selected_region = region_from_host(host, regions)
-
-    if host and not regions and not selected_region:
-        name, host, ui_host = (host, format_host(host, subdomain="api"), format_host(host, subdomain="ui"))
-    else:
-        name, host, ui_host = get_region_info(ctx, selected_region)
-
-    token = token or ctx.ensure_object(dict)["config"].get("token_passed")
-
-    if not token:
-        tokens_url = urljoin(ui_host, "tokens")
-        token = click.prompt(
-            f"\nCopy the \"admin your@email\" token from {tokens_url} and paste it here { f'OR press enter to use the token from .tinyb file' if default_password else ''}",
-            hide_input=True,
-            show_default=False,
-            default=default_password,
-        )
-
-    add_telemetry_event("auth_token", token=token)
-
-    config = await try_get_config(host, token)
-    if config is None and not try_all_regions:
-        raise CLIAuthException(FeedbackManager.error_invalid_token_for_host(host=host))
-
-    # No luck? Let's try auth in all other regions
-    if config is None and try_all_regions and not interactive:
-        if not regions:
-            regions = await get_regions(client, config_file)
-
-        # Check other regions, ignoring the previously tested region
-        for region in [r for r in regions if r is not selected_region]:
-            name, host, ui_host = get_region_info(ctx, region)
-            config = await try_get_config(host, token)
-            if config is not None:
-                click.echo(FeedbackManager.success_using_host(name=name, host=ui_host))
-                break
-
-    if config is None:
-        raise CLIAuthException(FeedbackManager.error_invalid_token())
-
-    try:
-        if "id" in config:
-            await write_config(config)
-            ctx.ensure_object(dict)["client"] = _get_tb_client(config["token"], config.get("host", DEFAULT_API_HOST))
-            ctx.ensure_object(dict)["config"] = config
-        else:
-            raise CLIAuthException(FeedbackManager.error_not_personal_auth())
-    except Exception as e:
-        raise CLIAuthException(FeedbackManager.error_exception(error=str(e)))
-
-    click.echo(FeedbackManager.success_auth())
-    click.echo(FeedbackManager.success_remember_api_host(api_host=host))
-
-    if "scope" not in config or not config["scope"]:
-        click.echo(FeedbackManager.warning_token_scope())
-
-    return config
-
-
 def ask_for_user_token(action: str, ui_host: str) -> str:
     return click.prompt(
         f'\nUse the token called "user token" in order to {action}. Copy it from {ui_host}/tokens and paste it here',
@@ -941,8 +697,8 @@ async def ask_for_starterkit_interactively(ctx: Context) -> Optional[str]:
     return starterkit[sk_index - 1]["friendly_name"]
 
 
-async def fork_workspace(ctx: Context, client: TinyB, user_client: TinyB, created_workspace):
-    config, _, _ = await get_config_and_hosts(ctx)
+async def fork_workspace(client: TinyB, user_client: TinyB, created_workspace):
+    config = CLIConfig.get_project_config()
 
     datasources = await client.datasources()
     for datasource in datasources:
@@ -963,7 +719,7 @@ async def create_workspace_non_interactive(
         click.echo(FeedbackManager.success_workspace_created(workspace_name=workspace_name))
 
         if fork:
-            await fork_workspace(ctx, client, user_client, created_workspace)
+            await fork_workspace(client, user_client, created_workspace)
 
     except Exception as e:
         raise CLIWorkspaceException(FeedbackManager.error_exception(error=str(e)))
@@ -1005,7 +761,7 @@ async def create_workspace_branch(
     _ = await try_update_config_with_remote(config)
 
     try:
-        workspace = await get_current_workspace_temp(config)
+        workspace = await get_current_workspace(config)
         if not workspace:
             raise CLIWorkspaceException(FeedbackManager.error_workspace())
 
@@ -1542,17 +1298,6 @@ def _get_setting_value(connection, setting, sensitive_settings):
     return connection.get(setting, "")
 
 
-async def _get_config_or_load_tb_file(config, semver: Optional[str] = None):
-    if "id" not in config:
-        config = await _get_config(config["host"], config["token"], load_tb_file=False, semver=semver)
-    else:
-        config_file = Path(getcwd()) / ".tinyb"
-        with open(config_file) as file:
-            config = json.loads(file.read())
-    config["semver"] = semver
-    return config
-
-
 async def switch_workspace(config: CLIConfig, workspace_name_or_id: str, only_environments: bool = False) -> None:
     try:
         if only_environments:
@@ -1611,7 +1356,7 @@ async def switch_to_workspace_by_user_workspace_data(config: CLIConfig, user_wor
 async def print_current_workspace(config: CLIConfig) -> None:
     _ = await try_update_config_with_remote(config, only_if_needed=True)
 
-    current_main_workspace = await get_current_main_workspace_temp(config)
+    current_main_workspace = await get_current_main_workspace(config)
     assert isinstance(current_main_workspace, dict)
 
     columns = ["name", "id", "role", "plan", "current"]
@@ -1643,7 +1388,7 @@ async def print_current_branch(config: CLIConfig) -> None:
             click.echo(FeedbackManager.info_current_branch())
             if workspace.get("is_branch"):
                 name = workspace["name"]
-                main_workspace = await get_current_main_workspace_temp(config)
+                main_workspace = await get_current_main_workspace(config)
                 assert isinstance(main_workspace, dict)
                 main_name = main_workspace["name"]
             else:
@@ -1714,20 +1459,16 @@ class ConnectionReplacements:
 # ======
 
 
-async def get_host_from_region_temp(
+async def get_host_from_region(
     config: CLIConfig, region_name_or_host_or_id: str, host: Optional[str] = None
 ) -> Tuple[List[Region], str]:
-    """Pending to remove the _temp suffix once we fully integrate the class CLIConfig.
-    Please, don't work with the previous version any more and make any changes here
-    """
-
     regions: List[Region]
     region: Optional[Region]
 
     host = host or config.get_host(use_defaults_if_needed=True)
 
     try:
-        regions = await get_regions_temp(config)
+        regions = await get_regions(config)
         assert isinstance(regions, list)
     except Exception:
         regions = []
@@ -1757,11 +1498,7 @@ async def get_host_from_region_temp(
     return regions, host
 
 
-async def get_regions_temp(config: CLIConfig) -> List[Region]:
-    """Pending to remove the _temp suffix once we fully integrate the class CLIConfig.
-    Please, don't work with the previous version any more and make any changes here
-    """
-
+async def get_regions(config: CLIConfig) -> List[Region]:
     regions: List[Region] = []
 
     try:
@@ -1797,10 +1534,6 @@ async def get_regions_temp(config: CLIConfig) -> List[Region]:
 
 
 def get_region_from_host(region_name_or_host: str, regions: List[Region]) -> Optional[Region]:
-    """Pending to remove the _temp suffix once we fully integrate the class CLIConfig.
-    Please, don't work with the previous version any more and make any changes here
-    """
-
     """Returns the region that matches region_name_or_host by name, API host or ui host"""
     for region in regions:
         if region_name_or_host in (region["name"].lower(), region["host"], region["api_host"]):
@@ -1811,10 +1544,6 @@ def get_region_from_host(region_name_or_host: str, regions: List[Region]) -> Opt
 async def try_update_config_with_remote(
     config: CLIConfig, raise_on_errors: bool = True, only_if_needed: bool = False, auto_persist: bool = True
 ) -> bool:
-    """Pending to remove the _temp suffix once we fully integrate the class CLIConfig.
-    Please, don't work with the previous version any more and make any changes here
-    """
-
     response: Dict[str, Any]
 
     if not config.get_token():
@@ -1870,7 +1599,7 @@ async def try_authenticate(
     host: Optional[str] = config.get_host()
 
     if not regions and interactive:
-        regions = await get_regions_temp(config)
+        regions = await get_regions(config)
 
     selected_region: Optional[Region] = None
     default_password: Optional[str] = None
@@ -1909,7 +1638,7 @@ async def try_authenticate(
     # No luck? Let's try auth in all other regions
     if not authenticated and try_all_regions and not interactive:
         if not regions:
-            regions = await get_regions_temp(config)
+            regions = await get_regions(config)
 
         # Check other regions, ignoring the previously tested region
         for region in [r for r in regions if r is not selected_region]:
@@ -1991,19 +1720,11 @@ async def wait_job_no_ui(
         raise
 
 
-async def get_current_main_workspace_temp(config: CLIConfig) -> Optional[Dict[str, Any]]:
-    """Pending to remove the _temp suffix once we fully integrate the class CLIConfig.
-    Please, don't work with the previous version any more and make any changes here
-    """
+async def get_current_main_workspace(config: CLIConfig) -> Optional[Dict[str, Any]]:
     current_workspace = await config.get_client().user_workspaces_and_branches()
     return _get_current_main_workspace_common(current_workspace, config.get("id", current_workspace["id"]))
 
 
-async def get_current_main_workspace(client: TinyB, config: Dict[str, Any]) -> Optional[Dict[str, Any]]:
-    current_workspace = await client.user_workspaces_and_branches()
-    return _get_current_main_workspace_common(current_workspace, config["id"])
-
-
 def _get_current_main_workspace_common(
     user_workspace_and_branches: Dict[str, Any], current_workspace_id: str
 ) -> Optional[Dict[str, Any]]:

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -14,6 +14,8 @@ import humanfriendly
 from click import Context
 
 from tinybird.client import CanNotBeDeletedException, DoesNotExistException, TinyB
+from tinybird.config import get_display_host
+from tinybird.tb_cli_modules.config import CLIConfig
 
 if TYPE_CHECKING:
     from tinybird.connectors import Connector
@@ -30,7 +32,6 @@ from tinybird.tb_cli_modules.common import (
     check_user_token,
     coro,
     echo_safe_humanfriendly_tables_format_smart_table,
-    get_config_and_hosts,
     get_format_from_filename_or_url,
     load_connector_config,
     push_data,
@@ -602,9 +603,11 @@ async def datasource_connect(ctx, connection, datasource_name, topic, group, aut
 async def datasource_share(ctx: Context, datasource_name: str, workspace_name_or_id: str, user_token: str, yes: bool):
     """Share a datasource"""
 
-    client: TinyB = ctx.ensure_object(dict)["client"]
+    config = CLIConfig.get_project_config()
+    client = config.get_client()
+    host = config.get_host() or CLIConfig.DEFAULTS["host"]
+    ui_host = get_display_host(host)
 
-    config, host, ui_host = await get_config_and_hosts(ctx)
     _datasource: Dict[str, Any] = {}
     try:
         _datasource = await client.get_datasource(datasource_name)
@@ -668,9 +671,11 @@ async def datasource_share(ctx: Context, datasource_name: str, workspace_name_or
 async def datasource_unshare(ctx: Context, datasource_name: str, workspace_name_or_id: str, user_token: str, yes: bool):
     """Unshare a datasource"""
 
-    client: TinyB = ctx.ensure_object(dict)["client"]
+    config = CLIConfig.get_project_config()
+    client = config.get_client()
+    host = config.get_host() or CLIConfig.DEFAULTS["host"]
+    ui_host = get_display_host(host)
 
-    config, host, ui_host = await get_config_and_hosts(ctx)
     _datasource: Dict[str, Any] = {}
     try:
         _datasource = await client.get_datasource(datasource_name)

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/tag.py

@@ -5,11 +5,7 @@ from click import Context
 
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
-from tinybird.tb_cli_modules.common import (
-    coro,
-    echo_safe_humanfriendly_tables_format_smart_table,
-    get_current_main_workspace,
-)
+from tinybird.tb_cli_modules.common import coro, echo_safe_humanfriendly_tables_format_smart_table
 
 
 @cli.group()
@@ -26,11 +22,7 @@ async def tag_ls(ctx: Context, tag_name: Optional[str]) -> None:
     """List all the tags of the current Workspace or the resources associated to a specific tag."""
 
     client = ctx.ensure_object(dict)["client"]
-    config = ctx.ensure_object(dict)["config"]
-    main_workspace = await get_current_main_workspace(client, config)
-    token = main_workspace.get("token") if main_workspace else None
-
-    response = await client.get_all_tags(token=token)
+    response = await client.get_all_tags()
 
     if tag_name:
         the_tag = [tag for tag in response["tags"] if tag["name"] == tag_name]
@@ -68,11 +60,7 @@ async def tag_create(ctx: Context, tag_name: str) -> None:
     """Create a tag in the current Workspace."""
 
     client = ctx.ensure_object(dict)["client"]
-    config = ctx.ensure_object(dict)["config"]
-    main_workspace = await get_current_main_workspace(client, config)
-    token = main_workspace.get("token") if main_workspace else None
-
-    await client.create_tag(name=tag_name, token=token)
+    await client.create_tag(name=tag_name)
 
     click.echo(FeedbackManager.success_tag_created(tag_name=tag_name))
 
@@ -86,14 +74,10 @@ async def tag_rm(ctx: Context, tag_name: str, yes: bool) -> None:
     """Remove a tag from the current Workspace."""
 
     client = ctx.ensure_object(dict)["client"]
-    config = ctx.ensure_object(dict)["config"]
-    main_workspace = await get_current_main_workspace(client, config)
-    token = main_workspace.get("token") if main_workspace else None
-
     remove_tag = True
 
     if not yes:
-        all_tags = await client.get_all_tags(token=token)
+        all_tags = await client.get_all_tags()
         the_tag = [tag for tag in all_tags["tags"] if tag["name"] == tag_name]
         if len(the_tag) > 0:
             unique_resources = []
@@ -112,5 +96,5 @@ async def tag_rm(ctx: Context, tag_name: str, yes: bool) -> None:
             click.echo(FeedbackManager.error_tag_not_found(tag_name=tag_name))
 
     if remove_tag:
-        await client.delete_tag(tag_name, token=token)
+        await client.delete_tag(tag_name)
         click.echo(FeedbackManager.success_tag_removed(tag_name=tag_name))

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/test.py

@@ -8,9 +8,11 @@ from typing import Any, Dict, Iterable, List, Tuple
 
 import click
 
+from tinybird.client import AuthNoTokenException
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
-from tinybird.tb_cli_modules.common import coro, create_tb_client, gather_with_concurrency, get_config_and_hosts
+from tinybird.tb_cli_modules.common import coro, create_tb_client, gather_with_concurrency
+from tinybird.tb_cli_modules.config import CLIConfig
 from tinybird.tb_cli_modules.exceptions import CLIException
 from tinybird.tb_cli_modules.tinyunit.tinyunit import (
     TestSummaryResults,
@@ -42,7 +44,9 @@ async def test_run(ctx: click.Context, file: Tuple[str, ...], verbose: bool, onl
 
     try:
         tb_client = create_tb_client(ctx)
-        config, _, _ = await get_config_and_hosts(ctx, check_token_exists=True)
+        config = CLIConfig.get_project_config()
+        if config.get("token") is None:
+            raise AuthNoTokenException
         workspaces: List[Dict[str, Any]] = (await tb_client.user_workspaces_and_branches()).get("workspaces", [])
         current_ws: Dict[str, Any] = next(
             (workspace for workspace in workspaces if config and workspace.get("id", ".") == config.get("id", "..")), {}

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/workspace.py

@@ -9,11 +9,11 @@ import click
 from click import Context
 
 from tinybird.client import CanNotBeDeletedException, DoesNotExistException, TinyB
+from tinybird.config import get_display_host
 from tinybird.datafile import PipeTypes
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
-    _get_config,
     _get_workspace_plan_name,
     ask_for_user_token,
     check_user_token,
@@ -21,12 +21,10 @@ from tinybird.tb_cli_modules.common import (
     create_workspace_interactive,
     create_workspace_non_interactive,
     echo_safe_humanfriendly_tables_format_smart_table,
-    get_config_and_hosts,
     get_current_main_workspace,
     is_valid_starterkit,
     print_current_workspace,
     switch_workspace,
-    try_update_config_with_remote,
 )
 from tinybird.tb_cli_modules.config import CLIConfig
 from tinybird.tb_cli_modules.exceptions import CLIWorkspaceException
@@ -44,15 +42,12 @@ def workspace(ctx: Context) -> None:
 async def workspace_ls(ctx: Context) -> None:
     """List all the workspaces you have access to in the account you're currently authenticated into."""
 
-    client = ctx.ensure_object(dict)["client"]
-    config = ctx.ensure_object(dict)["config"]
-
-    if "id" not in config:
-        config = await _get_config(config["host"], config["token"], load_tb_file=False)
+    config = CLIConfig.get_project_config()
+    client = config.get_client()
 
     response = await client.user_workspaces()
 
-    current_main_workspace = await get_current_main_workspace(client, config)
+    current_main_workspace = await get_current_main_workspace(config)
     if not current_main_workspace:
         raise CLIWorkspaceException(FeedbackManager.error_unable_to_identify_main_workspace())
 
@@ -80,7 +75,6 @@ async def workspace_ls(ctx: Context) -> None:
 async def workspace_use(workspace_name_or_id: str) -> None:
     """Switch to another workspace. Use 'tb workspace ls' to list the workspaces you have access to."""
     config = CLIConfig.get_project_config()
-    _ = await try_update_config_with_remote(config)
 
     await switch_workspace(config, workspace_name_or_id)
 
@@ -90,7 +84,6 @@ async def workspace_use(workspace_name_or_id: str) -> None:
 async def workspace_current():
     """Show the workspace you're currently authenticated to"""
     config = CLIConfig.get_project_config()
-    _ = await try_update_config_with_remote(config)
 
     await print_current_workspace(config)
 
@@ -107,11 +100,8 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
     """Drop all the resources inside a project. This command is dangerous because it removes everything, use with care."""
 
     # Get current workspace to add the name to the alert message
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    config = ctx.ensure_object(dict)["config"]
-
-    if "id" not in config:
-        config = await _get_config(config["host"], config["token"], load_tb_file=False)
+    config = CLIConfig.get_project_config()
+    client: TinyB = config.get_client()
 
     response = await client.user_workspaces_and_branches()
 
@@ -213,7 +203,9 @@ async def create_workspace(
             raise CLIWorkspaceException(FeedbackManager.error_starterkit_name(starterkit_name=starter_kit))
 
     if not user_token:
-        _, _, ui_host = await get_config_and_hosts(ctx)
+        config = CLIConfig.get_project_config()
+        host = config.get_host() or CLIConfig.DEFAULTS["host"]
+        ui_host = get_display_host(host)
         user_token = ask_for_user_token("create a new workspace", ui_host)
         if not user_token:
             return
@@ -244,8 +236,10 @@ async def delete_workspace(
 ) -> None:
     """Delete a workspace where you are an admin."""
 
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    _, _, ui_host = await get_config_and_hosts(ctx)
+    config = CLIConfig.get_project_config()
+    client = config.get_client()
+    host = config.get_host() or CLIConfig.DEFAULTS["host"]
+    ui_host = get_display_host(host)
 
     if not user_token:
         user_token = ask_for_user_token("delete a workspace", ui_host)

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird/tb_cli_modules/workspace_members.py

@@ -11,15 +11,16 @@ import click
 from click import Context
 
 from tinybird.client import TinyB
+from tinybird.config import get_display_host
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.common import (
     ask_for_user_token,
     check_user_token,
     coro,
     echo_safe_humanfriendly_tables_format_smart_table,
-    get_config_and_hosts,
     get_current_workspace,
 )
+from tinybird.tb_cli_modules.config import CLIConfig
 from tinybird.tb_cli_modules.exceptions import CLIWorkspaceMembersException
 from tinybird.tb_cli_modules.workspace import workspace
 
@@ -29,17 +30,20 @@ ROLES = ["viewer", "guest", "admin"]
 @dataclass
 class WorkspaceMemberCommandContext:
     client: TinyB
-    config: Dict[str, Any]
+    config: CLIConfig
     host: str
     ui_host: str
     workspace: Dict[str, Any]
 
 
 async def get_command_context(ctx: click.Context) -> WorkspaceMemberCommandContext:
-    client: TinyB = ctx.ensure_object(dict)["client"]
-    config, host, ui_host = await get_config_and_hosts(ctx)
+    config = CLIConfig.get_project_config()
+    client = config.get_client()
+    host = config.get_host() or CLIConfig.DEFAULTS["host"]
+    ui_host = get_display_host(host)
+
+    workspace = await get_current_workspace(config)
 
-    workspace = await get_current_workspace(client, config)
     if not workspace:
         raise CLIWorkspaceMembersException(FeedbackManager.error_unknown_resource(resource=config["d"]))
 

{tinybird-cli-5.8.1.dev1 → tinybird-cli-5.8.2.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.8.1.dev1
+Version: 5.8.2.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -17,7 +17,8 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 
 Changelog
 ----------
-5.8.1.dev1
+
+5.8.1
 ***********
 
 - `Improved` error message of `tb push` when pushing .datasource files