PyPI - tinybird - Versions diffs - 0.0.1.dev172__tar.gz → 0.0.1.dev174__tar.gz - Mend

@@ -11,9 +11,10 @@ from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
 class Project:
     extensions = ("datasource", "pipe", "connection")
-    def __init__(self, folder: str, workspace_name: str):
+    def __init__(self, folder: str, workspace_name: str, max_depth: int = 2):
         self.folder = folder
         self.workspace_name = workspace_name
+        self.max_depth = max_depth
     @property
     def path(self) -> Path:
@@ -23,10 +24,16 @@ class Project:
     def vendor_path(self) -> str:
         return f"{self.path}/vendor"
+    def get_files(self, extension: str) -> List[str]:
+        project_files: List[str] = []
+        for level in range(self.max_depth):
+            project_files.extend(glob.glob(f"{self.path}{'/*' * level}/*.{extension}", recursive=True))
+        return project_files
     def get_project_files(self) -> List[str]:
         project_files: List[str] = []
         for extension in self.extensions:
-            for project_file in glob.glob(f"{self.path}/**/*.{extension}", recursive=True):
+            for project_file in self.get_files(extension):
                 if self.vendor_path in project_file:
                     continue
                 project_files.append(project_file)
@@ -51,13 +58,13 @@ class Project:
         return sorted([Path(f).stem for f in self.get_connection_files()])
     def get_datasource_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.datasource", recursive=True)
+        return self.get_files("datasource")
     def get_pipe_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.pipe", recursive=True)
+        return self.get_files("pipe")
     def get_connection_files(self) -> List[str]:
-        return glob.glob(f"{self.path}/**/*.connection", recursive=True)
+        return self.get_files("connection")
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

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

@@ -1872,8 +1872,7 @@ def drop_token(url: str) -> str:
     parsed = urlparse(url)
     qs = parse_qs(parsed.query)
     qs_simplify = {k: v[0] for k, v in qs.items()}  # change several arguments to single one
-    if "token" in qs_simplify:
-        del qs_simplify["token"]
+    qs_simplify.pop("token", None)
     return f"{parsed.scheme}://{parsed.netloc}{parsed.path}?{urlencode(qs_simplify)}"

@@ -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.dev172'
-__revision__ = '418a96d'
+__version__ = '0.0.1.dev174'
+__revision__ = '39f0b89'

@@ -74,6 +74,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option(
     "--output", type=click.Choice(["json", "human"], case_sensitive=False), default="human", help="Output format"
 )
+@click.option("--max-depth", type=int, default=3, help="Maximum depth of the project files.")
 @click.version_option(version=VERSION)
 @click.pass_context
 @coro
@@ -88,6 +89,7 @@ async def cli(
     cloud: bool,
     staging: bool,
     output: str,
+    max_depth: int,
 ) -> None:
     """
     Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
@@ -148,7 +150,7 @@ 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()))
-    project = Project(folder=folder, workspace_name=config.get("name", ""))
+    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
     if token or host:

@@ -555,6 +555,5 @@ def drop_token(url: str) -> str:
     parsed = urlparse(url)
     qs = parse_qs(parsed.query)
     qs_simplify = {k: v[0] for k, v in qs.items()}  # change several arguments to single one
-    if "token" in qs_simplify:
-        del qs_simplify["token"]
+    qs_simplify.pop("token", None)
     return f"{parsed.scheme}://{parsed.netloc}{parsed.path}?{urlencode(qs_simplify)}"

tinybird 0.0.1.dev172tar.gz → 0.0.1.dev174tar.gz

Potentially problematic release.

@@ -125,8 +125,7 @@ def test_create(ctx: click.Context, name_or_filename: str, prompt: str) -> None:
                     test["expected_http_status"] = response.status_code
                     test["expected_result"] = response.json()["error"]
                 else:
-                    if "expected_http_status" in test:
-                        del test["expected_http_status"]
+                    test.pop("expected_http_status", None)
                     test["expected_result"] = response.text or ""
             tests.append(test)

tinybird 0.0.1.dev172__tar.gz → 0.0.1.dev174__tar.gz

Potentially problematic release.

tinybird 0.0.1.dev172tar.gz → 0.0.1.dev174tar.gz