Refactor imports and update type hints for Python 3.10+

Reordered and deduplicated imports across multiple modules for consistency and clarity. Updated type hints to use Python 3.10+ union syntax (e.g., 'str | None') instead of 'Optional'. Improved zip usage with 'strict=True' for better error handling. Refactored Plotly layout and marker arguments to use dict literals for compatibility. Removed unused imports and streamlined code for maintainability.

Author: dbsectrainer

Dockerfile

@@ -38,7 +38,6 @@ RUN pip install --no-cache-dir --no-index --find-links=/wheels -r requirements.t
 
 # Copy application code
 COPY src ./src
-COPY data ./data
 
 # Create directories for runtime data
 RUN mkdir -p data/warehouse data/cache && \

pyproject.toml

@@ -50,6 +50,7 @@ dev = [
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint]
 select = [
     "E",   # pycodestyle errors
     "F",   # pyflakes
@@ -65,7 +66,7 @@ ignore = [
     "E501",  # line too long (handled by black)
 ]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]  # Allow unused imports in __init__
 "tests/*" = ["S101"]      # Allow assert in tests
 

src/app.py

@@ -1,53 +1,53 @@
-import streamlit as st
-from datetime import datetime
 import numpy as np
+import streamlit as st
 
-# Import custom modules
-from data.market_data import (
-    get_market_share_data,
-    get_growth_trends_data,
-    get_regional_metrics,
-    get_key_metrics,
+from components.decision_helper import display_decision_helper
+from components.future_trends import display_future_trends
+from components.learning_resources import display_learning_resources
+from components.metrics import (
+    display_key_metrics,
+    display_regional_metrics,
+    display_sidebar_navigation,
 )
+from components.platform_comparisons import display_platform_comparisons
 from data.compliance_data import (
     get_compliance_matrix,
-    get_security_certifications,
     get_data_residency_map,
+    get_security_certifications,
+)
+
+# Import custom modules
+from data.market_data import (
+    get_growth_trends_data,
+    get_key_metrics,
+    get_market_share_data,
+    get_regional_metrics,
 )
 from data.performance_data import (
+    calculate_tco,
+    get_cost_analysis,
     get_performance_metrics,
     get_sla_comparisons,
-    get_cost_analysis,
-    calculate_tco,
-)
-from visualizations.plots import (
-    create_market_share_treemap,
-    create_growth_trends_line,
-    create_provider_comparison_radar,
 )
+from utils.helpers import filter_data_by_regions
 from visualizations.compliance_plots import (
+    create_certification_timeline,
     create_compliance_heatmap,
-    create_security_score_gauge,
     create_data_residency_map,
-    create_certification_timeline,
+    create_security_score_gauge,
 )
 from visualizations.performance_plots import (
-    create_performance_radar,
+    create_cost_comparison,
     create_latency_heatmap,
+    create_performance_radar,
     create_sla_comparison,
-    create_cost_comparison,
     create_tco_analysis,
 )
-from components.metrics import (
-    display_key_metrics,
-    display_regional_metrics,
-    display_sidebar_navigation,
+from visualizations.plots import (
+    create_growth_trends_line,
+    create_market_share_treemap,
+    create_provider_comparison_radar,
 )
-from components.decision_helper import display_decision_helper
-from components.platform_comparisons import display_platform_comparisons
-from components.learning_resources import display_learning_resources
-from components.future_trends import display_future_trends
-from utils.helpers import filter_data_by_regions, get_time_range_dates
 
 # Set up Streamlit page configuration
 st.set_page_config(

src/components/decision_helper.py

@@ -1,5 +1,4 @@
 import streamlit as st
-import pandas as pd
 
 
 def calculate_recommendation_score(inputs):
@@ -216,7 +215,7 @@ def display_recommendation_results(scores):
         "China Providers": "Best for cost efficiency and Asia-Pacific expansion.",
     }
     cols = st.columns(len(scores))
-    for col, (provider, score) in zip(cols, scores.items()):
+    for col, (provider, score) in zip(cols, scores.items(), strict=True):
         with col:
             st.metric(label=provider, value=int(score))
             st.caption(tooltips.get(provider, ""))

src/components/future_trends.py

@@ -1,8 +1,6 @@
-import streamlit as st
-import plotly.express as px
-import plotly.graph_objects as go
 import pandas as pd
-import numpy as np
+import plotly.graph_objects as go
+import streamlit as st
 
 
 def create_trend_forecast():

src/components/learning_resources.py

@@ -1,5 +1,5 @@
-import streamlit as st
 import pandas as pd
+import streamlit as st
 
 
 def display_learning_resources():

src/components/metrics.py

@@ -1,5 +1,4 @@
 import streamlit as st
-from datetime import datetime
 
 
 def display_key_metrics(metrics_data):
@@ -11,7 +10,7 @@ def display_key_metrics(metrics_data):
         "Active Providers": "Number of active cloud service providers worldwide.",
         "Avg. Compliance Score": "Average compliance score across all providers.",
     }
-    for col, (metric, data) in zip(cols, metrics_data.items()):
+    for col, (metric, data) in zip(cols, metrics_data.items(), strict=True):
         with col:
             st.metric(label=metric, value=data["value"], delta=data["change"])
             st.caption(tooltips.get(metric, ""))
@@ -20,7 +19,7 @@ def display_key_metrics(metrics_data):
 def display_regional_metrics(regional_data):
     """Display regional metrics in columns."""
     cols = st.columns(len(regional_data))
-    for col, (region, data) in zip(cols, regional_data.items()):
+    for col, (region, data) in zip(cols, regional_data.items(), strict=True):
         with col:
             st.metric(region, data["value"], f"↑ {data['growth']}")
             st.metric("Market Share", data["share"], data["share_change"])
@@ -76,7 +75,7 @@ def display_sidebar_navigation():
     )
     st.sidebar.markdown("---")
     st.sidebar.subheader("Feedback")
