Move to harp.data namespace

MicBoucinha · ZegCricket · MicBoucinha · commit 57918ec29891 · 2025-07-18T09:24:31.000+01:00
Co-authored-by: José Grilo &lt;jose.grilo@research.fchampalimaud.org&gt;
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 
 # Distribution / packaging
 dist/
+build/
 _version.py
 *.egg-info/
 *.egg
diff --git a/harp/__init__.py b/harp/__init__.py
diff --git a/harp/data/__init__.py b/harp/data/__init__.py
@@ -0,0 +1,5 @@
+from harp.data.io import REFERENCE_EPOCH, MessageType, read, to_buffer, to_file
+from harp.data.reader import create_reader
+from harp.data.schema import read_schema
+
+__all__ = ["REFERENCE_EPOCH", "MessageType", "read", "to_buffer", "to_file", "create_reader", "read_schema"]
diff --git a/harp/data/common.yml b/harp/data/common.yml
diff --git a/harp/data/io.py b/harp/data/io.py
@@ -8,7 +8,7 @@
 import pandas as pd
 from pandas._typing import Axes  # pyright: ignore[reportPrivateImportUsage]
 
-from harp.typing import _BufferLike, _FileLike
+from harp.data.typing import _BufferLike, _FileLike
 
 REFERENCE_EPOCH = datetime(1904, 1, 1)
 """The reference epoch for UTC harp time."""
diff --git a/harp/data/model.py b/harp/data/model.py
diff --git a/harp/data/reader.py b/harp/data/reader.py
@@ -12,10 +12,10 @@
 from pandas import DataFrame, Series
 from pandas._typing import Axes  # pyright: ignore[reportPrivateImportUsage]
 
-from harp.io import MessageType, read
-from harp.model import BitMask, GroupMask, Model, PayloadMember, Register
-from harp.schema import read_schema
-from harp.typing import _BufferLike, _FileLike
+from harp.data.io import MessageType, read
+from harp.data.model import BitMask, GroupMask, Model, PayloadMember, Register
+from harp.data.schema import read_schema
+from harp.data.typing import _BufferLike, _FileLike
 
 
 @dataclass
diff --git a/harp/data/schema.py b/harp/data/schema.py
@@ -4,7 +4,7 @@
 
 from pydantic_yaml import parse_yaml_raw_as
 
-from harp.model import Model, Registers
+from harp.data.model import Model, Registers
 
 
 def _read_common_registers() -> Registers:
diff --git a/harp/data/typing.py b/harp/data/typing.py
diff --git a/tests/params.py b/tests/params.py
@@ -6,7 +6,7 @@
 
 import numpy as np
 
-from harp.model import Model
+from harp.data.model import Model
 
 datapath = Path(__file__).parent
 
diff --git a/tests/test_io.py b/tests/test_io.py
@@ -5,7 +5,7 @@
 import pytest
 from pytest import mark
 
-from harp.io import REFERENCE_EPOCH, MessageType, read, to_buffer
+from harp.data.io import REFERENCE_EPOCH, MessageType, read, to_buffer
 from tests.params import DataFileParam
 
 testdata = [
diff --git a/tests/test_reader.py b/tests/test_reader.py
@@ -1,8 +1,8 @@
 import pandas as pd
 from pytest import mark
 
-from harp.io import REFERENCE_EPOCH, MessageType
-from harp.reader import create_reader
+from harp.data.io import REFERENCE_EPOCH, MessageType
+from harp.data.reader import create_reader
 from tests.params import DeviceSchemaParam
 
 testdata = [
diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -1,6 +1,6 @@
 from pytest import mark
 
-from harp.schema import read_schema
+from harp.data.schema import read_schema
 from tests.params import DeviceSchemaParam
 
 testdata = [
