tinybird 0.0.1.dev306__py3-none-any.whl → 1.0.5__py3-none-any.whl

tinybird/tb/modules/login_common.py

@@ -11,17 +11,21 @@ import threading
 import time
 import urllib.parse
 import webbrowser
+from datetime import datetime
+from pathlib import Path
 from typing import Any, Dict, Optional
 from urllib.parse import urlencode
 
 import click
 import requests
+from click import Context
 
 from tinybird.tb.config import DEFAULT_API_HOST
-from tinybird.tb.modules.common import ask_for_region_interactively, get_regions
+from tinybird.tb.modules.common import ask_for_region_interactively, get_region_from_host, get_regions
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLILoginException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.telemetry import is_ci_environment
 
 SERVER_MAX_WAIT_TIME = 180
 
@@ -163,14 +167,13 @@ def login(
                         "method": "code",
                     }
                     response = requests.get(f"{auth_host}/api/cli-login?{urlencode(params)}")
-
                     try:
                         if response.status_code == 200:
                             data = response.json()
                             user_token = data.get("user_token", "")
                             workspace_token = data.get("workspace_token", "")
                             if user_token and workspace_token:
-                                authenticate_with_tokens(data, host, cli_config)
+                                authenticate_with_tokens(data, cli_config)
                                 break
                     except Exception:
                         pass
@@ -216,7 +219,7 @@ def login(
             )
 
             data = response.json()
-            authenticate_with_tokens(data, host, cli_config)
+            authenticate_with_tokens(data, cli_config)
         else:
             raise Exception("Authentication failed or timed out.")
     except Exception as e:
@@ -294,9 +297,246 @@ def create_one_time_code():
     return seperator.join(parts), full_code
 
 
