tinybird 0.0.1.dev229__py3-none-any.whl → 0.0.1.dev231__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.dev229'
-__revision__ = '814718e'
+__version__ = '0.0.1.dev231'
+__revision__ = '6e2d225'

tinybird/tb/modules/cli.py

@@ -152,7 +152,18 @@ 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()))
+
+    # Calculate project folder path properly
+    tinyb_dir = os.path.dirname(config_temp._path)  # Directory containing .tinyb file
+    cwd_config = config.get("cwd", ".")
+
+    if os.path.isabs(cwd_config):
+        # If cwd is absolute, use it directly
+        folder = cwd_config
+    else:
+        # If cwd is relative, resolve it relative to .tinyb directory
+        folder = os.path.normpath(os.path.join(tinyb_dir, cwd_config))
+
     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

tinybird/tb/modules/datasource.py

@@ -788,7 +788,6 @@ async def datasource_create(
     connection_required = datasource_type in ("kafka", "s3", "gcs")
 
     if connection_required:
-        click.echo(FeedbackManager.gray(message="\n» Creating .connection file..."))
 
         def get_connection_files():
             connection_files = []
@@ -801,6 +800,8 @@ async def datasource_create(
             return connection_files
 
         connection_files = get_connection_files()
+
+        click.echo(FeedbackManager.gray(message="\n» Selecting connection..."))
         connection_name = ""
         topics: List[str] = []
         if len(connection_files) == 0:
@@ -857,9 +858,29 @@ async def datasource_create(
                 return
 
         if not connection_file:
-            connection_file = connection_files[0]
-            connection_path = Path(connection_file)
-            connection = connection_path.stem
+            if len(connection_files) > 1:
+                click.echo(
+                    FeedbackManager.highlight(
+                        message=f"? Multiple {datasource_types[datasource_type][0]} connections found. Please select one:"
+                    )
+                )
+                connection_index = -1
+                while connection_index == -1:
+                    for index, conn_file in enumerate(connection_files):
+                        conn_path = Path(conn_file)
+                        click.echo(f"  [{index + 1}] {conn_path.stem}")
+                    connection_index = click.prompt("\nSelect option", default=1)
+                    try:
+                        connection_file = connection_files[int(connection_index) - 1]
+                        connection_path = Path(connection_file)
+                        connection = connection_path.stem
+                    except Exception:
+                        connection_index = -1
+            else:
+                connection_file = connection_files[0]
+                connection_path = Path(connection_file)
+                connection = connection_path.stem
+                click.echo(FeedbackManager.info(message=f"Using connection: {connection}"))
 
     click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
 

tinybird/tb/modules/info.py

@@ -140,11 +140,16 @@ async def get_project_info(project_path: Optional[str] = None) -> Tuple[Iterable
     config = CLIConfig.get_project_config()
     tinyb_path = config.get_tinyb_file()
     current_path = os.getcwd()
-    project_path = current_path
-    if tinyb_path:
-        tinyb_dir = os.path.dirname(tinyb_path)
-        project_path = os.path.join(tinyb_dir, project_path)
+
+    if project_path:
+        # Use the provided project path
+        pass
+    elif tinyb_path:
+        # Use the directory containing the .tinyb file as the project path
+        project_path = os.path.dirname(tinyb_path)
     else:
+        # No .tinyb file found, use current directory
+        project_path = current_path
         tinyb_path = "Not found"
 
     columns = ["current", ".tinyb", "project"]

{tinybird-0.0.1.dev229.dist-info → tinybird-0.0.1.dev231.dist-info}/METADATA

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

{tinybird-0.0.1.dev229.dist-info → tinybird-0.0.1.dev231.dist-info}/RECORD

@@ -17,27 +17,27 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 tinybird/datafile/parse_connection.py,sha256=tRyn2Rpr1TeWet5BXmMoQgaotbGdYep1qiTak_OqC5E,1825
 tinybird/datafile/parse_datasource.py,sha256=ssW8QeFSgglVFi3sDZj_HgkJiTJ2069v2JgqnH3CkDE,1825
 tinybird/datafile/parse_pipe.py,sha256=xf4m0Tw44QWJzHzAm7Z7FwUoUUtr7noMYjU1NiWnX0k,3880
-tinybird/tb/__cli__.py,sha256=abf6p2ld9Q1KITecyuYWTXBq4NqGO5evhTrj1jhr90M,247
+tinybird/tb/__cli__.py,sha256=-NVM0s20VK2TP5o3L8acnnH-g8sllfCyX3hX1OXd72I,247
 tinybird/tb/check_pypi.py,sha256=i3l2L8IajeB7sreikR7oPlYJki9MtS3c_M4crnmbByc,760
 tinybird/tb/cli.py,sha256=0xYk2Ip4vb3nNFbxfTdG3VoIgdRvUKVbUVU_mviErPA,1107
 tinybird/tb/client.py,sha256=FKj61vY9STPW03kfVcxYuY1_csI-kP-mc1ERQfqJtg8,56505
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/build.py,sha256=T36msoBK5g9AZlrJnFRPvlZbrdE265LY1q3Y4YqvS3w,20067
 tinybird/tb/modules/cicd.py,sha256=H22MaMsqAeDv-OmeHFOlUOAmfNzEzTFaEV9TQ0g4ehs,7338
-tinybird/tb/modules/cli.py,sha256=zTUob6oSZszCx-lk6MJbQ_VuNOXBo8b0DOHPWezzMOg,15997
+tinybird/tb/modules/cli.py,sha256=I1G7q3-hjYZuwq1GQoZd5_2i8btl33s6ms8I0yF5XDc,16332
 tinybird/tb/modules/common.py,sha256=F6oaoFZ3aBxEMjiDKYhthsEIUqSFPkcdlMJ7h7A49Ac,83114
 tinybird/tb/modules/config.py,sha256=VnzYVUo4q1RBEEMMce4_OCrKp4erhgkRPHElydVlKj0,11488
 tinybird/tb/modules/connection.py,sha256=KHZgu7sK1C4UBgwkKAMeNdKB0RrTls0LG3YoaUfeAfw,17648
 tinybird/tb/modules/copy.py,sha256=zHN1d5NA-MFsgbk2kKJq2P9qA8dNOnIsIa60QpVnSwc,4458
 tinybird/tb/modules/create.py,sha256=56_x6nwj_oAr72X7AvdxXAuXCDKGJp-w1dP6E2XdxqU,23376
-tinybird/tb/modules/datasource.py,sha256=UiQXDkSEmQIPj4NcUD_I4bAJe9IGVmlVW07yGgSu6kY,40941
+tinybird/tb/modules/datasource.py,sha256=NRSiaSY58o9hYdlmcyv5TreFkWeqCaNQmR-Q8W3T-yc,42019
 tinybird/tb/modules/deployment.py,sha256=ByXIgEvwxB49pJEKKj0EJIfORWyflCYr04k8961nBkA,28391
 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=rC1CZiEZDMb5chByf4xZhv5PsfkoLeIVDScHQ-QcBsE,12072
 tinybird/tb/modules/exceptions.py,sha256=5jK91w1LPmtqIUfDpHe_Op5OxGz8-p1BPgtLREMIni0,5217
 tinybird/tb/modules/feedback_manager.py,sha256=5N2S_ymq0nJPQcFetzoQOWfR6hhx8_gaTp318pe76zU,77966
-tinybird/tb/modules/info.py,sha256=NqSsoyzFqbtUEGH_tSowNOI_jSsNuixibln6-plsfOY,6810
+tinybird/tb/modules/info.py,sha256=lAhZZhrp4bIBXIZ8R27jfPWfv4DA4aePgqpXzHU8d1c,6962
 tinybird/tb/modules/infra.py,sha256=fve30Gj3mG9zbquGxS2e4ipcOYOxviWQCpNFfEzJN_Q,33195
 tinybird/tb/modules/job.py,sha256=AsUCRNzy7HG5oJ4fyk9NpIm5NtNJgBZSy8MtJdXBe5A,3167
 tinybird/tb/modules/llm.py,sha256=QbHRcMLgFmLKEh4zVb2ctR_5tIGUGdFJrAiRCDtMxDw,1572
@@ -82,8 +82,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.dev229.dist-info/METADATA,sha256=L3f2CdrGIrB29xoxfCof0f5s38emd119j3lnUUCZ3P8,1682
-tinybird-0.0.1.dev229.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev229.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev229.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev229.dist-info/RECORD,,
+tinybird-0.0.1.dev231.dist-info/METADATA,sha256=xx59udHdXGwQ0rV0Unph8wKkqYDokrHe_pTdi4JiNFw,1682
+tinybird-0.0.1.dev231.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev231.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev231.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev231.dist-info/RECORD,,