Update generate-protobuf

CONTRIBUTING.md

@@ -65,7 +65,7 @@ defined in the [Tilebox Go repository](https://github.com/tilebox/tilebox-go/tre
 ### Updating protobuf files
 
 ```bash
-uv run copy-protobuf
+uv run generate-protobuf
 ```
 
 ## Releasing and deploying a new version

buf.gen.datasets.yaml

@@ -0,0 +1,16 @@
+version: v2
+managed:
+  enabled: true
+plugins:
+  - remote: buf.build/grpc/python
+    out: tilebox-datasets/tilebox/datasets
+  - remote: buf.build/protocolbuffers/python:v29.3 # v30.0 onwards requires protobuf > 6
+    out: tilebox-datasets/tilebox/datasets
+  - remote: buf.build/protocolbuffers/pyi:v29.3 # v30.0 onwards requires protobuf > 6
+    out: tilebox-datasets/tilebox/datasets
+inputs:
+  # for local development
+  # - directory: ../api
+  - module: buf.build/tilebox/api
+    paths:
+      - "datasets"

buf.gen.workflows.yaml

@@ -0,0 +1,16 @@
+version: v2
+managed:
+  enabled: true
+plugins:
+  - remote: buf.build/grpc/python
+    out: tilebox-workflows/tilebox/workflows
+  - remote: buf.build/protocolbuffers/python:v29.3 # v30.0 onwards requires protobuf > 6
+    out: tilebox-workflows/tilebox/workflows
+  - remote: buf.build/protocolbuffers/pyi:v29.3 # v30.0 onwards requires protobuf > 6
+    out: tilebox-workflows/tilebox/workflows
+inputs:
+  # for local development
+  # - directory: ../api
+  - module: buf.build/tilebox/api
+    paths:
+      - "workflows"

pyproject.toml

@@ -32,7 +32,7 @@ dev = [
 ]
 
 [project.scripts]
-copy-protobuf = "tools.copy_protobuf:main"
+generate-protobuf = "tools.generate_protobuf:main"
 
 [tool.hatch.build.targets.sdist]
 packages = ["tools"]
@@ -68,8 +68,8 @@ target-version = "py310"
 exclude = [
     "*/.venv/*",
     # it's auto generated, don't lint it
-    "*/datasetsv1/*",
-    "*/workflowsv1/*",
+    "*/datasets/v1/*",
+    "*/workflows/v1/*",
 ]
 
 [tool.ruff.lint]
@@ -116,8 +116,8 @@ exclude = ["**/.ipynb_checkpoints", "**/__pycache__", ".venv"]
 # ignore warnings in those files, but still type check them when used as a dependency in other files
 ignore = [
     # it's auto generated
-    "**/datasetsv1",
-    "**/workflowsv1",
+    "**/datasets/v1",
+    "**/workflows/v1",
 ]
 
 # pyright needs to have all the dependencies installed to be able to type check

tilebox-datasets/pyproject.toml

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

tilebox-datasets/tests/data/datapoint.py

@@ -42,7 +42,7 @@
 from tilebox.datasets.data.time_interval import (
     datetime_to_timestamp,
 )
-from tilebox.datasets.datasetsv1 import core_pb2
+from tilebox.datasets.datasets.v1 import core_pb2
 
 
 @composite

tilebox-datasets/tests/data/well_known_types.py

@@ -12,7 +12,7 @@
 
 from tests.data.time_interval import i64_datetimes
 from tilebox.datasets.data.time_interval import datetime_to_timestamp
-from tilebox.datasets.datasetsv1 import well_known_types_pb2
+from tilebox.datasets.datasets.v1 import well_known_types_pb2
 
 
 @composite

tilebox-datasets/tests/example_dataset/example_dataset_pb2.py

@@ -26,7 +26,7 @@
 _sym_db = _symbol_database.Default()
 
 
-from tilebox.datasets.datasetsv1 import well_known_types_pb2 as datasets_dot_v1_dot_well__known__types__pb2
+from tilebox.datasets.datasets.v1 import well_known_types_pb2 as datasets_dot_v1_dot_well__known__types__pb2
 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 

tilebox-datasets/tests/example_dataset/example_dataset_pb2.pyi

@@ -8,7 +8,7 @@ from google.protobuf import message as _message
 from google.protobuf import timestamp_pb2 as _timestamp_pb2
 from google.protobuf.internal import containers as _containers
 
-from tilebox.datasets.datasetsv1 import well_known_types_pb2 as _well_known_types_pb2
+from tilebox.datasets.datasets.v1 import well_known_types_pb2 as _well_known_types_pb2
 
 DESCRIPTOR_PROTO: bytes
 DESCRIPTOR: _descriptor.FileDescriptor

tilebox-datasets/tests/test_timeseries.py

@@ -26,16 +26,16 @@
     timestamp_to_datetime,
 )
 from tilebox.datasets.data.uuid import uuid_message_to_uuid, uuid_to_uuid_message
