tinybird-cli 5.8.2.dev0__tar.gz → 5.8.2.dev2__tar.gz

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.8.2.dev0
+Version: 5.8.2.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.8.2.dev2
+***********
+
+- `Changed` `tb pull` now applies the same formatting as `tb fmt` when pulling a Data Source file
+
+5.8.2.dev1
+***********
+
+- `Removed` misleading output message when `tb auth --token` with TB_TOKEN env var also defined
+
 5.8.1
 ***********
 

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/tinybird/__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__ = '5.8.2.dev0'
-__revision__ = 'c7a6831'
+__version__ = '5.8.2.dev2'
+__revision__ = '61ed1f8'

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/tinybird/config.py

@@ -35,6 +35,10 @@ LEGACY_HOSTS = {
     "https://api.wadus4.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus4",
     "https://api.wadus5.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus5",
     "https://api.wadus6.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus6",
+    "https://api.wadus1.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus1",
+    "https://api.wadus2.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus2",
+    "https://api.wadus3.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus3",
+    "https://api.wadus4.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus4",
     "https://ui.tinybird.co": "https://app.tinybird.co/gcp/europe-west3",
     "https://ui.us-east.tinybird.co": "https://app.tinybird.co/gcp/us-east4",
     "https://ui.us-east.aws.tinybird.co": "https://app.tinybird.co/aws/us-east-1",
@@ -48,9 +52,13 @@ LEGACY_HOSTS = {
     "https://inditex-rt-pro.tinybird.co": "https://app.inditex.tinybird.co/gcp/inditex-rt-pro",
     "https://inditex-pro.tinybird.co": "https://app.inditex.tinybird.co/gcp/inditex-pro",
     "https://ui.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
-    "https://ui.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/aws/split-us-west-2",
+    "https://ui.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",
     "https://ui.split.azure.tinybird.co": "https://app.tinybird.co/azure/split-us-east",
     "https://ui.split-westeurope.azure.tinybird.co": "https://app.tinybird.co/azure/split-westeurope",
+    "https://api.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
+    "https://api.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",
+    "https://api.split.azure.tinybird.co": "https://app.tinybird.co/azure/split-us-east",
+    "https://api.split-westeurope.azure.tinybird.co": "https://app.tinybird.co/azure/split-westeurope",
     "https://ui.wadus1.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus1",
     "https://ui.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",
     "https://ui.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/tinybird/datafile.py

@@ -4788,11 +4788,12 @@ async def format_datasource(
     datafile: Optional[Datafile] = None,
     for_deploy_diff: bool = False,
     skip_eval: bool = False,
+    content: Optional[str] = None,
 ) -> str:
     if datafile:
         doc = datafile
     else:
-        doc = parse_datasource(filename, replace_includes=replace_includes, skip_eval=skip_eval)
+        doc = parse_datasource(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content)
 
     file_parts: List[str] = []
     if for_diff:
@@ -5031,17 +5032,18 @@ async def format_node(
 
 async def format_pipe(
     filename: str,
-    line_length: Optional[int],
+    line_length: Optional[int] = DEFAULT_FMT_LINE_LENGTH,
     unroll_includes: bool = False,
     replace_includes: bool = False,
     datafile: Optional[Datafile] = None,
     for_deploy_diff: bool = False,
     skip_eval: bool = False,
+    content: Optional[str] = None,
 ) -> str:
     if datafile:
         doc = datafile
     else:
-        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval)
+        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content)
 
     file_parts: List[str] = []
     format_sources(file_parts, doc)
@@ -5123,6 +5125,7 @@ async def folder_pull(
     force: bool,
     verbose: bool = True,
     progress_bar: bool = False,
+    fmt: bool = False,
 ):  # noqa: C901
     pattern = re.compile(match) if match else None
 
@@ -5157,6 +5160,7 @@ async def folder_pull(
         extension: str,
         get_resource_function: str,
         progress_bar: bool = False,
+        fmt: bool = False,
     ):
         async def write_resource(k: Dict[str, Any]):
             name = f"{k['name']}.{extension}"
@@ -5167,6 +5171,13 @@ async def folder_pull(
                     return
 
                 resource = await getattr(client, get_resource_function)(k["original_name"])
+                resource_to_write = resource
+
+                if fmt:
+                    if extension == "datasource":
+                        resource_to_write = await format_datasource(name, content=resource)
+                    elif extension == "pipe":
+                        resource_to_write = await format_pipe(name, content=resource)
 
                 dest_folder = folder
                 if "." in k["name"] and extension != "token":
@@ -5189,14 +5200,17 @@ async def folder_pull(
                         # versions are a client only thing so
                         # datafiles from the server do not contains information about versions
                         if k["version"] >= 0:
-                            resource = f"VERSION {k['version']}\n" + resource
-                        if resource:
-                            matches = re.findall(r"([^\s\.]*__v\d+)", resource)
+                            if fmt:
+                                resource_to_write = "\n" + resource_to_write  # fmt strips the first line
+
+                            resource_to_write = f"VERSION {k['version']}\n" + resource_to_write
+                        if resource_to_write:
+                            matches = re.findall(r"([^\s\.]*__v\d+)", resource_to_write)
                             for match in set(matches):
                                 m = match.split("__v")[0]
                                 if m in resources or m in resource_names:
-                                    resource = resource.replace(match, m)
-                            fd.write(resource)
+                                    resource_to_write = resource_to_write.replace(match, m)
+                            fd.write(resource_to_write)
                 else:
                     if verbose:
                         click.echo(FeedbackManager.info_skip_already_exists())
@@ -5224,8 +5238,10 @@ async def folder_pull(
 
         resources = list(datasources_versions.keys()) + list(pipes_versions.keys())
 
-        await write_files(datasources_versions, resources, "datasource", "datasource_file", progress_bar=progress_bar)
-        await write_files(pipes_versions, resources, "pipe", "pipe_file", progress_bar=progress_bar)
+        await write_files(
+            datasources_versions, resources, "datasource", "datasource_file", progress_bar=progress_bar, fmt=fmt
+        )
+        await write_files(pipes_versions, resources, "pipe", "pipe_file", progress_bar=progress_bar, fmt=fmt)
 
         return
 

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/tinybird/tb_cli_modules/auth.py

@@ -73,7 +73,7 @@ async def auth(ctx: click.Context, token: str, host: str, region: str, connector
     if not token and not ctx.parent.params.get("token") and not env_token:
         config.set_token(None)
     else:
-        if env_token:
+        if env_token and not token:
             click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
 
     regions: Optional[List[Region]] = None

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/tinybird/tb_cli_modules/cli.py

@@ -691,21 +691,16 @@ async def push(
 )
 @click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
 @click.option("-f", "--force", is_flag=True, default=False, help="Override existing files")
+@click.option("--fmt", is_flag=True, default=False, help="Format files before saving")
 @click.pass_context
 @coro
-async def pull(
-    ctx: Context,
-    folder: str,
-    auto: bool,
-    match: Optional[str],
-    force: bool,
-) -> None:
+async def pull(ctx: Context, folder: str, auto: bool, match: Optional[str], force: bool, fmt: bool) -> None:
     """Retrieve latest versions for project files from Tinybird."""
 
     client = ctx.ensure_object(dict)["client"]
     folder = folder if folder else getcwd()
 
-    return await folder_pull(client, folder, auto, match, force)
+    return await folder_pull(client, folder, auto, match, force, fmt=fmt)
 
 
 @cli.command()

{tinybird-cli-5.8.2.dev0 → tinybird-cli-5.8.2.dev2}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.8.2.dev0
+Version: 5.8.2.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.8.2.dev2
+***********
+
+- `Changed` `tb pull` now applies the same formatting as `tb fmt` when pulling a Data Source file
+
+5.8.2.dev1
+***********
+
+- `Removed` misleading output message when `tb auth --token` with TB_TOKEN env var also defined
+
 5.8.1
 ***********