service-capacity-modeling 0.3.102__py3-none-any.whl → 0.3.104__py3-none-any.whl

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/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.dist-info → service_capacity_modeling-0.3.104.dist-info}/METADATA

@@ -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.dist-info → service_capacity_modeling-0.3.104.dist-info}/RECORD

@@ -72,21 +72,21 @@ service_capacity_modeling/models/org/netflix/kafka.py,sha256=1GA18idG9kk7yfoFbzR
 service_capacity_modeling/models/org/netflix/key_value.py,sha256=WH8NblHqHwnAAumB2Zz1Qd4NBFWDQEQ1rpBcP3fVVQk,9409
 service_capacity_modeling/models/org/netflix/postgres.py,sha256=LBxDqkc-lYxDBu2VwNLuf2Q4o4hU3jPwu4YSt33Oe-8,4128
 service_capacity_modeling/models/org/netflix/rds.py,sha256=8GVmpMhTisZPdT-mP1Sx5U7VAF32lnTI27iYPfGg9CY,10930
-service_capacity_modeling/models/org/netflix/stateless_java.py,sha256=1oL74Qd6wSsDIWG_3Qt4x0qwgMQie-mJ6HKB0obgD5g,11379
+service_capacity_modeling/models/org/netflix/stateless_java.py,sha256=-Se9VdLpKP8HdvvwGcbO87qsOfs9HiwUucV_uch0PxM,11574
 service_capacity_modeling/models/org/netflix/time_series.py,sha256=NjZTr0NC6c0tduY4O1Z6Nfm0S8Mt0pKxPgphywIulvQ,8240
 service_capacity_modeling/models/org/netflix/time_series_config.py,sha256=usV7y9NVb8hfGrB6POg63lzSfxUafyBMu0zP-HvPOMo,7326
 service_capacity_modeling/models/org/netflix/wal.py,sha256=QtRlqP_AIVpTg-XEINAfvf7J7J9EzXMY5PrxE3DIOU0,4482
 service_capacity_modeling/models/org/netflix/zookeeper.py,sha256=T_CkmRqoEVqpERCFPU8xihyaxlNfUHDJXz7dMHM8GD0,7679
 service_capacity_modeling/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 service_capacity_modeling/tools/auto_shape.py,sha256=K248-DayPrcZwLw1dYr47lpeQQwL0ylh1WAoVSdLNxw,23621
-service_capacity_modeling/tools/capture_baseline_costs.py,sha256=VXa5AEGpK4fGFhsDgKv-jKSkgLL8arAkuogv8Vm3Gq4,10729
+service_capacity_modeling/tools/capture_baseline_costs.py,sha256=X4uVRHidQOVgtBTTCGfwHkp_OPPce3UZLKzyHimzsUY,11250
 service_capacity_modeling/tools/fetch_pricing.py,sha256=fO84h77cqiiIHF4hZt490RwbZ6JqjB45UsnPpV2AXD4,6122
 service_capacity_modeling/tools/generate_missing.py,sha256=F7YqvMJAV4nZc20GNrlIsnQSF8_77sLgwYZqc5k4LDg,3099
 service_capacity_modeling/tools/instance_families.py,sha256=e5RuYkCLUITvsAazDH12B6KjX_PaBsv6Ne3mj0HK_sQ,9223
 service_capacity_modeling/tools/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-service_capacity_modeling-0.3.102.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-service_capacity_modeling-0.3.102.dist-info/METADATA,sha256=_l-grWwJT6CWBSAX1VJEaGR8oSgrdBG9t1Z36PC-XAc,10367
-service_capacity_modeling-0.3.102.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-service_capacity_modeling-0.3.102.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
-service_capacity_modeling-0.3.102.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
-service_capacity_modeling-0.3.102.dist-info/RECORD,,
+service_capacity_modeling-0.3.104.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+service_capacity_modeling-0.3.104.dist-info/METADATA,sha256=ysDkTgjsf5Z0SPMBaFMV1QQHw4LD_l4BZjVizDxU3eU,10367
+service_capacity_modeling-0.3.104.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+service_capacity_modeling-0.3.104.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
+service_capacity_modeling-0.3.104.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
+service_capacity_modeling-0.3.104.dist-info/RECORD,,

{service_capacity_modeling-0.3.102.dist-info → service_capacity_modeling-0.3.104.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any