ul-api-utils 9.0.0a1__py3-none-any.whl → 9.0.0a2__py3-none-any.whl

ul_api_utils/api_resource/db_types.py

@@ -2,7 +2,7 @@ from typing import Union, Dict, Any, Tuple, Optional, Iterable
 
 from pydantic import BaseModel
 from ul_db_utils.model.base_model import BaseModel as DbBaseModel
-from flask_sqlalchemy import Model
+from flask_sqlalchemy.model import Model
 
 # TODO: remove DbBaseModel/Model from it BECAUSE IT loads sqlalchemy (>20mb of code)
 TDictable = Union[Dict[str, Any], BaseModel, Tuple[Any, ...], DbBaseModel, Model]

ul_api_utils/debug/stat.py

@@ -6,7 +6,7 @@ from datetime import datetime
 from enum import Enum, unique
 from typing import List, Optional, NamedTuple, Dict, Any, Generator, Tuple
 
-from flask import _app_ctx_stack
+from flask import g
 
 from ul_api_utils.conf import APPLICATION_DEBUGGER_PIN
 from ul_api_utils.const import REQUEST_HEADER__DEBUGGER
@@ -22,23 +22,23 @@ def time_now() -> float:
 
 
 def mark_request_started() -> None:
-    _app_ctx_stack.top.debug_api_utils_request_started_at = time_now()  # type: ignore
+    g.debug_api_utils_request_started_at = time_now()  # type: ignore
 
 
 def get_request_started_at() -> float:
-    return getattr(_app_ctx_stack.top, 'debug_api_utils_request_started_at', 0.)
+    return getattr(g, 'debug_api_utils_request_started_at', 0.)
 
 
 def add_request_stat(stat: 'ApiUtilCallStat') -> None:
     try:
-        stats = _app_ctx_stack.top.debug_api_utils_request_stat  # type: ignore
+        stats = g.debug_api_utils_request_stat  # type: ignore
     except AttributeError:
-        stats = _app_ctx_stack.top.debug_api_utils_request_stat = []  # type: ignore
+        stats = g.debug_api_utils_request_stat = []  # type: ignore
     stats.append(stat)
 
 
 def get_request_stat() -> List['ApiUtilCallStat']:
-    return getattr(_app_ctx_stack.top, 'debug_api_utils_request_stat', [])
+    return getattr(g, 'debug_api_utils_request_stat', [])
 
 
 @unique
@@ -151,11 +151,11 @@ class ApiUtilCallStat(NamedTuple):
 
 
 def collecting_enabled() -> bool:
-    return getattr(_app_ctx_stack.top, 'debug_api_utils_collect_stat', False)
+    return getattr(g, 'debug_api_utils_collect_stat', False)
 
 
 def collecting_enable(enabled: bool) -> None:
-    _app_ctx_stack.top.debug_api_utils_collect_stat = enabled  # type: ignore
+    g.debug_api_utils_collect_stat = enabled  # type: ignore
 
 
 def get_stats_request_headers() -> Dict[str, str]:
