tinybird 0.0.1.dev171__py3-none-any.whl → 0.0.1.dev173__py3-none-any.whl

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.dev171'
-__revision__ = 'a5eb91f'
+__version__ = '0.0.1.dev173'
+__revision__ = '8bd5be6'

tinybird/tb/modules/cli.py

@@ -74,6 +74,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option(
     "--output", type=click.Choice(["json", "human"], case_sensitive=False), default="human", help="Output format"
 )
+@click.option("--max-depth", type=int, default=2, help="Maximum depth of the project files.")
 @click.version_option(version=VERSION)
 @click.pass_context
 @coro
@@ -88,6 +89,7 @@ async def cli(
     cloud: bool,
     staging: bool,
     output: str,
+    max_depth: int,
 ) -> None:
     """
     Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
@@ -148,7 +150,7 @@ async def cli(
     config = await get_config(host, token, user_token=user_token, config_file=config_temp._path)
     client = _get_tb_client(config.get("token", None), config["host"])
     folder = os.path.join(config_temp._path.replace(".tinyb", ""), config.get("cwd", os.getcwd()))
-    project = Project(folder=folder, workspace_name=config.get("name", ""))
+    project = Project(folder=folder, workspace_name=config.get("name", ""), max_depth=max_depth)
     config["path"] = str(project.path)
     # If they have passed a token or host as parameter and it's different that record in .tinyb, refresh the workspace id
     if token or host:

tinybird/tb/modules/deployment.py

@@ -360,7 +360,15 @@ def deployment_ls(ctx: click.Context, include_deleted: bool) -> None:
         url += "?include_deleted=true"
 
     result = api_fetch(url, HEADERS)
-    status_map = {"data_ready": "Staging", "failed": "Failed", "deleted": "Deleted"}
+    status_map = {
+        "calculating": "Creating - Calculating steps",
+        "creating_schema": "Creating - Creating schemas",
+        "schema_ready": "Creating - Migrating data",
+        "data_ready": "Staging",
+        "deleting": "Deleting",
+        "deleted": "Deleted",
+        "failed": "Failed",
+    }
     columns = ["ID", "Status", "Created at"]
     table = []
     for deployment in result.get("deployments", []):
@@ -370,7 +378,7 @@ def deployment_ls(ctx: click.Context, include_deleted: bool) -> None:
         table.append(
             [
                 deployment.get("id"),
-                "Live" if deployment.get("live") else status_map.get(deployment.get("status", "In progress")),
+                "Live" if deployment.get("live") else status_map.get(deployment.get("status"), "In progress"),
                 datetime.fromisoformat(deployment.get("created_at")).strftime("%Y-%m-%d %H:%M:%S"),
             ]
         )

tinybird/tb/modules/project.py

@@ -11,9 +11,10 @@ from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
 class Project:
     extensions = ("datasource", "pipe", "connection")
 
-    def __init__(self, folder: str, workspace_name: str):
+    def __init__(self, folder: str, workspace_name: str, max_depth: int = 2):
         self.folder = folder
         self.workspace_name = workspace_name
+        self.max_depth = max_depth
 
     @property
     def path(self) -> Path:
@@ -23,10 +24,16 @@ class Project:
     def vendor_path(self) -> str:
         return f"{self.path}/vendor"
 
+    def get_files(self, extension: str) -> List[str]:
+        project_files: List[str] = []
+        for level in range(self.max_depth):
+            project_files.extend(glob.glob(f"{self.path}{'/*' * level}/*.{extension}", recursive=True))
+        return project_files
+
     def get_project_files(self) -> List[str]:
         project_files: List[str] = []
         for extension in self.extensions:
-            for project_file in glob.glob(f"{self.path}/**/*.{extension}", recursive=True):
+            for project_file in self.get_files(extension):
                 if self.vendor_path in project_file:
                     continue
                 project_files.append(project_file)
@@ -51,13 +58,13 @@ class Project:
         return sorted([Path(f).stem for f in self.get_connection_files()])
 
     def get_datasource_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.datasource", recursive=True)
+        return self.get_files("datasource")
 
     def get_pipe_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.pipe", recursive=True)
+        return self.get_files("pipe")
 
     def get_connection_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.connection", recursive=True)
+        return self.get_files("connection")
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

{tinybird-0.0.1.dev171.dist-info → tinybird-0.0.1.dev173.dist-info}/METADATA

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

{tinybird-0.0.1.dev171.dist-info → tinybird-0.0.1.dev173.dist-info}/RECORD

@@ -12,21 +12,21 @@ 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=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
-tinybird/tb/__cli__.py,sha256=hKG-5atm5V0pGi635mfMITsiz00-mtLOQQlbU2c3LwA,247
+tinybird/tb/__cli__.py,sha256=SrFvAorASXALWf_bfYHBUAINND0hsASCiFTXRXjKQbU,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
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/build.py,sha256=zakH5812Lop-XHjGmDRdOPeofPtoeyb_2un_T6e50xw,19177
 tinybird/tb/modules/cicd.py,sha256=MnShTTJzKBYeajswF2jg7p7ZzupaeCgSriAN05MeEdg,7330
-tinybird/tb/modules/cli.py,sha256=3gDO1smcH1e2qEvbFCGbo4oNdgubDr3hC3fsKlB4ylY,15373
+tinybird/tb/modules/cli.py,sha256=cAogyZWCYIPhjgbTlhqj2omq-1OLLhiT105_i42M9mM,15508
 tinybird/tb/modules/common.py,sha256=lu1Z3VYImwocaHvqOW2FzBJP6F3Ev7RuXsItkCZ6jpo,83237
 tinybird/tb/modules/config.py,sha256=ziqW_t_mRVvWOd85VoB4vKyvgMkEfpXDf9H4v38p2xc,11422
 tinybird/tb/modules/connection.py,sha256=7oOR7x4PhBcm1ETFFCH2YJ_3oeGXjAbmx1cnZX9_L70,9014
 tinybird/tb/modules/copy.py,sha256=2Mm4FWKehOG7CoOhiF1m9UZJgJn0W1_cMolqju8ONYg,5805
 tinybird/tb/modules/create.py,sha256=_s_vdb9pjq1ORajE_gFMxSGVuns1imNgiD5H8KuI2gQ,17231
 tinybird/tb/modules/datasource.py,sha256=V314rkpdVxVMjsp5qcSCTqDlmp4Vu--qM07BoWh-aqs,17783
-tinybird/tb/modules/deployment.py,sha256=z2xK8EwKbx_a-rIOxIo3o_IQibcBASOaFfeWWosQFhs,26841
+tinybird/tb/modules/deployment.py,sha256=j-6zGvlAlr__ERRJg98-jEtwpR3ZbUJQeRJIj5YS94I,27070
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
 tinybird/tb/modules/endpoint.py,sha256=XySDt3pk66vxOZ0egUfz4bY8bEk3BjOXkv-L0OIJ3sc,12083
@@ -45,7 +45,7 @@ tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUD
 tinybird/tb/modules/mock.py,sha256=IyHweMUM6bUH8IhyiX2tTMpdVpTFUeAJ41lZ5P42-HQ,5303
 tinybird/tb/modules/open.py,sha256=OuctINN77oexpSjth9uoIZPCelKO4Li-yyVxeSnk1io,1371
 tinybird/tb/modules/pipe.py,sha256=AQKEDagO6e3psPVjJkS_MDbn8aK-apAiLp26k7jgAV0,2432
-tinybird/tb/modules/project.py,sha256=yENgJAqRx_eH_n7qalPMWWMZpjEWhAf0CMfGM6ChQrM,3220
+tinybird/tb/modules/project.py,sha256=_UWO79zhh2H0UA9F0wpKXYaylFPdjhGNmNAjIOSBvT8,3425
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb/modules/secret.py,sha256=WsqzxxLh9W_jkuHL2JofMXdIJy0lT5WEI-7bQSIDgAc,2921
 tinybird/tb/modules/shell.py,sha256=Zd_4Ak_5tKVX-cw6B4ag36xZeEGHeh-jZpAsIXkoMoE,14116
@@ -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.dev171.dist-info/METADATA,sha256=DZAvrAPILrw9XpHmGv6LUrVlhFvm7Qy_57YsHR2sA_U,1607
-tinybird-0.0.1.dev171.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev171.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev171.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev171.dist-info/RECORD,,
+tinybird-0.0.1.dev173.dist-info/METADATA,sha256=1_iiQus7JvB3NxLygHs4ZBhHpfcgqz0xnAsuSEiJhLA,1607
+tinybird-0.0.1.dev173.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev173.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev173.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev173.dist-info/RECORD,,