-def authenticate_with_tokens(data: Dict[str, Any], host: Optional[str], cli_config: CLIConfig):
+def check_current_folder_in_sessions(ctx: Context) -> None:
+    """
+    Check if the current folder is tracked in the sessions file before running a command.
+
+    If the current folder is not in sessions.txt:
+    - If no sessions exist or file doesn't exist: silently add it (first usage is fine)
+    - If other folders exist: warn the user they're running from an untracked folder
+
+    Args:
+        provider: The provider name (e.g., 'gcp', 'aws')
+        region: The region name
+        workspace_name: The workspace name
+        current_folder: The current working directory
+    """
+    try:
+        env = ctx.ensure_object(dict)["env"]
+        if env != "cloud" or ctx.invoked_subcommand == "login" or is_ci_environment():
+            return
+
+        current_folder = os.getcwd()
+        cli_config = CLIConfig.get_project_config()
+        regions = get_regions(cli_config)
+        host = cli_config.get_host()
+        if not host:
+            return
+
+        region = get_region_from_host(host, regions)
+
+        if not region:
+            return
+
+        provider = region.get("provider", "unknown")
+        region_name = region.get("name", "unknown")
+        current_folder = os.getcwd()
+        home_dir = Path.home()
+        workspace_name = cli_config.get("name", "unknown")
+        sessions_dir = home_dir / ".tinybird" / provider / region_name / workspace_name
+        sessions_file = sessions_dir / "sessions.txt"
+
+        # Normalize the current folder path
+        current_folder = os.path.abspath(current_folder)
+
+        # Read existing sessions
+        existing_sessions: dict[str, str] = {}  # folder -> timestamp
+        if sessions_file.exists():
+            try:
+                with open(sessions_file, "r") as f:
+                    for line in f:
+                        line = line.strip()
+                        if line:
+                            # Format: <folder_path>\t<timestamp>
+                            parts = line.split("\t")
+                            if len(parts) >= 2 and parts[0]:
+                                existing_sessions[parts[0]] = parts[1]
+            except Exception:
+                # If we can't read the file, just continue silently
+                return
+
+        # Check if current folder is already tracked
+        if current_folder in existing_sessions:
+            # Already tracked, update the timestamp
+            try:
+                existing_sessions[current_folder] = datetime.now().isoformat()
+                sessions_dir.mkdir(parents=True, exist_ok=True)
+                with open(sessions_file, "w") as f:
+                    f.writelines(f"{folder}\t{timestamp}\n" for folder, timestamp in existing_sessions.items())
+            except Exception:
+                # Silently fail, don't block the command
+                pass
+            return
+
+        # Current folder is not tracked
+        if not existing_sessions:
+            # No previous sessions, this is the first time - silently add it
+            try:
+                sessions_dir.mkdir(parents=True, exist_ok=True)
+                timestamp = datetime.now().isoformat()
+                with open(sessions_file, "a") as f:
+                    f.write(f"{current_folder}\t{timestamp}\n")
+            except Exception:
+                # Silently fail, don't block the command
+                pass
+        else:
+            # Other folders exist, warn the user
+            click.echo("")
+            click.echo(FeedbackManager.warning(message="Running command from an untracked folder"))
+            click.echo(FeedbackManager.gray(message="Current folder: ") + FeedbackManager.info(message=current_folder))
+            tracked_folders = ", ".join(existing_sessions.keys())
+            click.echo(
+                FeedbackManager.gray(message="Tracked folders: ") + FeedbackManager.info(message=tracked_folders)
+            )
+            confirmed = click.confirm(
+                FeedbackManager.highlight(message="» Are you sure you want to continue?"),
+                default=True,
+            )
+
+            if not confirmed:
+                raise TrackFolderCancelled("Command cancelled by user.")
+
+            # Add current folder to the tracked list
+            try:
+                timestamp = datetime.now().isoformat()
+                with open(sessions_file, "a") as f:
+                    f.write(f"{current_folder}\t{timestamp}\n")
+            except Exception:
+                # Silently fail, don't block the command
+                pass
+
+    except TrackFolderCancelled:
+        raise
+    except Exception:
+        # Don't block execution if folder check fails
+        pass
+
+
+class TrackFolderCancelled(Exception):
+    """Exception raised when the user cancels the folder tracking"""
+
+    pass
+
+
+def check_and_warn_folder_change(cli_config: CLIConfig) -> None:
+    """
+    Check if the user is logging in from a folder that hasn't been tracked before.
+
+    Reads from ~/.tinybird/<provider>/<region>/<workspace_name>/sessions.txt to track
+    folder usage history. If the current folder is not in the list of tracked folders
+    and there are existing sessions, prompts the user to confirm.
+
+    Behavior:
+        - If no sessions exist: Silently add current folder
+        - If current folder is already tracked: Update timestamp and continue
+        - If current folder is not tracked but other folders are: Show warning and ask for confirmation
+
+    Raises:
+        TrackFolderCancelled: If user declines the folder change confirmation
+    """
+    if is_ci_environment():
+        return
+
+    host = cli_config.get_host()
+    workspace_name = cli_config.get("name", None)
+    if not host or not workspace_name:
+        return
+
+    regions = get_regions(cli_config)
+    region = get_region_from_host(host, regions)
+
+    if not region:
+        return
+
+    provider = region.get("provider", "unknown")
+    region_name = region.get("name", "unknown")
+
+    current_folder = os.getcwd()
+
+    home_dir = Path.home()
+    sessions_dir = home_dir / ".tinybird" / provider / region_name / workspace_name
+    sessions_file = sessions_dir / "sessions.txt"
+
+    # Normalize the current folder path
+    current_folder = os.path.abspath(current_folder)
+
+    # Read existing sessions if the file exists
+    existing_sessions: dict[str, str] = {}  # folder -> timestamp
+    if sessions_file.exists():
+        try:
+            with open(sessions_file, "r") as f:
+                for line in f:
+                    line = line.strip()
+                    if line:
+                        # Format: <folder_path>\t<timestamp>
+                        parts = line.split("\t")
+                        if len(parts) >= 2 and parts[0]:
+                            existing_sessions[parts[0]] = parts[1]
+        except Exception as e:
+            # If we can't read the file, just continue without warning
+            click.echo(FeedbackManager.warning(message=f"Warning: Could not read sessions file: {e}"))
+
+    # If current folder is already tracked, update timestamp and return
+    if current_folder in existing_sessions:
+        try:
+            existing_sessions[current_folder] = datetime.now().isoformat()
+            sessions_dir.mkdir(parents=True, exist_ok=True)
+            with open(sessions_file, "w") as f:
+                f.writelines(f"{folder}\t{timestamp}\n" for folder, timestamp in existing_sessions.items())
+        except Exception as e:
+            click.echo(FeedbackManager.warning(message=f"Warning: Could not update sessions file: {e}"))
+        return
+
+    # If there are existing tracked folders but current folder is not tracked, warn the user
+    if existing_sessions:
+        click.echo("")
+        click.echo(
+            FeedbackManager.warning(message="Login from a different folder than previous sessions has been detected.")
+        )
+        click.echo(FeedbackManager.gray(message="Current folder: ") + FeedbackManager.info(message=current_folder))
+        tracked_folders = ", ".join(existing_sessions.keys())
+        click.echo(FeedbackManager.gray(message="Tracked folders: ") + FeedbackManager.info(message=tracked_folders))
+
+        # Ask for confirmation
+        confirmed = click.confirm(
+            FeedbackManager.highlight(message="» Are you sure you want to continue?"),
+            default=True,
+        )
+
+        if not confirmed:
+            raise TrackFolderCancelled("Login cancelled by user.")
+
+        # User accepted, show pull suggestion
+        click.echo(
+            FeedbackManager.warning(
+                message="Remember to run `tb --cloud pull` to have your latest resources available."
+            )
+        )
+
+    # Record the current session
+    try:
+        # Create the directory if it doesn't exist
+        sessions_dir.mkdir(parents=True, exist_ok=True)
+
+        # Add current folder to sessions and update timestamp
+        timestamp = datetime.now().isoformat()
+        existing_sessions[current_folder] = timestamp
+
+        # Write all sessions to file
+        with open(sessions_file, "w") as f:
+            f.writelines(f"{folder}\t{ts}\n" for folder, ts in existing_sessions.items())
+    except Exception as e:
+        # If we can't write the file, just warn but don't block the login
+        click.echo(FeedbackManager.warning(message=f"Warning: Could not update sessions file: {e}"))
+
+
+def authenticate_with_tokens(data: Dict[str, Any], cli_config: CLIConfig):
     cli_config.set_token(data.get("workspace_token", ""))