@@ -204,9 +204,9 @@ def get_stat(*, started_at: float, ended_at: float, code_spans: bool = True, spa
 
     stats: List[ApiUtilCallStat] = list(get_request_stat())
 
-    from flask_sqlalchemy import get_debug_queries
+    from flask_sqlalchemy.record_queries import get_recorded_queries
 
-    for q in get_debug_queries():
+    for q in get_recorded_queries():
         ok = q.end_time is not None
 
         try:

ul_api_utils/internal_api/internal_api.py

@@ -4,7 +4,7 @@ from json import dumps
 from typing import Optional, Dict, Any, Tuple, Callable
 
 import requests
-from flask import _app_ctx_stack
+from flask import g
 from werkzeug.datastructures import FileStorage
 
 from ul_api_utils.const import REQUEST_HEADER__INTERNAL, RESPONSE_HEADER__AUTHORIZATION, RESPONSE_HEADER__CONTENT_TYPE, INTERNAL_API__DEFAULT_PATH_PREFIX, REQUEST_HEADER__ACCEPT, \
@@ -23,13 +23,12 @@ from ul_api_utils.utils.json_encoder import CustomJSONEncoder
 
 def get_or_create_session(testing_mode: bool) -> requests.Session:
     if testing_mode:
-        if getattr(_app_ctx_stack, 'top', None) is None:
-            return requests.Session()
+        return requests.Session()
 
     try:
-        return _app_ctx_stack.top.internal_api_requests_session  # type: ignore
+        return g.internal_api_requests_session  # type: ignore
     except AttributeError:
-        s = _app_ctx_stack.top.internal_api_requests_session = requests.Session()  # type: ignore
+        s = g.internal_api_requests_session = requests.Session()  # type: ignore
         return s
 
 

ul_api_utils/internal_api/internal_api_check_context.py

@@ -2,7 +2,7 @@ import contextlib
 from typing import Generator, Any, TYPE_CHECKING
 from uuid import UUID
 
-from flask import _app_ctx_stack
+from flask import g
 
 from ul_api_utils.errors import NotCheckedResponseInternalApiError
 
@@ -12,13 +12,13 @@ if TYPE_CHECKING:
 
 @contextlib.contextmanager
 def internal_api_check_context() -> Generator[None, None, None]:
-    _app_ctx_stack.top._api_utils_internal_api_context = []  # type: ignore
+    g._api_utils_internal_api_context = []  # type: ignore
 
     try:
         yield
 
         invalid_resp = []
-        for resp in _app_ctx_stack.top._api_utils_internal_api_context:  # type: ignore
+        for resp in g._api_utils_internal_api_context:  # type: ignore
             if not resp._internal_use__checked_once:
                 invalid_resp.append(resp)
 
@@ -28,15 +28,15 @@ def internal_api_check_context() -> Generator[None, None, None]:
                 f'internal api responses must be checked once at least :: [{info}]',
             )
     finally:
-        _app_ctx_stack.top._api_utils_internal_api_context.clear()  # type: ignore
+        g._api_utils_internal_api_context.clear()  # type: ignore
 
 
 def internal_api_check_context_add_response(resp: 'InternalApiResponse[Any]') -> None:
-    if hasattr(_app_ctx_stack, 'top') and hasattr(_app_ctx_stack.top, '_api_utils_internal_api_context'):
-        _app_ctx_stack.top._api_utils_internal_api_context.append(resp)  # type: ignore
+    if hasattr(g, '_api_utils_internal_api_context'):
+        g._api_utils_internal_api_context.append(resp)  # type: ignore
 
 
 def internal_api_check_context_rm_response(id: UUID) -> None:
-    if hasattr(_app_ctx_stack, 'top') and hasattr(_app_ctx_stack.top, '_api_utils_internal_api_context'):
-        prev = _app_ctx_stack.top._api_utils_internal_api_context  # type: ignore
-        _app_ctx_stack.top._api_utils_internal_api_context = [r for r in prev if r.id != id]  # type: ignore
+    if hasattr(g, '_api_utils_internal_api_context'):
+        prev = g._api_utils_internal_api_context  # type: ignore
+        g._api_utils_internal_api_context = [r for r in prev if r.id != id]  # type: ignore

ul_api_utils/modules/api_sdk.py

@@ -8,7 +8,7 @@ from base64 import b64decode
 from datetime import datetime
 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 flask import Response, request, Flask, url_for as flask_url_for, g
 from pydantic import BaseModel
 from redis.connection import parse_url
 from ul_py_tool.utils.arg_files_glob import arg_files_print
@@ -63,15 +63,15 @@ logger = logging.getLogger(__name__)
 
 
 def add_files_to_clean(files: Set[str]) -> None:
-    if hasattr(_app_ctx_stack.top, '_api_utils_files_to_clean'):
+    if hasattr(g, '_api_utils_files_to_clean'):
         for f in files:
-            _app_ctx_stack.top._api_utils_files_to_clean.add(f)  # type: ignore
+            g._api_utils_files_to_clean.add(f)  # type: ignore
     else:
-        _app_ctx_stack.top._api_utils_files_to_clean = files  # type: ignore
+        g._api_utils_files_to_clean = files  # type: ignore
 
 
 def clean_files() -> None:
-    files: Set[str] = getattr(_app_ctx_stack.top, '_api_utils_files_to_clean', set())
+    files: Set[str] = getattr(g, '_api_utils_files_to_clean', set())
     for f in files:
         try:
             os.unlink(f)

ul_api_utils/utils/cached_per_request.py

@@ -1,7 +1,7 @@
 import functools
 from typing import Callable, TypeVar, Any
 
-from flask import _app_ctx_stack
+from flask import g
 
 TFn = TypeVar("TFn", bound=Callable[..., Any])
 
