tinybird 0.0.1.dev159__tar.gz → 0.0.1.dev160__tar.gz

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev159
+Version: 0.0.1.dev160
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev159'
-__revision__ = '33da9f4'
+__version__ = '0.0.1.dev160'
+__revision__ = '8c1a42a'

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/cli.py

@@ -4,7 +4,6 @@ import sys
 if sys.platform == "win32":
     asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
-import tinybird.tb.modules.auth
 import tinybird.tb.modules.build
 import tinybird.tb.modules.cli
 import tinybird.tb.modules.common
@@ -15,6 +14,7 @@ import tinybird.tb.modules.datasource
 import tinybird.tb.modules.deployment
 import tinybird.tb.modules.deprecations
 import tinybird.tb.modules.endpoint
+import tinybird.tb.modules.info
 import tinybird.tb.modules.infra
 import tinybird.tb.modules.job
 import tinybird.tb.modules.local

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/cicd.py

@@ -111,12 +111,13 @@ tinybird_ci_workflow:
   before_script:
     - apt update && apt install -y curl
     - curl https://tinybird.co | sh
+    - for i in {1..10}; do curl -s -o /dev/null "http://$TB_LOCAL_HOST" && break; sleep 5; done
   script:
     - export PATH="$HOME/.local/bin:$PATH"
     - cd $CI_PROJECT_DIR/{{ data_project_dir }}
     - tb build
     - tb test run
-    - tb --cloud --host ${{! TINYBIRD_HOST }} --token ${{! TINYBIRD_TOKEN }} deploy --check
+    - tb --cloud --host "$TINYBIRD_HOST" --token "$TINYBIRD_TOKEN" deploy --check
   services:
     - name: tinybirdco/tinybird-local:latest
       alias: tinybird-local
@@ -136,10 +137,13 @@ tinybird_cd_workflow:
         - .gitlab/tinybird/*{% if data_project_dir != '.' %}
         - {{ data_project_dir }}/*
         - {{ data_project_dir }}/**/*{% end %}
+  before_script:
+    - apt update && apt install -y curl
+    - curl https://tinybird.co | sh
   script:
     - export PATH="$HOME/.local/bin:$PATH"
     - cd $CI_PROJECT_DIR/{{ data_project_dir }}
-    - tb --cloud --host ${{! TINYBIRD_HOST }} --token ${{! TINYBIRD_TOKEN }} deploy
+    - tb --cloud --host "$TINYBIRD_HOST" --token "$TINYBIRD_TOKEN" deploy
 """
 
 

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/cli.py

@@ -317,7 +317,7 @@ def __unpatch_click_output():
 
 
 async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool):
-    commands_without_ctx_client = ["auth", "check", "local", "login", "logout", "update", "upgrade", "create"]
+    commands_without_ctx_client = ["auth", "check", "local", "login", "logout", "update", "upgrade", "create", "info"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
         return None

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/common.py

@@ -115,6 +115,10 @@ async def gather_with_concurrency(n, *tasks):
     return await asyncio.gather(*(sem_task(task) for task in tasks))
 
 
+def format_robust_table(data: Iterable[Any], column_names: List[str]):
+    return humanfriendly.tables.format_robust_table(data, column_names=column_names)
+
+
 def echo_safe_humanfriendly_tables_format_smart_table(data: Iterable[Any], column_names: List[str]) -> None:
     """
     There is a bug in the humanfriendly library: it breaks to render the small table for small terminals
