Merge pull request #14 from MadeByMads/multipart

Changed self.s3_client in init to boto3.resource

Author: AliyevH

examples/google_drive_main.py

@@ -0,0 +1,43 @@
+from logging import debug
+from fastapi_cloud_drives import GoogleDrive
+from fastapi_cloud_drives import GoogleDriveConfig
+
+from fastapi import FastAPI
+from fastapi.responses import JSONResponse
+import os
+app = FastAPI()
+
+google_conf = {
+    "CLIENT_ID_JSON" : "client_id.json",
+    "SCOPES": [
+        "https://www.googleapis.com/auth/drive"
+        ],
+    # "STORAGE_JSON": "/home/sabuhi/opt/fastapi-cloud-drives/storage.json"
+}
+
+config = GoogleDriveConfig(**google_conf)
+
+gdrive = GoogleDrive(config)
+
+@app.get("/list_files")
+async def list_files():
+    f = await gdrive.list_files()
+    return JSONResponse(status_code=200, content=f)
+
+@app.get("/upload_file")
+async def upload_file():
+    resp = await gdrive.upload_file(
+        filename = "photo.jpg",
+        filepath = "files/photo.jpg",
+    )
+    return JSONResponse(status_code=200, content=resp)
+
+@app.get("/create_folder")
+async def create_folder():
+    resp = await gdrive.create_folder(folder_name="Examples")
+    return JSONResponse(status_code=200, content=resp)
+
+@app.get("/download_file")
+async def download_file():
+    r = await gdrive.download_file(file_name = "photo.jpeg")
+    return JSONResponse(status_code=200, content=r)

fastapi_cloud_drives/__init__.py

@@ -1,6 +1,8 @@
 from fastapi_cloud_drives.fastapi_google import GoogleDrive
 from fastapi_cloud_drives.config import GoogleDriveConfig
 
+from fastapi_cloud_drives.fastapi_s3 import S3
+
 __author__ = "[email protected]"
 
 __all__ = [

fastapi_cloud_drives/fastapi_s3.py

@@ -8,21 +8,13 @@
 from botocore.exceptions import ClientError
 
 
-class S3(CloudStorageAbstractClass):   
-    def __init__(self, conf):
+class S3:   
+    def __init__(self, conf:dict):
+        self.session = boto3.session.Session()
         self.s3_client = boto3.resource("s3")
-        self.region = None
+        self.region = conf.get("region") or None
 
-    def auth(self):
-        pass
-
-    def build_service(self):
-        pass
-
-    def list_files(self):
-        pass
-
-    def upload_file(self, file_name, bucket, object_name=None, extra_args: dict=None):
+    async def upload_file(self, file_name: str, bucket: str, object_name=None, extra_args: dict=None):
         """Upload a file to an S3 bucket
 
         :param file_name: File to upload
@@ -33,16 +25,18 @@ def upload_file(self, file_name, bucket, object_name=None, extra_args: dict=None
 
         :return: True if file was uploaded, else False
         """
+        s3_client = boto3.client('s3')
+
         # If S3 object_name was not specified, use file_name
         if object_name is None:
             object_name = file_name
 
         # Upload the file
         try:
-            response = self.s3_client.upload_file(
-                file_name = file_name,
-                bucket = bucket,
-                object_name = object_name,
+            response = s3_client.upload_file(
+                file_name,
+                bucket,
+                object_name,
                 ExtraArgs = extra_args,
                 Callback=ProgressPercentage(file_name)
                 )
@@ -52,28 +46,31 @@ def upload_file(self, file_name, bucket, object_name=None, extra_args: dict=None
             return False
         return True
 
-    def download_file(self, bucket_name: str, file_name: str, object_name: str=None, extra_args: dict=None):
-        self.s3_clients3.download_file(
+    async def download_file(self, bucket_name: str, file_name: str, object_name: str=None, extra_args: dict=None):
+        s3_client = self.session.resource("s3")
+
+        s3_client.download_file(
             bucket_name,
             file_name,
             object_name,
             ExtraArgs = extra_args,
             Callback=ProgressPercentage(file_name)
             )
 
-    def list_buckets(self):
+    async def list_buckets(self):
         """[List existing buckets]
 
         Returns:
             [dict]: [List of buckets]
         """
+        s3_client = self.session.resource("s3")
+
         buckets = []
-        for bucket in self.s3_client.buckets.all():
-            buckets.append(bucket)
-            print(bucket.name)
+        for bucket in s3_client.buckets.all():
+            buckets.append(bucket.name)
         return buckets
 
-    def create_bucket(self, bucket_name: str, region_name: str = None):
+    async def create_bucket(self, bucket_name: str):
         """Create an S3 bucket in a specified region
 
         If a region is not specified, the bucket is created in the S3 default
@@ -87,14 +84,15 @@ def create_bucket(self, bucket_name: str, region_name: str = None):
         :return: True if bucket created, else False
         """
         # Create bucket
+        s3_client = self.session.resource("s3")
         try:
             if self.region is None:
-                self.s3_client.create_bucket(Bucket=bucket_name)
+                s3_client.create_bucket(Bucket=bucket_name)
             else:
-                self.s3_client = boto3.client('s3', region_name=region_name)
-                location = {'LocationConstraint': region_name}
+                s3_client = boto3.client('s3', region_name=self.region)
+                location = {'LocationConstraint': self.region}
 
-                self.s3_client.create_bucket(
+                s3_client.create_bucket(
                     Bucket=bucket_name,
                     CreateBucketConfiguration=location
                     )

s3_main.py

@@ -0,0 +1,29 @@
+from logging import debug
+from fastapi_cloud_drives import S3
+
+from fastapi import FastAPI
+from fastapi.responses import JSONResponse
+
+app = FastAPI()
+
+s3_conf = {
+    "region": "eu-central-1",
+}
+
+s3_client = S3(s3_conf)
+
+
+@app.get("/list_buckets")
+async def list_buckets():
+    buckets = await s3_client.list_buckets()
+    return JSONResponse(status_code=200, content=buckets)
+
+@app.get("/create_bucket")
+async def create_bucket():
+    created = await s3_client.create_bucket(bucket_name="fastapibucket")
+    return JSONResponse(status_code=200, content=created)
+
+@app.get("/upload_file")
+async def upload_file():
+    created = await s3_client.upload_file(bucket="fastapibucket", file_name="files/pi.dmg")
+    return JSONResponse(status_code=200, content=created)