tinybird 0.0.1.dev166__py3-none-any.whl → 0.0.1.dev167__py3-none-any.whl

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/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.dev167'
+__revision__ = '1b40d30'

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.dist-info → tinybird-0.0.1.dev167.dist-info}/METADATA

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

{tinybird-0.0.1.dev166.dist-info → tinybird-0.0.1.dev167.dist-info}/RECORD

@@ -11,8 +11,8 @@ tinybird/sql_toolset.py,sha256=KORVbNAUTfW1qo3U9oe7Z59xQ0QMsFhB0ji3HzY2JVo,15324
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
-tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=Bncibdl66_JHCDwjy6-b6gYfCvP97569anD3Ydq_nmo,247
+tinybird/ch_utils/engine.py,sha256=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
+tinybird/tb/__cli__.py,sha256=hOH0V0bHJIUdoaXgkkQIrbemhjCdguZddpBYgdOb1_A,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=CSBl_JRuioPyY0H8Ac96dJ9wQXDXfrvK2lwqlOxKGoY,55715
@@ -38,7 +38,7 @@ tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,29
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=SUaGWH9TLDFFF9uCw4y7UW4NsKgnXG8uxTcxz1dbkCM,14230
-tinybird/tb/modules/local_common.py,sha256=4GHb7h26iTT02vF_eExsLQM26BGgHF_qTpmDKmxK6nY,14216
+tinybird/tb/modules/local_common.py,sha256=msAZDNPPVenNyL9Dqfb0Z5uFC_1O809xdAi7j1iKmJA,17066
 tinybird/tb/modules/login.py,sha256=fmXPSdvJnKPv03chptGuu3_Fm6LhP6kUsUKhrmT8rJc,8269
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUDZ_WHJZWS8,5478
@@ -80,8 +80,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev166.dist-info/METADATA,sha256=BAITivfECM2Is3v12uYS8vUupGPgcXdLunIaqiQ3WEQ,1607
-tinybird-0.0.1.dev166.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev166.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev166.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev166.dist-info/RECORD,,
+tinybird-0.0.1.dev167.dist-info/METADATA,sha256=zC83ZfhfJZO452npBKKZrv20pk5lG41o4mD0dkImgE4,1607
+tinybird-0.0.1.dev167.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev167.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev167.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev167.dist-info/RECORD,,