@@ -13,11 +13,11 @@ def cached_per_request(key: str) -> Callable[[TFn], TFn]:
     def wrapper(fn: Callable[[...], Any]) -> Any:  # type: ignore
         @functools.wraps(fn)
         def wr(*args: Any, **kwargs: Any) -> Any:
-            cached_res = getattr(_app_ctx_stack.top, key, DEFAULT_OBJ)
+            cached_res = getattr(g, key, DEFAULT_OBJ)
             if cached_res is not DEFAULT_OBJ:
                 return cached_res
             res = fn(*args, **kwargs)
-            setattr(_app_ctx_stack.top, key, res)
+            setattr(g, key, res)
             return res
         return wr
     return wrapper

{ul_api_utils-9.0.0a1.dist-info → ul_api_utils-9.0.0a2.dist-info}/METADATA

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

{ul_api_utils-9.0.0a1.dist-info → ul_api_utils-9.0.0a2.dist-info}/RECORD

@@ -34,7 +34,7 @@ ul_api_utils/api_resource/api_resource_type.py,sha256=mgjSQI3swGpgpLI6y35LYtFrdN
 ul_api_utils/api_resource/api_response.py,sha256=bfnWo5GZUCzwJm8rDfzcpuYL4l63pBedJ0tTguP--qw,10069
 ul_api_utils/api_resource/api_response_db.py,sha256=ucY6ANPlHZml7JAbvq-PL85z0bvERTjEJKvz-REPyok,888
 ul_api_utils/api_resource/api_response_payload_alias.py,sha256=FoD0LhQGZ2T8A5-VKRX5ADyzSgm7_dd3qxU2BgCVXkA,587
-ul_api_utils/api_resource/db_types.py,sha256=gF0oxisRkYLf7_2e7YEU-HJDxLy3dJCVaJsYQbOfG5k,433
+ul_api_utils/api_resource/db_types.py,sha256=NxHBYetUogWZow7Vhd3e00Y3L62-dxjwRzJlXywYlV4,439
 ul_api_utils/api_resource/signature_check.py,sha256=jahhr7ttYEUKen_Wp2Eh1__oxqu7ZDoYgw0diK9CFzc,1266
 ul_api_utils/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/commands/cmd_enc_keys.py,sha256=HvwihTrLMqhQO_nYA8U0oowqrTKsmUGzseRofuSCO9k,8488
@@ -52,20 +52,20 @@ ul_api_utils/conf/ul-debugger-ui.js,sha256=bNwv6ntu8RjCrH33H5eTUtFXdBoMrgFt3P87u
 ul_api_utils/debug/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/debug/debugger.py,sha256=eBsYJjBjvUT2yfr8YuJSNSOETVlbz8jAvTPvIKTUvoY,3716
 ul_api_utils/debug/malloc.py,sha256=OvESxpn8sQMyAb64DxnYUAofRZdnJ1I199IUBWiIoa4,3274
-ul_api_utils/debug/stat.py,sha256=udlLLIopxj6SmHH8Scqz5fuNa_CucMlRx7qp88Fi5pY,14591
+ul_api_utils/debug/stat.py,sha256=LNWhp1tGtLV8u-qmfa3Du_eFaedTB166w7gOhCzdzzQ,14480
 ul_api_utils/encrypt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ul_api_utils/encrypt/encrypt_decrypt_abstract.py,sha256=V2lFKoBxUKO5AYvHWLYv-rTvYXiGDPj3nOkU1noebDI,334
 ul_api_utils/encrypt/encrypt_decrypt_aes_xtea.py,sha256=Gj-X_CoYY2PPrczTcG9Ho_dgordsh9jKB_cVnVEE3XU,2356
 ul_api_utils/internal_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ul_api_utils/internal_api/internal_api.py,sha256=gLlz4TYDgrmEF8S2XpNCKgAjLHsd21vs75kppHLoG6A,14067
