From 33fea9b298df716ab4eb1bce8d04d5d502e300df Mon Sep 17 00:00:00 2001 From: Simon Birkholz Date: Wed, 10 Apr 2024 17:00:01 +0200 Subject: [PATCH 1/2] moved implementation package import to single file --- cuvis/AcquisitionContext.py | 5 +---- cuvis/Async.py | 5 +---- cuvis/Calibration.py | 5 +---- cuvis/Export.py | 5 +---- cuvis/FileWriteSettings.py | 5 +---- cuvis/General.py | 5 +---- cuvis/Measurement.py | 5 +---- cuvis/ProcessingContext.py | 5 +---- cuvis/SessionFile.py | 5 +---- cuvis/Viewer.py | 5 +---- cuvis/_cuvis_il.py | 6 ++++++ cuvis/cuvis_aux.py | 6 +----- cuvis/cuvis_types.py | 5 +---- 13 files changed, 18 insertions(+), 49 deletions(-) create mode 100644 cuvis/_cuvis_il.py diff --git a/cuvis/AcquisitionContext.py b/cuvis/AcquisitionContext.py index c27d7a5..82dfa07 100644 --- a/cuvis/AcquisitionContext.py +++ b/cuvis/AcquisitionContext.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .Async import Async, AsyncMesu from .Calibration import Calibration from .General import ComponentInfo diff --git a/cuvis/Async.py b/cuvis/Async.py index 2b0ef4f..a676812 100644 --- a/cuvis/Async.py +++ b/cuvis/Async.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .Measurement import Measurement from .cuvis_aux import SDKException from .cuvis_types import AsyncResult diff --git a/cuvis/Calibration.py b/cuvis/Calibration.py index 8057c54..d6e9191 100644 --- a/cuvis/Calibration.py +++ b/cuvis/Calibration.py @@ -1,10 +1,7 @@ import os from pathlib import Path -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .SessionFile import SessionFile from .cuvis_aux import SDKException, Capabilities from .cuvis_types import OperationMode diff --git a/cuvis/Export.py b/cuvis/Export.py index d63f2e0..c833c91 100644 --- a/cuvis/Export.py +++ b/cuvis/Export.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .cuvis_aux import SDKException from .Measurement import Measurement diff --git a/cuvis/FileWriteSettings.py b/cuvis/FileWriteSettings.py index 30bb2a6..a9597ea 100644 --- a/cuvis/FileWriteSettings.py +++ b/cuvis/FileWriteSettings.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .cuvis_aux import SDKException from .cuvis_types import PanSharpeningInterpolationType, \ PanSharpeningAlgorithm, \ diff --git a/cuvis/General.py b/cuvis/General.py index 9a6f873..a2c72fc 100644 --- a/cuvis/General.py +++ b/cuvis/General.py @@ -2,10 +2,7 @@ import os import platform -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .cuvis_aux import SDKException from .cuvis_types import ComponentType diff --git a/cuvis/Measurement.py b/cuvis/Measurement.py index f142c10..ce4d341 100644 --- a/cuvis/Measurement.py +++ b/cuvis/Measurement.py @@ -1,10 +1,7 @@ import datetime import os -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .cuvis_aux import SDKException, SessionData, Capabilities, MeasurementFlags, SensorInfo, GPSData from .cuvis_types import DataFormat, ProcessingMode, ReferenceType diff --git a/cuvis/ProcessingContext.py b/cuvis/ProcessingContext.py index f87296b..cff59c5 100644 --- a/cuvis/ProcessingContext.py +++ b/cuvis/ProcessingContext.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .Calibration import Calibration from .FileWriteSettings import ProcessingArgs from .Measurement import Measurement diff --git a/cuvis/SessionFile.py b/cuvis/SessionFile.py index f99974e..bf81f0f 100644 --- a/cuvis/SessionFile.py +++ b/cuvis/SessionFile.py @@ -1,10 +1,7 @@ import os from pathlib import Path -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .Measurement import Measurement from .cuvis_aux import SDKException from .cuvis_types import OperationMode, SessionItemType, ReferenceType diff --git a/cuvis/Viewer.py b/cuvis/Viewer.py index 25b0ef6..5a56acb 100644 --- a/cuvis/Viewer.py +++ b/cuvis/Viewer.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .Measurement import ImageData, Measurement from .cuvis_aux import SDKException from .cuvis_types import CUVIS_imbuffer_format diff --git a/cuvis/_cuvis_il.py b/cuvis/_cuvis_il.py new file mode 100644 index 0000000..0a5707d --- /dev/null +++ b/cuvis/_cuvis_il.py @@ -0,0 +1,6 @@ +try: + from cuvis_il import cuvis_il # type: ignore +except ImportError as e: + if e.msg.startswith('DLL'): + raise + import cuvis_il # type: ignore \ No newline at end of file diff --git a/cuvis/cuvis_aux.py b/cuvis/cuvis_aux.py index dbdf194..1ef3eb8 100644 --- a/cuvis/cuvis_aux.py +++ b/cuvis/cuvis_aux.py @@ -3,11 +3,7 @@ import datetime base_datetime = datetime.datetime(1970, 1, 1) -try: - from cuvis_il import cuvis_il -except: - import cuvis_il - +from _cuvis_il import cuvis_il from typing import List, Union import cuvis.cuvis_types as internal diff --git a/cuvis/cuvis_types.py b/cuvis/cuvis_types.py index 28e1b27..108d5ff 100644 --- a/cuvis/cuvis_types.py +++ b/cuvis/cuvis_types.py @@ -1,10 +1,7 @@ import numpy as np from enum import Enum -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il def __generateTranslationDict(enum_cls): transDict = {value : cuvis_il.__dict__[value.name] for value in enum_cls } From f5e56bc53b3f1f9e434cedb9460661016b72239d Mon Sep 17 00:00:00 2001 From: Simon Birkholz Date: Wed, 10 Apr 2024 17:00:47 +0200 Subject: [PATCH 2/2] wip --- cuvis/Worker.py | 5 +---- cuvis/doc.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cuvis/Worker.py b/cuvis/Worker.py index 8e3ed57..df8c0b1 100644 --- a/cuvis/Worker.py +++ b/cuvis/Worker.py @@ -1,7 +1,4 @@ -try: - from cuvis_il import cuvis_il -except: - import cuvis_il +from _cuvis_il import cuvis_il from .Measurement import Measurement from .Viewer import Viewer, ImageData from .cuvis_aux import SDKException diff --git a/cuvis/doc.py b/cuvis/doc.py index 9e11527..9a3cca5 100644 --- a/cuvis/doc.py +++ b/cuvis/doc.py @@ -2,7 +2,7 @@ from typing import Callable, TypeVar, Any, TypeAlias try: - from typing_extensions import ParamSpec + from typing_extensions import ParamSpec # type: ignore except ImportError as exc: from typing import ParamSpec