Merge branch 'main' of https://github.com/mesoscope/cellpack into fea…

…ture/upload-to-s3

.github/workflows/analyze.yml

@@ -1,6 +1,10 @@
 name: Analyze
 
-on: push
+on: 
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
     Analyze:

cellpack/autopack/AWSHandler.py

@@ -1,7 +1,8 @@
 import logging
+from pathlib import Path
+
 import boto3
 from botocore.exceptions import ClientError
-from pathlib import Path
 
 
 class AWSHandler(object):
@@ -33,14 +34,13 @@ def get_aws_object_key(self, object_name):
 
     def upload_file(self, file_path):
         """Upload a file to an S3 bucket
-
         :param file_path: File to upload
         :param bucket: Bucket to upload to
         :param object_name: S3 object name. If not specified then file_path is used
         :return: True if file was uploaded, else False
         """
 
-        file_name = Path(file_path).stem
+        file_name = Path(file_path).name
 
         object_name = self.get_aws_object_key(file_name)
         # Upload the file
@@ -57,7 +57,6 @@ def upload_file(self, file_path):
 
     def create_presigned_url(self, object_name, expiration=3600):
         """Generate a presigned URL to share an S3 object
-
         :param object_name: string
         :param expiration: Time in seconds for the presigned URL to remain valid
         :return: Presigned URL as string. If error, returns None.
@@ -76,3 +75,11 @@ def create_presigned_url(self, object_name, expiration=3600):
         # The response contains the presigned URL
         # https://{self.bucket_name}.s3.{region}.amazonaws.com/{object_key}
         return url
+
+    def save_file(self, file_path):
+        """
+        Uploads a file to S3 and returns the presigned url
+        """
+        file_name = self.upload_file(file_path)
+        if file_name:
+            return self.create_presigned_url(file_name)