python-sdk-remote 0.0.148__py3-none-any.whl → 0.0.150__py3-none-any.whl

python_sdk_remote/constants.py

@@ -7,7 +7,7 @@ OBJECT_TO_INSERT_CODE = {
     'component_id': PYTHON_SDK_REMOTE_COMPONENT_ID,
     'component_name': PYTHON_SDK_REMOTE_COMPONENT_NAME,
     'component_category': LoggerComponentEnum.ComponentCategory.Code.value,
-    'developer_email': 'sahar.g@circ.zone'
+    'developer_email_address': 'sahar.g@circ.zone'
 }
 
 OBJECT_TO_INSERT_TEST = {
@@ -15,6 +15,5 @@ OBJECT_TO_INSERT_TEST = {
     'component_name': PYTHON_SDK_REMOTE_COMPONENT_NAME,
     'component_category': LoggerComponentEnum.ComponentCategory.Unit_Test.value,
     'testing_framework': LoggerComponentEnum.testingFramework.pytest.value,
-    'developer_email': 'sahar.g@circ.zone'
+    'developer_email_address': 'sahar.g@circ.zone'
 }
-

python_sdk_remote/mini_logger.py

@@ -1,10 +1,7 @@
 import logging
 import os
 import sys
-from enum import Enum
-import inspect
-from .constants_src_mini_logger import LogMessageSeverity, StartEndEnum
- 
+
 # TODO LOGGER_MINIMAL_SEVERITY_DEFAULT
 LOGGER_MINIMUM_SEVERITY = os.getenv("LOGGER_MINIMUM_SEVERITY", "INFO").upper()
 # logging expects NOTSET/DEBUG/INFO/WARNING/ERROR/FATAL/CRITICAL
@@ -12,18 +9,18 @@ if LOGGER_MINIMUM_SEVERITY.isdigit():
     # TODO logger_minimal_severity_default_value
     logger_minimum_severity = int(LOGGER_MINIMUM_SEVERITY)
     # TODO Change Magic Numbers and use the values from Logger.MessageSeverity
-    if logger_minimum_severity < LogMessageSeverity.Start.value:
+    if logger_minimum_severity < 400:
         # TODO LOGGER_MINIMAL_SEVERITY_DEFAULT_NAME =
-        # TODO Change "DEBUG", "INFO", "WARNING" ... into enum values from Logger.LogMessageSeverity
-        LOGGER_MINIMUM_SEVERITY = LogMessageSeverity.Debug
-    elif logger_minimum_severity < LogMessageSeverity.Warning.value:
-        LOGGER_MINIMUM_SEVERITY = LogMessageSeverity.Info
-    elif logger_minimum_severity < LogMessageSeverity.Error.value:
-        LOGGER_MINIMUM_SEVERITY = LogMessageSeverity.Warning
-    elif logger_minimum_severity < LogMessageSeverity.Critical.value:
-        LOGGER_MINIMUM_SEVERITY = LogMessageSeverity.Error
+        # TODO Change "DEBUG", "INFO", "WARNING" ... into enum values from Logger.MessageSeverity
+        LOGGER_MINIMUM_SEVERITY = "DEBUG"
+    elif logger_minimum_severity < 600:
+        LOGGER_MINIMUM_SEVERITY = "INFO"
+    elif logger_minimum_severity < 700:
+        LOGGER_MINIMUM_SEVERITY = "WARNING"
+    elif logger_minimum_severity < 800:
+        LOGGER_MINIMUM_SEVERITY = "ERROR"
     else:
-        LOGGER_MINIMUM_SEVERITY = LogMessageSeverity.Critical
+        LOGGER_MINIMUM_SEVERITY = "CRITICAL"
 
 logging.basicConfig(level=LOGGER_MINIMUM_SEVERITY, stream=sys.stdout,
                     format="%(asctime)s - %(message)s")
@@ -31,108 +28,105 @@ logger = logging.getLogger(__name__)
 
 
 class MiniLogger:
-    # TODO Can we so one generic function call by all
+    # TODO Can we have one generic function called by all as we have a lot of duplicated code here?
 
-    @staticmethod
-    def _log(level: LogMessageSeverity, start_or_end: StartEndEnum = None, log_message: str = None, **kwargs):
-        """
-        Private method to unify all log methods
-
-        Parameters:
-            level (MessageSeverity): log level
-            log_message (str): The message to be printed.
-        """
-        object = kwargs.get("object")
-        method_name = level.name.lower()
-        method = getattr(logger, method_name)
-        if not start_or_end:
-            action_name = level.name
-        else:
-            action_name = start_or_end.name
-        stk = inspect.stack()[2]
-        function = stk.function
-        line = stk.lineno
-        if object is None:
-            method(f"Function: {function}, Line: {line}; {action_name} - {log_message}")
-        else:
-            method(f"Function: {function}, Line: {line}; {action_name} - {log_message} - {object}")
-        
+    # TODO: print the caller function name
 
     @staticmethod
-    # TODO Add a new file called align_logger_and_minilogger_test.py, which makes sure the signature of all methods of MiniLogger and Logger are the same and we can change from MiniLogger to Logger and vice versa by changing only one line in our code. If we should change the signatures, we should make them backward compatible.
-    def start(log_message: str = None, **kwargs):
+    def start(message: str = "", object: dict = None):
         """
         Print a log message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
+            object (dict): The object to be printed.
         """
-        MiniLogger._log(LogMessageSeverity.Debug, StartEndEnum.Start, log_message, **kwargs)
+        if object is None:
+            logger.debug(f"START - {message}")
+        else:
+            logger.debug(f"START - {message} - {object}")
 
     @staticmethod
-    def end(log_message: str = None, **kwargs):
+    def end(message: str = "", object: dict = None):
         """
         Print a log message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
         """
-        MiniLogger._log(LogMessageSeverity.Debug, StartEndEnum.End, log_message, **kwargs)
+        if object is None:
+            logger.debug(f"END - {message}")
+        else:
+            logger.debug(f"END - {message} - {object}")
 
     # TODO convert all those methods (debug, info, warning, error) into one unified private method
-    # TODO Add to the unified private method print of the name of method, version 
-    # and line number of the calling function/method to the mini_logger methods
+    # TODO Add to the unified private method print of the name of method, version and line number of the calling function/method to the mini_logger methods  # noqa: E501
     @staticmethod
-    def debug(log_message: str = None, **kwargs):
+    def debug(message: str = "", object: dict = None):
         """
         Print a log message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
+            object (dict): The object to be printed.
         """
-        MiniLogger._log(LogMessageSeverity.Debug, log_message=log_message, **kwargs)
+        if object is None:
+            logger.debug(f"DEBUG - {message}")
+        else:
+            logger.debug(f"DEBUG {message} - {object}")
 
     @staticmethod
-    def info(log_message: str = None, **kwargs):
+    def info(message: str = "", object: dict = None):
         """
         Print a log message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
+            object (dict): The object to be printed.
         """
-        MiniLogger._log(LogMessageSeverity.Info, log_message=log_message, **kwargs)
+        if object is None:
+            logger.info(f"INFO - {message}")
+        else:
+            logger.info(f"INFO {message} - {object}")
 
     @staticmethod
-    def warning(log_message: str = None, **kwargs):
+    def warning(message: str = "", object: dict = None):
         """
         Print a log message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
+            object (dict): The object to be printed.
         """
         # TODO Add the source of the message - We should add the object or atleast some parts of it
-        MiniLogger._log(LogMessageSeverity.Warning, log_message=log_message, **kwargs)
-
+        if object is None:
+            logger.warning(f"WARNING - {message}")
+        else:
+            logger.warning(f"WARNING {message} - {object}")
 
     @staticmethod
-    def error(log_message: str = None, **kwargs):
+    def error(message: str = "", object: dict = None):
         """
         Print a log error message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
+            object (dict): The object to be printed.
         """
-        MiniLogger._log(LogMessageSeverity.Error, log_message=log_message, **kwargs)
+        if object is None:
+            logger.error(f"ERROR - {message}")
+        else:
+            logger.error(f"ERROR - {message} - {object}")
 
     @staticmethod
-    def exception(log_message: str = None, **kwargs):
+    def exception(message: str = "", object: Exception or dict = None):
         """
         Print a log error message with the current time.
 
         Parameters:
-            log_message (str): The message to be printed.
+            message (str): The message to be printed.
+            object (dict / Exception): The object / Exception to be printed.
         """
-        object = kwargs.get("object")
         if isinstance(object, Exception):
             exception = object
         elif isinstance(object, dict):
@@ -141,6 +135,6 @@ class MiniLogger:
             exception = None
 
         if object is None:
-            logger.exception(f"EXCEPTION - {log_message}")
+            logger.exception(f"EXCEPTION - {message}")
         else:
-            logger.exception(f"EXCEPTION- {log_message} - {object}", exc_info=exception)
+            logger.exception(f"EXCEPTION- {message} - {object}", exc_info=exception)

python_sdk_remote/utilities.py

@@ -279,6 +279,21 @@ def is_datetime_in_datetime_range(check_datetime: datetime, datetime_range: (dat
     return is_datetime_in_datetime_range_result
 
 
+# TODO add optional_prefix optional parameter. First check with optional_prefix, if not found, check without it.
+def our_get_env(key: str, default: str = None, raise_if_not_found: bool = True,
+                raise_if_empty: bool = False) -> str:
+    logger.start(object={"key": key, "default": default,
+                         "raise_if_not_found": raise_if_not_found,
+                         "raise_if_empty": raise_if_empty})
+    env_var = os.getenv(key, default)
+    # TODO: "default is None" is always False
+    if ((raise_if_not_found and key not in os.environ and default is None)
+            or (raise_if_empty and not env_var and not default)):
+        raise Exception(f"Environment variable {key} not found - please check your .env file")  # noqa: E501
+    logger.end(object={"env_var": env_var})
+    return env_var
+
+
 def get_brand_name(raise_if_not_found: bool = True,
                    raise_if_empty: bool = False) -> str:
     get_brand_name_result = our_get_env("BRAND_NAME",
@@ -296,22 +311,26 @@ def get_environment_name(raise_if_not_found: bool = True,
     return environment_name
 
 
-def our_get_env(key: str, default: str = None, raise_if_not_found: bool = True,
-                raise_if_empty: bool = False) -> str:
-    logger.start(object={"key": key, "default": default,
-                         "raise_if_not_found": raise_if_not_found,
-                         "raise_if_empty": raise_if_empty})
-    env_var = os.getenv(key, default)
-    # TODO: "default is None" is always False
-    if ((raise_if_not_found and key not in os.environ and default is None)
-            or (raise_if_empty and not env_var and not default)):
-        raise Exception(f"Environment variable {key} not found - please check your .env file")  # noqa: E501
-    logger.end(object={"env_var": env_var})
-    return env_var
+def get_product_user_identifier(raise_if_not_found: bool = True,
+                                raise_if_empty: bool = False) -> str:
+    get_product_user_identifier_result = our_get_env("PRODUCT_USER_IDENTIFIER",
+                                                     raise_if_not_found=raise_if_not_found,  # noqa E501
+                                                     raise_if_empty=raise_if_empty)  # noqa E501
+    return get_product_user_identifier_result
+
+
+def get_product_user_password(raise_if_not_found: bool = True,
+                              raise_if_empty: bool = False) -> str:
+    # TODO Add support to PRODUCT_USER_PASSWORD and deprecation message for PRODUCT_PASSWORD (backward compatible)
+    get_product_user_password_result = our_get_env("PRODUCT_PASSWORD",
+                                                     raise_if_not_found=raise_if_not_found,  # noqa E501
+                                                     raise_if_empty=raise_if_empty)  # noqa E501
+    return get_product_user_password_result
 
 
 # TODO As only the database package uses those, let's move those three to the database package  # noqa: E501
-def get_sql_hostname(raise_if_not_found: bool = True, raise_if_empty: bool = False) -> str:
+def get_sql_hostname(raise_if_not_found: bool = True,
+                     raise_if_empty: bool = False) -> str:
     get_sql_hostname_result = our_get_env("RDS_HOSTNAME",
                                           raise_if_empty=raise_if_empty)
     return get_sql_hostname_result
@@ -416,7 +435,7 @@ def validate_arguments(args: dict) -> None:
     :return: True if all arguments are not None or '', False otherwise
     """
     for arg, value in args.items():
-        if not value:
+        if not arg:
             raise ValueError(f"Argument {arg} is cannot be empty (got {value})")
 
 
@@ -456,8 +475,10 @@ def camel_to_snake(camel_str: str) -> str:
     return snake_str
 
 
+# We have both deprecation_warning as method in Logger and as a standalone function
+# We can call the deprecation_warning_function from the logger
 @lru_cache(maxsize=64)  # don't print the same warning multiple times
-def deprecation_warning(old_name: str, new_name: str, start_date: date = None) -> None:
+def deprecation_warning_function(old_name: str, new_name: str, start_date: date = None) -> None:
     if start_date and start_date < date.today():
         return
     warnings_message = f"Please use {old_name} instead of {new_name}."

{python_sdk_remote-0.0.148.dist-info → python_sdk_remote-0.0.150.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-sdk-remote
-Version: 0.0.148
+Version: 0.0.150
 Summary: PyPI Package for Circles Python SDK Local Python
 Home-page: https://github.com/circles-zone/python-sdk-remote-python-package
 Author: Circles

{python_sdk_remote-0.0.148.dist-info → python_sdk_remote-0.0.150.dist-info}/RECORD

@@ -1,16 +1,15 @@
 python_sdk_remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_sdk_remote/constants.py,sha256=Zg4_KOlTkbqdKwua3oTe_64QyYvK_mhA6KnriQMBIPo,752
-python_sdk_remote/constants_src_mini_logger.py,sha256=ukaPhopFSxnLeQwyHa4VUi3TACh4QuKn77JtSK8Z1Tg,247
+python_sdk_remote/constants.py,sha256=8n1iV8CJV5YdVeusue2Hfef8BGEFP72V3ycl2E0INLI,767
 python_sdk_remote/http_response.py,sha256=5_h9xOtUhsMzxUiLT4wkYBpL0StA7XYtaqKF4esGwis,6370
 python_sdk_remote/is_test_data.py,sha256=zbUz-Juj7vOPG9TtIttMIBWFxbsOs4-TuR1RYfGNkp4,92
 python_sdk_remote/item.py,sha256=6DQs1nBKbEmnHjE50vZtkMr14ECS_9b8cvE7ItPAbhE,322
-python_sdk_remote/mini_logger.py,sha256=5oX64d2vCrfa_5-WSeIxFaz9BenrUaGf8goIMyd_UUo,5659
+python_sdk_remote/mini_logger.py,sha256=EAARhRUvUTQKeSJLDS5n9AxNra9Jk0DUyFsAMhX0wCs,4869
 python_sdk_remote/our_object.py,sha256=Db3_CbM4e1VtDU97VDesnBNMXNuYvnuDL7QqHv4MgJo,4618
 python_sdk_remote/unified_json.py,sha256=zk4Lo9t9MSHXW8UKdo50YCYmFv5FgTsmHf6l2AWqLWU,961
-python_sdk_remote/utilities.py,sha256=4xwiZ6dvHBFnG4LGFKoY-Sey8h5-jLOT9BcGGA9KyNY,16754
+python_sdk_remote/utilities.py,sha256=MVWbVkuWQNywumh-7Sw1cLy3Fiq7EMtJiYzJ0HclRzw,18072
 python_sdk_remote/valid_json_versions.py,sha256=-ZU65JYI6gTEfK8o6gu9Dmm9SQmwzj5pDbEXiyUbBhQ,138
 python_sdk_remote/validate_environment.py,sha256=nzCHZDw56G56ekrTQT3gG48utjsU4VCwQi9dVsBDas0,2268
-python_sdk_remote-0.0.148.dist-info/METADATA,sha256=ffemxup2_QpPRISlrVd8TGxc91Tz3552mbabczSrbVQ,729
-python_sdk_remote-0.0.148.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_sdk_remote-0.0.148.dist-info/top_level.txt,sha256=JTpEq_svPlI5hTlPq30Ne-NkR-u5464gjVDP2U74PvE,18
-python_sdk_remote-0.0.148.dist-info/RECORD,,
+python_sdk_remote-0.0.150.dist-info/METADATA,sha256=dtgAcLP89567n7fieDu8GWgxXB3fHwyNkIKK6t8yXhI,729
+python_sdk_remote-0.0.150.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_sdk_remote-0.0.150.dist-info/top_level.txt,sha256=JTpEq_svPlI5hTlPq30Ne-NkR-u5464gjVDP2U74PvE,18
+python_sdk_remote-0.0.150.dist-info/RECORD,,

python_sdk_remote/constants_src_mini_logger.py

@@ -1,14 +0,0 @@
-from enum import Enum
-
-class LogMessageSeverity(Enum):
-    Debug = 100
-    Verbose = 200
-    Init = 300
-    Info = 500
-    Warning = 600
-    Error = 700
-    Critical = 800
-    Exception = 900
-class StartEndEnum(Enum):
-    Start = 400
-    End = 402