From bfb2d89186073193d55642d4624723ef5765be00 Mon Sep 17 00:00:00 2001
From: MDesktop <146254978+MDesktop@users.noreply.github.com>
Date: Thu, 3 Apr 2025 21:43:38 +0200
Subject: [PATCH 01/18] alligner

---
 src/data/accel/hbk/Accelerometer.py        |   5 +-
 src/data/accel/hbk/alligner.py             | 142 ++++++++++++++++++
 src/experiment_2.py                        |  47 ++++++
 tests/data/accel/hbk/test_accelerometer.py |  14 +-
 tests/data/accel/hbk/test_alligner.py      | 162 +++++++++++++++++++++
 5 files changed, 361 insertions(+), 9 deletions(-)
 create mode 100644 src/data/accel/hbk/alligner.py
 create mode 100644 src/experiment_2.py
 create mode 100644 tests/data/accel/hbk/test_alligner.py

diff --git a/src/data/accel/hbk/Accelerometer.py b/src/data/accel/hbk/Accelerometer.py
index 3cd12bd..3713696 100644
--- a/src/data/accel/hbk/Accelerometer.py
+++ b/src/data/accel/hbk/Accelerometer.py
@@ -58,8 +58,7 @@ def _process_message(self, msg):
         try:
             raw_payload = msg.payload
 
-            # Extract metadata
-            # We know that the first 2 bytes tells the length of the descriptor
+            # The first 2 bytes tells the length of the descriptor
             descriptor_length = struct.unpack("<H", raw_payload[:2])[0]
             (descriptor_length, _, __, ___,
              samples_from_daq_start,) = struct.unpack("<HHQQQ", raw_payload[:descriptor_length])
@@ -70,7 +69,7 @@ def _process_message(self, msg):
             accel_values = struct.unpack(f"<{num_samples}f", data_payload)
 
             # Store each data batch (e.g 32 samples in one message)
-            # in the map where usnig samples_from_daq_start as its the key
+            # in the map samples_from_daq_start is used as the key for each batch
             with self._lock:
                 self.data_map[samples_from_daq_start] = deque(accel_values)
                 # Check if the total samples in the map exceeds the max,
diff --git a/src/data/accel/hbk/alligner.py b/src/data/accel/hbk/alligner.py
new file mode 100644
index 0000000..a9008ae
--- /dev/null
+++ b/src/data/accel/hbk/alligner.py
@@ -0,0 +1,142 @@
+import threading
+import time
+import numpy as np #type: ignore
+
+#project imports
+from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
+from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
+
+
+
+class Alligner:
+    def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.nan):
+        """
+        Initializes the Alligner to receive and align data from multiple MQTT topics.
+
+        Parameters:
+            mqtt_client: MQTT client instance.
+            topics (list): List of MQTT topics (one per channel).
+            map_size (int): Maximum number of stored keys before removing old ones.
+            missing_value (float): Value to use when a sample is missing (default: NaN).
+        """
+        self.mqtt_client = mqtt_client
+        self.topics = topics
+        self.map_size = map_size
+        self.missing_value = missing_value
+
+        self.channels = []
+        self._lock = threading.Lock()
+
+        # Create one Accelerometer per topic
+        for topic in topics:
+            acc = Accelerometer(mqtt_client, topic=topic, map_size=map_size)
+            self.channels.append(acc)
+            mqtt_client.subscribe(topic, qos=1)
+            mqtt_client.message_callback_add(topic, lambda _, __,
+                                              msg, acc=acc: acc._process_message(msg))
+
+
+
+
+    def find_continuous_key_groups(self):
+        """
+        Determines the batch size, finds common keys, and groups them into continuous sequences.
+        Returns:
+            tuple: (batch_size, grouped_keys) or (None, None) if data is insufficient.
+            example of grouped keys: [[96, 128, 160, 192, 224, 256, 288, 320, 352, 384]]
+        """
+        if not self.channels:
+            return None, None
+
+        # Step 1: Determine batch size (By using the length of data samples in first messages, 
+                                # so all messages should contain the same number of data samples)
+        batch_size = None
+        for ch in self.channels:
+            if ch.data_map:
+                first_key = next(iter(ch.data_map))
+                batch_size = len(ch.data_map[first_key])
+                break
+        if batch_size is None:
+            return None, None
+
+        # Step 2: Find common keys across channels
+        key_sets = [set(ch.data_map.keys()) for ch in self.channels]
+        common_keys = sorted(set.intersection(*key_sets))
+
+        # Step 3: Group keys into continuous sequences
+        key_groups = []
+        current_group = []
+
+        for key in common_keys:
+            if not current_group:
+                current_group.append(key)
+            elif key == current_group[-1] + batch_size:
+                current_group.append(key)
+            else:
+                key_groups.append(current_group)
+                current_group = [key]
+        if current_group:
+            key_groups.append(current_group)
+
+        return batch_size, key_groups
+
+
+    def extract(self, requested_samples: int) -> np.ndarray:
+        """
+        Extracts a specified number of aligned samples from all channels.
+
+        This method:
+            1. Uses `find_continuous_key_groups()` to determine batch size and group keys into continuous aligned blocks.
+            2. Searches for the first key group that contains enough samples.
+            3. Collects aligned samples across all channels.
+            4. Cleans up old and used data from each channel's buffer.
+
+        Parameters:
+            requested_samples (int): The total number of samples to extract across all channels.
+
+        Returns:
+            np.ndarray: A 2D NumPy array of shape (channels, requested_samples) containing aligned data.
+                        Returns an empty array if alignment is not possible.
+        """
+        with self._lock:
+            batch_size, key_groups = self.find_continuous_key_groups()
+            print("Keys",key_groups)
+            if batch_size is None or not key_groups:
+                return np.empty((0, len(self.channels)), dtype=np.float32)
+
+            # Pick the first group that gives us enough samples
+            for group in key_groups:
+                total_samples = len(group) * batch_size
+                if total_samples >= requested_samples:
+                    aligned_data = []
+                    samples_collected = 0
+
+                    for key in group:
+                        entries = [list(ch.data_map[key]) for ch in self.channels]
+                        for i in range(batch_size):
+                            if samples_collected >= requested_samples:
+                                break
+                            aligned_data.append([entry[i] for entry in entries])
+                            samples_collected += 1
+                        if samples_collected >= requested_samples:
+                            break
+
+                    # Delete used and older data
+                    for ch in self.channels:
+                        for k in list(ch.data_map.keys()):
+                            if k < group[0]:
+                                del ch.data_map[k]
+                            elif k in group:
+                                for _ in range(min(requested_samples, len(ch.data_map[k]))):
+                                    ch.data_map[k].popleft()
+                                if not ch.data_map[k]:
+                                    del ch.data_map[k]
+
+                    aligned_array = np.array(aligned_data, dtype=np.float32).T
+                    print(f"Aligned shape: {aligned_array.shape}")
+                    return aligned_array
+
+            # No group had enough samples
+            return np.empty((0, len(self.channels)), dtype=np.float32)
+
+
diff --git a/src/experiment_2.py b/src/experiment_2.py
new file mode 100644
index 0000000..3162063
--- /dev/null
+++ b/src/experiment_2.py
@@ -0,0 +1,47 @@
+import time
+import numpy as np # pylint: disable=unused-import
+import uuid
+
+# Project imports
+from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
+from data.accel.hbk.alligner import Alligner  # type: ignore
+
+
+def main():
+    config = load_config("config/r-pi.json")
+    mqtt_config = config["MQTT"]
+
+
+    topic_indexes = [0,1] # Indexes of the topics/channels to allign
+
+    # Resolve topic names from config
+    all_topics = config["MQTT"]["TopicsToSubscribe"]
+    selected_topics = [all_topics[i] for i in topic_indexes]
+
+    mqtt_client, _ = setup_mqtt_client(mqtt_config, topic_index=topic_indexes[0])
+    mqtt_client.connect(mqtt_config["host"], mqtt_config["port"], 60)
+    mqtt_client.loop_start()
+
+    # We might need to give it some time before strating allignment,
+                # so we make sure that there is enough data to allign.
+
+    # pass actual topic as string
+    alligner = Alligner(mqtt_client, topics=selected_topics, map_size=2560)
+
+    while True:
+        time.sleep(5)
+        data = alligner.extract(100)
+        if data.shape[0] == 0:
+            print("Not enough aligned data yet.")
+        else:
+            print(f"Extracted aligned data shape: {data.shape}\n{data}")
+            break
+        time.sleep(1)
+
+
+if __name__ == "__main__":
+    main()
+
+
+
+
diff --git a/tests/data/accel/hbk/test_accelerometer.py b/tests/data/accel/hbk/test_accelerometer.py
index 83745f2..f139da0 100644
--- a/tests/data/accel/hbk/test_accelerometer.py
+++ b/tests/data/accel/hbk/test_accelerometer.py
@@ -21,7 +21,7 @@ def mqtt_client():
 
     client.connect(mqtt_config["host"], mqtt_config["port"], 60)
     client.loop_start()  
-    time.sleep(0.1)  
+    time.sleep(0.5)  
 
     yield client, selected_topic
     client.loop_stop()
@@ -60,6 +60,8 @@ def publish_binary_samples(client, topic, start, end):
         result.wait_for_publish()  
 
 
+
+
 def test_accelerometer_read_in_steps(client_and_topic, accelerometer_instance):
     """
     Test that reading in steps correctly retrieves the oldest samples 
@@ -114,7 +116,7 @@ def test_accelerometer_read_full_fifo(client_and_topic, accelerometer_instance):
     publish_binary_samples(client, topic, 0, 96)
     total_samples = 0
 
-    while total_samples < 96: 
+    while total_samples < 50: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
@@ -170,7 +172,7 @@ def test_accelerometer_read_insufficient_samples(client_and_topic, accelerometer
     publish_binary_samples(client, topic, 0, 64)
     total_samples = 0
 
-    while total_samples < 64: 
+    while total_samples < 50: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
@@ -198,7 +200,7 @@ def test_accelerometer_appending_more_samples_than_max(client_and_topic, acceler
     publish_binary_samples(client, topic, 0, 224)
     total_samples = 0
 
-    while total_samples < 192: 
+    while total_samples < 100: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
@@ -224,9 +226,9 @@ def test_accelerometer_reordering_late_sample(client_and_topic, accelerometer_in
     # Publish middle batch (32–63) AFTER last batch
     publish_binary_samples(client, topic, 32, 64)
 
-    # Wait for all samples to arrive
+    
     total_samples = 0
-    while total_samples < 96:  # Max wait time: 5 seconds
+    while total_samples < 60:  
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
     status, data = accelerometer_instance.read(96)
diff --git a/tests/data/accel/hbk/test_alligner.py b/tests/data/accel/hbk/test_alligner.py
new file mode 100644
index 0000000..e25bdfc
--- /dev/null
+++ b/tests/data/accel/hbk/test_alligner.py
@@ -0,0 +1,162 @@
+import time
+import json
+import pytest
+import struct
+
+import numpy as np
+from data.accel.hbk.alligner import Alligner  # type: ignore
+
+
+from constants import DESCRIPTOR_LENGTH, METADATA_VERSION, SECONDS, NANOSECONDS, BATCH_SIZE
+from data.sources.mqtt import setup_mqtt_client, load_config
+import uuid
+
+
+
+@pytest.fixture(scope="function")
+def mqtt_client_and_config():
+    config = load_config("config/test.json")
+    mqtt_config = config["MQTT"].copy()
+    mqtt_config["ClientID"] = f"test_{uuid.uuid4().hex[:6]}"
+
+    client, _ = setup_mqtt_client(mqtt_config, topic_index=0)
+    client.connect(mqtt_config["host"], mqtt_config["port"], 60)
+    client.loop_start()
+    time.sleep(0.1)
+
+    yield client, mqtt_config
+
+    client.loop_stop()
+    client.disconnect()
+
+
+@pytest.fixture(scope="function")
+def mqtt_setup():
+    config = load_config("config/test.json")
+    mqtt_config = config["MQTT"].copy()
+    mqtt_config["ClientID"] = f"test_{uuid.uuid4().hex[:6]}"
+
+    # Setup MQTT client once
+    client, _ = setup_mqtt_client(mqtt_config, 0)
+    client.connect(mqtt_config["host"], mqtt_config["port"], 60)
+    client.loop_start()
+    time.sleep(0.1)
+
+    # Extract topics manually
+    topics = [
+        config["MQTT"]["TopicsToSubscribe"][0],
+        config["MQTT"]["TopicsToSubscribe"][1],
+        config["MQTT"]["TopicsToSubscribe"][2],
+    ]
+
+    yield client, topics
+
+    client.loop_stop()
+    client.disconnect()
+
+
+def publish_samples(client, topic, values: np.ndarray, start_key: int):
+    """
+    Publishes a list of float values to the given MQTT topic using the expected binary format.
+    Data is split into 32-sample batches (BATCH_SIZE).
+    """
+    for batch_start in range(0, len(values), BATCH_SIZE):
+        batch_end = batch_start + BATCH_SIZE
+        batch_values = values[batch_start:batch_end]
+        data_bytes = b''.join([struct.pack("<f", float(v)) for v in batch_values])
+        descriptor = struct.pack("<H H Q Q Q",
+                                 DESCRIPTOR_LENGTH,
+                                 METADATA_VERSION,
+                                 SECONDS,
+                                 NANOSECONDS,
+                                 start_key + batch_start)
+        payload = descriptor + data_bytes
+        result = client.publish(topic, payload, qos=1)
+        result.wait_for_publish()
+    print(f"[PUBLISH DEBUG] Topic: {topic}, Start key: {start_key}, Batch size: {len(batch_values)}")
+
+
+
+
+
+
+
+
+
+def test_alligner_continuous_block_required(mqtt_setup):
+    client, topics = mqtt_setup
+    alligner = Alligner(client, topics=topics, map_size=512)
+
+    # CH1 and CH2: send full keys
+    for key in [0, 32, 64, 96, 128, 160, 192, 224]:
+        publish_samples(client, topics[0], np.arange(32), start_key=key)
+        publish_samples(client, topics[1], np.arange(32), start_key=key)
+
+    # CH3: skip key 64 to break continuity
+    for key in [0, 32, 96, 128, 160, 192, 224]:
+        publish_samples(client, topics[2], np.arange(32), start_key=key)
+
+    time.sleep(1.5)  # Let messages arrive
+
+    aligned = alligner.extract(128)  # Should use keys 96, 128, 160, 192 (128 samples)
+
+    assert aligned.shape == (3, 128), f"Expected 128 aligned rows, got {aligned.shape}"
+    assert np.allclose(aligned[0, :5], np.arange(5)), "Check data from channel 1"
+    assert np.allclose(aligned[2, :5], np.arange(5)), "Check data from channel 3"
+
+
+# TODO: Check specifc data
+
+
+
+
+def test_alligner_extract_removes_used_and_older_data(mqtt_setup):
+    client, topics = mqtt_setup
+    alligner = Alligner(client, topics=topics, map_size=512)
+
+    # Send 5 batches (160 samples) to all 3 channels
+    for key in [0, 32, 64, 96, 128]:
+        for topic in topics:
+            publish_samples(client, topic, np.arange(32), start_key=key)
+
+    time.sleep(1)
+
+    # Extract 96 samples → should consume keys 0, 32, 64 (96 samples)
+    aligned = alligner.extract(96)
+
+    assert aligned.shape == (3, 96), "Expected 96 aligned samples"
+
+    # Now check the internal maps
+    for i, ch in enumerate(alligner.channels):
+        with ch._lock:
+            remaining_keys = list(ch.data_map.keys())
+            print(f"[DEBUG] Channel {i+1} remaining keys after extract: {remaining_keys}")
+            assert all(k > 64 for k in remaining_keys), \
+                f"Channel {i+1} still contains old data (keys <= 64): {remaining_keys}"
+
+
+
+def test_alligner_single_channel_extract_and_cleanup(mqtt_setup):
+    client, topics = mqtt_setup
+    one_topic = [topics[0]]  # Use only the first topic
+
+    alligner = Alligner(client, topics=one_topic, map_size=512)
+
+    # Publish 128 samples to the single channel (4 batches of 32)
+    for key in [0, 32, 64, 96]:
+        publish_samples(client, topics[0], np.arange(32) + key, start_key=key)
+
+    time.sleep(1)
+
+    # Extract 64 samples from the single channel
+    extracted = alligner.extract(64)
+
+    assert extracted.shape == (1, 64), f"Expected shape (64, 1), got {extracted.shape}"
+    assert np.allclose(extracted.flatten()[:5], [0, 1, 2, 3, 4]), "Unexpected values in extracted data"
+
+    # Ensure keys 0 and 32 were removed, and 64+ remain
+    ch = alligner.channels[0]
+    with ch._lock:
+        remaining_keys = list(ch.data_map.keys())
+        print(f"[DEBUG] Remaining keys in single channel: {remaining_keys}")
+        assert all(k > 32 for k in remaining_keys), f"Expected only keys > 32, but got {remaining_keys}"

From d2375b8d5909b00018dcd9c3869a9c9a25f936c3 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Mon, 7 Apr 2025 12:09:19 +0200
Subject: [PATCH 02/18] Renamed Accelerometer.py to accelerometer.py

---
 src/data/accel/hbk/{Accelerometer.py => accelerometer.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/data/accel/hbk/{Accelerometer.py => accelerometer.py} (100%)

diff --git a/src/data/accel/hbk/Accelerometer.py b/src/data/accel/hbk/accelerometer.py
similarity index 100%
rename from src/data/accel/hbk/Accelerometer.py
rename to src/data/accel/hbk/accelerometer.py

From 2fee41a27f5bcd79883a5dc017b7f4cbf74ac421 Mon Sep 17 00:00:00 2001
From: MDesktop <146254978+MDesktop@users.noreply.github.com>
Date: Wed, 9 Apr 2025 19:52:15 +0200
Subject: [PATCH 03/18] config for tests

---
 .gitignore                               | 1 +
 config/{test.json.template => test.json} | 0
 2 files changed, 1 insertion(+)
 rename config/{test.json.template => test.json} (100%)

diff --git a/.gitignore b/.gitignore
index 63a3ab8..8223b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,4 +175,5 @@ cython_debug/
 
 # Ignore config files with credentials
 config/*.json
+!config/test.json
 !config/*.json.template
diff --git a/config/test.json.template b/config/test.json
similarity index 100%
rename from config/test.json.template
rename to config/test.json

From 1c26acaa224b5326b6f97d7e7584ee5c44d8a697 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Wed, 9 Apr 2025 19:56:15 +0200
Subject: [PATCH 04/18] resolved issues

---
 .pylintrc                                     |  4 +--
 pyproject.toml                                |  3 +-
 src/data/accel/hbk/accelerometer.py           |  9 ++---
 .../accel/hbk/{alligner.py => aligner.py}     | 29 +++++++--------
 src/data/accel/metadata_constants.py          |  2 ++
 src/examples/README.md                        | 35 +++++++++++++++++++
 src/examples/__init__.py                      |  0
 src/examples/example.py                       |  5 +++
 src/{ => examples}/experiment_1.py            |  8 ++---
 src/{ => examples}/experiment_2.py            | 13 +++----
 tests/data/accel/hbk/test_accelerometer.py    |  4 +--
 .../hbk/{test_alligner.py => test_aligner.py} | 24 ++++++-------
 12 files changed, 86 insertions(+), 50 deletions(-)
 rename src/data/accel/hbk/{alligner.py => aligner.py} (87%)
 create mode 100644 src/data/accel/metadata_constants.py
 create mode 100644 src/examples/README.md
 create mode 100644 src/examples/__init__.py
 create mode 100644 src/examples/example.py
 rename src/{ => examples}/experiment_1.py (91%)
 rename src/{ => examples}/experiment_2.py (82%)
 rename tests/data/accel/hbk/{test_alligner.py => test_aligner.py} (87%)

diff --git a/.pylintrc b/.pylintrc
index e545389..599a2bd 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -130,7 +130,7 @@ score=yes
 [REFACTORING]
 
 # Maximum number of nested blocks for function / method body
-max-nested-blocks=5
+max-nested-blocks=7
 
 # Complete name of functions that never returns. When checking for
 # inconsistent-return-statements if a never returning function is called then
@@ -559,7 +559,7 @@ max-attributes=7
 max-bool-expr=5
 
 # Maximum number of branch for function / method body.
-max-branches=12
+max-branches=15
 
 # Maximum number of locals for function / method body.
 max-locals=15
diff --git a/pyproject.toml b/pyproject.toml
index 4d8cae5..1e83aae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,4 +25,5 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.poetry.scripts]
-experiment_1 = "src.experiment_1:main"
\ No newline at end of file
+experiment_1 = "src.examples.experiment_1:main"
+experiment_2 = "src.examples.experiment_2:main"
diff --git a/src/data/accel/hbk/accelerometer.py b/src/data/accel/hbk/accelerometer.py
index 3713696..cba3d40 100644
--- a/src/data/accel/hbk/accelerometer.py
+++ b/src/data/accel/hbk/accelerometer.py
@@ -6,6 +6,8 @@
 # Project Imports
 from data.accel.accelerometer import IAccelerometer
 from data.accel.constants import MAX_MAP_SIZE
+from data.accel.metadata_constants import DESCRIPTOR_LENGTH_BYTES
+
 
 class Accelerometer(IAccelerometer):
     def __init__(
@@ -39,14 +41,14 @@ def _on_message(self, _, __, msg):
 
         def safe_process():  # This ensures that an exception does not crash the entire thread
             try:
-                self._process_message(msg)
+                self.process_message(msg)
             except Exception as e:
                 print(f"Error processing message: {e}")
 
         threading.Thread(target=safe_process, daemon=True).start()
 
 
-    def _process_message(self, msg):
+    def process_message(self, msg):
         """
             Processes incoming MQTT messages, extracts accelerometer data,
             and stores it in a dictionary of FIFO queues.
@@ -58,8 +60,7 @@ def _process_message(self, msg):
         try:
             raw_payload = msg.payload
 
-            # The first 2 bytes tells the length of the descriptor
-            descriptor_length = struct.unpack("<H", raw_payload[:2])[0]
+            descriptor_length = struct.unpack("<H", raw_payload[:DESCRIPTOR_LENGTH_BYTES])[0]
             (descriptor_length, _, __, ___,
              samples_from_daq_start,) = struct.unpack("<HHQQQ", raw_payload[:descriptor_length])
 
diff --git a/src/data/accel/hbk/alligner.py b/src/data/accel/hbk/aligner.py
similarity index 87%
rename from src/data/accel/hbk/alligner.py
rename to src/data/accel/hbk/aligner.py
index a9008ae..fe26356 100644
--- a/src/data/accel/hbk/alligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -1,22 +1,20 @@
 import threading
-import time
 import numpy as np #type: ignore
 
 #project imports
 from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
-from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
 
 
 
-class Alligner:
+class Aligner:
     def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.nan):
         """
-        Initializes the Alligner to receive and align data from multiple MQTT topics.
+        Initializes the Aligner to receive and align data from multiple MQTT topics.
 
         Parameters:
             mqtt_client: MQTT client instance.
             topics (list): List of MQTT topics (one per channel).
-            map_size (int): Maximum number of stored keys before removing old ones.
+            map_size (int): Maximum number of stored keys for each channel.
             missing_value (float): Value to use when a sample is missing (default: NaN).
         """
         self.mqtt_client = mqtt_client
@@ -33,7 +31,7 @@ def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.n
             self.channels.append(acc)
             mqtt_client.subscribe(topic, qos=1)
             mqtt_client.message_callback_add(topic, lambda _, __,
-                                              msg, acc=acc: acc._process_message(msg))
+                                              msg, acc=acc: acc.process_message(msg))
 
 
 
@@ -48,7 +46,7 @@ def find_continuous_key_groups(self):
         if not self.channels:
             return None, None
 
-        # Step 1: Determine batch size (By using the length of data samples in first messages, 
+        # Step 1: Determine batch size (By using the length of data samples in first messages,
                                 # so all messages should contain the same number of data samples)
         batch_size = None
         for ch in self.channels:
@@ -86,7 +84,8 @@ def extract(self, requested_samples: int) -> np.ndarray:
         Extracts a specified number of aligned samples from all channels.
 
         This method:
-            1. Uses `find_continuous_key_groups()` to determine batch size and group keys into continuous aligned blocks.
+            1. Uses `find_continuous_key_groups()` to determine batch size 
+                                    and group keys into continuous aligned blocks.
             2. Searches for the first key group that contains enough samples.
             3. Collects aligned samples across all channels.
             4. Cleans up old and used data from each channel's buffer.
@@ -95,7 +94,8 @@ def extract(self, requested_samples: int) -> np.ndarray:
             requested_samples (int): The total number of samples to extract across all channels.
 
         Returns:
