dataflow-core 2.1.6__py3-none-any.whl → 2.1.8__py3-none-any.whl

dataflow/utils/exceptions.py

@@ -0,0 +1,112 @@
+"""Custom exceptions for the dataflow secrets manager."""
+
+from dataflow.utils.logger import CustomLogger
+from typing import Optional
+
+
+class SecretsManagerException(Exception):
+    """Base exception for all secrets manager errors."""
+    
+    def __init__(self, message: str, details: Optional[str] = None, operation: Optional[str] = None):
+        self.message = message
+        self.details = details
+        self.operation = operation
+        self.logger = CustomLogger().get_logger(__name__)
+        
+        # Log detailed error information
+        log_msg = f"SecretsManager Error"
+        if operation:
+            log_msg += f" in {operation}"
+        log_msg += f": {message}"
+        if details:
+            log_msg += f" | Details: {details}"
+            
+        self.logger.error(log_msg)
+        super().__init__(message)
+
+
+class SecretNotFoundException(SecretsManagerException):
+    """Raised when a requested secret is not found."""
+    
+    def __init__(self, secret_type: str, key: str, context: Optional[str] = None, original_error: Optional[str] = None):
+        message = f"{secret_type.capitalize()} not found"
+        
+        details = f"Secret type: {secret_type}, Key: {key}"
+        if context:
+            details += f", Context: {context}"
+        if original_error:
+            details += f", Original error: {original_error}"
+            
+        super().__init__(message, details, f"get_{secret_type}")
+
+
+class SecretAlreadyExistsException(SecretsManagerException):
+    """Raised when trying to create a secret that already exists."""
+    
+    def __init__(self, secret_type: str, key: str, context: Optional[str] = None, original_error: Optional[str] = None, is_scheduled_for_deletion: bool = False):
+        if is_scheduled_for_deletion:
+            message = f"{secret_type.capitalize()} is in recovery mode. Please use another key name"
+        else:
+            message = f"{secret_type.capitalize()} already exists. Please use another key name"
+        
+        details = f"Secret type: {secret_type}, Key: {key}"
+        if context:
+            details += f", Context: {context}"
+        if is_scheduled_for_deletion:
+            details += ", Status: Scheduled for deletion"
+        if original_error:
+            details += f", Original error: {original_error}"
+            
+        super().__init__(message, details, f"create_{secret_type}")
+
+
+class SecretValidationException(SecretsManagerException):
+    """Raised when secret data validation fails."""
+    
+    def __init__(self, secret_type: str, validation_error: str, original_error: Optional[str] = None):
+        message = f"Invalid {secret_type} data. Please check your input"
+        
+        details = f"Secret type: {secret_type}, Validation error: {validation_error}"
+        if original_error:
+            details += f", Original error: {original_error}"
+            
+        super().__init__(message, details, f"validate_{secret_type}")
+
+
+class SecretManagerAuthException(SecretsManagerException):
+    """Raised when authentication or authorization fails."""
+    
+    def __init__(self, operation: str, original_error: Optional[str] = None):
+        message = "Access denied. Please check your permissions"
+        
+        details = f"Operation: {operation}"
+        if original_error:
+            details += f", Original error: {original_error}"
+            
+        super().__init__(message, details, operation)
+
+
+class SecretManagerServiceException(SecretsManagerException):
+    """Raised when the secret manager service is unavailable or fails."""
+    
+    def __init__(self, operation: str, original_error: Optional[str] = None):
+        message = "We're experiencing some issues. Our best minds are working on it!"
+        
+        details = f"Operation: {operation}"
+        if original_error:
+            details += f", Original error: {original_error}"
+            
+        super().__init__(message, details, operation)
+
+
+class SecretManagerConfigException(SecretsManagerException):
+    """Raised when there's a configuration error."""
+    
+    def __init__(self, config_issue: str, original_error: Optional[str] = None):
+        message = "Configuration issue detected. Please contact support"
+        
+        details = f"Config issue: {config_issue}"
+        if original_error:
+            details += f", Original error: {original_error}"
+            
+        super().__init__(message, details, "configuration")

dataflow/utils/get_current_user.py

@@ -26,9 +26,11 @@ def get_user_from_session(session_id: str, db: Session):
         raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found")
 
     base_role = user.role_details.base_role
+    role_id = user.role_details.id
     role_name = user.role_details.name
     user.base_role = base_role
     user.role = role_name
+    user.role_id = role_id
     
     return user
 