@@ -656,9 +660,7 @@ async def create_workspace_non_interactive(
         user_client: TinyB = deepcopy(client)
         user_client.token = user_token
 
-        created_workspace = await user_client.create_workspace(
-            workspace_name, organization_id, version="v1"
-        )
+        created_workspace = await user_client.create_workspace(workspace_name, organization_id, version="v1")
         if organization_id and organization_name:
             click.echo(
                 FeedbackManager.success_workspace_created_with_organization(

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/deprecations.py

@@ -4,6 +4,30 @@ from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
+@cli.command(
+    name="auth",
+    context_settings=dict(
+        ignore_unknown_options=True,
+    ),
+    hidden=True,
+)
+@click.argument("args", nargs=-1, type=click.UNPROCESSED)
+def auth(args) -> None:
+    """
+    `tb auth` is deprecated. Use `tb login` instead.
+    """
+    is_info_cmd = "info" in args
+    message = "This command is deprecated. Use `tb login` instead."
+    if is_info_cmd:
+        message = "This command is deprecated. Use `tb info` instead."
+    else:
+        message = "This command is deprecated. Use `tb login` instead."
+    click.echo(FeedbackManager.warning(message=message))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
+
+
 @cli.command(
     name="branch",
     context_settings=dict(

tinybird-0.0.1.dev160/tinybird/tb/modules/info.py

@@ -0,0 +1,112 @@
+import os
+from typing import Any, Dict, Iterable, List, Optional
+
+import click
+
+from tinybird.tb.client import TinyB
+from tinybird.tb.config import get_display_cloud_host
+from tinybird.tb.modules.cli import CLIConfig, cli
+from tinybird.tb.modules.common import coro, format_robust_table
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS, get_tinybird_local_config
+from tinybird.tb.modules.project import Project
+
+
+@cli.command(name="info")
+@click.pass_context
+@coro
+async def info(ctx: click.Context) -> None:
+    """Get information about the project that is currently being used"""
+    ctx_config = ctx.ensure_object(dict)["config"]
+    project: Project = ctx.ensure_object(dict)["project"]
+    click.echo(FeedbackManager.highlight(message="» Tinybird Cloud:"))
+    await get_cloud_info(ctx_config)
+    click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
+    await get_local_info(ctx_config)
+    click.echo(FeedbackManager.highlight(message="\n» Project:"))
+    await get_project_info(project.folder)
+
+
+async def get_cloud_info(ctx_config: Dict[str, Any]) -> None:
+    config = CLIConfig.get_project_config()
+
+    try:
+        client = config.get_client()
+        token = config.get_token() or "No workspace token found"
+        api_host = config.get("host") or "No API host found"
+        ui_host = get_display_cloud_host(api_host)
+        user_email = config.get("user_email") or "No user email found"
+        user_token = config.get_user_token() or "No user token found"
+        await get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host)
+    except Exception:
+        click.echo(
+            FeedbackManager.warning(
+                message="\n⚠  Could not retrieve Tinybird Cloud info. Please run `tb login` first or check that you are located in the correct directory."
+            )
+        )
+
+
+async def get_local_info(config: Dict[str, Any]) -> None:
+    try:
+        local_config = await get_tinybird_local_config(config, test=False, silent=False)
+        local_client = local_config.get_client(host=TB_LOCAL_ADDRESS, staging=False)
+        user_email = local_config.get_user_email() or "No user email found"
+        token = local_config.get_token() or "No token found"
+        user_token = local_config.get_user_token() or "No user token found"
+        api_host = TB_LOCAL_ADDRESS
+        ui_host = get_display_cloud_host(api_host)
+        await get_env_info(local_client, config, user_email, token, user_token, api_host, ui_host)
+    except Exception:
+        click.echo(
+            FeedbackManager.warning(
+                message="\n⚠  Could not retrieve Tinybird Local info. Please run `tb local start` first."
+            )
+        )
+        return
+
+
+async def get_env_info(
+    client: TinyB, config: Dict[str, Any], user_email: str, token: str, user_token: str, api_host: str, ui_host: str
+) -> None:
+    user_workspaces = await client.user_workspaces(version="v1")
+    current_workspace = await client.workspace_info(version="v1")
+
+    def _get_current_workspace(user_workspaces: Dict[str, Any], current_workspace_id: str) -> Optional[Dict[str, Any]]:
+        def get_workspace_by_name(workspaces: List[Dict[str, Any]], name: str) -> Optional[Dict[str, Any]]:
+            return next((ws for ws in workspaces if ws["name"] == name), None)
+
+        workspaces: Optional[List[Dict[str, Any]]] = user_workspaces.get("workspaces")
+        if not workspaces:
+            return None
+
+        current: Optional[Dict[str, Any]] = get_workspace_by_name(workspaces, current_workspace_id)
+        return current
+
+    current_main_workspace = _get_current_workspace(user_workspaces, config.get("name") or current_workspace["name"])
+
+    assert isinstance(current_main_workspace, dict)
+
+    columns = ["user", "workspace_name", "workspace_id", "token", "user_token", "api", "ui"]
+    if current_main_workspace["name"]:
+        ui_host += f"/{current_main_workspace['name']}"
+    table = [
+        (user_email, current_main_workspace["name"], current_main_workspace["id"], token, user_token, api_host, ui_host)
+    ]
+
+    click.echo(format_robust_table(table, column_names=columns))
+
+
+async def get_project_info(project_path: Optional[str] = None) -> None:
+    config = CLIConfig.get_project_config()
+    tinyb_path = config.get_tinyb_file()
+    current_path = os.getcwd()
+    project_path = current_path
+    if tinyb_path:
+        tinyb_dir = os.path.dirname(tinyb_path)
+        project_path = os.path.join(tinyb_dir, project_path)
+    else:
+        tinyb_path = "Not found"
+
+    columns = ["current", ".tinyb", "project"]
+    table: Iterable[Any] = [(current_path, tinyb_path, project_path)]
+    click.echo(format_robust_table(table, column_names=columns))

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/local_common.py

@@ -20,14 +20,16 @@ TB_LOCAL_HOST = re.sub(r"^https?://", "", os.getenv("TB_LOCAL_HOST", "localhost"
 TB_LOCAL_ADDRESS = f"http://{TB_LOCAL_HOST}:{TB_LOCAL_PORT}"
 
 
-async def get_tinybird_local_client(config_obj: Dict[str, Any], test: bool = False, staging: bool = False) -> TinyB:
+async def get_tinybird_local_client(
+    config_obj: Dict[str, Any], test: bool = False, staging: bool = False, silent: bool = False
+) -> TinyB:
     """Get a Tinybird client connected to the local environment."""
 
-    config = await get_tinybird_local_config(config_obj, test=test)
+    config = await get_tinybird_local_config(config_obj, test=test, silent=silent)
     return config.get_client(host=TB_LOCAL_ADDRESS, staging=staging)
 
 
-async def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False) -> CLIConfig:
+async def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = False, silent: bool = False) -> CLIConfig:
     """Craft a client config with a workspace name based on the path of the project files
 
     It uses the tokens from tinybird local
@@ -90,9 +92,7 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = Fal
             ws = None
 
         if not ws:
-            await user_client.create_workspace(
-                ws_name, assign_to_organization_id=user_org_id, version="v1"
-            )
+            await user_client.create_workspace(ws_name, assign_to_organization_id=user_org_id, version="v1")
             user_workspaces = requests.get(f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?token={admin_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/mock.py

@@ -62,7 +62,7 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, form
                 datasource_path = Path(datasource_from_glob[0])
 
         if not datasource_path.exists():
-            raise Exception(f"Datasource '{datasource_path.stem}' not fosund")
+            raise Exception(f"Datasource '{datasource_path.stem}' not found")
 
         datasource_content = datasource_path.read_text()
         config = CLIConfig.get_project_config()

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird/tb/modules/workspace.py

@@ -173,9 +173,7 @@ async def create_workspace(
             ctx, workspace_name, user_token, fork, organization_id, organization_name
         )
     else:
-        await create_workspace_interactive(
-            ctx, workspace_name, user_token, fork, organization_id, organization_name
-        )
+        await create_workspace_interactive(ctx, workspace_name, user_token, fork, organization_id, organization_name)
 
 
 @workspace.command(name="delete", short_help="Delete a workspace for your Tinybird user")

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev159
+Version: 0.0.1.dev160
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev159 → tinybird-0.0.1.dev160}/tinybird.egg-info/SOURCES.txt

@@ -29,7 +29,6 @@ tinybird/tb/check_pypi.py
 tinybird/tb/cli.py
 tinybird/tb/client.py
 tinybird/tb/config.py
-tinybird/tb/modules/auth.py
 tinybird/tb/modules/build.py
 tinybird/tb/modules/cicd.py
 tinybird/tb/modules/cli.py
@@ -45,6 +44,7 @@ tinybird/tb/modules/dev_server.py
 tinybird/tb/modules/endpoint.py
 tinybird/tb/modules/exceptions.py
 tinybird/tb/modules/feedback_manager.py
+tinybird/tb/modules/info.py
 tinybird/tb/modules/infra.py
 tinybird/tb/modules/job.py
 tinybird/tb/modules/llm.py

tinybird-0.0.1.dev159/tinybird/tb/modules/auth.py

@@ -1,252 +0,0 @@
-# This is a command file for our CLI. Please keep it clean.
-#
-# - If it makes sense and only when strictly necessary, you can create utility functions in this file.
-# - But please, **do not** interleave utility functions and command definitions.
-
-import os
-from typing import Any, Dict, List, Optional
-
-import click
-import humanfriendly.tables
-
-from tinybird.tb.config import get_display_cloud_host
-from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import (
-    configure_connector,
-    coro,
-    echo_safe_humanfriendly_tables_format_smart_table,
-    get_host_from_region,
-    get_regions,
-    try_authenticate,
-    try_update_config_with_remote,
-)
-from tinybird.tb.modules.config import CLIConfig, ConfigValueOrigin
-from tinybird.tb.modules.exceptions import CLIAuthException
-from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.regions import Region
-
-
-@cli.group(invoke_without_command=True)
-@click.option("--token", help="Use auth token, defaults to TB_TOKEN envvar, then to the .tinyb file")
-@click.option(
-    "--host",
-    help="Set custom host if it's different than https://api.tinybird.co. Check https://www.tinybird.co/docs/api-reference#regions-and-endpoints for the available list of regions",
-)
-@click.option(
-    "--region", envvar="TB_REGION", help="Set region. Run 'tb auth ls' to show available regions. Overrides host."
-)
-@click.option(
-    "--connector",
-    type=click.Choice(["bigquery", "snowflake"], case_sensitive=True),
-    help="Set credentials for one of the supported connectors",
-)
-@click.option(
-    "-i",
-    "--interactive",
-    is_flag=True,
-    default=False,
-    help="Show available regions and select where to authenticate to",
-)
-@click.pass_context
-@coro
-async def auth(ctx: click.Context, token: str, host: str, region: str, connector: str, interactive: bool) -> None:
-    """Configure auth."""
-
-    config: CLIConfig = CLIConfig.get_project_config()
-    if token:
-        config.set_token(token)
-    if host:
-        config.set_host(host)
-
-    if connector:
-        await configure_connector(connector)
-        return
-
-    # Only run when doing a bare 'tb auth'
-    if ctx.invoked_subcommand:
-        return
-
-    assert isinstance(ctx.parent, click.Context)
-
-    env_token = os.environ.get("TB_TOKEN", None)
-
-    # If no token passed, let's clear the current one to
-    # do a clean auth
-    if not token and not ctx.parent.params.get("token") and not env_token:
-        config.set_token(None)
-    else:
-        if env_token and not token:
-            click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
-
-    regions: Optional[List[Region]] = None
-    try_all_regions = True
-
-    if host:
-        try_all_regions = False
-
-    if region:
-        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)
-            try_all_regions = False
-
-    if not await try_authenticate(config, regions=regions, interactive=interactive, try_all_regions=try_all_regions):
-        raise CLIAuthException(FeedbackManager.error_invalid_token_for_host(host=config.get_host()))
-
-    config.persist_to_file()
-
-
-@auth.command(name="login", hidden=True)
-@click.option(
-    "--host",
-    help="Set custom host if it's different than https://api.tinybird.co. Use `tb auth ls` or check https://docs.tinybird.co/cli.html for the available list of regions.",
-)
-@click.argument("token", required=False)
-@coro
-async def auth_login(host: Optional[str], token: Optional[str]) -> None:
-    """Authenticate with a Tinybird host.
-
-    The authentication mode is token based. After completion, the authentication token
-    will be stored internally.
-
-    You need your User Token to log into Tinybird. Please, check the docs at
-    https://www.tinybird.co/docs/concepts/auth-tokens.html for more info.
-
-    Alternatively, tb will use the authentication token found in the environment
-    variable TB_USER_TOKEN. This method is most suitable for "headless" use of tb
-    such as in automations or in a CI environment."""
-    config = CLIConfig.get_project_config()
-
-    if host:
-        config.set_host(host)
-
-    if not token:
-        click.echo(FeedbackManager.info_pre_prompt_auth_login_user_token(host=config.get_host()))
-        token = click.prompt(FeedbackManager.prompt_auth_login_user_token(), type=str, hide_input=True)
-        if not token:
-            raise CLIAuthException(FeedbackManager.error_auth_login_token_expected())
-    config.set_user_token(token)
-
-    auth_info: Dict[str, Any] = await config.get_user_client().check_auth_login()
-    if not auth_info.get("is_valid", False):
-        raise CLIAuthException(FeedbackManager.error_auth_login_not_valid(host=config.get_host()))
-
-    if not auth_info.get("is_user", False):
-        raise CLIAuthException(FeedbackManager.error_auth_login_not_user(host=config.get_host()))
-
-    config.persist_to_file()
-
-    # No more output needed as per "The art of UNIX programming"
-    # http://www.catb.org/~esr/writings/taoup/html/ch11s09.html
-    # > be chatty only about things that deviate from what's normally expected.
-
-
-@auth.command(name="logout", hidden=True)
-@coro
-async def auth_logout() -> None:
-    """Remove authentication from Tinybird."""
-    conf = CLIConfig.get_project_config()
-    conf.set_user_token(None)
-    conf.persist_to_file()
-
-
-@auth.command(name="info")
-@coro
-async def auth_info() -> None:
-    """Get information about the authentication that is currently being used"""
-
-    config = CLIConfig.get_project_config()
-    _ = await try_update_config_with_remote(config, raise_on_errors=False)
-
-    if "id" in config:
-        table = []
-        user_email = config.get("user_email", "No user")
-
-        ORIGINS: Dict[ConfigValueOrigin, str] = {
-            ConfigValueOrigin.CONFIG: ".tinyb",
-            ConfigValueOrigin.DEFAULT: ".tinyb",
-            ConfigValueOrigin.ENVIRONMENT: "env",
-        }
-
-        token_origin = ORIGINS.get(config.get_value_origin("token"), "")
-        token = f"{config.get_token()} ({token_origin})"
-
-        host = config.get("host") or ""
-        ui_host = get_display_cloud_host(host)
-
-        if config.get_user_token():
-            user_token_origin = ORIGINS.get(config.get_value_origin("user_token"), "")
-            user_token = f"{config.get_user_token()} ({user_token_origin})"
-            columns = ["user", "user_token", "token", "host", "ui", "workspace_name", "workspace_id"]
-            table.append([user_email, user_token, token, host, ui_host, config["name"], config["id"]])
-        else:
-            columns = ["user", "token", "host", "ui", "workspace_name", "workspace_id"]
-            table.append([user_email, token, host, ui_host, config["name"], config["id"]])
-
-        click.echo(humanfriendly.tables.format_robust_table(table, column_names=columns))
-
-
-@auth.command(name="ls")
-@coro
-async def auth_ls() -> None:
-    """List available regions to authenticate."""
-
-    click.echo(FeedbackManager.info_available_regions())
-
-    config = CLIConfig.get_project_config()
-    _ = await try_update_config_with_remote(config, raise_on_errors=False)
-
-    table: List[List[Any]] = []
-    regions: List[Region] = await get_regions(config)
-    if regions:
-
-        def is_current(region: Region) -> bool:
-            return region["host"] == config.get("host") or region["api_host"] == config.get("host")
-
-        for index, region in enumerate(regions):
-            table.append(
-                [
-                    index + 1,
-                    region["name"].lower(),
-                    region.get("provider") or "",
-                    region["host"],
-                    region["api_host"],
-                    is_current(region),
-                ]
-            )
-    else:
-        table.append([1, "default", "", config["host"], True])
-
-    columns: List[str] = ["idx", "region", "provider", "ui", "host", "current"]
-    echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
-
-
-@auth.command(name="use")
-@click.argument("region_name_or_host_or_id")
-@coro
-async def auth_use(region_name_or_host_or_id: str) -> None:
-    """Switch to a different region.
-    You can pass the region name, the region host url, or the region index
-    after listing available regions with 'tb auth ls'
-
-    \b
-    Example usage:
-    \b
-    $ tb auth use us-east
-    $ tb auth use 1
-    $ tb auth use https://ui.us-east.tinybird.co
-    """
-
-    config = CLIConfig.get_project_config()
-    _ = await try_update_config_with_remote(config, raise_on_errors=False)
-
-    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):
-        msg = FeedbackManager.error_wrong_config_file(config_file=config._path)
-        raise CLIAuthException(msg)
-
-    config.persist_to_file()
-    click.echo(FeedbackManager.success_now_using_config(name=config["name"], id=config["id"]))