holado 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

holado_django/server/django_server.py

@@ -0,0 +1,110 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+from holado_core.common.exceptions.technical_exception import TechnicalException
+import logging
+from holado_core.common.tools.tools import Tools
+import os
+from holado_core.tools.abstracts.blocking_command_service import BlockingCommandService
+from holado_system.system.command.command import CommandStates
+from holado_core.common.handlers.wait import WaitFuncResultVerifying
+from holado.common.handlers.object import DeleteableObject
+
+logger = logging.getLogger(__name__)
+
+try:
+    import django  # @UnusedImport
+    with_django = True
+except Exception as exc:
+    if Tools.do_log(logger, logging.DEBUG):
+        logger.debug(f"DjangoServer is not available. Initialization failed on error: {exc}")
+    with_django = False
+
+
+class DjangoServer(DeleteableObject):
+    """
+    Django server
+    """
+    
+    @classmethod
+    def is_available(cls):
+        return with_django
+    
+    def __init__(self, name, django_project_path, port=8000, runserver_args=None):
+        super().__init__(name)
+        
+        self.__django_project_path = django_project_path
+        self.__runserver_port = port
+        self.__runserver_args = runserver_args
+        self.__project_command = None
+        
+        if not os.path.exists(django_project_path):
+            raise TechnicalException(f"Django project doesn't exist (project path: '{django_project_path}')")
+    
+    def _delete_object(self):
+        if self.__project_command is not None and self.__project_command.status == CommandStates.Running:
+            self.stop()
+
+    @property
+    def django_project_path(self):
+        return self.__django_project_path
+
+    @property
+    def runserver_port(self):
+        return self.__runserver_port
+
+    @property
+    def runserver_args(self):
+        return self.__runserver_args
+    
+    def start(self):
+        self.__start_server_by_command()
+    
+    def __start_server_by_command(self):
+        self.__project_command = self._new_project_command()
+        self.__project_command.start()
+        self._wait_until_server_is_reachable()
+    
+    def _new_project_command(self):
+        manage_path = os.path.join(self.django_project_path, "manage.py")
+        cmd = f"python {manage_path} runserver {self.runserver_port}"
+        if self.runserver_args:
+            cmd += f" {self.runserver_args}"
+        
+        res = BlockingCommandService(f"Command running Django server '{self.name}'", cmd)
+        res.auto_stop = True
+        
+        return res
+        
+    def _wait_until_server_is_reachable(self):
+        import requests
+        url = f"http://127.0.0.1:{self.runserver_port}"
+        redo = WaitFuncResultVerifying("server is reachable", 
+                                       lambda: requests.get(url), 
+                                       lambda result: result and result.status_code == 200 )
+        redo.ignoring(Exception)
+        redo.polling_every(0.01)
+        redo.execute()
+        
+    def stop(self):
+        if self.__project_command is None or self.__project_command.status != CommandStates.Running:
+            raise TechnicalException(f"Django server of project '{self.name}' is not running (status: {self.__project_command.status if self.__project_command else 'Unkown'})")
+        self.__project_command.stop()
+    
+    def join(self, timeout=None):
+        self.__project_command.join(timeout)
+    
+
+
+
+

holado_django/server/grpc_django_server.py

@@ -0,0 +1,57 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+import os
+from holado_core.tools.abstracts.blocking_command_service import BlockingCommandService
+from holado_django.server.django_server import DjangoServer
+from holado_core.common.handlers.wait import WaitFuncResultVerifying
+
+logger = logging.getLogger(__name__)
+
+
+class GrpcDjangoServer(DjangoServer):
+    """
+    gRPC Django server
+    """
+    
+    def __init__(self, name, django_project_path, runserver_args=None):
+        super().__init__(name, django_project_path, port=50051, runserver_args=runserver_args)
+    
+    def _new_project_command(self):
+        manage_path = os.path.join(self.django_project_path, "manage.py")
+        cmd = f"python {manage_path} grpcrunserver"
+        if self.runserver_args:
+            cmd += f" {self.runserver_args}"
+        
+        res = BlockingCommandService(f"Command running gRPC Django server '{self.name}'", cmd)
+        res.auto_stop = True
+        
+        return res
+        
+    def _wait_until_server_is_reachable(self):
+        import grpc_requests
+        
+        endpoint = f"localhost:{self.runserver_port}"
+        def request_is_unimplemented():
+            try:
+                grpc_requests.Client.get_by_endpoint(endpoint)
+            except Exception as exc:
+                if "status = StatusCode.UNIMPLEMENTED" in str(exc):
+                    return True
+            return False
+        redo = WaitFuncResultVerifying("server is reachable", request_is_unimplemented, lambda result: result )
+        redo.polling_every(0.01)
+        redo.execute()
+
+

