keep imports backward compatible

Author: corentinmusard

buf.gen.datasets.yaml

@@ -1,3 +1,4 @@
+# please keep this file in sync with buf.gen.workflows.yaml, especially the plugins versions
 version: v2
 managed:
   enabled: true

buf.gen.workflows.yaml

@@ -1,3 +1,4 @@
+# please keep this file in sync with buf.gen.datasets.yaml, especially the plugins versions
 version: v2
 managed:
   enabled: true

tilebox-datasets/tests/test_timeseries.py

@@ -36,7 +36,7 @@
     timestamp_to_datetime,
 )
 from tilebox.datasets.service import TileboxDatasetService
-from tilebox.datasets.uuid.uuid import uuid_message_to_uuid, uuid_to_uuid_message
+from tilebox.datasets.uuid import uuid_message_to_uuid, uuid_to_uuid_message
 
 
 def _mocked_dataset() -> tuple[DatasetClient, MagicMock]:

tilebox-datasets/tilebox/datasets/aio/dataset.py

@@ -30,7 +30,7 @@
 from tilebox.datasets.query.pagination import Pagination
 from tilebox.datasets.query.time_interval import TimeInterval, TimeIntervalLike
 from tilebox.datasets.service import TileboxDatasetService
-from tilebox.datasets.uuid.uuid import as_uuid
+from tilebox.datasets.uuid import as_uuid
 
 # allow private member access: we allow it here because we want to make as much private as possible so that we can
 # minimize the publicly facing API (which allows us to change internals later, and also limits to auto-completion)

tilebox-datasets/tilebox/datasets/aio/pagination.py

@@ -5,9 +5,9 @@
 
 from tqdm.auto import tqdm
 
-from tilebox.datasets.data import TimeInterval
 from tilebox.datasets.data.datapoint import QueryResultPage
 from tilebox.datasets.progress import ProgressCallback, TimeIntervalProgressBar
+from tilebox.datasets.query.time_interval import TimeInterval
 
 ResultPage = TypeVar("ResultPage", bound=QueryResultPage)
 

tilebox-datasets/tilebox/datasets/client.py

@@ -11,7 +11,7 @@
 from tilebox.datasets.group import Group
 from tilebox.datasets.message_pool import register_once
 from tilebox.datasets.service import TileboxDatasetService
-from tilebox.datasets.uuid.uuid import as_uuid
+from tilebox.datasets.uuid import as_uuid
 
 
 class TimeseriesDatasetLike(Protocol):

tilebox-datasets/tilebox/datasets/data/__init__.py

@@ -1,16 +1,28 @@
-from tilebox.datasets.query.time_interval import (
-    TimeInterval,
-    TimeIntervalLike,
-    datetime_to_timestamp,
-    timestamp_to_datetime,
-)
-from tilebox.datasets.uuid.uuid import uuid_message_to_uuid, uuid_to_uuid_message
+# for backwards compatibility, we can remove this hack in the future
 
-__all__ = [
-    "TimeInterval",
-    "TimeIntervalLike",
-    "datetime_to_timestamp",
-    "timestamp_to_datetime",
-    "uuid_message_to_uuid",
-    "uuid_to_uuid_message",
-]
+from warnings import warn
+
+from tilebox.datasets.query.time_interval import TimeInterval as _TimeInterval
+from tilebox.datasets.query.time_interval import TimeIntervalLike
+
+
+class TimeInterval(_TimeInterval):
+    def __post_init__(self) -> None:
+        warn(
+            "The TimeInterval class has been deprecated, import from tilebox.datasets.query instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        super().__post_init__()
+
+    @classmethod
+    def parse(cls, arg: TimeIntervalLike) -> "_TimeInterval":
+        warn(
+            "The TimeInterval class has been deprecated, import from tilebox.datasets.query instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return super().parse(arg)
+
+
+__all__ = ["TimeInterval"]

tilebox-datasets/tilebox/datasets/data/collection.py

@@ -3,7 +3,7 @@
 
 from tilebox.datasets.datasets.v1 import core_pb2
 from tilebox.datasets.query.time_interval import TimeInterval
-from tilebox.datasets.uuid.uuid import uuid_message_to_uuid, uuid_to_uuid_message
+from tilebox.datasets.uuid import uuid_message_to_uuid, uuid_to_uuid_message
 
 
 @dataclass

tilebox-datasets/tilebox/datasets/data/datapoint.py

@@ -8,7 +8,7 @@
 from tilebox.datasets.query.pagination import Pagination
 from tilebox.datasets.query.time_interval import timestamp_to_datetime
 from tilebox.datasets.tilebox.v1 import id_pb2
-from tilebox.datasets.uuid.uuid import uuid_message_to_uuid
+from tilebox.datasets.uuid import uuid_message_to_uuid
 
 
 @dataclass(frozen=True)

tilebox-datasets/tilebox/datasets/data/datasets.py

@@ -4,7 +4,7 @@
 from google.protobuf.descriptor_pb2 import FileDescriptorSet
 
 from tilebox.datasets.datasets.v1 import core_pb2, dataset_type_pb2, datasets_pb2
-from tilebox.datasets.uuid.uuid import uuid_message_to_optional_uuid, uuid_message_to_uuid, uuid_to_uuid_message
+from tilebox.datasets.uuid import uuid_message_to_optional_uuid, uuid_message_to_uuid, uuid_to_uuid_message
 
 
 @dataclass(frozen=True)