tilebox-datasets 0.38.0__tar.gz → 0.39.0__tar.gz

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilebox-datasets
-Version: 0.38.0
+Version: 0.39.0
 Summary: Access Tilebox datasets from Python
 Project-URL: Homepage, https://tilebox.com
 Project-URL: Documentation, https://docs.tilebox.com/datasets/introduction

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/pyproject.toml

@@ -54,7 +54,7 @@ packages = ["tilebox"]
 packages = ["tilebox"]
 
 [tool.coverage.run]
-omit = ["tilebox/*/datasetsv1/*"]
+omit = ["tilebox/*/datasets/v1/*", "tilebox/*/tilebox/v1/*"]
 
 [tool.pytest.ini_options]
 minversion = "6.0"

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/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-0.38.0 → tilebox_datasets-0.39.0}/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-0.38.0 → tilebox_datasets-0.39.0}/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)
 

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/tilebox/datasets/client.py

@@ -8,10 +8,10 @@ from promise import Promise
 
 from _tilebox.grpc.channel import parse_channel_info
 from tilebox.datasets.data.datasets import Dataset, DatasetGroup, ListDatasetsResponse
-from tilebox.datasets.data.uuid import as_uuid
 from tilebox.datasets.group import Group
 from tilebox.datasets.message_pool import register_once
 from tilebox.datasets.service import TileboxDatasetService
+from tilebox.datasets.uuid import as_uuid
 
 
 class TimeseriesDatasetLike(Protocol):

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

@@ -0,0 +1,28 @@
+# for backwards compatibility, we can remove this hack in the future
+
+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-0.38.0 → tilebox_datasets-0.39.0}/tilebox/datasets/data/collection.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from uuid import UUID
 
-from tilebox.datasets.data.time_interval import TimeInterval
-from tilebox.datasets.data.uuid import uuid_message_to_uuid, uuid_to_uuid_message
-from tilebox.datasets.datasetsv1 import core_pb2
+from tilebox.datasets.datasets.v1 import core_pb2
+from tilebox.datasets.query.time_interval import TimeInterval
+from tilebox.datasets.uuid import uuid_message_to_uuid, uuid_to_uuid_message
 
 
 @dataclass

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/tilebox/datasets/data/data_access.py

@@ -7,9 +7,9 @@ from shapely import Geometry, from_wkb, to_wkb
 # from python 3.11 onwards this is available as typing.NotRequired:
 from typing_extensions import NotRequired
 
-from tilebox.datasets.data.datapoint import DatapointInterval
-from tilebox.datasets.data.time_interval import TimeInterval
-from tilebox.datasets.datasetsv1 import data_access_pb2, well_known_types_pb2
+from tilebox.datasets.datasets.v1 import data_access_pb2, well_known_types_pb2
+from tilebox.datasets.query.id_interval import IDInterval
+from tilebox.datasets.query.time_interval import TimeInterval
 
 
 class SpatialFilterMode(Enum):
@@ -104,16 +104,16 @@ class SpatialFilter:
 
 @dataclass(frozen=True)
 class QueryFilters:
-    temporal_extent: TimeInterval | DatapointInterval
+    temporal_extent: TimeInterval | IDInterval
     spatial_extent: SpatialFilter | None = None
 
     @classmethod
     def from_message(cls, filters: data_access_pb2.QueryFilters) -> "QueryFilters":
-        temporal_extent: TimeInterval | DatapointInterval | None = None
+        temporal_extent: TimeInterval | IDInterval | None = None
         if filters.HasField("time_interval"):
             temporal_extent = TimeInterval.from_message(filters.time_interval)
         if filters.HasField("datapoint_interval"):
-            temporal_extent = DatapointInterval.from_message(filters.datapoint_interval)
+            temporal_extent = IDInterval.from_message(filters.datapoint_interval)
 
         if temporal_extent is None:
             raise ValueError("Invalid filter: time or datapoint interval must be set")

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/tilebox/datasets/data/datapoint.py

@@ -1,81 +1,14 @@
 from dataclasses import dataclass, field
 from datetime import datetime
