ul-api-utils 10.0.0.dev4__tar.gz → 10.0.0.dev6__tar.gz

{ul_api_utils-10.0.0.dev4/ul_api_utils.egg-info → ul_api_utils-10.0.0.dev6}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: ul_api_utils
-Version: 10.0.0.dev4
+Version: 10.0.0.dev6
 Summary: Python api utils
 Author: Unic-lab
+Author-email: 
 License: MIT
+Platform: any
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
@@ -12,9 +14,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ul-db-utils==6.0.0.dev2
+Requires-Dist: ul-db-utils==6.0.0.dev3
 Requires-Dist: ul-py-tool==3.0.2.dev1
-Requires-Dist: ul-unipipeline>=3.0.2.dev0
+Requires-Dist: ul-unipipeline>=3.0.2.dev1
 Requires-Dist: frozendict>=2.4.4
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: flask>=3.1.0
@@ -27,6 +29,7 @@ Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: gevent>=25.9.1
 Requires-Dist: gevent-websocket>=0.10.1
+Requires-Dist: psycogreen>=1.0.2
 Requires-Dist: flask-socketio>=5.5.1
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests>=2.31.0
@@ -49,6 +52,7 @@ Requires-Dist: wtforms-alchemy>=0.18.0
 Provides-Extra: dev
 Requires-Dist: uv-script>=0.1.9; extra == "dev"
 Dynamic: license-file
+Dynamic: platform
 
 # Generic library api-utils
 

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ul_api_utils"
-version = "10.0.0.dev4"
+version = "10.0.0.dev6"
 description = "Python api utils"
 readme = "README.md"
 license = { text = "MIT" }
@@ -21,9 +21,10 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "ul-db-utils==6.0.0.dev2",
+    "ul-db-utils==6.0.0.dev3",
     "ul-py-tool==3.0.2.dev1",
-    "ul-unipipeline>=3.0.2.dev0",
+    "ul-unipipeline>=3.0.2.dev1",
+
     "frozendict>=2.4.4",
     "jinja2>=3.1.6",
     "flask>=3.1.0",
