tinybird 0.0.1.dev107__py3-none-any.whl → 0.0.1.dev109__py3-none-any.whl

tinybird/prompts.py

@@ -605,8 +605,9 @@ Follow the instructions and generate the following response with no additional t
 copy_pipe_instructions = """
 <copy_pipe_instructions>
 - Do not create copy pipes by default, unless the user asks for it.
+- Copy pipes should be created in the /copies folder.
 - In a .pipe file you can define how to export the result of a Pipe to a Data Source, optionally with a schedule.
-- Do not include COPY_SCHEDULE in the .pipe file if it is not requested by the user.
+- Do not include COPY_SCHEDULE in the .pipe file unless is specifically requested by the user.
 - COPY_SCHEDULE is a cron expression that defines the schedule of the copy pipe.
 - COPY_SCHEDULE is optional and if not provided, the copy pipe will be executed only once.
 - TARGET_DATASOURCE is the name of the Data Source to export the result to.
@@ -634,6 +635,7 @@ COPY_SCHEDULE 0 * * * *
 materialized_pipe_instructions = """
 <materialized_pipe_instructions>
 - Do not create materialized pipes by default, unless the user asks for it.
+- Materialized pipes should be created in the /materializations folder.
 - In a .pipe file you can define how to materialize each row ingested in the earliest Data Source in the Pipe query to a materialized Data Source. Materialization happens at ingest.
 - DATASOURCE: Required when TYPE is MATERIALIZED. Sets the target Data Source for materialized nodes.
 - TYPE MATERIALIZED is the type of the pipe and it is mandatory for materialized pipes.

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.dev107'
-__revision__ = '76708c2'
+__version__ = '0.0.1.dev109'
+__revision__ = '421d6c4'

tinybird/tb/modules/datafile/common.py

@@ -191,6 +191,14 @@ KAFKA_PARAMS = {
 
 REQUIRED_KAFKA_PARAMS = KAFKA_PARAMS
 
+S3_PARAMS = {
+    "import_connection_name",
+    "import_schedule",
+    "import_bucket_uri",
+}
+
+REQUIRED_S3_PARAMS = S3_PARAMS
+
 
 class Datafile:
     def __init__(self) -> None:
@@ -261,6 +269,7 @@ class Datafile:
             #  [x] Engine is present
             #  [x] Token permissions are valid
             #  [x] If it's a kafka datasource, all required kafka params are present
+            #  [x] If it's an S3 datasource, all required S3 params are present
             #  [ ] ...
             if len(self.nodes) > 1:
                 # Our users are not aware of data source data files being a single-node data file, hence this error
@@ -283,6 +292,12 @@ class Datafile:
                 raise DatafileValidationError(
                     f"Some Kafka params have been provided, but the following required ones are missing: {missing}"
                 )
+            # Validate S3 params
+            if any(param in node for param in S3_PARAMS) and not all(param in node for param in REQUIRED_S3_PARAMS):
+                missing = [param for param in S3_PARAMS if param not in node]
+                raise DatafileValidationError(
+                    f"Some S3 params have been provided, but the following required ones are missing: {missing}"
+                )
         else:
             # We cannot validate a datafile whose kind is unknown
             pass

tinybird/tb/modules/local.py

@@ -1,4 +1,3 @@
-import os
 import re
 import subprocess
 import time
@@ -7,6 +6,7 @@ import boto3
 import click
 
 import docker
+from docker.client import DockerClient
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException
@@ -15,8 +15,9 @@ from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, T
 
 
 def start_tinybird_local(
-    docker_client,
-):
+    docker_client: DockerClient,
+    use_aws_creds: bool,
+) -> None:
     """Start the Tinybird container."""
     pull_show_prompt = False
     pull_required = False
