tinybird 0.0.1.dev50__py3-none-any.whl → 0.0.1.dev52__py3-none-any.whl

tinybird/prompts.py

@@ -779,7 +779,7 @@ You have commands at your disposal to develop a tinybird project:
 - {base_command} --build token ls: to list all the tokens
 There are other commands that you can use, but these are the most common ones. Run `{base_command} -h` to see all the commands if needed.
 When you need to work with resources or data in the Tinybird environment that you updated with the build command, add always the --build flag before the command. Example: {base_command} --build datasource ls
-When you need to work with resources or data in production, add always the --prod flag before the command. Example: {base_command} --prod datasource ls
+When you need to work with resources or data in cloud, add always the --cloud flag before the command. Example: {base_command} --cloud datasource ls
 </command_calling>
 <development_instructions>
 - When asking to create a tinybird data project, if the needed folders are not already created, use the following structure:
@@ -799,8 +799,9 @@ When you need to work with resources or data in production, add always the --pro
 When asking for ingesting data, adding data or appending data do the following depending on the environment you want to work with:
 <ingest_data_instructions>
 - When building locally, create a .ndjson file with the data you want to ingest and do `{base_command} build` to ingest the data in the build env.
-- When appending data in production, use `{base_command} --prod datasource append <datasource_name> <file_name>`
-- When you have a response that says “there are rows in quarantine”, do `{base_command} --build|--prod datasource data <datasource_name>_quarantine` to understand what is the problem.
+- We call `cloud` the production environment.
+- When appending data in cloud, use `{base_command} --cloud datasource append <datasource_name> <file_name>`
+- When you have a response that says “there are rows in quarantine”, do `{base_command} --build|--cloud datasource data <datasource_name>_quarantine` to understand what is the problem.
 </ingest_data_instructions>
 <datasource_file_instructions>
 Follow these instructions when creating or updating .datasource files:

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.dev50'
-__revision__ = 'ce37c39'
+__version__ = '0.0.1.dev52'
+__revision__ = '089e219'

tinybird/tb/modules/cli.py

@@ -55,7 +55,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option("--token", help="Use auth token, defaults to TB_TOKEN envvar, then to the .tinyb file")
 @click.option("--host", help="Use custom host, defaults to TB_HOST envvar, then to https://api.tinybird.co")
 @click.option("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens")
-@click.option("--prod/--local", is_flag=True, default=False, help="Run against production or local")
+@click.option("--cloud/--local", is_flag=True, default=False, help="Run against cloud or local")
 @click.option("--build", is_flag=True, default=False, help="Run against build mode")
 @click.option("--folder", type=str, help="Folder where files will be placed")
 @click.version_option(version=VERSION)
@@ -67,7 +67,7 @@ async def cli(
     token: str,
     host: str,
     show_tokens: bool,
-    prod: bool,
+    cloud: bool,
     build: bool,
     folder: Optional[str],
 ) -> None:
