tinybird 4.6.16.dev0__tar.gz → 4.6.17__tar.gz

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.16.dev0
+Version: 4.6.17
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -51,11 +51,32 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 
 Changelog
 ----------
+
+4.6.17
+********
+
+- `Added` ``tb job retry <job_id>`` to retry eligible import and S3/GCS sync jobs in ``error`` or ``cancelled`` status.
+
+4.6.16
+********
+
+- `Fixed` ``tb deployment promote --wait`` and ``tb deployment discard --wait`` no longer hang forever when the server reports the old/discarded deployment removal as ``failed``; the CLI now detects the failure, prints the deployment errors, and exits non-zero.
+
+4.6.15
+********
+
+- `Fixed` ``tb deploy`` waits for the old deployment to delete to avoid clashing with a new deployment submission.
+
 4.6.14
 ********
 
 - `Changed` ``tb datasource append`` and ``tb datasource replace`` submit local CSV, NDJSON, and Parquet files through the v1 import endpoint by default. ``tb datasource append --events`` also submits its request body through v1. These asynchronous imports print the queued job ID; pass ``--wait`` to wait for completion. Remote URL imports continue to use their existing route.
 
+4.6.14
+********
+
+- `Fixed` `tb migrate-to-forward` correctly finds and offers to delete all branches, not just those created by the user running the migration.
+
 4.6.13
 ********
 

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/ch_utils/engine.py

@@ -111,8 +111,7 @@ class TableDetails:
 
     @property
     def version(self):
-        _version = self.details.get("version", None)
-        return _version
+        return self.details.get("version", None)
 
     def is_replicated(self) -> bool:
         engine: Optional[str] = self.details.get("engine", None)
@@ -183,6 +182,7 @@ class TableDetails:
         settings = self.details.get("settings", None)
         if settings and settings.strip().lower() != "index_granularity = 8192":
             return settings
+        return None
 
     @property
     def ttl(self):
@@ -190,23 +190,19 @@ class TableDetails:
 
     @property
     def ver(self):
-        _ver = self.details.get("ver", None)
-        return _ver
+        return self.details.get("ver", None)
 
     @property
     def is_deleted(self):
-        _is_deleted = self.details.get("is_deleted", None)
-        return _is_deleted
+        return self.details.get("is_deleted", None)
 
     @property
     def columns(self):
-        _columns = self.details.get("columns", None)
-        return _columns
+        return self.details.get("columns", None)
 
     @property
     def sign(self):
-        _sign = self.details.get("sign", None)
-        return _sign
+        return self.details.get("sign", None)
 
     @property
     def statistics(self) -> Dict[str, Any]:
@@ -476,6 +472,9 @@ def engine_options(columns, options: List[EngineOption], args: Dict):
         if option_value:
             if o.sql.lower() == "settings":
                 engine_settings = f"{o.sql} {option_value}"
+            # Conditional TTLs fail if we wrap the value in parentheses
+            elif o.sql.lower() == "ttl":
+                options_values.append(f"{o.sql} {option_value}")
             else:
                 options_values.append(f"{o.sql} ({option_value})")
 
