tinybird 0.0.1.dev54__py3-none-any.whl → 0.0.1.dev56__py3-none-any.whl

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.dev54'
-__revision__ = 'a16ac30'
+__version__ = '0.0.1.dev56'
+__revision__ = 'e22d9a3'

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/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/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/tb/modules/login.py

@@ -21,11 +21,12 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
         self.send_response(200)
         self.send_header("Content-type", "text/html")
         self.end_headers()
-        self.wfile.write(b"""
+        self.wfile.write(
+            """
         <html>
         <head>
             <style>
-                body {
+                body {{
                     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
                     background: #f5f5f5;
                     display: flex;
@@ -33,7 +34,7 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
                     justify-content: center;
                     height: 100vh;
                     margin: 0;
-                }
+                }}
             </style>
         </head>
         <body>
@@ -41,14 +42,16 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
                 const searchParams = new URLSearchParams(window.location.search);
                 const code = searchParams.get('code');
                 const workspace = searchParams.get('workspace');
-                fetch('/?code=' + code, {method: 'POST'})
-                    .then(() => {
-                        window.location.href = "https://cloud.tinybird.co/cli-login?workspace=" + workspace;
-                    });
+                const host = "{auth_host}";
+                fetch('/?code=' + code, {{method: 'POST'}})
+                    .then(() => {{
+                        window.location.href = host + "/cli-login?workspace=" + workspace;
+                    }});
             </script>
         </body>
         </html>
-        """)
+        """.format(auth_host=self.server.auth_host).encode()
+        )
 
     def do_POST(self):
         parsed_path = urllib.parse.urlparse(self.path)
@@ -75,13 +78,14 @@ AUTH_SERVER_PORT = 49160
 class AuthServer(socketserver.TCPServer):
     allow_reuse_address = True
 
-    def __init__(self, server_address, RequestHandlerClass, auth_callback):
+    def __init__(self, server_address, RequestHandlerClass, auth_callback, auth_host):
         self.auth_callback = auth_callback
+        self.auth_host = auth_host
         super().__init__(server_address, RequestHandlerClass)
 
 
-def start_server(auth_callback):
-    with AuthServer(("", AUTH_SERVER_PORT), AuthHandler, auth_callback) as httpd:
+def start_server(auth_callback, auth_host):
+    with AuthServer(("", AUTH_SERVER_PORT), AuthHandler, auth_callback, auth_host) as httpd:
         httpd.timeout = 30
         start_time = time.time()
         while time.time() - start_time < 60:  # Run for a maximum of 60 seconds
@@ -91,6 +95,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,7 +112,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"
+
+    if auth_host == "https://cloud.tinybird.co" and "wadus" in host:
+        auth_host = "https://cloud-wadus.tinybird.co"
 
     def auth_callback(code):
         auth_code.append(code)
@@ -116,7 +123,7 @@ async def login(host: str, auth_host: str, workspace: str):
     click.echo(FeedbackManager.highlight(message="» Opening browser for authentication..."))
 
     # Start the local server in a separate thread
-    server_thread = threading.Thread(target=start_server, args=(auth_callback,))
+    server_thread = threading.Thread(target=start_server, args=(auth_callback, auth_host))
     server_thread.daemon = True
     server_thread.start()
 

{tinybird-0.0.1.dev54.dist-info → tinybird-0.0.1.dev56.dist-info}/METADATA

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

{tinybird-0.0.1.dev54.dist-info → tinybird-0.0.1.dev56.dist-info}/RECORD

@@ -15,18 +15,18 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=FL85SMPq2dH4JqKovmSbaolGdEzwOO91NqOzqXo2Qr0,41863
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=OXkBhlzGjZotjD0vaT-rFIbSGV4tpiHxE8qO_ip0SyQ,40454
-tinybird/tb/__cli__.py,sha256=lpsuIgRseyiLwDn_zKY_IAb-j5uezXGwkk2IJiDdaQg,251
+tinybird/tb/__cli__.py,sha256=5GEuAS2TJj6qPLbuuMWnjJTIDITptpmJkpS2ZJxSBlM,251
 tinybird/tb/cli.py,sha256=FD1pfbzu9YHJHEG6Vtn_EwPLTYhwqw-I6AxXeTaRHU8,926
 tinybird/tb/modules/auth.py,sha256=EzRWFmwRkXNhUmRaruEVFLdkbUg8xMSix0cAWl5D4Jg,9029
 tinybird/tb/modules/build.py,sha256=bGx4sON9g90zVBVCd16La-1yV1nWZ_AY-2RZ77sco0s,8361
 tinybird/tb/modules/cicd.py,sha256=xxXwy-QekJcG14kkJeGNl7LkHduhZXfvBZE8WrU6-t4,5351