-            np.ndarray: A 2D NumPy array of shape (channels, requested_samples) containing aligned data.
+            np.ndarray: A 2D NumPy array of shape 
+                    (channels, requested_samples) containing aligned data.
                         Returns an empty array if alignment is not possible.
         """
         with self._lock:
@@ -108,7 +108,7 @@ def extract(self, requested_samples: int) -> np.ndarray:
             for group in key_groups:
                 total_samples = len(group) * batch_size
                 if total_samples >= requested_samples:
-                    aligned_data = []
+                    aligned_data = [[] for _ in self.channels]
                     samples_collected = 0
 
                     for key in group:
@@ -116,10 +116,9 @@ def extract(self, requested_samples: int) -> np.ndarray:
                         for i in range(batch_size):
                             if samples_collected >= requested_samples:
                                 break
-                            aligned_data.append([entry[i] for entry in entries])
+                            for ch_idx, channel_data in enumerate(entries):
+                                aligned_data[ch_idx].append(channel_data[i])
                             samples_collected += 1
-                        if samples_collected >= requested_samples:
-                            break
 
                     # Delete used and older data
                     for ch in self.channels:
@@ -132,11 +131,9 @@ def extract(self, requested_samples: int) -> np.ndarray:
                                 if not ch.data_map[k]:
                                     del ch.data_map[k]
 
-                    aligned_array = np.array(aligned_data, dtype=np.float32).T
+                    aligned_array = np.array(aligned_data, dtype=np.float32)
                     print(f"Aligned shape: {aligned_array.shape}")
                     return aligned_array
 
             # No group had enough samples
             return np.empty((0, len(self.channels)), dtype=np.float32)
-
-
diff --git a/src/data/accel/metadata_constants.py b/src/data/accel/metadata_constants.py
new file mode 100644
index 0000000..c087fba
--- /dev/null
+++ b/src/data/accel/metadata_constants.py
@@ -0,0 +1,2 @@
+# In messages received from /data topics. The first 2 bytes tells the length of the descriptor
+DESCRIPTOR_LENGTH_BYTES = 2
diff --git a/src/examples/README.md b/src/examples/README.md
new file mode 100644
index 0000000..0a71c0e
--- /dev/null
+++ b/src/examples/README.md
@@ -0,0 +1,35 @@
+# Examples
+
+This directory contains examples demonstrating how to use the EXAMPLE-SHM package.
+
+## Installing the Package from Poetry Build
+
+To install the package built using `poetry`, follow these steps:
+
+### Step 1: Build the Package
+
+```bash
+poetry build
+```
+
+This will create a .whl file in the dist/ directory, e.g., dist/cp_sens-0.1.0-py3-none-any.whl. 
+
+### Step 2: Create and Activate a Virtual Environment
+
+python -m venv .venv
+source .venv/bin/activate        # On Linux/macOS
+.\.venv\Scripts\Activate.ps1     # On Windows
+
+### Step 3: Install the Built Package
+pip install dist/example_shm-<version>-py3-none-any.whl
+Replace <version> with the version number found in the .whl filename. (e.g 0.1.0)
+
+
+## Running the Example
+
+A simple example is provided to run the main() function from experiment_1.py.
+
+To run this example, use:
+```bash
+python examples/example.py
+```
diff --git a/src/examples/__init__.py b/src/examples/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/examples/example.py b/src/examples/example.py
new file mode 100644
index 0000000..3abdd5f
--- /dev/null
+++ b/src/examples/example.py
@@ -0,0 +1,5 @@
+from experiment_1 import main  # pylint: disable=import-error
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/experiment_1.py b/src/examples/experiment_1.py
similarity index 91%
rename from src/experiment_1.py
rename to src/examples/experiment_1.py
index 2a5da5c..8bc8603 100644
--- a/src/experiment_1.py
+++ b/src/examples/experiment_1.py
@@ -26,7 +26,7 @@ def main():
         accelerometer.data_map.clear()
 
     while True:
-        time.sleep(2.1)
+        time.sleep(1)
 
         with accelerometer.acquire_lock():
             # This print to see the dictionary
@@ -34,10 +34,10 @@ def main():
                 print(f"Key: {key} -> Data: {list(fifo)}\n")
         _, data = accelerometer.read(requested_samples=128)
         print("Data requsted", data)
-        #break
+        break
 
-    #mqtt_client.loop_stop()
-    #print("Data requsted", data)
+    mqtt_client.loop_stop()
+    print("Data requsted", data)
 
 
 if __name__ == '__main__':
diff --git a/src/experiment_2.py b/src/examples/experiment_2.py
similarity index 82%
rename from src/experiment_2.py
rename to src/examples/experiment_2.py
index 3162063..dfe5266 100644
--- a/src/experiment_2.py
+++ b/src/examples/experiment_2.py
@@ -1,14 +1,13 @@
 import time
 import numpy as np # pylint: disable=unused-import
-import uuid
 
 # Project imports
 from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
-from data.accel.hbk.alligner import Alligner  # type: ignore
+from data.accel.hbk.aligner import Aligner  # type: ignore
 
 
 def main():
-    config = load_config("config/r-pi.json")
+    config = load_config("config/production.json")
     mqtt_config = config["MQTT"]
 
 
@@ -26,11 +25,11 @@ def main():
                 # so we make sure that there is enough data to allign.
 
     # pass actual topic as string
-    alligner = Alligner(mqtt_client, topics=selected_topics, map_size=2560)
+    aligner = Aligner(mqtt_client, topics=selected_topics, map_size=2560)
 
     while True:
         time.sleep(5)
-        data = alligner.extract(100)
+        data = aligner.extract(16)
         if data.shape[0] == 0:
             print("Not enough aligned data yet.")
         else:
@@ -41,7 +40,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-
-
-
diff --git a/tests/data/accel/hbk/test_accelerometer.py b/tests/data/accel/hbk/test_accelerometer.py
index f139da0..6f3d05b 100644
--- a/tests/data/accel/hbk/test_accelerometer.py
+++ b/tests/data/accel/hbk/test_accelerometer.py
@@ -116,7 +116,7 @@ def test_accelerometer_read_full_fifo(client_and_topic, accelerometer_instance):
     publish_binary_samples(client, topic, 0, 96)
     total_samples = 0
 
-    while total_samples < 50: 
+    while total_samples < 60: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
@@ -144,7 +144,7 @@ def test_accelerometer_read_partial_fifo(client_and_topic, accelerometer_instanc
     publish_binary_samples(client, topic, 0, 64)
     total_samples = 0
 
-    while total_samples < 64: 
+    while total_samples < 60: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
diff --git a/tests/data/accel/hbk/test_alligner.py b/tests/data/accel/hbk/test_aligner.py
similarity index 87%
rename from tests/data/accel/hbk/test_alligner.py
rename to tests/data/accel/hbk/test_aligner.py
index e25bdfc..931222c 100644
--- a/tests/data/accel/hbk/test_alligner.py
+++ b/tests/data/accel/hbk/test_aligner.py
@@ -4,7 +4,7 @@
 import struct
 
 import numpy as np
-from data.accel.hbk.alligner import Alligner  # type: ignore
+from data.accel.hbk.aligner import Aligner  # type: ignore
 
 
 from constants import DESCRIPTOR_LENGTH, METADATA_VERSION, SECONDS, NANOSECONDS, BATCH_SIZE
@@ -83,9 +83,9 @@ def publish_samples(client, topic, values: np.ndarray, start_key: int):
 
 
 
-def test_alligner_continuous_block_required(mqtt_setup):
+def test_aligner_continuous_block_required(mqtt_setup):
     client, topics = mqtt_setup
-    alligner = Alligner(client, topics=topics, map_size=512)
+    aligner = Aligner(client, topics=topics, map_size=512)
 
     # CH1 and CH2: send full keys
     for key in [0, 32, 64, 96, 128, 160, 192, 224]:
@@ -98,7 +98,7 @@ def test_alligner_continuous_block_required(mqtt_setup):
 
     time.sleep(1.5)  # Let messages arrive
 
-    aligned = alligner.extract(128)  # Should use keys 96, 128, 160, 192 (128 samples)
+    aligned = aligner.extract(128)  # Should use keys 96, 128, 160, 192 (128 samples)
 
     assert aligned.shape == (3, 128), f"Expected 128 aligned rows, got {aligned.shape}"
     assert np.allclose(aligned[0, :5], np.arange(5)), "Check data from channel 1"
@@ -110,9 +110,9 @@ def test_alligner_continuous_block_required(mqtt_setup):
 
 
 
-def test_alligner_extract_removes_used_and_older_data(mqtt_setup):
+def test_aligner_extract_removes_used_and_older_data(mqtt_setup):
     client, topics = mqtt_setup
-    alligner = Alligner(client, topics=topics, map_size=512)
+    aligner = Aligner(client, topics=topics, map_size=512)
 
     # Send 5 batches (160 samples) to all 3 channels
     for key in [0, 32, 64, 96, 128]:
@@ -122,12 +122,12 @@ def test_alligner_extract_removes_used_and_older_data(mqtt_setup):
     time.sleep(1)
 
     # Extract 96 samples → should consume keys 0, 32, 64 (96 samples)
-    aligned = alligner.extract(96)
+    aligned = aligner.extract(96)
 
     assert aligned.shape == (3, 96), "Expected 96 aligned samples"
 
     # Now check the internal maps
-    for i, ch in enumerate(alligner.channels):
+    for i, ch in enumerate(aligner.channels):
         with ch._lock:
             remaining_keys = list(ch.data_map.keys())
             print(f"[DEBUG] Channel {i+1} remaining keys after extract: {remaining_keys}")
@@ -136,11 +136,11 @@ def test_alligner_extract_removes_used_and_older_data(mqtt_setup):
 
 
 
-def test_alligner_single_channel_extract_and_cleanup(mqtt_setup):
+def test_aligner_single_channel_extract_and_cleanup(mqtt_setup):
     client, topics = mqtt_setup
     one_topic = [topics[0]]  # Use only the first topic
 
-    alligner = Alligner(client, topics=one_topic, map_size=512)
+    aligner = Aligner(client, topics=one_topic, map_size=512)
 
     # Publish 128 samples to the single channel (4 batches of 32)
     for key in [0, 32, 64, 96]:
@@ -149,13 +149,13 @@ def test_alligner_single_channel_extract_and_cleanup(mqtt_setup):
     time.sleep(1)
 
     # Extract 64 samples from the single channel
-    extracted = alligner.extract(64)
+    extracted = aligner.extract(64)
 
     assert extracted.shape == (1, 64), f"Expected shape (64, 1), got {extracted.shape}"
     assert np.allclose(extracted.flatten()[:5], [0, 1, 2, 3, 4]), "Unexpected values in extracted data"
 
     # Ensure keys 0 and 32 were removed, and 64+ remain
-    ch = alligner.channels[0]
+    ch = aligner.channels[0]
     with ch._lock:
         remaining_keys = list(ch.data_map.keys())
         print(f"[DEBUG] Remaining keys in single channel: {remaining_keys}")

From 34bec5a41918ec1924d67d139669d8a22fa1cfe8 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Thu, 10 Apr 2025 14:17:47 +0200
Subject: [PATCH 05/18] deque trimming

---
 .pylintrc                           |  2 +-
 config/test.json                    |  3 ++-
 src/data/accel/hbk/accelerometer.py | 13 ++++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 599a2bd..cbf727b 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -562,7 +562,7 @@ max-bool-expr=5
 max-branches=15
 
 # Maximum number of locals for function / method body.
-max-locals=15
+max-locals=20
 
 # Maximum number of parents for a class (see R0901).
 max-parents=7
diff --git a/config/test.json b/config/test.json
index 8177337..372afa3 100644
--- a/config/test.json
+++ b/config/test.json
@@ -1,6 +1,6 @@
 {
     "MQTT": {
-        "host": "test.mosquitto.org",
+        "host": "mqtt.eclipseprojects.io",
         "port": 1883,
         "userId": "",
         "password": "",
@@ -9,3 +9,4 @@
         "TopicsToSubscribe": ["topicAA", "topicBB", "topicCC"]
     }
 }
+
diff --git a/src/data/accel/hbk/accelerometer.py b/src/data/accel/hbk/accelerometer.py
index cba3d40..c243db9 100644
--- a/src/data/accel/hbk/accelerometer.py
+++ b/src/data/accel/hbk/accelerometer.py
@@ -72,12 +72,19 @@ def process_message(self, msg):
             # Store each data batch (e.g 32 samples in one message)
             # in the map samples_from_daq_start is used as the key for each batch
             with self._lock:
-                self.data_map[samples_from_daq_start] = deque(accel_values)
+                if samples_from_daq_start not in self.data_map:
+                    self.data_map[samples_from_daq_start] = deque(accel_values)
+
+                total_samples = sum(len(dq) for dq in self.data_map.values())
                 # Check if the total samples in the map exceeds the max,
                 # then remove the oldest data batch
-                while sum(len(deque) for deque in self.data_map.values()) > self._map_size:
+                while total_samples > self._map_size:
                     oldest_key = min(self.data_map.keys())  # Find the oldest batch
-                    del self.data_map[oldest_key]  # Remove oldest batch
+                    oldest_deque = self.data_map[oldest_key]
+                    oldest_deque.popleft() # Delete samples from the oldest deque
+                    if not oldest_deque:  # Remove the key/deque from the map if it's empty
+                        del self.data_map[oldest_key]
+                    total_samples = sum(len(dq) for dq in self.data_map.values())
             print(f" Channel: {self.topic}  Key: {samples_from_daq_start}, Samples: {num_samples}")
 
         except Exception as e:

From cce4d376eee5651c2530b9a5d3ede5906ada1411 Mon Sep 17 00:00:00 2001
From: prasadtalasila <prasadtalasila@users.noreply.github.com>
Date: Sat, 12 Apr 2025 22:17:32 +0200
Subject: [PATCH 06/18] Fixes minor issues

---
 poetry.lock                  | 1019 +++++++++++-----------------------
 pyproject.toml               |    4 +-
 src/examples/experiment_1.py |   20 +-
 src/examples/experiment_2.py |    7 +-
 4 files changed, 348 insertions(+), 702 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e6bea62..57908ab 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,27 +1,15 @@
 # This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
 
-[[package]]
-name = "annotated-types"
-version = "0.7.0"
-description = "Reusable constraint types to use with typing.Annotated"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53"},
-    {file = "annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"},
-]
-
 [[package]]
 name = "astroid"
-version = "3.3.8"
+version = "3.3.9"
 description = "An abstract syntax tree for Python with inference support."
 optional = false
 python-versions = ">=3.9.0"
 groups = ["dev"]
 files = [
-    {file = "astroid-3.3.8-py3-none-any.whl", hash = "sha256:187ccc0c248bfbba564826c26f070494f7bc964fd286b6d9fff4420e55de828c"},
-    {file = "astroid-3.3.8.tar.gz", hash = "sha256:a88c7994f914a4ea8572fac479459f4955eeccc877be3f2d959a33273b0cf40b"},
+    {file = "astroid-3.3.9-py3-none-any.whl", hash = "sha256:d05bfd0acba96a7bd43e222828b7d9bc1e138aaeb0649707908d3702a9831248"},
+    {file = "astroid-3.3.9.tar.gz", hash = "sha256:622cc8e3048684aa42c820d9d218978021c3c3d174fb03a9f0d615921744f550"},
 ]
 
 [package.dependencies]
@@ -33,12 +21,12 @@ version = "0.4.6"
 description = "Cross-platform colored terminal text."
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-groups = ["main", "dev"]
+groups = ["dev"]
+markers = "sys_platform == \"win32\""
 files = [
     {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
-markers = {main = "platform_system == \"Windows\"", dev = "sys_platform == \"win32\""}
 
 [[package]]
 name = "contourpy"
@@ -116,75 +104,75 @@ test-no-images = ["pytest", "pytest-cov", "pytest-rerunfailures", "pytest-xdist"
 
 [[package]]
 name = "coverage"
-version = "7.6.12"
+version = "7.8.0"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "coverage-7.6.12-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:704c8c8c6ce6569286ae9622e534b4f5b9759b6f2cd643f1c1a61f666d534fe8"},
-    {file = "coverage-7.6.12-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ad7525bf0241e5502168ae9c643a2f6c219fa0a283001cee4cf23a9b7da75879"},
-    {file = "coverage-7.6.12-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:06097c7abfa611c91edb9e6920264e5be1d6ceb374efb4986f38b09eed4cb2fe"},
-    {file = "coverage-7.6.12-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:220fa6c0ad7d9caef57f2c8771918324563ef0d8272c94974717c3909664e674"},
-    {file = "coverage-7.6.12-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3688b99604a24492bcfe1c106278c45586eb819bf66a654d8a9a1433022fb2eb"},
-    {file = "coverage-7.6.12-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d1a987778b9c71da2fc8948e6f2656da6ef68f59298b7e9786849634c35d2c3c"},
-    {file = "coverage-7.6.12-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:cec6b9ce3bd2b7853d4a4563801292bfee40b030c05a3d29555fd2a8ee9bd68c"},
-    {file = "coverage-7.6.12-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ace9048de91293e467b44bce0f0381345078389814ff6e18dbac8fdbf896360e"},
-    {file = "coverage-7.6.12-cp310-cp310-win32.whl", hash = "sha256:ea31689f05043d520113e0552f039603c4dd71fa4c287b64cb3606140c66f425"},
-    {file = "coverage-7.6.12-cp310-cp310-win_amd64.whl", hash = "sha256:676f92141e3c5492d2a1596d52287d0d963df21bf5e55c8b03075a60e1ddf8aa"},
-    {file = "coverage-7.6.12-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e18aafdfb3e9ec0d261c942d35bd7c28d031c5855dadb491d2723ba54f4c3015"},
-    {file = "coverage-7.6.12-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:66fe626fd7aa5982cdebad23e49e78ef7dbb3e3c2a5960a2b53632f1f703ea45"},
-    {file = "coverage-7.6.12-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ef01d70198431719af0b1f5dcbefc557d44a190e749004042927b2a3fed0702"},
-    {file = "coverage-7.6.12-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07e92ae5a289a4bc4c0aae710c0948d3c7892e20fd3588224ebe242039573bf0"},
-    {file = "coverage-7.6.12-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e695df2c58ce526eeab11a2e915448d3eb76f75dffe338ea613c1201b33bab2f"},
-    {file = "coverage-7.6.12-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d74c08e9aaef995f8c4ef6d202dbd219c318450fe2a76da624f2ebb9c8ec5d9f"},
-    {file = "coverage-7.6.12-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e995b3b76ccedc27fe4f477b349b7d64597e53a43fc2961db9d3fbace085d69d"},
-    {file = "coverage-7.6.12-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b1f097878d74fe51e1ddd1be62d8e3682748875b461232cf4b52ddc6e6db0bba"},
-    {file = "coverage-7.6.12-cp311-cp311-win32.whl", hash = "sha256:1f7ffa05da41754e20512202c866d0ebfc440bba3b0ed15133070e20bf5aeb5f"},
-    {file = "coverage-7.6.12-cp311-cp311-win_amd64.whl", hash = "sha256:e216c5c45f89ef8971373fd1c5d8d1164b81f7f5f06bbf23c37e7908d19e8558"},
-    {file = "coverage-7.6.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b172f8e030e8ef247b3104902cc671e20df80163b60a203653150d2fc204d1ad"},
-    {file = "coverage-7.6.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:641dfe0ab73deb7069fb972d4d9725bf11c239c309ce694dd50b1473c0f641c3"},
-    {file = "coverage-7.6.12-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e549f54ac5f301e8e04c569dfdb907f7be71b06b88b5063ce9d6953d2d58574"},
-    {file = "coverage-7.6.12-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:959244a17184515f8c52dcb65fb662808767c0bd233c1d8a166e7cf74c9ea985"},
-    {file = "coverage-7.6.12-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bda1c5f347550c359f841d6614fb8ca42ae5cb0b74d39f8a1e204815ebe25750"},
-    {file = "coverage-7.6.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1ceeb90c3eda1f2d8c4c578c14167dbd8c674ecd7d38e45647543f19839dd6ea"},
-    {file = "coverage-7.6.12-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0f16f44025c06792e0fb09571ae454bcc7a3ec75eeb3c36b025eccf501b1a4c3"},
-    {file = "coverage-7.6.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b076e625396e787448d27a411aefff867db2bffac8ed04e8f7056b07024eed5a"},
-    {file = "coverage-7.6.12-cp312-cp312-win32.whl", hash = "sha256:00b2086892cf06c7c2d74983c9595dc511acca00665480b3ddff749ec4fb2a95"},
-    {file = "coverage-7.6.12-cp312-cp312-win_amd64.whl", hash = "sha256:7ae6eabf519bc7871ce117fb18bf14e0e343eeb96c377667e3e5dd12095e0288"},
-    {file = "coverage-7.6.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:488c27b3db0ebee97a830e6b5a3ea930c4a6e2c07f27a5e67e1b3532e76b9ef1"},
-    {file = "coverage-7.6.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d1095bbee1851269f79fd8e0c9b5544e4c00c0c24965e66d8cba2eb5bb535fd"},
-    {file = "coverage-7.6.12-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0533adc29adf6a69c1baa88c3d7dbcaadcffa21afbed3ca7a225a440e4744bf9"},
-    {file = "coverage-7.6.12-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:53c56358d470fa507a2b6e67a68fd002364d23c83741dbc4c2e0680d80ca227e"},
-    {file = "coverage-7.6.12-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64cbb1a3027c79ca6310bf101014614f6e6e18c226474606cf725238cf5bc2d4"},
-    {file = "coverage-7.6.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:79cac3390bfa9836bb795be377395f28410811c9066bc4eefd8015258a7578c6"},
-    {file = "coverage-7.6.12-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:9b148068e881faa26d878ff63e79650e208e95cf1c22bd3f77c3ca7b1d9821a3"},
-    {file = "coverage-7.6.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8bec2ac5da793c2685ce5319ca9bcf4eee683b8a1679051f8e6ec04c4f2fd7dc"},
-    {file = "coverage-7.6.12-cp313-cp313-win32.whl", hash = "sha256:200e10beb6ddd7c3ded322a4186313d5ca9e63e33d8fab4faa67ef46d3460af3"},
-    {file = "coverage-7.6.12-cp313-cp313-win_amd64.whl", hash = "sha256:2b996819ced9f7dbb812c701485d58f261bef08f9b85304d41219b1496b591ef"},
-    {file = "coverage-7.6.12-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:299cf973a7abff87a30609879c10df0b3bfc33d021e1adabc29138a48888841e"},
-    {file = "coverage-7.6.12-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4b467a8c56974bf06e543e69ad803c6865249d7a5ccf6980457ed2bc50312703"},
-    {file = "coverage-7.6.12-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2458f275944db8129f95d91aee32c828a408481ecde3b30af31d552c2ce284a0"},
-    {file = "coverage-7.6.12-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a9d8be07fb0832636a0f72b80d2a652fe665e80e720301fb22b191c3434d924"},
-    {file = "coverage-7.6.12-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14d47376a4f445e9743f6c83291e60adb1b127607a3618e3185bbc8091f0467b"},
-    {file = "coverage-7.6.12-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:b95574d06aa9d2bd6e5cc35a5bbe35696342c96760b69dc4287dbd5abd4ad51d"},
-    {file = "coverage-7.6.12-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:ecea0c38c9079570163d663c0433a9af4094a60aafdca491c6a3d248c7432827"},
-    {file = "coverage-7.6.12-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2251fabcfee0a55a8578a9d29cecfee5f2de02f11530e7d5c5a05859aa85aee9"},
-    {file = "coverage-7.6.12-cp313-cp313t-win32.whl", hash = "sha256:eb5507795caabd9b2ae3f1adc95f67b1104971c22c624bb354232d65c4fc90b3"},
-    {file = "coverage-7.6.12-cp313-cp313t-win_amd64.whl", hash = "sha256:f60a297c3987c6c02ffb29effc70eadcbb412fe76947d394a1091a3615948e2f"},
-    {file = "coverage-7.6.12-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e7575ab65ca8399c8c4f9a7d61bbd2d204c8b8e447aab9d355682205c9dd948d"},
-    {file = "coverage-7.6.12-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8161d9fbc7e9fe2326de89cd0abb9f3599bccc1287db0aba285cb68d204ce929"},
-    {file = "coverage-7.6.12-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a1e465f398c713f1b212400b4e79a09829cd42aebd360362cd89c5bdc44eb87"},
-    {file = "coverage-7.6.12-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f25d8b92a4e31ff1bd873654ec367ae811b3a943583e05432ea29264782dc32c"},
-    {file = "coverage-7.6.12-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a936309a65cc5ca80fa9f20a442ff9e2d06927ec9a4f54bcba9c14c066323f2"},
-    {file = "coverage-7.6.12-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:aa6f302a3a0b5f240ee201297fff0bbfe2fa0d415a94aeb257d8b461032389bd"},
-    {file = "coverage-7.6.12-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:f973643ef532d4f9be71dd88cf7588936685fdb576d93a79fe9f65bc337d9d73"},
-    {file = "coverage-7.6.12-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:78f5243bb6b1060aed6213d5107744c19f9571ec76d54c99cc15938eb69e0e86"},
-    {file = "coverage-7.6.12-cp39-cp39-win32.whl", hash = "sha256:69e62c5034291c845fc4df7f8155e8544178b6c774f97a99e2734b05eb5bed31"},
-    {file = "coverage-7.6.12-cp39-cp39-win_amd64.whl", hash = "sha256:b01a840ecc25dce235ae4c1b6a0daefb2a203dba0e6e980637ee9c2f6ee0df57"},
-    {file = "coverage-7.6.12-pp39.pp310-none-any.whl", hash = "sha256:7e39e845c4d764208e7b8f6a21c541ade741e2c41afabdfa1caa28687a3c98cf"},
-    {file = "coverage-7.6.12-py3-none-any.whl", hash = "sha256:eb8668cfbc279a536c633137deeb9435d2962caec279c3f8cf8b91fff6ff8953"},
-    {file = "coverage-7.6.12.tar.gz", hash = "sha256:48cfc4641d95d34766ad41d9573cc0f22a48aa88d22657a1fe01dca0dbae4de2"},
+    {file = "coverage-7.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2931f66991175369859b5fd58529cd4b73582461877ecfd859b6549869287ffe"},
+    {file = "coverage-7.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:52a523153c568d2c0ef8826f6cc23031dc86cffb8c6aeab92c4ff776e7951b28"},
+    {file = "coverage-7.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c8a5c139aae4c35cbd7cadca1df02ea8cf28a911534fc1b0456acb0b14234f3"},
+    {file = "coverage-7.8.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a26c0c795c3e0b63ec7da6efded5f0bc856d7c0b24b2ac84b4d1d7bc578d676"},
+    {file = "coverage-7.8.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:821f7bcbaa84318287115d54becb1915eece6918136c6f91045bb84e2f88739d"},
+    {file = "coverage-7.8.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a321c61477ff8ee705b8a5fed370b5710c56b3a52d17b983d9215861e37b642a"},
+    {file = "coverage-7.8.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:ed2144b8a78f9d94d9515963ed273d620e07846acd5d4b0a642d4849e8d91a0c"},
+    {file = "coverage-7.8.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:042e7841a26498fff7a37d6fda770d17519982f5b7d8bf5278d140b67b61095f"},
+    {file = "coverage-7.8.0-cp310-cp310-win32.whl", hash = "sha256:f9983d01d7705b2d1f7a95e10bbe4091fabc03a46881a256c2787637b087003f"},
+    {file = "coverage-7.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:5a570cd9bd20b85d1a0d7b009aaf6c110b52b5755c17be6962f8ccd65d1dbd23"},
+    {file = "coverage-7.8.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e7ac22a0bb2c7c49f441f7a6d46c9c80d96e56f5a8bc6972529ed43c8b694e27"},
+    {file = "coverage-7.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bf13d564d310c156d1c8e53877baf2993fb3073b2fc9f69790ca6a732eb4bfea"},
+    {file = "coverage-7.8.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5761c70c017c1b0d21b0815a920ffb94a670c8d5d409d9b38857874c21f70d7"},
+    {file = "coverage-7.8.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e5ff52d790c7e1628241ffbcaeb33e07d14b007b6eb00a19320c7b8a7024c040"},
+    {file = "coverage-7.8.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d39fc4817fd67b3915256af5dda75fd4ee10621a3d484524487e33416c6f3543"},
+    {file = "coverage-7.8.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:b44674870709017e4b4036e3d0d6c17f06a0e6d4436422e0ad29b882c40697d2"},
+    {file = "coverage-7.8.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8f99eb72bf27cbb167b636eb1726f590c00e1ad375002230607a844d9e9a2318"},
+    {file = "coverage-7.8.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b571bf5341ba8c6bc02e0baeaf3b061ab993bf372d982ae509807e7f112554e9"},
+    {file = "coverage-7.8.0-cp311-cp311-win32.whl", hash = "sha256:e75a2ad7b647fd8046d58c3132d7eaf31b12d8a53c0e4b21fa9c4d23d6ee6d3c"},
+    {file = "coverage-7.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:3043ba1c88b2139126fc72cb48574b90e2e0546d4c78b5299317f61b7f718b78"},
+    {file = "coverage-7.8.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:bbb5cc845a0292e0c520656d19d7ce40e18d0e19b22cb3e0409135a575bf79fc"},
+    {file = "coverage-7.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:4dfd9a93db9e78666d178d4f08a5408aa3f2474ad4d0e0378ed5f2ef71640cb6"},
+    {file = "coverage-7.8.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f017a61399f13aa6d1039f75cd467be388d157cd81f1a119b9d9a68ba6f2830d"},
+    {file = "coverage-7.8.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0915742f4c82208ebf47a2b154a5334155ed9ef9fe6190674b8a46c2fb89cb05"},
+    {file = "coverage-7.8.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a40fcf208e021eb14b0fac6bdb045c0e0cab53105f93ba0d03fd934c956143a"},
+    {file = "coverage-7.8.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a1f406a8e0995d654b2ad87c62caf6befa767885301f3b8f6f73e6f3c31ec3a6"},
+    {file = "coverage-7.8.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:77af0f6447a582fdc7de5e06fa3757a3ef87769fbb0fdbdeba78c23049140a47"},
+    {file = "coverage-7.8.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f2d32f95922927186c6dbc8bc60df0d186b6edb828d299ab10898ef3f40052fe"},
+    {file = "coverage-7.8.0-cp312-cp312-win32.whl", hash = "sha256:769773614e676f9d8e8a0980dd7740f09a6ea386d0f383db6821df07d0f08545"},
+    {file = "coverage-7.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:e5d2b9be5b0693cf21eb4ce0ec8d211efb43966f6657807f6859aab3814f946b"},
+    {file = "coverage-7.8.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5ac46d0c2dd5820ce93943a501ac5f6548ea81594777ca585bf002aa8854cacd"},
+    {file = "coverage-7.8.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:771eb7587a0563ca5bb6f622b9ed7f9d07bd08900f7589b4febff05f469bea00"},
+    {file = "coverage-7.8.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42421e04069fb2cbcbca5a696c4050b84a43b05392679d4068acbe65449b5c64"},
+    {file = "coverage-7.8.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:554fec1199d93ab30adaa751db68acec2b41c5602ac944bb19187cb9a41a8067"},
+    {file = "coverage-7.8.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aaeb00761f985007b38cf463b1d160a14a22c34eb3f6a39d9ad6fc27cb73008"},
+    {file = "coverage-7.8.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:581a40c7b94921fffd6457ffe532259813fc68eb2bdda60fa8cc343414ce3733"},
+    {file = "coverage-7.8.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:f319bae0321bc838e205bf9e5bc28f0a3165f30c203b610f17ab5552cff90323"},
+    {file = "coverage-7.8.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:04bfec25a8ef1c5f41f5e7e5c842f6b615599ca8ba8391ec33a9290d9d2db3a3"},
+    {file = "coverage-7.8.0-cp313-cp313-win32.whl", hash = "sha256:dd19608788b50eed889e13a5d71d832edc34fc9dfce606f66e8f9f917eef910d"},
+    {file = "coverage-7.8.0-cp313-cp313-win_amd64.whl", hash = "sha256:a9abbccd778d98e9c7e85038e35e91e67f5b520776781d9a1e2ee9d400869487"},
+    {file = "coverage-7.8.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:18c5ae6d061ad5b3e7eef4363fb27a0576012a7447af48be6c75b88494c6cf25"},
+    {file = "coverage-7.8.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:95aa6ae391a22bbbce1b77ddac846c98c5473de0372ba5c463480043a07bff42"},
+    {file = "coverage-7.8.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e013b07ba1c748dacc2a80e69a46286ff145935f260eb8c72df7185bf048f502"},
+    {file = "coverage-7.8.0-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d766a4f0e5aa1ba056ec3496243150698dc0481902e2b8559314368717be82b1"},
+    {file = "coverage-7.8.0-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad80e6b4a0c3cb6f10f29ae4c60e991f424e6b14219d46f1e7d442b938ee68a4"},
+    {file = "coverage-7.8.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:b87eb6fc9e1bb8f98892a2458781348fa37e6925f35bb6ceb9d4afd54ba36c73"},
+    {file = "coverage-7.8.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:d1ba00ae33be84066cfbe7361d4e04dec78445b2b88bdb734d0d1cbab916025a"},
+    {file = "coverage-7.8.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f3c38e4e5ccbdc9198aecc766cedbb134b2d89bf64533973678dfcf07effd883"},
+    {file = "coverage-7.8.0-cp313-cp313t-win32.whl", hash = "sha256:379fe315e206b14e21db5240f89dc0774bdd3e25c3c58c2c733c99eca96f1ada"},
+    {file = "coverage-7.8.0-cp313-cp313t-win_amd64.whl", hash = "sha256:2e4b6b87bb0c846a9315e3ab4be2d52fac905100565f4b92f02c445c8799e257"},
+    {file = "coverage-7.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fa260de59dfb143af06dcf30c2be0b200bed2a73737a8a59248fcb9fa601ef0f"},
+    {file = "coverage-7.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:96121edfa4c2dfdda409877ea8608dd01de816a4dc4a0523356067b305e4e17a"},
+    {file = "coverage-7.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b8af63b9afa1031c0ef05b217faa598f3069148eeee6bb24b79da9012423b82"},
+    {file = "coverage-7.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:89b1f4af0d4afe495cd4787a68e00f30f1d15939f550e869de90a86efa7e0814"},
+    {file = "coverage-7.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94ec0be97723ae72d63d3aa41961a0b9a6f5a53ff599813c324548d18e3b9e8c"},
+    {file = "coverage-7.8.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:8a1d96e780bdb2d0cbb297325711701f7c0b6f89199a57f2049e90064c29f6bd"},
+    {file = "coverage-7.8.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:f1d8a2a57b47142b10374902777e798784abf400a004b14f1b0b9eaf1e528ba4"},
+    {file = "coverage-7.8.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:cf60dd2696b457b710dd40bf17ad269d5f5457b96442f7f85722bdb16fa6c899"},
+    {file = "coverage-7.8.0-cp39-cp39-win32.whl", hash = "sha256:be945402e03de47ba1872cd5236395e0f4ad635526185a930735f66710e1bd3f"},
+    {file = "coverage-7.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:90e7fbc6216ecaffa5a880cdc9c77b7418c1dcb166166b78dbc630d07f278cc3"},
+    {file = "coverage-7.8.0-pp39.pp310.pp311-none-any.whl", hash = "sha256:b8194fb8e50d556d5849753de991d390c5a1edeeba50f68e3a9253fbd8bf8ccd"},
+    {file = "coverage-7.8.0-py3-none-any.whl", hash = "sha256:dbf364b4c5e7bae9250528167dfe40219b62e2d573c854d74be213e1e52069f7"},
+    {file = "coverage-7.8.0.tar.gz", hash = "sha256:7a3d62b3b03b4b6fd41a085f3574874cf946cb4604d2b4d3e8dca8cd570ca501"},
 ]
 
 [package.dependencies]
@@ -243,62 +231,62 @@ test = ["pytest (>=6)"]
 
 [[package]]
 name = "fonttools"
-version = "4.55.3"
+version = "4.57.0"
 description = "Tools to manipulate font files"
 optional = false
 python-versions = ">=3.8"
 groups = ["main"]
 files = [
-    {file = "fonttools-4.55.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1dcc07934a2165ccdc3a5a608db56fb3c24b609658a5b340aee4ecf3ba679dc0"},
-    {file = "fonttools-4.55.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f7d66c15ba875432a2d2fb419523f5d3d347f91f48f57b8b08a2dfc3c39b8a3f"},
-    {file = "fonttools-4.55.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27e4ae3592e62eba83cd2c4ccd9462dcfa603ff78e09110680a5444c6925d841"},
-    {file = "fonttools-4.55.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62d65a3022c35e404d19ca14f291c89cc5890032ff04f6c17af0bd1927299674"},
-    {file = "fonttools-4.55.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d342e88764fb201286d185093781bf6628bbe380a913c24adf772d901baa8276"},
-    {file = "fonttools-4.55.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:dd68c87a2bfe37c5b33bcda0fba39b65a353876d3b9006fde3adae31f97b3ef5"},
-    {file = "fonttools-4.55.3-cp310-cp310-win32.whl", hash = "sha256:1bc7ad24ff98846282eef1cbeac05d013c2154f977a79886bb943015d2b1b261"},
-    {file = "fonttools-4.55.3-cp310-cp310-win_amd64.whl", hash = "sha256:b54baf65c52952db65df39fcd4820668d0ef4766c0ccdf32879b77f7c804d5c5"},
-    {file = "fonttools-4.55.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8c4491699bad88efe95772543cd49870cf756b019ad56294f6498982408ab03e"},
-    {file = "fonttools-4.55.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5323a22eabddf4b24f66d26894f1229261021dacd9d29e89f7872dd8c63f0b8b"},
-    {file = "fonttools-4.55.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5480673f599ad410695ca2ddef2dfefe9df779a9a5cda89503881e503c9c7d90"},
-    {file = "fonttools-4.55.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da9da6d65cd7aa6b0f806556f4985bcbf603bf0c5c590e61b43aa3e5a0f822d0"},
-    {file = "fonttools-4.55.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e894b5bd60d9f473bed7a8f506515549cc194de08064d829464088d23097331b"},
-    {file = "fonttools-4.55.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:aee3b57643827e237ff6ec6d28d9ff9766bd8b21e08cd13bff479e13d4b14765"},
-    {file = "fonttools-4.55.3-cp311-cp311-win32.whl", hash = "sha256:eb6ca911c4c17eb51853143624d8dc87cdcdf12a711fc38bf5bd21521e79715f"},
-    {file = "fonttools-4.55.3-cp311-cp311-win_amd64.whl", hash = "sha256:6314bf82c54c53c71805318fcf6786d986461622dd926d92a465199ff54b1b72"},
-    {file = "fonttools-4.55.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:f9e736f60f4911061235603a6119e72053073a12c6d7904011df2d8fad2c0e35"},
-    {file = "fonttools-4.55.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a8aa2c5e5b8b3bcb2e4538d929f6589a5c6bdb84fd16e2ed92649fb5454f11c"},
-    {file = "fonttools-4.55.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:07f8288aacf0a38d174445fc78377a97fb0b83cfe352a90c9d9c1400571963c7"},
-    {file = "fonttools-4.55.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8d5e8916c0970fbc0f6f1bece0063363bb5857a7f170121a4493e31c3db3314"},
-    {file = "fonttools-4.55.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ae3b6600565b2d80b7c05acb8e24d2b26ac407b27a3f2e078229721ba5698427"},
-    {file = "fonttools-4.55.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:54153c49913f45065c8d9e6d0c101396725c5621c8aee744719300f79771d75a"},
-    {file = "fonttools-4.55.3-cp312-cp312-win32.whl", hash = "sha256:827e95fdbbd3e51f8b459af5ea10ecb4e30af50221ca103bea68218e9615de07"},
-    {file = "fonttools-4.55.3-cp312-cp312-win_amd64.whl", hash = "sha256:e6e8766eeeb2de759e862004aa11a9ea3d6f6d5ec710551a88b476192b64fd54"},
-    {file = "fonttools-4.55.3-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a430178ad3e650e695167cb53242dae3477b35c95bef6525b074d87493c4bf29"},
-    {file = "fonttools-4.55.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:529cef2ce91dc44f8e407cc567fae6e49a1786f2fefefa73a294704c415322a4"},
-    {file = "fonttools-4.55.3-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e75f12c82127486fac2d8bfbf5bf058202f54bf4f158d367e41647b972342ca"},
-    {file = "fonttools-4.55.3-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:859c358ebf41db18fb72342d3080bce67c02b39e86b9fbcf1610cca14984841b"},
-    {file = "fonttools-4.55.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:546565028e244a701f73df6d8dd6be489d01617863ec0c6a42fa25bf45d43048"},
-    {file = "fonttools-4.55.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:aca318b77f23523309eec4475d1fbbb00a6b133eb766a8bdc401faba91261abe"},
-    {file = "fonttools-4.55.3-cp313-cp313-win32.whl", hash = "sha256:8c5ec45428edaa7022f1c949a632a6f298edc7b481312fc7dc258921e9399628"},
-    {file = "fonttools-4.55.3-cp313-cp313-win_amd64.whl", hash = "sha256:11e5de1ee0d95af4ae23c1a138b184b7f06e0b6abacabf1d0db41c90b03d834b"},
-    {file = "fonttools-4.55.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:caf8230f3e10f8f5d7593eb6d252a37caf58c480b19a17e250a63dad63834cf3"},
-    {file = "fonttools-4.55.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b586ab5b15b6097f2fb71cafa3c98edfd0dba1ad8027229e7b1e204a58b0e09d"},
-    {file = "fonttools-4.55.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a8c2794ded89399cc2169c4d0bf7941247b8d5932b2659e09834adfbb01589aa"},
-    {file = "fonttools-4.55.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf4fe7c124aa3f4e4c1940880156e13f2f4d98170d35c749e6b4f119a872551e"},
-    {file = "fonttools-4.55.3-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:86721fbc389ef5cc1e2f477019e5069e8e4421e8d9576e9c26f840dbb04678de"},
-    {file = "fonttools-4.55.3-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:89bdc5d88bdeec1b15af790810e267e8332d92561dce4f0748c2b95c9bdf3926"},
-    {file = "fonttools-4.55.3-cp38-cp38-win32.whl", hash = "sha256:bc5dbb4685e51235ef487e4bd501ddfc49be5aede5e40f4cefcccabc6e60fb4b"},
-    {file = "fonttools-4.55.3-cp38-cp38-win_amd64.whl", hash = "sha256:cd70de1a52a8ee2d1877b6293af8a2484ac82514f10b1c67c1c5762d38073e56"},
-    {file = "fonttools-4.55.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bdcc9f04b36c6c20978d3f060e5323a43f6222accc4e7fcbef3f428e216d96af"},
-    {file = "fonttools-4.55.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c3ca99e0d460eff46e033cd3992a969658c3169ffcd533e0a39c63a38beb6831"},
-    {file = "fonttools-4.55.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22f38464daa6cdb7b6aebd14ab06609328fe1e9705bb0fcc7d1e69de7109ee02"},
-    {file = "fonttools-4.55.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed63959d00b61959b035c7d47f9313c2c1ece090ff63afea702fe86de00dbed4"},
-    {file = "fonttools-4.55.3-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:5e8d657cd7326eeaba27de2740e847c6b39dde2f8d7cd7cc56f6aad404ddf0bd"},
-    {file = "fonttools-4.55.3-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:fb594b5a99943042c702c550d5494bdd7577f6ef19b0bc73877c948a63184a32"},
-    {file = "fonttools-4.55.3-cp39-cp39-win32.whl", hash = "sha256:dc5294a3d5c84226e3dbba1b6f61d7ad813a8c0238fceea4e09aa04848c3d851"},
-    {file = "fonttools-4.55.3-cp39-cp39-win_amd64.whl", hash = "sha256:aedbeb1db64496d098e6be92b2e63b5fac4e53b1b92032dfc6988e1ea9134a4d"},
-    {file = "fonttools-4.55.3-py3-none-any.whl", hash = "sha256:f412604ccbeee81b091b420272841e5ec5ef68967a9790e80bffd0e30b8e2977"},
-    {file = "fonttools-4.55.3.tar.gz", hash = "sha256:3983313c2a04d6cc1fe9251f8fc647754cf49a61dac6cb1e7249ae67afaafc45"},
+    {file = "fonttools-4.57.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:babe8d1eb059a53e560e7bf29f8e8f4accc8b6cfb9b5fd10e485bde77e71ef41"},
+    {file = "fonttools-4.57.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:81aa97669cd726349eb7bd43ca540cf418b279ee3caba5e2e295fb4e8f841c02"},
+    {file = "fonttools-4.57.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0e9618630edd1910ad4f07f60d77c184b2f572c8ee43305ea3265675cbbfe7e"},
+    {file = "fonttools-4.57.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:34687a5d21f1d688d7d8d416cb4c5b9c87fca8a1797ec0d74b9fdebfa55c09ab"},
+    {file = "fonttools-4.57.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:69ab81b66ebaa8d430ba56c7a5f9abe0183afefd3a2d6e483060343398b13fb1"},
+    {file = "fonttools-4.57.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d639397de852f2ccfb3134b152c741406752640a266d9c1365b0f23d7b88077f"},
+    {file = "fonttools-4.57.0-cp310-cp310-win32.whl", hash = "sha256:cc066cb98b912f525ae901a24cd381a656f024f76203bc85f78fcc9e66ae5aec"},
+    {file = "fonttools-4.57.0-cp310-cp310-win_amd64.whl", hash = "sha256:7a64edd3ff6a7f711a15bd70b4458611fb240176ec11ad8845ccbab4fe6745db"},
+    {file = "fonttools-4.57.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3871349303bdec958360eedb619169a779956503ffb4543bb3e6211e09b647c4"},
+    {file = "fonttools-4.57.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c59375e85126b15a90fcba3443eaac58f3073ba091f02410eaa286da9ad80ed8"},
+    {file = "fonttools-4.57.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:967b65232e104f4b0f6370a62eb33089e00024f2ce143aecbf9755649421c683"},
+    {file = "fonttools-4.57.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39acf68abdfc74e19de7485f8f7396fa4d2418efea239b7061d6ed6a2510c746"},
+    {file = "fonttools-4.57.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:9d077f909f2343daf4495ba22bb0e23b62886e8ec7c109ee8234bdbd678cf344"},
+    {file = "fonttools-4.57.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:46370ac47a1e91895d40e9ad48effbe8e9d9db1a4b80888095bc00e7beaa042f"},
+    {file = "fonttools-4.57.0-cp311-cp311-win32.whl", hash = "sha256:ca2aed95855506b7ae94e8f1f6217b7673c929e4f4f1217bcaa236253055cb36"},
+    {file = "fonttools-4.57.0-cp311-cp311-win_amd64.whl", hash = "sha256:17168a4670bbe3775f3f3f72d23ee786bd965395381dfbb70111e25e81505b9d"},
+    {file = "fonttools-4.57.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:889e45e976c74abc7256d3064aa7c1295aa283c6bb19810b9f8b604dfe5c7f31"},
+    {file = "fonttools-4.57.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0425c2e052a5f1516c94e5855dbda706ae5a768631e9fcc34e57d074d1b65b92"},
+    {file = "fonttools-4.57.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:44c26a311be2ac130f40a96769264809d3b0cb297518669db437d1cc82974888"},
+    {file = "fonttools-4.57.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84c41ba992df5b8d680b89fd84c6a1f2aca2b9f1ae8a67400c8930cd4ea115f6"},
+    {file = "fonttools-4.57.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ea1e9e43ca56b0c12440a7c689b1350066595bebcaa83baad05b8b2675129d98"},
+    {file = "fonttools-4.57.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:84fd56c78d431606332a0627c16e2a63d243d0d8b05521257d77c6529abe14d8"},
+    {file = "fonttools-4.57.0-cp312-cp312-win32.whl", hash = "sha256:f4376819c1c778d59e0a31db5dc6ede854e9edf28bbfa5b756604727f7f800ac"},
+    {file = "fonttools-4.57.0-cp312-cp312-win_amd64.whl", hash = "sha256:57e30241524879ea10cdf79c737037221f77cc126a8cdc8ff2c94d4a522504b9"},
+    {file = "fonttools-4.57.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:408ce299696012d503b714778d89aa476f032414ae57e57b42e4b92363e0b8ef"},
+    {file = "fonttools-4.57.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:bbceffc80aa02d9e8b99f2a7491ed8c4a783b2fc4020119dc405ca14fb5c758c"},
+    {file = "fonttools-4.57.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f022601f3ee9e1f6658ed6d184ce27fa5216cee5b82d279e0f0bde5deebece72"},
+    {file = "fonttools-4.57.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dea5893b58d4637ffa925536462ba626f8a1b9ffbe2f5c272cdf2c6ebadb817"},
+    {file = "fonttools-4.57.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:dff02c5c8423a657c550b48231d0a48d7e2b2e131088e55983cfe74ccc2c7cc9"},
+    {file = "fonttools-4.57.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:767604f244dc17c68d3e2dbf98e038d11a18abc078f2d0f84b6c24571d9c0b13"},
+    {file = "fonttools-4.57.0-cp313-cp313-win32.whl", hash = "sha256:8e2e12d0d862f43d51e5afb8b9751c77e6bec7d2dc00aad80641364e9df5b199"},
+    {file = "fonttools-4.57.0-cp313-cp313-win_amd64.whl", hash = "sha256:f1d6bc9c23356908db712d282acb3eebd4ae5ec6d8b696aa40342b1d84f8e9e3"},
+    {file = "fonttools-4.57.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9d57b4e23ebbe985125d3f0cabbf286efa191ab60bbadb9326091050d88e8213"},
+    {file = "fonttools-4.57.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:579ba873d7f2a96f78b2e11028f7472146ae181cae0e4d814a37a09e93d5c5cc"},
+    {file = "fonttools-4.57.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e3e1ec10c29bae0ea826b61f265ec5c858c5ba2ce2e69a71a62f285cf8e4595"},
+    {file = "fonttools-4.57.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1968f2a2003c97c4ce6308dc2498d5fd4364ad309900930aa5a503c9851aec8"},
+    {file = "fonttools-4.57.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:aff40f8ac6763d05c2c8f6d240c6dac4bb92640a86d9b0c3f3fff4404f34095c"},
+    {file = "fonttools-4.57.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:d07f1b64008e39fceae7aa99e38df8385d7d24a474a8c9872645c4397b674481"},
+    {file = "fonttools-4.57.0-cp38-cp38-win32.whl", hash = "sha256:51d8482e96b28fb28aa8e50b5706f3cee06de85cbe2dce80dbd1917ae22ec5a6"},
+    {file = "fonttools-4.57.0-cp38-cp38-win_amd64.whl", hash = "sha256:03290e818782e7edb159474144fca11e36a8ed6663d1fcbd5268eb550594fd8e"},
+    {file = "fonttools-4.57.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7339e6a3283e4b0ade99cade51e97cde3d54cd6d1c3744459e886b66d630c8b3"},
+    {file = "fonttools-4.57.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:05efceb2cb5f6ec92a4180fcb7a64aa8d3385fd49cfbbe459350229d1974f0b1"},
+    {file = "fonttools-4.57.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a97bb05eb24637714a04dee85bdf0ad1941df64fe3b802ee4ac1c284a5f97b7c"},
+    {file = "fonttools-4.57.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:541cb48191a19ceb1a2a4b90c1fcebd22a1ff7491010d3cf840dd3a68aebd654"},
+    {file = "fonttools-4.57.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:cdef9a056c222d0479a1fdb721430f9efd68268014c54e8166133d2643cb05d9"},
+    {file = "fonttools-4.57.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:3cf97236b192a50a4bf200dc5ba405aa78d4f537a2c6e4c624bb60466d5b03bd"},
+    {file = "fonttools-4.57.0-cp39-cp39-win32.whl", hash = "sha256:e952c684274a7714b3160f57ec1d78309f955c6335c04433f07d36c5eb27b1f9"},
+    {file = "fonttools-4.57.0-cp39-cp39-win_amd64.whl", hash = "sha256:a2a722c0e4bfd9966a11ff55c895c817158fcce1b2b6700205a376403b546ad9"},
+    {file = "fonttools-4.57.0-py3-none-any.whl", hash = "sha256:3122c604a675513c68bd24c6a8f9091f1c2376d18e8f5fe5a101746c81b3e98f"},
+    {file = "fonttools-4.57.0.tar.gz", hash = "sha256:727ece10e065be2f9dd239d15dd5d60a66e17eac11aea47d447f9f03fdbc42de"},
 ]
 
 [package.extras]
@@ -317,30 +305,31 @@ woff = ["brotli (>=1.0.1) ; platform_python_implementation == \"CPython\"", "bro
 
 [[package]]
 name = "iniconfig"
-version = "2.0.0"
+version = "2.1.0"
 description = "brain-dead simple config-ini parsing"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 groups = ["dev"]
 files = [
-    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
-    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
+    {file = "iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760"},
+    {file = "iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7"},
 ]
 
 [[package]]
 name = "isort"
-version = "5.13.2"
+version = "6.0.1"
 description = "A Python utility / library to sort Python imports."
 optional = false
-python-versions = ">=3.8.0"
+python-versions = ">=3.9.0"
 groups = ["dev"]
 files = [
-    {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"},
-    {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"},
+    {file = "isort-6.0.1-py3-none-any.whl", hash = "sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615"},
+    {file = "isort-6.0.1.tar.gz", hash = "sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450"},
 ]
 
 [package.extras]
-colors = ["colorama (>=0.4.6)"]
+colors = ["colorama"]
+plugins = ["setuptools"]
 
 [[package]]
 name = "kiwisolver"
@@ -434,46 +423,46 @@ files = [
 
 [[package]]
 name = "matplotlib"
-version = "3.10.0"
+version = "3.10.1"
 description = "Python plotting package"
 optional = false
 python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "matplotlib-3.10.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:2c5829a5a1dd5a71f0e31e6e8bb449bc0ee9dbfb05ad28fc0c6b55101b3a4be6"},
-    {file = "matplotlib-3.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a2a43cbefe22d653ab34bb55d42384ed30f611bcbdea1f8d7f431011a2e1c62e"},
-    {file = "matplotlib-3.10.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:607b16c8a73943df110f99ee2e940b8a1cbf9714b65307c040d422558397dac5"},
-    {file = "matplotlib-3.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01d2b19f13aeec2e759414d3bfe19ddfb16b13a1250add08d46d5ff6f9be83c6"},
-    {file = "matplotlib-3.10.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:5e6c6461e1fc63df30bf6f80f0b93f5b6784299f721bc28530477acd51bfc3d1"},
-    {file = "matplotlib-3.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:994c07b9d9fe8d25951e3202a68c17900679274dadfc1248738dcfa1bd40d7f3"},
-    {file = "matplotlib-3.10.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:fd44fc75522f58612ec4a33958a7e5552562b7705b42ef1b4f8c0818e304a363"},
-    {file = "matplotlib-3.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c58a9622d5dbeb668f407f35f4e6bfac34bb9ecdcc81680c04d0258169747997"},
-    {file = "matplotlib-3.10.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:845d96568ec873be63f25fa80e9e7fae4be854a66a7e2f0c8ccc99e94a8bd4ef"},
-    {file = "matplotlib-3.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5439f4c5a3e2e8eab18e2f8c3ef929772fd5641876db71f08127eed95ab64683"},
-    {file = "matplotlib-3.10.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4673ff67a36152c48ddeaf1135e74ce0d4bce1bbf836ae40ed39c29edf7e2765"},
-    {file = "matplotlib-3.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:7e8632baebb058555ac0cde75db885c61f1212e47723d63921879806b40bec6a"},
-    {file = "matplotlib-3.10.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4659665bc7c9b58f8c00317c3c2a299f7f258eeae5a5d56b4c64226fca2f7c59"},
-    {file = "matplotlib-3.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d44cb942af1693cced2604c33a9abcef6205601c445f6d0dc531d813af8a2f5a"},
-    {file = "matplotlib-3.10.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a994f29e968ca002b50982b27168addfd65f0105610b6be7fa515ca4b5307c95"},
-    {file = "matplotlib-3.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9b0558bae37f154fffda54d779a592bc97ca8b4701f1c710055b609a3bac44c8"},
-    {file = "matplotlib-3.10.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:503feb23bd8c8acc75541548a1d709c059b7184cde26314896e10a9f14df5f12"},
-    {file = "matplotlib-3.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:c40ba2eb08b3f5de88152c2333c58cee7edcead0a2a0d60fcafa116b17117adc"},
-    {file = "matplotlib-3.10.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:96f2886f5c1e466f21cc41b70c5a0cd47bfa0015eb2d5793c88ebce658600e25"},
-    {file = "matplotlib-3.10.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:12eaf48463b472c3c0f8dbacdbf906e573013df81a0ab82f0616ea4b11281908"},
-    {file = "matplotlib-3.10.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2fbbabc82fde51391c4da5006f965e36d86d95f6ee83fb594b279564a4c5d0d2"},
-    {file = "matplotlib-3.10.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad2e15300530c1a94c63cfa546e3b7864bd18ea2901317bae8bbf06a5ade6dcf"},
-    {file = "matplotlib-3.10.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:3547d153d70233a8496859097ef0312212e2689cdf8d7ed764441c77604095ae"},
-    {file = "matplotlib-3.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:c55b20591ced744aa04e8c3e4b7543ea4d650b6c3c4b208c08a05b4010e8b442"},
-    {file = "matplotlib-3.10.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:9ade1003376731a971e398cc4ef38bb83ee8caf0aee46ac6daa4b0506db1fd06"},
-    {file = "matplotlib-3.10.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:95b710fea129c76d30be72c3b38f330269363fbc6e570a5dd43580487380b5ff"},
-    {file = "matplotlib-3.10.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5cdbaf909887373c3e094b0318d7ff230b2ad9dcb64da7ade654182872ab2593"},
-    {file = "matplotlib-3.10.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d907fddb39f923d011875452ff1eca29a9e7f21722b873e90db32e5d8ddff12e"},
-    {file = "matplotlib-3.10.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3b427392354d10975c1d0f4ee18aa5844640b512d5311ef32efd4dd7db106ede"},
-    {file = "matplotlib-3.10.0-cp313-cp313t-win_amd64.whl", hash = "sha256:5fd41b0ec7ee45cd960a8e71aea7c946a28a0b8a4dcee47d2856b2af051f334c"},
-    {file = "matplotlib-3.10.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:81713dd0d103b379de4516b861d964b1d789a144103277769238c732229d7f03"},
-    {file = "matplotlib-3.10.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:359f87baedb1f836ce307f0e850d12bb5f1936f70d035561f90d41d305fdacea"},
-    {file = "matplotlib-3.10.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ae80dc3a4add4665cf2faa90138384a7ffe2a4e37c58d83e115b54287c4f06ef"},
-    {file = "matplotlib-3.10.0.tar.gz", hash = "sha256:b886d02a581b96704c9d1ffe55709e49b4d2d52709ccebc4be42db856e511278"},
+    {file = "matplotlib-3.10.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:ff2ae14910be903f4a24afdbb6d7d3a6c44da210fc7d42790b87aeac92238a16"},
+    {file = "matplotlib-3.10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0721a3fd3d5756ed593220a8b86808a36c5031fce489adb5b31ee6dbb47dd5b2"},
+    {file = "matplotlib-3.10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0673b4b8f131890eb3a1ad058d6e065fb3c6e71f160089b65f8515373394698"},
+    {file = "matplotlib-3.10.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e875b95ac59a7908978fe307ecdbdd9a26af7fa0f33f474a27fcf8c99f64a19"},
+    {file = "matplotlib-3.10.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:2589659ea30726284c6c91037216f64a506a9822f8e50592d48ac16a2f29e044"},
+    {file = "matplotlib-3.10.1-cp310-cp310-win_amd64.whl", hash = "sha256:a97ff127f295817bc34517255c9db6e71de8eddaab7f837b7d341dee9f2f587f"},
+    {file = "matplotlib-3.10.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:057206ff2d6ab82ff3e94ebd94463d084760ca682ed5f150817b859372ec4401"},
+    {file = "matplotlib-3.10.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a144867dd6bf8ba8cb5fc81a158b645037e11b3e5cf8a50bd5f9917cb863adfe"},
+    {file = "matplotlib-3.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56c5d9fcd9879aa8040f196a235e2dcbdf7dd03ab5b07c0696f80bc6cf04bedd"},
+    {file = "matplotlib-3.10.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f69dc9713e4ad2fb21a1c30e37bd445d496524257dfda40ff4a8efb3604ab5c"},
+    {file = "matplotlib-3.10.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4c59af3e8aca75d7744b68e8e78a669e91ccbcf1ac35d0102a7b1b46883f1dd7"},
+    {file = "matplotlib-3.10.1-cp311-cp311-win_amd64.whl", hash = "sha256:11b65088c6f3dae784bc72e8d039a2580186285f87448babb9ddb2ad0082993a"},
+    {file = "matplotlib-3.10.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:66e907a06e68cb6cfd652c193311d61a12b54f56809cafbed9736ce5ad92f107"},
+    {file = "matplotlib-3.10.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e9b4bb156abb8fa5e5b2b460196f7db7264fc6d62678c03457979e7d5254b7be"},
+    {file = "matplotlib-3.10.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1985ad3d97f51307a2cbfc801a930f120def19ba22864182dacef55277102ba6"},
+    {file = "matplotlib-3.10.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c96f2c2f825d1257e437a1482c5a2cf4fee15db4261bd6fc0750f81ba2b4ba3d"},
+    {file = "matplotlib-3.10.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:35e87384ee9e488d8dd5a2dd7baf471178d38b90618d8ea147aced4ab59c9bea"},
+    {file = "matplotlib-3.10.1-cp312-cp312-win_amd64.whl", hash = "sha256:cfd414bce89cc78a7e1d25202e979b3f1af799e416010a20ab2b5ebb3a02425c"},
+    {file = "matplotlib-3.10.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c42eee41e1b60fd83ee3292ed83a97a5f2a8239b10c26715d8a6172226988d7b"},
+    {file = "matplotlib-3.10.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4f0647b17b667ae745c13721602b540f7aadb2a32c5b96e924cd4fea5dcb90f1"},
+    {file = "matplotlib-3.10.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aa3854b5f9473564ef40a41bc922be978fab217776e9ae1545c9b3a5cf2092a3"},
+    {file = "matplotlib-3.10.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e496c01441be4c7d5f96d4e40f7fca06e20dcb40e44c8daa2e740e1757ad9e6"},
+    {file = "matplotlib-3.10.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:5d45d3f5245be5b469843450617dcad9af75ca50568acf59997bed9311131a0b"},
+    {file = "matplotlib-3.10.1-cp313-cp313-win_amd64.whl", hash = "sha256:8e8e25b1209161d20dfe93037c8a7f7ca796ec9aa326e6e4588d8c4a5dd1e473"},
+    {file = "matplotlib-3.10.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:19b06241ad89c3ae9469e07d77efa87041eac65d78df4fcf9cac318028009b01"},
+    {file = "matplotlib-3.10.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:01e63101ebb3014e6e9f80d9cf9ee361a8599ddca2c3e166c563628b39305dbb"},
+    {file = "matplotlib-3.10.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f06bad951eea6422ac4e8bdebcf3a70c59ea0a03338c5d2b109f57b64eb3972"},
+    {file = "matplotlib-3.10.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3dfb036f34873b46978f55e240cff7a239f6c4409eac62d8145bad3fc6ba5a3"},
+    {file = "matplotlib-3.10.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dc6ab14a7ab3b4d813b88ba957fc05c79493a037f54e246162033591e770de6f"},
+    {file = "matplotlib-3.10.1-cp313-cp313t-win_amd64.whl", hash = "sha256:bc411ebd5889a78dabbc457b3fa153203e22248bfa6eedc6797be5df0164dbf9"},
+    {file = "matplotlib-3.10.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:648406f1899f9a818cef8c0231b44dcfc4ff36f167101c3fd1c9151f24220fdc"},
+    {file = "matplotlib-3.10.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:02582304e352f40520727984a5a18f37e8187861f954fea9be7ef06569cf85b4"},
+    {file = "matplotlib-3.10.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3809916157ba871bcdd33d3493acd7fe3037db5daa917ca6e77975a94cef779"},
+    {file = "matplotlib-3.10.1.tar.gz", hash = "sha256:e8d2d0e3881b129268585bf4765ad3ee73a4591d77b9a18c214ac7e3a79fb2ba"},
 ]
 
 [package.dependencies]
@@ -504,67 +493,67 @@ files = [
 
 [[package]]
 name = "numpy"
-version = "2.2.1"
+version = "2.2.4"
 description = "Fundamental package for array computing in Python"
 optional = false
 python-versions = ">=3.10"
 groups = ["main"]
 files = [
-    {file = "numpy-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5edb4e4caf751c1518e6a26a83501fda79bff41cc59dac48d70e6d65d4ec4440"},
-    {file = "numpy-2.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:aa3017c40d513ccac9621a2364f939d39e550c542eb2a894b4c8da92b38896ab"},
-    {file = "numpy-2.2.1-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:61048b4a49b1c93fe13426e04e04fdf5a03f456616f6e98c7576144677598675"},
-    {file = "numpy-2.2.1-cp310-cp310-macosx_14_0_x86_64.whl", hash = "sha256:7671dc19c7019103ca44e8d94917eba8534c76133523ca8406822efdd19c9308"},
-    {file = "numpy-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4250888bcb96617e00bfa28ac24850a83c9f3a16db471eca2ee1f1714df0f957"},
-    {file = "numpy-2.2.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7746f235c47abc72b102d3bce9977714c2444bdfaea7888d241b4c4bb6a78bf"},
-    {file = "numpy-2.2.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:059e6a747ae84fce488c3ee397cee7e5f905fd1bda5fb18c66bc41807ff119b2"},
-    {file = "numpy-2.2.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f62aa6ee4eb43b024b0e5a01cf65a0bb078ef8c395e8713c6e8a12a697144528"},
-    {file = "numpy-2.2.1-cp310-cp310-win32.whl", hash = "sha256:48fd472630715e1c1c89bf1feab55c29098cb403cc184b4859f9c86d4fcb6a95"},
-    {file = "numpy-2.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:b541032178a718c165a49638d28272b771053f628382d5e9d1c93df23ff58dbf"},
-    {file = "numpy-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:40f9e544c1c56ba8f1cf7686a8c9b5bb249e665d40d626a23899ba6d5d9e1484"},
-    {file = "numpy-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f9b57eaa3b0cd8db52049ed0330747b0364e899e8a606a624813452b8203d5f7"},
-    {file = "numpy-2.2.1-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:bc8a37ad5b22c08e2dbd27df2b3ef7e5c0864235805b1e718a235bcb200cf1cb"},
-    {file = "numpy-2.2.1-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:9036d6365d13b6cbe8f27a0eaf73ddcc070cae584e5ff94bb45e3e9d729feab5"},
-    {file = "numpy-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:51faf345324db860b515d3f364eaa93d0e0551a88d6218a7d61286554d190d73"},
-    {file = "numpy-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:38efc1e56b73cc9b182fe55e56e63b044dd26a72128fd2fbd502f75555d92591"},
-    {file = "numpy-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:31b89fa67a8042e96715c68e071a1200c4e172f93b0fbe01a14c0ff3ff820fc8"},
-    {file = "numpy-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4c86e2a209199ead7ee0af65e1d9992d1dce7e1f63c4b9a616500f93820658d0"},
-    {file = "numpy-2.2.1-cp311-cp311-win32.whl", hash = "sha256:b34d87e8a3090ea626003f87f9392b3929a7bbf4104a05b6667348b6bd4bf1cd"},
-    {file = "numpy-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:360137f8fb1b753c5cde3ac388597ad680eccbbbb3865ab65efea062c4a1fd16"},
-    {file = "numpy-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:694f9e921a0c8f252980e85bce61ebbd07ed2b7d4fa72d0e4246f2f8aa6642ab"},
-    {file = "numpy-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3683a8d166f2692664262fd4900f207791d005fb088d7fdb973cc8d663626faa"},
-    {file = "numpy-2.2.1-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:780077d95eafc2ccc3ced969db22377b3864e5b9a0ea5eb347cc93b3ea900315"},
-    {file = "numpy-2.2.1-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:55ba24ebe208344aa7a00e4482f65742969a039c2acfcb910bc6fcd776eb4355"},
-    {file = "numpy-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9b1d07b53b78bf84a96898c1bc139ad7f10fda7423f5fd158fd0f47ec5e01ac7"},
-    {file = "numpy-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5062dc1a4e32a10dc2b8b13cedd58988261416e811c1dc4dbdea4f57eea61b0d"},
-    {file = "numpy-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:fce4f615f8ca31b2e61aa0eb5865a21e14f5629515c9151850aa936c02a1ee51"},
-    {file = "numpy-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:67d4cda6fa6ffa073b08c8372aa5fa767ceb10c9a0587c707505a6d426f4e046"},
-    {file = "numpy-2.2.1-cp312-cp312-win32.whl", hash = "sha256:32cb94448be47c500d2c7a95f93e2f21a01f1fd05dd2beea1ccd049bb6001cd2"},
-    {file = "numpy-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:ba5511d8f31c033a5fcbda22dd5c813630af98c70b2661f2d2c654ae3cdfcfc8"},
-    {file = "numpy-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f1d09e520217618e76396377c81fba6f290d5f926f50c35f3a5f72b01a0da780"},
-    {file = "numpy-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3ecc47cd7f6ea0336042be87d9e7da378e5c7e9b3c8ad0f7c966f714fc10d821"},
-    {file = "numpy-2.2.1-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:f419290bc8968a46c4933158c91a0012b7a99bb2e465d5ef5293879742f8797e"},
-    {file = "numpy-2.2.1-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:5b6c390bfaef8c45a260554888966618328d30e72173697e5cabe6b285fb2348"},
-    {file = "numpy-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:526fc406ab991a340744aad7e25251dd47a6720a685fa3331e5c59fef5282a59"},
-    {file = "numpy-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f74e6fdeb9a265624ec3a3918430205dff1df7e95a230779746a6af78bc615af"},
-    {file = "numpy-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:53c09385ff0b72ba79d8715683c1168c12e0b6e84fb0372e97553d1ea91efe51"},
-    {file = "numpy-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f3eac17d9ec51be534685ba877b6ab5edc3ab7ec95c8f163e5d7b39859524716"},
-    {file = "numpy-2.2.1-cp313-cp313-win32.whl", hash = "sha256:9ad014faa93dbb52c80d8f4d3dcf855865c876c9660cb9bd7553843dd03a4b1e"},
-    {file = "numpy-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:164a829b6aacf79ca47ba4814b130c4020b202522a93d7bff2202bfb33b61c60"},
-    {file = "numpy-2.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:4dfda918a13cc4f81e9118dea249e192ab167a0bb1966272d5503e39234d694e"},
-    {file = "numpy-2.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:733585f9f4b62e9b3528dd1070ec4f52b8acf64215b60a845fa13ebd73cd0712"},
-    {file = "numpy-2.2.1-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:89b16a18e7bba224ce5114db863e7029803c179979e1af6ad6a6b11f70545008"},
-    {file = "numpy-2.2.1-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:676f4eebf6b2d430300f1f4f4c2461685f8269f94c89698d832cdf9277f30b84"},
-    {file = "numpy-2.2.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27f5cdf9f493b35f7e41e8368e7d7b4bbafaf9660cba53fb21d2cd174ec09631"},
-    {file = "numpy-2.2.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1ad395cf254c4fbb5b2132fee391f361a6e8c1adbd28f2cd8e79308a615fe9d"},
-    {file = "numpy-2.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:08ef779aed40dbc52729d6ffe7dd51df85796a702afbf68a4f4e41fafdc8bda5"},
-    {file = "numpy-2.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:26c9c4382b19fcfbbed3238a14abf7ff223890ea1936b8890f058e7ba35e8d71"},
-    {file = "numpy-2.2.1-cp313-cp313t-win32.whl", hash = "sha256:93cf4e045bae74c90ca833cba583c14b62cb4ba2cba0abd2b141ab52548247e2"},
-    {file = "numpy-2.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:bff7d8ec20f5f42607599f9994770fa65d76edca264a87b5e4ea5629bce12268"},
-    {file = "numpy-2.2.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7ba9cc93a91d86365a5d270dee221fdc04fb68d7478e6bf6af650de78a8339e3"},
-    {file = "numpy-2.2.1-pp310-pypy310_pp73-macosx_14_0_x86_64.whl", hash = "sha256:3d03883435a19794e41f147612a77a8f56d4e52822337844fff3d4040a142964"},
-    {file = "numpy-2.2.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4511d9e6071452b944207c8ce46ad2f897307910b402ea5fa975da32e0102800"},
-    {file = "numpy-2.2.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:5c5cc0cbabe9452038ed984d05ac87910f89370b9242371bd9079cb4af61811e"},
-    {file = "numpy-2.2.1.tar.gz", hash = "sha256:45681fd7128c8ad1c379f0ca0776a8b0c6583d2f69889ddac01559dfe4390918"},
+    {file = "numpy-2.2.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8146f3550d627252269ac42ae660281d673eb6f8b32f113538e0cc2a9aed42b9"},
+    {file = "numpy-2.2.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e642d86b8f956098b564a45e6f6ce68a22c2c97a04f5acd3f221f57b8cb850ae"},
+    {file = "numpy-2.2.4-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:a84eda42bd12edc36eb5b53bbcc9b406820d3353f1994b6cfe453a33ff101775"},
+    {file = "numpy-2.2.4-cp310-cp310-macosx_14_0_x86_64.whl", hash = "sha256:4ba5054787e89c59c593a4169830ab362ac2bee8a969249dc56e5d7d20ff8df9"},
+    {file = "numpy-2.2.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7716e4a9b7af82c06a2543c53ca476fa0b57e4d760481273e09da04b74ee6ee2"},
+    {file = "numpy-2.2.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:adf8c1d66f432ce577d0197dceaac2ac00c0759f573f28516246351c58a85020"},
+    {file = "numpy-2.2.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:218f061d2faa73621fa23d6359442b0fc658d5b9a70801373625d958259eaca3"},
+    {file = "numpy-2.2.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:df2f57871a96bbc1b69733cd4c51dc33bea66146b8c63cacbfed73eec0883017"},
+    {file = "numpy-2.2.4-cp310-cp310-win32.whl", hash = "sha256:a0258ad1f44f138b791327961caedffbf9612bfa504ab9597157806faa95194a"},
+    {file = "numpy-2.2.4-cp310-cp310-win_amd64.whl", hash = "sha256:0d54974f9cf14acf49c60f0f7f4084b6579d24d439453d5fc5805d46a165b542"},
+    {file = "numpy-2.2.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e9e0a277bb2eb5d8a7407e14688b85fd8ad628ee4e0c7930415687b6564207a4"},
+    {file = "numpy-2.2.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9eeea959168ea555e556b8188da5fa7831e21d91ce031e95ce23747b7609f8a4"},
+    {file = "numpy-2.2.4-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:bd3ad3b0a40e713fc68f99ecfd07124195333f1e689387c180813f0e94309d6f"},
+    {file = "numpy-2.2.4-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:cf28633d64294969c019c6df4ff37f5698e8326db68cc2b66576a51fad634880"},
+    {file = "numpy-2.2.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2fa8fa7697ad1646b5c93de1719965844e004fcad23c91228aca1cf0800044a1"},
+    {file = "numpy-2.2.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f4162988a360a29af158aeb4a2f4f09ffed6a969c9776f8f3bdee9b06a8ab7e5"},
+    {file = "numpy-2.2.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:892c10d6a73e0f14935c31229e03325a7b3093fafd6ce0af704be7f894d95687"},
+    {file = "numpy-2.2.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:db1f1c22173ac1c58db249ae48aa7ead29f534b9a948bc56828337aa84a32ed6"},
+    {file = "numpy-2.2.4-cp311-cp311-win32.whl", hash = "sha256:ea2bb7e2ae9e37d96835b3576a4fa4b3a97592fbea8ef7c3587078b0068b8f09"},
+    {file = "numpy-2.2.4-cp311-cp311-win_amd64.whl", hash = "sha256:f7de08cbe5551911886d1ab60de58448c6df0f67d9feb7d1fb21e9875ef95e91"},
+    {file = "numpy-2.2.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a7b9084668aa0f64e64bd00d27ba5146ef1c3a8835f3bd912e7a9e01326804c4"},
+    {file = "numpy-2.2.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:dbe512c511956b893d2dacd007d955a3f03d555ae05cfa3ff1c1ff6df8851854"},
+    {file = "numpy-2.2.4-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:bb649f8b207ab07caebba230d851b579a3c8711a851d29efe15008e31bb4de24"},
+    {file = "numpy-2.2.4-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:f34dc300df798742b3d06515aa2a0aee20941c13579d7a2f2e10af01ae4901ee"},
+    {file = "numpy-2.2.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c3f7ac96b16955634e223b579a3e5798df59007ca43e8d451a0e6a50f6bfdfba"},
+    {file = "numpy-2.2.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f92084defa704deadd4e0a5ab1dc52d8ac9e8a8ef617f3fbb853e79b0ea3592"},
+    {file = "numpy-2.2.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7a4e84a6283b36632e2a5b56e121961f6542ab886bc9e12f8f9818b3c266bfbb"},
+    {file = "numpy-2.2.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:11c43995255eb4127115956495f43e9343736edb7fcdb0d973defd9de14cd84f"},
+    {file = "numpy-2.2.4-cp312-cp312-win32.whl", hash = "sha256:65ef3468b53269eb5fdb3a5c09508c032b793da03251d5f8722b1194f1790c00"},
+    {file = "numpy-2.2.4-cp312-cp312-win_amd64.whl", hash = "sha256:2aad3c17ed2ff455b8eaafe06bcdae0062a1db77cb99f4b9cbb5f4ecb13c5146"},
+    {file = "numpy-2.2.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1cf4e5c6a278d620dee9ddeb487dc6a860f9b199eadeecc567f777daace1e9e7"},
+    {file = "numpy-2.2.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1974afec0b479e50438fc3648974268f972e2d908ddb6d7fb634598cdb8260a0"},
+    {file = "numpy-2.2.4-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:79bd5f0a02aa16808fcbc79a9a376a147cc1045f7dfe44c6e7d53fa8b8a79392"},
+    {file = "numpy-2.2.4-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:3387dd7232804b341165cedcb90694565a6015433ee076c6754775e85d86f1fc"},
+    {file = "numpy-2.2.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f527d8fdb0286fd2fd97a2a96c6be17ba4232da346931d967a0630050dfd298"},
+    {file = "numpy-2.2.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bce43e386c16898b91e162e5baaad90c4b06f9dcbe36282490032cec98dc8ae7"},
+    {file = "numpy-2.2.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:31504f970f563d99f71a3512d0c01a645b692b12a63630d6aafa0939e52361e6"},
+    {file = "numpy-2.2.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:81413336ef121a6ba746892fad881a83351ee3e1e4011f52e97fba79233611fd"},
+    {file = "numpy-2.2.4-cp313-cp313-win32.whl", hash = "sha256:f486038e44caa08dbd97275a9a35a283a8f1d2f0ee60ac260a1790e76660833c"},
+    {file = "numpy-2.2.4-cp313-cp313-win_amd64.whl", hash = "sha256:207a2b8441cc8b6a2a78c9ddc64d00d20c303d79fba08c577752f080c4007ee3"},
+    {file = "numpy-2.2.4-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:8120575cb4882318c791f839a4fd66161a6fa46f3f0a5e613071aae35b5dd8f8"},
+    {file = "numpy-2.2.4-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:a761ba0fa886a7bb33c6c8f6f20213735cb19642c580a931c625ee377ee8bd39"},
+    {file = "numpy-2.2.4-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:ac0280f1ba4a4bfff363a99a6aceed4f8e123f8a9b234c89140f5e894e452ecd"},
+    {file = "numpy-2.2.4-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:879cf3a9a2b53a4672a168c21375166171bc3932b7e21f622201811c43cdd3b0"},
+    {file = "numpy-2.2.4-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f05d4198c1bacc9124018109c5fba2f3201dbe7ab6e92ff100494f236209c960"},
+    {file = "numpy-2.2.4-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2f085ce2e813a50dfd0e01fbfc0c12bbe5d2063d99f8b29da30e544fb6483b8"},
+    {file = "numpy-2.2.4-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:92bda934a791c01d6d9d8e038363c50918ef7c40601552a58ac84c9613a665bc"},
+    {file = "numpy-2.2.4-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:ee4d528022f4c5ff67332469e10efe06a267e32f4067dc76bb7e2cddf3cd25ff"},
+    {file = "numpy-2.2.4-cp313-cp313t-win32.whl", hash = "sha256:05c076d531e9998e7e694c36e8b349969c56eadd2cdcd07242958489d79a7286"},
+    {file = "numpy-2.2.4-cp313-cp313t-win_amd64.whl", hash = "sha256:188dcbca89834cc2e14eb2f106c96d6d46f200fe0200310fc29089657379c58d"},
+    {file = "numpy-2.2.4-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7051ee569db5fbac144335e0f3b9c2337e0c8d5c9fee015f259a5bd70772b7e8"},
+    {file = "numpy-2.2.4-pp310-pypy310_pp73-macosx_14_0_x86_64.whl", hash = "sha256:ab2939cd5bec30a7430cbdb2287b63151b77cf9624de0532d629c9a1c59b1d5c"},
+    {file = "numpy-2.2.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0f35b19894a9e08639fd60a1ec1978cb7f5f7f1eace62f38dd36be8aecdef4d"},
+    {file = "numpy-2.2.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:b4adfbbc64014976d2f91084915ca4e626fbf2057fb81af209c1a6d776d23e3d"},
+    {file = "numpy-2.2.4.tar.gz", hash = "sha256:9ba03692a45d3eef66559efe1d1096c4b9b75c0986b5dff5530c378fb8331d4f"},
 ]
 
 [[package]]
@@ -594,202 +583,122 @@ files = [
 [package.extras]
 proxy = ["pysocks"]
 
-[[package]]
-name = "pandas"
-version = "2.2.3"
-description = "Powerful data structures for data analysis, time series, and statistics"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "pandas-2.2.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1948ddde24197a0f7add2bdc4ca83bf2b1ef84a1bc8ccffd95eda17fd836ecb5"},
-    {file = "pandas-2.2.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:381175499d3802cde0eabbaf6324cce0c4f5d52ca6f8c377c29ad442f50f6348"},
-    {file = "pandas-2.2.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d9c45366def9a3dd85a6454c0e7908f2b3b8e9c138f5dc38fed7ce720d8453ed"},
-    {file = "pandas-2.2.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:86976a1c5b25ae3f8ccae3a5306e443569ee3c3faf444dfd0f41cda24667ad57"},
-    {file = "pandas-2.2.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:b8661b0238a69d7aafe156b7fa86c44b881387509653fdf857bebc5e4008ad42"},
-    {file = "pandas-2.2.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:37e0aced3e8f539eccf2e099f65cdb9c8aa85109b0be6e93e2baff94264bdc6f"},
-    {file = "pandas-2.2.3-cp310-cp310-win_amd64.whl", hash = "sha256:56534ce0746a58afaf7942ba4863e0ef81c9c50d3f0ae93e9497d6a41a057645"},
-    {file = "pandas-2.2.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:66108071e1b935240e74525006034333f98bcdb87ea116de573a6a0dccb6c039"},
-    {file = "pandas-2.2.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7c2875855b0ff77b2a64a0365e24455d9990730d6431b9e0ee18ad8acee13dbd"},
-    {file = "pandas-2.2.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:cd8d0c3be0515c12fed0bdbae072551c8b54b7192c7b1fda0ba56059a0179698"},
-    {file = "pandas-2.2.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c124333816c3a9b03fbeef3a9f230ba9a737e9e5bb4060aa2107a86cc0a497fc"},
-    {file = "pandas-2.2.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:63cc132e40a2e084cf01adf0775b15ac515ba905d7dcca47e9a251819c575ef3"},
-    {file = "pandas-2.2.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:29401dbfa9ad77319367d36940cd8a0b3a11aba16063e39632d98b0e931ddf32"},
-    {file = "pandas-2.2.3-cp311-cp311-win_amd64.whl", hash = "sha256:3fc6873a41186404dad67245896a6e440baacc92f5b716ccd1bc9ed2995ab2c5"},
-    {file = "pandas-2.2.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b1d432e8d08679a40e2a6d8b2f9770a5c21793a6f9f47fdd52c5ce1948a5a8a9"},
-    {file = "pandas-2.2.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a5a1595fe639f5988ba6a8e5bc9649af3baf26df3998a0abe56c02609392e0a4"},
-    {file = "pandas-2.2.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5de54125a92bb4d1c051c0659e6fcb75256bf799a732a87184e5ea503965bce3"},
-    {file = "pandas-2.2.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fffb8ae78d8af97f849404f21411c95062db1496aeb3e56f146f0355c9989319"},
-    {file = "pandas-2.2.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6dfcb5ee8d4d50c06a51c2fffa6cff6272098ad6540aed1a76d15fb9318194d8"},
-    {file = "pandas-2.2.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:062309c1b9ea12a50e8ce661145c6aab431b1e99530d3cd60640e255778bd43a"},
-    {file = "pandas-2.2.3-cp312-cp312-win_amd64.whl", hash = "sha256:59ef3764d0fe818125a5097d2ae867ca3fa64df032331b7e0917cf5d7bf66b13"},
-    {file = "pandas-2.2.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015"},
-    {file = "pandas-2.2.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28"},
-    {file = "pandas-2.2.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0"},
-    {file = "pandas-2.2.3-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24"},
-    {file = "pandas-2.2.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659"},
-    {file = "pandas-2.2.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb"},
-    {file = "pandas-2.2.3-cp313-cp313-win_amd64.whl", hash = "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d"},
-    {file = "pandas-2.2.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468"},
-    {file = "pandas-2.2.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18"},
-    {file = "pandas-2.2.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2"},
-    {file = "pandas-2.2.3-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4"},
-    {file = "pandas-2.2.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d"},
-    {file = "pandas-2.2.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a"},
-    {file = "pandas-2.2.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc6b93f9b966093cb0fd62ff1a7e4c09e6d546ad7c1de191767baffc57628f39"},
-    {file = "pandas-2.2.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5dbca4c1acd72e8eeef4753eeca07de9b1db4f398669d5994086f788a5d7cc30"},
-    {file = "pandas-2.2.3-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:8cd6d7cc958a3910f934ea8dbdf17b2364827bb4dafc38ce6eef6bb3d65ff09c"},
-    {file = "pandas-2.2.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99df71520d25fade9db7c1076ac94eb994f4d2673ef2aa2e86ee039b6746d20c"},
-    {file = "pandas-2.2.3-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:31d0ced62d4ea3e231a9f228366919a5ea0b07440d9d4dac345376fd8e1477ea"},
-    {file = "pandas-2.2.3-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:7eee9e7cea6adf3e3d24e304ac6b8300646e2a5d1cd3a3c2abed9101b0846761"},
-    {file = "pandas-2.2.3-cp39-cp39-win_amd64.whl", hash = "sha256:4850ba03528b6dd51d6c5d273c46f183f39a9baf3f0143e566b89450965b105e"},
-    {file = "pandas-2.2.3.tar.gz", hash = "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667"},
-]
-
-[package.dependencies]
-numpy = [
-    {version = ">=1.22.4", markers = "python_version < \"3.11\""},
-    {version = ">=1.26.0", markers = "python_version >= \"3.12\""},
-    {version = ">=1.23.2", markers = "python_version == \"3.11\""},
-]
-python-dateutil = ">=2.8.2"
-pytz = ">=2020.1"
-tzdata = ">=2022.7"
-
-[package.extras]
-all = ["PyQt5 (>=5.15.9)", "SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "adbc-driver-sqlite (>=0.8.0)", "beautifulsoup4 (>=4.11.2)", "bottleneck (>=1.3.6)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=2022.12.0)", "fsspec (>=2022.11.0)", "gcsfs (>=2022.11.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.9.2)", "matplotlib (>=3.6.3)", "numba (>=0.56.4)", "numexpr (>=2.8.4)", "odfpy (>=1.4.1)", "openpyxl (>=3.1.0)", "pandas-gbq (>=0.19.0)", "psycopg2 (>=2.9.6)", "pyarrow (>=10.0.1)", "pymysql (>=1.0.2)", "pyreadstat (>=1.2.0)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)", "python-calamine (>=0.1.7)", "pyxlsb (>=1.0.10)", "qtpy (>=2.3.0)", "s3fs (>=2022.11.0)", "scipy (>=1.10.0)", "tables (>=3.8.0)", "tabulate (>=0.9.0)", "xarray (>=2022.12.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.5)", "zstandard (>=0.19.0)"]
-aws = ["s3fs (>=2022.11.0)"]
-clipboard = ["PyQt5 (>=5.15.9)", "qtpy (>=2.3.0)"]
-compression = ["zstandard (>=0.19.0)"]
-computation = ["scipy (>=1.10.0)", "xarray (>=2022.12.0)"]
-consortium-standard = ["dataframe-api-compat (>=0.1.7)"]
-excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.1.0)", "python-calamine (>=0.1.7)", "pyxlsb (>=1.0.10)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.5)"]
-feather = ["pyarrow (>=10.0.1)"]
-fss = ["fsspec (>=2022.11.0)"]
-gcp = ["gcsfs (>=2022.11.0)", "pandas-gbq (>=0.19.0)"]
-hdf5 = ["tables (>=3.8.0)"]
-html = ["beautifulsoup4 (>=4.11.2)", "html5lib (>=1.1)", "lxml (>=4.9.2)"]
-mysql = ["SQLAlchemy (>=2.0.0)", "pymysql (>=1.0.2)"]
-output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.9.0)"]
-parquet = ["pyarrow (>=10.0.1)"]
-performance = ["bottleneck (>=1.3.6)", "numba (>=0.56.4)", "numexpr (>=2.8.4)"]
-plot = ["matplotlib (>=3.6.3)"]
-postgresql = ["SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "psycopg2 (>=2.9.6)"]
-pyarrow = ["pyarrow (>=10.0.1)"]
-spss = ["pyreadstat (>=1.2.0)"]
-sql-other = ["SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "adbc-driver-sqlite (>=0.8.0)"]
-test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)"]
-xml = ["lxml (>=4.9.2)"]
-
 [[package]]
 name = "pillow"
-version = "11.0.0"
+version = "11.2.1"
 description = "Python Imaging Library (Fork)"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "pillow-11.0.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:6619654954dc4936fcff82db8eb6401d3159ec6be81e33c6000dfd76ae189947"},
-    {file = "pillow-11.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b3c5ac4bed7519088103d9450a1107f76308ecf91d6dabc8a33a2fcfb18d0fba"},
-    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a65149d8ada1055029fcb665452b2814fe7d7082fcb0c5bed6db851cb69b2086"},
-    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88a58d8ac0cc0e7f3a014509f0455248a76629ca9b604eca7dc5927cc593c5e9"},
-    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:c26845094b1af3c91852745ae78e3ea47abf3dbcd1cf962f16b9a5fbe3ee8488"},
-    {file = "pillow-11.0.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:1a61b54f87ab5786b8479f81c4b11f4d61702830354520837f8cc791ebba0f5f"},
-    {file = "pillow-11.0.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:674629ff60030d144b7bca2b8330225a9b11c482ed408813924619c6f302fdbb"},
-    {file = "pillow-11.0.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:598b4e238f13276e0008299bd2482003f48158e2b11826862b1eb2ad7c768b97"},
-    {file = "pillow-11.0.0-cp310-cp310-win32.whl", hash = "sha256:9a0f748eaa434a41fccf8e1ee7a3eed68af1b690e75328fd7a60af123c193b50"},
-    {file = "pillow-11.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:a5629742881bcbc1f42e840af185fd4d83a5edeb96475a575f4da50d6ede337c"},
-    {file = "pillow-11.0.0-cp310-cp310-win_arm64.whl", hash = "sha256:ee217c198f2e41f184f3869f3e485557296d505b5195c513b2bfe0062dc537f1"},
-    {file = "pillow-11.0.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:1c1d72714f429a521d8d2d018badc42414c3077eb187a59579f28e4270b4b0fc"},
-    {file = "pillow-11.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:499c3a1b0d6fc8213519e193796eb1a86a1be4b1877d678b30f83fd979811d1a"},
-    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8b2351c85d855293a299038e1f89db92a2f35e8d2f783489c6f0b2b5f3fe8a3"},
-    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f4dba50cfa56f910241eb7f883c20f1e7b1d8f7d91c750cd0b318bad443f4d5"},
-    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:5ddbfd761ee00c12ee1be86c9c0683ecf5bb14c9772ddbd782085779a63dd55b"},
-    {file = "pillow-11.0.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:45c566eb10b8967d71bf1ab8e4a525e5a93519e29ea071459ce517f6b903d7fa"},
-    {file = "pillow-11.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:b4fd7bd29610a83a8c9b564d457cf5bd92b4e11e79a4ee4716a63c959699b306"},
-    {file = "pillow-11.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:cb929ca942d0ec4fac404cbf520ee6cac37bf35be479b970c4ffadf2b6a1cad9"},
-    {file = "pillow-11.0.0-cp311-cp311-win32.whl", hash = "sha256:006bcdd307cc47ba43e924099a038cbf9591062e6c50e570819743f5607404f5"},
-    {file = "pillow-11.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:52a2d8323a465f84faaba5236567d212c3668f2ab53e1c74c15583cf507a0291"},
-    {file = "pillow-11.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:16095692a253047fe3ec028e951fa4221a1f3ed3d80c397e83541a3037ff67c9"},
-    {file = "pillow-11.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d2c0a187a92a1cb5ef2c8ed5412dd8d4334272617f532d4ad4de31e0495bd923"},
-    {file = "pillow-11.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:084a07ef0821cfe4858fe86652fffac8e187b6ae677e9906e192aafcc1b69903"},
-    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8069c5179902dcdce0be9bfc8235347fdbac249d23bd90514b7a47a72d9fecf4"},
-    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f02541ef64077f22bf4924f225c0fd1248c168f86e4b7abdedd87d6ebaceab0f"},
-    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:fcb4621042ac4b7865c179bb972ed0da0218a076dc1820ffc48b1d74c1e37fe9"},
-    {file = "pillow-11.0.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:00177a63030d612148e659b55ba99527803288cea7c75fb05766ab7981a8c1b7"},
-    {file = "pillow-11.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8853a3bf12afddfdf15f57c4b02d7ded92c7a75a5d7331d19f4f9572a89c17e6"},
-    {file = "pillow-11.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3107c66e43bda25359d5ef446f59c497de2b5ed4c7fdba0894f8d6cf3822dafc"},
-    {file = "pillow-11.0.0-cp312-cp312-win32.whl", hash = "sha256:86510e3f5eca0ab87429dd77fafc04693195eec7fd6a137c389c3eeb4cfb77c6"},
-    {file = "pillow-11.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:8ec4a89295cd6cd4d1058a5e6aec6bf51e0eaaf9714774e1bfac7cfc9051db47"},
-    {file = "pillow-11.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:27a7860107500d813fcd203b4ea19b04babe79448268403172782754870dac25"},
-    {file = "pillow-11.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:bcd1fb5bb7b07f64c15618c89efcc2cfa3e95f0e3bcdbaf4642509de1942a699"},
-    {file = "pillow-11.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0e038b0745997c7dcaae350d35859c9715c71e92ffb7e0f4a8e8a16732150f38"},
-    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ae08bd8ffc41aebf578c2af2f9d8749d91f448b3bfd41d7d9ff573d74f2a6b2"},
-    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d69bfd8ec3219ae71bcde1f942b728903cad25fafe3100ba2258b973bd2bc1b2"},
-    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:61b887f9ddba63ddf62fd02a3ba7add935d053b6dd7d58998c630e6dbade8527"},
-    {file = "pillow-11.0.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:c6a660307ca9d4867caa8d9ca2c2658ab685de83792d1876274991adec7b93fa"},
-    {file = "pillow-11.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:73e3a0200cdda995c7e43dd47436c1548f87a30bb27fb871f352a22ab8dcf45f"},
-    {file = "pillow-11.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fba162b8872d30fea8c52b258a542c5dfd7b235fb5cb352240c8d63b414013eb"},
-    {file = "pillow-11.0.0-cp313-cp313-win32.whl", hash = "sha256:f1b82c27e89fffc6da125d5eb0ca6e68017faf5efc078128cfaa42cf5cb38798"},
-    {file = "pillow-11.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:8ba470552b48e5835f1d23ecb936bb7f71d206f9dfeee64245f30c3270b994de"},
-    {file = "pillow-11.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:846e193e103b41e984ac921b335df59195356ce3f71dcfd155aa79c603873b84"},
-    {file = "pillow-11.0.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:4ad70c4214f67d7466bea6a08061eba35c01b1b89eaa098040a35272a8efb22b"},
-    {file = "pillow-11.0.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:6ec0d5af64f2e3d64a165f490d96368bb5dea8b8f9ad04487f9ab60dc4bb6003"},
-    {file = "pillow-11.0.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c809a70e43c7977c4a42aefd62f0131823ebf7dd73556fa5d5950f5b354087e2"},
-    {file = "pillow-11.0.0-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:4b60c9520f7207aaf2e1d94de026682fc227806c6e1f55bba7606d1c94dd623a"},
-    {file = "pillow-11.0.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:1e2688958a840c822279fda0086fec1fdab2f95bf2b717b66871c4ad9859d7e8"},
-    {file = "pillow-11.0.0-cp313-cp313t-win32.whl", hash = "sha256:607bbe123c74e272e381a8d1957083a9463401f7bd01287f50521ecb05a313f8"},
-    {file = "pillow-11.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:5c39ed17edea3bc69c743a8dd3e9853b7509625c2462532e62baa0732163a904"},
-    {file = "pillow-11.0.0-cp313-cp313t-win_arm64.whl", hash = "sha256:75acbbeb05b86bc53cbe7b7e6fe00fbcf82ad7c684b3ad82e3d711da9ba287d3"},
-    {file = "pillow-11.0.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:2e46773dc9f35a1dd28bd6981332fd7f27bec001a918a72a79b4133cf5291dba"},
-    {file = "pillow-11.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2679d2258b7f1192b378e2893a8a0a0ca472234d4c2c0e6bdd3380e8dfa21b6a"},
-    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eda2616eb2313cbb3eebbe51f19362eb434b18e3bb599466a1ffa76a033fb916"},
-    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20ec184af98a121fb2da42642dea8a29ec80fc3efbaefb86d8fdd2606619045d"},
-    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:8594f42df584e5b4bb9281799698403f7af489fba84c34d53d1c4bfb71b7c4e7"},
-    {file = "pillow-11.0.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:c12b5ae868897c7338519c03049a806af85b9b8c237b7d675b8c5e089e4a618e"},
-    {file = "pillow-11.0.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:70fbbdacd1d271b77b7721fe3cdd2d537bbbd75d29e6300c672ec6bb38d9672f"},
-    {file = "pillow-11.0.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5178952973e588b3f1360868847334e9e3bf49d19e169bbbdfaf8398002419ae"},
-    {file = "pillow-11.0.0-cp39-cp39-win32.whl", hash = "sha256:8c676b587da5673d3c75bd67dd2a8cdfeb282ca38a30f37950511766b26858c4"},
-    {file = "pillow-11.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:94f3e1780abb45062287b4614a5bc0874519c86a777d4a7ad34978e86428b8dd"},
-    {file = "pillow-11.0.0-cp39-cp39-win_arm64.whl", hash = "sha256:290f2cc809f9da7d6d622550bbf4c1e57518212da51b6a30fe8e0a270a5b78bd"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:1187739620f2b365de756ce086fdb3604573337cc28a0d3ac4a01ab6b2d2a6d2"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:fbbcb7b57dc9c794843e3d1258c0fbf0f48656d46ffe9e09b63bbd6e8cd5d0a2"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d203af30149ae339ad1b4f710d9844ed8796e97fda23ffbc4cc472968a47d0b"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21a0d3b115009ebb8ac3d2ebec5c2982cc693da935f4ab7bb5c8ebe2f47d36f2"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:73853108f56df97baf2bb8b522f3578221e56f646ba345a372c78326710d3830"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e58876c91f97b0952eb766123bfef372792ab3f4e3e1f1a2267834c2ab131734"},
-    {file = "pillow-11.0.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:224aaa38177597bb179f3ec87eeefcce8e4f85e608025e9cfac60de237ba6316"},
-    {file = "pillow-11.0.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:5bd2d3bdb846d757055910f0a59792d33b555800813c3b39ada1829c372ccb06"},
-    {file = "pillow-11.0.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:375b8dd15a1f5d2feafff536d47e22f69625c1aa92f12b339ec0b2ca40263273"},
-    {file = "pillow-11.0.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:daffdf51ee5db69a82dd127eabecce20729e21f7a3680cf7cbb23f0829189790"},
-    {file = "pillow-11.0.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7326a1787e3c7b0429659e0a944725e1b03eeaa10edd945a86dead1913383944"},
-    {file = "pillow-11.0.0.tar.gz", hash = "sha256:72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739"},
+    {file = "pillow-11.2.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:d57a75d53922fc20c165016a20d9c44f73305e67c351bbc60d1adaf662e74047"},
+    {file = "pillow-11.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:127bf6ac4a5b58b3d32fc8289656f77f80567d65660bc46f72c0d77e6600cc95"},
+    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4ba4be812c7a40280629e55ae0b14a0aafa150dd6451297562e1764808bbe61"},
+    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8bd62331e5032bc396a93609982a9ab6b411c05078a52f5fe3cc59234a3abd1"},
+    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:562d11134c97a62fe3af29581f083033179f7ff435f78392565a1ad2d1c2c45c"},
+    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:c97209e85b5be259994eb5b69ff50c5d20cca0f458ef9abd835e262d9d88b39d"},
+    {file = "pillow-11.2.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:0c3e6d0f59171dfa2e25d7116217543310908dfa2770aa64b8f87605f8cacc97"},
+    {file = "pillow-11.2.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:cc1c3bc53befb6096b84165956e886b1729634a799e9d6329a0c512ab651e579"},
+    {file = "pillow-11.2.1-cp310-cp310-win32.whl", hash = "sha256:312c77b7f07ab2139924d2639860e084ec2a13e72af54d4f08ac843a5fc9c79d"},
+    {file = "pillow-11.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:9bc7ae48b8057a611e5fe9f853baa88093b9a76303937449397899385da06fad"},
+    {file = "pillow-11.2.1-cp310-cp310-win_arm64.whl", hash = "sha256:2728567e249cdd939f6cc3d1f049595c66e4187f3c34078cbc0a7d21c47482d2"},
+    {file = "pillow-11.2.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:35ca289f712ccfc699508c4658a1d14652e8033e9b69839edf83cbdd0ba39e70"},
+    {file = "pillow-11.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0409af9f829f87a2dfb7e259f78f317a5351f2045158be321fd135973fff7bf"},
+    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4e5c5edee874dce4f653dbe59db7c73a600119fbea8d31f53423586ee2aafd7"},
+    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b93a07e76d13bff9444f1a029e0af2964e654bfc2e2c2d46bfd080df5ad5f3d8"},
+    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:e6def7eed9e7fa90fde255afaf08060dc4b343bbe524a8f69bdd2a2f0018f600"},
+    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:8f4f3724c068be008c08257207210c138d5f3731af6c155a81c2b09a9eb3a788"},
+    {file = "pillow-11.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a0a6709b47019dff32e678bc12c63008311b82b9327613f534e496dacaefb71e"},
+    {file = "pillow-11.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f6b0c664ccb879109ee3ca702a9272d877f4fcd21e5eb63c26422fd6e415365e"},
+    {file = "pillow-11.2.1-cp311-cp311-win32.whl", hash = "sha256:cc5d875d56e49f112b6def6813c4e3d3036d269c008bf8aef72cd08d20ca6df6"},
+    {file = "pillow-11.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:0f5c7eda47bf8e3c8a283762cab94e496ba977a420868cb819159980b6709193"},
+    {file = "pillow-11.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:4d375eb838755f2528ac8cbc926c3e31cc49ca4ad0cf79cff48b20e30634a4a7"},
+    {file = "pillow-11.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:78afba22027b4accef10dbd5eed84425930ba41b3ea0a86fa8d20baaf19d807f"},
+    {file = "pillow-11.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78092232a4ab376a35d68c4e6d5e00dfd73454bd12b230420025fbe178ee3b0b"},
+    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25a5f306095c6780c52e6bbb6109624b95c5b18e40aab1c3041da3e9e0cd3e2d"},
+    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c7b29dbd4281923a2bfe562acb734cee96bbb129e96e6972d315ed9f232bef4"},
+    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:3e645b020f3209a0181a418bffe7b4a93171eef6c4ef6cc20980b30bebf17b7d"},
+    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:b2dbea1012ccb784a65349f57bbc93730b96e85b42e9bf7b01ef40443db720b4"},
+    {file = "pillow-11.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:da3104c57bbd72948d75f6a9389e6727d2ab6333c3617f0a89d72d4940aa0443"},
+    {file = "pillow-11.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:598174aef4589af795f66f9caab87ba4ff860ce08cd5bb447c6fc553ffee603c"},
+    {file = "pillow-11.2.1-cp312-cp312-win32.whl", hash = "sha256:1d535df14716e7f8776b9e7fee118576d65572b4aad3ed639be9e4fa88a1cad3"},
+    {file = "pillow-11.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:14e33b28bf17c7a38eede290f77db7c664e4eb01f7869e37fa98a5aa95978941"},
+    {file = "pillow-11.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:21e1470ac9e5739ff880c211fc3af01e3ae505859392bf65458c224d0bf283eb"},
+    {file = "pillow-11.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:fdec757fea0b793056419bca3e9932eb2b0ceec90ef4813ea4c1e072c389eb28"},
+    {file = "pillow-11.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b0e130705d568e2f43a17bcbe74d90958e8a16263868a12c3e0d9c8162690830"},
+    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bdb5e09068332578214cadd9c05e3d64d99e0e87591be22a324bdbc18925be0"},
+    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d189ba1bebfbc0c0e529159631ec72bb9e9bc041f01ec6d3233d6d82eb823bc1"},
+    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:191955c55d8a712fab8934a42bfefbf99dd0b5875078240943f913bb66d46d9f"},
+    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:ad275964d52e2243430472fc5d2c2334b4fc3ff9c16cb0a19254e25efa03a155"},
+    {file = "pillow-11.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:750f96efe0597382660d8b53e90dd1dd44568a8edb51cb7f9d5d918b80d4de14"},
+    {file = "pillow-11.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fe15238d3798788d00716637b3d4e7bb6bde18b26e5d08335a96e88564a36b6b"},
+    {file = "pillow-11.2.1-cp313-cp313-win32.whl", hash = "sha256:3fe735ced9a607fee4f481423a9c36701a39719252a9bb251679635f99d0f7d2"},
+    {file = "pillow-11.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:74ee3d7ecb3f3c05459ba95eed5efa28d6092d751ce9bf20e3e253a4e497e691"},
+    {file = "pillow-11.2.1-cp313-cp313-win_arm64.whl", hash = "sha256:5119225c622403afb4b44bad4c1ca6c1f98eed79db8d3bc6e4e160fc6339d66c"},
+    {file = "pillow-11.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:8ce2e8411c7aaef53e6bb29fe98f28cd4fbd9a1d9be2eeea434331aac0536b22"},
+    {file = "pillow-11.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:9ee66787e095127116d91dea2143db65c7bb1e232f617aa5957c0d9d2a3f23a7"},
+    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9622e3b6c1d8b551b6e6f21873bdcc55762b4b2126633014cea1803368a9aa16"},
+    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63b5dff3a68f371ea06025a1a6966c9a1e1ee452fc8020c2cd0ea41b83e9037b"},
+    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_28_aarch64.whl", hash = "sha256:31df6e2d3d8fc99f993fd253e97fae451a8db2e7207acf97859732273e108406"},
+    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:062b7a42d672c45a70fa1f8b43d1d38ff76b63421cbbe7f88146b39e8a558d91"},
+    {file = "pillow-11.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4eb92eca2711ef8be42fd3f67533765d9fd043b8c80db204f16c8ea62ee1a751"},
+    {file = "pillow-11.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f91ebf30830a48c825590aede79376cb40f110b387c17ee9bd59932c961044f9"},
+    {file = "pillow-11.2.1-cp313-cp313t-win32.whl", hash = "sha256:e0b55f27f584ed623221cfe995c912c61606be8513bfa0e07d2c674b4516d9dd"},
+    {file = "pillow-11.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:36d6b82164c39ce5482f649b437382c0fb2395eabc1e2b1702a6deb8ad647d6e"},
+    {file = "pillow-11.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:225c832a13326e34f212d2072982bb1adb210e0cc0b153e688743018c94a2681"},
+    {file = "pillow-11.2.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:7491cf8a79b8eb867d419648fff2f83cb0b3891c8b36da92cc7f1931d46108c8"},
+    {file = "pillow-11.2.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8b02d8f9cb83c52578a0b4beadba92e37d83a4ef11570a8688bbf43f4ca50909"},
+    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:014ca0050c85003620526b0ac1ac53f56fc93af128f7546623cc8e31875ab928"},
+    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3692b68c87096ac6308296d96354eddd25f98740c9d2ab54e1549d6c8aea9d79"},
+    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:f781dcb0bc9929adc77bad571b8621ecb1e4cdef86e940fe2e5b5ee24fd33b35"},
+    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:2b490402c96f907a166615e9a5afacf2519e28295f157ec3a2bb9bd57de638cb"},
+    {file = "pillow-11.2.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:dd6b20b93b3ccc9c1b597999209e4bc5cf2853f9ee66e3fc9a400a78733ffc9a"},
+    {file = "pillow-11.2.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:4b835d89c08a6c2ee7781b8dd0a30209a8012b5f09c0a665b65b0eb3560b6f36"},
+    {file = "pillow-11.2.1-cp39-cp39-win32.whl", hash = "sha256:b10428b3416d4f9c61f94b494681280be7686bda15898a3a9e08eb66a6d92d67"},
+    {file = "pillow-11.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:6ebce70c3f486acf7591a3d73431fa504a4e18a9b97ff27f5f47b7368e4b9dd1"},
+    {file = "pillow-11.2.1-cp39-cp39-win_arm64.whl", hash = "sha256:c27476257b2fdcd7872d54cfd119b3a9ce4610fb85c8e32b70b42e3680a29a1e"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9b7b0d4fd2635f54ad82785d56bc0d94f147096493a79985d0ab57aedd563156"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:aa442755e31c64037aa7c1cb186e0b369f8416c567381852c63444dd666fb772"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0d3348c95b766f54b76116d53d4cb171b52992a1027e7ca50c81b43b9d9e363"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85d27ea4c889342f7e35f6d56e7e1cb345632ad592e8c51b693d7b7556043ce0"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:bf2c33d6791c598142f00c9c4c7d47f6476731c31081331664eb26d6ab583e01"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e616e7154c37669fc1dfc14584f11e284e05d1c650e1c0f972f281c4ccc53193"},
+    {file = "pillow-11.2.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:39ad2e0f424394e3aebc40168845fee52df1394a4673a6ee512d840d14ab3013"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:80f1df8dbe9572b4b7abdfa17eb5d78dd620b1d55d9e25f834efdbee872d3aed"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ea926cfbc3957090becbcbbb65ad177161a2ff2ad578b5a6ec9bb1e1cd78753c"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:738db0e0941ca0376804d4de6a782c005245264edaa253ffce24e5a15cbdc7bd"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9db98ab6565c69082ec9b0d4e40dd9f6181dab0dd236d26f7a50b8b9bfbd5076"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:036e53f4170e270ddb8797d4c590e6dd14d28e15c7da375c18978045f7e6c37b"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:14f73f7c291279bd65fda51ee87affd7c1e097709f7fdd0188957a16c264601f"},
+    {file = "pillow-11.2.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:208653868d5c9ecc2b327f9b9ef34e0e42a4cdd172c2988fd81d62d2bc9bc044"},
+    {file = "pillow-11.2.1.tar.gz", hash = "sha256:a64dd61998416367b7ef979b73d3a85853ba9bec4c2925f74e588879a58716b6"},
 ]
 
 [package.extras]
-docs = ["furo", "olefile", "sphinx (>=8.1)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph"]
+docs = ["furo", "olefile", "sphinx (>=8.2)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph"]
 fpx = ["olefile"]
 mic = ["olefile"]
-tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
+test-arrow = ["pyarrow"]
+tests = ["check-manifest", "coverage (>=7.4.2)", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout", "trove-classifiers (>=2024.10.12)"]
 typing = ["typing-extensions ; python_version < \"3.10\""]
 xmp = ["defusedxml"]
 
 [[package]]
 name = "platformdirs"
-version = "4.3.6"
+version = "4.3.7"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "platformdirs-4.3.6-py3-none-any.whl", hash = "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"},
-    {file = "platformdirs-4.3.6.tar.gz", hash = "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907"},
+    {file = "platformdirs-4.3.7-py3-none-any.whl", hash = "sha256:a03875334331946f13c549dbd8f4bac7a13a50a895a0eb1e8c6a8ace80d40a94"},
+    {file = "platformdirs-4.3.7.tar.gz", hash = "sha256:eb437d586b6a0986388f0d6f74aa0cde27b48d0e3d66843640bfb6bdcdb6e351"},
 ]
 
 [package.extras]
-docs = ["furo (>=2024.8.6)", "proselint (>=0.14)", "sphinx (>=8.0.2)", "sphinx-autodoc-typehints (>=2.4)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=8.3.2)", "pytest-cov (>=5)", "pytest-mock (>=3.14)"]
-type = ["mypy (>=1.11.2)"]
+docs = ["furo (>=2024.8.6)", "proselint (>=0.14)", "sphinx (>=8.1.3)", "sphinx-autodoc-typehints (>=3)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=8.3.4)", "pytest-cov (>=6)", "pytest-mock (>=3.14)"]
+type = ["mypy (>=1.14.1)"]
 
 [[package]]
 name = "pluggy"
@@ -807,194 +716,46 @@ files = [
 dev = ["pre-commit", "tox"]
 testing = ["pytest", "pytest-benchmark"]
 
-[[package]]
-name = "pydantic"
-version = "2.10.6"
-description = "Data validation using Python type hints"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "pydantic-2.10.6-py3-none-any.whl", hash = "sha256:427d664bf0b8a2b34ff5dd0f5a18df00591adcee7198fbd71981054cef37b584"},
-    {file = "pydantic-2.10.6.tar.gz", hash = "sha256:ca5daa827cce33de7a42be142548b0096bf05a7e7b365aebfa5f8eeec7128236"},
-]
-
-[package.dependencies]
-annotated-types = ">=0.6.0"
-pydantic-core = "2.27.2"
-typing-extensions = ">=4.12.2"
-
-[package.extras]
-email = ["email-validator (>=2.0.0)"]
-timezone = ["tzdata ; python_version >= \"3.9\" and platform_system == \"Windows\""]
-
-[[package]]
-name = "pydantic-core"
-version = "2.27.2"
-description = "Core functionality for Pydantic validation and serialization"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "pydantic_core-2.27.2-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:2d367ca20b2f14095a8f4fa1210f5a7b78b8a20009ecced6b12818f455b1e9fa"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:491a2b73db93fab69731eaee494f320faa4e093dbed776be1a829c2eb222c34c"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7969e133a6f183be60e9f6f56bfae753585680f3b7307a8e555a948d443cc05a"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3de9961f2a346257caf0aa508a4da705467f53778e9ef6fe744c038119737ef5"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e2bb4d3e5873c37bb3dd58714d4cd0b0e6238cebc4177ac8fe878f8b3aa8e74c"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:280d219beebb0752699480fe8f1dc61ab6615c2046d76b7ab7ee38858de0a4e7"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47956ae78b6422cbd46f772f1746799cbb862de838fd8d1fbd34a82e05b0983a"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:14d4a5c49d2f009d62a2a7140d3064f686d17a5d1a268bc641954ba181880236"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:337b443af21d488716f8d0b6164de833e788aa6bd7e3a39c005febc1284f4962"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-musllinux_1_1_armv7l.whl", hash = "sha256:03d0f86ea3184a12f41a2d23f7ccb79cdb5a18e06993f8a45baa8dfec746f0e9"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7041c36f5680c6e0f08d922aed302e98b3745d97fe1589db0a3eebf6624523af"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-win32.whl", hash = "sha256:50a68f3e3819077be2c98110c1f9dcb3817e93f267ba80a2c05bb4f8799e2ff4"},
-    {file = "pydantic_core-2.27.2-cp310-cp310-win_amd64.whl", hash = "sha256:e0fd26b16394ead34a424eecf8a31a1f5137094cabe84a1bcb10fa6ba39d3d31"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:8e10c99ef58cfdf2a66fc15d66b16c4a04f62bca39db589ae8cba08bc55331bc"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:26f32e0adf166a84d0cb63be85c562ca8a6fa8de28e5f0d92250c6b7e9e2aff7"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c19d1ea0673cd13cc2f872f6c9ab42acc4e4f492a7ca9d3795ce2b112dd7e15"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5e68c4446fe0810e959cdff46ab0a41ce2f2c86d227d96dc3847af0ba7def306"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d9640b0059ff4f14d1f37321b94061c6db164fbe49b334b31643e0528d100d99"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:40d02e7d45c9f8af700f3452f329ead92da4c5f4317ca9b896de7ce7199ea459"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c1fd185014191700554795c99b347d64f2bb637966c4cfc16998a0ca700d048"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d81d2068e1c1228a565af076598f9e7451712700b673de8f502f0334f281387d"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1a4207639fb02ec2dbb76227d7c751a20b1a6b4bc52850568e52260cae64ca3b"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:3de3ce3c9ddc8bbd88f6e0e304dea0e66d843ec9de1b0042b0911c1663ffd474"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:30c5f68ded0c36466acede341551106821043e9afaad516adfb6e8fa80a4e6a6"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-win32.whl", hash = "sha256:c70c26d2c99f78b125a3459f8afe1aed4d9687c24fd677c6a4436bc042e50d6c"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-win_amd64.whl", hash = "sha256:08e125dbdc505fa69ca7d9c499639ab6407cfa909214d500897d02afb816e7cc"},
-    {file = "pydantic_core-2.27.2-cp311-cp311-win_arm64.whl", hash = "sha256:26f0d68d4b235a2bae0c3fc585c585b4ecc51382db0e3ba402a22cbc440915e4"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:9e0c8cfefa0ef83b4da9588448b6d8d2a2bf1a53c3f1ae5fca39eb3061e2f0b0"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:83097677b8e3bd7eaa6775720ec8e0405f1575015a463285a92bfdfe254529ef"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:172fce187655fece0c90d90a678424b013f8fbb0ca8b036ac266749c09438cb7"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:519f29f5213271eeeeb3093f662ba2fd512b91c5f188f3bb7b27bc5973816934"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:05e3a55d124407fffba0dd6b0c0cd056d10e983ceb4e5dbd10dda135c31071d6"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c3ed807c7b91de05e63930188f19e921d1fe90de6b4f5cd43ee7fcc3525cb8c"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6fb4aadc0b9a0c063206846d603b92030eb6f03069151a625667f982887153e2"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:28ccb213807e037460326424ceb8b5245acb88f32f3d2777427476e1b32c48c4"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:de3cd1899e2c279b140adde9357c4495ed9d47131b4a4eaff9052f23398076b3"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:220f892729375e2d736b97d0e51466252ad84c51857d4d15f5e9692f9ef12be4"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a0fcd29cd6b4e74fe8ddd2c90330fd8edf2e30cb52acda47f06dd615ae72da57"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-win32.whl", hash = "sha256:1e2cb691ed9834cd6a8be61228471d0a503731abfb42f82458ff27be7b2186fc"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-win_amd64.whl", hash = "sha256:cc3f1a99a4f4f9dd1de4fe0312c114e740b5ddead65bb4102884b384c15d8bc9"},
-    {file = "pydantic_core-2.27.2-cp312-cp312-win_arm64.whl", hash = "sha256:3911ac9284cd8a1792d3cb26a2da18f3ca26c6908cc434a18f730dc0db7bfa3b"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7d14bd329640e63852364c306f4d23eb744e0f8193148d4044dd3dacdaacbd8b"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:82f91663004eb8ed30ff478d77c4d1179b3563df6cdb15c0817cd1cdaf34d154"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:71b24c7d61131bb83df10cc7e687433609963a944ccf45190cfc21e0887b08c9"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fa8e459d4954f608fa26116118bb67f56b93b209c39b008277ace29937453dc9"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce8918cbebc8da707ba805b7fd0b382816858728ae7fe19a942080c24e5b7cd1"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:eda3f5c2a021bbc5d976107bb302e0131351c2ba54343f8a496dc8783d3d3a6a"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd8086fa684c4775c27f03f062cbb9eaa6e17f064307e86b21b9e0abc9c0f02e"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8d9b3388db186ba0c099a6d20f0604a44eabdeef1777ddd94786cdae158729e4"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7a66efda2387de898c8f38c0cf7f14fca0b51a8ef0b24bfea5849f1b3c95af27"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:18a101c168e4e092ab40dbc2503bdc0f62010e95d292b27827871dc85450d7ee"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ba5dd002f88b78a4215ed2f8ddbdf85e8513382820ba15ad5ad8955ce0ca19a1"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-win32.whl", hash = "sha256:1ebaf1d0481914d004a573394f4be3a7616334be70261007e47c2a6fe7e50130"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-win_amd64.whl", hash = "sha256:953101387ecf2f5652883208769a79e48db18c6df442568a0b5ccd8c2723abee"},
-    {file = "pydantic_core-2.27.2-cp313-cp313-win_arm64.whl", hash = "sha256:ac4dbfd1691affb8f48c2c13241a2e3b60ff23247cbcf981759c768b6633cf8b"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d3e8d504bdd3f10835468f29008d72fc8359d95c9c415ce6e767203db6127506"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:521eb9b7f036c9b6187f0b47318ab0d7ca14bd87f776240b90b21c1f4f149320"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:85210c4d99a0114f5a9481b44560d7d1e35e32cc5634c656bc48e590b669b145"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d716e2e30c6f140d7560ef1538953a5cd1a87264c737643d481f2779fc247fe1"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f66d89ba397d92f840f8654756196d93804278457b5fbede59598a1f9f90b228"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:669e193c1c576a58f132e3158f9dfa9662969edb1a250c54d8fa52590045f046"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fdbe7629b996647b99c01b37f11170a57ae675375b14b8c13b8518b8320ced5"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d262606bf386a5ba0b0af3b97f37c83d7011439e3dc1a9298f21efb292e42f1a"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cabb9bcb7e0d97f74df8646f34fc76fbf793b7f6dc2438517d7a9e50eee4f14d"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-musllinux_1_1_armv7l.whl", hash = "sha256:d2d63f1215638d28221f664596b1ccb3944f6e25dd18cd3b86b0a4c408d5ebb9"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bca101c00bff0adb45a833f8451b9105d9df18accb8743b08107d7ada14bd7da"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-win32.whl", hash = "sha256:f6f8e111843bbb0dee4cb6594cdc73e79b3329b526037ec242a3e49012495b3b"},
-    {file = "pydantic_core-2.27.2-cp38-cp38-win_amd64.whl", hash = "sha256:fd1aea04935a508f62e0d0ef1f5ae968774a32afc306fb8545e06f5ff5cdf3ad"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:c10eb4f1659290b523af58fa7cffb452a61ad6ae5613404519aee4bfbf1df993"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ef592d4bad47296fb11f96cd7dc898b92e795032b4894dfb4076cfccd43a9308"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c61709a844acc6bf0b7dce7daae75195a10aac96a596ea1b776996414791ede4"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c5f762659e47fdb7b16956c71598292f60a03aa92f8b6351504359dbdba6cf"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4c9775e339e42e79ec99c441d9730fccf07414af63eac2f0e48e08fd38a64d76"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:57762139821c31847cfb2df63c12f725788bd9f04bc2fb392790959b8f70f118"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0d1e85068e818c73e048fe28cfc769040bb1f475524f4745a5dc621f75ac7630"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:097830ed52fd9e427942ff3b9bc17fab52913b2f50f2880dc4a5611446606a54"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:044a50963a614ecfae59bb1eaf7ea7efc4bc62f49ed594e18fa1e5d953c40e9f"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-musllinux_1_1_armv7l.whl", hash = "sha256:4e0b4220ba5b40d727c7f879eac379b822eee5d8fff418e9d3381ee45b3b0362"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5e4f4bb20d75e9325cc9696c6802657b58bc1dbbe3022f32cc2b2b632c3fbb96"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-win32.whl", hash = "sha256:cca63613e90d001b9f2f9a9ceb276c308bfa2a43fafb75c8031c4f66039e8c6e"},
-    {file = "pydantic_core-2.27.2-cp39-cp39-win_amd64.whl", hash = "sha256:77d1bca19b0f7021b3a982e6f903dcd5b2b06076def36a652e3907f596e29f67"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:2bf14caea37e91198329b828eae1618c068dfb8ef17bb33287a7ad4b61ac314e"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:b0cb791f5b45307caae8810c2023a184c74605ec3bcbb67d13846c28ff731ff8"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:688d3fd9fcb71f41c4c015c023d12a79d1c4c0732ec9eb35d96e3388a120dcf3"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d591580c34f4d731592f0e9fe40f9cc1b430d297eecc70b962e93c5c668f15f"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:82f986faf4e644ffc189a7f1aafc86e46ef70372bb153e7001e8afccc6e54133"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:bec317a27290e2537f922639cafd54990551725fc844249e64c523301d0822fc"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:0296abcb83a797db256b773f45773da397da75a08f5fcaef41f2044adec05f50"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:0d75070718e369e452075a6017fbf187f788e17ed67a3abd47fa934d001863d9"},
-    {file = "pydantic_core-2.27.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:7e17b560be3c98a8e3aa66ce828bdebb9e9ac6ad5466fba92eb74c4c95cb1151"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:c33939a82924da9ed65dab5a65d427205a73181d8098e79b6b426bdf8ad4e656"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:00bad2484fa6bda1e216e7345a798bd37c68fb2d97558edd584942aa41b7d278"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c817e2b40aba42bac6f457498dacabc568c3b7a986fc9ba7c8d9d260b71485fb"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:251136cdad0cb722e93732cb45ca5299fb56e1344a833640bf93b2803f8d1bfd"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d2088237af596f0a524d3afc39ab3b036e8adb054ee57cbb1dcf8e09da5b29cc"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d4041c0b966a84b4ae7a09832eb691a35aec90910cd2dbe7a208de59be77965b"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:8083d4e875ebe0b864ffef72a4304827015cff328a1be6e22cc850753bfb122b"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f141ee28a0ad2123b6611b6ceff018039df17f32ada8b534e6aa039545a3efb2"},
-    {file = "pydantic_core-2.27.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7d0c8399fcc1848491f00e0314bd59fb34a9c008761bcb422a057670c3f65e35"},
-    {file = "pydantic_core-2.27.2.tar.gz", hash = "sha256:eb026e5a4c1fee05726072337ff51d1efb6f59090b7da90d30ea58625b1ffb39"},
-]
-
-[package.dependencies]
-typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
-
 [[package]]
 name = "pylint"
-version = "3.3.3"
+version = "3.3.6"
 description = "python code static checker"
 optional = false
 python-versions = ">=3.9.0"
 groups = ["dev"]
 files = [
-    {file = "pylint-3.3.3-py3-none-any.whl", hash = "sha256:26e271a2bc8bce0fc23833805a9076dd9b4d5194e2a02164942cb3cdc37b4183"},
-    {file = "pylint-3.3.3.tar.gz", hash = "sha256:07c607523b17e6d16e2ae0d7ef59602e332caa762af64203c24b41c27139f36a"},
+    {file = "pylint-3.3.6-py3-none-any.whl", hash = "sha256:8b7c2d3e86ae3f94fb27703d521dd0b9b6b378775991f504d7c3a6275aa0a6a6"},
+    {file = "pylint-3.3.6.tar.gz", hash = "sha256:b634a041aac33706d56a0d217e6587228c66427e20ec21a019bc4cdee48c040a"},
 ]
 
 [package.dependencies]
-astroid = ">=3.3.8,<=3.4.0-dev0"
+astroid = ">=3.3.8,<=3.4.0.dev0"
 colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""}
 dill = [
     {version = ">=0.2", markers = "python_version < \"3.11\""},
     {version = ">=0.3.7", markers = "python_version >= \"3.12\""},
     {version = ">=0.3.6", markers = "python_version == \"3.11\""},
 ]
-isort = ">=4.2.5,<5.13.0 || >5.13.0,<6"
+isort = ">=4.2.5,<5.13 || >5.13,<7"
 mccabe = ">=0.6,<0.8"
-platformdirs = ">=2.2.0"
-tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
+platformdirs = ">=2.2"
+tomli = {version = ">=1.1", markers = "python_version < \"3.11\""}
 tomlkit = ">=0.10.1"
 
 [package.extras]
 spelling = ["pyenchant (>=3.2,<4.0)"]
 testutils = ["gitpython (>3)"]
 
-
-
-[package.dependencies]
-matplotlib = ">=3.7.4"
-numpy = {version = ">=1.25", markers = "python_version >= \"3.9\""}
-pandas = ">=2.0.3"
-pydantic = ">=2.5.1"
-scipy = ">=1.9.3"
-tqdm = ">=4.66.1"
-
-[package.extras]
-openpyxl = ["openpyxl (>=3.1.3)"]
-pyvista = ["PyQt5 (==5.15.10)", "PyQt5-Qt5 (==5.15.14) ; sys_platform == \"darwin\"", "PyQt5-Qt5 (==5.15.2) ; sys_platform != \"darwin\"", "PyQt5-sip (==12.15.0)", "pyvista[all]", "pyvistaqt", "vtk (==9.3.1) ; python_version != \"3.8\" or sys_platform != \"darwin\""]
-
 [[package]]
 name = "pyparsing"
-version = "3.2.0"
+version = "3.2.3"
 description = "pyparsing module - Classes and methods to define and execute parsing grammars"
 optional = false
 python-versions = ">=3.9"
 groups = ["main"]
 files = [
-    {file = "pyparsing-3.2.0-py3-none-any.whl", hash = "sha256:93d9577b88da0bbea8cc8334ee8b918ed014968fd2ec383e868fb8afb1ccef84"},
-    {file = "pyparsing-3.2.0.tar.gz", hash = "sha256:cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c"},
+    {file = "pyparsing-3.2.3-py3-none-any.whl", hash = "sha256:a749938e02d6fd0b59b356ca504a24982314bb090c383e3cf201c95ef7e2bfcf"},
+    {file = "pyparsing-3.2.3.tar.gz", hash = "sha256:b9c13f1ab8b3b542f72e28f634bad4de758ab3ce4546e4301970ad6fa77c38be"},
 ]
 
 [package.extras]
@@ -1002,14 +763,14 @@ diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
-version = "8.3.4"
+version = "8.3.5"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.8"
 groups = ["dev"]
 files = [
-    {file = "pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6"},
-    {file = "pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"},
+    {file = "pytest-8.3.5-py3-none-any.whl", hash = "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820"},
+    {file = "pytest-8.3.5.tar.gz", hash = "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"},
 ]
 
 [package.dependencies]
@@ -1025,14 +786,14 @@ dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments
 
 [[package]]
 name = "pytest-cov"
-version = "6.0.0"
+version = "6.1.1"
 description = "Pytest plugin for measuring coverage."
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "pytest-cov-6.0.0.tar.gz", hash = "sha256:fde0b595ca248bb8e2d76f020b465f3b107c9632e6a1d1705f17834c89dcadc0"},
-    {file = "pytest_cov-6.0.0-py3-none-any.whl", hash = "sha256:eee6f1b9e61008bd34975a4d5bab25801eb31898b032dd55addc93e96fcaaa35"},
+    {file = "pytest_cov-6.1.1-py3-none-any.whl", hash = "sha256:bddf29ed2d0ab6f4df17b4c55b0a657287db8684af9c42ea546b21b1041b3dde"},
+    {file = "pytest_cov-6.1.1.tar.gz", hash = "sha256:46935f7aaefba760e716c2ebfbe1c216240b9592966e7da99ea8292d4d3e2a0a"},
 ]
 
 [package.dependencies]
@@ -1057,82 +818,6 @@ files = [
 [package.dependencies]
 six = ">=1.5"
 
-[[package]]
-name = "pytz"
-version = "2025.1"
-description = "World timezone definitions, modern and historical"
-optional = false
-python-versions = "*"
-groups = ["main"]
-files = [
-    {file = "pytz-2025.1-py2.py3-none-any.whl", hash = "sha256:89dd22dca55b46eac6eda23b2d72721bf1bdfef212645d81513ef5d03038de57"},
-    {file = "pytz-2025.1.tar.gz", hash = "sha256:c2db42be2a2518b28e65f9207c4d05e6ff547d1efa4086469ef855e4ab70178e"},
-]
-
-[[package]]
-name = "scipy"
-version = "1.15.2"
-description = "Fundamental algorithms for scientific computing in Python"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "scipy-1.15.2-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:a2ec871edaa863e8213ea5df811cd600734f6400b4af272e1c011e69401218e9"},
-    {file = "scipy-1.15.2-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:6f223753c6ea76983af380787611ae1291e3ceb23917393079dcc746ba60cfb5"},
-    {file = "scipy-1.15.2-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:ecf797d2d798cf7c838c6d98321061eb3e72a74710e6c40540f0e8087e3b499e"},
-    {file = "scipy-1.15.2-cp310-cp310-macosx_14_0_x86_64.whl", hash = "sha256:9b18aa747da280664642997e65aab1dd19d0c3d17068a04b3fe34e2559196cb9"},
-    {file = "scipy-1.15.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:87994da02e73549dfecaed9e09a4f9d58a045a053865679aeb8d6d43747d4df3"},
-    {file = "scipy-1.15.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:69ea6e56d00977f355c0f84eba69877b6df084516c602d93a33812aa04d90a3d"},
-    {file = "scipy-1.15.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:888307125ea0c4466287191e5606a2c910963405ce9671448ff9c81c53f85f58"},
-    {file = "scipy-1.15.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:9412f5e408b397ff5641080ed1e798623dbe1ec0d78e72c9eca8992976fa65aa"},
-    {file = "scipy-1.15.2-cp310-cp310-win_amd64.whl", hash = "sha256:b5e025e903b4f166ea03b109bb241355b9c42c279ea694d8864d033727205e65"},
-    {file = "scipy-1.15.2-cp311-cp311-macosx_10_13_x86_64.whl", hash = "sha256:92233b2df6938147be6fa8824b8136f29a18f016ecde986666be5f4d686a91a4"},
-    {file = "scipy-1.15.2-cp311-cp311-macosx_12_0_arm64.whl", hash = "sha256:62ca1ff3eb513e09ed17a5736929429189adf16d2d740f44e53270cc800ecff1"},
-    {file = "scipy-1.15.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:4c6676490ad76d1c2894d77f976144b41bd1a4052107902238047fb6a473e971"},
-    {file = "scipy-1.15.2-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:a8bf5cb4a25046ac61d38f8d3c3426ec11ebc350246a4642f2f315fe95bda655"},
-    {file = "scipy-1.15.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a8e34cf4c188b6dd004654f88586d78f95639e48a25dfae9c5e34a6dc34547e"},
-    {file = "scipy-1.15.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28a0d2c2075946346e4408b211240764759e0fabaeb08d871639b5f3b1aca8a0"},
-    {file = "scipy-1.15.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:42dabaaa798e987c425ed76062794e93a243be8f0f20fff6e7a89f4d61cb3d40"},
-    {file = "scipy-1.15.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6f5e296ec63c5da6ba6fa0343ea73fd51b8b3e1a300b0a8cae3ed4b1122c7462"},
-    {file = "scipy-1.15.2-cp311-cp311-win_amd64.whl", hash = "sha256:597a0c7008b21c035831c39927406c6181bcf8f60a73f36219b69d010aa04737"},
-    {file = "scipy-1.15.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c4697a10da8f8765bb7c83e24a470da5797e37041edfd77fd95ba3811a47c4fd"},
-    {file = "scipy-1.15.2-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:869269b767d5ee7ea6991ed7e22b3ca1f22de73ab9a49c44bad338b725603301"},
-    {file = "scipy-1.15.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:bad78d580270a4d32470563ea86c6590b465cb98f83d760ff5b0990cb5518a93"},
-    {file = "scipy-1.15.2-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:b09ae80010f52efddb15551025f9016c910296cf70adbf03ce2a8704f3a5ad20"},
-    {file = "scipy-1.15.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5a6fd6eac1ce74a9f77a7fc724080d507c5812d61e72bd5e4c489b042455865e"},
-    {file = "scipy-1.15.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b871df1fe1a3ba85d90e22742b93584f8d2b8e6124f8372ab15c71b73e428b8"},
-    {file = "scipy-1.15.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:03205d57a28e18dfd39f0377d5002725bf1f19a46f444108c29bdb246b6c8a11"},
-    {file = "scipy-1.15.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:601881dfb761311045b03114c5fe718a12634e5608c3b403737ae463c9885d53"},
-    {file = "scipy-1.15.2-cp312-cp312-win_amd64.whl", hash = "sha256:e7c68b6a43259ba0aab737237876e5c2c549a031ddb7abc28c7b47f22e202ded"},
-    {file = "scipy-1.15.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:01edfac9f0798ad6b46d9c4c9ca0e0ad23dbf0b1eb70e96adb9fa7f525eff0bf"},
-    {file = "scipy-1.15.2-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:08b57a9336b8e79b305a143c3655cc5bdbe6d5ece3378578888d2afbb51c4e37"},
-    {file = "scipy-1.15.2-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:54c462098484e7466362a9f1672d20888f724911a74c22ae35b61f9c5919183d"},
-    {file = "scipy-1.15.2-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:cf72ff559a53a6a6d77bd8eefd12a17995ffa44ad86c77a5df96f533d4e6c6bb"},
-    {file = "scipy-1.15.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9de9d1416b3d9e7df9923ab23cd2fe714244af10b763975bea9e4f2e81cebd27"},
-    {file = "scipy-1.15.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fb530e4794fc8ea76a4a21ccb67dea33e5e0e60f07fc38a49e821e1eae3b71a0"},
-    {file = "scipy-1.15.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5ea7ed46d437fc52350b028b1d44e002646e28f3e8ddc714011aaf87330f2f32"},
-    {file = "scipy-1.15.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:11e7ad32cf184b74380f43d3c0a706f49358b904fa7d5345f16ddf993609184d"},
-    {file = "scipy-1.15.2-cp313-cp313-win_amd64.whl", hash = "sha256:a5080a79dfb9b78b768cebf3c9dcbc7b665c5875793569f48bf0e2b1d7f68f6f"},
-    {file = "scipy-1.15.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:447ce30cee6a9d5d1379087c9e474628dab3db4a67484be1b7dc3196bfb2fac9"},
-    {file = "scipy-1.15.2-cp313-cp313t-macosx_12_0_arm64.whl", hash = "sha256:c90ebe8aaa4397eaefa8455a8182b164a6cc1d59ad53f79943f266d99f68687f"},
-    {file = "scipy-1.15.2-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:def751dd08243934c884a3221156d63e15234a3155cf25978b0a668409d45eb6"},
-    {file = "scipy-1.15.2-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:302093e7dfb120e55515936cb55618ee0b895f8bcaf18ff81eca086c17bd80af"},
-    {file = "scipy-1.15.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7cd5b77413e1855351cdde594eca99c1f4a588c2d63711388b6a1f1c01f62274"},
-    {file = "scipy-1.15.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d0194c37037707b2afa7a2f2a924cf7bac3dc292d51b6a925e5fcb89bc5c776"},
-    {file = "scipy-1.15.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:bae43364d600fdc3ac327db99659dcb79e6e7ecd279a75fe1266669d9a652828"},
-    {file = "scipy-1.15.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f031846580d9acccd0044efd1a90e6f4df3a6e12b4b6bd694a7bc03a89892b28"},
-    {file = "scipy-1.15.2-cp313-cp313t-win_amd64.whl", hash = "sha256:fe8a9eb875d430d81755472c5ba75e84acc980e4a8f6204d402849234d3017db"},
-    {file = "scipy-1.15.2.tar.gz", hash = "sha256:cd58a314d92838f7e6f755c8a2167ead4f27e1fd5c1251fd54289569ef3495ec"},
-]
-
-[package.dependencies]
-numpy = ">=1.23.5,<2.5"
-
-[package.extras]
-dev = ["cython-lint (>=0.12.2)", "doit (>=0.36.0)", "mypy (==1.10.0)", "pycodestyle", "pydevtool", "rich-click", "ruff (>=0.0.292)", "types-psutil", "typing_extensions"]
-doc = ["intersphinx_registry", "jupyterlite-pyodide-kernel", "jupyterlite-sphinx (>=0.16.5)", "jupytext", "matplotlib (>=3.5)", "myst-nb", "numpydoc", "pooch", "pydata-sphinx-theme (>=0.15.2)", "sphinx (>=5.0.0,<8.0.0)", "sphinx-copybutton", "sphinx-design (>=0.4.0)"]
-test = ["Cython", "array-api-strict (>=2.0,<2.1.1)", "asv", "gmpy2", "hypothesis (>=6.30)", "meson", "mpmath", "ninja ; sys_platform != \"emscripten\"", "pooch", "pytest", "pytest-cov", "pytest-timeout", "pytest-xdist", "scikit-umfpack", "threadpoolctl"]
-
 [[package]]
 name = "six"
 version = "1.17.0"
@@ -1200,54 +885,20 @@ files = [
     {file = "tomlkit-0.13.2.tar.gz", hash = "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79"},
 ]
 
-[[package]]
-name = "tqdm"
-version = "4.67.1"
-description = "Fast, Extensible Progress Meter"
-optional = false
-python-versions = ">=3.7"
-groups = ["main"]
-files = [
-    {file = "tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2"},
-    {file = "tqdm-4.67.1.tar.gz", hash = "sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2"},
-]
-
-[package.dependencies]
-colorama = {version = "*", markers = "platform_system == \"Windows\""}
-
-[package.extras]
-dev = ["nbval", "pytest (>=6)", "pytest-asyncio (>=0.24)", "pytest-cov", "pytest-timeout"]
-discord = ["requests"]
-notebook = ["ipywidgets (>=6)"]
-slack = ["slack-sdk"]
-telegram = ["requests"]
-
 [[package]]
 name = "typing-extensions"
-version = "4.12.2"
+version = "4.13.2"
 description = "Backported and Experimental Type Hints for Python 3.8+"
 optional = false
 python-versions = ">=3.8"
-groups = ["main", "dev"]
-files = [
-    {file = "typing_extensions-4.12.2-py3-none-any.whl", hash = "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d"},
-    {file = "typing_extensions-4.12.2.tar.gz", hash = "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"},
-]
-markers = {dev = "python_version < \"3.11\""}
-
-[[package]]
-name = "tzdata"
-version = "2025.1"
-description = "Provider of IANA time zone data"
-optional = false
-python-versions = ">=2"
-groups = ["main"]
+groups = ["dev"]
+markers = "python_version < \"3.11\""
 files = [
-    {file = "tzdata-2025.1-py2.py3-none-any.whl", hash = "sha256:7e127113816800496f027041c570f50bcd464a020098a3b6b199517772303639"},
-    {file = "tzdata-2025.1.tar.gz", hash = "sha256:24894909e88cdb28bd1636c6887801df64cb485bd593f2fd83ef29075a81d694"},
+    {file = "typing_extensions-4.13.2-py3-none-any.whl", hash = "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c"},
+    {file = "typing_extensions-4.13.2.tar.gz", hash = "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"},
 ]
 
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.10, <3.13"
-content-hash = "c8abbc2048e9c6e5526487d2d2f0d2b379e5cfc9fe5d12767c52770c296e6796"
+content-hash = "4dae1746dfecc146018a0bb769eca6a3bfd4df22dec5f6cc1eff4a0bf1ae089f"
diff --git a/pyproject.toml b/pyproject.toml
index 1e83aae..aabc2ce 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "example-shm"
-version = "0.1.0"
-description = ""
+version = "0.2.0"
+description = "Demonstration for structural health monitoring of engineering structures"
 authors = [
     "Mohamed Abdulkarim <202206332@post.au.dk>",
     "Prasad Talasila <prasadtalasila@gmail.com>"
diff --git a/src/examples/experiment_1.py b/src/examples/experiment_1.py
index 8bc8603..0fe1c99 100644
--- a/src/examples/experiment_1.py
+++ b/src/examples/experiment_1.py
@@ -25,20 +25,16 @@ def main():
     with accelerometer.acquire_lock():
         accelerometer.data_map.clear()
 
-    while True:
-        time.sleep(1)
-
-        with accelerometer.acquire_lock():
-            # This print to see the dictionary
-            for key, fifo in sorted(accelerometer.data_map.items()):
-                print(f"Key: {key} -> Data: {list(fifo)}\n")
-        _, data = accelerometer.read(requested_samples=128)
-        print("Data requsted", data)
-        break
-
-    mqtt_client.loop_stop()
+    time.sleep(10)  # Allow time for data collection
+    with accelerometer.acquire_lock():
+        # This print to see the dictionary
+        for key, fifo in sorted(accelerometer.data_map.items()):
+            print(f"Key: {key} -> Data: {list(fifo)}\n")
+    _, data = accelerometer.read(requested_samples=256)
     print("Data requsted", data)
 
+    mqtt_client.loop_stop()
+    mqtt_client.disconnect()
 
 if __name__ == '__main__':
     main()
diff --git a/src/examples/experiment_2.py b/src/examples/experiment_2.py
index dfe5266..c213118 100644
--- a/src/examples/experiment_2.py
+++ b/src/examples/experiment_2.py
@@ -1,5 +1,4 @@
 import time
-import numpy as np # pylint: disable=unused-import
 
 # Project imports
 from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
@@ -11,7 +10,7 @@ def main():
     mqtt_config = config["MQTT"]
 
 
-    topic_indexes = [0,1] # Indexes of the topics/channels to allign
+    topic_indexes = [0,1] # Indexes of the topics/channels to align
 
     # Resolve topic names from config
     all_topics = config["MQTT"]["TopicsToSubscribe"]
@@ -21,8 +20,8 @@ def main():
     mqtt_client.connect(mqtt_config["host"], mqtt_config["port"], 60)
     mqtt_client.loop_start()
 
-    # We might need to give it some time before strating allignment,
-                # so we make sure that there is enough data to allign.
+    # We might need to give it some time before strating alignment,
+                # so we make sure that there is enough data to align.
 
     # pass actual topic as string
     aligner = Aligner(mqtt_client, topics=selected_topics, map_size=2560)

From aee4e0fd0081eb636cb6f676756fe4bc769232db Mon Sep 17 00:00:00 2001
From: prasadtalasila <prasadtalasila@users.noreply.github.com>
Date: Sun, 13 Apr 2025 09:34:21 +0200
Subject: [PATCH 07/18] Updates documetnation and configuration

---
 .coveragerc                   |  2 ++
 README.md                     |  2 ++
 pytest.ini                    |  2 +-
 src/data/accel/hbk/aligner.py |  3 ---
 src/examples/README.md        | 32 ++++++++++++++++++++++++--------
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index ec5cd66..e3ff08e 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -4,6 +4,8 @@ omit =
     */venv/*
     */.venv/*
     */__init__.py
+    */src/data/accel/random.py
+    */src/examples/*
 
 [report]
 exclude_lines =
diff --git a/README.md b/README.md
index a739214..747d170 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ poetry build                     # builds cp-sens package that can be published
 poetry run experiment_1          # run one experiment with real data
 ```
 
+The `poetry build` will create a `.whl` file in the `dist/` directory, e.g., `dist/cp_sens-0.1.0-py3-none-any.whl`.
+
 ## Testing
 
 Write tests in the _tests_ directory. Be sure to name any new files as
diff --git a/pytest.ini b/pytest.ini
index 0171d98..4cb9017 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,7 +3,7 @@ minversion = 8.3
 pythonpath = src src/data src/methods  tests
 testpaths =
     tests
-addopts = --cov=src --cov-report=term-missing --cov-report=html
+addopts = --cov=src --ignore=src/examples --cov-report=term-missing --cov-report=html
 python_files = test_*.py
 
 log_cli=true  
diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index fe26356..e321e7d 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -5,7 +5,6 @@
 from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
 
 
-
 class Aligner:
     def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.nan):
         """
