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

holado_django/server/django_projects/rest_api/rest_api/settings.py

@@ -0,0 +1,130 @@
+"""
+Django settings for server_rest_example project.
+
+Generated by 'django-admin startproject' using Django 5.2.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.2/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/5.2/ref/settings/
+"""
+
+from pathlib import Path
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-(4nx+&@_ylqw(sa25syu5gdnu1q0bhyy69%*)^al_=2*%c*=ar'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'rest_framework',
+]
+
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+]
+
+ROOT_URLCONF = 'rest_api.urls'
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = 'rest_api.wsgi.application'
+
+
+# Database
+# https://docs.djangoproject.com/en/5.2/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
+
+
+# Password validation
+# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
+
+AUTH_PASSWORD_VALIDATORS = [
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/5.2/topics/i18n/
+
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/5.2/howto/static-files/
+
+STATIC_URL = 'static/'
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+
+REST_FRAMEWORK = {
+    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+    'PAGE_SIZE': 10
+}
+

holado_django/server/django_projects/rest_api/rest_api/urls.py

@@ -0,0 +1,35 @@
+"""
+URL configuration for server_rest_example project.
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/5.2/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+from django.contrib import admin
+from django.urls import path
+from rest_framework import routers
+from django.urls.conf import include
+from rest_api.application.apps import django_application_inst
+from holado_core.common.exceptions.technical_exception import TechnicalException
+
+router = routers.DefaultRouter()
+if django_application_inst is not None:
+    django_application_inst.register_urls(router)
+    print(f"router urls: {router.urls}")
+else:
+    raise TechnicalException("Django application instance is not set")
+
+urlpatterns = [
+    path('', include(router.urls)),
+    path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    path('admin/', admin.site.urls),
+]

holado_django/server/django_projects/rest_api/rest_api/wsgi.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for server_rest_example project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.2/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'rest_api.settings')
+
+application = get_wsgi_application()

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/server/patch_djangogrpcframework.py

@@ -0,0 +1,46 @@
+
+#################################################
+# 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.
+#################################################
+
+
+#################################################
+#
+# Patches are done to follow ITU recommendation:
+# https://www.e-navigation.nl/sites/default/files/R-REC-M.1371-5-201402-I!!PDF-E_1.pdf
+#
+#################################################
+
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+# Since Django 4.1, requires_system_checks cannot be a boolean anymore.
+# Framework djangogrpcframework is not maintained anymore.
+# Patch it by removing reference to requires_system_checks
+#
+# USAGE:
+#    1. If not using holado in django project, copy this file in django project
+#    2. In manage.py, import this file
+
+try:
+    import django_grpc_framework  # @UnusedImport
+    with_django_grpc_framework = True
+except:
+    with_django_grpc_framework = True
+
+if with_django_grpc_framework:
+    from django_grpc_framework.management.commands.grpcrunserver import Command  # @UnusedImport
+    del Command.requires_system_checks
+
+

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_logging/common/logging/holado_logger.py

@@ -43,12 +43,7 @@ class HALogger(logging.Logger):
         
         if msg_size_limit is None:
             msg_size_limit = HALogger.default_message_size_limit
-            
-        if msg_size_limit is not None and msg_size_limit > 0 and len(msg) > msg_size_limit:
-            truncated_suffix = f"[...({len(msg)-msg_size_limit})]"
-            msg_to_log = Tools.truncate_text(msg, msg_size_limit, truncated_suffix)
-        else:
-            msg_to_log = msg
+        msg_to_log = Tools.truncate_text(msg, msg_size_limit)
             
         logging.Logger._log(self, level, msg_to_log, args, exc_info=exc_info, extra=extra, stack_info=stack_info, stacklevel=stacklevel)
     

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_multitask/multithreading/thread.py

@@ -22,20 +22,21 @@ from holado.common.handlers.undefined import undefined_argument, default_context
 from holado_core.common.exceptions.technical_exception import TimeoutTechnicalException
 from holado_core.common.exceptions.functional_exception import FunctionalException
 from holado_python.common.tools.datetime import DateTime, FORMAT_DATETIME_ISO
+from holado.common.handlers.object import DeleteableObject
 
 logger = logging.getLogger(__name__)
 
 
-class Thread(threading.Thread):
+class Thread(threading.Thread, DeleteableObject):
     """ Helper class managing a thread."""
     
     def __init__(self, name, default_wait_timeout=None, register_thread=True, register_scope=default_context, delay_before_run_sec=None):
-        super().__init__()
+        threading.Thread.__init__(self)
+        DeleteableObject.__init__(self, name)
         
         if default_wait_timeout is None:
             default_wait_timeout = Config.timeout_seconds * 1000
             
-        self.__name = name
         # Note: if SessionContext doesn't have an instance (like during session context reset), use name+now as unique name
         self.__unique_name = SessionContext.instance().multitask_manager.prepare_thread(name) if SessionContext.has_instance() else f"{name}_{DateTime.datetime_2_str(DateTime.now(), FORMAT_DATETIME_ISO)}"
         self.__default_wait_timeout = default_wait_timeout
@@ -51,14 +52,15 @@ class Thread(threading.Thread):
         
         # Register thread
         # Note: Do not register thread if session context doesn't have an instance (like during session context reset)
+        self.__is_registered = False
+        self.__register_scope = None
         if register_thread and SessionContext.has_instance():
             # Registered name has to be unique
             SessionContext.instance().threads_manager.register_thread(self.__unique_name, self, scope=register_scope)
+            self.__is_registered = True
+            self.__register_scope = register_scope
+            self.on_delete_call_func(self.__unregister_thread)
         
-    @property
-    def name(self):
-        return self.__name
-
     @property
     def unique_name(self):
         return self.__unique_name
@@ -149,6 +151,10 @@ class Thread(threading.Thread):
                 elif wait_round_counter % 10 == 0:
                     logger.debug("[{}] Still waiting {} (round {})".format(self.name, event_details, wait_round_counter))
         logger.debug("[{}] Finished waiting {}...".format(self.name, event_details))
+    
+    def __unregister_thread(self):
+        if self.__is_registered:
+            SessionContext.instance().threads_manager.unregister_thread(self.__unique_name, self, scope=self.__register_scope)
 
 
 class InterruptableThread(Thread):

holado_multitask/multithreading/timer.py

@@ -40,7 +40,10 @@ class Timer(InterruptableThread):
         self.finished.set()
 
     def run(self):
+        # Wait timer interval or canceled (ie finished==True)
         self.finished.wait(self.interval)
+        
+        # Run function if not canceled
         if not self.finished.is_set():
             self.function(*self.args, **self.kwargs)
         self.finished.set()