@@ -536,7 +535,9 @@ def engine_full_from_dict(
     >>> engine_full_from_dict('MergeTree', {'sorting_key': 'local_date, cod_store'}, schema=schema)
     'MergeTree() ORDER BY (local_date, cod_store)'
     >>> engine_full_from_dict('MergeTree', {'partition_key': 'toDate(timestamp)', 'sorting_key': 'local_date, cod_store', 'settings': 'index_granularity = 32, index_granularity_bytes = 2048', 'ttl': 'toDate(local_date) + INTERVAL 1 DAY'}, schema=schema)
-    'MergeTree() PARTITION BY (toDate(timestamp)) ORDER BY (local_date, cod_store) TTL (toDate(local_date) + INTERVAL 1 DAY) SETTINGS index_granularity = 32, index_granularity_bytes = 2048'
+    'MergeTree() PARTITION BY (toDate(timestamp)) ORDER BY (local_date, cod_store) TTL toDate(local_date) + INTERVAL 1 DAY SETTINGS index_granularity = 32, index_granularity_bytes = 2048'
+    >>> engine_full_from_dict('MergeTree', {'sorting_key': 'timestamp', 'ttl': 'timestamp + INTERVAL 1 DAY DELETE WHERE is_deleted = 1'}, schema=schema)
+    'MergeTree() ORDER BY (timestamp) TTL timestamp + INTERVAL 1 DAY DELETE WHERE is_deleted = 1'
 
     >>> schema = ''
     >>> engine_full_from_dict('CollapsingMergeTree', {'sign': 'sign_column'}, schema=schema)
@@ -694,8 +695,7 @@ def ttl_from_engine(engine: str) -> Optional[str]:
         return None
     settings_array = engine.split(" SETTINGS ")
     settings = " SETTINGS " + settings_array[1] if len(settings_array) > 1 else None
-    ttl = ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
-    return ttl
+    return ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
 
 
 def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/client.py

@@ -266,14 +266,13 @@ class TinyB:
 
     async def alter_tokens(self, name: str, scopes: List[str]):
         if not scopes:
-            return
+            return None
         scopes_url: str = "&".join([f"scope={scope}" for scope in scopes])
         url = f"/v0/tokens/{name}"
         if len(url + "?" + scopes_url) > TinyB.MAX_GET_LENGTH:
             return await self._req(url, method="PUT", data=scopes_url)
-        else:
-            url = url + "?" + scopes_url
-            return await self._req(url, method="PUT", data="")
+        url = url + "?" + scopes_url
+        return await self._req(url, method="PUT", data="")
 
     async def datasources(self, branch: Optional[str] = None, used_by: bool = False) -> List[Dict[str, Any]]:
         params = {}
@@ -294,16 +293,13 @@ class TinyB:
         return await self._req(f"/v0/variables/{name}")
 
     async def create_secret(self, name: str, value: str):
-        response = await self._req("/v0/variables", method="POST", data={"name": name, "value": value})
-        return response
+        return await self._req("/v0/variables", method="POST", data={"name": name, "value": value})
 
     async def update_secret(self, name: str, value: str):
-        response = await self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
-        return response
+        return await self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
 
     async def delete_secret(self, name: str):
-        response = await self._req(f"/v0/variables/{name}", method="DELETE")
-        return response
+        return await self._req(f"/v0/variables/{name}", method="DELETE")
 
     async def get_connections(self, service: Optional[str] = None):
         params = {}
@@ -577,8 +573,7 @@ class TinyB:
         node_name = node["params"]["name"] if node.get("params", None) else node["name"]
         if datasource_name:
             params["datasource"] = datasource_name
-        response = await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/analysis?{urlencode(params)}")
-        return response
+        return await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/analysis?{urlencode(params)}")
 
     async def populate_node(
         self,
@@ -600,10 +595,7 @@ class TinyB:
             params.update({"populate_condition": populate_condition})
         if on_demand_compute:
             params.update({"on_demand_compute": "true"})
-        response = await self._req(
-            f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST"
-        )
-        return response
+        return await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_name}/population?{urlencode(params)}", method="POST")
 
     async def pipes(self, branch=None, dependencies: bool = False, node_attrs=None, attrs=None) -> List[Dict[str, Any]]:
         params = {
@@ -635,9 +627,8 @@ class TinyB:
         query_string = urlencode(params)
         if len(url + "?" + query_string) > TinyB.MAX_GET_LENGTH:
             return await self._req(f"/v0/pipes/{pipe_name_or_uid}.{format}", method="POST", data=params)
-        else:
-            url = url + "?" + query_string
-            return await self._req(url)
+        url = url + "?" + query_string
+        return await self._req(url)
 
     async def pipe_create(self, pipe_name: str, sql: str):
         return await self._req(
@@ -726,8 +717,7 @@ class TinyB:
 
         if len(sql) > TinyB.MAX_GET_LENGTH:
             return await self._req(f"/v0/sql?{urlencode(params)}", data=sql, method="POST")
-        else:
-            return await self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
+        return await self._req(f"/v0/sql?q={quote(sql, safe='')}&{urlencode(params)}")
 
     async def jobs(self, status=None):
         jobs = (await self._req("/v0/jobs"))["jobs"]
@@ -922,7 +912,7 @@ class TinyB:
 
     async def add_workspaces_to_organization(self, organization_id: str, workspace_ids: List[str]):
         if not workspace_ids:
-            return
+            return None
         return await self._req(
             f"/v0/organizations/{organization_id}/workspaces",
             method="PUT",
@@ -1105,8 +1095,7 @@ class TinyB:
                 from tinybird.sql_toolset import format_sql
 
                 return format_sql(sql)
-            else:
-                return await self._sql_get_format_remote(sql, with_clickhouse_format)
+            return await self._sql_get_format_remote(sql, with_clickhouse_format)
         except ModuleNotFoundError:
             return await self._sql_get_format_remote(sql, with_clickhouse_format)
 
@@ -1168,8 +1157,7 @@ class TinyB:
         return next((connector for connector in result["connectors"] if connector_equals(connector, kwargs)), None)
 
     async def regions(self):
-        regions = await self._req("/v0/regions")
-        return regions
+        return await self._req("/v0/regions")
 
     async def datasource_query_copy(self, datasource_name: str, sql_query: str):
         params = {"copy_to": datasource_name}

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/config.py

@@ -49,11 +49,7 @@ LEGACY_HOSTS = {
     "https://ui.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
     "https://ui.ap-east.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east-1",
     "https://ui.ap-east-1.aws.tinybird.co": "https://app.tinybird.co/aws/ap-east-1",
-    "https://ui.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
-    "https://ui.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",
     "https://ui.northamerica-northeast2.gcp.tinybird.co": "https://app.tinybird.co/gcp/northamerica-northeast2",
-    "https://api.split.tinybird.co": "https://app.tinybird.co/aws/split-us-east",
-    "https://api.split.us-west-2.aws.tinybird.co": "https://app.tinybird.co/aws/split-us-west-2",
     "https://ui.wadus1.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus1",
     "https://ui.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",
     "https://ui.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/datafile/common.py

@@ -278,6 +278,12 @@ REQUIRED_DYNAMODB_PARAMS = {
 }
 DYNAMODB_PARAMS = REQUIRED_DYNAMODB_PARAMS
 
+REQUIRED_POSTGRES_PARAMS = {
+    "pg_connection_name",
+    "pg_table",
+}
+POSTGRES_PARAMS = REQUIRED_POSTGRES_PARAMS
+
 
 def extract_column_names_from_sorting_key_part(part: str) -> List[str]:
     """
@@ -496,13 +502,12 @@ class Datafile:
                     f"For Kafka sinks, provide 'export_kafka_topic'. "
                     f"For S3/GCS sinks, provide 'export_bucket_uri' and 'export_file_template'."
                 )
-            else:
-                # There are some export parameters, but they don't match known patterns
-                raise DatafileValidationError(
-                    f"Sink node {repr(node['name'])} has unrecognized export parameters: {export_params}. "
-                    f"For Kafka sinks, use 'export_kafka_topic'. "
-                    f"For S3/GCS sinks, use 'export_bucket_uri' and 'export_file_template'."
-                )
+            # There are some export parameters, but they don't match known patterns
+            raise DatafileValidationError(
+                f"Sink node {repr(node['name'])} has unrecognized export parameters: {export_params}. "
+                f"For Kafka sinks, use 'export_kafka_topic'. "
+                f"For S3/GCS sinks, use 'export_bucket_uri' and 'export_file_template'."
+            )
 
         # Validate schedule format (common for both Kafka and S3/GCS)
         export_schedule = node.get("export_schedule")
@@ -602,6 +607,13 @@ class Datafile:
                     raise DatafileValidationError(
                         f"Invalid import schedule '{node['import_schedule']}'. Only {sorted(VALID_BLOB_STORAGE_CRON_VALUES)} values are allowed"
                     )
+            # Validate Postgres params
+            if any(param in node for param in POSTGRES_PARAMS) and (
+                missing := [param for param in REQUIRED_POSTGRES_PARAMS if param not in node]
+            ):
+                raise DatafileValidationError(
+                    f"Some Postgres params have been provided, but the following required ones are missing: {missing}"
+                )
 
         else:
             # We cannot validate a datafile whose kind is unknown
@@ -1060,8 +1072,7 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
     # Find the first SyntaxExpr in lookup that matches the schema at the current offset
     def lookahead_matches(lookup: Iterable) -> Optional[SyntaxExpr]:
         s = schema[i:]
-        match = next((x for x in lookup if x.regex.match(s)), None)
-        return match
+        return next((x for x in lookup if x.regex.match(s)), None)
 
     def advance_single_char() -> None:
         nonlocal i, line, pos
@@ -1109,10 +1120,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                     )
                 advance_single_char()
             return schema[begin:i]
-        else:
-            # backticked name
-            advance_single_char()
-            return get_backticked()
+        # backticked name
+        advance_single_char()
+        return get_backticked()
 
     def parse_expr(lookup: Iterable[SyntaxExpr], attribute: str) -> str:
         """Parse an expression for an attribute.
@@ -1283,10 +1293,9 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
                     or "incompatible data types between aggregate function" in str(e).lower()
                 ):
                     raise SchemaSyntaxError(message=str(e), lineno=line, pos=type_start_pos)
-                else:
-                    # TODO(eclbg): The resulting error message is a bit confusing, as the clickhouse error contains some
-                    # references to positions that don't match the position in the schema.
-                    raise SchemaSyntaxError(f"Error parsing type: {e}", lineno=line, pos=type_start_pos)
+                # TODO(eclbg): The resulting error message is a bit confusing, as the clickhouse error contains some
+                # references to positions that don't match the position in the schema.
+                raise SchemaSyntaxError(f"Error parsing type: {e}", lineno=line, pos=type_start_pos)
             except ModuleNotFoundError:
                 pass
             _type = detected_type
@@ -1677,8 +1686,9 @@ def parse(
 
             if severity == "error":
                 return raise_deprecation_error
-            elif severity == "warning":
+            if severity == "warning":
                 return add_deprecation_warning
+            return None
 
         return inner
 
@@ -2068,6 +2078,8 @@ def parse(
             "import_query": assign_var("import_query"),  # Deprecated, BQ and SFK
             "import_table_arn": assign_var("import_table_arn"),  # Only for DynamoDB
             "import_export_bucket": assign_var("import_export_bucket"),  # For DynamoDB
+            "pg_connection_name": assign_var("pg_connection_name"),
+            "pg_table": assign_var("pg_table"),
             "shared_with": shared_with,
             "export_service": export_service,  # Deprecated
             "forward_query": forward_query,
@@ -2128,6 +2140,12 @@ def parse(
             "gcs_secret": assign_var("gcs_hmac_secret"),
             "gcs_hmac_access_id": assign_var("gcs_hmac_access_id"),
             "gcs_hmac_secret": assign_var("gcs_hmac_secret"),
+            "pg_host": assign_var("pg_host"),
+            "pg_port": assign_var("pg_port"),
+            "pg_database": assign_var("pg_database"),
+            "pg_user": assign_var("pg_user"),
+            "pg_password": assign_var("pg_password"),
+            "pg_ssl_mode": assign_var("pg_ssl_mode"),
             "include": include,
         },
     }
@@ -2217,12 +2235,11 @@ def parse(
     except IndexError as e:
         if "node" in line.lower():
             raise click.ClickException(FeedbackManager.error_missing_node_name())
-        elif "sql" in line.lower():
+        if "sql" in line.lower():
             raise click.ClickException(FeedbackManager.error_missing_sql_command())
-        elif "datasource" in line.lower():
+        if "datasource" in line.lower():
             raise click.ClickException(FeedbackManager.error_missing_datasource_name())
-        else:
-            raise ValidationException(f"Validation error, found {line} in line {str(lineno)}: {str(e)}", lineno=lineno)
+        raise ValidationException(f"Validation error, found {line} in line {str(lineno)}: {str(e)}", lineno=lineno)
     except IncludeFileNotFoundException as e:
         raise IncludeFileNotFoundException(str(e), lineno=lineno)
     except Exception as e:
@@ -2556,12 +2573,11 @@ def get_name_version(ds: str) -> Dict[str, Any]:
     tk = ds.rsplit("__", 2)
     if len(tk) == 1:
         return {"name": tk[0], "version": None}
-    elif len(tk) == 2:
+    if len(tk) == 2:
         if len(tk[1]):
             if tk[1][0] == "v" and _PATTERN_VERSION_NUMBER.match(tk[1][1:]):
                 return {"name": tk[0], "version": int(tk[1][1:])}
-            else:
-                return {"name": tk[0] + "__" + tk[1], "version": None}
+            return {"name": tk[0] + "__" + tk[1], "version": None}
     elif len(tk) == 3 and len(tk[2]):
         if tk[2] == "checker":
             return {"name": tk[0] + "__" + tk[1] + "__" + tk[2], "version": None}

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/git_settings.py

@@ -137,9 +137,7 @@ def bump_version(version: str, next_version: Optional[str]) -> str:
 
 
 def get_default_init_files_deploy(workspace_name: str) -> Dict[str, str]:
-    modified_files = {
+    return {
         path.replace("tinybird_", f"tinybird_{workspace_name.lower()}_"): content
         for path, content in DEFAULT_INIT_FILES_DEPLOY.items()
     }
-
-    return modified_files

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/service_datasources.py

@@ -48,6 +48,7 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "client_ip", "type": "Nullable(String)"},
                 {"name": "resource_tags", "type": "Array(String)"},
                 {"name": "memory_usage", "type": "UInt64"},
+                {"name": "replica", "type": "String"},
             ],
         },
         {
@@ -333,6 +334,26 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "job_metadata", "type": "String"},
             ],
         },
+        {
+            "name": "tinybird.cluster_control_log",
+            "description": "Actions applied by cluster control in your workspace to keep the load of your cluster under control: one row every time cluster control applies, updates, or clears the concurrency limit of an endpoint. rate_limit_type is the control family, currently always endpoint_concurrency. action is the transition: applied, updated, or cleared. limit_metadata is a JSON object with the inputs of the decision and the resulting limit, read it with JSONExtract functions; its keys are max_concurrent_queries (UInt64, the limit in force after the transition), change_reason (String), analysis_window_seconds (UInt64), and the nullable estimated_qps, request_count, observed_qps, error_count, success_count, error_to_success_ratio, rate_limited_request_count, degradation_reason, pipe_cpu_time, total_cpu_time, pipe_cpu_ratio and max_cpu_ratio. This data source has a TTL of 6 months.",
+            "dateColumn": "timestamp",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "timestamp, pipe_name",
+                "partition_key": "toYYYYMM(timestamp)",
+                "ttl": "toStartOfMonth(toDateTime(timestamp)) + toIntervalMonth(6)",
+            },
+            "columns": [
+                {"name": "timestamp", "type": "DateTime64(3)"},
+                {"name": "workspace_id", "type": "String"},
+                {"name": "workspace_name", "type": "String"},
+                {"name": "pipe_name", "type": "String"},
+                {"name": "rate_limit_type", "type": "LowCardinality(String)"},
+                {"name": "action", "type": "LowCardinality(String)"},
+                {"name": "limit_metadata", "type": "String"},
+            ],
+        },
         {
             "name": "tinybird.hook_log",
             "description": "Log of hook executions and their results.",
@@ -518,22 +539,6 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "origin", "type": "String"},
             ],
         },
