nsj-rest-lib2 0.0.9__tar.gz → 0.0.11__tar.gz

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.9
+Version: 0.0.11
 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
@@ -17,7 +17,7 @@ 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
 Requires-Dist: black<26.0.0,>=25.1.0
-Requires-Dist: pyyaml>7.0.0,>=6.0.3
+Requires-Dist: pyyaml<7.0.0,>=6.0.3
 
 # nsj_rest_lib2
 

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/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,7 @@ class EDLCompiler:
             props_pk,
             enum_classes,
             related_imports,
+            relations_dependencies,
         ) = self._properties_compiler.compile(
             properties_structure,
             map_unique_by_property,
@@ -142,6 +133,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 +236,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.11/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

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/nsj_rest_lib2/compiler/property_compiler.py

@@ -13,6 +13,7 @@ from nsj_rest_lib2.compiler.edl_model.primitives import (
     REGEX_INTERNAL_REF,
 )
 from nsj_rest_lib2.compiler.edl_model.property_meta_model import PropertyMetaModel
+from nsj_rest_lib2.compiler.model import RelationDependency
 from nsj_rest_lib2.compiler.util.str_util import CompilerStrUtil
 from nsj_rest_lib2.compiler.util.type_naming_util import (
     compile_dto_class_name,
@@ -40,6 +41,7 @@ class EDLPropertyCompiler:
         list[str],
         list[ast.stmt],
         list[tuple[str, str, str]],
+        list[RelationDependency],
     ]:
 
         # TODO Criar opção de campo calculado?
@@ -70,6 +72,7 @@ class EDLPropertyCompiler:
         props_pk = []
         enum_classes = []
         related_imports = []
+        relations_dependencies = []
 
         if properties_structure.properties is None:
             return (ast_dto_attributes, ast_entity_attributes, props_pk, enum_classes)
@@ -140,6 +143,14 @@ class EDLPropertyCompiler:
                         )
                     )
 
+                    # Gravando a dependência de relacionamento
+                    relation_dependency = RelationDependency()
+                    relation_dependency.entity_resource = related_entity.api.resource
+                    relation_dependency.entity_scope = related_entity.escopo
+                    relation_dependency.tenant = tenant
+                    relation_dependency.grupo_empresarial = grupo_empresarial
+                    relations_dependencies.append(relation_dependency)
+
                     # Instanciando o ast
                     if prop.cardinality == CardinalityTypes.C1_N:
                         # Para relacionamentos 1_N
@@ -214,6 +225,7 @@ class EDLPropertyCompiler:
             props_pk,
             enum_classes,
             related_imports,
+            relations_dependencies,
         )
 
     def compile_simple_property(

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/nsj_rest_lib2/service/entity_loader.py

@@ -1,11 +1,14 @@
 import datetime
 import json
+import re
 import sys
 import threading
 import types
 
 from nsj_rest_lib.settings import get_logger
 
+from nsj_rest_lib2.compiler.edl_model.primitives import REGEX_EXTERNAL_REF
+from nsj_rest_lib2.compiler.model import RelationDependency
 from nsj_rest_lib2.compiler.util.type_naming_util import compile_namespace_keys
 from nsj_rest_lib2.exception import MissingEntityConfigException
 from nsj_rest_lib2.redis_config import get_redis
@@ -21,14 +24,15 @@ class LoadedEntity:
         self.loaded_at: datetime.datetime = datetime.datetime.now()
         self.api_expose: bool = False
         self.api_verbs: list[str] = []
+        self.relations_dependencies: list[RelationDependency] = []
 
 
 class Namespace:
     def __init__(self):
         self.key: str = ""
         self.loaded_entities: dict[str, LoadedEntity] = {}
-        self.entities_dict: dict = None
-        self.module: types.ModuleType = None
+        self.entities_dict: dict = {}
+        self.module: types.ModuleType = types.ModuleType("empty")
 
 
 namespaces_dict: dict[str, Namespace] = {}
@@ -43,17 +47,18 @@ class EntityLoader:
         entity_resource: str,
         tenant: str | None,
         grupo_empresarial: str | None,
+        scope: str = ESCOPO_RESTLIB2,
     ) -> tuple[str, str, dict, bool, list[str]]:
         # Montando as chaves dos namespaces
         grupo_key, tenant_key, default_key = compile_namespace_keys(
             tenant, grupo_empresarial
         )
 
