tinybird 0.0.1.dev229__tar.gz → 0.0.1.dev231__tar.gz

{tinybird-0.0.1.dev229 → tinybird-0.0.1.dev231}/PKG-INFO

@@ -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 → tinybird-0.0.1.dev231}/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-0.0.1.dev229 → tinybird-0.0.1.dev231}/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-0.0.1.dev229 → tinybird-0.0.1.dev231}/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-0.0.1.dev229 → tinybird-0.0.1.dev231}/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 → tinybird-0.0.1.dev231}/tinybird.egg-info/PKG-INFO

@@ -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