tinybird 0.0.1.dev152__tar.gz → 0.0.1.dev154__tar.gz

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev152
+Version: 0.0.1.dev154
 Summary: Tinybird Command Line Tool
-Home-page: https://www.tinybird.co/docs/cli/introduction.html
+Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
 Author-email: support@tinybird.co
 Requires-Python: >=3.9, <3.14

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/__cli__.py

@@ -1,8 +1,8 @@
 
 __name__ = 'tinybird'
 __description__ = 'Tinybird Command Line Tool'
-__url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
+__url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev152'
-__revision__ = '100f32b'
+__version__ = '0.0.1.dev154'
+__revision__ = 'db74d7e'

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/modules/build.py

@@ -23,6 +23,7 @@ from tinybird.tb.modules.datafile.fixture import FixtureExtension, get_fixture_d
 from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
 from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
 from tinybird.tb.modules.datafile.playground import folder_playground
+from tinybird.tb.modules.dev_server import BuildStatus, start_server
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.shell import Shell, print_table_formatted
@@ -50,16 +51,28 @@ def build(ctx: click.Context, watch: bool) -> None:
 
 @cli.command("dev", help="Build the project server side and watch for changes.")
 @click.option("--data-origin", type=str, default="", help="Data origin: local or cloud")
+@click.option("--ui", is_flag=True, default=False, help="Connect your local project to Tinybird UI")
 @click.pass_context
-def dev(ctx: click.Context, data_origin: str) -> None:
+def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
     if data_origin == "cloud":
         return dev_cloud(ctx)
-
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
+    build_status = BuildStatus()
+    if ui:
+        server_thread = threading.Thread(
+            target=start_server, args=(project, tb_client, process, build_status), daemon=True
+        )
+        server_thread.start()
+        # Wait for the server to start
+        time.sleep(0.5)
     click.echo(FeedbackManager.highlight_building_project())
-    process(project=project, tb_client=tb_client, watch=True)
-    run_watch(project=project, tb_client=tb_client, process=partial(process, project=project, tb_client=tb_client))
+    process(project=project, tb_client=tb_client, watch=True, build_status=build_status)
+    run_watch(
+        project=project,
+        tb_client=tb_client,
+        process=partial(process, project=project, tb_client=tb_client, build_status=build_status),
+    )
 
 
 def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str] = None, silent: bool = False) -> None:
@@ -171,7 +184,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
             build_errors = result.get("errors")
             full_error_msg = ""
             for build_error in build_errors:
-                filename_bit = build_error.get("filename", "")
+                filename_bit = build_error.get("filename", build_error.get("resource", ""))
                 error_bit = build_error.get("error") or build_error.get("message") or ""
                 error_msg = ((filename_bit + "\n") if filename_bit else "") + error_bit
                 full_error_msg += error_msg + "\n\n"
@@ -266,10 +279,17 @@ def process(
     file_changed: Optional[str] = None,
     diff: Optional[str] = None,
     silent: bool = False,
-) -> None:
+    error: bool = False,
+    build_status: Optional[BuildStatus] = None,
+) -> Optional[str]:
     time_start = time.time()
     build_failed = False
     build_error: Optional[str] = None
+    if build_status:
+        if build_status.building:
+            return build_status.error
+        else:
+            build_status.building = True
     if file_changed and (file_changed.endswith(FixtureExtension.NDJSON) or file_changed.endswith(FixtureExtension.CSV)):
         rebuild_fixture(project, tb_client, file_changed)
     elif file_changed and file_changed.endswith(".sql"):