-from typing import Any, TypeAlias
+from typing import Any
 from uuid import UUID
 
-from tilebox.datasets.data.pagination import Pagination
-from tilebox.datasets.data.time_interval import timestamp_to_datetime
-from tilebox.datasets.data.uuid import uuid_message_to_uuid, uuid_to_uuid_message
-from tilebox.datasets.datasetsv1 import core_pb2, data_access_pb2, data_ingestion_pb2
+from tilebox.datasets.datasets.v1 import core_pb2, data_access_pb2, data_ingestion_pb2
 from tilebox.datasets.message_pool import get_message_type
-
-DatapointIntervalLike: TypeAlias = "tuple[str, str] | tuple[UUID, UUID] | DatapointInterval"
-
-
-@dataclass(frozen=True)
-class DatapointInterval:
-    start_id: UUID
-    end_id: UUID
-    start_exclusive: bool
-    end_inclusive: bool
-
-    @classmethod
-    def from_message(cls, interval: core_pb2.DatapointInterval) -> "DatapointInterval":
-        return cls(
-            start_id=uuid_message_to_uuid(interval.start_id),
-            end_id=uuid_message_to_uuid(interval.end_id),
-            start_exclusive=interval.start_exclusive,
-            end_inclusive=interval.end_inclusive,
-        )
-
-    def to_message(self) -> core_pb2.DatapointInterval:
-        return core_pb2.DatapointInterval(
-            start_id=uuid_to_uuid_message(self.start_id),
-            end_id=uuid_to_uuid_message(self.end_id),
-            start_exclusive=self.start_exclusive,
-            end_inclusive=self.end_inclusive,
-        )
-
-    @classmethod
-    def parse(
-        cls, arg: DatapointIntervalLike, start_exclusive: bool = False, end_inclusive: bool = True
-    ) -> "DatapointInterval":
-        """
-        Convert a variety of input types to a DatapointInterval.
-
-        Supported input types:
-        - DatapointInterval: Return the input as is
-        - tuple of two UUIDs: Return an DatapointInterval with start and end id set to the given values
-        - tuple of two strings: Return an DatapointInterval with start and end id set to the UUIDs parsed from the given strings
-
-        Args:
-            arg: The input to convert
-            start_exclusive: Whether the start id is exclusive
-            end_inclusive: Whether the end id is inclusive
-
-        Returns:
-            DatapointInterval: The parsed ID interval
-        """
-
-        match arg:
-            case DatapointInterval(_, _, _, _):
-                return arg
-            case (UUID(), UUID()):
-                start, end = arg
-                return DatapointInterval(
-                    start_id=start,
-                    end_id=end,
-                    start_exclusive=start_exclusive,
-                    end_inclusive=end_inclusive,
-                )
-            case (str(), str()):
-                start, end = arg
-                return DatapointInterval(
-                    start_id=UUID(start),
-                    end_id=UUID(end),
-                    start_exclusive=start_exclusive,
-                    end_inclusive=end_inclusive,
-                )
+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 import uuid_message_to_uuid
 
 
 @dataclass(frozen=True)
@@ -173,5 +106,5 @@ class IngestResponse:
         return data_ingestion_pb2.IngestResponse(
             num_created=self.num_created,
             num_existing=self.num_existing,
-            datapoint_ids=[core_pb2.ID(uuid=datapoint_id.bytes) for datapoint_id in self.datapoint_ids],
+            datapoint_ids=[id_pb2.ID(uuid=datapoint_id.bytes) for datapoint_id in self.datapoint_ids],
         )

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/tilebox/datasets/data/datasets.py

@@ -3,8 +3,8 @@ from uuid import UUID
 
 from google.protobuf.descriptor_pb2 import FileDescriptorSet
 
-from tilebox.datasets.data.uuid import uuid_message_to_optional_uuid, uuid_message_to_uuid, uuid_to_uuid_message
-from tilebox.datasets.datasetsv1 import core_pb2, dataset_type_pb2, datasets_pb2
+from tilebox.datasets.datasets.v1 import core_pb2, dataset_type_pb2, datasets_pb2
+from tilebox.datasets.uuid import uuid_message_to_optional_uuid, uuid_message_to_uuid, uuid_to_uuid_message
 
 
 @dataclass(frozen=True)

