nsj-rest-lib2 0.0.32__py3-none-any.whl → 0.0.34__py3-none-any.whl

nsj_rest_lib2/compiler/compiler.py

@@ -33,6 +33,7 @@ from nsj_rest_lib2.compiler.util.relation_ref import RelationRefParser
 from nsj_rest_lib2.compiler.edl_model.entity_model import EntityModel
 
 from nsj_rest_lib2.settings import get_logger
+from nsj_rest_lib2.dto.escopo_dto import EscopoDTO
 
 
 class EDLCompiler:
@@ -44,13 +45,24 @@ class EDLCompiler:
         self._function_get_delete_compiler = FunctionGetDeleteCompiler()
 
     def compile_models(
-        self, entity_models: dict[str, EntityModel]
+        self,
+        entity_models: dict[str, EntityModel],
+        escopos: dict[str, EscopoDTO],
     ) -> list[CompilerResult]:
 
         compiler_results = []
         for entity_model_id in entity_models:
             entity_model = entity_models[entity_model_id]
-            compiler_result = self._compile_model(entity_model, entity_models)
+            escopo_dto = escopos.get(entity_model.escopo)
+            if escopo_dto is None:
+                raise Exception(
+                    f"EscopoDTO não informado para o escopo: {entity_model.escopo}."
+                )
+            compiler_result = self._compile_model(
+                entity_model,
+                entity_models,
+                escopo=escopo_dto,
+            )
             if compiler_result:
                 compiler_results.append(compiler_result)
 
@@ -60,6 +72,7 @@ class EDLCompiler:
         self,
         edl_json: dict[str, Any],
         dependencies_edls: list[dict[str, Any]],
+        escopo: EscopoDTO,
     ) -> CompilerResult | None:
         entity_model = EntityModel(**edl_json)
 
@@ -71,35 +84,36 @@ class EDLCompiler:
                 dependency_entity_model = EntityModel(**dependency_edl)
             entity_models.append(dependency_entity_model)
 
-        return self.compile_model(entity_model, entity_models)
+        return self.compile_model(entity_model, entity_models, escopo=escopo)
 
     def compile_model(
         self,
         entity_model: EntityModelBase,
         dependencies_models: list[tuple[str, EntityModelBase]],
+        escopo: EscopoDTO,
     ) -> CompilerResult | None:
         entity_models = {}
         for dependency_entity_model in dependencies_models:
             complete_entity_id = dependency_entity_model[0]
             entity_models[complete_entity_id] = dependency_entity_model[1]
 
-        return self._compile_model(entity_model, entity_models)
+        return self._compile_model(entity_model, entity_models, escopo=escopo)
 
     def _compile_model(
         self,
         entity_model: EntityModelBase,
         entity_models: dict[str, EntityModel],
-        escopo: str | None = None,
+        escopo: EscopoDTO | None,
         prefx_class_name: str = "",
     ) -> CompilerResult | None:
         if entity_model.mixin:
             return None
 
-        if escopo is None and (isinstance(entity_model, EntityModel)):
-            escopo = entity_model.escopo
-
-        if not escopo:
-            raise Exception(f"Escopo não definido para a entidade: {entity_model.id}.")
+        if escopo is None:
+            raise Exception(
+                f"EscopoDTO não informado para a entidade: {getattr(entity_model, 'id', '<unknown>')}."
+            )
+        escopo_codigo = escopo.codigo
 
         # Tratando dos dados base para a extensão parcial
         partial_metadata: dict[str, str] | None = None