holado_django/tests/behave/steps/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+
+from .django_server_steps import *

holado_django/tests/behave/steps/django_server_steps.py

@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+from holado.common.context.session_context import SessionContext
+from holado_test.behave.behave import *  # @UnusedWildImport
+import logging
+from holado_test.scenario.step_tools import StepTools
+from holado_django.server.django_server import DjangoServer
+from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
+from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
+from holado_core.common.exceptions.technical_exception import TechnicalException
+from holado_django.server.grpc_django_server import GrpcDjangoServer
+
+logger = logging.getLogger(__name__)
+
+
+def __get_session_context():
+    return SessionContext.instance()
+
+def __get_scenario_context():
+    return __get_session_context().get_scenario_context()
+
+def __get_text_interpreter():
+    return __get_scenario_context().get_text_interpreter()
+
+def __get_variable_manager():
+    return __get_scenario_context().get_variable_manager()
+
+
+
+@Given(r"(?P<var_name>{Variable}) = new Django server")
+def step_impl(context, var_name):
+    var_name = StepTools.evaluate_variable_name(var_name)
+    table = BehaveStepTools.get_step_table(context)
+    
+    kwargs = ValueTableConverter.convert_name_value_table_2_json_object(table)
+    if 'django_project_path' not in kwargs:
+        raise TechnicalException("Parameter 'django_project_path' is required")
+    if 'name' not in kwargs:
+        kwargs['name'] = f"Django server ({kwargs['django_project_path']})"
+    
+    server = DjangoServer(**kwargs)
+    
+    __get_variable_manager().register_variable(var_name, server)
+    
+@Given(r"(?P<var_name>{Variable}) = new gRPC Django server")
+def step_impl(context, var_name):
+    var_name = StepTools.evaluate_variable_name(var_name)
+    table = BehaveStepTools.get_step_table(context)
+    
+    kwargs = ValueTableConverter.convert_name_value_table_2_json_object(table)
+    if 'django_project_path' not in kwargs:
+        raise TechnicalException("Parameter 'django_project_path' is required")
+    if 'name' not in kwargs:
+        kwargs['name'] = f"Django server ({kwargs['django_project_path']})"
+    
+    server = GrpcDjangoServer(**kwargs)
+    
+    __get_variable_manager().register_variable(var_name, server)
+    
+
+@Step(r"start \(Django server: (?P<var_server>{Variable})\)")
+def step_impl(context, var_server):
+    server = StepTools.evaluate_variable_value(var_server)
+    server.start()
+
+@Step(r"stop \(Django server: (?P<var_server>{Variable})\)")
+def step_impl(context, var_server):
+    server = StepTools.evaluate_variable_value(var_server)
+    server.stop()
+
+    

holado_grpc/tests/behave/steps/private/api/grpc_steps.py

@@ -49,18 +49,18 @@ def step_impl(context, var_name):
     var_name = StepTools.evaluate_variable_name(var_name)
     
     here = os.path.abspath(os.path.dirname(__file__))
-    api_grpc_path = os.path.normpath(os.path.join(here, "..", "..", "..", "..", "..", "..", "..", "tests", "behave", "test_holado", "tools", "django", "api_grpc"))
-    manage_path = os.path.join(api_grpc_path, "manage.py")
-    cmd = f"python {manage_path} grpcrunserver"
+    django_project_path = os.path.normpath(os.path.join(here, "..", "..", "..", "..", "..", "..", "..", "tests", "behave", "test_holado", "tools", "django", "api_grpc"))
     
-    obj = BlockingCommandService("internal gRPC server", cmd)
-    obj.auto_stop = True
-    obj.start()
-    
-    __get_variable_manager().register_variable(var_name, obj)
+    execute_steps(u"""
+        Given {var_name} = new gRPC Django server
+            | Name                   | Value                          |
+            | 'name'                 | 'gRPC server for holado tests' |
+            | 'django_project_path'  | '{django_project_path}'        |
+        When start (Django server: {var_name})
+        """.format(var_name=var_name, django_project_path=django_project_path))
     
     # Update imported grpc messages and services
