service-capacity-modeling 0.3.102__tar.gz → 0.3.104__tar.gz

{service_capacity_modeling-0.3.102 → service_capacity_modeling-0.3.104}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: service-capacity-modeling
-Version: 0.3.102
+Version: 0.3.104
 Summary: Contains utilities for modeling capacity for pluggable workloads
 Author: Joseph Lynch
 Author-email: josephl@netflix.com

{service_capacity_modeling-0.3.102 → service_capacity_modeling-0.3.104}/service_capacity_modeling/models/org/netflix/stateless_java.py

@@ -113,6 +113,10 @@ def _estimate_java_app_region(  # pylint: disable=too-many-positional-arguments
     cluster.cluster_type = "nflx-java-app"
     cluster.attached_drives = attached_drives
 
+    # Add drive cost (root volume is EBS and costs money)
+    drive_cost = sum(d.annual_cost for d in attached_drives) * cluster.count
+    cluster.annual_cost = cluster.annual_cost + drive_cost
+
     # Generally don't want giant clusters
     # Especially not above 1000 because some load balancers struggle
     # with such large clusters

{service_capacity_modeling-0.3.102 → service_capacity_modeling-0.3.104}/service_capacity_modeling/tools/capture_baseline_costs.py

@@ -19,6 +19,7 @@ from service_capacity_modeling.interface import (
     CapacityDesires,
     certain_float,
     certain_int,
+    ClusterCapacity,
     Consistency,
     DataShape,
     GlobalConsistency,
@@ -27,6 +28,27 @@ from service_capacity_modeling.interface import (
 )
 
 
+def _format_cluster(cluster: ClusterCapacity, deployment: str) -> dict[str, Any]:
+    """Format a single cluster's details."""
+    info: dict[str, Any] = {
+        "cluster_type": cluster.cluster_type,
+        "deployment": deployment,
+        "instance": cluster.instance.name,
+        "count": cluster.count,
+        "annual_cost": float(cluster.annual_cost),
+    }
+
+    # Add attached drives if present
+    if cluster.attached_drives:
+        drives = []
+        for drive in cluster.attached_drives:
+            size_gib = int(drive.size_gib) if drive.size_gib else 0
+            drives.append(f"{drive.name} : {size_gib}GB")
+        info["attached_drives"] = sorted(drives)
+
+    return info
+
+
 def capture_costs(
     model_name: str,
     region: str,
@@ -48,31 +70,27 @@ def capture_costs(
             return {"error": "No capacity plans generated", "scenario": scenario_name}
 
         cap_plan = cap_plans[0]
-        clusters = cap_plan.candidate_clusters
+        candidate = cap_plan.candidate_clusters
+
+        # Build cluster details for each cluster
+        cluster_details = []
+        for zonal_cluster in candidate.zonal:
+            cluster_details.append(_format_cluster(zonal_cluster, "zonal"))
+        for regional_cluster in candidate.regional:
+            cluster_details.append(_format_cluster(regional_cluster, "regional"))
 
         result = {
             "scenario": scenario_name,
             "model": model_name,
             "region": region,
             "service_tier": desires.service_tier,
+            "total_annual_cost": float(candidate.total_annual_cost),
+            "clusters": cluster_details,
             "annual_costs": dict(
-                sorted((k, float(v)) for k, v in clusters.annual_costs.items())
+                sorted((k, float(v)) for k, v in candidate.annual_costs.items())
             ),
-            "total_annual_cost": float(clusters.total_annual_cost),
-            "cluster_count": len(clusters.zonal) + len(clusters.regional),
-            "service_count": len(clusters.services),
         }
 
-        # Add instance info
-        if clusters.zonal:
-            result["instance_name"] = clusters.zonal[0].instance.name
-            result["instance_count"] = clusters.zonal[0].count
-            result["deployment"] = "zonal"
-        elif clusters.regional:
-            result["instance_name"] = clusters.regional[0].instance.name
-            result["instance_count"] = clusters.regional[0].count
-            result["deployment"] = "regional"
-
         return result
     except (ValueError, KeyError, AttributeError) as e:
         return {"error": str(e), "scenario": scenario_name}

{service_capacity_modeling-0.3.102 → service_capacity_modeling-0.3.104}/service_capacity_modeling.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: service-capacity-modeling
-Version: 0.3.102
+Version: 0.3.104
 Summary: Contains utilities for modeling capacity for pluggable workloads
 Author: Joseph Lynch
 Author-email: josephl@netflix.com