sharedkernel 1.7.1__tar.gz → 1.7.3__tar.gz

{sharedkernel-1.7.1 → sharedkernel-1.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.7.1
+Version: 1.7.3
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -20,6 +20,10 @@ Requires-Dist: boto3
 this a shared kernel package
 
 # Change Log
+### Version 1.7.3
+- Add optional folder name for s3 uploader to save the file in
+### Version 1.7.2
+- Fix bug of to_diff_persian_date_time_string
 ### Version 1.7.1
 - Update BaseDocument initial values
 ### Version 1.7.0

{sharedkernel-1.7.1 → sharedkernel-1.7.3}/README.md

@@ -2,6 +2,10 @@
 this a shared kernel package
 
 # Change Log
+### Version 1.7.3
+- Add optional folder name for s3 uploader to save the file in
+### Version 1.7.2
+- Fix bug of to_diff_persian_date_time_string
 ### Version 1.7.1
 - Update BaseDocument initial values
 ### Version 1.7.0

{sharedkernel-1.7.1 → sharedkernel-1.7.3}/setup.py

@@ -35,7 +35,7 @@ setup(
         "boto3"
     ],
     # *strongly* suggested for sharing
-    version="1.7.1",
+    version="1.7.3",
     description="sharekernel is a shared package between all python projects",
     long_description=long_description,
     long_description_content_type="text/markdown",

{sharedkernel-1.7.1 → sharedkernel-1.7.3}/sharedkernel/date_converter.py

@@ -76,7 +76,7 @@ class DateConverter:
             total_days = abs(total_days)
             total_months = abs(total_months)
 
-        date_time_today = comparison_base.date()
+        date_time_today = JalaliDateTime.to_jalali(comparison_base)
         yesterday = date_time_today - timedelta(days=1)
         tomorrow = date_time_today + timedelta(days=1)
 
@@ -95,10 +95,10 @@ class DateConverter:
             if total_seconds < 86400:
                 return f"{floor(total_seconds / 3600)} ساعت{suffix}{hh_mm}"
 
-        if yesterday == date.date():
-            return f"دیروز {get_persian_day_name(JalaliDate(yesterday.year, yesterday.month, yesterday.day -1))}"
+        if yesterday.date() == date.date():
+            return f"دیروز {get_persian_day_name(JalaliDate(yesterday.year, yesterday.month, yesterday.day))}"
         if tomorrow == date.date():
-            return f"فردا {get_persian_day_name(JalaliDate(tomorrow.year, tomorrow.month, tomorrow.day -1))}"
+            return f"فردا {get_persian_day_name(JalaliDate(tomorrow.year, tomorrow.month, tomorrow.day))}"
 
         if total_days < MONTH:  # 30 days
             return f"{int(total_days)} روز{suffix}"
@@ -106,7 +106,7 @@ class DateConverter:
         total_months = int(total_days / MONTH)
         total_days = total_days - total_months * MONTH
 
-        if total_months < 12 * MONTH:
+        if total_months < 12:
             if total_days == 0:
                 return f"{total_months} ماه {suffix}"
             else:

{sharedkernel-1.7.1 → sharedkernel-1.7.3}/sharedkernel/s3_uploader.py

@@ -27,13 +27,14 @@ class S3Uploader:
             aws_secret_access_key=self.secret_key,
         )
 
-    def upload_file_object(self, file_obj, object_name=None, file_extension=None):
+    def upload_file_object(self, file_obj, object_name=None, file_extension=None, folder_name=None):
         """
         Uploads a file object to an S3 bucket and returns its URL.
 
         :param file_obj: File object to upload
         :param object_name: S3 file name to save as (optional)
         :param file_extension: File extension to append to object name (optional)
+        :param folder_name: Optional folder name to save the file in
         :return: URL of the uploaded file if successful, else False
         """
         # Use uuid4 to generate a unique object_name if not provided
@@ -44,6 +45,10 @@ class S3Uploader:
         if file_extension:
             object_name += file_extension
 
+        # Prefix the object name with the folder if provided
+        if folder_name:
+            object_name = f"{folder_name}/{object_name}"
+
         # Upload the file object
         self.s3.upload_fileobj(file_obj, self.bucket, object_name, ExtraArgs={'ACL':'public-read'})
         print(f"File object uploaded to {self.bucket} as {object_name}.")
@@ -53,20 +58,21 @@ class S3Uploader:
 
         return file_url
 
-    def upload_file_from_url(self, file_url, object_name=None):
+    def upload_file_from_url(self, file_url, object_name=None, folder_name=None):
         """
         Downloads a file from a URL and uploads it to an S3 bucket, returning its URL.
 
         :param file_url: URL of the file to download
         :param object_name: S3 file name to save as (optional)
+        :param folder_name: Optional folder name to save the file in
         :return: URL of the uploaded file if successful, else False
         """
         # Step 1: Download the file from the provided URL
         response = requests.get(file_url)
         response.raise_for_status()  # Check if the request was successful
 
-         # Extract file extension from the URL if available
-        file_extension = os.path.splitext(file_url)[1]  # Get extension from URL (e.g., .jpg, .png, etc.)
+        # Extract file extension from the URL if available
+        file_extension = os.path.splitext(file_url)[1]  # Get extension from URL (e.g., .jpg, .mp3, etc.)
         
         # Use the filename from the URL if no object_name is provided, otherwise use uuid4
         if object_name is None:
@@ -74,4 +80,4 @@ class S3Uploader:
 
         # Step 2: Upload the file to S3
         file_obj = BytesIO(response.content)
-        return self.upload_file_object(file_obj, object_name, file_extension)
+        return self.upload_file_object(file_obj=file_obj, object_name=object_name, file_extension=file_extension, folder_name=folder_name)

{sharedkernel-1.7.1 → sharedkernel-1.7.3}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.7.1
+Version: 1.7.3
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -20,6 +20,10 @@ Requires-Dist: boto3
 this a shared kernel package
 
 # Change Log
+### Version 1.7.3
+- Add optional folder name for s3 uploader to save the file in
+### Version 1.7.2
+- Fix bug of to_diff_persian_date_time_string
 ### Version 1.7.1
 - Update BaseDocument initial values
 ### Version 1.7.0