sofe 0.4.2__tar.gz → 0.4.4__tar.gz

{sofe-0.4.2/sofe.egg-info → sofe-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sofe
-Version: 0.4.2
+Version: 0.4.4
 Summary: Stairway Open FinOps Engine — FinOps Policies as Code for AWS
 Author-email: Carlos Cortez <carlos@cortez.cloud>
 License: Apache-2.0
@@ -51,7 +51,7 @@ Dynamic: license-file
   <img src="https://img.shields.io/pypi/v/sofe?style=flat-square&logo=pypi&color=8A2BE2" alt="PyPI">
   <img src="https://img.shields.io/badge/python-3.10%2B-blue?style=flat-square&logo=python" alt="Python">
   <img src="https://img.shields.io/badge/license-Apache_2.0-8A2BE2?style=flat-square" alt="License">
-  <img src="https://img.shields.io/badge/policies-10-success?style=flat-square" alt="10 policies">
+  <img src="https://img.shields.io/badge/policies-39-success?style=flat-square" alt="39 policies">
   <img src="https://img.shields.io/badge/collectors-19-blue?style=flat-square" alt="19 collectors">
   <img src="https://img.shields.io/badge/PRs-welcome-brightgreen?style=flat-square" alt="PRs">
 </p>

{sofe-0.4.2 → sofe-0.4.4}/README.md

@@ -23,7 +23,7 @@
   <img src="https://img.shields.io/pypi/v/sofe?style=flat-square&logo=pypi&color=8A2BE2" alt="PyPI">
   <img src="https://img.shields.io/badge/python-3.10%2B-blue?style=flat-square&logo=python" alt="Python">
   <img src="https://img.shields.io/badge/license-Apache_2.0-8A2BE2?style=flat-square" alt="License">
-  <img src="https://img.shields.io/badge/policies-10-success?style=flat-square" alt="10 policies">
+  <img src="https://img.shields.io/badge/policies-39-success?style=flat-square" alt="39 policies">
   <img src="https://img.shields.io/badge/collectors-19-blue?style=flat-square" alt="19 collectors">
   <img src="https://img.shields.io/badge/PRs-welcome-brightgreen?style=flat-square" alt="PRs">
 </p>

{sofe-0.4.2 → sofe-0.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sofe"
-version = "0.4.2"
+version = "0.4.4"
 description = "Stairway Open FinOps Engine — FinOps Policies as Code for AWS"
 requires-python = ">=3.11"
 license = {text = "Apache-2.0"}

{sofe-0.4.2 → sofe-0.4.4}/sofe/__init__.py

@@ -1,2 +1,2 @@
 """SOFE — Stairway Open FinOps Engine. Policies as Code for AWS."""
-__version__ = "0.1.0"
+__version__ = "0.4.4"

{sofe-0.4.2 → sofe-0.4.4}/sofe/collectors/__init__.py

@@ -42,7 +42,7 @@ def collect_all(profile: str = None, resource_types: list[str] = None, regions:
     _enrich_costs(session, resources, account_id)
 
     # Enrich with commitment coverage/utilization (SP + RI)
-    _enrich_commitments(session, resources, account_id)
+    commit_metrics = _enrich_commitments(session, resources, account_id)
 
     # S082 — collect savings/rightsizing recommendations (findings)
     _enrich_recommendations(session, account_id, target_regions)
@@ -52,6 +52,10 @@ def collect_all(profile: str = None, resource_types: list[str] = None, regions:
         for key in ['owner', 'env', 'costCenter', 'Environment', 'Name']:
             r.metrics[f'has_tag:{key}'] = 1.0 if key in r.tags else 0.0
 
+    # S083 — synthetic account resource (account-level metrics for savings policies)
+    account_resource = _build_account_resource(account_id, commit_metrics, target_regions[0])
+    resources.append(account_resource)
+
     return resources
 
 
@@ -129,8 +133,11 @@ def _enrich_costs(session: boto3.Session, resources: list[Resource], account_id:
         pass  # Graceful fallback — evaluation works without cost data
 
 
-def _enrich_commitments(session: boto3.Session, resources: list[Resource], account_id: str):
-    """Enrich resources with commitment coverage/utilization from Cost Explorer."""
+def _enrich_commitments(session: boto3.Session, resources: list[Resource], account_id: str) -> dict[str, float | None]:
+    """Enrich resources with commitment coverage/utilization from Cost Explorer.
+
+    Returns the commitment metrics dict (S081) for account-level aggregation.
+    """
     from .aws.commitments import CommitmentsCollector
 
     try:
@@ -149,8 +156,33 @@ def _enrich_commitments(session: boto3.Session, resources: list[Resource], accou
         if shown:
             print(f"  📊 Commitments: " + ", ".join(f"{k}={v:.1f}%" for k, v in shown.items()), file=sys.stderr)
 
+        return metrics
+
     except Exception:
-        pass
+        return {}
+
+
+def _build_account_resource(account_id: str, commit_metrics: dict[str, float | None], region: str) -> Resource:
+    """Synthetic account-level resource (S083) carrying savings metrics for policies.
+
+    Policies scope to resource_types: [aws.account] to evaluate the account ONCE.
+    """
+    metrics: dict[str, float] = {}
+    for k, v in commit_metrics.items():
+        if v is not None:
+            metrics[k] = v
+    potential = sum(f.estimated_savings or 0 for f in get_recommendations())
+    metrics["potential_savings_monthly"] = round(potential, 2)
+
+    return Resource(
+        resource_id=f"account-{account_id}",
+        resource_type="aws.account",
+        region=region,
+        account_id=account_id,
+        tags={},
+        properties={},
+        metrics=metrics,
+    )
 
 
 def _enrich_recommendations(session: boto3.Session, account_id: str, target_regions: list[str]):

{sofe-0.4.2 → sofe-0.4.4}/sofe/engine/__init__.py

@@ -139,7 +139,11 @@ def _check_rule(resource: Resource, policy: Policy, context: ArchitectureContext
 
     # Check additional conditions (AND logic)
     for cond in rule.additional_conditions:
-        cond_value = resource.metrics.get(cond.field) or resource.properties.get(cond.field)
+        # Use explicit None checks — a valid 0.0 metric is falsy and must NOT
+        # fall through to properties (that dropped `== 0` conditions silently).
+        cond_value = resource.metrics.get(cond.field)
+        if cond_value is None:
+            cond_value = resource.properties.get(cond.field)
         if cond_value is None:
             return None  # Missing data — skip
         if not _apply_operator(float(cond_value), cond.operator, float(cond.value)):

{sofe-0.4.2 → sofe-0.4.4/sofe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sofe
-Version: 0.4.2
+Version: 0.4.4
 Summary: Stairway Open FinOps Engine — FinOps Policies as Code for AWS
 Author-email: Carlos Cortez <carlos@cortez.cloud>
 License: Apache-2.0
@@ -51,7 +51,7 @@ Dynamic: license-file
   <img src="https://img.shields.io/pypi/v/sofe?style=flat-square&logo=pypi&color=8A2BE2" alt="PyPI">
   <img src="https://img.shields.io/badge/python-3.10%2B-blue?style=flat-square&logo=python" alt="Python">
   <img src="https://img.shields.io/badge/license-Apache_2.0-8A2BE2?style=flat-square" alt="License">
-  <img src="https://img.shields.io/badge/policies-10-success?style=flat-square" alt="10 policies">
+  <img src="https://img.shields.io/badge/policies-39-success?style=flat-square" alt="39 policies">
   <img src="https://img.shields.io/badge/collectors-19-blue?style=flat-square" alt="19 collectors">
   <img src="https://img.shields.io/badge/PRs-welcome-brightgreen?style=flat-square" alt="PRs">
 </p>

{sofe-0.4.2 → sofe-0.4.4}/sofe.egg-info/SOURCES.txt

@@ -42,4 +42,5 @@ tests/test_architecture.py
 tests/test_cli_outputs.py
 tests/test_commitments.py
 tests/test_recommendations.py
+tests/test_savings_policies.py
 tests/test_validate.py

sofe-0.4.4/tests/test_savings_policies.py

@@ -0,0 +1,65 @@
+"""Tests for S083 savings policies (evaluated against the synthetic account resource)."""
+
+from sofe.loader import load_policies
+from sofe.engine import evaluate
+from sofe.models import Resource
+
+
+def _account(metrics: dict[str, float]) -> Resource:
+    return Resource(
+        resource_id="account-123",
+        resource_type="aws.account",
+        region="us-east-1",
+        account_id="123",
+        tags={},
+        properties={},
+        metrics=metrics,
+    )
+
+
+def _savings_policies():
+    return [p for p in load_policies("policies/") if p.metadata.name in
+            ("savings-plan-coverage-low", "ri-utilization-low", "sp-utilization-low")]
+
+
+def test_low_coverage_fires():
+    policies = _savings_policies()
+    assert len(policies) == 3
+    findings = evaluate(policies, [_account({"sp_coverage_pct": 60.0, "ri_utilization_pct": 95.0, "sp_utilization_pct": 80.0})])
+    names = {f.policy_name for f in findings}
+    assert "savings-plan-coverage-low" in names
+    assert "ri-utilization-low" not in names  # ri=95 ok
+    assert "sp-utilization-low" not in names  # sp=80 ok
+    print("✓ low coverage fires")
+
+
+def test_low_ri_and_sp_utilization_fire():
+    policies = _savings_policies()
+    findings = evaluate(policies, [_account({"sp_coverage_pct": 95.0, "ri_utilization_pct": 50.0, "sp_utilization_pct": 40.0})])
+    names = {f.policy_name for f in findings}
+    assert "ri-utilization-low" in names
+    assert "sp-utilization-low" in names
+    assert "savings-plan-coverage-low" not in names
+    print("✓ low ri/sp utilization fire")
+
+
+def test_healthy_account_no_findings():
+    policies = _savings_policies()
+    findings = evaluate(policies, [_account({"sp_coverage_pct": 95.0, "ri_utilization_pct": 90.0, "sp_utilization_pct": 85.0})])
+    assert findings == []
+    print("✓ healthy account no findings")
+
+
+def test_missing_metrics_skip():
+    policies = _savings_policies()
+    findings = evaluate(policies, [_account({})])  # no sp/ri metrics -> skip
+    assert findings == []
+    print("✓ missing metrics skip")
+
+
+if __name__ == "__main__":
+    test_low_coverage_fires()
+    test_low_ri_and_sp_utilization_fire()
+    test_healthy_account_no_findings()
+    test_missing_metrics_skip()
+    print("All S083 policy tests passed.")