holado 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

{holado-0.6.0.dist-info → holado-0.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.6.0
+Version: 0.6.2
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

{holado-0.6.0.dist-info → holado-0.6.2.dist-info}/RECORD

@@ -155,14 +155,14 @@ holado_db/tests/behave/steps/tools/db/postgresql_client_steps.py,sha256=HtO-NSlT
 holado_db/tests/behave/steps/tools/db/sqlite_client_steps.py,sha256=6B8GGBJxxG6Z49cGCPykm8BP7nQQZWUrWpw0XgaYGaE,2930
 holado_db/tools/db/db_manager.py,sha256=0llXc6YhXfLr6oNfncPNjh4_ZInIm8XYywutQYvvLso,5400
 holado_db/tools/db/clients/base/db_audit.py,sha256=eJ1r_0YUhvq50JngpWAdyEeVHWjAD4YCvWCJsLc1zmc,4368
-holado_db/tools/db/clients/base/db_client.py,sha256=rkWd3Mau3VRPn-TMd_EVxzn8WFhY9skHsBx0I3EQlCs,15290
+holado_db/tools/db/clients/base/db_client.py,sha256=sdMKDbnhO0zMCxq3n6vHcn5d5Asm6N5WhKDss89v_PU,15298
 holado_db/tools/db/clients/postgresql/postgresql_audit.py,sha256=yoy4-Yt4lZHJw7xAcuTj2Thg4aTDCYJBt-6HzQeEE80,3939
-holado_db/tools/db/clients/postgresql/postgresql_client.py,sha256=40UOniOJS-2Jrl-lxCSPTn32JGmblO-WqRFQYV40srk,4246
+holado_db/tools/db/clients/postgresql/postgresql_client.py,sha256=FW9t4kGh3ClDr1NfOymSMAYSrguPcKeqbwE6BM4ognI,4746
 holado_db/tools/db/clients/sqlite/sqlite_audit.py,sha256=cK7hBE7aKCFOX5xnT-QnYD_1loQPgPP9Gf6qTT1XuI4,3966
 holado_db/tools/db/clients/sqlite/sqlite_client.py,sha256=-EvKAeaOc1Iv_wmuAgvzpS5hEfDFvZgP9OkFc9L5M-s,2891
 holado_db/tools/db/query/query_manager.py,sha256=7n-d_Q373hlsKQshY3accIH8XfqaLScqnhMdTT2oWC4,3642
 holado_db/tools/db/query/base/query_builder.py,sha256=-nCyBe8zsRhOX39uCV0P7OY_YKobQJVIpJDL2sUA_H8,5926
-holado_db/tools/db/query/pypika/pypika_query_builder.py,sha256=qwFtd-7dSRju-qwGkiaDPwSkNgYpdfKsunq-TM3HhI8,10988
+holado_db/tools/db/query/pypika/pypika_query_builder.py,sha256=9x2-7B4p3eXSq3vLWWLscoFWJZakhcPxmNrpGR2ysdw,10964
 holado_django/__init__.py,sha256=KpbIi2cm1BYZgoWf0LuhE0ei3ZCE15UcUtjC1cSA55M,1653
 holado_django/server/HOWTO.txt,sha256=91z7uC1Hf_X6dNO2wxdqQFKG2U6wIIW6NKxirUglYOA,2085
 holado_django/server/django_server.py,sha256=2nVH0WX99nGGH-c4QztfoC-zAJKmLrNTXvhTp4qsL08,4557
@@ -185,7 +185,7 @@ holado_django/server/django_projects/rest_api/rest_api/application/migrations/__
 holado_django/tests/behave/steps/__init__.py,sha256=1x7ID0w53eDe1P-n4Y5XOnLOTg_bta54gZE2YI0-IHo,1281
 holado_django/tests/behave/steps/django_server_steps.py,sha256=XAnKDUXJxsZ4L7-PYatjevh2BT3qdKIg5sXXG5Y3QFQ,3819
 holado_docker/__init__.py,sha256=CtGYR7aEkaCdAHPDAsu_ErjpVtYE0yz9wbgbfRUwS8s,1574
-holado_docker/sdk/docker/docker_client.py,sha256=ME_ugypTREAIpG-fmEurIpsqq7e7GYHOHO2Y4Yhvn1Q,12610
+holado_docker/sdk/docker/docker_client.py,sha256=SnNIcLM4Slec81uJqlCn6r5NhT2MLdj_-lYs2O-P1X0,13792
 holado_docker/sdk/docker/docker_service.py,sha256=SvMSIZ7XTCbC7q5rur03lJhJVSHL3uIq1dBQz9oDpkw,3767
 holado_docker/tests/behave/steps/__init__.py,sha256=lrP0btKLA3qQD2wp3zbOp0ug8RmgpaYWCrOAWehcPiI,1298
 holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py,sha256=hgns0Kyl38jJlZsVpMtEWlQKfga815BfJRFS_JhQvWc,4438
@@ -605,7 +605,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
 test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
 test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado-0.6.0.dist-info/METADATA,sha256=2D7nfgsZFztMf6a_wQ4VQn252_so4YzqOd9Di_4qpl0,6166
-holado-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.6.0.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.6.0.dist-info/RECORD,,
+holado-0.6.2.dist-info/METADATA,sha256=-BSf1eXEHFtbGEN1IB-KhCayPLGj-uBMe1OVN9OlXRU,6166
+holado-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.6.2.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.6.2.dist-info/RECORD,,

holado_db/tools/db/clients/base/db_client.py

@@ -23,7 +23,6 @@ from holado_core.common.tables.table import Table
 from holado_db.tools.db.query.base.query_builder import QueryBuilder
 from holado_data.data.generator.base import BaseGenerator
 from holado_python.standard_library.typing import Typing
-import pypika.queries
 
 logger = logging.getLogger(__name__)
 
@@ -223,6 +222,7 @@ class DBClient(object):
     def is_query_type(self, sql_or_query, query_type):
         from sql_metadata.keywords_lists import QueryType
         import sql_metadata
+        import pypika.queries
         
         if isinstance(sql_or_query, pypika.queries.QueryBuilder):
             sql = self.query_builder.to_sql(sql_or_query)

holado_db/tools/db/clients/postgresql/postgresql_client.py

@@ -15,9 +15,9 @@ import logging
 from holado_db.tools.db.clients.base.db_client import DBClient
 from holado_core.common.tables.table_with_header import TableWithHeader
 from holado_core.common.tools.tools import Tools
-import json
-from pypika.terms import Function, LiteralValue
 from holado_db.tools.db.clients.postgresql.postgresql_audit import PostgreSQLTriggerAuditManager
+from holado_db.tools.db.query.pypika.pypika_query_builder import PypikaQueryBuilder
+from holado_core.common.exceptions.technical_exception import TechnicalException
 
 logger = logging.getLogger(__name__)
 
@@ -29,11 +29,13 @@ except Exception as exc:
         logger.debug(f"PostgreSQLClient is not available. Initialization failed on error: {exc}")
     with_psycopg = False
 
-
-# from pypika import Function
-class JsonbSet(Function):
-    def __init__(self, name, *args, **kwargs):
-        super().__init__('jsonb_set', LiteralValue(name), *args, **kwargs)
+if PypikaQueryBuilder.is_available():
+    from pypika.terms import Function, LiteralValue
+    
+    # from pypika import Function
+    class JsonbSet(Function):
+        def __init__(self, name, *args, **kwargs):
+            super().__init__('jsonb_set', LiteralValue(name), *args, **kwargs)
 
 
 class PostgreSQLClient(DBClient):
@@ -72,6 +74,9 @@ class PostgreSQLClient(DBClient):
             if isinstance(result, TableWithHeader) and result[0][0].content is not None:
                 is_key_set = json_key in result[0][0].content
             if is_key_set:
+                if not PypikaQueryBuilder.is_available():
+                    # Note: This case cannot appear currently (04/08/2025), but can appear if another QueryBuilder is managed that is not using pypika
+                    raise TechnicalException(f"Missing dependence: pypika")
                 self.update(table_name, {field_name: JsonbSet(f'{field_name}', f'{{"{json_key}"}}', f'"{json_value}"')}, where_data=where_data, where_compare_data=where_compare_data, do_commit=True)
             else:
                 self.update(table_name, {field_name: f'{field_name} || {{"{json_key}":"{json_value}"}}'}, where_data=where_data, where_compare_data=where_compare_data, do_commit=True)

holado_db/tools/db/query/pypika/pypika_query_builder.py

@@ -16,7 +16,6 @@ from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado_db.tools.db.query.base.query_builder import QueryBuilder, DBCompareOperator
 from holado_core.common.tools.tools import Tools
 from holado_python.standard_library.typing import Typing
-from pypika.terms import Function
 
 
 logger = logging.getLogger(__name__)
@@ -24,7 +23,7 @@ logger = logging.getLogger(__name__)
 try:
     import pypika.functions
     from pypika.queries import Table, Query
-    from pypika.terms import Parameter
+    from pypika.terms import Parameter, Function
     with_pypika = True
 except Exception as exc:
     if Tools.do_log(logger, logging.DEBUG):

holado_docker/sdk/docker/docker_client.py

@@ -74,9 +74,27 @@ class DockerClient(object):
         
         return self.__containers.get(name)
     
+    def update_containers(self, reset_if_removed=True):
+        # Add new containers
+        updated_names = set()
+        for c in self.__client.containers.list(all=True, sparse=True, ignore_removed=True):
+            try:
+                c_name = c.name
+            except docker.errors.NotFound:
+                # Container 'c' doesn't exist anymore
+                continue
+            
+            if c_name not in self.__containers:
+                self.__containers[c_name] = DockerContainer(self, c)
+            updated_names.add(c_name)
+            
+        if reset_if_removed:
+            for name in set(self.__containers.keys()).difference(updated_names):
+                del self.__containers[name]
+    
     def get_all_container_names(self):
         res = []
-        for c in self.__client.containers.list(all=True):
+        for c in self.__client.containers.list(all=True, sparse=True, ignore_removed=True):
             try:
                 c_name = c.name
             except docker.errors.NotFound:
@@ -88,7 +106,7 @@ class DockerClient(object):
     
     def __get_container_from_list(self, name):
         res = None
-        for c in self.__client.containers.list(all=True):
+        for c in self.__client.containers.list(all=True, ignore_removed=True):
             try:
                 c_name = c.name
             except docker.errors.NotFound:
@@ -248,14 +266,22 @@ class DockerContainer(DeleteableObject):
         self.__auto_stop = False
         
     def _delete_object(self):
-        if self.auto_stop and self.__docker_client and self.__docker_client.has_container(self.name) \
-                and self.__docker_client.get_container(self.name).status == "running":
+        if self.auto_stop and self.status == "running" and self.__docker_client and self.__docker_client.has_container(self.name):
             self.__docker_client.stop_container(self.name)
         
     @property
     def container(self):
         return self.__container
         
+    @property
+    def information(self):
+        try:
+            self.__container.reload()
+        except docker.errors.NotFound:
+            # Container doesn't exist anymore, use last known information
+            pass
+        return self.__container.attrs
+        
     @property
     def status(self):
         try:
@@ -272,6 +298,13 @@ class DockerContainer(DeleteableObject):
     def auto_stop(self, auto_stop):
         self.__auto_stop = auto_stop
     
+    def reload(self, ignore_removed=True):
+        try:
+            self.__container.reload()
+        except docker.errors.NotFound:
+            if not ignore_removed:
+                raise
+        
     def restart(self, **kwargs):
         return self.__container.restart(**kwargs)