tilebox-datasets 0.38.0__py3-none-any.whl → 0.40.0__py3-none-any.whl

tilebox/datasets/aio/client.py

@@ -5,10 +5,10 @@ from _tilebox.grpc.aio.error import with_pythonic_errors
 from tilebox.datasets.aio.dataset import DatasetClient
 from tilebox.datasets.client import Client as BaseClient
 from tilebox.datasets.client import token_from_env
-from tilebox.datasets.datasetsv1.collections_pb2_grpc import CollectionServiceStub
-from tilebox.datasets.datasetsv1.data_access_pb2_grpc import DataAccessServiceStub
-from tilebox.datasets.datasetsv1.data_ingestion_pb2_grpc import DataIngestionServiceStub
-from tilebox.datasets.datasetsv1.datasets_pb2_grpc import DatasetServiceStub
+from tilebox.datasets.datasets.v1.collections_pb2_grpc import CollectionServiceStub
+from tilebox.datasets.datasets.v1.data_access_pb2_grpc import DataAccessServiceStub
+from tilebox.datasets.datasets.v1.data_ingestion_pb2_grpc import DataIngestionServiceStub
+from tilebox.datasets.datasets.v1.datasets_pb2_grpc import DatasetServiceStub
 from tilebox.datasets.group import Group
 from tilebox.datasets.service import TileboxDatasetService
 

tilebox/datasets/aio/dataset.py

@@ -11,18 +11,11 @@ from _tilebox.grpc.aio.pagination import Pagination as PaginationProtocol
 from _tilebox.grpc.aio.pagination import paginated_request
 from _tilebox.grpc.aio.producer_consumer import async_producer_consumer
 from _tilebox.grpc.error import ArgumentError, NotFoundError
-from tilebox.datasets.aio.pagination import (
-    with_progressbar,
-    with_time_progress_callback,
-    with_time_progressbar,
-)
+from tilebox.datasets.aio.pagination import with_progressbar, with_time_progress_callback, with_time_progressbar
 from tilebox.datasets.data.collection import CollectionInfo
 from tilebox.datasets.data.data_access import QueryFilters, SpatialFilter, SpatialFilterLike
-from tilebox.datasets.data.datapoint import DatapointInterval, DatapointIntervalLike, QueryResultPage
+from tilebox.datasets.data.datapoint import QueryResultPage
 from tilebox.datasets.data.datasets import Dataset
-from tilebox.datasets.data.pagination import Pagination
-from tilebox.datasets.data.time_interval import TimeInterval, TimeIntervalLike
-from tilebox.datasets.data.uuid import as_uuid
 from tilebox.datasets.message_pool import get_message_type
 from tilebox.datasets.progress import ProgressCallback
 from tilebox.datasets.protobuf_conversion.protobuf_xarray import MessageToXarrayConverter
@@ -33,7 +26,11 @@ from tilebox.datasets.protobuf_conversion.to_protobuf import (
     marshal_messages,
     to_messages,
 )
+from tilebox.datasets.query.id_interval import IDInterval, IDIntervalLike
+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 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)
@@ -240,7 +237,7 @@ class CollectionClient:
 
     async def _find_interval(
         self,
-        datapoint_id_interval: DatapointIntervalLike,
+        datapoint_id_interval: IDIntervalLike,
         end_inclusive: bool = True,
         *,
         skip_data: bool = False,
@@ -259,9 +256,7 @@ class CollectionClient:
         Returns:
             The datapoints in the given interval as an xarray dataset
         """
-        filters = QueryFilters(
-            temporal_extent=DatapointInterval.parse(datapoint_id_interval, end_inclusive=end_inclusive)
-        )
+        filters = QueryFilters(temporal_extent=IDInterval.parse(datapoint_id_interval, end_inclusive=end_inclusive))
 
         async def request(page: PaginationProtocol) -> QueryResultPage:
             query_page = Pagination(page.limit, page.starting_after)

tilebox/datasets/aio/pagination.py

@@ -5,11 +5,9 @@ from typing import TypeVar
 
 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)