-    host = host or data.get("api_host", "")
+    host = data.get("api_host", "")
+
+    if not host:
+        raise Exception("API host not found in the authentication response")
+
     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)
@@ -305,9 +545,6 @@ def authenticate_with_tokens(data: Dict[str, Any], host: Optional[str], cli_conf
         if k in ws:
             cli_config[k] = ws[k]
 
-    path = os.path.join(os.getcwd(), ".tinyb")
-    cli_config.persist_to_file(override_with_path=path)
-
     auth_info: Dict[str, Any] = cli_config.get_user_client().check_auth_login()
     if not auth_info.get("is_valid", False):
         raise Exception(FeedbackManager.error_auth_login_not_valid(host=cli_config.get_host()))
@@ -315,6 +552,12 @@ def authenticate_with_tokens(data: Dict[str, Any], host: Optional[str], cli_conf
     if not auth_info.get("is_user", False):
         raise Exception(FeedbackManager.error_auth_login_not_user(host=cli_config.get_host()))
 
+    # Check for folder change before persisting config
+    check_and_warn_folder_change(cli_config)
+
+    path = os.path.join(os.getcwd(), ".tinyb")
+    cli_config.persist_to_file(override_with_path=path)
+
     click.echo(FeedbackManager.gray(message="\nWorkspace: ") + FeedbackManager.info(message=ws["name"]))
     click.echo(FeedbackManager.gray(message="User: ") + FeedbackManager.info(message=ws["user_email"]))
     click.echo(FeedbackManager.gray(message="Host: ") + FeedbackManager.info(message=host))

tinybird/tb/modules/open.py

@@ -7,7 +7,6 @@ from tinybird.tb.config import get_display_cloud_host
 from tinybird.tb.modules.cli import cli
 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
 
 
 @cli.command()
@@ -21,12 +20,12 @@ def open(ctx: Context, workspace: str):
 
     config = ctx.ensure_object(dict)["config"]
     client = ctx.ensure_object(dict)["client"]
-    env = ctx.ensure_object(dict)["env"]
+    branch = ctx.ensure_object(dict)["branch"]
 
     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")
+        workspace = config.get("name")
 
     if not workspace:
         raise CLIException(
@@ -35,7 +34,13 @@ def open(ctx: Context, workspace: str):
             )
         )
 
-    click.echo(FeedbackManager.highlight(message=f"» Opening workspace {workspace} in the browser"))
+    if branch:
+        click.echo(
+            FeedbackManager.highlight(message=f"» Opening branch {branch} of workspace {workspace} in the browser")
+        )
+        auth_url = f"{url_host}/{workspace}~{branch}"
+    else:
+        click.echo(FeedbackManager.highlight(message=f"» Opening workspace {workspace} in the browser"))
+        auth_url = f"{url_host}/{workspace}"
 
-    auth_url = f"{url_host}/{workspace}"
     webbrowser.open(auth_url)

tinybird/tb/modules/project.py

@@ -130,7 +130,7 @@ class Project:
 
     @property
     def connections(self) -> List[str]:
-        return sorted([Path(f).stem for f in self.get_connection_files()])
+        return sorted([Path(f).stem for f in self._get_connection_files()])
 
     def get_datasource_files(self) -> List[str]:
         return self.get_files("datasource")
@@ -138,17 +138,26 @@ class Project:
     def get_pipe_files(self) -> List[str]:
         return self.get_files("pipe")
 
-    def get_connection_files(self) -> List[str]:
+    def _get_connection_files(self) -> List[str]:
         return self.get_files("connection")
 
+    def get_connection_files(self, connection_type: Optional[str] = None) -> List[str]:
+        if connection_type == "kafka":
+            return self.get_kafka_connection_files()
+        if connection_type == "s3":
+            return self.get_s3_connection_files()
+        if connection_type == "gcs":
+            return self.get_gcs_connection_files()
+        return self._get_connection_files()
+
     def get_kafka_connection_files(self) -> List[str]:
-        return [f for f in self.get_connection_files() if self.is_kafka_connection(Path(f).read_text())]
+        return [f for f in self._get_connection_files() if self.is_kafka_connection(Path(f).read_text())]
 
     def get_s3_connection_files(self) -> List[str]:
-        return [f for f in self.get_connection_files() if self.is_s3_connection(Path(f).read_text())]
+        return [f for f in self._get_connection_files() if self.is_s3_connection(Path(f).read_text())]
 
     def get_gcs_connection_files(self) -> List[str]:
-        return [f for f in self.get_connection_files() if self.is_gcs_connection(Path(f).read_text())]
+        return [f for f in self._get_connection_files() if self.is_gcs_connection(Path(f).read_text())]
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

tinybird/tb/modules/shell.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
 import sys
-from typing import List
+from typing import List, Optional
 
 import click
 import humanfriendly
@@ -192,11 +192,14 @@ def _(event):
 
 
 class Shell:
-    def __init__(self, project: Project, tb_client: TinyB, playground: bool = False):
+    def __init__(self, project: Project, tb_client: TinyB, playground=False, branch: Optional[str] = None):
         self.history = self.get_history()
         self.project = project
         self.tb_client = tb_client
-        self.env = "cloud" if playground else "local"
+        if playground:
+            self.env = "--cloud"
+        else:
+            self.env = f"--branch={branch}" if branch else "--local"
         self.prompt_message = "\ntb » "
         self.session: PromptSession = PromptSession(
             completer=DynamicCompleter(project),
@@ -245,6 +248,8 @@ class Shell:
             self.handle_auth()
         elif cmd == "workspace":
             self.handle_workspace()
+        elif cmd == "branch":
+            self.handle_branch()
         elif cmd == "deploy":
             self.handle_deploy()
         elif cmd == "mock":
@@ -264,13 +269,16 @@ class Shell:
     def handle_workspace(self):
         click.echo(FeedbackManager.error(message="'tb workspace' is not available in the dev shell"))
 
+    def handle_branch(self):
+        click.echo(FeedbackManager.error(message="'tb branch' 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():
             arg = arg.replace("mock", "")
-        subprocess.run(f"tb --{self.env} mock {arg}", shell=True, text=True)
+        subprocess.run(f"tb {self.env} mock {arg}", shell=True, text=True)
 
     def handle_tb(self, argline):
         click.echo("")
@@ -287,7 +295,7 @@ class Shell:
             need_skip = ("mock", "test create", "create")
             if any(arg.startswith(cmd) for cmd in need_skip):
                 argline = f"{argline}"
-            subprocess.run(f"tb --{self.env} {argline}", shell=True, text=True)
+            subprocess.run(f"tb {self.env} {argline}", shell=True, text=True)
 
     def default(self, argline):
         click.echo("")
@@ -302,7 +310,7 @@ class Shell:
             need_skip = ("mock", "test create", "create")
             if any(arg.startswith(cmd) for cmd in need_skip):
                 argline = f"{argline}"
-            subprocess.run(f"tb --{self.env} {argline}", shell=True, text=True)
+            subprocess.run(f"tb {self.env} {argline}", shell=True, text=True)
 
     def run_sql(self, query, rows_limit=20):
         try:

tinybird/tb/modules/sink.py

@@ -11,6 +11,7 @@ from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import echo_safe_humanfriendly_tables_format_smart_table, wait_job
 from tinybird.tb.modules.exceptions import CLIPipeException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.job_common import echo_job_url
 
 
 @cli.group()
@@ -84,12 +85,13 @@ def sink_run(ctx: click.Context, pipe_name_or_id: str, wait: bool, mode: str, pa
     params = dict(key_value.split("=") for key_value in param) if param else {}
     click.echo(FeedbackManager.highlight(message=f"\n» Running sink '{pipe_name_or_id}'"))
     client: TinyB = ctx.ensure_object(dict)["client"]
+    config = ctx.ensure_object(dict)["config"]
 
     try:
         response = client.pipe_run(pipe_name_or_id, "sink", params, mode)
         job_id = response["job"]["id"]
         job_url = response["job"]["job_url"]
-        click.echo(FeedbackManager.gray(message="Job URL: ") + FeedbackManager.info(message=f"{job_url}"))
+        echo_job_url(client.token, client.host, config.get("name") or "", job_url)
         click.echo(FeedbackManager.success(message="✓ Sink job created"))
 
         if wait:

tinybird/tb/modules/telemetry.py

@@ -42,8 +42,11 @@ def get_ci_product_name() -> Optional[str]:
 
 
 def is_ci_environment() -> bool:
-    ci_product: Optional[str] = get_ci_product_name()
-    return ci_product is not None
+    try:
+        ci_product: Optional[str] = get_ci_product_name()
+        return ci_product is not None
+    except Exception:
+        return False
 
 
 def silence_errors(f: Callable) -> Callable:
@@ -86,7 +89,7 @@ class TelemetryHelper:
         tb_host: Optional[str] = None,
         max_enqueued_events: int = 5,
     ) -> None:
-        self.tb_host = tb_host or os.getenv("TB_CLI_TELEMETRY_HOST", "https://api.tinybird.co")
+        self.tb_host = tb_host or os.getenv("TB_CLI_TELEMETRY_HOST", "https://api.europe-west2.gcp.tinybird.co")
         self.max_enqueued_events: int = max_enqueued_events
 
         self.enabled: bool = True
@@ -133,6 +136,7 @@ class TelemetryHelper:
         event_dict["event"] = event
         event_dict["event_data"] = json.dumps(event_data)
         event_dict["timestamp"] = datetime.utcnow().isoformat()
+        event_dict["cli"] = "forward"
 
         self.events.append(event_dict)
         if len(self.events) >= self.max_enqueued_events:

tinybird/tb_cli_modules/telemetry.py

@@ -81,7 +81,7 @@ def _hide_tokens(text: str) -> str:
 
 class TelemetryHelper:
     def __init__(self, tb_host: Optional[str] = None, max_enqueued_events: int = 5) -> None:
-        self.tb_host = tb_host or os.getenv("TB_CLI_TELEMETRY_HOST", "https://api.tinybird.co")
+        self.tb_host = tb_host or os.getenv("TB_CLI_TELEMETRY_HOST", "https://api.europe-west2.gcp.tinybird.co")
         self.max_enqueued_events: int = max_enqueued_events
 
         self.enabled: bool = True

{tinybird-0.0.1.dev306.dist-info → tinybird-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev306
+Version: 1.0.5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -57,7 +57,32 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-0.0.1dev1
-***********
+1.0.5
+*******
 
-* Initial release of the Tinybird CLI
+- `Added` Internal changes 
+
+1.0.4
+*******
+
+- `Changed` `tb login` help text has been updated to provide more clarity on the available options.
+
+1.0.3
+*******
+
+- `Changed` `tb login` now will warn the user if they are trying to login from a different folder than the last one and will ask for confirmation to continue.
+
+1.0.2
+*******
+
+- `Changed` If connection name is not provided in `tb connection data`, it will prompt the user to select a connection from the list of available connections.
+
+1.0.1
+*******
+
+- `Added` Support for `schema_registry_url` and `auto_offset_reset` when creating a Kafka connection.
+
+1.0.0
+*******
+
+- `Released` Version 1.0.0, from now on the tinybird-cli package uses the standard semver convention for stable versions. Development versions will be tagged as with the `.devX` suffix where `X` is an integer number.