mcli-framework 7.4.0__py3-none-any.whl → 7.5.0__py3-none-any.whl

mcli/lib/auth/aws_manager.py

@@ -1,84 +1,29 @@
 import json
-from typing import Optional
 
 from mcli.lib.config import DEV_SECRETS_ROOT
 from mcli.lib.fs import get_absolute_path
 from mcli.lib.logger.logger import get_logger
 
-from .credential_manager import CredentialManager
+from .credential_manager import CloudProviderManager
 
 logger = get_logger(__name__)
 
 
-class AwsManager(CredentialManager):
+class AwsManager(CloudProviderManager):
     """
-    Specialized credential manager for handling authentication tokens and environment URLs.
+    AWS credential manager for handling authentication tokens and storage credentials.
+    Inherits common token management from CloudProviderManager.
     """
 
-    def __init__(self, app_name: str = "mcli"):
-        """
-        Initialize AwsManager with a specific configuration filename.
-
-        Args:
-            app_name (str, optional): Name of the application. Defaults to "mcli".
-        """
-        super().__init__(app_name, config_filename="mcli.token.config.json")
-
-    def save_token(self, token: str):
+    @staticmethod
+    def persist_aws_storage_creds(access_key, secret_key):
         """
-        Save authentication token to configuration.
+        Persist AWS storage credentials to file.
 
         Args:
-            token (str): Authentication token to save.
-
-        Raises:
-            ValueError: If token is empty or not a string.
-        """
-        if not token or not isinstance(token, str):
-            raise ValueError("Token must be a non-empty string")
-
-        try:
-            self.update_config("auth_token", token)
-        except Exception as e:
-            raise Exception(f"Failed to save token: {str(e)}")
-
-    def get_token(self) -> Optional[str]:
+            access_key (str): AWS access key.
+            secret_key (str): AWS secret key.
         """
-        Retrieve the stored authentication token.
-
-        Returns:
-            Optional[str]: Stored authentication token or None if not found.
-        """
-        try:
-            logger.info("getting token")
-            return self.get_config_value("auth_token")
-        except Exception as e:
-            logger.info(f"Warning: Error retrieving token: {str(e)}")
-            return None
-
-    def clear_token(self):
-        """
-        Clear the stored authentication token.
-        Uses the base class clear_config method.
-        """
-        self.clear_config()
-
-    def get_url(self) -> Optional[str]:
-        """
-        Retrieve environment URL from configuration.
-
-        Returns:
-            Optional[str]: Stored environment URL or None if not found.
-        """
-        try:
-            logger.info("getting url")
-            return self.get_config_value("env_url")
-        except Exception as e:
-            logger.info(f"Warning: Error retrieving environment URL: {str(e)}")
-            return None
-
-    @staticmethod
-    def persist_aws_storage_creds(access_key, secret_key):
         filepath = get_absolute_path(DEV_SECRETS_ROOT + "aws/aws.json")
         with open(filepath, "w") as f:
             json.dump({"access_key": access_key, "secret_key": secret_key}, f)

mcli/lib/auth/azure_manager.py

@@ -1,84 +1,29 @@
 import json
-from typing import Optional
 
 from mcli.lib.config import DEV_SECRETS_ROOT
 from mcli.lib.fs import get_absolute_path
 from mcli.lib.logger.logger import get_logger
 
-from .credential_manager import CredentialManager
+from .credential_manager import CloudProviderManager
 
 logger = get_logger(__name__)
 
 
-class AzureManager(CredentialManager):
+class AzureManager(CloudProviderManager):
     """
-    Specialized credential manager for handling authentication tokens and environment URLs.
+    Azure credential manager for handling authentication tokens and storage credentials.
+    Inherits common token management from CloudProviderManager.
     """
 
