Feature/refactor importing structure

cuvis/AcquisitionContext.py

@@ -1,9 +1,4 @@
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
+from _cuvis_il import cuvis_il
 from .Async import Async, AsyncMesu
 from .Calibration import Calibration
 from .General import ComponentInfo

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

cuvis/Calibration.py

@@ -1,12 +1,7 @@
 import os
 from pathlib import Path
 
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
+from _cuvis_il import cuvis_il
 from .SessionFile import SessionFile
 from .cuvis_aux import SDKException, Capabilities
 from .cuvis_types import OperationMode

cuvis/Export.py

@@ -1,9 +1,4 @@
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
+from _cuvis_il import cuvis_il
 from .cuvis_aux import SDKException
 
 from .Measurement import Measurement

cuvis/FileWriteSettings.py

@@ -1,9 +1,4 @@
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
+from _cuvis_il import cuvis_il
 from .cuvis_aux import SDKException
 from .cuvis_types import PanSharpeningInterpolationType, \
     PanSharpeningAlgorithm, \

cuvis/General.py

@@ -2,12 +2,7 @@
 import os
 import platform
 
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
+from _cuvis_il import cuvis_il
 from .cuvis_aux import SDKException
 from .cuvis_types import ComponentType
 

cuvis/Measurement.py

@@ -1,12 +1,7 @@
 import datetime
 import os
 
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    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
 

cuvis/ProcessingContext.py

@@ -1,9 +1,4 @@
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
+from _cuvis_il import cuvis_il
 from .Calibration import Calibration
 from .FileWriteSettings import ProcessingArgs
 from .Measurement import Measurement

cuvis/SessionFile.py

@@ -1,12 +1,7 @@
 import os
 from pathlib import Path
 
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    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

cuvis/Viewer.py

@@ -1,9 +1,4 @@
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    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

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

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

cuvis/cuvis_aux.py

@@ -3,13 +3,7 @@
 import datetime
 base_datetime = datetime.datetime(1970, 1, 1)
 
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    import cuvis_il
-
+from _cuvis_il import cuvis_il
 from typing import List, Union
 
 import cuvis.cuvis_types as internal

cuvis/cuvis_types.py

@@ -1,12 +1,7 @@
 import numpy as np
 from enum import Enum
 
-try:
-    from cuvis_il import cuvis_il
-except ImportError as e:
-    if e.msg.startswith('DLL'):
-        raise
-    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 }

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