Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Added _import_error_ignored_modules.

Browse source 
ImportErrors on these entity modules will be ignored when dynamically
loading them, since they have optional external dependencies and we
shouldn't throw an error if we can't import them.
This commit is contained in:
Fabio Manganiello 2023-03-09 01:40:35 +01:00
parent c4efec6832
commit 9f9ee575f1
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
platypush/entities/_base.py
View file

@ -4,7 +4,7 @@ import pathlib
import types import types
from datetime import datetime from datetime import datetime
from dateutil.tz import tzutc from dateutil.tz import tzutc
from typing import Callable, Mapping, Type, Tuple, Any from typing import Callable, Final, Mapping, Set, Type, Tuple, Any
import pkgutil import pkgutil
from sqlalchemy import ( from sqlalchemy import (
@ -26,6 +26,14 @@ from platypush.message import JSONAble
entities_registry: Mapping[Type['Entity'], Mapping] = {} entities_registry: Mapping[Type['Entity'], Mapping] = {}
_import_error_ignored_modules: Final[Set[str]] = {'bluetooth'}
"""
ImportError exceptions will be ignored for these entity submodules when
imported dynamically. An ImportError for these modules means that some optional
requirements are missing, and if those plugins aren't enabled then we shouldn't
fail.
"""
if 'entity' not in Base.metadata: if 'entity' not in Base.metadata:
@ -177,8 +185,15 @@ def _discover_entity_types():
module = types.ModuleType(mod_loader.name) module = types.ModuleType(mod_loader.name)
mod_loader.loader.exec_module(module) mod_loader.loader.exec_module(module)
except Exception as e: except Exception as e:
logger.warning(f'Could not import module {modname}') if (
logger.exception(e) isinstance(e, (ImportError, ModuleNotFoundError))
and modname[len(__package__) + 1 :] in _import_error_ignored_modules
):
logger.debug(f'Could not import module {modname}')
else:
logger.warning(f'Could not import module {modname}')
logger.exception(e)
continue continue
for _, obj in inspect.getmembers(module): for _, obj in inspect.getmembers(module):