nsj-rest-lib2 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

nsj_rest_lib2/compiler/compiler.py

@@ -9,6 +9,7 @@ from nsj_rest_lib2.compiler.compiler_structures import (
 )
 from nsj_rest_lib2.compiler.dto_compiler import DTOCompiler
 from nsj_rest_lib2.compiler.edl_model.entity_model_base import EntityModelBase
+from nsj_rest_lib2.compiler.edl_model.entity_model_mixin import EntityModelMixin
 from nsj_rest_lib2.compiler.edl_model.primitives import REGEX_EXTERNAL_REF
 from nsj_rest_lib2.compiler.entity_compiler import EntityCompiler
 from nsj_rest_lib2.compiler.model import CompilerResult
@@ -22,7 +23,6 @@ from nsj_rest_lib2.settings import get_logger
 # TODO Implementar suporte a conjuntos
 # TODO Autenticação nas rotas
 # TODO Atualizar o status da entidade pelo worker de compilação (e talvez parar uma compilação, quando se delete uma entidade)
-# TODO Mixins
 # TODO Classes Abstratas
 # TODO Partial Classes
 # TODO Migrations
@@ -44,8 +44,8 @@ class EDLCompiler:
         compiler_results = []
         for entity_model_id in entity_models:
             entity_model = entity_models[entity_model_id]
-            if not entity_model.abstract:
-                compiler_result = self._compile_model(entity_model, entity_models)
+            compiler_result = self._compile_model(entity_model, entity_models)
+            if compiler_result:
                 compiler_results.append(compiler_result)
 
         return compiler_results
@@ -54,27 +54,28 @@ class EDLCompiler:
         self,
         edl_json: dict[str, Any],
         dependencies_edls: list[dict[str, Any]],
-    ) -> CompilerResult:
+    ) -> CompilerResult | None:
         entity_model = EntityModel(**edl_json)
 
         entity_models = []
         for dependency_edl in dependencies_edls:
-            dependency_entity_model = EntityModel(**dependency_edl)
+            if "mixin" in dependency_edl and dependency_edl["mixin"]:
+                dependency_entity_model = EntityModelMixin(**dependency_edl)
+            else:
+                dependency_entity_model = EntityModel(**dependency_edl)
             entity_models.append(dependency_entity_model)
 
         return self.compile_model(entity_model, entity_models)
 
     def compile_model(
         self,
-        entity_model: EntityModel,
-        dependencies_models: list[EntityModel],
-    ) -> CompilerResult:
+        entity_model: EntityModelBase,
+        dependencies_models: list[tuple[str, EntityModelBase]],
+    ) -> CompilerResult | None:
         entity_models = {}
         for dependency_entity_model in dependencies_models:
-            complete_entity_id = (
-                f"{dependency_entity_model.escopo}/{dependency_entity_model.id}"
-            )
-            entity_models[complete_entity_id] = dependency_entity_model
+            complete_entity_id = dependency_entity_model[0]
+            entity_models[complete_entity_id] = dependency_entity_model[1]
 
         return self._compile_model(entity_model, entity_models)
 
@@ -84,9 +85,11 @@ class EDLCompiler:
         entity_models: dict[str, EntityModel],
         escopo: str | None = None,
         prefx_class_name: str = "",
-    ) -> CompilerResult:
+    ) -> CompilerResult | None:
+        if entity_model.mixin:
+            return None
 
-        if escopo is None and isinstance(entity_model, EntityModel):
+        if escopo is None and (isinstance(entity_model, EntityModel)):
             escopo = entity_model.escopo
 
         if not escopo:
@@ -148,6 +151,11 @@ class EDLCompiler:
                 prefx_class_name=f"{prefx_class_name}_{entity_model.id}",
             )
 
+            if not component_compiled:
+                raise Exception(
+                    f"Erro ao compilar o component '{component_key}' da entidade '{entity_model.id}'. Gerou saída None, como se fosse um mixin."
+                )
+
             # Guardando o código gerado no buffer
             if component_compiled.dto_code:
                 dto_code += component_compiled.dto_code + "\n\n"