-    proto_path = os.path.join(api_grpc_path, "api_grpc", "api1", "proto")
+    proto_path = os.path.join(django_project_path, "api_grpc", "api1", "proto")
     __get_session_context().protobuf_messages.import_all_compiled_proto(proto_path)
     __get_session_context().grpc_services.import_all_compiled_proto(proto_path)
     

holado_multitask/multitasking/multitask_manager.py

@@ -22,6 +22,8 @@ from holado_core.common.tools.tools import Tools
 from holado_python.standard_library.typing import Typing
 from holado.common.handlers.undefined import default_context
 from holado.common.context.session_context import SessionContext
+import psutil
+import signal
 
 logger = logging.getLogger(__name__)
 
@@ -60,16 +62,40 @@ class MultitaskManager(object):
         if pid is None:
             return os.getppid()
         else:
-            if GlobalSystem.get_os_type() ==  OSTypes.Linux:
-                # Read /proc/<pid>/status and look for the line `PPid:\t120517\n`
-                with open(f"/proc/{pid}/status", encoding="ascii") as f:
-                    for line in f.readlines():
-                        if line.startswith("PPid:\t"):
-                            return int(line[6:])
-                raise TechnicalException(f"No PPid line found in /proc/{pid}/status")
-            else:
-                raise TechnicalException(f"Unmanaged OS type {GlobalSystem.get_os_type().name}")
-                
+            process = psutil.Process(pid)
+            return process.ppid()
+    
+    @classmethod
+    def get_children_process_ids(cls, pid=None, recursive=False):
+        if pid is None:
+            pid = os.getpid()
+        
+        process = psutil.Process(pid)
+        children = process.children(recursive=recursive)
+        return [c.pid for c in children]
+    
+    @classmethod
+    def kill_process(cls, pid, sig=signal.SIGTERM, do_kill_children=True, recursively=True):
+        try:
+            process = psutil.Process(pid)
+        except psutil.NoSuchProcess:
+            return
+        
+        # Kill children
+        if do_kill_children:
+            children = process.children(recursive=recursively)
+            for proc in children:
+                try:
+                    proc.send_signal(sig)
+                except signal.SIGTERM:
+                    pass
+        
+        # Kill process
+        try:
+            process.send_signal(sig)
+        except signal.SIGTERM:
+            pass
+    
     @classmethod
     def has_thread_native_id(cls):
         from holado_multitask.multithreading.threadsmanager import ThreadsManager

holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -2,20 +2,20 @@
 MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
 Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
-SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUwNjI2MTYxMzE3WhcN
-MjUwNjI3MTYxMzE3WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO4WKCcsF4eCjLUeUT3/3IbM8m0N
-Z5Fgmqe3K9lDOXFQa/dX98/gGPswQiWkJ3ALspYgDGnfqEQEc5kBrTNpom0xoWPD
-vgv7M4O222bMtVvXyvE5/Absw/VYGhW5KGln2k/4hEl0Xl2kS7P0KMlrczrjDyqW
-NhGMvgWfSSF1D1fP1tx4E/74TnCrUQy332wlprxB567kIlPLUe4zbNT1PvAhXXj1
-r9kKYBy6ontb+VWnrYraD3YhLOsez3OocY32JfvB8jFgjaxKTFMCchOJaFuFZEl8
-/wCPawwCdG8aIvC+EVuttbA3F/s3vDjQRTKW9WJ1KoJhRIwYbwwmvNIycMkCAwEA
-AaNCMEAwHQYDVR0OBBYEFMXW798gAD4iFP15opS+N49NX/9HMB8GA1UdIwQYMBaA
-FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQAtxMjai8tc
-VEA0TTPeDplTyDUYZqwnb+wbxOmb8+CTwt7hj/o1vDS82QGoKINiHyRGhyJrfiTQ
-6TqBRxZMt52IdYwQoAMDnxyjxLdeVr0RNbxGziWBs3fjjahaEX/BMqzu5wd4mcpi
-UUmauULmYtY3vKiw8wsUEEkzzMM3fNJklMdMcR47cbH783FuJ7clhYaE/pJlq8RD
-wNIgume1u3BstRpIHafuZOy4Rg2nDiIuQoIORq7n8eRfgU9ZxVL7kZOgPFiTuokq
-0EgnEhwOTUahO6aFpN9j/wCIANLrf1bZWw7v80bno7aFQ1XOm2RW5yJywkc7LFqi
-Dia/obmoNitb
+SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUwNzAxMTQyMDI3WhcN
+MjUwNzAyMTQyMDI3WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALmLkz54fCoSSM/uG945GvhavQF8
+unsEDd0RuHWZPIBcrlEzhLLiiiegET4UFlywF4wSfbiNGgwr3Uw+6ph3xLrNs91B
+EYqOGesT9wRPMlon88qsaVIFfbqfg4e1m0si+/NwZMk+5bBeYC0blXk7HiTZ5KJt
+QNLeduIYaPSuyq+qxl/xDqWOifbKcgycitgCPKPxohtwa5h6IjU3WYb7+xNPt3cx
++hoCwfab1NgVBse6ZsUf81nkCEVKKLaNvlDkmXp9ItqZZay+0/yzLCgNyf8gDprU
+8u+nDM+pcz83OtIQWVeN5MtFjkA4nik55yqdlqnB1OWzEzaMSMh6Vsy13xMCAwEA
+AaNCMEAwHQYDVR0OBBYEFG5H5JaQhWehs8VRJu88HbHgK9CvMB8GA1UdIwQYMBaA
+FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQCs93UG22r0
+ZIF10IAoXVbPWOeXpKJgWpsQYURsGw7sB+Cgr/vK3P1lkZVMl72LUzNazmOQldev
+zUQ0TtOq24go1iAYWc7zYlxo9OHNkbAUDoViKP63K/CkXNCIkXg00vmEUco1PQWU
++OEaTNrQCeiW2eqYie9WNc4T5a7aUHT3Xno7G8KXTM7gtW35FNI/b0CwVWHRFzev
+n9VhRI9xrNYxpDqqxYu7diIV4TQVmscmNicuEtDB98kJ7yOAhlpzQhIFi1vQEefD
+4gZZ3ihlLd2XJWxiXZgeiz7dzva4oGcr9mU5Uohza3u/sjF34kx02+gNuv8x4Wil
+CU9Rl0WFGJ00
 -----END CERTIFICATE-----

holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDuFignLBeHgoy1
-HlE9/9yGzPJtDWeRYJqntyvZQzlxUGv3V/fP4Bj7MEIlpCdwC7KWIAxp36hEBHOZ
-Aa0zaaJtMaFjw74L+zODtttmzLVb18rxOfwG7MP1WBoVuShpZ9pP+IRJdF5dpEuz
-9CjJa3M64w8qljYRjL4Fn0khdQ9Xz9bceBP++E5wq1EMt99sJaa8Qeeu5CJTy1Hu
-M2zU9T7wIV149a/ZCmAcuqJ7W/lVp62K2g92ISzrHs9zqHGN9iX7wfIxYI2sSkxT
-AnITiWhbhWRJfP8Aj2sMAnRvGiLwvhFbrbWwNxf7N7w40EUylvVidSqCYUSMGG8M
-JrzSMnDJAgMBAAECggEAB6aan7ehAe/GCcPxpGZmdcZ8O9jkbR2HmsAeHps0a1nE
-PmyLQBjZdKj2VzNROR6HHJ/nBjfztkvWUyJkqHRKjeu8XfJaVxQ5cZAcuM73PP5Q
-PTQ5zxcorOep3uzWSZzWvR8lUR72MVgoPp4n+WEEkO3e/OVa03GMYa3esb6LQa0S
-QcPkMwsxgPZQ1V9s85IIyVBn2ebbOhDbU1mz0FhzWtJ18Jikm0KhJuHUwwXAwO4H
-aINMbSkckOtyJwQ2Iu2Me8/ZiFLUTCMkdym2fb3jkWS+uiHxJye0Pg4AnXtIZE+W
-cUwwrZE+TnhodiqoAc3CgD0ZkqIpp07KMl7FM9jGaQKBgQD7vQHHBHKLFbW6e9dT
-ruZR+4kwOeTA1jzKlr2D8/Y6XJAPVG2UCn1oxfMTp6NkqC9nmalct4FH6lzpleZG
-Duwm2kxhmI+kxPj5MXH/MDlMSL3nw06mQD8tWUM9u6M73Rm6DMg5VMH3WqcUzycl
-4FZDl0LcABDZsP+3f2A34l30uwKBgQDyHfxC5bA93cbvVzo3Qd5I611oKgg9J3vh
-/5I2bT3HKCIb7ruAthbDIO5/5K0ufIIzKAxcI9EJd2ViSO2MHhMQOfkrcKh6Kzb+
-u61r52ZRKN1aI2UiZzqtUTpkOetevRh1WMmH0CmItxZ/OpqDq/2OyQ6XedZWvd5t
-/PockMZaSwKBgBtZXWgRw5/4q9Wmvq4Iwl0FxtHGeGO64r/fwJclWgrdI4mG0qDS
-wu0vFEl+XPICk6Pdvdik1xbJD28RKgNSe7V84e94c6KjA6mPBaODybXP8VHMli7Z
-rANxPyzlxcYrLzBXUylnW+tTnfNUzhv/U1/kfw8HsszzvdRhskJgBXUhAoGBAIHU
-sHwS/PH/5fhcFvyglpkVlS4RM//PF3A2Auqqo7ETBU9jMiqv+f7CvwHX10IRRCQ4
-eoBCOIrR+oy8vJ0hV2mhHMs9iyqP19q7OyCcolItDp2SU14iauWbpCswn9Vaoy3x
-4YexiUQloaux+j9XUA1sJSX3EIfNIuRp/piozaSHAoGAWODO4Ug0aU3SxHoj3muQ
-dgQmAcwNKif7UOWCcB/6qQFDMqDqiWuqPX1x7sUYjN61Dd2AwoOanI8phDsp2R4/
-7ywBy2es5ePrk5Ma332QA/6rxkLVXGaGEV4mCVziF4PEGsbMZzx7YDIZoXUwuKw0
-JLVTXQhAmlEnNoMi1T/zLB8=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5i5M+eHwqEkjP
+7hveORr4Wr0BfLp7BA3dEbh1mTyAXK5RM4Sy4oonoBE+FBZcsBeMEn24jRoMK91M
+PuqYd8S6zbPdQRGKjhnrE/cETzJaJ/PKrGlSBX26n4OHtZtLIvvzcGTJPuWwXmAt
+G5V5Ox4k2eSibUDS3nbiGGj0rsqvqsZf8Q6ljon2ynIMnIrYAjyj8aIbcGuYeiI1
+N1mG+/sTT7d3MfoaAsH2m9TYFQbHumbFH/NZ5AhFSii2jb5Q5Jl6fSLamWWsvtP8
+sywoDcn/IA6a1PLvpwzPqXM/NzrSEFlXjeTLRY5AOJ4pOecqnZapwdTlsxM2jEjI
+elbMtd8TAgMBAAECggEAfLWcfSOcSObLO76NyppVT1IlsWc1K9O4wbrUYW5iZOBm
+Zbub2GQ9eY6zqCb2NMxCt2oCSFXGiSG+dy3eniX5+5ig6PiAIsGKGB/uKl5UuJYb
+3UBu9astK49lZ4Sf4Sudbq0/gKge16FHQWpF2BrtEtXFP4rxRAo0m5jOio8lOlYG
+VSBFrkww7aS0pbymELj+Yg0twrUQjeG/hhoA4juiAq8T6oilrNfxhgc8pi2e23Ix
+iokPjVWWAylKr6+oKhgBj/MKoIcEPeyYem1rBCesO2Th5CHy4YwIsZq+456Wo9/z
+efxjnr+1vrsH+WK83nff3wUMruchKbdP1p9sMSkwqQKBgQD0y8b7sK4omV/JRdS3
+sADYETu2wshP22EuUbkDPICe5/ct1LWlTJAI84MkMcg4rOHuLubD32ttRA3SWnK/
+eqXB3gkcstVhipjj5qH5sg3gCIOa5rmePY1Zn5v75BImYzHYBfqQ0Z99czBNQ4un
+MPMxe1IRT+b6aU7EOWjSWG2X/wKBgQDCCZGpv+pFQqxb5YjPQqDn/7M9wE89b22T
+G2weESzoBrnLCUA4M0QEhhgBkcb9grZQ0aCOzjqKTDF/2AnFOhP6IIzEVxkrsC/0
+c150lU8kiIlkymVF7N5vwayPFUeNqaO5NdHOYu0HkEQ8h9FCFurc0OjA/8xRPXkp
+AGar8P/Y7QKBgE+5jjSqdg4C5Y9Hjt/EEoJMGoaLKXHYoO3U78x+B+W45memvwH2
+zXIc3LkM/Yh3xZ0s6TshqHsNjvLTQkvaReG9znnqRFRgLysKEfagZqRwIWxxeEJx
+CXgG42ZGASM/axxP1isUGj1hJnoDZZgt+QZEg5Xfz/n+EgkWKW1YH1lBAoGAMw7L
+ioxae+Egc4oBpvAUYRfStXQOJc9VWPlFSOAiHefvKbMEeAVdZ4dVd8xBPWIQ0VFn
+20v+8Xc9KzPQ1loC+bVo9R0qHWneJIfbGfhT+/wFk0UCwxSiL2waGQhzbJ5v24OC
+8rjrQCtBGWBvuuFG6dX6+RYWUGZJpHVbjvD6kb0CgYAnU00V1AZu39ku1iozaHoY
+STedxCDtGZotOISDFzaqIxaJ1JUeWZ/90ZMIVHdE+pP8n2P8MN7rppBbTN6Mxcbq
+uE9BfZJGN5A8PuugoJWBJwkfnhrEMXXSpz5SPQntCkrET7pkAW2Nx1CWRQKaj1pu
++CKEVUIhv/elJOdMV9mGbA==
 -----END PRIVATE KEY-----