-        result = self._load_entity_source_from_memory(
+        result = self._search_entity_namespace_in_memory(
             entity_resource, grupo_key, tenant_key, default_key
         )
 
-        # Se conseguiu carregar da memória, verifica se houve alteração no hash, em relação ao redis
+        # Se conseguiu localizar na memória, verifica se houve alteração no hash, em relação ao redis
         if result is not None:
             # Desempacotando o result e recuperando informações do namespace
             (
@@ -67,6 +72,21 @@ class EntityLoader:
             entities_dict = namespace.entities_dict
             api_expose = loaded_entity.api_expose
             api_verbs = loaded_entity.api_verbs
+            relations_dependencies = loaded_entity.relations_dependencies
+
+            # Verificando se alguma de suas dependências precisariam ser recarregadas
+            for rd in relations_dependencies:
+                if rd.entity_resource is None or rd.entity_scope is None:
+                    raise RuntimeError(
+                        f"Erro: Dependência de entidade mal formada na entidade {entity_resource}."
+                    )
+
+                self.load_entity_source(
+                    rd.entity_resource,
+                    str(rd.tenant),
+                    str(rd.grupo_empresarial),
+                    rd.entity_scope,
+                )
 
             # Se o tempo entre o carregamento e agora for maior do que MIN_TIME_SOURCE_REFRESH minutos,
             # verifica se precisa de refresh
@@ -215,6 +235,10 @@ class EntityLoader:
             api_expose = entity_config["api_expose"]
             # api_resource = entity_config["api_resource"]
             api_verbs = entity_config["api_verbs"]
+            relations_dependencies = [
+                RelationDependency().from_dict(rd)
+                for rd in entity_config.get("relations_dependencies", [])
+            ]
         except json.JSONDecodeError as e:
             if not check_refresh:
                 raise RuntimeError(
@@ -226,6 +250,20 @@ class EntityLoader:
                 )
                 return None
 
+        # Verificando se alguma de suas dependências precisariam ser carregadas (ou recarregadas)
+        for rd in relations_dependencies:
+            if rd.entity_resource is None or rd.entity_scope is None:
+                raise RuntimeError(
+                    f"Erro: Dependência de entidade mal formada na entidade {entity_resource}."
+                )
+
+            self.load_entity_source(
+                rd.entity_resource,
+                str(rd.tenant),
+                str(rd.grupo_empresarial),
+                rd.entity_scope,
+            )
+
         # Verificando se a entidade precisa ou não de refresh
         if check_refresh:
             loaded_namespace = namespaces_dict.get(entity_config_key)
@@ -283,6 +321,7 @@ class EntityLoader:
             loaded_entity.entity_hash = entity_hash
             loaded_entity.api_expose = api_expose
             loaded_entity.api_verbs = api_verbs
+            loaded_entity.relations_dependencies = relations_dependencies
 
             namespace.loaded_entities[entity_resource] = loaded_entity
 
@@ -334,7 +373,7 @@ class EntityLoader:
 
         return (entity_config_key, entity_config_str)
 
-    def _load_entity_source_from_memory(
+    def _search_entity_namespace_in_memory(
         self,
         entity_resource: str,
         grupo_key: str,

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/nsj_rest_lib2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.9
+Version: 0.0.11
 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
@@ -17,7 +17,7 @@ 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
 Requires-Dist: black<26.0.0,>=25.1.0
-Requires-Dist: pyyaml>7.0.0,>=6.0.3
+Requires-Dist: pyyaml<7.0.0,>=6.0.3
 
 # nsj_rest_lib2
 

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/nsj_rest_lib2.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ setup.cfg
 ./nsj_rest_lib2/compiler/compiler_structures.py
 ./nsj_rest_lib2/compiler/dto_compiler.py
 ./nsj_rest_lib2/compiler/entity_compiler.py
+./nsj_rest_lib2/compiler/model.py
 ./nsj_rest_lib2/compiler/property_compiler.py
 ./nsj_rest_lib2/compiler/edl_model/__init__.py
 ./nsj_rest_lib2/compiler/edl_model/ai_entity_edl.py
@@ -50,6 +51,7 @@ nsj_rest_lib2/compiler/compiler.py
 nsj_rest_lib2/compiler/compiler_structures.py
 nsj_rest_lib2/compiler/dto_compiler.py
 nsj_rest_lib2/compiler/entity_compiler.py
+nsj_rest_lib2/compiler/model.py
 nsj_rest_lib2/compiler/property_compiler.py
 nsj_rest_lib2/compiler/edl_model/__init__.py
 nsj_rest_lib2/compiler/edl_model/ai_entity_edl.py

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/nsj_rest_lib2.egg-info/requires.txt

@@ -3,4 +3,4 @@ redis<7.0.0,>=6.4.0
 nsj-multi-database-lib<3.0.0,>=2.0.1
 pydantic<3.0.0,>=2.11.9
 black<26.0.0,>=25.1.0
-pyyaml>7.0.0,>=6.0.3
+pyyaml<7.0.0,>=6.0.3

{nsj_rest_lib2-0.0.9 → nsj_rest_lib2-0.0.11}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = nsj_rest_lib2
-version = 0.0.9
+version = 0.0.11
 author = Nasajon Sistemas
 author_email = contact.dev@nasajon.com.br
 description = Biblioteca para permitir a distribuição de rotas dinâmicas numa API, configuradas por meio de EDLs declarativos (em formato JSON).
@@ -26,7 +26,7 @@ install_requires =
 	nsj-multi-database-lib>=2.0.1,<3.0.0
 	pydantic>=2.11.9,<3.0.0
 	black>=25.1.0,<26.0.0
-	pyyaml>=6.0.3,>7.0.0
+	pyyaml>=6.0.3,<7.0.0
 
 [options.packages.find]
 where = ./