tinybird 0.0.1.dev147__tar.gz → 0.0.1.dev148__tar.gz

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/PKG-INFO

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

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/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.dev147'
-__revision__ = 'c9f089b'
+__version__ = '0.0.1.dev148'
+__revision__ = '7b2789f'

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/tinybird/tb/modules/cli.py

@@ -317,13 +317,13 @@ def __unpatch_click_output():
 
 
 async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool):
-    commands_without_ctx_client = ["auth", "check", "local", "login", "logout", "update", "upgrade"]
+    commands_without_ctx_client = ["auth", "check", "local", "login", "logout", "update", "upgrade", "create"]
     command = ctx.invoked_subcommand
     if command in commands_without_ctx_client:
         return None
 
     commands_always_cloud = ["pull", "infra"]
-    commands_always_local = ["build", "test", "dev", "create"]
+    commands_always_local = ["build", "test", "dev"]
     if (cloud or command in commands_always_cloud) and command not in commands_always_local:
         click.echo(
             FeedbackManager.gray(message=f"Running against Tinybird Cloud: Workspace {config.get('name', 'default')}")

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/tinybird/tb/modules/create.py

@@ -1,7 +1,7 @@
 import os
 import re
 from pathlib import Path
-from typing import Optional, Tuple
+from typing import Any, Dict, Optional, Tuple
 
 import click
 
@@ -16,6 +16,7 @@ from tinybird.tb.modules.exceptions import CLICreateException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
+from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 
 
@@ -24,13 +25,13 @@ from tinybird.tb.modules.project import Project
     "--data",
     type=click.Path(exists=True),
     default=None,
-    help="Initial data to be used to create the project",
+    help="Initial data to be used to create the project. Tinybird Local and authentication are required.",
 )
 @click.option(
     "--prompt",
     type=str,
     default=None,
-    help="Prompt to be used to create the project",
+    help="Prompt to be used to create the project. Tinybird Local and authentication are required.",
 )
 @click.option("--rows", type=int, default=10, help="Number of events to send")
 @click.option("--folder", type=str, default=None, help="Folder to create the project in")
@@ -41,7 +42,6 @@ async def create(
     ctx: click.Context, data: Optional[str], prompt: Optional[str], rows: int, folder: Optional[str], agent: str
 ) -> None:
     """Initialize a new project."""
-    local_client: TinyB = ctx.ensure_object(dict)["client"]
     project: Project = ctx.ensure_object(dict)["project"]
     config = CLIConfig.get_project_config()
     ctx_config = ctx.ensure_object(dict)["config"]