holado_rest/api/rest/TODO.txt

@@ -1,2 +1,2 @@
-Client with library "requests"
 Client with library "httpx"
+

holado_rest/tests/behave/steps/private/api/rest_steps.py

@@ -17,6 +17,7 @@ from holado_test.behave.behave import *  # @UnusedWildImport
 import os.path
 import logging
 from holado_test.scenario.step_tools import StepTools
+from holado_django.server.django_server import DjangoServer
 
 logger = logging.getLogger(__name__)
 
@@ -40,22 +41,19 @@ def step_impl(context, var_name):
     var_name = StepTools.evaluate_variable_name(var_name)
     
     here = os.path.abspath(os.path.dirname(__file__))
-    manage_path = os.path.normpath(os.path.join(here, "..", "..", "tools", "django", "api_rest", "manage.py"))
-    cmd = f"python {manage_path} runserver"
+    django_project_path = os.path.normpath(os.path.join(here, "..", "..", "..", "..", "..", "..", "..", "tests", "behave", "test_holado", "tools", "django", "api_rest"))
     
     execute_steps(u"""
-                      Given {var_name} = new command '{cmd}' with
-                          | Name        | Value |
-                          | 'auto_stop' | True  |
-                          | 'blocking'  | True  |
-                          | 'name'      | 'internal REST server' |
-                      Given run command {var_name}
-                      Then command {var_name} has status Ready
-                      When wait 5 seconds
-                      Then command {var_name} has status Running
-                      """.format(cmd=cmd, var_name=var_name))
-      
+        Given {var_name} = new Django server
+            | Name                   | Value                          |
+            | 'name'                 | 'REST server for holado tests' |
+            | 'django_project_path'  | '{django_project_path}'        |
+            | 'port'                 | 8000                           |
+        When start (Django server: {var_name})
+        """.format(var_name=var_name, django_project_path=django_project_path))
     
+
+
 @Given(r"(?P<var_name>{Variable}) = new internal REST client")
 def step_impl(context, var_name):
     var_name = StepTools.evaluate_variable_name(var_name)

holado_system/system/command/command.py

@@ -20,6 +20,9 @@ import time
 from enum import IntEnum
 from holado_core.common.exceptions.functional_exception import FunctionalException
 import copy
+import signal
+from holado_core.common.tools.tools import Tools
+from holado_multitask.multitasking.multitask_manager import MultitaskManager
 
 logger = logging.getLogger(__name__)
 
@@ -31,6 +34,7 @@ class CommandStates(IntEnum):
     Success = 3
     Error = 4
 
+
 class Command(threading.Thread):
     """
     Execute a command in a thread.
@@ -58,6 +62,7 @@ class Command(threading.Thread):
         self.__callback_delay_ms = None
         self.__external_parameters = {}
         self.__subprocess_kwargs = subprocess_kwargs
+        self.__stop_signal = signal.SIGTERM
 
  
     @property