-    feedback = st.sidebar.text_area("Share your feedback or feature requests:")
+    st.sidebar.text_area("Share your feedback or feature requests:")
     if st.sidebar.button("Submit Feedback"):
         st.sidebar.success("Thank you for your feedback!")
     return page, selected_regions, time_range, selected_provider

src/components/platform_comparisons.py

@@ -1,5 +1,5 @@
-import streamlit as st
 import pandas as pd
+import streamlit as st
 
 
 def display_platform_comparisons():

src/config/settings.py

@@ -1,7 +1,6 @@
 """Application settings using Pydantic for type-safe configuration."""
 
 from pathlib import Path
-from typing import Optional
 
 from pydantic import Field, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -29,25 +28,25 @@ class Settings(BaseSettings):
     EXPORT_DIR: Path = Field(default=Path("data/exports"))
 
     # Database
-    DATABASE_URL: Optional[str] = Field(
+    DATABASE_URL: str | None = Field(
         default=None,
         description="PostgreSQL connection string",
     )
 
     # Object Storage (MinIO/S3)
-    MINIO_ENDPOINT: Optional[str] = None
-    MINIO_ACCESS_KEY: Optional[str] = None
-    MINIO_SECRET_KEY: Optional[str] = None
+    MINIO_ENDPOINT: str | None = None
+    MINIO_ACCESS_KEY: str | None = None
+    MINIO_SECRET_KEY: str | None = None
     MINIO_SECURE: bool = False
     MINIO_BUCKET: str = "cloud-dashboard"
 
     # Observability
-    OTEL_ENDPOINT: Optional[str] = Field(
+    OTEL_ENDPOINT: str | None = Field(
         default=None,
         description="OpenTelemetry collector endpoint (HTTP)",
     )
     OTEL_SERVICE_NAME: str = "cloud-dashboard"
-    PROMETHEUS_URL: Optional[str] = None
+    PROMETHEUS_URL: str | None = None
     ENABLE_TELEMETRY: bool = True
 
     # Features

src/data/compliance_data.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+
 import pandas as pd