@@ -195,6 +203,12 @@ class EDLCompiler:
             compiler_result.api_verbs = entity_model.api.verbs
             compiler_result.relations_dependencies = relations_dependencies_complete
 
+        get_logger().debug(f"código gerado para a entidade: {entity_model.id}")
+        get_logger().debug("DTO Code:")
+        get_logger().debug(f"\n{dto_code}")
+        get_logger().debug("Entity Code:")
+        get_logger().debug(f"\n{entity_code}")
+
         return compiler_result
 
     def _make_components_structures(
@@ -262,6 +276,19 @@ class EDLCompiler:
                 entity_model.repository.properties
             )
 
+        # Populando com as propriedades dos mixins
+        if entity_model.mixins:
+            for mixin_id in entity_model.mixins:
+                if mixin_id not in entity_models:
+                    raise Exception(f"Mixin '{mixin_id}' não encontrado.")
+
+                mixin_model = entity_models[mixin_id]
+                self._make_properties_structures(
+                    properties_structure,
+                    mixin_model,
+                    entity_models,
+                )
+
     def _make_unique_map_by_property(
         self,
         map_indexes_by_property: dict[str, list[IndexCompilerStructure]],
@@ -311,18 +338,25 @@ class EDLCompiler:
 
     def list_dependencies(
         self, edl_json: dict[str, Any]
-    ) -> tuple[list[str], EntityModel]:
-        entity_model = EntityModel(**edl_json)
+    ) -> tuple[list[str], EntityModelBase]:
+        if edl_json.get("mixin", False):
+            entity_model = EntityModelMixin(**edl_json)
+        else:
+            entity_model = EntityModel(**edl_json)
 
         return (self._list_dependencies(entity_model), entity_model)
 
-    def _list_dependencies(self, entity_model: EntityModel) -> list[str]:
+    def _list_dependencies(self, entity_model: EntityModelBase) -> list[str]:
         entities: list[str] = []
 
         # Adicionando dependências por traits
         if entity_model.trait_from:
             entities.append(entity_model.trait_from)
 
+        # Adicionando dependências por mixins
+        if entity_model.mixins:
+            entities.extend(entity_model.mixins)
+
         # Populando com as dependências de propriedades de relacionamento
         relations = self._list_dependencies_relations(entity_model)
         entities.extend(relations)
@@ -384,7 +418,10 @@ if __name__ == "__main__":
         # Instanciando o objeto de modelo de entidade a partir do JSON,
         # e já realizando as validações básicas de tipo e estrutura.
         print(f"Validando arquivo: {file}")
-        entity_model = EntityModel(**edl)
+        if edl.get("mixin", False):
+            entity_model = EntityModelMixin(**edl)
+        else:
+            entity_model = EntityModel(**edl)
 
         complete_entity_id = f"{entity_model.escopo}/{entity_model.id}"
         entities[complete_entity_id] = entity_model

nsj_rest_lib2/compiler/edl_model/entity_model.py

@@ -4,12 +4,11 @@ from pydantic import Field
 from typing import Optional
 
 from nsj_rest_lib2.compiler.edl_model.api_model import APIModel
-from nsj_rest_lib2.compiler.edl_model.entity_model_base import EntityModelBase
+from nsj_rest_lib2.compiler.edl_model.entity_model_mixin import EntityModelMixin
 
 
-class EntityModel(EntityModelBase):
+class EntityModel(EntityModelMixin):
     edl_version: Optional[str] = Field(default="1.0", description="Versão do EDL")
-    escopo: str = Field(..., description="Escopo do EDL (define a aplicação).")
     version: Optional[str] = Field(
         default="1.0", description="Versão da entidade (padrão: 1.0)."
     )

nsj_rest_lib2/compiler/edl_model/entity_model_base.py

