tinybird 0.0.1.dev224__tar.gz → 0.0.1.dev226__tar.gz

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev224
+Version: 0.0.1.dev226
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/datafile/common.py

@@ -1710,6 +1710,8 @@ def parse(
             "s3_access_key": assign_var("s3_access_key"),
             "s3_secret": assign_var("s3_secret"),
             "gcs_service_account_credentials_json": assign_var_json("gcs_service_account_credentials_json"),
+            "gcs_access_id": assign_var("gcs_hmac_access_id"),
+            "gcs_secret": assign_var("gcs_hmac_secret"),
             "gcs_hmac_access_id": assign_var("gcs_hmac_access_id"),
             "gcs_hmac_secret": assign_var("gcs_hmac_secret"),
             "include": include,

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/prompts.py

@@ -896,11 +896,10 @@ You have commands at your disposal to develop a tinybird project:
 - {base_command} build: to build the project locally and check it works.
 - {base_command} deployment create --wait --auto: to create a deployment and promote it automatically
 - {base_command} test run: to run existing tests
-- {base_command} --build endpoint url <pipe_name>: to get the url of an endpoint, token included.
-- {base_command} --build endpoint data <pipe_name>: to get the data of an endpoint. You can pass parameters to the endpoint like this: {base_command} --build endpoint data <pipe_name> --param1 value1 --param2 value2
-- {base_command} --build token ls: to list all the tokens
+- {base_command} endpoint url <pipe_name>: to get the url of an endpoint, token included.
+- {base_command} endpoint data <pipe_name>: to get the data of an endpoint. You can pass parameters to the endpoint like this: {base_command} endpoint data <pipe_name> --param1 value1 --param2 value2
+- {base_command}  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 cloud, add always the --cloud flag before the command. Example: {base_command} --cloud datasource ls
 </command_calling>
 <development_instructions>
@@ -925,7 +924,7 @@ When asking for ingesting data, adding data or appending data do the following d
 - 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.
 - 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.
+- When you have a response that says “there are rows in quarantine”, do `{base_command} [--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:
@@ -975,6 +974,93 @@ Follow these instructions when evolving a datasource schema:
     )
 
 
+def claude_rules_prompt(source: Optional[str] = None) -> str:
+    base_command = source or "tb"
+    return """
+# Tinybird CLI rules
+
+## Commands
+You have commands at your disposal to develop a tinybird project:
+- {base_command} build: to build the project locally and check it works.
+- {base_command} deployment create --wait --auto: to create a deployment and promote it automatically
+- {base_command} test run: to run existing tests
+- {base_command} endpoint url <pipe_name>: to get the url of an endpoint, token included.
+- {base_command} endpoint data <pipe_name>: to get the data of an endpoint. You can pass parameters to the endpoint like this: {base_command} endpoint data <pipe_name> --param1 value1 --param2 value2
+- {base_command}  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 cloud, add always the --cloud flag before the command. Example: {base_command} --cloud datasource ls
+
+## Development instructions
+- When asking to create a tinybird data project, if the needed folders are not already created, use the following structure:
+├── connections
+├── copies
+├── sinks
+├── datasources
+├── endpoints
+├── fixtures
+├── materializations
+├── pipes
+└── tests
+- The local development server will be available at http://localhost:7181. Even if some response uses another base url, use always http://localhost:7181.
+- After every change in your .datasource, .pipe or .ndjson files, run `{base_command} build` to build the project locally.
+- When you need to ingest data locally in a datasource, create a .ndjson file with the same name of the datasource and the data you want and run `{base_command} build` so the data is ingested.
+- The format of the generated api endpoint urls is: http://localhost:7181/v0/pipe/<pipe_name>.json?token=<token>
+- Before running the tests, remember to have the project built with `{base_command} build` with the latest changes.
+</development_instructions>
+When asking for ingesting data, adding data or appending data do the following depending on the environment you want to work with:
+
+## Ingestion 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.
+- 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} [--cloud] datasource data <datasource_name>_quarantine` to understand what is the problem.
+
+## .datasource file instructions
+Follow these instructions when creating or updating .datasource files:
+{datasource_instructions}
+
+## .pipe file instructions
+Follow these instructions when creating or updating .pipe files:
+{pipe_instructions}
+{sql_instructions}
+{datasource_example}
+{pipe_example}
+{copy_pipe_instructions}
+{materialized_pipe_instructions}
+{sink_pipe_instructions}
+{connection_instructions}
+{kafka_connection_example}
+{gcs_connection_example}
+{gcs_hmac_connection_example}
+{s3_connection_example}
+
+## .test file instructions
+Follow these instructions when creating or updating .yaml files for tests:
+{test_instructions}
+
+## Deployment instructions
+Follow these instructions when evolving a datasource schema:
+{deployment_instructions}
+""".format(
+        base_command=base_command,
+        datasource_instructions=datasource_instructions,
+        pipe_instructions=pipe_instructions,
+        sql_instructions=sql_instructions,
+        datasource_example=datasource_example,
+        pipe_example=pipe_example,
+        copy_pipe_instructions=copy_pipe_instructions,
+        materialized_pipe_instructions=materialized_pipe_instructions,
+        sink_pipe_instructions=sink_pipe_instructions,
+        test_instructions=test_instructions,
+        deployment_instructions=deployment_instructions,
+        connection_instructions=connection_instructions,
+        kafka_connection_example=kafka_connection_example,
+        gcs_connection_example=gcs_connection_example,
+        gcs_hmac_connection_example=gcs_hmac_connection_example,
+        s3_connection_example=s3_connection_example,
+    )
+
+
 test_instructions = """
 - The test file name must match the name of the pipe it is testing.
 - Every scenario name must be unique inside the test file.

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev224'
-__revision__ = 'c632cc3'
+__version__ = '0.0.1.dev226'
+__revision__ = '7ee5a2e'

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/tb/modules/common.py

@@ -1761,18 +1761,11 @@ async def run_aws_iamrole_connection_flow(
 
 async def run_gcp_svc_account_connection_flow(
     environment: str,
-) -> Tuple[str, str, str]:
-    bucket_name = click.prompt(
-        "📦 Bucket name (specific name recommended, use '*' for unrestricted access in IAM policy)",
-        prompt_suffix="\n> ",
-    )
-    validate_string_connector_param("Bucket", bucket_name)
-
+) -> None:
     click.echo(FeedbackManager.prompt_gcs_svc_account_login_gcp())
     click.echo(FeedbackManager.click_enter_to_continue())
     input()
 
-    # Display message and wait for user to press Enter
     click.echo(FeedbackManager.prompt_gcs_service_account_creation_flow(environment=environment))
     click.echo(FeedbackManager.click_enter_to_continue())
     input()
@@ -1781,8 +1774,6 @@ async def run_gcp_svc_account_connection_flow(
     click.echo(FeedbackManager.click_enter_to_continue())
     input()
 
-    return bucket_name
-
 
 async def production_aws_iamrole_only(
     prod_client: TinyB,

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/tb/modules/connection.py

@@ -203,7 +203,10 @@ async def connection_create_s3(ctx: Context) -> None:
     )
     unique_suffix = uuid.uuid4().hex[:8]  # Use first 8 chars of a UUID for brevity
     secret_name = f"s3_role_arn_{connection_name}_{unique_suffix}"
-    save_secret_to_env_file(project=project, name=secret_name, value=role_arn)
+    if obj["env"] == "local":
+        save_secret_to_env_file(project=project, name=secret_name, value=role_arn)
+    else:
+        await client.create_secret(name=secret_name, value=role_arn)
 
     create_in_cloud = (
         click.confirm(FeedbackManager.prompt_connection_in_cloud_confirmation(), default=True)
@@ -267,15 +270,19 @@ async def connection_create_gcs(ctx: Context) -> None:
     """
     project: Project = ctx.ensure_object(dict)["project"]
     obj: Dict[str, Any] = ctx.ensure_object(dict)
+    client: TinyB = obj["client"]
 
     service = DataConnectorType.GCLOUD_STORAGE
     click.echo(FeedbackManager.prompt_gcs_connection_header())
     connection_name = get_gcs_connection_name(project.folder)
-    _ = await run_gcp_svc_account_connection_flow(environment=obj["env"])
+    await run_gcp_svc_account_connection_flow(environment=obj["env"])
     creds_json = get_gcs_svc_account_creds()
     unique_suffix = uuid.uuid4().hex[:8]  # Use first 8 chars of a UUID for brevity
     secret_name = f"gcs_svc_account_creds_{connection_name}_{unique_suffix}"
-    save_secret_to_env_file(project=project, name=secret_name, value=creds_json)
+    if obj["env"] == "local":
+        save_secret_to_env_file(project=project, name=secret_name, value=creds_json)
+    else:
+        await client.create_secret(name=secret_name, value=creds_json)
 
     connection_path = await generate_gcs_connection_file_with_secrets(
         name=connection_name,

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/tb/modules/create.py

@@ -1,6 +1,7 @@
 import glob
 import os
 import re
+import shutil
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 from urllib.parse import urlparse
@@ -8,7 +9,7 @@ from urllib.parse import urlparse
 import click
 import requests
 
-from tinybird.prompts import create_prompt, readme_prompt, rules_prompt
+from tinybird.prompts import claude_rules_prompt, create_prompt, readme_prompt, rules_prompt
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cicd import init_cicd
 from tinybird.tb.modules.cli import cli
@@ -144,6 +145,13 @@ async def create(
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
             created_something = True
 
+        if not already_has_claude_rules(root_folder):
+            click.echo(FeedbackManager.highlight(message="\n» Creating Claude Code rules..."))
+            create_claude_rules(root_folder, "tb")
+            click.echo(FeedbackManager.info(message="CLAUDE.md"))
+            click.echo(FeedbackManager.success(message="✓ Done!\n"))
+            created_something = True
+
         if should_generate_fixtures(result):
             click.echo(FeedbackManager.highlight(message="\n» Generating fixtures..."))
 
@@ -246,6 +254,11 @@ def already_has_cursor_rules(folder: str) -> bool:
     return any((Path(folder) / path).exists() for path in cursor_rules_paths)
 
 
+def already_has_claude_rules(folder: str) -> bool:
+    claude_rules_path = "CLAUDE.md"
+    return (Path(folder) / claude_rules_path).exists()
+
+
 def already_has_env_file(folder: str) -> bool:
     env_file_pattern = ".env.*"
     return any((Path(folder) / path).exists() for path in glob.glob(env_file_pattern))
@@ -466,9 +479,22 @@ def create_rules(folder: str, source: str, agent: str):
     elif agent == "windsurf":
         extension = ".windsurfrules"
     else:
-        extension = ".txt"
+        extension = ".md"
+
     rules_file = Path(folder) / extension
-    rules_file.write_text(rules_prompt(source))
+    rules_content = rules_prompt(source)
+    rules_file.write_text(rules_content)
+
+
+def create_claude_rules(folder: str, source: str):
+    try:
+        is_claude_code_installed = shutil.which("claude") is not None
+        if is_claude_code_installed:
+            rules_content = claude_rules_prompt(source)
+            claude_file = Path(folder) / "CLAUDE.md"
+            claude_file.write_text(rules_content)
+    except Exception:
+        pass
 
 
 def get_context_file() -> Path:

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/tb/modules/feedback_manager.py

@@ -631,7 +631,13 @@ STEP 2: CREATE GCP SERVICE ACCOUNT
 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 IAM Conditions: https://www.tinybird.co/docs/forward/get-data-in/connectors/gcs)
+4. Click the "Select a role" drop down menu and select:
+- "Storage Object Viewer" for GCS Data Source (reading from GCS)
+- For GCS Sink (writing to GCS), select all three roles:
+  • "Storage Object Creator" - Allows users to create objects
+  • "Storage Object Viewer" - Grants access to view objects and their metadata
+  • "Storage Bucket Viewer" - Grants access to view buckets and their metadata
+(You can add IAM condition to provide access to selected buckets. More info in IAM Conditions: https://cloud.google.com/iam/docs/conditions-overview)
 5. Click "Done"
 """
     )
@@ -654,7 +660,9 @@ 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}'
+  • You can also use this connection in your Pipes with: EXPORT_CONNECTION_NAME '{connection_name}'
   • Learn more about our GCS Connector: https://www.tinybird.co/docs/forward/get-data-in/connectors/gcs
+  • Learn more about our GCS Sinks: https://www.tinybird.co/docs/forward/work-with-data/publish-data/gcs-sinks
 """)
 
     prompt_init_git_release_pull = prompt_message(

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird/tb/modules/login.py

@@ -1,8 +1,10 @@
 import http.server
 import os
 import platform
+import random
 import shutil
 import socketserver
+import string
 import subprocess
 import sys
 import threading
@@ -127,8 +129,14 @@ def start_server(auth_callback, auth_host):
     default=False,
     help="Show available regions and select where to authenticate to",
 )
+@click.option(
+    "--method",
+    type=click.Choice(["browser", "code"]),
+    default="browser",
+    help="Set the authentication method to use. Default: browser.",
+)
 @coro
-async def login(host: Optional[str], auth_host: str, workspace: str, interactive: bool):
+async def login(host: Optional[str], auth_host: str, workspace: str, interactive: bool, method: str):
     """Authenticate using the browser."""
     try:
         cli_config = CLIConfig.get_project_config()
@@ -154,6 +162,49 @@ async def login(host: Optional[str], auth_host: str, workspace: str, interactive
         host = host.rstrip("/")
         auth_host = auth_host.rstrip("/")
 
+        if method == "code":
+            display_code, one_time_code = create_one_time_code()
+            click.echo(FeedbackManager.info(message=f"First, copy your one-time code: {display_code}"))
+            click.echo(FeedbackManager.info(message="Press [Enter] to continue in the browser..."))
+            input()
+            click.echo(FeedbackManager.highlight(message="» Opening browser for authentication..."))
+            params = {
+                "apiHost": host,
+                "code": one_time_code,
+                "method": "code",
+            }
+            auth_url = f"{auth_host}/api/cli-login?{urlencode(params)}"
+            open_url(auth_url)
+            click.echo(
+                FeedbackManager.info(message="\nIf browser does not open, please open the following URL manually:")
+            )
+            click.echo(FeedbackManager.info(message=auth_url))
+
+            async def poll_for_tokens():
+                while True:
+                    params = {
+                        "apiHost": host,
+                        "cliCode": one_time_code,
+                        "method": "code",
+                    }
+                    response = requests.get(f"{auth_host}/api/cli-login?{urlencode(params)}")  # noqa: ASYNC210
+
+                    try:
+                        if response.status_code == 200:
+                            data = response.json()
+                            user_token = data.get("user_token", "")
+                            workspace_token = data.get("workspace_token", "")
+                            if user_token and workspace_token:
+                                await authenticate_with_tokens(data, host, cli_config)
+                                break
+                    except Exception:
+                        pass
+
+                    time.sleep(2)  # noqa: ASYNC251
+
+            await poll_for_tokens()
+            return
+
         auth_event = threading.Event()
         auth_code: list[str] = []  # Using a list to store the code, as it's mutable
 
@@ -190,32 +241,7 @@ async def login(host: Optional[str], auth_host: str, workspace: str, interactive
             )
 
             data = response.json()
-            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", ""))
-            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:
-                    cli_config[k] = ws[k]
-
-            path = os.path.join(os.getcwd(), ".tinyb")
-            cli_config.persist_to_file(override_with_path=path)
-
-            auth_info: Dict[str, Any] = await cli_config.get_user_client().check_auth_login()
-            if not auth_info.get("is_valid", False):
-                raise Exception(FeedbackManager.error_auth_login_not_valid(host=cli_config.get_host()))
-
-            if not auth_info.get("is_user", False):
-                raise Exception(FeedbackManager.error_auth_login_not_user(host=cli_config.get_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!"))
+            await authenticate_with_tokens(data, host, cli_config)
         else:
             raise Exception("Authentication failed or timed out.")
     except Exception as e:
@@ -272,3 +298,38 @@ def open_url(url: str, *, new_tab: bool = False) -> bool:
 
     # 5. If everything failed, let the caller know.
     return False
+
+
+def create_one_time_code():
+    """Create a random one-time code for the authentication process in the format of A2C4-D2G4 (only uppercase letters and digits)"""
+    seperator = "-"
+    full_code = "".join(random.choices(string.ascii_uppercase + string.digits, k=8))
+    parts = [full_code[:4], full_code[4:]]
+    return seperator.join(parts), full_code
+
+
+async def authenticate_with_tokens(data: Dict[str, Any], host: Optional[str], cli_config: CLIConfig):
+    cli_config.set_token(data.get("workspace_token", ""))
+    host = host or data.get("api_host", "")
+    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)
+    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:
+            cli_config[k] = ws[k]
+
+    path = os.path.join(os.getcwd(), ".tinyb")
+    cli_config.persist_to_file(override_with_path=path)
+
+    auth_info: Dict[str, Any] = await cli_config.get_user_client().check_auth_login()
+    if not auth_info.get("is_valid", False):
+        raise Exception(FeedbackManager.error_auth_login_not_valid(host=cli_config.get_host()))
+
+    if not auth_info.get("is_user", False):
+        raise Exception(FeedbackManager.error_auth_login_not_user(host=cli_config.get_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!"))

{tinybird-0.0.1.dev224 → tinybird-0.0.1.dev226}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev224
+Version: 0.0.1.dev226
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird