tinybird 0.0.1.dev108__py3-none-any.whl → 0.0.1.dev110__py3-none-any.whl

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/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/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/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,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/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.dist-info → tinybird-0.0.1.dev110.dist-info}/METADATA

@@ -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.dist-info → tinybird-0.0.1.dev110.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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=0i4Bzg-60lV6NlrQ1Vu6NZ_2we3GqV3rExu77YfA0V4,33889
-tinybird/sql.py,sha256=J35bhdpuu84HW2tiLp-cs_nzkRwPhiy1yPcFhcWMCR4,46248
+tinybird/sql.py,sha256=C_B81wwv3BsqyXGhF5oTk9DcTUkrp7NwIFqSzd3Dmjc,47854
 tinybird/sql_template.py,sha256=mK0yeRFctbXTAu0VNMjIzoFBJoh9PoniAVgEatA5SG4,99832
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
 tinybird/sql_toolset.py,sha256=KORVbNAUTfW1qo3U9oe7Z59xQ0QMsFhB0ji3HzY2JVo,15324
@@ -15,11 +15,11 @@ 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=OSNR6WHHR8BSY9FOJAY3RW4JLaPIKXViXTAQ-ptYsYg,252
+tinybird/tb/__cli__.py,sha256=nWZHU4E-KvHLB4OyR1gFO9T0XZFvxUwB3SRqcAoINyU,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
-tinybird/tb/modules/cicd.py,sha256=F0hQw-TExU9W3NpUSY-msNZ4tlaPeTXjRDpFZ2B2STU,7023
+tinybird/tb/modules/cicd.py,sha256=k2hCout_N1g_rRAMWo_cf9tAGiJ1Puu5eiTV2DPob20,6939
 tinybird/tb/modules/cli.py,sha256=XtdwMI5uPoKfhlpSuCuhzODRJfTCx1oXHz_bn3x1OBg,16047
 tinybird/tb/modules/common.py,sha256=6AmvMe8Uj-5A46aUlM3wJg7AilkJEAmHt1hTOb5IH2w,82957
 tinybird/tb/modules/config.py,sha256=FqdLpLaKpYubqw3xkB4EX06ufZYDgGRxONR_9i-y-KE,11416
@@ -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=4BhxfkSTHpckXmH4aU_BothlV5n4JyAIoBKX3wP_BZg,7863
+tinybird/tb/modules/local.py,sha256=CYc35OxihraGUD3frLemz_7Tz_q6zZ9nf___CT1teuI,9332
 tinybird/tb/modules/local_common.py,sha256=RN5OEncHdq7ua4AZ--WgKtaFuEsLvIhq_ROHJadRXXA,3188
-tinybird/tb/modules/login.py,sha256=98b7obc1yQtDtoB-88yyEj_X99ZvVRB13q261AMKJBM,6270
+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.dev108.dist-info/METADATA,sha256=gXcf738MA5OAGkVcougBzsBLqsPi-1fff5sNv6bAjGU,1612
-tinybird-0.0.1.dev108.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev108.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev108.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev108.dist-info/RECORD,,
+tinybird-0.0.1.dev110.dist-info/METADATA,sha256=lQOlesa4BTowVCtRXrLSiOr1GzGDu5MUncxDYbXbWgI,1612
+tinybird-0.0.1.dev110.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev110.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev110.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev110.dist-info/RECORD,,