From 3dc383d5fec4300e5f740b0a5defa9b276c8b7f8 Mon Sep 17 00:00:00 2001 From: mihran113 Date: Wed, 11 Jan 2023 18:10:25 +0400 Subject: [PATCH 1/2] Enable support for protobuf>=4.0.0 --- .../upgrade/_legacy_repo/proto/base_pb2.py | 101 ++---------------- .../upgrade/_legacy_repo/proto/metric_pb2.py | 73 ++----------- .../upgrade/_legacy_repo/proto/v3/__init__.py | 0 .../upgrade/_legacy_repo/proto/v3/base_pb2.py | 97 +++++++++++++++++ .../_legacy_repo/proto/v3/metric_pb2.py | 69 ++++++++++++ .../upgrade/_legacy_repo/proto/v4/__init__.py | 0 .../upgrade/_legacy_repo/proto/v4/base_pb2.py | 25 +++++ .../_legacy_repo/proto/v4/metric_pb2.py | 25 +++++ aim/ext/transport/client.py | 8 +- aim/ext/transport/health.py | 4 +- aim/ext/transport/heartbeat.py | 2 +- aim/ext/transport/message_utils.py | 2 +- aim/ext/transport/proto/__init__.py | 0 aim/ext/transport/proto/health_pb2.py | 8 ++ .../transport/{ => proto}/health_pb2_grpc.py | 2 +- aim/ext/transport/proto/remote_router_pb2.py | 8 ++ .../{ => proto}/remote_router_pb2_grpc.py | 2 +- .../transport/proto/remote_tracking_pb2.py | 8 ++ .../{ => proto}/remote_tracking_pb2_grpc.py | 2 +- aim/ext/transport/proto/v3/__init__.py | 0 .../transport/{ => proto/v3}/health_pb2.py | 0 .../{ => proto/v3}/remote_router_pb2.py | 2 +- .../{ => proto/v3}/remote_tracking_pb2.py | 0 aim/ext/transport/proto/v4/__init__.py | 0 aim/ext/transport/proto/v4/health_pb2.py | 31 ++++++ .../transport/proto/v4/remote_router_pb2.py | 52 +++++++++ .../transport/proto/v4/remote_tracking_pb2.py | 61 +++++++++++ aim/ext/transport/remote_tracking.py | 4 +- aim/ext/transport/router.py | 4 +- aim/ext/transport/worker.py | 4 +- setup.py | 6 +- 31 files changed, 415 insertions(+), 185 deletions(-) create mode 100644 aim/cli/upgrade/_legacy_repo/proto/v3/__init__.py create mode 100644 aim/cli/upgrade/_legacy_repo/proto/v3/base_pb2.py create mode 100644 aim/cli/upgrade/_legacy_repo/proto/v3/metric_pb2.py create mode 100644 aim/cli/upgrade/_legacy_repo/proto/v4/__init__.py create mode 100644 aim/cli/upgrade/_legacy_repo/proto/v4/base_pb2.py create mode 100644 aim/cli/upgrade/_legacy_repo/proto/v4/metric_pb2.py create mode 100644 aim/ext/transport/proto/__init__.py create mode 100644 aim/ext/transport/proto/health_pb2.py rename aim/ext/transport/{ => proto}/health_pb2_grpc.py (98%) create mode 100644 aim/ext/transport/proto/remote_router_pb2.py rename aim/ext/transport/{ => proto}/remote_router_pb2_grpc.py (99%) create mode 100644 aim/ext/transport/proto/remote_tracking_pb2.py rename aim/ext/transport/{ => proto}/remote_tracking_pb2_grpc.py (99%) create mode 100644 aim/ext/transport/proto/v3/__init__.py rename aim/ext/transport/{ => proto/v3}/health_pb2.py (100%) rename aim/ext/transport/{ => proto/v3}/remote_router_pb2.py (99%) rename aim/ext/transport/{ => proto/v3}/remote_tracking_pb2.py (100%) create mode 100644 aim/ext/transport/proto/v4/__init__.py create mode 100644 aim/ext/transport/proto/v4/health_pb2.py create mode 100644 aim/ext/transport/proto/v4/remote_router_pb2.py create mode 100644 aim/ext/transport/proto/v4/remote_tracking_pb2.py diff --git a/aim/cli/upgrade/_legacy_repo/proto/base_pb2.py b/aim/cli/upgrade/_legacy_repo/proto/base_pb2.py index 650f8fc00a..052d2dc001 100644 --- a/aim/cli/upgrade/_legacy_repo/proto/base_pb2.py +++ b/aim/cli/upgrade/_legacy_repo/proto/base_pb2.py @@ -1,97 +1,8 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: base.proto +import google.protobuf -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) +protobuf_version = google.protobuf.__version__[0] -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='base.proto', - package='artifacts.proto', - syntax='proto3', - serialized_pb=_b('\n\nbase.proto\x12\x0f\x61rtifacts.proto\"a\n\nBaseRecord\x12\x0c\n\x04step\x18\x01 \x01(\x05\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x10\n\x08\x61rtifact\x18\x03 \x01(\x0c\x12\r\n\x05\x65poch\x18\x04 \x01(\x05\x12\x11\n\thas_epoch\x18\x05 \x01(\x08\x62\x06proto3') -) - - - - -_BASERECORD = _descriptor.Descriptor( - name='BaseRecord', - full_name='artifacts.proto.BaseRecord', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='step', full_name='artifacts.proto.BaseRecord.step', index=0, - number=1, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='timestamp', full_name='artifacts.proto.BaseRecord.timestamp', index=1, - number=2, type=3, cpp_type=2, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='artifact', full_name='artifacts.proto.BaseRecord.artifact', index=2, - number=3, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=_b(""), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='epoch', full_name='artifacts.proto.BaseRecord.epoch', index=3, - number=4, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='has_epoch', full_name='artifacts.proto.BaseRecord.has_epoch', index=4, - number=5, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=31, - serialized_end=128, -) - -DESCRIPTOR.message_types_by_name['BaseRecord'] = _BASERECORD -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -BaseRecord = _reflection.GeneratedProtocolMessageType('BaseRecord', (_message.Message,), dict( - DESCRIPTOR = _BASERECORD, - __module__ = 'base_pb2' - # @@protoc_insertion_point(class_scope:artifacts.proto.BaseRecord) - )) -_sym_db.RegisterMessage(BaseRecord) - - -# @@protoc_insertion_point(module_scope) +if protobuf_version == "3": + from aim.cli.upgrade._legacy_repo.proto.v3.base_pb2 import * +elif protobuf_version == "4": + from aim.cli.upgrade._legacy_repo.proto.v4.base_pb2 import * diff --git a/aim/cli/upgrade/_legacy_repo/proto/metric_pb2.py b/aim/cli/upgrade/_legacy_repo/proto/metric_pb2.py index d017193b85..867ccb42a1 100644 --- a/aim/cli/upgrade/_legacy_repo/proto/metric_pb2.py +++ b/aim/cli/upgrade/_legacy_repo/proto/metric_pb2.py @@ -1,69 +1,8 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: metric.proto +import google.protobuf -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) +protobuf_version = google.protobuf.__version__[0] -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='metric.proto', - package='artifacts.proto', - syntax='proto3', - serialized_pb=_b('\n\x0cmetric.proto\x12\x0f\x61rtifacts.proto\"\x1d\n\x0cMetricRecord\x12\r\n\x05value\x18\x01 \x01(\x01\x62\x06proto3') -) - - - - -_METRICRECORD = _descriptor.Descriptor( - name='MetricRecord', - full_name='artifacts.proto.MetricRecord', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='value', full_name='artifacts.proto.MetricRecord.value', index=0, - number=1, type=1, cpp_type=5, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=33, - serialized_end=62, -) - -DESCRIPTOR.message_types_by_name['MetricRecord'] = _METRICRECORD -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -MetricRecord = _reflection.GeneratedProtocolMessageType('MetricRecord', (_message.Message,), dict( - DESCRIPTOR = _METRICRECORD, - __module__ = 'metric_pb2' - # @@protoc_insertion_point(class_scope:artifacts.proto.MetricRecord) - )) -_sym_db.RegisterMessage(MetricRecord) - - -# @@protoc_insertion_point(module_scope) +if protobuf_version == "3": + from aim.cli.upgrade._legacy_repo.proto.v3.metric_pb2 import * +elif protobuf_version == "4": + from aim.cli.upgrade._legacy_repo.proto.v4.metric_pb2 import * diff --git a/aim/cli/upgrade/_legacy_repo/proto/v3/__init__.py b/aim/cli/upgrade/_legacy_repo/proto/v3/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/aim/cli/upgrade/_legacy_repo/proto/v3/base_pb2.py b/aim/cli/upgrade/_legacy_repo/proto/v3/base_pb2.py new file mode 100644 index 0000000000..650f8fc00a --- /dev/null +++ b/aim/cli/upgrade/_legacy_repo/proto/v3/base_pb2.py @@ -0,0 +1,97 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: base.proto + +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor.FileDescriptor( + name='base.proto', + package='artifacts.proto', + syntax='proto3', + serialized_pb=_b('\n\nbase.proto\x12\x0f\x61rtifacts.proto\"a\n\nBaseRecord\x12\x0c\n\x04step\x18\x01 \x01(\x05\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x10\n\x08\x61rtifact\x18\x03 \x01(\x0c\x12\r\n\x05\x65poch\x18\x04 \x01(\x05\x12\x11\n\thas_epoch\x18\x05 \x01(\x08\x62\x06proto3') +) + + + + +_BASERECORD = _descriptor.Descriptor( + name='BaseRecord', + full_name='artifacts.proto.BaseRecord', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='step', full_name='artifacts.proto.BaseRecord.step', index=0, + number=1, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='timestamp', full_name='artifacts.proto.BaseRecord.timestamp', index=1, + number=2, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='artifact', full_name='artifacts.proto.BaseRecord.artifact', index=2, + number=3, type=12, cpp_type=9, label=1, + has_default_value=False, default_value=_b(""), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='epoch', full_name='artifacts.proto.BaseRecord.epoch', index=3, + number=4, type=5, cpp_type=1, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + _descriptor.FieldDescriptor( + name='has_epoch', full_name='artifacts.proto.BaseRecord.has_epoch', index=4, + number=5, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=31, + serialized_end=128, +) + +DESCRIPTOR.message_types_by_name['BaseRecord'] = _BASERECORD +_sym_db.RegisterFileDescriptor(DESCRIPTOR) + +BaseRecord = _reflection.GeneratedProtocolMessageType('BaseRecord', (_message.Message,), dict( + DESCRIPTOR = _BASERECORD, + __module__ = 'base_pb2' + # @@protoc_insertion_point(class_scope:artifacts.proto.BaseRecord) + )) +_sym_db.RegisterMessage(BaseRecord) + + +# @@protoc_insertion_point(module_scope) diff --git a/aim/cli/upgrade/_legacy_repo/proto/v3/metric_pb2.py b/aim/cli/upgrade/_legacy_repo/proto/v3/metric_pb2.py new file mode 100644 index 0000000000..d017193b85 --- /dev/null +++ b/aim/cli/upgrade/_legacy_repo/proto/v3/metric_pb2.py @@ -0,0 +1,69 @@ +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: metric.proto + +import sys +_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +from google.protobuf import descriptor as _descriptor +from google.protobuf import message as _message +from google.protobuf import reflection as _reflection +from google.protobuf import symbol_database as _symbol_database +from google.protobuf import descriptor_pb2 +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor.FileDescriptor( + name='metric.proto', + package='artifacts.proto', + syntax='proto3', + serialized_pb=_b('\n\x0cmetric.proto\x12\x0f\x61rtifacts.proto\"\x1d\n\x0cMetricRecord\x12\r\n\x05value\x18\x01 \x01(\x01\x62\x06proto3') +) + + + + +_METRICRECORD = _descriptor.Descriptor( + name='MetricRecord', + full_name='artifacts.proto.MetricRecord', + filename=None, + file=DESCRIPTOR, + containing_type=None, + fields=[ + _descriptor.FieldDescriptor( + name='value', full_name='artifacts.proto.MetricRecord.value', index=0, + number=1, type=1, cpp_type=5, label=1, + has_default_value=False, default_value=float(0), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + options=None), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=33, + serialized_end=62, +) + +DESCRIPTOR.message_types_by_name['MetricRecord'] = _METRICRECORD +_sym_db.RegisterFileDescriptor(DESCRIPTOR) + +MetricRecord = _reflection.GeneratedProtocolMessageType('MetricRecord', (_message.Message,), dict( + DESCRIPTOR = _METRICRECORD, + __module__ = 'metric_pb2' + # @@protoc_insertion_point(class_scope:artifacts.proto.MetricRecord) + )) +_sym_db.RegisterMessage(MetricRecord) + + +# @@protoc_insertion_point(module_scope) diff --git a/aim/cli/upgrade/_legacy_repo/proto/v4/__init__.py b/aim/cli/upgrade/_legacy_repo/proto/v4/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/aim/cli/upgrade/_legacy_repo/proto/v4/base_pb2.py b/aim/cli/upgrade/_legacy_repo/proto/v4/base_pb2.py new file mode 100644 index 0000000000..7b31ecc34d --- /dev/null +++ b/aim/cli/upgrade/_legacy_repo/proto/v4/base_pb2.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: base.proto +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\nbase.proto\x12\x0f\x61rtifacts.proto\"a\n\nBaseRecord\x12\x0c\n\x04step\x18\x01 \x01(\x05\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x10\n\x08\x61rtifact\x18\x03 \x01(\x0c\x12\r\n\x05\x65poch\x18\x04 \x01(\x05\x12\x11\n\thas_epoch\x18\x05 \x01(\x08\x62\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'base_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + _BASERECORD._serialized_start=31 + _BASERECORD._serialized_end=128 +# @@protoc_insertion_point(module_scope) diff --git a/aim/cli/upgrade/_legacy_repo/proto/v4/metric_pb2.py b/aim/cli/upgrade/_legacy_repo/proto/v4/metric_pb2.py new file mode 100644 index 0000000000..e29918f663 --- /dev/null +++ b/aim/cli/upgrade/_legacy_repo/proto/v4/metric_pb2.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: metric.proto +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cmetric.proto\x12\x0f\x61rtifacts.proto\"\x1d\n\x0cMetricRecord\x12\r\n\x05value\x18\x01 \x01(\x01\x62\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'metric_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + _METRICRECORD._serialized_start=33 + _METRICRECORD._serialized_end=62 +# @@protoc_insertion_point(module_scope) diff --git a/aim/ext/transport/client.py b/aim/ext/transport/client.py index 017f23a042..36dd4c95a7 100644 --- a/aim/ext/transport/client.py +++ b/aim/ext/transport/client.py @@ -7,10 +7,10 @@ from copy import deepcopy from typing import Tuple -import aim.ext.transport.remote_tracking_pb2 as rpc_messages -import aim.ext.transport.remote_router_pb2 as router_messages -import aim.ext.transport.remote_tracking_pb2_grpc as remote_tracking_pb2_grpc -import aim.ext.transport.remote_router_pb2_grpc as remote_router_pb2_grpc +import aim.ext.transport.proto.remote_tracking_pb2 as rpc_messages +import aim.ext.transport.proto.remote_router_pb2 as router_messages +import aim.ext.transport.proto.remote_tracking_pb2_grpc as remote_tracking_pb2_grpc +import aim.ext.transport.proto.remote_router_pb2_grpc as remote_router_pb2_grpc from aim.ext.transport.message_utils import pack_stream, unpack_stream, raise_exception from aim.ext.transport.rpc_queue import RpcQueueWithRetry diff --git a/aim/ext/transport/health.py b/aim/ext/transport/health.py index d38251dde0..a9eeb5c26a 100644 --- a/aim/ext/transport/health.py +++ b/aim/ext/transport/health.py @@ -5,8 +5,8 @@ import collections import threading -from aim.ext.transport import health_pb2 as health_pb2 -from aim.ext.transport import health_pb2_grpc as health_pb2_grpc +from aim.ext.transport.proto import health_pb2 as health_pb2 +from aim.ext.transport.proto import health_pb2_grpc as health_pb2_grpc # The service name of the health checking servicer. diff --git a/aim/ext/transport/heartbeat.py b/aim/ext/transport/heartbeat.py index db85191db6..d0fc3fb930 100644 --- a/aim/ext/transport/heartbeat.py +++ b/aim/ext/transport/heartbeat.py @@ -7,7 +7,7 @@ from threading import Thread from typing import Union -import aim.ext.transport.remote_router_pb2 as rpc_messages +import aim.ext.transport.proto.remote_router_pb2 as rpc_messages logger = logging.getLogger(__name__) diff --git a/aim/ext/transport/message_utils.py b/aim/ext/transport/message_utils.py index 66112e1e61..1664413c68 100644 --- a/aim/ext/transport/message_utils.py +++ b/aim/ext/transport/message_utils.py @@ -3,7 +3,7 @@ import json from typing import Iterator, Tuple, Union -import aim.ext.transport.remote_tracking_pb2 as rpc_messages +import aim.ext.transport.proto.remote_tracking_pb2 as rpc_messages from aim.storage.object import CustomObject from aim.storage.types import BLOB diff --git a/aim/ext/transport/proto/__init__.py b/aim/ext/transport/proto/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/aim/ext/transport/proto/health_pb2.py b/aim/ext/transport/proto/health_pb2.py new file mode 100644 index 0000000000..faeb0102fc --- /dev/null +++ b/aim/ext/transport/proto/health_pb2.py @@ -0,0 +1,8 @@ +import google.protobuf + +protobuf_version = google.protobuf.__version__[0] + +if protobuf_version == "3": + from aim.ext.transport.proto.v3.health_pb2 import * +elif protobuf_version == "4": + from aim.ext.transport.proto.v4.health_pb2 import * diff --git a/aim/ext/transport/health_pb2_grpc.py b/aim/ext/transport/proto/health_pb2_grpc.py similarity index 98% rename from aim/ext/transport/health_pb2_grpc.py rename to aim/ext/transport/proto/health_pb2_grpc.py index 391b9e70a6..63ebb795be 100644 --- a/aim/ext/transport/health_pb2_grpc.py +++ b/aim/ext/transport/proto/health_pb2_grpc.py @@ -6,7 +6,7 @@ except ImportError: grpc = None -import aim.ext.transport.health_pb2 as health__pb2 +import aim.ext.transport.proto.health_pb2 as health__pb2 class HealthStub(object): diff --git a/aim/ext/transport/proto/remote_router_pb2.py b/aim/ext/transport/proto/remote_router_pb2.py new file mode 100644 index 0000000000..6d1f958055 --- /dev/null +++ b/aim/ext/transport/proto/remote_router_pb2.py @@ -0,0 +1,8 @@ +import google.protobuf + +protobuf_version = google.protobuf.__version__[0] + +if protobuf_version == "3": + from aim.ext.transport.proto.v3.remote_router_pb2 import * +elif protobuf_version == "4": + from aim.ext.transport.proto.v4.remote_router_pb2 import * diff --git a/aim/ext/transport/remote_router_pb2_grpc.py b/aim/ext/transport/proto/remote_router_pb2_grpc.py similarity index 99% rename from aim/ext/transport/remote_router_pb2_grpc.py rename to aim/ext/transport/proto/remote_router_pb2_grpc.py index eccb80f067..8ba0f32788 100644 --- a/aim/ext/transport/remote_router_pb2_grpc.py +++ b/aim/ext/transport/proto/remote_router_pb2_grpc.py @@ -6,7 +6,7 @@ except ImportError: grpc = None -import aim.ext.transport.remote_router_pb2 as remote__router__pb2 +import aim.ext.transport.proto.remote_router_pb2 as remote__router__pb2 class RemoteRouterServiceStub(object): diff --git a/aim/ext/transport/proto/remote_tracking_pb2.py b/aim/ext/transport/proto/remote_tracking_pb2.py new file mode 100644 index 0000000000..3feaafe7c4 --- /dev/null +++ b/aim/ext/transport/proto/remote_tracking_pb2.py @@ -0,0 +1,8 @@ +import google.protobuf + +protobuf_version = google.protobuf.__version__[0] + +if protobuf_version == "3": + from aim.ext.transport.proto.v3.remote_tracking_pb2 import * +elif protobuf_version == "4": + from aim.ext.transport.proto.v4.remote_tracking_pb2 import * diff --git a/aim/ext/transport/remote_tracking_pb2_grpc.py b/aim/ext/transport/proto/remote_tracking_pb2_grpc.py similarity index 99% rename from aim/ext/transport/remote_tracking_pb2_grpc.py rename to aim/ext/transport/proto/remote_tracking_pb2_grpc.py index 80479a9d43..1d227a45ba 100644 --- a/aim/ext/transport/remote_tracking_pb2_grpc.py +++ b/aim/ext/transport/proto/remote_tracking_pb2_grpc.py @@ -6,7 +6,7 @@ except ImportError: grpc = None -import aim.ext.transport.remote_tracking_pb2 as remote__tracking__pb2 +import aim.ext.transport.proto.remote_tracking_pb2 as remote__tracking__pb2 class RemoteTrackingServiceStub(object): diff --git a/aim/ext/transport/proto/v3/__init__.py b/aim/ext/transport/proto/v3/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/aim/ext/transport/health_pb2.py b/aim/ext/transport/proto/v3/health_pb2.py similarity index 100% rename from aim/ext/transport/health_pb2.py rename to aim/ext/transport/proto/v3/health_pb2.py diff --git a/aim/ext/transport/remote_router_pb2.py b/aim/ext/transport/proto/v3/remote_router_pb2.py similarity index 99% rename from aim/ext/transport/remote_router_pb2.py rename to aim/ext/transport/proto/v3/remote_router_pb2.py index 73128e8e00..1f1db2e88a 100644 --- a/aim/ext/transport/remote_router_pb2.py +++ b/aim/ext/transport/proto/v3/remote_router_pb2.py @@ -11,7 +11,7 @@ _sym_db = _symbol_database.Default() -import aim.ext.transport.remote_tracking_pb2 as remote__tracking__pb2 +import aim.ext.transport.proto.v3.remote_tracking_pb2 as remote__tracking__pb2 DESCRIPTOR = _descriptor.FileDescriptor( diff --git a/aim/ext/transport/remote_tracking_pb2.py b/aim/ext/transport/proto/v3/remote_tracking_pb2.py similarity index 100% rename from aim/ext/transport/remote_tracking_pb2.py rename to aim/ext/transport/proto/v3/remote_tracking_pb2.py diff --git a/aim/ext/transport/proto/v4/__init__.py b/aim/ext/transport/proto/v4/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/aim/ext/transport/proto/v4/health_pb2.py b/aim/ext/transport/proto/v4/health_pb2.py new file mode 100644 index 0000000000..fe0b2adf7d --- /dev/null +++ b/aim/ext/transport/proto/v4/health_pb2.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: health.proto +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0chealth.proto\x12\x0egrpc.health.v1\"%\n\x12HealthCheckRequest\x12\x0f\n\x07service\x18\x01 \x01(\t\"\xa9\x01\n\x13HealthCheckResponse\x12\x41\n\x06status\x18\x01 \x01(\x0e\x32\x31.grpc.health.v1.HealthCheckResponse.ServingStatus\"O\n\rServingStatus\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07SERVING\x10\x01\x12\x0f\n\x0bNOT_SERVING\x10\x02\x12\x13\n\x0fSERVICE_UNKNOWN\x10\x03\x32\xae\x01\n\x06Health\x12P\n\x05\x43heck\x12\".grpc.health.v1.HealthCheckRequest\x1a#.grpc.health.v1.HealthCheckResponse\x12R\n\x05Watch\x12\".grpc.health.v1.HealthCheckRequest\x1a#.grpc.health.v1.HealthCheckResponse0\x01\x62\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'health_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + _HEALTHCHECKREQUEST._serialized_start=32 + _HEALTHCHECKREQUEST._serialized_end=69 + _HEALTHCHECKRESPONSE._serialized_start=72 + _HEALTHCHECKRESPONSE._serialized_end=241 + _HEALTHCHECKRESPONSE_SERVINGSTATUS._serialized_start=162 + _HEALTHCHECKRESPONSE_SERVINGSTATUS._serialized_end=241 + _HEALTH._serialized_start=244 + _HEALTH._serialized_end=418 +# @@protoc_insertion_point(module_scope) diff --git a/aim/ext/transport/proto/v4/remote_router_pb2.py b/aim/ext/transport/proto/v4/remote_router_pb2.py new file mode 100644 index 0000000000..bf5dd2f44e --- /dev/null +++ b/aim/ext/transport/proto/v4/remote_router_pb2.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: remote_router.proto +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13remote_router.proto\x1a\x15remote_tracking.proto\"\x10\n\x0eVersionRequest\"\x8f\x01\n\x0fVersionResponse\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\'\n\x06status\x18\x02 \x01(\x0e\x32\x17.VersionResponse.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"&\n\x10HeartbeatRequest\x12\x12\n\nclient_uri\x18\x01 \x01(\t\"\x82\x01\n\x11HeartbeatResponse\x12)\n\x06status\x18\x01 \x01(\x0e\x32\x19.HeartbeatResponse.Status\x12%\n\texception\x18\x02 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"$\n\x0e\x43onnectRequest\x12\x12\n\nclient_uri\x18\x01 \x01(\t\"\xa2\x01\n\x0f\x43onnectResponse\x12\x0c\n\x04port\x18\x01 \x01(\t\x12\x14\n\x0cworker_index\x18\x02 \x01(\t\x12\'\n\x06status\x18\x03 \x01(\x0e\x32\x17.ConnectResponse.Status\x12%\n\texception\x18\x04 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"&\n\x10ReconnectRequest\x12\x12\n\nclient_uri\x18\x01 \x01(\t\"\x90\x01\n\x11ReconnectResponse\x12\x0c\n\x04port\x18\x01 \x01(\t\x12)\n\x06status\x18\x02 \x01(\x0e\x32\x19.ReconnectResponse.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"\'\n\x11\x44isconnectRequest\x12\x12\n\nclient_uri\x18\x01 \x01(\t\"\x84\x01\n\x12\x44isconnectResponse\x12*\n\x06status\x18\x01 \x01(\x0e\x32\x1a.DisconnectResponse.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\x32\xa5\x02\n\x13RemoteRouterService\x12;\n\x10\x63lient_heartbeat\x12\x11.HeartbeatRequest\x1a\x12.HeartbeatResponse\"\x00\x12\x32\n\x0bget_version\x12\x0f.VersionRequest\x1a\x10.VersionResponse\"\x00\x12.\n\x07\x63onnect\x12\x0f.ConnectRequest\x1a\x10.ConnectResponse\"\x00\x12\x34\n\treconnect\x12\x11.ReconnectRequest\x1a\x12.ReconnectResponse\"\x00\x12\x37\n\ndisconnect\x12\x12.DisconnectRequest\x1a\x13.DisconnectResponse\"\x00\x62\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'remote_router_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + _VERSIONREQUEST._serialized_start=46 + _VERSIONREQUEST._serialized_end=62 + _VERSIONRESPONSE._serialized_start=65 + _VERSIONRESPONSE._serialized_end=208 + _VERSIONRESPONSE_STATUS._serialized_start=181 + _VERSIONRESPONSE_STATUS._serialized_end=208 + _HEARTBEATREQUEST._serialized_start=210 + _HEARTBEATREQUEST._serialized_end=248 + _HEARTBEATRESPONSE._serialized_start=251 + _HEARTBEATRESPONSE._serialized_end=381 + _HEARTBEATRESPONSE_STATUS._serialized_start=181 + _HEARTBEATRESPONSE_STATUS._serialized_end=208 + _CONNECTREQUEST._serialized_start=383 + _CONNECTREQUEST._serialized_end=419 + _CONNECTRESPONSE._serialized_start=422 + _CONNECTRESPONSE._serialized_end=584 + _CONNECTRESPONSE_STATUS._serialized_start=181 + _CONNECTRESPONSE_STATUS._serialized_end=208 + _RECONNECTREQUEST._serialized_start=586 + _RECONNECTREQUEST._serialized_end=624 + _RECONNECTRESPONSE._serialized_start=627 + _RECONNECTRESPONSE._serialized_end=771 + _RECONNECTRESPONSE_STATUS._serialized_start=181 + _RECONNECTRESPONSE_STATUS._serialized_end=208 + _DISCONNECTREQUEST._serialized_start=773 + _DISCONNECTREQUEST._serialized_end=812 + _DISCONNECTRESPONSE._serialized_start=815 + _DISCONNECTRESPONSE._serialized_end=947 + _DISCONNECTRESPONSE_STATUS._serialized_start=181 + _DISCONNECTRESPONSE_STATUS._serialized_end=208 + _REMOTEROUTERSERVICE._serialized_start=950 + _REMOTEROUTERSERVICE._serialized_end=1243 +# @@protoc_insertion_point(module_scope) diff --git a/aim/ext/transport/proto/v4/remote_tracking_pb2.py b/aim/ext/transport/proto/v4/remote_tracking_pb2.py new file mode 100644 index 0000000000..cd1fd45e91 --- /dev/null +++ b/aim/ext/transport/proto/v4/remote_tracking_pb2.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# Generated by the protocol buffer compiler. DO NOT EDIT! +# source: remote_tracking.proto +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder +from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool +from google.protobuf import symbol_database as _symbol_database +# @@protoc_insertion_point(imports) + +_sym_db = _symbol_database.Default() + + + + +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15remote_tracking.proto\"J\n\x11\x45xceptionResponse\x12\x13\n\x0bmodule_name\x18\x01 \x01(\t\x12\x12\n\nclass_name\x18\x02 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x03 \x01(\t\"2\n\x1c\x43lientResourceCleanupRequest\x12\x12\n\nclient_uri\x18\x01 \x01(\t\"\x9a\x01\n\x1d\x43lientResourceCleanupResponse\x12\x35\n\x06status\x18\x01 \x01(\x0e\x32%.ClientResourceCleanupResponse.Status\x12%\n\texception\x18\x02 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"[\n\x0fResourceRequest\x12\x15\n\rresource_type\x18\x01 \x01(\t\x12\x0f\n\x07handler\x18\x02 \x01(\t\x12\x12\n\nclient_uri\x18\x03 \x01(\t\x12\x0c\n\x04\x61rgs\x18\x04 \x01(\x0c\"\x91\x01\n\x10ResourceResponse\x12\x0f\n\x07handler\x18\x01 \x01(\t\x12(\n\x06status\x18\x02 \x01(\x0e\x32\x18.ResourceResponse.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"=\n\x16ReleaseResourceRequest\x12\x0f\n\x07handler\x18\x01 \x01(\t\x12\x12\n\nclient_uri\x18\x02 \x01(\t\"\x8e\x01\n\x17ReleaseResourceResponse\x12/\n\x06status\x18\x02 \x01(\x0e\x32\x1f.ReleaseResourceResponse.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"Z\n\rRequestHeader\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x0f\n\x07handler\x18\x02 \x01(\t\x12\x12\n\nclient_uri\x18\x03 \x01(\t\x12\x13\n\x0bmethod_name\x18\x04 \x01(\t\"X\n\x12InstructionRequest\x12 \n\x06header\x18\x01 \x01(\x0b\x32\x0e.RequestHeaderH\x00\x12\x11\n\x07message\x18\x02 \x01(\x0cH\x00\x42\r\n\x0binstruction\"\x8d\x01\n\x0eResponseHeader\x12\x0f\n\x07version\x18\x01 \x01(\t\x12&\n\x06status\x18\x02 \x01(\x0e\x32\x16.ResponseHeader.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\"Z\n\x13InstructionResponse\x12!\n\x06header\x18\x01 \x01(\x0b\x32\x0f.ResponseHeaderH\x00\x12\x11\n\x07message\x18\x02 \x01(\x0cH\x00\x42\r\n\x0binstruction\"P\n\x18WriteInstructionsRequest\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x12\n\nclient_uri\x18\x02 \x01(\t\x12\x0f\n\x07message\x18\x03 \x01(\x0c\"\xa3\x01\n\x19WriteInstructionsResponse\x12\x0f\n\x07version\x18\x01 \x01(\t\x12\x31\n\x06status\x18\x02 \x01(\x0e\x32!.WriteInstructionsResponse.Status\x12%\n\texception\x18\x03 \x01(\x0b\x32\x12.ExceptionResponse\"\x1b\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\t\n\x05\x45RROR\x10\x01\x32\x8d\x03\n\x15RemoteTrackingService\x12[\n\x18\x63leanup_client_resources\x12\x1d.ClientResourceCleanupRequest\x1a\x1e.ClientResourceCleanupResponse\"\x00\x12\x35\n\x0cget_resource\x12\x10.ResourceRequest\x1a\x11.ResourceResponse\"\x00\x12G\n\x10release_resource\x12\x17.ReleaseResourceRequest\x1a\x18.ReleaseResourceResponse\"\x00\x12\x42\n\x0frun_instruction\x12\x13.InstructionRequest\x1a\x14.InstructionResponse\"\x00(\x01\x30\x01\x12S\n\x16run_write_instructions\x12\x19.WriteInstructionsRequest\x1a\x1a.WriteInstructionsResponse\"\x00(\x01\x62\x06proto3') + +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'remote_tracking_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + + DESCRIPTOR._options = None + _EXCEPTIONRESPONSE._serialized_start=25 + _EXCEPTIONRESPONSE._serialized_end=99 + _CLIENTRESOURCECLEANUPREQUEST._serialized_start=101 + _CLIENTRESOURCECLEANUPREQUEST._serialized_end=151 + _CLIENTRESOURCECLEANUPRESPONSE._serialized_start=154 + _CLIENTRESOURCECLEANUPRESPONSE._serialized_end=308 + _CLIENTRESOURCECLEANUPRESPONSE_STATUS._serialized_start=281 + _CLIENTRESOURCECLEANUPRESPONSE_STATUS._serialized_end=308 + _RESOURCEREQUEST._serialized_start=310 + _RESOURCEREQUEST._serialized_end=401 + _RESOURCERESPONSE._serialized_start=404 + _RESOURCERESPONSE._serialized_end=549 + _RESOURCERESPONSE_STATUS._serialized_start=281 + _RESOURCERESPONSE_STATUS._serialized_end=308 + _RELEASERESOURCEREQUEST._serialized_start=551 + _RELEASERESOURCEREQUEST._serialized_end=612 + _RELEASERESOURCERESPONSE._serialized_start=615 + _RELEASERESOURCERESPONSE._serialized_end=757 + _RELEASERESOURCERESPONSE_STATUS._serialized_start=281 + _RELEASERESOURCERESPONSE_STATUS._serialized_end=308 + _REQUESTHEADER._serialized_start=759 + _REQUESTHEADER._serialized_end=849 + _INSTRUCTIONREQUEST._serialized_start=851 + _INSTRUCTIONREQUEST._serialized_end=939 + _RESPONSEHEADER._serialized_start=942 + _RESPONSEHEADER._serialized_end=1083 + _RESPONSEHEADER_STATUS._serialized_start=281 + _RESPONSEHEADER_STATUS._serialized_end=308 + _INSTRUCTIONRESPONSE._serialized_start=1085 + _INSTRUCTIONRESPONSE._serialized_end=1175 + _WRITEINSTRUCTIONSREQUEST._serialized_start=1177 + _WRITEINSTRUCTIONSREQUEST._serialized_end=1257 + _WRITEINSTRUCTIONSRESPONSE._serialized_start=1260 + _WRITEINSTRUCTIONSRESPONSE._serialized_end=1423 + _WRITEINSTRUCTIONSRESPONSE_STATUS._serialized_start=281 + _WRITEINSTRUCTIONSRESPONSE_STATUS._serialized_end=308 + _REMOTETRACKINGSERVICE._serialized_start=1426 + _REMOTETRACKINGSERVICE._serialized_end=1823 +# @@protoc_insertion_point(module_scope) diff --git a/aim/ext/transport/remote_tracking.py b/aim/ext/transport/remote_tracking.py index cf907a2240..da42510e48 100644 --- a/aim/ext/transport/remote_tracking.py +++ b/aim/ext/transport/remote_tracking.py @@ -1,7 +1,7 @@ from typing import Dict, Union -import aim.ext.transport.remote_tracking_pb2 as tracking_rpc -import aim.ext.transport.remote_tracking_pb2_grpc as tracking_pb2_grpc +import aim.ext.transport.proto.remote_tracking_pb2 as tracking_rpc +import aim.ext.transport.proto.remote_tracking_pb2_grpc as tracking_pb2_grpc import aim.ext.transport.message_utils as utils from aim.ext.transport.handlers import get_handler diff --git a/aim/ext/transport/router.py b/aim/ext/transport/router.py index cca7169371..5033cf0890 100644 --- a/aim/ext/transport/router.py +++ b/aim/ext/transport/router.py @@ -2,8 +2,8 @@ from typing import List, TYPE_CHECKING -import aim.ext.transport.remote_router_pb2 as router_rpc -import aim.ext.transport.remote_router_pb2_grpc as router_pb2_grpc +import aim.ext.transport.proto.remote_router_pb2 as router_rpc +import aim.ext.transport.proto.remote_router_pb2_grpc as router_pb2_grpc from aim.ext.transport.message_utils import build_exception diff --git a/aim/ext/transport/worker.py b/aim/ext/transport/worker.py index c89ea1f186..819f5e3ef4 100644 --- a/aim/ext/transport/worker.py +++ b/aim/ext/transport/worker.py @@ -3,8 +3,8 @@ from multiprocessing import Process from typing import Optional -import aim.ext.transport.remote_tracking_pb2 as rpc_messages -import aim.ext.transport.remote_tracking_pb2_grpc as remote_tracking_pb2_grpc +import aim.ext.transport.proto.remote_tracking_pb2 as rpc_messages +import aim.ext.transport.proto.remote_tracking_pb2_grpc as remote_tracking_pb2_grpc from aim.ext.cleanup import AutoClean diff --git a/setup.py b/setup.py index bc60b51e27..cefbb07d29 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,6 @@ def package_files(directory): 'cryptography>=3.0', 'filelock>=3.3.0', 'numpy>=1.12.0', - 'protobuf>=3.11.0', 'psutil>=5.6.7', 'py3nvml>=0.2.5', 'RestrictedPython>=5.1', @@ -71,10 +70,7 @@ def package_files(directory): 'SQLAlchemy>=1.4.1', 'uvicorn>=0.12.0', 'Pillow>=8.0.0', - 'protobuf >= 3.9.2,<4.0.0', - # fastapi to support python3.6 - 'async-exit-stack>=1.0.0; python_version<"3.7"', - 'async-generator>=1.0; python_version<"3.7"', + 'protobuf >= 3.9.2', 'packaging>=15.0', 'python-dateutil', 'requests', From 74540304488754f207d10d224be9df0021e98515 Mon Sep 17 00:00:00 2001 From: mihran113 Date: Fri, 13 Jan 2023 14:35:06 +0400 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1806cd3c79..a8cc920273 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Add other x-axis alignment and system logs tracking to cli convert wandb (hjoonjang) - Add support for pre-binned distribution/histogram (YodaEmbedding) - Fix plotly and matplotlib compatibility (tmynn) +- Enable support for protobuf v4 (mihran113) ### Fixes