From ac13773d3b605ed002342e56d048a42bdf8d723e Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Mon, 16 Mar 2026 11:24:54 +0100 Subject: [PATCH 1/7] pycompss_dummy no-need of pycompss --- pyproject.toml | 7 +- src/dataclay/contrib/pycompss_dummy/api.py | 5 +- .../contrib/pycompss_dummy/constraint.py | 2 +- .../contrib/pycompss_dummy/container.py | 2 +- .../contrib/pycompss_dummy/on_failure.py | 2 +- .../contrib/pycompss_dummy/reduction.py | 2 +- src/dataclay/contrib/pycompss_dummy/task.py | 2 +- src/dataclay/proto/backend/backend_pb2.py | 18 +- .../proto/backend/backend_pb2_grpc.py | 345 ++++++++++++++---- src/dataclay/proto/common/common_pb2.py | 16 +- src/dataclay/proto/common/common_pb2_grpc.py | 20 + src/dataclay/proto/metadata/metadata_pb2.py | 22 +- .../proto/metadata/metadata_pb2_grpc.py | 237 +++++++++--- 13 files changed, 537 insertions(+), 143 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 70da465b..00dcf93a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,13 +18,12 @@ classifiers = [ "Topic :: System :: Distributed Computing", "Topic :: Software Development :: Libraries :: Application Frameworks", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3 :: Only", ] -requires-python = ">=3.9,<3.13" +requires-python = ">=3.10,<3.13" dependencies = [ "aiorwlock>=1.4.0", "bcrypt>=4.1.1", @@ -116,5 +115,5 @@ include = ["src/dataclay", "src/storage", "dataclay-common", "compile_protos.py" [tool.hatch.version] path = "src/dataclay/__init__.py" -[tool.hatch.build.hooks.custom] -path = "compile_protos.py" +#[tool.hatch.build.hooks.custom] +#path = "compile_protos.py" diff --git a/src/dataclay/contrib/pycompss_dummy/api.py b/src/dataclay/contrib/pycompss_dummy/api.py index fae0015a..b53843d7 100644 --- a/src/dataclay/contrib/pycompss_dummy/api.py +++ b/src/dataclay/contrib/pycompss_dummy/api.py @@ -25,7 +25,10 @@ import os -from pycompss.util.typing_helper import typing +try: + from pycompss.util.typing_helper import typing +except ModuleNotFoundError: + import typing def compss_start( diff --git a/src/dataclay/contrib/pycompss_dummy/constraint.py b/src/dataclay/contrib/pycompss_dummy/constraint.py index 195b16be..fbebb387 100644 --- a/src/dataclay/contrib/pycompss_dummy/constraint.py +++ b/src/dataclay/contrib/pycompss_dummy/constraint.py @@ -23,7 +23,7 @@ This file contains the dummy class constraint used as decorator. """ -from pycompss.api.dummy._decorator import _Dummy as Dummy +from _decorator import _Dummy as Dummy Constraint = Dummy # pylint: disable=invalid-name constraint = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/container.py b/src/dataclay/contrib/pycompss_dummy/container.py index 7e437766..14fafb87 100644 --- a/src/dataclay/contrib/pycompss_dummy/container.py +++ b/src/dataclay/contrib/pycompss_dummy/container.py @@ -23,7 +23,7 @@ This file contains the dummy class container used as decorator. """ -from pycompss.api.dummy._decorator import _Dummy as Dummy +from _decorator import _Dummy as Dummy Container = Dummy # pylint: disable=invalid-name container = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/on_failure.py b/src/dataclay/contrib/pycompss_dummy/on_failure.py index fc5ba7d8..d067e667 100644 --- a/src/dataclay/contrib/pycompss_dummy/on_failure.py +++ b/src/dataclay/contrib/pycompss_dummy/on_failure.py @@ -23,7 +23,7 @@ This file contains the dummy class on failure used as decorator. """ -from pycompss.api.dummy._decorator import _Dummy as Dummy +from _decorator import _Dummy as Dummy OnFailure = Dummy # pylint: disable=invalid-name on_failure = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/reduction.py b/src/dataclay/contrib/pycompss_dummy/reduction.py index 2a86d451..a377bcef 100644 --- a/src/dataclay/contrib/pycompss_dummy/reduction.py +++ b/src/dataclay/contrib/pycompss_dummy/reduction.py @@ -23,7 +23,7 @@ This file contains the dummy class reduction used as decorator. """ -from pycompss.api.dummy._decorator import _Dummy as Dummy +from _decorator import _Dummy as Dummy Reduction = Dummy # pylint: disable=invalid-name reduction = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/task.py b/src/dataclay/contrib/pycompss_dummy/task.py index 4d860adb..c4a108ef 100644 --- a/src/dataclay/contrib/pycompss_dummy/task.py +++ b/src/dataclay/contrib/pycompss_dummy/task.py @@ -23,7 +23,7 @@ This file contains the dummy class task used as decorator. """ -from pycompss.api.dummy._decorator import _Dummy as Dummy +from _decorator import _Dummy as Dummy Task = Dummy # pylint: disable=invalid-name task = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/proto/backend/backend_pb2.py b/src/dataclay/proto/backend/backend_pb2.py index 952fbbb3..6433a7aa 100644 --- a/src/dataclay/proto/backend/backend_pb2.py +++ b/src/dataclay/proto/backend/backend_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: dataclay/proto/backend/backend.proto -# Protobuf Python Version: 4.25.1 +# Protobuf Python Version: 6.31.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 6, + 31, + 1, + '', + 'dataclay/proto/backend/backend.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -22,10 +32,10 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'dataclay.proto.backend.backend_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - _globals['DESCRIPTOR']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None _globals['DESCRIPTOR']._serialized_options = b'\n\035es.bsc.dataclay.proto.backendP\001' - _globals['_CALLACTIVEMETHODREQUEST_EXECCONSTRAINTSENTRY']._options = None + _globals['_CALLACTIVEMETHODREQUEST_EXECCONSTRAINTSENTRY']._loaded_options = None _globals['_CALLACTIVEMETHODREQUEST_EXECCONSTRAINTSENTRY']._serialized_options = b'8\001' _globals['_MAKEPERSISTENTREQUEST']._serialized_start=152 _globals['_MAKEPERSISTENTREQUEST']._serialized_end=196 diff --git a/src/dataclay/proto/backend/backend_pb2_grpc.py b/src/dataclay/proto/backend/backend_pb2_grpc.py index 47955b8a..aa1cc2de 100644 --- a/src/dataclay/proto/backend/backend_pb2_grpc.py +++ b/src/dataclay/proto/backend/backend_pb2_grpc.py @@ -1,11 +1,31 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from dataclay.proto.backend import backend_pb2 as dataclay_dot_proto_dot_backend_dot_backend__pb2 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 +GRPC_GENERATED_VERSION = '1.78.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + ' but the generated code in dataclay/proto/backend/backend_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class BackendServiceStub(object): """Missing associated documentation comment in .proto file.""" @@ -20,92 +40,92 @@ def __init__(self, channel): '/dataclay.proto.backend.BackendService/MakePersistent', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.MakePersistentRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.CallActiveMethod = channel.unary_unary( '/dataclay.proto.backend.BackendService/CallActiveMethod', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.CallActiveMethodRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.CallActiveMethodResponse.FromString, - ) + _registered_method=True) self.GetObjectAttribute = channel.unary_unary( '/dataclay.proto.backend.BackendService/GetObjectAttribute', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.GetObjectAttributeRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.GetObjectAttributeResponse.FromString, - ) + _registered_method=True) self.SetObjectAttribute = channel.unary_unary( '/dataclay.proto.backend.BackendService/SetObjectAttribute', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.SetObjectAttributeRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.SetObjectAttributeResponse.FromString, - ) + _registered_method=True) self.DelObjectAttribute = channel.unary_unary( '/dataclay.proto.backend.BackendService/DelObjectAttribute', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.DelObjectAttributeRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.DelObjectAttributeResponse.FromString, - ) + _registered_method=True) self.GetObjectProperties = channel.unary_unary( '/dataclay.proto.backend.BackendService/GetObjectProperties', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.GetObjectPropertiesRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_wrappers__pb2.BytesValue.FromString, - ) + _registered_method=True) self.UpdateObjectProperties = channel.unary_unary( '/dataclay.proto.backend.BackendService/UpdateObjectProperties', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.UpdateObjectPropertiesRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.SendObjects = channel.unary_unary( '/dataclay.proto.backend.BackendService/SendObjects', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.SendObjectsRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.RegisterObjects = channel.unary_unary( '/dataclay.proto.backend.BackendService/RegisterObjects', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.RegisterObjectsRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.NewObjectVersion = channel.unary_unary( '/dataclay.proto.backend.BackendService/NewObjectVersion', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.NewObjectVersionRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.NewObjectVersionResponse.FromString, - ) + _registered_method=True) self.ConsolidateObjectVersion = channel.unary_unary( '/dataclay.proto.backend.BackendService/ConsolidateObjectVersion', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.ConsolidateObjectVersionRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.ProxifyObject = channel.unary_unary( '/dataclay.proto.backend.BackendService/ProxifyObject', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.ProxifyObjectRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.ChangeObjectId = channel.unary_unary( '/dataclay.proto.backend.BackendService/ChangeObjectId', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.ChangeObjectIdRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.NewObjectReplica = channel.unary_unary( '/dataclay.proto.backend.BackendService/NewObjectReplica', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.NewObjectReplicaRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.FlushAll = channel.unary_unary( '/dataclay.proto.backend.BackendService/FlushAll', request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.Stop = channel.unary_unary( '/dataclay.proto.backend.BackendService/Stop', request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.Drain = channel.unary_unary( '/dataclay.proto.backend.BackendService/Drain', request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.GetClassInfo = channel.unary_unary( '/dataclay.proto.backend.BackendService/GetClassInfo', request_serializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.GetClassInfoRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_backend_dot_backend__pb2.GetClassInfoResponse.FromString, - ) + _registered_method=True) class BackendServiceServicer(object): @@ -316,6 +336,7 @@ def add_BackendServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'dataclay.proto.backend.BackendService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('dataclay.proto.backend.BackendService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -333,11 +354,21 @@ def MakePersistent(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/MakePersistent', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/MakePersistent', dataclay_dot_proto_dot_backend_dot_backend__pb2.MakePersistentRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def CallActiveMethod(request, @@ -350,11 +381,21 @@ def CallActiveMethod(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/CallActiveMethod', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/CallActiveMethod', dataclay_dot_proto_dot_backend_dot_backend__pb2.CallActiveMethodRequest.SerializeToString, dataclay_dot_proto_dot_backend_dot_backend__pb2.CallActiveMethodResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetObjectAttribute(request, @@ -367,11 +408,21 @@ def GetObjectAttribute(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/GetObjectAttribute', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/GetObjectAttribute', dataclay_dot_proto_dot_backend_dot_backend__pb2.GetObjectAttributeRequest.SerializeToString, dataclay_dot_proto_dot_backend_dot_backend__pb2.GetObjectAttributeResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def SetObjectAttribute(request, @@ -384,11 +435,21 @@ def SetObjectAttribute(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/SetObjectAttribute', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/SetObjectAttribute', dataclay_dot_proto_dot_backend_dot_backend__pb2.SetObjectAttributeRequest.SerializeToString, dataclay_dot_proto_dot_backend_dot_backend__pb2.SetObjectAttributeResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def DelObjectAttribute(request, @@ -401,11 +462,21 @@ def DelObjectAttribute(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/DelObjectAttribute', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/DelObjectAttribute', dataclay_dot_proto_dot_backend_dot_backend__pb2.DelObjectAttributeRequest.SerializeToString, dataclay_dot_proto_dot_backend_dot_backend__pb2.DelObjectAttributeResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetObjectProperties(request, @@ -418,11 +489,21 @@ def GetObjectProperties(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/GetObjectProperties', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/GetObjectProperties', dataclay_dot_proto_dot_backend_dot_backend__pb2.GetObjectPropertiesRequest.SerializeToString, google_dot_protobuf_dot_wrappers__pb2.BytesValue.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def UpdateObjectProperties(request, @@ -435,11 +516,21 @@ def UpdateObjectProperties(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/UpdateObjectProperties', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/UpdateObjectProperties', dataclay_dot_proto_dot_backend_dot_backend__pb2.UpdateObjectPropertiesRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def SendObjects(request, @@ -452,11 +543,21 @@ def SendObjects(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/SendObjects', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/SendObjects', dataclay_dot_proto_dot_backend_dot_backend__pb2.SendObjectsRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def RegisterObjects(request, @@ -469,11 +570,21 @@ def RegisterObjects(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/RegisterObjects', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/RegisterObjects', dataclay_dot_proto_dot_backend_dot_backend__pb2.RegisterObjectsRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def NewObjectVersion(request, @@ -486,11 +597,21 @@ def NewObjectVersion(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/NewObjectVersion', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/NewObjectVersion', dataclay_dot_proto_dot_backend_dot_backend__pb2.NewObjectVersionRequest.SerializeToString, dataclay_dot_proto_dot_backend_dot_backend__pb2.NewObjectVersionResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def ConsolidateObjectVersion(request, @@ -503,11 +624,21 @@ def ConsolidateObjectVersion(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/ConsolidateObjectVersion', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/ConsolidateObjectVersion', dataclay_dot_proto_dot_backend_dot_backend__pb2.ConsolidateObjectVersionRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def ProxifyObject(request, @@ -520,11 +651,21 @@ def ProxifyObject(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/ProxifyObject', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/ProxifyObject', dataclay_dot_proto_dot_backend_dot_backend__pb2.ProxifyObjectRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def ChangeObjectId(request, @@ -537,11 +678,21 @@ def ChangeObjectId(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/ChangeObjectId', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/ChangeObjectId', dataclay_dot_proto_dot_backend_dot_backend__pb2.ChangeObjectIdRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def NewObjectReplica(request, @@ -554,11 +705,21 @@ def NewObjectReplica(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/NewObjectReplica', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/NewObjectReplica', dataclay_dot_proto_dot_backend_dot_backend__pb2.NewObjectReplicaRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def FlushAll(request, @@ -571,11 +732,21 @@ def FlushAll(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/FlushAll', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/FlushAll', google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def Stop(request, @@ -588,11 +759,21 @@ def Stop(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/Stop', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/Stop', google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def Drain(request, @@ -605,11 +786,21 @@ def Drain(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/Drain', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/Drain', google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetClassInfo(request, @@ -622,8 +813,18 @@ def GetClassInfo(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.backend.BackendService/GetClassInfo', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.backend.BackendService/GetClassInfo', dataclay_dot_proto_dot_backend_dot_backend__pb2.GetClassInfoRequest.SerializeToString, dataclay_dot_proto_dot_backend_dot_backend__pb2.GetClassInfoResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) diff --git a/src/dataclay/proto/common/common_pb2.py b/src/dataclay/proto/common/common_pb2.py index 072ffac6..03995da6 100644 --- a/src/dataclay/proto/common/common_pb2.py +++ b/src/dataclay/proto/common/common_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: dataclay/proto/common/common.proto -# Protobuf Python Version: 4.25.1 +# Protobuf Python Version: 6.31.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 6, + 31, + 1, + '', + 'dataclay/proto/common/common.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -19,8 +29,8 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'dataclay.proto.common.common_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - _globals['DESCRIPTOR']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None _globals['DESCRIPTOR']._serialized_options = b'\n\034es.bsc.dataclay.proto.commonP\001' _globals['_BACKEND']._serialized_start=61 _globals['_BACKEND']._serialized_end=131 diff --git a/src/dataclay/proto/common/common_pb2_grpc.py b/src/dataclay/proto/common/common_pb2_grpc.py index 2daafffe..1ffc52aa 100644 --- a/src/dataclay/proto/common/common_pb2_grpc.py +++ b/src/dataclay/proto/common/common_pb2_grpc.py @@ -1,4 +1,24 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings + +GRPC_GENERATED_VERSION = '1.78.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + ' but the generated code in dataclay/proto/common/common_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) diff --git a/src/dataclay/proto/metadata/metadata_pb2.py b/src/dataclay/proto/metadata/metadata_pb2.py index 371a2722..bde7fa93 100644 --- a/src/dataclay/proto/metadata/metadata_pb2.py +++ b/src/dataclay/proto/metadata/metadata_pb2.py @@ -1,12 +1,22 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! +# NO CHECKED-IN PROTOBUF GENCODE # source: dataclay/proto/metadata/metadata.proto -# Protobuf Python Version: 4.25.1 +# Protobuf Python Version: 6.31.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder +_runtime_version.ValidateProtobufRuntimeVersion( + _runtime_version.Domain.PUBLIC, + 6, + 31, + 1, + '', + 'dataclay/proto/metadata/metadata.proto' +) # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -21,14 +31,14 @@ _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'dataclay.proto.metadata.metadata_pb2', _globals) -if _descriptor._USE_C_DESCRIPTORS == False: - _globals['DESCRIPTOR']._options = None +if not _descriptor._USE_C_DESCRIPTORS: + _globals['DESCRIPTOR']._loaded_options = None _globals['DESCRIPTOR']._serialized_options = b'\n\036es.bsc.dataclay.proto.metadataP\001' - _globals['_GETALLBACKENDSRESPONSE_BACKENDSENTRY']._options = None + _globals['_GETALLBACKENDSRESPONSE_BACKENDSENTRY']._loaded_options = None _globals['_GETALLBACKENDSRESPONSE_BACKENDSENTRY']._serialized_options = b'8\001' - _globals['_GETALLOBJECTSRESPONSE_OBJECTSENTRY']._options = None + _globals['_GETALLOBJECTSRESPONSE_OBJECTSENTRY']._loaded_options = None _globals['_GETALLOBJECTSRESPONSE_OBJECTSENTRY']._serialized_options = b'8\001' - _globals['_GETALLALIASRESPONSE_ALIASESENTRY']._options = None + _globals['_GETALLALIASRESPONSE_ALIASESENTRY']._loaded_options = None _globals['_GETALLALIASRESPONSE_ALIASESENTRY']._serialized_options = b'8\001' _globals['_NEWACCOUNTREQUEST']._serialized_start=132 _globals['_NEWACCOUNTREQUEST']._serialized_end=187 diff --git a/src/dataclay/proto/metadata/metadata_pb2_grpc.py b/src/dataclay/proto/metadata/metadata_pb2_grpc.py index f12a79af..384ecb11 100644 --- a/src/dataclay/proto/metadata/metadata_pb2_grpc.py +++ b/src/dataclay/proto/metadata/metadata_pb2_grpc.py @@ -1,11 +1,31 @@ # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! """Client and server classes corresponding to protobuf-defined services.""" import grpc +import warnings from dataclay.proto.common import common_pb2 as dataclay_dot_proto_dot_common_dot_common__pb2 from dataclay.proto.metadata import metadata_pb2 as dataclay_dot_proto_dot_metadata_dot_metadata__pb2 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 +GRPC_GENERATED_VERSION = '1.78.0' +GRPC_VERSION = grpc.__version__ +_version_not_supported = False + +try: + from grpc._utilities import first_version_is_lower + _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION) +except ImportError: + _version_not_supported = True + +if _version_not_supported: + raise RuntimeError( + f'The grpc package installed is at version {GRPC_VERSION},' + + ' but the generated code in dataclay/proto/metadata/metadata_pb2_grpc.py depends on' + + f' grpcio>={GRPC_GENERATED_VERSION}.' + + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}' + + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.' + ) + class MetadataServiceStub(object): """Missing associated documentation comment in .proto file.""" @@ -20,62 +40,62 @@ def __init__(self, channel): '/dataclay.proto.metadata.MetadataService/NewAccount', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.NewAccountRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.GetAccount = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetAccount', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAccountRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAccountResponse.FromString, - ) + _registered_method=True) self.NewDataset = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/NewDataset', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.NewDatasetRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.GetAllBackends = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetAllBackends', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllBackendsRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllBackendsResponse.FromString, - ) + _registered_method=True) self.GetDataclay = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetDataclay', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetDataclayRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_common_dot_common__pb2.Dataclay.FromString, - ) + _registered_method=True) self.GetObjectMDById = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetObjectMDById', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetObjectMDByIdRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_common_dot_common__pb2.ObjectMetadata.FromString, - ) + _registered_method=True) self.GetObjectMDByAlias = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetObjectMDByAlias', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetObjectMDByAliasRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_common_dot_common__pb2.ObjectMetadata.FromString, - ) + _registered_method=True) self.GetAllObjects = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetAllObjects', request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllObjectsResponse.FromString, - ) + _registered_method=True) self.DeleteAlias = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/DeleteAlias', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.DeleteAliasRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.NewAlias = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/NewAlias', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.NewAliasRequest.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) self.GetAllAlias = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/GetAllAlias', request_serializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllAliasRequest.SerializeToString, response_deserializer=dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllAliasResponse.FromString, - ) + _registered_method=True) self.Stop = channel.unary_unary( '/dataclay.proto.metadata.MetadataService/Stop', request_serializer=google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, response_deserializer=google_dot_protobuf_dot_empty__pb2.Empty.FromString, - ) + _registered_method=True) class MetadataServiceServicer(object): @@ -226,6 +246,7 @@ def add_MetadataServiceServicer_to_server(servicer, server): generic_handler = grpc.method_handlers_generic_handler( 'dataclay.proto.metadata.MetadataService', rpc_method_handlers) server.add_generic_rpc_handlers((generic_handler,)) + server.add_registered_method_handlers('dataclay.proto.metadata.MetadataService', rpc_method_handlers) # This class is part of an EXPERIMENTAL API. @@ -243,11 +264,21 @@ def NewAccount(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/NewAccount', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/NewAccount', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.NewAccountRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetAccount(request, @@ -260,11 +291,21 @@ def GetAccount(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetAccount', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetAccount', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAccountRequest.SerializeToString, dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAccountResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def NewDataset(request, @@ -277,11 +318,21 @@ def NewDataset(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/NewDataset', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/NewDataset', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.NewDatasetRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetAllBackends(request, @@ -294,11 +345,21 @@ def GetAllBackends(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetAllBackends', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetAllBackends', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllBackendsRequest.SerializeToString, dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllBackendsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetDataclay(request, @@ -311,11 +372,21 @@ def GetDataclay(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetDataclay', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetDataclay', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetDataclayRequest.SerializeToString, dataclay_dot_proto_dot_common_dot_common__pb2.Dataclay.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetObjectMDById(request, @@ -328,11 +399,21 @@ def GetObjectMDById(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetObjectMDById', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetObjectMDById', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetObjectMDByIdRequest.SerializeToString, dataclay_dot_proto_dot_common_dot_common__pb2.ObjectMetadata.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetObjectMDByAlias(request, @@ -345,11 +426,21 @@ def GetObjectMDByAlias(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetObjectMDByAlias', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetObjectMDByAlias', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetObjectMDByAliasRequest.SerializeToString, dataclay_dot_proto_dot_common_dot_common__pb2.ObjectMetadata.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetAllObjects(request, @@ -362,11 +453,21 @@ def GetAllObjects(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetAllObjects', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetAllObjects', google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllObjectsResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def DeleteAlias(request, @@ -379,11 +480,21 @@ def DeleteAlias(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/DeleteAlias', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/DeleteAlias', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.DeleteAliasRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def NewAlias(request, @@ -396,11 +507,21 @@ def NewAlias(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/NewAlias', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/NewAlias', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.NewAliasRequest.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def GetAllAlias(request, @@ -413,11 +534,21 @@ def GetAllAlias(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/GetAllAlias', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/GetAllAlias', dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllAliasRequest.SerializeToString, dataclay_dot_proto_dot_metadata_dot_metadata__pb2.GetAllAliasResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) @staticmethod def Stop(request, @@ -430,8 +561,18 @@ def Stop(request, wait_for_ready=None, timeout=None, metadata=None): - return grpc.experimental.unary_unary(request, target, '/dataclay.proto.metadata.MetadataService/Stop', + return grpc.experimental.unary_unary( + request, + target, + '/dataclay.proto.metadata.MetadataService/Stop', google_dot_protobuf_dot_empty__pb2.Empty.SerializeToString, google_dot_protobuf_dot_empty__pb2.Empty.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) + options, + channel_credentials, + insecure, + call_credentials, + compression, + wait_for_ready, + timeout, + metadata, + _registered_method=True) From 3a55eac66ee0b2e05ed1501c22c74d79f64b1861 Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Mon, 16 Mar 2026 16:12:19 +0100 Subject: [PATCH 2/7] pyproject --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 00dcf93a..0675f980 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,5 +115,5 @@ include = ["src/dataclay", "src/storage", "dataclay-common", "compile_protos.py" [tool.hatch.version] path = "src/dataclay/__init__.py" -#[tool.hatch.build.hooks.custom] -#path = "compile_protos.py" +[tool.hatch.build.hooks.custom] +path = "compile_protos.py" From 7e85d3c26d02b5bd1a68fc572f5c3a0aad57824a Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Wed, 18 Mar 2026 12:02:18 +0100 Subject: [PATCH 3/7] pycompss_dummy parameters --- .../contrib/pycompss_dummy/parameter.py | 190 ++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 src/dataclay/contrib/pycompss_dummy/parameter.py diff --git a/src/dataclay/contrib/pycompss_dummy/parameter.py b/src/dataclay/contrib/pycompss_dummy/parameter.py new file mode 100644 index 00000000..7efe075c --- /dev/null +++ b/src/dataclay/contrib/pycompss_dummy/parameter.py @@ -0,0 +1,190 @@ +#!/usr/bin/env python3 +# +# Copyright 2002-2026 Barcelona Supercomputing Center (www.bsc.es) +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# -*- coding: utf-8 -*- + +""" +PyCOMPSs API - Parameter definitions. + +This file contains the classes needed for the parameter definition. +1. DIRECTION. + - IN + - OUT + - INOUT + - CONCURRENT + - COMMUTATIVE + - IN_DELETE +2. TYPE. + - FILE + - BOOLEAN + - STRING + - INT + - LONG + - FLOAT + - OBJECT + - COLLECTION + - DICTIONARY + - EXTERNAL_PSCO + - EXTERNAL_STREAM + - ... (check _DataType generated during installation) +3. IOSTREAM. + - STDIN + - STDOUT + - STDERR + - UNSPECIFIED +4. PREFIX. +5. ALIASES. +""" + +# Numbers match both C and Java enums +class SupportedDirections: # pylint: disable=too-few-public-methods + """Used as enum for direction types.""" + + IN = 0 + OUT = 1 + INOUT = 2 + CONCURRENT = 3 + COMMUTATIVE = 4 + IN_DELETE = 5 + + +# Numbers match both C and Java enums +class SupportedIoStreams: # pylint: disable=too-few-public-methods + """Used as enum for stream types.""" + + STDIN = 0 + STDOUT = 1 + STDERR = 2 + UNSPECIFIED = 3 + + +# String that identifies the prefix +class SupportedPrefixes: # pylint: disable=too-few-public-methods + """Used as enum for prefix.""" + + PREFIX = "null" # NOSONAR + +class SupportedFiles: # pylint: disable=too-few-public-methods + """Used as enum for prefix.""" + + FILE = None + FILE_IN = None + FILE_OUT = None + FILE_INOUT = None + FILE_CONCURRENT = None + FILE_COMMUTATIVE = None + +DIRECTION = SupportedDirections() +IOSTREAM = SupportedIoStreams() +PREFIX = SupportedPrefixes() +FILES = SupportedFiles() + + + + +# Aliases for objects (just direction) +IN = DIRECTION.IN +OUT = DIRECTION.OUT +INOUT = DIRECTION.INOUT +CONCURRENT = DIRECTION.CONCURRENT +COMMUTATIVE = DIRECTION.COMMUTATIVE +IN_DELETE = DIRECTION.IN_DELETE + +# Aliases for files with direction +FILE = FILES.FILE +FILE_IN = FILES.FILE_IN +FILE_OUT = FILES.FILE_OUT +FILE_INOUT = FILES.FILE_INOUT +FILE_CONCURRENT = FILES.FILE_CONCURRENT +FILE_COMMUTATIVE = FILES.FILE_COMMUTATIVE + +# Aliases for files with stream +FILE_STDIN = None +FILE_STDERR = None +FILE_STDOUT = None + +# Aliases for files with direction and stream +FILE_IN_STDIN = None +FILE_IN_STDERR = None +FILE_IN_STDOUT =None +FILE_OUT_STDIN = None +FILE_OUT_STDERR = None +FILE_OUT_STDOUT = None +FILE_INOUT_STDIN = None +FILE_INOUT_STDERR = None +FILE_INOUT_STDOUT = None +FILE_CONCURRENT_STDIN = None +FILE_CONCURRENT_STDERR = None +FILE_CONCURRENT_STDOUT = None +FILE_COMMUTATIVE_STDIN = None +FILE_COMMUTATIVE_STDERR = None +FILE_COMMUTATIVE_STDOUT = None +# Aliases for dirs +DIRECTORY = None +DIRECTORY_IN = None +DIRECTORY_OUT = None +DIRECTORY_INOUT = None + +# Aliases for collections +COLLECTION = None +COLLECTION_IN = None +COLLECTION_INOUT = None +COLLECTION_OUT = None +COLLECTION_IN_DELETE = None +COLLECTION_FILE = None +COLLECTION_FILE_IN = None +COLLECTION_FILE_INOUT = None +COLLECTION_FILE_OUT = None + +# Aliases for dictionary collections +DICTIONARY = None +DICTIONARY_IN = None +DICTIONARY_INOUT = None +DICTIONARY_OUT = None +DICTIONARY_IN_DELETE = None + +# Aliases for streams +STREAM_IN = None +STREAM_OUT = None + +# Aliases for std IO streams (just stream direction) +STDIN = IOSTREAM.STDIN +STDOUT = IOSTREAM.STDOUT +STDERR = IOSTREAM.STDERR + +# Aliases for parameter definition as dictionary +# - Parameter type +Type = None # pylint: disable=invalid-name +# - Parameter direction +Direction = None # pylint: disable=invalid-name +# - Parameter stream +StdIOStream = None # pylint: disable=invalid-name +# - Parameter prefix +Prefix = None # pylint: disable=invalid-name +# - Collection recursive depth +Depth = None # pylint: disable=invalid-name +# - Parameter weight +Weight = None # pylint: disable=invalid-name +# - Parameter keep rename property +Keep_rename = None # pylint: disable=invalid-name +# - Enable/disable store in cache +Cache = None # pylint: disable=invalid-name + +# Aliases for collection layout for native mpi tasks +block_count = None # pylint: disable=invalid-name +block_length = None # pylint: disable=invalid-name +stride = None # pylint: disable=invalid-name From f2ac707edcde079548dc3cce27f89c3249f9689f Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Fri, 20 Mar 2026 11:39:00 +0100 Subject: [PATCH 4/7] EventMaster --- src/dataclay/contrib/pycompss_dummy/eventMaster.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/dataclay/contrib/pycompss_dummy/eventMaster.py diff --git a/src/dataclay/contrib/pycompss_dummy/eventMaster.py b/src/dataclay/contrib/pycompss_dummy/eventMaster.py new file mode 100644 index 00000000..ee3a4cfc --- /dev/null +++ b/src/dataclay/contrib/pycompss_dummy/eventMaster.py @@ -0,0 +1,9 @@ +class EventMaster: + def __init__(self, *args, **kwargs): + pass + + def __enter__(self): + return self + + def __exit__(self, exc_type, exc, tb): + return False \ No newline at end of file From 62636af43a243df42b57246a44b61868dbbe9dcd Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Fri, 20 Mar 2026 13:34:53 +0100 Subject: [PATCH 5/7] ._decorator --- src/dataclay/contrib/pycompss_dummy/_decorator.py | 5 ++++- src/dataclay/contrib/pycompss_dummy/constraint.py | 2 +- src/dataclay/contrib/pycompss_dummy/container.py | 2 +- src/dataclay/contrib/pycompss_dummy/on_failure.py | 2 +- src/dataclay/contrib/pycompss_dummy/reduction.py | 2 +- src/dataclay/contrib/pycompss_dummy/task.py | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/dataclay/contrib/pycompss_dummy/_decorator.py b/src/dataclay/contrib/pycompss_dummy/_decorator.py index cd274db6..90be12f7 100644 --- a/src/dataclay/contrib/pycompss_dummy/_decorator.py +++ b/src/dataclay/contrib/pycompss_dummy/_decorator.py @@ -23,7 +23,10 @@ This file contains the dummy class task used as decorator. """ -from pycompss.util.typing_helper import typing +try: + from pycompss.util.typing_helper import typing +except ModuleNotFoundError: + import typing class _Dummy: diff --git a/src/dataclay/contrib/pycompss_dummy/constraint.py b/src/dataclay/contrib/pycompss_dummy/constraint.py index fbebb387..db273ec6 100644 --- a/src/dataclay/contrib/pycompss_dummy/constraint.py +++ b/src/dataclay/contrib/pycompss_dummy/constraint.py @@ -23,7 +23,7 @@ This file contains the dummy class constraint used as decorator. """ -from _decorator import _Dummy as Dummy +from ._decorator import _Dummy as Dummy Constraint = Dummy # pylint: disable=invalid-name constraint = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/container.py b/src/dataclay/contrib/pycompss_dummy/container.py index 14fafb87..6e6b565e 100644 --- a/src/dataclay/contrib/pycompss_dummy/container.py +++ b/src/dataclay/contrib/pycompss_dummy/container.py @@ -23,7 +23,7 @@ This file contains the dummy class container used as decorator. """ -from _decorator import _Dummy as Dummy +from ._decorator import _Dummy as Dummy Container = Dummy # pylint: disable=invalid-name container = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/on_failure.py b/src/dataclay/contrib/pycompss_dummy/on_failure.py index d067e667..0938067f 100644 --- a/src/dataclay/contrib/pycompss_dummy/on_failure.py +++ b/src/dataclay/contrib/pycompss_dummy/on_failure.py @@ -23,7 +23,7 @@ This file contains the dummy class on failure used as decorator. """ -from _decorator import _Dummy as Dummy +from ._decorator import _Dummy as Dummy OnFailure = Dummy # pylint: disable=invalid-name on_failure = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/reduction.py b/src/dataclay/contrib/pycompss_dummy/reduction.py index a377bcef..4542f4d4 100644 --- a/src/dataclay/contrib/pycompss_dummy/reduction.py +++ b/src/dataclay/contrib/pycompss_dummy/reduction.py @@ -23,7 +23,7 @@ This file contains the dummy class reduction used as decorator. """ -from _decorator import _Dummy as Dummy +from ._decorator import _Dummy as Dummy Reduction = Dummy # pylint: disable=invalid-name reduction = Dummy # pylint: disable=invalid-name diff --git a/src/dataclay/contrib/pycompss_dummy/task.py b/src/dataclay/contrib/pycompss_dummy/task.py index c4a108ef..a5b6f9ed 100644 --- a/src/dataclay/contrib/pycompss_dummy/task.py +++ b/src/dataclay/contrib/pycompss_dummy/task.py @@ -23,7 +23,7 @@ This file contains the dummy class task used as decorator. """ -from _decorator import _Dummy as Dummy +from ._decorator import _Dummy as Dummy Task = Dummy # pylint: disable=invalid-name task = Dummy # pylint: disable=invalid-name From 683087af63a6b647b0ac93d23972890e95cddefb Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Wed, 3 Jun 2026 10:16:17 +0200 Subject: [PATCH 6/7] comment compile.protos.py --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0675f980..00dcf93a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -115,5 +115,5 @@ include = ["src/dataclay", "src/storage", "dataclay-common", "compile_protos.py" [tool.hatch.version] path = "src/dataclay/__init__.py" -[tool.hatch.build.hooks.custom] -path = "compile_protos.py" +#[tool.hatch.build.hooks.custom] +#path = "compile_protos.py" From aeee80854d2c2b5367aff5eed8e47f6adb230ff4 Mon Sep 17 00:00:00 2001 From: Canicula98 Date: Mon, 13 Jul 2026 17:51:54 +0200 Subject: [PATCH 7/7] block_apply func --- src/dataclay/contrib/persistent_block.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dataclay/contrib/persistent_block.py b/src/dataclay/contrib/persistent_block.py index ea482d34..a87ebdc6 100644 --- a/src/dataclay/contrib/persistent_block.py +++ b/src/dataclay/contrib/persistent_block.py @@ -76,3 +76,7 @@ def partial_sum(self, centers: np.ndarray) -> np.ndarray: def partial_histogram(self, n_bins: int, n_dimensions: int) -> np.ndarray: values, _ = np.histogramdd(self.block_data, n_bins, [(0, 1)] * n_dimensions) return values + + @activemethod + def block_apply(self, func, *args, **kwargs): + return func(self.block_data, *args, **kwargs) \ No newline at end of file