-from tilebox.datasets.datasetsv1.collections_pb2 import (
+from tilebox.datasets.datasets.v1.collections_pb2 import (
     CreateCollectionRequest,
     DeleteCollectionRequest,
     GetCollectionByNameRequest,
     ListCollectionsRequest,
 )
-from tilebox.datasets.datasetsv1.collections_pb2_grpc import CollectionServiceStub
-from tilebox.datasets.datasetsv1.core_pb2 import Collection as CollectionMessage
-from tilebox.datasets.datasetsv1.core_pb2 import CollectionInfo as CollectionInfoMessage
-from tilebox.datasets.datasetsv1.core_pb2 import CollectionInfos as CollectionInfosMessage
+from tilebox.datasets.datasets.v1.collections_pb2_grpc import CollectionServiceStub
+from tilebox.datasets.datasets.v1.core_pb2 import Collection as CollectionMessage
+from tilebox.datasets.datasets.v1.core_pb2 import CollectionInfo as CollectionInfoMessage
+from tilebox.datasets.datasets.v1.core_pb2 import CollectionInfos as CollectionInfosMessage
 from tilebox.datasets.service import TileboxDatasetService
 
 

tilebox-datasets/tilebox/datasets/aio/client.py

@@ -5,10 +5,10 @@
 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/tilebox/datasets/data/collection.py

@@ -3,7 +3,7 @@
 
 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
 
 
 @dataclass

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

@@ -9,7 +9,7 @@
 
 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
 
 
 class SpatialFilterMode(Enum):

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

@@ -6,7 +6,7 @@
 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"

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

@@ -4,7 +4,7 @@
 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
 
 
 @dataclass(frozen=True)

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

@@ -2,7 +2,7 @@
 from uuid import UUID
 
 from tilebox.datasets.data.uuid import uuid_message_to_optional_uuid, uuid_to_uuid_message
-from tilebox.datasets.datasetsv1 import core_pb2
+from tilebox.datasets.datasets.v1 import core_pb2
 
 
 @dataclass

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

@@ -8,7 +8,7 @@
 from google.protobuf.timestamp_pb2 import Timestamp
 from pandas.core.tools.datetimes import DatetimeScalar, to_datetime
 
-from tilebox.datasets.datasetsv1 import core_pb2
+from tilebox.datasets.datasets.v1 import core_pb2
 
 _SMALLEST_POSSIBLE_TIMEDELTA = timedelta(microseconds=1)
 _EPOCH = datetime(1970, 1, 1, tzinfo=timezone.utc)

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

@@ -5,7 +5,7 @@
 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
 
 
 @dataclass

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

@@ -1,7 +1,7 @@
 # allow the uuid module name which shadows the builtin:
 from uuid import UUID
 
-from tilebox.datasets.datasetsv1 import core_pb2, well_known_types_pb2
+from tilebox.datasets.datasets.v1 import core_pb2, well_known_types_pb2
 
 _NIL_UUID = UUID(int=0)
 

tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.pyi → tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2.pyi

@@ -1,4 +1,4 @@
-from tilebox.datasets.datasetsv1 import core_pb2 as _core_pb2
+from tilebox.datasets.datasets.v1 import core_pb2 as _core_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

tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2_grpc.py → tilebox-datasets/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):