tinybird-cli 1.2.1.dev4__tar.gz → 1.2.1.dev6__tar.gz

{tinybird-cli-1.2.1.dev4 → tinybird-cli-1.2.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.2.1.dev4
+Version: 1.2.1.dev6
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+1.2.1.dev6
+************
+
+- `Fixed` Skip replacing `.incl` files in `tb fmt`
+
+1.2.1.dev5
+************
+
+- `Added` Support for Copy pipes in `tb fmt` 
+
 1.2.1.dev4
 ************
 

{tinybird-cli-1.2.1.dev4 → tinybird-cli-1.2.1.dev6}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '1.2.1.dev4'
-__revision__ = '9dd3d50'
+__version__ = '1.2.1.dev6'
+__revision__ = '35463e1'

{tinybird-cli-1.2.1.dev4 → tinybird-cli-1.2.1.dev6}/tinybird/datafile.py

@@ -108,15 +108,22 @@ class DataFileExtensions:
     TOKEN = ".token"
 
 
+class CopyParameters:
+    TARGET_DATASOURCE = "target_datasource"
+    COPY_SCHEDULE = "copy_schedule"
+
+
 PREVIEW_CONNECTOR_SERVICES = ["s3", "gcs"]
 
+ON_DEMAND = "@on-demand"
+
 
 class ImportReplacements:
     _REPLACEMENTS: Tuple[Tuple[str, str, Optional[str]], ...] = (
         ("import_service", "service", None),
         ("import_strategy", "mode", "replace"),
         ("import_connection_name", "connection", None),
-        ("import_schedule", "cron", "@on-demand"),
+        ("import_schedule", "cron", ON_DEMAND),
         ("import_query", "query", None),
         ("import_connector", "connector", None),
         ("import_external_datasource", "external_data_source", None),
@@ -156,7 +163,7 @@ class ImportReplacements:
         if linker_param != "cron":
             return linker_value
         if linker_value == "@once":
-            return "@on-demand"
+            return ON_DEMAND
         if connector_service in PREVIEW_CONNECTOR_SERVICES:
             return "@auto"
         return linker_value
@@ -193,7 +200,7 @@ class ExportReplacements:
         """Returns the export parameters for a given node."""
         params = {}
         for datafile_key, export_key, default_value in ExportReplacements._REPLACEMENTS:
-            if datafile_key == "export_schedule" and node.get(datafile_key, None) == "@on-demand":
+            if datafile_key == "export_schedule" and node.get(datafile_key, None) == ON_DEMAND:
                 node[datafile_key] = ""
             params[export_key] = node[datafile_key] if datafile_key in node else default_value
         return params
@@ -832,7 +839,7 @@ def parse(
         "datasource": assign_node_var("datasource"),
         "tags": assign_node_var("tags"),
         "target_datasource": assign_node_var("target_datasource"),
-        "copy_schedule": assign_node_var("copy_schedule"),
+        "copy_schedule": assign_node_var(CopyParameters.COPY_SCHEDULE),
         "resource": assign_node_var("resource"),
         "filter": assign_node_var("filter"),
         "token": add_token,
@@ -1176,7 +1183,7 @@ async def process_file(
                 raise Exception(f"Unknown import service: {service}")
 
             if service in PREVIEW_CONNECTOR_SERVICES:
-                ON_DEMAND_CRON = "@on-demand"
+                ON_DEMAND_CRON = ON_DEMAND
                 AUTO_CRON = "@auto"
                 ON_DEMAND_CRON_EXPECTED_BY_THE_API = "@once"
                 VALID_CRONS: Tuple[str, ...] = (ON_DEMAND_CRON, AUTO_CRON)
@@ -1289,7 +1296,7 @@ async def process_file(
                 "type": node_type,
                 "description": node.get("description", ""),
                 "target_datasource": node.get("target_datasource", None),
-                "copy_schedule": node.get("copy_schedule", None),
+                "copy_schedule": node.get(CopyParameters.COPY_SCHEDULE, None),
             }
 
             is_export_node = ExportReplacements.is_export_node(node)
@@ -2198,9 +2205,9 @@ async def check_copy_pipe(pipe, copy_node, tb_client: TinyB):
     except Exception as e:
         raise CLIPipeException(FeedbackManager.error_exception(error=e))
 
-    schedule_cron = copy_node["params"].get("copy_schedule", None)
+    schedule_cron = copy_node["params"].get(CopyParameters.COPY_SCHEDULE, None)
     is_valid_cron = not schedule_cron or (
-        schedule_cron and (schedule_cron == "@on-demand" or croniter.is_valid(schedule_cron))
+        schedule_cron and (schedule_cron == ON_DEMAND or croniter.is_valid(schedule_cron))
     )
 
     if not is_valid_cron:
@@ -2485,9 +2492,9 @@ async def new_pipe(
         if node:
             copy_params = {"pipe_name_or_id": pipe_id, "node_id": node["id"]}
             try:
-                target_datasource = copy_node.get("target_datasource", None)
-                schedule_cron = copy_node.get("copy_schedule", None)
-                schedule_cron = None if schedule_cron == "@on-demand" else schedule_cron
+                target_datasource = copy_node.get(CopyParameters.TARGET_DATASOURCE, None)
+                schedule_cron = copy_node.get(CopyParameters.COPY_SCHEDULE, None)
+                schedule_cron = None if schedule_cron == ON_DEMAND else schedule_cron
                 current_target_datasource_id = data["copy_target_datasource"]
                 target_datasource_response = await tb_client.get_datasource(target_datasource)
                 target_datasource_to_send = (
@@ -2495,7 +2502,7 @@ async def new_pipe(
                     if target_datasource_response.get("id", target_datasource) != current_target_datasource_id
                     else None
                 )
-                copy_params["target_datasource"] = target_datasource_to_send
+                copy_params[CopyParameters.TARGET_DATASOURCE] = target_datasource_to_send
                 current_schedule = data.get("schedule", {})
                 current_schedule_cron = current_schedule.get("cron", None) if current_schedule else None
                 schedule_cron_should_be_removed = current_schedule_cron and not schedule_cron
@@ -4011,23 +4018,46 @@ async def format_engine(
 
 
 async def format_node_type(file_parts: List[str], node: Dict[str, Any]) -> List[str]:
-    if node.get("type", "").lower() == PipeNodeTypes.MATERIALIZED:
-        file_parts.append(f'TYPE {node["type"].upper()}')
+    node_type = node.get("type", "").lower()
+    node_type_upper = f"TYPE {node_type.upper()}"
+
+    # Materialized pipe
+    if node_type == PipeNodeTypes.MATERIALIZED:
+        file_parts.append(node_type_upper)
         file_parts.append(DATAFILE_NEW_LINE)
         file_parts.append(f'DATASOURCE {node["datasource"]}')
         file_parts.append(DATAFILE_NEW_LINE)
         await format_engine(file_parts, node)
+
+    # Copy pipe
+    if node_type == PipeNodeTypes.COPY:
+        file_parts.append(node_type_upper)
+        file_parts.append(DATAFILE_NEW_LINE)
+        file_parts.append(f'TARGET_DATASOURCE {node["target_datasource"]}')
+        if CopyParameters.COPY_SCHEDULE in node and node[CopyParameters.COPY_SCHEDULE]:
+            is_ondemand = node[CopyParameters.COPY_SCHEDULE].lower() == ON_DEMAND
+            file_parts.append(DATAFILE_NEW_LINE)
+            file_parts.append(
+                f"{CopyParameters.COPY_SCHEDULE.upper()} {ON_DEMAND if is_ondemand else node[CopyParameters.COPY_SCHEDULE]}"
+            )
+        else:
+            file_parts.append(DATAFILE_NEW_LINE)
+            file_parts.append(f"{CopyParameters.COPY_SCHEDULE.upper()} {ON_DEMAND}")
+        file_parts.append(DATAFILE_NEW_LINE)
+
+    # Sink pipe
     if ExportReplacements.is_export_node(node):
-        file_parts.append(f'TYPE {node["type"].upper()}')
+        file_parts.append(node_type_upper)
         export_params = ExportReplacements.get_params_from_datafile(node)
         file_parts.append(DATAFILE_NEW_LINE)
         for param, value in export_params.items():
             if param == "schedule_cron" and not value:
-                value = "@on-demand"
+                value = ON_DEMAND
             datafile_key = ExportReplacements.get_datafile_key(param)
             if datafile_key:
                 file_parts.append(f"{datafile_key} {value}")
                 file_parts.append(DATAFILE_NEW_LINE)
+
     return file_parts
 
 
@@ -4067,7 +4097,7 @@ async def format_node(
 
 
 async def format_pipe(
-    filename: str, line_length: Optional[int], unroll_includes: bool = False, replace_includes: bool = True
+    filename: str, line_length: Optional[int], unroll_includes: bool = False, replace_includes: bool = False
 ) -> str:
     doc = parse_pipe(filename, replace_includes=replace_includes)
 
@@ -4382,9 +4412,9 @@ async def diff_files(
             return file.readlines()
 
     async def parse(filename, with_format=True, unroll_includes=False):
-        extension = Path(filename).suffix
+        extensions = Path(filename).suffixes
         lines = None
-        if extension == ".datasource":
+        if ".datasource" in extensions:  # Accepts '.datasource' and '.datasource.incl'
             lines = (
                 await format_datasource(
                     filename, unroll_includes=unroll_includes, for_diff=True, client=client, replace_includes=True
@@ -4392,7 +4422,7 @@ async def diff_files(
                 if with_format
                 else file_lines(filename)
             )
-        elif extension in [".pipe", ".incl"]:
+        elif (".pipe" in extensions) or (".incl" in extensions):
             lines = (
                 await format_pipe(filename, 100, unroll_includes=unroll_includes, replace_includes=True)
                 if with_format

{tinybird-cli-1.2.1.dev4 → tinybird-cli-1.2.1.dev6}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.2.1.dev4
+Version: 1.2.1.dev6
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+1.2.1.dev6
+************
+
+- `Fixed` Skip replacing `.incl` files in `tb fmt`
+
+1.2.1.dev5
+************
+
+- `Added` Support for Copy pipes in `tb fmt` 
+
 1.2.1.dev4
 ************