tinybird 0.0.1.dev80__py3-none-any.whl → 0.0.1.dev82__py3-none-any.whl

tinybird/client.py

@@ -924,11 +924,12 @@ class TinyB:
         kafka_auto_offset_reset=None,
         kafka_schema_registry_url=None,
         kafka_sasl_mechanism="PLAIN",
+        kafka_security_protocol="SASL_SSL",
         kafka_ssl_ca_pem=None,
     ):
         params = {
             "service": "kafka",
-            "kafka_security_protocol": "SASL_SSL",
+            "kafka_security_protocol": kafka_security_protocol,
             "kafka_sasl_mechanism": kafka_sasl_mechanism,
             "kafka_bootstrap_servers": kafka_bootstrap_servers,
             "kafka_sasl_plain_username": kafka_key,

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev80'
-__revision__ = 'f5f5948'
+__version__ = '0.0.1.dev82'
+__revision__ = '6ef6586'

tinybird/tb/modules/cli.py

@@ -88,7 +88,6 @@ async def cli(
         logging.basicConfig(level=logging.DEBUG)
 
     config_temp = CLIConfig.get_project_config()
-    project = Project(folder=config_temp.cwd)
 
     if token:
         config_temp.set_token(token)
@@ -109,7 +108,8 @@ async def cli(
 
     config = await get_config(host, token, config_file=config_temp._path)
     client = _get_tb_client(config.get("token", None), config["host"])
-
+    project = Project(folder=config.get("cwd", os.getcwd()))
+    config["path"] = str(project.path)
     # If they have passed a token or host as paramter and it's different that record in .tinyb, refresh the workspace id
     if token or host:
         try:
@@ -399,8 +399,8 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, b
         return None
 
     commands_always_cloud = ["pull", "playground"]
-    commands_always_build = ["build", "test", "dev"]
-    commands_always_local = ["create"]
+    commands_always_build = ["build", "test", "dev", "create"]
+    commands_always_local: List[str] = []
     if (
         (cloud or command in commands_always_cloud)
         and command not in commands_always_local

tinybird/tb/modules/config.py

@@ -146,9 +146,6 @@ class CLIConfig:
                 values: Dict[str, Any] = json.loads(file.read())
                 for k, v in values.items():
                     self[k] = v
-                if "cwd" in values:
-                    self.set_cwd(values["cwd"])
-
             return True
         except OSError:
             return False
@@ -212,7 +209,7 @@ class CLIConfig:
         self["host"] = f"{scheme}://{netloc}"
 
     def set_cwd(self, cwd: str) -> None:
-        self.cwd = os.path.join(os.path.dirname(self._path) if self._path else os.getcwd(), cwd)
+        self["cwd"] = cwd
 
     def get_host(self, use_defaults_if_needed: bool = False) -> Optional[str]:
         result: Optional[str] = self.get("host", None)

tinybird/tb/modules/create.py

@@ -1,7 +1,7 @@
 import os
 import re
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Tuple
 
 import click
 
@@ -64,7 +64,7 @@ async def create(
     try:
         tb_client = config.get_client()
         user_token: Optional[str] = None
-        created = False
+        created_something = False
         if prompt:
             try:
                 user_token = config.get_user_token()
@@ -83,11 +83,13 @@ async def create(
             click.echo(FeedbackManager.highlight(message="\n» Creating new project structure..."))
             create_project_structure(folder)
             click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
-            created = True
+            created_something = True
         result = ""
         if data or prompt:
             click.echo(FeedbackManager.highlight(message="\n» Creating resources..."))
-            result = await create_resources(local_client, tb_client, user_token, data, prompt, folder)
+            result, created_something = await create_resources(
+                local_client, tb_client, user_token, data, prompt, folder
+            )
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
 
         if not already_has_cicd(root_folder):
@@ -95,12 +97,14 @@ async def create(
             init_git(root_folder)
             await init_cicd(root_folder, data_project_dir=os.path.relpath(folder))
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
+            created_something = True
 
         if not already_has_cursor_rules(root_folder):
             click.echo(FeedbackManager.highlight(message="\n» Creating .cursorrules..."))
             create_rules(root_folder, "tb", agent)
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
-            created = True
+            created_something = True
+
         if should_generate_fixtures(result):
             click.echo(FeedbackManager.highlight(message="\n» Generating fixtures..."))
 
@@ -110,7 +114,7 @@ async def create(
                 datasource_path = Path(folder) / "datasources" / f"{ds_name}.datasource"
                 click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
                 persist_fixture(ds_name, data_content, folder)
-                created = True
+                created_something = True
             elif prompt and user_token:
                 datasource_files = [f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")]
                 for datasource_file in datasource_files:
@@ -129,8 +133,9 @@ async def create(
                         if data:
                             persist_fixture(datasource_name, data, folder)
                             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
-                            created = True
-        if not created:
+                            created_something = True
+
+        if not created_something:
             click.echo(FeedbackManager.warning(message="△ No resources created\n"))
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))
@@ -185,8 +190,9 @@ async def create_resources(
     data: Optional[str],
     prompt: Optional[str],
     folder: str,
-):
+) -> Tuple[str, bool]:
     result = ""
+    created_any_resource = False
     folder_path = Path(folder)
     if data:
         path = folder_path / data
@@ -206,6 +212,7 @@ TYPE ENDPOINT
         result = (
             f"<response><resource><type>datasource</type><name>{name}</name><content></content></resource></response>"
         )
+        created_any_resource = True
 
     elif prompt and user_token:
         datasource_paths = [
@@ -262,12 +269,14 @@ TYPE ENDPOINT
                 force=True,
                 folder=folder,
             )
+            created_any_resource = True
 
         for pipe in pipes:
             content = pipe["content"].replace("```", "")
             generate_pipe_file(pipe["name"], content, folder)
+            created_any_resource = True
 
-        return result
+    return result, created_any_resource
 
 
 def init_git(folder: str):

{tinybird-0.0.1.dev80.dist-info → tinybird-0.0.1.dev82.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev80
+Version: 0.0.1.dev82
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev80.dist-info → tinybird-0.0.1.dev82.dist-info}/RECORD

@@ -1,5 +1,5 @@
 tinybird/__cli__.py,sha256=esPl5QDTzuQgHe5FuxWLm-fURFigGGwjnYLh9GuWUw4,232
-tinybird/client.py,sha256=ZRskFcS5Or-ELl_uaGfoTfioY_S2pwc_GyMQ6qIKqgM,52798
+tinybird/client.py,sha256=s3YanJI9VBCOZ3QSu11PzWMVXt725qtTgCxBXI9g5vQ,52855
 tinybird/config.py,sha256=GQSc8v7mT79pmMANvp758i8mGVsTPd1VjJzjJmFi0LM,5885
 tinybird/connectors.py,sha256=7Gjms7b5MAaBFGi3xytsJurCylprONpFcYrzp4Fw2Rc,15241
 tinybird/context.py,sha256=VaMhyHruH-uyMypPDfxtuo4scS18b7rxCCdeUVm6ysg,1301
@@ -15,16 +15,16 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=KmW_VD7y-NVqrc8YZKwIaxoJB0XpCcB2izdmxmtmApM,41944
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=AUAww-KjGOZg9h0IBlKA3FeacJYB4rOtqcTGJhFM-g8,40392
-tinybird/tb/__cli__.py,sha256=b2UfXx5tqbCIJ_Ithif0cKrS57a1zq0eTwvY7iyFQ1g,251
+tinybird/tb/__cli__.py,sha256=ezu8vf-QOzUbTt44Gb65yoYa0VsoKoBZ5vj7XkSjB6Y,251
 tinybird/tb/cli.py,sha256=KpJ_-V6xVEzcdPRPnHhEdh2EgRPCyhZnfJVqeqMsftI,964
 tinybird/tb/modules/auth.py,sha256=L1IatO2arRSzys3t8px8xVt8uPWUL5EVD0sFzAV_uVU,9022
 tinybird/tb/modules/build.py,sha256=46ZTxubughaq8QDV6yq9thatSVVY4yNqyzbfxRBcgDA,10446
 tinybird/tb/modules/cicd.py,sha256=T0lb9u_bDdTUVe8TwNNb1qQ5KnSPHMVjqPfKF4BBNBw,5347
-tinybird/tb/modules/cli.py,sha256=GT1FSL700AP49g-g01Aw8SxbTn8lHftZFbk5tO0q-Nw,16296
+tinybird/tb/modules/cli.py,sha256=ldy1_sxQx6hwJYsMtJm_epHljIrfHXI6E2PgoDKZpVc,16362
 tinybird/tb/modules/common.py,sha256=f5yKjb1dgUzR-SrC4UHnpHXYIu6INcTHwNO96jW8A9w,73201
-tinybird/tb/modules/config.py,sha256=JVf2Kcafqmkid4voHecNvWdDVXmht-2zyNXkdcIyIm4,11509
+tinybird/tb/modules/config.py,sha256=wIsoIf2yMCT2JQ5f6nZr-WzB7Uuah9EqXf6Glxe_p-Q,11353
 tinybird/tb/modules/copy.py,sha256=MAVqKip8_QhOYq99U_XuqSO6hCLJEh5sFtbhcXtI3SI,5802
-tinybird/tb/modules/create.py,sha256=bWCKND9R16vtBZHThCnx87bPtufp3pNpNr_yt5xgEn8,12795
+tinybird/tb/modules/create.py,sha256=EAPI-ZsY4Nr_FBehUMpM4y1HZRoWLgdtHQtb71WnauE,13137
 tinybird/tb/modules/datasource.py,sha256=dNCK9iCR2xPLfwqqwg2ixyE6NuoVEiJU2mBZBmOYrVY,16906
 tinybird/tb/modules/deployment.py,sha256=LzxOWjI9hSIXbNxR0BmQfXWBUHhVX2LoZUeChkcmg6c,17528
 tinybird/tb/modules/endpoint.py,sha256=EhVoGAXsFz-83Fiwj1gI-I73iRRvL49d0W81un7hvPE,12080
@@ -76,8 +76,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.dev80.dist-info/METADATA,sha256=v2Pql-adOVjd0zZ1xHmW0kML7uDHf5YKWWiY1i_NzL0,2585
-tinybird-0.0.1.dev80.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev80.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev80.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev80.dist-info/RECORD,,
+tinybird-0.0.1.dev82.dist-info/METADATA,sha256=bcfHRBRtdZrTNN6KIzNtv3-Vrsj5wiHl_bLKfZByU88,2585
+tinybird-0.0.1.dev82.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev82.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev82.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev82.dist-info/RECORD,,