Addresses #144, Part 2: Adding Billing Rates to the config.py and rewriting code references

Author: jimmysway

openshift_metrics/config.py

@@ -14,3 +14,21 @@
 S3_SECRET_ACCESS_KEY = os.getenv("S3_OUTPUT_SECRET_ACCESS_KEY")
 S3_INVOICE_BUCKET = os.getenv("S3_INVOICE_BUCKET", "nerc-invoicing")
 S3_METRICS_BUCKET = os.getenv("S3_METRICS_BUCKET", "openshift_metrics")
+
+# Billing Configuration
+# Service Unit Names for Rate Lookup from nerc-rates
+SU_NAMES = ["GPUV100", "GPUA100", "GPUA100SXM4", "GPUH100", "CPU"]
+RESOURCE_NAMES = ["vCPUs", "RAM", "GPUs"]
+
+# Rate Configuration
+USE_NERC_RATES = os.getenv("USE_NERC_RATES", "false").lower() == "true"
+
+# Individual rates (used when USE_NERC_RATES=false)
+RATE_CPU_SU = os.getenv("RATE_CPU_SU", "0.013")
+RATE_GPU_V100_SU = os.getenv("RATE_GPU_V100_SU", "1.214")
+RATE_GPU_A100SXM4_SU = os.getenv("RATE_GPU_A100SXM4_SU", "2.078")
+RATE_GPU_A100_SU = os.getenv("RATE_GPU_A100_SU", "1.803")
+RATE_GPU_H100_SU = os.getenv("RATE_GPU_H100_SU", "6.04")
+
+# Legacy rate (for backward compatibility)
+GPU_A100_RATE = os.getenv("GPU_A100_RATE", "1.803")

openshift_metrics/merge.py

@@ -12,7 +12,17 @@
 
 from openshift_metrics import utils, invoice
 from openshift_metrics.metrics_processor import MetricsProcessor
-from openshift_metrics.config import S3_INVOICE_BUCKET
+from openshift_metrics.config import (
+    S3_INVOICE_BUCKET,
+    SU_NAMES,
+    RESOURCE_NAMES,
+    USE_NERC_RATES,
+    RATE_CPU_SU,
+    RATE_GPU_V100_SU,
+    RATE_GPU_A100SXM4_SU,
+    RATE_GPU_A100_SU,
+    RATE_GPU_H100_SU,
+)
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
@@ -45,11 +55,9 @@ def parse_timestamp_range(timestamp_range: str) -> Tuple[datetime, datetime]:
 def get_su_definitions(report_month) -> dict:
     su_definitions = {}
     nerc_data = nerc_rates.load_from_url()
-    su_names = ["GPUV100", "GPUA100", "GPUA100SXM4", "GPUH100", "CPU"]
-    resource_names = ["vCPUs", "RAM", "GPUs"]
-    for su_name in su_names:
+    for su_name in SU_NAMES:
         su_definitions.setdefault(f"OpenShift {su_name}", {})
-        for resource_name in resource_names:
+        for resource_name in RESOURCE_NAMES:
             su_definitions[f"OpenShift {su_name}"][resource_name] = (
                 nerc_data.get_value_at(
                     f"{resource_name} in {su_name} SU", report_month, Decimal
@@ -92,13 +100,14 @@ def main():
     parser.add_argument(
         "--use-nerc-rates",
         action="store_true",
+        default=USE_NERC_RATES,
         help="Use rates from the nerc-rates repo",
     )
-    parser.add_argument("--rate-cpu-su", type=Decimal)
-    parser.add_argument("--rate-gpu-v100-su", type=Decimal)
-    parser.add_argument("--rate-gpu-a100sxm4-su", type=Decimal)
-    parser.add_argument("--rate-gpu-a100-su", type=Decimal)
-    parser.add_argument("--rate-gpu-h100-su", type=Decimal)
+    parser.add_argument("--rate-cpu-su", type=Decimal, default=Decimal(RATE_CPU_SU))
+    parser.add_argument("--rate-gpu-v100-su", type=Decimal, default=Decimal(RATE_GPU_V100_SU))
+    parser.add_argument("--rate-gpu-a100sxm4-su", type=Decimal, default=Decimal(RATE_GPU_A100SXM4_SU))
+    parser.add_argument("--rate-gpu-a100-su", type=Decimal, default=Decimal(RATE_GPU_A100_SU))
+    parser.add_argument("--rate-gpu-h100-su", type=Decimal, default=Decimal(RATE_GPU_H100_SU))
 
     args = parser.parse_args()
     files = args.files