tinybird 0.0.1.dev296__tar.gz → 0.0.1.dev298__tar.gz

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev296
+Version: 0.0.1.dev298
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev296'
-__revision__ = 'b2373b7'
+__version__ = '0.0.1.dev298'
+__revision__ = '86d8c44'

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird/tb/config.py

@@ -40,6 +40,23 @@ CLOUD_HOSTS = {
     "https://ui.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
 }
 
+CH_HOSTS = {
+    "https://api.tinybird.co": "https://clickhouse.tinybird.co",
+    "https://api.us-east.tinybird.co": "https://clickhouse.us-east.tinybird.co",
+    "https://api.us-east.aws.tinybird.co": "https://clickhouse.us-east-1.aws.tinybird.co",
+    "https://api.us-west-2.aws.tinybird.co": "https://clickhouse.us-west-2.aws.tinybird.co",
+    "https://api.eu-central-1.aws.tinybird.co": "https://clickhouse.eu-central-1.aws.tinybird.co",
+    "https://api.eu-west-1.aws.tinybird.co": "https://clickhouse.eu-west-1.aws.tinybird.co",
+    "https://api.europe-west2.gcp.tinybird.co": "https://clickhouse.europe-west2.gcp.tinybird.co",
+    "https://api.ap-east.aws.tinybird.co": "https://clickhouse.ap-east.aws.tinybird.co",
+    "https://ui.tinybird.co": "https://clickhouse.tinybird.co",
+    "https://ui.us-east.tinybird.co": "https://clickhouse.us-east.tinybird.co",
+    "https://ui.us-east.aws.tinybird.co": "https://clickhouse.us-east.aws.tinybird.co",
+    "https://ui.us-west-2.aws.tinybird.co": "https://clickhouse.us-west-2.aws.tinybird.co",
+    "https://ui.eu-central-1.aws.tinybird.co": "https://clickhouse.eu-central-1.aws.tinybird.co",
+    "https://ui.europe-west2.gcp.tinybird.co": "https://clickhouse.europe-west2.gcp.tinybird.co",
+}
+
 
 def get_config(
     host: Optional[str], token: Optional[str], semver: Optional[str] = None, config_file: Optional[str] = None
@@ -85,6 +102,13 @@ def get_display_cloud_host(api_host: str) -> str:
     return CLOUD_HOSTS.get(api_host, api_host)
 
 
+def get_clickhouse_host(api_host: str) -> str:
+    is_local = "localhost" in api_host
+    if is_local:
+        return "http://localhost:7182"
+    return f"{CH_HOSTS.get(api_host, api_host.replace('api.', 'clickhouse.'))}:443"
+
+
 class FeatureFlags:
     @classmethod
     def ignore_sql_errors(cls) -> bool:  # Context: #1155

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird/tb/modules/agent/agent.py

@@ -17,7 +17,7 @@ from requests import Response
 
 from tinybird.tb.check_pypi import CheckPypi
 from tinybird.tb.client import TinyB
-from tinybird.tb.config import CURRENT_VERSION, get_display_cloud_host
+from tinybird.tb.config import CURRENT_VERSION, get_clickhouse_host, get_display_cloud_host
 from tinybird.tb.modules.agent.animations import ThinkingAnimation
 from tinybird.tb.modules.agent.banner import display_banner
 from tinybird.tb.modules.agent.command_agent import CommandAgent
@@ -284,7 +284,14 @@ class TinybirdAgent:
 - API Host: {ctx.deps.local_host}
 - Token: {ctx.deps.local_token}
 - UI Dashboard URL: {get_display_cloud_host(ctx.deps.local_host)}/{ctx.deps.workspace_name}
-            """
+- ClickHouse native HTTP interface:
+    - Protocol: HTTP
+    - Host: localhost
+    - Port: 7182
+    - Full URL: http://localhost:7182
+    - Username: {ctx.deps.workspace_name}  # Optional, for identification purposes
+    - Password: __TB_CLOUD_TOKEN__          # Your Tinybird auth token
+"""
 
         @self.agent.instructions
         def get_cloud_host(ctx: RunContext[TinybirdAgentContext]) -> str:
@@ -302,6 +309,7 @@ class TinybirdAgent:
 
             region_provider = region["provider"]
             region_name = region["name"]
+            ch_host = get_clickhouse_host(ctx.deps.host)
             return f"""
 # Tinybird Cloud info (region details):
 - API Host: {ctx.deps.host}
@@ -310,6 +318,14 @@ class TinybirdAgent:
 - Region provider: {region_provider}
 - Region name: {region_name}
 - UI Dashboard URL: {get_display_cloud_host(ctx.deps.host)}/{ctx.deps.workspace_name}
+- ClickHouse native HTTP interface:
+    - Protocol: HTTPS
+    - Host: {ch_host.replace("https://", "").replace(":443", "")}
+    - Port: 443 (HTTPS)
+    - SSL/TLS: Required (enabled)
+    - Full URL: {ch_host}
+    - Username: {ctx.deps.workspace_name}  # Optional, for identification purposes
+    - Password: __TB_CLOUD_TOKEN__          # Your Tinybird auth token
 """
 
         @self.agent.instructions

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird/tb/modules/cli.py

@@ -2,7 +2,6 @@
 #
 # - 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 json
 import logging
 import os
@@ -11,9 +10,11 @@ import sys
 from os import environ, getcwd
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from urllib.parse import urlencode
 
 import click
 import humanfriendly
+import requests
 from click import Context
 
 from tinybird.tb import __cli__
@@ -21,7 +22,9 @@ from tinybird.tb.check_pypi import CheckPypi
 from tinybird.tb.client import (
     AuthException,
     AuthNoTokenException,
+    TinyB,
 )
+from tinybird.tb.config import get_clickhouse_host
 from tinybird.tb.modules.agent import run_agent
 from tinybird.tb.modules.common import (
     CatchAuthExceptions,
@@ -36,6 +39,7 @@ from tinybird.tb.modules.common import (
 from tinybird.tb.modules.config import CURRENT_VERSION, CLIConfig
 from tinybird.tb.modules.datafile.build import build_graph
 from tinybird.tb.modules.datafile.pull import folder_pull
+from tinybird.tb.modules.exceptions import CLIChException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
@@ -336,6 +340,88 @@ def sql(
         click.echo(FeedbackManager.info_no_rows())
 
 
+@cli.command(
+    name="ch",
+    context_settings=dict(
+        ignore_unknown_options=True,
+        allow_extra_args=True,
+    ),
+)
+@click.option(
+    "--query",
+    type=str,
+    default=None,
+    required=False,
+    help="The query to run against ClickHouse.",
+)
+@click.option(
+    "--user",
+    required=False,
+    help="User field is not used for authentication but helps identify the connection.",
+)
+@click.option(
+    "--password",
+    required=False,
+    help="Your Tinybird Auth Token. If not provided, the token will be your current workspace token.",
+)
+@click.option(
+    "-m",
+    "--multiline",
+    is_flag=True,
+    default=False,
+    help="Enable multiline mode - read the query from multiple lines until a semicolon.",
+)
+@click.pass_context
+def ch(ctx: Context, query: str, user: Optional[str], password: Optional[str], multiline: bool) -> None:
+    """Run a query against ClickHouse native HTTP interface."""
+    try:
+        query_arg = next((arg for arg in ctx.args if not arg.startswith("--param_")), None)
+        if query_arg and not query:
+            query = query_arg
+
+        if not query and not sys.stdin.isatty():  # Check if there's piped input
+            query = sys.stdin.read().strip()
+
+        if not query:
+            click.echo(FeedbackManager.warning(message="Nothing to do. No query provided"))
+            return
+
+        if multiline:
+            queries = [query.strip() for query in query.split(";") if query.strip()]
+        else:
+            queries = [query]
+
+        client: TinyB = ctx.ensure_object(dict)["client"]
+        config = ctx.ensure_object(dict)["config"]
+        password = password or client.token
+        user = user or config.get("name", None)
+        ch_host = get_clickhouse_host(client.host)
+        headers = {"X-ClickHouse-Key": password}
+        if user:
+            headers["X-ClickHouse-User"] = user
+
+        params = {}
+
+        for param in ctx.args:
+            if param.startswith("--param_"):
+                param_name = param.split("=")[0].replace("--", "")
+                param_value = param.split("=")[1]
+                params[param_name] = param_value
+
+        for query in queries:
+            query_params = {**params, "query": query}
+            url = f"{ch_host}?{urlencode(query_params)}"
+            res = requests.get(url=url, headers=headers)
+
+            if res.status_code != 200:
+                raise Exception(res.text)
+
+            click.echo(res.text)
+
+    except Exception as e:
+        raise CLIChException(FeedbackManager.error(message=str(e)))
+
+
 def __patch_click_output():
     import re
 

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird/tb/modules/exceptions.py

@@ -146,3 +146,10 @@ class CLISecretException(CLIException):
 
     def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
         super().__init__(message, "secret_error", **kw_telemetry_event_data)
+
+
+class CLIChException(CLIException):
+    """Exceptions generated by the ch commands"""
+
+    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
+        super().__init__(message, "ch_error", **kw_telemetry_event_data)

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird/tb/modules/info.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, Iterable, List, Optional, Tuple
 import click
 
 from tinybird.tb.client import TinyB
-from tinybird.tb.config import get_display_cloud_host
+from tinybird.tb.config import get_clickhouse_host, get_display_cloud_host
 from tinybird.tb.modules.cli import CLIConfig, cli
 from tinybird.tb.modules.common import echo_json, force_echo, format_robust_table
 from tinybird.tb.modules.exceptions import CLILocalException
@@ -54,9 +54,10 @@ def get_cloud_info(ctx_config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]
         token = config.get_token() or "No workspace token found"
         api_host = config.get("host") or "No API host found"
         ui_host = get_display_cloud_host(api_host)
+        ch_host = get_clickhouse_host(api_host)
         user_email = config.get("user_email") or "No user email found"
         user_token = config.get_user_token() or "No user token found"
-        return get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host)
+        return get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host, ch_host)
     except Exception:
         click.echo(
             FeedbackManager.warning(
@@ -75,7 +76,10 @@ def get_local_info(config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]]:
         user_token = local_config.get_user_token() or "No user token found"
         api_host = TB_LOCAL_ADDRESS
         ui_host = get_display_cloud_host(api_host)
-        return get_env_info(local_client, config, user_email, token, user_token, api_host, ui_host, is_local=True)
+        ch_host = get_clickhouse_host(api_host)
+        return get_env_info(
+            local_client, config, user_email, token, user_token, api_host, ui_host, ch_host, is_local=True
+        )
     except CLILocalException as e:
         raise e
     except Exception as e:
@@ -95,6 +99,7 @@ def get_env_info(
     user_token: str,
     api_host: str,
     ui_host: str,
+    ch_host: str,
     is_local=False,
 ) -> Tuple[List[Any], List[str]]:
     user_workspaces = client.user_workspaces(version="v1")
@@ -115,11 +120,20 @@ def get_env_info(
 
     assert isinstance(current_main_workspace, dict)
 
-    columns = ["user", "workspace_name", "workspace_id", "token", "user_token", "api", "ui"]
+    columns = ["user", "workspace_name", "workspace_id", "token", "user_token", "api", "ui", "clickhouse"]
     if current_main_workspace["name"]:
         ui_host += f"/{current_main_workspace['name']}"
     table = [
-        (user_email, current_main_workspace["name"], current_main_workspace["id"], token, user_token, api_host, ui_host)
+        (
+            user_email,
+            current_main_workspace["name"],
+            current_main_workspace["id"],
+            token,
+            user_token,
+            api_host,
+            ui_host,
+            ch_host,
+        )
     ]
 
     if is_local and (

{tinybird-0.0.1.dev296 → tinybird-0.0.1.dev298}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev296
+Version: 0.0.1.dev298
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird