tinybird-cli 5.6.1.dev0__tar.gz → 5.6.1.dev1__tar.gz

{tinybird-cli-5.6.1.dev0 → tinybird-cli-5.6.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.6.1.dev0
+Version: 5.6.1.dev1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,12 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.6.1.dev1
+**********
+
+- `Fixed` issue with `tb auth` when using `--region` and `--token` options together.
+- `Fixed` `tb auth` behavior when the `TB_TOKEN` env var is set.
+
 5.6.0
 **********
 

{tinybird-cli-5.6.1.dev0 → tinybird-cli-5.6.1.dev1}/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.6.1.dev0'
-__revision__ = '0c7f300'
+__version__ = '5.6.1.dev1'
+__revision__ = '48fe3e9'

{tinybird-cli-5.6.1.dev0 → tinybird-cli-5.6.1.dev1}/tinybird/datafile.py

@@ -205,9 +205,9 @@ class ExportReplacements:
         ("export_format", "format", "csv"),
         ("export_compression", "compression", None),
         ("export_strategy", "strategy", "@new"),
+        ("export_kafka_topic", "kafka_topic", None),
         ("kafka_connection_name", "connection", None),
         ("kafka_topic", "kafka_topic", None),
-        ("kafka_group_id", "kafka_group_id", None),
     )
 
     @staticmethod
@@ -216,6 +216,10 @@ class ExportReplacements:
             return "kafka"
         return (node.get("export_service", "") or "").lower()
 
+    @staticmethod
+    def get_node_type(node: Dict[str, Optional[str]]) -> str:
+        return (node.get("type", "standard") or "standard").lower()
+
     @staticmethod
     def is_export_node(node: Dict[str, Optional[str]]) -> bool:
         export_service = ExportReplacements.get_export_service(node)
@@ -232,11 +236,11 @@ class ExportReplacements:
     def get_params_from_datafile(node: Dict[str, Optional[str]]) -> Dict[str, Optional[str]]:
         """Returns the export parameters for a given node."""
         params = {}
-        export_service = ExportReplacements.get_export_service(node)
+        node_type = ExportReplacements.get_node_type(node)
         for datafile_key, export_key, default_value in ExportReplacements._REPLACEMENTS:
-            if export_service != "kafka" and "kafka_" in datafile_key:
+            if node_type != PipeNodeTypes.STREAM and datafile_key.startswith("kafka_"):
                 continue
-            if export_service == "kafka" and "export_" in datafile_key:
+            if node_type == PipeNodeTypes.STREAM and datafile_key.startswith("export_"):
                 continue
             if datafile_key == "export_schedule" and node.get(datafile_key, None) == ON_DEMAND:
                 node[datafile_key] = ""
@@ -246,14 +250,14 @@ class ExportReplacements:
     @staticmethod
     def get_datafile_key(param: str, node: Dict[str, Optional[str]]) -> Optional[str]:
         """Returns the datafile key for a given export parameter."""
-        export_service = ExportReplacements.get_export_service(node)
-        for datafile_k, export_k, _ in ExportReplacements._REPLACEMENTS:
-            if export_service != "kafka" and "kafka_" in datafile_k:
+        node_type = ExportReplacements.get_node_type(node)
+        for datafile_key, export_key, _ in ExportReplacements._REPLACEMENTS:
+            if node_type != PipeNodeTypes.STREAM and datafile_key.startswith("kafka_"):
                 continue
-            if export_service == "kafka" and "export_" in datafile_k:
+            if node_type == PipeNodeTypes.STREAM and datafile_key.startswith("export_"):
                 continue
-            if export_k == param.lower():
-                return datafile_k.upper()
+            if export_key == param.lower():
+                return datafile_key.upper()
         return None
 
 
@@ -1160,6 +1164,7 @@ def parse(
         "export_format": assign_var("export_format"),
         "export_strategy": assign_var("export_strategy"),
         "export_compression": assign_var("export_compression"),
+        "export_kafka_topic": assign_var("export_kafka_topic"),
     }
 
     engine_vars = set()
@@ -4815,7 +4820,7 @@ async def format_node_type(file_parts: List[str], node: Dict[str, Any]) -> List[
             if param == "schedule_cron" and not value:
                 value = ON_DEMAND
             datafile_key = ExportReplacements.get_datafile_key(param, node)
-            if datafile_key:
+            if datafile_key and value:
                 file_parts.append(f"{datafile_key} {value}")
                 file_parts.append(DATAFILE_NEW_LINE)
 

{tinybird-cli-5.6.1.dev0 → tinybird-cli-5.6.1.dev1}/tinybird/feedback_manager.py

@@ -423,6 +423,7 @@ class FeedbackManager:
     info_dry_minor_patch_release_no_autopromote = info_message(
         "** [DRY RUN] Detected a minor or patch version: {version}. TB_AUTO_PROMOTE=0 detected, a new Release will be created in preview status."
     )
+    info_reading_from_env = info_message("** Reading {value} from env var {envvar}")
     info_releases_detected = info_message("** Live Release: {current_semver} => New Release: {semver}")
     info_dry_releases_detected = info_message("** [DRY RUN] Live Release: {current_semver} => New Release: {semver}")
     info_pre_prompt_auth_login_user_token = info_message(

{tinybird-cli-5.6.1.dev0 → tinybird-cli-5.6.1.dev1}/tinybird/tb_cli_modules/auth.py

@@ -3,6 +3,7 @@
 # - If it makes sense and only when strictly necessary, you can create utility functions in this file.
 # - But please, **do not** interleave utility functions and command definitions.
 
+import os
 from typing import Any, Dict, List, Optional
 
 import click
@@ -65,18 +66,27 @@ async def auth(ctx: click.Context, token: str, host: str, region: str, connector
 
     assert isinstance(ctx.parent, click.Context)
 
+    env_token = os.environ.get("TB_TOKEN", None)
+
     # If no token passed, let's clear the current one to
     # do a clean auth
-    if not token and not ctx.parent.params.get("token"):
+    if not token and not ctx.parent.params.get("token") and not env_token:
         config.set_token(None)
+    else:
+        if env_token:
+            click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
 
     regions: Optional[List[Region]] = None
+    try_all_regions = True
 
     if region:
         regions, host = await get_host_from_region_temp(config, region, config.get_host())
         config.set_host(host)
+        if token:
+            config.set_token_for_host(token, host)
+            try_all_regions = False
 
-    if not await try_authenticate(config, regions=regions, interactive=interactive, try_all_regions=True):
+    if not await try_authenticate(config, regions=regions, interactive=interactive, try_all_regions=try_all_regions):
         raise CLIAuthException(FeedbackManager.error_invalid_token_for_host(host=config.get_host()))
 
     config.persist_to_file()

{tinybird-cli-5.6.1.dev0 → tinybird-cli-5.6.1.dev1}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.6.1.dev0
+Version: 5.6.1.dev1
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,12 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.6.1.dev1
+**********
+
+- `Fixed` issue with `tb auth` when using `--region` and `--token` options together.
+- `Fixed` `tb auth` behavior when the `TB_TOKEN` env var is set.
+
 5.6.0
 **********