From 0c0125ba7b759b7025b98833009e6c351fb31d17 Mon Sep 17 00:00:00 2001 From: Bhavya Sharma Date: Wed, 20 Nov 2024 15:21:54 -0800 Subject: [PATCH 1/2] Changes in description of --help of generate-size-report to add Total Image Size. --- src/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 26859971..7d4429b2 100644 --- a/src/main.py +++ b/src/main.py @@ -420,7 +420,7 @@ def get_arg_parser(): ) package_size_parser = subparsers.add_parser( "generate-size-report", - help="Generates package size report for each of the packages in the given " "image version.", + help="Generates toatl image size and package size report for each of the packages in the given " "image version.", ) package_size_parser.set_defaults(func=generate_package_size_report) package_size_parser.add_argument( From 70bd92a21e60c3186d97693d69169d18a9f1efdb Mon Sep 17 00:00:00 2001 From: Bhavya Sharma Date: Wed, 20 Nov 2024 15:30:27 -0800 Subject: [PATCH 2/2] Added Functionality for findind Total Image Size --- src/package_report.py | 87 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/src/package_report.py b/src/package_report.py index 24d9a5f7..17a2556b 100644 --- a/src/package_report.py +++ b/src/package_report.py @@ -1,5 +1,6 @@ import json import os +import boto3 from itertools import islice import conda.cli.python_api @@ -268,6 +269,10 @@ def generate_package_size_report(args): source_patch_version = f.readline() base_version = get_semver(source_patch_version) base_version_dir = get_dir_for_version(base_version) if base_version else None + + #Generate the report for Total Image Size changed from Base Version + _generate_image_size_report(target_version, base_version) + validate_results = [] for image_config in _image_generator_configs[target_version.major]: base_pkg_metadata = pull_conda_package_metadata(image_config, base_version_dir) if base_version else None @@ -306,3 +311,85 @@ def generate_package_dependency_report(args): for image_config in configs: print("## Image Type: " + "(" + image_config["image_type"].upper() + ")") _generate_python_package_dependency_report(image_config, base_version_dir, target_version_dir) + +def get_image_size(image_tag): + try: + ecr_client = boto3.client('ecr', region_name="us-east-1") + + response = ecr_client.describe_images( + registryId=STAGING_ACCOUNT, + repositoryName=STAGING_REPO_NAME, + imageIds=[{'imageTag': image_tag}] + ) + image_details = response.get('imageDetails', []) + if image_details: + image_size_bytes = image_details[0].get('imageSizeInBytes') + if image_size_bytes: + image_size_gb = image_size_bytes / (1024 ** 3) + return image_size_gb + else: + print(f"Image size not found for {STAGING_REPO_NAME}:{image_tag}") + else: + print(f"No image details found for {STAGING_REPO_NAME}:{image_tag}") + + except Exception as e: + print(f"Error retrieving image size: {str(e)}") + + return None + +def _generate_image_size_report(target_version, base_version): + target_tag_gpu = f"{target_version.major}.{target_version.minor}.{target_version.patch}-gpu" + base_tag_gpu = f"{base_version.major}.{base_version.minor}.{base_version.patch}-gpu" if base_version else None + + target_tag_cpu = f"{target_version.major}.{target_version.minor}.{target_version.patch}-cpu" + base_tag_cpu = f"{base_version.major}.{base_version.minor}.{base_version.patch}-cpu" if base_version else None + + target_size_gpu = get_image_size(target_tag_gpu) + base_size_gpu = get_image_size(base_tag_gpu) if base_tag_gpu else None + + target_size_cpu = get_image_size(target_tag_cpu) + base_size_cpu = get_image_size(base_tag_cpu) if base_tag_cpu else None + + headers = ["Target Image Size", "Base Image Size", "Size Difference", "Size Change (%)"] + + print("\n# GPU Total Image Size Report\n") + if target_size_gpu is not None and base_size_gpu is not None: + size_diff_gpu = target_size_gpu - base_size_gpu + size_diff_gpu_rel = size_diff_gpu / base_size_gpu if base_size_gpu != 0 else 0 + + size_change_gpu = f"{size_diff_gpu:.2f} GB {'Larger' if size_diff_gpu > 0 else ('Smaller' if size_diff_gpu < 0 else 'No Change')}" + + size_change_percentage_gpu = f"{round(abs(size_diff_gpu_rel * 100), 2)}% {'Larger' if size_diff_gpu > 0 else ('Smaller' if size_diff_gpu < 0 else 'No Change')}" if size_diff_gpu_rel else "-" + + rows = [ + { + "Target Image Size": f"{target_tag_gpu}:{target_size_gpu:.2f} GB", + "Base Image Size": f"{base_tag_gpu}:{base_size_gpu:.2f} GB", + "Size Difference": size_change_gpu, + "Size Change (%)": size_change_percentage_gpu + } + ] + print(create_markdown_table(headers, rows)) + else: + print(f"Failed to retrieve size for target image: {target_tag_gpu} or base image: {base_tag_gpu}") + + print("\n# CPU Total Image Size Report\n") + if target_size_cpu is not None and base_size_cpu is not None: + size_diff_cpu = target_size_cpu - base_size_cpu + size_diff_cpu_rel = size_diff_cpu / base_size_cpu if base_size_cpu != 0 else 0 + + size_change_cpu = f"{size_diff_cpu:.2f} GB {'Larger' if size_diff_cpu > 0 else ('Smaller' if size_diff_cpu < 0 else 'No Change')}" + + size_change_percentage_cpu = f"{round(abs(size_diff_cpu_rel * 100), 2)}% {'Larger' if size_diff_cpu > 0 else ('Smaller' if size_diff_cpu < 0 else 'No Change')}" if size_diff_cpu_rel else "-" + + rows = [ + { + "Target Image Size": f"{target_tag_cpu}:{target_size_cpu:.2f} GB", + "Base Image Size": f"{base_tag_cpu}:{base_size_cpu:.2f} GB", + "Size Difference": size_change_cpu, + "Size Change (%)": size_change_percentage_cpu + } + ] + print(create_markdown_table(headers, rows)) + else: + print(f"Failed to retrieve size for target image: {target_tag_cpu} or base image: {base_tag_cpu}")