tinybird 0.0.1.dev53__tar.gz → 0.0.1.dev55__tar.gz

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev53
+Version: 0.0.1.dev55
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/tinybird/tb/__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__ = '0.0.1.dev53'
-__revision__ = '883fa46'
+__version__ = '0.0.1.dev55'
+__revision__ = 'cc01364'

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/tinybird/tb/modules/cli.py

@@ -123,7 +123,7 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    client = await create_ctx_client(ctx, config, cloud, build, project)
+    client = await create_ctx_client(ctx, config, cloud, build)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -390,7 +390,7 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool, project: Project):
+async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool):
     commands_without_ctx_client = ["auth", "check", "login", "local", "upgrade"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
@@ -404,9 +404,11 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
         and command not in commands_always_build
         and command not in commands_always_local
     ):
-        click.echo(FeedbackManager.gray(message=f"Running against {config.get('name') or 'cloud'}"))
+        click.echo(
+            FeedbackManager.gray(message=f"Running against Tinybird Cloud: Workspace {config.get('name', 'default')}")
+        )
         return _get_tb_client(config.get("token", None), config["host"])
     build = command in commands_always_build or build
     if not build and command not in commands_always_local and command not in commands_always_build:
-        click.echo(FeedbackManager.gray(message="Running against Tinybird local\n"))
+        click.echo(FeedbackManager.gray(message="Running against Tinybird Local\n"))
     return await get_tinybird_local_client(config, build=build)

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/tinybird/tb/modules/copy.py

@@ -75,7 +75,6 @@ async def copy_ls(ctx: Context, match: str, format_: str):
 @click.option(
     "--mode", type=click.Choice(["append", "replace"], case_sensitive=True), default=None, help="Copy strategy"
 )
-@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @click.option(
     "--param",
     nargs=1,
@@ -86,37 +85,33 @@ async def copy_ls(ctx: Context, match: str, format_: str):
 )
 @click.pass_context
 @coro
-async def copy_run(
-    ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, yes: bool, param: Optional[Tuple[str]]
-):
-    """Run an on-demand copy job"""
+async def copy_run(ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, param: Optional[Tuple[str]]):
+    """Run an on-demand copy pipe"""
 
     params = dict(key_value.split("=") for key_value in param) if param else {}
+    click.echo(FeedbackManager.highlight(message=f"\n» Running on-demand copy '{pipe_name_or_id}'"))
+    client: TinyB = ctx.ensure_object(dict)["client"]
+
+    try:
+        response = await client.pipe_run_copy(pipe_name_or_id, params, mode)
+
+        job_id = response["job"]["job_id"]
+        job_url = response["job"]["job_url"]
+        target_datasource_id = response["tags"]["copy_target_datasource"]
+        target_datasource = await client.get_datasource(target_datasource_id)
+        target_datasource_name = target_datasource["name"]
+        click.echo(FeedbackManager.gray(message="Job URL: ") + FeedbackManager.info(message=f"{job_url}"))
+        click.echo(FeedbackManager.success(message=f"✓ Copy to '{target_datasource_name}' job created"))
 
-    if yes or click.confirm(FeedbackManager.warning_confirm_copy_pipe(pipe=pipe_name_or_id)):
-        click.echo(FeedbackManager.info_copy_job_running(pipe=pipe_name_or_id))
-        client: TinyB = ctx.ensure_object(dict)["client"]
-
-        try:
-            response = await client.pipe_run_copy(pipe_name_or_id, params, mode)
-
-            job_id = response["job"]["job_id"]
-            job_url = response["job"]["job_url"]
-            target_datasource_id = response["tags"]["copy_target_datasource"]
-            target_datasource = await client.get_datasource(target_datasource_id)
-            target_datasource_name = target_datasource["name"]
-            click.echo(
-                FeedbackManager.success_copy_job_created(target_datasource=target_datasource_name, job_url=job_url)
-            )
-
-            if wait:
-                await wait_job(client, job_id, job_url, "** Copying data")
-                click.echo(FeedbackManager.success_data_copied_to_ds(target_datasource=target_datasource_name))
-
-        except AuthNoTokenException:
-            raise
-        except Exception as e:
-            raise CLIPipeException(FeedbackManager.error_creating_copy_job(error=e))
+        if wait:
+            click.echo("\n")
+            await wait_job(client, job_id, job_url, FeedbackManager.highlight(message="» Copying data"))
+            click.echo(FeedbackManager.success(message=f"✓ Data copied to '{target_datasource_name}'"))
+
+    except AuthNoTokenException:
+        raise
+    except Exception as e:
+        raise CLIPipeException(FeedbackManager.error_creating_copy_job(error=e))
 
 
 @copy.command(name="resume", short_help="Resume a paused copy pipe")

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/tinybird/tb/modules/deployment.py

@@ -15,6 +15,8 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 
 
+# TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for promoting a deployment
+# potato
 def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
     r = requests.get(TINYBIRD_API_URL, headers=headers)
@@ -72,6 +74,8 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     click.echo(FeedbackManager.success(message="Deployment promoted successfully"))
 
 
+# TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for rolling back a
+# deployment
 def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
     r = requests.get(TINYBIRD_API_URL, headers=headers)

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/tinybird/tb/modules/login.py

@@ -91,6 +91,7 @@ def start_server(auth_callback):
 @cli.command()
 @click.option(
     "--host",
+    default="https://api.europe-west2.gcp.tinybird.co",
     help="Set custom host if it's different than https://api.tinybird.co. See https://www.tinybird.co/docs/api-reference/overview#regions-and-endpoints for the available list of regions.",
 )
 @click.option(
@@ -107,10 +108,9 @@ async def login(host: str, auth_host: str, workspace: str):
     """Authenticate using the browser."""
     auth_event = threading.Event()
     auth_code: list[str] = []  # Using a list to store the code, as it's mutable
-    host = host or "https://api.wadus2.gcp.tinybird.co"
 
     def auth_callback(code):
-        auth_code[0] = code
+        auth_code.append(code)
         auth_event.set()
 
     click.echo(FeedbackManager.highlight(message="» Opening browser for authentication..."))

{tinybird-0.0.1.dev53 → tinybird-0.0.1.dev55}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird
-Version: 0.0.1.dev53
+Version: 0.0.1.dev55
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird