nsj-rest-lib2 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

nsj_rest_lib2/service/entity_loader.py

@@ -1,3 +1,4 @@
+import datetime
 import json
 import sys
 import threading
@@ -7,13 +8,15 @@ from nsj_rest_lib.settings import get_logger
 
 from nsj_rest_lib2.exception import MissingEntityConfigException
 from nsj_rest_lib2.redis_config import get_redis
-from nsj_rest_lib2.settings import ESCOPO_RESTLIB2
+from nsj_rest_lib2.settings import ESCOPO_RESTLIB2, MIN_TIME_SOURCE_REFRESH
 
 
 class LoadedEntity:
-    dto_class_name: str = ""
-    entity_class_name: str = ""
-    entity_hash: str = ""
+    def __init__(self):
+        self.dto_class_name: str = ""
+        self.entity_class_name: str = ""
+        self.entity_hash: str = ""
+        self.loaded_at: datetime.datetime = datetime.datetime.now()
 
 
 class Namespace:
@@ -24,7 +27,7 @@ class Namespace:
         self.module: types.ModuleType = None
 
 
-namespaces_dict = {}
+namespaces_dict: dict[str, Namespace] = {}
 
 
 class EntityLoader:
@@ -48,34 +51,51 @@ class EntityLoader:
 
         # Se conseguiu carregar da memória, verifica se houve alteração no hash, em relação ao redis
         if result is not None:
-            # Desempacotando o result
-            dto_class_name, entity_class_name, entities_dict, entity_config_key = result
+            # Desempacotando o result e recuperando informações do namespace
+            (
+                entity_config_key,
+                namespace,
+            ) = result
 
-            # Recuperando do Redis direto pela key (faz uma só chamada ao redis)
-            loaded_config = self._load_entity_config_from_redis(
-                entity_id, grupo_key, tenant_key, default_key, entity_config_key
-            )
+            loaded_entity = namespace.loaded_entities[entity_id]
+            dto_class_name = loaded_entity.dto_class_name
+            entity_class_name = loaded_entity.entity_class_name
+            entities_dict = namespace.entities_dict
 
-            # Se não achar no redis, usa o que estava em memória
-            if not loaded_config:
-                return (dto_class_name, entity_class_name, entities_dict)
+            # Se o tempo entre o carregamento e agora for maior do que MIN_TIME_SOURCE_REFRESH minutos,
+            # verifica se precisa de refresh
+            time_diff = datetime.datetime.now() - loaded_entity.loaded_at
 
-            # Desempacotando resultado
-            entity_config_key, entity_config_str = loaded_config
+            if time_diff.total_seconds() >= MIN_TIME_SOURCE_REFRESH * 60:
+                # Recuperando do Redis direto pela key (faz uma só chamada ao redis)
+                loaded_config = self._load_entity_config_from_redis(
+                    entity_id, grupo_key, tenant_key, default_key, entity_config_key
+                )
 
-            # Executando o código da entidade, só se houver mudança no hash
-            result_execute = self._execute_entity_source(
-                entity_config_str,
-                entity_config_key,
-                entity_id,
-                check_refresh=True,
-            )
+                # Se não achar no redis, usa o que estava em memória
+                if not loaded_config:
+                    return (dto_class_name, entity_class_name, entities_dict)
 
-            if result_execute is None:
-                return (dto_class_name, entity_class_name, entities_dict)
+                # Desempacotando resultado
+                entity_config_key, entity_config_str = loaded_config
+
+                # Executando o código da entidade, só se houver mudança no hash
+                result_execute = self._execute_entity_source(
+                    entity_config_str,
+                    entity_config_key,
+                    entity_id,
+                    check_refresh=True,
+                )
+
+                # Se não carregou novo código, usa o que estava em memória
+                if result_execute is None:
+                    return (dto_class_name, entity_class_name, entities_dict)
+                else:
+                    dto_class_name, entity_class_name, namespace = result_execute
+                    return (dto_class_name, entity_class_name, namespace.entities_dict)
             else:
