tinybird 0.0.1.dev192__tar.gz → 0.0.1.dev194__tar.gz

{tinybird-0.0.1.dev192 → tinybird-0.0.1.dev194}/PKG-INFO

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

{tinybird-0.0.1.dev192 → tinybird-0.0.1.dev194}/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.dev192'
-__revision__ = '116c2dc'
+__version__ = '0.0.1.dev194'
+__revision__ = 'f73c305'

{tinybird-0.0.1.dev192 → tinybird-0.0.1.dev194}/tinybird/tb/modules/datasource.py

@@ -127,7 +127,7 @@ async def datasource_ls(ctx: Context, match: Optional[str], format_: str):
 
 @datasource.command(name="append")
 @click.argument("datasource_name", required=False)
-@click.argument("data", nargs=-1, required=False)
+@click.argument("data", required=False)
 @click.option("--url", type=str, help="URL to append data from")
 @click.option("--file", type=str, help="Local file to append data from")
 @click.option("--events", type=str, help="Events to append data from")
@@ -159,15 +159,30 @@ async def datasource_append(
 
     # If data is passed as argument, we detect if it's a JSON object, a URL or a file
     if data:
-        try:
-            json.loads(data)
+        VALID_EXTENSIONS = [
+            "csv",
+            "csv.gz",
+            "ndjson",
+            "ndjson.gz",
+            "jsonl",
+            "jsonl.gz",
+            "json",
+            "json.gz",
+            "parquet",
+            "parquet.gz",
+        ]
+        is_file_or_url = data and (data.startswith("http") or any(data.endswith(f".{ext}") for ext in VALID_EXTENSIONS))
+        if is_file_or_url:
+            try:
+                if urlparse(data).scheme in ("http", "https"):
+                    url = data
+            except Exception:
+                pass
+
+            if not url:
+                file = data
+        else:
             events = data
-        except Exception:
-            pass
-        if urlparse(data).scheme in ("http", "https"):
-            url = data
-        if not events and not url:
-            file = data
 
     # If data is not passed as argument, we use the data from the options
     if not data:

{tinybird-0.0.1.dev192 → tinybird-0.0.1.dev194}/tinybird/tb/modules/deployment.py

@@ -671,7 +671,7 @@ def print_changes(result: dict, project: Project) -> None:
         resources.append(["new", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for p in deployment.get("new_pipe_names", []):
-        path = str(project.get_resource_path(p, "pipe"))
+        path = project.get_resource_path(p, "pipe")
         pipe_type = project.get_pipe_type(path)
         resources.append(["new", p, pipe_type, path])
 
@@ -682,7 +682,7 @@ def print_changes(result: dict, project: Project) -> None:
         resources.append(["modified", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for p in deployment.get("changed_pipe_names", []):
-        path = str(project.get_resource_path(p, "pipe"))
+        path = project.get_resource_path(p, "pipe")
         pipe_type = project.get_pipe_type(path)
         resources.append(["modified", p, pipe_type, path])
 
@@ -696,7 +696,7 @@ def print_changes(result: dict, project: Project) -> None:
         resources.append(["deleted", ds, "datasource", project.get_resource_path(ds, "datasource")])
 
     for p in deployment.get("deleted_pipe_names", []):
-        path = str(project.get_resource_path(p, "pipe"))
+        path = project.get_resource_path(p, "pipe")
         pipe_type = project.get_pipe_type(path)
         resources.append(["deleted", p, pipe_type, path])
 

{tinybird-0.0.1.dev192 → tinybird-0.0.1.dev194}/tinybird/tb/modules/project.py

@@ -50,12 +50,12 @@ class Project:
                 project_files.append(project_file)
         return project_files
 
-    def get_resource_path(self, resource_name: str, resource_type: str) -> Optional[str]:
+    def get_resource_path(self, resource_name: str, resource_type: str) -> str:
         full_path = next(
             (p for p in self.get_project_files() if p.endswith("/" + resource_name + f".{resource_type}")), ""
         )
         if not full_path:
-            return None
+            return ""
         return Path(full_path).relative_to(self.path).as_posix()
 
     @property
@@ -117,14 +117,17 @@ class Project:
 
     @staticmethod
     def get_pipe_type(path: str) -> str:
-        content = Path(path).read_text()
-        if re.search(r"TYPE endpoint", content, re.IGNORECASE):
-            return "endpoint"
-        elif re.search(r"TYPE materialized", content, re.IGNORECASE):
-            return "materialization"
-        elif re.search(r"TYPE copy", content, re.IGNORECASE):
-            return "copy"
-        return "pipe"
+        try:
+            content = Path(path).read_text()
+            if re.search(r"TYPE endpoint", content, re.IGNORECASE):
+                return "endpoint"
+            elif re.search(r"TYPE materialized", content, re.IGNORECASE):
+                return "materialization"
+            elif re.search(r"TYPE copy", content, re.IGNORECASE):
+                return "copy"
+            return "pipe"
+        except Exception:
+            return "pipe"
 
     @staticmethod
     def is_kafka_connection(content: str) -> bool:

{tinybird-0.0.1.dev192 → tinybird-0.0.1.dev194}/tinybird.egg-info/PKG-INFO

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