ul-api-utils 7.3.1__py3-none-any.whl → 7.3.3__py3-none-any.whl

ul_api_utils/modules/api_sdk.py

@@ -10,6 +10,7 @@ from functools import wraps
 from typing import List, Union, Callable, Tuple, Any, Optional, TypeVar, cast, Set, TYPE_CHECKING
 
 from flask import Response, request, Flask, url_for as flask_url_for, _app_ctx_stack
+from pydantic import BaseModel
 from ul_py_tool.utils.arg_files_glob import arg_files_print
 from werkzeug import Response as BaseResponse
 
@@ -19,7 +20,7 @@ from ul_api_utils.api_resource.api_resource import ApiResource
 from ul_api_utils.api_resource.api_resource_config import ApiResourceConfig
 from ul_api_utils.api_resource.api_resource_fn_typing import ApiResourceFnTyping
 from ul_api_utils.api_resource.api_resource_type import ApiResourceType
-from ul_api_utils.api_resource.api_response import ApiResponse, JsonApiResponse, RootJsonApiResponse, ProxyJsonApiResponse
+from ul_api_utils.api_resource.api_response import ApiResponse, JsonApiResponse, RootJsonApiResponse, ProxyJsonApiResponse, AnyJsonApiResponse
 from ul_api_utils.conf import APPLICATION_DEBUGGER_PIN, APPLICATION_DEBUG, APPLICATION_DIR, APPLICATION_ENV_IS_LOCAL, \
     APPLICATION_START_DT
 from ul_api_utils.const import REQUEST_HEADER__DEBUGGER, REQUEST_HEADER__INTERNAL
@@ -76,6 +77,19 @@ def clean_files() -> None:
     files.clear()
 
 
+def _get_error_types(response: ApiResponse) -> Optional[str]:
+    if isinstance(response, AnyJsonApiResponse) and isinstance(response.errors, (list, tuple)) and len(response.errors) > 0:
+        for err in response.errors:
+            err_t = None
+            if isinstance(err, BaseModel):  # type: ignore
+                err_t = getattr(err, 'error_type', None)  # type: ignore
+            elif isinstance(err, dict):
+                err_t = err.get('error_type', None)
+            if isinstance(err_t, str):
+                return err_t
+    return None
+
+
 class ApiSdk:
     ACCESS_PUBLIC = GLOBAL_PERMISSION__PUBLIC
     ACCESS_PRIVATE = GLOBAL_PERMISSION__PRIVATE
@@ -292,6 +306,9 @@ class ApiSdk:
             assert self._initialized_flask_name is not None, 'app must be initialized'
             assert fn.__module__, 'empty __module__ of function'
 
+            fn_module = fn.__module__
+            fn_name = fn.__name__
+
             logger = logging.getLogger(fn.__module__)
 
             fn_typing = ApiResourceFnTyping.parse_fn(api_type, enum_methods, fn)
@@ -321,11 +338,13 @@ class ApiSdk:
                 scope_user_id = None
                 scope_token_id = None
 
+                res: Optional[Tuple[BaseResponse, int]] = None
+
                 with sentry.configure_scope() as sentry_scope:
                     sentry_scope.set_tag('app_name', self._initialized_flask_name)
                     sentry_scope.set_tag('app_type', 'api')
                     sentry_scope.set_tag('app_uptime', f'{(datetime.now() - APPLICATION_START_DT).seconds // 60}s')
-                    sentry_scope.set_tag('app_api_name', fn.__name__)
+                    sentry_scope.set_tag('app_api_name', fn_name)
                     sentry_scope.set_tag('app_api_access', access.id)
 
                     try:
@@ -402,14 +421,18 @@ class ApiSdk:
                     res = api_resource_config.override_flask_response(res)
 
                 ri = api_resource.request_info
-                logger.info(json.dumps({
-                    'user_id': str(scope_user_id),
-                    'token_id': str(scope_token_id),
+                logger.info('AUDIT ' + json.dumps({
+                    'user_id': str(scope_user_id) if scope_user_id else None,
+                    'token_id': str(scope_token_id) if scope_token_id else None,
                     'method': request.method,
                     'url': request.url,
                     'ipv4': ri.ipv4,
                     'user_agent': ri.user_agent,
                     'duration': time.time() - now,
+                    'status_code': res[1] if res is not None else 500,
+                    'fn_id': fn_name,
+                    'fn_mdl': fn_module,
+                    'error_code': _get_error_types(result),
                 }))
 
                 return res

{ul_api_utils-7.3.1.dist-info → ul_api_utils-7.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-api-utils
-Version: 7.3.1
+Version: 7.3.3
 Summary: Python api utils
 Author: Unic-lab
 Author-email: 

{ul_api_utils-7.3.1.dist-info → ul_api_utils-7.3.3.dist-info}/RECORD

@@ -55,7 +55,7 @@ ul_api_utils/internal_api/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 ul_api_utils/internal_api/__tests__/internal_api.py,sha256=X2iopeso6vryszeeA__lcqXQVtz3Nwt3ngH7M4OuN1U,1116
 ul_api_utils/internal_api/__tests__/internal_api_content_type.py,sha256=mfiYPkzKtfZKFpi4RSnWAoCd6mRijr6sFsa2TF-s5t8,749
 ul_api_utils/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/modules/api_sdk.py,sha256=-bzW4x8Zpn034v_KamCp4-fiF0Z06SKOYPmIW2o_K8U,20862
+ul_api_utils/modules/api_sdk.py,sha256=3MsDwfsKxzaD7ixMUeJWAI_qSgBU6h7o2QBPS0-d6ZE,21880
 ul_api_utils/modules/api_sdk_config.py,sha256=ItTShOENf4mhZi9sOLsx7ZugDj5abDpYDeU_BN5sy8E,1761
 ul_api_utils/modules/api_sdk_jwt.py,sha256=2XRfb0LxHUnldSL67S60v1uyoDpVPNaq4zofUtkeg88,15112
 ul_api_utils/modules/intermediate_state.py,sha256=7ZZ3Sypbb8LaSfrVhaXaWRDnj8oyy26NUbmFK7vr-y4,1270
@@ -122,9 +122,9 @@ ul_api_utils/validators/validate_empty_object.py,sha256=3Ck_iwyJE_M5e7l6s1i88aqb
 ul_api_utils/validators/validate_uuid.py,sha256=EfvlRirv2EW0Z6w3s8E8rUa9GaI8qXZkBWhnPs8NFrA,257
 ul_api_utils/validators/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/validators/__tests__/test_custom_fields.py,sha256=QLZ7DFta01Z7DOK9Z5Iq4uf_CmvDkVReis-GAl_QN48,1447
-ul_api_utils-7.3.1.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-7.3.1.dist-info/METADATA,sha256=GW_7jqYBIt3y4FiNbORYkgRIs0eUbM793zdpLXLVFrA,14371
-ul_api_utils-7.3.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-7.3.1.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-7.3.1.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-7.3.1.dist-info/RECORD,,
+ul_api_utils-7.3.3.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-7.3.3.dist-info/METADATA,sha256=Q7GUC7sI4cCZmTC3spchiEHqauep3ID0C0NFyuPWKiQ,14371
+ul_api_utils-7.3.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-7.3.3.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-7.3.3.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-7.3.3.dist-info/RECORD,,