{dataflow_core-2.1.6.dist-info → dataflow_core-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.6
+Version: 2.1.8
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 
@@ -9,6 +9,8 @@ Requires-Dist: boto3
 Requires-Dist: psycopg2-binary
 Requires-Dist: pymysql
 Requires-Dist: requests
+Requires-Dist: azure-identity
+Requires-Dist: azure-keyvault-secrets
 Dynamic: author
 Dynamic: requires-dist
 Dynamic: summary

{dataflow_core-2.1.6.dist-info → dataflow_core-2.1.8.dist-info}/RECORD

@@ -1,17 +1,18 @@
 authenticator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 authenticator/dataflowairflowauthenticator.py,sha256=gEdCiL2yJQ7lYvAwbrjcAkccVMfehoMJldw9eU7cc2s,2243
-authenticator/dataflowhubauthenticator.py,sha256=-wFEPEQfgCgtghC0Eo9e18B-OU1JsPKam0tbQaYCg1s,13563
+authenticator/dataflowhubauthenticator.py,sha256=WEIYk8T8kvXfyqPMnV83nzD4sSDwYEWLBnzcqZtTg1E,13473
 authenticator/dataflowsupersetauthenticator.py,sha256=NkAmDaIc-ui-qEolu4xz_UY7P_2g8111hwNjPvAOW1Q,2839
 dataflow/__init__.py,sha256=WTRg8HMpMWSgxYJ9ZGVldx4k07fAbta3mBmZ1hG9mWE,30
 dataflow/configuration.py,sha256=7To6XwH1eESiYp39eqPcswXWwrdBUdPF6xN6WnazOF0,663
 dataflow/database_manager.py,sha256=tJHMuOZ9Muskrh9t4uLRlTuFU0VkHAzoHlGP5DORIC4,899
-dataflow/dataflow.py,sha256=-UYZst7EO1GgaOjlAkKu-tu7RC6XsgadGeDp1MOvZiA,7439
+dataflow/dataflow.py,sha256=Ixj4xSmpG94ByedfYJpzD4fCcmO5jXLxYpkJ4shoDeY,13331
 dataflow/db.py,sha256=73ojGqpCTRVTlPszD73Ozhjih_BI2KTHmazqxxL6iWk,3780
 dataflow/environment.py,sha256=05F-dBRyZu2mr26vuiuJU13pfgtRpA9yW69bk83HGUw,27239
-dataflow/models/__init__.py,sha256=7Wnx1_8eRd5QW07QlcY4-Pdt_3OD7dXm2-CcV0S6uy4,853
+dataflow/models/__init__.py,sha256=WnlLd-0T3HYtJloDms1a58lN66WzBIbBSTReDXD6HaQ,892
 dataflow/models/app_types.py,sha256=yE_ZB13lhpK7AZ7PyBwnQlf0RlIHYs_-vdMKx7_RMlY,379
 dataflow/models/blacklist_library.py,sha256=B2oi3Z8GcR_glhLAyinFk0W8c9txXvm3uOER6dY-q7I,991
 dataflow/models/connection.py,sha256=_VJL3KuIrm8t4lJmtunIL3-AXF9Yvi5wUolzdR3tE0E,1017
+dataflow/models/dataflow_zone.py,sha256=yFCvQXos5M1cU7ksbVSO338_RkT3hkdw2wr3kCJ_rec,769
 dataflow/models/environment.py,sha256=300CUwx7d7bjadrMsTch7NSRYLCuf9AK9WVzlT26CAc,2616
 dataflow/models/environment_status.py,sha256=lvPDNUsUoTW9D97B07aKqJQHRKp4LvPM28pQDMPH1ac,536
 dataflow/models/git_ssh.py,sha256=W15SDypxzGOz_aZkHEnVZ6DIMVsjAsbSIXVIEt2mPYU,694
@@ -19,26 +20,36 @@ dataflow/models/pinned_projects.py,sha256=I-XMQq7__XJJi2lyOdEvQEfhPRz8D6KHA6Cbav
 dataflow/models/project_details.py,sha256=iNb95L3UGjcC_Ws6FiUTDANCUFhYWpnsKraS6rmCyRU,1098
 dataflow/models/recent_project_studio.py,sha256=m12KGCsv453C1ijHjfVD8E7cJ7Og_0N8uc7_9VlfkYw,812
 dataflow/models/recent_projects.py,sha256=OFd5MSRXVRHs9UbvUNoJBBnh9rgsJ0lwE23wm5_Hc5w,321
-dataflow/models/role.py,sha256=_I5F2TFox_k2-LGgjVuO2PIW9-gpwpoX8Te7m024A8k,693
+dataflow/models/role.py,sha256=0fgLjCx7aETRwCV5SW0-4PQBWzWddWO9a_ObJA14VOY,962
 dataflow/models/role_server.py,sha256=mMcfjsGX1cY8hOAOBBmrZgw8ozdfuvjKJoBlR6F0Kdc,689
-dataflow/models/runtime.py,sha256=OiuBfZTMg81U10GS00DxfhiAmHlcyQUw5LBR8RaPl7s,415
+dataflow/models/role_zone.py,sha256=uH8JheWyzUWcRECRzYuzdphUAUXeU5zRVA1Bhuz3h9w,772
 dataflow/models/server_config.py,sha256=8ocKT8tPen9tedO8BLPEfkWxUEIHaqvA2L-qEhrFND0,1385
 dataflow/models/session.py,sha256=c8TI6qXsM8utzp5vSQtAOXJSbgasnyu-a0qSAvA-rWs,459
 dataflow/models/team.py,sha256=fjkqF0N4PSwSYTgHjEQl9wuC7yumd0iOb5nNFePI6q4,488
-dataflow/models/user.py,sha256=agxhZkkJ6C6_ZqNX-ISTBySeBz5kPw-OM_POMn_MESU,1086
+dataflow/models/user.py,sha256=qFvkU6hZQzv-QWCC8nDKonnpl2Z2YEqMni5iUVQpMB0,1041
 dataflow/models/user_environment.py,sha256=yI9NutULcLiwlycuEin6ROe6o1Sjdv_sgw2MEkJFeYg,568
 dataflow/models/user_team.py,sha256=r_fmKvf6JuGgiiI9TXWjVG2QZ3WOvDrOwYWVQ3r8oWo,659
 dataflow/models/variables.py,sha256=Sinvv3zFYni5i_GrL69cVfhCh4tOOaIHiEzWYRJ-i10,1132
+dataflow/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dataflow/schemas/connection.py,sha256=1bKTSEPW1QwcFQe35QCIr-S5DTMr34WJCjSKhxMpPek,2449
+dataflow/schemas/git_ssh.py,sha256=mJdEbUe2uQNXGpj2XnLZhTgqiISwH0Xw2O0utW1Bp9Y,1333
+dataflow/schemas/secret.py,sha256=dAN_2IBTjnjf4sT6cyPVd_Zcdaw8s_EMG4aodMoCwXU,1165
 dataflow/scripts/clone_environment.sh,sha256=xWJBw9z1W1rztrzLXYro3UtEdFuBSqNrB83y45zqFfE,487
 dataflow/scripts/create_environment.sh,sha256=3FHgNplJuEZvyTsLqlCJNX9oyfXgsfqn80VZk2xtvso,828
 dataflow/scripts/update_environment.sh,sha256=2dtn2xlNi6frpig-sqlGE1_IKRbbkqYOCpf_qyMKKII,992
+dataflow/secrets_manager/__init__.py,sha256=idGqIDtYl0De2WIK9Obl-N7SDPSYtVM0D-wXfZjCiy4,559
+dataflow/secrets_manager/factory.py,sha256=k1sIyXBKtas1upWJpq8Mks2d8kjLAHU7CFvjeuMXXxs,2160
+dataflow/secrets_manager/interface.py,sha256=HhrKpQrprWIbDsVfU_qc59OXmSIuHXv106OXv6-Epqc,506
+dataflow/secrets_manager/service.py,sha256=SSWgTXJTAwVPqMIc76cB2hR6nghNVOoMpIN9M0i7Su0,7241
+dataflow/secrets_manager/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dataflow/secrets_manager/providers/aws_manager.py,sha256=16peXyKeuAjv2RVTMUjrzArPYENK9Zu7jREWVgMfScA,8671
+dataflow/secrets_manager/providers/azure_manager.py,sha256=sWOz-7ALnLt6vyM3lt14GBpzpmDnlH3hkdqtuApqkgU,9430
 dataflow/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dataflow/utils/aws_secrets_manager.py,sha256=A_fNs9VNah9dDdl9NhqizJamYU7xr2v_GXlw9InEDFk,2380
-dataflow/utils/get_current_user.py,sha256=akjcUyTpmMdAZj9LFGSTs76hjBRjltNk9hLUqC_BdkA,1140
-dataflow/utils/json_handler.py,sha256=5_7WdypegRBDe2HSqBXyrJAdd92wsha8qRcmQvCj1TA,782
+dataflow/utils/exceptions.py,sha256=8GRFoYZ5dPGQckVm2znaHpPi0ZAs69fK-RGKukEsapk,4432
+dataflow/utils/get_current_user.py,sha256=4nSO3SPVMZhW-MsIgxR3f9ZzrFaIZIuyrM6hvfyE7PQ,1202
 dataflow/utils/logger.py,sha256=7BFrOq5Oiqn8P4XZbgJzMP5O07d2fpdECbbfsjrUuHw,1213
-dataflow_core-2.1.6.dist-info/METADATA,sha256=riTs6HqJEWRlVFoaXya_aF98d_tJgB6TbuBBpIaTABo,301
-dataflow_core-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.6.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.6.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
-dataflow_core-2.1.6.dist-info/RECORD,,
+dataflow_core-2.1.8.dist-info/METADATA,sha256=f7JqNJGVu3L1qea_GAEIsRDh3N4y-8lKrhcMhuvlZUs,369
+dataflow_core-2.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.8.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.8.dist-info/top_level.txt,sha256=SZsUOpSCK9ntUy-3Tusxzf5A2e8ebwD8vouPb1dPt_8,23
+dataflow_core-2.1.8.dist-info/RECORD,,

dataflow/models/runtime.py

@@ -1,11 +0,0 @@
-from sqlalchemy import Column, Integer, String, Boolean
-from dataflow.db import Base
-
-class RuntimeZone(Base):
-    __tablename__ = "RUNTIME_ZONE"
-
-    id = Column(Integer, primary_key=True, autoincrement=True, unique=True)
-    name = Column(String, unique=True, nullable=False)
-    display_name = Column(String, nullable=False)
-    display_order = Column(Integer)
-    spark_enabled = Column(Boolean, default=False)

dataflow/utils/aws_secrets_manager.py

@@ -1,57 +0,0 @@
-import boto3
-from botocore.exceptions import ClientError, EndpointConnectionError, NoCredentialsError
-import json
-from .json_handler import JsonHandler
-
-class SecretsManagerClient:
-    """
-    A class to interact with AWS Secrets Manager for managing secrets.
-
-    Attributes:
-        client: The Boto3 client for Secrets Manager.
-        json_handler: An instance of JsonHandler for handling JSON operations.
-    """
-    def __init__(self):
-        self.json_handler = JsonHandler()
-        try:
-            self.client = boto3.client('secretsmanager')
-        except EndpointConnectionError as e:
-            self.logger.error(f"Failed to initialize SecretsManagerClient: {e}")
-            raise Exception(f"Failed to initialize SecretsManagerClient: Unable to connect to the endpoint. {e}")
-        except NoCredentialsError as e:
-            self.logger.error(f"Failed to initialize SecretsManagerClient: {e}")
-            raise Exception(f"Failed to initialize SecretsManagerClient: No AWS credentials found. {e}")
-
-
-    def get_secret_by_key(self, vault_path, user_name, conn_id: str, runtime, slug):
-        """
-        Get information about a specific secret using a dynamically constructed vault path.
-
-        Args:
-            vault_path (str): The base vault path.
-            user_name (str): The user name.
-            conn_id (str): The key of the secret to retrieve.
-            runtime (str, optional): The runtime environment. Defaults to None.
-            slug (str, optional): The slug identifier. Defaults to None.
-
-        Returns:
-            str: Information about the secret in JSON format.
-
-        Raises:
-            Exception: If the operation fails.
-        """
-        try:
-            if runtime and slug:
-                secret_name = f"{runtime}/{slug}/{vault_path}/{conn_id}"
-            else:
-                secret_name = f"{user_name}/{vault_path}/{conn_id}"
-            
-            response = self.client.get_secret_value(SecretId=secret_name)
-            secret_data = json.loads(response.get('SecretString'))
-
-            return secret_data
-        except ClientError as e:
-            if e.response['Error']['Code'] == 'ResourceNotFoundException':
-                raise Exception(f"Secret named '{conn_id}' not found with path '{secret_name}'")
-            else:
-                raise Exception(f"Failed to get secret '{conn_id}': {e}")

dataflow/utils/json_handler.py

@@ -1,33 +0,0 @@
-import json 
-
-class JsonHandler:
-    """
-    Helper class for handling JSON serialization and deserialization.
-    """
-
-    def __init__(self):
-        pass
-
-    def dict_to_json(self, data_dict):
-        """
-        Serialize a dictionary to JSON string.
-
-        Args:
-            data_dict (dict): The dictionary to serialize.
-
-        Returns:
-            str: The JSON string representation of the dictionary.
-        """
-        return json.dumps(data_dict)
-
-    def json_to_dict(self, json_string):
-        """
-        Deserialize a JSON string to dictionary.
-
-        Args:
-            json_string (str): The JSON string to deserialize.
-
-        Returns:
-            dict: The dictionary representation of the JSON string.
-        """
-        return json.loads(json_string)