tinybird 0.0.1.dev160__tar.gz → 0.0.1.dev161__tar.gz

{tinybird-0.0.1.dev160 → tinybird-0.0.1.dev161}/PKG-INFO

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

{tinybird-0.0.1.dev160 → tinybird-0.0.1.dev161}/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.dev160'
-__revision__ = '8c1a42a'
+__version__ = '0.0.1.dev161'
+__revision__ = '29ac536'

{tinybird-0.0.1.dev160 → tinybird-0.0.1.dev161}/tinybird/tb/modules/build.py

@@ -17,7 +17,6 @@ from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data, sys_exit
 from tinybird.tb.modules.config import CLIConfig
-from tinybird.tb.modules.datafile.build import folder_build
 from tinybird.tb.modules.datafile.exceptions import ParseException
 from tinybird.tb.modules.datafile.fixture import FixtureExtension, get_fixture_dir, persist_fixture
 from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
@@ -75,7 +74,7 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
     )
 
 
-def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str] = None, silent: bool = False) -> None:
+def build_project(project: Project, tb_client: TinyB, silent: bool = False) -> Optional[bool]:
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
     DATAFILE_TYPE_TO_CONTENT_TYPE = {
         ".datasource": "text/plain",
@@ -95,7 +94,7 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         project_files = project.get_project_files()
 
         if not project_files:
-            return
+            return False
 
         for file_path in project_files:
             relative_path = str(Path(file_path).relative_to(project_path))
@@ -118,37 +117,40 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         build_result = result.get("result")
         if build_result == "success":
             build = result.get("build")
-            datasources = build.get("new_datasource_names", [])
-            pipes = build.get("new_pipe_names", [])
-            connections = build.get("new_data_connector_names", [])
-
-            if not file_changed and not silent:
-                for ds in datasources:
-                    ds_path_str: Optional[str] = next(
-                        (p for p in project_files if p.endswith(ds + ".datasource")), None
-                    )
-                    if ds_path_str:
-                        ds_path = Path(ds_path_str)
-                        ds_path_str = ds_path_str.replace(f"{project.folder}/", "")
-                        click.echo(FeedbackManager.info(message=f"✓ {ds_path_str} created"))
-                for pipe in pipes:
-                    pipe_name = pipe
-                    pipe_path_str: Optional[str] = next(
-                        (p for p in project_files if p.endswith(pipe_name + ".pipe")), None
-                    )
-                    if pipe_path_str:
-                        pipe_path_str = pipe_path_str.replace(f"{project.folder}/", "")
-                        click.echo(FeedbackManager.info(message=f"✓ {pipe_path_str} created"))
-
-                for connection in connections:
-                    connection_name = connection
-                    connection_path_str: Optional[str] = next(
-                        (p for p in project_files if p.endswith(connection_name + ".connection")), None
-                    )
-                    if connection_path_str:
-                        connection_path_str = connection_path_str.replace(f"{project.folder}/", "")
-                        click.echo(FeedbackManager.info(message=f"✓ {connection_path_str} created"))
-
+            new_datasources = build.get("new_datasource_names", [])
+            new_pipes = build.get("new_pipe_names", [])
+            new_connections = build.get("new_data_connector_names", [])
+            changed_datasources = build.get("changed_datasource_names", [])
+            changed_pipes = build.get("changed_pipe_names", [])
+            changed_connections = build.get("changed_data_connector_names", [])
+            deleted_datasources = build.get("deleted_datasource_names", [])
+            deleted_pipes = build.get("deleted_pipe_names", [])
+            deleted_connections = build.get("deleted_data_connector_names", [])
+
+            no_changes = (
+                not new_datasources
+                and not changed_datasources
+                and not new_pipes
+                and not changed_pipes
+                and not new_connections
+                and not changed_connections
+                and not deleted_datasources
+                and not deleted_pipes
+                and not deleted_connections
+            )
+            if no_changes:
+                return False
+            else:
+                if not silent:
+                    echo_changes(project, new_datasources, ".datasource", "created")
+                    echo_changes(project, changed_datasources, ".datasource", "changed")
+                    echo_changes(project, deleted_datasources, ".datasource", "deleted")
+                    echo_changes(project, new_pipes, ".pipe", "created")
+                    echo_changes(project, changed_pipes, ".pipe", "changed")
+                    echo_changes(project, deleted_pipes, ".pipe", "deleted")
+                    echo_changes(project, new_connections, ".connection", "created")
+                    echo_changes(project, changed_connections, ".connection", "changed")
+                    echo_changes(project, deleted_connections, ".connection", "deleted")
             try:
                 for filename in project_files:
                     if filename.endswith(".datasource"):
@@ -200,6 +202,8 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
     if error:
         raise click.ClickException(error)
 
+    return build_result
+
 
 def append_fixture(
     tb_client: TinyB,
@@ -285,6 +289,7 @@ def process(
     time_start = time.time()
     build_failed = False
     build_error: Optional[str] = None
+    build_result: Optional[bool] = None
     if build_status:
         if build_status.building:
             return build_status.error
@@ -296,7 +301,7 @@ def process(
         rebuild_fixture_sql(project, tb_client, file_changed)
     else:
         try:
-            build_project(project, tb_client, file_changed, silent)
+            build_result = build_project(project, tb_client, silent)
             if build_status:
                 build_status.building = False
                 build_status.error = None
@@ -305,10 +310,8 @@ def process(
             build_error = str(e)
             build_failed = True
         try:
-            if file_changed and not build_failed:
-                asyncio.run(folder_build(project, tb_client, filenames=[file_changed]))
-                if not build_status:
-                    show_data(tb_client, file_changed, diff)
+            if file_changed and not build_failed and not build_status:
+                show_data(tb_client, file_changed, diff)
         except Exception:
             pass
 
@@ -327,7 +330,10 @@ def process(
         return build_error
     else:
         if not silent:
-            click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
+            if build_result == False:  # noqa: E712
+                click.echo(FeedbackManager.info(message="No changes. Build skipped."))
+            else:
+                click.echo(FeedbackManager.success(message=f"\n✓ {rebuild_str} completed in {elapsed_time:.1f}s"))
 
     return None
 
@@ -473,3 +479,13 @@ async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename
     node_sql = last_node["sql"]
     res = await tb_client.query(f"{node_sql} FORMAT JSON", playground=playground_id)
     print_table_formatted(res, name)
+
+
+def echo_changes(project: Project, changes: List[str], extension: str, status: str):
+    for resource in changes:
+        path_str = next(
+            (p for p in project.get_project_files() if p.endswith(resource + extension)), resource + extension
+        )
+        if path_str:
+            path_str = path_str.replace(f"{project.folder}/", "")
+            click.echo(FeedbackManager.info(message=f"✓ {path_str} {status}"))

{tinybird-0.0.1.dev160 → tinybird-0.0.1.dev161}/tinybird/tb/modules/watch.py

@@ -30,7 +30,7 @@ class WatchProjectHandler(PatternMatchingEventHandler):
         self.project = project
         self.process = process
         self.datafiles = project.get_project_datafiles()
-        patterns = [f"{project.path}/**/*{ext}" for ext in self.valid_extensions]
+        patterns = [f"**/*{ext}" for ext in self.valid_extensions]
         super().__init__(patterns=patterns)
 
     def should_process(self, event: Any) -> Optional[str]:

{tinybird-0.0.1.dev160 → tinybird-0.0.1.dev161}/tinybird.egg-info/PKG-INFO

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