arcane-flask 2.2.1__tar.gz → 3.0.0__tar.gz

{arcane_flask-2.2.1 → arcane_flask-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arcane-flask
-Version: 2.2.1
+Version: 3.0.0
 Summary: Utility functions for flask apps.
 Author: Arcane
 Author-email: product@wearcane.com

{arcane_flask-2.2.1 → arcane_flask-3.0.0}/arcane/flask/authentication.py

@@ -1,3 +1,4 @@
+import asyncio
 import functools
 import inspect
 import time
@@ -14,7 +15,6 @@ from google.cloud.exceptions import ServiceUnavailable
 from arcane.core import CLIENTS_PARAM, ALL_CLIENTS_RIGHTS, RightsLevelEnum, GOOGLE_EXCEPTIONS_TO_RETRY, BadRequestError
 from arcane.datastore import Client as DatastoreClient
 from arcane.pubsub import Client as PubSubClient
-import concurrent.futures
 
 from .tracking import send_tracking_information
 
@@ -75,75 +75,96 @@ def check_access_rights(service: str,
             start = time.time()
             is_appengine_cron = request.headers.get('X-Appengine-Cron', False)
 
-            if is_appengine_cron:
-                logging.info("App Engine calls service : " + service)
-                return job_func(*args, **kwargs)
-
             claims = {}
             origin = ''
-            # Check feature rights
-            if auth_enabled:
-                token = str(request.headers.get('Authorization', '')).split(' ').pop()
-                origin = str(request.headers.get('origin', ''))
-                try:
-                    claims = verify_token(token)
-                except (firebase_auth.ExpiredIdTokenError,
-                        firebase_auth.RevokedIdTokenError,
-                        firebase_auth.InvalidIdTokenError) as e:
-                    if required_rights != RightsLevelEnum.NONE:
-                        return {'detail': 'You don\'t have access to Adscale resources\n', 'firebase_log': str(e)}, 401
-                except ValueError as e:
-                    return {'detail': str(e)}, 401
 
-                try:
-                    _check_feature_right_access(
-                        claims,
-                        required_rights,
-                        service_user_right
-                    )
-                except BadRequestError:
-                    rights = _get_level_access_for_a_feature_from_claims(claims, service_user_right)
-                    return {'detail': f"You don't have access to this resource : your rights are "
-                            f"'{rights_mapper.get(str(rights), '0')}' for service '{service}'. "
-                            f"You need '{rights_mapper.get(str(required_rights), '0')}'.",
-                            'claims': f"Your current rights are {json.dumps(claims, indent=4, sort_keys=True)}"}, 401
-
-            # Fill authorized_clients
-            if receive_rights_per_client:
-                if not auth_enabled:
-                    authorized_clients = [ALL_CLIENTS_RIGHTS]
-                else:
-                    # Value defined for service to service calls
-                    service_authorized_clients = claims.get('authorized_clients')
-                    db_user_id = claims.get('db_user_id')
-                    if service_authorized_clients and not db_user_id:
-                        authorized_clients = service_authorized_clients
+            async def async_execution():
+                nonlocal claims, origin
+
+                if is_appengine_cron:
+                    logging.info("App Engine calls service : " + service)
+                    if asyncio.iscoroutinefunction(job_func):
+                        return await job_func(*args, **kwargs)
+                    else:
+                        return job_func(*args, **kwargs)
+
+                # Check feature rights
+                if auth_enabled:
+                    token = str(request.headers.get('Authorization', '')).split(' ').pop()
+                    origin = str(request.headers.get('origin', ''))
+                    try:
+                        claims = verify_token(token)
+                    except (firebase_auth.ExpiredIdTokenError,
+                            firebase_auth.RevokedIdTokenError,
+                            firebase_auth.InvalidIdTokenError) as e:
+                        if required_rights != RightsLevelEnum.NONE:
+                            return {'detail': 'You don\'t have access to Adscale resources\n', 'firebase_log': str(e)}, 401
+                    except ValueError as e:
+                        return {'detail': str(e)}, 401
+
+                    try:
+                        _check_feature_right_access(
+                            claims,
+                            required_rights,
+                            service_user_right
+                        )
+                    except BadRequestError:
+                        rights = _get_level_access_for_a_feature_from_claims(claims, service_user_right)
+                        return {'detail': f"You don't have access to this resource : your rights are "
+                                f"'{rights_mapper.get(str(rights), '0')}' for service '{service}'. "
+                                f"You need '{rights_mapper.get(str(required_rights), '0')}'.",
+                                'claims': f"Your current rights are {json.dumps(claims, indent=4, sort_keys=True)}"}, 401
+
+                # Fill authorized_clients
+                if receive_rights_per_client:
+                    if not auth_enabled:
+                        authorized_clients = [ALL_CLIENTS_RIGHTS]
                     else:
-                        if not db_user_id:
-                            authorized_clients = []
+                        # Value defined for service to service calls
+                        service_authorized_clients = claims.get('authorized_clients')
+                        db_user_id = claims.get('db_user_id')
+                        if service_authorized_clients and not db_user_id:
+                            authorized_clients = service_authorized_clients
                         else:
-                            user = datastore_client.get_entity(USERS_KIND, int(db_user_id))
-                            if user is None:
+                            if not db_user_id:
                                 authorized_clients = []
                             else:
-                                authorized_clients = user.get('authorized_clients', [])
-
-                if ALL_CLIENTS_RIGHTS in authorized_clients:
-                    authorized_clients.remove(ALL_CLIENTS_RIGHTS)
-                    clients_query = datastore_client.query()
-                    clients_query.kind = CLIENTS_KIND
-                    clients_query.keys_only()
-                    authorized_clients = [client_entity.key.name for client_entity in clients_query.fetch()]
-
-                kwargs[CLIENTS_PARAM] = sorted(set(authorized_clients))
-            try:
-                with concurrent.futures.ThreadPoolExecutor() as executor:
-                    future = executor.submit(job_func, *args, **kwargs)
-                    func_response = future.result(timeout=timeout)
-            except concurrent.futures.TimeoutError:
-                func_response = {'detail': 'Request Timeout'}, 504
-            except Exception as e:
-                func_response = {'detail': f'Server Error: {str(e)}'}, 500
+                                user = datastore_client.get_entity(USERS_KIND, int(db_user_id))
+                                if user is None:
+                                    authorized_clients = []
+                                else:
+                                    authorized_clients = user.get('authorized_clients', [])
+
+                    if ALL_CLIENTS_RIGHTS in authorized_clients:
+                        authorized_clients.remove(ALL_CLIENTS_RIGHTS)
+                        clients_query = datastore_client.query()
+                        clients_query.kind = CLIENTS_KIND
+                        clients_query.keys_only()
+                        authorized_clients = [client_entity.key.name for client_entity in clients_query.fetch()]
+
+                    kwargs[CLIENTS_PARAM] = sorted(set(authorized_clients))
+
+                try:
+                    if asyncio.iscoroutinefunction(job_func):
+                        func_response = await asyncio.wait_for(job_func(*args, **kwargs), timeout=timeout)
+                    else:
+                        # Synchronous function - wrap in executor for timeout handling
+                        if timeout is not None:
+                            loop = asyncio.get_event_loop()
+                            func_response = await asyncio.wait_for(
+                                loop.run_in_executor(None, lambda: job_func(*args, **kwargs)),
+                                timeout=timeout
+                            )
+                        else:
+                            func_response = job_func(*args, **kwargs)
+                    return func_response
+                except asyncio.TimeoutError:
+                    return {'detail': 'Request Timeout'}, 504
+                except Exception as e:
+                    return {'detail': f'Server Error: {str(e)}'}, 500
+
+            # Run the async execution in a new event loop
+            func_response = asyncio.run(async_execution())
 
             end = time.time()
 

{arcane_flask-2.2.1 → arcane_flask-3.0.0}/arcane/flask/log.py

@@ -7,7 +7,7 @@ from typing import Any, Callable, Literal, Optional
 from flask import g, has_request_context, request
 from flask_log_request_id import current_request_id
 
-STANDARD_FORMAT = '{"severity": "%(levelname)s", "logging.googleapis.com/trace": "%(cloud_trace)s", "logging.googleapis.com/spanId": "%(span_id)s", "component": "arbitrary", "message": "%(message)s", "logging.googleapis.com/labels": %(labels)s}'
+STANDARD_FORMAT = '{"severity": "%(levelname)s", "logging.googleapis.com/trace": "%(cloud_trace)s", "logging.googleapis.com/spanId": "%(span_id)s", "component": "arbitrary", "message": %(message)s, "logging.googleapis.com/labels": %(labels)s}'
 
 
 class LabelFilter(logging.Filter):

{arcane_flask-2.2.1 → arcane_flask-3.0.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "arcane-flask"
 
-version = "2.2.1"
+version = "3.0.0"
 
 
 description = "Utility functions for flask apps."