@@ -34,8 +33,6 @@ def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.n
                                               msg, acc=acc: acc.process_message(msg))
 
 
-
-
     def find_continuous_key_groups(self):
         """
         Determines the batch size, finds common keys, and groups them into continuous sequences.
diff --git a/src/examples/README.md b/src/examples/README.md
index 0a71c0e..6009825 100644
--- a/src/examples/README.md
+++ b/src/examples/README.md
@@ -1,8 +1,9 @@
 # Examples
 
-This directory contains examples demonstrating how to use the EXAMPLE-SHM package.
+This directory contains examples demonstrating how to use
+the **EXAMPLE-SHM** package.
 
-## Installing the Package from Poetry Build
+## Install the Package from Poetry Build
 
 To install the package built using `poetry`, follow these steps:
 
@@ -12,24 +13,39 @@ To install the package built using `poetry`, follow these steps:
 poetry build
 ```
 
-This will create a .whl file in the dist/ directory, e.g., dist/cp_sens-0.1.0-py3-none-any.whl. 
+This will create a `.whl` file in the `dist/` directory,
+e.g., `dist/cp_sens-0.1.0-py3-none-any.whl`.
 
 ### Step 2: Create and Activate a Virtual Environment
 
+```py
 python -m venv .venv
 source .venv/bin/activate        # On Linux/macOS
 .\.venv\Scripts\Activate.ps1     # On Windows
+```
 
 ### Step 3: Install the Built Package
-pip install dist/example_shm-<version>-py3-none-any.whl
-Replace <version> with the version number found in the .whl filename. (e.g 0.1.0)
 
+```py
+pip install example_shm-<version>-py3-none-any.whl
+```
+
+Replace `<version>` with the version number found in the `.whl`
+filename. (e.g `0.1.0`).
 
-## Running the Example
+## Running the Examples
 
-A simple example is provided to run the main() function from experiment_1.py.
+There are two examples.
+
+* **example_1** demonstrates the use of `Accelerometer` class to extract
+  accelerometer measurements from MQTT data stream.
+* **example_2** demonstrates the use of `Aligner` class to collect and
+  align accelerometer measurements from multiple MQTT data streams.
+
+A simple example is provided to run the `main()` function from `experiment_1.py`.
 
 To run this example, use:
+
 ```bash
-python examples/example.py
+python examples/example_1.py
 ```

From 26d2e90d485c06aeeb36be452d6999a81e522402 Mon Sep 17 00:00:00 2001
From: prasadtalasila <prasadtalasila@users.noreply.github.com>
Date: Sun, 13 Apr 2025 10:16:06 +0200
Subject: [PATCH 08/18] Upgrades packages and python version

---
 .pylintrc                     |   6 +-
 poetry.lock                   | 547 +---------------------------------
 pyproject.toml                |  10 +-
 src/data/accel/hbk/aligner.py |   2 +-
 4 files changed, 13 insertions(+), 552 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index cbf727b..e545389 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -130,7 +130,7 @@ score=yes
 [REFACTORING]
 
 # Maximum number of nested blocks for function / method body
-max-nested-blocks=7
+max-nested-blocks=5
 
 # Complete name of functions that never returns. When checking for
 # inconsistent-return-statements if a never returning function is called then
@@ -559,10 +559,10 @@ max-attributes=7
 max-bool-expr=5
 
 # Maximum number of branch for function / method body.
-max-branches=15
+max-branches=12
 
 # Maximum number of locals for function / method body.
-max-locals=20
+max-locals=15
 
 # Maximum number of parents for a class (see R0901).
 max-parents=7
diff --git a/poetry.lock b/poetry.lock
index 57908ab..4286811 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -12,9 +12,6 @@ files = [
     {file = "astroid-3.3.9.tar.gz", hash = "sha256:622cc8e3048684aa42c820d9d218978021c3c3d174fb03a9f0d615921744f550"},
 ]
 
-[package.dependencies]
-typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.11\""}
-
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -28,80 +25,6 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
-[[package]]
-name = "contourpy"
-version = "1.3.1"
-description = "Python library for calculating contours of 2D quadrilateral grids"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "contourpy-1.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a045f341a77b77e1c5de31e74e966537bba9f3c4099b35bf4c2e3939dd54cdab"},
-    {file = "contourpy-1.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:500360b77259914f7805af7462e41f9cb7ca92ad38e9f94d6c8641b089338124"},
-    {file = "contourpy-1.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b2f926efda994cdf3c8d3fdb40b9962f86edbc4457e739277b961eced3d0b4c1"},
-    {file = "contourpy-1.3.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:adce39d67c0edf383647a3a007de0a45fd1b08dedaa5318404f1a73059c2512b"},
-    {file = "contourpy-1.3.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:abbb49fb7dac584e5abc6636b7b2a7227111c4f771005853e7d25176daaf8453"},
-    {file = "contourpy-1.3.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0cffcbede75c059f535725c1680dfb17b6ba8753f0c74b14e6a9c68c29d7ea3"},
-    {file = "contourpy-1.3.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:ab29962927945d89d9b293eabd0d59aea28d887d4f3be6c22deaefbb938a7277"},
-    {file = "contourpy-1.3.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:974d8145f8ca354498005b5b981165b74a195abfae9a8129df3e56771961d595"},
-    {file = "contourpy-1.3.1-cp310-cp310-win32.whl", hash = "sha256:ac4578ac281983f63b400f7fe6c101bedc10651650eef012be1ccffcbacf3697"},
-    {file = "contourpy-1.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:174e758c66bbc1c8576992cec9599ce8b6672b741b5d336b5c74e35ac382b18e"},
-    {file = "contourpy-1.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3e8b974d8db2c5610fb4e76307e265de0edb655ae8169e8b21f41807ccbeec4b"},
-    {file = "contourpy-1.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:20914c8c973f41456337652a6eeca26d2148aa96dd7ac323b74516988bea89fc"},
-    {file = "contourpy-1.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19d40d37c1c3a4961b4619dd9d77b12124a453cc3d02bb31a07d58ef684d3d86"},
-    {file = "contourpy-1.3.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:113231fe3825ebf6f15eaa8bc1f5b0ddc19d42b733345eae0934cb291beb88b6"},
-    {file = "contourpy-1.3.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4dbbc03a40f916a8420e420d63e96a1258d3d1b58cbdfd8d1f07b49fcbd38e85"},
-    {file = "contourpy-1.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a04ecd68acbd77fa2d39723ceca4c3197cb2969633836ced1bea14e219d077c"},
-    {file = "contourpy-1.3.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c414fc1ed8ee1dbd5da626cf3710c6013d3d27456651d156711fa24f24bd1291"},
-    {file = "contourpy-1.3.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:31c1b55c1f34f80557d3830d3dd93ba722ce7e33a0b472cba0ec3b6535684d8f"},
-    {file = "contourpy-1.3.1-cp311-cp311-win32.whl", hash = "sha256:f611e628ef06670df83fce17805c344710ca5cde01edfdc72751311da8585375"},
-    {file = "contourpy-1.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:b2bdca22a27e35f16794cf585832e542123296b4687f9fd96822db6bae17bfc9"},
-    {file = "contourpy-1.3.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0ffa84be8e0bd33410b17189f7164c3589c229ce5db85798076a3fa136d0e509"},
-    {file = "contourpy-1.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:805617228ba7e2cbbfb6c503858e626ab528ac2a32a04a2fe88ffaf6b02c32bc"},
-    {file = "contourpy-1.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ade08d343436a94e633db932e7e8407fe7de8083967962b46bdfc1b0ced39454"},
-    {file = "contourpy-1.3.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:47734d7073fb4590b4a40122b35917cd77be5722d80683b249dac1de266aac80"},
-    {file = "contourpy-1.3.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2ba94a401342fc0f8b948e57d977557fbf4d515f03c67682dd5c6191cb2d16ec"},
-    {file = "contourpy-1.3.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efa874e87e4a647fd2e4f514d5e91c7d493697127beb95e77d2f7561f6905bd9"},
-    {file = "contourpy-1.3.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1bf98051f1045b15c87868dbaea84f92408337d4f81d0e449ee41920ea121d3b"},
-    {file = "contourpy-1.3.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:61332c87493b00091423e747ea78200659dc09bdf7fd69edd5e98cef5d3e9a8d"},
-    {file = "contourpy-1.3.1-cp312-cp312-win32.whl", hash = "sha256:e914a8cb05ce5c809dd0fe350cfbb4e881bde5e2a38dc04e3afe1b3e58bd158e"},
-    {file = "contourpy-1.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:08d9d449a61cf53033612cb368f3a1b26cd7835d9b8cd326647efe43bca7568d"},
-    {file = "contourpy-1.3.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a761d9ccfc5e2ecd1bf05534eda382aa14c3e4f9205ba5b1684ecfe400716ef2"},
-    {file = "contourpy-1.3.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:523a8ee12edfa36f6d2a49407f705a6ef4c5098de4f498619787e272de93f2d5"},
-    {file = "contourpy-1.3.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece6df05e2c41bd46776fbc712e0996f7c94e0d0543af1656956d150c4ca7c81"},
-    {file = "contourpy-1.3.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:573abb30e0e05bf31ed067d2f82500ecfdaec15627a59d63ea2d95714790f5c2"},
-    {file = "contourpy-1.3.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a9fa36448e6a3a1a9a2ba23c02012c43ed88905ec80163f2ffe2421c7192a5d7"},
-    {file = "contourpy-1.3.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ea9924d28fc5586bf0b42d15f590b10c224117e74409dd7a0be3b62b74a501c"},
-    {file = "contourpy-1.3.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5b75aa69cb4d6f137b36f7eb2ace9280cfb60c55dc5f61c731fdf6f037f958a3"},
-    {file = "contourpy-1.3.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:041b640d4ec01922083645a94bb3b2e777e6b626788f4095cf21abbe266413c1"},
-    {file = "contourpy-1.3.1-cp313-cp313-win32.whl", hash = "sha256:36987a15e8ace5f58d4d5da9dca82d498c2bbb28dff6e5d04fbfcc35a9cb3a82"},
-    {file = "contourpy-1.3.1-cp313-cp313-win_amd64.whl", hash = "sha256:a7895f46d47671fa7ceec40f31fae721da51ad34bdca0bee83e38870b1f47ffd"},
-    {file = "contourpy-1.3.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:9ddeb796389dadcd884c7eb07bd14ef12408aaae358f0e2ae24114d797eede30"},
-    {file = "contourpy-1.3.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:19c1555a6801c2f084c7ddc1c6e11f02eb6a6016ca1318dd5452ba3f613a1751"},
-    {file = "contourpy-1.3.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:841ad858cff65c2c04bf93875e384ccb82b654574a6d7f30453a04f04af71342"},
-    {file = "contourpy-1.3.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4318af1c925fb9a4fb190559ef3eec206845f63e80fb603d47f2d6d67683901c"},
-    {file = "contourpy-1.3.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:14c102b0eab282427b662cb590f2e9340a9d91a1c297f48729431f2dcd16e14f"},
-    {file = "contourpy-1.3.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05e806338bfeaa006acbdeba0ad681a10be63b26e1b17317bfac3c5d98f36cda"},
-    {file = "contourpy-1.3.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4d76d5993a34ef3df5181ba3c92fabb93f1eaa5729504fb03423fcd9f3177242"},
-    {file = "contourpy-1.3.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:89785bb2a1980c1bd87f0cb1517a71cde374776a5f150936b82580ae6ead44a1"},
-    {file = "contourpy-1.3.1-cp313-cp313t-win32.whl", hash = "sha256:8eb96e79b9f3dcadbad2a3891672f81cdcab7f95b27f28f1c67d75f045b6b4f1"},
-    {file = "contourpy-1.3.1-cp313-cp313t-win_amd64.whl", hash = "sha256:287ccc248c9e0d0566934e7d606201abd74761b5703d804ff3df8935f523d546"},
-    {file = "contourpy-1.3.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:b457d6430833cee8e4b8e9b6f07aa1c161e5e0d52e118dc102c8f9bd7dd060d6"},
-    {file = "contourpy-1.3.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cb76c1a154b83991a3cbbf0dfeb26ec2833ad56f95540b442c73950af2013750"},
-    {file = "contourpy-1.3.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:44a29502ca9c7b5ba389e620d44f2fbe792b1fb5734e8b931ad307071ec58c53"},
-    {file = "contourpy-1.3.1.tar.gz", hash = "sha256:dfd97abd83335045a913e3bcc4a09c0ceadbe66580cf573fe961f4a825efa699"},
-]
-
-[package.dependencies]
-numpy = ">=1.23"
-
-[package.extras]
-bokeh = ["bokeh", "selenium"]
-docs = ["furo", "sphinx (>=7.2)", "sphinx-copybutton"]
-mypy = ["contourpy[bokeh,docs]", "docutils-stubs", "mypy (==1.11.1)", "types-Pillow"]
-test = ["Pillow", "contourpy[test-no-images]", "matplotlib"]
-test-no-images = ["pytest", "pytest-cov", "pytest-rerunfailures", "pytest-xdist", "wurlitzer"]
-
 [[package]]
 name = "coverage"
 version = "7.8.0"
@@ -175,28 +98,9 @@ files = [
     {file = "coverage-7.8.0.tar.gz", hash = "sha256:7a3d62b3b03b4b6fd41a085f3574874cf946cb4604d2b4d3e8dca8cd570ca501"},
 ]
 
-[package.dependencies]
-tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""}
-
 [package.extras]
 toml = ["tomli ; python_full_version <= \"3.11.0a6\""]
 
-[[package]]
-name = "cycler"
-version = "0.12.1"
-description = "Composable style cycles"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30"},
-    {file = "cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c"},
-]
-
-[package.extras]
-docs = ["ipython", "matplotlib", "numpydoc", "sphinx"]
-tests = ["pytest", "pytest-cov", "pytest-xdist"]
-
 [[package]]
 name = "dill"
 version = "0.3.9"
@@ -213,96 +117,6 @@ files = [
 graph = ["objgraph (>=1.7.2)"]
 profile = ["gprof2dot (>=2022.7.29)"]
 
-[[package]]
-name = "exceptiongroup"
-version = "1.2.2"
-description = "Backport of PEP 654 (exception groups)"
-optional = false
-python-versions = ">=3.7"
-groups = ["dev"]
-markers = "python_version < \"3.11\""
-files = [
-    {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
-    {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
-]
-
-[package.extras]
-test = ["pytest (>=6)"]
-
-[[package]]
-name = "fonttools"
-version = "4.57.0"
-description = "Tools to manipulate font files"
-optional = false
-python-versions = ">=3.8"
-groups = ["main"]
-files = [
-    {file = "fonttools-4.57.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:babe8d1eb059a53e560e7bf29f8e8f4accc8b6cfb9b5fd10e485bde77e71ef41"},
-    {file = "fonttools-4.57.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:81aa97669cd726349eb7bd43ca540cf418b279ee3caba5e2e295fb4e8f841c02"},
-    {file = "fonttools-4.57.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0e9618630edd1910ad4f07f60d77c184b2f572c8ee43305ea3265675cbbfe7e"},
-    {file = "fonttools-4.57.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:34687a5d21f1d688d7d8d416cb4c5b9c87fca8a1797ec0d74b9fdebfa55c09ab"},
-    {file = "fonttools-4.57.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:69ab81b66ebaa8d430ba56c7a5f9abe0183afefd3a2d6e483060343398b13fb1"},
-    {file = "fonttools-4.57.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d639397de852f2ccfb3134b152c741406752640a266d9c1365b0f23d7b88077f"},
-    {file = "fonttools-4.57.0-cp310-cp310-win32.whl", hash = "sha256:cc066cb98b912f525ae901a24cd381a656f024f76203bc85f78fcc9e66ae5aec"},
-    {file = "fonttools-4.57.0-cp310-cp310-win_amd64.whl", hash = "sha256:7a64edd3ff6a7f711a15bd70b4458611fb240176ec11ad8845ccbab4fe6745db"},
-    {file = "fonttools-4.57.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3871349303bdec958360eedb619169a779956503ffb4543bb3e6211e09b647c4"},
-    {file = "fonttools-4.57.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c59375e85126b15a90fcba3443eaac58f3073ba091f02410eaa286da9ad80ed8"},
-    {file = "fonttools-4.57.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:967b65232e104f4b0f6370a62eb33089e00024f2ce143aecbf9755649421c683"},
-    {file = "fonttools-4.57.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:39acf68abdfc74e19de7485f8f7396fa4d2418efea239b7061d6ed6a2510c746"},
-    {file = "fonttools-4.57.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:9d077f909f2343daf4495ba22bb0e23b62886e8ec7c109ee8234bdbd678cf344"},
-    {file = "fonttools-4.57.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:46370ac47a1e91895d40e9ad48effbe8e9d9db1a4b80888095bc00e7beaa042f"},
-    {file = "fonttools-4.57.0-cp311-cp311-win32.whl", hash = "sha256:ca2aed95855506b7ae94e8f1f6217b7673c929e4f4f1217bcaa236253055cb36"},
-    {file = "fonttools-4.57.0-cp311-cp311-win_amd64.whl", hash = "sha256:17168a4670bbe3775f3f3f72d23ee786bd965395381dfbb70111e25e81505b9d"},
-    {file = "fonttools-4.57.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:889e45e976c74abc7256d3064aa7c1295aa283c6bb19810b9f8b604dfe5c7f31"},
-    {file = "fonttools-4.57.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0425c2e052a5f1516c94e5855dbda706ae5a768631e9fcc34e57d074d1b65b92"},
-    {file = "fonttools-4.57.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:44c26a311be2ac130f40a96769264809d3b0cb297518669db437d1cc82974888"},
-    {file = "fonttools-4.57.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84c41ba992df5b8d680b89fd84c6a1f2aca2b9f1ae8a67400c8930cd4ea115f6"},
-    {file = "fonttools-4.57.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ea1e9e43ca56b0c12440a7c689b1350066595bebcaa83baad05b8b2675129d98"},
-    {file = "fonttools-4.57.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:84fd56c78d431606332a0627c16e2a63d243d0d8b05521257d77c6529abe14d8"},
-    {file = "fonttools-4.57.0-cp312-cp312-win32.whl", hash = "sha256:f4376819c1c778d59e0a31db5dc6ede854e9edf28bbfa5b756604727f7f800ac"},
-    {file = "fonttools-4.57.0-cp312-cp312-win_amd64.whl", hash = "sha256:57e30241524879ea10cdf79c737037221f77cc126a8cdc8ff2c94d4a522504b9"},
-    {file = "fonttools-4.57.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:408ce299696012d503b714778d89aa476f032414ae57e57b42e4b92363e0b8ef"},
-    {file = "fonttools-4.57.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:bbceffc80aa02d9e8b99f2a7491ed8c4a783b2fc4020119dc405ca14fb5c758c"},
-    {file = "fonttools-4.57.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f022601f3ee9e1f6658ed6d184ce27fa5216cee5b82d279e0f0bde5deebece72"},
-    {file = "fonttools-4.57.0-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dea5893b58d4637ffa925536462ba626f8a1b9ffbe2f5c272cdf2c6ebadb817"},
-    {file = "fonttools-4.57.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:dff02c5c8423a657c550b48231d0a48d7e2b2e131088e55983cfe74ccc2c7cc9"},
-    {file = "fonttools-4.57.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:767604f244dc17c68d3e2dbf98e038d11a18abc078f2d0f84b6c24571d9c0b13"},
-    {file = "fonttools-4.57.0-cp313-cp313-win32.whl", hash = "sha256:8e2e12d0d862f43d51e5afb8b9751c77e6bec7d2dc00aad80641364e9df5b199"},
-    {file = "fonttools-4.57.0-cp313-cp313-win_amd64.whl", hash = "sha256:f1d6bc9c23356908db712d282acb3eebd4ae5ec6d8b696aa40342b1d84f8e9e3"},
-    {file = "fonttools-4.57.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9d57b4e23ebbe985125d3f0cabbf286efa191ab60bbadb9326091050d88e8213"},
-    {file = "fonttools-4.57.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:579ba873d7f2a96f78b2e11028f7472146ae181cae0e4d814a37a09e93d5c5cc"},
-    {file = "fonttools-4.57.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e3e1ec10c29bae0ea826b61f265ec5c858c5ba2ce2e69a71a62f285cf8e4595"},
-    {file = "fonttools-4.57.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1968f2a2003c97c4ce6308dc2498d5fd4364ad309900930aa5a503c9851aec8"},
-    {file = "fonttools-4.57.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:aff40f8ac6763d05c2c8f6d240c6dac4bb92640a86d9b0c3f3fff4404f34095c"},
-    {file = "fonttools-4.57.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:d07f1b64008e39fceae7aa99e38df8385d7d24a474a8c9872645c4397b674481"},
-    {file = "fonttools-4.57.0-cp38-cp38-win32.whl", hash = "sha256:51d8482e96b28fb28aa8e50b5706f3cee06de85cbe2dce80dbd1917ae22ec5a6"},
-    {file = "fonttools-4.57.0-cp38-cp38-win_amd64.whl", hash = "sha256:03290e818782e7edb159474144fca11e36a8ed6663d1fcbd5268eb550594fd8e"},
-    {file = "fonttools-4.57.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7339e6a3283e4b0ade99cade51e97cde3d54cd6d1c3744459e886b66d630c8b3"},
-    {file = "fonttools-4.57.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:05efceb2cb5f6ec92a4180fcb7a64aa8d3385fd49cfbbe459350229d1974f0b1"},
-    {file = "fonttools-4.57.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a97bb05eb24637714a04dee85bdf0ad1941df64fe3b802ee4ac1c284a5f97b7c"},
-    {file = "fonttools-4.57.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:541cb48191a19ceb1a2a4b90c1fcebd22a1ff7491010d3cf840dd3a68aebd654"},
-    {file = "fonttools-4.57.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:cdef9a056c222d0479a1fdb721430f9efd68268014c54e8166133d2643cb05d9"},
-    {file = "fonttools-4.57.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:3cf97236b192a50a4bf200dc5ba405aa78d4f537a2c6e4c624bb60466d5b03bd"},
-    {file = "fonttools-4.57.0-cp39-cp39-win32.whl", hash = "sha256:e952c684274a7714b3160f57ec1d78309f955c6335c04433f07d36c5eb27b1f9"},
-    {file = "fonttools-4.57.0-cp39-cp39-win_amd64.whl", hash = "sha256:a2a722c0e4bfd9966a11ff55c895c817158fcce1b2b6700205a376403b546ad9"},
-    {file = "fonttools-4.57.0-py3-none-any.whl", hash = "sha256:3122c604a675513c68bd24c6a8f9091f1c2376d18e8f5fe5a101746c81b3e98f"},
-    {file = "fonttools-4.57.0.tar.gz", hash = "sha256:727ece10e065be2f9dd239d15dd5d60a66e17eac11aea47d447f9f03fdbc42de"},
-]
-
-[package.extras]
-all = ["brotli (>=1.0.1) ; platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; platform_python_implementation != \"CPython\"", "fs (>=2.2.0,<3)", "lxml (>=4.0)", "lz4 (>=1.7.4.2)", "matplotlib", "munkres ; platform_python_implementation == \"PyPy\"", "pycairo", "scipy ; platform_python_implementation != \"PyPy\"", "skia-pathops (>=0.5.0)", "sympy", "uharfbuzz (>=0.23.0)", "unicodedata2 (>=15.1.0) ; python_version <= \"3.12\"", "xattr ; sys_platform == \"darwin\"", "zopfli (>=0.1.4)"]
-graphite = ["lz4 (>=1.7.4.2)"]
-interpolatable = ["munkres ; platform_python_implementation == \"PyPy\"", "pycairo", "scipy ; platform_python_implementation != \"PyPy\""]
-lxml = ["lxml (>=4.0)"]
-pathops = ["skia-pathops (>=0.5.0)"]
-plot = ["matplotlib"]
-repacker = ["uharfbuzz (>=0.23.0)"]
-symfont = ["sympy"]
-type1 = ["xattr ; sys_platform == \"darwin\""]
-ufo = ["fs (>=2.2.0,<3)"]
-unicode = ["unicodedata2 (>=15.1.0) ; python_version <= \"3.12\""]
-woff = ["brotli (>=1.0.1) ; platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; platform_python_implementation != \"CPython\"", "zopfli (>=0.1.4)"]
-
 [[package]]
 name = "iniconfig"
 version = "2.1.0"
@@ -331,154 +145,6 @@ files = [
 colors = ["colorama"]
 plugins = ["setuptools"]
 
-[[package]]
-name = "kiwisolver"
-version = "1.4.8"
-description = "A fast implementation of the Cassowary constraint solver"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "kiwisolver-1.4.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88c6f252f6816a73b1f8c904f7bbe02fd67c09a69f7cb8a0eecdbf5ce78e63db"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c72941acb7b67138f35b879bbe85be0f6c6a70cab78fe3ef6db9c024d9223e5b"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ce2cf1e5688edcb727fdf7cd1bbd0b6416758996826a8be1d958f91880d0809d"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c8bf637892dc6e6aad2bc6d4d69d08764166e5e3f69d469e55427b6ac001b19d"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:034d2c891f76bd3edbdb3ea11140d8510dca675443da7304205a2eaa45d8334c"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d47b28d1dfe0793d5e96bce90835e17edf9a499b53969b03c6c47ea5985844c3"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb158fe28ca0c29f2260cca8c43005329ad58452c36f0edf298204de32a9a3ed"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5536185fce131780ebd809f8e623bf4030ce1b161353166c49a3c74c287897f"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:369b75d40abedc1da2c1f4de13f3482cb99e3237b38726710f4a793432b1c5ff"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:641f2ddf9358c80faa22e22eb4c9f54bd3f0e442e038728f500e3b978d00aa7d"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:d561d2d8883e0819445cfe58d7ddd673e4015c3c57261d7bdcd3710d0d14005c"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:1732e065704b47c9afca7ffa272f845300a4eb959276bf6970dc07265e73b605"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:bcb1ebc3547619c3b58a39e2448af089ea2ef44b37988caf432447374941574e"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-win_amd64.whl", hash = "sha256:89c107041f7b27844179ea9c85d6da275aa55ecf28413e87624d033cf1f6b751"},
-    {file = "kiwisolver-1.4.8-cp310-cp310-win_arm64.whl", hash = "sha256:b5773efa2be9eb9fcf5415ea3ab70fc785d598729fd6057bea38d539ead28271"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a4d3601908c560bdf880f07d94f31d734afd1bb71e96585cace0e38ef44c6d84"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:856b269c4d28a5c0d5e6c1955ec36ebfd1651ac00e1ce0afa3e28da95293b561"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c2b9a96e0f326205af81a15718a9073328df1173a2619a68553decb7097fd5d7"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5020c83e8553f770cb3b5fc13faac40f17e0b205bd237aebd21d53d733adb03"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dace81d28c787956bfbfbbfd72fdcef014f37d9b48830829e488fdb32b49d954"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:11e1022b524bd48ae56c9b4f9296bce77e15a2e42a502cceba602f804b32bb79"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3b9b4d2892fefc886f30301cdd80debd8bb01ecdf165a449eb6e78f79f0fabd6"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a96c0e790ee875d65e340ab383700e2b4891677b7fcd30a699146f9384a2bb0"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:23454ff084b07ac54ca8be535f4174170c1094a4cff78fbae4f73a4bcc0d4dab"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:87b287251ad6488e95b4f0b4a79a6d04d3ea35fde6340eb38fbd1ca9cd35bbbc"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b21dbe165081142b1232a240fc6383fd32cdd877ca6cc89eab93e5f5883e1c25"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:768cade2c2df13db52475bd28d3a3fac8c9eff04b0e9e2fda0f3760f20b3f7fc"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:d47cfb2650f0e103d4bf68b0b5804c68da97272c84bb12850d877a95c056bd67"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-win_amd64.whl", hash = "sha256:ed33ca2002a779a2e20eeb06aea7721b6e47f2d4b8a8ece979d8ba9e2a167e34"},
-    {file = "kiwisolver-1.4.8-cp311-cp311-win_arm64.whl", hash = "sha256:16523b40aab60426ffdebe33ac374457cf62863e330a90a0383639ce14bf44b2"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d6af5e8815fd02997cb6ad9bbed0ee1e60014438ee1a5c2444c96f87b8843502"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:bade438f86e21d91e0cf5dd7c0ed00cda0f77c8c1616bd83f9fc157fa6760d31"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b83dc6769ddbc57613280118fb4ce3cd08899cc3369f7d0e0fab518a7cf37fdb"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:111793b232842991be367ed828076b03d96202c19221b5ebab421ce8bcad016f"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:257af1622860e51b1a9d0ce387bf5c2c4f36a90594cb9514f55b074bcc787cfc"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:69b5637c3f316cab1ec1c9a12b8c5f4750a4c4b71af9157645bf32830e39c03a"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:782bb86f245ec18009890e7cb8d13a5ef54dcf2ebe18ed65f795e635a96a1c6a"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc978a80a0db3a66d25767b03688f1147a69e6237175c0f4ffffaaedf744055a"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:36dbbfd34838500a31f52c9786990d00150860e46cd5041386f217101350f0d3"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:eaa973f1e05131de5ff3569bbba7f5fd07ea0595d3870ed4a526d486fe57fa1b"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:a66f60f8d0c87ab7f59b6fb80e642ebb29fec354a4dfad687ca4092ae69d04f4"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:858416b7fb777a53f0c59ca08190ce24e9abbd3cffa18886a5781b8e3e26f65d"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:085940635c62697391baafaaeabdf3dd7a6c3643577dde337f4d66eba021b2b8"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-win_amd64.whl", hash = "sha256:01c3d31902c7db5fb6182832713d3b4122ad9317c2c5877d0539227d96bb2e50"},
-    {file = "kiwisolver-1.4.8-cp312-cp312-win_arm64.whl", hash = "sha256:a3c44cb68861de93f0c4a8175fbaa691f0aa22550c331fefef02b618a9dcb476"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:1c8ceb754339793c24aee1c9fb2485b5b1f5bb1c2c214ff13368431e51fc9a09"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:54a62808ac74b5e55a04a408cda6156f986cefbcf0ada13572696b507cc92fa1"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:68269e60ee4929893aad82666821aaacbd455284124817af45c11e50a4b42e3c"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:34d142fba9c464bc3bbfeff15c96eab0e7310343d6aefb62a79d51421fcc5f1b"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ddc373e0eef45b59197de815b1b28ef89ae3955e7722cc9710fb91cd77b7f47"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:77e6f57a20b9bd4e1e2cedda4d0b986ebd0216236f0106e55c28aea3d3d69b16"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:08e77738ed7538f036cd1170cbed942ef749137b1311fa2bbe2a7fda2f6bf3cc"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5ce1e481a74b44dd5e92ff03ea0cb371ae7a0268318e202be06c8f04f4f1246"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:fc2ace710ba7c1dfd1a3b42530b62b9ceed115f19a1656adefce7b1782a37794"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:3452046c37c7692bd52b0e752b87954ef86ee2224e624ef7ce6cb21e8c41cc1b"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:7e9a60b50fe8b2ec6f448fe8d81b07e40141bfced7f896309df271a0b92f80f3"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:918139571133f366e8362fa4a297aeba86c7816b7ecf0bc79168080e2bd79957"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e063ef9f89885a1d68dd8b2e18f5ead48653176d10a0e324e3b0030e3a69adeb"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-win_amd64.whl", hash = "sha256:a17b7c4f5b2c51bb68ed379defd608a03954a1845dfed7cc0117f1cc8a9b7fd2"},
-    {file = "kiwisolver-1.4.8-cp313-cp313-win_arm64.whl", hash = "sha256:3cd3bc628b25f74aedc6d374d5babf0166a92ff1317f46267f12d2ed54bc1d30"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:370fd2df41660ed4e26b8c9d6bbcad668fbe2560462cba151a721d49e5b6628c"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:84a2f830d42707de1d191b9490ac186bf7997a9495d4e9072210a1296345f7dc"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:7a3ad337add5148cf51ce0b55642dc551c0b9d6248458a757f98796ca7348712"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7506488470f41169b86d8c9aeff587293f530a23a23a49d6bc64dab66bedc71e"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f0121b07b356a22fb0414cec4666bbe36fd6d0d759db3d37228f496ed67c880"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d6d6bd87df62c27d4185de7c511c6248040afae67028a8a22012b010bc7ad062"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:291331973c64bb9cce50bbe871fb2e675c4331dab4f31abe89f175ad7679a4d7"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:893f5525bb92d3d735878ec00f781b2de998333659507d29ea4466208df37bed"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:b47a465040146981dc9db8647981b8cb96366fbc8d452b031e4f8fdffec3f26d"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:99cea8b9dd34ff80c521aef46a1dddb0dcc0283cf18bde6d756f1e6f31772165"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:151dffc4865e5fe6dafce5480fab84f950d14566c480c08a53c663a0020504b6"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:577facaa411c10421314598b50413aa1ebcf5126f704f1e5d72d7e4e9f020d90"},
-    {file = "kiwisolver-1.4.8-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:be4816dc51c8a471749d664161b434912eee82f2ea66bd7628bd14583a833e85"},
-    {file = "kiwisolver-1.4.8-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:e7a019419b7b510f0f7c9dceff8c5eae2392037eae483a7f9162625233802b0a"},
-    {file = "kiwisolver-1.4.8-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:286b18e86682fd2217a48fc6be6b0f20c1d0ed10958d8dc53453ad58d7be0bf8"},
-    {file = "kiwisolver-1.4.8-pp310-pypy310_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4191ee8dfd0be1c3666ccbac178c5a05d5f8d689bbe3fc92f3c4abec817f8fe0"},
-    {file = "kiwisolver-1.4.8-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7cd2785b9391f2873ad46088ed7599a6a71e762e1ea33e87514b1a441ed1da1c"},
-    {file = "kiwisolver-1.4.8-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c07b29089b7ba090b6f1a669f1411f27221c3662b3a1b7010e67b59bb5a6f10b"},
-    {file = "kiwisolver-1.4.8-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:65ea09a5a3faadd59c2ce96dc7bf0f364986a315949dc6374f04396b0d60e09b"},
-    {file = "kiwisolver-1.4.8.tar.gz", hash = "sha256:23d5f023bdc8c7e54eb65f03ca5d5bb25b601eac4d7f1a042888a1f45237987e"},
-]
-
-[[package]]
-name = "matplotlib"
-version = "3.10.1"
-description = "Python plotting package"
-optional = false
-python-versions = ">=3.10"
-groups = ["main"]
-files = [
-    {file = "matplotlib-3.10.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:ff2ae14910be903f4a24afdbb6d7d3a6c44da210fc7d42790b87aeac92238a16"},
-    {file = "matplotlib-3.10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0721a3fd3d5756ed593220a8b86808a36c5031fce489adb5b31ee6dbb47dd5b2"},
-    {file = "matplotlib-3.10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0673b4b8f131890eb3a1ad058d6e065fb3c6e71f160089b65f8515373394698"},
-    {file = "matplotlib-3.10.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e875b95ac59a7908978fe307ecdbdd9a26af7fa0f33f474a27fcf8c99f64a19"},
-    {file = "matplotlib-3.10.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:2589659ea30726284c6c91037216f64a506a9822f8e50592d48ac16a2f29e044"},
-    {file = "matplotlib-3.10.1-cp310-cp310-win_amd64.whl", hash = "sha256:a97ff127f295817bc34517255c9db6e71de8eddaab7f837b7d341dee9f2f587f"},
-    {file = "matplotlib-3.10.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:057206ff2d6ab82ff3e94ebd94463d084760ca682ed5f150817b859372ec4401"},
-    {file = "matplotlib-3.10.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a144867dd6bf8ba8cb5fc81a158b645037e11b3e5cf8a50bd5f9917cb863adfe"},
-    {file = "matplotlib-3.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56c5d9fcd9879aa8040f196a235e2dcbdf7dd03ab5b07c0696f80bc6cf04bedd"},
-    {file = "matplotlib-3.10.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f69dc9713e4ad2fb21a1c30e37bd445d496524257dfda40ff4a8efb3604ab5c"},
-    {file = "matplotlib-3.10.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4c59af3e8aca75d7744b68e8e78a669e91ccbcf1ac35d0102a7b1b46883f1dd7"},
-    {file = "matplotlib-3.10.1-cp311-cp311-win_amd64.whl", hash = "sha256:11b65088c6f3dae784bc72e8d039a2580186285f87448babb9ddb2ad0082993a"},
-    {file = "matplotlib-3.10.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:66e907a06e68cb6cfd652c193311d61a12b54f56809cafbed9736ce5ad92f107"},
-    {file = "matplotlib-3.10.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e9b4bb156abb8fa5e5b2b460196f7db7264fc6d62678c03457979e7d5254b7be"},
-    {file = "matplotlib-3.10.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1985ad3d97f51307a2cbfc801a930f120def19ba22864182dacef55277102ba6"},
-    {file = "matplotlib-3.10.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c96f2c2f825d1257e437a1482c5a2cf4fee15db4261bd6fc0750f81ba2b4ba3d"},
-    {file = "matplotlib-3.10.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:35e87384ee9e488d8dd5a2dd7baf471178d38b90618d8ea147aced4ab59c9bea"},
-    {file = "matplotlib-3.10.1-cp312-cp312-win_amd64.whl", hash = "sha256:cfd414bce89cc78a7e1d25202e979b3f1af799e416010a20ab2b5ebb3a02425c"},
-    {file = "matplotlib-3.10.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c42eee41e1b60fd83ee3292ed83a97a5f2a8239b10c26715d8a6172226988d7b"},
-    {file = "matplotlib-3.10.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4f0647b17b667ae745c13721602b540f7aadb2a32c5b96e924cd4fea5dcb90f1"},
-    {file = "matplotlib-3.10.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aa3854b5f9473564ef40a41bc922be978fab217776e9ae1545c9b3a5cf2092a3"},
-    {file = "matplotlib-3.10.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e496c01441be4c7d5f96d4e40f7fca06e20dcb40e44c8daa2e740e1757ad9e6"},
-    {file = "matplotlib-3.10.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:5d45d3f5245be5b469843450617dcad9af75ca50568acf59997bed9311131a0b"},
-    {file = "matplotlib-3.10.1-cp313-cp313-win_amd64.whl", hash = "sha256:8e8e25b1209161d20dfe93037c8a7f7ca796ec9aa326e6e4588d8c4a5dd1e473"},
-    {file = "matplotlib-3.10.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:19b06241ad89c3ae9469e07d77efa87041eac65d78df4fcf9cac318028009b01"},
-    {file = "matplotlib-3.10.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:01e63101ebb3014e6e9f80d9cf9ee361a8599ddca2c3e166c563628b39305dbb"},
-    {file = "matplotlib-3.10.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f06bad951eea6422ac4e8bdebcf3a70c59ea0a03338c5d2b109f57b64eb3972"},
-    {file = "matplotlib-3.10.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3dfb036f34873b46978f55e240cff7a239f6c4409eac62d8145bad3fc6ba5a3"},
-    {file = "matplotlib-3.10.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dc6ab14a7ab3b4d813b88ba957fc05c79493a037f54e246162033591e770de6f"},
-    {file = "matplotlib-3.10.1-cp313-cp313t-win_amd64.whl", hash = "sha256:bc411ebd5889a78dabbc457b3fa153203e22248bfa6eedc6797be5df0164dbf9"},
-    {file = "matplotlib-3.10.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:648406f1899f9a818cef8c0231b44dcfc4ff36f167101c3fd1c9151f24220fdc"},
-    {file = "matplotlib-3.10.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:02582304e352f40520727984a5a18f37e8187861f954fea9be7ef06569cf85b4"},
-    {file = "matplotlib-3.10.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3809916157ba871bcdd33d3493acd7fe3037db5daa917ca6e77975a94cef779"},
-    {file = "matplotlib-3.10.1.tar.gz", hash = "sha256:e8d2d0e3881b129268585bf4765ad3ee73a4591d77b9a18c214ac7e3a79fb2ba"},
-]
-
-[package.dependencies]
-contourpy = ">=1.0.1"
-cycler = ">=0.10"
-fonttools = ">=4.22.0"
-kiwisolver = ">=1.3.1"
-numpy = ">=1.23"
-packaging = ">=20.0"
-pillow = ">=8"
-pyparsing = ">=2.3.1"
-python-dateutil = ">=2.7"
-
-[package.extras]
-dev = ["meson-python (>=0.13.1,<0.17.0)", "pybind11 (>=2.13.2,!=2.13.3)", "setuptools (>=64)", "setuptools_scm (>=7)"]
-
 [[package]]
 name = "mccabe"
 version = "0.7.0"
@@ -562,7 +228,7 @@ version = "24.2"
 description = "Core utilities for Python packages"
 optional = false
 python-versions = ">=3.8"
-groups = ["main", "dev"]
+groups = ["dev"]
 files = [
     {file = "packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759"},
     {file = "packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"},
@@ -583,106 +249,6 @@ files = [
 [package.extras]
 proxy = ["pysocks"]
 
-[[package]]
-name = "pillow"
-version = "11.2.1"
-description = "Python Imaging Library (Fork)"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "pillow-11.2.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:d57a75d53922fc20c165016a20d9c44f73305e67c351bbc60d1adaf662e74047"},
-    {file = "pillow-11.2.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:127bf6ac4a5b58b3d32fc8289656f77f80567d65660bc46f72c0d77e6600cc95"},
-    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4ba4be812c7a40280629e55ae0b14a0aafa150dd6451297562e1764808bbe61"},
-    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8bd62331e5032bc396a93609982a9ab6b411c05078a52f5fe3cc59234a3abd1"},
-    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:562d11134c97a62fe3af29581f083033179f7ff435f78392565a1ad2d1c2c45c"},
-    {file = "pillow-11.2.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:c97209e85b5be259994eb5b69ff50c5d20cca0f458ef9abd835e262d9d88b39d"},
-    {file = "pillow-11.2.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:0c3e6d0f59171dfa2e25d7116217543310908dfa2770aa64b8f87605f8cacc97"},
-    {file = "pillow-11.2.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:cc1c3bc53befb6096b84165956e886b1729634a799e9d6329a0c512ab651e579"},
-    {file = "pillow-11.2.1-cp310-cp310-win32.whl", hash = "sha256:312c77b7f07ab2139924d2639860e084ec2a13e72af54d4f08ac843a5fc9c79d"},
-    {file = "pillow-11.2.1-cp310-cp310-win_amd64.whl", hash = "sha256:9bc7ae48b8057a611e5fe9f853baa88093b9a76303937449397899385da06fad"},
-    {file = "pillow-11.2.1-cp310-cp310-win_arm64.whl", hash = "sha256:2728567e249cdd939f6cc3d1f049595c66e4187f3c34078cbc0a7d21c47482d2"},
-    {file = "pillow-11.2.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:35ca289f712ccfc699508c4658a1d14652e8033e9b69839edf83cbdd0ba39e70"},
-    {file = "pillow-11.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e0409af9f829f87a2dfb7e259f78f317a5351f2045158be321fd135973fff7bf"},
-    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4e5c5edee874dce4f653dbe59db7c73a600119fbea8d31f53423586ee2aafd7"},
-    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b93a07e76d13bff9444f1a029e0af2964e654bfc2e2c2d46bfd080df5ad5f3d8"},
-    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:e6def7eed9e7fa90fde255afaf08060dc4b343bbe524a8f69bdd2a2f0018f600"},
-    {file = "pillow-11.2.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:8f4f3724c068be008c08257207210c138d5f3731af6c155a81c2b09a9eb3a788"},
-    {file = "pillow-11.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a0a6709b47019dff32e678bc12c63008311b82b9327613f534e496dacaefb71e"},
-    {file = "pillow-11.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f6b0c664ccb879109ee3ca702a9272d877f4fcd21e5eb63c26422fd6e415365e"},
-    {file = "pillow-11.2.1-cp311-cp311-win32.whl", hash = "sha256:cc5d875d56e49f112b6def6813c4e3d3036d269c008bf8aef72cd08d20ca6df6"},
-    {file = "pillow-11.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:0f5c7eda47bf8e3c8a283762cab94e496ba977a420868cb819159980b6709193"},
-    {file = "pillow-11.2.1-cp311-cp311-win_arm64.whl", hash = "sha256:4d375eb838755f2528ac8cbc926c3e31cc49ca4ad0cf79cff48b20e30634a4a7"},
-    {file = "pillow-11.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:78afba22027b4accef10dbd5eed84425930ba41b3ea0a86fa8d20baaf19d807f"},
-    {file = "pillow-11.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78092232a4ab376a35d68c4e6d5e00dfd73454bd12b230420025fbe178ee3b0b"},
-    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25a5f306095c6780c52e6bbb6109624b95c5b18e40aab1c3041da3e9e0cd3e2d"},
-    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c7b29dbd4281923a2bfe562acb734cee96bbb129e96e6972d315ed9f232bef4"},
-    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:3e645b020f3209a0181a418bffe7b4a93171eef6c4ef6cc20980b30bebf17b7d"},
-    {file = "pillow-11.2.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:b2dbea1012ccb784a65349f57bbc93730b96e85b42e9bf7b01ef40443db720b4"},
-    {file = "pillow-11.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:da3104c57bbd72948d75f6a9389e6727d2ab6333c3617f0a89d72d4940aa0443"},
-    {file = "pillow-11.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:598174aef4589af795f66f9caab87ba4ff860ce08cd5bb447c6fc553ffee603c"},
-    {file = "pillow-11.2.1-cp312-cp312-win32.whl", hash = "sha256:1d535df14716e7f8776b9e7fee118576d65572b4aad3ed639be9e4fa88a1cad3"},
-    {file = "pillow-11.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:14e33b28bf17c7a38eede290f77db7c664e4eb01f7869e37fa98a5aa95978941"},
-    {file = "pillow-11.2.1-cp312-cp312-win_arm64.whl", hash = "sha256:21e1470ac9e5739ff880c211fc3af01e3ae505859392bf65458c224d0bf283eb"},
-    {file = "pillow-11.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:fdec757fea0b793056419bca3e9932eb2b0ceec90ef4813ea4c1e072c389eb28"},
-    {file = "pillow-11.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b0e130705d568e2f43a17bcbe74d90958e8a16263868a12c3e0d9c8162690830"},
-    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bdb5e09068332578214cadd9c05e3d64d99e0e87591be22a324bdbc18925be0"},
-    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d189ba1bebfbc0c0e529159631ec72bb9e9bc041f01ec6d3233d6d82eb823bc1"},
-    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:191955c55d8a712fab8934a42bfefbf99dd0b5875078240943f913bb66d46d9f"},
-    {file = "pillow-11.2.1-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:ad275964d52e2243430472fc5d2c2334b4fc3ff9c16cb0a19254e25efa03a155"},
-    {file = "pillow-11.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:750f96efe0597382660d8b53e90dd1dd44568a8edb51cb7f9d5d918b80d4de14"},
-    {file = "pillow-11.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fe15238d3798788d00716637b3d4e7bb6bde18b26e5d08335a96e88564a36b6b"},
-    {file = "pillow-11.2.1-cp313-cp313-win32.whl", hash = "sha256:3fe735ced9a607fee4f481423a9c36701a39719252a9bb251679635f99d0f7d2"},
-    {file = "pillow-11.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:74ee3d7ecb3f3c05459ba95eed5efa28d6092d751ce9bf20e3e253a4e497e691"},
-    {file = "pillow-11.2.1-cp313-cp313-win_arm64.whl", hash = "sha256:5119225c622403afb4b44bad4c1ca6c1f98eed79db8d3bc6e4e160fc6339d66c"},
-    {file = "pillow-11.2.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:8ce2e8411c7aaef53e6bb29fe98f28cd4fbd9a1d9be2eeea434331aac0536b22"},
-    {file = "pillow-11.2.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:9ee66787e095127116d91dea2143db65c7bb1e232f617aa5957c0d9d2a3f23a7"},
-    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9622e3b6c1d8b551b6e6f21873bdcc55762b4b2126633014cea1803368a9aa16"},
-    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63b5dff3a68f371ea06025a1a6966c9a1e1ee452fc8020c2cd0ea41b83e9037b"},
-    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_28_aarch64.whl", hash = "sha256:31df6e2d3d8fc99f993fd253e97fae451a8db2e7207acf97859732273e108406"},
-    {file = "pillow-11.2.1-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:062b7a42d672c45a70fa1f8b43d1d38ff76b63421cbbe7f88146b39e8a558d91"},
-    {file = "pillow-11.2.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4eb92eca2711ef8be42fd3f67533765d9fd043b8c80db204f16c8ea62ee1a751"},
-    {file = "pillow-11.2.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f91ebf30830a48c825590aede79376cb40f110b387c17ee9bd59932c961044f9"},
-    {file = "pillow-11.2.1-cp313-cp313t-win32.whl", hash = "sha256:e0b55f27f584ed623221cfe995c912c61606be8513bfa0e07d2c674b4516d9dd"},
-    {file = "pillow-11.2.1-cp313-cp313t-win_amd64.whl", hash = "sha256:36d6b82164c39ce5482f649b437382c0fb2395eabc1e2b1702a6deb8ad647d6e"},
-    {file = "pillow-11.2.1-cp313-cp313t-win_arm64.whl", hash = "sha256:225c832a13326e34f212d2072982bb1adb210e0cc0b153e688743018c94a2681"},
-    {file = "pillow-11.2.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:7491cf8a79b8eb867d419648fff2f83cb0b3891c8b36da92cc7f1931d46108c8"},
-    {file = "pillow-11.2.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8b02d8f9cb83c52578a0b4beadba92e37d83a4ef11570a8688bbf43f4ca50909"},
-    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:014ca0050c85003620526b0ac1ac53f56fc93af128f7546623cc8e31875ab928"},
-    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3692b68c87096ac6308296d96354eddd25f98740c9d2ab54e1549d6c8aea9d79"},
-    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:f781dcb0bc9929adc77bad571b8621ecb1e4cdef86e940fe2e5b5ee24fd33b35"},
-    {file = "pillow-11.2.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:2b490402c96f907a166615e9a5afacf2519e28295f157ec3a2bb9bd57de638cb"},
-    {file = "pillow-11.2.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:dd6b20b93b3ccc9c1b597999209e4bc5cf2853f9ee66e3fc9a400a78733ffc9a"},
-    {file = "pillow-11.2.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:4b835d89c08a6c2ee7781b8dd0a30209a8012b5f09c0a665b65b0eb3560b6f36"},
-    {file = "pillow-11.2.1-cp39-cp39-win32.whl", hash = "sha256:b10428b3416d4f9c61f94b494681280be7686bda15898a3a9e08eb66a6d92d67"},
-    {file = "pillow-11.2.1-cp39-cp39-win_amd64.whl", hash = "sha256:6ebce70c3f486acf7591a3d73431fa504a4e18a9b97ff27f5f47b7368e4b9dd1"},
-    {file = "pillow-11.2.1-cp39-cp39-win_arm64.whl", hash = "sha256:c27476257b2fdcd7872d54cfd119b3a9ce4610fb85c8e32b70b42e3680a29a1e"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9b7b0d4fd2635f54ad82785d56bc0d94f147096493a79985d0ab57aedd563156"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:aa442755e31c64037aa7c1cb186e0b369f8416c567381852c63444dd666fb772"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0d3348c95b766f54b76116d53d4cb171b52992a1027e7ca50c81b43b9d9e363"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85d27ea4c889342f7e35f6d56e7e1cb345632ad592e8c51b693d7b7556043ce0"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:bf2c33d6791c598142f00c9c4c7d47f6476731c31081331664eb26d6ab583e01"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e616e7154c37669fc1dfc14584f11e284e05d1c650e1c0f972f281c4ccc53193"},
-    {file = "pillow-11.2.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:39ad2e0f424394e3aebc40168845fee52df1394a4673a6ee512d840d14ab3013"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:80f1df8dbe9572b4b7abdfa17eb5d78dd620b1d55d9e25f834efdbee872d3aed"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:ea926cfbc3957090becbcbbb65ad177161a2ff2ad578b5a6ec9bb1e1cd78753c"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:738db0e0941ca0376804d4de6a782c005245264edaa253ffce24e5a15cbdc7bd"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9db98ab6565c69082ec9b0d4e40dd9f6181dab0dd236d26f7a50b8b9bfbd5076"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:036e53f4170e270ddb8797d4c590e6dd14d28e15c7da375c18978045f7e6c37b"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:14f73f7c291279bd65fda51ee87affd7c1e097709f7fdd0188957a16c264601f"},
-    {file = "pillow-11.2.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:208653868d5c9ecc2b327f9b9ef34e0e42a4cdd172c2988fd81d62d2bc9bc044"},
-    {file = "pillow-11.2.1.tar.gz", hash = "sha256:a64dd61998416367b7ef979b73d3a85853ba9bec4c2925f74e588879a58716b6"},
-]
-
-[package.extras]
-docs = ["furo", "olefile", "sphinx (>=8.2)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinxext-opengraph"]
-fpx = ["olefile"]
-mic = ["olefile"]
-test-arrow = ["pyarrow"]
-tests = ["check-manifest", "coverage (>=7.4.2)", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout", "trove-classifiers (>=2024.10.12)"]
-typing = ["typing-extensions ; python_version < \"3.10\""]
-xmp = ["defusedxml"]
-
 [[package]]
 name = "platformdirs"
 version = "4.3.7"
@@ -731,36 +297,16 @@ files = [
 [package.dependencies]
 astroid = ">=3.3.8,<=3.4.0.dev0"
 colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""}
-dill = [
-    {version = ">=0.2", markers = "python_version < \"3.11\""},
-    {version = ">=0.3.7", markers = "python_version >= \"3.12\""},
-    {version = ">=0.3.6", markers = "python_version == \"3.11\""},
-]
+dill = {version = ">=0.3.7", markers = "python_version >= \"3.12\""}
 isort = ">=4.2.5,<5.13 || >5.13,<7"
 mccabe = ">=0.6,<0.8"
 platformdirs = ">=2.2"
-tomli = {version = ">=1.1", markers = "python_version < \"3.11\""}
 tomlkit = ">=0.10.1"
 
 [package.extras]
 spelling = ["pyenchant (>=3.2,<4.0)"]
 testutils = ["gitpython (>3)"]
 
-[[package]]
-name = "pyparsing"
-version = "3.2.3"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-optional = false
-python-versions = ">=3.9"
-groups = ["main"]
-files = [
-    {file = "pyparsing-3.2.3-py3-none-any.whl", hash = "sha256:a749938e02d6fd0b59b356ca504a24982314bb090c383e3cf201c95ef7e2bfcf"},
-    {file = "pyparsing-3.2.3.tar.gz", hash = "sha256:b9c13f1ab8b3b542f72e28f634bad4de758ab3ce4546e4301970ad6fa77c38be"},
-]
-
-[package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
-
 [[package]]
 name = "pytest"
 version = "8.3.5"
@@ -775,11 +321,9 @@ files = [
 
 [package.dependencies]
 colorama = {version = "*", markers = "sys_platform == \"win32\""}
-exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""}
 iniconfig = "*"
 packaging = "*"
 pluggy = ">=1.5,<2"
-tomli = {version = ">=1", markers = "python_version < \"3.11\""}
 
 [package.extras]
 dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
@@ -803,76 +347,6 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"]
 
-[[package]]
-name = "python-dateutil"
-version = "2.9.0.post0"
-description = "Extensions to the standard Python datetime module"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-groups = ["main"]
-files = [
-    {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
-    {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
-]
-
-[package.dependencies]
-six = ">=1.5"
-
-[[package]]
-name = "six"
-version = "1.17.0"
-description = "Python 2 and 3 compatibility utilities"
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-groups = ["main"]
-files = [
-    {file = "six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"},
-    {file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"},
-]
-
-[[package]]
-name = "tomli"
-version = "2.2.1"
-description = "A lil' TOML parser"
-optional = false
-python-versions = ">=3.8"
-groups = ["dev"]
-markers = "python_version < \"3.11\""
-files = [
-    {file = "tomli-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:678e4fa69e4575eb77d103de3df8a895e1591b48e740211bd1067378c69e8249"},
-    {file = "tomli-2.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:023aa114dd824ade0100497eb2318602af309e5a55595f76b626d6d9f3b7b0a6"},
-    {file = "tomli-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ece47d672db52ac607a3d9599a9d48dcb2f2f735c6c2d1f34130085bb12b112a"},
-    {file = "tomli-2.2.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6972ca9c9cc9f0acaa56a8ca1ff51e7af152a9f87fb64623e31d5c83700080ee"},
-    {file = "tomli-2.2.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c954d2250168d28797dd4e3ac5cf812a406cd5a92674ee4c8f123c889786aa8e"},
-    {file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8dd28b3e155b80f4d54beb40a441d366adcfe740969820caf156c019fb5c7ec4"},
-    {file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:e59e304978767a54663af13c07b3d1af22ddee3bb2fb0618ca1593e4f593a106"},
-    {file = "tomli-2.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:33580bccab0338d00994d7f16f4c4ec25b776af3ffaac1ed74e0b3fc95e885a8"},
-    {file = "tomli-2.2.1-cp311-cp311-win32.whl", hash = "sha256:465af0e0875402f1d226519c9904f37254b3045fc5084697cefb9bdde1ff99ff"},
-    {file = "tomli-2.2.1-cp311-cp311-win_amd64.whl", hash = "sha256:2d0f2fdd22b02c6d81637a3c95f8cd77f995846af7414c5c4b8d0545afa1bc4b"},
-    {file = "tomli-2.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:4a8f6e44de52d5e6c657c9fe83b562f5f4256d8ebbfe4ff922c495620a7f6cea"},
-    {file = "tomli-2.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d57ca8095a641b8237d5b079147646153d22552f1c637fd3ba7f4b0b29167a8"},
-    {file = "tomli-2.2.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e340144ad7ae1533cb897d406382b4b6fede8890a03738ff1683af800d54192"},
-    {file = "tomli-2.2.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db2b95f9de79181805df90bedc5a5ab4c165e6ec3fe99f970d0e302f384ad222"},
-    {file = "tomli-2.2.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:40741994320b232529c802f8bc86da4e1aa9f413db394617b9a256ae0f9a7f77"},
-    {file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:400e720fe168c0f8521520190686ef8ef033fb19fc493da09779e592861b78c6"},
-    {file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:02abe224de6ae62c19f090f68da4e27b10af2b93213d36cf44e6e1c5abd19fdd"},
-    {file = "tomli-2.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b82ebccc8c8a36f2094e969560a1b836758481f3dc360ce9a3277c65f374285e"},
-    {file = "tomli-2.2.1-cp312-cp312-win32.whl", hash = "sha256:889f80ef92701b9dbb224e49ec87c645ce5df3fa2cc548664eb8a25e03127a98"},
-    {file = "tomli-2.2.1-cp312-cp312-win_amd64.whl", hash = "sha256:7fc04e92e1d624a4a63c76474610238576942d6b8950a2d7f908a340494e67e4"},
-    {file = "tomli-2.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f4039b9cbc3048b2416cc57ab3bda989a6fcf9b36cf8937f01a6e731b64f80d7"},
-    {file = "tomli-2.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:286f0ca2ffeeb5b9bd4fcc8d6c330534323ec51b2f52da063b11c502da16f30c"},
-    {file = "tomli-2.2.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a92ef1a44547e894e2a17d24e7557a5e85a9e1d0048b0b5e7541f76c5032cb13"},
-    {file = "tomli-2.2.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9316dc65bed1684c9a98ee68759ceaed29d229e985297003e494aa825ebb0281"},
-    {file = "tomli-2.2.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e85e99945e688e32d5a35c1ff38ed0b3f41f43fad8df0bdf79f72b2ba7bc5272"},
-    {file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ac065718db92ca818f8d6141b5f66369833d4a80a9d74435a268c52bdfa73140"},
-    {file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d920f33822747519673ee656a4b6ac33e382eca9d331c87770faa3eef562aeb2"},
-    {file = "tomli-2.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a198f10c4d1b1375d7687bc25294306e551bf1abfa4eace6650070a5c1ae2744"},
-    {file = "tomli-2.2.1-cp313-cp313-win32.whl", hash = "sha256:d3f5614314d758649ab2ab3a62d4f2004c825922f9e370b29416484086b264ec"},
-    {file = "tomli-2.2.1-cp313-cp313-win_amd64.whl", hash = "sha256:a38aa0308e754b0e3c67e344754dff64999ff9b513e691d0e786265c93583c69"},
-    {file = "tomli-2.2.1-py3-none-any.whl", hash = "sha256:cb55c73c5f4408779d0cf3eef9f762b9c9f147a77de7b258bef0a5628adc85cc"},
-    {file = "tomli-2.2.1.tar.gz", hash = "sha256:cd45e1dc79c835ce60f7404ec8119f2eb06d38b1deba146f07ced3bbc44505ff"},
-]
-
 [[package]]
 name = "tomlkit"
 version = "0.13.2"
@@ -885,20 +359,7 @@ files = [
     {file = "tomlkit-0.13.2.tar.gz", hash = "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79"},
 ]
 
-[[package]]
-name = "typing-extensions"
-version = "4.13.2"
-description = "Backported and Experimental Type Hints for Python 3.8+"
-optional = false
-python-versions = ">=3.8"
-groups = ["dev"]
-markers = "python_version < \"3.11\""
-files = [
-    {file = "typing_extensions-4.13.2-py3-none-any.whl", hash = "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c"},
-    {file = "typing_extensions-4.13.2.tar.gz", hash = "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"},
-]
-
 [metadata]
 lock-version = "2.1"
-python-versions = ">=3.10, <3.13"
-content-hash = "4dae1746dfecc146018a0bb769eca6a3bfd4df22dec5f6cc1eff4a0bf1ae089f"
+python-versions = ">=3.12, <3.13"
+content-hash = "8cf0e37ad4078f644257790a6604931972ec7ecf92f1eb369a516bd1721fd21c"
diff --git a/pyproject.toml b/pyproject.toml
index aabc2ce..9d192a8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,14 +11,14 @@ license = "INTO-CPS Association"
 packages = [{include = "*", from="src"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10, <3.13"
+python = ">=3.12, <3.13"
 paho-mqtt = "^2.1.0"
-matplotlib = "^3.10.0"
+numpy = "^2.2.4"
 
 [tool.poetry.group.dev.dependencies]
-pylint = "^3.3.3"
-pytest = "^8.3.4"
-pytest-cov = "^6.0.0"
+pylint = "^3.3.6"
+pytest = "^8.3.5"
+pytest-cov = "^6.1.1"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index e321e7d..3a1d199 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -1,5 +1,5 @@
 import threading
-import numpy as np #type: ignore
+import numpy as np
 
 #project imports
 from data.accel.hbk.accelerometer import Accelerometer  # type: ignore

From 1818fb703823358137382942d396c1531251dff1 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Sun, 13 Apr 2025 12:14:37 +0200
Subject: [PATCH 09/18] ignore duplicated topics

---
 src/data/accel/hbk/aligner.py | 16 +++++++++-------
 src/examples/experiment_2.py  |  6 ++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index 3a1d199..86f0166 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -23,14 +23,16 @@ def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.n
 
         self.channels = []
         self._lock = threading.Lock()
-
-        # Create one Accelerometer per topic
+        seen = set()
+        # Create one Accelerometer per uniqe topic
         for topic in topics:
-            acc = Accelerometer(mqtt_client, topic=topic, map_size=map_size)
-            self.channels.append(acc)
-            mqtt_client.subscribe(topic, qos=1)
-            mqtt_client.message_callback_add(topic, lambda _, __,
-                                              msg, acc=acc: acc.process_message(msg))
+            if topic not in seen:
+                seen.add(topic)
+                acc = Accelerometer(mqtt_client, topic=topic, map_size=map_size)
+                self.channels.append(acc)
+                mqtt_client.subscribe(topic, qos=1)
+                mqtt_client.message_callback_add(topic, lambda _, __,
+                                                msg, acc=acc: acc.process_message(msg))
 
 
     def find_continuous_key_groups(self):
diff --git a/src/examples/experiment_2.py b/src/examples/experiment_2.py
index c213118..fea6689 100644
--- a/src/examples/experiment_2.py
+++ b/src/examples/experiment_2.py
@@ -10,7 +10,7 @@ def main():
     mqtt_config = config["MQTT"]
 
 
-    topic_indexes = [0,1] # Indexes of the topics/channels to align
+    topic_indexes = [1,1,0,1,0] # Indexes of the topics/channels to align
 
     # Resolve topic names from config
     all_topics = config["MQTT"]["TopicsToSubscribe"]
@@ -20,14 +20,12 @@ def main():
     mqtt_client.connect(mqtt_config["host"], mqtt_config["port"], 60)
     mqtt_client.loop_start()
 
-    # We might need to give it some time before strating alignment,
-                # so we make sure that there is enough data to align.
 
     # pass actual topic as string
     aligner = Aligner(mqtt_client, topics=selected_topics, map_size=2560)
 
     while True:
-        time.sleep(5)
+        time.sleep(1)
         data = aligner.extract(16)
         if data.shape[0] == 0:
             print("Not enough aligned data yet.")

From b515b0d095bcc8a5ed53a8a328b309dd0f6bd690 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Sun, 13 Apr 2025 14:34:02 +0200
Subject: [PATCH 10/18] data_map access

---
 src/data/accel/hbk/accelerometer.py |  77 ++++++++++++++++++--
 src/data/accel/hbk/aligner.py       | 109 ++++++++++++++--------------
 tests/data/sources/test_mqtt.py     |  54 +++++++++++++-
 3 files changed, 179 insertions(+), 61 deletions(-)

diff --git a/src/data/accel/hbk/accelerometer.py b/src/data/accel/hbk/accelerometer.py
index c243db9..5080900 100644
--- a/src/data/accel/hbk/accelerometer.py
+++ b/src/data/accel/hbk/accelerometer.py
@@ -1,7 +1,9 @@
 import threading
 import struct
 from collections import deque
+from typing import Tuple, Any, Optional, List
 import numpy as np
+import paho.mqtt.client as mqtt
 
 # Project Imports
 from data.accel.accelerometer import IAccelerometer
@@ -12,7 +14,7 @@
 class Accelerometer(IAccelerometer):
     def __init__(
         self,
-        mqtt_client,
+        mqtt_client: mqtt.Client,
         topic: str = "cpsens/d8-3a-dd-f5-92-48/cpsns_Simulator/1/acc/raw/data",
         map_size: int = MAX_MAP_SIZE ):
 
@@ -35,7 +37,8 @@ def __init__(
         # Setting up MQTT callback
         self.mqtt_client.on_message = self._on_message
 
-    def _on_message(self, _, __, msg):
+    # pylint: disable=unused-argument
+    def _on_message(self, client: Any, userdata: Any, msg: mqtt.MQTTMessage) -> None:
         """Handles incoming MQTT messages."""
         print(f"Received message on topic {msg.topic}")
 
@@ -48,7 +51,7 @@ def safe_process():  # This ensures that an exception does not crash the entire
         threading.Thread(target=safe_process, daemon=True).start()
 
 
-    def process_message(self, msg):
+    def process_message(self, msg: mqtt.MQTTMessage) -> None:
         """
             Processes incoming MQTT messages, extracts accelerometer data,
             and stores it in a dictionary of FIFO queues.
