holado 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

{holado-0.8.1.dist-info → holado-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.8.1
+Version: 0.8.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.8.1.dist-info → holado-0.8.2.dist-info}/RECORD

@@ -194,7 +194,7 @@ holado_docker/sdk/docker/docker_service.py,sha256=SvMSIZ7XTCbC7q5rur03lJhJVSHL3u
 holado_docker/tests/behave/steps/__init__.py,sha256=lrP0btKLA3qQD2wp3zbOp0ug8RmgpaYWCrOAWehcPiI,1298
 holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py,sha256=Y26ZstOZrI3uVX6MGBQr88jjDEsCsNuik0ZBmpT5kDg,4800
 holado_docker/tools/docker_controller/docker_controller_manager.py,sha256=q3oac2KIK9wGfMQqGIol65nHUmeuuV0rQ61tfH2APAk,2477
-holado_docker/tools/docker_controller/client/rest/docker_controller_client.py,sha256=TP3GBgtZusl9y6mNd8rFsOoF9K7u_M8mLFq3ZTsCHUM,4316
+holado_docker/tools/docker_controller/client/rest/docker_controller_client.py,sha256=rySX7cK-SBfYRLnspntm8tWuDVyHEGuxFs9vJm7wHDA,4316
 holado_docker/tools/docker_controller/server/Dockerfile,sha256=zuSkj3HYDhvpjOSXmxL4oDqhN7dRB1YTX5Fyur1cuDY,1774
 holado_docker/tools/docker_controller/server/requirements.txt,sha256=0RvLV3t2DyBR2FsbAd1WVEcbsVc6FVUN2horQJU4POo,57
 holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh,sha256=Q56P8VA895I29kVSaSa2FpzvjxJUwLVZ9-7vjScXfc0,3406
@@ -207,7 +207,7 @@ holado_docker/tools/docker_controller/server/rest/initialize_holado.py,sha256=Ux
 holado_docker/tools/docker_controller/server/rest/openapi.yaml,sha256=HUD7CHasVGjpd6yW9mU0sWOKs4tuG_VSoefa7NuQWFI,6773
 holado_docker/tools/docker_controller/server/rest/run.py,sha256=8w5Xl7uOnjsYW59cmuUMOUd71fcXQn30k2jVis7cVNs,1748
 holado_docker/tools/docker_controller/server/rest/api/__init__.py,sha256=FlLRagAiw1LDxnF0CmW7Y6bVXuj8x6volT8-DuHTTVY,2427
-holado_docker/tools/docker_controller/server/rest/api/config.py,sha256=pe76IMkdNoljRsDRyhZW6BwkSSu6LsvnSEGqgd8_Ro4,2459
+holado_docker/tools/docker_controller/server/rest/api/config.py,sha256=Ln__1bsigSzJZ-Iy3MQgmiZMnpBxC3TCQE0O72g5cAs,2459
 holado_docker/tools/docker_controller/server/rest/api/container.py,sha256=6D612WF4chpDCzr4MBzZXzELxi-yOwrgxCxSBBVMcVo,2673
 holado_docker/tools/docker_controller/server/rest/api/os.py,sha256=ZdAbx_ZzwMaqHseOWWSf9ZPL_CEdRa2RvEXGvkk5c1o,1830
 holado_docker/tools/docker_viewer/docker_viewer_manager.py,sha256=tSLuIUdYjJoZIFUc1k4WnrRTUtjjTAmNTbrDmS-8SjI,2287
@@ -480,10 +480,10 @@ holado_system/system/command/command.py,sha256=9lv9kgvvIq4Fqx6fJXU_HQA8pCO80Ws9r
 holado_system/system/command/command_result.py,sha256=sunGDegNVOtpK9s9r4HCAJlREu4iKS0w3HY4KKDEQkw,4613
 holado_system/system/command/curl_command.py,sha256=CEMaO0_qLyKe4tLytMlHzmCuS_gi-oU479hwOaEyZ60,3743
 holado_system/system/command/exceptions.py,sha256=InT6t8GVeGCiBE-NpRr4NzycWVAvzmc6WpM6mk7_1yk,2363
-holado_system/system/filesystem/file.py,sha256=Y5uq2n-ttimdRvLh3QQjpECoOSUzcj9DesuT2HerYuk,2840
+holado_system/system/filesystem/file.py,sha256=stIFMNPeJuQNYlrm-wQPdwnRP8SgLoah7hkjz0hvx5g,4084
 holado_system/tests/behave/steps/__init__.py,sha256=7LrCSTHk5oHNuEsr4IhJuNDsohtR2cq3YT1owXrhdjc,1351
 holado_system/tests/behave/steps/system/commands_steps.py,sha256=uYiojPpYPkfif8l8afRrJ0sj-wFBE4j1x67BDMNs76Q,3901
