python-sdk-local 0.0.134__tar.gz → 0.0.135__tar.gz

{python_sdk_local-0.0.134 → python_sdk_local-0.0.135}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sdk-local
-Version: 0.0.134
+Version: 0.0.135
 Summary: PyPI Package for Circles Python SDK Local Python
 Home-page: https://github.com/circles-zone/python-sdk-local-python-package
 Author: Circles
@@ -13,6 +13,6 @@ Requires-Dist: requests
 Requires-Dist: python-dotenv
 Requires-Dist: url-remote
 Requires-Dist: pyjwt
-Requires-Dist: python-sdk-remote
+Requires-Dist: python-sdk-remoteuser-context-remote
 
 This is a package for sharing common functions used in different repositories

{python_sdk_local-0.0.134 → python_sdk_local-0.0.135}/python_sdk_local/src/http_response.py

@@ -4,6 +4,8 @@ from http import HTTPStatus
 from typing import Any
 
 from python_sdk_remote.mini_logger import MiniLogger as logger
+from user_context_remote.user_context import UserContext
+
 from .utilities import camel_to_snake, snake_to_camel, to_dict, to_json
 
 HEADERS_KEY = 'headers'
@@ -43,10 +45,10 @@ def get_request_parameters_from_event(event: dict) -> dict:
     all_parameters_dict.update({snake_to_camel(key): value for key, value in all_parameters_dict.items()})
     return all_parameters_dict
 
+
 # TODO: move everything related to serverless to another file
 # TODO: test
-# TODO: remove this user_context once we can import it
-def handler_decorator(logger, user_context = None):
+def handler_decorator(logger):
     """Decorator for AWS Lambda handler functions. It wraps the handler function with logging and error handling.
     Usage:
     from python_sdk_local.http_response import handler_decorator
@@ -61,10 +63,12 @@ def handler_decorator(logger, user_context = None):
             handler_response = None
             try:
                 logger.start(object={"event": event, "context": context})
-                if user_context:
-                    user_jwt = get_user_jwt_from_event(event)
-                    user_context.login_using_user_jwt(user_jwt)
                 request_parameters = get_request_parameters_from_event(event)
+                user_jwt = get_user_jwt_from_event(event)
+                if user_jwt:
+                    request_parameters["user_context"] = UserContext.login_using_user_jwt(user_jwt)
+                else:
+                    logger.warning("No user_jwt provided")
                 body_result = handler(request_parameters)
                 handler_response = create_ok_http_response(body_result)
             except Exception as e:
@@ -91,10 +95,10 @@ def create_authorization_http_headers(user_jwt: str) -> dict:
 
 def get_user_jwt_from_event(event: dict) -> str:
     logger.start(object={"event": event})
-    auth_header = event.get(HEADERS_KEY, {}).get(AUTHORIZATION_KEY)
+    auth_header = event.get(HEADERS_KEY, {}).get(AUTHORIZATION_KEY, "")
     if auth_header is None:
-        auth_header = event.get(HEADERS_KEY, {}).get(AUTHORIZATION_KEY.lower())
-    user_jwt = auth_header.split(AUTHORIZATION_PREFIX)[1]
+        auth_header = event.get(HEADERS_KEY, {}).get(AUTHORIZATION_KEY.lower(), "")
+    user_jwt = auth_header.split(AUTHORIZATION_PREFIX)[-1]
     logger.end(object={"user_jwt": user_jwt})
     return user_jwt
 

{python_sdk_local-0.0.134 → python_sdk_local-0.0.135}/python_sdk_local.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-sdk-local
-Version: 0.0.134
+Version: 0.0.135
 Summary: PyPI Package for Circles Python SDK Local Python
 Home-page: https://github.com/circles-zone/python-sdk-local-python-package
 Author: Circles
@@ -13,6 +13,6 @@ Requires-Dist: requests
 Requires-Dist: python-dotenv
 Requires-Dist: url-remote
 Requires-Dist: pyjwt
-Requires-Dist: python-sdk-remote
+Requires-Dist: python-sdk-remoteuser-context-remote
 
 This is a package for sharing common functions used in different repositories

{python_sdk_local-0.0.134 → python_sdk_local-0.0.135}/python_sdk_local.egg-info/requires.txt

@@ -2,4 +2,4 @@ requests
 python-dotenv
 url-remote
 pyjwt
-python-sdk-remote
+python-sdk-remoteuser-context-remote

{python_sdk_local-0.0.134 → python_sdk_local-0.0.135}/setup.py

@@ -1,4 +1,4 @@
-import setuptools 
+import setuptools
 
 PACKAGE_NAME = "python-sdk-local"
 package_dir = PACKAGE_NAME.replace("-", "_")
@@ -7,7 +7,7 @@ package_dir = PACKAGE_NAME.replace("-", "_")
 # python -m build needs pyproject.toml or setup.py
 setuptools.setup(
     name=PACKAGE_NAME,
-    version='0.0.134',  # https://pypi.org/project/python-sdk-local/
+    version='0.0.135',  # https://pypi.org/project/python-sdk-local/
     author="Circles",
     author_email="info@circlez.ai",
     description="PyPI Package for Circles Python SDK Local Python",
@@ -28,5 +28,6 @@ setuptools.setup(
         "url-remote",
         "pyjwt",
         "python-sdk-remote"
+        "user-context-remote",
     ]
 )