@@ -250,7 +264,7 @@ class EDLCompiler:
         ) = self._properties_compiler.compile(
             properties_structure,
             map_unique_by_property,
-            escopo,
+            escopo_codigo,
             entity_model,
             entity_models,
             prefx_class_name,
@@ -371,9 +385,7 @@ class EDLCompiler:
         compiler_result.list_function_type_class_name = list_function_type_class
         compiler_result.delete_function_type_class_name = delete_function_type_class
         compiler_result.source_get_function_type = get_function_code.strip() or None
-        compiler_result.source_list_function_type = (
-            list_function_code.strip() or None
-        )
+        compiler_result.source_list_function_type = list_function_code.strip() or None
         compiler_result.source_delete_function_type = (
             delete_function_code.strip() or None
         )
@@ -392,6 +404,7 @@ class EDLCompiler:
             compiler_result.api_expose = entity_model.api.expose
             compiler_result.api_resource = entity_model.api.resource
             compiler_result.api_verbs = entity_model.api.verbs
+        compiler_result.service_account = escopo.service_account
 
         get_logger().debug(f"código gerado para a entidade: {entity_model.id}")
         get_logger().debug("DTO Code:")
@@ -848,7 +861,14 @@ if __name__ == "__main__":
         entities[complete_entity_id] = entity_model
 
     compiler = EDLCompiler()
-    compiler_results = compiler.compile_models(entities)
+    escopos = {}
+    for entity_model in entities.values():
+        if entity_model.escopo not in escopos:
+            escopos[entity_model.escopo] = EscopoDTO(
+                codigo=entity_model.escopo,
+                service_account=None,
+            )
+    compiler_results = compiler.compile_models(entities, escopos)
 
     with open("output_compilacao_local.py", "w") as f:
         for compiler_result in compiler_results:

nsj_rest_lib2/compiler/model.py

@@ -42,6 +42,7 @@ class CompilerResult:
         self.api_expose: bool | None = None
         self.api_resource: str | None = None
         self.api_verbs: list[str] | None = None
+        self.service_account: str | None = None
         self.relations_dependencies: list[RelationDependency] | None = None
         self.insert_function_class_name: str | None = None
         self.insert_function_name: str | None = None

nsj_rest_lib2/controller/dynamic_controller.py

@@ -1,6 +1,6 @@
 import json
 
-from typing import Any
+from typing import Any, Callable
 
 from flask import Flask, request
 
@@ -68,426 +68,311 @@ def setup_dynamic_routes(
             f"/{APP_NAME}/{dynamic_root_path}/<entity_escopo>/<entity_resource>/<id>"
         )
 
-    def list_dynamic_wrapper(injector_factory: Any, *args: Any, **kwargs: Any) -> Any:
-
-        def list_dynamic(*args: Any, **kwargs: Any):
-            # Recuperando o identificador da entidade
+    def _dynamic_route_wrapper(
+        route_builder: Callable[[tuple[Any, ...]], Callable[..., Any]],
+        endpoint_suffix: str | None = None,
+    ) -> Callable[..., Any]:
+        def wrapper(*args: Any, **kwargs: Any) -> Any:
             if "entity_resource" not in kwargs:
                 msg = "Faltando parâmetro identificador da entidade na URL."
                 return (format_json_error(msg), 400, {**DEFAULT_RESP_HEADERS})
             entity_resource = kwargs.pop("entity_resource")
 
-            # Verificando se o identificador do escopo foi passado na URL
-            entity_escopo = ""
-            if "entity_escopo" in kwargs:
-                entity_escopo = kwargs.pop("entity_escopo")
+            entity_escopo = kwargs.pop("entity_escopo", "")
 
-            # Lendo tenant e grupo_empresarial
             tenant, grupo_empresarial, force_reload = _get_query_args()
 
             try:
-                # Recuperando o código do DTO e Entity correspondente
                 entity_loader = EntityLoader()
-                (
-                    dto_class_name,
-                    entity_class_name,
-                    etities_dict,
-                    api_expose,
-                    api_verbs,
-                    _insert_function_class_name,
-                    _update_function_class_name,
-                    _insert_function_name,
-                    _update_function_name,
-                    _get_function_name,
-                    list_function_name,
-                    _delete_function_name,
-                    _get_function_type_class_name,
-                    list_function_type_class_name,
-                    _delete_function_type_class_name,
-                ) = entity_loader.load_entity_source(
+                entity_config = entity_loader.load_entity_source(
                     entity_resource,
                     tenant,
                     grupo_empresarial,
                     escopo=entity_escopo,
                     force_reload=force_reload,
                 )
-
-                # Verificando se essa API deve ser exposta
-                if not api_expose or "GET" not in api_verbs:
-                    return ("", 405, {})
-
-                # Executando o list pelo RestLib
-                route = ListRoute(
-                    url=COLLECTION_DYNAMIC_ROUTE,
-                    http_method="GET",
-                    dto_class=etities_dict[dto_class_name],
-                    entity_class=etities_dict[entity_class_name],
-                    injector_factory=injector_factory,
-                    list_function_name=list_function_name,
-                    list_function_type_class=etities_dict.get(
-                        list_function_type_class_name
-                    ),
-                )
-
-                return route.handle_request(*args, **kwargs)
             except MissingEntityConfigException:
                 msg = f"Entity configuration for {entity_resource} not found."
                 return (format_json_error(msg), 412, {**DEFAULT_RESP_HEADERS})
 
-        return list_dynamic
+            (
+                _,
+                _,
+                _,
+                _,
+                _,
+                service_account,
+                *rest,
+            ) = entity_config
+
+            route_handler = route_builder(entity_config)
+
+            if multidb:
+                route_handler = multi_database(service_account)(route_handler)
+
+            return route_handler(*args, **kwargs)
+
+        wrapper.__name__ = endpoint_suffix or f"{route_builder.__name__}_wrapper"
+        return wrapper
+
+    def list_dynamic_builder(entity_config: tuple[Any, ...]) -> Callable[..., Any]:
+        (
+            dto_class_name,
+            entity_class_name,
+            etities_dict,
+            api_expose,
+            api_verbs,
+            _service_account,
+            _insert_function_class_name,
+            _update_function_class_name,
+            _insert_function_name,
+            _update_function_name,
+            _get_function_name,
+            list_function_name,
+            _delete_function_name,
+            _get_function_type_class_name,
+            list_function_type_class_name,
+            _delete_function_type_class_name,
+        ) = entity_config
+
+        def list_dynamic(*args: Any, **kwargs: Any) -> Any:
+            if not api_expose or "GET" not in api_verbs:
+                return ("", 405, {})
+
+            route = ListRoute(
+                url=COLLECTION_DYNAMIC_ROUTE,
+                http_method="GET",
+                dto_class=etities_dict[dto_class_name],
+                entity_class=etities_dict[entity_class_name],
+                injector_factory=injector_factory,
+                list_function_name=list_function_name,
+                list_function_type_class=etities_dict.get(
+                    list_function_type_class_name
+                ),
+            )
+
+            return route.handle_request(*args, **kwargs)
 
-    def get_dynamic_wrapper(injector_factory: Any, *args: Any, **kwargs: Any) -> Any:
-
-        def get_dynamic(*args: Any, **kwargs: Any):
-            # Recuperando o identificador da entidade
-            if "entity_resource" not in kwargs:
-                msg = "Faltando parâmetro identificador da entidade na URL."
-                return (format_json_error(msg), 400, {**DEFAULT_RESP_HEADERS})
-            entity_resource = kwargs.pop("entity_resource")
-
-            # Verificando se o identificador do escopo foi passado na URL
-            entity_escopo = ""
-            if "entity_escopo" in kwargs:
-                entity_escopo = kwargs.pop("entity_escopo")
-
-            # Lendo tenant e grupo_empresarial
-            tenant, grupo_empresarial, force_reload = _get_query_args()
-
-            try:
-                # Recuperando o código do DTO e Entity correspondente
-                entity_loader = EntityLoader()
-                (
-                    dto_class_name,
-                    entity_class_name,
-                    etities_dict,
-                    api_expose,
-                    api_verbs,
-                    _insert_function_class_name,
-                    _update_function_class_name,
-                    _insert_function_name,
-                    _update_function_name,
-                    get_function_name,
-                    _list_function_name,
-                    _delete_function_name,
-                    get_function_type_class_name,
-                    _list_function_type_class_name,
-                    _delete_function_type_class_name,
-                ) = entity_loader.load_entity_source(
-                    entity_resource,
-                    tenant,
-                    grupo_empresarial,
-                    escopo=entity_escopo,
-                    force_reload=force_reload,
-                )
-
-                # Verificando se essa API deve ser exposta
-                if not api_expose or "GET" not in api_verbs:
-                    return ("", 405, {})
-
-                # Executando o list pelo RestLib
-                route = GetRoute(
-                    url=ONE_DYNAMIC_ROUTE,
-                    http_method="GET",
-                    dto_class=etities_dict[dto_class_name],
-                    entity_class=etities_dict[entity_class_name],
-                    injector_factory=injector_factory,
-                    get_function_name=get_function_name,
-                    get_function_type_class=etities_dict.get(
-                        get_function_type_class_name
-                    ),
-                )
+        return list_dynamic
 
-                return route.handle_request(*args, **kwargs)
-            except MissingEntityConfigException:
-                msg = f"Entity configuration for {entity_resource} not found."
-                return (format_json_error(msg), 412, {**DEFAULT_RESP_HEADERS})
+    def get_dynamic_builder(entity_config: tuple[Any, ...]) -> Callable[..., Any]:
+        (
+            dto_class_name,
+            entity_class_name,
+            etities_dict,
+            api_expose,
+            api_verbs,
+            _service_account,
+            _insert_function_class_name,
+            _update_function_class_name,
+            _insert_function_name,
+            _update_function_name,
+            get_function_name,
+            _list_function_name,
+            _delete_function_name,
+            get_function_type_class_name,
+            _list_function_type_class_name,
+            _delete_function_type_class_name,
+        ) = entity_config
+
+        def get_dynamic(*args: Any, **kwargs: Any) -> Any:
+            if not api_expose or "GET" not in api_verbs:
+                return ("", 405, {})
+
+            route = GetRoute(
+                url=ONE_DYNAMIC_ROUTE,
+                http_method="GET",
+                dto_class=etities_dict[dto_class_name],
+                entity_class=etities_dict[entity_class_name],
+                injector_factory=injector_factory,
+                get_function_name=get_function_name,
+                get_function_type_class=etities_dict.get(get_function_type_class_name),
+            )
+
+            return route.handle_request(*args, **kwargs)
 
         return get_dynamic
 
-    def post_dynamic_wrapper(injector_factory: Any, *args: Any, **kwargs: Any) -> Any:
-        def post_dynamic(*args: Any, **kwargs: Any):
-            # Recuperando o identificador da entidade
-            if "entity_resource" not in kwargs:
-                msg = "Faltando parâmetro identificador da entidade na URL."
-                return (format_json_error(msg), 400, {**DEFAULT_RESP_HEADERS})
-            entity_resource = kwargs.pop("entity_resource")
-
-            # Verificando se o identificador do escopo foi passado na URL
-            entity_escopo = ""
-            if "entity_escopo" in kwargs:
-                entity_escopo = kwargs.pop("entity_escopo")
-
-            # Lendo tenant e grupo_empresarial
-            tenant, grupo_empresarial, force_reload = _get_query_args()
-
-            try:
-                # Recuperando o código do DTO e Entity correspondente
-                entity_loader = EntityLoader()
-                (
-                    dto_class_name,
-                    entity_class_name,
-                    etities_dict,
-                    api_expose,
-                    api_verbs,
-                    insert_function_class_name,
-                    _update_function_class_name,
-                    insert_function_name,
-                    _update_function_name,
-                    _get_function_name,
-                    _list_function_name,
-                    _delete_function_name,
-                    _get_function_type_class_name,
-                    _list_function_type_class_name,
-                    _delete_function_type_class_name,
-                ) = entity_loader.load_entity_source(
-                    entity_resource,
-                    tenant,
-                    grupo_empresarial,
-                    escopo=entity_escopo,
-                    force_reload=force_reload,
-                )
-
-                # Verificando se essa API deve ser exposta
-                if not api_expose or "POST" not in api_verbs:
-                    return ("", 405, {})
-
-                # Executando o list pelo RestLib
-                insert_function_type_class = (
-                    etities_dict.get(insert_function_class_name)
-                    if insert_function_class_name
-                    else None
-                )
-
-                route = PostRoute(
-                    url=COLLECTION_DYNAMIC_ROUTE,
-                    http_method="POST",
-                    dto_class=etities_dict[dto_class_name],
-                    entity_class=etities_dict[entity_class_name],
-                    injector_factory=injector_factory,
-                    insert_function_type_class=insert_function_type_class,
-                    insert_function_name=insert_function_name,
-                )
-
-                return route.handle_request(*args, **kwargs)
-            except MissingEntityConfigException:
-                msg = f"Entity configuration for {entity_resource} not found."
-                return (format_json_error(msg), 412, {**DEFAULT_RESP_HEADERS})
+    def post_dynamic_builder(entity_config: tuple[Any, ...]) -> Callable[..., Any]:
+        (
+            dto_class_name,
+            entity_class_name,
+            etities_dict,
+            api_expose,
+            api_verbs,
+            _service_account,
+            insert_function_class_name,
+            _update_function_class_name,
+            insert_function_name,
+            _update_function_name,
+            _get_function_name,
+            _list_function_name,
+            _delete_function_name,
+            _get_function_type_class_name,
+            _list_function_type_class_name,
+            _delete_function_type_class_name,
+        ) = entity_config
+
+        def post_dynamic(*args: Any, **kwargs: Any) -> Any:
+            if not api_expose or "POST" not in api_verbs:
+                return ("", 405, {})
+
+            insert_function_type_class = (
+                etities_dict.get(insert_function_class_name)
+                if insert_function_class_name
+                else None
+            )
+
+            route = PostRoute(
+                url=COLLECTION_DYNAMIC_ROUTE,
+                http_method="POST",
+                dto_class=etities_dict[dto_class_name],
+                entity_class=etities_dict[entity_class_name],
+                injector_factory=injector_factory,
+                insert_function_type_class=insert_function_type_class,
+                insert_function_name=insert_function_name,
+            )
+
+            return route.handle_request(*args, **kwargs)
 
         return post_dynamic
 
-    def put_dynamic_wrapper(injector_factory: Any, *args: Any, **kwargs: Any) -> Any:
-        def put_dynamic(*args: Any, **kwargs: Any):
-            # Recuperando o identificador da entidade
-            if "entity_resource" not in kwargs:
-                msg = "Faltando parâmetro identificador da entidade na URL."
-                return (format_json_error(msg), 400, {**DEFAULT_RESP_HEADERS})
-            entity_resource = kwargs.pop("entity_resource")
-
-            # Verificando se o identificador do escopo foi passado na URL
-            entity_escopo = ""
-            if "entity_escopo" in kwargs:
-                entity_escopo = kwargs.pop("entity_escopo")
-
-            # Lendo tenant e grupo_empresarial
-            tenant, grupo_empresarial, force_reload = _get_query_args()
-
-            try:
-                # Recuperando o código do DTO e Entity correspondente
-                entity_loader = EntityLoader()
-                (
-                    dto_class_name,
-                    entity_class_name,
-                    etities_dict,
-                    api_expose,
-                    api_verbs,
-                    _insert_function_class_name,
-                    update_function_class_name,
-                    _insert_function_name,
-                    update_function_name,
-                    _get_function_name,
-                    _list_function_name,
-                    _delete_function_name,
-                    _get_function_type_class_name,
-                    _list_function_type_class_name,
-                    _delete_function_type_class_name,
-                ) = entity_loader.load_entity_source(
-                    entity_resource,
-                    tenant,
-                    grupo_empresarial,
-                    escopo=entity_escopo,
-                    force_reload=force_reload,
-                )
-
-                # Verificando se essa API deve ser exposta
-                if not api_expose or "PUT" not in api_verbs:
-                    return ("", 405, {})
-
-                # Executando o list pelo RestLib
-                update_function_type_class = (
-                    etities_dict.get(update_function_class_name)
-                    if update_function_class_name
-                    else None
-                )
-
-                route = PutRoute(
-                    url=ONE_DYNAMIC_ROUTE,
-                    http_method="PUT",
-                    dto_class=etities_dict[dto_class_name],
-                    entity_class=etities_dict[entity_class_name],
-                    injector_factory=injector_factory,
-                    update_function_type_class=update_function_type_class,
-                    update_function_name=update_function_name,
-                )
-
-                return route.handle_request(*args, **kwargs)
-            except MissingEntityConfigException:
-                msg = f"Entity configuration for {entity_resource} not found."
-                return (format_json_error(msg), 412, {**DEFAULT_RESP_HEADERS})
+    def put_dynamic_builder(entity_config: tuple[Any, ...]) -> Callable[..., Any]:
+        (
+            dto_class_name,
+            entity_class_name,
+            etities_dict,
+            api_expose,
+            api_verbs,
+            _service_account,
+            _insert_function_class_name,
+            update_function_class_name,
+            _insert_function_name,
+            update_function_name,
+            _get_function_name,
+            _list_function_name,
+            _delete_function_name,
+            _get_function_type_class_name,
+            _list_function_type_class_name,
+            _delete_function_type_class_name,
+        ) = entity_config
+
+        def put_dynamic(*args: Any, **kwargs: Any) -> Any:
+            if not api_expose or "PUT" not in api_verbs:
+                return ("", 405, {})
+
+            update_function_type_class = (
+                etities_dict.get(update_function_class_name)
+                if update_function_class_name
+                else None
+            )
+
+            route = PutRoute(
+                url=ONE_DYNAMIC_ROUTE,
+                http_method="PUT",
+                dto_class=etities_dict[dto_class_name],
+                entity_class=etities_dict[entity_class_name],
+                injector_factory=injector_factory,
+                update_function_type_class=update_function_type_class,
+                update_function_name=update_function_name,
+            )
+
+            return route.handle_request(*args, **kwargs)
 
         return put_dynamic
 
-    def patch_dynamic_wrapper(injector_factory: Any, *args: Any, **kwargs: Any) -> Any:
-        def patch_dynamic(*args: Any, **kwargs: Any):
-            # Recuperando o identificador da entidade
-            if "entity_resource" not in kwargs:
-                msg = "Faltando parâmetro identificador da entidade na URL."
-                return (format_json_error(msg), 400, {**DEFAULT_RESP_HEADERS})
-            entity_resource = kwargs.pop("entity_resource")
-
-            # Verificando se o identificador do escopo foi passado na URL
-            entity_escopo = ""
-            if "entity_escopo" in kwargs:
-                entity_escopo = kwargs.pop("entity_escopo")
-
-            # Lendo tenant e grupo_empresarial
-            tenant, grupo_empresarial, force_reload = _get_query_args()
-
-            try:
-                # Recuperando o código do DTO e Entity correspondente
-                entity_loader = EntityLoader()
-                (
-                    dto_class_name,
-                    entity_class_name,
-                    etities_dict,
-                    api_expose,
-                    api_verbs,
-                    _insert_function_class_name,
-                    _update_function_class_name,
-                    _insert_function_name,
-                    _update_function_name,
-                    _get_function_name,
-                    _list_function_name,
-                    _delete_function_name,
-                ) = entity_loader.load_entity_source(
-                    entity_resource,
-                    tenant,
-                    grupo_empresarial,
-                    escopo=entity_escopo,
-                    force_reload=force_reload,
-                )
-
-                # Verificando se essa API deve ser exposta
-                if not api_expose or "PATCH" not in api_verbs:
-                    return ("", 405, {})
-
-                # Executando o list pelo RestLib
-                route = PatchRoute(
-                    url=ONE_DYNAMIC_ROUTE,
-                    http_method="PATCH",
-                    dto_class=etities_dict[dto_class_name],
-                    entity_class=etities_dict[entity_class_name],
-                    injector_factory=injector_factory,
-                )
-
-                return route.handle_request(*args, **kwargs)
-            except MissingEntityConfigException:
-                msg = f"Entity configuration for {entity_resource} not found."
-                return (format_json_error(msg), 412, {**DEFAULT_RESP_HEADERS})
+    def patch_dynamic_builder(entity_config: tuple[Any, ...]) -> Callable[..., Any]:
+        (
+            dto_class_name,
+            entity_class_name,
+            etities_dict,
+            api_expose,
+            api_verbs,
+            _service_account,
+            _insert_function_class_name,
+            _update_function_class_name,
+            _insert_function_name,
+            _update_function_name,
+            _get_function_name,
+            _list_function_name,
+            _delete_function_name,
+            *_,
+        ) = entity_config
+
+        def patch_dynamic(*args: Any, **kwargs: Any) -> Any:
+            if not api_expose or "PATCH" not in api_verbs:
+                return ("", 405, {})
+
+            route = PatchRoute(
+                url=ONE_DYNAMIC_ROUTE,
+                http_method="PATCH",
+                dto_class=etities_dict[dto_class_name],
+                entity_class=etities_dict[entity_class_name],
+                injector_factory=injector_factory,
+            )
+
+            return route.handle_request(*args, **kwargs)
 
         return patch_dynamic
 
-    def delete_dynamic_wrapper(injector_factory: Any, *args: Any, **kwargs: Any) -> Any:
-        def delete_dynamic(*args: Any, **kwargs: Any):
-            # Recuperando o identificador da entidade
-            if "entity_resource" not in kwargs:
-                msg = "Faltando parâmetro identificador da entidade na URL."
-                return (format_json_error(msg), 400, {**DEFAULT_RESP_HEADERS})
-            entity_resource = kwargs.pop("entity_resource")
-
-            # Verificando se o identificador do escopo foi passado na URL
-            entity_escopo = ""
-            if "entity_escopo" in kwargs:
-                entity_escopo = kwargs.pop("entity_escopo")
-
-            # Lendo tenant e grupo_empresarial
-            tenant, grupo_empresarial, force_reload = _get_query_args()
-
-            try:
-                # Recuperando o código do DTO e Entity correspondente
-                entity_loader = EntityLoader()
-                (
-                    dto_class_name,
-                    entity_class_name,
-                    etities_dict,
-                    api_expose,
-                    api_verbs,
-                    _insert_function_class_name,
-                    _update_function_class_name,
-                    _insert_function_name,
-                    _update_function_name,
-                    _get_function_name,
-                    _list_function_name,
-                    delete_function_name,
-                    _get_function_type_class_name,
-                    _list_function_type_class_name,
-                    delete_function_type_class_name,
-                ) = entity_loader.load_entity_source(
-                    entity_resource,
-                    tenant,
-                    grupo_empresarial,
-                    escopo=entity_escopo,
-                    force_reload=force_reload,
-                )
-
-                # Verificando se essa API deve ser exposta
-                if not api_expose or "DELETE" not in api_verbs:
-                    return ("", 405, {})
-
-                # Executando o list pelo RestLib
-                route = DeleteRoute(
-                    url=ONE_DYNAMIC_ROUTE,
-                    http_method="DELETE",
-                    dto_class=etities_dict[dto_class_name],
-                    entity_class=etities_dict[entity_class_name],
-                    injector_factory=injector_factory,
-                    delete_function_name=delete_function_name,
-                    delete_function_type_class=etities_dict.get(
-                        delete_function_type_class_name
-                    ),
-                )
-
-                return route.handle_request(*args, **kwargs)
-            except MissingEntityConfigException:
-                msg = f"Entity configuration for {entity_resource} not found."
-                return (format_json_error(msg), 412, {**DEFAULT_RESP_HEADERS})
+    def delete_dynamic_builder(entity_config: tuple[Any, ...]) -> Callable[..., Any]:
+        (
+            dto_class_name,
+            entity_class_name,
+            etities_dict,
+            api_expose,
+            api_verbs,
+            _service_account,
+            _insert_function_class_name,
+            _update_function_class_name,
+            _insert_function_name,
+            _update_function_name,
+            _get_function_name,
+            _list_function_name,
+            delete_function_name,
+            _get_function_type_class_name,
+            _list_function_type_class_name,
+            delete_function_type_class_name,
+        ) = entity_config
+
+        def delete_dynamic(*args: Any, **kwargs: Any) -> Any:
+            if not api_expose or "DELETE" not in api_verbs:
+                return ("", 405, {})
+
+            route = DeleteRoute(
+                url=ONE_DYNAMIC_ROUTE,
+                http_method="DELETE",
+                dto_class=etities_dict[dto_class_name],
+                entity_class=etities_dict[entity_class_name],
+                injector_factory=injector_factory,
+                delete_function_name=delete_function_name,
+                delete_function_type_class=etities_dict.get(
+                    delete_function_type_class_name
+                ),
+            )
+
+            return route.handle_request(*args, **kwargs)
 
         return delete_dynamic
 
-    # Ajustando para o padrão com multi database (se necessário)
-    if multidb:
-        list_dynamic = multi_database()(list_dynamic_wrapper(injector_factory))
-        get_dynamic = multi_database()(get_dynamic_wrapper(injector_factory))
-        post_dynamic = multi_database()(post_dynamic_wrapper(injector_factory))
-        put_dynamic = multi_database()(put_dynamic_wrapper(injector_factory))
-        patch_dynamic = multi_database()(patch_dynamic_wrapper(injector_factory))
-        delete_dynamic = multi_database()(delete_dynamic_wrapper(injector_factory))
-    else:
-        list_dynamic = list_dynamic_wrapper(injector_factory)
-        get_dynamic = get_dynamic_wrapper(injector_factory)
-        post_dynamic = post_dynamic_wrapper(injector_factory)
-        put_dynamic = put_dynamic_wrapper(injector_factory)
-        patch_dynamic = patch_dynamic_wrapper(injector_factory)
-        delete_dynamic = delete_dynamic_wrapper(injector_factory)
+    list_dynamic = _dynamic_route_wrapper(
+        list_dynamic_builder, endpoint_suffix="list_dynamic"
+    )
+    get_dynamic = _dynamic_route_wrapper(
+        get_dynamic_builder, endpoint_suffix="get_dynamic"
+    )
+    post_dynamic = _dynamic_route_wrapper(
+        post_dynamic_builder, endpoint_suffix="post_dynamic"
+    )
+    put_dynamic = _dynamic_route_wrapper(
+        put_dynamic_builder, endpoint_suffix="put_dynamic"
+    )
+    patch_dynamic = _dynamic_route_wrapper(
+        patch_dynamic_builder, endpoint_suffix="patch_dynamic"
+    )
+    delete_dynamic = _dynamic_route_wrapper(
+        delete_dynamic_builder, endpoint_suffix="delete_dynamic"
+    )
 
     # Registrando as rotas no flask
     flask_app.add_url_rule(

nsj_rest_lib2/dto/__init__.py

@@ -0,0 +1 @@
+#

nsj_rest_lib2/dto/escopo_dto.py

@@ -0,0 +1,39 @@
+import uuid
+
+from nsj_rest_lib.decorator.dto import DTO
+from nsj_rest_lib.descriptor.dto_field import DTOField
+from nsj_rest_lib.descriptor.dto_field_validators import DTOFieldValidators
+from nsj_rest_lib.dto.dto_base import DTOBase
+
+
+@DTO()
+class EscopoDTO(DTOBase):
+
+    id: uuid.UUID = DTOField(
+        pk=True,
+        resume=True,
+        not_null=True,
+        default_value=uuid.uuid4,
+        strip=True,
+        min=36,
+        max=36,
+        validator=DTOFieldValidators().validate_uuid,
+    )
+
+    codigo: str = DTOField(
+        resume=True,
+        not_null=True,
+        strip=True,
+        min=1,
+        max=100,
+        unique="escopo_codigo",
+        candidate_key=True,
+    )
+
+    service_account: str = DTOField(
+        resume=True,
+        strip=True,
+        min=5,
+        max=320,
+        validator=DTOFieldValidators().validate_email,
+    )

nsj_rest_lib2/entity/escopo_entity.py

@@ -0,0 +1,15 @@
+import uuid
+
+from nsj_rest_lib.entity.entity_base import EntityBase
+from nsj_rest_lib.decorator.entity import Entity
+
+
+@Entity(
+    table_name="restlib2.escopo",
+    pk_field="id",
+    default_order_fields=["codigo", "id"],
+)
+class EscopoEntity(EntityBase):
+    id: uuid.UUID = None
+    codigo: str = None
+    service_account: str = None

nsj_rest_lib2/service/entity_config_writer.py

@@ -70,6 +70,7 @@ class EntityConfigWriter:
         return {
             "dto_class_name": compiler_result.dto_class_name,
             "entity_class_name": compiler_result.entity_class_name,
+            "service_account": compiler_result.service_account,
             "insert_function_class_name": compiler_result.insert_function_class_name,
             "insert_function_name": compiler_result.insert_function_name,
             "source_insert_function": compiler_result.source_insert_function,
@@ -141,6 +142,7 @@ class EntityConfigWriter:
             compiler_result.source_get_function_type,
             compiler_result.source_list_function_type,
             compiler_result.source_delete_function_type,
+            compiler_result.service_account,
         ):
             hasher.update(content)
 

nsj_rest_lib2/service/entity_loader.py

@@ -24,6 +24,7 @@ class LoadedEntity:
         self.api_expose: bool = False
         self.api_verbs: list[str] = []
         self.relations_dependencies: list[RelationDependency] = []
+        self.service_account: str | None = None
         self.insert_function_class_name: str | None = None
         self.update_function_class_name: str | None = None
         self.insert_function_name: str | None = None
@@ -102,6 +103,7 @@ class EntityLoader:
             entities_dict = namespace.entities_dict
             api_expose = loaded_entity.api_expose
             api_verbs = loaded_entity.api_verbs
+            service_account = loaded_entity.service_account
             relations_dependencies = loaded_entity.relations_dependencies
             insert_function_class_name = loaded_entity.insert_function_class_name
             update_function_class_name = loaded_entity.update_function_class_name
@@ -164,6 +166,7 @@ class EntityLoader:
                         entities_dict,
                         api_expose,
                         api_verbs,
+                        service_account,
                         insert_function_class_name,
                         update_function_class_name,
                         insert_function_name,
@@ -195,6 +198,7 @@ class EntityLoader:
                         entities_dict,
                         api_expose,
                         api_verbs,
+                        service_account,
                         insert_function_class_name,
                         update_function_class_name,
                         insert_function_name,
@@ -213,6 +217,7 @@ class EntityLoader:
                         namespace,
                         api_expose,
                         api_verbs,
+                        service_account,
                         insert_function_class_name,
                         update_function_class_name,
                         insert_function_name,
@@ -230,6 +235,7 @@ class EntityLoader:
                         namespace.entities_dict,
                         api_expose,
                         api_verbs,
+                        service_account,
                         insert_function_class_name,
                         update_function_class_name,
                         insert_function_name,
@@ -249,6 +255,7 @@ class EntityLoader:
                     entities_dict,
                     api_expose,
                     api_verbs,
+                    service_account,
                     insert_function_class_name,
                     update_function_class_name,
                     insert_function_name,
@@ -293,6 +300,7 @@ class EntityLoader:
             namespace,
             api_expose,
             api_verbs,
+            service_account,
             insert_function_class_name,
             update_function_class_name,
             insert_function_name,
@@ -311,6 +319,7 @@ class EntityLoader:
             namespace.entities_dict,
             api_expose,
             api_verbs,
+            service_account,
             insert_function_class_name,
             update_function_class_name,
             insert_function_name,
@@ -367,6 +376,7 @@ class EntityLoader:
         str | None,
         str | None,
         str | None,
+        str | None,
     ] | None:
         # Interpretando o json de configuração da entidade
         try:
@@ -381,6 +391,7 @@ class EntityLoader:
             api_expose = entity_config["api_expose"]
             # api_resource = entity_config["api_resource"]
             api_verbs = entity_config["api_verbs"]
+            service_account = entity_config.get("service_account")
             insert_function_class_name = entity_config.get(
                 "insert_function_class_name"
             )
@@ -533,6 +544,7 @@ class EntityLoader:
             loaded_entity.entity_hash = entity_hash
             loaded_entity.api_expose = api_expose
             loaded_entity.api_verbs = api_verbs
+            loaded_entity.service_account = service_account
             loaded_entity.relations_dependencies = relations_dependencies
             loaded_entity.insert_function_class_name = insert_function_class_name
             loaded_entity.update_function_class_name = update_function_class_name
@@ -559,6 +571,7 @@ class EntityLoader:
             namespace,
             api_expose,
             api_verbs,
+            service_account,
             insert_function_class_name,
             update_function_class_name,
             insert_function_name,

{nsj_rest_lib2-0.0.32.dist-info → nsj_rest_lib2-0.0.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.32
+Version: 0.0.34
 Summary: Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configuradas por meio de EDLs declarativos (em formato JSON).
 Home-page: https://github.com/Nasajon/nsj_rest_lib2
 Author: Nasajon Sistemas
@@ -12,7 +12,7 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.4
 Description-Content-Type: text/markdown
-Requires-Dist: nsj-rest-lib<6.0.0,>=5.1.3
+Requires-Dist: nsj-rest-lib<7.0.0,>=5.1.3
 Requires-Dist: redis<7.0.0,>=6.4.0
 Requires-Dist: nsj-multi-database-lib<3.0.0,>=2.0.1
 Requires-Dist: pydantic<3.0.0,>=2.11.9

{nsj_rest_lib2-0.0.32.dist-info → nsj_rest_lib2-0.0.34.dist-info}/RECORD

@@ -3,7 +3,7 @@ nsj_rest_lib2/exception.py,sha256=E9uMUdoCCQOVQfc8f6gD9b5Pxurf3Q4SytDCcqSlkZ8,56
 nsj_rest_lib2/redis_config.py,sha256=4KLcvYS3nJO7PMQgF6F9_j6r-TyqcS7TBbd3LEQuKDU,629
 nsj_rest_lib2/settings.py,sha256=Hn_o1HZmievnYb8D1kNT2Nq-OEjxbyNjOiOpbnFsMwE,367
 nsj_rest_lib2/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/compiler/compiler.py,sha256=f62qzh3R9oC9JJ0pkaHJwVyhM0MEwhZDs_q7MzdDlxw,34467
+nsj_rest_lib2/compiler/compiler.py,sha256=a-lfAEgj2O6mmYKoA3q2x_tVhjBD-y7C6LHixStgqaU,35263
 nsj_rest_lib2/compiler/compiler_structures.py,sha256=stspjqJGXU7Vz3BqQ-ZF5ZmumFm3R4jpkWgVVsXW5d0,1488
 nsj_rest_lib2/compiler/dto_compiler.py,sha256=Fs6VysuAjBgct7_Wc0sugvx7z9tfnlZcSrBu0l0Pyp0,7019
 nsj_rest_lib2/compiler/entity_compiler.py,sha256=LeGEBxsjAmZZog2gh4vjUX1aFp9JSVgHHOdTkY0aH-s,6733
@@ -14,7 +14,7 @@ nsj_rest_lib2/compiler/migration_compiler.py,sha256=vlG54XmYRqzIo0Iey-4HbSRzPg3Y
 nsj_rest_lib2/compiler/migration_compiler_alter_table.py,sha256=awtqVrKox86rmlQV7K17JzZJZqz9cF7McshLBlLx65s,7969
 nsj_rest_lib2/compiler/migration_compiler_create_table.py,sha256=h22cU53EFnuB5t28fMZ_r7MM-14Vqqu3emebBUJN2LY,2606
 nsj_rest_lib2/compiler/migration_compiler_util.py,sha256=WB_GRX78nTRKlZkgL-4yowwlQoAe81llZ-E2AYfIbh4,5168
-nsj_rest_lib2/compiler/model.py,sha256=hmL9ItHGTX4sNZbAYCzVdZnX8JYb_MjG1PtuaQQ2hsA,2310
+nsj_rest_lib2/compiler/model.py,sha256=ow9dQve7npl4OZU2GyS0HMZ2OXvBSebWTQCXFm6iMxM,2358
 nsj_rest_lib2/compiler/property_compiler.py,sha256=hMQX5vrLqjOEM_wdzuerxuARMq5JhZQ_R8cUVoLHNNM,47631
 nsj_rest_lib2/compiler/edl_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/compiler/edl_model/ai_entity_edl.py,sha256=664QBDcOgVnyfwtUOXO1W7AKaZhueBG335x5DuogruY,7644
@@ -34,11 +34,15 @@ nsj_rest_lib2/compiler/util/str_util.py,sha256=0ReIQ2Vy4zAmVMvGv0FcUehRQw15hlz0e
 nsj_rest_lib2/compiler/util/type_naming_util.py,sha256=jYUnr3eC6ewwhIAFHF89OOLoSH9aO_syHMF66AsWX3s,2355
 nsj_rest_lib2/compiler/util/type_util.py,sha256=HTKOH4uRTOY0YgoM8oUv_6cEcReE_bgKYXFBsQCb-3A,357
 nsj_rest_lib2/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/controller/dynamic_controller.py,sha256=y9bSGJdQ-mIIkDneY0nRFfmivPOzDbeGFxFU9J3pQTk,21642
+nsj_rest_lib2/controller/dynamic_controller.py,sha256=8kvN75-E4mA1nApNJMMQstKv036z8tDPV5YtLCokNQU,14132
+nsj_rest_lib2/dto/__init__.py,sha256=MsSFjiLMLJZ7QhUPpVBWKiyDnCzryquRyr329NoCACI,2
+nsj_rest_lib2/dto/escopo_dto.py,sha256=RSAPVTgckH57qd9y_dVHYG0NcAKg7B2UFZUyQRok28M,869
+nsj_rest_lib2/entity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsj_rest_lib2/entity/escopo_entity.py,sha256=T4bxFDzHJvIj-nZ_6d0Xh2oQg21HgoRjp19nt6clY18,338
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/service/entity_config_writer.py,sha256=4pLNqyw2asTiiuxNwYnH69eLLABa9GfrgD_GxS6vJ18,5991
-nsj_rest_lib2/service/entity_loader.py,sha256=65qa_45tPAQWU6G_vsG9Gy4d9OksYT2yyyr137zrWb0,24812
-nsj_rest_lib2-0.0.32.dist-info/METADATA,sha256=Jw_r7sNxYeJKtk46OthJwrqHvH-pbqTmE37JKHSlFNg,1094
-nsj_rest_lib2-0.0.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.32.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.32.dist-info/RECORD,,
+nsj_rest_lib2/service/entity_config_writer.py,sha256=bLXWrncm_OOjkvF_wcEAJ1NVjhcrV-zt41gDNtPDh68,6100
+nsj_rest_lib2/service/entity_loader.py,sha256=FPHdJs6qA_-bjtHMsJ7OAe0RxVv0vfOMX5lN51ZB_JA,25355
+nsj_rest_lib2-0.0.34.dist-info/METADATA,sha256=WfkNgNrmcbNCbwJIvWqv8DqqcBSSBNgNl1YZHi54dfE,1094
+nsj_rest_lib2-0.0.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.34.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.34.dist-info/RECORD,,