tinybird-cli 2.1.1.dev2__tar.gz → 2.1.1.dev4__tar.gz

{tinybird-cli-2.1.1.dev2 → tinybird-cli-2.1.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 2.1.1.dev2
+Version: 2.1.1.dev4
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+2.1.1.dev4
+************
+
+- `Fixed` `tb deploy` fixes to work with `--dry-run` and push changes of new and modified files
+
+2.1.1.dev3
+************
+
+- `Changed` `tb init --git` update to get ready to use cicd with releases
+
 2.1.1.dev2
 ************
 

{tinybird-cli-2.1.1.dev2 → tinybird-cli-2.1.1.dev4}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '2.1.1.dev2'
-__revision__ = '0a4a8e6'
+__version__ = '2.1.1.dev4'
+__revision__ = 'b6aab87'

{tinybird-cli-2.1.1.dev2 → tinybird-cli-2.1.1.dev4}/tinybird/datafile.py

@@ -3254,7 +3254,7 @@ async def build_graph(
         dir_path = os.getcwd()
 
     if process_dependencies and only_changes:
-        all_resources, all_dep_map = await build_graph(
+        all_resources, all_dep_map, _, _ = await build_graph(
             get_project_filenames(dir_path),
             tb_client,
             dir_path=dir_path,
@@ -3452,13 +3452,15 @@ async def build_graph(
             dep_map, downstream_dep_map, all_resources, to_run, dep_map_keys, key=None, visited=visited
         )
 
+    old_dep_map = deepcopy(dep_map)
+    old_to_run = deepcopy(to_run)
     new_dep_map = dep_map
     if all_dep_map and fork_downstream:
         downstream_dep_map = create_downstream_dependency_graph(all_dep_map, all_resources)
         new_dep_map = {}
         update_dep_map_recursively(new_dep_map, downstream_dep_map, all_resources, to_run, list(set(dep_map.keys())))
 
-    return to_run, new_dep_map
+    return to_run, new_dep_map, old_to_run, old_dep_map
 
 
 async def get_changes_from_main(
@@ -3598,7 +3600,7 @@ async def folder_push(
 
     # build graph to get new versions for all the files involved in the query
     # dependencies need to be processed always to get the versions
-    resources, dep_map = await build_graph(
+    resources, dep_map, _, back_dep_map = await build_graph(
         filenames,
         tb_client,
         dir_path=folder,
@@ -3625,7 +3627,7 @@ async def folder_push(
         latest_datasource_versions = {}
 
     # build the graph again with the right version
-    to_run, dep_map = await build_graph(
+    to_run, dep_map, back_to_run, back_dep_map = await build_graph(
         filenames,
         tb_client,
         dir_path=folder,
@@ -3774,15 +3776,32 @@ async def folder_push(
                 else:
                     click.echo(FeedbackManager.warning_dry_name_already_exists(name=name))
 
+    def is_new(name, changed):
+        if changed and changed.get(name) == "A":
+            return True
+        return False
+
     async def push_files(dry_run: bool = False):
         endpoints_dep_map = dict()
         pipes_dep_map = dict()
         mat_dep_map = dict()
         processed = set()
 
+        groups = [group for group in toposort(back_dep_map)]
+        for group in groups:
+            for name in group:
+                if not is_new(name, changed) or not fork_downstream:
+                    continue
+                await push(
+                    name, back_to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream, fork
+                )
+                processed.add(name)
+
         groups = [group for group in toposort(dep_map)]
         for group in groups:
             for name in group:
+                if name in processed:
+                    continue
                 # https://gitlab.com/tinybird/analytics/-/merge_requests/6737
                 if is_endpoint_with_no_dependencies(to_run.get(name, {}), dep_map, to_run):
                     endpoints_dep_map[name] = dep_map[name]
@@ -3847,7 +3866,7 @@ async def folder_push(
             # We need to upload the fixtures even if there is no change
             if is_environment:
                 filenames = get_project_filenames(folder, with_vendor=True)
-                to_run, dep_map = await build_graph(
+                to_run, dep_map, back_to_run, back_dep_map = await build_graph(
                     filenames,
                     tb_client,
                     dir_path=folder,

{tinybird-cli-2.1.1.dev2 → tinybird-cli-2.1.1.dev4}/tinybird/tb_cli_modules/cicd.py

@@ -38,8 +38,9 @@ GITHUB_CI_YML = """
 
     jobs:
         ci: # ci using environments from workspace '{{ workspace_name }}'
-          uses: tinybirdco/ci/.github/workflows/ci.yml@v2.4.0
+          uses: tinybirdco/ci/.github/workflows/ci.yml@v2.5.1
           with:
+            tb_deploy: false
             data_project_dir: {{ data_project_dir }}
           secrets:
             tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
@@ -64,7 +65,7 @@ GITHUB_CD_YML = """
           - '{{ data_project_dir }}/**'{% end %}
     jobs:
       cd:  # deploy changes to workspace '{{ workspace_name }}'
-        uses: tinybirdco/ci/.github/workflows/cd.yml@v2.4.0
+        uses: tinybirdco/ci/.github/workflows/cd.yml@v2.5.1
         with:
           tb_deploy: false
           data_project_dir: {{ data_project_dir }}
@@ -73,6 +74,34 @@ GITHUB_CD_YML = """
           tb_host: {{ tb_host }}
 """
 
+GITHUB_RELEASES_YML = """
+    ##################################################
+    ###   Visit https://github.com/tinybirdco/ci   ###
+    ###   for more details or custom CI/CD         ###
+    ##################################################
+
+    name: Tinybird - Releases Workflow
+
+    on:
+      workflow_dispatch:
+        inputs:
+          job_to_run:
+            description: 'Select the job to run manually'
+            required: true
+            default: 'promote'
+
+    jobs:
+      cd:  # manage releases for workspace '{{ workspace_name }}'
+        uses: tinybirdco/ci/.github/workflows/release.yml@v2.5.0
+        with:
+          job_to_run: ${{! inputs.job_to_run }}
+          data_project_dir: {{ data_project_dir }}
+          tb_deploy: false
+        secrets:
+          tb_admin_token: ${{! secrets.TB_ADMIN_TOKEN }}  # set the Workspace admin token in GitHub secrets
+          tb_host: {{ tb_host }}
+"""
+
 
 GITLAB_YML = """
     ##################################################
@@ -80,7 +109,7 @@ GITLAB_YML = """
     ###   for more details or custom CI/CD         ###
     ##################################################
 
-    include: "https://raw.githubusercontent.com/tinybirdco/ci/v2.4.0/.gitlab/ci_cd.yaml"
+    include: "https://raw.githubusercontent.com/tinybirdco/ci/v2.5.1/.gitlab/ci_cd.yaml"
 
     .ci_config_rules:
       - &ci_config_rule
@@ -131,14 +160,34 @@ GITLAB_YML = """
       variables:
         <<: *cicd_variables
 
-    cleanup_cd_env:
-      extends: .cleanup_cd_branch
-      needs: ["run_cd"]
-      when: always
+    run_promote:
+      extends: .release_promote
+      dependencies: []
+      when: manual
       rules:
         - *cd_config_rule
       variables:
         <<: *cicd_variables
+
+    run_rollback:
+      extends: .release_rollback
+      dependencies: []
+      when: manual
+      rules:
+        - *cd_config_rule
+      variables:
+        <<: *cicd_variables
+
+    run_rm:
+      extends: .release_rm
+      dependencies: []
+      when: manual
+      rules:
+        - *cd_config_rule
+      variables:
+        <<: *cicd_variables
+
+
 """
 
 
@@ -192,6 +241,11 @@ class GitHubCICDGenerator(CICDGeneratorBase):
             template=GITHUB_CD_YML,
             file_name="tinybird_cd.yml",
             dir_path=".github/workflows",
+        ),
+        CICDFile(
+            template=GITHUB_RELEASES_YML,
+            file_name="tinybird_release.yml",
+            dir_path=".github/workflows",
             warning_message="Set TB_ADMIN_TOKEN in GitHub secrets. Use the Workspace admin token. Hint: use `tb token copy {token_id}` to copy clipboard",
         ),
     ]

{tinybird-cli-2.1.1.dev2 → tinybird-cli-2.1.1.dev4}/tinybird/tb_cli_modules/cli.py

@@ -913,7 +913,7 @@ async def sql(
 
             # build graph to get new versions for all the files involved in the query
             # dependencies need to be processed always to get the versions
-            resources, dep_map = await build_graph(
+            resources, _, _, _ = await build_graph(
                 filenames,
                 client,
                 dir_path=".",
@@ -930,7 +930,7 @@ async def sql(
                     latest_datasource_versions[ds] = dep["version"]
 
             # build the graph again with the rigth version
-            to_run, _ = await build_graph(
+            to_run, _, _, _ = await build_graph(
                 filenames,
                 client,
                 dir_path=".",
@@ -1493,7 +1493,8 @@ async def deploy(
         click.echo(FeedbackManager.info_releases_detected(current_semver=current_semver, semver=semver))
         if version.parse(semver.split("-snapshot")[0]) > version.parse(current_semver.split("-snapshot")[0]):
             click.echo(FeedbackManager.info_create_release())
-            await create_release(client, config, semver)
+            if not dry_run:
+                await create_release(client, config, semver)
             release_created = True
             fork_downstream = True
         else:
@@ -1533,11 +1534,11 @@ async def deploy(
             release_created=release_created,
         )
     except Exception as e:
-        if release_created:
+        if release_created and not dry_run:
             await client.release_failed(config["id"], semver)
         raise e
 
-    if release_created:
+    if release_created and not dry_run:
         try:
             await client.release_preview(config["id"], semver)
             click.echo(FeedbackManager.success_release_preview(semver=semver))

{tinybird-cli-2.1.1.dev2 → tinybird-cli-2.1.1.dev4}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 2.1.1.dev2
+Version: 2.1.1.dev4
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+2.1.1.dev4
+************
+
+- `Fixed` `tb deploy` fixes to work with `--dry-run` and push changes of new and modified files
+
+2.1.1.dev3
+************
+
+- `Changed` `tb init --git` update to get ready to use cicd with releases
+
 2.1.1.dev2
 ************