tilebox_datasets-0.39.0/tilebox/datasets/data/time_interval.py

@@ -0,0 +1,18 @@
+# kept for backwards compatibility, we can remove this whole file in the future
+
+from warnings import warn
+
+from tilebox.datasets.query.time_interval import (
+    TimeInterval,
+    TimeIntervalLike,
+    datetime_to_timestamp,
+    timestamp_to_datetime,
+)
+
+warn(
+    "The time_interval module has been deprecated, import from tilebox.datasets.query instead.",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
+__all__ = ["TimeInterval", "TimeIntervalLike", "datetime_to_timestamp", "timestamp_to_datetime"]

{tilebox_datasets-0.38.0 → tilebox_datasets-0.39.0}/tilebox/datasets/data/timeseries.py

@@ -2,10 +2,10 @@ from dataclasses import dataclass
 from datetime import timedelta
 from uuid import UUID
 
-from tilebox.datasets.data.datapoint import DatapointInterval
-from tilebox.datasets.data.time_interval import TimeInterval, duration_to_timedelta, timedelta_to_duration
-from tilebox.datasets.data.uuid import uuid_message_to_uuid, uuid_to_uuid_message
-from tilebox.datasets.datasetsv1 import timeseries_pb2
+from tilebox.datasets.datasets.v1 import timeseries_pb2
+from tilebox.datasets.query.id_interval import IDInterval
+from tilebox.datasets.query.time_interval import TimeInterval, duration_to_timedelta, timedelta_to_duration
+from tilebox.datasets.uuid import uuid_message_to_uuid, uuid_to_uuid_message
 
 
 @dataclass
@@ -13,7 +13,7 @@ class TimeseriesDatasetChunk:
     dataset_id: UUID
     collection_id: UUID
     time_interval: TimeInterval | None
-    datapoint_interval: DatapointInterval | None
+    datapoint_interval: IDInterval | None
     branch_factor: int
     chunk_size: int
     datapoints_per_365_days: int
@@ -28,7 +28,7 @@ class TimeseriesDatasetChunk:
             and chunk.datapoint_interval.start_id.uuid
             and chunk.datapoint_interval.end_id.uuid
         ):
-            datapoint_interval = DatapointInterval.from_message(chunk.datapoint_interval)
+            datapoint_interval = IDInterval.from_message(chunk.datapoint_interval)
 
         time_interval = None
         if chunk.time_interval and chunk.time_interval.start_time and chunk.time_interval.end_time:

