holado 0.8.1__tar.gz → 0.8.2__tar.gz

{holado-0.8.1 → holado-0.8.2}/PKG-INFO

@@ -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.2/packaging/VERSION

@@ -0,0 +1 @@
+0.8.2

{holado-0.8.1 → holado-0.8.2}/src/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-0.8.1 → holado-0.8.2}/src/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-0.8.1 → holado-0.8.2}/src/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-0.8.1 → holado-0.8.2}/src/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-0.8.1 → holado-0.8.2}/src/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)
         

holado-0.8.1/packaging/VERSION

@@ -1 +0,0 @@
-0.8.1