@@ -36,6 +37,7 @@ dependencies = [
     "gunicorn>=23.0.0",
     "gevent>=25.9.1",
     "gevent-websocket>=0.10.1",
+    "psycogreen>=1.0.2",
     "flask-socketio>=5.5.1",
     "pyyaml>=6.0",
     "requests>=2.31.0",

ul_api_utils-10.0.0.dev6/setup.py

@@ -0,0 +1,94 @@
+from os import path
+from setuptools import setup, find_packages
+
+HERE = path.abspath(path.dirname(__file__))
+
+with open(path.join(HERE, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+
+setup(
+    name='ul_api_utils',
+    version='9.4.0',
+    description='Python api utils',
+    author='Unic-lab',
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    author_email='',
+    packages=find_packages(),
+    package_data={
+        "ul_api_utils": [
+            'py.typed',
+            "utils/flask_swagger_ui/templates/*.html",
+            "utils/flask_swagger_ui/static/*.html",
+            "utils/flask_swagger_ui/static/*.js",
+            "utils/flask_swagger_ui/static/*.css",
+            "utils/flask_swagger_ui/static/*.png",
+            "utils/flask_swagger_ui/static/*.map",
+            "conf/ul-debugger-main.js",
+            "conf/ul-debugger-ui.js",
+        ],
+    },
+    entry_points={
+        "console_scripts": [
+            'ulapiutls=ul_api_utils.main:main',
+        ],
+    },
+    include_package_data=True,
+    license="MIT",
+    classifiers=[
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Operating System :: OS Independent",
+    ],
+    platforms='any',
+    install_requires=[
+        "ul-unipipeline==2.0.6",
+        "jinja2==3.1.6",
+        "flask==3.1.0",
+        "flask-wtf==1.2.2",
+        "flask-limiter==3.10.1",
+        "flask-caching==2.3.1",
+        "flask-swagger-ui==4.11.1",
+        "flask-monitoringdashboard>=5.0.0",
+        "pycryptodome==3.21.0",
+        "pyjwt==2.10.1",
+        "gunicorn==23.0.0",
+        "gevent==24.11.1",
+        "gevent-websocket==0.10.1",
+        "psycogreen==1.0.2",
+        "pyyaml==6.0",
+        "requests>=2.32.0",
+        "cryptography==44.0.2",
+        "colored==1.4.3",
+        "flask-socketio==5.5.1",
+        "ormsgpack==1.8.0",
+        "msgpack==1.1.0",
+        "msgpack-types==0.5.0",
+        "fastavro==1.10.0",
+        "factory-boy==3.3.0",
+        "sentry-sdk[flask]==2.22.0",
+        "faker==37.0.0",
+        "types-requests==2.32.0.20250306",
+        "types-jinja2==2.11.9",
+        "xlsxwriter==3.2.2",
+        "werkzeug==3.1.3",
+        "frozendict==2.4.4",
+        "wtforms==3.0.1",
+        "wtforms-alchemy==0.18.0",
+        "pathvalidate==3.2.3",
+
+        # "opentelemetry-sdk==1.8.0",
+        # "opentelemetry-api==1.8.0",
+        # "opentelemetry-instrumentation-flask==0.27b0",
+        # "opentelemetry-instrumentation-requests==0.27b0",
+        # "opentelemetry-exporter-jaeger==1.8.0",
+        # "opentelemetry-instrumentation-sqlalchemy==0.27b0",
+        # "ul-db-utils==5.1.0",        # ACTUALIZE, BUT DO NOT UNCOMMENT PLEASE
+        # "ul-py-tool==2.1.4",        # ACTUALIZE, BUT DO NOT UNCOMMENT PLEASE
+    ],
+)

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils/api_resource/api_resource_fn_typing.py

@@ -3,7 +3,6 @@ from typing import NamedTuple, Any, Callable, Optional, List, Dict, Type, Tuple,
 
 from flask import request
 from pydantic import BaseModel, ValidationError, validate_call, TypeAdapter, RootModel
-from pydantic.v1.utils import deep_update
 from pydantic_core import ErrorDetails
 
 from ul_api_utils.api_resource.api_request import ApiRequestQuery
@@ -25,6 +24,16 @@ if TYPE_CHECKING:
 FN_SYSTEM_PROPS = {"api_resource", "query", "body", "return", "body_validation_error", "query_validation_error"}
 
 
+def deep_update(mapping: Dict[str, Any], updating_mapping: Dict[str, Any]) -> Dict[str, Any]:
+    updated_mapping = mapping.copy()
+    for k, v in updating_mapping.items():
+        if k in updated_mapping and isinstance(updated_mapping[k], dict) and isinstance(v, dict):
+            updated_mapping[k] = deep_update(updated_mapping[k], v)
+        else:
+            updated_mapping[k] = v
+    return updated_mapping
+
+
 def _is_complex_type(annotation: Any) -> bool:
     origin = get_origin(annotation)
 

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils/commands/cmd_start.py

@@ -55,7 +55,7 @@ class CmdStart(Cmd):
         parser.add_argument('--debug', dest='debug', type=arg_str2bool, default=False, required=False)
         parser.add_argument('--max-requests', dest='max_requests', type=int, default=1000, required=False)
         parser.add_argument('--max-requests-jitter', dest='max_requests_jitter', type=int, default=50, required=False)
-        parser.add_argument('--worker-class', dest='worker_class', type=str, default='sync', required=False)
+        parser.add_argument('--worker-class', dest='worker_class', type=str, default='gevent', required=False)
         parser.add_argument('--statsd_endpoint', dest='statsd_endpoint', type=str, default=None, required=False)
         parser.add_argument('--statsd_prefix', dest='statsd_prefix', type=str, default=None, required=False)
         parser.add_argument('--freeze-gc', dest='freeze_gc', type=bool, default=False, required=False)
@@ -77,8 +77,10 @@ class CmdStart(Cmd):
         assert len(APPLICATION_GUNICORN_WORKERS) > 0
 
         debug = (self.debug and self.env == ENV_LOCAL)
+
         local_conf = os.path.abspath(os.path.normpath(os.path.join(THIS_LIB_CWD, "commands", "start", "gunicorn.conf.local.py")))
         prod_conf = os.path.abspath(os.path.normpath(os.path.join(THIS_LIB_CWD, "commands", "start", "gunicorn.conf.py")))
+
         gunicorn_config = prod_conf if self.freeze_gc and not debug else local_conf
 
         args = [
@@ -94,7 +96,7 @@ class CmdStart(Cmd):
             '--access-logfile=-',
             '--error-logfile=-',
             '--disable-redirect-access-to-syslog',
-            *(['--reload'] if debug else ['--preload']),
+            *(['--reload'] if debug else ([] if self.worker_class.lower().startswith('gevent') else ['--preload'])),  # gevent workers do monkey-patching in init_process; --preload loads app in master before that
             f'{self.app_module}:{self.app_name}',
         ]
 

ul_api_utils-10.0.0.dev6/ul_api_utils/commands/start/gunicorn.conf.local.py

@@ -0,0 +1,40 @@
+import gc
+from typing import Any
+
+from ul_py_tool.utils.write_stdout import write_stdout
+
+try:
+    import gevent.monkey  # type: ignore
+    _gevent_available = True
+except ImportError:
+    _gevent_available = False
+
+
+def post_fork(server: Any, worker: Any) -> None:
+    """
+    Called just after a worker has been forked.
+    Applies gevent monkey-patching so that all stdlib I/O is cooperative
+    from the very start of the worker process (local / debug mode).
+    https://docs.gunicorn.org/en/20.1.0/settings.html?highlight=preload#post-fork
+    """
+    if _gevent_available and not gevent.monkey.is_module_patched('os'):
+        gevent.monkey.patch_all()
+        write_stdout("gevent monkey-patching applied for worker", worker.pid)
+    write_stdout("Enabling GC for worker", worker.pid)
+    gc.enable()
+
+
+def post_worker_init(worker: Any) -> None:
+    """
+    Called just after a worker has been initialized (inside the worker process).
+    Patches psycopg2 to use a gevent-friendly wait callback so that database I/O
+    through libpq (C extension) yields to the gevent event loop instead of blocking.
+    https://docs.gunicorn.org/en/stable/settings.html#post-worker-init
+    """
+    if _gevent_available and gevent.monkey.is_module_patched('socket'):
+        try:
+            from psycogreen.gevent import patch_psycopg  # type: ignore
+            patch_psycopg()
+            write_stdout("psycogreen patch applied for worker", worker.pid)
+        except ImportError:
+            pass

ul_api_utils-10.0.0.dev6/ul_api_utils/commands/start/gunicorn.conf.py

@@ -0,0 +1,53 @@
+import gc
+from typing import Any
+
+from ul_py_tool.utils.write_stdout import write_stdout
+
+try:
+    import gevent.monkey  # type: ignore
+    _gevent_available = True
+except ImportError:
+    _gevent_available = False
+
+
+def when_ready(server: Any) -> None:
+    """
+    Use only with --preload option.
+    Called just after the server is started.
+    Freeze garbage collector objects after preloading the application.
+    https://docs.gunicorn.org/en/20.1.0/settings.html?highlight=preload#when-ready
+    """
+    gc.freeze()
+    write_stdout("Objects frozen in permanent generation: ", gc.get_freeze_count())
+
+
+def post_fork(server: Any, worker: Any) -> None:
+    """
+    Works only with --preload.
+    Called just after a worker has been forked.
+    Enable garbage collection on each worker if it's not enabled for some reason.
+    Also applies gevent monkey-patching when using a gevent-based worker class so
+    that all stdlib I/O is cooperative from the very start of the worker process.
+    https://docs.gunicorn.org/en/20.1.0/settings.html?highlight=preload#post-fork
+    """
+    if _gevent_available and not gevent.monkey.is_module_patched('os'):
+        gevent.monkey.patch_all()
+        write_stdout("gevent monkey-patching applied for worker", worker.pid)
+    write_stdout("Enabling GC for worker", worker.pid)
+    gc.enable()
+
+
+def post_worker_init(worker: Any) -> None:
+    """
+    Called just after a worker has been initialized (inside the worker process).
+    Patches psycopg2 to use a gevent-friendly wait callback so that database I/O
+    through libpq (C extension) yields to the gevent event loop instead of blocking.
+    https://docs.gunicorn.org/en/stable/settings.html#post-worker-init
+    """
+    if _gevent_available and gevent.monkey.is_module_patched('socket'):
+        try:
+            from psycogreen.gevent import patch_psycopg  # type: ignore
+            patch_psycopg()
+            write_stdout("psycogreen patch applied for worker", worker.pid)
+        except ImportError:
+            pass

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils/const.py

@@ -68,11 +68,11 @@ INTERNAL_API__DEFAULT_PATH_PREFIX = '/api'
 
 AUTO_GZIP_THRESHOLD_LENGTH = 1000
 
-CRON_EXPRESSION_VALIDATION_REGEX = "(^((\*\/)?([0-5]?[0-9])((\,|\-|\/)([0-5]?[0-9]))*|\*)\s+((\*\/)?((2[0-3]|1[0-9]|[0-9]|00))" \
-                                   "((\,|\-|\/)(2[0-3]|1[0-9]|[0-9]|00))*|\*)\s+((\*\/)?([1-9]|[12][0-9]|3[01])((\,|\-|\/)" \
-                                   "([1-9]|[12][0-9]|3[01]))*|\*)\s+((\*\/)?([1-9]|1[0-2])((\,|\-|\/)" \
-                                   "([1-9]|1[0-2]))*|\*|(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|des))\s+((\*\/)?[0-6]" \
-                                   "((\,|\-|\/)[0-6])*|\*|00|(sun|mon|tue|wed|thu|fri|sat))\s*$)|@(annually|yearly|monthly|weekly|daily|hourly|reboot)"  # noqa
+CRON_EXPRESSION_VALIDATION_REGEX = (r"(^((\*\/)?([0-5]?[0-9])((\,|\-|\/)([0-5]?[0-9]))*|\*)\s+((\*\/)?((2[0-3]|1[0-9]|[0-9]|00))"
+                                    r"((\,|\-|\/)(2[0-3]|1[0-9]|[0-9]|00))*|\*)\s+((\*\/)?([1-9]|[12][0-9]|3[01])((\,|\-|\/)"
+                                    r"([1-9]|[12][0-9]|3[01]))*|\*)\s+((\*\/)?([1-9]|1[0-2])((\,|\-|\/)"
+                                    r"([1-9]|1[0-2]))*|\*|(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|des))\s+((\*\/)?[0-6]"
+                                    r"((\,|\-|\/)[0-6])*|\*|00|(sun|mon|tue|wed|thu|fri|sat))\s*$)|@(annually|yearly|monthly|weekly|daily|hourly|reboot)")  # noqa
 
 MAX_UTC_OFFSET_SECONDS = 50400
 MIN_UTC_OFFSET_SECONDS = -43200

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils/modules/api_sdk.py

@@ -194,13 +194,6 @@ class ApiSdk:
         if APPLICATION_DEBUG:
             arg_files_print(1000, route_files, ignored_files=ignored_route_files, name='files loaded')
 
-            if (plugins_config := self.config.flask_debugging_plugins) is not None:
-                if plugins_config.flask_monitoring_dashboard:
-                    import flask_monitoringdashboard as dashboard  # type: ignore
-                    if os.environ.get('FLASK_MONITORING_DASHBOARD_CONFIG'):
-                        dashboard.config.init_from(envvar='FLASK_MONITORING_DASHBOARD_CONFIG', log_verbose=True)
-                    dashboard.bind(self._flask_app)
-
         load_permissions(self, self._initialized_flask_name, self._config.permissions)
 
         load_debugger_static_scripts(self)

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils/modules/api_sdk_config.py

@@ -26,10 +26,6 @@ class ApiSdkHttpAuth(BaseModel):
     scheme: str = 'Basic'
 
 
-class ApiSdkFlaskDebuggingPluginsEnabled(BaseModel):
-    flask_monitoring_dashboard: bool = False
-
-
 class ApiSdkConfig(BaseModel):
     service_name: str
     permissions: Optional[Union[Callable[[], PermissionRegistry], PermissionRegistry]] = None
@@ -52,8 +48,6 @@ class ApiSdkConfig(BaseModel):
     cache_storage_uri: str = ''  # supports only redis
     cache_default_ttl: int = 60  # seconds
 
-    flask_debugging_plugins: Optional[ApiSdkFlaskDebuggingPluginsEnabled] = None
-
     api_route_path_prefix: str = '/api'
 
     model_config = ConfigDict(

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6/ul_api_utils.egg-info}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: ul_api_utils
-Version: 10.0.0.dev4
+Version: 10.0.0.dev6
 Summary: Python api utils
 Author: Unic-lab
+Author-email: 
 License: MIT
+Platform: any
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
@@ -12,9 +14,9 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ul-db-utils==6.0.0.dev2
+Requires-Dist: ul-db-utils==6.0.0.dev3
 Requires-Dist: ul-py-tool==3.0.2.dev1
-Requires-Dist: ul-unipipeline>=3.0.2.dev0
+Requires-Dist: ul-unipipeline>=3.0.2.dev1
 Requires-Dist: frozendict>=2.4.4
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: flask>=3.1.0
@@ -27,6 +29,7 @@ Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: gevent>=25.9.1
 Requires-Dist: gevent-websocket>=0.10.1
+Requires-Dist: psycogreen>=1.0.2
 Requires-Dist: flask-socketio>=5.5.1
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: requests>=2.31.0
@@ -49,6 +52,7 @@ Requires-Dist: wtforms-alchemy>=0.18.0
 Provides-Extra: dev
 Requires-Dist: uv-script>=0.1.9; extra == "dev"
 Dynamic: license-file
+Dynamic: platform
 
 # Generic library api-utils
 

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.md
 pyproject.toml
+setup.py
 ul_api_utils/__init__.py
 ul_api_utils/conf.py
 ul_api_utils/const.py

{ul_api_utils-10.0.0.dev4 → ul_api_utils-10.0.0.dev6}/ul_api_utils.egg-info/requires.txt

@@ -1,6 +1,6 @@
-ul-db-utils==6.0.0.dev2
+ul-db-utils==6.0.0.dev3
 ul-py-tool==3.0.2.dev1
-ul-unipipeline>=3.0.2.dev0
+ul-unipipeline>=3.0.2.dev1
 frozendict>=2.4.4
 jinja2>=3.1.6
 flask>=3.1.0
@@ -13,6 +13,7 @@ pyjwt>=2.10.1
 gunicorn>=23.0.0
 gevent>=25.9.1
 gevent-websocket>=0.10.1
+psycogreen>=1.0.2
 flask-socketio>=5.5.1
 pyyaml>=6.0
 requests>=2.31.0

ul_api_utils-10.0.0.dev4/ul_api_utils/commands/start/gunicorn.conf.py

@@ -1,26 +0,0 @@
-import gc
-from typing import Any
-
-from ul_py_tool.utils.write_stdout import write_stdout
-
-
-def when_ready(server: Any) -> None:
-    """
-    Use only with --preload option.
-    Called just after the server is started.
-    Freeze garbage collector objects after preloading the application.
-    https://docs.gunicorn.org/en/20.1.0/settings.html?highlight=preload#when-ready
-    """
-    gc.freeze()
-    write_stdout("Objects frozen in permanent generation: ", gc.get_freeze_count())
-
-
-def post_fork(server: Any, worker: Any) -> None:
-    """
-    Works only with --preload.
-    Called just after a worker has been forked.
-    Enable garbage collection on each worker if it's not enabled for some reason.
-    https://docs.gunicorn.org/en/20.1.0/settings.html?highlight=preload#post-fork
-    """
-    write_stdout("Enabling GC for worker", worker.pid)
-    gc.enable()