sharedkernel 1.6.4__tar.gz → 1.6.6__tar.gz

{sharedkernel-1.6.4 → sharedkernel-1.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.6.4
+Version: 1.6.6
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -20,6 +20,10 @@ Requires-Dist: persiantools
 this a shared kernel package
 
 # Change Log
+### Version 1.6.6
+- Fix bug of phonenumber normalizer
+### Version 1.6.5
+- Update on the JWTBearer (Save decoded token in request state)
 ### Version 1.6.4
 - Update normlizer package
 ### Version 1.6.3

{sharedkernel-1.6.4 → sharedkernel-1.6.6}/README.md

@@ -2,6 +2,10 @@
 this a shared kernel package
 
 # Change Log
+### Version 1.6.6
+- Fix bug of phonenumber normalizer
+### Version 1.6.5
+- Update on the JWTBearer (Save decoded token in request state)
 ### Version 1.6.4
 - Update normlizer package
 ### Version 1.6.3

{sharedkernel-1.6.4 → sharedkernel-1.6.6}/setup.py

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

{sharedkernel-1.6.4 → sharedkernel-1.6.6}/sharedkernel/jwt_service.py

@@ -19,13 +19,14 @@ class JWTBearer(HTTPBearer):
                 JWTBearer, self
             ).__call__(request)
 
-            self.verify(credentials.credentials)
+            decoded_token = self.verify(credentials.credentials)
+            request.state.decoded_token = decoded_token
 
         except:
             raise UnAuthorizedException()       
 
 
-    def verify(self, token: str) -> bool:
+    def verify(self, token: str) -> dict:
             decoded_token = jwt.decode(
             jwt= token.replace("Bearer","").strip(),
             key= self.jwt_config.secret_key,
@@ -36,3 +37,5 @@ class JWTBearer(HTTPBearer):
 
             if decoded_token["exp"] < time.time():
                 raise UnAuthorizedException()
+            
+            return decoded_token

{sharedkernel-1.6.4 → sharedkernel-1.6.6}/sharedkernel/normalizer/phone_number_normalizer.py

@@ -154,15 +154,16 @@ class PhoneNumberNormalizer:
         str_num = str(num)
         next_numbers = set()
         for i in range(len(str_num) - 1):
-            current_digit = int(str_num[i])
-            next_digit = int(str_num[i + 1])
-            new_num = (
-                str_num[:i]
-                + str(int(current_digit) * str(next_digit))
-                + str_num[i + 2 :]
-            )
-            if len(new_num) <= 7:
-                next_numbers.add(str(new_num))
+            if  i <= digit_mapping.SEVEN_DIGIT_PREFIX_LENGTH :
+                current_digit = int(str_num[i])
+                next_digit = int(str_num[i + 1])
+                new_num = (
+                    str_num[:i]
+                    + str(int(current_digit) * str(next_digit))
+                    + str_num[i + 2 :]
+                )
+                if digit_mapping.MIN_NUMBER_FOR_GENERATE <= len(new_num) <= digit_mapping.SEVEN_DIGIT_PREFIX_LENGTH:
+                    next_numbers.add(str(new_num))
         return next_numbers
 
     def __find_seven_chain_numbers(self, start_num):
@@ -204,7 +205,6 @@ class PhoneNumberNormalizer:
 
     def __generate_valid_numbers(self, start_num):
         numbers_list = self.__find_seven_chain_numbers(start_num)
-
         # If the number list length matches the valid criteria, return the first number
         if len(numbers_list) == digit_mapping.GENERATIVE_VALID_NUMBER_COUNT:
             return numbers_list[0] if numbers_list else start_num
@@ -230,7 +230,6 @@ class PhoneNumberNormalizer:
         filtered_numbers = self.__apply_filter(
             filtered_numbers, -4, lambda num: str(num)[-4:] == start_num_str[-4:]
         )
-
         # Return the first valid number or fallback
         return (
             filtered_numbers[0]
@@ -270,12 +269,10 @@ class PhoneNumberNormalizer:
         grouped = [
             (char, len(list(group))) for char, group in itertools.groupby(number_str)
         ]
-
         # Find the max repeated group
         max_repeated_char, max_repeated_len = max(grouped, key=lambda x: x[1])
-
         # Only extend the sequence if the maximum repeated length is greater than 1
-        if max_repeated_len > 1:
+        if max_repeated_len > 1 and int(max_repeated_char) != 0:
             # Find the start index of the sequence
             start_index = number_str.find(max_repeated_char * max_repeated_len)
 
@@ -304,7 +301,7 @@ class PhoneNumberNormalizer:
 
         while i < len(number_str):
             # Check if the next digit is the same as the current one
-            if i > 0 and number_str[i] == number_str[i - 1]:
+            if i > 0 and number_str[i] == number_str[i - 1] and int(number_str[i]) != 0:
                 repeat_count += 1
             else:
                 repeat_count = 1  # Reset the repeat count if the digit changes
@@ -454,7 +451,14 @@ class PhoneNumberNormalizer:
             return self.__update_text_with_number(text, new_number, "۰۹۹", "۰۹۹۹")
 
         return self.__update_general_case(text, number)
-
+        
+    def __normalize_format_text(self, text):
+        # اضافه کردن فاصله قبل و بعد از اعداد
+        text_with_spaces = re.sub(r'(\d+)', r' \1 ', text)
+        # حذف فضاهای اضافی
+        formatted_text = re.sub(r'\s+', ' ', text_with_spaces).strip()
+        return formatted_text
+    
     @staticmethod
     def normalize(text):
         """
@@ -494,5 +498,6 @@ class PhoneNumberNormalizer:
                 <= digit_mapping.PHONE_NUMBER_LENGTH_PARTIAL
             ):
                 cleaned_text = processor.__process_number_replacement(cleaned_text, result)
-
+                #new_version 2.0 fixed bug space between number and word
+                cleaned_text = processor.__normalize_format_text(cleaned_text)
         return cleaned_text if results else text

{sharedkernel-1.6.4 → sharedkernel-1.6.6}/sharedkernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sharedkernel
-Version: 1.6.4
+Version: 1.6.6
 Summary: sharekernel is a shared package between all python projects
 Author: Smilinno
 Description-Content-Type: text/markdown
@@ -20,6 +20,10 @@ Requires-Dist: persiantools
 this a shared kernel package
 
 # Change Log
+### Version 1.6.6
+- Fix bug of phonenumber normalizer
+### Version 1.6.5
+- Update on the JWTBearer (Save decoded token in request state)
 ### Version 1.6.4
 - Update normlizer package
 ### Version 1.6.3