service-capacity-modeling 0.3.101__py3-none-any.whl → 0.3.103__py3-none-any.whl

service_capacity_modeling/models/org/netflix/control.py

@@ -67,30 +67,6 @@ class NflxControlCapacityModel(CapacityModel):
     def compose_with(
         user_desires: CapacityDesires, extra_model_arguments: Dict[str, Any]
     ) -> Tuple[Tuple[str, Callable[[CapacityDesires], CapacityDesires]], ...]:
-        def _modify_rds_desires(
-            user_desires: CapacityDesires,
-        ) -> CapacityDesires:
-            """RDS proxy for Control service."""
-            relaxed = user_desires.model_copy(deep=True)
-
-            # RDS doesn't support tier 0
-            if relaxed.service_tier == 0:
-                relaxed.service_tier = 1
-
-            # Control caches reads, so proxy only sees writes + minimal reads
-            relaxed.query_pattern.estimated_read_per_second = certain_int(1)
-            if relaxed.query_pattern.estimated_write_per_second:
-                relaxed.query_pattern.estimated_write_per_second = (
-                    relaxed.query_pattern.estimated_write_per_second.scale(0.05)
-                )
-
-            # Minimal data footprint for connection metadata
-            relaxed.data_shape.estimated_state_size_gib = (
-                relaxed.data_shape.estimated_state_size_gib.scale(0.01)
-            )
-
-            return relaxed
-
         def _modify_postgres_desires(
             user_desires: CapacityDesires,
         ) -> CapacityDesires:
@@ -107,10 +83,7 @@ class NflxControlCapacityModel(CapacityModel):
 
             return relaxed
 
