sharedkernel 1.4.5__tar.gz → 1.5.1__tar.gz

{sharedkernel-1.4.5 → sharedkernel-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.4.5
+Version: 1.5.1
 Summary: sharekernel is an shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -14,11 +14,17 @@ Requires-Dist: chromadb
 Requires-Dist: persian_tools
 Requires-Dist: sentry-sdk
 Requires-Dist: jdatetime
+Requires-Dist: persiantools
 
 # SharedKernel
 this a shared kernel package
 
 # Change Log
+### Version 1.5.1
+- fix mongo repository bug
+### Version 1.5.0
+- implement date converter
+  -  example: فردا - دیروز - یک ماه قبل
 ### Version 1.4.5
 - upgrade fastapi version
 ### Version 1.4.4

{sharedkernel-1.4.5 → sharedkernel-1.5.1}/README.md

@@ -2,6 +2,11 @@
 this a shared kernel package
 
 # Change Log
+### Version 1.5.1
+- fix mongo repository bug
+### Version 1.5.0
+- implement date converter
+  -  example: فردا - دیروز - یک ماه قبل
 ### Version 1.4.5
 - upgrade fastapi version
 ### Version 1.4.4

{sharedkernel-1.4.5 → sharedkernel-1.5.1}/setup.py

@@ -29,10 +29,11 @@ setup(
         "chromadb",
         "persian_tools",
         "sentry-sdk",
-        "jdatetime"
+        "jdatetime",
+        "persiantools"
     ],
     # *strongly* suggested for sharing
-    version="1.4.5",
+    version="1.5.1",
     description="sharekernel is an shared package between all python projects",
     long_description=long_description,
     long_description_content_type="text/markdown",

{sharedkernel-1.4.5 → sharedkernel-1.5.1}/sharedkernel/database/mongo_generic_repository.py

@@ -22,6 +22,7 @@ class MongoGenericRepository(Generic[T]):
         query = {"_id": ObjectId(id), "is_deleted": False}
         result = self.collection.find_one(query)
         return self._map_to_model(result) if result else None
+    
 
     def insert_one(self, data: T) -> str:
         delattr(data, "id")
@@ -46,5 +47,6 @@ class MongoGenericRepository(Generic[T]):
 
     def get_all(self, page_number=1, page_size=10) -> List[T]:
         skip_count = (page_number - 1) * page_size
-        result = self.collection.find().skip(skip_count).limit(page_size)
+        query = {"is_deleted": False}
+        result = self.collection.find(query).skip(skip_count).limit(page_size)
         return [self._map_to_model(doc) for doc in result]

sharedkernel-1.5.1/sharedkernel/date_converter.py

@@ -0,0 +1,122 @@
+import jdatetime
+from datetime import datetime, timedelta
+from persiantools.jdatetime import JalaliDate, JalaliDateTime
+from math import floor
+
+from sharedkernel.enum import ErrorCode
+
+MONTH = 30
+
+
+class DateConverter:
+    @staticmethod
+    def to_jalali(
+        input_datetime: datetime | jdatetime.datetime, format_string: str = "%Y/%m/%d"
+    ):
+        if isinstance(input_datetime, jdatetime.datetime):
+            return input_datetime.strftime(format_string)
+
+        if isinstance(input_datetime, datetime):
+            jalali_date = jdatetime.datetime.fromgregorian(date=input_datetime)
+            return jalali_date.strftime(format_string)
+
+        raise ValueError(ErrorCode.Unsupported_Date_Type)
+
+    @staticmethod
+    def to_georgian(
+        input_datetime: datetime | jdatetime.datetime, format_string: str = "%Y/%m/%d"
+    ):
+        if isinstance(input_datetime, jdatetime.datetime):
+            georgian_date = jdatetime.datetime.togregorian(input_datetime)
+            return georgian_date.strftime(format_string)
+
+        if isinstance(input_datetime, datetime):
+            return input_datetime.strftime(format_string)
+
+        raise ValueError(ErrorCode.Unsupported_Date_Type)
+
+    @staticmethod
+    def to_diff_persian_date_time_string(
+        dt, comparison_base, append_hh_mm=False, has_suffix=False
+    ):
+
+        def get_persian_day_name(jalali_date):
+            # Adjust this function based on how Persian day names should be retrieved
+            day_names = [
+                "شنبه",
+                "یک‌شنبه",
+                "دوشنبه",
+                "سه‌شنبه",
+                "چهارشنبه",
+                "پنج‌شنبه",
+                "جمعه",
+            ]
+            return day_names[jalali_date.weekday()]
+
+        persian_date = JalaliDateTime.to_jalali(dt)
+        persian_year = persian_date.year
+        persian_month = persian_date.month
+        persian_day = persian_date.day
+
+        hour = dt.hour
+        minute = dt.minute
+        hh_mm = f"{hour:02}:{minute:02}"
+
+        date = JalaliDateTime(persian_year, persian_month, persian_day, hour, minute)
+        diff = date - comparison_base
+        total_seconds = round(diff.total_seconds())
+        total_days = round(total_seconds / 86400)
+        total_hours = abs(round(total_seconds / 3600))
+        total_months = abs(total_days // MONTH)  # Approximate months calculation
+
+        suffix = " بعد"
+        if total_seconds < 0:
+            suffix = " قبل"
+            total_seconds = abs(total_seconds)
+            total_days = abs(total_days)
+            total_months = abs(total_months)
+
+        date_time_today = comparison_base.date()
+        yesterday = date_time_today - timedelta(days=1)
+        tomorrow = date_time_today + timedelta(days=1)
+
+        suffix = suffix if has_suffix else ""
+        hh_mm = f"، ساعت {hh_mm}" if append_hh_mm else ""
+
+        if total_hours < 24:
+            if total_seconds < 60:
+                return "هم اکنون"
+            if total_seconds < 120:
+                return f"یک دقیقه{suffix}{hh_mm}"
+            if total_seconds < 3600:
+                return f"{floor(total_seconds / 60)} دقیقه{suffix}{hh_mm}"
+            if total_seconds < 7200:
+                return f"یک ساعت{suffix}{hh_mm}"
+            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 tomorrow == date.date():
+            return f"فردا {get_persian_day_name(JalaliDate(tomorrow.year, tomorrow.month, tomorrow.day -1))}"
+
+        if total_days < MONTH:  # 30 days
+            return f"{int(total_days)} روز{suffix}"
+
+        total_months = int(total_days / MONTH)
+        total_days = total_days - MONTH
+
+        if total_months < 12 * MONTH:
+            if total_days == 0:
+                return f"{total_months} ماه {suffix}"
+            else:
+                return f"{total_months} ماه و {total_days} روز{suffix}"
+
+        # Handling years and months
+        total_years = total_months // 12
+        remaining_months = total_months % 12
+        if remaining_months > 0:
+            return f"{total_years} سال و {remaining_months} ماه{suffix}"
+        else:
+            return f"{total_years} سال{suffix}"
+

{sharedkernel-1.4.5 → sharedkernel-1.5.1}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.4.5
+Version: 1.5.1
 Summary: sharekernel is an shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -14,11 +14,17 @@ Requires-Dist: chromadb
 Requires-Dist: persian_tools
 Requires-Dist: sentry-sdk
 Requires-Dist: jdatetime
+Requires-Dist: persiantools
 
 # SharedKernel
 this a shared kernel package
 
 # Change Log
+### Version 1.5.1
+- fix mongo repository bug
+### Version 1.5.0
+- implement date converter
+  -  example: فردا - دیروز - یک ماه قبل
 ### Version 1.4.5
 - upgrade fastapi version
 ### Version 1.4.4

{sharedkernel-1.4.5 → sharedkernel-1.5.1}/sharedkernel.egg-info/requires.txt

@@ -8,3 +8,4 @@ chromadb
 persian_tools
 sentry-sdk
 jdatetime
+persiantools

sharedkernel-1.4.5/sharedkernel/date_converter.py

@@ -1,32 +0,0 @@
-import jdatetime
-from datetime import datetime
-
-from sharedkernel.enum import ErrorCode
-
-
-class DateConverter:
-    @staticmethod
-    def to_jalali(
-        input_datetime: datetime | jdatetime.datetime, format_string: str = "%Y/%m/%d"
-    ):
-        if isinstance(input_datetime, jdatetime.datetime):
-            return input_datetime.strftime(format_string)
-
-        if isinstance(input_datetime, datetime):
-            jalali_date = jdatetime.datetime.fromgregorian(date=input_datetime)
-            return jalali_date.strftime(format_string)
-
-        raise ValueError(ErrorCode.Unsupported_Date_Type)
-
-    @staticmethod
-    def to_georgian(
-        input_datetime: datetime | jdatetime.datetime, format_string: str = "%Y/%m/%d"
-    ):
-        if isinstance(input_datetime, jdatetime.datetime):
-            georgian_date = jdatetime.datetime.togregorian(input_datetime)
-            return georgian_date.strftime(format_string)
-
-        if isinstance(input_datetime, datetime):
-            return input_datetime.strftime(format_string)
-
-        raise ValueError(ErrorCode.Unsupported_Date_Type)