fix core-lib

core_lib/helpers/validation.py

@@ -38,11 +38,11 @@ def is_int(val) -> bool:
 #
 # complex
 #
+EMAIL_CHECK_REGEX = r'^\b[\w\D][^<>\[\]]+@[\w.-]+\.[A-Z|a-z]{2,}\b$'
 def is_email(email: str) -> bool:
-    regex = r'\b[\w\D][^<>\[\]]+@[\w.-]+\.[A-Z|a-z]{2,}\b'
     if email is None:
         return False
-    return True if re.fullmatch(regex, email) else False
+    return True if re.fullmatch(EMAIL_CHECK_REGEX, email) else False
 
 
 def is_int_enum(int_value: int, enum: IntEnum) -> bool:

core_lib/rule_validator/rule_validator.py

@@ -26,7 +26,10 @@ def __init__(
         self.prohibited_keys = prohibited_keys
 
         self.rules = {}
-        for rule_validator in value_rule_validators:
+        self.update(value_rule_validators)
+
+    def update(self, additional_validators):
+        for rule_validator in additional_validators:
             if not isinstance(rule_validator, ValueRuleValidator):
                 raise ValueError(
                     f'RuleValidator.value_rule_validators can only be from type '

core_lib/rule_validator/rule_validator_decorator.py

@@ -39,6 +39,9 @@ def __wrapper(*args, **kwargs):
                     f'Apply only when updating the database with `dict` parameters '
                 )
 
+            if 'additional_validators' in kwargs and type(kwargs['additional_validators']) is list:
+                self.rule_validator.update(kwargs['additional_validators'])
+
             updated_dict = self.rule_validator.validate_dict(
                 update_dict,
                 strict_mode=self.strict_mode,

core_lib/session/jwt_token_handler.py

@@ -16,8 +16,9 @@ def __init__(self, secret, expiration_time: timedelta, verify: bool = False, alg
         self._logger = logging.getLogger(self.__class__.__name__)
 
     def encode(self, message: dict) -> str:
-        if 'exp' not in message and self._expiration_time:
+        if self._expiration_time:
             message['exp'] = (datetime.utcnow() + self._expiration_time).timestamp()
+
         return jwt.encode(message, self._secret, algorithm=self._algorithm)
 
     def decode(self, encoded):

requirements.txt

@@ -1,5 +1,5 @@
 #Core lib
-hydra-core
+hydra-core==1.2
 python-dateutil
 PyJWT
 argh
@@ -37,5 +37,4 @@ python-dotenv
 moto
 freezegun
 mongomock
-flask_wtf
-elasticsearch~=8.9.0
+flask_wtf