@@ -94,29 +99,38 @@ class Command(threading.Thread):
             return self.__process.returncode
         else:
             return None
-  
+    
     @property
     def callback(self):
         return self.__callback
- 
+    
     @callback.setter
     def callback(self, callback):
         """Set callback called when execution end."""
         self.__callback = callback
- 
+    
     @property
     def callback_delay_ms(self):
         return self.__callback_delay_ms
- 
+    
     @callback_delay_ms.setter
     def callback_delay_ms(self, delay_ms):
         """Set callback delay in ms."""
         self.__callback_delay_ms = delay_ms
-  
+    
     @property
     def external_parameters(self):
         return self.__external_parameters
-       
+    
+    @property
+    def stop_signal(self):
+        return self.__stop_signal
+    
+    @stop_signal.setter
+    def stop_signal(self, stop_signal):
+        """Set stop signal."""
+        self.__stop_signal = stop_signal
+    
     def run(self):
         logger.debug("Call command: {}".format(self.cmd))
         try:
@@ -139,7 +153,7 @@ class Command(threading.Thread):
             
             self.__stdout = ""
             self.__stderr = ""
-            while (self.__process.returncode is None):
+            while self.__process.returncode is None:
                 # Wait a small time and in same time yield this thread
                 time.sleep(0.001)
                 
@@ -175,7 +189,7 @@ class Command(threading.Thread):
                     logger.debug(f"Command [{self.cmd}] has finished, calling callback...")
                     self.callback(self)
             elif self.error is not None:
-                logger.error(f"Command [{self.cmd}] has finished on error : {self.error}")
+                logger.error(f"Command [{self.cmd}] has finished on error: {self.error}")
             elif self.state == CommandStates.Error:
                 logger.error(f"Command [{self.cmd}] has finished on error code {self.return_code} and stderr: {self.stderr}")
             elif self.state != CommandStates.Success:
@@ -208,13 +222,21 @@ class Command(threading.Thread):
             raise FunctionalException(msg)
         
     def kill(self):
+        # Note: kill is equivalent to terminate in subprocess implementation
         if self.state == CommandStates.Running:
             self.__process.kill() 
                        
     def terminate(self):
         if self.state == CommandStates.Running:
             self.__process.terminate()
-
+    
+    def stop(self):
+        if self.state == CommandStates.Running:
+            if Tools.do_log(logger, logging.DEBUG):
+                logger.debug(f"Stopping command [{self.cmd}] with signal {self.__stop_signal} and PID {self.__process.pid}")
+            
+            MultitaskManager.kill_process(self.__process.pid, sig=self.__stop_signal, do_kill_children=True, recursively=True)
+    
     def __repr__(self):
         return pprint.pformat({'cmd' : self.cmd,
                                'is alive' : self.is_alive() })

holado_system/system/global_system.py

@@ -14,9 +14,7 @@
 import logging
 from holado.common.handlers.enums import AutoNumber
 import platform
-from holado_system.system.command.command import Command, CommandStates
 from holado_core.common.exceptions.technical_exception import TechnicalException
-from holado_system.system.command.command_result import CommandResult
 import time
 import os
 from holado_core.common.tools.tools import Tools
@@ -87,6 +85,9 @@ class GlobalSystem(object):
 
     @classmethod
     def execute_command(cls, cmd, do_log_output=False, do_raise_on_stderr=False):
+        from holado_system.system.command.command import Command, CommandStates
+        from holado_system.system.command.command_result import CommandResult
+        
         command = Command(cmd, do_log_output=do_log_output, do_raise_on_stderr=do_raise_on_stderr)
         command.start()
         command.join()
@@ -183,5 +184,4 @@ class GlobalSystem(object):
                 return port
         return None
     
-    
     

test_holado/environment.py

@@ -19,10 +19,12 @@ import logging
 
 # Add testing solution sources paths
 here = os.path.abspath(os.path.dirname(__file__))
-sys.path.append(here)
-holado_path = os.path.normpath(os.path.join(here, "..", "..", ".."))
-sys.path.append( os.path.join(holado_path, "src") )
-sys.path.append( os.path.join(holado_path, "tests", "behave") )
+sys.path.insert(0, here)
+
+# Add HolAdo source paths (needed when using a clone of HolAdo project)
+from initialize_holado import insert_holado_source_paths
+insert_holado_source_paths()
+
 
 # Configure HolAdo
 import holado