-        {
-            "name": "organization.processed_data",
-            "description": "Information related to all processed data per day per workspace.",
-            "dateColumn": "date",
-            "engine": {
-                "engine": "SummingMergeTree",
-                "sorting_key": "database, date",
-                "partition_key": "toYYYYMM(date)",
-            },
-            "columns": [
-                {"name": "date", "type": "Date"},
-                {"name": "database", "type": "String"},
-                {"name": "read_bytes", "type": "UInt64"},
-                {"name": "written_bytes", "type": "UInt64"},
-            ],
-        },
         {
             "name": "organization.datasources_storage",
             "description": "Similar to tinybird.datasources_storage but with data for all Organization Workspaces.",
@@ -683,6 +688,7 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "user_agent", "type": "Nullable(String)"},
                 {"name": "resource_tags", "type": "Array(String)"},
                 {"name": "memory_usage", "type": "UInt64"},
+                {"name": "replica", "type": "String"},
             ],
         },
         {
@@ -726,6 +732,26 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "job_metadata", "type": "String"},
             ],
         },
+        {
+            "name": "organization.cluster_control_log",
+            "description": "Actions applied by cluster control across all the workspaces in your organization to keep the load of your cluster under control: one row every time cluster control applies, updates, or clears the concurrency limit of an endpoint. workspace_id and workspace_name identify the affected workspace. rate_limit_type is the control family, currently always endpoint_concurrency. action is the transition: applied, updated, or cleared. limit_metadata is a JSON object with the inputs of the decision and the resulting limit, read it with JSONExtract functions; its keys are max_concurrent_queries (UInt64, the limit in force after the transition), change_reason (String), analysis_window_seconds (UInt64), and the nullable estimated_qps, request_count, observed_qps, error_count, success_count, error_to_success_ratio, rate_limited_request_count, degradation_reason, pipe_cpu_time, total_cpu_time, pipe_cpu_ratio and max_cpu_ratio. This data source has a TTL of 6 months.",
+            "dateColumn": "timestamp",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "workspace_id, timestamp, pipe_name",
+                "partition_key": "toYYYYMM(timestamp)",
+                "ttl": "toStartOfMonth(toDateTime(timestamp)) + toIntervalMonth(6)",
+            },
+            "columns": [
+                {"name": "timestamp", "type": "DateTime64(3)"},
+                {"name": "workspace_id", "type": "String"},
+                {"name": "workspace_name", "type": "String"},
+                {"name": "pipe_name", "type": "String"},
+                {"name": "rate_limit_type", "type": "LowCardinality(String)"},
+                {"name": "action", "type": "LowCardinality(String)"},
+                {"name": "limit_metadata", "type": "String"},
+            ],
+        },
         {
             "name": "organization.sinks_ops_log",
             "description": "Historic Logs for all Sink job executions across the organization",

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/sql_toolset.py

@@ -493,7 +493,6 @@ def replace_tables_chquery_cached(
     sorted_replacements: Optional[tuple] = None,
     default_database: str = "",
     output_one_line: bool = False,
-    timestamp: Optional[datetime] = None,
     function_allow_list: Optional[FrozenSet[str]] = None,
     settings_allow_list: Optional[FrozenSet[str]] = None,
 ) -> str:
@@ -536,7 +535,6 @@ def replace_tables(
             sql,
             None,
             output_one_line=output_one_line,
-            timestamp=timestamp,
             function_allow_list=hashable_list,
             settings_allow_list=hashable_settings_list,
         )
@@ -610,7 +608,6 @@ def replace_tables(
             sql,
             None,
             output_one_line=output_one_line,
-            timestamp=timestamp,
             function_allow_list=hashable_list,
             settings_allow_list=hashable_settings_list,
         )
@@ -649,7 +646,6 @@ def replace_tables(
                 r,
                 default_database=default_database,
                 output_one_line=output_one_line,
-                timestamp=timestamp,
                 function_allow_list=hashable_list,
                 settings_allow_list=hashable_settings_list,
             )
@@ -658,7 +654,6 @@ def replace_tables(
                 sql,
                 None,
                 output_one_line=output_one_line,
-                timestamp=timestamp,
                 function_allow_list=hashable_list,
                 settings_allow_list=hashable_settings_list,
             )

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/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__ = '4.6.16.dev0'
-__revision__ = '532ee82'
+__version__ = '4.6.17'
+__revision__ = '92350bf'

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/tb/client.py

@@ -811,6 +811,9 @@ class TinyB:
     def job_cancel(self, job_id: str):
         return self._req(f"/v0/jobs/{job_id}/cancel", method="POST", data=b"")
 
+    def job_retry(self, job_id: str) -> Dict[str, Any]:
+        return self._req(f"/v0/jobs/{job_id}/retry", method="POST", data=b"")
+
     def user_workspaces(self, version: str = "v0"):
         data = self._req(f"/{version}/user/workspaces/?with_environments=false")
         # TODO: this is repeated in local_common.py but I'm avoiding circular imports
@@ -833,8 +836,8 @@ class TinyB:
     def user_workspace_branches(self, version: str = "v0"):
         return self._req(f"/{version}/user/workspaces/?with_environments=true&only_environments=true")
 
-    def branches(self):
-        return self._req("/v1/environments")
+    def branches(self, version: str = "v1"):
+        return self._req(f"/{version}/environments")
 
     def releases(self, workspace_id):
         return self._req(f"/v0/workspaces/{workspace_id}/releases")

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/tb/modules/build_common.py

@@ -44,7 +44,7 @@ def process(
 
     # Ensure SHARED_WITH workspaces exist before build
     if not is_branch:
-        build_shared_with_workspaces(project=project, tb_client=tb_client, config=config)
+        build_shared_with_workspaces(project=project, tb_client=tb_client)
 
     build_failed = False
     build_error: Optional[str] = None
@@ -90,9 +90,7 @@ def process(
             click.echo(FeedbackManager.error(message=f"✗ {rebuild_str} failed"))
             if not watch and exit_on_error:
                 sys_exit("build_error", build_error or "Unknown error")
-        build_error = build_error or "Unknown error"
-
-        return build_error
+        return build_error or "Unknown error"
 
     if not silent:
         if build_result == False:  # noqa: E712
@@ -250,7 +248,7 @@ def build_project(
             if with_connections:
                 echo_dynamodb_local_backfill_feedback(build)
             return True
-        elif build_result == "failed":
+        if build_result == "failed":
             error = format_build_errors(result.get("errors", []))
         else:
             error = f"Unknown build result. Error: {result.get('error')}"
@@ -614,7 +612,7 @@ def build_vendored_workspaces(project: Project, tb_client: TinyB, config: dict[s
         click.echo(FeedbackManager.error_exception(error=e))
 
 
-def build_shared_with_workspaces(project: Project, tb_client: TinyB, config: dict[str, Any]) -> None:
+def build_shared_with_workspaces(project: Project, tb_client: TinyB) -> None:
     """Scan project for .datasource files and ensure SHARED_WITH workspaces exist."""
 
     try:

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/tb/modules/common.py

@@ -18,7 +18,7 @@ from copy import deepcopy
 from enum import Enum
 from os import getcwd, getenv
 from pathlib import Path
-from typing import Any, Callable, Dict, Iterable, List, Literal, Optional, Set, Tuple, TypedDict, Union
+from typing import Any, Callable, Dict, Iterable, List, Literal, NoReturn, Optional, Set, Tuple, TypedDict, Union
 from urllib.parse import urlparse
 
 import click
@@ -2370,7 +2370,7 @@ def ask_for_organization(
 event_error_separator = "__error__"
 
 
-def sys_exit(event: str, msg: str) -> None:
+def sys_exit(event: str, msg: str) -> NoReturn:
     sys.exit(f"{event}{event_error_separator}{msg}")
 
 

{tinybird-4.6.16.dev0 → tinybird-4.6.17}/tinybird/tb/modules/deployment.py

@@ -155,16 +155,13 @@ def api_fetch(url: str, headers: dict, request_from: Optional[str] = None) -> di
     return {}
 
 
-def _get_classic_workspace_branches(client: TinyB, workspace_id: str) -> list[dict[str, Any]]:
-    branches: list[dict[str, Any]] = client.user_workspace_branches(version="v0").get("workspaces", [])
-    return [branch for branch in branches if str(branch.get("main")) == workspace_id]
+def _get_classic_workspace_branches(client: TinyB) -> list[dict[str, Any]]:
+    return client.branches(version="v0").get("environments", [])
 
 
-def _cleanup_classic_migration_blockers(client: TinyB, config: Dict[str, Any]) -> None:
-    workspace_id = str(config["id"])
-
+def _cleanup_classic_migration_blockers(client: TinyB) -> None:
     try:
-        branches = _get_classic_workspace_branches(client, workspace_id)
+        branches = _get_classic_workspace_branches(client)
         if not branches:
             return
 
@@ -488,7 +485,7 @@ def migrate_to_forward(ctx: click.Context, allow_destructive_operations: bool) -
         click.echo(FeedbackManager.info(message="Migration cancelled."))
         return
 
-    _cleanup_classic_migration_blockers(client, config)
+    _cleanup_classic_migration_blockers(client)
     _persist_migrate_to_forward_config(project)
     migrate_to_forward_workspace(client=client, output=output, dry_run=False)
     create_deployment(