@@ -91,7 +94,71 @@ def process_message(self, msg):
             print(f"Error processing message: {e}")
 
 
-    def read(self, requested_samples: int) -> (int, np.ndarray):
+
+    def get_batch_size(self) -> Optional[int]:
+        """
+        Returns the number of samples in the first available data batch.
+        Useful for determining alignment batch size.
+        """
+        with self._lock:
+            if not self.data_map:
+                return None
+            first_key = next(iter(self.data_map))
+            return len(self.data_map[first_key])
+
+    def get_sorted_keys(self) -> List[int]:
+        """
+        Returns the sorted list of sample keys currently available.
+        """
+        with self._lock:
+            return sorted(self.data_map.keys())
+
+
+    def get_samples_for_key(self, key: int) -> Optional[List[float]]:
+        """
+        Returns a copy of the sample list for a given key,
+        or None if the key is not present.
+        """
+        with self._lock:
+            if key in self.data_map:
+                return list(self.data_map[key])
+            return None
+
+    def clear_used_data(self, start_key: int, samples_to_remove: int) -> None:
+        """
+        Deletes all keys older than `start_key` and consumes `samples_to_remove`
+        samples starting from `start_key`, across subsequent keys in order.
+        """
+        with self._lock:
+            # Delete older keys
+            keys_to_delete = [k for k in self.data_map if k < start_key]
+            for k in keys_to_delete:
+                del self.data_map[k]
+
+            # Remove samples from start_key and onwards until all samples used are removed
+            keys = sorted(k for k in self.data_map if k >= start_key)
+            remaining_to_remove = samples_to_remove
+
+            for key in keys:
+                if remaining_to_remove <= 0:
+                    break
+                dq = self.data_map[key]
+                num_available = len(dq)
+                num_to_remove = min(remaining_to_remove, num_available)
+
+                for _ in range(num_to_remove):
+                    dq.popleft()
+
+                if not dq:
+                    del self.data_map[key]
+
+                remaining_to_remove -= num_to_remove
+
+
+
+
+
+    def read(self, requested_samples: int) -> Tuple[(int, np.ndarray)]:
         """
         Reads the oldest accelerometer data from the FIFO buffer and removes only the read samples.
 
@@ -134,5 +201,5 @@ def read(self, requested_samples: int) -> (int, np.ndarray):
         return status, samples
 
 
-    def acquire_lock(self)->(threading.Lock):
+    def acquire_lock(self)-> threading.Lock:
         return self._lock
diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index 86f0166..56d2997 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -1,6 +1,8 @@
 import threading
+from typing import List, Tuple, Optional
 import numpy as np
 
+
 #project imports
 from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
 
@@ -25,42 +27,41 @@ def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.n
         self._lock = threading.Lock()
         seen = set()
         # Create one Accelerometer per uniqe topic
-        for topic in topics:
-            if topic not in seen:
-                seen.add(topic)
-                acc = Accelerometer(mqtt_client, topic=topic, map_size=map_size)
-                self.channels.append(acc)
-                mqtt_client.subscribe(topic, qos=1)
-                mqtt_client.message_callback_add(topic, lambda _, __,
-                                                msg, acc=acc: acc.process_message(msg))
+        unique_topics = [topic for topic in topics if not (topic in seen or seen.add(topic))]
+        for topic in unique_topics:
+            seen.add(topic)
+            acc = Accelerometer(mqtt_client, topic=topic, map_size=map_size)
+            self.channels.append(acc)
+            mqtt_client.subscribe(topic, qos=1)
+            mqtt_client.message_callback_add(topic, lambda _, __,
+                                            msg, acc=acc: acc.process_message(msg))
 
 
-    def find_continuous_key_groups(self):
+    def find_continuous_key_groups(self) -> Tuple[Optional[int], Optional[List[List[int]]]]:
         """
         Determines the batch size, finds common keys, and groups them into continuous sequences.
         Returns:
             tuple: (batch_size, grouped_keys) or (None, None) if data is insufficient.