@@ -76,7 +76,7 @@ async def cli(
     """
     project = Project(folder=folder or os.getcwd())
     # We need to unpatch for our tests not to break
-    if show_tokens or not prod or ctx.invoked_subcommand == "build" or build:
+    if show_tokens or not cloud or ctx.invoked_subcommand == "build" or build:
         __unpatch_click_output()
     else:
         __patch_click_output()
@@ -108,11 +108,13 @@ async def cli(
     config = await get_config(host, token)
     client = _get_tb_client(config.get("token", None), config["host"])
 
+    config["path"] = str(project.path)
     # If they have passed a token or host as paramter and it's different that record in .tinyb, refresh the workspace id
     if token or host:
         try:
             workspace = await client.workspace_info()
             config["id"] = workspace.get("id", "")
+            config["name"] = workspace.get("name", "")
         # If we can not get this info, we continue with the id on the file
         except (AuthNoTokenException, AuthException):
             pass
@@ -121,7 +123,7 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    client = await create_ctx_client(ctx, config, prod, build, project)
+    client = await create_ctx_client(ctx, config, cloud, build, project)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -388,23 +390,23 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(ctx: Context, config: Dict[str, Any], prod: bool, build: bool, project: Project):
+async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, build: bool, project: Project):
     commands_without_ctx_client = ["auth", "check", "login", "local"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
         return None
 
-    commands_always_prod = ["pull"]
+    commands_always_cloud = ["pull"]
     commands_always_build = ["build", "test"]
     commands_always_local = ["create", "mock"]
     if (
-        (prod or command in commands_always_prod)
+        (cloud or command in commands_always_cloud)
         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 'production'}"))
+        click.echo(FeedbackManager.gray(message=f"Running against {config.get('name') or 'cloud'}"))
         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"))
-    return await get_tinybird_local_client(str(project.path), build=build)
+    return await get_tinybird_local_client(config, build=build)

tinybird/tb/modules/local_common.py

@@ -1,6 +1,7 @@
 import hashlib
 import logging
 import os
+from typing import Any, Dict
 
 import requests
 
@@ -8,23 +9,24 @@ from tinybird.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIException
 
-TB_IMAGE_NAME = "registry.gitlab.com/tinybird/analytics/tinybird-local-jammy-3.11:beta"
+TB_IMAGE_NAME = "tinybirdco/tinybird-local:beta"
 TB_CONTAINER_NAME = "tinybird-local"
 TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 80))
 TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
 
 
-async def get_tinybird_local_client(path: str, build: bool = False) -> TinyB:
+async def get_tinybird_local_client(config_obj: Dict[str, Any], build: bool = False) -> TinyB:
     """Get a Tinybird client connected to the local environment."""
-    config = await get_tinybird_local_config(path, build=build)
+    config = await get_tinybird_local_config(config_obj, build=build)
     return config.get_client(host=TB_LOCAL_HOST)
 
 
-async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig:
+async def get_tinybird_local_config(config_obj: Dict[str, Any], build: 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
     """
+    path = config_obj.get("path")
     config = CLIConfig.get_project_config(path)
 
     try:
@@ -34,26 +36,26 @@ async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig
         raise CLIException("Tinybird local is not running. Please run `tb local start` first.")
 
     user_token = tokens["user_token"]
+    admin_token = tokens["admin_token"]
     default_token = tokens["workspace_admin_token"]
     # Create a new workspace if path is provided. This is used to isolate the build in a different workspace.
-    path = path or os.getcwd()
     if path:
         folder_hash = hashlib.sha256(path.encode()).hexdigest()
         user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
-        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else config.get("name")
+        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else config.get("name") or config_obj.get("name")
         if not ws_name:
             raise AuthNoTokenException()
 
         logging.debug(f"Workspace used for build: {ws_name}")
 
-        user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
+        user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={admin_token}").json()
         local_workspaces = user_workspaces.get("workspaces", [])
 
         ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
 
         if not ws:
             await user_client.create_workspace(ws_name, template=None)
-            user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
+            user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={admin_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:
                 raise AuthNoTokenException()

tinybird/tb/modules/login.py

@@ -34,35 +34,16 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
                     height: 100vh;
                     margin: 0;
                 }
-                .message {
-                    background: white;
-                    padding: 2rem 3rem;
-                    border-radius: 8px;
-                    box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-                    text-align: center;
-                    display: flex;
-                    flex-direction: column;
-                    align-items: center;
-                }
-                h1 {
-                    color: #25283D;
-                    font-size: 1.2rem;
-                    margin: 0;
-                    font-weight: 500;
-                }
             </style>
         </head>
         <body>
-            <div class="message">
-                <h1>Authenticating...</h1>
-            </div>
             <script>
-                var hash = window.location.hash.substr(1);
-                var access_token = new URLSearchParams(hash).get('access_token');
-                window.history.pushState({}, '', '/');
-                fetch('/?token=' + access_token, {method: 'POST'})
+                const searchParams = new URLSearchParams(window.location.search);
+                const code = searchParams.get('code');
+                const workspace = searchParams.get('workspace');
+                fetch('/?code=' + code, {method: 'POST'})
                     .then(() => {
-                        document.querySelector('.message h1').textContent = 'Authentication successful! You can close this window.';
+                        window.location.href = "https://cloud.tinybird.co/cli-login?workspace=" + workspace;
                     });
             </script>
         </body>
@@ -73,13 +54,13 @@ class AuthHandler(http.server.SimpleHTTPRequestHandler):
         parsed_path = urllib.parse.urlparse(self.path)
         query_params = urllib.parse.parse_qs(parsed_path.query)
 
-        if "token" in query_params:
-            token = query_params["token"][0]
-            self.server.auth_callback(token)  # type: ignore
+        if "code" in query_params:
+            code = query_params["code"][0]
+            self.server.auth_callback(code)  # type: ignore
             self.send_response(200)
             self.end_headers()
         else:
-            self.send_error(400, "Missing 'token' parameter")
+            self.send_error(400, "Missing 'code' parameter")
 
         self.server.shutdown()
 
@@ -112,12 +93,17 @@ def start_server(auth_callback):
     "--host",
     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(
+    "--auth-host",
+    default="https://cloud.tinybird.co",
+    help="Set the host to authenticate to. If unset, the default host will be used.",
+)
 @click.option(
     "--workspace",
     help="Set the workspace to authenticate to. If unset, the default workspace will be used.",
 )
 @coro
-async def login(host: str, workspace: str):
+async def login(host: str, auth_host: str, workspace: str):
     """Authenticate using the browser."""
     auth_event = threading.Event()
     auth_code = [None]  # Using a list to store the code, as it's mutable
@@ -135,30 +121,23 @@ async def login(host: str, workspace: str):
     server_thread.start()
 
     # Open the browser to the auth page
-    if "wadus" in host:
-        client_id = "Rpl7Uy9aSjqoPCSvHgGl3zNQuZcSOXBe"
-        base_auth_url = "https://auth.wadus1.tinybird.co"
-    else:
-        client_id = "T6excMo8IKguvUw4vFNYfqlt9pe6msCU"
-        base_auth_url = "https://auth.tinybird.co"
     callback_url = f"http://localhost:{AUTH_SERVER_PORT}"
     params = {
-        "client_id": client_id,
         "redirect_uri": callback_url,
-        "response_type": "token",
-        "scope": "openid profile email",
     }
-    auth_url = f"{base_auth_url}/authorize?{urlencode(params)}"
+
+    if workspace:
+        params["workspace"] = workspace
+
+    auth_url = f"{auth_host}/api/cli-login?{urlencode(params)}"
     webbrowser.open(auth_url)
 
     # Wait for the authentication to complete or timeout
     if auth_event.wait(timeout=60):  # Wait for up to 60 seconds
         params = {}
-        if workspace:
-            params["workspace_id"] = workspace
+        params["code"] = auth_code[0]
         response = requests.get(  # noqa: ASYNC210
-            f"{host}/v0/user/tokens?{urlencode(params)}",
-            headers={"Authorization": f"Bearer {auth_code[0]}"},
+            f"{auth_host}/api/cli-login?{urlencode(params)}",
         )
 
         data = response.json()
@@ -168,15 +147,15 @@ async def login(host: str, workspace: str):
         cli_config.set_user_token(data.get("user_token", ""))
         cli_config.set_host(host)
 
-        ws = await cli_config.get_client().workspace_info()
+        ws = await cli_config.get_client(token=data.get("workspace_token", "")).workspace_info()
         for k in ("id", "name", "user_email", "user_id", "scope"):
             if k in ws:
                 cli_config[k] = ws[k]
 
         cli_config.persist_to_file()
-        click.echo(FeedbackManager.info(message="\nWorkspace: %s" % ws["name"]))
-        click.echo(FeedbackManager.info(message="User: %s" % ws["user_email"]))
-        click.echo(FeedbackManager.info(message="Host: %s" % host))
+        click.echo(FeedbackManager.gray(message="\nWorkspace: ") + FeedbackManager.info(message=ws["name"]))
+        click.echo(FeedbackManager.gray(message="User: ") + FeedbackManager.info(message=ws["user_email"]))
+        click.echo(FeedbackManager.gray(message="Host: ") + FeedbackManager.info(message=host))
         click.echo(FeedbackManager.success(message="\n✓ Authentication successful!"))
     else:
         click.echo(FeedbackManager.error(message="Authentication failed or timed out."))

{tinybird-0.0.1.dev50.dist-info → tinybird-0.0.1.dev52.dist-info}/METADATA

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

{tinybird-0.0.1.dev50.dist-info → tinybird-0.0.1.dev52.dist-info}/RECORD

@@ -6,7 +6,7 @@ tinybird/context.py,sha256=A3GBApac9xO6hrAMJ1s9dMrI_ou9aKF84CdEjtPddMk,1417
 tinybird/datatypes.py,sha256=XNypumfqNjsvLJ5iNXnbVHRvAJe0aQwI3lS6Cxox-e0,10979
 tinybird/feedback_manager.py,sha256=g1r9NcFfKXdk_13soaiTZLvdoUGleVfawl6Yfj3zmRw,67823
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
-tinybird/prompts.py,sha256=unaqHksayhVtxFaTTxuL6Dftb1IM9vQncXtpTI3pxuY,30545
+tinybird/prompts.py,sha256=3Yx0atKYf0uE1YKN04HU0h-kJGEHKt0OItPhDgOYGKI,30585
 tinybird/sql.py,sha256=LBi74GxhNAYTb6m2-KNGpAkguSKh7rcvBbERbE7nalA,46195
 tinybird/sql_template.py,sha256=GmMLAI10MTqjQo9qztuQHLRWs67teozsWDxUBdvkAn4,93668
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
@@ -15,12 +15,12 @@ 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=cKGrrXAl7KnVAvMksFSzNWU1rVZC5C-NHFyK0FbUxNE,251
+tinybird/tb/__cli__.py,sha256=IBx_XSP1q2ge9y0mmA6ZqDind5oGjb9jTywt-9A8TQU,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=2nQxwooYcvp0nrgI36yr4ZC1ka9LD3lr4B4TWg3SRUQ,16086
+tinybird/tb/modules/cli.py,sha256=ILZ39TNbT7QuimzRayAU1NAYBmWWhE66pAbVDUlKWMU,16167
 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
@@ -35,8 +35,8 @@ tinybird/tb/modules/job.py,sha256=956Pj8BEEsiD2GZsV9RKKVM3I_CveOLgS82lykO5ukk,29
 tinybird/tb/modules/llm.py,sha256=AC0VSphTOM2t-v1_3NLvNN_FIbgMo4dTyMqIv5nniPo,835
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=x4xuCGVkoa8KLYGZEJnFUP8HUkKX05Frp_djRVjVjTs,5669
-tinybird/tb/modules/local_common.py,sha256=UW6tNexC98aGRC6ca2w8qDDzyTTn-GDfr3uRy7zRHBM,2767
-tinybird/tb/modules/login.py,sha256=cnB2Vwjc94FpG9C-7Y-l7Lb0Xilp2oUFDzqbQW0tpkU,6519
+tinybird/tb/modules/local_common.py,sha256=W1fEnB1vBQ4YC5U1PdA0w0g3cTV78bQ5R-lRxdDj5-Y,2868
+tinybird/tb/modules/login.py,sha256=bzZ5HyG3lD1DvWFrSXZKVJVUxRNEnmd_wXLITJbyalg,5733
 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.dev50.dist-info/METADATA,sha256=sHW1V0sKWKhAnBz7c01CAdci9nxkirPHycgQ2vzpHT0,2482
-tinybird-0.0.1.dev50.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev50.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev50.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev50.dist-info/RECORD,,
+tinybird-0.0.1.dev52.dist-info/METADATA,sha256=SiIvJoWFT3tstvtnBfuqv3v_tjkswAQ-z-wrB8J8UwA,2482
+tinybird-0.0.1.dev52.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev52.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev52.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev52.dist-info/RECORD,,