Restructure visualization paths

Author: luciasanchezbella01

.github/workflows/measure-disk-usage.yml

@@ -1,7 +1,7 @@
 name: Measure Disk Usage
 
 on:
-  push:
+  pull_request:
     branches:
     - master 
 env:
@@ -29,24 +29,22 @@ jobs:
         ddev config set repo core
     - name: Measure disk usage (uncompressed)
       run: | 
-        mkdir -p status_visualizations
-        ddev size status --csv > size-uncompressed.csv
-        ddev size status  --save_to_png_path status_visualizations/uncompressed.png > size-uncompressed.txt
+        ddev size status >> size-uncompressed.txt
+        ddev size status  --format png,csv,markdown
         cat size-uncompressed.txt
         echo "# Size (uncompressed)" >> $GITHUB_STEP_SUMMARY
         echo '```' >> $GITHUB_STEP_SUMMARY
-        cat size-uncompressed.txt >> $GITHUB_STEP_SUMMARY
+        cat uncompressed_status.md >> $GITHUB_STEP_SUMMARY
         echo '```' >> $GITHUB_STEP_SUMMARY
   
     - name: Measure disk usage (compressed)
       run: |
-        mkdir -p status_visualizations
-        ddev size status --csv --compressed > size-compressed.csv
-        ddev size status --compressed  --save_to_png_path status_visualizations/compressed.png > size-compressed.txt
+        ddev size status --compressed > size-compressed.txt
+        ddev size status --compressed  --format png,csv,markdown
         cat size-compressed.txt
         echo "# Size (compressed)" >> $GITHUB_STEP_SUMMARY
         echo '```' >> $GITHUB_STEP_SUMMARY
-        cat size-compressed.txt >> $GITHUB_STEP_SUMMARY
+        cat compressed_status.md >> $GITHUB_STEP_SUMMARY
         echo '```' >> $GITHUB_STEP_SUMMARY
 
 
@@ -81,15 +79,15 @@ jobs:
     - name: Upload file sizes (uncompressed)
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
-        name: size-uncompressed.csv
-        path: size-uncompressed.csv
+        name: uncompressed_status.csv
+        path: uncompressed_status.csv
         if-no-files-found: error
 
     - name: Upload file sizes (compressed)
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
-        name: size-compressed.csv
-        path: size-compressed.csv
+        name: compressed_status.csv
+        path: compressed_status.csv
         if-no-files-found: error
 
     - name: Upload file sizes diff (uncompressed)
@@ -112,7 +110,7 @@ jobs:
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: size-visuals
-        path: status_visualizations/
+        path: size_status_visualizations/
         if-no-files-found: error
 
     - name: Upload diff PNGs

ddev/src/ddev/cli/size/diff.py

@@ -2,6 +2,7 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
+import os
 from datetime import datetime
 from typing import Optional
 