-            example of grouped keys: [[96, 128, 160, 192, 224, 256, 288, 320, 352, 384]]
         """
         if not self.channels:
             return None, None
 
-        # Step 1: Determine batch size (By using the length of data samples in first messages,
-                                # so all messages should contain the same number of data samples)
+        # Get the batch size from any channel
         batch_size = None
         for ch in self.channels:
-            if ch.data_map:
-                first_key = next(iter(ch.data_map))
-                batch_size = len(ch.data_map[first_key])
+            batch_size = ch.get_batch_size()
+            if batch_size is not None:
                 break
         if batch_size is None:
             return None, None
 
-        # Step 2: Find common keys across channels
-        key_sets = [set(ch.data_map.keys()) for ch in self.channels]
+        # Get common keys across all channels
+        key_sets = [set(ch.get_sorted_keys()) for ch in self.channels]
+        if not key_sets:
+            return None, None
         common_keys = sorted(set.intersection(*key_sets))
 
-        # Step 3: Group keys into continuous sequences
+        # Group keys into continuous sequences
         key_groups = []
         current_group = []
 
@@ -77,62 +78,60 @@ def find_continuous_key_groups(self):
 
         return batch_size, key_groups
 
-
     def extract(self, requested_samples: int) -> np.ndarray:
         """
         Extracts a specified number of aligned samples from all channels.
 
         This method:
             1. Uses `find_continuous_key_groups()` to determine batch size 