@@ -28,6 +28,10 @@ class EntityModelBase(BaseModel):
     required: Optional[List[str]] = Field(
         None, description="Lista de campos obrigatórios no modelo."
     )
+    mixin: Optional[bool] = Field(
+        False,
+        description="Indica se o modelo é um mixin (bloco reutilizável, que não gera contém tabela própria no banco).",
+    )
     partition_data: Optional[List[str]] = Field(
         None,
         description="Lista de propriedades da entidade, que serã usadas para particionamento dos dados no banco (sendo obrigatórias em todas as chamadas, inclusive como um tipo de filtro obrigatório).",

nsj_rest_lib2/compiler/edl_model/entity_model_mixin.py

@@ -0,0 +1,7 @@
+from pydantic import Field
+
+from nsj_rest_lib2.compiler.edl_model.entity_model_base import EntityModelBase
+
+
+class EntityModelMixin(EntityModelBase):
+    escopo: str = Field(..., description="Escopo do EDL (define a aplicação).")

nsj_rest_lib2/compiler/property_compiler.py

@@ -64,14 +64,15 @@ class EDLPropertyCompiler:
                 if prop.pk:
                     pk_keys.append(pkey)
 
-        if len(pk_keys) > 1:
-            raise Exception(
-                f"Entidade '{entity_model.id}' possui mais de uma chave primária (ainda não suportado): {pk_keys}"
-            )
-        elif len(pk_keys) == 0:
-            raise Exception(
-                f"Entidade '{entity_model.id}' não tem nenhuma chave primária (ainda não suportado)"
-            )
+        if not entity_model.mixin:
+            if len(pk_keys) > 1:
+                raise Exception(
+                    f"Entidade '{entity_model.id}' possui mais de uma chave primária (ainda não suportado): {pk_keys}"
+                )
+            elif len(pk_keys) == 0:
+                raise Exception(
+                    f"Entidade '{entity_model.id}' não tem nenhuma chave primária (ainda não suportado)"
+                )
 
         # pk_key = pk_keys[0]
 

nsj_rest_lib2/service/entity_loader.py

@@ -317,6 +317,12 @@ class EntityLoader:
                 namespace.module = module
                 namespace.entities_dict = module.__dict__
 
+            get_logger().debug(
+                f"Executando o código da entidade {entity_resource} no namespace {entity_config_key}. Código:"
+            )
+            get_logger().debug(f"Entity source:\n{source_entity}")
+            get_logger().debug(f"DTO source:\n{source_dto}")
+
             self._safe_exec(source_entity, namespace.entities_dict, "Entity source")
             self._safe_exec(source_dto, namespace.entities_dict, "DTO source")
 

{nsj_rest_lib2-0.0.14.dist-info → nsj_rest_lib2-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.14
+Version: 0.0.15
 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

{nsj_rest_lib2-0.0.14.dist-info → nsj_rest_lib2-0.0.15.dist-info}/RECORD

@@ -4,18 +4,19 @@ nsj_rest_lib2/redis_config.py,sha256=4KLcvYS3nJO7PMQgF6F9_j6r-TyqcS7TBbd3LEQuKDU
 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/ai_compiler.py,sha256=shAtN4T0ai_52qh15L3mK1QbeC6glHOR6C3J3gj14II,9029
-nsj_rest_lib2/compiler/compiler.py,sha256=zyHaP2Vi-ONkfc6F59DXtVDgdQ_EOFcWAURUPdJBfx4,15171
+nsj_rest_lib2/compiler/compiler.py,sha256=HiBlaC_SDFFVE77UbwcWzXdcuF8G5Xaz4tzdpkHbIo4,16766
 nsj_rest_lib2/compiler/compiler_structures.py,sha256=ZUeWnO-23f3JHq4bOfTcqszMDDXwuFEtMRhqMN7GeWQ,1214
 nsj_rest_lib2/compiler/dto_compiler.py,sha256=KDdfzoghbsO0RpWAhuhZ4gsb11aoxgci-93dwxWNMuY,5400
 nsj_rest_lib2/compiler/entity_compiler.py,sha256=7LypMMlgXnUIkpO7rEYtc2V1sKi9Nv1IxlXkgObX25s,4453
 nsj_rest_lib2/compiler/model.py,sha256=QDBoM26qoZdiNcykl1nvXCrFDhg-6Q__QzVq6uY1QzE,1460
-nsj_rest_lib2/compiler/property_compiler.py,sha256=EP-EnszasIKaCgz-_HzBliNA5L7cilixwnhrJD68iJI,35720
+nsj_rest_lib2/compiler/property_compiler.py,sha256=AL0QW2-IqlCKJ7X4QFPEaafZ2MfNBElGF-e6KFPHPaA,35787
 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
 nsj_rest_lib2/compiler/edl_model/api_model.py,sha256=pH0Uiq_64AGvkHqwY44TrulWWZXbi6M0EKJWUhSqKj0,837
 nsj_rest_lib2/compiler/edl_model/column_meta_model.py,sha256=s0sEVkoW1hV2_hto1mws4XhzKGH_b4NzhaOiwFH25Ks,694
-nsj_rest_lib2/compiler/edl_model/entity_model.py,sha256=tkx76ldDS5iFr3CbPi4mmq6y5F55LcgAhqCsrqfdzkc,936
-nsj_rest_lib2/compiler/edl_model/entity_model_base.py,sha256=cUpbNUat7GJgJv14-8R2XYPc0vrcLXC6KPoVaXYZZ5A,3291
+nsj_rest_lib2/compiler/edl_model/entity_model.py,sha256=-y_b9ZFZvdYiB_oxX64BdKyS9qDVHzknWd5R6muTEO8,857
+nsj_rest_lib2/compiler/edl_model/entity_model_base.py,sha256=pkWBfrtz3ZTG1qvZwDUwJHE9qTkcqmOgesq3vgQKxBo,3472
+nsj_rest_lib2/compiler/edl_model/entity_model_mixin.py,sha256=vGUYwMXcf24T4oF7Ie-cTzCvZLEa_bxCA-euBz8S7_Q,232
 nsj_rest_lib2/compiler/edl_model/index_model.py,sha256=cXWlu0hxtro5vvYoirkDW4R3PCnBW5oCCWjRJ6AX5zE,508
 nsj_rest_lib2/compiler/edl_model/primitives.py,sha256=GTo8e1mf9munvl_J1-fmaXgSJ8yQvGX56f2rwS85M1Y,1459
 nsj_rest_lib2/compiler/edl_model/property_meta_model.py,sha256=x2SApvI-5MZTErAHeOXnR6qfjflhSs8r6Y9KMtCykV0,3960
@@ -28,8 +29,8 @@ nsj_rest_lib2/compiler/util/type_util.py,sha256=HTKOH4uRTOY0YgoM8oUv_6cEcReE_bgK
 nsj_rest_lib2/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/controller/dynamic_controller.py,sha256=XMqxe1NW-NE5XwomXb4pSNdALQHpP74Hc26R4fnmXqg,15194
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/service/entity_loader.py,sha256=cv34rNuSOOz4_l5ouW_X-IIDiRtEkN44Dn3quNBDZJE,15372
-nsj_rest_lib2-0.0.14.dist-info/METADATA,sha256=aYvlmJGdy6qZxzyAij9JKvOYIBNawhmVY3SeX8kwkSE,1361
-nsj_rest_lib2-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.14.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.14.dist-info/RECORD,,
+nsj_rest_lib2/service/entity_loader.py,sha256=uB0xXih9Px2jSTMdZNIu6_3dngE37K7adKX03cYSRug,15660
+nsj_rest_lib2-0.0.15.dist-info/METADATA,sha256=ULdAQGwg_pghhmixzJCCPI9Qg0L-xuVonJqBkx5Rt3Y,1361
+nsj_rest_lib2-0.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.15.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.15.dist-info/RECORD,,