tinybird 0.0.1.dev184__py3-none-any.whl → 0.0.1.dev186__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.dev184'
-__revision__ = '0d5d2de'
+__version__ = '0.0.1.dev186'
+__revision__ = '57239e4'

tinybird/tb/modules/common.py

@@ -174,8 +174,12 @@ def generate_datafile(
         base = Path(folder) / base
     datasource_name = normalize_datasource_name(p.stem)
     if not base.exists():
-        base = Path()
+        if folder:
+            base = Path(folder)
+        else:
+            base = Path()
     f = base / (datasource_name + ".datasource")
+
     if not f.exists() or force:
         with open(f"{f}", "w") as ds_file:
             ds_file.write(datafile)
@@ -421,13 +425,18 @@ async def _analyze(filename: str, client: TinyB, format: str, connector: Optiona
 
 
 async def _generate_datafile(
-    filename: str, client: TinyB, format: str, connector: Optional["Connector"] = None, force: Optional[bool] = False
+    filename: str,
+    client: TinyB,
+    format: str,
+    connector: Optional["Connector"] = None,
+    force: Optional[bool] = False,
+    folder: Optional[str] = None,
 ):
     meta, data = await _analyze(filename, client, format, connector=connector)
     schema = meta["analysis"]["schema"]
     schema = schema.replace(", ", ",\n    ")
     datafile = f"""DESCRIPTION >\n    Generated from {filename}\n\nSCHEMA >\n    {schema}"""
-    return generate_datafile(datafile, filename, data, force, _format=format)
+    return generate_datafile(datafile, filename, data, force, _format=format, folder=folder)
 
 
 async def configure_connector(connector):

tinybird/tb/modules/create.py

@@ -56,9 +56,6 @@ async def create(
         config.persist_to_file()
         project.folder = folder
 
-    if cwd := config.get("cwd"):
-        click.echo(FeedbackManager.gray(message=f"Using '{cwd.replace(os.getcwd(), '')}' as target folder"))
-
     root_folder = os.getcwd()
     if config._path:
         root_folder = os.path.dirname(config._path)
@@ -78,7 +75,7 @@ async def create(
             if not user_token:
                 raise Exception("This action requires authentication. Run 'tb login' first.")
 
-        if not validate_project_structure(folder):
+        if not validate_project_structure(project):
             click.echo(FeedbackManager.highlight(message="\n» Creating new project structure..."))
             create_project_structure(folder)
             click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
@@ -188,14 +185,13 @@ async def create(
 PROJECT_PATHS = ("datasources", "endpoints", "materializations", "copies", "pipes", "fixtures", "tests", "connections")
 
 
-def validate_project_structure(folder: str) -> bool:
-    some_folder_created = any((Path(folder) / path).exists() for path in PROJECT_PATHS)
+def validate_project_structure(project: Project) -> bool:
+    some_folder_created = any((Path(project.folder) / path).exists() for path in PROJECT_PATHS)
     if some_folder_created:
         return True
 
-    folder_path = Path(folder)
-    datasources = list(folder_path.glob("**/*.datasource"))
-    pipes = list(folder_path.glob("**/*.pipe"))
+    datasources = project.get_datasource_files()
+    pipes = project.get_pipe_files()
 
     return len(datasources) > 0 or len(pipes) > 0
 
@@ -468,9 +464,11 @@ async def create_resources_from_data(
     local_client = await get_tinybird_local_client(config)
     folder_path = project.path
     path = folder_path / data
+    if not path.exists():
+        path = Path(data)
     result: List[Path] = []
     format = path.suffix.lstrip(".")
-    ds_file = await _generate_datafile(str(path), local_client, format=format, force=True)
+    ds_file = await _generate_datafile(str(path), local_client, format=format, force=True, folder=project.folder)
     result.append(ds_file)
     name = ds_file.stem
     no_pipes = len(project.get_pipe_files()) == 0
@@ -493,7 +491,7 @@ async def create_resources_from_url(url: str, project: Project, config: Dict[str
     result: List[Path] = []
     local_client = await get_tinybird_local_client(config)
     format = url.split(".")[-1]
-    ds_file = await _generate_datafile(url, local_client, format=format, force=True)
+    ds_file = await _generate_datafile(url, local_client, format=format, force=True, folder=project.folder)
     result.append(ds_file)
     name = ds_file.stem
     no_pipes = len(project.get_pipe_files()) == 0

tinybird/tb/modules/workspace.py

@@ -138,7 +138,6 @@ async def workspace_current(ctx: Context):
 
 @workspace.command(name="create", short_help="Create a new Workspace for your Tinybird user")
 @click.argument("workspace_name", required=False)
-@click.option("--user_token", is_flag=False, default=None, help="When passed, tb won't prompt asking for the token")
 @click.option(
     "--fork",
     is_flag=True,
@@ -157,13 +156,25 @@ async def workspace_current(ctx: Context):
 async def create_workspace(
     ctx: Context,
     workspace_name: str,
-    user_token: Optional[str],
     fork: bool,
     organization_id: Optional[str],
 ) -> None:
     config = CLIConfig.get_project_config()
+    is_cloud = ctx.ensure_object(dict)["env"] == "cloud"
+    if not is_cloud:
+        raise CLIWorkspaceException(
+            FeedbackManager.error(
+                message="`tb workspace create` is not available in local mode. Use --cloud to create a workspace in Tinybird Cloud and it will be used in Tinybird Local."
+            )
+        )
+
+    config = CLIConfig.get_project_config()
+    user_token = config.get_user_token()
 
-    user_token = await get_user_token(config, user_token)
+    if not user_token:
+        raise CLIWorkspaceException(
+            FeedbackManager.error(message="This action requires authentication. Run 'tb login' first.")
+        )
 
     organization_name = None
     organizations = await get_organizations_by_user(config, user_token)

{tinybird-0.0.1.dev184.dist-info → tinybird-0.0.1.dev186.dist-info}/METADATA

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

{tinybird-0.0.1.dev184.dist-info → tinybird-0.0.1.dev186.dist-info}/RECORD

@@ -12,7 +12,7 @@ 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=53aFe84vyt7b02YzNl7TMyome7H2Q6p-1cvE7VbeusE,247
+tinybird/tb/__cli__.py,sha256=fgDoHWj5-L_sJYYjP6ocah4vsol2C_odPl9VN2POpgU,247
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=u3eGOhX0MHkuT6tiwaZ0_3twqLmqKXDAOxF7yV_Nn9Q,1075
 tinybird/tb/client.py,sha256=59GH0IoYSV_KUG0eEbDDYHSWH4OlkVnSRFXE3mYAM0s,56571
@@ -20,11 +20,11 @@ tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/build.py,sha256=rRL5XKBdadMc9uVDEUt0GXm0h09Y6XXw199rdmRI1qo,19127
 tinybird/tb/modules/cicd.py,sha256=MnShTTJzKBYeajswF2jg7p7ZzupaeCgSriAN05MeEdg,7330
 tinybird/tb/modules/cli.py,sha256=dXZs-MuqYPvxStVj7aLg36LwXtEB8NzTobDmHV9nzZI,15508
-tinybird/tb/modules/common.py,sha256=lu1Z3VYImwocaHvqOW2FzBJP6F3Ev7RuXsItkCZ6jpo,83237
+tinybird/tb/modules/common.py,sha256=DYCjpj0iBaCDZ8BJ0MNG_6m6NyFMCrpQShIajHKLIfM,83373
 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=sT0d7hbM1TX6nws6jY4TQIVGBtmt2xPUqUYmgHgHK30,18756
+tinybird/tb/modules/create.py,sha256=3ccvOCcuJfhhaaoX60-6dSmnF8SfnOLTfVqLJs48jOA,18672
 tinybird/tb/modules/datasource.py,sha256=0_6Cn07p5GoNBBGdu88pSeLvTWojln1-k23FsS8jTDs,17801
 tinybird/tb/modules/deployment.py,sha256=t6DDLJ1YdY3SJiTPbEG7CRblSLkbuqwzauQ9y65FWtY,27147
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
@@ -54,7 +54,7 @@ tinybird/tb/modules/telemetry.py,sha256=X0p5AVkM8BNsK_Rhdcg4p2eIf6OHimHO_VLldBqH
 tinybird/tb/modules/test.py,sha256=QxyDkHGL9Ae46h7BA00z1Efb2_5dBYGqW8cgKIJer5s,13081
 tinybird/tb/modules/token.py,sha256=2fmKwu10_M0pqs6YmJVeILR9ZQB0ejRAET86agASbKM,13488
 tinybird/tb/modules/watch.py,sha256=H1FieLTVGRqmZ0hR0vELbQJ9l0CThrFCgGCta-MPuAY,8883
-tinybird/tb/modules/workspace.py,sha256=-XUvL2PB5GcviJ8m30h-ZDc5kwJcm1wy1dreYa2l4Ck,10658
+tinybird/tb/modules/workspace.py,sha256=WDi3Vu9t60b4Ht5vbPsakUErFmsECtFRcfXb1l300xc,11057
 tinybird/tb/modules/workspace_members.py,sha256=RYLpyPM1ECCasHRg3uvpckzXplX0_KgNFsSPZn_i6qk,8744
 tinybird/tb/modules/datafile/build.py,sha256=d_h3pRFDPFrDKGhpFx2iejY25GuB2k8yfNouj6s8caw,50973
 tinybird/tb/modules/datafile/build_common.py,sha256=LU24kAQmxDJIyoIapDaYG-SU3P4FrMG9UBf8m9PgVSI,4565
@@ -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.dev184.dist-info/METADATA,sha256=rBeUzI1isxMpgMebrnRzC64xPiVvvz2OnQrIDq-Ppyw,1608
-tinybird-0.0.1.dev184.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev184.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev184.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev184.dist-info/RECORD,,
+tinybird-0.0.1.dev186.dist-info/METADATA,sha256=XBsl7gXGbcV3mEUvFluqVdyPzg8F-X-c6kXWzx1Cbr4,1608
+tinybird-0.0.1.dev186.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev186.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev186.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev186.dist-info/RECORD,,