bisslog-flask 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

bisslog_flask/builder/builder_flask_app_manager.py

@@ -8,6 +8,7 @@ configuration, and runtime setup.
 The generated code is returned as a full Python script and can be written to a file (e.g.,
 `flask_app.py`).
 """
+
 from typing import Optional, Callable
 import json
 
@@ -17,6 +18,7 @@ from bisslog_schema.schema import UseCaseInfo, TriggerHttp, TriggerWebsocket
 from bisslog_schema.setup import get_setup_metadata
 from bisslog_schema.use_case_code_inspector.use_case_code_metadata import UseCaseCodeInfo, \
     UseCaseCodeInfoClass, UseCaseCodeInfoObject
+
 from .static_python_construct_data import StaticPythonConstructData
 
 
@@ -147,6 +149,9 @@ if "JWT_SECRET_KEY" in os.environ:
         StaticPythonConstructData
             The generated code for the HTTP trigger.
         """
+        imports = {
+            "flask": {"jsonify"}
+        }
         starting_build = ""
         mapper_code_lines = []
         if trigger_info.mapper is not None:
@@ -155,7 +160,7 @@ if "JWT_SECRET_KEY" in os.environ:
                                f"base={json.dumps(trigger_info.mapper)})")
             mapper_code_lines.append(f"""
     res_map = {mapper_name}.map({{
-        "path_query": request.view_args or {{}},
+        "path_query": route_vars,
         "body": request.get_json(silent=True) or {{}},
         "params": request.args.to_dict(),
         "headers": request.headers,
@@ -166,20 +171,33 @@ if "JWT_SECRET_KEY" in os.environ:
 
         lines = [
             f'@app.route("{flask_path}", methods=["{method}"])',
-            f'def {handler_name}():',
         ]
+
+        if use_case_code_info.is_coroutine:
+            lines.append(f"async def {handler_name}(**route_vars):")
+        else:
+            lines.append(f"def {handler_name}(**route_vars):")
+
         if not mapper_code_lines:
             lines.append("    kwargs = {}")
-            lines.append("    kwargs.update(request.view_args or {})")
+            lines.append("    kwargs.update(route_vars)")
             lines.append("    kwargs.update(request.get_json(silent=True) or {})")
             lines.append("    kwargs.update(request.args.to_dict())")
             lines.append("    kwargs.update(dict(request.headers))")
-            lines.append(f"    return {uc_callable}(**kwargs)\n")
+            var_to_unpack = "kwargs"
         else:
             lines.extend(mapper_code_lines)
-            lines.append(f'    return {uc_callable}(**res_map)\n')
+            var_to_unpack = "res_map"
+
+        if use_case_code_info.is_coroutine:
+            lines.append(f'    result = await {uc_callable}(**{var_to_unpack})')
+        else:
+            lines.append(f'    result = {uc_callable}(**{var_to_unpack})\n')
+
+        lines.append('    return jsonify(result)\n')
 
-        return StaticPythonConstructData(build=starting_build, body="\n".join(lines))
+        return StaticPythonConstructData(build=starting_build,
+                                         body="\n".join(lines), importing=imports)
 
     @staticmethod
     def _generate_use_case_code_websocket_trigger(
@@ -217,7 +235,7 @@ if "JWT_SECRET_KEY" in os.environ:
         imports = {
             use_case_code_info.module: {use_case_code_info.name},
             "flask_sock": {"Sock"},
-            "flask": {"request"},
+            "flask": {"request", "jsonify"},
             "bisslog.utils.mapping": {"Mapper"},
             "json": None
         }

bisslog_flask/cli/__init__.py

@@ -1,10 +1,11 @@
+"""Command-line interface for the `bisslog_flask` package."""
+import argparse
 import os
 import sys
-import argparse
 import traceback
 
-from .commands.run import run
 from .commands.build import build_boiler_plate_flask
+from .commands.run import run
 
 
 def main():
@@ -62,7 +63,8 @@ def main():
     build_parser.add_argument("--encoding", type=str, default="utf-8",
                               help="File encoding (default: utf-8).")
     build_parser.add_argument("--target-filename", type=str, default="flask_app.py",
-                              help="Filename to write the generated boilerplate (default: flask_app.py)")
+                              help="Filename to write the generated "
+                                   "boilerplate (default: flask_app.py)")
 
     args = parser.parse_args()
 
@@ -82,7 +84,7 @@ def main():
                 encoding=args.encoding,
                 target_filename=args.target_filename
             )
-    except Exception as e:
+    except Exception as e:  # pylint: disable=broad-except
         traceback.print_exc()
         print(e)
         sys.exit(1)

bisslog_flask/cli/commands/build.py

@@ -10,8 +10,10 @@ The generated code supports HTTP and WebSocket routes, environment-based securit
 configuration, and respects the Bisslog runtime setup defined via decorators.
 """
 from typing import Optional
+
 from ...builder.builder_flask_app_manager import bisslog_flask_builder
 
+
 def build_boiler_plate_flask(
         metadata_file: Optional[str] = None,
         use_cases_folder_path: Optional[str] = None,

bisslog_flask/cli/commands/run.py

@@ -18,7 +18,7 @@ def run(metadata_file: Optional[str] = None,
         secret_key: Optional[str] = None,
         jwt_secret_key: Optional[str] = None):
     """
-    Run a Flask application using metadata and use case source.
+    Run a Flask application using metadata and use-case source.
 
     This function creates and runs a Flask app configured through the
     BisslogFlask integration layer. It loads metadata definitions,

bisslog_flask/initializer/bisslog_flask_http_resolver.py

@@ -16,10 +16,12 @@ Dependencies
 - bisslog_schema
 - bisslog.utils.mapping
 """
+import inspect
 from copy import deepcopy
-from typing import Callable, Optional, Dict
+from typing import Callable, Optional, Dict, Union, Awaitable, Any
 
 from flask import Flask, request, jsonify
+
 try:
     from flask_cors import cross_origin
 except ImportError:
@@ -82,10 +84,10 @@ class BisslogFlaskHttpResolver(BisslogFlaskResolver):
 
     @staticmethod
     def _use_case_factory(
-            use_case_name: str,
-            fn: Callable,
-            mapper: Optional[Dict[str, str]] = None,
-            trigger: Optional[TriggerHttp] = None
+        use_case_name: str,
+        fn: Callable,
+        mapper: Optional[Dict[str, str]] = None,
+        trigger: Optional[TriggerHttp] = None
     ):
         """
         Factory to produce a Flask view function with optional mapping and CORS.
@@ -109,10 +111,49 @@ class BisslogFlaskHttpResolver(BisslogFlaskResolver):
         use_case_fn_copy = deepcopy(fn)
         __mapper__ = Mapper(name=f"Mapper {use_case_name}", base=mapper) if mapper else None
 
-        def uc(*args, **kwargs):
-            return BisslogFlaskHttpResolver._lambda_fn(
-                *args, fn=use_case_fn_copy, __mapper__=__mapper__, **kwargs
-            )
+        is_async = (
+            inspect.iscoroutinefunction(fn)
+            or inspect.iscoroutinefunction(getattr(fn, "__call__", None))
+        )
+
+        if is_async:
+            async def uc(*args, **kwargs):
+                if __mapper__ is None:
+                    more_kwargs = {}
+                    if request.method.lower() != "get":
+                        more_kwargs.update(request.get_json(silent=True) or {})
+                    res = await use_case_fn_copy(*args, **kwargs, **more_kwargs)
+                    return jsonify(res)
+
+                res_map = __mapper__.map({
+                    "path_query": request.view_args or {},
+                    "body": request.get_json(silent=True) or {},
+                    "params": request.args.to_dict(),
+                    "headers": request.headers,
+                })
+                res = await use_case_fn_copy(**res_map)
+                return jsonify(res)
+
+            view = uc
+        else:
+            def uc(*args, **kwargs):
+                if __mapper__ is None:
+                    more_kwargs = {}
+                    if request.method.lower() != "get":
+                        more_kwargs.update(request.get_json(silent=True) or {})
+                    res = use_case_fn_copy(*args, **kwargs, **more_kwargs)
+                    return jsonify(res)
+
+                res_map = __mapper__.map({
+                    "path_query": request.view_args or {},
+                    "body": request.get_json(silent=True) or {},
+                    "params": request.args.to_dict(),
+                    "headers": request.headers,
+                })
+                res = use_case_fn_copy(**res_map)
+                return jsonify(res)
+
+            view = uc
 
         # Apply CORS dynamically if allowed
         if trigger and trigger.allow_cors:
@@ -124,13 +165,13 @@ class BisslogFlaskHttpResolver(BisslogFlaskResolver):
                 "allow_headers": ["Content-Type", "Authorization"],
                 "supports_credentials": True
             }
-            return cross_origin(**cors_kwargs)(uc)
+            return cross_origin(**cors_kwargs)(view)
 
-        return uc
+        return view
 
     @classmethod
     def _add_use_case(cls, app: Flask, use_case_info: UseCaseInfo, trigger: TriggerInfo,
-                      use_case_function):
+                      use_case_function: Union[Callable[..., Any], Callable[..., Awaitable[Any]]]):
         """
         Adds an HTTP endpoint to the Flask app for a given use case.
 

bisslog_flask/initializer/bisslog_flask_resolver.py

@@ -9,7 +9,6 @@ from abc import ABC, abstractmethod
 from typing import Callable
 
 from bisslog_schema.schema import UseCaseInfo, TriggerInfo
-
 from flask import Flask
 
 

bisslog_flask/initializer/bisslog_flask_ws_resolver.py

@@ -5,7 +5,9 @@ This module defines the `BisslogFlaskWebSocketResolver` class, which dynamically
 WebSocket-based use case triggers in a Flask app. The class uses metadata definitions to
 configure event routes (via `route_key`) and binds them to corresponding use case functions.
 """
+import inspect
 from typing import Callable
+
 from flask import Flask, request
 
 try:
@@ -64,13 +66,27 @@ class BisslogFlaskWebSocketResolver(BisslogFlaskResolver):
             base=trigger_info.options.mapper
         ) if trigger_info.options.mapper else None
 
-        @socket_io_obj.on(route_key)
-        def on_event(data):
-            mapped_data = mapper.map({
-                "route_key": route_key,
-                "connection_id": request.sid,
-                "body": data,
-                "headers": dict(request.headers)
-            }) if mapper else data
+        is_async = inspect.iscoroutinefunction(use_case_callable)
+
+        if is_async:
+            @socket_io_obj.on(route_key)
+            async def on_event(data):
+                mapped_data = mapper.map({
+                    "route_key": route_key,
+                    "connection_id": request.sid,
+                    "body": data,
+                    "headers": dict(request.headers)
+                }) if mapper else data
+
+                return await use_case_callable(**mapped_data) if mapper else use_case_callable(data)
+        else:
+            @socket_io_obj.on(route_key)
+            def on_event(data):
+                mapped_data = mapper.map({
+                    "route_key": route_key,
+                    "connection_id": request.sid,
+                    "body": data,
+                    "headers": dict(request.headers)
+                }) if mapper else data
 
-            return use_case_callable(**mapped_data) if mapper else use_case_callable(data)
+                return use_case_callable(**mapped_data) if mapper else use_case_callable(data)

bisslog_flask/initializer/init_flask_app_manager.py

@@ -19,8 +19,8 @@ from typing import Optional, Callable
 
 from bisslog_schema import read_service_info_with_code
 from bisslog_schema.eager_import_module_or_package import EagerImportModulePackage
-from bisslog_schema.setup import run_setup
 from bisslog_schema.schema import UseCaseInfo, TriggerHttp, TriggerWebsocket
+from bisslog_schema.setup import run_setup
 from flask import Flask
 
 from .bisslog_flask_http_resolver import BisslogFlaskHttpResolver

{bisslog_flask-0.0.2.dist-info → bisslog_flask-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bisslog_flask
-Version: 0.0.2
+Version: 0.0.3
 Summary: It is an extension of the bisslog library to support processes with flask
 Author-email: Darwin Stiven Herrera Cartagena <darwinsherrerac@gmail.com>
 Project-URL: Homepage, https://github.com/darwinhc/bisslog-flask
@@ -10,13 +10,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: bisslog>=0.0.7
-Requires-Dist: bisslog-schema>=0.0.6
+Requires-Dist: bisslog>=0.0.9
+Requires-Dist: bisslog-schema>=0.0.10
 Requires-Dist: flask
 Provides-Extra: websocket
 Requires-Dist: flask-socketio; extra == "websocket"
 Provides-Extra: cors
 Requires-Dist: flask-cors>=6.0.0; extra == "cors"
+Provides-Extra: async
+Requires-Dist: Flask[async]>=2.2; extra == "async"
 Dynamic: license-file
 
 # bisslog-flask

bisslog_flask-0.0.3.dist-info/RECORD

@@ -0,0 +1,21 @@
+bisslog_flask/__init__.py,sha256=BEf_UxFtcMfaM-Smh_bwc6Xn8pR8LcEjby3nCs0hdXE,758
+bisslog_flask/builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bisslog_flask/builder/builder_flask_app_manager.py,sha256=HffxWfMRRlrfmYSojCdH563bJgQGa3vF2GB9rOYnINw,14777
+bisslog_flask/builder/static_python_construct_data.py,sha256=p8QcXUAXZRXtNlghWv-husw9hByGTp53_g0RxhmzoNc,5735
+bisslog_flask/cli/__init__.py,sha256=DlqqUfYI3e3Q6wY7xg7X-Ux9_6gTNQAAClAe2aI2-tg,3792
+bisslog_flask/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bisslog_flask/cli/commands/build.py,sha256=uI-aH8HvW7UPdqGJvtQ2p5tw5nEFcUAzvicLCGuKccY,2341
+bisslog_flask/cli/commands/run.py,sha256=gUfgpLzPxQ-hB2DApA-BcxpkPaI_QCNH7OUUpkl8D34,1953
+bisslog_flask/initializer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bisslog_flask/initializer/bisslog_flask_http_resolver.py,sha256=nxAZFyl_7akpMzgDQsURVAbJmTxuFKlpCu3SfYioh44,7890
+bisslog_flask/initializer/bisslog_flask_resolver.py,sha256=pt7EC-WqfsBp7w3Z0SE378hfwWTLfRDM6fGMfF3_sb8,1707
+bisslog_flask/initializer/bisslog_flask_ws_resolver.py,sha256=wcG8iPky2PYyRUovHJg5woX1vLJ-fmLRmgUW-PLU_Jc,3572
+bisslog_flask/initializer/init_flask_app_manager.py,sha256=gwu6cg6RLh5UMT4GGiIFJx8cD385j7EvUnGfk9S6aC0,5389
+bisslog_flask/socket_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bisslog_flask/socket_helper/socket_helper.py,sha256=HHENwYT-qdrJlwmGszYqFM1MA1g6naRurUp6sYCHRRQ,2967
+bisslog_flask-0.0.3.dist-info/licenses/LICENSE,sha256=TSlM1hRIXc6yR3xpGzy2DMSSbds0svqHSetfNfQqCEk,1074
+bisslog_flask-0.0.3.dist-info/METADATA,sha256=8X8f3Lsko5s7NX8iZwkP1gFpVNoOdRVUSjKinqaaVyk,4251
+bisslog_flask-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bisslog_flask-0.0.3.dist-info/entry_points.txt,sha256=A2_A5lZt973oUBpuOCC78aTm7dGyHk6cemnn5_jOXHw,57
+bisslog_flask-0.0.3.dist-info/top_level.txt,sha256=Xk85d0SIhkUP1HjsXOtq2vlU7yQT3mFApyb5IVgtG6w,14
+bisslog_flask-0.0.3.dist-info/RECORD,,

bisslog_flask-0.0.2.dist-info/RECORD

@@ -1,21 +0,0 @@
-bisslog_flask/__init__.py,sha256=BEf_UxFtcMfaM-Smh_bwc6Xn8pR8LcEjby3nCs0hdXE,758
-bisslog_flask/builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisslog_flask/builder/builder_flask_app_manager.py,sha256=cJtbkT21lydm2tEQr3V3-7wm5ilJfJP0qFl9Oa3TpkA,14302
-bisslog_flask/builder/static_python_construct_data.py,sha256=p8QcXUAXZRXtNlghWv-husw9hByGTp53_g0RxhmzoNc,5735
-bisslog_flask/cli/__init__.py,sha256=Qd9zgdNKb6lAFb7Nsf8USrO_NNuemtOIfJAm8hOZXqc,3660
-bisslog_flask/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisslog_flask/cli/commands/build.py,sha256=QiXQvI3tHCS4i8Xbq6ucdx5lwkWg6yzsvQKqV6y4-p8,2339
-bisslog_flask/cli/commands/run.py,sha256=6RDEDw8HrwDupii9e-O-Q2bfrIqGmDuMYa3wUvRCW5E,1953
-bisslog_flask/initializer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisslog_flask/initializer/bisslog_flask_http_resolver.py,sha256=d-KFQwMXeRyq3_Cu5bxCF7CpnetfnKainChEbdxDk2c,6257
-bisslog_flask/initializer/bisslog_flask_resolver.py,sha256=QWjft6HZbBplbP1vVMNoPhGoSZBJubAotwLR76HVttw,1708
-bisslog_flask/initializer/bisslog_flask_ws_resolver.py,sha256=s-eDdk5HA6E_D8iZC6IN7RSW-96mzu8m8VGL3Xqm9PQ,2974
-bisslog_flask/initializer/init_flask_app_manager.py,sha256=55lb2WoKBHyD2_XSO1svMLZY0tP-yIm8XKLOVZBIogk,5389
-bisslog_flask/socket_helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bisslog_flask/socket_helper/socket_helper.py,sha256=HHENwYT-qdrJlwmGszYqFM1MA1g6naRurUp6sYCHRRQ,2967
-bisslog_flask-0.0.2.dist-info/licenses/LICENSE,sha256=TSlM1hRIXc6yR3xpGzy2DMSSbds0svqHSetfNfQqCEk,1074
-bisslog_flask-0.0.2.dist-info/METADATA,sha256=oKpJICdabwz2vtIG70DyJEQVZQTNksX-teABr-dz8KQ,4177
-bisslog_flask-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bisslog_flask-0.0.2.dist-info/entry_points.txt,sha256=A2_A5lZt973oUBpuOCC78aTm7dGyHk6cemnn5_jOXHw,57
-bisslog_flask-0.0.2.dist-info/top_level.txt,sha256=Xk85d0SIhkUP1HjsXOtq2vlU7yQT3mFApyb5IVgtG6w,14
-bisslog_flask-0.0.2.dist-info/RECORD,,