-holado_system/tests/behave/steps/system/file_steps.py,sha256=kJ7qEzaKkzErRpWCWmq1mJhqO3kHlMa-u5RmsG4664g,10388
+holado_system/tests/behave/steps/system/file_steps.py,sha256=-RPUGEjsYfzWIMRDiQRalmvspPZIPP8YMzSZvSI4-p8,9966
 holado_system/tests/behave/steps/system/system_steps.py,sha256=2XrZwuAaYDjB_HvPgxZq9MpYB_Zo7FVZ0DYcmtKht2s,3778
 holado_test/__init__.py,sha256=A0edMOLhnuU-A_NazQ50WghvKvB889KNCBddtBPa9Ag,1539
 holado_test/test_config.py,sha256=yQK2jNHEGltGc3fmsAgcsKN4y3_nuldZHD45XEMrsQA,1575
@@ -529,7 +529,7 @@ holado_yaml/__init__.py,sha256=KpbIi2cm1BYZgoWf0LuhE0ei3ZCE15UcUtjC1cSA55M,1653
 holado_yaml/tests/behave/steps/__init__.py,sha256=mXzHzGy9gkIDjYXdlxQ6BzaT4AfithgRmL_1sMxr63g,1272
 holado_yaml/tests/behave/steps/yaml_steps.py,sha256=cxNgDywCopT_RCeqKiWfcJYyKZM3mlc39bAtGm2rgfc,8531
 holado_yaml/yaml/enums.py,sha256=WD7mM_VhXtv8l0n08s6CSe7k2RUZDf_70mNCFsjjo94,1625
-holado_yaml/yaml/yaml_client.py,sha256=I7Xkhk0KIBVucEBNzTN2vWNOjuSQ-7W_D8ZiPHl1M7k,9042
+holado_yaml/yaml/yaml_client.py,sha256=sg0UEBD33MqiY-8CxlZT4mT_blkp5Z926vvQjkhiNFA,9288
 holado_yaml/yaml/yaml_manager.py,sha256=iAg-WyXgHeIq_7WzYiVYE8G19Mcalqie8cD3_eyxogg,4363
 holado_yaml/yaml/pyyaml/pyyaml_client.py,sha256=yZrx42Y3fGt6psBsLXTzMTWH30oiOfzsm5dVPkpJjQE,3086
 holado_yaml/yaml/ruamel/ruamel_yaml_client.py,sha256=i4fJi-gbKJMfUPd3KfJPFaF7ZP6shMNfCPu8NPhAJVg,3201
@@ -655,7 +655,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.8.1.dist-info/METADATA,sha256=96tNajEz2ibDQX0118wv3VNay6ndeo-YNIOGQvMo2bI,7671
-holado-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.8.1.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.8.1.dist-info/RECORD,,
+holado-0.8.2.dist-info/METADATA,sha256=zWwgnlMfG4-_3ABtoVtk1fIB0DZNXW9Uq2qPI-2snwU,7671
+holado-0.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.8.2.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.8.2.dist-info/RECORD,,

holado_docker/tools/docker_controller/client/rest/docker_controller_client.py

@@ -26,12 +26,12 @@ class DockerControllerClient(RestClient):
     
     def get_environment_variable_value(self, var_name):
         data = [var_name]
-        response = self.get(f"os/env", data=data)
+        response = self.get(f"os/env", json=data)
         return self.response_result(response, status_ok=[200])
     
     def get_directory_filenames(self, path):
         data = {'path':path}
-        response = self.get(f"os/ls", data=data)
+        response = self.get(f"os/ls", json=data)
         return self.response_result(response, status_ok=[200])
     
     
@@ -86,7 +86,7 @@ class DockerControllerClient(RestClient):
             'with_backup': with_backup,
             'backup_extension': backup_extension
             }
-        response = self.patch(f"config/yaml_file", data=data)
+        response = self.patch(f"config/yaml_file", json=data)
         return self.response_result(response, status_ok=[200,204])
     
     def restore_yaml_file(self, file_path, backup_extension='.ha_bak'):
@@ -95,7 +95,7 @@ class DockerControllerClient(RestClient):
             'file_path': file_path,
             'backup_extension': backup_extension
             }
-        response = self.put(f"config/yaml_file", data=data)
+        response = self.put(f"config/yaml_file", json=data)
         return self.response_result(response, status_ok=[200,204])
     
     

holado_docker/tools/docker_controller/server/rest/api/config.py

@@ -18,7 +18,7 @@ def _get_session_context():
     return SessionContext.instance()
 
 
-class YamlfileView(MethodView):
+class YamlFileView(MethodView):
     
     def get(self, body: dict):
         file_path = body['file_path']

holado_system/system/filesystem/file.py

@@ -14,6 +14,8 @@
 from holado.common.handlers.object import DeleteableObject
 import os
 from typing import AnyStr, List
+from holado_python.standard_library.typing import Typing
+from holado_core.common.exceptions.technical_exception import TechnicalException
 
 
 class File(DeleteableObject):
