nsj-rest-lib2 0.0.20__py3-none-any.whl → 0.0.22__py3-none-any.whl

nsj_rest_lib2/compiler/compiler.py

@@ -25,18 +25,6 @@ from nsj_rest_lib2.compiler.edl_model.entity_model import EntityModel
 
 from nsj_rest_lib2.settings import get_logger
 
-# TODO GET e POST de relacionamentos 1X1
-# TODO Revisar compilação de valores default (sensível a tipos)
-# 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 Classes Abstratas
-# TODO Partial Classes
-# TODO Migrations
-# TODO Criar imagem docker base para as aplicações, usando venv (para poderem atualizar o pydantic)
-
-# TODO Suporte ao "min_items" dos relacionamentos no RestLib1
-
 
 class EDLCompiler:
     def __init__(self) -> None:
@@ -117,7 +105,9 @@ class EDLCompiler:
                     f"Entidade base '{entity_model.partial_of}' da extensão parcial '{entity_model.id}' é inválida."
                 )
 
-            self._validate_partial_model(entity_model, base_model_candidate, entity_models)
+            self._validate_partial_model(
+                entity_model, base_model_candidate, entity_models
+            )
             partial_metadata = self._build_partial_metadata(
                 entity_model, base_model_candidate
             )
@@ -252,13 +242,13 @@ class EDLCompiler:
         compiler_result.entity_code = entity_code
         compiler_result.dto_class_name = dto_class_name
         compiler_result.dto_code = dto_code
+        compiler_result.relations_dependencies = relations_dependencies_complete
 
         # Compilando questões das APIs
         if isinstance(entity_model, EntityModel):
             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_complete
 
         get_logger().debug(f"código gerado para a entidade: {entity_model.id}")
         get_logger().debug("DTO Code:")

nsj_rest_lib2/compiler/edl_model/primitives.py

@@ -48,6 +48,14 @@ MAPPING_PRIMITIVE_TYPES_TO_PYTHON = {
 BasicTypes = int | bool | float | str
 DefaultTypes = BasicTypes | List[BasicTypes]
 
+STR_BASED_TYPES = {
+    PrimitiveTypes.STRING,
+    PrimitiveTypes.EMAIL,
+    PrimitiveTypes.CPF,
+    PrimitiveTypes.CNPJ,
+    PrimitiveTypes.CPF_CNPJ,
+}
+
 
 class CardinalityTypes(enum.Enum):
     C1_1 = "1_1"

nsj_rest_lib2/compiler/edl_model/property_meta_model.py

@@ -36,7 +36,6 @@ class PropertyMetaModel(BaseModel):
         None, description="Comprimento máximo (para strings)."
     )
 
-    ## TODO Sugestões de validação
     min_length: Optional[int] = Field(
         None, description="Comprimento mínimo (para strings)."
     )

nsj_rest_lib2/compiler/property_compiler.py

@@ -1,5 +1,7 @@
 import ast
+import datetime
 import re
+import uuid
 
 from nsj_rest_lib2.compiler.compiler_structures import (
     IndexCompilerStructure,
@@ -13,6 +15,7 @@ from nsj_rest_lib2.compiler.edl_model.primitives import (
     PrimitiveTypes,
     REGEX_EXTERNAL_REF,
     REGEX_INTERNAL_REF,
+    STR_BASED_TYPES,
 )
 from nsj_rest_lib2.compiler.edl_model.property_meta_model import PropertyMetaModel
 from nsj_rest_lib2.compiler.edl_model.trait_property_meta_model import (
@@ -27,10 +30,6 @@ from nsj_rest_lib2.compiler.util.type_naming_util import (
 )
 from nsj_rest_lib2.compiler.util.type_util import TypeUtil
 
-# TODO pattern
-# TODO lowercase
-# TODO uppercase
-
 
 class EDLPropertyCompiler:
 
@@ -51,9 +50,6 @@ class EDLPropertyCompiler:
         list[RelationDependency],
         list[tuple[str, BasicTypes]],
     ]:
-
-        # TODO Criar opção de campo calculado?
-
         # Descobrindo os atributos marcados como PK (e recuperando a chave primária)
         # TODO Verificar se devemos manter essa verificação
         pk_keys = []
@@ -64,8 +60,8 @@ class EDLPropertyCompiler:
                 if prop.pk:
                     pk_keys.append(pkey)
 
-        is_partial_extension = (
-            isinstance(entity_model, EntityModel) and bool(entity_model.partial_of)
+        is_partial_extension = isinstance(entity_model, EntityModel) and bool(
+            entity_model.partial_of
         )
 
         if not entity_model.mixin:
@@ -944,16 +940,6 @@ class EDLPropertyCompiler:
                 )
             )
 