-tinybird/tb/modules/cli.py,sha256=hom-69SKIWSyc-reh424G-eLGYokx7XBLM8Aaa1yS3c,16178
+tinybird/tb/modules/cli.py,sha256=lCRp71IOfmDIv4fTKeswYEe1ZzpDAX202a5zxBCg-zQ,16199
 tinybird/tb/modules/common.py,sha256=TWcGJUgzJCQvzI1oMKbNdx-KTRmMGvB25BawHpsaV8Q,70610
 tinybird/tb/modules/config.py,sha256=mie3oMVTf5YOUFEiLs88P16U4LkJafJjSpjwyAkFHog,10979
-tinybird/tb/modules/copy.py,sha256=wxyxZg8BPiWDgbW5HXJKYQp7_EumBXmAilo3McbCQOo,5916
+tinybird/tb/modules/copy.py,sha256=Aq6wh_wjRiyLQtEOKF9pKLPgJhSvbGTFWIw_LJB0t0U,5801
 tinybird/tb/modules/create.py,sha256=_eAMjntZ85uub1HqHoDekWC7ks79FQ2Zbc_6grjhT_g,14472
 tinybird/tb/modules/datasource.py,sha256=TQ4wSag3CCw34d54FEXPJFGLQNYyNqv2nQbU6QT9uAE,14725
-tinybird/tb/modules/deployment.py,sha256=Ezb_7ZK6ym967GNPzuSUH3K6ukAMWXaHb1gFXNet2pA,11859
+tinybird/tb/modules/deployment.py,sha256=LtAvjNuoUZFEB8gi3DKYGwPCAjiIh-OskDONW6lZdRI,12111
 tinybird/tb/modules/endpoint.py,sha256=9arqN1JQCMb0Nd3-EJ7lukOYkGHHCpQmiiZpp5FqPhc,9432
 tinybird/tb/modules/exceptions.py,sha256=4A2sSjCEqKUMqpP3WI00zouCWW4uLaghXXLZBSw04mY,3363
 tinybird/tb/modules/feedback_manager.py,sha256=mrw5tdYycfvg6WLXlM0KIjfJardm_aNpnJkUg2vH0cA,68463
@@ -36,7 +36,7 @@ tinybird/tb/modules/llm.py,sha256=AC0VSphTOM2t-v1_3NLvNN_FIbgMo4dTyMqIv5nniPo,83
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=_PIa-1M-72bv9rhLwqaNthJM1ZhvcjWXFChZAfEPXRs,5658
 tinybird/tb/modules/local_common.py,sha256=W1fEnB1vBQ4YC5U1PdA0w0g3cTV78bQ5R-lRxdDj5-Y,2868
-tinybird/tb/modules/login.py,sha256=qiwYp04gQqu92YwBBjrf-sNu_Hn9ms6lBEEoKkJ1pis,5743
+tinybird/tb/modules/login.py,sha256=_Wg2diSxyj9BCpQ_61UMAiS6YeVkOb2fnbgt5Skrveg,6047
 tinybird/tb/modules/materialization.py,sha256=HQKRTH6lkcYiDQJihbFqF_in58ezXG4ggZ_7Ywp_nUM,5738
 tinybird/tb/modules/mock.py,sha256=PzFtZL-6bZAZ3EiCC2nYJo058I4m50fD7FcBHISn3cI,5235
 tinybird/tb/modules/pipe.py,sha256=pH2KwgH6Xbvl3kT8vMelpKvT6bcyB4EKFDvGfOsxXbg,2418
@@ -74,8 +74,8 @@ tinybird/tb_cli_modules/config.py,sha256=6u6B5QCdiQLbJkCkwtnKGs9H3nP-KXXhC75mF7B
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird-0.0.1.dev54.dist-info/METADATA,sha256=s080Eiwo9TmpftconXf2acJM4OzcXr26--BKbG6K-YY,2482
-tinybird-0.0.1.dev54.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev54.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev54.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev54.dist-info/RECORD,,
+tinybird-0.0.1.dev56.dist-info/METADATA,sha256=BEIuDVbGT-rIUDOER7B99FXf_bjAgiL74CkedcbagLI,2482
+tinybird-0.0.1.dev56.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev56.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev56.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev56.dist-info/RECORD,,