Update src/auth/auth.py

src/auth/auth.py

@@ -78,87 +78,56 @@ def get_direct_access_token(username, password):
 
 
 class S3Connector:
-    """
-    A client for connecting to S3-compatible storage services.
-    
-    This connector provides an interface to connect to an S3-compatible
-    storage service and retrieve the S3 resource object.
-    """
-    
-    def __init__(self, endpoint_url, access_key_id, secret_access_key, region_name='default'):
-        """
-        Initialize S3 connector with credentials and endpoint information.
-        
-        Parameters
-        ----------
-        endpoint_url : str
-            The URL of the S3 endpoint
-        access_key_id : str
-            The access key for authentication
-        secret_access_key : str
-            The secret key for authentication
-        region_name : str, optional
-            The AWS region name, by default 'default'
-        """
+    """A clean connector for S3-compatible storage services"""
+
+    def __init__(self, endpoint_url, access_key_id,
+                 secret_access_key, region_name='default'):
+        """Initialize the S3Connector with connection parameters"""
         self.endpoint_url = endpoint_url
         self.access_key_id = access_key_id
         self.secret_access_key = secret_access_key
         self.region_name = region_name
-        self.s3_client = None
-    
-    def connect(self):
-        """
-        Establish connection to S3 service.
-        
-        Returns
-        -------
-        bool
-            True if connection was successful, False otherwise
-        """
-        try:
-            # Also create a client object
-            self.s3_client = boto3.client(
-                's3',
-                endpoint_url=self.endpoint_url,
-                aws_access_key_id=self.access_key_id,
-                aws_secret_access_key=self.secret_access_key,
-                region_name=self.region_name
-            )
-            return True
-        except Exception as e:
-            print(f"Connection failed: {e}")
-            return False
-    
-    def get_s3(self):
-        """
-        Return the S3 resource object.
-        
-        If not already connected, this method will first establish a connection.
-        
-        Returns
-        -------
-        boto3.resources.factory.s3.ServiceResource
-            The boto3 S3 resource object for interacting with S3 storage
-        """
-        if not self.s3:
-            self.connect()
-        return self.s3
-    
+
+        # Create session
+        self.session = boto3.session.Session()
+
+        # Initialize S3 resource
+        self.s3 = self.session.resource(
+            's3',
+            endpoint_url=self.endpoint_url,
+            aws_access_key_id=self.access_key_id,
+            aws_secret_access_key=self.secret_access_key,
+            region_name=self.region_name
+        )
+
+        # Initialize S3 client
+        self.s3_client = self.session.client(
+            's3',
+            endpoint_url=self.endpoint_url,
+            aws_access_key_id=self.access_key_id,
+            aws_secret_access_key=self.secret_access_key,
+            region_name=self.region_name
+        )
+
     def get_s3_client(self):
-        """
-        Return the S3 client object.
-        
-        If not already connected, this method will first establish a connection.
-        
-        Returns
-        -------
-        boto3.client.S3
-            The boto3 S3 client object for interacting with S3 storage
-        """
-        if not self.s3_client:
-            self.connect()
+        """Get the boto3 S3 client"""
         return self.s3_client
-    
+
+    def get_s3_resource(self):
+        """Get the boto3 S3 resource"""
+        return self.s3
+
+    def get_bucket(self, bucket_name):
+        """Get a specific bucket by name"""
+        return self.s3.Bucket(bucket_name)
+
+    def list_buckets(self):
+        """List all available buckets"""
+        response = self.s3_client.list_buckets()
+        if 'Buckets' in response:
+            return [bucket['Name'] for bucket in response['Buckets']]
+        return []
+
 # if __name__ == "__main__":
 
 
@@ -177,4 +146,3 @@ class S3Connector:
 #     # Connect to S3
 #     s3_connector.connect()
 #     s3_client = s3_connector.get_s3_client()
-