@@ -52,13 +53,13 @@ def start_tinybird_local(
         if container:
             container.remove(force=True)
 
-        environment = get_local_aws_credentials()
+        environment = get_use_aws_creds() if use_aws_creds else {}
 
         container = docker_client.containers.run(
             TB_IMAGE_NAME,
             name=TB_CONTAINER_NAME,
             detach=True,
-            ports={"80/tcp": TB_LOCAL_PORT},
+            ports={"7181/tcp": TB_LOCAL_PORT},
             remove=False,
             platform="linux/amd64",
             environment=environment,
@@ -81,7 +82,7 @@ def start_tinybird_local(
         image.remove(force=True)
 
 
-def get_docker_client():
+def get_docker_client() -> DockerClient:
     """Check if Docker is installed and running."""
     try:
         client = docker.from_env()  # type: ignore
@@ -93,7 +94,7 @@ def get_docker_client():
         )
 
 
-def get_local_aws_credentials():
+def get_use_aws_creds():
     credentials: dict[str, str] = {}
     try:
         # Get the boto3 session and credentials
@@ -132,19 +133,31 @@ def remove_tinybird_local(docker_client):
     """Remove the Tinybird container."""
     try:
         container = docker_client.containers.get(TB_CONTAINER_NAME)
-        container.remove(force=True)
+        if click.confirm(
+            FeedbackManager.warning(
+                message="△ This step will remove all your data inside Tinybird Local. Are you sure? [y/N]:"
+            ),
+            show_default=False,
+            prompt_suffix="",
+        ):
+            container.remove(force=True)
     except Exception:
         pass
 
 
 def update_cli():
     click.echo(FeedbackManager.highlight(message="» Updating Tinybird CLI..."))
-    process = subprocess.Popen(
-        [f"{os.getenv('HOME')}/.local/bin/uv", "tool", "upgrade", "tinybird"],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-    )
+
+    try:
+        process = subprocess.Popen(
+            ["uv", "tool", "upgrade", "tinybird"],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+    except FileNotFoundError:
+        raise CLIException("Cannot find required tool: uv. Reinstall using: curl -LsSf tbrd.co/fwd | sh")
+
     stdout, stderr = process.communicate()
     if "Nothing to upgrade" not in stdout + stderr:
         for line in stdout.split("\n") + stderr.split("\n"):
@@ -195,21 +208,23 @@ async def remove() -> None:
 
 @local.command()
 @coro
-async def start() -> None:
+@click.option("--use-aws-creds", default=False, is_flag=True, help="Use local AWS credentials")
+async def start(use_aws_creds: bool) -> None:
     """Start Tinybird Local"""
     click.echo(FeedbackManager.highlight(message="» Starting Tinybird Local..."))
     docker_client = get_docker_client()
-    start_tinybird_local(docker_client)
+    start_tinybird_local(docker_client, use_aws_creds)
     click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
 
 
 @local.command()
 @coro
-async def restart() -> None:
+@click.option("--use-aws-creds", is_flag=True, help="Use local AWS credentials")
+async def restart(use_aws_creds: bool) -> None:
     """Restart Tinybird Local"""
     click.echo(FeedbackManager.highlight(message="» Restarting Tinybird Local..."))
     docker_client = get_docker_client()
     remove_tinybird_local(docker_client)
     click.echo(FeedbackManager.info(message="✓ Tinybird Local stopped"))
-    start_tinybird_local(docker_client)
+    start_tinybird_local(docker_client, use_aws_creds)
     click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))

tinybird/tb/modules/login.py

@@ -99,7 +99,7 @@ def start_server(auth_callback, auth_host):
 @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.",
+    help="Set custom host if it's different than https://api.europe-west2.gcp.tinybird.co. See https://www.tinybird.co/docs/api-reference/overview#regions-and-endpoints for the available list of regions.",
 )
 @click.option(
     "--auth-host",
@@ -113,6 +113,9 @@ def start_server(auth_callback, auth_host):
 @coro
 async def login(host: str, auth_host: str, workspace: str):
     """Authenticate using the browser."""
+    host = host.rstrip("/")
+    auth_host = auth_host.rstrip("/")
+
     auth_event = threading.Event()
     auth_code: list[str] = []  # Using a list to store the code, as it's mutable
 
@@ -153,8 +156,8 @@ async def login(host: str, auth_host: str, workspace: str):
         cli_config.set_token(data.get("workspace_token", ""))
         cli_config.set_token_for_host(data.get("workspace_token", ""), host)
         cli_config.set_user_token(data.get("user_token", ""))
-        cli_config.set_host(host or data.get("api_host", ""))
-
+        host = data.get("api_host", host)
+        cli_config.set_host(host)
         ws = await cli_config.get_client(token=data.get("workspace_token", ""), host=host).workspace_info(version="v1")
         for k in ("id", "name", "user_email", "user_id", "scope"):
             if k in ws:

{tinybird-0.0.1.dev107.dist-info → tinybird-0.0.1.dev109.dist-info}/METADATA

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

{tinybird-0.0.1.dev107.dist-info → tinybird-0.0.1.dev109.dist-info}/RECORD

@@ -6,7 +6,7 @@ tinybird/context.py,sha256=FfqYfrGX_I7PKGTQo93utaKPDNVYWelg4Hsp3evX5wM,1291
 tinybird/datatypes.py,sha256=XNypumfqNjsvLJ5iNXnbVHRvAJe0aQwI3lS6Cxox-e0,10979
 tinybird/feedback_manager.py,sha256=a_ZhFX2zcB7vRknIcmHKMdQbb0c7TqlTBQ_5hPuWh88,69267
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
-tinybird/prompts.py,sha256=RgV1B7-b6-1xXStNlhKikYSCG1WNaddDVeSp8hSgBlE,33753
+tinybird/prompts.py,sha256=0i4Bzg-60lV6NlrQ1Vu6NZ_2we3GqV3rExu77YfA0V4,33889
 tinybird/sql.py,sha256=J35bhdpuu84HW2tiLp-cs_nzkRwPhiy1yPcFhcWMCR4,46248
 tinybird/sql_template.py,sha256=mK0yeRFctbXTAu0VNMjIzoFBJoh9PoniAVgEatA5SG4,99832
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
@@ -15,7 +15,7 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=t8MFy2-t9fuw6aYIBOtbd_R7b7PF-LjKaUPwssmRWnA,252
+tinybird/tb/__cli__.py,sha256=gq1iOJ_OD1Jr2fuf07Ot_OShPnS-FIvM36rsSSSVtzs,252
 tinybird/tb/cli.py,sha256=H_HaZhkimKgkryYXpBjHfY9Qtg-ZORiONU3psDNpzDk,1135
 tinybird/tb/modules/auth.py,sha256=L1IatO2arRSzys3t8px8xVt8uPWUL5EVD0sFzAV_uVU,9022
 tinybird/tb/modules/build.py,sha256=h5drdmDFX8NHts9dA2Zepao7KSgMAl3DZGyFufVZP78,11085
@@ -36,9 +36,9 @@ tinybird/tb/modules/infra.py,sha256=GA5xnYLlVItPfJu_3_5NIdHQDuyfk2Z71wtcn9NncGA,
 tinybird/tb/modules/job.py,sha256=956Pj8BEEsiD2GZsV9RKKVM3I_CveOLgS82lykO5ukk,2963
 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=ju4pckNbtCUD9eQpvxEKP_YsVIny8WPidoCxqXEyh3Y,7111
+tinybird/tb/modules/local.py,sha256=4BhxfkSTHpckXmH4aU_BothlV5n4JyAIoBKX3wP_BZg,7863
 tinybird/tb/modules/local_common.py,sha256=RN5OEncHdq7ua4AZ--WgKtaFuEsLvIhq_ROHJadRXXA,3188
-tinybird/tb/modules/login.py,sha256=dAaBBn_ZIQRm9BFl6Uw_HgZa2qoLuAO6mBOxob_17ms,6253
+tinybird/tb/modules/login.py,sha256=lLCJ1kIq3sLcoSMH1kZge5isHh-fDwHPRHApIqbaCkw,6350
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=r8Q9HXcYEmfrEzP4WpiasCKDJdSkTPaAKJtZMoJKhi8,5749
 tinybird/tb/modules/mock.py,sha256=2E26N8TMK1sP7eRc9N1nODdc_vU1jBeGRs8e-fbQ5Dc,4516
@@ -61,7 +61,7 @@ tinybird/tb/modules/datafile/build.py,sha256=jhfIJ2xt0N13XsLPe3iMQIyCPApHS13_Df2
 tinybird/tb/modules/datafile/build_common.py,sha256=rT7VJ5mnQ68R_8US91DAtkusfvjWuG_NObOzNgtN_ko,4562
 tinybird/tb/modules/datafile/build_datasource.py,sha256=CCU3eQ8Rax9RgHHfbAXDRL6rQ49N35h_GDQnGrUUUzA,17379
 tinybird/tb/modules/datafile/build_pipe.py,sha256=w-Wd08gZYAEcak9FdBijVfIU2_Wn_PPdgAZddPpoGTo,11382
-tinybird/tb/modules/datafile/common.py,sha256=4Jv20MUMaQl2NlbviRGHH41ncoDc6h9g4IWC0nl0j3M,82579
+tinybird/tb/modules/datafile/common.py,sha256=4pvW92X9BXomaN3-WhQOjvnAHY96O4dTsp4USBdknzk,83192
 tinybird/tb/modules/datafile/diff.py,sha256=-0J7PsBO64T7LOZSkZ4ZFHHCPvT7cKItnJkbz2PkndU,6754
 tinybird/tb/modules/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
 tinybird/tb/modules/datafile/fixture.py,sha256=si-9LB-LdKQSWDtVW82xDrHtFfko5bgBG1cvjqqrcPU,1064
@@ -81,8 +81,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 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=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev107.dist-info/METADATA,sha256=O5fKB-GC4H563pOpRl3NOiRPDOjoCcE661OrM-gzza4,1612
-tinybird-0.0.1.dev107.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev107.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev107.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev107.dist-info/RECORD,,
+tinybird-0.0.1.dev109.dist-info/METADATA,sha256=v6-T3y67YWXtDvTUvKDY54ywJvMNaNpb150tom2JvtM,1612
+tinybird-0.0.1.dev109.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev109.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev109.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev109.dist-info/RECORD,,