nsj-rest-lib2 0.0.10__tar.gz → 0.0.12__tar.gz

{nsj_rest_lib2-0.0.10 → nsj_rest_lib2-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.10
+Version: 0.0.12
 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.10 → nsj_rest_lib2-0.0.12}/nsj_rest_lib2/compiler/compiler.py

@@ -1,4 +1,5 @@
 import re
+
 from typing import Any
 
 from nsj_rest_lib2.compiler.compiler_structures import (
@@ -7,8 +8,8 @@ from nsj_rest_lib2.compiler.compiler_structures import (
 )
 from nsj_rest_lib2.compiler.dto_compiler import DTOCompiler
 from nsj_rest_lib2.compiler.edl_model.primitives import REGEX_EXTERNAL_REF
-from nsj_rest_lib2.compiler.edl_model.repository_model import RepositoryModel
 from nsj_rest_lib2.compiler.entity_compiler import EntityCompiler
+from nsj_rest_lib2.compiler.model import CompilerResult
 from nsj_rest_lib2.compiler.property_compiler import EDLPropertyCompiler
 
 from nsj_rest_lib2.compiler.edl_model.entity_model import EntityModel
@@ -26,17 +27,6 @@ from nsj_rest_lib2.settings import get_logger
 # TODO Criar imagem docker base para as aplicações, usando venv (para poderem atualizar o pydantic)
 
 
-class CompilerResult:
-    def __init__(self):
-        self.dto_class_name: str | None = None
-        self.dto_code: str | None = None
-        self.entity_class_name: str | None = None
-        self.entity_code: str | None = None
-        self.api_expose: bool | None = None
-        self.api_resource: str | None = None
-        self.api_verbs: list[str] | None = None
-
-
 class EDLCompiler:
     def __init__(self) -> None:
         self._properties_compiler = EDLPropertyCompiler()
@@ -114,6 +104,8 @@ class EDLCompiler:
             props_pk,
             enum_classes,
             related_imports,
+            relations_dependencies,
+            fixed_filters,
         ) = self._properties_compiler.compile(
             properties_structure,
             map_unique_by_property,
@@ -123,7 +115,11 @@ class EDLCompiler:
 
         # Gerando o código do DTO
         dto_class_name, code_dto = self._dto_compiler.compile(
-            entity_model, ast_dto_attributes, enum_classes, related_imports
+            entity_model,
+            ast_dto_attributes,
+            enum_classes,
+            related_imports,
+            fixed_filters,
         )
 
         # Gerando o código da Entity
@@ -142,6 +138,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.relations_dependencies = relations_dependencies
 
         return compiler_result
 
@@ -244,10 +241,20 @@ class EDLCompiler:
     def _list_dependencies(self, entity_model: EntityModel) -> list[str]:
         entities: list[str] = []
 
+        # Adicionando dependências por traits
         if entity_model.trait_from:
             entities.append(entity_model.trait_from)
 
-        # Populando com as dependências de propriedades de relacionamento 1_N
+        # Populando com as dependências de propriedades de relacionamento
+        relations = self._list_dependencies_relations(entity_model)
+        entities.extend(relations)
+
+        return entities
+
+    def _list_dependencies_relations(self, entity_model) -> list[str]:
+        entities = []
+
+        # Relacionamento 1_N
         for pkey in entity_model.properties:
             prop = entity_model.properties[pkey]
 

{nsj_rest_lib2-0.0.10 → nsj_rest_lib2-0.0.12}/nsj_rest_lib2/compiler/dto_compiler.py

@@ -3,6 +3,7 @@ import ast
 import black
 
 from nsj_rest_lib2.compiler.edl_model.entity_model import EntityModel
+from nsj_rest_lib2.compiler.edl_model.primitives import BasicTypes
 from nsj_rest_lib2.compiler.util.str_util import CompilerStrUtil
 from nsj_rest_lib2.compiler.util.type_naming_util import compile_dto_class_name
 
@@ -17,6 +18,7 @@ class DTOCompiler:
         ast_dto_attributes: list[ast.stmt],
         enum_classes: list[ast.stmt],
         related_imports: list[tuple[str, str, str]],
+        fixed_filters: list[tuple[str, BasicTypes]],
     ) -> tuple[str, str]:
         """
         Compila o código do DTO a partir do AST e retorna o código compilado.
@@ -71,6 +73,18 @@ class DTOCompiler:
                 names=[ast.alias(name="DTOBase", asname=None)],
                 level=0,
             ),
+            # from nsj_rest_lib.descriptor.dto_left_join_field import EntityRelationOwner
+            ast.ImportFrom(
+                module="nsj_rest_lib.descriptor.dto_left_join_field",
+                names=[ast.alias(name="EntityRelationOwner", asname=None)],
+                level=0,
+            ),
+            # from nsj_rest_lib.descriptor.dto_object_field import DTOObjectField
+            ast.ImportFrom(
+                module="nsj_rest_lib.descriptor.dto_object_field",
+                names=[ast.alias(name="DTOObjectField", asname=None)],
+                level=0,
+            ),
         ]
 
         for import_ in related_imports:
@@ -89,6 +103,19 @@ class DTOCompiler:
                 )
             )
 
+        # Keywords para tipos usados em fixed_filters
+        keywords_decorator_dto = []
+        for fixed_filter in fixed_filters:
+            keywords_decorator_dto.append(
+                ast.keyword(
+                    arg="fixed_filters",
+                    value=ast.Dict(
+                        keys=[ast.Constant(value=fixed_filter[0])],
+                        values=[ast.Constant(value=fixed_filter[1])],
+                    ),
+                )
+            )
+
         # Criando o ast da classe
         class_name = compile_dto_class_name(entity_model.id)
         ast_class = ast.ClassDef(
@@ -99,7 +126,7 @@ class DTOCompiler:
                 ast.Call(
                     func=ast.Name(id="DTO", ctx=ast.Load()),
                     args=[],
-                    keywords=[],
+                    keywords=keywords_decorator_dto,
                 )
             ],
             body=ast_dto_attributes,

{nsj_rest_lib2-0.0.10 → nsj_rest_lib2-0.0.12}/nsj_rest_lib2/compiler/edl_model/column_meta_model.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field, model_validator
-from typing import List, Optional, Literal
+from typing import Optional
 
 
 class ColumnMetaModel(BaseModel):

{nsj_rest_lib2-0.0.10 → nsj_rest_lib2-0.0.12}/nsj_rest_lib2/compiler/edl_model/trait_property_meta_model.py

@@ -1,6 +1,8 @@
+from typing import List, Optional
 from pydantic import BaseModel, Field
 
 from nsj_rest_lib2.compiler.edl_model.primitives import BasicTypes, PropertyType
+from nsj_rest_lib2.compiler.edl_model.property_meta_model import DomainConfigModel
 
 
 class TraitPropertyMetaModel(BaseModel):
@@ -8,3 +10,7 @@ class TraitPropertyMetaModel(BaseModel):
     value: BasicTypes = Field(
         ..., description="Valor fixo da propriedade de condicionamento do trait."
     )
+    domain_config: Optional[List[DomainConfigModel]] = Field(
+        None,
+        description="Lista de valores permitidos.",
+    )

nsj_rest_lib2-0.0.12/nsj_rest_lib2/compiler/model.py

@@ -0,0 +1,45 @@
+import uuid
+
+from typing import Any
+
+
+class RelationDependency:
+    def __init__(self):
+        self.tenant: int | None = None
+        self.grupo_empresarial: uuid.UUID | None = None
+        self.entity_resource: str | None = None
+        self.entity_scope: str | None = None
+
+    def to_dict(self) -> dict[str, Any]:
+        return {
+            "tenant": self.tenant,
+            "grupo_empresarial": (
+                str(self.grupo_empresarial) if self.grupo_empresarial else None
+            ),
+            "entity_resource": self.entity_resource,
+            "entity_scope": self.entity_scope,
+        }
+
+    def from_dict(self, data: dict[str, Any]) -> "RelationDependency":
+        self.tenant = data.get("tenant")
+        self.grupo_empresarial = (
+            uuid.UUID(data["grupo_empresarial"])
+            if data.get("grupo_empresarial")
+            else None
+        )
+        self.entity_resource = data.get("entity_resource")
+        self.entity_scope = data.get("entity_scope")
+
+        return self
+
+
+class CompilerResult:
+    def __init__(self):
+        self.dto_class_name: str | None = None
+        self.dto_code: str | None = None
+        self.entity_class_name: str | None = None
+        self.entity_code: str | None = None
+        self.api_expose: bool | None = None
+        self.api_resource: str | None = None
+        self.api_verbs: list[str] | None = None
+        self.relations_dependencies: list[RelationDependency] | None = None