@@ -33,7 +35,15 @@ class File(DeleteableObject):
 
     def _delete_object(self):
         self.close()
-        
+    
+    def __enter__(self):
+        if self.__file is None:
+            self.open()
+        return self
+    
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+    
     @property
     def path(self):
         return self.__path
@@ -74,3 +84,36 @@ class File(DeleteableObject):
     def readlines(self, hint: int = -1) -> List[AnyStr]:
         return self.internal_file.readlines(hint)
 
+
+
+    @classmethod
+    def get_file_content(cls, path, is_text_file=True):
+        mode = 'rt' if is_text_file else 'rb'
+        with File(path, mode=mode) as file:
+            res = file.read()
+        return res
+
+    @classmethod
+    def get_file_content_in_base64(cls, path):
+        import base64
+        
+        with File(path, mode="rb") as fin:
+            content = fin.read()
+        res = base64.b64encode(content)
+        
+        return res
+
+    @classmethod
+    def create_file_with_content(cls, path, content):
+        if isinstance(content, str):
+            with File(path, mode='wt') as fout:
+                fout.write(content)
+        elif isinstance(content, bytes):
+            with File(path, mode='wb') as fout:
+                fout.write(content)
+        else:
+            raise TechnicalException(f"Unexpected content type {Typing.get_object_class_fullname(content)} (allowed types: str, bytes)")
+
+
+
+

holado_system/tests/behave/steps/system/file_steps.py

@@ -88,8 +88,7 @@ def step_impl(context, var_name, path):
     open_kwargs = ValueTableConverter.convert_name_value_table_2_dict(table)
     
     __get_path_manager().makedirs(path)
-    res = File(path)
-    res.open(**open_kwargs)
+    res = File(path, **open_kwargs)
 
     __get_variable_manager().register_variable(var_name, res)
 
@@ -125,9 +124,7 @@ def step_impl(context, var_name, is_text_file_str, path):  # @DuplicatedSignatur
     is_text_file = is_text_file_str is not None
     path = StepTools.evaluate_scenario_parameter(path)
     
-    mode = 'rt' if is_text_file else 'rb'
-    with open(path, mode) as fin:
-        res = fin.read()
+    res = File.get_file_content(path, is_text_file)
     
     __get_variable_manager().register_variable(var_name, res)
 
@@ -136,9 +133,7 @@ def step_impl(context, var_name, path):  # @DuplicatedSignature
     var_name = StepTools.evaluate_variable_name(var_name)
     path = StepTools.evaluate_scenario_parameter(path)
 
-    with open(path, "rb") as fin:
-        content = fin.read()
-    res = base64.b64encode(content)
+    res = File.get_file_content_in_base64(path)
     
     __get_variable_manager().register_variable(var_name, res)
 
@@ -147,7 +142,7 @@ def step_impl(context, var_name, path):  # @DuplicatedSignature
     var_name = StepTools.evaluate_variable_name(var_name)
     path = StepTools.evaluate_scenario_parameter(path)
 
-    with open(path, "r") as fin:
+    with File(path, mode="r") as fin:
         lines = fin.readlines()
     res = list(map(lambda x: x.strip('\n'), lines))
     
@@ -192,14 +187,7 @@ def step_impl(context, var_name, path_name, content):
     file_path = os.path.join(dest_path, filename)
     __get_path_manager().makedirs(file_path)
     
-    if isinstance(content, str):
-        with open(file_path, 'wt') as fout:
-            fout.write(content)
-    elif isinstance(content, bytes):
-        with open(file_path, 'wb') as fout:
-            fout.write(content)
-    else:
-        raise TechnicalException(f"Unexpected content type {Typing.get_object_class_fullname(content)} (allowed types: string, bytes)")
+    File.create_file_with_content(file_path, content)
 
     __get_variable_manager().register_variable(var_name, file_path)
 

holado_yaml/yaml/yaml_client.py

@@ -104,16 +104,24 @@ class YAMLClient(Object):
         
         # Update file
         dst_data = self.load_file(file_path)
-        self.update_data(dst_data, data, update_type)
+        if dst_data is None:
+            dst_data = data
+        else:
+            self.update_data(dst_data, data, update_type)
         self.save_in_file(file_path, dst_data, **kwargs)        # Note: as file already exists, it is not needed to pass parameters mode, user and group
     
     def update_string(self, text, data, update_type=UpdateType.AddOrUpdate, **kwargs):
         dst_data = self.load_string(text)
-        self.update_data(dst_data, data, update_type)
+        if dst_data is None:
+            dst_data = data
+        else:
+            self.update_data(dst_data, data, update_type)
         res = self.save_in_string(dst_data, **kwargs)
         return res
     
     def update_data(self, dst, src, update_type=UpdateType.AddOrUpdate):
+        if dst is None:
+            raise TechnicalException("Destination data cannot be None")
         if isinstance(src, str):
             src = self.load_string(src)