tinybird 0.0.1.dev169__tar.gz → 0.0.1.dev171__tar.gz

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/PKG-INFO

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

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/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.dev169'
-__revision__ = '0e591e6'
+__version__ = '0.0.1.dev171'
+__revision__ = 'a5eb91f'

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/tinybird/tb/modules/cli.py

@@ -71,6 +71,9 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens.")
 @click.option("--cloud/--local", is_flag=True, default=False, help="Run against cloud or local.")
 @click.option("--staging", is_flag=True, default=False, help="Run against a staging deployment.")
+@click.option(
+    "--output", type=click.Choice(["json", "human"], case_sensitive=False), default="human", help="Output format"
+)
 @click.version_option(version=VERSION)
 @click.pass_context
 @coro
@@ -84,15 +87,19 @@ async def cli(
     show_tokens: bool,
     cloud: bool,
     staging: bool,
+    output: str,
 ) -> None:
     """
     Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
     """
     # We need to unpatch for our tests not to break
-    if show_tokens or not cloud or ctx.invoked_subcommand == "build":
-        __unpatch_click_output()
+    if output == "json":
+        __hide_click_output()
     else:
-        __patch_click_output()
+        if show_tokens or not cloud or ctx.invoked_subcommand == "build":
+            __unpatch_click_output()
+        else:
+            __patch_click_output()
 
     if getenv_bool("TB_DISABLE_SSL_CHECKS", False):
         click.echo(FeedbackManager.warning_disabled_ssl_checks())
@@ -167,6 +174,7 @@ async def cli(
 
     ctx.ensure_object(dict)["project"] = project
     ctx.ensure_object(dict)["env"] = get_target_env(cloud)
+    ctx.ensure_object(dict)["output"] = output
 
 
 @cli.command(hidden=True)
@@ -316,6 +324,24 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
+def __hide_click_output() -> None:
+    """
+    Modify click.echo and click.secho to only output when explicitly requested.
+    Adds a 'force_output' parameter to both functions that defaults to False.
+    """
+
+    def silent_echo(msg: Any, *args: Any, force_output: bool = False, **kwargs: Any) -> None:
+        if force_output:
+            __old_click_echo(msg, *args, **kwargs)
+
+    def silent_secho(msg: Any, *args: Any, force_output: bool = False, **kwargs: Any) -> None:
+        if force_output:
+            __old_click_secho(msg, *args, **kwargs)
+
+    click.echo = silent_echo  # type: ignore
+    click.secho = silent_secho  # type: ignore
+
+
 async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool):
     commands_without_ctx_client = [
         "auth",

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/tinybird/tb/modules/common.py

@@ -2227,3 +2227,7 @@ def get_error_event(error: str) -> Tuple[str, str]:
         error_event = "error"
         silent_error_msg = "Unknown error"
     return error_event, silent_error_msg
+
+
+def echo_json(data: Dict[str, Any]) -> None:
+    click.echo(json.dumps(data), force_output=True)  # type: ignore

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/tinybird/tb/modules/create.py

@@ -435,13 +435,8 @@ def save_context(prompt: str, feedback: str):
 
 
 def get_resources_xml(project: Project) -> str:
-    folder = project.folder
-    datasource_paths = [
-        Path(folder) / "datasources" / f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")
-    ]
-    pipes_paths = [
-        Path(folder) / "endpoints" / f for f in os.listdir(Path(folder) / "endpoints") if f.endswith(".pipe")
-    ]
+    datasource_paths = [Path(f) for f in project.get_datasource_files()]
+    pipes_paths = [Path(f) for f in project.get_pipe_files()]
     resources_xml = "\n".join(
         [
             f"<resource><type>{resource_type}</type><name>{resource_name}</name><content>{resource_content}</content></resource>"

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/tinybird/tb/modules/info.py

@@ -1,12 +1,12 @@
 import os
-from typing import Any, Dict, Iterable, List, Optional
+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.modules.cli import CLIConfig, cli
-from tinybird.tb.modules.common import coro, format_robust_table
+from tinybird.tb.modules.common import coro, echo_json, format_robust_table
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import TB_LOCAL_ADDRESS, get_tinybird_local_config
 from tinybird.tb.modules.project import Project
@@ -19,15 +19,29 @@ async def info(ctx: click.Context) -> None:
     """Get information about the project that is currently being used"""
     ctx_config = ctx.ensure_object(dict)["config"]
     project: Project = ctx.ensure_object(dict)["project"]
+    is_json = ctx.ensure_object(dict)["output"] == "json"
     click.echo(FeedbackManager.highlight(message="» Tinybird Cloud:"))
-    await get_cloud_info(ctx_config)
+    cloud_table, cloud_columns = await get_cloud_info(ctx_config)
     click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
-    await get_local_info(ctx_config)
+    local_table, local_columns = await get_local_info(ctx_config)
     click.echo(FeedbackManager.highlight(message="\n» Project:"))
-    await get_project_info(project.folder)
+    project_table, project_columns = await get_project_info(project.folder)
+    if is_json:
+        cloud_data = {}
+        if cloud_columns and cloud_table and isinstance(cloud_table, list) and len(cloud_table) > 0:
+            cloud_data = {column: cloud_table[0][i] for i, column in enumerate(cloud_columns)}
 
+        local_data = {}
+        if local_columns and local_table and isinstance(local_table, list) and len(local_table) > 0:
+            local_data = {column: local_table[0][i] for i, column in enumerate(local_columns)}
 
-async def get_cloud_info(ctx_config: Dict[str, Any]) -> None:
+        project_data = {}
+        if project_columns and project_table and isinstance(project_table, list) and len(project_table) > 0:
+            project_data = {column: project_table[0][i] for i, column in enumerate(project_columns)}
+        echo_json({"cloud": cloud_data, "local": local_data, "project": project_data})
+
+
+async def get_cloud_info(ctx_config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]]:
     config = CLIConfig.get_project_config()
 
     try:
@@ -37,16 +51,17 @@ async def get_cloud_info(ctx_config: Dict[str, Any]) -> None:
         ui_host = get_display_cloud_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"
-        await get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host)
+        return await get_env_info(client, ctx_config, user_email, token, user_token, api_host, ui_host)
     except Exception:
         click.echo(
             FeedbackManager.warning(
                 message="\n⚠  Could not retrieve Tinybird Cloud info. Please run `tb login` first or check that you are located in the correct directory."
             )
         )
+        return [], []
 
 
-async def get_local_info(config: Dict[str, Any]) -> None:
+async def get_local_info(config: Dict[str, Any]) -> Tuple[Iterable[Any], List[str]]:
     try:
         local_config = await get_tinybird_local_config(config, test=False, silent=False)
         local_client = local_config.get_client(host=TB_LOCAL_ADDRESS, staging=False)
@@ -55,19 +70,19 @@ async def get_local_info(config: Dict[str, Any]) -> None:
         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)
