tinybird 0.0.1.dev119__tar.gz → 0.0.1.dev121__tar.gz

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/PKG-INFO

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

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/datatypes.py

@@ -5,11 +5,14 @@ from decimal import Decimal
 from typing import Callable, Dict, List, Optional, Tuple
 
 datetime64_patterns = [
-    r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d.\d\d\d",
-    r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}.\d{1,3}",
+    re.compile(r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d.\d\d\d"),
+    re.compile(r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}.\d{1,3}"),
 ]
 
-datetime_patterns = [r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d", r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}"]
+datetime_patterns = [
+    re.compile(r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d"),
+    re.compile(r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}"),
+]
 
 int_8_max = 2**7
 int16_max = 2**15
@@ -23,13 +26,15 @@ uint32_max = 2**32
 uint64_max = 2**64
 uint128_max = 2**128
 uint256_max = 2**256
-intx_re = r"^[+-]?\d+$"
-uintx_re = r"^\d+$"
+intx_re = re.compile(r"^[+-]?\d+$")
+uintx_re = re.compile(r"^\d+$")
 float32_max = 2**23  # 23 bits is the fractional part of float 32 ieee754
 float64_max = 2**52  # 51 bits is the fractional part of float 64 ieee754
 
-datetime64_type_pattern = r"^DateTime64(\([1-9](, ?'.+')?\))?$"
-datetime_type_pattern = r"^DateTime(\(('.+')?)?\)?$"
+date_pattern = re.compile(r"\d\d\d\d-\d\d-\d\d$")
+
+datetime64_type_pattern = re.compile(r"^DateTime64(\([1-9](, ?'.+')?\))?$")
+datetime_type_pattern = re.compile(r"^DateTime(\(('.+')?)?\)?$")
 
 # List from https://github.com/tinybirdco/ClickHousePrivate/blob/153473d9c1c871974688a1d72dcff7a13fc2076c/src/DataTypes/Serializations/SerializationBool.cpp#L216
 bool_allowed_values = {
@@ -71,7 +76,7 @@ def is_type_datetime64(type_to_check: str) -> bool:
     >>> is_type_datetime64("datetime64")
     False
     """
-    return re.match(datetime64_type_pattern, type_to_check) is not None
+    return datetime64_type_pattern.match(type_to_check) is not None
 
 
 def is_type_datetime(type_to_check: str) -> bool:
@@ -87,7 +92,7 @@ def is_type_datetime(type_to_check: str) -> bool:
     >>> is_type_datetime("datetime")
     False
     """
-    return re.match(datetime_type_pattern, type_to_check) is not None
+    return datetime_type_pattern.match(type_to_check) is not None
 
 
 def string_test(x: str) -> bool:
@@ -95,63 +100,63 @@ def string_test(x: str) -> bool:
 
 
 def date_test(x: str) -> bool:
-    return re.match(r"\d\d\d\d-\d\d-\d\d$", x) is not None
+    return date_pattern.match(x) is not None
 
 
 def datetime64_test(x: str) -> bool:
-    return any([re.match(p, x) for p in datetime64_patterns])
+    return any([p.match(x) for p in datetime64_patterns])
 
 
 def datetime_test(x: str) -> bool:
-    return any([re.match(p, x) for p in datetime_patterns])
+    return any([p.match(x) for p in datetime_patterns])
 
 
 def int_8_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int_8_max <= int(x) < int_8_max
+    return intx_re.match(x) is not None and -int_8_max <= int(x) < int_8_max
 
 
 def int16_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int16_max <= int(x) < int16_max
+    return intx_re.match(x) is not None and -int16_max <= int(x) < int16_max
 
 
 def int32_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int32_max <= int(x) < int32_max
+    return intx_re.match(x) is not None and -int32_max <= int(x) < int32_max
 
 
 def int64_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int64_max <= int(x) < int64_max
+    return intx_re.match(x) is not None and -int64_max <= int(x) < int64_max
 
 
 def int128_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int128_max <= int(x) < int128_max
+    return intx_re.match(x) is not None and -int128_max <= int(x) < int128_max
 
 
 def int256_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int256_max <= int(x) < int256_max
+    return intx_re.match(x) is not None and -int256_max <= int(x) < int256_max
 
 
 def uint_8_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint_8_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint_8_max
 
 
 def uint16_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint16_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint16_max
 
 
 def uint32_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint32_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint32_max
 
 
 def uint64_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint64_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint64_max
 
 
 def uint128_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and 0 <= int(x) < uint128_max
+    return intx_re.match(x) is not None and 0 <= int(x) < uint128_max
 
 
 def uint256_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and 0 <= int(x) < uint256_max
+    return intx_re.match(x) is not None and 0 <= int(x) < uint256_max
 
 
 def float_test(x: str) -> bool:

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/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.dev119'
-__revision__ = 'bbe4729'
+__version__ = '0.0.1.dev121'
+__revision__ = '3609440'

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/client.py

@@ -1170,14 +1170,30 @@ class TinyB:
         response = await self._req(f"/v0/connectors/snowflake/warehouses?{urlencode(params)}", method="POST", data="")
         return response["warehouses"]
 
-    async def get_trust_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/trust-policy")
+    async def check_aws_credentials(self) -> bool:
+        try:
+            await self._req("/v0/integrations/s3/settings")
+            return True
+        except Exception:
+            return False
 
-    async def get_access_write_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/write-access-policy")
+    async def get_trust_policy(self, service: str, external_id_seed: Optional[str] = None) -> Dict[str, Any]:
+        params = {}
+        if external_id_seed:
+            params["external_id_seed"] = external_id_seed
+        return await self._req(f"/v0/integrations/{service}/policies/trust-policy?{urlencode(params)}")
 
-    async def get_access_read_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/read-access-policy")
+    async def get_access_write_policy(self, service: str, bucket: Optional[str] = None) -> Dict[str, Any]:
+        params = {}
+        if bucket:
+            params["bucket"] = bucket
+        return await self._req(f"/v0/integrations/{service}/policies/write-access-policy?{urlencode(params)}")
+
+    async def get_access_read_policy(self, service: str, bucket: Optional[str] = None) -> Dict[str, Any]:
+        params = {}
+        if bucket:
+            params["bucket"] = bucket
+        return await self._req(f"/v0/integrations/{service}/policies/read-access-policy?{urlencode(params)}")
 
     async def sql_get_format(self, sql: str, with_clickhouse_format: bool = False) -> str:
         try:

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/common.py

@@ -1758,6 +1758,7 @@ async def run_aws_iamrole_connection_flow(
     client: TinyB,
     service: str,
     environment: str,
+    connection_name: str,
 ) -> Tuple[str, str, str]:
     if service == DataConnectorType.AMAZON_DYNAMODB:
         raise NotImplementedError("DynamoDB is not supported")
@@ -1771,8 +1772,9 @@ async def run_aws_iamrole_connection_flow(
     region = click.prompt("🌐 Region (the region where the bucket is located, e.g. 'us-east-1')", prompt_suffix="\n> ")
     validate_string_connector_param("Region", region)
 
-    access_policy, trust_policy, _ = await get_aws_iamrole_policies(client, service=service, policy="read")
-    access_policy = access_policy.replace("<bucket>", bucket_name)
+    access_policy, trust_policy, _ = await get_aws_iamrole_policies(
+        client, service=service, policy="read", bucket=bucket_name, external_id_seed=connection_name
+    )
 
     click.echo(FeedbackManager.prompt_s3_iamrole_connection_login_aws())
     click.echo(FeedbackManager.click_enter_to_continue())
@@ -1834,8 +1836,11 @@ async def production_aws_iamrole_only(
     region: str,
     bucket_name: str,
     environment: str,
+    connection_name: str,
 ) -> Tuple[str, str, str]:
-    _, trust_policy, external_id = await get_aws_iamrole_policies(prod_client, service=service, policy="read")
+    _, trust_policy, external_id = await get_aws_iamrole_policies(
+        prod_client, service=service, policy="read", bucket=bucket_name, external_id_seed=connection_name
+    )
 
     trust_policy_copied = True
     try:
@@ -1868,15 +1873,21 @@ async def production_aws_iamrole_only(
     return role_arn, region, external_id
 
 
-async def get_aws_iamrole_policies(client: TinyB, service: str, policy: str = "write"):
+async def get_aws_iamrole_policies(
+    client: TinyB,
+    service: str,
+    policy: str = "write",
+    bucket: Optional[str] = None,
+    external_id_seed: Optional[str] = None,
+):
     access_policy: Dict[str, Any] = {}
     if service == DataConnectorType.AMAZON_S3_IAMROLE:
         service = DataConnectorType.AMAZON_S3
     try:
         if policy == "write":
-            access_policy = await client.get_access_write_policy(service)
+            access_policy = await client.get_access_write_policy(service, bucket)
         elif policy == "read":
-            access_policy = await client.get_access_read_policy(service)
+            access_policy = await client.get_access_read_policy(service, bucket)
         else:
             raise Exception(f"Access policy {policy} not supported. Choose from 'read' or 'write'")
         if not len(access_policy) > 0:
@@ -1886,7 +1897,7 @@ async def get_aws_iamrole_policies(client: TinyB, service: str, policy: str = "w
 
     trust_policy: Dict[str, Any] = {}
     try:
-        trust_policy = await client.get_trust_policy(service)
+        trust_policy = await client.get_trust_policy(service, external_id_seed)
         if not len(trust_policy) > 0:
             raise Exception(f"{service.upper()} Integration not supported in this region")
     except Exception as e:
@@ -2187,30 +2198,6 @@ async def get_user_token(config: CLIConfig, user_token: Optional[str] = None) ->
     return user_token
 
 
-def get_ui_url(api_host: str) -> str:
-    """Transforms API URLs into their corresponding UI URLs.
-    Examples:
-        >>> get_ui_url("http://localhost:8000")
-        'https://cloud.tinybird.co/local/8000'
-        >>> get_ui_url("https://api.europe-west2.gcp.tinybird.co")
-        'https://cloud.tinybird.co/gcp/europe-west2'
-        >>> get_ui_url("https://other-domain.com")
-        'https://other-domain.com'
-    """
-    if "//localhost" in api_host:
-        port = api_host.split(":")[-1] or "80"
-        return f"https://cloud.tinybird.co/local/{port}"
-
-    if api_host.endswith("tinybird.co") and "api." in api_host:
-        parts = api_host.split(".")
-        if len(parts) >= 4:
-            region = parts[1] or "europe-west2"
-            cloud = parts[2] or "gcp"
-            return f"https://cloud.tinybird.co/{cloud}/{region}"
-
-    return api_host
-
-
 async def ask_for_organization(
     organizations: Optional[List[Dict[str, Any]]],
     organization_id: Optional[str] = None,

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/connection.py

@@ -151,6 +151,15 @@ async def connection_create_s3(ctx: Context) -> None:
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
 
+    if obj["env"] == "local" and not await client.check_aws_credentials():
+        click.echo(
+            FeedbackManager.error(
+                message="No AWS credentials found. Please run `tb local restart --use-aws-creds` to pass your credentials. "
+                "Read more about this in https://www.tinybird.co/docs/forward/get-data-in/connectors/s3#local-environment"
+            )
+        )
+        return
+
     service = DataConnectorType.AMAZON_S3
     click.echo(FeedbackManager.prompt_s3_connection_header())
     connection_name = get_s3_connection_name(project.folder)
@@ -158,6 +167,7 @@ async def connection_create_s3(ctx: Context) -> None:
         client,
         service=service,
         environment=obj["env"],
+        connection_name=connection_name,
     )
     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}"
@@ -179,7 +189,12 @@ async def connection_create_s3(ctx: Context) -> None:
             staging=False,
         )
         prod_role_arn, _, _ = await production_aws_iamrole_only(
-            prod_client, service=service, region=region, bucket_name=bucket_name, environment="cloud"
+            prod_client,
+            service=service,
+            region=region,
+            bucket_name=bucket_name,
+            environment="cloud",
+            connection_name=connection_name,
         )
         await prod_client.create_secret(name=secret_name, value=prod_role_arn)
 

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/datafile/common.py

@@ -810,6 +810,31 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
             detected_type = parse_expr(
                 [NULL, NOTNULL, DEFAULT, MATERIALIZED, ALIAS, CODEC, TTL, JSONPATH, COMMA], "TYPE"
             )
+
+            # Boolean type is supported in ClickHouse but its behavior is strange and will lead to unexpected results.
+            # Better to use Bool or UInt8 instead. An example:
+            #
+            # SELECT
+            #     CAST(true, 'Boolean') AS bool,
+            #     toTypeName(bool)
+            #
+            # ┌─bool─┬─toTypeName(bool)─┐
+            # │ true │ Bool             │
+            # └──────┴──────────────────┘
+            if "boolean" in detected_type.lower():
+                raise SchemaSyntaxError(
+                    message="Boolean type is not supported",
+                    hint="Hint: use Bool or UInt8 instead",
+                    lineno=line,
+                    pos=pos,
+                )
+            if "datetime64" in detected_type.lower() and "datetime64(" not in detected_type.lower():
+                raise SchemaSyntaxError(
+                    message="DateTime64 type without precision is not supported",
+                    hint="Hint: use DateTime64(3) instead",
+                    lineno=line,
+                    pos=pos,
+                )
             try:
                 # Imported in the body to be compatible with the CLI
                 from chtoolset.query import check_compatible_types

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/feedback_manager.py

@@ -441,6 +441,7 @@ class FeedbackManager:
     error_tag_generic = error_message("There was an issue updating tags. {error}")
     error_tag_not_found = error_message("Tag {tag_name} not found.")
     error_build_failed = error_message("Build failed")
+    error_request_failed = error_message("Request failed with status code {status_code}, please try again later.")
 
     info_incl_relative_path = info_message("** Relative path {path} does not exist, skipping.")
     info_ignoring_incl_file = info_message(

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/llm.py

@@ -1,5 +1,11 @@
 import requests
 
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+class LLMException(Exception):
+    pass
+
 
 class LLM:
     def __init__(
@@ -29,4 +35,8 @@ class LLM:
             headers={"Authorization": f"Bearer {self.user_token}"},
             data=data,
         )
+
+        if not response.ok:
+            raise LLMException(FeedbackManager.error_request_failed(status_code=response.status_code))
+
         return response.json().get("result", "")

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/local.py

@@ -207,7 +207,11 @@ def update_cli() -> None:
             text=True,
         )
     except FileNotFoundError:
-        raise CLIException("Cannot find required tool: uv. Reinstall using: curl https://tinybird.co | sh")
+        raise CLIException(
+            FeedbackManager.error(
+                message="Cannot find required tool: uv. Reinstall using: curl https://tinybird.co | sh"
+            )
+        )
 
     stdout, stderr = process.communicate()
     if "Nothing to upgrade" not in stdout + stderr:

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird/tb/modules/open.py

@@ -3,8 +3,9 @@ import webbrowser
 import click
 from click import Context
 
+from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import coro, get_ui_url
+from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_build_workspace_name
@@ -24,7 +25,7 @@ async def open(ctx: Context, workspace: str):
     client = ctx.ensure_object(dict)["client"]
     env = ctx.ensure_object(dict)["env"]
 
-    url_host = get_ui_url(client.host)
+    url_host = get_display_cloud_host(client.host)
 
     if not workspace:
         workspace = get_build_workspace_name(config.get("path")) if env == "build" else config.get("name")

{tinybird-0.0.1.dev119 → tinybird-0.0.1.dev121}/tinybird.egg-info/PKG-INFO

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