python-sdk-remote 0.0.64__tar.gz → 0.0.66__tar.gz

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sdk-remote
-Version: 0.0.64
+Version: 0.0.66
 Summary: PyPI Package for Circles Python SDK Local Python
 Home-page: https://github.com/circles-zone/python-sdk-remote-python-package
 Author: Circles
@@ -9,5 +9,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+Requires-Dist: python-dotenv
 
 This is a package for sharing common functions used in different repositories

python-sdk-remote-0.0.66/python_sdk_remote/src/constants.py

@@ -0,0 +1,28 @@
+import os
+
+from dotenv import load_dotenv
+
+# from logger_local.LoggerComponentEnum import LoggerComponentEnum
+
+# PYTHON_SDK_LOCAL_COMPONENT_ID = 184
+# PYTHON_SDK_LOCAL_COMPONENT_NAME = 'python_sdk_local'
+
+load_dotenv()
+ENVIRONMENT_NAME = os.getenv("ENVIRONMENT_NAME")
+BRAND_NAME = os.getenv("BRAND_NAME")
+LOGZIO_TOKEN = os.getenv("LOGZIO_TOKEN")
+
+# OBJECT_TO_INSERT_CODE = {
+#     'component_id': PYTHON_SDK_LOCAL_COMPONENT_ID,
+#     'component_name': PYTHON_SDK_LOCAL_COMPONENT_NAME,
+#     'component_category': LoggerComponentEnum.ComponentCategory.Code.value,
+#     'developer_email': 'sahar.g@circ.zone'
+# }
+#
+# OBJECT_TO_INSERT_TEST = {
+#     'component_id': PYTHON_SDK_LOCAL_COMPONENT_ID,
+#     'component_name': PYTHON_SDK_LOCAL_COMPONENT_NAME,
+#     'component_category': LoggerComponentEnum.ComponentCategory.Unit_Test.value,
+#     'testing_framework': LoggerComponentEnum.testingFramework.pytest.value,
+#     'developer_email': 'sahar.g@circ.zone'
+# }

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote/src/mini_logger.py

@@ -17,7 +17,7 @@ class MiniLogger:
         if object is None:
             print(f"{datetime.now()} - START - {message}")
         else:
-            print(f"{datetime.now()} - START - {message} - {str(object)}")
+            print(f"{datetime.now()} - START - {message} - {object}")
 
     @staticmethod
     def end(message: str = "", object: dict = None):
@@ -30,7 +30,7 @@ class MiniLogger:
         if object is None:
             print(f"{datetime.now()} - END - {message}")
         else:
-            print(f"{datetime.now()} - END - {message} - {str(object)}")
+            print(f"{datetime.now()} - END - {message} - {object}")
 
     @staticmethod
     def info(message: str = "", object: dict = None):
@@ -44,7 +44,7 @@ class MiniLogger:
         if object is None:
             print(f"{datetime.now()} - INFO - {message}")
         else:
-            print(f"{datetime.now()} - INFO {message} - {str(object)}")
+            print(f"{datetime.now()} - INFO {message} - {object}")
 
     @staticmethod
     def warning(message: str = "", object: dict = None):
@@ -58,7 +58,7 @@ class MiniLogger:
         if object is None:
             print(f"{datetime.now()} - WARNING - {message}")
         else:
-            print(f"{datetime.now()} - WARNING {message} - {str(object)}")
+            print(f"{datetime.now()} - WARNING {message} - {object}")
 
     @staticmethod
     def error(message: str = "", object: dict = None):
@@ -73,19 +73,19 @@ class MiniLogger:
             print(f"{datetime.now()} - ERROR - {message}", file=sys.stderr)
         else:
             print(
-                f"{datetime.now()} - ERROR - {message} - {str(object)}", file=sys.stderr)
+                f"{datetime.now()} - ERROR - {message} - {object}", file=sys.stderr)
 
     @staticmethod
-    def exception(message: str = "", object: dict = None):
+    def exception(message: str = "", object: Exception | dict = None):
         """
         Print a log error message with the current time.
 
         Parameters:
             message (str): The message to be printed.
-            object (dict): The object to be printed.
+            object (dict / Exception): The object / Exception to be printed.
         """
         if object is None:
             print(f"{datetime.now()} - EXCEPTION - {message}", file=sys.stderr)
         else:
             print(
-                f"{datetime.now()} - EXCEPTION- {message} - {str(object)}", file=sys.stderr)
+                f"{datetime.now()} - EXCEPTION- {message} - {object}", file=sys.stderr)

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote/src/our_object.py

@@ -1,11 +1,7 @@
 import json
 from abc import ABC, abstractmethod
 
