rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better handling of default extension exceptions

Browse source
This commit is contained in:
Joel Collins 2020-01-14 16:49:45 +00:00
parent 94aac61925
commit bc5c410abc
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
openflexure_microscope/api/default_extensions/__init__.py
View file

@ -1,4 +1,14 @@
import logging
import traceback
from .autofocus import autofocus_extension_v2 from .autofocus import autofocus_extension_v2
from .scan import scan_extension_v2 from .scan import scan_extension_v2
from .zip_builder import zip_extension_v2 from .zip_builder import zip_extension_v2
from .picamera_autocalibrate import lst_extension_v2
# "Gracefully" handle cases where picamera cannot be imported (eg test server)
try:
from .picamera_autocalibrate import lst_extension_v2
except Exception as e:
logging.error(
f"Exception loading builtin extension picamera_autocalibrate: \n{traceback.format_exc()}"
)

10
openflexure_microscope/common/flask_labthings/extensions.py
View file

@ -36,7 +36,7 @@ class BaseExtension:
self.actions = [] self.actions = []
self.properties = [] self.properties = []
self.name = name self._name = name
self.description = get_docstring(self) self.description = get_docstring(self)
self.version = str(version) self.version = str(version)
@ -57,9 +57,6 @@ class BaseExtension:
view_id = cleaned_rule.replace("/", "_").replace("<", "").replace(">", "") view_id = cleaned_rule.replace("/", "_").replace("<", "").replace(">", "")
# Create a Python-safe route ID
logging.debug(view_id)
# Store route information in a dictionary # Store route information in a dictionary
d = {"rule": full_rule, "view": view_class, "kwargs": kwargs} d = {"rule": full_rule, "view": view_class, "kwargs": kwargs}
@ -82,8 +79,8 @@ class BaseExtension:
self._meta[key] = val self._meta[key] = val
@property @property
def _name(self): def name(self):
return self.name return self._name
@property @property
def _name_python_safe(self): def _name_python_safe(self):
@ -111,6 +108,7 @@ def find_instances_in_module(module, class_to_find):
for attribute in dir(module): for attribute in dir(module):
if not attribute.startswith("__"): if not attribute.startswith("__"):
if isinstance(getattr(module, attribute), class_to_find): if isinstance(getattr(module, attribute), class_to_find):
logging.debug(f"Found extension {getattr(module, attribute).name}")
objs.append(getattr(module, attribute)) objs.append(getattr(module, attribute))
return objs return objs