@@ -277,6 +297,9 @@ def process(
     else:
         try:
             build_project(project, tb_client, file_changed, silent)
+            if build_status:
+                build_status.building = False
+                build_status.error = None
         except click.ClickException as e:
             click.echo(FeedbackManager.info(message=str(e)))
             build_error = str(e)
@@ -284,7 +307,8 @@ def process(
         try:
             if file_changed and not build_failed:
                 asyncio.run(folder_build(project, tb_client, filenames=[file_changed]))
-                show_data(tb_client, file_changed, diff)
+                if not build_status:
+                    show_data(tb_client, file_changed, diff)
         except Exception:
             pass
 
@@ -296,14 +320,19 @@ def process(
         click.echo(FeedbackManager.error(message=f"✗ {rebuild_str} failed"))
         if not watch:
             sys_exit("build_error", build_error or "Unknown error")
+        build_error = build_error or "Unknown error"
+        if build_status:
+            build_status.error = build_error
+            build_status.building = False
+        return build_error
     else:
         if not silent:
             click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
 
+    return None
 
-def run_watch(
-    project: Project, tb_client: TinyB, process: Callable[[bool, Optional[str], Optional[str]], None]
-) -> None:
+
+def run_watch(project: Project, tb_client: TinyB, process: Callable) -> None:
     shell = Shell(project=project, tb_client=tb_client, playground=False)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
     watcher_thread = threading.Thread(

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/modules/cli.py

@@ -141,7 +141,7 @@ async def cli(
     config = await get_config(host, token, user_token=user_token, config_file=config_temp._path)
     client = _get_tb_client(config.get("token", None), config["host"])
     folder = os.path.join(config_temp._path.replace(".tinyb", ""), config.get("cwd", os.getcwd()))
-    project = Project(folder=folder)
+    project = Project(folder=folder, workspace_name=config.get("name", ""))
     config["path"] = str(project.path)
     # If they have passed a token or host as parameter and it's different that record in .tinyb, refresh the workspace id
     if token or host:

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/modules/deployment.py

@@ -68,7 +68,6 @@ def download_github_template(url: str) -> Optional[Path]:
     """
     # Parse GitHub URL components
     # From: https://github.com/owner/repo/tree/branch/path
-    # To: api.github.com/repos/owner/repo/contents/path?ref=branch
     parts = url.replace("https://github.com/", "").split("/")
     if len(parts) < 5 or "tree" not in parts:
         click.echo(
@@ -83,16 +82,50 @@ def download_github_template(url: str) -> Optional[Path]:
     branch = parts[parts.index("tree") + 1]
     path = "/".join(parts[parts.index("tree") + 2 :])
 
-    api_url = f"https://api.github.com/repos/{owner}/{repo}/contents/{path}?ref={branch}"
-
-    # Create temporary directory for template
+    try:
+        import shutil
+        import subprocess
+        import tempfile
+
+        # Create a temporary directory for cloning
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # Clone the specific branch with minimum depth
+            repo_url = f"https://github.com/{owner}/{repo}.git"
+            subprocess.run(
+                ["git", "clone", "--depth", "1", "--branch", branch, repo_url, temp_dir],
+                check=True,
+                capture_output=True,
+            )
 
-    dir = Path(".")
+            # Copy the specific path to current directory
+            source_path = Path(temp_dir) / path
+            if not source_path.exists():
+                click.echo(FeedbackManager.error(message=f"Path {path} not found in repository"))
+                return None
+
+            dir = Path(".")
+            if source_path.is_dir():
+                # Copy directory contents
+                for item in source_path.iterdir():
+                    dest = dir / item.name
+                    if item.is_dir():
+                        shutil.copytree(item, dest)
+                    else:
+                        shutil.copy2(item, dest)
+                    click.echo(FeedbackManager.info(message=f"Downloaded {item.name}"))
+            else:
+                # Copy single file
+                shutil.copy2(source_path, dir / source_path.name)
+                click.echo(FeedbackManager.info(message=f"Downloaded {source_path.name}"))
 
-    # Recursively download all files
-    download_github_contents(api_url, dir)
+            return dir
 
-    return dir
+    except subprocess.CalledProcessError as e:
+        click.echo(FeedbackManager.error(message=f"Git clone failed: {e.stderr.decode()}"))
+        return None
+    except Exception as e:
+        click.echo(FeedbackManager.error(message=f"Error downloading template: {str(e)}"))
+        return None
 
 
 # TODO(eclbg): This should eventually end up in client.py, but we're not using it here yet.

tinybird-0.0.1.dev154/tinybird/tb/modules/dev_server.py

@@ -0,0 +1,257 @@
+import glob
+import http.server
+import json
+import time
+from pathlib import Path
+from typing import Callable, Optional
+
+import click
+
+from tinybird.tb.client import TinyB
+from tinybird.tb.modules.common import sys_exit
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.local_common import TB_LOCAL_PORT
+from tinybird.tb.modules.project import Project
+
+
+class BuildStatus:
+    def __init__(self):
+        self.last_build_time = 0
+        self.building = False
+        self.error: Optional[str] = None
+        self.result: Optional[str] = None
+
+
+class DevServer(http.server.HTTPServer):
+    project: Project
+    tb_client: TinyB
+    process: Callable
+
+    def __init__(
+        self,
+        process: Callable,
+        project: Project,
+        build_status: BuildStatus,
+        tb_client: TinyB,
+    ):
+        port = 49161
+        self.project = project
+        self.tb_client = tb_client
+        self.process = process
+        self.build_status = build_status
+        self.port = port
+
+        try:
+            super().__init__(("", port), DevHandler)
+            click.echo(FeedbackManager.success(message=f"✓ Dev server running on http://localhost:{port}"))
+            click.echo(
+                FeedbackManager.info(
+                    message=f"* Access your project at https://cloud.tinybird.co/local/{TB_LOCAL_PORT}/{project.workspace_name}/project"
+                )
+            )
+        except OSError as e:
+            if e.errno == 48:  # Address already in use
+                click.echo(FeedbackManager.error(message=f"Port {port} is already in use. Try a different port."))
+                sys_exit("port_in_use", f"Port {port} is already in use")
+            else:
+                click.echo(FeedbackManager.error_exception(error=e))
+                sys_exit("server_error", str(e))
+
+
+class DevHandler(http.server.SimpleHTTPRequestHandler):
+    server: DevServer
+
+    def send_cors_headers(self):
+        self.send_header("Access-Control-Allow-Origin", "*")
+        self.send_header("Access-Control-Allow-Methods", "GET, POST, OPTIONS")
+        self.send_header("Access-Control-Allow-Headers", "Content-Type, Authorization")
+
+    def do_OPTIONS(self):
+        self.send_response(200)
+        self.send_cors_headers()
+        self.end_headers()
+
+    def do_GET(self):
+        try:
+            project: Project = self.server.project
+
+            if self.path == "/":
+                self.send_response(200)
+                self.send_header("Content-Type", "text/html")
+                self.send_cors_headers()
+                self.end_headers()
+
+                html = f"""
+                <!DOCTYPE html>
+                <html>
+                <head>
+                    <title>Tinybird Dev Server</title>
+                    <style>
+                        body {{ font-family: Arial, sans-serif; margin: 40px; line-height: 1.6; }}
+                        h1 {{ color: #333; }}
+                        ul {{ list-style-type: none; padding: 0; }}
+                        li {{ margin-bottom: 10px; }}
+                        a {{ color: #0066cc; text-decoration: none; }}
+                        a:hover {{ text-decoration: underline; }}
+                    </style>
+                </head>
+                <body>
+                    <h1>Tinybird Dev Server</h1>
+                    <p>Server running for project: {project.path}</p>
+                    <p>Access your local environment at <a href="https://cloud.tinybird.co/local/{TB_LOCAL_PORT}/{project.workspace_name}/project">https://cloud.tinybird.co/local/{TB_LOCAL_PORT}/{project.workspace_name}/project</a> and edit your project.</p>
+                    <h2>API Endpoints:</h2>
+                    <ul>
+                        <li><a href="/files">/files</a> - List all project files</li>
+                    </ul>
+                </body>
+                </html>
+                """
+                self.wfile.write(html.encode())
+                return
+
+            elif "/files/" in self.path:
+                file_path = self.path.split("/files/")[1].split("?")[0]
+                project_files = project.get_project_files()
+                project_file = next((Path(f) for f in project_files if f.endswith(file_path)), None)
+                if not project_file:
+                    self.send_response(404)
+                    self.send_header("Content-Type", "application/json")
+                    self.send_cors_headers()
+                    self.end_headers()
+                    self.wfile.write(json.dumps({"status": "error", "error": "Resource not found"}).encode())
+                    return
+
+                self.send_response(200)
+                self.send_header("Content-Type", "application/json")
+                self.send_cors_headers()
+                self.end_headers()
+                self.wfile.write(json.dumps({"path": str(project_file), "content": project_file.read_text()}).encode())
+                return
+
+            elif "/files" in self.path:
+                project_files = project.get_project_files()
+                self.send_response(200)
+                self.send_header("Content-Type", "application/json")
+                self.send_cors_headers()
+                self.end_headers()
+                self.wfile.write(
+                    json.dumps(
+                        {
+                            "files": [f.replace(f"{project.folder}/", "") for f in project_files],
+                            "root": project.folder,
+                            "workspace_name": project.workspace_name,
+                        }
+                    ).encode()
+                )
+                return
+
+            # Handle all other paths
+            self.send_response(404)
+            self.send_header("Content-Type", "application/json")
+            self.send_cors_headers()
+            self.end_headers()
+            self.wfile.write(json.dumps({"status": "error", "message": "Not found"}).encode())
+
+        except Exception as e:
+            self.send_response(400)
+            self.send_header("Content-Type", "application/json")
+            self.send_cors_headers()
+            self.end_headers()
+            self.wfile.write(json.dumps({"status": "error", "message": str(e)}).encode())
+
+    def do_POST(self):
+        try:
+            # Parse the request body
+            content_length = int(self.headers["Content-Length"])
+            body = self.rfile.read(content_length)
+            data = json.loads(body)
+
+            # Get the file path from the request body
+            file_path = data.get("path")
+            if not file_path:
+                self.send_response(400)
+                self.send_header("Content-Type", "application/json")
+                self.send_cors_headers()
+                self.end_headers()
+                self.wfile.write(json.dumps({"status": "error", "message": "No file path provided"}).encode())
+                return
+
+            exists = glob.glob(f"{self.server.project.folder}/**/{file_path}", recursive=True)
+            if not exists:
+                self.send_response(400)
+                self.send_header("Content-Type", "application/json")
+                self.send_cors_headers()
+                self.end_headers()
+                self.wfile.write(json.dumps({"status": "error", "message": "File does not exist"}).encode())
+                return
+
+            # Get the content from the request body
+            content = data.get("content")
+            if not content:
+                self.send_response(400)
+                self.send_header("Content-Type", "application/json")
+                self.send_cors_headers()
+                self.end_headers()
+                self.wfile.write(json.dumps({"status": "error", "message": "No content provided"}).encode())
+                return
+
+            # Write the content to the file
+            file_path = exists[0]
+            with open(file_path, "w") as f:
+                f.write(content)
+            # sleep for 0.2 seconds to ensure the file is written
+            time.sleep(0.2)
+
+            def check_build_status(attempts: int = 0):
+                if attempts > 10:
+                    return "Build timeout. Check the console for more details."
+                if self.server.build_status.building:
+                    time.sleep(0.5)
+                    return check_build_status(attempts + 1)
+                else:
+                    return self.server.build_status.error
+
+            build_error = check_build_status()
+            if build_error:
+                raise Exception(build_error)
+
+            self.send_response(200)
+            self.send_header("Content-Type", "application/json")
+            self.send_cors_headers()
+            self.end_headers()
+            self.wfile.write(json.dumps({"status": "success", "message": "File written successfully"}).encode())
+
+        except Exception as e:
+            self.send_response(400)
+            self.send_header("Content-Type", "application/json")
+            self.send_cors_headers()
+            self.end_headers()
+            self.wfile.write(json.dumps({"status": "error", "error": str(e)}).encode())
+
+    def log_message(self, format, *args):
+        pass
+
+
+def start_server(project: Project, tb_client: TinyB, process: Callable, build_status: BuildStatus):
+    """Start a development server for the project.
+
+    Args:
+        project: The project instance to serve.
+    """
+
+    try:
+        click.echo(FeedbackManager.highlight(message="\n» Starting Tinybird dev server...\n"))
+
+        # Create and start the server
+        server = DevServer(process, project, build_status, tb_client)
+        server.serve_forever()
+
+        # Run the server in the main thread
+        click.echo(FeedbackManager.gray(message="\nWatching for changes...\n"))
+        click.echo(FeedbackManager.highlight(message="Press Ctrl+C to stop the server\n"))
+
+    except KeyboardInterrupt:
+        click.echo(FeedbackManager.highlight(message="\n» Stopping Tinybird dev server...\n"))
+    except Exception as e:
+        click.echo(FeedbackManager.error_exception(error=e))
+        sys_exit("server_error", str(e))

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/modules/local.py

@@ -16,6 +16,7 @@ from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException, CLILocalException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, TB_LOCAL_PORT
+from tinybird.tb.modules.telemetry import add_telemetry_event
 
 
 def start_tinybird_local(
@@ -131,16 +132,70 @@ def get_docker_client() -> DockerClient:
         if not docker_host:
             # Try to get docker host from docker context
             try:
-                output = subprocess.check_output(["docker", "context", "inspect"], text=True)
-                context = json.loads(output)
+                try:
+                    output = subprocess.check_output(["docker", "context", "inspect"], text=True)
+                except Exception as e:
+                    add_telemetry_event(
+                        "docker_error",
+                        data={
+                            "error_kind": "docker_context_inspect_error",
+                            "exception": str(e),
+                        },
+                    )
+                    raise e
+                try:
+                    context = json.loads(output)
+                except Exception as e:
+                    add_telemetry_event(
+                        "docker_error",
+                        data={
+                            "error_kind": "docker_context_inspect_parse_output_error",
+                            "exception": str(e),
+                            "docker_context_inspect_output": output,
+                        },
+                    )
+                    raise e
                 if context and len(context) > 0:
-                    docker_host = context[0].get("Endpoints", {}).get("docker", {}).get("Host")
-                    if docker_host:
-                        os.environ["DOCKER_HOST"] = docker_host
+                    try:
+                        docker_host = context[0].get("Endpoints", {}).get("docker", {}).get("Host")
+                        if docker_host:
+                            os.environ["DOCKER_HOST"] = docker_host
+                    except Exception as e:
+                        add_telemetry_event(
+                            "docker_error",
+                            data={
+                                "error_kind": "docker_context_parse_host_error",
+                                "exception": str(e),
+                                "context": json.dumps(context),
+                            },
+                        )
+                        raise e
             except Exception:
                 pass
-        client = docker.from_env()  # type: ignore
-        client.ping()
+        try:
+            client = docker.from_env()  # type: ignore
+        except Exception as e:
+            add_telemetry_event(
+                "docker_error",
+                data={
+                    "error_kind": "docker_get_client_from_env_error",
+                    "exception": str(e),
+                },
+            )
+            raise e
+        try:
+            client.ping()
+        except Exception as e:
+            client_dict_non_sensitive = {k: v for k, v in client.api.__dict__.items() if "auth" not in k}
+            add_telemetry_event(
+                "docker_error",
+                data={
+                    "error_kind": "docker_ping_error",
+                    "exception": str(e),
+                    "client": repr(client_dict_non_sensitive),
+                },
+            )
+            raise e
         return client
     except Exception:
         raise CLILocalException(

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/modules/local_common.py

@@ -2,6 +2,7 @@ import hashlib
 import logging
 import os
 import re
+import subprocess
 from typing import Any, Dict
 
 import requests
@@ -10,6 +11,7 @@ from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLILocalException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.telemetry import add_telemetry_event
 
 TB_IMAGE_NAME = "tinybirdco/tinybird-local:latest"
 TB_CONTAINER_NAME = "tinybird-local"
@@ -37,6 +39,22 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any], test: bool = Fal
         # ruff: noqa: ASYNC210
         tokens = requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
     except Exception:
+        try:
+            # Check if tinybird-local is running with docker, in case it's a config issue
+            output = subprocess.check_output(["docker", "ps"], text=True)  # noqa: ASYNC221
+            header_row = next((line for line in output.splitlines() if "CONTAINER ID" in line), "")
+            tb_local_row = next(
+                (line for line in output.splitlines() if TB_CONTAINER_NAME in line),
+                f"{TB_CONTAINER_NAME} not found in output",
+            )
+            add_telemetry_event(
+                "docker_debug",
+                data={
+                    "docker_ps_output": header_row + tb_local_row,
+                },
+            )
+        except Exception:
+            pass
         raise CLILocalException(
             FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
         )

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird/tb/modules/project.py

@@ -11,8 +11,9 @@ from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
 class Project:
     extensions = ("datasource", "pipe", "connection")
 
-    def __init__(self, folder: str):
+    def __init__(self, folder: str, workspace_name: str):
         self.folder = folder
+        self.workspace_name = workspace_name
 
     @property
     def path(self) -> Path:

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev152
+Version: 0.0.1.dev154
 Summary: Tinybird Command Line Tool
-Home-page: https://www.tinybird.co/docs/cli/introduction.html
+Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
 Author-email: support@tinybird.co
 Requires-Python: >=3.9, <3.14

{tinybird-0.0.1.dev152 → tinybird-0.0.1.dev154}/tinybird.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ tinybird/tb/modules/create.py
 tinybird/tb/modules/datasource.py
 tinybird/tb/modules/deployment.py
 tinybird/tb/modules/deprecations.py
+tinybird/tb/modules/dev_server.py
 tinybird/tb/modules/endpoint.py
 tinybird/tb/modules/exceptions.py
 tinybird/tb/modules/feedback_manager.py