-from logger_local.Logger import Logger  # TODO Shouldn't we use mini logger?
-
-from .constants import OBJECT_TO_INSERT_CODE
-
-logger = Logger.create_logger(object=OBJECT_TO_INSERT_CODE)
+from .mini_logger import MiniLogger as logger
 
 
 class OurObject(ABC):

python-sdk-remote-0.0.66/python_sdk_remote/src/unified_json.py

@@ -0,0 +1,27 @@
+from .valid_json_versions import valid_json_versions
+
+
+class UnifiedJson:
+    def __init__(self, data: dict, json_version: str):
+        if json_version not in valid_json_versions:
+            raise Exception(
+                f"version {json_version} is not in valid_json_versions {valid_json_versions}, "
+                f"please make sure you run sql2code."
+            )
+        self.json_version = json_version
+        self.data = data
+
+    def get_unified_json(self):
+        return {"version": self.json_version, "data": self.data}
+
+    def get_data(self):
+        return self.data
+
+    def get_json_version(self):
+        return self.json_version
+
+    def __str__(self):
+        return self.get_unified_json()
+
+    def __repr__(self):
+        return self.__str__()

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote/src/utilities.py

@@ -4,15 +4,12 @@ from datetime import date, datetime, time, timedelta
 from urllib.parse import urlparse
 
 from dotenv import load_dotenv
-from logger_local.Logger import Logger
 
-from .constants import (BRAND_NAME, ENVIRONMENT_NAME,  # noqa: E402
-                        OBJECT_TO_INSERT_CODE)
-from .validate_environment import validate_brand_name  # noqa: E402
+from .mini_logger import MiniLogger as logger
+from .validate_environment import validate_brand_name
 from .validate_environment import validate_environment_name
 
-load_dotenv()  # for our_get_env
-logger = Logger.create_logger(object=OBJECT_TO_INSERT_CODE)
+load_dotenv()
 
 
 def timedelta_to_time_format(time_delta: timedelta) -> str:
@@ -171,9 +168,10 @@ def is_list_of_dicts(obj):
         logger.end(IS_LIST_OF_DICTS_FUNCTION_NAME, object={
             "is_list_of_dicts_result": is_list_of_dicts_result})
         return is_list_of_dicts_result
-    except Exception as e:
-        logger.end(IS_LIST_OF_DICTS_FUNCTION_NAME, exception=e)
-        raise e
+    except Exception as exception:
+        logger.exception(IS_LIST_OF_DICTS_FUNCTION_NAME, exception)
+        logger.end(IS_LIST_OF_DICTS_FUNCTION_NAME)
+        raise
 
 
 def is_time_in_time_range(check_time: time, time_range: tuple) -> bool:
@@ -279,25 +277,25 @@ def create_http_body(body):
 
 def get_brand_name():
     validate_brand_name()
-    return BRAND_NAME
+    return our_get_env("BRAND_NAME")
 
 
 def get_environment_name():
     validate_environment_name()
-    return ENVIRONMENT_NAME
+    return our_get_env("ENVIRONMENT_NAME")
 
 
-def our_get_env(key: str) -> str:
-    return os.getenv(key)
+def our_get_env(key: str, default: str = None) -> str:
+    return os.getenv(key, default)
 
 
-def get_sql_hostname():
+def get_sql_hostname() -> str:
     return our_get_env("RDS_HOSTNAME")
 
 
-def get_sql_username():
+def get_sql_username() -> str:
     return our_get_env("RDS_USERNAME")
 
 
-def get_sql_password():
+def get_sql_password() -> str:
     return our_get_env("RDS_PASSWORD")

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote/src/valid_json_versions.py

@@ -1,4 +1,4 @@
 # Later we'll generate this file using Sql2Code (from json_version database schema)
 valid_json_versions = {
-    "240109"
-}
+    "240109": "Description"
+}

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote/src/validate_environment.py

@@ -1,6 +1,7 @@
 from .constants import BRAND_NAME, ENVIRONMENT_NAME, LOGZIO_TOKEN
 
 
+# TODO: I think this should be in logger-local, not here (akiva)
 # TODO Align with https://github.com/circles-zone/typescript-sdk-remote-typescript-package/edit/dev/typescript-sdk/src/utils/index.ts validateTenantEnvironmentVariables()  # noqa501
 def validate_enviroment_variables(brand_name: str = BRAND_NAME, environment_name: str = ENVIRONMENT_NAME,
                                   logzio_token: str = LOGZIO_TOKEN):
