tinybird 0.0.1.dev184__tar.gz → 0.0.1.dev185__tar.gz

{tinybird-0.0.1.dev184 → tinybird-0.0.1.dev185}/PKG-INFO

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

{tinybird-0.0.1.dev184 → tinybird-0.0.1.dev185}/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.dev185'
+__revision__ = 'b79d3c1'

{tinybird-0.0.1.dev184 → tinybird-0.0.1.dev185}/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-0.0.1.dev184 → tinybird-0.0.1.dev185}/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-0.0.1.dev184 → tinybird-0.0.1.dev185}/tinybird.egg-info/PKG-INFO

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