-                                    and group keys into continuous aligned blocks.
-            2. Searches for the first key group that contains enough samples.
-            3. Collects aligned samples across all channels.
-            4. Cleans up old and used data from each channel's buffer.
+            and group keys into continuous aligned blocks.
+            2. Selects the first group that has enough samples.
+            3. Collects aligned samples across all channels using their accessors.
+            4. Cleans up used and older data via `clear_used_data()` on each Accelerometer.
 
         Parameters:
             requested_samples (int): The total number of samples to extract across all channels.
 
         Returns:
             np.ndarray: A 2D NumPy array of shape 
-                    (channels, requested_samples) containing aligned data.
+                        (channels, requested_samples) containing aligned data.
                         Returns an empty array if alignment is not possible.
         """
         with self._lock:
             batch_size, key_groups = self.find_continuous_key_groups()
-            print("Keys",key_groups)
+            print("Keys", key_groups)
+
             if batch_size is None or not key_groups:
                 return np.empty((0, len(self.channels)), dtype=np.float32)
 
-            # Pick the first group that gives us enough samples
             for group in key_groups:
                 total_samples = len(group) * batch_size
-                if total_samples >= requested_samples:
-                    aligned_data = [[] for _ in self.channels]
-                    samples_collected = 0
-
-                    for key in group:
-                        entries = [list(ch.data_map[key]) for ch in self.channels]
-                        for i in range(batch_size):
-                            if samples_collected >= requested_samples:
-                                break
-                            for ch_idx, channel_data in enumerate(entries):
-                                aligned_data[ch_idx].append(channel_data[i])
-                            samples_collected += 1
-
-                    # Delete used and older data
-                    for ch in self.channels:
-                        for k in list(ch.data_map.keys()):
-                            if k < group[0]:
-                                del ch.data_map[k]
-                            elif k in group:
-                                for _ in range(min(requested_samples, len(ch.data_map[k]))):
-                                    ch.data_map[k].popleft()
-                                if not ch.data_map[k]:
-                                    del ch.data_map[k]
-
-                    aligned_array = np.array(aligned_data, dtype=np.float32)
-                    print(f"Aligned shape: {aligned_array.shape}")
-                    return aligned_array
-
-            # No group had enough samples
+                if total_samples < requested_samples:
+                    continue  # Skip groups that don't have enough samples
+
+                # Proceed with aligned extraction
+                aligned_data = [[] for _ in self.channels]
+                samples_collected = 0
+
+                for key in group:
+                    entries = [ch.get_samples_for_key(key) for ch in self.channels]
+
+                    for i in range(batch_size):
+                        if samples_collected >= requested_samples:
+                            break
+                        for ch_idx, channel_data in enumerate(entries):
+                            aligned_data[ch_idx].append(channel_data[i])
+                        samples_collected += 1
+
+                    if samples_collected >= requested_samples:
+                        break
+
+                # Clean up used and older data
+                for ch in self.channels:
+                    ch.clear_used_data(group[0], requested_samples)
+
+                aligned_array = np.array(aligned_data, dtype=np.float32)
+                print(f"Aligned shape: {aligned_array.shape}")
+                return aligned_array
+
             return np.empty((0, len(self.channels)), dtype=np.float32)
diff --git a/tests/data/sources/test_mqtt.py b/tests/data/sources/test_mqtt.py
index 6779de8..b6dc1dd 100644
--- a/tests/data/sources/test_mqtt.py
+++ b/tests/data/sources/test_mqtt.py
@@ -1,15 +1,67 @@
 import io
 import os
+import json
 import pytest
 from unittest.mock import MagicMock
 
+
+from data.sources import mqtt
 from data.sources.mqtt import (
     create_on_connect_callback,
     create_on_subscribe_callback,
     create_on_message_callback,
     create_on_publish_callback,
-    setup_mqtt_client
+    setup_mqtt_client,
+    load_config
 )
+def test_load_config_success(tmp_path):
+    config_data = {"key": "value"}
+    config_file = tmp_path / "config.json"
+    config_file.write_text(json.dumps(config_data), encoding="utf-8")
+
+    loaded = load_config(str(config_file))
+    assert loaded == config_data
+
+
+def test_load_config_file_not_found():
+    with pytest.raises(FileNotFoundError):
+        load_config("non_existing_config.json")
+
+
+
+def test_load_config_invalid_json(tmp_path):
+    invalid_file = tmp_path / "bad_config.json"
+    invalid_file.write_text("{invalid_json: True", encoding="utf-8")
+    with pytest.raises(ValueError):
+        load_config(str(invalid_file))
+
+
+def test_load_config_unexpected_exception(monkeypatch):
+
+    def bad_open(*args, **kwargs):
+        raise OSError("Unexpected OS error")
+
+    monkeypatch.setattr("builtins.open", bad_open)
+
+    with pytest.raises(RuntimeError):
+        mqtt.load_config("config.json")
+
+
+def test_setup_mqtt_client_invalid_index():
+    dummy_config = {
+        "ClientID": "test_client",
+        "userId": "test_user",
+        "password": "test_pass",
+        "TopicsToSubscribe": ["topic1"],
+        "QoS": 1,
+        "host": "localhost",
+        "port": 1883
+    }
+
+    with pytest.raises(ValueError):
+        setup_mqtt_client(dummy_config, topic_index=5)
+
+
 
 def test_on_connect_callback_success():
     topics = ["test/topic1", "test/topic2"]

From 92ca1f91ec29cb79236949c9ef1f110bd2fb050b Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Sun, 13 Apr 2025 20:34:22 +0200
Subject: [PATCH 11/18] changed test directory

---
 tests/{ => integration}/data/accel/hbk/constants.py    |  0
 .../data/accel/hbk/test_accelerometer.py               |  0
 tests/{ => integration}/data/accel/hbk/test_aligner.py | 10 ----------
 tests/{ => integration}/data/sources/test_mqtt.py      |  0
 4 files changed, 10 deletions(-)
 rename tests/{ => integration}/data/accel/hbk/constants.py (100%)
 rename tests/{ => integration}/data/accel/hbk/test_accelerometer.py (100%)
 rename tests/{ => integration}/data/accel/hbk/test_aligner.py (99%)
 rename tests/{ => integration}/data/sources/test_mqtt.py (100%)

diff --git a/tests/data/accel/hbk/constants.py b/tests/integration/data/accel/hbk/constants.py
similarity index 100%
rename from tests/data/accel/hbk/constants.py
rename to tests/integration/data/accel/hbk/constants.py
diff --git a/tests/data/accel/hbk/test_accelerometer.py b/tests/integration/data/accel/hbk/test_accelerometer.py
similarity index 100%
rename from tests/data/accel/hbk/test_accelerometer.py
rename to tests/integration/data/accel/hbk/test_accelerometer.py
diff --git a/tests/data/accel/hbk/test_aligner.py b/tests/integration/data/accel/hbk/test_aligner.py
similarity index 99%
rename from tests/data/accel/hbk/test_aligner.py
rename to tests/integration/data/accel/hbk/test_aligner.py
index 931222c..ed5effe 100644
--- a/tests/data/accel/hbk/test_aligner.py
+++ b/tests/integration/data/accel/hbk/test_aligner.py
@@ -76,13 +76,6 @@ def publish_samples(client, topic, values: np.ndarray, start_key: int):
     print(f"[PUBLISH DEBUG] Topic: {topic}, Start key: {start_key}, Batch size: {len(batch_values)}")
 
 
-
-
-
-
-
-
-
 def test_aligner_continuous_block_required(mqtt_setup):
     client, topics = mqtt_setup
     aligner = Aligner(client, topics=topics, map_size=512)
@@ -105,9 +98,6 @@ def test_aligner_continuous_block_required(mqtt_setup):
     assert np.allclose(aligned[2, :5], np.arange(5)), "Check data from channel 3"
 
 
-# TODO: Check specifc data
-
-
 
 
 def test_aligner_extract_removes_used_and_older_data(mqtt_setup):
diff --git a/tests/data/sources/test_mqtt.py b/tests/integration/data/sources/test_mqtt.py
similarity index 100%
rename from tests/data/sources/test_mqtt.py
rename to tests/integration/data/sources/test_mqtt.py

From c183ff1b21a1d6e71cf338d29cb1364ec4112de6 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Sun, 13 Apr 2025 20:36:19 +0200
Subject: [PATCH 12/18] minor change to aligner

---
 src/data/accel/hbk/aligner.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index 56d2997..b88eed7 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -52,12 +52,10 @@ def find_continuous_key_groups(self) -> Tuple[Optional[int], Optional[List[List[
             batch_size = ch.get_batch_size()
             if batch_size is not None:
                 break
-        if batch_size is None:
-            return None, None
 
         # Get common keys across all channels
         key_sets = [set(ch.get_sorted_keys()) for ch in self.channels]
-        if not key_sets:
+        if not key_sets or batch_size is None:
             return None, None
         common_keys = sorted(set.intersection(*key_sets))
 
@@ -101,21 +99,16 @@ def extract(self, requested_samples: int) -> np.ndarray:
             batch_size, key_groups = self.find_continuous_key_groups()
             print("Keys", key_groups)
 
-            if batch_size is None or not key_groups:
-                return np.empty((0, len(self.channels)), dtype=np.float32)
-
             for group in key_groups:
                 total_samples = len(group) * batch_size
                 if total_samples < requested_samples:
                     continue  # Skip groups that don't have enough samples
-
                 # Proceed with aligned extraction
                 aligned_data = [[] for _ in self.channels]
                 samples_collected = 0
 
                 for key in group:
                     entries = [ch.get_samples_for_key(key) for ch in self.channels]
-
                     for i in range(batch_size):
                         if samples_collected >= requested_samples:
                             break

From 60cbeccfc5393c44abec6479e7fc325f1fce9087 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Mon, 14 Apr 2025 12:53:30 +0200
Subject: [PATCH 13/18] unit_tests

---
 src/data/accel/hbk/aligner.py                 |   3 +
 .../data/accel/hbk/test_accelerometer_unit.py | 198 ++++++++++++++++++
 .../unit/data/accel/hbk/test_aligner_unit.py  | 120 +++++++++++
 3 files changed, 321 insertions(+)
 create mode 100644 tests/unit/data/accel/hbk/test_accelerometer_unit.py
 create mode 100644 tests/unit/data/accel/hbk/test_aligner_unit.py

diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index b88eed7..707b1b5 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -99,6 +99,9 @@ def extract(self, requested_samples: int) -> np.ndarray:
             batch_size, key_groups = self.find_continuous_key_groups()
             print("Keys", key_groups)
 
+            if batch_size is None or key_groups is None:
+                return np.empty((0, len(self.channels)), dtype=np.float32)
+            
             for group in key_groups:
                 total_samples = len(group) * batch_size
                 if total_samples < requested_samples:
diff --git a/tests/unit/data/accel/hbk/test_accelerometer_unit.py b/tests/unit/data/accel/hbk/test_accelerometer_unit.py
new file mode 100644
index 0000000..1bc2bba
--- /dev/null
+++ b/tests/unit/data/accel/hbk/test_accelerometer_unit.py
@@ -0,0 +1,198 @@
+import struct
+import threading
+import pytest
+import numpy as np
+from unittest.mock import MagicMock
+from data.accel.hbk.accelerometer import Accelerometer
+from data.accel.metadata_constants import DESCRIPTOR_LENGTH_BYTES
+
+
+
+@pytest.fixture
+def mock_mqtt_client():
+    return MagicMock()
+
+
+@pytest.fixture
+def test_accelerometer(mock_mqtt_client):
+    return Accelerometer(mock_mqtt_client, topic="test/topic", map_size=128)
+
+
+class MockMQTTMessage:
+    def __init__(self, topic, payload):
+        self.topic = topic
+        self.payload = payload
+
+
+def make_mock_payload(start_key: int, num_samples: int = 32) -> bytes:
+    descriptor_length = 28
+    descriptor = struct.pack("<H H Q Q Q", descriptor_length, 1, 0, 0, start_key)
+    data = struct.pack(f"<{num_samples}f", *[float(i + start_key) for i in range(num_samples)])
+    return descriptor + data
+
+
+def test_process_message_stores_data(test_accelerometer):
+    key = 0
+    payload = make_mock_payload(key)
+    msg = MockMQTTMessage(topic="test/topic", payload=payload)
+
+    test_accelerometer.process_message(msg)
+
+    keys = test_accelerometer.get_sorted_keys()
+    assert keys == [key]
+    samples = test_accelerometer.get_samples_for_key(key)
+    assert samples == [float(i + key) for i in range(32)]  
+
+
+def test_get_batch_size(test_accelerometer):
+    payload = make_mock_payload(200)
+    msg = MockMQTTMessage("test/topic", payload)
+    test_accelerometer.process_message(msg)
+
+    batch_size = test_accelerometer.get_batch_size()
+    assert batch_size == 32
+
+
+
+
+
+def test_clear_used_data_removes_samples_and_keys(test_accelerometer):
+    # Add three batches: 0–31, 32–63, 64–95
+    for i in range(3):
+        msg = MockMQTTMessage("test/topic", make_mock_payload(i * 32))
+        test_accelerometer.process_message(msg)
+
+    assert len(test_accelerometer.get_sorted_keys()) == 3
+
+    # Remove 50 samples starting from key 32
+    test_accelerometer.clear_used_data(32, 50)
+
+    remaining_keys = test_accelerometer.get_sorted_keys()
+    assert 0 not in remaining_keys
+
+    remaining_samples = sum(len(test_accelerometer.get_samples_for_key(k)) for k in remaining_keys)
+    print(f"Remaining keys: {remaining_keys}")
+    print(f"Remaining samples: {remaining_samples}")
+
+    # Batch at key 32: 32 samples
+    # Batch at key 64: 32 samples
+    # We removed 50 → should leave 64 - 50 = 14
+    assert remaining_samples == 14
+
+
+
+
+
+
+
+def test_read_fewer_than_available(test_accelerometer):
+    for i in range(3):
+        msg = MockMQTTMessage("test/topic", make_mock_payload(i * 32))
+        test_accelerometer.process_message(msg)
+
+    status, data = test_accelerometer.read(50)
+    assert status == 1
+    assert data.shape == (50,)
+    assert np.allclose(data, np.arange(50))
+
+
+def test_read_more_than_available_returns_partial(test_accelerometer):
+    for i in range(2):
+        msg = MockMQTTMessage("test/topic", make_mock_payload(i * 32))
+        test_accelerometer.process_message(msg)
+
+    status, data = test_accelerometer.read(96)
+    assert status == 0
+    assert data.shape == (64,)
+    assert np.allclose(data, np.arange(64))
+
+
+def test_get_samples_for_nonexistent_key_returns_none(test_accelerometer):
+    assert test_accelerometer.get_samples_for_key(1234) is None
+
+def test_get_batch_size_returns_none_when_empty(test_accelerometer):
+    assert test_accelerometer.get_batch_size() is None
+
+
+
+
+
+
+def test_on_message_invokes_process_in_thread(test_accelerometer, mocker):
+    msg = MockMQTTMessage("test/topic", make_mock_payload(0))
+    process_mock = mocker.patch.object(test_accelerometer, "process_message")
+    thread_mock = mocker.patch("threading.Thread")
+
+    test_accelerometer._on_message(None, None, msg)
+
+    thread_mock.assert_called_once()
+    assert thread_mock.call_args.kwargs["target"].__name__ == "safe_process"
+    assert thread_mock.call_args.kwargs["daemon"] is True
+
+
+def test_process_message_handles_short_payload(test_accelerometer, capsys):
+    msg = MockMQTTMessage("test/topic", b"too short")
+    test_accelerometer.process_message(msg)
+    captured = capsys.readouterr()
+    assert "Error processing message" in captured.out
+
+
+def test_clear_used_data_across_many_keys(test_accelerometer):
+    # Add 4 keys of 16 samples each = 64 samples
+    for i in range(4):
+        msg = MockMQTTMessage("test/topic", make_mock_payload(i * 16, num_samples=16))
+        test_accelerometer.process_message(msg)
+
+    keys_before = test_accelerometer.get_sorted_keys()
+    assert len(keys_before) == 4
+
+    test_accelerometer.clear_used_data(start_key=16, samples_to_remove=48)
+
+    keys_after = test_accelerometer.get_sorted_keys()
+    assert 0 not in keys_after
+    remaining_samples = sum(len(test_accelerometer.get_samples_for_key(k)) for k in keys_after)
+    assert remaining_samples == 0  # Because the first 16 is considered outdated, and got deleted also.
+
+
+def test_read_across_batches(test_accelerometer):
+    # Add 3 keys with 20 samples each = 60 total
+    for i in range(3):
+        msg = MockMQTTMessage("test/topic", make_mock_payload(i * 20, num_samples=20))
+        test_accelerometer.process_message(msg)
+
+    status, data = test_accelerometer.read(50)
+    assert status == 1
+    assert data.shape == (50,)
+    assert np.allclose(data, np.arange(50))
+
+
+def test_acquire_lock_returns_threading_lock(test_accelerometer):
+    lock = test_accelerometer.acquire_lock()
+    assert isinstance(lock, type(threading.Lock()))
+
+
+def test_process_message_triggers_eviction_when_map_size_exceeded():
+
+    acc = Accelerometer(mqtt_client=MagicMock(), topic="test/topic", map_size=64)
+
+    # Add three batches: each has 32 samples (total 96), map_size is 64 → should trigger eviction
+    for key in [0, 32, 64]:
+        payload = make_mock_payload(key)
+        msg = MockMQTTMessage(topic="test/topic", payload=payload)
+        acc.process_message(msg)
+
+    # Now only the two newest batches (32 and 64) should remain
+    keys = acc.get_sorted_keys()
+    assert keys == [32, 64], f"Eviction did not occur correctly. Remaining keys: {keys}"
+
+
+
+def test_clear_used_data_with_zero_samples_to_remove_does_nothing(test_accelerometer):
+    # Add a single batch
+    msg = MockMQTTMessage("test/topic", make_mock_payload(0))
+    test_accelerometer.process_message(msg)
+
+    test_accelerometer.clear_used_data(0, 0)
+    # Data should remain untouched
+    assert test_accelerometer.get_sorted_keys() == [0]
+    assert test_accelerometer.get_samples_for_key(0) == [float(i) for i in range(32)]
diff --git a/tests/unit/data/accel/hbk/test_aligner_unit.py b/tests/unit/data/accel/hbk/test_aligner_unit.py
new file mode 100644
index 0000000..5881eaf
--- /dev/null
+++ b/tests/unit/data/accel/hbk/test_aligner_unit.py
@@ -0,0 +1,120 @@
+import pytest
+import numpy as np
+from unittest.mock import MagicMock, patch
+from data.accel.hbk.aligner import Aligner  # type: ignore
+
+
+@pytest.fixture
+def mock_accelerometers():
+    accelerometers = []
+    for ch_idx in range(3):
+        acc = MagicMock()
+        acc.get_batch_size.return_value = 4
+        acc.get_sorted_keys.return_value = [0, 4, 8, 12, 16]
+        acc.get_samples_for_key.side_effect = lambda key, ch=ch_idx: [float(key + i) for i in range(4)]
+        acc.clear_used_data = MagicMock()
+        accelerometers.append(acc)
+    return accelerometers
+
+
+@pytest.fixture
+def aligner_with_mock_channels(mock_accelerometers):
+    with patch("data.accel.hbk.aligner.Accelerometer", side_effect=mock_accelerometers):
+        client = MagicMock()
+        topics = ["topic1", "topic2", "topic3"]
+        aligner = Aligner(client, topics)
+    return aligner, mock_accelerometers
+
+
+def test_find_continuous_key_groups(aligner_with_mock_channels):
+    aligner, _ = aligner_with_mock_channels
+    batch_size, groups = aligner.find_continuous_key_groups()
+
+    assert batch_size == 4
+    assert groups == [[0, 4, 8, 12, 16]]
+
+
+def test_extract_with_enough_samples(aligner_with_mock_channels):
+    aligner, accelerometers = aligner_with_mock_channels
+
+    result = aligner.extract(8)
+
+    assert result.shape == (3, 8)
+    expected = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0]
+    assert np.allclose(result[0], expected)
+
+    for acc in accelerometers:
+        acc.clear_used_data.assert_called_once_with(0, 8)
+
+
+def test_extract_too_few_samples_returns_empty(aligner_with_mock_channels):
+    aligner, _ = aligner_with_mock_channels
+
+    result = aligner.extract(200)  # more than available
+    assert result.shape == (0, 3)
+
+
+def test_find_continuous_key_groups_no_channels():
+    aligner = Aligner(mqtt_client=MagicMock(), topics=[])
+    batch_size, key_groups = aligner.find_continuous_key_groups()
+    assert batch_size is None and key_groups is None
+
+def test_find_continuous_key_groups_handles_last_group():
+    aligner = Aligner(mqtt_client=MagicMock(), topics=["t1", "t2"])
+    
+    ch1 = MagicMock()
+    ch2 = MagicMock()
+    ch1.get_batch_size.return_value = 4
+    ch2.get_batch_size.return_value = 4
+    ch1.get_sorted_keys.return_value = [0, 4, 8]
+    ch2.get_sorted_keys.return_value = [0, 4, 8]
+    aligner.channels = [ch1, ch2]
+
+    batch_size, groups = aligner.find_continuous_key_groups()
+    assert groups == [[0, 4, 8]]
+
+def test_find_continuous_key_groups_returns_none_when_batch_size_none():
+    ch = MagicMock()
+    ch.get_batch_size.return_value = None
+    ch.get_sorted_keys.return_value = [0, 32]
+
+    aligner = Aligner(mqtt_client=MagicMock(), topics=[])
+    aligner.channels = [ch]
+
+    batch_size, key_groups = aligner.find_continuous_key_groups()
+    assert batch_size is None
+    assert key_groups is None
+
+
+
+def test_extract_skips_initial_and_gaps_until_valid_block(aligner_with_mock_channels):
+    aligner, accelerometers = aligner_with_mock_channels
+
+    # Total keys in the system
+    partial_keys = [0, 16, 32]  # Only 48 samples — should be ignored
+    missing_keys = [48, 64]     # Break continuity
+    valid_keys = [80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240]  
+    all_keys = partial_keys + valid_keys
+
+    batch_size = 16
+    required_samples = 128
+    required_keys = required_samples // batch_size  # 8
+
+    for acc in accelerometers:
+        acc.get_batch_size.return_value = batch_size
+        acc.get_sorted_keys.return_value = all_keys
+        acc.clear_used_data = MagicMock()
+        acc.get_samples_for_key.side_effect = lambda key: [float(key + i) for i in range(batch_size)]
+
+    # Extract 128 samples
+    result = aligner.extract(required_samples)
+
+    # Assert correct shape
+    assert result.shape == (3, 128), f"Expected (3, 128), got {result.shape}"
+
+    # Expect samples from the first aligned block starting at key 80
+    expected_values = [float(80 + i) for i in range(128)]
+    actual_values = result[0].tolist()
+
+    assert np.allclose(actual_values, expected_values), \
+        f"Expected starting from 80, got {actual_values[:10]}"

From cf4f69742245fdc577b6b947bec3db7041d37e80 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:04:20 +0200
Subject: [PATCH 14/18] aligner now also returns UTC.

---
 src/data/accel/hbk/aligner.py | 12 ++++++++----
 src/examples/experiment_2.py  |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index 707b1b5..1c8d875 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -1,5 +1,6 @@
 import threading
 from typing import List, Tuple, Optional
+from datetime import datetime, timedelta
 import numpy as np
 
 
@@ -91,9 +92,10 @@ def extract(self, requested_samples: int) -> np.ndarray:
             requested_samples (int): The total number of samples to extract across all channels.
 
         Returns:
-            np.ndarray: A 2D NumPy array of shape 
-                        (channels, requested_samples) containing aligned data.
-                        Returns an empty array if alignment is not possible.
+           tuple: (aligned_data, utc_timestamp)
+                   aligned_data is a NumPy array of shape (channels, requested_samples)
+                   utc_timestamp is the UTC time of the first aligned sample.
+            Returns an empty array if alignment is not possible.
         """
         with self._lock:
             batch_size, key_groups = self.find_continuous_key_groups()