tilebox_datasets-0.39.0/tilebox/datasets/datasets/v1/collections_pb2.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: datasets/v1/collections.proto
+# Protobuf Python Version: 5.29.3
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    29,
+    3,
+    '',
+    'datasets/v1/collections.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2
+from tilebox.datasets.tilebox.v1 import id_pb2 as tilebox_dot_v1_dot_id__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x61tasets/v1/collections.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\x13tilebox/v1/id.proto\"\\\n\x17\x43reateCollectionRequest\x12-\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\tdatasetId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"\xc0\x01\n\x1aGetCollectionByNameRequest\x12\'\n\x0f\x63ollection_name\x18\x01 \x01(\tR\x0e\x63ollectionName\x12+\n\x11with_availability\x18\x02 \x01(\x08R\x10withAvailability\x12\x1d\n\nwith_count\x18\x03 \x01(\x08R\twithCount\x12-\n\ndataset_id\x18\x04 \x01(\x0b\x32\x0e.tilebox.v1.IDR\tdatasetId\"}\n\x17\x44\x65leteCollectionRequest\x12\x33\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x0c\x63ollectionId\x12-\n\ndataset_id\x18\x02 \x01(\x0b\x32\x0e.tilebox.v1.IDR\tdatasetId\"\x1a\n\x18\x44\x65leteCollectionResponse\"\x93\x01\n\x16ListCollectionsRequest\x12-\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\tdatasetId\x12+\n\x11with_availability\x18\x02 \x01(\x08R\x10withAvailability\x12\x1d\n\nwith_count\x18\x03 \x01(\x08R\twithCount2\x86\x03\n\x11\x43ollectionService\x12W\n\x10\x43reateCollection\x12$.datasets.v1.CreateCollectionRequest\x1a\x1b.datasets.v1.CollectionInfo\"\x00\x12]\n\x13GetCollectionByName\x12\'.datasets.v1.GetCollectionByNameRequest\x1a\x1b.datasets.v1.CollectionInfo\"\x00\x12\x61\n\x10\x44\x65leteCollection\x12$.datasets.v1.DeleteCollectionRequest\x1a%.datasets.v1.DeleteCollectionResponse\"\x00\x12V\n\x0fListCollections\x12#.datasets.v1.ListCollectionsRequest\x1a\x1c.datasets.v1.CollectionInfos\"\x00\x42u\n\x0f\x63om.datasets.v1B\x10\x43ollectionsProtoP\x01\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tasets.V1\xca\x02\x0b\x44\x61tasets\\V1\xe2\x02\x17\x44\x61tasets\\V1\\GPBMetadata\xea\x02\x0c\x44\x61tasets::V1\x92\x03\x02\x08\x02\x62\x08\x65\x64itionsp\xe8\x07')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.collections_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\020CollectionsProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1\222\003\002\010\002'
+  _globals['_CREATECOLLECTIONREQUEST']._serialized_start=91
+  _globals['_CREATECOLLECTIONREQUEST']._serialized_end=183
+  _globals['_GETCOLLECTIONBYNAMEREQUEST']._serialized_start=186
+  _globals['_GETCOLLECTIONBYNAMEREQUEST']._serialized_end=378
+  _globals['_DELETECOLLECTIONREQUEST']._serialized_start=380
+  _globals['_DELETECOLLECTIONREQUEST']._serialized_end=505
+  _globals['_DELETECOLLECTIONRESPONSE']._serialized_start=507
+  _globals['_DELETECOLLECTIONRESPONSE']._serialized_end=533
+  _globals['_LISTCOLLECTIONSREQUEST']._serialized_start=536
+  _globals['_LISTCOLLECTIONSREQUEST']._serialized_end=683
+  _globals['_COLLECTIONSERVICE']._serialized_start=686
+  _globals['_COLLECTIONSERVICE']._serialized_end=1076
+# @@protoc_insertion_point(module_scope)

{tilebox_datasets-0.38.0/tilebox/datasets/datasetsv1 → tilebox_datasets-0.39.0/tilebox/datasets/datasets/v1}/collections_pb2.pyi

@@ -1,4 +1,5 @@
-from tilebox.datasets.datasetsv1 import core_pb2 as _core_pb2
+from tilebox.datasets.datasets.v1 import core_pb2 as _core_pb2
+from tilebox.datasets.tilebox.v1 import id_pb2 as _id_pb2
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from typing import ClassVar as _ClassVar, Mapping as _Mapping, Optional as _Optional, Union as _Union
@@ -9,9 +10,9 @@ class CreateCollectionRequest(_message.Message):
     __slots__ = ("dataset_id", "name")
     DATASET_ID_FIELD_NUMBER: _ClassVar[int]
     NAME_FIELD_NUMBER: _ClassVar[int]
-    dataset_id: _core_pb2.ID
+    dataset_id: _id_pb2.ID
     name: str
-    def __init__(self, dataset_id: _Optional[_Union[_core_pb2.ID, _Mapping]] = ..., name: _Optional[str] = ...) -> None: ...
+    def __init__(self, dataset_id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ..., name: _Optional[str] = ...) -> None: ...
 
 class GetCollectionByNameRequest(_message.Message):
     __slots__ = ("collection_name", "with_availability", "with_count", "dataset_id")
@@ -22,16 +23,16 @@ class GetCollectionByNameRequest(_message.Message):
     collection_name: str
     with_availability: bool
     with_count: bool
