tinybird 0.0.1.dev120__tar.gz → 0.0.1.dev122__tar.gz

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/PKG-INFO

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

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/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.dev120'
-__revision__ = 'a558f0d'
+__version__ = '0.0.1.dev122'
+__revision__ = '2212d5c'

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/client.py

@@ -1177,14 +1177,23 @@ class TinyB:
         except Exception:
             return False
 
-    async def get_trust_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/trust-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_write_policy(self, service: str) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/write-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) -> Dict[str, Any]:
-        return await self._req(f"/v0/integrations/{service}/policies/read-access-policy")
+    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.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/build.py

@@ -150,7 +150,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
             except Exception as e:
                 click.echo(FeedbackManager.error_exception(error=f"Error appending fixtures for '{ds_name}': {e}"))
 
-            feedback = result.get("feedback", [])
+            feedback = build.get("feedback", [])
             for f in feedback:
                 click.echo(
                     FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/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.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/connection.py

@@ -167,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}"
@@ -188,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.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/build.py

@@ -934,7 +934,7 @@ async def process_file(
         return params
 
     if DataFileExtensions.DATASOURCE in filename:
-        doc = parse_datasource(filename)
+        doc = parse_datasource(filename).datafile
         node = doc.nodes[0]
         deps: List[str] = []
         # reemplace tables on materialized columns
@@ -1094,7 +1094,7 @@ async def process_file(
         return resources
 
     elif DataFileExtensions.PIPE in filename:
-        doc = parse_pipe(filename)
+        doc = parse_pipe(filename).datafile
         version = f"__v{doc.version}" if doc.version is not None else ""
         name = os.path.basename(filename).split(".")[0]
         description = doc.description if doc.description is not None else ""

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/common.py

@@ -17,7 +17,7 @@ from enum import Enum
 from io import StringIO
 from pathlib import Path
 from string import Template
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, cast
+from typing import Any, Callable, Dict, Iterable, List, Literal, NamedTuple, Optional, Tuple, cast
 
 import click
 from croniter import croniter
@@ -1163,6 +1163,19 @@ def parse_table_structure(schema: str) -> List[Dict[str, Any]]:
     return _parse_table_structure(schema)
 
 
+@dataclass
+class DatafileParseWarning:
+    message: str
+
+    def __str__(self) -> str:
+        return self.message
+
+
+class ParseResult(NamedTuple):
+    datafile: Datafile
+    warnings: list[DatafileParseWarning]
+
+
 def parse(
     s: str,
     default_node: Optional[str] = None,
@@ -1170,10 +1183,10 @@ def parse(
     replace_includes: bool = True,
     skip_eval: bool = False,
     kind: Optional[DatafileKind] = None,
-) -> Datafile:
+) -> ParseResult:
     """
     Parses `s` string into a document
-    >>> d = parse("NODE \\"test_01\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n        SELECT * from test_00\\n\\n\\nNODE \\"test_02\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n    SELECT * from test_01\\n    WHERE a > 1\\n    GROUP by a\\n")
+    >>> d, w = parse("NODE \\"test_01\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n        SELECT * from test_00\\n\\n\\nNODE \\"test_02\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n    SELECT * from test_01\\n    WHERE a > 1\\n    GROUP by a\\n")
     >>> len(d.nodes)
     2
     >>> d.nodes[0]
@@ -1184,6 +1197,8 @@ def parse(
     lines = list(StringIO(s, newline=None))
 
     doc = Datafile()
+    warnings: List[DatafileParseWarning] = []
+
     if kind is not None:
         doc.set_kind(kind)
     doc.raw = list(StringIO(s, newline=None))
@@ -1212,16 +1227,30 @@ def parse(
 
         return error_if_multiline
 
-    def deprecated(func: Callable[..., Any]) -> Callable[..., Any]:
-        @functools.wraps(func)
-        def raise_deprecation_error(*args: Any, **kwargs: Any) -> Any:
-            raise DatafileSyntaxError(
-                f"{kwargs['cmd'].upper()} has been deprecated",
-                lineno=kwargs["lineno"],
-                pos=1,
-            )
+    def deprecated(severity: Literal["error", "warning"]) -> Callable[..., Any]:
+        def inner(func: Callable[..., Any]) -> Callable[..., Any]:
+            @functools.wraps(func)
+            def raise_deprecation_error(*args: Any, **kwargs: Any) -> Any:
+                raise DatafileSyntaxError(
+                    f"{kwargs['cmd'].upper()} has been deprecated",
+                    lineno=kwargs["lineno"],
+                    pos=1,
+                )
 
-        return raise_deprecation_error
+            @functools.wraps(func)
+            def add_deprecation_warning(*args: Any, **kwargs: Any) -> Any:
+                warnings.append(
+                    DatafileParseWarning(
+                        message=f"{kwargs['cmd'].upper()} has been deprecated and will be ignored.",
+                    )
+                )
+
+            if severity == "error":
+                return raise_deprecation_error
+            elif severity == "warning":
+                return add_deprecation_warning
+
+        return inner
 
     def not_supported_yet(extra_message: str = "") -> Callable[..., Any]:
         def inner(func: Callable[..., Any]) -> Callable[..., Any]:
@@ -1288,7 +1317,7 @@ def parse(
             pos=1,
         )
 
-    @deprecated
+    @deprecated(severity="error")
     def sources(x: str, **kwargs: Any) -> None:
         pass  # Deprecated
 
@@ -1423,7 +1452,7 @@ def parse(
         except FileNotFoundError:
             raise IncludeFileNotFoundException(f, lineno)
 
-    @deprecated
+    @deprecated(severity="warning")
     def version(*args: str, **kwargs: Any) -> None:
         pass  # whatever, it's deprecated
 
@@ -1634,7 +1663,7 @@ def parse(
         traceback.print_tb(e.__traceback__)
         raise ParseException(f"Unexpected error: {e}", lineno=lineno)
 
-    return doc
+    return ParseResult(datafile=doc, warnings=warnings)
 
 
 class ImportReplacements:

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/format_datasource.py

@@ -29,7 +29,9 @@ async def format_datasource(
     if datafile:
         doc = datafile
     else:
-        doc = parse_datasource(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content)
+        doc = parse_datasource(
+            filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content
+        ).datafile
 
     file_parts: List[str] = []
     if for_diff:

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/format_pipe.py

@@ -136,7 +136,7 @@ async def format_pipe(
     if datafile:
         doc = datafile
     else:
-        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content)
+        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content).datafile
 
     file_parts: List[str] = []
     format_maintainer(file_parts, doc)
@@ -162,7 +162,7 @@ async def format_pipe(
                 if "." in include_file
                 else eval_var(include_file)
             )
-            included_pipe = parse_pipe(include_file, skip_eval=skip_eval)
+            included_pipe = parse_pipe(include_file, skip_eval=skip_eval).datafile
             pipe_nodes = doc.nodes.copy()
             for included_node in included_pipe.nodes.copy():
                 unrolled_included_node = next(

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/parse_datasource.py

@@ -5,9 +5,9 @@ import click
 
 from tinybird.sql_template import render_template_with_secrets
 from tinybird.tb.modules.datafile.common import (
-    Datafile,
     DatafileKind,
     DatafileSyntaxError,
+    ParseResult,
     format_filename,
     parse,
 )
@@ -23,7 +23,7 @@ def parse_datasource(
     hide_folders: bool = False,
     add_context_to_datafile_syntax_errors: bool = True,
     secrets: Optional[Dict[str, str]] = None,
-) -> Datafile:
+) -> ParseResult:
     basepath = ""
     if not content:
         with open(filename) as file:
@@ -35,7 +35,7 @@ def parse_datasource(
     s = render_template_with_secrets(filename, s, secrets=secrets or {})
     filename = format_filename(filename, hide_folders)
     try:
-        doc = parse(
+        doc, warnings = parse(
             s, "default", basepath, replace_includes=replace_includes, skip_eval=skip_eval, kind=DatafileKind.datasource
         )
         doc.validate()
@@ -52,4 +52,4 @@ def parse_datasource(
             FeedbackManager.error_parsing_file(filename=filename, lineno=e.lineno, error=e)
         ) from None
 
-    return doc
+    return ParseResult(datafile=doc, warnings=warnings)

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/parse_pipe.py

@@ -5,9 +5,9 @@ import click
 
 from tinybird.sql_template import get_template_and_variables, render_sql_template
 from tinybird.tb.modules.datafile.common import (
-    Datafile,
     DatafileKind,
     DatafileSyntaxError,
+    ParseResult,
     format_filename,
     parse,
 )
@@ -24,7 +24,7 @@ def parse_pipe(
     hide_folders: bool = False,
     add_context_to_datafile_syntax_errors: bool = True,
     secrets: Optional[Dict[str, str]] = None,
-) -> Datafile:
+) -> ParseResult:
     basepath = ""
     if not content:
         with open(filename) as file:
@@ -37,7 +37,7 @@ def parse_pipe(
     try:
         sql = ""
         try:
-            doc = parse(
+            doc, warnings = parse(
                 s, basepath=basepath, replace_includes=replace_includes, skip_eval=skip_eval, kind=DatafileKind.pipe
             )
             doc.validate()
@@ -86,4 +86,4 @@ def parse_pipe(
         raise click.ClickException(FeedbackManager.error_not_found_include(filename=e, lineno=e.lineno))
     except ModuleNotFoundError:
         pass
-    return doc
+    return ParseResult(datafile=doc, warnings=warnings)

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/datafile/playground.py

@@ -1091,7 +1091,7 @@ async def process_file(
         return params
 
     if DataFileExtensions.DATASOURCE in filename:
-        doc = parse_datasource(filename)
+        doc, warnings = parse_datasource(filename)
         node = doc.nodes[0]
         deps: List[str] = []
         # reemplace tables on materialized columns
@@ -1251,7 +1251,7 @@ async def process_file(
         return resources
 
     elif DataFileExtensions.PIPE in filename:
-        doc = parse_pipe(filename)
+        doc, warnings = parse_pipe(filename)
         version = f"__v{doc.version}" if doc.version is not None else ""
         name = os.path.basename(filename).split(".")[0]
         description = doc.description if doc.description is not None else ""

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/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.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/project.py

@@ -57,13 +57,13 @@ class Project:
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:
-            return parse_pipe(filename)
+            return parse_pipe(filename).datafile
         except Exception:
             return None
 
     def get_datasource_datafile(self, filename: str) -> Optional[Datafile]:
         try:
-            return parse_datasource(filename)
+            return parse_datasource(filename).datafile
         except Exception:
             return None
 

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird/tb/modules/shell.py

@@ -247,6 +247,8 @@ class Shell:
             self.handle_auth()
         elif cmd == "workspace":
             self.handle_workspace()
+        elif cmd == "deploy":
+            self.handle_deploy()
         elif cmd == "mock":
             self.handle_mock(arg)
         elif cmd == "tb":
@@ -256,13 +258,16 @@ class Shell:
             self.default(line)
 
     def handle_build(self):
-        click.echo(FeedbackManager.error(message="'tb build' command is not available in watch mode"))
+        click.echo(FeedbackManager.error(message="'tb build' is not available in the dev shell"))
 
     def handle_auth(self):
-        click.echo(FeedbackManager.error(message="'tb auth' command is not available in watch mode"))
+        click.echo(FeedbackManager.error(message="'tb auth' is not available in the dev shell"))
 
     def handle_workspace(self):
-        click.echo(FeedbackManager.error(message="'tb workspace' command is not available in watch mode"))
+        click.echo(FeedbackManager.error(message="'tb workspace' is not available in the dev shell"))
+
+    def handle_deploy(self):
+        click.echo(FeedbackManager.error(message="'tb deploy' is not available in the dev shell"))
 
     def handle_mock(self, arg):
         if "mock" in arg.strip().lower():

{tinybird-0.0.1.dev120 → tinybird-0.0.1.dev122}/tinybird.egg-info/PKG-INFO

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