@@ -109,6 +111,8 @@ def extract(self, requested_samples: int) -> np.ndarray:
                 # Proceed with aligned extraction
                 aligned_data = [[] for _ in self.channels]
                 samples_collected = 0
+                utc_time = datetime.utcnow()
+
 
                 for key in group:
                     entries = [ch.get_samples_for_key(key) for ch in self.channels]
@@ -128,6 +132,6 @@ def extract(self, requested_samples: int) -> np.ndarray:
 
                 aligned_array = np.array(aligned_data, dtype=np.float32)
                 print(f"Aligned shape: {aligned_array.shape}")
-                return aligned_array
+                return aligned_array, utc_time
 
             return np.empty((0, len(self.channels)), dtype=np.float32)
diff --git a/src/examples/experiment_2.py b/src/examples/experiment_2.py
index fea6689..2931691 100644
--- a/src/examples/experiment_2.py
+++ b/src/examples/experiment_2.py
@@ -26,10 +26,11 @@ def main():
 
     while True:
         time.sleep(1)
-        data = aligner.extract(16)
+        data, Utime = aligner.extract(16)
         if data.shape[0] == 0:
             print("Not enough aligned data yet.")
         else:
+            print(f"Colllected this batch at:{Utime}")
             print(f"Extracted aligned data shape: {data.shape}\n{data}")
             break
         time.sleep(1)

From 1e8544e78f6b7f7ab6b9a191ae12122fc0f2ee1a Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Mon, 14 Apr 2025 22:13:24 +0200
Subject: [PATCH 15/18] small bug

---
 tests/integration/data/accel/hbk/test_aligner.py | 6 +++---
 tests/unit/data/accel/hbk/test_aligner_unit.py   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/integration/data/accel/hbk/test_aligner.py b/tests/integration/data/accel/hbk/test_aligner.py
index ed5effe..fbeb8ca 100644
--- a/tests/integration/data/accel/hbk/test_aligner.py
+++ b/tests/integration/data/accel/hbk/test_aligner.py
@@ -91,7 +91,7 @@ def test_aligner_continuous_block_required(mqtt_setup):
 
     time.sleep(1.5)  # Let messages arrive
 
-    aligned = aligner.extract(128)  # Should use keys 96, 128, 160, 192 (128 samples)
+    aligned, _ = aligner.extract(128)  # Should use keys 96, 128, 160, 192 (128 samples)
 
     assert aligned.shape == (3, 128), f"Expected 128 aligned rows, got {aligned.shape}"
     assert np.allclose(aligned[0, :5], np.arange(5)), "Check data from channel 1"
@@ -112,7 +112,7 @@ def test_aligner_extract_removes_used_and_older_data(mqtt_setup):
     time.sleep(1)
 
     # Extract 96 samples → should consume keys 0, 32, 64 (96 samples)
-    aligned = aligner.extract(96)
+    aligned, _ = aligner.extract(96)
 
     assert aligned.shape == (3, 96), "Expected 96 aligned samples"
 
@@ -139,7 +139,7 @@ def test_aligner_single_channel_extract_and_cleanup(mqtt_setup):
     time.sleep(1)
 
     # Extract 64 samples from the single channel
-    extracted = aligner.extract(64)
+    extracted, _ = aligner.extract(64)
 
     assert extracted.shape == (1, 64), f"Expected shape (64, 1), got {extracted.shape}"
     assert np.allclose(extracted.flatten()[:5], [0, 1, 2, 3, 4]), "Unexpected values in extracted data"
diff --git a/tests/unit/data/accel/hbk/test_aligner_unit.py b/tests/unit/data/accel/hbk/test_aligner_unit.py
index 5881eaf..e3f69af 100644
--- a/tests/unit/data/accel/hbk/test_aligner_unit.py
+++ b/tests/unit/data/accel/hbk/test_aligner_unit.py
@@ -37,7 +37,7 @@ def test_find_continuous_key_groups(aligner_with_mock_channels):
 def test_extract_with_enough_samples(aligner_with_mock_channels):
     aligner, accelerometers = aligner_with_mock_channels
 
-    result = aligner.extract(8)
+    result, _ = aligner.extract(8)
 
     assert result.shape == (3, 8)
     expected = [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0]
@@ -50,7 +50,7 @@ def test_extract_with_enough_samples(aligner_with_mock_channels):
 def test_extract_too_few_samples_returns_empty(aligner_with_mock_channels):
     aligner, _ = aligner_with_mock_channels
 
-    result = aligner.extract(200)  # more than available
+    result = aligner.extract(210)  # more than available it should return empty array, no timestamp
     assert result.shape == (0, 3)
 
 
@@ -107,7 +107,7 @@ def test_extract_skips_initial_and_gaps_until_valid_block(aligner_with_mock_chan
         acc.get_samples_for_key.side_effect = lambda key: [float(key + i) for i in range(batch_size)]
 
     # Extract 128 samples
-    result = aligner.extract(required_samples)
+    result, _ = aligner.extract(required_samples)
 
     # Assert correct shape
     assert result.shape == (3, 128), f"Expected (3, 128), got {result.shape}"

From 698494b90d0fa893ca5fbaa1ff890555948b83ee Mon Sep 17 00:00:00 2001
From: prasadtalasila <prasadtalasila@users.noreply.github.com>
Date: Mon, 14 Apr 2025 22:36:18 +0200
Subject: [PATCH 16/18] minor fixes

---
 poetry.lock                         | 20 +++++++++++++++++++-
 pyproject.toml                      |  1 +
 src/data/accel/accelerometer.py     |  1 -
 src/data/accel/hbk/accelerometer.py |  6 ++----
 src/data/accel/hbk/aligner.py       |  7 +++----
 src/data/accel/random.py            | 28 ----------------------------
 src/examples/experiment_2.py        |  4 ++--
 7 files changed, 27 insertions(+), 40 deletions(-)
 delete mode 100644 src/data/accel/random.py

diff --git a/poetry.lock b/poetry.lock
index 4286811..cdd770a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -347,6 +347,24 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"]
 
+[[package]]
+name = "pytest-mock"
+version = "3.14.0"
+description = "Thin-wrapper around the mock package for easier use with pytest"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "pytest-mock-3.14.0.tar.gz", hash = "sha256:2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0"},
+    {file = "pytest_mock-3.14.0-py3-none-any.whl", hash = "sha256:0b72c38033392a5f4621342fe11e9219ac11ec9d375f8e2a0c164539e0d70f6f"},
+]
+
+[package.dependencies]
+pytest = ">=6.2.5"
+
+[package.extras]
+dev = ["pre-commit", "pytest-asyncio", "tox"]
+
 [[package]]
 name = "tomlkit"
 version = "0.13.2"