@@ -83,9 +83,7 @@ async def create(
 
         if data or (prompt and user_token):
             click.echo(FeedbackManager.highlight(message="\n» Creating resources..."))
-            result, created_something = await create_resources(
-                local_client, tb_client, user_token, data, prompt, folder
-            )
+            result, created_something = await create_resources(tb_client, user_token, data, prompt, folder, ctx_config)
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
             if prompt:
                 readme_path = Path(root_folder) / "README.md"
@@ -146,7 +144,7 @@ async def create(
                         response = llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
                         sql = extract_xml(response, "sql")
                         sql = sql.split("FORMAT")[0]
-                        query_result = await local_client.query(f"{sql} FORMAT JSON")
+                        query_result = await tb_client.query(f"{sql} FORMAT JSON")
                         data = query_result.get("data", [])
                         if data:
                             persist_fixture(datasource_name, data, folder, format="ndjson")
@@ -202,17 +200,18 @@ def create_project_structure(folder: str):
 
 
 async def create_resources(
-    local_client: TinyB,
     tb_client: TinyB,
     user_token: Optional[str],
     data: Optional[str],
     prompt: Optional[str],
     folder: str,
+    config: Dict[str, Any],
 ) -> Tuple[str, bool]:
     result = ""
     created_any_resource = False
     folder_path = Path(folder)
     if data:
+        local_client = await get_tinybird_local_client(config)
         path = folder_path / data
         format = path.suffix.lstrip(".")
         await _generate_datafile(str(path), local_client, format=format, force=True)

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/tinybird/tb/modules/deployment.py

@@ -19,6 +19,82 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 
 
+def download_github_contents(api_url: str, target_dir: Path) -> None:
+    """
+    Recursively downloads contents from GitHub API URL to target directory.
+
+    Args:
+        api_url: str - GitHub API URL to fetch contents from
+        target_dir: Path - Directory to save downloaded files to
+    """
+    response = requests.get(api_url)
+    if response.status_code != 200:
+        click.echo(
+            FeedbackManager.error(message=f"Failed to fetch contents from GitHub: {response.json().get('message', '')}")
+        )
+        return
+
+    contents = response.json()
+    if not isinstance(contents, list):
+        click.echo(FeedbackManager.error(message="Invalid response from GitHub API"))
+        return
+
+    for item in contents:
+        item_path = target_dir / item["name"]
+
+        if item["type"] == "dir":
+            # Create directory and recursively download its contents
+            item_path.mkdir(parents=True, exist_ok=True)
+            download_github_contents(item["url"], item_path)
+        elif item["type"] == "file":
+            # Download file
+            file_response = requests.get(item["download_url"])
+            if file_response.status_code == 200:
+                item_path.write_bytes(file_response.content)
+                click.echo(FeedbackManager.info(message=f"Downloaded {item['path']}"))
+            else:
+                click.echo(FeedbackManager.warning(message=f"Failed to download {item['path']}"))
+
+
+def download_github_template(url: str) -> Optional[Path]:
+    """
+    Downloads a template from a GitHub URL and returns the path to the downloaded files.
+
+    Args:
+        url: str - GitHub URL in the format https://github.com/owner/repo/tree/branch/path
+
+    Returns:
+        Optional[Path] - Path to the downloaded template or None if download fails
+    """
+    # Parse GitHub URL components
+    # From: https://github.com/owner/repo/tree/branch/path
+    # To: api.github.com/repos/owner/repo/contents/path?ref=branch
+    parts = url.replace("https://github.com/", "").split("/")
+    if len(parts) < 5 or "tree" not in parts:
+        click.echo(
+            FeedbackManager.error(
+                message="Invalid GitHub URL format. Expected: https://github.com/owner/repo/tree/branch/path"
+            )
+        )
+        return None
+
+    owner = parts[0]
+    repo = parts[1]
+    branch = parts[parts.index("tree") + 1]
+    path = "/".join(parts[parts.index("tree") + 2 :])
+
+    api_url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}?ref={branch}"
+
+    # Create temporary directory for template
+
+    dir = Path(".")
+
+    # Recursively download all files
+    download_github_contents(api_url, dir)
+
+    return dir
+
+
 # TODO(eclbg): This should eventually end up in client.py, but we're not using it here yet.
 def api_fetch(url: str, headers: dict) -> dict:
     r = requests.get(url, headers=headers)
@@ -215,14 +291,19 @@ def deployment_group() -> None:
     default=False,
     help="Allow removing datasources. Disabled by default.",
 )
+@click.option(
+    "--template",
+    default=None,
+    help="URL of the template to use for the deployment. Example: https://github.com/tinybirdco/web-analytics-starter-kit/tree/main/tinybird",
+)
 @click.pass_context
 def deployment_create(
-    ctx: click.Context, wait: bool, auto: bool, check: bool, allow_destructive_operations: bool
+    ctx: click.Context, wait: bool, auto: bool, check: bool, allow_destructive_operations: bool, template: Optional[str]
 ) -> None:
     """
     Validate and deploy the project server side.
     """
-    create_deployment(ctx, wait, auto, check, allow_destructive_operations)
+    create_deployment_cmd(ctx, wait, auto, check, allow_destructive_operations, template)
 
 
 @deployment_group.command(name="ls")
@@ -330,11 +411,38 @@ def deployment_discard(ctx: click.Context, wait: bool) -> None:
     default=False,
     help="Allow removing datasources. Disabled by default.",
 )
+@click.option(
+    "--template",
+    default=None,
+    help="URL of the template to use for the deployment. Example: https://github.com/tinybirdco/web-analytics-starter-kit/tree/main/tinybird",
+)
 @click.pass_context
-def deploy(ctx: click.Context, wait: bool, auto: bool, check: bool, allow_destructive_operations: bool) -> None:
+def deploy(
+    ctx: click.Context, wait: bool, auto: bool, check: bool, allow_destructive_operations: bool, template: Optional[str]
+) -> None:
     """
     Deploy the project.
     """
