service-capacity-modeling 0.3.94__py3-none-any.whl → 0.3.98__py3-none-any.whl

service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_ec2.json

@@ -632,15 +632,6 @@
       "dl1.24xlarge": {
         "annual_cost": 43178.0
       },
-      "f1.16xlarge": {
-        "annual_cost": 50230.0
-      },
-      "f1.2xlarge": {
-        "annual_cost": 6278.67
-      },
-      "f1.4xlarge": {
-        "annual_cost": 12557.33
-      },
       "g4ad.16xlarge": {
         "annual_cost": 13331.67
       },
@@ -1574,26 +1565,20 @@
       "m8g.xlarge": {
         "annual_cost": 621.0
       },
-      "p3.16xlarge": {
-        "annual_cost": 69054.67
-      },
-      "p3.2xlarge": {
-        "annual_cost": 8631.67
-      },
-      "p3.8xlarge": {
-        "annual_cost": 34527.33
-      },
       "p3dn.24xlarge": {
         "annual_cost": 79416.67
       },
       "p4d.24xlarge": {
-        "annual_cost": 95297.67
+        "annual_cost": 71473.33
       },
       "p4de.24xlarge": {
-        "annual_cost": 119122.0
+        "annual_cost": 89341.67
       },
       "p5.48xlarge": {
-        "annual_cost": 329048.33
+        "annual_cost": 181288.67
+      },
+      "p5.4xlarge": {
+        "annual_cost": 22661.0
       },
       "r3.2xlarge": {
         "annual_cost": 2043.33
@@ -2303,15 +2288,6 @@
       "trn1n.32xlarge": {
         "annual_cost": 70804.67
       },
-      "u-12tb1.112xlarge": {
-        "annual_cost": 267960.67
-      },
-      "u-18tb1.112xlarge": {
-        "annual_cost": 401266.33
-      },
-      "u-24tb1.112xlarge": {
-        "annual_cost": 535022.0
-      },
       "u-3tb1.56xlarge": {
         "annual_cost": 66877.67
       },
@@ -2321,20 +2297,17 @@
       "u-6tb1.56xlarge": {
         "annual_cost": 113677.33
       },
-      "u-9tb1.112xlarge": {
-        "annual_cost": 200970.33
-      },
       "u7i-12tb.224xlarge": {
-        "annual_cost": 375144.67
+        "annual_cost": 308159.0
       },
       "u7in-16tb.224xlarge": {
-        "annual_cost": 499353.67
+        "annual_cost": 442117.0
       },
       "u7in-24tb.224xlarge": {
-        "annual_cost": 749030.67
+        "annual_cost": 663219.67
       },
       "u7in-32tb.224xlarge": {
-        "annual_cost": 998707.67
+        "annual_cost": 884322.0
       },
       "vt1.24xlarge": {
         "annual_cost": 17127.67

service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_rds.json

@@ -0,0 +1,159 @@
+{
+  "us-east-1": {
+    "drives": {},
+    "instances": {
+      "db.r5.12xlarge": {
+        "annual_cost": 21258.0
+      },
+      "db.r5.16xlarge": {
+        "annual_cost": 28344.0
+      },
+      "db.r5.24xlarge": {
+        "annual_cost": 42516.0
+      },
+      "db.r5.2xlarge": {
+        "annual_cost": 3543.0
+      },
+      "db.r5.4xlarge": {
+        "annual_cost": 7086.0
+      },
+      "db.r5.8xlarge": {
+        "annual_cost": 14172.0
+      },
+      "db.r5.large": {
+        "annual_cost": 885.67
+      },
+      "db.r5.xlarge": {
+        "annual_cost": 1771.33
+      },
+      "db.r6g.12xlarge": {
+        "annual_cost": 19024.0
+      },
+      "db.r6g.16xlarge": {
+        "annual_cost": 25365.33
+      },
+      "db.r6g.2xlarge": {
+        "annual_cost": 3170.67
+      },
+      "db.r6g.4xlarge": {
+        "annual_cost": 6341.33
+      },
+      "db.r6g.8xlarge": {
+        "annual_cost": 12682.67
+      },
+      "db.r6g.large": {
+        "annual_cost": 792.67
+      },
+      "db.r6g.xlarge": {
+        "annual_cost": 1585.33
+      },
+      "db.r6gd.12xlarge": {
+        "annual_cost": 34765.33
+      },
+      "db.r6gd.16xlarge": {
+        "annual_cost": 46353.67
+      },
+      "db.r6gd.2xlarge": {
+        "annual_cost": 5794.33
+      },
+      "db.r6gd.4xlarge": {
+        "annual_cost": 11588.33
+      },
+      "db.r6gd.8xlarge": {
+        "annual_cost": 23177.0
+      },
+      "db.r6gd.xlarge": {
+        "annual_cost": 2897.0
+      },
+      "db.r6i.12xlarge": {
+        "annual_cost": 21256.0
+      },
+      "db.r6i.16xlarge": {
+        "annual_cost": 28341.33
+      },
+      "db.r6i.24xlarge": {
+        "annual_cost": 42512.0
+      },
+      "db.r6i.2xlarge": {
+        "annual_cost": 3542.67
+      },
+      "db.r6i.32xlarge": {
+        "annual_cost": 56682.67
+      },
+      "db.r6i.4xlarge": {
+        "annual_cost": 7085.33
+      },
+      "db.r6i.8xlarge": {
+        "annual_cost": 14170.67
+      },
+      "db.r6i.large": {
+        "annual_cost": 885.67
+      },
+      "db.r6i.xlarge": {
+        "annual_cost": 1771.33
+      },
+      "db.r6id.24xlarge": {
+        "annual_cost": 77553.33
+      },
+      "db.r6id.32xlarge": {
+        "annual_cost": 103404.33
+      },
+      "db.r7g.12xlarge": {
+        "annual_cost": 30796.33
+      },
+      "db.r7g.16xlarge": {
+        "annual_cost": 41061.67
+      },
+      "db.r7g.2xlarge": {
+        "annual_cost": 5132.67
+      },
+      "db.r7g.4xlarge": {
+        "annual_cost": 10265.33
+      },
+      "db.r7g.8xlarge": {
+        "annual_cost": 20530.67
+      },
+      "db.r7g.large": {
+        "annual_cost": 1283.33
+      },
+      "db.r7g.xlarge": {
+        "annual_cost": 2566.33
+      },
+      "db.t3.large": {
+        "annual_cost": 622.67
+      },
+      "db.t3.medium": {
+        "annual_cost": 311.33
+      },
+      "db.t4g.large": {
+        "annual_cost": 550.0
+      },
+      "db.t4g.medium": {
+        "annual_cost": 275.0
+      },
+      "db.x2g.12xlarge": {
+        "annual_cost": 27726.33
+      },
+      "db.x2g.16xlarge": {
+        "annual_cost": 36968.67
+      },
+      "db.x2g.2xlarge": {
+        "annual_cost": 4621.0
+      },
+      "db.x2g.4xlarge": {
+        "annual_cost": 9242.0
+      },
+      "db.x2g.8xlarge": {
+        "annual_cost": 18484.33
+      },
+      "db.x2g.large": {
+        "annual_cost": 1155.33
+      },
+      "db.x2g.xlarge": {
+        "annual_cost": 2310.67
+      }
+    },
+    "services": {},
+    "zones_in_region": 3
+  }
+}

service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_zz-overrides.json

@@ -3,15 +3,7 @@
     "instances": {
       "f5.large.deprecated": {"annual_cost": 300.0, "lifecycle": "deprecated"},
       "m6id.4xlarge":  {"annual_cost": 3126.64},
-      "m6id.xlarge":   {"annual_cost": 781.66},
-      "db.r5.large":     {"annual_cost": 885.7},
-      "db.r5.xlarge":    {"annual_cost": 1771.3},
-      "db.r5.2xlarge":   {"annual_cost": 3543},
-      "db.r5.4xlarge":   {"annual_cost": 7086},
-      "db.r5.8xlarge":   {"annual_cost": 14171.7},
-      "db.r5.12xlarge":   {"annual_cost": 21258},
-      "db.r5.16xlarge":   {"annual_cost": 28343.3},
-      "db.r5.24xlarge":   {"annual_cost": 42516}
+      "m6id.xlarge":   {"annual_cost": 781.66}
     },
     "drives": {
       "gp2": {"annual_cost_per_gib": 1.2},

service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r6g.json

@@ -0,0 +1,95 @@
+{
+  "instances": {
+    "db.r6g.large": {
+      "name": "db.r6g.large",
+      "cpu": 2,
+      "cpu_cores": 2,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 15.26,
+      "net_mbps": 750.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6g.xlarge": {
+      "name": "db.r6g.xlarge",
+      "cpu": 4,
+      "cpu_cores": 4,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 30.52,
+      "net_mbps": 1250.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6g.2xlarge": {
+      "name": "db.r6g.2xlarge",
+      "cpu": 8,
+      "cpu_cores": 8,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 61.04,
+      "net_mbps": 2500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6g.4xlarge": {
+      "name": "db.r6g.4xlarge",
+      "cpu": 16,
+      "cpu_cores": 16,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 122.07,
+      "net_mbps": 5000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6g.8xlarge": {
+      "name": "db.r6g.8xlarge",
+      "cpu": 32,
+      "cpu_cores": 32,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 244.14,
+      "net_mbps": 12000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6g.12xlarge": {
+      "name": "db.r6g.12xlarge",
+      "cpu": 48,
+      "cpu_cores": 48,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 366.21,
+      "net_mbps": 20000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6g.16xlarge": {
+      "name": "db.r6g.16xlarge",
+      "cpu": 64,
+      "cpu_cores": 64,
+      "cpu_ghz": 2.5,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 488.28,
+      "net_mbps": 25000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    }
+  }
+}

service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r6i.json

@@ -0,0 +1,121 @@
+{
+  "instances": {
+    "db.r6i.large": {
+      "name": "db.r6i.large",
+      "cpu": 2,
+      "cpu_cores": 1,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 15.26,
+      "net_mbps": 781.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.xlarge": {
+      "name": "db.r6i.xlarge",
+      "cpu": 4,
+      "cpu_cores": 2,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 30.52,
+      "net_mbps": 1562.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.2xlarge": {
+      "name": "db.r6i.2xlarge",
+      "cpu": 8,
+      "cpu_cores": 4,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 61.04,
+      "net_mbps": 3125.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.4xlarge": {
+      "name": "db.r6i.4xlarge",
+      "cpu": 16,
+      "cpu_cores": 8,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 122.07,
+      "net_mbps": 6250.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.8xlarge": {
+      "name": "db.r6i.8xlarge",
+      "cpu": 32,
+      "cpu_cores": 16,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 244.14,
+      "net_mbps": 12500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.12xlarge": {
+      "name": "db.r6i.12xlarge",
+      "cpu": 48,
+      "cpu_cores": 24,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 366.21,
+      "net_mbps": 18750.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.16xlarge": {
+      "name": "db.r6i.16xlarge",
+      "cpu": 64,
+      "cpu_cores": 32,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 488.28,
+      "net_mbps": 25000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.24xlarge": {
+      "name": "db.r6i.24xlarge",
+      "cpu": 96,
+      "cpu_cores": 48,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 732.42,
+      "net_mbps": 37500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r6i.32xlarge": {
+      "name": "db.r6i.32xlarge",
+      "cpu": 128,
+      "cpu_cores": 64,
+      "cpu_ghz": 3.5,
+      "cpu_ipc_scale": 1.0,
+      "ram_gib": 976.56,
+      "net_mbps": 50000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    }
+  }
+}

service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r7g.json

@@ -0,0 +1,95 @@
+{
+  "instances": {
+    "db.r7g.large": {
+      "name": "db.r7g.large",
+      "cpu": 2,
+      "cpu_cores": 2,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 15.26,
+      "net_mbps": 937.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7g.xlarge": {
+      "name": "db.r7g.xlarge",
+      "cpu": 4,
+      "cpu_cores": 4,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 30.52,
+      "net_mbps": 1876.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7g.2xlarge": {
+      "name": "db.r7g.2xlarge",
+      "cpu": 8,
+      "cpu_cores": 8,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 61.04,
+      "net_mbps": 3750.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7g.4xlarge": {
+      "name": "db.r7g.4xlarge",
+      "cpu": 16,
+      "cpu_cores": 16,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 122.07,
+      "net_mbps": 7500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7g.8xlarge": {
+      "name": "db.r7g.8xlarge",
+      "cpu": 32,
+      "cpu_cores": 32,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 244.14,
+      "net_mbps": 15000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7g.12xlarge": {
+      "name": "db.r7g.12xlarge",
+      "cpu": 48,
+      "cpu_cores": 48,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 366.21,
+      "net_mbps": 22500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7g.16xlarge": {
+      "name": "db.r7g.16xlarge",
+      "cpu": 64,
+      "cpu_cores": 64,
+      "cpu_ghz": 2.6,
+      "cpu_ipc_scale": 1.5,
+      "ram_gib": 488.28,
+      "net_mbps": 30000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    }
+  }
+}

service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r7i.json

@@ -0,0 +1,121 @@
+{
+  "instances": {
+    "db.r7i.large": {
+      "name": "db.r7i.large",
+      "cpu": 2,
+      "cpu_cores": 1,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 15.26,
+      "net_mbps": 781.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.xlarge": {
+      "name": "db.r7i.xlarge",
+      "cpu": 4,
+      "cpu_cores": 2,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 30.52,
+      "net_mbps": 1562.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.2xlarge": {
+      "name": "db.r7i.2xlarge",
+      "cpu": 8,
+      "cpu_cores": 4,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 61.04,
+      "net_mbps": 3125.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.4xlarge": {
+      "name": "db.r7i.4xlarge",
+      "cpu": 16,
+      "cpu_cores": 8,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 122.07,
+      "net_mbps": 6250.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.8xlarge": {
+      "name": "db.r7i.8xlarge",
+      "cpu": 32,
+      "cpu_cores": 16,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 244.14,
+      "net_mbps": 12500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.12xlarge": {
+      "name": "db.r7i.12xlarge",
+      "cpu": 48,
+      "cpu_cores": 24,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 366.21,
+      "net_mbps": 18750.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.16xlarge": {
+      "name": "db.r7i.16xlarge",
+      "cpu": 64,
+      "cpu_cores": 32,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 488.28,
+      "net_mbps": 25000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.24xlarge": {
+      "name": "db.r7i.24xlarge",
+      "cpu": 96,
+      "cpu_cores": 48,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 732.42,
+      "net_mbps": 37500.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    },
+    "db.r7i.48xlarge": {
+      "name": "db.r7i.48xlarge",
+      "cpu": 192,
+      "cpu_cores": 96,
+      "cpu_ghz": 3.2,
+      "cpu_ipc_scale": 1.25,
+      "ram_gib": 1464.84,
+      "net_mbps": 50000.0,
+      "drive": null,
+      "platforms": [
+        "Aurora PostgreSQL"
+      ]
+    }
+  }
+}

service_capacity_modeling/hardware/profiles/shapes/aws/manual_instances.json

@@ -378,7 +378,7 @@
       "cpu": 64,
       "cpu_ghz": 3.1,
       "ram_gib": 512,
-      "net_mbps": 13600,
+      "net_mbps": 20000,
       "drive": null,
       "platforms": ["Aurora MySQL","Aurora PostgreSQL"]
     },
@@ -387,7 +387,7 @@
       "cpu": 96,
       "cpu_ghz": 3.1,
       "ram_gib": 768,
-      "net_mbps": 19000,
+      "net_mbps": 25000,
       "drive": null,
       "platforms": ["Aurora MySQL","Aurora PostgreSQL"]
     }

service_capacity_modeling/tools/auto_shape.py

@@ -110,6 +110,42 @@ def _gb_to_gib(inp: float) -> int:
     return int(round((inp * 10**9) / 2.0**30))
 
 
+def deduce_cpu_ipc_scale(
+    vcpu_count: int,
+    cpu_cores: int,
+    cpu_perf: Optional[CPUPerformance] = None,
+) -> float:
+    """
+    Deduce CPU IPC scale factor from vCPU and core counts.
+    If all vCPUs are full cores (no SMT), use 1.5, otherwise 1.0.
+    """
+    if cpu_perf is not None and cpu_perf.ipc_scale_factor is not None:
+        return cpu_perf.ipc_scale_factor
+    if vcpu_count == cpu_cores:
+        return 1.5
+    return 1.0
+
+
+def convert_mib_to_gib(size_mib: float) -> float:
+    """Convert AWS MiB memory size to GiB."""
+    return round(size_mib * 10**6 / 2.0**30, 2)
+
+
+def convert_gbps_to_mbps(bandwidth_gbps: float) -> float:
+    """Convert AWS Gbps network bandwidth to Mbps."""
+    return round(bandwidth_gbps * 1000)
+
+
+def _engine_to_platform(engine: str) -> str:
+    """
+    Map RDS engine name to Platform enum value.
+    Currently only supports aurora-postgresql.
+    """
+    if engine == "aurora-postgresql":
+        return "aurora_postgres"
+    raise ValueError(f"Engine '{engine}' is not supported")
+
+
 def _drive(
     drive_type: DriveType,
     io_perf: Optional[IOPerformance],
@@ -233,24 +269,19 @@ def pull_family(
             print(name)
 
         drive = _drive(disk_type, io_perf, scale=normalized_size, data=data)
-        if cpu_perf is not None and cpu_perf.ipc_scale_factor is not None:
-            cpu_ipc_scale_factor = cpu_perf.ipc_scale_factor
-        else:
-            if data["VCpuInfo"].get("DefaultThreadsPerCore", 2) == 1:
-                cpu_ipc_scale_factor = 1.5
-            else:
-                cpu_ipc_scale_factor = 1.0
+        vcpu_count = data["VCpuInfo"]["DefaultVCpus"]
+        cpu_cores = data["VCpuInfo"]["DefaultCores"]
+        cpu_ipc_scale_factor = deduce_cpu_ipc_scale(vcpu_count, cpu_cores, cpu_perf)
 
         new_shape = Instance(
             name=data["InstanceType"],
-            cpu=data["VCpuInfo"]["DefaultVCpus"],
-            cpu_cores=data["VCpuInfo"]["DefaultCores"],
+            cpu=vcpu_count,
+            cpu_cores=cpu_cores,
             cpu_ghz=data["ProcessorInfo"]["SustainedClockSpeedInGhz"],
             cpu_ipc_scale=cpu_ipc_scale_factor,
-            ram_gib=round(data["MemoryInfo"]["SizeInMiB"] * 10**6 / 2.0**30, 2),
-            net_mbps=round(
+            ram_gib=convert_mib_to_gib(data["MemoryInfo"]["SizeInMiB"]),
+            net_mbps=convert_gbps_to_mbps(
                 data["NetworkInfo"]["NetworkCards"][0]["BaselineBandwidthInGbps"]
-                * 10**3
             ),
             drive=drive,
         )
@@ -260,6 +291,124 @@ def pull_family(
     return results
 
 
+def lookup_ec2_instance_specs(
+    ec2_client: Any,
+    instance_type: str,
+    debug: bool = False,
+) -> Tuple[int, int, float, float, float]:
+    """
+    Look up EC2 instance specifications.
+    Returns: (vcpu_count, cpu_cores, cpu_ghz, ram_gib, net_mbps)
+    Returns zeros/defaults if lookup fails.
+    """
+    try:
+        ec2_response = ec2_client.describe_instance_types(InstanceTypes=[instance_type])
+        if ec2_response["InstanceTypes"]:
+            ec2_data = ec2_response["InstanceTypes"][0]
+            vcpu_count = ec2_data["VCpuInfo"]["DefaultVCpus"]
+            cpu_cores = ec2_data["VCpuInfo"]["DefaultCores"]
+            cpu_ghz = ec2_data["ProcessorInfo"]["SustainedClockSpeedInGhz"]
+            ram_gib = convert_mib_to_gib(ec2_data["MemoryInfo"]["SizeInMiB"])
+            net_mbps = convert_gbps_to_mbps(
+                ec2_data["NetworkInfo"]["NetworkCards"][0]["BaselineBandwidthInGbps"]
+            )
+            if debug:
+                print(
+                    f"Looked up {instance_type} -> {vcpu_count} vCPUs, "
+                    f"{cpu_cores} cores, {cpu_ghz} GHz, {ram_gib} GiB, {net_mbps} Mbps",
+                    file=sys.stderr,
+                )
+            return vcpu_count, cpu_cores, cpu_ghz, ram_gib, net_mbps
+        else:
+            raise RuntimeError("No EC2 instance types returned")
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
+        if debug:
+            print(
+                f"WARNING: Could not look up {instance_type}: {e}. Using defaults.",
+                file=sys.stderr,
+            )
+        return 0, 0, 2.5, 0.0, 1000.0
+
+
+def pull_rds_family(  # pylint: disable=too-many-locals
+    rds_client: Any,
+    family: str,
+    db_engines: Sequence[str],
+    cpu_perf: Optional[CPUPerformance] = None,
+    debug: bool = False,
+) -> Sequence[Instance]:
+    """
+    Pull RDS Instance shapes from AWS RDS APIs.
+    Queries describe_orderable_db_instance_options for the specified engines
+    and family, then constructs Instance objects with appropriate platform tags.
+    Returns a list of Instance for hardware shapes.
+    """
+
+    def debug_log(msg: str) -> None:
+        if debug:
+            print(msg, file=sys.stderr)
+
+    ec2_client = boto3.client("ec2", region_name=rds_client.meta.region_name)
+    instance_data_map = {}
+    for engine in db_engines:
+        debug_log(f"Querying RDS API for engine={engine}, family=db.{family}.*")
+        paginator = rds_client.get_paginator("describe_orderable_db_instance_options")
+        page_iterator = paginator.paginate(Engine=engine)
+        for page in page_iterator:
+            for option in page["OrderableDBInstanceOptions"]:
+                db_instance_class = option["DBInstanceClass"]
+                if not db_instance_class.startswith(f"db.{family}."):
+                    continue
+                if db_instance_class not in instance_data_map:
+                    instance_data_map[db_instance_class] = {
+                        "data": option,
+                        "platforms": set(),
+                    }
+                platform = _engine_to_platform(engine)
+                instance_data_map[db_instance_class]["platforms"].add(platform)
+    if not instance_data_map:
+        print(
+            f"ERROR: No RDS instances found for family 'db.{family}' "
+            f"with engines {db_engines}",
+            file=sys.stderr,
+        )
+        return []
+    debug_log(f"Found {len(instance_data_map)} unique instance classes")
+    results = []
+    for db_instance_class, info in instance_data_map.items():
+        option = info["data"]
+        platforms = sorted(info["platforms"])
+        _, size = db_instance_class.rsplit(".", 1)
+        ec2_instance_type = f"{family}.{size}"
+        vcpu_count, cpu_cores, cpu_ghz, ram_gib, net_mbps = lookup_ec2_instance_specs(
+            ec2_client, ec2_instance_type, debug
+        )
+        cpu_ipc_scale_factor = deduce_cpu_ipc_scale(vcpu_count, cpu_cores, cpu_perf)
+        debug_log(
+            f"{db_instance_class}: cpu={vcpu_count}, cores={cpu_cores}, "
+            f"ghz={cpu_ghz}, ram={ram_gib} GiB, net={net_mbps} Mbps, "
+            f"platforms={platforms}"
+        )
+        from service_capacity_modeling.interface import Platform
+
+        new_instance = Instance(
+            name=db_instance_class,
+            cpu=vcpu_count,
+            cpu_cores=cpu_cores,
+            cpu_ghz=cpu_ghz,
+            cpu_ipc_scale=cpu_ipc_scale_factor,
+            ram_gib=ram_gib,
+            net_mbps=net_mbps,
+            drive=None,
+            platforms=[Platform[p] for p in platforms],
+        )
+        results.append(new_instance)
+    results = sorted(
+        results, key=lambda i: normalized_aws_size(i.name.replace("db.", ""))
+    )
+    return results
+
+
 def parse_iops(inp: Optional[str]) -> Optional[Tuple[int, int]]:
     """Parses strings like 100,000/50,000 to (100000, 50000)"""
     if inp is None:
@@ -278,6 +427,19 @@ def parse_iops(inp: Optional[str]) -> Optional[Tuple[int, int]]:
         )
 
 
+def parse_db_engines(engines_str: str) -> Sequence[str]:
+    """Parse comma-separated database engines. Currently only aurora-postgresql is supported."""
+    engines = [e.strip() for e in engines_str.split(",")]
+    supported_engines = {"aurora-postgresql"}
+    for engine in engines:
+        if engine not in supported_engines:
+            raise argparse.ArgumentTypeError(
+                f"Database engine '{engine}' is not implemented yet. "
+                f"Currently supported: {', '.join(sorted(supported_engines))}"
+            )
+    return engines
+
+
 def _parse_family(family: str) -> Tuple[str, int, str]:
     series = family[0]
     num = re.findall(r"\d+", family)
@@ -348,23 +510,53 @@ def deduce_cpu_perf(
 
 def main(args: Any) -> int:
     for family in args.families:
-        io_perf = deduce_io_perf(
-            family=family, curve=args.io_latency_curve, iops=args.xl_iops
-        )
-
-        cpu_perf = deduce_cpu_perf(
-            family=family,
-            ipc_scale_factor=args.cpu_ipc_scale,
-        )
-
-        ec2_client = boto3.client("ec2", region_name=args.region)
-        family_shapes = pull_family(
-            ec2_client=ec2_client,
-            family=family,
-            cpu_perf=cpu_perf,
-            io_perf=io_perf,
-            debug=args.debug,
-        )
+        is_rds = family.startswith("db.")
+        if is_rds:
+            rds_family = family[3:]
+            if not args.db_engines:
+                print(
+                    f"ERROR: Family '{family}' appears to be RDS (starts with 'db.'), "
+                    "but --db-engines was not specified. Please provide "
+                    "--db-engines with comma-separated list like 'aurora-postgresql'",
+                    file=sys.stderr,
+                )
+                return 1
+            if args.xl_iops or args.io_latency_curve != "ssd":
+                print(
+                    "WARNING: --xl-iops and --io-latency-curve are ignored for RDS "
+                    "instances (db.* families) as they use managed storage.",
+                    file=sys.stderr,
+                )
+            cpu_perf = deduce_cpu_perf(
+                family=rds_family,
+                ipc_scale_factor=args.cpu_ipc_scale,
+            )
+            rds_client = boto3.client("rds", region_name=args.region)
+            family_shapes = pull_rds_family(
+                rds_client=rds_client,
+                family=rds_family,
+                db_engines=args.db_engines,
+                cpu_perf=cpu_perf,
+                debug=args.debug,
+            )
+            output_filename = f"auto_db_{rds_family}.json"
+        else:
+            io_perf = deduce_io_perf(
+                family=family, curve=args.io_latency_curve, iops=args.xl_iops
+            )
+            cpu_perf = deduce_cpu_perf(
+                family=family,
+                ipc_scale_factor=args.cpu_ipc_scale,
+            )
+            ec2_client = boto3.client("ec2", region_name=args.region)
+            family_shapes = pull_family(
+                ec2_client=ec2_client,
+                family=family,
+                cpu_perf=cpu_perf,
+                io_perf=io_perf,
+                debug=args.debug,
+            )
+            output_filename = f"auto_{family}.json"
         json_shapes: Dict[str, Dict[str, Any]] = {"instances": {}}
         for shape in family_shapes:
             model_dict = shape.model_dump(exclude_unset=True)
@@ -377,23 +569,19 @@ def main(args: Any) -> int:
                 and "annual_cost" in model_dict["drive"]
             ):
                 del model_dict["drive"]["annual_cost"]
-
             json_shapes["instances"][shape.name] = model_dict
-
         print(f"[{family}] Hardware Shapes", file=sys.stderr)
         print(json.dumps(json_shapes, indent=2))
-
         # Write to JSON file if requested
         if args.output_path is not None:
             path: Path = args.output_path
             if path.is_dir():
-                output_path = Path(path, f"auto_{family}.json")
+                output_path = Path(path, output_filename)
             else:
                 output_path = path
             with open(output_path, "wt", encoding="utf-8") as fd:
                 json.dump(json_shapes, fd, indent=2)
                 fd.write("\n")
-
     return 0
 
 
@@ -417,6 +605,21 @@ if __name__ == "__main__":
     for offering in offerings:
         families.add(offering["InstanceType"].rsplit(".", 1)[0])
 
+    try:
+        rds_client = boto3.client("rds", region_name="us-east-1")
+        paginator = rds_client.get_paginator("describe_orderable_db_instance_options")
+        page_iterator = paginator.paginate(Engine="aurora-postgresql")
+        for page in page_iterator:
+            for option in page["OrderableDBInstanceOptions"]:
+                db_instance_class = option["DBInstanceClass"]
+                families.add(db_instance_class.rsplit(".", 1)[0])
+    except botocore.exceptions.ClientError:
+        print(
+            "Unable to connect to RDS. Do you have AWS credentials refreshed?",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+
     parser = argparse.ArgumentParser(
         prog="Project shapes from instance family filter",
         description="Input the target instance family filter like m7a.* and generates shape data",
@@ -445,6 +648,16 @@ if __name__ == "__main__":
             "full cores (not threads) in which case it will be 1.5 by default."
         ),
     )
+    parser.add_argument(
+        "--db-engines",
+        type=parse_db_engines,
+        default=None,
+        help=(
+            "Comma-separated list of database engines for RDS instances. "
+            "Required when family starts with 'db.'. "
+            "Currently supported: aurora-postgresql"
+        ),
+    )
     parser.add_argument("--region", choices=regions, default="us-east-1")
     parser.add_argument(
         "--output-path",

service_capacity_modeling/tools/fetch_pricing.py

@@ -38,11 +38,7 @@ def extract_3yr_upfront_price(price_data: Dict[str, Any]) -> Optional[float]:
     return None
 
 
-def fetch_pricing(region: str) -> None:
-    # Initialize pricing client
-    pricing_client = boto3.client("pricing", region_name=region)
-
-    # Get all EC2 pricing for Reserved Instances
+def fetch_ec2_pricing(pricing_client: Any) -> Dict[str, Dict[str, Union[float, str]]]:
     paginator = pricing_client.get_paginator("get_products")
 
     instances = {}
@@ -81,39 +77,105 @@ def fetch_pricing(region: str) -> None:
                 if "deprecated" in str(instance_type).lower():
                     instance_info["lifecycle"] = "deprecated"
                 instances[instance_type] = instance_info
+    return instances
+
+
+def fetch_rds_pricing(pricing_client: Any) -> Dict[str, Dict[str, Union[float, str]]]:
+    paginator = pricing_client.get_paginator("get_products")
+
+    instances = {}
+
+    filter_params = {
+        "ServiceCode": "AmazonRDS",
+        "Filters": [
+            {
+                "Type": "TERM_MATCH",
+                "Field": "location",
+                "Value": "US East (N. Virginia)",
+            },
+            {
+                "Type": "TERM_MATCH",
+                "Field": "databaseEngine",
+                "Value": "Aurora PostgreSQL",
+            },
+            {"Type": "TERM_MATCH", "Field": "deploymentOption", "Value": "Single-AZ"},
+        ],
+    }
+
+    for page in paginator.paginate(**filter_params):
+        for price_item in page["PriceList"]:
+            price_data = json.loads(price_item)
+
+            # Extract instance type
+            attributes = price_data.get("product", {}).get("attributes", {})
+            instance_type = attributes.get("instanceType")
+
+            if not instance_type:
+                continue
+
+            annual_cost = extract_3yr_upfront_price(price_data)
+            if annual_cost:
+                instance_info: Dict[str, Union[float, str]] = {
+                    "annual_cost": annual_cost
+                }
+                if "deprecated" in str(instance_type).lower():
+                    instance_info["lifecycle"] = "deprecated"
+                instances[instance_type] = instance_info
+    return instances
+
+
+def fetch_pricing(region: str) -> None:
+    pricing_client = boto3.client("pricing", region_name=region)
+    ec2_instances = fetch_ec2_pricing(pricing_client)
+    rds_instances = fetch_rds_pricing(pricing_client)
 
-    # Create final output structure
+    project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    ec2_output_file = os.path.join(
+        project_root,
+        "hardware",
+        "profiles",
+        "pricing",
+        "aws",
+        "3yr-reserved_ec2.json",
+    )
     # we bolt on the other info, as a hack until we can improve prior layers
-    output = {
+    ec2_output = {
         "us-east-1": {
-            "instances": instances,
+            "instances": ec2_instances,
             "drives": {},
             "services": {},
             "zones_in_region": 3,
         }
     }
-
-    # Write to JSON file
-    project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    output_file = os.path.join(
+    with open(ec2_output_file, "w", encoding="utf-8") as f:
+        json.dump(ec2_output, f, indent=2, sort_keys=True)
+        f.write("\n")
+    print(f"\nEC2 pricing data written to {ec2_output_file}")
+    rds_output_file = os.path.join(
         project_root,
-        "service_capacity_modeling",
         "hardware",
         "profiles",
         "pricing",
         "aws",
-        "3yr-reserved_ec2.json",
+        "3yr-reserved_rds.json",
     )
-    with open(output_file, "w", encoding="utf-8") as f:
-        json.dump(output, f, indent=2, sort_keys=True)
+    rds_output = {
+        "us-east-1": {
+            "instances": rds_instances,
+            "drives": {},
+            "services": {},
+            "zones_in_region": 3,
+        }
+    }
+    with open(rds_output_file, "w", encoding="utf-8") as f:
+        json.dump(rds_output, f, indent=2, sort_keys=True)
         f.write("\n")
-
-    print(f"Pricing data written to {output_file}")
+    print(f"RDS pricing data written to {rds_output_file}")
 
 
 def main() -> None:
     parser = argparse.ArgumentParser(
-        description="Fetch EC2 Reserved Instance pricing data."
+        description="Fetch EC2 and RDS Reserved Instance pricing data."
     )
     parser.add_argument(
         "--region",

{service_capacity_modeling-0.3.94.dist-info → service_capacity_modeling-0.3.98.dist-info}/METADATA

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

{service_capacity_modeling-0.3.94.dist-info → service_capacity_modeling-0.3.98.dist-info}/RECORD

@@ -6,8 +6,9 @@ service_capacity_modeling/stats.py,sha256=LCNUcQPfwF5hhIZwsfAsDe4ZbnuhDnl3vQHKfp
 service_capacity_modeling/hardware/__init__.py,sha256=P5ostvoSOMUqPODtepeFYb4qfTVH0E73mMFraP49rYU,9196
 service_capacity_modeling/hardware/profiles/__init__.py,sha256=7-y3JbCBkgzaAjFla2RIymREcImdZ51HTl3yn3vzoGw,1602
 service_capacity_modeling/hardware/profiles/profiles.txt,sha256=tOfSR3B0E0uAOaXd5SLI3ioq83UYZ3yhK7UHhsK4awQ,49
-service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_ec2.json,sha256=JNAj4yotSrEzlsMLamg_GmhqOiiTwKNcDPNs44PTLxI,52798
-service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_zz-overrides.json,sha256=lk69Mho6ISxwM2AzlVC2smadkjmJcaaX6_cmvWAWhC4,2282
+service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_ec2.json,sha256=beqldIMtUxoKGAC1deK7XdaeppHMoQbjE0Bi9-O2_f4,52198
+service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_rds.json,sha256=e_BNVQSEv8OnPKOk-pyXVBpFufkhqEbIKDDwrK_MuwA,3410
+service_capacity_modeling/hardware/profiles/pricing/aws/3yr-reserved_zz-overrides.json,sha256=rK3OZNz1avC2VX6nj61AxG0ezPEzFVTe1paWDm47Qm4,1884
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_c5.json,sha256=epluPmSzdil-tTKQ_wYlXgfMjqUEGXQoC8dXdZXvlTA,1740
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_c5a.json,sha256=8s7Ek0codNDESJwRjmUlzGA4cCp_-f_q_QyL7myl_zM,1764
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_c5d.json,sha256=7uVla6lab2uLA18ZjHbN9twvc0MEfzibdfOeCeVm1Ls,4617
@@ -18,6 +19,10 @@ service_capacity_modeling/hardware/profiles/shapes/aws/auto_c6id.json,sha256=eYk
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_c7a.json,sha256=lsdIAFd-CIgAaz4Qpv8ZMy5smYDJQdYrAjI_saLvOQY,2414
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_c7i.json,sha256=ZweQIQNbVLet5KnWFwFf7COXp4Q5gE1JTDYL_Dcpdec,1996
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_c8i.json,sha256=n63Kj0B3esSZix7fmPGa8gn-JitgPkakqru328SNbs8,2435
+service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r6g.json,sha256=dMWrkbMGEMSLWdHWgciPB-a0f1daZvHFtcUMDH7nsQY,1989
+service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r6i.json,sha256=shYz0c8GLbObIUZgQG3Hn1OwV9EMVilCADxtfsXYHGg,2559
+service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r7g.json,sha256=QF8EwWZj3-nlH3UNyg-qax0cxkoZPFRTRtDybUSsdVM,1989
+service_capacity_modeling/hardware/profiles/shapes/aws/auto_db_r7i.json,sha256=bXUEYbpe13WZq2KBgdABq6rGflmYK2n84p0mExT0LHM,2569
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_i3en.json,sha256=xdWvo_qbSQtlSOpy78Rsc6SbHOAYetswakr8DOKyY3U,4074
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_i4i.json,sha256=vyo2qpbayKprN_wqUl2KGoJhv_Xjm8PpHPTVz-9wLaA,5231
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_i7i.json,sha256=M2j1UT6XTvErjGKqHAFBFlenztNNhOz-9BETs1e8nCw,5289
@@ -44,7 +49,7 @@ service_capacity_modeling/hardware/profiles/shapes/aws/auto_r7a.json,sha256=-ZrE
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_r7i.json,sha256=o6LqdWUwgLRplzGMJkGbkz1CjYvb8tGwZxrXHk5qR-g,2002
 service_capacity_modeling/hardware/profiles/shapes/aws/auto_r8i.json,sha256=CxRt67LhBmKbzHXHIWDGPCMNEJaANw_zlOWTkAlLm9U,2442
 service_capacity_modeling/hardware/profiles/shapes/aws/manual_drives.json,sha256=0qxEciNTb0yGhAmX1bI6hV-4SSkGMp1FZ8OQvaOET64,1709
-service_capacity_modeling/hardware/profiles/shapes/aws/manual_instances.json,sha256=-_jxyQgmwKe5JnbfhMD9xDCq0sy7z2fdZn7Fu76IUkk,12457
+service_capacity_modeling/hardware/profiles/shapes/aws/manual_instances.json,sha256=-6Nsy-LlDuxm6LNp-hm7LkEf_6yGRxNSqU77pFtFHeY,12457
 service_capacity_modeling/hardware/profiles/shapes/aws/manual_services.json,sha256=h63675KKmu5IrI3BORDN8fiAqLjAyYHArErKbC7-T30,776
 service_capacity_modeling/models/__init__.py,sha256=03Y1aOe1fNgRKOO-x50SbrtfHTfdAqEs0ipeAx0WzMc,13940
 service_capacity_modeling/models/common.py,sha256=Bs-G1eHrb9qmS9qEWzx0rzN9QjQ419UomQu78dFoxXk,36704
@@ -73,13 +78,13 @@ service_capacity_modeling/models/org/netflix/time_series_config.py,sha256=usV7y9
 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=Jx9H2ay9-H_kUDjtB141owQNxGFu3hRHxUtnDRUD2Kw,15045
-service_capacity_modeling/tools/fetch_pricing.py,sha256=Qp-XMymkY1dvtyS51RufmEpfgOHv-IQ-XyzS8wp2-qM,4021
+service_capacity_modeling/tools/auto_shape.py,sha256=K248-DayPrcZwLw1dYr47lpeQQwL0ylh1WAoVSdLNxw,23621
+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-0.3.94.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
-service_capacity_modeling-0.3.94.dist-info/METADATA,sha256=U1H34i0DFGCnlsE6INMyWuuKiO7SIlwiB6Rl4msWUUA,10366
-service_capacity_modeling-0.3.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-service_capacity_modeling-0.3.94.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
-service_capacity_modeling-0.3.94.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
-service_capacity_modeling-0.3.94.dist-info/RECORD,,
+service_capacity_modeling-0.3.98.dist-info/licenses/LICENSE,sha256=nl_Lt5v9VvJ-5lWJDT4ddKAG-VZ-2IaLmbzpgYDz2hU,11343
+service_capacity_modeling-0.3.98.dist-info/METADATA,sha256=_XVCm9T7EhrvHCSswx_57lwhTsn7R1O6-vYdPQOjQrE,10366
+service_capacity_modeling-0.3.98.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+service_capacity_modeling-0.3.98.dist-info/entry_points.txt,sha256=ZsjzpG5SomWpT1zCE19n1uSXKH2gTI_yc33sdl0vmJg,146
+service_capacity_modeling-0.3.98.dist-info/top_level.txt,sha256=H8XjTCLgR3enHq5t3bIbxt9SeUkUT8HT_SDv2dgIT_A,26
+service_capacity_modeling-0.3.98.dist-info/RECORD,,

{service_capacity_modeling-0.3.94.dist-info → service_capacity_modeling-0.3.98.dist-info}/WHEEL

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