@@ -362,4 +380,4 @@ files = [
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.12, <3.13"
-content-hash = "8cf0e37ad4078f644257790a6604931972ec7ecf92f1eb369a516bd1721fd21c"
+content-hash = "5be5e4e13be93614c6a8f1d722748f3ac25a3c50e59bb8366cdab3312d70e45e"
diff --git a/pyproject.toml b/pyproject.toml
index 9d192a8..e8d6d60 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,6 +19,7 @@ numpy = "^2.2.4"
 pylint = "^3.3.6"
 pytest = "^8.3.5"
 pytest-cov = "^6.1.1"
+pytest-mock = "^3.14.0"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/src/data/accel/accelerometer.py b/src/data/accel/accelerometer.py
index a48a3fa..6dd890a 100644
--- a/src/data/accel/accelerometer.py
+++ b/src/data/accel/accelerometer.py
@@ -19,4 +19,3 @@ def read(self, requested_samples: int) -> (int, np.ndarray):  # type: ignore
             }
         }
         """
-        pass
diff --git a/src/data/accel/hbk/accelerometer.py b/src/data/accel/hbk/accelerometer.py
index 5080900..1cdead0 100644
--- a/src/data/accel/hbk/accelerometer.py
+++ b/src/data/accel/hbk/accelerometer.py
@@ -94,7 +94,6 @@ def process_message(self, msg: mqtt.MQTTMessage) -> None:
             print(f"Error processing message: {e}")
 
 
-
     def get_batch_size(self) -> Optional[int]:
         """
         Returns the number of samples in the first available data batch.
@@ -106,6 +105,7 @@ def get_batch_size(self) -> Optional[int]:
             first_key = next(iter(self.data_map))
             return len(self.data_map[first_key])
 
+
     def get_sorted_keys(self) -> List[int]:
         """
         Returns the sorted list of sample keys currently available.
@@ -124,6 +124,7 @@ def get_samples_for_key(self, key: int) -> Optional[List[float]]:
                 return list(self.data_map[key])
             return None
 
+
     def clear_used_data(self, start_key: int, samples_to_remove: int) -> None:
         """
         Deletes all keys older than `start_key` and consumes `samples_to_remove`
@@ -155,9 +156,6 @@ def clear_used_data(self, start_key: int, samples_to_remove: int) -> None:
                 remaining_to_remove -= num_to_remove
 
 
-
-
-
     def read(self, requested_samples: int) -> Tuple[(int, np.ndarray)]:
         """
         Reads the oldest accelerometer data from the FIFO buffer and removes only the read samples.
diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index 1c8d875..a9bde2c 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -1,11 +1,10 @@
 import threading
 from typing import List, Tuple, Optional
-from datetime import datetime, timedelta
+from datetime import datetime
 import numpy as np
 
-
 #project imports
-from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
+from data.accel.hbk.accelerometer import Accelerometer
 
 
 class Aligner:
@@ -103,7 +102,7 @@ def extract(self, requested_samples: int) -> np.ndarray:
 
             if batch_size is None or key_groups is None:
                 return np.empty((0, len(self.channels)), dtype=np.float32)
-            
+
             for group in key_groups:
                 total_samples = len(group) * batch_size
                 if total_samples < requested_samples:
diff --git a/src/data/accel/random.py b/src/data/accel/random.py
deleted file mode 100644
index de13600..0000000
--- a/src/data/accel/random.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from datetime import datetime
-import random
-from .accelerometer import IAccelerometer, US_MULTIPLIER
-
-"""
-A dummy accelerometer that generates
-random (x,y,z) values in the [-1,1] range
-"""
-
-
-class RandomSource(IAccelerometer):
-
-    def read(self) -> dict:
-        accel = {
-            'x': random.uniform(-1, 1),
-            'y': random.uniform(-1, 1),
-            'z': random.uniform(-1, 1)
-        }
-        # represents time at resolution of a microsecond
-        # but depends on the underlying clock
-        timestamp = datetime.timestamp(datetime.now())
-        # pylint: disable=unused-variable
-        key = round(timestamp * US_MULTIPLIER)
-        sample = {
-            'timestamp': timestamp,
-            'acceleration': accel
-        }
-        return sample
diff --git a/src/examples/experiment_2.py b/src/examples/experiment_2.py
index 2931691..73bb233 100644
--- a/src/examples/experiment_2.py
+++ b/src/examples/experiment_2.py
@@ -26,11 +26,11 @@ def main():
 
     while True:
         time.sleep(1)
-        data, Utime = aligner.extract(16)
+        data, utime = aligner.extract(16)
         if data.shape[0] == 0:
             print("Not enough aligned data yet.")
         else:
-            print(f"Colllected this batch at:{Utime}")
+            print(f"Colllected this batch at:{utime}")
             print(f"Extracted aligned data shape: {data.shape}\n{data}")
             break
         time.sleep(1)

From d5c2b596c1c7793219fa2f90f1c0852f2610d599 Mon Sep 17 00:00:00 2001
From: 8ohamed <114395272+8ohamed@users.noreply.github.com>
Date: Tue, 15 Apr 2025 01:53:48 +0200
Subject: [PATCH 17/18] Class Interface + Fixed bugs in test

---
 pytest.ini                                    |   7 +
 src/data/accel/accelerometer.py               |  76 ++++++++--
 src/data/accel/aligner.py                     |  36 +++++
 src/data/accel/hbk/accelerometer.py           |   4 -
 src/data/accel/hbk/aligner.py                 | 137 +++++++++---------
 src/examples/experiment_1.py                  |   4 +-
 .../data/accel/hbk/test_accelerometer.py      |  20 ++-
 .../data/accel/hbk/test_aligner.py            |  15 +-
 tests/integration/data/sources/test_mqtt.py   |   9 +-
 .../data/accel/hbk/test_accelerometer_unit.py |  16 +-
 .../unit/data/accel/hbk/test_aligner_unit.py  |   6 +-
 11 files changed, 202 insertions(+), 128 deletions(-)
 create mode 100644 src/data/accel/aligner.py

diff --git a/pytest.ini b/pytest.ini
index 4cb9017..e2d7a4a 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -13,3 +13,10 @@ log_date_format = %Y-%m-%d %H:%M:%S
 
 #timeout slow tests
 timeout=5
+
+env =
+    MQTT_CONNECT_DELAY=0.5
+
+markers =
+    unit: marks unit tests 
+    integration: marks integration tests 
diff --git a/src/data/accel/accelerometer.py b/src/data/accel/accelerometer.py
index 6dd890a..f8bf4a5 100644
--- a/src/data/accel/accelerometer.py
+++ b/src/data/accel/accelerometer.py
@@ -1,21 +1,69 @@
+# pylint: disable=W0107
 import abc
+from typing import Tuple, Optional, List
 import numpy as np
 
-US_MULTIPLIER = 1000000  # factor to convert time to microseconds
+class IAccelerometer(abc.ABC):
+    @abc.abstractmethod
+    def read(self, requested_samples: int) -> Tuple[int, np.ndarray]:
+        """
+        Read and return the requested number of accelerometer samples from the buffer.
+
+        Parameters:
+            requested_samples (int): The number of samples to retrieve.
+
+        Returns:
+            Tuple[int, np.ndarray]:
+                - status: 1 if the requested number of samples was returned,
+                          0 if fewer samples were available.
+                - data: A NumPy array containing the retrieved samples.
+        """
+        pass
+
+
+    @abc.abstractmethod
+    def get_batch_size(self) -> Optional[int]:
+        """
+        Get the number of samples in the first data batch.
+
+        Returns:
+            int or None: The size of the first batch, or None if no data is available.
+        """
+        pass
+
+
+    @abc.abstractmethod
+    def get_sorted_keys(self) -> List[int]:
+        """
+        Get the sorted list of keys (samples since data first acquisition) available in the buffer.
+
+        Returns:
+            List[int]: Sorted keys representing batches of data.
+        """
+        pass
+
+
+    @abc.abstractmethod
+    def get_samples_for_key(self, key: int) -> Optional[List[float]]:
+        """
+        Get the list of samples for a given key.
+
+        Parameters:
+            key (int): The identifier for the desired data batch.
+
+        Returns:
+            List[float] or None: A copy of the sample list if the key exists, otherwise None.
+        """
+        pass
 
 
-class IAccelerometer(abc.ABC):
     @abc.abstractmethod
-    def read(self, requested_samples: int) -> (int, np.ndarray):  # type: ignore
-        """
-        This method provides a single accelerometer reading.
-        A sample reading is:
-        sample = {
-        'timestamp': 0,
-        'accel_readings':  {
-            'x': 0,
-            'y': 0,
-            'z': 0
-            }
-        }
+    def clear_used_data(self, start_key: int, samples_to_remove: int) -> None:
+        """
+        Remove old and used data from the buffer.
+
+        Parameters:
+            start_key (int): The first key from which data will be retained.
+            samples_to_remove (int): The number of samples to remove starting from `start_key`.
         """
+        pass
diff --git a/src/data/accel/aligner.py b/src/data/accel/aligner.py
new file mode 100644
index 0000000..e8d79f9
--- /dev/null
+++ b/src/data/accel/aligner.py
@@ -0,0 +1,36 @@
+# pylint: disable=W0107
+import abc
+from datetime import datetime
+from typing import List, Optional, Tuple
+import numpy as np
+
+class IAligner(abc.ABC):
+    @abc.abstractmethod
+    def find_continuous_key_groups(self) -> Tuple[Optional[int], Optional[List[List[int]]]]:
+        """
+        Finds common continuous key groups across all channels.
+
+        Returns:
+            Tuple:
+                - batch_size (Optional[int]): Size of each data batch if found, else None.
+                - key_groups (Optional[List[List[int]]]): 
+                            Groups of continuous sample keys common to all channels.
+        """
+        pass
+
+
+    @abc.abstractmethod
+    def extract(self, requested_samples: int) -> Tuple[np.ndarray, Optional[datetime]]:
+        """
+        Extracts aligned accelerometer samples from all channels.
+
+        Parameters:
+            requested_samples (int): The number of aligned samples to extract.
+
+        Returns:
+            Tuple:
+                - np.ndarray: A 2D NumPy array of shape (num_channels, num_samples).
+                - Optional[datetime]: UTC timestamp 
+                            when the aligned samples were extracted, or None on failure.
+        """
+        pass
diff --git a/src/data/accel/hbk/accelerometer.py b/src/data/accel/hbk/accelerometer.py
index 1cdead0..1df62ae 100644
--- a/src/data/accel/hbk/accelerometer.py
+++ b/src/data/accel/hbk/accelerometer.py
@@ -4,21 +4,17 @@
 from typing import Tuple, Any, Optional, List
 import numpy as np
 import paho.mqtt.client as mqtt
-
 # Project Imports
 from data.accel.accelerometer import IAccelerometer
 from data.accel.constants import MAX_MAP_SIZE
 from data.accel.metadata_constants import DESCRIPTOR_LENGTH_BYTES
 
-
 class Accelerometer(IAccelerometer):
     def __init__(
         self,
         mqtt_client: mqtt.Client,
         topic: str = "cpsens/d8-3a-dd-f5-92-48/cpsns_Simulator/1/acc/raw/data",
         map_size: int = MAX_MAP_SIZE ):
-
-
         """
         Initializes the Accelerometer instance with a pre-configured MQTT client.
 
diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index a9bde2c..ce1b0d8 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -3,7 +3,7 @@
 from datetime import datetime
 import numpy as np
 
-#project imports
+# project imports
 from data.accel.hbk.accelerometer import Accelerometer
 
 
@@ -33,37 +33,34 @@ def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.n
             acc = Accelerometer(mqtt_client, topic=topic, map_size=map_size)
             self.channels.append(acc)
             mqtt_client.subscribe(topic, qos=1)
-            mqtt_client.message_callback_add(topic, lambda _, __,
-                                            msg, acc=acc: acc.process_message(msg))
+            mqtt_client.message_callback_add(topic, lambda _,
+                                             __, msg, acc=acc: acc.process_message(msg))
 
 
-    def find_continuous_key_groups(self) -> Tuple[Optional[int], Optional[List[List[int]]]]:
+    def _get_common_keys(self, batch_size: Optional[int]) -> Optional[List[int]]:
         """
-        Determines the batch size, finds common keys, and groups them into continuous sequences.
+        Gets the sorted list of keys that are common across all channels.
+
         Returns:
-            tuple: (batch_size, grouped_keys) or (None, None) if data is insufficient.
+            A sorted list of common keys or None if batch_size is invalid.
         """
-        if not self.channels:
-            return None, None
-
-        # Get the batch size from any channel
-        batch_size = None
-        for ch in self.channels:
-            batch_size = ch.get_batch_size()
-            if batch_size is not None:
-                break
-
         # Get common keys across all channels
         key_sets = [set(ch.get_sorted_keys()) for ch in self.channels]
         if not key_sets or batch_size is None:
-            return None, None
-        common_keys = sorted(set.intersection(*key_sets))
+            return None
+        return sorted(set.intersection(*key_sets))
+
+
+    def _group_continuous_keys(self, keys: List[int], batch_size: int) -> List[List[int]]:
+        """
+        Groups sorted keys into continuous sequences based on batch_size.
 
-        # Group keys into continuous sequences
+        Returns:
+            A list of key groups (each group is a list of consecutive keys).
+        """
         key_groups = []
         current_group = []
-
-        for key in common_keys:
+        for key in keys:
             if not current_group:
                 current_group.append(key)
             elif key == current_group[-1] + batch_size:
@@ -73,64 +70,70 @@ def find_continuous_key_groups(self) -> Tuple[Optional[int], Optional[List[List[
                 current_group = [key]
         if current_group:
             key_groups.append(current_group)
+        return key_groups
 
-        return batch_size, key_groups
 
-    def extract(self, requested_samples: int) -> np.ndarray:
-        """
-        Extracts a specified number of aligned samples from all channels.
+    def find_continuous_key_groups(self) -> Tuple[Optional[int], Optional[List[List[int]]]]:
+        if not self.channels:
+            return None, None
 
-        This method:
-            1. Uses `find_continuous_key_groups()` to determine batch size 
-            and group keys into continuous aligned blocks.
-            2. Selects the first group that has enough samples.
-            3. Collects aligned samples across all channels using their accessors.
-            4. Cleans up used and older data via `clear_used_data()` on each Accelerometer.
+        batch_size = None
+        for ch in self.channels:
+            batch_size = ch.get_batch_size()
+            if batch_size is not None:
+                break
+        common_keys = self._get_common_keys(batch_size)
+        if common_keys is None:
+            return None, None
+        return batch_size, self._group_continuous_keys(common_keys, batch_size)
 
-        Parameters:
-            requested_samples (int): The total number of samples to extract across all channels.
+
+    def _extract_aligned_block(self, group: List[int], batch_size: int,
+                               requested_samples: int) -> Tuple[np.ndarray, datetime]:
+        """
+        Extracts samples from the given aligned key group.
+
+        Collects aligned samples across all channels and returns them
+        along with the UTC timestamp of the first aligned sample.
 
         Returns:
-           tuple: (aligned_data, utc_timestamp)
-                   aligned_data is a NumPy array of shape (channels, requested_samples)
-                   utc_timestamp is the UTC time of the first aligned sample.
-            Returns an empty array if alignment is not possible.
+            A tuple (aligned_data, utc_time)
         """
+        aligned_data = [[] for _ in self.channels]
+        samples_collected = 0
+        utc_time = datetime.utcnow()
+
+        for key in group:
+            entries = [ch.get_samples_for_key(key) for ch in self.channels]
+            for i in range(batch_size):
+                if samples_collected >= requested_samples:
+                    break
+                for ch_idx, channel_data in enumerate(entries):
+                    aligned_data[ch_idx].append(channel_data[i])
+                samples_collected += 1
+            if samples_collected >= requested_samples:
+                break
+
+        for ch in self.channels:
+            ch.clear_used_data(group[0], requested_samples)
+
+        aligned_array = np.array(aligned_data, dtype=np.float32)
+        print(f"Aligned shape: {aligned_array.shape}")
+        return aligned_array, utc_time
+
+
+    def extract(self, requested_samples: int) -> Tuple[np.ndarray, Optional[datetime]]:
         with self._lock:
             batch_size, key_groups = self.find_continuous_key_groups()
             print("Keys", key_groups)
 
             if batch_size is None or key_groups is None:
-                return np.empty((0, len(self.channels)), dtype=np.float32)
+                # No data or groups to align, returun empty
+                return np.empty((0, len(self.channels)), dtype=np.float32), None
 
             for group in key_groups:
                 total_samples = len(group) * batch_size
-                if total_samples < requested_samples:
-                    continue  # Skip groups that don't have enough samples
-                # Proceed with aligned extraction
-                aligned_data = [[] for _ in self.channels]
-                samples_collected = 0
-                utc_time = datetime.utcnow()
-
-
-                for key in group:
-                    entries = [ch.get_samples_for_key(key) for ch in self.channels]
-                    for i in range(batch_size):
-                        if samples_collected >= requested_samples:
-                            break
-                        for ch_idx, channel_data in enumerate(entries):
-                            aligned_data[ch_idx].append(channel_data[i])
-                        samples_collected += 1
-
-                    if samples_collected >= requested_samples:
-                        break
-
-                # Clean up used and older data
-                for ch in self.channels:
-                    ch.clear_used_data(group[0], requested_samples)
-
-                aligned_array = np.array(aligned_data, dtype=np.float32)
-                print(f"Aligned shape: {aligned_array.shape}")
-                return aligned_array, utc_time
-
-            return np.empty((0, len(self.channels)), dtype=np.float32)
+                if total_samples >= requested_samples:
+                    return self._extract_aligned_block(group, batch_size, requested_samples)
+            # No data or groups to align, returun empty
+            return np.empty((0, len(self.channels)), dtype=np.float32), None
diff --git a/src/examples/experiment_1.py b/src/examples/experiment_1.py
index 0fe1c99..2478b0a 100644
--- a/src/examples/experiment_1.py
+++ b/src/examples/experiment_1.py
@@ -25,7 +25,7 @@ def main():
     with accelerometer.acquire_lock():
         accelerometer.data_map.clear()
 
-    time.sleep(10)  # Allow time for data collection
+    time.sleep(1)  # Allow time for data collection
     with accelerometer.acquire_lock():
         # This print to see the dictionary
         for key, fifo in sorted(accelerometer.data_map.items()):
@@ -35,6 +35,8 @@ def main():
 
     mqtt_client.loop_stop()
     mqtt_client.disconnect()
+    time.sleep(1)
+    print("Exiting cleanly")
 
 if __name__ == '__main__':
     main()
diff --git a/tests/integration/data/accel/hbk/test_accelerometer.py b/tests/integration/data/accel/hbk/test_accelerometer.py
index 6f3d05b..795b3bf 100644
--- a/tests/integration/data/accel/hbk/test_accelerometer.py
+++ b/tests/integration/data/accel/hbk/test_accelerometer.py
@@ -2,12 +2,14 @@
 import json
 import pytest
 import struct
+import os
 
 import numpy as np
 from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
 from constants import DESCRIPTOR_LENGTH, METADATA_VERSION, SECONDS, NANOSECONDS, BATCH_SIZE
 from data.sources.mqtt import setup_mqtt_client, load_config
 import uuid
+pytestmark = pytest.mark.integration
 
 
 @pytest.fixture(scope="function")
@@ -21,7 +23,8 @@ def mqtt_client():
 
     client.connect(mqtt_config["host"], mqtt_config["port"], 60)
     client.loop_start()  
-    time.sleep(0.5)  
+    connect_delay = float(os.environ.get("MQTT_CONNECT_DELAY"))
+    time.sleep(connect_delay)  
 
     yield client, selected_topic
     client.loop_stop()
@@ -60,8 +63,6 @@ def publish_binary_samples(client, topic, start, end):
         result.wait_for_publish()  
 
 
-
-
 def test_accelerometer_read_in_steps(client_and_topic, accelerometer_instance):
     """
     Test that reading in steps correctly retrieves the oldest samples 
@@ -113,18 +114,18 @@ def test_accelerometer_read_full_fifo(client_and_topic, accelerometer_instance):
     """
     client, topic = client_and_topic  
 
-    publish_binary_samples(client, topic, 0, 96)
+    publish_binary_samples(client, topic, 0, 64)
     total_samples = 0
 
     while total_samples < 60: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
-    status, data = accelerometer_instance.read(96)
+    status, data = accelerometer_instance.read(64)
 
     assert status == 1, f"Expected status 1, but got {status}"
-    assert data.shape == (96,), f"Unexpected shape: {data.shape}" 
-    assert np.allclose(data, np.arange(96)), f"Order mismatch: {data[:10]}"
+    assert data.shape == (64,), f"Unexpected shape: {data.shape}" 
+    assert np.allclose(data, np.arange(64)), f"Order mismatch: {data[:10]}"
 
 
 def test_accelerometer_read_partial_fifo(client_and_topic, accelerometer_instance):
@@ -144,7 +145,7 @@ def test_accelerometer_read_partial_fifo(client_and_topic, accelerometer_instanc
     publish_binary_samples(client, topic, 0, 64)
     total_samples = 0
 
-    while total_samples < 60: 
+    while total_samples < 33: 
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
 
@@ -226,14 +227,11 @@ def test_accelerometer_reordering_late_sample(client_and_topic, accelerometer_in
     # Publish middle batch (32–63) AFTER last batch
     publish_binary_samples(client, topic, 32, 64)
 
-    
     total_samples = 0
     while total_samples < 60:  
         with accelerometer_instance._lock:
             total_samples = sum(len(deque) for deque in accelerometer_instance.data_map.values())
     status, data = accelerometer_instance.read(96)
-
-
     assert status == 1, f"Expected status 1, but got {status}"
     assert data.shape == (96,), f"Unexpected shape: {data.shape}"
     expected_data = np.arange(96)  # Expected: 0, 1, 2, ..., 95
diff --git a/tests/integration/data/accel/hbk/test_aligner.py b/tests/integration/data/accel/hbk/test_aligner.py
index fbeb8ca..d446e99 100644
--- a/tests/integration/data/accel/hbk/test_aligner.py
+++ b/tests/integration/data/accel/hbk/test_aligner.py
@@ -1,17 +1,17 @@
 import time
 import json
+import os
 import pytest
 import struct
-
 import numpy as np
-from data.accel.hbk.aligner import Aligner  # type: ignore
-
 
+from data.accel.hbk.aligner import Aligner  # type: ignore
 from constants import DESCRIPTOR_LENGTH, METADATA_VERSION, SECONDS, NANOSECONDS, BATCH_SIZE
 from data.sources.mqtt import setup_mqtt_client, load_config
 import uuid
 
-
+pytestmark = pytest.mark.integration
+connect_delay = float(os.environ.get("MQTT_CONNECT_DELAY"))
 
 @pytest.fixture(scope="function")
 def mqtt_client_and_config():
@@ -22,7 +22,7 @@ def mqtt_client_and_config():
     client, _ = setup_mqtt_client(mqtt_config, topic_index=0)
     client.connect(mqtt_config["host"], mqtt_config["port"], 60)
     client.loop_start()
-    time.sleep(0.1)
+    time.sleep(connect_delay)
 
     yield client, mqtt_config
 
@@ -40,7 +40,7 @@ def mqtt_setup():
     client, _ = setup_mqtt_client(mqtt_config, 0)
     client.connect(mqtt_config["host"], mqtt_config["port"], 60)
     client.loop_start()
-    time.sleep(0.1)
+    time.sleep(connect_delay)
 
     # Extract topics manually
     topics = [
@@ -98,8 +98,6 @@ def test_aligner_continuous_block_required(mqtt_setup):
     assert np.allclose(aligned[2, :5], np.arange(5)), "Check data from channel 3"
 
 
-
-
 def test_aligner_extract_removes_used_and_older_data(mqtt_setup):
     client, topics = mqtt_setup
     aligner = Aligner(client, topics=topics, map_size=512)
@@ -125,7 +123,6 @@ def test_aligner_extract_removes_used_and_older_data(mqtt_setup):
                 f"Channel {i+1} still contains old data (keys <= 64): {remaining_keys}"
 
 
-
 def test_aligner_single_channel_extract_and_cleanup(mqtt_setup):
     client, topics = mqtt_setup
     one_topic = [topics[0]]  # Use only the first topic
diff --git a/tests/integration/data/sources/test_mqtt.py b/tests/integration/data/sources/test_mqtt.py
index b6dc1dd..7cef093 100644
--- a/tests/integration/data/sources/test_mqtt.py
+++ b/tests/integration/data/sources/test_mqtt.py
@@ -28,7 +28,6 @@ def test_load_config_file_not_found():
         load_config("non_existing_config.json")
 
 
-
 def test_load_config_invalid_json(tmp_path):
     invalid_file = tmp_path / "bad_config.json"
     invalid_file.write_text("{invalid_json: True", encoding="utf-8")
@@ -62,7 +61,6 @@ def test_setup_mqtt_client_invalid_index():
         setup_mqtt_client(dummy_config, topic_index=5)
 
 
-
 def test_on_connect_callback_success():
     topics = ["test/topic1", "test/topic2"]
     qos = 1
@@ -75,6 +73,7 @@ def test_on_connect_callback_success():
     for topic in topics:
         client.subscribe.assert_any_call(topic, qos=qos)
 
+
 def test_on_connect_callback_failure():
     topics = ["test/topic1", "test/topic2"]
     qos = 1
@@ -85,6 +84,7 @@ def test_on_connect_callback_failure():
     # Verify that subscribe is not called when connection fails.
     client.subscribe.assert_not_called()
 
+
 def test_on_subscribe_callback(capsys):
     on_subscribe = create_on_subscribe_callback()
     client = MagicMock()
@@ -94,6 +94,7 @@ def test_on_subscribe_callback(capsys):
     assert "Subscription ID 42" in captured
     assert "QoS levels [1, 1]" in captured
 
+
 def test_on_message_callback(capsys):
     on_message = create_on_message_callback()
     client = MagicMock()
@@ -109,6 +110,7 @@ class FakeMsg:
     assert "Received message on test/topic" in captured
     #assert "Message payload: test payload" in captured
 
+
 def test_on_publish_callback(capsys):
     on_publish = create_on_publish_callback()
     client = MagicMock()
@@ -127,7 +129,6 @@ def test_setup_mqtt_client():
         "host": "localhost",
         "port": 1883
     }
-    
     # Unpack the returned tuple
     client, selected_topic = setup_mqtt_client(dummy_config)
 
@@ -141,5 +142,3 @@ def test_setup_mqtt_client():
     assert client.on_message is not None
     assert client.on_publish is not None
 
-    # Optional: Ensure the correct topic is selected
-    assert selected_topic == "test/topic1"  # Since topic_index defaults to 0
diff --git a/tests/unit/data/accel/hbk/test_accelerometer_unit.py b/tests/unit/data/accel/hbk/test_accelerometer_unit.py
index 1bc2bba..a6c6f84 100644
--- a/tests/unit/data/accel/hbk/test_accelerometer_unit.py
+++ b/tests/unit/data/accel/hbk/test_accelerometer_unit.py
@@ -6,7 +6,7 @@
 from data.accel.hbk.accelerometer import Accelerometer
 from data.accel.metadata_constants import DESCRIPTOR_LENGTH_BYTES
 
-
+pytestmark = pytest.mark.unit
 
 @pytest.fixture
 def mock_mqtt_client():
@@ -17,7 +17,6 @@ def mock_mqtt_client():
 def test_accelerometer(mock_mqtt_client):
     return Accelerometer(mock_mqtt_client, topic="test/topic", map_size=128)
 
-
 class MockMQTTMessage:
     def __init__(self, topic, payload):
         self.topic = topic
@@ -53,9 +52,6 @@ def test_get_batch_size(test_accelerometer):
     assert batch_size == 32
 
 
-
-
-
 def test_clear_used_data_removes_samples_and_keys(test_accelerometer):
     # Add three batches: 0–31, 32–63, 64–95
     for i in range(3):
@@ -80,11 +76,6 @@ def test_clear_used_data_removes_samples_and_keys(test_accelerometer):
     assert remaining_samples == 14
 
 
-
-
-
-
-
 def test_read_fewer_than_available(test_accelerometer):
     for i in range(3):
         msg = MockMQTTMessage("test/topic", make_mock_payload(i * 32))
@@ -114,10 +105,6 @@ def test_get_batch_size_returns_none_when_empty(test_accelerometer):
     assert test_accelerometer.get_batch_size() is None
 
 
-
-
-
-
 def test_on_message_invokes_process_in_thread(test_accelerometer, mocker):
     msg = MockMQTTMessage("test/topic", make_mock_payload(0))
     process_mock = mocker.patch.object(test_accelerometer, "process_message")
@@ -186,7 +173,6 @@ def test_process_message_triggers_eviction_when_map_size_exceeded():
     assert keys == [32, 64], f"Eviction did not occur correctly. Remaining keys: {keys}"
 
 
-
 def test_clear_used_data_with_zero_samples_to_remove_does_nothing(test_accelerometer):
     # Add a single batch
     msg = MockMQTTMessage("test/topic", make_mock_payload(0))
diff --git a/tests/unit/data/accel/hbk/test_aligner_unit.py b/tests/unit/data/accel/hbk/test_aligner_unit.py
index e3f69af..f41f754 100644
--- a/tests/unit/data/accel/hbk/test_aligner_unit.py
+++ b/tests/unit/data/accel/hbk/test_aligner_unit.py
@@ -2,6 +2,7 @@
 import numpy as np
 from unittest.mock import MagicMock, patch
 from data.accel.hbk.aligner import Aligner  # type: ignore
+pytestmark = pytest.mark.unit
 
 
 @pytest.fixture
@@ -50,7 +51,7 @@ def test_extract_with_enough_samples(aligner_with_mock_channels):
 def test_extract_too_few_samples_returns_empty(aligner_with_mock_channels):
     aligner, _ = aligner_with_mock_channels
 
-    result = aligner.extract(210)  # more than available it should return empty array, no timestamp
+    result, _ = aligner.extract(210)  # more than available it should return empty array, None
     assert result.shape == (0, 3)
 
 
@@ -59,6 +60,7 @@ def test_find_continuous_key_groups_no_channels():
     batch_size, key_groups = aligner.find_continuous_key_groups()
     assert batch_size is None and key_groups is None
 
+
 def test_find_continuous_key_groups_handles_last_group():
     aligner = Aligner(mqtt_client=MagicMock(), topics=["t1", "t2"])
     
@@ -73,6 +75,7 @@ def test_find_continuous_key_groups_handles_last_group():
     batch_size, groups = aligner.find_continuous_key_groups()
     assert groups == [[0, 4, 8]]
 
+
 def test_find_continuous_key_groups_returns_none_when_batch_size_none():
     ch = MagicMock()
     ch.get_batch_size.return_value = None
@@ -86,7 +89,6 @@ def test_find_continuous_key_groups_returns_none_when_batch_size_none():
     assert key_groups is None
 
 
-
 def test_extract_skips_initial_and_gaps_until_valid_block(aligner_with_mock_channels):
     aligner, accelerometers = aligner_with_mock_channels
 

From c40506ffc13f0a4db58a3bf9468daa6231db547c Mon Sep 17 00:00:00 2001
From: prasadtalasila <prasadtalasila@users.noreply.github.com>
Date: Tue, 15 Apr 2025 17:15:31 +0200
Subject: [PATCH 18/18]   Fixes minor errors and improves docs

---
 .coveragerc                                   |  3 ++-
 README.md                                     |  8 ++++++-
 poetry.lock                                   | 22 +++++++++++++++++--
 pyproject.toml                                |  1 +
 src/data/accel/hbk/aligner.py                 |  5 +++--
 src/examples/README.md                        | 12 +++++++---
 src/examples/experiment_1.py                  |  9 ++++----
 src/examples/experiment_2.py                  |  4 ++--
 .../data/accel/hbk/test_accelerometer.py      |  2 +-
 .../data/accel/hbk/test_aligner.py            |  2 +-
 .../unit/data/accel/hbk/test_aligner_unit.py  |  2 +-
 11 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index e3ff08e..9ecf53f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -4,7 +4,8 @@ omit =
     */venv/*
     */.venv/*
     */__init__.py
-    */src/data/accel/random.py
+    */src/data/accel/accelerometer.py
+    */src/data/accel/aligner.py
     */src/examples/*
 
 [report]
diff --git a/README.md b/README.md
index 747d170..2b638fd 100644
--- a/README.md
+++ b/README.md
@@ -32,5 +32,11 @@ Write tests in the _tests_ directory. Be sure to name any new files as
 _test_*_.py_. To run all tests, with coverage:
 
 ```bash
-pytest
+pytest -m unit         # run unit tests
+pytest -m integration  # run integration tests
+pytest                 # run all the tests
 ```
+
+## Use
+
+Please see [examples](src/examples/README.md) for typical usage of the package.
diff --git a/poetry.lock b/poetry.lock
index cdd770a..5a2c117 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.2 and should not be changed by hand.
 
 [[package]]
 name = "astroid"
@@ -347,6 +347,24 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"]
 
+[[package]]
+name = "pytest-env"
+version = "1.1.5"
+description = "pytest plugin that allows you to add environment variables."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "pytest_env-1.1.5-py3-none-any.whl", hash = "sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30"},
+    {file = "pytest_env-1.1.5.tar.gz", hash = "sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf"},
+]
+
+[package.dependencies]
+pytest = ">=8.3.3"
+
+[package.extras]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "pytest-mock (>=3.14)"]
+
 [[package]]
 name = "pytest-mock"
 version = "3.14.0"
@@ -380,4 +398,4 @@ files = [
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.12, <3.13"
-content-hash = "5be5e4e13be93614c6a8f1d722748f3ac25a3c50e59bb8366cdab3312d70e45e"
+content-hash = "58fc409de10d9fccc22304b5e3054a1de3c91b70d864121e4abcded535ab0f5b"
diff --git a/pyproject.toml b/pyproject.toml
index e8d6d60..766c58b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,6 +20,7 @@ pylint = "^3.3.6"
 pytest = "^8.3.5"
 pytest-cov = "^6.1.1"
 pytest-mock = "^3.14.0"
+pytest-env = "^1.1.5"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/src/data/accel/hbk/aligner.py b/src/data/accel/hbk/aligner.py
index ce1b0d8..055a560 100644
--- a/src/data/accel/hbk/aligner.py
+++ b/src/data/accel/hbk/aligner.py
@@ -4,10 +4,11 @@
 import numpy as np
 
 # project imports
+from data.accel.aligner import IAligner
 from data.accel.hbk.accelerometer import Accelerometer
 
 
-class Aligner:
+class Aligner(IAligner):
     def __init__(self, mqtt_client, topics: list, map_size=44840, missing_value=np.nan):
         """
         Initializes the Aligner to receive and align data from multiple MQTT topics.
@@ -101,7 +102,7 @@ def _extract_aligned_block(self, group: List[int], batch_size: int,
         """
         aligned_data = [[] for _ in self.channels]
         samples_collected = 0
-        utc_time = datetime.utcnow()
+        utc_time = datetime.now()
 
         for key in group:
             entries = [ch.get_samples_for_key(key) for ch in self.channels]
diff --git a/src/examples/README.md b/src/examples/README.md
index 6009825..e272776 100644
--- a/src/examples/README.md
+++ b/src/examples/README.md
@@ -42,10 +42,16 @@ There are two examples.
 * **example_2** demonstrates the use of `Aligner` class to collect and
   align accelerometer measurements from multiple MQTT data streams.
 
-A simple example is provided to run the `main()` function from `experiment_1.py`.
+To run these examples, use:
 
-To run this example, use:
+```bash
+python src/examples/example_1.py
+python src/examples/example_2.py
+```
+
+You can also run these examples in **poetry** environment using
 
 ```bash
-python examples/example_1.py
+poetry run example_1
+poetry run example_2
 ```
diff --git a/src/examples/experiment_1.py b/src/examples/experiment_1.py
index 2478b0a..4990036 100644
--- a/src/examples/experiment_1.py
+++ b/src/examples/experiment_1.py
@@ -1,8 +1,9 @@
 import time
+import sys
 import numpy as np # pylint: disable=unused-import
 
 # Project imports
-from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
+from data.accel.hbk.accelerometer import Accelerometer
 from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
 
 
@@ -31,12 +32,12 @@ def main():
         for key, fifo in sorted(accelerometer.data_map.items()):
             print(f"Key: {key} -> Data: {list(fifo)}\n")
     _, data = accelerometer.read(requested_samples=256)
-    print("Data requsted", data)
 
     mqtt_client.loop_stop()
     mqtt_client.disconnect()
-    time.sleep(1)
-    print("Exiting cleanly")
+
+    print("Data requsted", data)
+    sys.stdout.flush()
 
 if __name__ == '__main__':
     main()
diff --git a/src/examples/experiment_2.py b/src/examples/experiment_2.py
index 73bb233..793c3db 100644
--- a/src/examples/experiment_2.py
+++ b/src/examples/experiment_2.py
@@ -2,7 +2,7 @@
 
 # Project imports
 from data.sources.mqtt import setup_mqtt_client, load_config  # type: ignore
-from data.accel.hbk.aligner import Aligner  # type: ignore
+from data.accel.hbk.aligner import Aligner
 
 
 def main():
@@ -25,7 +25,7 @@ def main():
     aligner = Aligner(mqtt_client, topics=selected_topics, map_size=2560)
 
     while True:
-        time.sleep(1)
+        time.sleep(1)  # Allow time for data collection
         data, utime = aligner.extract(16)
         if data.shape[0] == 0:
             print("Not enough aligned data yet.")
diff --git a/tests/integration/data/accel/hbk/test_accelerometer.py b/tests/integration/data/accel/hbk/test_accelerometer.py
index 795b3bf..7da78ac 100644
--- a/tests/integration/data/accel/hbk/test_accelerometer.py
+++ b/tests/integration/data/accel/hbk/test_accelerometer.py
@@ -5,7 +5,7 @@
 import os
 
 import numpy as np
-from data.accel.hbk.accelerometer import Accelerometer  # type: ignore
+from data.accel.hbk.accelerometer import Accelerometer
 from constants import DESCRIPTOR_LENGTH, METADATA_VERSION, SECONDS, NANOSECONDS, BATCH_SIZE
 from data.sources.mqtt import setup_mqtt_client, load_config
 import uuid
diff --git a/tests/integration/data/accel/hbk/test_aligner.py b/tests/integration/data/accel/hbk/test_aligner.py
index d446e99..aee1e3d 100644
--- a/tests/integration/data/accel/hbk/test_aligner.py
+++ b/tests/integration/data/accel/hbk/test_aligner.py
@@ -5,7 +5,7 @@
 import struct
 import numpy as np
 
-from data.accel.hbk.aligner import Aligner  # type: ignore
+from data.accel.hbk.aligner import Aligner
 from constants import DESCRIPTOR_LENGTH, METADATA_VERSION, SECONDS, NANOSECONDS, BATCH_SIZE
 from data.sources.mqtt import setup_mqtt_client, load_config
 import uuid
diff --git a/tests/unit/data/accel/hbk/test_aligner_unit.py b/tests/unit/data/accel/hbk/test_aligner_unit.py
index f41f754..77c99fb 100644
--- a/tests/unit/data/accel/hbk/test_aligner_unit.py
+++ b/tests/unit/data/accel/hbk/test_aligner_unit.py
@@ -1,7 +1,7 @@
 import pytest
 import numpy as np
 from unittest.mock import MagicMock, patch
-from data.accel.hbk.aligner import Aligner  # type: ignore
+from data.accel.hbk.aligner import Aligner
 pytestmark = pytest.mark.unit