@@ -17,8 +18,9 @@ def validate_enviroment_variables(brand_name: str = BRAND_NAME, environment_name
 
 def validate_environment_name(environment_name: str = ENVIRONMENT_NAME):
     if environment_name is None:
-        raise Exception("logger-local-python-package LoggerLocal.py please add Environment Variable called "
-                        "ENVIRONMENT_NAME=local or play1 (instead of ENVIRONMENT)")
+        raise Exception(
+            "logger-local-python-package LoggerLocal.py in case of Play1 environment, please add Environment Variable called "
+            "ENVIRONMENT_NAME=local or play1 (instead of ENVIRONMENT)")
 
 
 def validate_brand_name(brand_name: str = BRAND_NAME):

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sdk-remote
-Version: 0.0.64
+Version: 0.0.66
 Summary: PyPI Package for Circles Python SDK Local Python
 Home-page: https://github.com/circles-zone/python-sdk-remote-python-package
 Author: Circles
@@ -9,5 +9,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+Requires-Dist: python-dotenv
 
 This is a package for sharing common functions used in different repositories

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/python_sdk_remote.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ setup.py
 python_sdk_remote.egg-info/PKG-INFO
 python_sdk_remote.egg-info/SOURCES.txt
 python_sdk_remote.egg-info/dependency_links.txt
+python_sdk_remote.egg-info/requires.txt
 python_sdk_remote.egg-info/top_level.txt
 python_sdk_remote/src/__init__.py
 python_sdk_remote/src/constants.py

python-sdk-remote-0.0.66/python_sdk_remote.egg-info/requires.txt

@@ -0,0 +1 @@
+python-dotenv

{python-sdk-remote-0.0.64 → python-sdk-remote-0.0.66}/setup.py

@@ -7,13 +7,13 @@ package_dir = PACKAGE_NAME.replace("-", "_")
 # python -m build needs pyproject.toml or setup.py
 setuptools.setup(
     name=PACKAGE_NAME,
-    version='0.0.64',  # https://pypi.org/project/python-sdk-remote/
+    version='0.0.66',  # https://pypi.org/project/python-sdk-remote/
     author="Circles",
     author_email="info@circles.life",
     description="PyPI Package for Circles Python SDK Local Python",
     long_description="This is a package for sharing common functions used in different repositories",
     long_description_content_type="text/markdown",
-    url="https://github.com/circles-zone/python-sdk-remote-python-package",
+    url=f"https://github.com/circles-zone/{PACKAGE_NAME}-python-package",
     packages=[package_dir],
     package_dir={package_dir: f'{package_dir}/src'},
     package_data={package_dir: ['*.py']},
@@ -22,4 +22,7 @@ setuptools.setup(
         "License :: Other/Proprietary License",
         "Operating System :: OS Independent",
     ],
+    install_requires=[
+        "python-dotenv"
+    ]
 )

python-sdk-remote-0.0.64/python_sdk_remote/src/constants.py

@@ -1,27 +0,0 @@
-import os
-from dotenv import load_dotenv
-
-from logger_local.LoggerComponentEnum import LoggerComponentEnum
-
-PYTHON_SDK_LOCAL_COMPONENT_ID = 184
-PYTHON_SDK_LOCAL_COMPONENT_NAME = 'python_sdk_local'
-
-load_dotenv()
-ENVIRONMENT_NAME = os.getenv("ENVIRONMENT_NAME")
-BRAND_NAME = os.getenv("BRAND_NAME")
-LOGZIO_TOKEN = os.getenv("LOGZIO_TOKEN")
-
-OBJECT_TO_INSERT_CODE = {
-    'component_id': PYTHON_SDK_LOCAL_COMPONENT_ID,
-    'component_name': PYTHON_SDK_LOCAL_COMPONENT_NAME,
-    'component_category': LoggerComponentEnum.ComponentCategory.Code.value,
-    'developer_email': 'sahar.g@circ.zone'
-}
-
-OBJECT_TO_INSERT_TEST = {
-    'component_id': PYTHON_SDK_LOCAL_COMPONENT_ID,
-    'component_name': PYTHON_SDK_LOCAL_COMPONENT_NAME,
-    'component_category': LoggerComponentEnum.ComponentCategory.Unit_Test.value,
-    'testing_framework': LoggerComponentEnum.testingFramework.pytest.value,
-    'developer_email': 'sahar.g@circ.zone'
-}

python-sdk-remote-0.0.64/python_sdk_remote/src/unified_json.py

@@ -1,18 +0,0 @@
-from .valid_json_version import valid_json_versions
-class UnifiedJson:
-    def __init__(self, data: dict, version: str):
-        if version not in valid_json_versions:
-            raise Exception(
-                f"version {version} is not in valid_json_versions {valid_json_versions}"
-            )
-        self.version = version
-        self.data = data
-
-    def get_unified_json(self):
-        return {"version": self.version, "data": self.data}
-
-    def __str__(self):
-        return self.get_unified_json()
-
-    def __repr__(self):
-        return self.__str__()