c2cgeoportal-commons 2.8.1.181__py3-none-any.whl → 2.9rc1__py3-none-any.whl

c2cgeoportal_commons/models/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -27,10 +27,11 @@
 
 
 import logging
-from typing import Any, Dict, List
+from typing import Any
 
 import sqlalchemy.ext.declarative
 import sqlalchemy.orm
+import sqlalchemy.orm.scoping
 import zope.event
 
 try:
@@ -42,19 +43,25 @@ except ModuleNotFoundError:
 
 
 # Should be filed on application initialization
-DBSession: sqlalchemy.orm.Session = None
-Base: sqlalchemy.ext.declarative.ConcreteBase = sqlalchemy.ext.declarative.declarative_base()
-DBSessions: Dict[str, sqlalchemy.orm.Session] = {}
+DBSession: sqlalchemy.orm.scoping.scoped_session[sqlalchemy.orm.Session] | None = None
 
 
-LOG = logging.getLogger(__name__)
+class BaseType(sqlalchemy.ext.declarative.DeclarativeMeta, type):
+    pass
+
+
+Base: BaseType = sqlalchemy.orm.declarative_base()
+DBSessions: dict[str, sqlalchemy.orm.scoping.scoped_session[sqlalchemy.orm.Session]] = {}
+
+
+_LOG = logging.getLogger(__name__)
 
 
 class InvalidateCacheEvent:
     """Event to be broadcast."""
 
 
-def cache_invalidate_cb(*args: List[Any]) -> None:
+def cache_invalidate_cb(*args: list[Any]) -> None:
     """Invalidate the cache on a broadcast event."""
     _cache_invalidate_cb()
 
@@ -67,4 +74,4 @@ try:
         zope.event.notify(InvalidateCacheEvent())
 
 except ModuleNotFoundError:
-    LOG.error("c2cwsgiutils broadcast not found")
+    _LOG.error("c2cwsgiutils broadcast not found")