Fix lint and type errors for CI

- Replace Optional[X] with X | None (UP045)
- Restructure static region data to fit line length limit (E501)
- Use datetime.UTC alias (UP017)
- Fix boto3 Session init and CloudWatch client typing

Author: mahabubul470

canopy/cli/main.py

@@ -1,6 +1,6 @@
 """Canopy CLI entry point."""
 
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 from rich.console import Console
@@ -25,7 +25,7 @@ def version_callback(value: bool) -> None:
 @app.callback()
 def main(
     version: Annotated[
-        Optional[bool],
+        bool | None,
         typer.Option("--version", "-v", callback=version_callback, is_eager=True),
     ] = None,
 ) -> None:
@@ -35,7 +35,7 @@ def main(
 @app.command()
 def audit(
     provider: Annotated[str, typer.Option(help="Cloud provider (aws, gcp)")] = "aws",
-    region: Annotated[Optional[str], typer.Option(help="Filter by region")] = None,
+    region: Annotated[str | None, typer.Option(help="Filter by region")] = None,
     output: Annotated[str, typer.Option(help="Output format (table, json)")] = "table",
 ) -> None:
     """Scan running infrastructure and compute EcoWeight scores."""

canopy/engine/carbon/client.py

@@ -4,36 +4,46 @@
 
 from canopy.models.core import Region
 
+
 # Static fallback data based on publicly available sources.
 # Used when no API key is configured or when offline.
 # Sources: Google Cloud CFE%, Electricity Maps, WattTime
+def _r(
+    provider: str, name: str, location: str, cfe: int, intensity: int
+) -> dict[str, object]:
+    return {
+        "provider": provider, "name": name,
+        "location": location, "cfe": cfe, "intensity": intensity,
+    }
+
+
 STATIC_REGIONS: list[dict[str, object]] = [
     # GCP
-    {"provider": "gcp", "name": "europe-north1", "location": "Finland", "cfe": 94, "intensity": 8},
-    {"provider": "gcp", "name": "europe-north2", "location": "Stockholm, SE", "cfe": 100, "intensity": 3},
-    {"provider": "gcp", "name": "europe-west9", "location": "Paris, FR", "cfe": 96, "intensity": 16},
-    {"provider": "gcp", "name": "northamerica-northeast1", "location": "Montréal, CA", "cfe": 99, "intensity": 5},
-    {"provider": "gcp", "name": "us-west1", "location": "Oregon, US", "cfe": 87, "intensity": 79},
-    {"provider": "gcp", "name": "us-central1", "location": "Iowa, US", "cfe": 97, "intensity": 39},
-    {"provider": "gcp", "name": "us-east1", "location": "South Carolina, US", "cfe": 31, "intensity": 576},
-    {"provider": "gcp", "name": "us-east4", "location": "Virginia, US", "cfe": 28, "intensity": 312},
-    {"provider": "gcp", "name": "asia-south1", "location": "Mumbai, IN", "cfe": 9, "intensity": 679},
-    {"provider": "gcp", "name": "asia-east1", "location": "Taiwan", "cfe": 10, "intensity": 541},
-    {"provider": "gcp", "name": "asia-northeast1", "location": "Tokyo, JP", "cfe": 19, "intensity": 463},
-    {"provider": "gcp", "name": "europe-west1", "location": "Belgium", "cfe": 74, "intensity": 110},
-    # AWS (estimated from grid data — AWS does not publish per-region CFE%)
-    {"provider": "aws", "name": "eu-north-1", "location": "Stockholm, SE", "cfe": 98, "intensity": 8},
-    {"provider": "aws", "name": "ca-central-1", "location": "Montréal, CA", "cfe": 95, "intensity": 12},
-    {"provider": "aws", "name": "eu-west-1", "location": "Ireland", "cfe": 75, "intensity": 98},
-    {"provider": "aws", "name": "eu-west-3", "location": "Paris, FR", "cfe": 93, "intensity": 22},
-    {"provider": "aws", "name": "eu-central-1", "location": "Frankfurt, DE", "cfe": 55, "intensity": 252},
-    {"provider": "aws", "name": "us-west-2", "location": "Oregon, US", "cfe": 85, "intensity": 79},
-    {"provider": "aws", "name": "us-east-1", "location": "N. Virginia, US", "cfe": 30, "intensity": 312},
-    {"provider": "aws", "name": "us-east-2", "location": "Ohio, US", "cfe": 25, "intensity": 410},
-    {"provider": "aws", "name": "ap-south-1", "location": "Mumbai, IN", "cfe": 9, "intensity": 679},
-    {"provider": "aws", "name": "ap-southeast-1", "location": "Singapore", "cfe": 3, "intensity": 408},
-    {"provider": "aws", "name": "ap-northeast-1", "location": "Tokyo, JP", "cfe": 19, "intensity": 463},
-    {"provider": "aws", "name": "sa-east-1", "location": "São Paulo, BR", "cfe": 80, "intensity": 61},
+    _r("gcp", "europe-north1", "Finland", 94, 8),
+    _r("gcp", "europe-north2", "Stockholm, SE", 100, 3),
+    _r("gcp", "europe-west9", "Paris, FR", 96, 16),
+    _r("gcp", "northamerica-northeast1", "Montréal, CA", 99, 5),
+    _r("gcp", "us-west1", "Oregon, US", 87, 79),
+    _r("gcp", "us-central1", "Iowa, US", 97, 39),
+    _r("gcp", "us-east1", "S. Carolina, US", 31, 576),
+    _r("gcp", "us-east4", "Virginia, US", 28, 312),
+    _r("gcp", "asia-south1", "Mumbai, IN", 9, 679),
+    _r("gcp", "asia-east1", "Taiwan", 10, 541),
+    _r("gcp", "asia-northeast1", "Tokyo, JP", 19, 463),
+    _r("gcp", "europe-west1", "Belgium", 74, 110),
+    # AWS (estimated — AWS does not publish per-region CFE%)
+    _r("aws", "eu-north-1", "Stockholm, SE", 98, 8),
+    _r("aws", "ca-central-1", "Montréal, CA", 95, 12),
+    _r("aws", "eu-west-1", "Ireland", 75, 98),
+    _r("aws", "eu-west-3", "Paris, FR", 93, 22),
+    _r("aws", "eu-central-1", "Frankfurt, DE", 55, 252),
+    _r("aws", "us-west-2", "Oregon, US", 85, 79),
+    _r("aws", "us-east-1", "N. Virginia, US", 30, 312),
+    _r("aws", "us-east-2", "Ohio, US", 25, 410),
+    _r("aws", "ap-south-1", "Mumbai, IN", 9, 679),
+    _r("aws", "ap-southeast-1", "Singapore", 3, 408),
+    _r("aws", "ap-northeast-1", "Tokyo, JP", 19, 463),
+    _r("aws", "sa-east-1", "São Paulo, BR", 80, 61),
 ]
 
 

canopy/engine/providers/aws.py

@@ -1,6 +1,7 @@
 """AWS cloud provider implementation."""
 
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
+from typing import Any
 
 import boto3
 from botocore.exceptions import ClientError
@@ -62,11 +63,10 @@ class AWSProvider(CloudProvider):
     """AWS cloud provider using boto3."""
 
     def __init__(self, profile: str | None = None, default_region: str = "us-east-1") -> None:
-        session_kwargs: dict[str, str] = {}
-        if profile:
-            session_kwargs["profile_name"] = profile
-        session_kwargs["region_name"] = default_region
-        self._session = boto3.Session(**session_kwargs)
+        self._session = boto3.Session(
+            profile_name=profile,
+            region_name=default_region,
+        )
         self._default_region = default_region
 
     @property
@@ -143,12 +143,12 @@ def _list_ec2_instances(self, region: str) -> list[Workload]:
 
         return workloads
 
-    def _get_avg_cpu(self, cw_client: object, instance_id: str) -> float:
+    def _get_avg_cpu(self, cw_client: Any, instance_id: str) -> float:
         """Get average CPU utilization over the last 7 days."""
         try:
-            end = datetime.now(timezone.utc)
+            end = datetime.now(UTC)
             start = end - timedelta(days=7)
-            response = cw_client.get_metric_statistics(  # type: ignore[union-attr]
+            response = cw_client.get_metric_statistics(
                 Namespace="AWS/EC2",
                 MetricName="CPUUtilization",
                 Dimensions=[{"Name": "InstanceId", "Value": instance_id}],
@@ -157,10 +157,10 @@ def _get_avg_cpu(self, cw_client: object, instance_id: str) -> float:
                 Period=86400,
                 Statistics=["Average"],
             )
-            datapoints = response.get("Datapoints", [])
+            datapoints: list[dict[str, Any]] = response.get("Datapoints", [])
             if not datapoints:
                 return 0.0
-            return sum(d["Average"] for d in datapoints) / len(datapoints)
+            return float(sum(d["Average"] for d in datapoints) / len(datapoints))
         except Exception:
             return 0.0