-    dataset_id: _core_pb2.ID
-    def __init__(self, collection_name: _Optional[str] = ..., with_availability: bool = ..., with_count: bool = ..., dataset_id: _Optional[_Union[_core_pb2.ID, _Mapping]] = ...) -> None: ...
+    dataset_id: _id_pb2.ID
+    def __init__(self, collection_name: _Optional[str] = ..., with_availability: bool = ..., with_count: bool = ..., dataset_id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ...) -> None: ...
 
 class DeleteCollectionRequest(_message.Message):
     __slots__ = ("collection_id", "dataset_id")
     COLLECTION_ID_FIELD_NUMBER: _ClassVar[int]
     DATASET_ID_FIELD_NUMBER: _ClassVar[int]
-    collection_id: _core_pb2.ID
-    dataset_id: _core_pb2.ID
-    def __init__(self, collection_id: _Optional[_Union[_core_pb2.ID, _Mapping]] = ..., dataset_id: _Optional[_Union[_core_pb2.ID, _Mapping]] = ...) -> None: ...
+    collection_id: _id_pb2.ID
+    dataset_id: _id_pb2.ID
+    def __init__(self, collection_id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ..., dataset_id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ...) -> None: ...
 
 class DeleteCollectionResponse(_message.Message):
     __slots__ = ()
@@ -42,7 +43,7 @@ class ListCollectionsRequest(_message.Message):
     DATASET_ID_FIELD_NUMBER: _ClassVar[int]
     WITH_AVAILABILITY_FIELD_NUMBER: _ClassVar[int]
     WITH_COUNT_FIELD_NUMBER: _ClassVar[int]
-    dataset_id: _core_pb2.ID
+    dataset_id: _id_pb2.ID
     with_availability: bool
     with_count: bool
-    def __init__(self, dataset_id: _Optional[_Union[_core_pb2.ID, _Mapping]] = ..., with_availability: bool = ..., with_count: bool = ...) -> None: ...
+    def __init__(self, dataset_id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ..., with_availability: bool = ..., with_count: bool = ...) -> None: ...

{tilebox_datasets-0.38.0/tilebox/datasets/datasetsv1 → tilebox_datasets-0.39.0/tilebox/datasets/datasets/v1}/collections_pb2_grpc.py

@@ -2,8 +2,8 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-from tilebox.datasets.datasetsv1 import collections_pb2 as datasets_dot_v1_dot_collections__pb2
-from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2
+from tilebox.datasets.datasets.v1 import collections_pb2 as datasets_dot_v1_dot_collections__pb2
+from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2
 
 
 class CollectionServiceStub(object):

