From 3320a488f3a30d154d6d8eba55c84d1086c6da75 Mon Sep 17 00:00:00 2001 From: Son NK Date: Mon, 23 Dec 2019 14:56:55 +0000 Subject: [PATCH] refactor s3.py --- app/s3.py | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/app/s3.py b/app/s3.py index dfbb1e69..93c6723a 100644 --- a/app/s3.py +++ b/app/s3.py @@ -3,15 +3,9 @@ from io import BytesIO import boto3 import requests -from app.config import ( - AWS_REGION, - BUCKET, - AWS_ACCESS_KEY_ID, - AWS_SECRET_ACCESS_KEY, - AVATAR_URL_EXPIRATION, -) +from app.config import AWS_REGION, BUCKET, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY -session = boto3.Session( +_session = boto3.Session( aws_access_key_id=AWS_ACCESS_KEY_ID, aws_secret_access_key=AWS_SECRET_ACCESS_KEY, region_name=AWS_REGION, @@ -20,7 +14,7 @@ session = boto3.Session( def upload_from_bytesio(key: str, bs: BytesIO, content_type="string") -> None: bs.seek(0) - session.resource("s3").Bucket(BUCKET).put_object( + _session.resource("s3").Bucket(BUCKET).put_object( Key=key, Body=bs, ContentType=content_type ) @@ -31,21 +25,14 @@ def upload_from_url(url: str, upload_path): def delete_file(key: str) -> None: - o = session.resource("s3").Bucket(BUCKET).Object(key) + o = _session.resource("s3").Bucket(BUCKET).Object(key) o.delete() def get_url(key: str, expires_in=3600) -> str: - s3_client = session.client("s3") + s3_client = _session.client("s3") return s3_client.generate_presigned_url( ExpiresIn=expires_in, ClientMethod="get_object", Params={"Bucket": BUCKET, "Key": key}, ) - - -if __name__ == "__main__": - with open("/tmp/1.png", "rb") as f: - upload_from_bytesio("1.png", BytesIO(f.read())) - - print(get_url(BUCKET, "1.png"))