-        await get_env_info(local_client, config, user_email, token, user_token, api_host, ui_host)
+        return await get_env_info(local_client, config, user_email, token, user_token, api_host, ui_host)
     except Exception:
         click.echo(
             FeedbackManager.warning(
                 message="\n⚠  Could not retrieve Tinybird Local info. Please run `tb local start` first."
             )
         )
-        return
+        return [], []
 
 
 async def get_env_info(
     client: TinyB, config: Dict[str, Any], user_email: str, token: str, user_token: str, api_host: str, ui_host: str
-) -> None:
+) -> Tuple[List[Any], List[str]]:
     user_workspaces = await client.user_workspaces(version="v1")
     current_workspace = await client.workspace_info(version="v1")
 
@@ -94,9 +109,10 @@ async def get_env_info(
     ]
 
     click.echo(format_robust_table(table, column_names=columns))
+    return table, columns
 
 
-async def get_project_info(project_path: Optional[str] = None) -> None:
+async def get_project_info(project_path: Optional[str] = None) -> Tuple[Iterable[Any], List[str]]:
     config = CLIConfig.get_project_config()
     tinyb_path = config.get_tinyb_file()
     current_path = os.getcwd()
@@ -110,3 +126,4 @@ async def get_project_info(project_path: Optional[str] = None) -> None:
     columns = ["current", ".tinyb", "project"]
     table: Iterable[Any] = [(current_path, tinyb_path, project_path)]
     click.echo(format_robust_table(table, column_names=columns))
+    return table, columns

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/tinybird/tb/modules/project.py

@@ -38,32 +38,26 @@ class Project:
             return None
         return Path(full_path).relative_to(self.path).as_posix()
 
-    def get_vendor_files(self) -> List[str]:
-        vendor_files: List[str] = []
-        for project_file in glob.glob(f"{self.vendor_path}/**/*.datasource", recursive=False):
-            vendor_files.append(project_file)
-        return vendor_files
-
     @property
     def datasources(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=False)])
+        return sorted([Path(f).stem for f in self.get_datasource_files()])
 
     @property
     def pipes(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=False)])
+        return sorted([Path(f).stem for f in self.get_pipe_files()])
 
     @property
     def connections(self) -> List[str]:
-        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.connection", recursive=False)])
+        return sorted([Path(f).stem for f in self.get_connection_files()])
 
     def get_datasource_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.datasource", recursive=False)
+        return glob.glob(f"{self.path}/**/*.datasource", recursive=True)
 
     def get_pipe_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.pipe", recursive=False)
+        return glob.glob(f"{self.path}/**/*.pipe", recursive=True)
 
     def get_connection_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.connection", recursive=False)
+        return glob.glob(f"{self.path}/**/*.connection", recursive=True)
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

{tinybird-0.0.1.dev169 → tinybird-0.0.1.dev171}/tinybird.egg-info/PKG-INFO

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