-        return (
-            ("org.netflix.rds", _modify_rds_desires),
-            ("org.netflix.postgres", _modify_postgres_desires),
-        )
+        return (("org.netflix.postgres", _modify_postgres_desires),)
 
     @staticmethod
     def default_desires(

service_capacity_modeling/models/org/netflix/entity.py

@@ -63,34 +63,6 @@ class NflxEntityCapacityModel(CapacityModel):
     def compose_with(
         user_desires: CapacityDesires, extra_model_arguments: Dict[str, Any]
     ) -> Tuple[Tuple[str, Callable[[CapacityDesires], CapacityDesires]], ...]:
-        def _modify_rds_desires(
-            user_desires: CapacityDesires,
-        ) -> CapacityDesires:
-            """RDS proxy handles connection pooling and auth translation.
-            Capacity needs are much lower than the backend database."""
-            relaxed = user_desires.model_copy(deep=True)
-
-            # RDS doesn't support tier 0
-            if relaxed.service_tier == 0:
-                relaxed.service_tier = 1
-
-            # Proxy layer sees ~5% of actual load due to connection pooling
-            if relaxed.query_pattern.estimated_read_per_second:
-                relaxed.query_pattern.estimated_read_per_second = (
-                    relaxed.query_pattern.estimated_read_per_second.scale(0.05)
-                )
-            if relaxed.query_pattern.estimated_write_per_second:
-                relaxed.query_pattern.estimated_write_per_second = (
-                    relaxed.query_pattern.estimated_write_per_second.scale(0.05)
-                )
-
-            # Proxy only needs to store connection metadata, not actual data
-            relaxed.data_shape.estimated_state_size_gib = (
-                relaxed.data_shape.estimated_state_size_gib.scale(0.01)
-            )
-
-            return relaxed
-
         def _modify_postgres_desires(
             user_desires: CapacityDesires,
         ) -> CapacityDesires:
@@ -128,7 +100,6 @@ class NflxEntityCapacityModel(CapacityModel):
             return relaxed
 
         return (
-            ("org.netflix.rds", _modify_rds_desires),
             ("org.netflix.postgres", _modify_postgres_desires),
             ("org.netflix.key-value", lambda x: x),
             ("org.netflix.elasticsearch", _modify_elasticsearch_desires),

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

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

{service_capacity_modeling-0.3.101.dist-info → service_capacity_modeling-0.3.103.dist-info}/RECORD

@@ -59,12 +59,12 @@ service_capacity_modeling/models/org/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 service_capacity_modeling/models/org/netflix/__init__.py,sha256=keaBt7dk6DB2VuRINdo8wRfsobK655Gfw3hYjruacJs,2553
 service_capacity_modeling/models/org/netflix/aurora.py,sha256=ZCileXosW1A8D9QfPf8mCu1BIt4xKvzGdqU5iW487Jg,13076
 service_capacity_modeling/models/org/netflix/cassandra.py,sha256=6CV0UIWpK0lcfF9_-LGrUjDomysswCvoMYS3S-wpSOU,39627
-service_capacity_modeling/models/org/netflix/control.py,sha256=-MqVCtr528vCElMAInFucX-NjsnERd4cot-mYDncbZg,6813
+service_capacity_modeling/models/org/netflix/control.py,sha256=4F9yw60mnOvLrhzRwJwk6kGDBB861a9GhPCNGcC9_Ho,5774
 service_capacity_modeling/models/org/netflix/counter.py,sha256=kTDL7dCnkn-XU27_Z1VBc4CCLCPoOqJZe9WgcENHHd4,10517
 service_capacity_modeling/models/org/netflix/crdb.py,sha256=iW7tyG8jpXhHIdXrw3DPYSHRAknPN42MlCRLJO4o9C8,20826
 service_capacity_modeling/models/org/netflix/ddb.py,sha256=9qRiuTqWev9zbYFFzewyowU7M41uALsuLklYx20yAXw,26502
 service_capacity_modeling/models/org/netflix/elasticsearch.py,sha256=zPrC6b2LNrAh3IWE3HCMUEYASacjYbHChbO4WZSMma4,25234
-service_capacity_modeling/models/org/netflix/entity.py,sha256=bL_7UcHb-E7zxbjmy1a1whMfYc4sRdvIL96B_aVs1hE,10139
+service_capacity_modeling/models/org/netflix/entity.py,sha256=CrexndRmoVA_082XYMIL9LVM13qqI8ILJUPbzH6uYZY,8858
 service_capacity_modeling/models/org/netflix/evcache.py,sha256=BDVRWely3F_3Ecb3Um3dQ024_I6XgvagpRJ6zdP5E18,25687
 service_capacity_modeling/models/org/netflix/graphkv.py,sha256=7ncEhx9lLsN_vGIKNHkvWfDdKffG7cYe91Wr-DB7IjU,8659
 service_capacity_modeling/models/org/netflix/iso_date_math.py,sha256=oC5sgIXDqwOp6-5z2bdTkm-bJLlnzhqcONI_tspHjac,1137
@@ -79,14 +79,14 @@ service_capacity_modeling/models/org/netflix/wal.py,sha256=QtRlqP_AIVpTg-XEINAfv
 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.101.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-service_capacity_modeling-0.3.101.dist-info/METADATA,sha256=6tuDUib_sRWz0Y9imRcO6t5KhF-qr4v1kXG8zbmewj0,10367
-service_capacity_modeling-0.3.101.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-service_capacity_modeling-0.3.101.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
-service_capacity_modeling-0.3.101.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
-service_capacity_modeling-0.3.101.dist-info/RECORD,,
+service_capacity_modeling-0.3.103.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+service_capacity_modeling-0.3.103.dist-info/METADATA,sha256=iPkZURUhQFYGLsQx5MdbadJFiEb_JEHnrClAJVkMPH8,10367
+service_capacity_modeling-0.3.103.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+service_capacity_modeling-0.3.103.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
+service_capacity_modeling-0.3.103.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
+service_capacity_modeling-0.3.103.dist-info/RECORD,,

{service_capacity_modeling-0.3.101.dist-info → service_capacity_modeling-0.3.103.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