linting and fix

Author: florian-huber

ms2query/database/ann_index.py

@@ -7,7 +7,7 @@
 import pandas as pd
 from matchms import Spectrum
 from ms2deepscore.models import compute_embedding_array, load_model
-from ms2query.spectral_processing import normalize_spectrum_sum
+from ms2query.data_processing import normalize_spectrum_sum
 from .database_utils import blob_to_ndarray, ndarray_to_blob
 from .spectra_merging import ensure_merged_tables  # schema with precursor_mz + metadata fields
 

ms2query/database/spectra_merging.py

@@ -5,9 +5,9 @@
 import numpy as np
 from matchms import Spectrum
 from matchms.similarity import CosineGreedy
-from ms2query.spectral_processing import cluster_block, get_merged_spectra
-from ms2query.spectral_processing.merging_utils import METADATA_FIELDS_FROM_FIRST, METADATA_FIELDS_SUM
 from tqdm import tqdm
+from ms2query.data_processing import cluster_block, get_merged_spectra
+from ms2query.data_processing.merging_utils import METADATA_FIELDS_FROM_FIRST, METADATA_FIELDS_SUM
 from .database_utils import ndarray_to_blob
 
 

tests/test_merging_utils.py

@@ -2,12 +2,12 @@
 import numpy as np
 import pytest
 from matchms import Spectrum
-from ms2query.spectral_processing.merging_utils import (
+from numpy.testing import assert_allclose
+from ms2query.data_processing.merging_utils import (
     _merge_cluster_to_consensus,
     get_merged_spectra,
     normalize_spectrum_sum,
 )
-from numpy.testing import assert_allclose
 
 
 # ---------- helpers ----------