mcli-framework 7.3.1__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)