updated backend compatibility

Author: alexlib

src/pyptv/_backend.py

@@ -10,6 +10,7 @@
 
 import openptv_python
 from openptv_python._native_compat import (
+    HAS_OPTV,
     get_active_engine,
     get_engine_preference,
     get_engine_reason,
@@ -50,13 +51,22 @@ def _to_openptv_name(name: str) -> str:
 # Module imports with compatibility wrapping
 # =============================================================================
 
-from openptv_python.calibration import Calibration
-from openptv_python.parameters import ControlPar as ControlParams
 from openptv_python.parameters import MultimediaPar
-from openptv_python.parameters import SequencePar as SequenceParams
-from openptv_python.parameters import TargetPar as TargetParams
-from openptv_python.parameters import TrackPar as TrackingParams
-from openptv_python.parameters import VolumePar as VolumeParams
+
+if HAS_OPTV:
+    from optv.calibration import Calibration
+    from optv.parameters import ControlParams
+    from optv.parameters import SequenceParams
+    from optv.parameters import TargetParams
+    from optv.parameters import TrackingParams
+    from optv.parameters import VolumeParams
+else:
+    from openptv_python.calibration import Calibration
+    from openptv_python.parameters import ControlPar as ControlParams
+    from openptv_python.parameters import SequencePar as SequenceParams
+    from openptv_python.parameters import TargetPar as TargetParams
+    from openptv_python.parameters import TrackPar as TrackingParams
+    from openptv_python.parameters import VolumePar as VolumeParams
 from openptv_python.image_processing import preprocess_image
 from openptv_python.segmentation import target_recognition
 from openptv_python.correspondences import (
@@ -116,21 +126,31 @@ def get_backend_status() -> str:
 
 def create_control_params(num_cams: int, **kwargs) -> ControlParams:
     """Create ControlParams with backend-appropriate initialization."""
-    cpar = ControlParams(
-        num_cams=num_cams,
-        img_base_name=["" for _ in range(num_cams)],
-        cal_img_base_name=["" for _ in range(num_cams)],
-        mm=MultimediaPar(),
-    )
+    cpar = ControlParams(num_cams)
     for key, value in kwargs.items():
+        if key == "mm" and hasattr(cpar, "get_multimedia_params"):
+            mm = cpar.get_multimedia_params()
+            if mm is not None and isinstance(value, dict):
+                for mm_key, mm_value in value.items():
+                    setter = getattr(mm, f"set_{mm_key}", None)
+                    if callable(setter):
+                        setter(mm_value)
+                    elif hasattr(mm, mm_key):
+                        setattr(mm, mm_key, mm_value)
+            continue
         if hasattr(cpar, key):
             setattr(cpar, key, value)
     return cpar
 
 
 def create_sequence_params(num_cams: int, **kwargs) -> SequenceParams:
     """Create SequenceParams with backend-appropriate initialization."""
-    spar = SequenceParams(img_base_name=["" for _ in range(num_cams)])
+    try:
+        spar = SequenceParams(num_cams=num_cams)
+    except TypeError:
+        spar = SequenceParams()
+        if hasattr(spar, "set_img_base_name"):
+            spar.set_img_base_name(["" for _ in range(num_cams)])
 
     for key, value in kwargs.items():
         if hasattr(spar, key):
@@ -160,10 +180,7 @@ def create_volume_params(**kwargs) -> VolumeParams:
 
 def create_target_params(**kwargs) -> TargetParams:
     """Create TargetParams with backend-appropriate initialization."""
-    if BACKEND == "openptv_python":
-        tpar = TargetParams()
-    else:
-        tpar = TargetParams()
+    tpar = TargetParams()
 
     for key, value in kwargs.items():
         if hasattr(tpar, key):

src/pyptv/ptv.py

@@ -211,12 +211,20 @@ def _populate_spar(seq_params: dict, num_cams: int) -> SequenceParams:
     if len([x for x in base_name_list if x is not None]) < num_cams:
         raise ValueError(f"base_name_list length ({len(base_name_list)}) does not match num_cams ({num_cams})")
 
-    spar = SequenceParams()
+    try:
+        spar = SequenceParams(num_cams=num_cams)
+    except TypeError:
+        spar = SequenceParams()
+        spar.set_img_base_name(["" for _ in range(num_cams)])
     spar.set_first(seq_params['first'])
     spar.set_last(seq_params['last'])
 
     # Set base names for each camera
-    spar.set_img_base_name(base_name_list[:num_cams])
+    try:
+        spar.set_img_base_name(base_name_list[:num_cams])
+    except TypeError:
+        for cam_index, base_name in enumerate(base_name_list[:num_cams]):
+            spar.set_img_base_name(cam_index, base_name)
 
     return spar
 

tests/pyptv/test_populate_parameters.py

@@ -4,7 +4,6 @@
 from unittest.mock import Mock, patch
 import numpy as np
 import shutil
-import filecmp
 
 from pyptv.ptv import (
     _populate_cpar, _populate_spar, _populate_vpar, 
@@ -731,8 +730,10 @@ def test_calibration_round_trip_filecmp(self):
                 np.testing.assert_array_almost_equal(orig_cal.get_affine(), copied_cal.get_affine(), decimal=10)
                 np.testing.assert_array_almost_equal(orig_cal.get_glass_vec(), copied_cal.get_glass_vec(), decimal=10)
 
-                # For addpar files, they should be exactly identical (no floating point calculations)
-                assert filecmp.cmp(input_add_file.decode('utf-8'), output_add_file.decode('utf-8'), shallow=False), \
+                # The native writer omits the final newline; normalize that before comparing bytes.
+                input_add_bytes = Path(input_add_file.decode('utf-8')).read_bytes().rstrip(b"\r\n")
+                output_add_bytes = Path(output_add_file.decode('utf-8')).read_bytes().rstrip(b"\r\n")
+                assert output_add_bytes == input_add_bytes, \
                     f"ADDPAR round-trip failed for {cam_file}.addpar"
 
                 print(f"✓ Round-trip test passed for {cam_file}")