From ae800acf778111223cf5090aa2dac8ed19d11302 Mon Sep 17 00:00:00 2001 From: Corentin Musard Date: Fri, 11 Jul 2025 10:59:13 +0200 Subject: [PATCH] Update generate-protobuf --- CONTRIBUTING.md | 2 +- buf.gen.datasets.yaml | 16 ++++ buf.gen.workflows.yaml | 16 ++++ pyproject.toml | 10 +-- tilebox-datasets/pyproject.toml | 2 +- tilebox-datasets/tests/data/datapoint.py | 2 +- .../tests/data/well_known_types.py | 2 +- .../example_dataset/example_dataset_pb2.py | 2 +- .../example_dataset/example_dataset_pb2.pyi | 2 +- tilebox-datasets/tests/test_timeseries.py | 10 +-- .../tilebox/datasets/aio/client.py | 8 +- .../tilebox/datasets/data/collection.py | 2 +- .../tilebox/datasets/data/data_access.py | 2 +- .../tilebox/datasets/data/datapoint.py | 2 +- .../tilebox/datasets/data/datasets.py | 2 +- .../tilebox/datasets/data/pagination.py | 2 +- .../tilebox/datasets/data/time_interval.py | 2 +- .../tilebox/datasets/data/timeseries.py | 2 +- .../tilebox/datasets/data/uuid.py | 2 +- .../v1}/collections_pb2.py | 6 +- .../v1}/collections_pb2.pyi | 2 +- .../v1}/collections_pb2_grpc.py | 4 +- .../{datasetsv1 => datasets/v1}/core_pb2.py | 6 +- .../{datasetsv1 => datasets/v1}/core_pb2.pyi | 2 +- .../v1}/core_pb2_grpc.py | 0 .../v1}/data_access_pb2.py | 8 +- .../v1}/data_access_pb2.pyi | 4 +- .../v1}/data_access_pb2_grpc.py | 4 +- .../v1}/data_ingestion_pb2.py | 6 +- .../v1}/data_ingestion_pb2.pyi | 2 +- .../v1}/data_ingestion_pb2_grpc.py | 2 +- .../v1}/dataset_type_pb2.py | 6 +- .../v1}/dataset_type_pb2.pyi | 2 +- .../v1}/dataset_type_pb2_grpc.py | 0 .../v1}/datasets_pb2.py | 8 +- .../v1}/datasets_pb2.pyi | 4 +- .../v1}/datasets_pb2_grpc.py | 4 +- .../v1}/timeseries_pb2.py | 6 +- .../v1}/timeseries_pb2.pyi | 2 +- .../v1}/timeseries_pb2_grpc.py | 0 .../v1}/well_known_types_pb2.py | 4 +- .../v1}/well_known_types_pb2.pyi | 0 .../v1}/well_known_types_pb2_grpc.py | 0 .../tilebox/datasets/message_pool.py | 2 +- .../protobuf_conversion/field_types.py | 4 +- tilebox-datasets/tilebox/datasets/service.py | 18 ++-- .../tilebox/datasets/sync/client.py | 8 +- tilebox-workflows/pyproject.toml | 2 +- .../tests/automations/test_client.py | 12 +-- .../tests/clusters/test_client.py | 6 +- tilebox-workflows/tests/jobs/test_client.py | 10 +-- .../tilebox/workflows/automations/cron.py | 4 +- .../tilebox/workflows/automations/service.py | 6 +- .../workflows/automations/storage_event.py | 4 +- .../tilebox/workflows/clusters/service.py | 4 +- tilebox-workflows/tilebox/workflows/data.py | 4 +- .../tilebox/workflows/jobs/service.py | 10 +-- .../tilebox/workflows/runner/task_service.py | 6 +- .../v1}/automation_pb2.py | 6 +- .../v1}/automation_pb2.pyi | 2 +- .../v1}/automation_pb2_grpc.py | 4 +- .../{workflowsv1 => workflows/v1}/core_pb2.py | 4 +- .../v1}/core_pb2.pyi | 0 .../v1}/core_pb2_grpc.py | 0 .../v1}/diagram_pb2.py | 4 +- .../v1}/diagram_pb2.pyi | 0 .../v1}/diagram_pb2_grpc.py | 2 +- .../{workflowsv1 => workflows/v1}/job_pb2.py | 8 +- .../{workflowsv1 => workflows/v1}/job_pb2.pyi | 4 +- .../v1}/job_pb2_grpc.py | 6 +- .../{workflowsv1 => workflows/v1}/task_pb2.py | 6 +- .../v1}/task_pb2.pyi | 2 +- .../v1}/task_pb2_grpc.py | 4 +- .../v1}/workflows_pb2.py | 6 +- .../v1}/workflows_pb2.pyi | 2 +- .../v1}/workflows_pb2_grpc.py | 4 +- tools/copy_protobuf.py | 88 ------------------- tools/generate_protobuf.py | 57 ++++++++++++ 78 files changed, 240 insertions(+), 239 deletions(-) create mode 100644 buf.gen.datasets.yaml create mode 100644 buf.gen.workflows.yaml rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/collections_pb2.py (84%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/collections_pb2.pyi (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/collections_pb2_grpc.py (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/core_pb2.py (92%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/core_pb2.pyi (99%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/core_pb2_grpc.py (100%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/data_access_pb2.py (87%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/data_access_pb2.pyi (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/data_access_pb2_grpc.py (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/data_ingestion_pb2.py (82%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/data_ingestion_pb2.pyi (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/data_ingestion_pb2_grpc.py (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/dataset_type_pb2.py (85%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/dataset_type_pb2.pyi (97%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/dataset_type_pb2_grpc.py (100%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/datasets_pb2.py (88%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/datasets_pb2.pyi (96%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/datasets_pb2_grpc.py (98%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/timeseries_pb2.py (78%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/timeseries_pb2.pyi (96%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/timeseries_pb2_grpc.py (100%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/well_known_types_pb2.py (91%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/well_known_types_pb2.pyi (100%) rename tilebox-datasets/tilebox/datasets/{datasetsv1 => datasets/v1}/well_known_types_pb2_grpc.py (100%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/automation_pb2.py (90%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/automation_pb2.pyi (98%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/automation_pb2_grpc.py (99%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/core_pb2.py (93%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/core_pb2.pyi (100%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/core_pb2_grpc.py (100%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/diagram_pb2.py (81%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/diagram_pb2.pyi (100%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/diagram_pb2_grpc.py (96%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/job_pb2.py (90%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/job_pb2.pyi (97%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/job_pb2_grpc.py (98%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/task_pb2.py (86%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/task_pb2.pyi (97%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/task_pb2_grpc.py (97%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/workflows_pb2.py (82%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/workflows_pb2.pyi (95%) rename tilebox-workflows/tilebox/workflows/{workflowsv1 => workflows/v1}/workflows_pb2_grpc.py (97%) delete mode 100755 tools/copy_protobuf.py create mode 100755 tools/generate_protobuf.py diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5b455b8..1db46a5 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/buf.gen.datasets.yaml b/buf.gen.datasets.yaml new file mode 100644 index 0000000..8e4fd50 --- /dev/null +++ b/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" diff --git a/buf.gen.workflows.yaml b/buf.gen.workflows.yaml new file mode 100644 index 0000000..97822d9 --- /dev/null +++ b/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" diff --git a/pyproject.toml b/pyproject.toml index b2bcedb..695ee31 100644 --- a/pyproject.toml +++ b/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 diff --git a/tilebox-datasets/pyproject.toml b/tilebox-datasets/pyproject.toml index 2234ea6..efe35c9 100644 --- a/tilebox-datasets/pyproject.toml +++ b/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" diff --git a/tilebox-datasets/tests/data/datapoint.py b/tilebox-datasets/tests/data/datapoint.py index 205e70f..21e4573 100644 --- a/tilebox-datasets/tests/data/datapoint.py +++ b/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 diff --git a/tilebox-datasets/tests/data/well_known_types.py b/tilebox-datasets/tests/data/well_known_types.py index 1889001..f708001 100644 --- a/tilebox-datasets/tests/data/well_known_types.py +++ b/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 diff --git a/tilebox-datasets/tests/example_dataset/example_dataset_pb2.py b/tilebox-datasets/tests/example_dataset/example_dataset_pb2.py index ebc8943..9747456 100644 --- a/tilebox-datasets/tests/example_dataset/example_dataset_pb2.py +++ b/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 diff --git a/tilebox-datasets/tests/example_dataset/example_dataset_pb2.pyi b/tilebox-datasets/tests/example_dataset/example_dataset_pb2.pyi index f2f3c38..d4aa089 100644 --- a/tilebox-datasets/tests/example_dataset/example_dataset_pb2.pyi +++ b/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 diff --git a/tilebox-datasets/tests/test_timeseries.py b/tilebox-datasets/tests/test_timeseries.py index cbe417f..0a6f34c 100644 --- a/tilebox-datasets/tests/test_timeseries.py +++ b/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 diff --git a/tilebox-datasets/tilebox/datasets/aio/client.py b/tilebox-datasets/tilebox/datasets/aio/client.py index 7252d07..1809293 100644 --- a/tilebox-datasets/tilebox/datasets/aio/client.py +++ b/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 diff --git a/tilebox-datasets/tilebox/datasets/data/collection.py b/tilebox-datasets/tilebox/datasets/data/collection.py index 2f74883..14e8e63 100644 --- a/tilebox-datasets/tilebox/datasets/data/collection.py +++ b/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 diff --git a/tilebox-datasets/tilebox/datasets/data/data_access.py b/tilebox-datasets/tilebox/datasets/data/data_access.py index e0abf61..c9d33bb 100644 --- a/tilebox-datasets/tilebox/datasets/data/data_access.py +++ b/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): diff --git a/tilebox-datasets/tilebox/datasets/data/datapoint.py b/tilebox-datasets/tilebox/datasets/data/datapoint.py index 888e086..ef621e3 100644 --- a/tilebox-datasets/tilebox/datasets/data/datapoint.py +++ b/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" diff --git a/tilebox-datasets/tilebox/datasets/data/datasets.py b/tilebox-datasets/tilebox/datasets/data/datasets.py index 99433c0..7bb0b6d 100644 --- a/tilebox-datasets/tilebox/datasets/data/datasets.py +++ b/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) diff --git a/tilebox-datasets/tilebox/datasets/data/pagination.py b/tilebox-datasets/tilebox/datasets/data/pagination.py index 8e3dbc6..2ce0b7f 100644 --- a/tilebox-datasets/tilebox/datasets/data/pagination.py +++ b/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 diff --git a/tilebox-datasets/tilebox/datasets/data/time_interval.py b/tilebox-datasets/tilebox/datasets/data/time_interval.py index 5809865..2a59b86 100644 --- a/tilebox-datasets/tilebox/datasets/data/time_interval.py +++ b/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) diff --git a/tilebox-datasets/tilebox/datasets/data/timeseries.py b/tilebox-datasets/tilebox/datasets/data/timeseries.py index 3a1ace1..6d13f6f 100644 --- a/tilebox-datasets/tilebox/datasets/data/timeseries.py +++ b/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 diff --git a/tilebox-datasets/tilebox/datasets/data/uuid.py b/tilebox-datasets/tilebox/datasets/data/uuid.py index 4ed9f02..8bbaca0 100644 --- a/tilebox-datasets/tilebox/datasets/data/uuid.py +++ b/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) diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2.py similarity index 84% rename from tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2.py index f611b85..c7dd6e2 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2.py @@ -22,17 +22,17 @@ _sym_db = _symbol_database.Default() -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__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\"]\n\x17\x43reateCollectionRequest\x12.\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\tdatasetId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"\xc1\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\x0f.datasets.v1.IDR\tdatasetId\"\x7f\n\x17\x44\x65leteCollectionRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12.\n\ndataset_id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\tdatasetId\"\x1a\n\x18\x44\x65leteCollectionResponse\"\x94\x01\n\x16ListCollectionsRequest\x12.\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0f.datasets.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\x42\xb2\x01\n\x0f\x63om.datasets.v1B\x10\x43ollectionsProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +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\"]\n\x17\x43reateCollectionRequest\x12.\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\tdatasetId\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\"\xc1\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\x0f.datasets.v1.IDR\tdatasetId\"\x7f\n\x17\x44\x65leteCollectionRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12.\n\ndataset_id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\tdatasetId\"\x1a\n\x18\x44\x65leteCollectionResponse\"\x94\x01\n\x16ListCollectionsRequest\x12.\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0f.datasets.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\x42p\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::V1b\x06proto3') _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\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _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' _globals['_CREATECOLLECTIONREQUEST']._serialized_start=70 _globals['_CREATECOLLECTIONREQUEST']._serialized_end=163 _globals['_GETCOLLECTIONBYNAMEREQUEST']._serialized_start=166 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2.pyi similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2.pyi index 9e52300..b550b8d 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2.pyi +++ b/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 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2_grpc.py similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/collections_pb2_grpc.py index c8e8b67..18a08b1 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/collections_pb2_grpc.py +++ b/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): diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2.py similarity index 92% rename from tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2.py index 2e4ad08..1688489 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2.py @@ -22,18 +22,18 @@ _sym_db = _symbol_database.Default() -from tilebox.datasets.datasetsv1 import dataset_type_pb2 as datasets_dot_v1_dot_dataset__type__pb2 +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 -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\"\x18\n\x02ID\x12\x12\n\x04uuid\x18\x01 \x01(\x0cR\x04uuid\"\xce\x01\n\x0cTimeInterval\x12\x39\n\nstart_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"\xb5\x01\n\x11\x44\x61tapointInterval\x12*\n\x08start_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x07startId\x12&\n\x06\x65nd_id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x05\x65ndId\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"v\n\x10LegacyPagination\x12\x19\n\x05limit\x18\x01 \x01(\x03H\x00R\x05limit\x88\x01\x01\x12*\n\x0estarting_after\x18\x02 \x01(\tH\x01R\rstartingAfter\x88\x01\x01\x42\x08\n\x06_limitB\x11\n\x0f_starting_after\"\x81\x01\n\nPagination\x12\x19\n\x05limit\x18\x01 \x01(\x03H\x00R\x05limit\x88\x01\x01\x12;\n\x0estarting_after\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDH\x01R\rstartingAfter\x88\x01\x01\x42\x08\n\x06_limitB\x11\n\x0f_starting_after\"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\"\xad\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\x13\n\x02id\x18\x03 \x01(\tH\x00R\x02id\x88\x01\x01\x42\x05\n\x03_id\"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\"\xc0\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?\n\tnext_page\x18\x03 \x01(\x0b\x32\x1d.datasets.v1.LegacyPaginationH\x00R\x08nextPage\x88\x01\x01\x42\x0c\n\n_next_page\"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\x1f\n\x02id\x18\x03 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\"\xc3\x01\n\x0e\x43ollectionInfo\x12\x37\n\ncollection\x18\x01 \x01(\x0b\x32\x17.datasets.v1.CollectionR\ncollection\x12\x42\n\x0c\x61vailability\x18\x02 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalH\x00R\x0c\x61vailability\x88\x01\x01\x12\x19\n\x05\x63ount\x18\x03 \x01(\x04H\x01R\x05\x63ount\x88\x01\x01\x42\x0f\n\r_availabilityB\x08\n\x06_count\"B\n\x0f\x43ollectionInfos\x12/\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x1b.datasets.v1.CollectionInfoR\x04\x64\x61ta\"\xbb\x03\n\x07\x44\x61taset\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12*\n\x08group_id\x18\x02 \x01(\x0b\x32\x0f.datasets.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\"\xa2\x01\n\x0c\x44\x61tasetGroup\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12,\n\tparent_id\x18\x02 \x01(\x0b\x32\x0f.datasets.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\x42\xab\x01\n\x0f\x63om.datasets.v1B\tCoreProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +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\"\x18\n\x02ID\x12\x12\n\x04uuid\x18\x01 \x01(\x0cR\x04uuid\"\xce\x01\n\x0cTimeInterval\x12\x39\n\nstart_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"\xb5\x01\n\x11\x44\x61tapointInterval\x12*\n\x08start_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x07startId\x12&\n\x06\x65nd_id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x05\x65ndId\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"v\n\x10LegacyPagination\x12\x19\n\x05limit\x18\x01 \x01(\x03H\x00R\x05limit\x88\x01\x01\x12*\n\x0estarting_after\x18\x02 \x01(\tH\x01R\rstartingAfter\x88\x01\x01\x42\x08\n\x06_limitB\x11\n\x0f_starting_after\"\x81\x01\n\nPagination\x12\x19\n\x05limit\x18\x01 \x01(\x03H\x00R\x05limit\x88\x01\x01\x12;\n\x0estarting_after\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDH\x01R\rstartingAfter\x88\x01\x01\x42\x08\n\x06_limitB\x11\n\x0f_starting_after\"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\"\xad\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\x13\n\x02id\x18\x03 \x01(\tH\x00R\x02id\x88\x01\x01\x42\x05\n\x03_id\"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\"\xc0\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?\n\tnext_page\x18\x03 \x01(\x0b\x32\x1d.datasets.v1.LegacyPaginationH\x00R\x08nextPage\x88\x01\x01\x42\x0c\n\n_next_page\"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\x1f\n\x02id\x18\x03 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\"\xc3\x01\n\x0e\x43ollectionInfo\x12\x37\n\ncollection\x18\x01 \x01(\x0b\x32\x17.datasets.v1.CollectionR\ncollection\x12\x42\n\x0c\x61vailability\x18\x02 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalH\x00R\x0c\x61vailability\x88\x01\x01\x12\x19\n\x05\x63ount\x18\x03 \x01(\x04H\x01R\x05\x63ount\x88\x01\x01\x42\x0f\n\r_availabilityB\x08\n\x06_count\"B\n\x0f\x43ollectionInfos\x12/\n\x04\x64\x61ta\x18\x01 \x03(\x0b\x32\x1b.datasets.v1.CollectionInfoR\x04\x64\x61ta\"\xbb\x03\n\x07\x44\x61taset\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12*\n\x08group_id\x18\x02 \x01(\x0b\x32\x0f.datasets.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\"\xa2\x01\n\x0c\x44\x61tasetGroup\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12,\n\tparent_id\x18\x02 \x01(\x0b\x32\x0f.datasets.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\x42i\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::V1b\x06proto3') _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\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _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' _globals['_DATASETPERMISSION']._serialized_start=2455 _globals['_DATASETPERMISSION']._serialized_end=2610 _globals['_VISIBILITY']._serialized_start=2612 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2.pyi similarity index 99% rename from tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2.pyi index c59fc50..b79cd68 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2.pyi +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2.pyi @@ -1,4 +1,4 @@ -from tilebox.datasets.datasetsv1 import dataset_type_pb2 as _dataset_type_pb2 +from tilebox.datasets.datasets.v1 import dataset_type_pb2 as _dataset_type_pb2 from google.protobuf import timestamp_pb2 as _timestamp_pb2 from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2_grpc.py similarity index 100% rename from tilebox-datasets/tilebox/datasets/datasetsv1/core_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/core_pb2_grpc.py diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2.py similarity index 87% rename from tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2.py index c54aa97..60f324c 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2.py @@ -22,18 +22,18 @@ _sym_db = _symbol_database.Default() -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 -from tilebox.datasets.datasetsv1 import well_known_types_pb2 as datasets_dot_v1_dot_well__known__types__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import well_known_types_pb2 as datasets_dot_v1_dot_well__known__types__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x61tasets/v1/data_access.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\"datasets/v1/well_known_types.proto\"\xcd\x02\n\x1cGetDatasetForIntervalRequest\x12#\n\rcollection_id\x18\x01 \x01(\tR\x0c\x63ollectionId\x12>\n\rtime_interval\x18\x02 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalR\x0ctimeInterval\x12M\n\x12\x64\x61tapoint_interval\x18\x06 \x01(\x0b\x32\x1e.datasets.v1.DatapointIntervalR\x11\x64\x61tapointInterval\x12\x36\n\x04page\x18\x03 \x01(\x0b\x32\x1d.datasets.v1.LegacyPaginationH\x00R\x04page\x88\x01\x01\x12\x1b\n\tskip_data\x18\x04 \x01(\x08R\x08skipData\x12\x1b\n\tskip_meta\x18\x05 \x01(\x08R\x08skipMetaB\x07\n\x05_page\"k\n\x17GetDatapointByIdRequest\x12#\n\rcollection_id\x18\x01 \x01(\tR\x0c\x63ollectionId\x12\x0e\n\x02id\x18\x02 \x01(\tR\x02id\x12\x1b\n\tskip_data\x18\x03 \x01(\x08R\x08skipData\"\x88\x01\n\x10QueryByIDRequest\x12\x36\n\x0e\x63ollection_ids\x18\x01 \x03(\x0b\x32\x0f.datasets.v1.IDR\rcollectionIds\x12\x1f\n\x02id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12\x1b\n\tskip_data\x18\x03 \x01(\x08R\x08skipData\"\xf7\x01\n\x0cQueryFilters\x12@\n\rtime_interval\x18\x01 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalH\x00R\x0ctimeInterval\x12O\n\x12\x64\x61tapoint_interval\x18\x02 \x01(\x0b\x32\x1e.datasets.v1.DatapointIntervalH\x00R\x11\x64\x61tapointInterval\x12\x41\n\x0espatial_extent\x18\x03 \x01(\x0b\x32\x1a.datasets.v1.SpatialFilterR\rspatialExtentB\x11\n\x0ftemporal_extent\"\xc9\x01\n\rSpatialFilter\x12\x31\n\x08geometry\x18\x01 \x01(\x0b\x32\x15.datasets.v1.GeometryR\x08geometry\x12\x32\n\x04mode\x18\x02 \x01(\x0e\x32\x1e.datasets.v1.SpatialFilterModeR\x04mode\x12Q\n\x11\x63oordinate_system\x18\x03 \x01(\x0e\x32$.datasets.v1.SpatialCoordinateSystemR\x10\x63oordinateSystem\"\xd3\x01\n\x0cQueryRequest\x12\x36\n\x0e\x63ollection_ids\x18\x01 \x03(\x0b\x32\x0f.datasets.v1.IDR\rcollectionIds\x12\x33\n\x07\x66ilters\x18\x02 \x01(\x0b\x32\x19.datasets.v1.QueryFiltersR\x07\x66ilters\x12\x30\n\x04page\x18\x03 \x01(\x0b\x32\x17.datasets.v1.PaginationH\x00R\x04page\x88\x01\x01\x12\x1b\n\tskip_data\x18\x04 \x01(\x08R\x08skipDataB\x07\n\x05_page\"\x88\x01\n\x0fQueryResultPage\x12,\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x18.datasets.v1.RepeatedAnyR\x04\x64\x61ta\x12\x39\n\tnext_page\x18\x02 \x01(\x0b\x32\x17.datasets.v1.PaginationH\x00R\x08nextPage\x88\x01\x01\x42\x0c\n\n_next_page*~\n\x11SpatialFilterMode\x12#\n\x1fSPATIAL_FILTER_MODE_UNSPECIFIED\x10\x00\x12\"\n\x1eSPATIAL_FILTER_MODE_INTERSECTS\x10\x01\x12 \n\x1cSPATIAL_FILTER_MODE_CONTAINS\x10\x02*\x96\x01\n\x17SpatialCoordinateSystem\x12)\n%SPATIAL_COORDINATE_SYSTEM_UNSPECIFIED\x10\x00\x12\'\n#SPATIAL_COORDINATE_SYSTEM_CARTESIAN\x10\x01\x12\'\n#SPATIAL_COORDINATE_SYSTEM_SPHERICAL\x10\x02\x32\xcd\x02\n\x11\x44\x61taAccessService\x12`\n\x15GetDatasetForInterval\x12).datasets.v1.GetDatasetForIntervalRequest\x1a\x1a.datasets.v1.DatapointPage\"\x00\x12R\n\x10GetDatapointByID\x12$.datasets.v1.GetDatapointByIdRequest\x1a\x16.datasets.v1.Datapoint\"\x00\x12>\n\tQueryByID\x12\x1d.datasets.v1.QueryByIDRequest\x1a\x10.datasets.v1.Any\"\x00\x12\x42\n\x05Query\x12\x19.datasets.v1.QueryRequest\x1a\x1c.datasets.v1.QueryResultPage\"\x00\x42\xb1\x01\n\x0f\x63om.datasets.v1B\x0f\x44\x61taAccessProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x61tasets/v1/data_access.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\"datasets/v1/well_known_types.proto\"\xcd\x02\n\x1cGetDatasetForIntervalRequest\x12#\n\rcollection_id\x18\x01 \x01(\tR\x0c\x63ollectionId\x12>\n\rtime_interval\x18\x02 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalR\x0ctimeInterval\x12M\n\x12\x64\x61tapoint_interval\x18\x06 \x01(\x0b\x32\x1e.datasets.v1.DatapointIntervalR\x11\x64\x61tapointInterval\x12\x36\n\x04page\x18\x03 \x01(\x0b\x32\x1d.datasets.v1.LegacyPaginationH\x00R\x04page\x88\x01\x01\x12\x1b\n\tskip_data\x18\x04 \x01(\x08R\x08skipData\x12\x1b\n\tskip_meta\x18\x05 \x01(\x08R\x08skipMetaB\x07\n\x05_page\"k\n\x17GetDatapointByIdRequest\x12#\n\rcollection_id\x18\x01 \x01(\tR\x0c\x63ollectionId\x12\x0e\n\x02id\x18\x02 \x01(\tR\x02id\x12\x1b\n\tskip_data\x18\x03 \x01(\x08R\x08skipData\"\x88\x01\n\x10QueryByIDRequest\x12\x36\n\x0e\x63ollection_ids\x18\x01 \x03(\x0b\x32\x0f.datasets.v1.IDR\rcollectionIds\x12\x1f\n\x02id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12\x1b\n\tskip_data\x18\x03 \x01(\x08R\x08skipData\"\xf7\x01\n\x0cQueryFilters\x12@\n\rtime_interval\x18\x01 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalH\x00R\x0ctimeInterval\x12O\n\x12\x64\x61tapoint_interval\x18\x02 \x01(\x0b\x32\x1e.datasets.v1.DatapointIntervalH\x00R\x11\x64\x61tapointInterval\x12\x41\n\x0espatial_extent\x18\x03 \x01(\x0b\x32\x1a.datasets.v1.SpatialFilterR\rspatialExtentB\x11\n\x0ftemporal_extent\"\xc9\x01\n\rSpatialFilter\x12\x31\n\x08geometry\x18\x01 \x01(\x0b\x32\x15.datasets.v1.GeometryR\x08geometry\x12\x32\n\x04mode\x18\x02 \x01(\x0e\x32\x1e.datasets.v1.SpatialFilterModeR\x04mode\x12Q\n\x11\x63oordinate_system\x18\x03 \x01(\x0e\x32$.datasets.v1.SpatialCoordinateSystemR\x10\x63oordinateSystem\"\xd3\x01\n\x0cQueryRequest\x12\x36\n\x0e\x63ollection_ids\x18\x01 \x03(\x0b\x32\x0f.datasets.v1.IDR\rcollectionIds\x12\x33\n\x07\x66ilters\x18\x02 \x01(\x0b\x32\x19.datasets.v1.QueryFiltersR\x07\x66ilters\x12\x30\n\x04page\x18\x03 \x01(\x0b\x32\x17.datasets.v1.PaginationH\x00R\x04page\x88\x01\x01\x12\x1b\n\tskip_data\x18\x04 \x01(\x08R\x08skipDataB\x07\n\x05_page\"\x88\x01\n\x0fQueryResultPage\x12,\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32\x18.datasets.v1.RepeatedAnyR\x04\x64\x61ta\x12\x39\n\tnext_page\x18\x02 \x01(\x0b\x32\x17.datasets.v1.PaginationH\x00R\x08nextPage\x88\x01\x01\x42\x0c\n\n_next_page*~\n\x11SpatialFilterMode\x12#\n\x1fSPATIAL_FILTER_MODE_UNSPECIFIED\x10\x00\x12\"\n\x1eSPATIAL_FILTER_MODE_INTERSECTS\x10\x01\x12 \n\x1cSPATIAL_FILTER_MODE_CONTAINS\x10\x02*\x96\x01\n\x17SpatialCoordinateSystem\x12)\n%SPATIAL_COORDINATE_SYSTEM_UNSPECIFIED\x10\x00\x12\'\n#SPATIAL_COORDINATE_SYSTEM_CARTESIAN\x10\x01\x12\'\n#SPATIAL_COORDINATE_SYSTEM_SPHERICAL\x10\x02\x32\xcd\x02\n\x11\x44\x61taAccessService\x12`\n\x15GetDatasetForInterval\x12).datasets.v1.GetDatasetForIntervalRequest\x1a\x1a.datasets.v1.DatapointPage\"\x00\x12R\n\x10GetDatapointByID\x12$.datasets.v1.GetDatapointByIdRequest\x1a\x16.datasets.v1.Datapoint\"\x00\x12>\n\tQueryByID\x12\x1d.datasets.v1.QueryByIDRequest\x1a\x10.datasets.v1.Any\"\x00\x12\x42\n\x05Query\x12\x19.datasets.v1.QueryRequest\x1a\x1c.datasets.v1.QueryResultPage\"\x00\x42o\n\x0f\x63om.datasets.v1B\x0f\x44\x61taAccessProtoP\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::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.data_access_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\017DataAccessProtoP\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\017DataAccessProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' _globals['_SPATIALFILTERMODE']._serialized_start=1497 _globals['_SPATIALFILTERMODE']._serialized_end=1623 _globals['_SPATIALCOORDINATESYSTEM']._serialized_start=1626 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2.pyi similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2.pyi index 4578a74..dd078d1 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2.pyi +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2.pyi @@ -1,5 +1,5 @@ -from tilebox.datasets.datasetsv1 import core_pb2 as _core_pb2 -from tilebox.datasets.datasetsv1 import well_known_types_pb2 as _well_known_types_pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as _core_pb2 +from tilebox.datasets.datasets.v1 import well_known_types_pb2 as _well_known_types_pb2 from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2_grpc.py similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2_grpc.py index d43c8ac..7ec8b99 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/data_access_pb2_grpc.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/data_access_pb2_grpc.py @@ -2,8 +2,8 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 -from tilebox.datasets.datasetsv1 import data_access_pb2 as datasets_dot_v1_dot_data__access__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import data_access_pb2 as datasets_dot_v1_dot_data__access__pb2 class DataAccessServiceStub(object): diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2.py similarity index 82% rename from tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2.py index 9879263..03546b4 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2.py @@ -22,17 +22,17 @@ _sym_db = _symbol_database.Default() -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n datasets/v1/data_ingestion.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\"\xaf\x01\n\x17IngestDatapointsRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12\x37\n\ndatapoints\x18\x02 \x01(\x0b\x32\x17.datasets.v1.DatapointsR\ndatapoints\x12%\n\x0e\x61llow_existing\x18\x03 \x01(\x08R\rallowExisting\"\x84\x01\n\rIngestRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12\x16\n\x06values\x18\x02 \x03(\x0cR\x06values\x12%\n\x0e\x61llow_existing\x18\x03 \x01(\x08R\rallowExisting\"\x8a\x01\n\x0eIngestResponse\x12\x1f\n\x0bnum_created\x18\x01 \x01(\x03R\nnumCreated\x12!\n\x0cnum_existing\x18\x02 \x01(\x03R\x0bnumExisting\x12\x34\n\rdatapoint_ids\x18\x03 \x03(\x0b\x32\x0f.datasets.v1.IDR\x0c\x64\x61tapointIds\"{\n\rDeleteRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12\x34\n\rdatapoint_ids\x18\x02 \x03(\x0b\x32\x0f.datasets.v1.IDR\x0c\x64\x61tapointIds\"1\n\x0e\x44\x65leteResponse\x12\x1f\n\x0bnum_deleted\x18\x01 \x01(\x03R\nnumDeleted2\xa0\x01\n\x14\x44\x61taIngestionService\x12\x43\n\x06Ingest\x12\x1a.datasets.v1.IngestRequest\x1a\x1b.datasets.v1.IngestResponse\"\x00\x12\x43\n\x06\x44\x65lete\x12\x1a.datasets.v1.DeleteRequest\x1a\x1b.datasets.v1.DeleteResponse\"\x00\x42\xb4\x01\n\x0f\x63om.datasets.v1B\x12\x44\x61taIngestionProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n datasets/v1/data_ingestion.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\"\xaf\x01\n\x17IngestDatapointsRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12\x37\n\ndatapoints\x18\x02 \x01(\x0b\x32\x17.datasets.v1.DatapointsR\ndatapoints\x12%\n\x0e\x61llow_existing\x18\x03 \x01(\x08R\rallowExisting\"\x84\x01\n\rIngestRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12\x16\n\x06values\x18\x02 \x03(\x0cR\x06values\x12%\n\x0e\x61llow_existing\x18\x03 \x01(\x08R\rallowExisting\"\x8a\x01\n\x0eIngestResponse\x12\x1f\n\x0bnum_created\x18\x01 \x01(\x03R\nnumCreated\x12!\n\x0cnum_existing\x18\x02 \x01(\x03R\x0bnumExisting\x12\x34\n\rdatapoint_ids\x18\x03 \x03(\x0b\x32\x0f.datasets.v1.IDR\x0c\x64\x61tapointIds\"{\n\rDeleteRequest\x12\x34\n\rcollection_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12\x34\n\rdatapoint_ids\x18\x02 \x03(\x0b\x32\x0f.datasets.v1.IDR\x0c\x64\x61tapointIds\"1\n\x0e\x44\x65leteResponse\x12\x1f\n\x0bnum_deleted\x18\x01 \x01(\x03R\nnumDeleted2\xa0\x01\n\x14\x44\x61taIngestionService\x12\x43\n\x06Ingest\x12\x1a.datasets.v1.IngestRequest\x1a\x1b.datasets.v1.IngestResponse\"\x00\x12\x43\n\x06\x44\x65lete\x12\x1a.datasets.v1.DeleteRequest\x1a\x1b.datasets.v1.DeleteResponse\"\x00\x42r\n\x0f\x63om.datasets.v1B\x12\x44\x61taIngestionProtoP\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::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.data_ingestion_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\022DataIngestionProtoP\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\022DataIngestionProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' _globals['_INGESTDATAPOINTSREQUEST']._serialized_start=74 _globals['_INGESTDATAPOINTSREQUEST']._serialized_end=249 _globals['_INGESTREQUEST']._serialized_start=252 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2.pyi similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2.pyi index a59deb0..faebfc2 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2.pyi +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_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.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2_grpc.py similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2_grpc.py index 6b53208..2e8a9c1 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/data_ingestion_pb2_grpc.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/data_ingestion_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.datasets.datasetsv1 import data_ingestion_pb2 as datasets_dot_v1_dot_data__ingestion__pb2 +from tilebox.datasets.datasets.v1 import data_ingestion_pb2 as datasets_dot_v1_dot_data__ingestion__pb2 class DataIngestionServiceStub(object): diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2.py similarity index 85% rename from tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2.py index 7b01281..f233ee6 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2.py @@ -22,19 +22,19 @@ _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 descriptor_pb2 as google_dot_protobuf_dot_descriptor__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x64\x61tasets/v1/dataset_type.proto\x12\x0b\x64\x61tasets.v1\x1a\"datasets/v1/well_known_types.proto\x1a google/protobuf/descriptor.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xaa\x01\n\x05\x46ield\x12\x45\n\ndescriptor\x18\x01 \x01(\x0b\x32%.google.protobuf.FieldDescriptorProtoR\ndescriptor\x12<\n\nannotation\x18\x02 \x01(\x0b\x32\x1c.datasets.v1.FieldAnnotationR\nannotation\x12\x1c\n\tqueryable\x18\x03 \x01(\x08R\tqueryable\"X\n\x0f\x46ieldAnnotation\x12 \n\x0b\x64\x65scription\x18\x01 \x01(\tR\x0b\x64\x65scription\x12#\n\rexample_value\x18\x02 \x01(\tR\x0c\x65xampleValue\"g\n\x0b\x44\x61tasetType\x12,\n\x04kind\x18\x01 \x01(\x0e\x32\x18.datasets.v1.DatasetKindR\x04kind\x12*\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x12.datasets.v1.FieldR\x06\x66ields\"\xf4\x01\n\rAnnotatedType\x12I\n\x0e\x64\x65scriptor_set\x18\x01 \x01(\x0b\x32\".google.protobuf.FileDescriptorSetR\rdescriptorSet\x12\x19\n\x08type_url\x18\x02 \x01(\tR\x07typeUrl\x12I\n\x11\x66ield_annotations\x18\x04 \x03(\x0b\x32\x1c.datasets.v1.FieldAnnotationR\x10\x66ieldAnnotations\x12,\n\x04kind\x18\x05 \x01(\x0e\x32\x18.datasets.v1.DatasetKindR\x04kindJ\x04\x08\x03\x10\x04\"\xa9\x01\n\x11TemporalDatapoint\x12.\n\x04time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x04time\x12!\n\x02id\x18\x02 \x01(\x0b\x32\x11.datasets.v1.UUIDR\x02id\x12\x41\n\x0eingestion_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\ringestionTime\"\xe2\x01\n\x17SpatioTemporalDatapoint\x12.\n\x04time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x04time\x12!\n\x02id\x18\x02 \x01(\x0b\x32\x11.datasets.v1.UUIDR\x02id\x12\x41\n\x0eingestion_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\ringestionTime\x12\x31\n\x08geometry\x18\x04 \x01(\x0b\x32\x15.datasets.v1.GeometryR\x08geometry*g\n\x0b\x44\x61tasetKind\x12\x1c\n\x18\x44\x41TASET_KIND_UNSPECIFIED\x10\x00\x12\x19\n\x15\x44\x41TASET_KIND_TEMPORAL\x10\x01\x12\x1f\n\x1b\x44\x41TASET_KIND_SPATIOTEMPORAL\x10\x02\x42\xb2\x01\n\x0f\x63om.datasets.v1B\x10\x44\x61tasetTypeProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1e\x64\x61tasets/v1/dataset_type.proto\x12\x0b\x64\x61tasets.v1\x1a\"datasets/v1/well_known_types.proto\x1a google/protobuf/descriptor.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\xaa\x01\n\x05\x46ield\x12\x45\n\ndescriptor\x18\x01 \x01(\x0b\x32%.google.protobuf.FieldDescriptorProtoR\ndescriptor\x12<\n\nannotation\x18\x02 \x01(\x0b\x32\x1c.datasets.v1.FieldAnnotationR\nannotation\x12\x1c\n\tqueryable\x18\x03 \x01(\x08R\tqueryable\"X\n\x0f\x46ieldAnnotation\x12 \n\x0b\x64\x65scription\x18\x01 \x01(\tR\x0b\x64\x65scription\x12#\n\rexample_value\x18\x02 \x01(\tR\x0c\x65xampleValue\"g\n\x0b\x44\x61tasetType\x12,\n\x04kind\x18\x01 \x01(\x0e\x32\x18.datasets.v1.DatasetKindR\x04kind\x12*\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x12.datasets.v1.FieldR\x06\x66ields\"\xf4\x01\n\rAnnotatedType\x12I\n\x0e\x64\x65scriptor_set\x18\x01 \x01(\x0b\x32\".google.protobuf.FileDescriptorSetR\rdescriptorSet\x12\x19\n\x08type_url\x18\x02 \x01(\tR\x07typeUrl\x12I\n\x11\x66ield_annotations\x18\x04 \x03(\x0b\x32\x1c.datasets.v1.FieldAnnotationR\x10\x66ieldAnnotations\x12,\n\x04kind\x18\x05 \x01(\x0e\x32\x18.datasets.v1.DatasetKindR\x04kindJ\x04\x08\x03\x10\x04\"\xa9\x01\n\x11TemporalDatapoint\x12.\n\x04time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x04time\x12!\n\x02id\x18\x02 \x01(\x0b\x32\x11.datasets.v1.UUIDR\x02id\x12\x41\n\x0eingestion_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\ringestionTime\"\xe2\x01\n\x17SpatioTemporalDatapoint\x12.\n\x04time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x04time\x12!\n\x02id\x18\x02 \x01(\x0b\x32\x11.datasets.v1.UUIDR\x02id\x12\x41\n\x0eingestion_time\x18\x03 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\ringestionTime\x12\x31\n\x08geometry\x18\x04 \x01(\x0b\x32\x15.datasets.v1.GeometryR\x08geometry*g\n\x0b\x44\x61tasetKind\x12\x1c\n\x18\x44\x41TASET_KIND_UNSPECIFIED\x10\x00\x12\x19\n\x15\x44\x41TASET_KIND_TEMPORAL\x10\x01\x12\x1f\n\x1b\x44\x41TASET_KIND_SPATIOTEMPORAL\x10\x02\x42p\n\x0f\x63om.datasets.v1B\x10\x44\x61tasetTypeProtoP\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::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.dataset_type_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\020DatasetTypeProtoP\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\020DatasetTypeProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' _globals['_DATASETKIND']._serialized_start=1166 _globals['_DATASETKIND']._serialized_end=1269 _globals['_FIELD']._serialized_start=151 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2.pyi similarity index 97% rename from tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2.pyi index 0bc9fa6..4a1daa6 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2.pyi +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2.pyi @@ -1,4 +1,4 @@ -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 from google.protobuf import descriptor_pb2 as _descriptor_pb2 from google.protobuf import timestamp_pb2 as _timestamp_pb2 from google.protobuf.internal import containers as _containers diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2_grpc.py similarity index 100% rename from tilebox-datasets/tilebox/datasets/datasetsv1/dataset_type_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/dataset_type_pb2_grpc.py diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2.py similarity index 88% rename from tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2.py index 9fb8402..efa9981 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2.py @@ -22,18 +22,18 @@ _sym_db = _symbol_database.Default() -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 -from tilebox.datasets.datasetsv1 import dataset_type_pb2 as datasets_dot_v1_dot_dataset__type__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import dataset_type_pb2 as datasets_dot_v1_dot_dataset__type__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x64\x61tasets/v1/datasets.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\x1e\x64\x61tasets/v1/dataset_type.proto\"\x8f\x01\n\x14\x43reateDatasetRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x04type\x18\x02 \x01(\x0b\x32\x18.datasets.v1.DatasetTypeR\x04type\x12\x18\n\x07summary\x18\x03 \x01(\tR\x07summary\x12\x1b\n\tcode_name\x18\x04 \x01(\tR\x08\x63odeName\"H\n\x11GetDatasetRequest\x12\x12\n\x04slug\x18\x01 \x01(\tR\x04slug\x12\x1f\n\x02id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\"\x93\x01\n\x14UpdateDatasetRequest\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12,\n\x04type\x18\x03 \x01(\x0b\x32\x18.datasets.v1.DatasetTypeR\x04type\x12\x18\n\x07summary\x18\x04 \x01(\tR\x07summary\"t\n\nClientInfo\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12 \n\x0b\x65nvironment\x18\x02 \x01(\tR\x0b\x65nvironment\x12\x30\n\x08packages\x18\x03 \x03(\x0b\x32\x14.datasets.v1.PackageR\x08packages\"7\n\x07Package\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\"d\n\x1fUpdateDatasetDescriptionRequest\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scription\"7\n\x14\x44\x65leteDatasetRequest\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\"1\n\x15\x44\x65leteDatasetResponse\x12\x18\n\x07trashed\x18\x01 \x01(\x08R\x07trashed\"O\n\x13ListDatasetsRequest\x12\x38\n\x0b\x63lient_info\x18\x01 \x01(\x0b\x32\x17.datasets.v1.ClientInfoR\nclientInfo\"\x9f\x02\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datasets.v1.DatasetR\x08\x64\x61tasets\x12\x31\n\x06groups\x18\x02 \x03(\x0b\x32\x19.datasets.v1.DatasetGroupR\x06groups\x12%\n\x0eserver_message\x18\x03 \x01(\tR\rserverMessage\x12%\n\x0eowned_datasets\x18\x04 \x01(\x03R\rownedDatasets\x12\x39\n\x16maximum_owned_datasets\x18\x05 \x01(\x03H\x00R\x14maximumOwnedDatasets\x88\x01\x01\x42\x19\n\x17_maximum_owned_datasets2\x81\x04\n\x0e\x44\x61tasetService\x12J\n\rCreateDataset\x12!.datasets.v1.CreateDatasetRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12\x44\n\nGetDataset\x12\x1e.datasets.v1.GetDatasetRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12J\n\rUpdateDataset\x12!.datasets.v1.UpdateDatasetRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12`\n\x18UpdateDatasetDescription\x12,.datasets.v1.UpdateDatasetDescriptionRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12X\n\rDeleteDataset\x12!.datasets.v1.DeleteDatasetRequest\x1a\".datasets.v1.DeleteDatasetResponse\"\x00\x12U\n\x0cListDatasets\x12 .datasets.v1.ListDatasetsRequest\x1a!.datasets.v1.ListDatasetsResponse\"\x00\x42\xaf\x01\n\x0f\x63om.datasets.v1B\rDatasetsProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1a\x64\x61tasets/v1/datasets.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\x1e\x64\x61tasets/v1/dataset_type.proto\"\x8f\x01\n\x14\x43reateDatasetRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12,\n\x04type\x18\x02 \x01(\x0b\x32\x18.datasets.v1.DatasetTypeR\x04type\x12\x18\n\x07summary\x18\x03 \x01(\tR\x07summary\x12\x1b\n\tcode_name\x18\x04 \x01(\tR\x08\x63odeName\"H\n\x11GetDatasetRequest\x12\x12\n\x04slug\x18\x01 \x01(\tR\x04slug\x12\x1f\n\x02id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\"\x93\x01\n\x14UpdateDatasetRequest\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12,\n\x04type\x18\x03 \x01(\x0b\x32\x18.datasets.v1.DatasetTypeR\x04type\x12\x18\n\x07summary\x18\x04 \x01(\tR\x07summary\"t\n\nClientInfo\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12 \n\x0b\x65nvironment\x18\x02 \x01(\tR\x0b\x65nvironment\x12\x30\n\x08packages\x18\x03 \x03(\x0b\x32\x14.datasets.v1.PackageR\x08packages\"7\n\x07Package\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\"d\n\x1fUpdateDatasetDescriptionRequest\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\x12 \n\x0b\x64\x65scription\x18\x02 \x01(\tR\x0b\x64\x65scription\"7\n\x14\x44\x65leteDatasetRequest\x12\x1f\n\x02id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\x02id\"1\n\x15\x44\x65leteDatasetResponse\x12\x18\n\x07trashed\x18\x01 \x01(\x08R\x07trashed\"O\n\x13ListDatasetsRequest\x12\x38\n\x0b\x63lient_info\x18\x01 \x01(\x0b\x32\x17.datasets.v1.ClientInfoR\nclientInfo\"\x9f\x02\n\x14ListDatasetsResponse\x12\x30\n\x08\x64\x61tasets\x18\x01 \x03(\x0b\x32\x14.datasets.v1.DatasetR\x08\x64\x61tasets\x12\x31\n\x06groups\x18\x02 \x03(\x0b\x32\x19.datasets.v1.DatasetGroupR\x06groups\x12%\n\x0eserver_message\x18\x03 \x01(\tR\rserverMessage\x12%\n\x0eowned_datasets\x18\x04 \x01(\x03R\rownedDatasets\x12\x39\n\x16maximum_owned_datasets\x18\x05 \x01(\x03H\x00R\x14maximumOwnedDatasets\x88\x01\x01\x42\x19\n\x17_maximum_owned_datasets2\x81\x04\n\x0e\x44\x61tasetService\x12J\n\rCreateDataset\x12!.datasets.v1.CreateDatasetRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12\x44\n\nGetDataset\x12\x1e.datasets.v1.GetDatasetRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12J\n\rUpdateDataset\x12!.datasets.v1.UpdateDatasetRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12`\n\x18UpdateDatasetDescription\x12,.datasets.v1.UpdateDatasetDescriptionRequest\x1a\x14.datasets.v1.Dataset\"\x00\x12X\n\rDeleteDataset\x12!.datasets.v1.DeleteDatasetRequest\x1a\".datasets.v1.DeleteDatasetResponse\"\x00\x12U\n\x0cListDatasets\x12 .datasets.v1.ListDatasetsRequest\x1a!.datasets.v1.ListDatasetsResponse\"\x00\x42m\n\x0f\x63om.datasets.v1B\rDatasetsProtoP\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::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.datasets_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\rDatasetsProtoP\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\rDatasetsProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' _globals['_CREATEDATASETREQUEST']._serialized_start=100 _globals['_CREATEDATASETREQUEST']._serialized_end=243 _globals['_GETDATASETREQUEST']._serialized_start=245 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2.pyi similarity index 96% rename from tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2.pyi index 9a42081..19f1409 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2.pyi +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2.pyi @@ -1,5 +1,5 @@ -from tilebox.datasets.datasetsv1 import core_pb2 as _core_pb2 -from tilebox.datasets.datasetsv1 import dataset_type_pb2 as _dataset_type_pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as _core_pb2 +from tilebox.datasets.datasets.v1 import dataset_type_pb2 as _dataset_type_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2_grpc.py similarity index 98% rename from tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2_grpc.py index 2c484b2..5729c02 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/datasets_pb2_grpc.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/datasets_pb2_grpc.py @@ -2,8 +2,8 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 -from tilebox.datasets.datasetsv1 import datasets_pb2 as datasets_dot_v1_dot_datasets__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import datasets_pb2 as datasets_dot_v1_dot_datasets__pb2 class DatasetServiceStub(object): diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2.py similarity index 78% rename from tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2.py index b83a81c..ed26e47 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2.py @@ -22,18 +22,18 @@ _sym_db = _symbol_database.Default() -from tilebox.datasets.datasetsv1 import core_pb2 as datasets_dot_v1_dot_core__pb2 +from tilebox.datasets.datasets.v1 import core_pb2 as datasets_dot_v1_dot_core__pb2 from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64\x61tasets/v1/timeseries.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\x1egoogle/protobuf/duration.proto\"\x88\x03\n\x16TimeseriesDatasetChunk\x12.\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\tdatasetId\x12\x34\n\rcollection_id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12>\n\rtime_interval\x18\x03 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalR\x0ctimeInterval\x12M\n\x12\x64\x61tapoint_interval\x18\x04 \x01(\x0b\x32\x1e.datasets.v1.DatapointIntervalR\x11\x64\x61tapointInterval\x12#\n\rbranch_factor\x18\x05 \x01(\x05R\x0c\x62ranchFactor\x12\x1d\n\nchunk_size\x18\x06 \x01(\x05R\tchunkSize\x12\x35\n\x17\x64\x61tapoints_per_365_days\x18\x07 \x01(\x03R\x14\x64\x61tapointsPer365Days\"\x85\x01\n\tTimeChunk\x12>\n\rtime_interval\x18\x01 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalR\x0ctimeInterval\x12\x38\n\nchunk_size\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\tchunkSizeB\xb1\x01\n\x0f\x63om.datasets.v1B\x0fTimeseriesProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64\x61tasets/v1/timeseries.proto\x12\x0b\x64\x61tasets.v1\x1a\x16\x64\x61tasets/v1/core.proto\x1a\x1egoogle/protobuf/duration.proto\"\x88\x03\n\x16TimeseriesDatasetChunk\x12.\n\ndataset_id\x18\x01 \x01(\x0b\x32\x0f.datasets.v1.IDR\tdatasetId\x12\x34\n\rcollection_id\x18\x02 \x01(\x0b\x32\x0f.datasets.v1.IDR\x0c\x63ollectionId\x12>\n\rtime_interval\x18\x03 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalR\x0ctimeInterval\x12M\n\x12\x64\x61tapoint_interval\x18\x04 \x01(\x0b\x32\x1e.datasets.v1.DatapointIntervalR\x11\x64\x61tapointInterval\x12#\n\rbranch_factor\x18\x05 \x01(\x05R\x0c\x62ranchFactor\x12\x1d\n\nchunk_size\x18\x06 \x01(\x05R\tchunkSize\x12\x35\n\x17\x64\x61tapoints_per_365_days\x18\x07 \x01(\x03R\x14\x64\x61tapointsPer365Days\"\x85\x01\n\tTimeChunk\x12>\n\rtime_interval\x18\x01 \x01(\x0b\x32\x19.datasets.v1.TimeIntervalR\x0ctimeInterval\x12\x38\n\nchunk_size\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR\tchunkSizeBo\n\x0f\x63om.datasets.v1B\x0fTimeseriesProtoP\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::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.timeseries_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\017TimeseriesProtoP\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\017TimeseriesProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' _globals['_TIMESERIESDATASETCHUNK']._serialized_start=102 _globals['_TIMESERIESDATASETCHUNK']._serialized_end=494 _globals['_TIMECHUNK']._serialized_start=497 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2.pyi similarity index 96% rename from tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2.pyi index a98797c..a8d7f73 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2.pyi +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_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 duration_pb2 as _duration_pb2 from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2_grpc.py similarity index 100% rename from tilebox-datasets/tilebox/datasets/datasetsv1/timeseries_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/timeseries_pb2_grpc.py diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2.py b/tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2.py similarity index 91% rename from tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2.py index 6706feb..df9e62a 100644 --- a/tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2.py +++ b/tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2.py @@ -26,14 +26,14 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"datasets/v1/well_known_types.proto\x12\x0b\x64\x61tasets.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x1a\n\x04UUID\x12\x12\n\x04uuid\x18\x01 \x01(\x0cR\x04uuid\"0\n\x04Vec3\x12\x0c\n\x01x\x18\x01 \x01(\x01R\x01x\x12\x0c\n\x01y\x18\x02 \x01(\x01R\x01y\x12\x0c\n\x01z\x18\x03 \x01(\x01R\x01z\"L\n\nQuaternion\x12\x0e\n\x02q1\x18\x01 \x01(\x01R\x02q1\x12\x0e\n\x02q2\x18\x02 \x01(\x01R\x02q2\x12\x0e\n\x02q3\x18\x03 \x01(\x01R\x02q3\x12\x0e\n\x02q4\x18\x04 \x01(\x01R\x02q4\"B\n\x06LatLon\x12\x1a\n\x08latitude\x18\x01 \x01(\x01R\x08latitude\x12\x1c\n\tlongitude\x18\x02 \x01(\x01R\tlongitude\"a\n\tLatLonAlt\x12\x1a\n\x08latitude\x18\x01 \x01(\x01R\x08latitude\x12\x1c\n\tlongitude\x18\x02 \x01(\x01R\tlongitude\x12\x1a\n\x08\x61ltitude\x18\x03 \x01(\x01R\x08\x61ltitude\"\x1c\n\x08Geometry\x12\x10\n\x03wkb\x18\x01 \x01(\x0cR\x03wkb*t\n\x0f\x46lightDirection\x12 \n\x1c\x46LIGHT_DIRECTION_UNSPECIFIED\x10\x00\x12\x1e\n\x1a\x46LIGHT_DIRECTION_ASCENDING\x10\x01\x12\x1f\n\x1b\x46LIGHT_DIRECTION_DESCENDING\x10\x02*~\n\x14ObservationDirection\x12%\n!OBSERVATION_DIRECTION_UNSPECIFIED\x10\x00\x12\x1e\n\x1aOBSERVATION_DIRECTION_LEFT\x10\x01\x12\x1f\n\x1bOBSERVATION_DIRECTION_RIGHT\x10\x02*\x99\x01\n\x10OpendataProvider\x12!\n\x1dOPENDATA_PROVIDER_UNSPECIFIED\x10\x00\x12\x19\n\x15OPENDATA_PROVIDER_ASF\x10\x01\x12*\n&OPENDATA_PROVIDER_COPERNICUS_DATASPACE\x10\x02\x12\x1b\n\x17OPENDATA_PROVIDER_UMBRA\x10\x03*\xf1\x02\n\x0fProcessingLevel\x12 \n\x1cPROCESSING_LEVEL_UNSPECIFIED\x10\x00\x12\x17\n\x13PROCESSING_LEVEL_L0\x10\x0c\x12\x17\n\x13PROCESSING_LEVEL_L1\x10\n\x12\x18\n\x14PROCESSING_LEVEL_L1A\x10\x01\x12\x18\n\x14PROCESSING_LEVEL_L1B\x10\x02\x12\x18\n\x14PROCESSING_LEVEL_L1C\x10\x03\x12\x17\n\x13PROCESSING_LEVEL_L2\x10\x04\x12\x18\n\x14PROCESSING_LEVEL_L2A\x10\x05\x12\x18\n\x14PROCESSING_LEVEL_L2B\x10\x06\x12\x17\n\x13PROCESSING_LEVEL_L3\x10\x07\x12\x18\n\x14PROCESSING_LEVEL_L3A\x10\x08\x12\x17\n\x13PROCESSING_LEVEL_L4\x10\t\x12#\n\x1fPROCESSING_LEVEL_NOT_APPLICABLE\x10\x0b*\x98\x02\n\x0cPolarization\x12\x1c\n\x18POLARIZATION_UNSPECIFIED\x10\x00\x12\x13\n\x0fPOLARIZATION_HH\x10\x01\x12\x13\n\x0fPOLARIZATION_HV\x10\x02\x12\x13\n\x0fPOLARIZATION_VH\x10\x03\x12\x13\n\x0fPOLARIZATION_VV\x10\x04\x12\x18\n\x14POLARIZATION_DUAL_HH\x10\x05\x12\x18\n\x14POLARIZATION_DUAL_HV\x10\x06\x12\x18\n\x14POLARIZATION_DUAL_VH\x10\x07\x12\x18\n\x14POLARIZATION_DUAL_VV\x10\x08\x12\x16\n\x12POLARIZATION_HH_HV\x10\t\x12\x16\n\x12POLARIZATION_VV_VH\x10\n*\xf1\x02\n\x0f\x41\x63quisitionMode\x12 \n\x1c\x41\x43QUISITION_MODE_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41\x43QUISITION_MODE_SM\x10\x01\x12\x17\n\x13\x41\x43QUISITION_MODE_EW\x10\x02\x12\x17\n\x13\x41\x43QUISITION_MODE_IW\x10\x03\x12\x17\n\x13\x41\x43QUISITION_MODE_WV\x10\x04\x12\x1e\n\x1a\x41\x43QUISITION_MODE_SPOTLIGHT\x10\n\x12\x19\n\x15\x41\x43QUISITION_MODE_NOBS\x10\x14\x12\x19\n\x15\x41\x43QUISITION_MODE_EOBS\x10\x15\x12\x19\n\x15\x41\x43QUISITION_MODE_DASC\x10\x16\x12\x19\n\x15\x41\x43QUISITION_MODE_ABSR\x10\x17\x12\x18\n\x14\x41\x43QUISITION_MODE_VIC\x10\x18\x12\x18\n\x14\x41\x43QUISITION_MODE_RAW\x10\x19\x12\x18\n\x14\x41\x43QUISITION_MODE_TST\x10\x1a\x42\xb5\x01\n\x0f\x63om.datasets.v1B\x13WellKnownTypesProtoP\x01Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\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::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"datasets/v1/well_known_types.proto\x12\x0b\x64\x61tasets.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x1a\n\x04UUID\x12\x12\n\x04uuid\x18\x01 \x01(\x0cR\x04uuid\"0\n\x04Vec3\x12\x0c\n\x01x\x18\x01 \x01(\x01R\x01x\x12\x0c\n\x01y\x18\x02 \x01(\x01R\x01y\x12\x0c\n\x01z\x18\x03 \x01(\x01R\x01z\"L\n\nQuaternion\x12\x0e\n\x02q1\x18\x01 \x01(\x01R\x02q1\x12\x0e\n\x02q2\x18\x02 \x01(\x01R\x02q2\x12\x0e\n\x02q3\x18\x03 \x01(\x01R\x02q3\x12\x0e\n\x02q4\x18\x04 \x01(\x01R\x02q4\"B\n\x06LatLon\x12\x1a\n\x08latitude\x18\x01 \x01(\x01R\x08latitude\x12\x1c\n\tlongitude\x18\x02 \x01(\x01R\tlongitude\"a\n\tLatLonAlt\x12\x1a\n\x08latitude\x18\x01 \x01(\x01R\x08latitude\x12\x1c\n\tlongitude\x18\x02 \x01(\x01R\tlongitude\x12\x1a\n\x08\x61ltitude\x18\x03 \x01(\x01R\x08\x61ltitude\"\x1c\n\x08Geometry\x12\x10\n\x03wkb\x18\x01 \x01(\x0cR\x03wkb*t\n\x0f\x46lightDirection\x12 \n\x1c\x46LIGHT_DIRECTION_UNSPECIFIED\x10\x00\x12\x1e\n\x1a\x46LIGHT_DIRECTION_ASCENDING\x10\x01\x12\x1f\n\x1b\x46LIGHT_DIRECTION_DESCENDING\x10\x02*~\n\x14ObservationDirection\x12%\n!OBSERVATION_DIRECTION_UNSPECIFIED\x10\x00\x12\x1e\n\x1aOBSERVATION_DIRECTION_LEFT\x10\x01\x12\x1f\n\x1bOBSERVATION_DIRECTION_RIGHT\x10\x02*\x99\x01\n\x10OpendataProvider\x12!\n\x1dOPENDATA_PROVIDER_UNSPECIFIED\x10\x00\x12\x19\n\x15OPENDATA_PROVIDER_ASF\x10\x01\x12*\n&OPENDATA_PROVIDER_COPERNICUS_DATASPACE\x10\x02\x12\x1b\n\x17OPENDATA_PROVIDER_UMBRA\x10\x03*\xf1\x02\n\x0fProcessingLevel\x12 \n\x1cPROCESSING_LEVEL_UNSPECIFIED\x10\x00\x12\x17\n\x13PROCESSING_LEVEL_L0\x10\x0c\x12\x17\n\x13PROCESSING_LEVEL_L1\x10\n\x12\x18\n\x14PROCESSING_LEVEL_L1A\x10\x01\x12\x18\n\x14PROCESSING_LEVEL_L1B\x10\x02\x12\x18\n\x14PROCESSING_LEVEL_L1C\x10\x03\x12\x17\n\x13PROCESSING_LEVEL_L2\x10\x04\x12\x18\n\x14PROCESSING_LEVEL_L2A\x10\x05\x12\x18\n\x14PROCESSING_LEVEL_L2B\x10\x06\x12\x17\n\x13PROCESSING_LEVEL_L3\x10\x07\x12\x18\n\x14PROCESSING_LEVEL_L3A\x10\x08\x12\x17\n\x13PROCESSING_LEVEL_L4\x10\t\x12#\n\x1fPROCESSING_LEVEL_NOT_APPLICABLE\x10\x0b*\x98\x02\n\x0cPolarization\x12\x1c\n\x18POLARIZATION_UNSPECIFIED\x10\x00\x12\x13\n\x0fPOLARIZATION_HH\x10\x01\x12\x13\n\x0fPOLARIZATION_HV\x10\x02\x12\x13\n\x0fPOLARIZATION_VH\x10\x03\x12\x13\n\x0fPOLARIZATION_VV\x10\x04\x12\x18\n\x14POLARIZATION_DUAL_HH\x10\x05\x12\x18\n\x14POLARIZATION_DUAL_HV\x10\x06\x12\x18\n\x14POLARIZATION_DUAL_VH\x10\x07\x12\x18\n\x14POLARIZATION_DUAL_VV\x10\x08\x12\x16\n\x12POLARIZATION_HH_HV\x10\t\x12\x16\n\x12POLARIZATION_VV_VH\x10\n*\xf1\x02\n\x0f\x41\x63quisitionMode\x12 \n\x1c\x41\x43QUISITION_MODE_UNSPECIFIED\x10\x00\x12\x17\n\x13\x41\x43QUISITION_MODE_SM\x10\x01\x12\x17\n\x13\x41\x43QUISITION_MODE_EW\x10\x02\x12\x17\n\x13\x41\x43QUISITION_MODE_IW\x10\x03\x12\x17\n\x13\x41\x43QUISITION_MODE_WV\x10\x04\x12\x1e\n\x1a\x41\x43QUISITION_MODE_SPOTLIGHT\x10\n\x12\x19\n\x15\x41\x43QUISITION_MODE_NOBS\x10\x14\x12\x19\n\x15\x41\x43QUISITION_MODE_EOBS\x10\x15\x12\x19\n\x15\x41\x43QUISITION_MODE_DASC\x10\x16\x12\x19\n\x15\x41\x43QUISITION_MODE_ABSR\x10\x17\x12\x18\n\x14\x41\x43QUISITION_MODE_VIC\x10\x18\x12\x18\n\x14\x41\x43QUISITION_MODE_RAW\x10\x19\x12\x18\n\x14\x41\x43QUISITION_MODE_TST\x10\x1a\x42s\n\x0f\x63om.datasets.v1B\x13WellKnownTypesProtoP\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::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'datasets.v1.well_known_types_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\023WellKnownTypesProtoP\001Z@github.com/tilebox/tilebox-go/protogen/go/datasets/v1;datasetsv1\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\017com.datasets.v1B\023WellKnownTypesProtoP\001\242\002\003DXX\252\002\013Datasets.V1\312\002\013Datasets\\V1\342\002\027Datasets\\V1\\GPBMetadata\352\002\014Datasets::V1' _globals['_FLIGHTDIRECTION']._serialized_start=469 _globals['_FLIGHTDIRECTION']._serialized_end=585 _globals['_OBSERVATIONDIRECTION']._serialized_start=587 diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2.pyi b/tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2.pyi similarity index 100% rename from tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2.pyi rename to tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2.pyi diff --git a/tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2_grpc.py b/tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2_grpc.py similarity index 100% rename from tilebox-datasets/tilebox/datasets/datasetsv1/well_known_types_pb2_grpc.py rename to tilebox-datasets/tilebox/datasets/datasets/v1/well_known_types_pb2_grpc.py diff --git a/tilebox-datasets/tilebox/datasets/message_pool.py b/tilebox-datasets/tilebox/datasets/message_pool.py index 1334df7..f740b5f 100644 --- a/tilebox-datasets/tilebox/datasets/message_pool.py +++ b/tilebox-datasets/tilebox/datasets/message_pool.py @@ -3,7 +3,7 @@ from google.protobuf.message_factory import GetMessageClass, GetMessages from tilebox.datasets.data.datasets import AnnotatedType -from tilebox.datasets.datasetsv1 import well_known_types_pb2 +from tilebox.datasets.datasets.v1 import well_known_types_pb2 # make sure all the well known types are imported, and therefore available in the global protobuf message pool __all__ = ["duration_pb2", "timestamp_pb2", "well_known_types_pb2"] # this is here so ruff doesn't remove the imports diff --git a/tilebox-datasets/tilebox/datasets/protobuf_conversion/field_types.py b/tilebox-datasets/tilebox/datasets/protobuf_conversion/field_types.py index 6cea416..1e37bc2 100644 --- a/tilebox-datasets/tilebox/datasets/protobuf_conversion/field_types.py +++ b/tilebox-datasets/tilebox/datasets/protobuf_conversion/field_types.py @@ -13,8 +13,8 @@ from pandas.core.tools.timedeltas import to_timedelta from shapely import from_wkb -from tilebox.datasets.datasetsv1.well_known_types_pb2 import UUID as UUIDMessage # noqa: N811 -from tilebox.datasets.datasetsv1.well_known_types_pb2 import Geometry, LatLon, LatLonAlt, Quaternion, Vec3 +from tilebox.datasets.datasets.v1.well_known_types_pb2 import UUID as UUIDMessage # noqa: N811 +from tilebox.datasets.datasets.v1.well_known_types_pb2 import Geometry, LatLon, LatLonAlt, Quaternion, Vec3 ProtoFieldValue = Message | float | str | bool | bytes | Sized | None diff --git a/tilebox-datasets/tilebox/datasets/service.py b/tilebox-datasets/tilebox/datasets/service.py index bfe3386..ab7f34a 100644 --- a/tilebox-datasets/tilebox/datasets/service.py +++ b/tilebox-datasets/tilebox/datasets/service.py @@ -15,23 +15,23 @@ from tilebox.datasets.data.datasets import Dataset, ListDatasetsResponse from tilebox.datasets.data.pagination import Pagination from tilebox.datasets.data.uuid import must_uuid_to_uuid_message, uuid_to_uuid_message -from tilebox.datasets.datasetsv1 import core_pb2 -from tilebox.datasets.datasetsv1.collections_pb2 import ( +from tilebox.datasets.datasets.v1 import core_pb2 +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.data_access_pb2 import ( +from tilebox.datasets.datasets.v1.collections_pb2_grpc import CollectionServiceStub +from tilebox.datasets.datasets.v1.data_access_pb2 import ( QueryByIDRequest, QueryRequest, ) -from tilebox.datasets.datasetsv1.data_access_pb2_grpc import DataAccessServiceStub -from tilebox.datasets.datasetsv1.data_ingestion_pb2 import DeleteRequest, IngestRequest -from tilebox.datasets.datasetsv1.data_ingestion_pb2_grpc import DataIngestionServiceStub -from tilebox.datasets.datasetsv1.datasets_pb2 import ClientInfo, GetDatasetRequest, ListDatasetsRequest, Package -from tilebox.datasets.datasetsv1.datasets_pb2_grpc import DatasetServiceStub +from tilebox.datasets.datasets.v1.data_access_pb2_grpc import DataAccessServiceStub +from tilebox.datasets.datasets.v1.data_ingestion_pb2 import DeleteRequest, IngestRequest +from tilebox.datasets.datasets.v1.data_ingestion_pb2_grpc import DataIngestionServiceStub +from tilebox.datasets.datasets.v1.datasets_pb2 import ClientInfo, GetDatasetRequest, ListDatasetsRequest, Package +from tilebox.datasets.datasets.v1.datasets_pb2_grpc import DatasetServiceStub class TileboxDatasetService: diff --git a/tilebox-datasets/tilebox/datasets/sync/client.py b/tilebox-datasets/tilebox/datasets/sync/client.py index fed1c9d..830f714 100644 --- a/tilebox-datasets/tilebox/datasets/sync/client.py +++ b/tilebox-datasets/tilebox/datasets/sync/client.py @@ -4,10 +4,10 @@ from _tilebox.grpc.error import with_pythonic_errors 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 from tilebox.datasets.sync.dataset import DatasetClient diff --git a/tilebox-workflows/pyproject.toml b/tilebox-workflows/pyproject.toml index 06ed4c5..e2b21a4 100644 --- a/tilebox-workflows/pyproject.toml +++ b/tilebox-workflows/pyproject.toml @@ -45,7 +45,7 @@ packages = ["tilebox"] packages = ["tilebox"] [tool.coverage.run] -omit = ["tilebox/workflows/workflowsv1/*"] +omit = ["tilebox/workflows/workflows/v1/*"] [tool.pytest.ini_options] minversion = "6.0" diff --git a/tilebox-workflows/tests/automations/test_client.py b/tilebox-workflows/tests/automations/test_client.py index b6e336b..12a6b31 100644 --- a/tilebox-workflows/tests/automations/test_client.py +++ b/tilebox-workflows/tests/automations/test_client.py @@ -17,12 +17,12 @@ uuid_message_to_uuid, uuid_to_uuid_message, ) -from tilebox.workflows.workflowsv1.automation_pb2 import AutomationPrototype as AutomationPrototypeMessage -from tilebox.workflows.workflowsv1.automation_pb2 import Automations, DeleteAutomationRequest -from tilebox.workflows.workflowsv1.automation_pb2 import CronTrigger as CronTriggerMessage -from tilebox.workflows.workflowsv1.automation_pb2 import StorageEventTrigger as StorageEventTriggerMessage -from tilebox.workflows.workflowsv1.automation_pb2_grpc import AutomationServiceStub -from tilebox.workflows.workflowsv1.core_pb2 import UUID as UUIDMessage # noqa: N811 +from tilebox.workflows.workflows.v1.automation_pb2 import AutomationPrototype as AutomationPrototypeMessage +from tilebox.workflows.workflows.v1.automation_pb2 import Automations, DeleteAutomationRequest +from tilebox.workflows.workflows.v1.automation_pb2 import CronTrigger as CronTriggerMessage +from tilebox.workflows.workflows.v1.automation_pb2 import StorageEventTrigger as StorageEventTriggerMessage +from tilebox.workflows.workflows.v1.automation_pb2_grpc import AutomationServiceStub +from tilebox.workflows.workflows.v1.core_pb2 import UUID as UUIDMessage # noqa: N811 class MockAutomationService(AutomationServiceStub): diff --git a/tilebox-workflows/tests/clusters/test_client.py b/tilebox-workflows/tests/clusters/test_client.py index ef5cd43..4b88b34 100644 --- a/tilebox-workflows/tests/clusters/test_client.py +++ b/tilebox-workflows/tests/clusters/test_client.py @@ -10,15 +10,15 @@ from tilebox.workflows.data import ( Cluster, ) -from tilebox.workflows.workflowsv1.core_pb2 import Cluster as ClusterMessage -from tilebox.workflows.workflowsv1.workflows_pb2 import ( +from tilebox.workflows.workflows.v1.core_pb2 import Cluster as ClusterMessage +from tilebox.workflows.workflows.v1.workflows_pb2 import ( CreateClusterRequest, DeleteClusterRequest, GetClusterRequest, ListClustersRequest, ListClustersResponse, ) -from tilebox.workflows.workflowsv1.workflows_pb2_grpc import WorkflowsServiceStub +from tilebox.workflows.workflows.v1.workflows_pb2_grpc import WorkflowsServiceStub class MockClusterService(WorkflowsServiceStub): diff --git a/tilebox-workflows/tests/jobs/test_client.py b/tilebox-workflows/tests/jobs/test_client.py index 4491343..53f7ca3 100644 --- a/tilebox-workflows/tests/jobs/test_client.py +++ b/tilebox-workflows/tests/jobs/test_client.py @@ -11,10 +11,10 @@ from tilebox.workflows.jobs.client import JobClient from tilebox.workflows.jobs.service import JobService from tilebox.workflows.task import ExecutionContext, Task -from tilebox.workflows.workflowsv1.core_pb2 import Job as JobMessage -from tilebox.workflows.workflowsv1.core_pb2 import JobState -from tilebox.workflows.workflowsv1.diagram_pb2 import Diagram -from tilebox.workflows.workflowsv1.job_pb2 import ( +from tilebox.workflows.workflows.v1.core_pb2 import Job as JobMessage +from tilebox.workflows.workflows.v1.core_pb2 import JobState +from tilebox.workflows.workflows.v1.diagram_pb2 import Diagram +from tilebox.workflows.workflows.v1.job_pb2 import ( CancelJobRequest, CancelJobResponse, GetJobRequest, @@ -25,7 +25,7 @@ SubmitJobRequest, VisualizeJobRequest, ) -from tilebox.workflows.workflowsv1.job_pb2_grpc import JobServiceStub +from tilebox.workflows.workflows.v1.job_pb2_grpc import JobServiceStub class DummyTask(Task): diff --git a/tilebox-workflows/tilebox/workflows/automations/cron.py b/tilebox-workflows/tilebox/workflows/automations/cron.py index c9f71c4..8446c95 100644 --- a/tilebox-workflows/tilebox/workflows/automations/cron.py +++ b/tilebox-workflows/tilebox/workflows/automations/cron.py @@ -10,8 +10,8 @@ from tilebox.workflows.data import TriggeredCronEvent from tilebox.workflows.task import RunnerContext, Task, deserialize_task, serialize_task -from tilebox.workflows.workflowsv1.automation_pb2 import Automation as AutomationMessage -from tilebox.workflows.workflowsv1.automation_pb2 import TriggeredCronEvent as TriggeredCronEventMessage +from tilebox.workflows.workflows.v1.automation_pb2 import Automation as AutomationMessage +from tilebox.workflows.workflows.v1.automation_pb2 import TriggeredCronEvent as TriggeredCronEventMessage _NOT_TRIGGERED = TriggeredCronEvent(datetime.min.replace(tzinfo=timezone.utc)) diff --git a/tilebox-workflows/tilebox/workflows/automations/service.py b/tilebox-workflows/tilebox/workflows/automations/service.py index 234c6ae..3698d2f 100644 --- a/tilebox-workflows/tilebox/workflows/automations/service.py +++ b/tilebox-workflows/tilebox/workflows/automations/service.py @@ -9,9 +9,9 @@ StorageLocation, uuid_to_uuid_message, ) -from tilebox.workflows.workflowsv1.automation_pb2 import AutomationPrototype as AutomationPrototypeMessage -from tilebox.workflows.workflowsv1.automation_pb2 import Automations, DeleteAutomationRequest, StorageLocations -from tilebox.workflows.workflowsv1.automation_pb2_grpc import AutomationServiceStub +from tilebox.workflows.workflows.v1.automation_pb2 import AutomationPrototype as AutomationPrototypeMessage +from tilebox.workflows.workflows.v1.automation_pb2 import Automations, DeleteAutomationRequest, StorageLocations +from tilebox.workflows.workflows.v1.automation_pb2_grpc import AutomationServiceStub class AutomationService: diff --git a/tilebox-workflows/tilebox/workflows/automations/storage_event.py b/tilebox-workflows/tilebox/workflows/automations/storage_event.py index b5bf0a6..6656d56 100644 --- a/tilebox-workflows/tilebox/workflows/automations/storage_event.py +++ b/tilebox-workflows/tilebox/workflows/automations/storage_event.py @@ -14,8 +14,8 @@ TriggeredStorageEvent, ) from tilebox.workflows.task import RunnerContext, Task, deserialize_task, serialize_task -from tilebox.workflows.workflowsv1.automation_pb2 import Automation as AutomationMessage -from tilebox.workflows.workflowsv1.automation_pb2 import TriggeredStorageEvent as TriggeredStorageEventMessage +from tilebox.workflows.workflows.v1.automation_pb2 import Automation as AutomationMessage +from tilebox.workflows.workflows.v1.automation_pb2 import TriggeredStorageEvent as TriggeredStorageEventMessage _NOT_TRIGGERED = TriggeredStorageEvent( StorageLocation(UUID(int=0), "", StorageType.FS), diff --git a/tilebox-workflows/tilebox/workflows/clusters/service.py b/tilebox-workflows/tilebox/workflows/clusters/service.py index 53450f4..800de86 100644 --- a/tilebox-workflows/tilebox/workflows/clusters/service.py +++ b/tilebox-workflows/tilebox/workflows/clusters/service.py @@ -4,14 +4,14 @@ from tilebox.workflows.data import ( Cluster, ) -from tilebox.workflows.workflowsv1.workflows_pb2 import ( +from tilebox.workflows.workflows.v1.workflows_pb2 import ( CreateClusterRequest, DeleteClusterRequest, GetClusterRequest, ListClustersRequest, ListClustersResponse, ) -from tilebox.workflows.workflowsv1.workflows_pb2_grpc import WorkflowsServiceStub +from tilebox.workflows.workflows.v1.workflows_pb2_grpc import WorkflowsServiceStub class ClusterService: diff --git a/tilebox-workflows/tilebox/workflows/data.py b/tilebox-workflows/tilebox/workflows/data.py index eb64a79..4382b45 100644 --- a/tilebox-workflows/tilebox/workflows/data.py +++ b/tilebox-workflows/tilebox/workflows/data.py @@ -22,8 +22,8 @@ from tilebox.datasets.data import datetime_to_timestamp, timestamp_to_datetime from tilebox.datasets.sync.client import Client as DatasetsClient -from tilebox.workflows.workflowsv1 import automation_pb2 as automation_pb -from tilebox.workflows.workflowsv1 import core_pb2, job_pb2, task_pb2 +from tilebox.workflows.workflows.v1 import automation_pb2 as automation_pb +from tilebox.workflows.workflows.v1 import core_pb2, job_pb2, task_pb2 _VERSION_PATTERN = re.compile(r"^v(\d+)\.(\d+)$") # matches a version string in the format "v3.2" diff --git a/tilebox-workflows/tilebox/workflows/jobs/service.py b/tilebox-workflows/tilebox/workflows/jobs/service.py index b094c17..c808185 100644 --- a/tilebox-workflows/tilebox/workflows/jobs/service.py +++ b/tilebox-workflows/tilebox/workflows/jobs/service.py @@ -11,9 +11,9 @@ TaskSubmission, uuid_to_uuid_message, ) -from tilebox.workflows.workflowsv1.core_pb2 import Job as JobMessage -from tilebox.workflows.workflowsv1.diagram_pb2 import Diagram, RenderOptions -from tilebox.workflows.workflowsv1.job_pb2 import ( +from tilebox.workflows.workflows.v1.core_pb2 import Job as JobMessage +from tilebox.workflows.workflows.v1.diagram_pb2 import Diagram, RenderOptions +from tilebox.workflows.workflows.v1.job_pb2 import ( CancelJobRequest, GetJobRequest, QueryJobsRequest, @@ -22,8 +22,8 @@ SubmitJobRequest, VisualizeJobRequest, ) -from tilebox.workflows.workflowsv1.job_pb2 import QueryJobsResponse as QueryJobsResponseMessage -from tilebox.workflows.workflowsv1.job_pb2_grpc import JobServiceStub +from tilebox.workflows.workflows.v1.job_pb2 import QueryJobsResponse as QueryJobsResponseMessage +from tilebox.workflows.workflows.v1.job_pb2_grpc import JobServiceStub class JobService: diff --git a/tilebox-workflows/tilebox/workflows/runner/task_service.py b/tilebox-workflows/tilebox/workflows/runner/task_service.py index 724e538..c6f17d2 100644 --- a/tilebox-workflows/tilebox/workflows/runner/task_service.py +++ b/tilebox-workflows/tilebox/workflows/runner/task_service.py @@ -11,14 +11,14 @@ TaskLease, uuid_to_uuid_message, ) -from tilebox.workflows.workflowsv1.core_pb2 import TaskLease as TaskLeaseMessage -from tilebox.workflows.workflowsv1.task_pb2 import ( +from tilebox.workflows.workflows.v1.core_pb2 import TaskLease as TaskLeaseMessage +from tilebox.workflows.workflows.v1.task_pb2 import ( NextTaskRequest, NextTaskResponse, TaskFailedRequest, TaskLeaseRequest, ) -from tilebox.workflows.workflowsv1.task_pb2_grpc import TaskServiceStub +from tilebox.workflows.workflows.v1.task_pb2_grpc import TaskServiceStub class TaskService: diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2.py b/tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2.py similarity index 90% rename from tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2.py index 6649a54..3efb1e0 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2.py @@ -24,17 +24,17 @@ from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dworkflows/v1/automation.proto\x12\x0cworkflows.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17workflows/v1/core.proto\"\x80\x01\n\x0fStorageLocation\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x1a\n\x08location\x18\x02 \x01(\tR\x08location\x12-\n\x04type\x18\x03 \x01(\x0e\x32\x19.workflows.v1.StorageTypeR\x04type\"O\n\x10StorageLocations\x12;\n\tlocations\x18\x01 \x03(\x0b\x32\x1d.workflows.v1.StorageLocationR\tlocations\"\xa2\x02\n\x13\x41utomationPrototype\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12:\n\tprototype\x18\x03 \x01(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\tprototype\x12W\n\x16storage_event_triggers\x18\x04 \x03(\x0b\x32!.workflows.v1.StorageEventTriggerR\x14storageEventTriggers\x12>\n\rcron_triggers\x18\x05 \x03(\x0b\x32\x19.workflows.v1.CronTriggerR\x0c\x63ronTriggers\"R\n\x0b\x41utomations\x12\x43\n\x0b\x61utomations\x18\x01 \x03(\x0b\x32!.workflows.v1.AutomationPrototypeR\x0b\x61utomations\"\xa6\x01\n\x13StorageEventTrigger\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12H\n\x10storage_location\x18\x02 \x01(\x0b\x32\x1d.workflows.v1.StorageLocationR\x0fstorageLocation\x12!\n\x0cglob_pattern\x18\x03 \x01(\tR\x0bglobPattern\"M\n\x0b\x43ronTrigger\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x1a\n\x08schedule\x18\x02 \x01(\tR\x08schedule\"E\n\nAutomation\x12#\n\rtrigger_event\x18\x01 \x01(\x0cR\x0ctriggerEvent\x12\x12\n\x04\x61rgs\x18\x02 \x01(\x0cR\x04\x61rgs\"\xab\x01\n\x15TriggeredStorageEvent\x12\x42\n\x13storage_location_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x11storageLocationId\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32\x1e.workflows.v1.StorageEventTypeR\x04type\x12\x1a\n\x08location\x18\x03 \x01(\tR\x08location\"S\n\x12TriggeredCronEvent\x12=\n\x0ctrigger_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0btriggerTime\"s\n\x17\x44\x65leteAutomationRequest\x12\x37\n\rautomation_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x0c\x61utomationId\x12\x1f\n\x0b\x63\x61ncel_jobs\x18\x02 \x01(\x08R\ncancelJobs*k\n\x0bStorageType\x12\x1c\n\x18STORAGE_TYPE_UNSPECIFIED\x10\x00\x12\x14\n\x10STORAGE_TYPE_GCS\x10\x01\x12\x13\n\x0fSTORAGE_TYPE_S3\x10\x02\x12\x13\n\x0fSTORAGE_TYPE_FS\x10\x03*V\n\x10StorageEventType\x12\"\n\x1eSTORAGE_EVENT_TYPE_UNSPECIFIED\x10\x00\x12\x1e\n\x1aSTORAGE_EVENT_TYPE_CREATED\x10\x01\x32\xdd\x05\n\x11\x41utomationService\x12N\n\x14ListStorageLocations\x12\x16.google.protobuf.Empty\x1a\x1e.workflows.v1.StorageLocations\x12G\n\x12GetStorageLocation\x12\x12.workflows.v1.UUID\x1a\x1d.workflows.v1.StorageLocation\x12U\n\x15\x43reateStorageLocation\x12\x1d.workflows.v1.StorageLocation\x1a\x1d.workflows.v1.StorageLocation\x12\x43\n\x15\x44\x65leteStorageLocation\x12\x12.workflows.v1.UUID\x1a\x16.google.protobuf.Empty\x12\x44\n\x0fListAutomations\x12\x16.google.protobuf.Empty\x1a\x19.workflows.v1.Automations\x12\x46\n\rGetAutomation\x12\x12.workflows.v1.UUID\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10\x43reateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10UpdateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12Q\n\x10\x44\x65leteAutomation\x12%.workflows.v1.DeleteAutomationRequest\x1a\x16.google.protobuf.EmptyB\xb8\x01\n\x10\x63om.workflows.v1B\x0f\x41utomationProtoP\x01ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dworkflows/v1/automation.proto\x12\x0cworkflows.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17workflows/v1/core.proto\"\x80\x01\n\x0fStorageLocation\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x1a\n\x08location\x18\x02 \x01(\tR\x08location\x12-\n\x04type\x18\x03 \x01(\x0e\x32\x19.workflows.v1.StorageTypeR\x04type\"O\n\x10StorageLocations\x12;\n\tlocations\x18\x01 \x03(\x0b\x32\x1d.workflows.v1.StorageLocationR\tlocations\"\xa2\x02\n\x13\x41utomationPrototype\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12:\n\tprototype\x18\x03 \x01(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\tprototype\x12W\n\x16storage_event_triggers\x18\x04 \x03(\x0b\x32!.workflows.v1.StorageEventTriggerR\x14storageEventTriggers\x12>\n\rcron_triggers\x18\x05 \x03(\x0b\x32\x19.workflows.v1.CronTriggerR\x0c\x63ronTriggers\"R\n\x0b\x41utomations\x12\x43\n\x0b\x61utomations\x18\x01 \x03(\x0b\x32!.workflows.v1.AutomationPrototypeR\x0b\x61utomations\"\xa6\x01\n\x13StorageEventTrigger\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12H\n\x10storage_location\x18\x02 \x01(\x0b\x32\x1d.workflows.v1.StorageLocationR\x0fstorageLocation\x12!\n\x0cglob_pattern\x18\x03 \x01(\tR\x0bglobPattern\"M\n\x0b\x43ronTrigger\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x1a\n\x08schedule\x18\x02 \x01(\tR\x08schedule\"E\n\nAutomation\x12#\n\rtrigger_event\x18\x01 \x01(\x0cR\x0ctriggerEvent\x12\x12\n\x04\x61rgs\x18\x02 \x01(\x0cR\x04\x61rgs\"\xab\x01\n\x15TriggeredStorageEvent\x12\x42\n\x13storage_location_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x11storageLocationId\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32\x1e.workflows.v1.StorageEventTypeR\x04type\x12\x1a\n\x08location\x18\x03 \x01(\tR\x08location\"S\n\x12TriggeredCronEvent\x12=\n\x0ctrigger_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0btriggerTime\"s\n\x17\x44\x65leteAutomationRequest\x12\x37\n\rautomation_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x0c\x61utomationId\x12\x1f\n\x0b\x63\x61ncel_jobs\x18\x02 \x01(\x08R\ncancelJobs*k\n\x0bStorageType\x12\x1c\n\x18STORAGE_TYPE_UNSPECIFIED\x10\x00\x12\x14\n\x10STORAGE_TYPE_GCS\x10\x01\x12\x13\n\x0fSTORAGE_TYPE_S3\x10\x02\x12\x13\n\x0fSTORAGE_TYPE_FS\x10\x03*V\n\x10StorageEventType\x12\"\n\x1eSTORAGE_EVENT_TYPE_UNSPECIFIED\x10\x00\x12\x1e\n\x1aSTORAGE_EVENT_TYPE_CREATED\x10\x01\x32\xdd\x05\n\x11\x41utomationService\x12N\n\x14ListStorageLocations\x12\x16.google.protobuf.Empty\x1a\x1e.workflows.v1.StorageLocations\x12G\n\x12GetStorageLocation\x12\x12.workflows.v1.UUID\x1a\x1d.workflows.v1.StorageLocation\x12U\n\x15\x43reateStorageLocation\x12\x1d.workflows.v1.StorageLocation\x1a\x1d.workflows.v1.StorageLocation\x12\x43\n\x15\x44\x65leteStorageLocation\x12\x12.workflows.v1.UUID\x1a\x16.google.protobuf.Empty\x12\x44\n\x0fListAutomations\x12\x16.google.protobuf.Empty\x1a\x19.workflows.v1.Automations\x12\x46\n\rGetAutomation\x12\x12.workflows.v1.UUID\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10\x43reateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10UpdateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12Q\n\x10\x44\x65leteAutomation\x12%.workflows.v1.DeleteAutomationRequest\x1a\x16.google.protobuf.EmptyBt\n\x10\x63om.workflows.v1B\x0f\x41utomationProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.automation_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\017AutomationProtoP\001ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\017AutomationProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' _globals['_STORAGETYPE']._serialized_start=1418 _globals['_STORAGETYPE']._serialized_end=1525 _globals['_STORAGEEVENTTYPE']._serialized_start=1527 diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2.pyi b/tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2.pyi similarity index 98% rename from tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2.pyi rename to tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2.pyi index 52249e4..d933f46 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2.pyi +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2.pyi @@ -1,6 +1,6 @@ from google.protobuf import empty_pb2 as _empty_pb2 from google.protobuf import timestamp_pb2 as _timestamp_pb2 -from tilebox.workflows.workflowsv1 import core_pb2 as _core_pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as _core_pb2 from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2_grpc.py b/tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2_grpc.py similarity index 99% rename from tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2_grpc.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2_grpc.py index 03e32cd..b0c03d4 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/automation_pb2_grpc.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/automation_pb2_grpc.py @@ -3,8 +3,8 @@ import grpc from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -from tilebox.workflows.workflowsv1 import automation_pb2 as workflows_dot_v1_dot_automation__pb2 -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import automation_pb2 as workflows_dot_v1_dot_automation__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 class AutomationServiceStub(object): diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2.py b/tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2.py similarity index 93% rename from tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2.py index 98b4852..0c0172b 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2.py @@ -26,14 +26,14 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17workflows/v1/core.proto\x12\x0cworkflows.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"^\n\x07\x43luster\x12\x12\n\x04slug\x18\x02 \x01(\tR\x04slug\x12!\n\x0c\x64isplay_name\x18\x03 \x01(\tR\x0b\x64isplayName\x12\x1c\n\tdeletable\x18\x04 \x01(\x08R\tdeletable\"\xa5\x03\n\x03Job\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12!\n\x0ctrace_parent\x18\x03 \x01(\tR\x0btraceParent\x12\x1a\n\x08\x63\x61nceled\x18\x05 \x01(\x08R\x08\x63\x61nceled\x12,\n\x05state\x18\x06 \x01(\x0e\x32\x16.workflows.v1.JobStateR\x05state\x12=\n\x0csubmitted_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bsubmittedAt\x12\x39\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12@\n\x0etask_summaries\x18\t \x03(\x0b\x32\x19.workflows.v1.TaskSummaryR\rtaskSummaries\x12\x37\n\rautomation_id\x18\n \x01(\x0b\x32\x12.workflows.v1.UUIDR\x0c\x61utomationIdJ\x04\x08\x04\x10\x05\"\xa7\x02\n\x0bTaskSummary\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12/\n\tparent_id\x18\x04 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x08parentId\x12\x39\n\nstarted_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x39\n\nstopped_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstoppedAtJ\x04\x08\x05\x10\x06\"\xc0\x03\n\x04Task\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12\x19\n\x05input\x18\x04 \x01(\x0cH\x00R\x05input\x88\x01\x01\x12\x1d\n\x07\x64isplay\x18\x05 \x01(\tH\x01R\x07\x64isplay\x88\x01\x01\x12#\n\x03job\x18\x06 \x01(\x0b\x32\x11.workflows.v1.JobR\x03job\x12/\n\tparent_id\x18\x07 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x08parentId\x12\x31\n\ndepends_on\x18\x08 \x03(\x0b\x32\x12.workflows.v1.UUIDR\tdependsOn\x12-\n\x05lease\x18\t \x01(\x0b\x32\x17.workflows.v1.TaskLeaseR\x05lease\x12\x1f\n\x0bretry_count\x18\n \x01(\x03R\nretryCountB\x08\n\x06_inputB\n\n\x08_display\">\n\x0eTaskIdentifier\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\"1\n\x05Tasks\x12(\n\x05tasks\x18\x01 \x03(\x0b\x32\x12.workflows.v1.TaskR\x05tasks\"\xe6\x01\n\x0eTaskSubmission\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12\x14\n\x05input\x18\x03 \x01(\x0cR\x05input\x12\x18\n\x07\x64isplay\x18\x04 \x01(\tR\x07\x64isplay\x12\"\n\x0c\x64\x65pendencies\x18\x05 \x03(\x03R\x0c\x64\x65pendencies\x12\x1f\n\x0bmax_retries\x18\x06 \x01(\x03R\nmaxRetries\"\x1a\n\x04UUID\x12\x12\n\x04uuid\x18\x01 \x01(\x0cR\x04uuid\"\xa9\x01\n\tTaskLease\x12/\n\x05lease\x18\x01 \x01(\x0b\x32\x19.google.protobuf.DurationR\x05lease\x12k\n%recommended_wait_until_next_extension\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR!recommendedWaitUntilNextExtension\"\xce\x01\n\x0cTimeInterval\x12\x39\n\nstart_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"\xb4\x01\n\nIDInterval\x12-\n\x08start_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x07startId\x12)\n\x06\x65nd_id\x18\x02 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05\x65ndId\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"\x84\x01\n\nPagination\x12\x19\n\x05limit\x18\x01 \x01(\x03H\x00R\x05limit\x88\x01\x01\x12>\n\x0estarting_after\x18\x02 \x01(\x0b\x32\x12.workflows.v1.UUIDH\x01R\rstartingAfter\x88\x01\x01\x42\x08\n\x06_limitB\x11\n\x0f_starting_after*k\n\x08JobState\x12\x19\n\x15JOB_STATE_UNSPECIFIED\x10\x00\x12\x14\n\x10JOB_STATE_QUEUED\x10\x01\x12\x15\n\x11JOB_STATE_STARTED\x10\x02\x12\x17\n\x13JOB_STATE_COMPLETED\x10\x03*\xa0\x01\n\tTaskState\x12\x1a\n\x16TASK_STATE_UNSPECIFIED\x10\x00\x12\x15\n\x11TASK_STATE_QUEUED\x10\x01\x12\x16\n\x12TASK_STATE_RUNNING\x10\x02\x12\x17\n\x13TASK_STATE_COMPUTED\x10\x03\x12\x15\n\x11TASK_STATE_FAILED\x10\x04\x12\x18\n\x14TASK_STATE_CANCELLED\x10\x05\x42\xb2\x01\n\x10\x63om.workflows.v1B\tCoreProtoP\x01ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17workflows/v1/core.proto\x12\x0cworkflows.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"^\n\x07\x43luster\x12\x12\n\x04slug\x18\x02 \x01(\tR\x04slug\x12!\n\x0c\x64isplay_name\x18\x03 \x01(\tR\x0b\x64isplayName\x12\x1c\n\tdeletable\x18\x04 \x01(\x08R\tdeletable\"\xa5\x03\n\x03Job\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12!\n\x0ctrace_parent\x18\x03 \x01(\tR\x0btraceParent\x12\x1a\n\x08\x63\x61nceled\x18\x05 \x01(\x08R\x08\x63\x61nceled\x12,\n\x05state\x18\x06 \x01(\x0e\x32\x16.workflows.v1.JobStateR\x05state\x12=\n\x0csubmitted_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bsubmittedAt\x12\x39\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12@\n\x0etask_summaries\x18\t \x03(\x0b\x32\x19.workflows.v1.TaskSummaryR\rtaskSummaries\x12\x37\n\rautomation_id\x18\n \x01(\x0b\x32\x12.workflows.v1.UUIDR\x0c\x61utomationIdJ\x04\x08\x04\x10\x05\"\xa7\x02\n\x0bTaskSummary\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12/\n\tparent_id\x18\x04 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x08parentId\x12\x39\n\nstarted_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x39\n\nstopped_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstoppedAtJ\x04\x08\x05\x10\x06\"\xc0\x03\n\x04Task\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12\x19\n\x05input\x18\x04 \x01(\x0cH\x00R\x05input\x88\x01\x01\x12\x1d\n\x07\x64isplay\x18\x05 \x01(\tH\x01R\x07\x64isplay\x88\x01\x01\x12#\n\x03job\x18\x06 \x01(\x0b\x32\x11.workflows.v1.JobR\x03job\x12/\n\tparent_id\x18\x07 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x08parentId\x12\x31\n\ndepends_on\x18\x08 \x03(\x0b\x32\x12.workflows.v1.UUIDR\tdependsOn\x12-\n\x05lease\x18\t \x01(\x0b\x32\x17.workflows.v1.TaskLeaseR\x05lease\x12\x1f\n\x0bretry_count\x18\n \x01(\x03R\nretryCountB\x08\n\x06_inputB\n\n\x08_display\">\n\x0eTaskIdentifier\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\x12\x18\n\x07version\x18\x02 \x01(\tR\x07version\"1\n\x05Tasks\x12(\n\x05tasks\x18\x01 \x03(\x0b\x32\x12.workflows.v1.TaskR\x05tasks\"\xe6\x01\n\x0eTaskSubmission\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12\x14\n\x05input\x18\x03 \x01(\x0cR\x05input\x12\x18\n\x07\x64isplay\x18\x04 \x01(\tR\x07\x64isplay\x12\"\n\x0c\x64\x65pendencies\x18\x05 \x03(\x03R\x0c\x64\x65pendencies\x12\x1f\n\x0bmax_retries\x18\x06 \x01(\x03R\nmaxRetries\"\x1a\n\x04UUID\x12\x12\n\x04uuid\x18\x01 \x01(\x0cR\x04uuid\"\xa9\x01\n\tTaskLease\x12/\n\x05lease\x18\x01 \x01(\x0b\x32\x19.google.protobuf.DurationR\x05lease\x12k\n%recommended_wait_until_next_extension\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR!recommendedWaitUntilNextExtension\"\xce\x01\n\x0cTimeInterval\x12\x39\n\nstart_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartTime\x12\x35\n\x08\x65nd_time\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x07\x65ndTime\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"\xb4\x01\n\nIDInterval\x12-\n\x08start_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x07startId\x12)\n\x06\x65nd_id\x18\x02 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05\x65ndId\x12\'\n\x0fstart_exclusive\x18\x03 \x01(\x08R\x0estartExclusive\x12#\n\rend_inclusive\x18\x04 \x01(\x08R\x0c\x65ndInclusive\"\x84\x01\n\nPagination\x12\x19\n\x05limit\x18\x01 \x01(\x03H\x00R\x05limit\x88\x01\x01\x12>\n\x0estarting_after\x18\x02 \x01(\x0b\x32\x12.workflows.v1.UUIDH\x01R\rstartingAfter\x88\x01\x01\x42\x08\n\x06_limitB\x11\n\x0f_starting_after*k\n\x08JobState\x12\x19\n\x15JOB_STATE_UNSPECIFIED\x10\x00\x12\x14\n\x10JOB_STATE_QUEUED\x10\x01\x12\x15\n\x11JOB_STATE_STARTED\x10\x02\x12\x17\n\x13JOB_STATE_COMPLETED\x10\x03*\xa0\x01\n\tTaskState\x12\x1a\n\x16TASK_STATE_UNSPECIFIED\x10\x00\x12\x15\n\x11TASK_STATE_QUEUED\x10\x01\x12\x16\n\x12TASK_STATE_RUNNING\x10\x02\x12\x17\n\x13TASK_STATE_COMPUTED\x10\x03\x12\x15\n\x11TASK_STATE_FAILED\x10\x04\x12\x18\n\x14TASK_STATE_CANCELLED\x10\x05\x42n\n\x10\x63om.workflows.v1B\tCoreProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.core_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\tCoreProtoP\001ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\tCoreProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' _globals['_JOBSTATE']._serialized_start=2450 _globals['_JOBSTATE']._serialized_end=2557 _globals['_TASKSTATE']._serialized_start=2560 diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2.pyi b/tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2.pyi similarity index 100% rename from tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2.pyi rename to tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2.pyi diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2_grpc.py b/tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2_grpc.py similarity index 100% rename from tilebox-workflows/tilebox/workflows/workflowsv1/core_pb2_grpc.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/core_pb2_grpc.py diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2.py b/tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2.py similarity index 81% rename from tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2.py index bd1ad88..979b18e 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2.py @@ -24,14 +24,14 @@ -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1aworkflows/v1/diagram.proto\x12\x0cworkflows.v1\"t\n\x14RenderDiagramRequest\x12\x18\n\x07\x64iagram\x18\x01 \x01(\tR\x07\x64iagram\x12\x42\n\x0erender_options\x18\x02 \x01(\x0b\x32\x1b.workflows.v1.RenderOptionsR\rrenderOptions\"\xa6\x01\n\rRenderOptions\x12\x16\n\x06layout\x18\x01 \x01(\tR\x06layout\x12\x1e\n\x08theme_id\x18\x02 \x01(\x03H\x00R\x07themeId\x88\x01\x01\x12\x18\n\x07sketchy\x18\x03 \x01(\x08R\x07sketchy\x12\x18\n\x07padding\x18\x04 \x01(\x03R\x07padding\x12\x1c\n\tdirection\x18\x05 \x01(\tR\tdirectionB\x0b\n\t_theme_id\"\x1b\n\x07\x44iagram\x12\x10\n\x03svg\x18\x01 \x01(\x0cR\x03svg2U\n\x0e\x44iagramService\x12\x43\n\x06Render\x12\".workflows.v1.RenderDiagramRequest\x1a\x15.workflows.v1.DiagramB\xb5\x01\n\x10\x63om.workflows.v1B\x0c\x44iagramProtoP\x01ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1aworkflows/v1/diagram.proto\x12\x0cworkflows.v1\"t\n\x14RenderDiagramRequest\x12\x18\n\x07\x64iagram\x18\x01 \x01(\tR\x07\x64iagram\x12\x42\n\x0erender_options\x18\x02 \x01(\x0b\x32\x1b.workflows.v1.RenderOptionsR\rrenderOptions\"\xa6\x01\n\rRenderOptions\x12\x16\n\x06layout\x18\x01 \x01(\tR\x06layout\x12\x1e\n\x08theme_id\x18\x02 \x01(\x03H\x00R\x07themeId\x88\x01\x01\x12\x18\n\x07sketchy\x18\x03 \x01(\x08R\x07sketchy\x12\x18\n\x07padding\x18\x04 \x01(\x03R\x07padding\x12\x1c\n\tdirection\x18\x05 \x01(\tR\tdirectionB\x0b\n\t_theme_id\"\x1b\n\x07\x44iagram\x12\x10\n\x03svg\x18\x01 \x01(\x0cR\x03svg2U\n\x0e\x44iagramService\x12\x43\n\x06Render\x12\".workflows.v1.RenderDiagramRequest\x1a\x15.workflows.v1.DiagramBq\n\x10\x63om.workflows.v1B\x0c\x44iagramProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.diagram_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\014DiagramProtoP\001ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\014DiagramProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' _globals['_RENDERDIAGRAMREQUEST']._serialized_start=44 _globals['_RENDERDIAGRAMREQUEST']._serialized_end=160 _globals['_RENDEROPTIONS']._serialized_start=163 diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2.pyi b/tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2.pyi similarity index 100% rename from tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2.pyi rename to tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2.pyi diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2_grpc.py b/tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2_grpc.py similarity index 96% rename from tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2_grpc.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2_grpc.py index 45877e8..c98edc1 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/diagram_pb2_grpc.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/diagram_pb2_grpc.py @@ -2,7 +2,7 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.workflows.workflowsv1 import diagram_pb2 as workflows_dot_v1_dot_diagram__pb2 +from tilebox.workflows.workflows.v1 import diagram_pb2 as workflows_dot_v1_dot_diagram__pb2 class DiagramServiceStub(object): diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2.py b/tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2.py similarity index 90% rename from tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2.py index 3c4c7c6..8ef9a56 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2.py @@ -22,18 +22,18 @@ _sym_db = _symbol_database.Default() -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -from tilebox.workflows.workflowsv1 import diagram_pb2 as workflows_dot_v1_dot_diagram__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import diagram_pb2 as workflows_dot_v1_dot_diagram__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16workflows/v1/job.proto\x12\x0cworkflows.v1\x1a\x17workflows/v1/core.proto\x1a\x1aworkflows/v1/diagram.proto\"\xbd\x01\n\x10SubmitJobRequest\x12\x32\n\x05tasks\x18\x01 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\x05tasks\x12\x19\n\x08job_name\x18\x02 \x01(\tR\x07jobName\x12!\n\x0ctrace_parent\x18\x03 \x01(\tR\x0btraceParent\x12\x37\n\rautomation_id\x18\x04 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x0c\x61utomationId\":\n\rGetJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"<\n\x0fRetryJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"F\n\x10RetryJobResponse\x12\x32\n\x15num_tasks_rescheduled\x18\x01 \x01(\x03R\x13numTasksRescheduled\"=\n\x10\x43\x61ncelJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"\x13\n\x11\x43\x61ncelJobResponse\"\xe8\x01\n\x13VisualizeJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\x12\x42\n\x0erender_options\x18\x02 \x01(\x0b\x32\x1b.workflows.v1.RenderOptionsR\rrenderOptions\x12\x38\n\x05theme\x18\x03 \x01(\x0e\x32\".workflows.v1.WorkflowDiagramThemeR\x05theme\x12(\n\x10include_job_name\x18\x04 \x01(\x08R\x0eincludeJobName\"\xf1\x01\n\x0cQueryFilters\x12\x41\n\rtime_interval\x18\x01 \x01(\x0b\x32\x1a.workflows.v1.TimeIntervalH\x00R\x0ctimeInterval\x12;\n\x0bid_interval\x18\x02 \x01(\x0b\x32\x18.workflows.v1.IDIntervalH\x00R\nidInterval\x12<\n\rautomation_id\x18\x03 \x01(\x0b\x32\x12.workflows.v1.UUIDH\x01R\x0c\x61utomationId\x88\x01\x01\x42\x11\n\x0ftemporal_extentB\x10\n\x0e_automation_id\"\x84\x01\n\x10QueryJobsRequest\x12\x34\n\x07\x66ilters\x18\x01 \x01(\x0b\x32\x1a.workflows.v1.QueryFiltersR\x07\x66ilters\x12\x31\n\x04page\x18\x02 \x01(\x0b\x32\x18.workflows.v1.PaginationH\x00R\x04page\x88\x01\x01\x42\x07\n\x05_page\"\x84\x01\n\x11QueryJobsResponse\x12%\n\x04jobs\x18\x01 \x03(\x0b\x32\x11.workflows.v1.JobR\x04jobs\x12:\n\tnext_page\x18\x03 \x01(\x0b\x32\x18.workflows.v1.PaginationH\x00R\x08nextPage\x88\x01\x01\x42\x0c\n\n_next_page\"C\n\x16GetJobPrototypeRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"q\n\x17GetJobPrototypeResponse\x12;\n\nroot_tasks\x18\x01 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\trootTasks\x12\x19\n\x08job_name\x18\x02 \x01(\tR\x07jobName\"\xa7\x01\n\x0f\x43loneJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\x12N\n\x14root_tasks_overrides\x18\x02 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\x12rootTasksOverrides\x12\x19\n\x08job_name\x18\x03 \x01(\tR\x07jobName*\xd4\x01\n\x14WorkflowDiagramTheme\x12&\n\"WORKFLOW_DIAGRAM_THEME_UNSPECIFIED\x10\x00\x12 \n\x1cWORKFLOW_DIAGRAM_THEME_LIGHT\x10\x01\x12\x1f\n\x1bWORKFLOW_DIAGRAM_THEME_DARK\x10\x02\x12(\n$WORKFLOW_DIAGRAM_THEME_CONSOLE_LIGHT\x10\x03\x12\'\n#WORKFLOW_DIAGRAM_THEME_CONSOLE_DARK\x10\x04\x32\xd5\x04\n\nJobService\x12>\n\tSubmitJob\x12\x1e.workflows.v1.SubmitJobRequest\x1a\x11.workflows.v1.Job\x12\x38\n\x06GetJob\x12\x1b.workflows.v1.GetJobRequest\x1a\x11.workflows.v1.Job\x12I\n\x08RetryJob\x12\x1d.workflows.v1.RetryJobRequest\x1a\x1e.workflows.v1.RetryJobResponse\x12L\n\tCancelJob\x12\x1e.workflows.v1.CancelJobRequest\x1a\x1f.workflows.v1.CancelJobResponse\x12H\n\x0cVisualizeJob\x12!.workflows.v1.VisualizeJobRequest\x1a\x15.workflows.v1.Diagram\x12L\n\tQueryJobs\x12\x1e.workflows.v1.QueryJobsRequest\x1a\x1f.workflows.v1.QueryJobsResponse\x12^\n\x0fGetJobPrototype\x12$.workflows.v1.GetJobPrototypeRequest\x1a%.workflows.v1.GetJobPrototypeResponse\x12<\n\x08\x43loneJob\x12\x1d.workflows.v1.CloneJobRequest\x1a\x11.workflows.v1.JobB\xb1\x01\n\x10\x63om.workflows.v1B\x08JobProtoP\x01ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16workflows/v1/job.proto\x12\x0cworkflows.v1\x1a\x17workflows/v1/core.proto\x1a\x1aworkflows/v1/diagram.proto\"\xbd\x01\n\x10SubmitJobRequest\x12\x32\n\x05tasks\x18\x01 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\x05tasks\x12\x19\n\x08job_name\x18\x02 \x01(\tR\x07jobName\x12!\n\x0ctrace_parent\x18\x03 \x01(\tR\x0btraceParent\x12\x37\n\rautomation_id\x18\x04 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x0c\x61utomationId\":\n\rGetJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"<\n\x0fRetryJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"F\n\x10RetryJobResponse\x12\x32\n\x15num_tasks_rescheduled\x18\x01 \x01(\x03R\x13numTasksRescheduled\"=\n\x10\x43\x61ncelJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"\x13\n\x11\x43\x61ncelJobResponse\"\xe8\x01\n\x13VisualizeJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\x12\x42\n\x0erender_options\x18\x02 \x01(\x0b\x32\x1b.workflows.v1.RenderOptionsR\rrenderOptions\x12\x38\n\x05theme\x18\x03 \x01(\x0e\x32\".workflows.v1.WorkflowDiagramThemeR\x05theme\x12(\n\x10include_job_name\x18\x04 \x01(\x08R\x0eincludeJobName\"\xf1\x01\n\x0cQueryFilters\x12\x41\n\rtime_interval\x18\x01 \x01(\x0b\x32\x1a.workflows.v1.TimeIntervalH\x00R\x0ctimeInterval\x12;\n\x0bid_interval\x18\x02 \x01(\x0b\x32\x18.workflows.v1.IDIntervalH\x00R\nidInterval\x12<\n\rautomation_id\x18\x03 \x01(\x0b\x32\x12.workflows.v1.UUIDH\x01R\x0c\x61utomationId\x88\x01\x01\x42\x11\n\x0ftemporal_extentB\x10\n\x0e_automation_id\"\x84\x01\n\x10QueryJobsRequest\x12\x34\n\x07\x66ilters\x18\x01 \x01(\x0b\x32\x1a.workflows.v1.QueryFiltersR\x07\x66ilters\x12\x31\n\x04page\x18\x02 \x01(\x0b\x32\x18.workflows.v1.PaginationH\x00R\x04page\x88\x01\x01\x42\x07\n\x05_page\"\x84\x01\n\x11QueryJobsResponse\x12%\n\x04jobs\x18\x01 \x03(\x0b\x32\x11.workflows.v1.JobR\x04jobs\x12:\n\tnext_page\x18\x03 \x01(\x0b\x32\x18.workflows.v1.PaginationH\x00R\x08nextPage\x88\x01\x01\x42\x0c\n\n_next_page\"C\n\x16GetJobPrototypeRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\"q\n\x17GetJobPrototypeResponse\x12;\n\nroot_tasks\x18\x01 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\trootTasks\x12\x19\n\x08job_name\x18\x02 \x01(\tR\x07jobName\"\xa7\x01\n\x0f\x43loneJobRequest\x12)\n\x06job_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x05jobId\x12N\n\x14root_tasks_overrides\x18\x02 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\x12rootTasksOverrides\x12\x19\n\x08job_name\x18\x03 \x01(\tR\x07jobName*\xd4\x01\n\x14WorkflowDiagramTheme\x12&\n\"WORKFLOW_DIAGRAM_THEME_UNSPECIFIED\x10\x00\x12 \n\x1cWORKFLOW_DIAGRAM_THEME_LIGHT\x10\x01\x12\x1f\n\x1bWORKFLOW_DIAGRAM_THEME_DARK\x10\x02\x12(\n$WORKFLOW_DIAGRAM_THEME_CONSOLE_LIGHT\x10\x03\x12\'\n#WORKFLOW_DIAGRAM_THEME_CONSOLE_DARK\x10\x04\x32\xd5\x04\n\nJobService\x12>\n\tSubmitJob\x12\x1e.workflows.v1.SubmitJobRequest\x1a\x11.workflows.v1.Job\x12\x38\n\x06GetJob\x12\x1b.workflows.v1.GetJobRequest\x1a\x11.workflows.v1.Job\x12I\n\x08RetryJob\x12\x1d.workflows.v1.RetryJobRequest\x1a\x1e.workflows.v1.RetryJobResponse\x12L\n\tCancelJob\x12\x1e.workflows.v1.CancelJobRequest\x1a\x1f.workflows.v1.CancelJobResponse\x12H\n\x0cVisualizeJob\x12!.workflows.v1.VisualizeJobRequest\x1a\x15.workflows.v1.Diagram\x12L\n\tQueryJobs\x12\x1e.workflows.v1.QueryJobsRequest\x1a\x1f.workflows.v1.QueryJobsResponse\x12^\n\x0fGetJobPrototype\x12$.workflows.v1.GetJobPrototypeRequest\x1a%.workflows.v1.GetJobPrototypeResponse\x12<\n\x08\x43loneJob\x12\x1d.workflows.v1.CloneJobRequest\x1a\x11.workflows.v1.JobBm\n\x10\x63om.workflows.v1B\x08JobProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.job_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\010JobProtoP\001ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\010JobProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' _globals['_WORKFLOWDIAGRAMTHEME']._serialized_start=1667 _globals['_WORKFLOWDIAGRAMTHEME']._serialized_end=1879 _globals['_SUBMITJOBREQUEST']._serialized_start=94 diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2.pyi b/tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2.pyi similarity index 97% rename from tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2.pyi rename to tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2.pyi index cc35e38..550a9b3 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2.pyi +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2.pyi @@ -1,5 +1,5 @@ -from tilebox.workflows.workflowsv1 import core_pb2 as _core_pb2 -from tilebox.workflows.workflowsv1 import diagram_pb2 as _diagram_pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as _core_pb2 +from tilebox.workflows.workflows.v1 import diagram_pb2 as _diagram_pb2 from google.protobuf.internal import containers as _containers from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper from google.protobuf import descriptor as _descriptor diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2_grpc.py b/tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2_grpc.py similarity index 98% rename from tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2_grpc.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2_grpc.py index 54b3c8a..b9dc99d 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/job_pb2_grpc.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/job_pb2_grpc.py @@ -2,9 +2,9 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -from tilebox.workflows.workflowsv1 import diagram_pb2 as workflows_dot_v1_dot_diagram__pb2 -from tilebox.workflows.workflowsv1 import job_pb2 as workflows_dot_v1_dot_job__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import diagram_pb2 as workflows_dot_v1_dot_diagram__pb2 +from tilebox.workflows.workflows.v1 import job_pb2 as workflows_dot_v1_dot_job__pb2 class JobServiceStub(object): diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2.py b/tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2.py similarity index 86% rename from tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2.py index 91c862a..e457f07 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2.py @@ -23,17 +23,17 @@ from google.protobuf import duration_pb2 as google_dot_protobuf_dot_duration__pb2 -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17workflows/v1/task.proto\x12\x0cworkflows.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x17workflows/v1/core.proto\"\xc9\x01\n\x0fNextTaskRequest\x12\x44\n\rcomputed_task\x18\x01 \x01(\x0b\x32\x1a.workflows.v1.ComputedTaskH\x00R\x0c\x63omputedTask\x88\x01\x01\x12I\n\x10next_task_to_run\x18\x02 \x01(\x0b\x32\x1b.workflows.v1.NextTaskToRunH\x01R\rnextTaskToRun\x88\x01\x01\x42\x10\n\x0e_computed_taskB\x13\n\x11_next_task_to_run\"r\n\rNextTaskToRun\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\x12>\n\x0bidentifiers\x18\x02 \x03(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\x0bidentifiers\"\x87\x01\n\x0c\x43omputedTask\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12\x39\n\tsub_tasks\x18\x03 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\x08subTasks\"C\n\x10NextTaskResponse\x12/\n\tnext_task\x18\x01 \x01(\x0b\x32\x12.workflows.v1.TaskR\x08nextTask\"y\n\x11TaskFailedRequest\x12+\n\x07task_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x06taskId\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12\x1d\n\ncancel_job\x18\x03 \x01(\x08R\tcancelJob\"B\n\x11TaskStateResponse\x12-\n\x05state\x18\x01 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\"\x9c\x01\n\x10TaskLeaseRequest\x12+\n\x07task_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x06taskId\x12G\n\x0frequested_lease\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00R\x0erequestedLease\x88\x01\x01\x42\x12\n\x10_requested_lease2\xf4\x01\n\x0bTaskService\x12I\n\x08NextTask\x12\x1d.workflows.v1.NextTaskRequest\x1a\x1e.workflows.v1.NextTaskResponse\x12N\n\nTaskFailed\x12\x1f.workflows.v1.TaskFailedRequest\x1a\x1f.workflows.v1.TaskStateResponse\x12J\n\x0f\x45xtendTaskLease\x12\x1e.workflows.v1.TaskLeaseRequest\x1a\x17.workflows.v1.TaskLeaseB\xb2\x01\n\x10\x63om.workflows.v1B\tTaskProtoP\x01ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17workflows/v1/task.proto\x12\x0cworkflows.v1\x1a\x1egoogle/protobuf/duration.proto\x1a\x17workflows/v1/core.proto\"\xc9\x01\n\x0fNextTaskRequest\x12\x44\n\rcomputed_task\x18\x01 \x01(\x0b\x32\x1a.workflows.v1.ComputedTaskH\x00R\x0c\x63omputedTask\x88\x01\x01\x12I\n\x10next_task_to_run\x18\x02 \x01(\x0b\x32\x1b.workflows.v1.NextTaskToRunH\x01R\rnextTaskToRun\x88\x01\x01\x42\x10\n\x0e_computed_taskB\x13\n\x11_next_task_to_run\"r\n\rNextTaskToRun\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\x12>\n\x0bidentifiers\x18\x02 \x03(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\x0bidentifiers\"\x87\x01\n\x0c\x43omputedTask\x12\"\n\x02id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x02id\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12\x39\n\tsub_tasks\x18\x03 \x03(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\x08subTasks\"C\n\x10NextTaskResponse\x12/\n\tnext_task\x18\x01 \x01(\x0b\x32\x12.workflows.v1.TaskR\x08nextTask\"y\n\x11TaskFailedRequest\x12+\n\x07task_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x06taskId\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12\x1d\n\ncancel_job\x18\x03 \x01(\x08R\tcancelJob\"B\n\x11TaskStateResponse\x12-\n\x05state\x18\x01 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\"\x9c\x01\n\x10TaskLeaseRequest\x12+\n\x07task_id\x18\x01 \x01(\x0b\x32\x12.workflows.v1.UUIDR\x06taskId\x12G\n\x0frequested_lease\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationH\x00R\x0erequestedLease\x88\x01\x01\x42\x12\n\x10_requested_lease2\xf4\x01\n\x0bTaskService\x12I\n\x08NextTask\x12\x1d.workflows.v1.NextTaskRequest\x1a\x1e.workflows.v1.NextTaskResponse\x12N\n\nTaskFailed\x12\x1f.workflows.v1.TaskFailedRequest\x1a\x1f.workflows.v1.TaskStateResponse\x12J\n\x0f\x45xtendTaskLease\x12\x1e.workflows.v1.TaskLeaseRequest\x1a\x17.workflows.v1.TaskLeaseBn\n\x10\x63om.workflows.v1B\tTaskProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.task_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\tTaskProtoP\001ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\tTaskProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' _globals['_NEXTTASKREQUEST']._serialized_start=99 _globals['_NEXTTASKREQUEST']._serialized_end=300 _globals['_NEXTTASKTORUN']._serialized_start=302 diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2.pyi b/tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2.pyi similarity index 97% rename from tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2.pyi rename to tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2.pyi index 45eaf08..6c0ebec 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2.pyi +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2.pyi @@ -1,5 +1,5 @@ from google.protobuf import duration_pb2 as _duration_pb2 -from tilebox.workflows.workflowsv1 import core_pb2 as _core_pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as _core_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2_grpc.py b/tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2_grpc.py similarity index 97% rename from tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2_grpc.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2_grpc.py index 78ea5ff..078f35b 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/task_pb2_grpc.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/task_pb2_grpc.py @@ -2,8 +2,8 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -from tilebox.workflows.workflowsv1 import task_pb2 as workflows_dot_v1_dot_task__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import task_pb2 as workflows_dot_v1_dot_task__pb2 class TaskServiceStub(object): diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2.py b/tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2.py similarity index 82% rename from tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2.py index 6388e73..2ef21bc 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2.py @@ -22,17 +22,17 @@ _sym_db = _symbol_database.Default() -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cworkflows/v1/workflows.proto\x12\x0cworkflows.v1\x1a\x17workflows/v1/core.proto\"*\n\x14\x43reateClusterRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"6\n\x11GetClusterRequest\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\"9\n\x14\x44\x65leteClusterRequest\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\"\x17\n\x15\x44\x65leteClusterResponse\"\x15\n\x13ListClustersRequest\"I\n\x14ListClustersResponse\x12\x31\n\x08\x63lusters\x18\x01 \x03(\x0b\x32\x15.workflows.v1.ClusterR\x08\x63lusters2\xd5\x02\n\x10WorkflowsService\x12J\n\rCreateCluster\x12\".workflows.v1.CreateClusterRequest\x1a\x15.workflows.v1.Cluster\x12\x44\n\nGetCluster\x12\x1f.workflows.v1.GetClusterRequest\x1a\x15.workflows.v1.Cluster\x12X\n\rDeleteCluster\x12\".workflows.v1.DeleteClusterRequest\x1a#.workflows.v1.DeleteClusterResponse\x12U\n\x0cListClusters\x12!.workflows.v1.ListClustersRequest\x1a\".workflows.v1.ListClustersResponseB\xb7\x01\n\x10\x63om.workflows.v1B\x0eWorkflowsProtoP\x01ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1cworkflows/v1/workflows.proto\x12\x0cworkflows.v1\x1a\x17workflows/v1/core.proto\"*\n\x14\x43reateClusterRequest\x12\x12\n\x04name\x18\x01 \x01(\tR\x04name\"6\n\x11GetClusterRequest\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\"9\n\x14\x44\x65leteClusterRequest\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\"\x17\n\x15\x44\x65leteClusterResponse\"\x15\n\x13ListClustersRequest\"I\n\x14ListClustersResponse\x12\x31\n\x08\x63lusters\x18\x01 \x03(\x0b\x32\x15.workflows.v1.ClusterR\x08\x63lusters2\xd5\x02\n\x10WorkflowsService\x12J\n\rCreateCluster\x12\".workflows.v1.CreateClusterRequest\x1a\x15.workflows.v1.Cluster\x12\x44\n\nGetCluster\x12\x1f.workflows.v1.GetClusterRequest\x1a\x15.workflows.v1.Cluster\x12X\n\rDeleteCluster\x12\".workflows.v1.DeleteClusterRequest\x1a#.workflows.v1.DeleteClusterResponse\x12U\n\x0cListClusters\x12!.workflows.v1.ListClustersRequest\x1a\".workflows.v1.ListClustersResponseBs\n\x10\x63om.workflows.v1B\x0eWorkflowsProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1b\x06proto3') _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.workflows_pb2', _globals) if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None - _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\016WorkflowsProtoP\001ZBgithub.com/tilebox/tilebox-go/protogen/go/workflows/v1;workflowsv1\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' + _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\016WorkflowsProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1' _globals['_CREATECLUSTERREQUEST']._serialized_start=71 _globals['_CREATECLUSTERREQUEST']._serialized_end=113 _globals['_GETCLUSTERREQUEST']._serialized_start=115 diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2.pyi b/tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2.pyi similarity index 95% rename from tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2.pyi rename to tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2.pyi index abebaae..a3e33a6 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2.pyi +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2.pyi @@ -1,4 +1,4 @@ -from tilebox.workflows.workflowsv1 import core_pb2 as _core_pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as _core_pb2 from google.protobuf.internal import containers as _containers from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message diff --git a/tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2_grpc.py b/tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2_grpc.py similarity index 97% rename from tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2_grpc.py rename to tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2_grpc.py index ad531ee..4d354a5 100644 --- a/tilebox-workflows/tilebox/workflows/workflowsv1/workflows_pb2_grpc.py +++ b/tilebox-workflows/tilebox/workflows/workflows/v1/workflows_pb2_grpc.py @@ -2,8 +2,8 @@ """Client and server classes corresponding to protobuf-defined services.""" import grpc -from tilebox.workflows.workflowsv1 import core_pb2 as workflows_dot_v1_dot_core__pb2 -from tilebox.workflows.workflowsv1 import workflows_pb2 as workflows_dot_v1_dot_workflows__pb2 +from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2 +from tilebox.workflows.workflows.v1 import workflows_pb2 as workflows_dot_v1_dot_workflows__pb2 class WorkflowsServiceStub(object): diff --git a/tools/copy_protobuf.py b/tools/copy_protobuf.py deleted file mode 100755 index 505104f..0000000 --- a/tools/copy_protobuf.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python - -""" -A small utility script to copy generated protobuf messages from the core repository into this repository - -This will put them in the right place, and automatically fix the imports as well - -Usage (from repo root): -uv run copy-protobuf - -Requires tilebox-go (https://github.com/tilebox/tilebox-go) to be checked out, and protos to be generated. -This can be done by running `go generate ./...` in the root of the tilebox-go repository. -""" - -import sys -from pathlib import Path - -_MODULES_TO_COPY = { - "datasets": { - "tilebox-datasets/tilebox/datasets/datasetsv1": [ - "collections", - "core", - "data_access", - "data_ingestion", - "dataset_type", - "datasets", - "timeseries", - "well_known_types", - ], - }, - "workflows": { - "tilebox-workflows/tilebox/workflows/workflowsv1": [ - "automation", - "core", - "diagram", - "job", - "task", - "workflows", - ], - }, -} - - -def main() -> None: - clients_repo = Path(__file__).parent.parent - go_repo = clients_repo.parent / "tilebox-go" - - if len(sys.argv) == 3: # manual arg parsing, don't want any dependencies for this simple script - go_repo = Path(sys.argv[1]) - clients_repo = Path(sys.argv[2]) - elif len(sys.argv) != 1: - print("Usage: uv run copy-protobuf ") # noqa: T201 - sys.exit(1) - - for root_module, copy_operations in _MODULES_TO_COPY.items(): - for target_path, modules in copy_operations.items(): - for module in modules: - copy_module( - go_repo / "protogen" / "python" / root_module / "v1", - clients_repo / target_path, - module, - ) - - -def copy_module(search_path: Path, target_path: Path, module: str) -> None: - for file in search_path.glob(f"{module}*"): - target_file = target_path / file.name - target_file.parent.mkdir(parents=True, exist_ok=True) - target_file.write_text(fix_imports(file.read_text())) - print(f"Copied and fixed file: {target_file}") # noqa: T201 - - -def fix_imports(content: str) -> str: - for root_module, copy_operations in _MODULES_TO_COPY.items(): - for target_path, modules in copy_operations.items(): - parts = Path(target_path).parts - index = parts.index("_tilebox") if "_tilebox" in parts else parts.index("tilebox") - tilebox_module = ".".join(parts[index:]) - - for module in modules: - content = content.replace( - f"from {root_module}.v1 import {module}", f"from {tilebox_module} import {module}" - ) - return content.strip() + "\n" # end of file -> new line fix - - -if __name__ == "__main__": - main() diff --git a/tools/generate_protobuf.py b/tools/generate_protobuf.py new file mode 100755 index 0000000..001a14d --- /dev/null +++ b/tools/generate_protobuf.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python + +""" +A small utility script to generate protobuf files. + +This will put them in the right place, and automatically fix the imports as well + +Usage (from repo root): +uv run generate-protobuf +""" + +import os +import sys +from pathlib import Path + + +def main() -> None: + clients_repo = Path(__file__).parent.parent + + if len(sys.argv) == 2: # manual arg parsing, don't want any dependencies for this simple script + clients_repo = Path(sys.argv[1]) + elif len(sys.argv) != 1: + print("Usage: uv run generate-protobuf ") # noqa: T201 + sys.exit(1) + + print("Running buf generate") # noqa: T201 + os.system("buf generate --template buf.gen.datasets.yaml") # noqa: S605, S607 + os.system("buf generate --template buf.gen.workflows.yaml") # noqa: S605, S607 + + for package in ["datasets", "workflows"]: + package_mapping = { + f"from {package}.v1 import": f"from tilebox.{package}.{package}.v1 import", + } + folder = clients_repo / f"tilebox-{package}" / "tilebox" / package / package / "v1" + + for pattern in ["*.py", "*.pyi"]: + for py_file in folder.rglob(pattern): + fix_imports(py_file, package_mapping) + + +def fix_imports(file_path: Path, package_mapping: dict[str, str]) -> None: + """Fix imports in a single Python file.""" + content = file_path.read_text() + original_content = content + + for old_import, new_import in package_mapping.items(): + content = content.replace(old_import, new_import) + + content = content.strip() + "\n" # end of file -> new line fix + + if content != original_content: + file_path.write_text(content) + print(f"Fixed imports in: {file_path}") # noqa: T201 + + +if __name__ == "__main__": + main()