-        if (
-            prop.default
-        ):  # TODO Verificar esse modo de tratar valores default (principalmente expressões)
-            keywords.append(
-                ast.keyword(
-                    arg="default_value",
-                    value=ast.Name(str(prop.default), ctx=ast.Load()),
-                )
-            )
-
         if prop.trim:
             keywords.append(ast.keyword(arg="strip", value=ast.Constant(True)))
 
@@ -1086,6 +1072,15 @@ class EDLPropertyCompiler:
             enum_class_name, ast_enum_class = result
             aux_classes.append(ast_enum_class)
 
+        default_value_ast = self._build_default_value_ast(pkey, prop, enum_class_name)
+        if default_value_ast is not None:
+            keywords.append(
+                ast.keyword(
+                    arg="default_value",
+                    value=default_value_ast,
+                )
+            )
+
         # Resolvendo o nome da propriedade no Entity
         if (
             properties_structure.entity_properties
@@ -1118,6 +1113,258 @@ class EDLPropertyCompiler:
 
         ast_entity_attributes.append(ast_entity_attr)
 
+    def _build_default_value_ast(
+        self,
+        pkey: str,
+        prop: PropertyMetaModel,
+        enum_class_name: str | None,
+    ) -> ast.expr | None:
+        default_value = prop.default
+        if default_value is None:
+            return None
+
+        if prop.domain_config and enum_class_name:
+            return self._build_enum_default_value_ast(
+                pkey, prop, enum_class_name, default_value
+            )
+
+        if not isinstance(prop.type, PrimitiveTypes):
+            raise ValueError(
+                f"Propriedade '{pkey}' não suporta valor default para relacionamentos."
+            )
+
+        return self._build_primitive_default_value_ast(pkey, prop, default_value)
+
+    def _build_enum_default_value_ast(
+        self,
+        pkey: str,
+        prop: PropertyMetaModel,
+        enum_class_name: str,
+        default_value: object,
+    ) -> ast.expr:
+        target_option = None
+        for option in prop.domain_config or []:
+            if option.value == default_value:
+                target_option = option
+                break
+
+            if option.mapped_value is not None and option.mapped_value == default_value:
+                target_option = option
+                break
+
+        if not target_option:
+            raise ValueError(
+                f"Propriedade '{pkey}' possui valor default '{default_value}' que não corresponde a nenhuma opção do enum."
+            )
+
+        enum_member_name = CompilerStrUtil.to_enum_member_name(target_option.value)
+
+        return ast.Attribute(
+            value=ast.Name(id=enum_class_name, ctx=ast.Load()),
+            attr=enum_member_name,
+            ctx=ast.Load(),
+        )
+
+    def _build_primitive_default_value_ast(
+        self,
+        pkey: str,
+        prop: PropertyMetaModel,
+        default_value: object,
+    ) -> ast.expr:
+        primitive_type = prop.type
+
+        if isinstance(default_value, str):
+            expression_ast = self._build_python_expression_from_string(default_value)
+            if expression_ast is not None:
+                return expression_ast
+
+        if primitive_type in STR_BASED_TYPES:
+            if not isinstance(default_value, str):
+                raise ValueError(
+                    f"Propriedade '{pkey}' exige valor default textual, recebido '{default_value}'."
+                )
+            return ast.Constant(value=default_value)
+
+        if primitive_type == PrimitiveTypes.BOOLEAN:
+            if isinstance(default_value, bool):
+                return ast.Constant(value=default_value)
+            raise ValueError(
+                f"Propriedade '{pkey}' exige valor default booleano, recebido '{default_value}'."
+            )
+
+        if primitive_type == PrimitiveTypes.INTEGER:
+            return self._build_numeric_constant_default_ast(
+                pkey,
+                default_value,
+                int,
+                "inteiro",
+                forbid_fraction=True,
+            )
+
+        if primitive_type in (
+            PrimitiveTypes.NUMBER,
+            PrimitiveTypes.CURRENCY,
+            PrimitiveTypes.QUANTITY,
+        ):
+            return self._build_numeric_constant_default_ast(
+                pkey,
+                default_value,
+                float,
+                "numérico",
+            )
+
+        if primitive_type == PrimitiveTypes.UUID:
+            return self._build_uuid_default_ast(pkey, default_value)
+
+        if primitive_type == PrimitiveTypes.DATE:
+            return self._build_iso_datetime_default_ast(
+                pkey,
+                default_value,
+                target="date",
+            )
+
+        if primitive_type == PrimitiveTypes.DATETIME:
+            return self._build_iso_datetime_default_ast(
+                pkey,
+                default_value,
+                target="datetime",
+            )
+
+        raise ValueError(
+            f"Propriedade '{pkey}' não suporta valor default para o tipo '{primitive_type.value}'."
+        )
+
+    def _build_numeric_constant_default_ast(
+        self,
+        pkey: str,
+        default_value: object,
+        cast_type: type,
+        type_label: str,
+        *,
+        forbid_fraction: bool = False,
+    ) -> ast.expr:
+        if isinstance(default_value, bool):
+            raise ValueError(
+                f"Propriedade '{pkey}' exige valor default {type_label}, recebido '{default_value}'."
+            )
+
+        value_to_convert = (
+            default_value.strip()
+            if isinstance(default_value, str)
+            else default_value
+        )
+
+        if forbid_fraction and isinstance(value_to_convert, float):
+            if not value_to_convert.is_integer():
+                raise ValueError(
+                    f"Propriedade '{pkey}' exige valor default inteiro, recebido '{default_value}'."
+                )
+
+        try:
+            converted_value = cast_type(value_to_convert)
+        except (TypeError, ValueError) as exc:
+            raise ValueError(
+                f"Propriedade '{pkey}' exige valor default {type_label}, recebido '{default_value}'."
+            ) from exc
+
+        if forbid_fraction and isinstance(value_to_convert, float):
+            converted_value = int(converted_value)
+
+        return ast.Constant(value=converted_value)
+
+    def _build_uuid_default_ast(
+        self,
+        pkey: str,
+        default_value: object,
+    ) -> ast.expr:
+        if isinstance(default_value, uuid.UUID):
+            uuid_value = str(default_value)
+        elif isinstance(default_value, str):
+            try:
+                uuid_value = str(uuid.UUID(default_value))
+            except ValueError as exc:
+                raise ValueError(
+                    f"Propriedade '{pkey}' exige UUID válido ou expressão Python, recebido '{default_value}'."
+                ) from exc
+        else:
+            raise ValueError(
+                f"Propriedade '{pkey}' exige UUID válido ou expressão Python, recebido '{default_value}'."
+            )
+
+        return ast.Call(
+            func=ast.Attribute(
+                value=ast.Name(id="uuid", ctx=ast.Load()),
+                attr="UUID",
+                ctx=ast.Load(),
+            ),
+            args=[ast.Constant(value=uuid_value)],
+            keywords=[],
+        )
+
+    def _build_iso_datetime_default_ast(
+        self,
+        pkey: str,
+        default_value: object,
+        *,
+        target: str,
+    ) -> ast.expr:
+        if target == "date":
+            parser = datetime.date
+        else:
+            parser = datetime.datetime
+
+        if isinstance(default_value, parser):
+            iso_value = default_value.isoformat()
+        elif isinstance(default_value, str):
+            iso_value = default_value.strip()
+        else:
+            raise ValueError(
+                f"Propriedade '{pkey}' exige {target} em formato ISO ou expressão Python, recebido '{default_value}'."
+            )
+
+        try:
+            parser.fromisoformat(iso_value)
+        except ValueError as exc:
+            raise ValueError(
+                f"Propriedade '{pkey}' exige {target} em formato ISO ou expressão Python, recebido '{default_value}'."
+            ) from exc
+
+        return ast.Call(
+            func=ast.Attribute(
+                value=ast.Attribute(
+                    value=ast.Name(id="datetime", ctx=ast.Load()),
+                    attr=target,
+                    ctx=ast.Load(),
+                ),
+                attr="fromisoformat",
+                ctx=ast.Load(),
+            ),
+            args=[ast.Constant(value=iso_value)],
+            keywords=[],
+        )
+
+    def _build_python_expression_from_string(self, expression: str) -> ast.expr | None:
+        try:
+            parsed_expr = ast.parse(expression, mode="eval").body
+        except SyntaxError:
+            return None
+
+        if self._is_safe_python_expression(parsed_expr):
+            return parsed_expr
+
+        return None
+
+    def _is_safe_python_expression(self, node: ast.AST) -> bool:
+        if isinstance(node, ast.Name):
+            return True
+        if isinstance(node, ast.Attribute):
+            return self._is_safe_python_expression(node.value)
+        if isinstance(node, ast.Call):
+            if node.keywords or node.args:
+                return False
+            return self._is_safe_python_expression(node.func)
+        return False
+
     def _compile_domain_config(
         self,
         pkey: str,
@@ -1139,7 +1386,7 @@ class EDLPropertyCompiler:
         # Compilando as opções do enum
         ast_values = []
         for value in prop.domain_config:
-            value_name = CompilerStrUtil.to_snake_case(value.value).upper()
+            value_name = CompilerStrUtil.to_enum_member_name(value.value)
 
             if use_mapped_value and value.mapped_value is None:
                 raise Exception(

nsj_rest_lib2/compiler/util/str_util.py

@@ -1,3 +1,6 @@
+import re
+
+
 class CompilerStrUtil:
     @staticmethod
     def to_camel_case(snake_str: str) -> str:
@@ -20,3 +23,10 @@ class CompilerStrUtil:
                 snake_str += "_"
             snake_str += char.lower()
         return snake_str
+
+    @staticmethod
+    def to_enum_member_name(raw_value: str) -> str:
+        """Converte um valor livre para o nome de membro enum padronizado."""
+        sanitized = re.sub(r"[^0-9A-Za-z]+", "_", raw_value.strip())
+        sanitized = sanitized.strip("_")
+        return CompilerStrUtil.to_snake_case(sanitized).upper()

nsj_rest_lib2/service/entity_loader.py

@@ -15,7 +15,6 @@ from nsj_rest_lib2.redis_config import get_redis
 from nsj_rest_lib2.settings import ESCOPO_RESTLIB2, MIN_TIME_SOURCE_REFRESH
 
 
-# TODO Verificar se está atualizando o loaded_at, quando o hash não muda
 class LoadedEntity:
     def __init__(self):
         self.dto_class_name: str = ""

{nsj_rest_lib2-0.0.20.dist-info → nsj_rest_lib2-0.0.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.20
+Version: 0.0.22
 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
@@ -25,12 +25,3 @@ Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configur
 
 [ESPECIFICAÇÃO DO MODELO DE ENTIDADES](docs/especificacao.md)
 
-## TODO
-* Unificar o arquivo redis_config.py
-* Usar pydantic, ou similar, para transformar a configuração das entidades, no redis, num objeto
-* Rever modo de usar o InjectFactory (talvez dando ciência, ao RestLib, do padrão multibanco)
-* Implementar e documentar campos join
-* Implementar e documentar conjuntos
-* Dar erro ao haver conflito de nomes das propriedades (por qualquer tipo de herança)
-* Rotas para o inline
-* inline será para composição (arquivo externo é agregação)

{nsj_rest_lib2-0.0.20.dist-info → nsj_rest_lib2-0.0.22.dist-info}/RECORD

@@ -4,12 +4,12 @@ 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=K8npaE6BPs_Bxu3uSvB-hZF5JEIxgu4sVsKYqLk6wcI,27572
+nsj_rest_lib2/compiler/compiler.py,sha256=vSA_hukm_l3WYjNn3UfDtydCxPEAVFPpfhUgmS-q3no,27056
 nsj_rest_lib2/compiler/compiler_structures.py,sha256=a_DF_nU4VgCt0sWJI03Ky6fPHvoIM0cjMkwQb_dYv6Q,1437
 nsj_rest_lib2/compiler/dto_compiler.py,sha256=mvZo19owtpFTjanCE20T0jmBKjhKXIVUsnR5raiGoRM,6728
 nsj_rest_lib2/compiler/entity_compiler.py,sha256=-mDA1-dHKYp0umQi1A4GbA0F1hlaC-gQRqj69vkADC4,6536
 nsj_rest_lib2/compiler/model.py,sha256=QDBoM26qoZdiNcykl1nvXCrFDhg-6Q__QzVq6uY1QzE,1460
-nsj_rest_lib2/compiler/property_compiler.py,sha256=Kqo9c1AvAjBN-7A4PBvrrXRPkngogH7FUZ6-pMuf8TE,41460
+nsj_rest_lib2/compiler/property_compiler.py,sha256=3PIt0l8jrUeSxwTfM48X5fjwAYe0_0s0PGq9Z4cMmBQ,49713
 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
@@ -18,19 +18,19 @@ nsj_rest_lib2/compiler/edl_model/entity_model.py,sha256=Yc6wvjsiwacmz796mZIU-i9h
 nsj_rest_lib2/compiler/edl_model/entity_model_base.py,sha256=eRn0pirIPHvniqGpT0xE-mmgqz5RIVtqghxcnfxKNdQ,4345
 nsj_rest_lib2/compiler/edl_model/entity_model_root.py,sha256=VinsxFlNyCaKKk37ZzcbmWaWgoUP2-dZBG61Ke7NvVs,231
 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=ie3roNZAqYTwz7q0TTdceMjY5khnBiED2yp0XBqqk7E,3909
+nsj_rest_lib2/compiler/edl_model/primitives.py,sha256=y6wvz76R995BHVAW9z2Kywd7sUIF4uwvk0-O2H_Zd1w,1613
+nsj_rest_lib2/compiler/edl_model/property_meta_model.py,sha256=ciphkgdTtfPfLpeMQpcf3GXQ_qx7xl1tzgeUoJBjPBU,3871
 nsj_rest_lib2/compiler/edl_model/repository_model.py,sha256=OmtUzSq2LKmM76VXefGrKwg8xtVFCutt3JNH2nv42qU,1821
 nsj_rest_lib2/compiler/edl_model/trait_property_meta_model.py,sha256=NtMVZeOPu3LJwXI-8tCOLVuQiGua_0t7kL1h9gL7HuM,657
 nsj_rest_lib2/compiler/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/compiler/util/str_util.py,sha256=lVP1yHhj1pOd6ULtTnkcfX6Gqrpe4yCBratHUhBNGcI,843
+nsj_rest_lib2/compiler/util/str_util.py,sha256=0ReIQ2Vy4zAmVMvGv0FcUehRQw15hlz0e7yDsF89ghk,1178
 nsj_rest_lib2/compiler/util/type_naming_util.py,sha256=wTfxPCezCTt-ltSg_hkaYNH7Z05k-mlJKZd-9AMA9ac,768
 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=XMqxe1NW-NE5XwomXb4pSNdALQHpP74Hc26R4fnmXqg,15194
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/service/entity_loader.py,sha256=uB0xXih9Px2jSTMdZNIu6_3dngE37K7adKX03cYSRug,15660
-nsj_rest_lib2-0.0.20.dist-info/METADATA,sha256=SC3lNUvvmPq0kvWSdMfvbyzpo0jOTGY0VrVGR7bhBLU,1585
-nsj_rest_lib2-0.0.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.20.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.20.dist-info/RECORD,,
+nsj_rest_lib2/service/entity_loader.py,sha256=-Adgj8shMkLXrIV4ZDAqpOLSN--B5k9Uokfy9nrQA4I,15585
+nsj_rest_lib2-0.0.22.dist-info/METADATA,sha256=-YyM5sMuF6_0dZ0r09vyzQuZoDcZb0FEsKzOBF31PjM,1094
+nsj_rest_lib2-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.22.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.22.dist-info/RECORD,,