tilebox_datasets-0.39.0/tilebox/datasets/datasets/v1/core_pb2.py

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: datasets/v1/core.proto
+# Protobuf Python Version: 5.29.3
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    29,
+    3,
+    '',
+    'datasets/v1/core.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from tilebox.datasets.datasets.v1 import dataset_type_pb2 as datasets_dot_v1_dot_dataset__type__pb2
+from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
+from tilebox.datasets.tilebox.v1 import id_pb2 as tilebox_dot_v1_dot_id__pb2
+from tilebox.datasets.tilebox.v1 import query_pb2 as tilebox_dot_v1_dot_query__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16\x64\x61tasets/v1/core.proto\x12\x0b\x64\x61tasets.v1\x1a\x1e\x64\x61tasets/v1/dataset_type.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13tilebox/v1/id.proto\x1a\x16tilebox/v1/query.proto\"]\n\x10LegacyPagination\x12\x1b\n\x05limit\x18\x01 \x01(\x03\x42\x05\xaa\x01\x02\x08\x01R\x05limit\x12,\n\x0estarting_after\x18\x02 \x01(\tB\x05\xaa\x01\x02\x08\x01R\rstartingAfter\"6\n\x03\x41ny\x12\x19\n\x08type_url\x18\x01 \x01(\tR\x07typeUrl\x12\x14\n\x05value\x18\x02 \x01(\x0cR\x05value\">\n\x0bRepeatedAny\x12\x19\n\x08type_url\x18\x01 \x01(\tR\x07typeUrl\x12\x14\n\x05value\x18\x02 \x03(\x0cR\x05value\"\xa8\x01\n\x11\x44\x61tapointMetadata\x12\x39\n\nevent_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\teventTime\x12\x41\n\x0eingestion_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\ringestionTime\x12\x15\n\x02id\x18\x03 \x01(\tB\x05\xaa\x01\x02\x08\x01R\x02id\"n\n\nDatapoints\x12\x32\n\x04meta\x18\x01 \x03(\x0b\x32\x1e.datasets.v1.DatapointMetadataR\x04meta\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x18.datasets.v1.RepeatedAnyR\x04\x64\x61ta\"\xb4\x01\n\rDatapointPage\x12\x32\n\x04meta\x18\x01 \x03(\x0b\x32\x1e.datasets.v1.DatapointMetadataR\x04meta\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x18.datasets.v1.RepeatedAnyR\x04\x64\x61ta\x12\x41\n\tnext_page\x18\x03 \x01(\x0b\x32\x1d.datasets.v1.LegacyPaginationB\x05\xaa\x01\x02\x08\x01R\x08nextPage\"e\n\tDatapoint\x12\x32\n\x04meta\x18\x01 \x01(\x0b\x32\x1e.datasets.v1.DatapointMetadataR\x04meta\x12$\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x10.datasets.v1.AnyR\x04\x64\x61ta\"]\n\nCollection\x12\x1b\n\tlegacy_id\x18\x01 \x01(\tR\x08legacyId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12\x1e\n\x02id\x18\x03 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\"\xab\x01\n\x0e\x43ollectionInfo\x12\x37\n\ncollection\x18\x01 \x01(\x0b\x32\x17.datasets.v1.CollectionR\ncollection\x12\x43\n\x0c\x61vailability\x18\x02 \x01(\x0b\x32\x18.tilebox.v1.TimeIntervalB\x05\xaa\x01\x02\x08\x01R\x0c\x61vailability\x12\x1b\n\x05\x63ount\x18\x03 \x01(\x04\x42\x05\xaa\x01\x02\x08\x01R\x05\x63ount\"B\n\x0f\x43ollectionInfos\x12/\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x1b.datasets.v1.CollectionInfoR\x04\x64\x61ta\"\xb9\x03\n\x07\x44\x61taset\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12)\n\x08group_id\x18\x02 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x07groupId\x12.\n\x04type\x18\x03 \x01(\x0b\x32\x1a.datasets.v1.AnnotatedTypeR\x04type\x12\x1b\n\tcode_name\x18\x04 \x01(\tR\x08\x63odeName\x12\x12\n\x04name\x18\x05 \x01(\tR\x04name\x12\x18\n\x07summary\x18\x06 \x01(\tR\x07summary\x12\x12\n\x04icon\x18\x07 \x01(\tR\x04icon\x12 \n\x0b\x64\x65scription\x18\x08 \x01(\tR\x0b\x64\x65scription\x12@\n\x0bpermissions\x18\n \x03(\x0e\x32\x1e.datasets.v1.DatasetPermissionR\x0bpermissions\x12\x37\n\nvisibility\x18\x0b \x01(\x0e\x32\x17.datasets.v1.VisibilityR\nvisibility\x12\x12\n\x04slug\x18\x0c \x01(\tR\x04slug\x12#\n\rtype_editable\x18\r \x01(\x08R\x0ctypeEditable\"\xa0\x01\n\x0c\x44\x61tasetGroup\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12+\n\tparent_id\x18\x02 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x08parentId\x12\x1b\n\tcode_name\x18\x03 \x01(\tR\x08\x63odeName\x12\x12\n\x04name\x18\x04 \x01(\tR\x04name\x12\x12\n\x04icon\x18\x05 \x01(\tR\x04icon*\x9b\x01\n\x11\x44\x61tasetPermission\x12\"\n\x1e\x44\x41TASET_PERMISSION_UNSPECIFIED\x10\x00\x12\"\n\x1e\x44\x41TASET_PERMISSION_ACCESS_DATA\x10\x01\x12!\n\x1d\x44\x41TASET_PERMISSION_WRITE_DATA\x10\x02\x12\x1b\n\x17\x44\x41TASET_PERMISSION_EDIT\x10\x03*v\n\nVisibility\x12\x1a\n\x16VISIBILITY_UNSPECIFIED\x10\x00\x12\x16\n\x12VISIBILITY_PRIVATE\x10\x01\x12\x1d\n\x19VISIBILITY_SHARED_WITH_ME\x10\x02\x12\x15\n\x11VISIBILITY_PUBLIC\x10\x03\x42n\n\x0f\x63om.datasets.v1B\tCoreProtoP\x01\xa2\x02\x03\x44XX\xaa\x02\x0b\x44\x61tasets.V1\xca\x02\x0b\x44\x61tasets\\V1\xe2\x02\x17\x44\x61tasets\\V1\\GPBMetadata\xea\x02\x0c\x44\x61tasets::V1\x92\x03\x02\x08\x02\x62\x08\x65\x64itionsp\xe8\x07')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.core_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\tCoreProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1\222\003\002\010\002'
+  _globals['_LEGACYPAGINATION'].fields_by_name['limit']._loaded_options = None
+  _globals['_LEGACYPAGINATION'].fields_by_name['limit']._serialized_options = b'\252\001\002\010\001'
+  _globals['_LEGACYPAGINATION'].fields_by_name['starting_after']._loaded_options = None
+  _globals['_LEGACYPAGINATION'].fields_by_name['starting_after']._serialized_options = b'\252\001\002\010\001'
+  _globals['_DATAPOINTMETADATA'].fields_by_name['id']._loaded_options = None
+  _globals['_DATAPOINTMETADATA'].fields_by_name['id']._serialized_options = b'\252\001\002\010\001'
+  _globals['_DATAPOINTPAGE'].fields_by_name['next_page']._loaded_options = None
+  _globals['_DATAPOINTPAGE'].fields_by_name['next_page']._serialized_options = b'\252\001\002\010\001'
+  _globals['_COLLECTIONINFO'].fields_by_name['availability']._loaded_options = None
+  _globals['_COLLECTIONINFO'].fields_by_name['availability']._serialized_options = b'\252\001\002\010\001'
+  _globals['_COLLECTIONINFO'].fields_by_name['count']._loaded_options = None
+  _globals['_COLLECTIONINFO'].fields_by_name['count']._serialized_options = b'\252\001\002\010\001'
+  _globals['_DATASETPERMISSION']._serialized_start=1878
+  _globals['_DATASETPERMISSION']._serialized_end=2033
+  _globals['_VISIBILITY']._serialized_start=2035
+  _globals['_VISIBILITY']._serialized_end=2153
+  _globals['_LEGACYPAGINATION']._serialized_start=149
+  _globals['_LEGACYPAGINATION']._serialized_end=242
+  _globals['_ANY']._serialized_start=244
+  _globals['_ANY']._serialized_end=298
+  _globals['_REPEATEDANY']._serialized_start=300
+  _globals['_REPEATEDANY']._serialized_end=362
+  _globals['_DATAPOINTMETADATA']._serialized_start=365
+  _globals['_DATAPOINTMETADATA']._serialized_end=533
+  _globals['_DATAPOINTS']._serialized_start=535
+  _globals['_DATAPOINTS']._serialized_end=645
+  _globals['_DATAPOINTPAGE']._serialized_start=648
+  _globals['_DATAPOINTPAGE']._serialized_end=828
+  _globals['_DATAPOINT']._serialized_start=830
+  _globals['_DATAPOINT']._serialized_end=931
+  _globals['_COLLECTION']._serialized_start=933
+  _globals['_COLLECTION']._serialized_end=1026
+  _globals['_COLLECTIONINFO']._serialized_start=1029
+  _globals['_COLLECTIONINFO']._serialized_end=1200
+  _globals['_COLLECTIONINFOS']._serialized_start=1202
+  _globals['_COLLECTIONINFOS']._serialized_end=1268
+  _globals['_DATASET']._serialized_start=1271
+  _globals['_DATASET']._serialized_end=1712
+  _globals['_DATASETGROUP']._serialized_start=1715
+  _globals['_DATASETGROUP']._serialized_end=1875
+# @@protoc_insertion_point(module_scope)