@@ -161,11 +162,12 @@ def diff_mode(
 
     if params["show_gui"] or treemap_path:
         plot_treemap(
+            params["app"],
             formatted_modules,
             f"Disk Usage Differences for {params['platform']} and Python version {params['version']}",
             params["show_gui"],
             "diff",
-            treemap_path,
+            "size_diff_visualizations" + os.sep + treemap_path,
         )
 
     return formatted_modules

ddev/src/ddev/cli/size/status.py

@@ -2,6 +2,7 @@
 # All rights reserved
 # Licensed under a 3-clause BSD style license (see LICENSE)
 
+import os
 from pathlib import Path
 from typing import Optional
 
@@ -29,6 +30,7 @@
 
 @click.command()
 @click.option("--to-dd-org", type=str, help="Send metrics to Datadog using the specified organization name.")
+@click.option("--to-dd-key", type=str, help="Send metrics to datadoghq.com using the specified API key.")
 @click.option("--python", "version", help="Python version (e.g 3.12).  If not specified, all versions will be analyzed")
 @common_params  # platform, compressed, format, show_gui
 @click.pass_obj
@@ -40,6 +42,7 @@ def status(
     format: list[str],
     show_gui: bool,
     to_dd_org: str,
+    to_dd_key: str,
 ) -> None:
     """
     Show the current size of all integrations and dependencies.
@@ -52,10 +55,12 @@ def status(
             raise ValueError(f"Invalid platform: {platform}")
         elif version and version not in valid_versions:
             raise ValueError(f"Invalid version: {version}")
-        if format:
+        elif format:
             for fmt in format:
                 if fmt not in ["png", "csv", "markdown", "json"]:
                     raise ValueError(f"Invalid format: {fmt}. Only png, csv, markdown, and json are supported.")
+        elif to_dd_org and not to_dd_key:
+            raise ValueError("Specify either --to-dd-org or --to-dd-key, not both")
         modules_plat_ver: list[FileDataEntryPlatformVersion] = []
         platforms = valid_platforms if platform is None else [platform]
         versions = valid_versions if version is None else [version]
@@ -78,8 +83,8 @@ def status(
 
         if format:
             export_format(app, format, modules_plat_ver, "status", platform, version, compressed)
-        if to_dd_org:
-            send_metrics_to_dd(app, modules_plat_ver, to_dd_org, compressed)
+        if to_dd_org or to_dd_key:
+            send_metrics_to_dd(app, modules_plat_ver, to_dd_org, to_dd_key, compressed)
     except Exception as e:
         app.abort(str(e))
 
@@ -107,11 +112,12 @@ def status_mode(
 
     if params["show_gui"] or treemap_path:
         plot_treemap(
+            params["app"],
             formatted_modules,
             f"Disk Usage Status for {params['platform']} and Python version {params['version']}",
             params["show_gui"],
             "status",
-            treemap_path,
+            "size_status_visualizations" + os.sep + treemap_path,
         )
 
     return formatted_modules

ddev/src/ddev/cli/size/timeline.py

@@ -289,7 +289,14 @@ def timeline_mode(
     )
 
     if params["show_gui"] or timeline_path:
-        plot_linegraph(formatted_modules, params["module"], params["platform"], params["show_gui"], timeline_path)
+        plot_linegraph(
+            params["app"],
+            formatted_modules,
+            params["module"],
+            params["platform"],
+            params["show_gui"],
+            "size_timeline_visualizations" + os.sep + timeline_path,
+        )
 
     return formatted_modules
 
@@ -788,6 +795,7 @@ def export_format(
 
 
 def plot_linegraph(
+    app: Application,
     modules: list[CommitEntryWithDelta] | list[CommitEntryPlatformWithDelta],
     module: str,
     platform: Optional[str],
@@ -821,7 +829,9 @@ def plot_linegraph(
     plt.tight_layout()
 
     if path:
-        plt.savefig(path)
+        os.makedirs(os.path.dirname(path), exist_ok=True)
+        plt.savefig(path, bbox_inches="tight", format="png")
+        app.display(f"Linegraph saved to {path}")
     if show:
         plt.show()
     plt.close()

ddev/src/ddev/cli/size/utils/common_funcs.py

@@ -545,6 +545,7 @@ def export_format(
 
 
 def plot_treemap(
+    app: Application,
     modules: list[FileDataEntryPlatformVersion],
     title: str,
     show: bool,
@@ -579,7 +580,9 @@ def plot_treemap(
     plt.tight_layout()
 
     if path:
+        os.makedirs(os.path.dirname(path), exist_ok=True)
         plt.savefig(path, bbox_inches="tight", format="png")
+        app.display(f"Treemap saved to {path}")
     if show:
         plt.show()
 
@@ -750,14 +753,15 @@ def draw_treemap_rects_with_labels(
 
 
 def send_metrics_to_dd(
-    app: Application, modules: list[FileDataEntryPlatformVersion], org: str, compressed: bool
+    app: Application, modules: list[FileDataEntryPlatformVersion], org: str, key: str, compressed: bool
 ) -> None:
     metric_name = (
         "datadog.agent_integrations.size_analyzer.compressed"
         if compressed
         else "datadog.agent_integrations.size_analyzer.uncompressed"
     )
-    config_file_info = get_org(app, org)
+
+    config_file_info = get_org(app, org) if org else {"api_key": key, "site": "datadoghq.com"}
     # if not is_everything_committed():
     #     raise RuntimeError("All files have to be committed in order to send the metrics to Datadog")
     if "api_key" not in config_file_info: