Merge branch 'main' into uv

Author: maskarb

nise/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.7.0"
+__version__ = "4.7.2"
 
 
 VERSION = __version__.split(".")

nise/__main__.py

@@ -242,6 +242,14 @@ def add_gcp_parser_args(parser):
         dest="daily_report",
         help="GCP daily report activation",
     )
+
+    parser.add_argument(
+        "--gcp-daily-flow",
+        action="store_true",
+        required=False,
+        dest="gcp_daily_flow",
+        help="additional GCP day to day ingest",
+    )
     parser.add_argument(
         "-etag", "--gcp-etag", metavar="GCP_ETAG", dest="gcp_etag", required=False, help="The etag in the filename"
     )

nise/generators/aws/ec2_generator.py

@@ -26,7 +26,17 @@ class EC2Generator(AWSGenerator):
 
     INSTANCE_TYPES = (
         # NOTE: Each tuple represents
-        # (instance type, physical_cores, vCPUs, memory, storage, family, cost, rate, savings, description)
+        # (instance type,
+        # physical_cores,
+        # vCPUs,
+        # memory,
+        # storage,
+        # family,
+        # cost,
+        # rate,
+        # Reserved_instances,
+        # savings,
+        # description)
         (
             "m5.large",
             "1",
@@ -39,6 +49,7 @@ class EC2Generator(AWSGenerator):
             "0.045",
             1,
             False,
+            False,
             "${cost} per On Demand Linux {inst_type} Instance Hour",
         ),
         (
@@ -53,6 +64,7 @@ class EC2Generator(AWSGenerator):
             "0.17",
             1,
             False,
+            False,
             "${cost} per On Demand Linux {inst_type} Instance Hour",
         ),
         (
@@ -67,6 +79,7 @@ class EC2Generator(AWSGenerator):
             "0.099",
             1,
             False,
+            False,
             "${cost} per On Demand Linux {inst_type} Instance Hour",
         ),
         (
@@ -81,6 +94,7 @@ class EC2Generator(AWSGenerator):
             "0.067",
             1,
             False,
+            False,
             "${cost} per On Demand Linux {inst_type} Instance Hour",
         ),
     )
@@ -125,6 +139,7 @@ def __init__(self, start_date, end_date, currency, payer_account, usage_accounts
                 instance_type.get("rate"),
                 instance_type.get("saving"),
                 instance_type.get("amount", "1"),
+                instance_type.get("reserved_instance", False),
                 instance_type.get("negation", False),
                 "${cost} per On Demand Linux {inst_type} Instance Hour",
             )
@@ -142,6 +157,7 @@ def _update_data(self, row, start, end, **kwargs):
             rate,
             saving,
             amount,
+            reserved_instance,
             negation,
             description,
         ) = self._instance_type
@@ -204,6 +220,18 @@ def _update_data(self, row, start, end, **kwargs):
         # Overwrite lineItem/LineItemType for items with applied Savings plan
         if saving is not None:
             row["lineItem/LineItemType"] = "SavingsPlanCoveredUsage"
+        # Overwrite lineitem/LineItemType for RI's discount usage
+        if reserved_instance:
+            row["lineItem/LineItemType"] = "DiscountedUsage"
+            row["lineItem/UnblendedCost"] = 0
+            row["lineItem/UnblendedRate"] = 0
+            row["lineItem/BlendedCost"] = 0
+            row["lineItem/BlendedRate"] = 0
+            row["lineItem/LineItemDescription"] = f"{inst_type} reserved instance applied"
+            row["pricing/publicOnDemandCost"] = "convertible"
+            row["pricing/publicOnDemandRate"] = "No Upfront"
+            row["savingsPlan/SavingsPlanEffectiveCost"] = None
+            row["savingsPlan/SavingsPlanRate"] = None
 
         if negation:
             row["lineItem/LineItemType"] = "SavingsPlanNegation"

nise/report.py

@@ -1207,6 +1207,7 @@ def _gcp_bigquery_process(
     start_date, end_date, currency, projects, generators, options, gcp_bucket_name, gcp_dataset_name, gcp_table_name
 ):
     resource_level = options.get("gcp_resource_level", False)
+    gcp_daily_flow = options.get("gcp_daily_flow", False)
     data = []
     for project in projects:
         num_gens = len(generators)
@@ -1240,7 +1241,14 @@ def _gcp_bigquery_process(
             gcp_table_name = f"gcp_billing_export_resource_{etag}"
         else:
             gcp_table_name = f"gcp_billing_export_{etag}"
-    gcp_bucket_to_dataset(gcp_bucket_name, output_file_name, gcp_dataset_name, gcp_table_name, resource_level)
+    gcp_bucket_to_dataset(
+        gcp_bucket_name,
+        output_file_name,
+        gcp_dataset_name,
+        gcp_table_name,
+        resource_level,
+        gcp_daily_flow=gcp_daily_flow,
+    )
 
     return monthly_files