-ul_api_utils/internal_api/internal_api_check_context.py,sha256=FJyYuyhp7AzvKSoyNrszw6vtUanSUKNNcDmlNH-UDI4,1709
+ul_api_utils/internal_api/internal_api.py,sha256=0ye53z06naptIN2P3TKDc6fSGVrxyEZNelnED39hr2U,13959
+ul_api_utils/internal_api/internal_api_check_context.py,sha256=OEDkI06wArjBNSjRSzARvEIPDhTzmfvYThgpvFJgUZU,1490
 ul_api_utils/internal_api/internal_api_error.py,sha256=sdm3V2VLSfFVBmxaeo2Wy2wkhmxWTXGsCCR-u08ChMg,471
 ul_api_utils/internal_api/internal_api_response.py,sha256=rNAqY82ezupcRSnWY1YO2T5QhwfOFrak0dp23shgUxY,11583
 ul_api_utils/internal_api/__tests__/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=IKcQYnx22GHV2paH4qvJcCqsM5LXpUVIMfrl6bevTRE,26506
+ul_api_utils/modules/api_sdk.py,sha256=0fA26r7165BN4kYtLoCLcBZC7xyt2gvoDKVcf7OQ-ho,26425
 ul_api_utils/modules/api_sdk_config.py,sha256=ZUR48tIJeFlPJTSjyXzKfXaCKPtfqeaA0mlLX42SSFY,2137
 ul_api_utils/modules/api_sdk_jwt.py,sha256=2XRfb0LxHUnldSL67S60v1uyoDpVPNaq4zofUtkeg88,15112
 ul_api_utils/modules/intermediate_state.py,sha256=7ZZ3Sypbb8LaSfrVhaXaWRDnj8oyy26NUbmFK7vr-y4,1270
@@ -103,7 +103,7 @@ ul_api_utils/utils/api_path_version.py,sha256=gOwe0bcKs9ovwgh0XsSzih5rq5coL9rNZy
 ul_api_utils/utils/api_request_info.py,sha256=vxfqs_6-HSd-0o_k8e9KFKWhLNXL0KUHvGB0_9g9bgE,100
 ul_api_utils/utils/avro.py,sha256=-o1NEgn_hcae1C03Lq3q79bjeQn0OPf_HjI33D10DqI,5021
 ul_api_utils/utils/broker_topics_message_count.py,sha256=CzTL8hZ4hS1TW-aboWLISd8HRCFO4-ha25XtHVXHYxA,1562
-ul_api_utils/utils/cached_per_request.py,sha256=tOcTs0MJUm597fyKFGcJLaUZGtPKcf8s6XE_t9fSQqs,670
+ul_api_utils/utils/cached_per_request.py,sha256=8WSOOO0Ih4kj1NB3g_N9aZKvhuPhayNrPCZjRjE03v4,623
 ul_api_utils/utils/colors.py,sha256=NbNlA5jBYvET9OMJgW0HdssrZN9l3sCA1pr-etBVzEU,732
 ul_api_utils/utils/constants.py,sha256=Qx57-WOPlCnQn9KxinVLp2zGjyeyVYuHrAu99Ramn8o,219
 ul_api_utils/utils/decode_base64.py,sha256=rqiD5Whzm2MPx-bk_4r4G4Pe4UUFyU_u-UAjZcXIIjU,398
@@ -148,9 +148,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=20gLlnm1Ithsbbz3NIUXVAd92lW6YwVRSg_nETZhfaI,1442
-ul_api_utils-9.0.0a1.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
-ul_api_utils-9.0.0a1.dist-info/METADATA,sha256=HavhGv0aJ4SDsYMR4wRFxzR7-b-4y4Hhw7qV8ANqtzY,14714
-ul_api_utils-9.0.0a1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ul_api_utils-9.0.0a1.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
-ul_api_utils-9.0.0a1.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
-ul_api_utils-9.0.0a1.dist-info/RECORD,,
+ul_api_utils-9.0.0a2.dist-info/LICENSE,sha256=6Qo8OdcqI8aGrswJKJYhST-bYqxVQBQ3ujKdTSdq-80,1062
+ul_api_utils-9.0.0a2.dist-info/METADATA,sha256=0dKlK__iEBPXqpkoGQI3TMWA4DLK_vCWs8P13qCwalc,14714
+ul_api_utils-9.0.0a2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+ul_api_utils-9.0.0a2.dist-info/entry_points.txt,sha256=8tL3ySHWTyJMuV1hx1fHfN8zumDVOCOm63w3StphkXg,53
+ul_api_utils-9.0.0a2.dist-info/top_level.txt,sha256=1XsW8iOSFaH4LOzDcnNyxHpHrbKU3fSn-aIAxe04jmw,21
+ul_api_utils-9.0.0a2.dist-info/RECORD,,