tinybird 0.0.1.dev166__tar.gz → 0.0.1.dev168__tar.gz

{tinybird-0.0.1.dev166 → tinybird-0.0.1.dev168}/PKG-INFO

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

{tinybird-0.0.1.dev166 → tinybird-0.0.1.dev168}/tinybird/ch_utils/engine.py

@@ -146,10 +146,9 @@ class TableDetails:
     def is_replacing_engine(self) -> bool:
         if self.engine:
             engine_lower = self.engine.lower()
-            is_aggregating = "aggregatingmergetree" in engine_lower
             is_replacing = "replacingmergetree" in engine_lower
             is_collapsing = "collapsingmergetree" in engine_lower
-            return is_aggregating or is_replacing or is_collapsing
+            return is_replacing or is_collapsing
         return False
 
     def diff_ttl(self, new_ttl: str) -> bool:
@@ -169,6 +168,10 @@ class TableDetails:
     @property
     def sorting_key(self) -> Optional[str]:
         _sorting_key = self.details.get("sorting_key", None)
+        # TODO: This should use ENABLED_ENGINES to guess if the sorting key is required or not
+        # Also checking this and raising an error in a getter is a bit of an anti-pattern,
+        # a data source could have a "wrong" sorting key and we won't be able to even show it in the API.
+        # All these checks be performed only on creation time.
         if self.is_replacing_engine() and not _sorting_key:
             raise ValueError(f"SORTING_KEY must be defined for the {self.engine} engine")
         if self.is_mergetree_family():

{tinybird-0.0.1.dev166 → tinybird-0.0.1.dev168}/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.dev166'
-__revision__ = 'dfe3726'
+__version__ = '0.0.1.dev168'
+__revision__ = 'd746fb3'

{tinybird-0.0.1.dev166 → tinybird-0.0.1.dev168}/tinybird/tb/modules/deployment.py

@@ -468,6 +468,19 @@ def create_deployment_cmd(
     template: Optional[str] = None,
 ) -> None:
     if template:
+        project = ctx.ensure_object(dict)["project"]
+        if project.get_project_files():
+            click.echo(
+                FeedbackManager.error(
+                    message="You are trying to deploy a template from a folder that already contains data files. "
+                    "Please remove the data files from the current folder or use a different folder and try again."
+                )
+            )
+            sys_exit(
+                "deployment_error",
+                "Deployment using a template is not allowed when the project already contains data files",
+            )
+
         click.echo(FeedbackManager.info(message="» Downloading template..."))
         try:
             download_github_template(template)

{tinybird-0.0.1.dev166 → tinybird-0.0.1.dev168}/tinybird/tb/modules/local_common.py

@@ -109,22 +109,84 @@ def get_local_tokens() -> Dict[str, str]:
         # ruff: noqa: ASYNC210
         return requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
     except Exception:
+        # Check if tinybird-local is running using docker client (some clients use podman and won't have docker cmd)
         try:
-            # Check if tinybird-local is running with docker, in case it's a config issue
-            output = subprocess.check_output(["docker", "ps"], text=True)
-            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",
+            docker_client = get_docker_client()
+            container = get_existing_container_with_matching_env(docker_client, TB_CONTAINER_NAME, {})
+
+            output = {}
+            if container:
+                output = container.attrs
+            add_telemetry_event(
+                "docker_debug",
+                data={
+                    "container_attrs": output,
+                },
             )
+
+            if container and container.status == "running":
+                if container.health == "healthy":
+                    raise CLILocalException(
+                        FeedbackManager.error(
+                            message=(
+                                "Looks like Tinybird Local is running but we are not able to connect to it.\n\n"
+                                "If you've run it manually using different host or port, please set the environment variables "
+                                "TB_LOCAL_HOST and TB_LOCAL_PORT to match the ones you're using.\n"
+                                "If you're not sure about this, please run `tb local restart` and try again."
+                            )
+                        )
+                    )
+                raise CLILocalException(
+                    FeedbackManager.error(
+                        message=(
+                            "Tinybird Local is running but it's unhealthy. Please check if it's running and try again.\n"
+                            "If the problem persists, please run `tb local restart` and try again."
+                        )
+                    )
+                )
+        except CLILocalException as e:
+            raise e
+        except Exception:
+            pass
+
+        # Check if tinybird-local is running with docker
+        try:
+            output_str = subprocess.check_output(
+                ["docker", "ps", "--filter", f"name={TB_CONTAINER_NAME}", "--format", "json"], text=True
+            )
+            output = {}
+            if output_str:
+                output = json.loads(output_str)
             add_telemetry_event(
                 "docker_debug",
                 data={
-                    "docker_ps_output": header_row + tb_local_row,
+                    "docker_ps_output": output,
                 },
             )
+
+            if output.get("State", "") == "running":
+                if "(healthy)" in output.get("Status", ""):
+                    raise CLILocalException(
+                        FeedbackManager.error(
+                            message=(
+                                "Looks like Tinybird Local is running but we are not able to connect to it.\n\n"
+                                "If you've run it manually using different host or port, please set the environment variables "
+                                "TB_LOCAL_HOST and TB_LOCAL_PORT to match the ones you're using.\n"
+                                "If you're not sure about this, please run `tb local restart` and try again."
+                            )
+                        )
+                    )
+                raise CLILocalException(
+                    FeedbackManager.error(
+                        message="Tinybird Local is running but it's unhealthy. Please check if it's running and try again.\n"
+                        "If the problem persists, please run `tb local restart` and try again."
+                    )
+                )
+        except CLILocalException as e:
+            raise e
         except Exception:
             pass
+
         is_ci = (
             os.getenv("GITHUB_ACTIONS")
             or os.getenv("TRAVIS")
@@ -146,6 +208,7 @@ def get_local_tokens() -> Dict[str, str]:
                 start_tinybird_local(docker_client, False)
                 click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
                 return get_local_tokens()
+
         raise CLILocalException(
             FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
         )

{tinybird-0.0.1.dev166 → tinybird-0.0.1.dev168}/tinybird.egg-info/PKG-INFO

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