tinybird 0.0.1.dev106__tar.gz → 0.0.1.dev108__tar.gz

{tinybird-0.0.1.dev106 → tinybird-0.0.1.dev108}/PKG-INFO

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

{tinybird-0.0.1.dev106 → tinybird-0.0.1.dev108}/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-0.0.1.dev106 → tinybird-0.0.1.dev108}/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.dev106'
-__revision__ = 'b74e464'
+__version__ = '0.0.1.dev108'
+__revision__ = '1909c2e'

{tinybird-0.0.1.dev106 → tinybird-0.0.1.dev108}/tinybird/tb/modules/cicd.py

@@ -58,6 +58,33 @@ jobs:
         run: tb --cloud --host ${{! env.TINYBIRD_HOST }} --token ${{! env.TINYBIRD_TOKEN }} deploy --check
 """
 
+GITHUB_CD_YML = """
+name: Tinybird - CD Workflow
+
+on:
+  push:
+    branches:
+      - main
+      - master{% if data_project_dir != '.' %}
+    paths:
+      - '{{ data_project_dir }}/**'{% end %}
+
+concurrency: ${{! github.workflow }}-${{! github.event.ref }}
+
+env:
+  TINYBIRD_HOST: ${{! secrets.TINYBIRD_HOST }}
+  TINYBIRD_TOKEN: ${{! secrets.TINYBIRD_TOKEN }}
+
+jobs:
+  cd:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Tinybird CLI
+        run: curl -LsSf https://api.tinybird.co/static/install.sh | sh
+      - name: Deploy project
+        run: tb --cloud --host ${{! env.TINYBIRD_HOST }} --token ${{! env.TINYBIRD_TOKEN }} deploy
+"""
 
 GITLAB_YML = """
 include:
@@ -65,6 +92,7 @@ include:
 
 stages:
   - tests
+  - deploy
 """
 
 
@@ -92,6 +120,22 @@ tinybird_ci_workflow:
   services:
     - name: tinybirdco/tinybird-local:beta
       alias: tinybird-local
+
+tinybird_cd_workflow:
+  image: ubuntu:latest
+  stage: deploy
+  resource_group: production
+  needs: []
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      changes:
+        - .gitlab/tinybird/*{% if data_project_dir != '.' %}
+        - {{ data_project_dir }}/*
+        - {{ data_project_dir }}/**/*{% end %}
+  script:
+    - export PATH="$HOME/.local/bin:$PATH"
+    - cd $CI_PROJECT_DIR/{{ data_project_dir }}
+    - tb --cloud --host ${{! TINYBIRD_HOST }} --token ${{! TINYBIRD_TOKEN }} deploy
 """
 
 
@@ -153,6 +197,11 @@ class GitHubCICDGenerator(CICDGeneratorBase):
             file_name="tinybird-ci.yml",
             dir_path=".github/workflows",
         ),
+        CICDFile(
+            template=GITHUB_CD_YML,
+            file_name="tinybird-cd.yml",
+            dir_path=".github/workflows",
+        ),
     ]
 
 

{tinybird-0.0.1.dev106 → tinybird-0.0.1.dev108}/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,21 +133,36 @@ 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"):
+            if "Updated tinybird" in line:
+                click.echo(FeedbackManager.info(message=f"» {line}"))
         click.echo(FeedbackManager.success(message="✓ Tinybird CLI updated"))
     else:
         click.echo(FeedbackManager.info(message="✓ Tinybird CLI is already up-to-date"))
@@ -192,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-0.0.1.dev106 → tinybird-0.0.1.dev108}/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",

{tinybird-0.0.1.dev106 → tinybird-0.0.1.dev108}/tinybird.egg-info/PKG-INFO

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