-    def __init__(self, app_name: str = "mcli"):
-        """
-        Initialize GcpManager with a specific configuration filename.
-
-        Args:
-            app_name (str, optional): Name of the application. Defaults to "mcli".
-        """
-        super().__init__(app_name, config_filename="mcli.token.config.json")
-
-    def save_token(self, token: str):
+    @staticmethod
+    def persist_azure_storage_creds(account_name, access_key):
         """
-        Save authentication token to configuration.
+        Persist Azure storage credentials to file.
 
         Args:
-            token (str): Authentication token to save.
-
-        Raises:
-            ValueError: If token is empty or not a string.
-        """
-        if not token or not isinstance(token, str):
-            raise ValueError("Token must be a non-empty string")
-
-        try:
-            self.update_config("auth_token", token)
-        except Exception as e:
-            raise Exception(f"Failed to save token: {str(e)}")
-
-    def get_token(self) -> Optional[str]:
+            account_name (str): Azure storage account name.
+            access_key (str): Azure storage access key.
         """
-        Retrieve the stored authentication token.
-
-        Returns:
-            Optional[str]: Stored authentication token or None if not found.
-        """
-        try:
-            logger.info("getting token")
-            return self.get_config_value("auth_token")
-        except Exception as e:
-            logger.info(f"Warning: Error retrieving token: {str(e)}")
-            return None
-
-    def clear_token(self):
-        """
-        Clear the stored authentication token.
-        Uses the base class clear_config method.
-        """
-        self.clear_config()
-
-    def get_url(self) -> Optional[str]:
-        """
-        Retrieve environment URL from configuration.
-
-        Returns:
-            Optional[str]: Stored environment URL or None if not found.
-        """
-        try:
-            logger.info("getting url")
-            return self.get_config_value("env_url")
-        except Exception as e:
-            logger.info(f"Warning: Error retrieving environment URL: {str(e)}")
-            return None
-
-    @staticmethod
-    def persist_azure_storage_creds(account_name, access_key):
         filepath = get_absolute_path(DEV_SECRETS_ROOT + "azure/azure.json")
         with open(filepath, "w") as f:
             json.dump(

mcli/lib/auth/credential_manager.py

@@ -189,4 +189,73 @@ class CredentialManager:
         return key_b64
 
 
-__all__ = ["CredentialManager"]
+class CloudProviderManager(CredentialManager):
+    """
+    Abstract base class for cloud provider credential managers.
+    Provides common token and URL management functionality for AWS, GCP, and Azure.
+    """
+
+    def __init__(self, app_name: str = "mcli"):
+        """
+        Initialize CloudProviderManager with token configuration filename.
+
+        Args:
+            app_name (str, optional): Name of the application. Defaults to "mcli".
+        """
+        super().__init__(app_name, config_filename="mcli.token.config.json")
+
+    def save_token(self, token: str):
+        """
+        Save authentication token to configuration.
+
+        Args:
+            token (str): Authentication token to save.
+
+        Raises:
+            ValueError: If token is empty or not a string.
+        """
+        if not token or not isinstance(token, str):
+            raise ValueError("Token must be a non-empty string")
+
+        try:
+            self.update_config("auth_token", token)
+        except Exception as e:
+            raise Exception(f"Failed to save token: {str(e)}")
+
+    def get_token(self) -> Optional[str]:
+        """
+        Retrieve the stored authentication token.
+
+        Returns:
+            Optional[str]: Stored authentication token or None if not found.
+        """
+        try:
+            logger.info("getting token")
+            return self.get_config_value("auth_token")
+        except Exception as e:
+            logger.info(f"Warning: Error retrieving token: {str(e)}")
+            return None
+
+    def clear_token(self):
+        """
+        Clear the stored authentication token.
+        Uses the base class clear_config method.
+        """
+        self.clear_config()
+
+    def get_url(self) -> Optional[str]:
+        """
+        Retrieve environment URL from configuration.
+
+        Returns:
+            Optional[str]: Stored environment URL or None if not found.
+        """
+        try:
+            logger.info("getting url")
+            return self.get_config_value("env_url")
+        except Exception as e:
+            logger.info(f"Warning: Error retrieving environment URL: {str(e)}")
+            return None
+
+
+__all__ = ["CredentialManager", "CloudProviderManager"]

mcli/lib/auth/gcp_manager.py

@@ -1,84 +1,31 @@
 import json
-from typing import Optional
 
 from mcli.lib.config import DEV_SECRETS_ROOT
 from mcli.lib.fs import get_absolute_path
 from mcli.lib.logger.logger import get_logger
 
-from .credential_manager import CredentialManager
+from .credential_manager import CloudProviderManager
 
 logger = get_logger(__name__)
 
 
-class GcpManager(CredentialManager):
+class GcpManager(CloudProviderManager):
     """
-    Specialized credential manager for handling authentication tokens and environment URLs.
+    GCP credential manager for handling authentication tokens and storage credentials.
+    Inherits common token management from CloudProviderManager.
     """
 
-    def __init__(self, app_name: str = "mcli"):
-        """
-        Initialize GcpManager with a specific configuration filename.
-
-        Args:
-            app_name (str, optional): Name of the application. Defaults to "mcli".
-        """
-        super().__init__(app_name, config_filename="mcli.token.config.json")
-
-    def save_token(self, token: str):
+    @staticmethod
+    def persist_gcp_storage_creds(account_id, account_email, access_key, secret_key):
         """
-        Save authentication token to configuration.
+        Persist GCP storage credentials to file.
 
         Args:
-            token (str): Authentication token to save.
-
-        Raises:
-            ValueError: If token is empty or not a string.
-        """
-        if not token or not isinstance(token, str):
-            raise ValueError("Token must be a non-empty string")
-
-        try:
-            self.update_config("auth_token", token)
-        except Exception as e:
-            raise Exception(f"Failed to save token: {str(e)}")
-
-    def get_token(self) -> Optional[str]:
+            account_id (str): GCP account ID.
+            account_email (str): GCP account email.
+            access_key (str): GCP access key.
+            secret_key (str): GCP secret key.
         """
-        Retrieve the stored authentication token.
-
-        Returns:
-            Optional[str]: Stored authentication token or None if not found.
-        """
-        try:
-            logger.info("getting token")
-            return self.get_config_value("auth_token")
-        except Exception as e:
-            logger.info(f"Warning: Error retrieving token: {str(e)}")
-            return None
-
-    def clear_token(self):
-        """
-        Clear the stored authentication token.
-        Uses the base class clear_config method.
-        """
-        self.clear_config()
-
-    def get_url(self) -> Optional[str]:
-        """
-        Retrieve environment URL from configuration.
-
-        Returns:
-            Optional[str]: Stored environment URL or None if not found.
-        """
-        try:
-            logger.info("getting url")
-            return self.get_config_value("env_url")
-        except Exception as e:
-            logger.info(f"Warning: Error retrieving environment URL: {str(e)}")
-            return None
-
-    @staticmethod
-    def persist_gcp_storage_creds(account_id, account_email, access_key, secret_key):
         filepath = get_absolute_path(DEV_SECRETS_ROOT + "gcp/gcp.json")
         with open(filepath, "w") as f:
             json.dump(

mcli/ml/dashboard/app.py

@@ -25,47 +25,14 @@ from mcli.ml.database.models import (
     User,
 )
 from mcli.ml.database.session import SessionLocal
+from mcli.ml.dashboard.common import setup_page_config
+from mcli.ml.dashboard.styles import apply_dashboard_styles
 
-# Page config
-st.set_page_config(
-    page_title="MCLI ML Dashboard", page_icon="📊", layout="wide", initial_sidebar_state="expanded"
-)
+# Page config - must be first
+setup_page_config(page_title="MCLI ML Dashboard")
 
-# Custom CSS
-st.markdown(
-    """
-<style>
-    .metric-card {
-        background-color: #f0f2f6;
-        padding: 1rem;
-        border-radius: 0.5rem;
-        border-left: 4px solid #1f77b4;
-    }
-    .alert-success {
-        background-color: #d4edda;
-        border: 1px solid #c3e6cb;
-        color: #155724;
-        padding: 0.75rem;
-        border-radius: 0.25rem;
-    }
-    .alert-warning {
-        background-color: #fff3cd;
-        border: 1px solid #ffeaa7;
-        color: #856404;
-        padding: 0.75rem;
-        border-radius: 0.25rem;
-    }
-    .alert-danger {
-        background-color: #f8d7da;
-        border: 1px solid #f5c6cb;
-        color: #721c24;
-        padding: 0.75rem;
-        border-radius: 0.25rem;
-    }
-</style>
-""",
-    unsafe_allow_html=True,
-)
+# Apply standard dashboard styles
+apply_dashboard_styles()
 
 
 @st.cache_data(ttl=30)

mcli/ml/dashboard/app_integrated.py

@@ -6,48 +6,37 @@ import logging
 import os
 import pickle
 import subprocess
-import warnings
 from datetime import datetime, timedelta
 from pathlib import Path
 from typing import List
 
 import numpy as np
 
-# Suppress Streamlit warnings when used outside runtime context
-warnings.filterwarnings("ignore", message=".*missing ScriptRunContext.*")
-warnings.filterwarnings("ignore", message=".*No runtime found.*")
-warnings.filterwarnings("ignore", message=".*Session state does not function.*")
-warnings.filterwarnings("ignore", message=".*to view this Streamlit app.*")
+# Suppress warnings before other imports
+from mcli.ml.dashboard.common import suppress_streamlit_warnings
 
-# Suppress Plotly deprecation warnings
-warnings.filterwarnings("ignore", message=".*keyword arguments have been deprecated.*")
-warnings.filterwarnings("ignore", message=".*Use `config` instead.*")
-
-# Suppress media file errors
-warnings.filterwarnings("ignore", message=".*MediaFileHandler.*")
-warnings.filterwarnings("ignore", message=".*Missing file.*")
-warnings.filterwarnings("ignore", message=".*Bad filename.*")
-
-# Suppress additional warnings
-warnings.filterwarnings("ignore", category=UserWarning)
-warnings.filterwarnings("ignore", category=FutureWarning)
+suppress_streamlit_warnings()
 
 logger = logging.getLogger(__name__)
 
-# Suppress specific Streamlit media file errors in logging
-logging.getLogger("streamlit.runtime.media_file_storage").setLevel(logging.ERROR)
-logging.getLogger("streamlit.web.server.media_file_handler").setLevel(logging.ERROR)
 import pandas as pd
 import plotly.express as px
 import plotly.graph_objects as go
 import requests
 import streamlit as st
-from dotenv import load_dotenv
 from plotly.subplots import make_subplots
-from supabase import Client, create_client
+from supabase import Client
+
+# Import common dashboard utilities
+from mcli.ml.dashboard.common import (
+    get_supabase_client,
+    load_environment_variables,
+    setup_page_config,
+)
+from mcli.ml.dashboard.styles import apply_dashboard_styles
 
-# Load environment variables from .env file
-load_dotenv()
+# Load environment variables
+load_environment_variables()
 
 # Import streamlit-extras utilities
 try:
@@ -111,7 +100,7 @@ show_debug_dependencies = None
 
 # Import Overview page
 try:
-    from mcli.ml.dashboard.pages.overview import show_overview
+    from mcli.ml.dashboard.overview import show_overview
     HAS_OVERVIEW_PAGE = True
 except (ImportError, KeyError, ModuleNotFoundError) as e:
     st.warning(f"Overview page not available: {e}")
@@ -217,24 +206,19 @@ try:
 except (ImportError, KeyError, ModuleNotFoundError) as e:
     st.warning(f"Debug Dependencies page not available: {e}")
 
-# Page config
-st.set_page_config(
+# Page config - must be before other st commands
+setup_page_config(
     page_title="Politician Trading Tracker - MCLI",
-    page_icon="📊",
-    layout="wide",
-    initial_sidebar_state="expanded",
+    page_icon="📊"
 )
 
-# Custom CSS
+# Apply standard dashboard styles (includes metric-card, alert boxes)
+apply_dashboard_styles()
+
+# Add integrated dashboard-specific CSS
 st.markdown(
     """
 <style>
-    .metric-card {
-        background-color: #f0f2f6;
-        padding: 1rem;
-        border-radius: 0.5rem;
-        border-left: 4px solid #1f77b4;
-    }
     .success-box {
         background-color: #d4edda;
         border: 1px solid #c3e6cb;
@@ -254,69 +238,7 @@ st.markdown(
     unsafe_allow_html=True,
 )
 
-
-@st.cache_resource
-def get_supabase_client() -> Client:
-    """Get Supabase client with Streamlit Cloud secrets support"""
-    # Try Streamlit secrets first (for Streamlit Cloud), then fall back to environment variables (for local dev)
-    try:
-        url = st.secrets.get("SUPABASE_URL", "")
-        key = st.secrets.get("SUPABASE_KEY", "") or st.secrets.get("SUPABASE_SERVICE_ROLE_KEY", "")
-    except (AttributeError, FileNotFoundError):
-        # Secrets not available, try environment variables
-        url = os.getenv("SUPABASE_URL", "")
-        key = os.getenv("SUPABASE_KEY", "") or os.getenv("SUPABASE_SERVICE_ROLE_KEY", "")
-
-    if not url or not key:
-        st.error(
-            "❌ Supabase credentials not configured"
-        )
-        with st.expander("🔧 Configuration Required"):
-            st.markdown("""
-            **Missing Supabase credentials:**
-            - `SUPABASE_URL`: {}
-            - `SUPABASE_KEY`: {}
-
-            **For Streamlit Cloud:**
-            1. Go to https://share.streamlit.io
-            2. Select your app → Settings → Secrets
-            3. Add:
-               ```toml
-               SUPABASE_URL = "https://your-project.supabase.co"
-               SUPABASE_KEY = "your-anon-key"
-               ```
-
-            **For local development:**
-            1. Create `.streamlit/secrets.toml` file
-            2. Add the same credentials as above
-            3. Restart the dashboard
-
-            **Using demo data** until configured.
-            """.format(
-                "✅ Set" if url else "❌ Missing",
-                "✅ Set" if key else "❌ Missing"
-            ))
-        return None
-
-    try:
-        client = create_client(url, key)
-        # Test connection with a simple query
-        try:
-            test_result = client.table("politicians").select("id").limit(1).execute()
-            logger.info(f"✅ Supabase connection successful (URL: {url[:30]}...)")
-            return client
-        except Exception as conn_error:
-            st.error(f"❌ Supabase connection failed: {conn_error}")
-            with st.expander("🔍 Connection Details"):
-                st.write(f"**URL:** {url[:30]}...")
-                st.write(f"**Error:** {str(conn_error)}")
-                st.write("**Using demo data** until connection is restored.")
-            logger.error(f"Supabase connection test failed: {conn_error}")
-            return None
-    except Exception as e:
-        st.error(f"❌ Failed to create Supabase client: {e}")
-        logger.error(f"Failed to create Supabase client: {e}")
-        return None
+# Note: get_supabase_client is now imported from common.py
 
 
 @st.cache_data(ttl=300)  # Cache for 5 minutes

mcli/ml/dashboard/app_supabase.py

@@ -1,75 +1,26 @@
 """Streamlit dashboard for ML system monitoring - Supabase version"""
 
 import asyncio
-import os
 from datetime import datetime, timedelta
-from pathlib import Path
 
 import numpy as np
 import pandas as pd
 import plotly.express as px
 import plotly.graph_objects as go
 import streamlit as st
-from dotenv import load_dotenv
 from plotly.subplots import make_subplots
-from supabase import Client, create_client
+
+from mcli.ml.dashboard.common import get_supabase_client, load_environment_variables, setup_page_config
+from mcli.ml.dashboard.styles import apply_dashboard_styles
 
 # Page config must come first
-st.set_page_config(
-    page_title="MCLI ML Dashboard", page_icon="📊", layout="wide", initial_sidebar_state="expanded"
-)
-
-# Load environment variables from supabase/.env.local
-env_path = Path(__file__).parent.parent.parent.parent.parent / "supabase" / ".env.local"
-if env_path.exists():
-    load_dotenv(env_path)
-
-# Custom CSS
-st.markdown(
-    """
-<style>
-    .metric-card {
-        background-color: #f0f2f6;
-        padding: 1rem;
-        border-radius: 0.5rem;
-        border-left: 4px solid #1f77b4;
-    }
-</style>
-""",
-    unsafe_allow_html=True,
-)
+setup_page_config(page_title="MCLI ML Dashboard")
 
+# Load environment variables
+load_environment_variables()
 
-@st.cache_resource
-def get_supabase_client() -> Client:
-    """Get Supabase client with Streamlit Cloud secrets support"""
-    # Try Streamlit secrets first (for Streamlit Cloud), then fall back to environment variables (for local dev)
-    try:
-        url = st.secrets.get("SUPABASE_URL", "")
-        key = st.secrets.get("SUPABASE_KEY", "") or st.secrets.get("SUPABASE_SERVICE_ROLE_KEY", "")
-    except (AttributeError, FileNotFoundError):
-        # Secrets not available, try environment variables
-        url = os.getenv("SUPABASE_URL", "")
-        key = os.getenv("SUPABASE_KEY", "") or os.getenv("SUPABASE_SERVICE_ROLE_KEY", "")
-
-    if not url or not key:
-        st.warning(
-            "⚠️ Supabase credentials not found. Configure SUPABASE_URL and SUPABASE_KEY in Streamlit Cloud secrets or environment variables."
-        )
-        return None
-
-    try:
-        client = create_client(url, key)
-        # Test connection
-        try:
-            client.table("politicians").select("id").limit(1).execute()
-            return client
-        except Exception as e:
-            st.error(f"❌ Supabase connection test failed: {e}")
-            return None
-    except Exception as e:
-        st.error(f"❌ Failed to create Supabase client: {e}")
-        return None
+# Apply standard dashboard styles
+apply_dashboard_styles()
 
 
 @st.cache_data(ttl=30)