openmodule 18.1.1__tar.gz → 18.1.2__tar.gz

{openmodule-18.1.1 → openmodule-18.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openmodule
-Version: 18.1.1
+Version: 18.1.2
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO

{openmodule-18.1.1 → openmodule-18.1.2}/openmodule/core.py

@@ -55,12 +55,13 @@ class OpenModuleCore(threading.Thread):
         self._messages_internal.register_handler("healthz", HealthPingMessage, self.health.process_message,
                                                  match_type=True)
 
-    def init_database(self):
+    def init_database(self, migration_timeout: float = 300):
         from openmodule.database.database import Database
         if self.config.TESTING:
-            self.database = Database(self.config.DATABASE_FOLDER, self.config.NAME, alembic_path="../src/database")
+            self.database = Database(self.config.DATABASE_FOLDER, self.config.NAME, alembic_path="../src/database",
+                                     migration_timeout=migration_timeout)
         else:
-            self.database = Database(self.config.DATABASE_FOLDER, self.config.NAME)
+            self.database = Database(self.config.DATABASE_FOLDER, self.config.NAME, migration_timeout=migration_timeout)
 
     def start(self) -> None:
         super().start()
@@ -153,9 +154,9 @@ def wait_for_misc(core: OpenModuleCore, timeout: float = 120, retry_time: float
 
 
 def init_openmodule(config, *, dsn: str = None, sentry=None, logging=True, dsgvo=True,
-                    health_handler: HealthHandlerType | None = None,
-                    context=None, database=False, catch_sigterm=True,
-                    dispatcher_max_threads=1, wait_for_broker=True, **sentry_kwargs) -> OpenModuleCore:
+                    health_handler: HealthHandlerType | None = None, context=None, database=False, catch_sigterm=True,
+                    dispatcher_max_threads=1, wait_for_broker=True, migration_timeout=300.0, **sentry_kwargs) \
+        -> OpenModuleCore:
     if health_handler:
         warnings.warn(
             "health_handler is deprecated, and will simply be ignored. Please use metrics "
@@ -208,7 +209,7 @@ def init_openmodule(config, *, dsn: str = None, sentry=None, logging=True, dsgvo
         _core_thread.health.health_handler = health_handler
 
     if database:
-        _core_thread.init_database()
+        _core_thread.init_database(migration_timeout)
 
     if catch_sigterm and threading.current_thread().__class__.__name__ == "_MainThread":
         signal.signal(signal.SIGTERM, sigterm_handler)

{openmodule-18.1.1 → openmodule-18.1.2}/openmodule/database/database.py

@@ -47,7 +47,7 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 active_databases = {}
 
 
-def execute_migration(engine: Engine, alembic_path: Optional[str] = None):
+def execute_migration(engine: Engine, alembic_path: Optional[str] = None, migration_timeout: float = 300):
     def isolated_migration_process():
         nonlocal engine, alembic_path
         from openmodule.database.migration import migrate_database
@@ -56,7 +56,7 @@ def execute_migration(engine: Engine, alembic_path: Optional[str] = None):
     p = MigrationProcess(target=isolated_migration_process)
     try:
         p.start()
-        p.join(timeout=5 * 60)  # default 5 min timeout -> exception/sentry in service
+        p.join(timeout=migration_timeout)  # default 5 min timeout -> exception/sentry in service
     except ProcessError:
         raise
     finally:
@@ -78,7 +78,7 @@ def database_path(db_folder, db_name):
     return os.path.join(db_folder, db_name) + ".sqlite3"
 
 
-def get_database(db_folder: str, name: str, alembic_path: Optional[str] = None):
+def get_database(db_folder: str, name: str, alembic_path: Optional[str] = None, migration_timeout: float = 300):
     global active_databases
     tmp = database_path(db_folder, name)
     assert active_databases.get(tmp) is None, f"database {tmp} already exists," \
@@ -88,7 +88,7 @@ def get_database(db_folder: str, name: str, alembic_path: Optional[str] = None):
     engine = create_engine(path, poolclass=StaticPool, connect_args={'check_same_thread': False})
 
     # migration executed in a separate process -> no alembic import in main process
-    execute_migration(engine, alembic_path)
+    execute_migration(engine, alembic_path, migration_timeout)
 
     active_databases[tmp] = engine
 
@@ -124,10 +124,10 @@ class SessionWrapper(Session):
 class Database:
     active_session: Optional[Session]
 
-    def __init__(self, database_folder, name="database", alembic_path=None):
+    def __init__(self, database_folder, name="database", alembic_path=None, migration_timeout: float = 300):
         self.db_folder = database_folder
         self.name = name
-        self._engine = get_database(database_folder, name, alembic_path)
+        self._engine = get_database(database_folder, name, alembic_path, migration_timeout)
         self._session = sessionmaker(bind=self._engine, class_=SessionWrapper)
         self.active_session = None
         self.lock = threading.RLock()

{openmodule-18.1.1 → openmodule-18.1.2}/openmodule/health.py

@@ -249,6 +249,7 @@ class Healthz:
         metric = self.metrics.get(key)
         if not metric:
             self._metric_log_or_raise("Metric %s not found, the metric will not be set", key)
+            return
         if value is None:
             metric.values.pop(self._labels_string(labels), None)
         elif metric.type == HealthMetricType.count:

{openmodule-18.1.1 → openmodule-18.1.2}/openmodule.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openmodule
-Version: 18.1.1
+Version: 18.1.2
 Summary: Libraries for developing the arivo openmodule
 Home-page: https://gitlab.com/arivo-public/device-python/openmodule.git
 Author: ARIVO