tinybird 0.0.1.dev108__tar.gz → 0.0.1.dev110__tar.gz

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

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

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev110}/tinybird/sql.py

@@ -9,6 +9,24 @@ valid_chars_name: str = string.ascii_letters + string.digits + "._`*<>+-'"
 valid_chars_fn: str = valid_chars_name + "[](),=!?:/ \n\t\r"
 
 INDEX_WHITELIST = ["minmax", "set", "bloom_filter", "ngrambf_v1", "tokenbf_v1"]
+INDEX_SUPPORTED_TYPES = {
+    "bloom_filter": [
+        "Int*",
+        "UInt*",
+        "Float*",
+        "Enum",
+        "Date",
+        "DateTime",
+        "String",
+        "FixedString",
+        "Array",
+        "LowCardinality",
+        "Nullable",
+        "UUID",
+        "Map",
+    ],
+    "ngrambf_v1": ["String", "FixedString", "Map"],
+}
 
 
 @dataclass
@@ -39,12 +57,37 @@ class TableIndex:
     def clear_index_sql(self):
         return f"CLEAR INDEX IF EXISTS {self.name}"
 
-    def validate_allowed(self):
+    def _validate_index_type(self, table_structure: List[Dict[str, Any]]):
+        for col in table_structure:
+            if col["normalized_name"] != self.expr:
+                continue
+            col_type = col["type"]
+            index_supported_types: Optional[str] = next((t for t in INDEX_SUPPORTED_TYPES if t in self.type_full), None)
+
+            if index_supported_types:
+                for supported_type in INDEX_SUPPORTED_TYPES.get(index_supported_types, []):
+                    # Convert supported type to regex pattern
+                    # Replace * with \d+ to match any number
+                    pattern = supported_type.replace("*", r"\d+")
+                    if re.match(f"^{pattern}$", col_type):
+                        return
+                raise ValueError(
+                    f"Not allowed data type '{col_type}' for index '{self.type_full}' for column '{self.expr}' "
+                )
+
+    def validate_allowed(self, table_structure: Optional[List[Dict[str, Any]]] = None):
         """
         Validate at API level not to depend on CLI version
         """
         if not any(index in self.type_full for index in INDEX_WHITELIST):
             raise ValueError(f"Not allowed index '{self.type_full}'")
+        try:
+            if table_structure:
+                self._validate_index_type(table_structure)
+        except ValueError as e:
+            raise e
+        except Exception:
+            logging.exception(f"Error validating index '{self.type_full}' for column '{self.expr}'")
 
 
 @dataclass

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

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

@@ -49,7 +49,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Tinybird CLI
-        run: curl -LsSf https://api.tinybird.co/static/install.sh | sh
+        run: curl https://tinybird.co | sh
       - name: Build project
         run: tb build
       - name: Test project
@@ -81,7 +81,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Install Tinybird CLI
-        run: curl -LsSf https://api.tinybird.co/static/install.sh | sh
+        run: curl https://tinybird.co | sh
       - name: Deploy project
         run: tb --cloud --host ${{! env.TINYBIRD_HOST }} --token ${{! env.TINYBIRD_TOKEN }} deploy
 """
@@ -110,7 +110,7 @@ tinybird_ci_workflow:
         - {{ data_project_dir }}/**/*{% end %}
   before_script:
     - apt update && apt install -y curl
-    - curl -LsSf https://api.tinybird.co/static/install.sh | sh
+    - curl https://tinybird.co | sh
   script:
     - export PATH="$HOME/.local/bin:$PATH"
     - cd $CI_PROJECT_DIR/{{ data_project_dir }}

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev110}/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-0.0.1.dev108 → tinybird-0.0.1.dev110}/tinybird/tb/modules/local.py

@@ -1,12 +1,14 @@
 import re
 import subprocess
 import time
+from typing import Optional
 
 import boto3
 import click
 
 import docker
 from docker.client import DockerClient
+from docker.models.containers import Container
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException
@@ -41,10 +43,9 @@ def start_tinybird_local(
     if pull_required:
         docker_client.images.pull(TB_IMAGE_NAME, platform="linux/amd64")
 
-    container = None
-    containers = docker_client.containers.list(all=True, filters={"name": TB_CONTAINER_NAME})
-    if containers:
-        container = containers[0]
+    environment = get_use_aws_creds() if use_aws_creds else {}
+
+    container = get_existing_container_with_matching_env(docker_client, TB_CONTAINER_NAME, environment)
 
     if container and not pull_required:
         # Container `start` is idempotent. It's safe to call it even if the container is already running.
@@ -53,8 +54,6 @@ def start_tinybird_local(
         if container:
             container.remove(force=True)
 
-        environment = get_use_aws_creds() if use_aws_creds else {}
-
         container = docker_client.containers.run(
             TB_IMAGE_NAME,
             name=TB_CONTAINER_NAME,
@@ -82,6 +81,43 @@ def start_tinybird_local(
         image.remove(force=True)
 
 
+def get_existing_container_with_matching_env(
+    docker_client: DockerClient, container_name: str, required_env: dict[str, str]
+) -> Optional[Container]:
+    """
+    Checks if a container with the given name exists and has matching environment variables.
+    If it exists but environment doesn't match, it returns None.
+
+    Args:
+        docker_client: The Docker client instance
+        container_name: The name of the container to check
+        required_env: Dictionary of environment variables that must be present
+
+    Returns:
+        The container if it exists with matching environment, None otherwise
+    """
+    container = None
+    containers = docker_client.containers.list(all=True, filters={"name": container_name})
+    if containers:
+        container = containers[0]
+
+    if container and required_env:
+        container_info = container.attrs
+        container_env = container_info.get("Config", {}).get("Env", [])
+        env_missing = False
+        for key, value in required_env.items():
+            env_var = f"{key}={value}"
+            if env_var not in container_env:
+                env_missing = True
+                break
+
+        if env_missing:
+            container.remove(force=True)
+            container = None
+
+    return container
+
+
 def get_docker_client() -> DockerClient:
     """Check if Docker is installed and running."""
     try:
@@ -156,7 +192,7 @@ def update_cli():
             text=True,
         )
     except FileNotFoundError:
-        raise CLIException("Cannot find required tool: uv. Reinstall using: curl -LsSf tbrd.co/fwd | sh")
+        raise CLIException("Cannot find required tool: uv. Reinstall using: curl https://tinybird.co | sh")
 
     stdout, stderr = process.communicate()
     if "Nothing to upgrade" not in stdout + stderr:
@@ -208,7 +244,12 @@ async def remove() -> None:
 
 @local.command()
 @coro
-@click.option("--use-aws-creds", default=False, is_flag=True, help="Use local AWS credentials")
+@click.option(
+    "--use-aws-creds",
+    default=False,
+    is_flag=True,
+    help="Use local AWS credentials from your environment and pass them to the Tinybird docker container",
+)
 async def start(use_aws_creds: bool) -> None:
     """Start Tinybird Local"""
     click.echo(FeedbackManager.highlight(message="» Starting Tinybird Local..."))
@@ -219,7 +260,12 @@ async def start(use_aws_creds: bool) -> None:
 
 @local.command()
 @coro
-@click.option("--use-aws-creds", is_flag=True, help="Use local AWS credentials")
+@click.option(
+    "--use-aws-creds",
+    default=False,
+    is_flag=True,
+    help="Use local AWS credentials from your environment and pass them to the Tinybird docker container",
+)
 async def restart(use_aws_creds: bool) -> None:
     """Restart Tinybird Local"""
     click.echo(FeedbackManager.highlight(message="» Restarting Tinybird Local..."))

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev110}/tinybird/tb/modules/login.py

@@ -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.dev108 → tinybird-0.0.1.dev110}/tinybird.egg-info/PKG-INFO

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