+    create_deployment_cmd(ctx, wait, auto, check, allow_destructive_operations, template)
+
+
+def create_deployment_cmd(
+    ctx: click.Context,
+    wait: bool,
+    auto: bool,
+    check: Optional[bool] = None,
+    allow_destructive_operations: Optional[bool] = None,
+    template: Optional[str] = None,
+) -> None:
+    if template:
+        click.echo(FeedbackManager.info(message="» Downloading template..."))
+        try:
+            download_github_template(template)
+        except Exception as e:
+            click.echo(FeedbackManager.error(message=f"Error downloading template: {str(e)}"))
+            sys_exit("deployment_error", f"Failed to download template {template}")
+        click.echo(FeedbackManager.success(message="Template downloaded successfully"))
+
     create_deployment(ctx, wait, auto, check, allow_destructive_operations)
 
 

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/tinybird/tb/modules/deprecations.py

@@ -15,10 +15,14 @@ def branch(args) -> None:
     """
     `tb branch` is deprecated. You should rely on your version control system to manage branches.
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated. You should rely on your version control system to manage branches."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
+    click.echo(
+        FeedbackManager.warning(
+            message="This command is deprecated. You should rely on your version control system to manage branches."
+        )
+    )
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
 
 
 @cli.command(
@@ -32,10 +36,10 @@ def check(args) -> None:
     """
     `tb check` is deprecated.
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
+    click.echo(FeedbackManager.warning(message="This command is deprecated."))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
 
 
 @cli.command(
@@ -49,10 +53,10 @@ def diff(args) -> None:
     """
     `tb diff` is deprecated.
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
+    click.echo(FeedbackManager.warning(message="This command is deprecated."))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
 
 
 @cli.command(
@@ -66,10 +70,10 @@ def fmt(args) -> None:
     """
     `tb fmt` is deprecated.
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
+    click.echo(FeedbackManager.warning(message="This command is deprecated."))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
 
 
 @cli.command(
@@ -83,11 +87,10 @@ def init(args) -> None:
     """
     `tb init` is deprecated. Use `tb create` instead.
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated. Use `tb create` instead."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
-
+    click.echo(FeedbackManager.warning(message="This command is deprecated. Use `tb create` instead."))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
 
 
 @cli.command(
@@ -101,11 +104,10 @@ def push(args) -> None:
     """
     `tb push` is deprecated. Use `tb deploy` instead.
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated. Use `tb deploy` instead."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
-
+    click.echo(FeedbackManager.warning(message="This command is deprecated. Use `tb deploy` instead."))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )
 
 
 @cli.command(
@@ -119,9 +121,7 @@ def tag(args) -> None:
     """
     `tb tag` is deprecated
     """
-    click.echo(FeedbackManager.warning( 
-        message="This command is deprecated."
-    ))
-    click.echo("You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward")
-
-
+    click.echo(FeedbackManager.warning(message="This command is deprecated."))
+    click.echo(
+        "You are using Tinybird Forward CLI.\nYou can find more information in the docs at https://www.tinybird.co/docs/forward"
+    )

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/tinybird/tb/modules/feedback_manager.py

@@ -508,7 +508,7 @@ Ready? """
   STEP 1: AWS AUTHENTICATION
 ──────────────────────────────────────────────────────────────
 
-Please log into your \033]8;;https://console.aws.amazon.com/\033\\AWS Console\033]8;;\033\\. We'll guide you through creating the necessary permissions.
+Please log into your AWS Console. We'll guide you through creating the necessary permissions: https://console.aws.amazon.com/
 
 You'll be creating a single IAM Policy and Roles (you will need one per environment, Local and Cloud) to access your S3 data. Using IAM Roles improves security by providing temporary credentials and following least privilege principles.""")
 
@@ -518,7 +518,7 @@ You'll be creating a single IAM Policy and Roles (you will need one per environm
 STEP 2: CREATE IAM POLICY
 ──────────────────────────────────────────────────────────────
 
-1. Go to \033]8;;https://console.aws.amazon.com/iamv2/home?region={aws_region}#/policies/create\033\\AWS IAM > Create Policy\033]8;;\033\\
+1. Go to AWS IAM > Create Policy: https://console.aws.amazon.com/iamv2/home?region={aws_region}#/policies/create
 2. Select the JSON tab
 3. Paste the following policy (already copied to clipboard):
 
@@ -536,7 +536,7 @@ STEP 2: CREATE IAM POLICY
 STEP 2: CREATE IAM POLICY
 ──────────────────────────────────────────────────────────────
 
-1. Go to \033]8;;https://console.aws.amazon.com/iamv2/home?region={aws_region}#/policies/create\033\\AWS IAM > Create Policy\033]8;;\033\\
+1. Go to AWS IAM > Create Policy: https://console.aws.amazon.com/iamv2/home?region={aws_region}#/policies/create
 2. Select the JSON tab
 3. Copy and paste the following policy (replace <bucket> with your bucket name):
 
@@ -553,7 +553,7 @@ STEP 2: CREATE IAM POLICY
 STEP {step}: CREATE IAM ROLE FOR {environment} ENVIRONMENT
 ──────────────────────────────────────────────────────────────
 
-1. Go to \033]8;;https://console.aws.amazon.com/iamv2/home?region={aws_region}#/roles/create\033\\AWS IAM > Create Role\033]8;;\033\\
+1. Go to AWS IAM > Create Role: https://console.aws.amazon.com/iamv2/home?region={aws_region}#/roles/create
 2. Choose "Custom trust policy" and paste the following (already copied to clipboard):
 
 {trust_policy}
@@ -576,7 +576,7 @@ Please enter the ARN of the role you just created"""
 STEP {step}: CREATE IAM ROLE FOR {environment} ENVIRONMENT
 ──────────────────────────────────────────────────────────────
 
-1. Go to \033]8;;https://console.aws.amazon.com/iamv2/home?region={aws_region}#/roles/create\033\\AWS IAM > Create Role\033]8;;\033\\
+1. Go to AWS IAM > Create Role: https://console.aws.amazon.com/iamv2/home?region={aws_region}#/roles/create
 2. Choose "Custom trust policy" and paste the following:
 
 {trust_policy}
@@ -594,7 +594,7 @@ Please enter the ARN of the role you just created"""
 
   • File created at: {connection_path}
   • You can now use this connection in your Data Sources with: IMPORT_CONNECTION_NAME '{connection_name}'
-  • \033]8;;https://www.tinybird.co/docs/forward/get-data-in/connectors/s3\033\\Learn more about our S3 Connector\033]8;;\033\\
+  • Learn more about our S3 Connector: https://www.tinybird.co/docs/forward/get-data-in/connectors/s3
 """)
 
     # S3 IAM Role Connection Messages
@@ -608,7 +608,7 @@ Please enter the ARN of the role you just created"""
   STEP 1: GCP AUTHENTICATION
 ──────────────────────────────────────────────────────────────
 
-Please log into your \033]8;;https://console.cloud.google.com/\033\\GCP Console\033]8;;\033\\. We'll guide you through creating the necessary permissions.
+Please log into your GCP Console. We'll guide you through creating the necessary permissions: https://console.cloud.google.com/
 
 You'll be creating a Google Service Account and you will grant it access to you GCS data. Using Google Service Accounts is the Google recommended solution for this use case.""")
 
@@ -618,10 +618,10 @@ You'll be creating a Google Service Account and you will grant it access to you
 STEP 2: CREATE GCP SERVICE ACCOUNT
 ──────────────────────────────────────────────────────────────
 
-1. Go to \033]8;https://console.cloud.google.com/iam-admin/serviceaccounts/create\033\\IAM & Admin > Service Accounts > + Create Service Account\033]8;;\033\\
+1. Go to IAM & Admin > Service Accounts > + Create Service Account: https://console.cloud.google.com/iam-admin/serviceaccounts/create
 2. Provide a service account name. Name the service account something meaningful (e.g., TinybirdGCS-{environment}-svc-account)
 3. Click "Create and continue"
-4. Click the "Select a role" drop down menu and select "Storage Object Viewer" (You can add IAM condition to provide access to selected buckets. More info in \033]8;;https://www.tinybird.co/docs/forward/get-data-in/connectors/gcs\033\\IAM Conditions\033]8;;\033\\)
+4. Click the "Select a role" drop down menu and select "Storage Object Viewer" (You can add IAM condition to provide access to selected buckets. More info in IAM Conditions: https://www.tinybird.co/docs/forward/get-data-in/connectors/gcs)
 5. Click "Done"
 """
     )
@@ -644,7 +644,7 @@ STEP 3: ADD KEY TO SERVICE ACCOUNT
 
   • File created at: {connection_path}
   • You can now use this connection in your Data Sources with: IMPORT_CONNECTION_NAME '{connection_name}'
-  • \033]8;;https://www.tinybird.co/docs/forward/get-data-in/connectors/s3\033\\Learn more about our GCS Connector\033]8;;\033\\
+  • Learn more about our GCS Connector: https://www.tinybird.co/docs/forward/get-data-in/connectors/gcs
 """)
 
     prompt_init_git_release_pull = prompt_message(

{tinybird-0.0.1.dev147 → tinybird-0.0.1.dev148}/tinybird.egg-info/PKG-INFO

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