-                dto_class_name, entity_class_name, namespace = result_execute
-                return (dto_class_name, entity_class_name, namespace.entities_dict)
+                # Se não deu o intervalo de verificação do refresh, retorna o que está em memória
+                return (dto_class_name, entity_class_name, entities_dict)
 
         # Se não conseguir recuperar a entidade, procura no redis:
         loaded_config = self._load_entity_config_from_redis(
@@ -236,7 +256,7 @@ class EntityLoader:
         grupo_key: str,
         tenant_key: str,
         default_key: str,
-    ) -> tuple[str, str, dict, str] | None:
+    ) -> tuple[str, Namespace] | None:
         namespace = None
         entity_config_key = None
 
@@ -258,11 +278,7 @@ class EntityLoader:
             entity_config_key = default_key
             namespace = default_namespace
 
-        if namespace:
-            loaded_entity = namespace.loaded_entities[entity_id]
-            dto_class_name = loaded_entity.dto_class_name
-            entity_class_name = loaded_entity.entity_class_name
-            entities_dict = namespace.entities_dict
-            return (dto_class_name, entity_class_name, entities_dict, entity_config_key)
+        if namespace and entity_config_key:
+            return (entity_config_key, namespace)
         else:
             return None

nsj_rest_lib2/settings.py

@@ -1,3 +1,10 @@
 import os
 
 ESCOPO_RESTLIB2 = os.environ["ESCOPO_RESTLIB2"]
+
+ENV = os.getenv("ENV", "dev").lower()
+
+if ENV in ("dev", "local"):
+    MIN_TIME_SOURCE_REFRESH = 0
+else:
+    MIN_TIME_SOURCE_REFRESH = int(os.getenv("MIN_TIME_SOURCE_REFRESH", "15"))

{nsj_rest_lib2-0.0.2.dist-info → nsj_rest_lib2-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nsj_rest_lib2
-Version: 0.0.2
+Version: 0.0.3
 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.2.dist-info → nsj_rest_lib2-0.0.3.dist-info}/RECORD

@@ -1,12 +1,12 @@
 nsj_rest_lib2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=F6y6lOAdLhGzZA6NE01x3t1vSAvrm1pC9ImjLhe61IU,59
+nsj_rest_lib2/settings.py,sha256=f_jqFEv1rkhfEfyvCtTduUEwc4dwiiLnP00VM7gvWPw,243
 nsj_rest_lib2/controller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nsj_rest_lib2/controller/dynamic_controller.py,sha256=4HS1__ton8cQ1LSvMoZUv93BQEnGV5f2gE-jW5lD510,13448
 nsj_rest_lib2/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsj_rest_lib2/service/entity_loader.py,sha256=i7ljsgDV4jlG-Flq5u-gmMqJp7SnpNfMRX1MYunln0E,9771
-nsj_rest_lib2-0.0.2.dist-info/METADATA,sha256=Z5cHSoCY_AfI8ax7hxGufv236q5ffK6Nbjrw_4RD5bg,1196
-nsj_rest_lib2-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nsj_rest_lib2-0.0.2.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
-nsj_rest_lib2-0.0.2.dist-info/RECORD,,
+nsj_rest_lib2/service/entity_loader.py,sha256=1_NhcO_7g7CWC3WTKHCYkblH2luO3AbPRyE2uCQ2zXw,10638
+nsj_rest_lib2-0.0.3.dist-info/METADATA,sha256=wkUs-y8kYkmSQYVt2pi4QHR28ECogJkjez3VcsGpcMY,1196
+nsj_rest_lib2-0.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nsj_rest_lib2-0.0.3.dist-info/top_level.txt,sha256=L6zh0EfH8_rur7OJ8_V-El-XEMf4qg3bkF8ADgqLVIA,14
+nsj_rest_lib2-0.0.3.dist-info/RECORD,,