From 535df8d272971637a1fff6c6725fc89b37c9178b Mon Sep 17 00:00:00 2001 From: ifrit98 Date: Thu, 22 Jun 2023 15:52:32 +0000 Subject: [PATCH] remove hotkey from proto and dendrite --- bittensor/_dendrite/dendrite.py | 2 - bittensor/_proto/bittensor.proto | 4 -- bittensor/_proto/bittensor_pb2.py | 90 +++++++++++-------------------- 3 files changed, 31 insertions(+), 65 deletions(-) diff --git a/bittensor/_dendrite/dendrite.py b/bittensor/_dendrite/dendrite.py index 0fa0a42797..0a362d52d3 100644 --- a/bittensor/_dendrite/dendrite.py +++ b/bittensor/_dendrite/dendrite.py @@ -44,7 +44,6 @@ def __init__( self.timeout = timeout self.start_time = time.time() self.elapsed_time = 0.0 - self.src_hotkey = self.dendrite.keypair.ss58_address self.src_version = bittensor.__version_as_int__ self.dest_hotkey = self.dendrite.axon_info.hotkey self.dest_version = self.dendrite.axon_info.version @@ -73,7 +72,6 @@ def _get_request_proto(self) -> object: request_proto = self.get_request_proto() request_proto.version = self.src_version request_proto.timeout = self.timeout - request_proto.hotkey = self.src_hotkey return request_proto @abstractmethod diff --git a/bittensor/_proto/bittensor.proto b/bittensor/_proto/bittensor.proto index 18f8301d39..1bd758de79 100644 --- a/bittensor/_proto/bittensor.proto +++ b/bittensor/_proto/bittensor.proto @@ -11,20 +11,17 @@ service TextPrompting { ///////////////////////// message ForwardTextPromptingRequest { int32 version = 1; - string hotkey = 2; repeated string messages = 3; float timeout = 4; } message ForwardTextPromptingResponse { int32 version = 1; - string hotkey = 2; string response = 3; string return_message = 4; ReturnCode return_code = 5; } message BackwardTextPromptingRequest { int32 version = 1; - string hotkey = 2; repeated float rewards = 3; repeated string messages = 4; string response = 5; @@ -32,7 +29,6 @@ message BackwardTextPromptingRequest { } message BackwardTextPromptingResponse { int32 version = 1; - string hotkey = 2; string return_message = 4; ReturnCode return_code = 5; } diff --git a/bittensor/_proto/bittensor_pb2.py b/bittensor/_proto/bittensor_pb2.py index 10e3a699f7..0a98cab4c9 100644 --- a/bittensor/_proto/bittensor_pb2.py +++ b/bittensor/_proto/bittensor_pb2.py @@ -20,7 +20,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n bittensor/_proto/bittensor.proto\"a\n\x1b\x46orwardTextPromptingRequest\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0e\n\x06hotkey\x18\x02 \x01(\t\x12\x10\n\x08messages\x18\x03 \x03(\t\x12\x0f\n\x07timeout\x18\x04 \x01(\x02\"\x8b\x01\n\x1c\x46orwardTextPromptingResponse\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0e\n\x06hotkey\x18\x02 \x01(\t\x12\x10\n\x08response\x18\x03 \x01(\t\x12\x16\n\x0ereturn_message\x18\x04 \x01(\t\x12 \n\x0breturn_code\x18\x05 \x01(\x0e\x32\x0b.ReturnCode\"\x85\x01\n\x1c\x42\x61\x63kwardTextPromptingRequest\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0e\n\x06hotkey\x18\x02 \x01(\t\x12\x0f\n\x07rewards\x18\x03 \x03(\x02\x12\x10\n\x08messages\x18\x04 \x03(\t\x12\x10\n\x08response\x18\x05 \x01(\t\x12\x0f\n\x07timeout\x18\x06 \x01(\x02\"z\n\x1d\x42\x61\x63kwardTextPromptingResponse\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0e\n\x06hotkey\x18\x02 \x01(\t\x12\x16\n\x0ereturn_message\x18\x04 \x01(\t\x12 \n\x0breturn_code\x18\x05 \x01(\x0e\x32\x0b.ReturnCode\"\xac\x01\n\x06Tensor\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0e\n\x06\x62uffer\x18\x02 \x01(\x0c\x12\r\n\x05shape\x18\x03 \x03(\x03\x12\x1f\n\nserializer\x18\x04 \x01(\x0e\x32\x0b.Serializer\x12 \n\x0btensor_type\x18\x05 \x01(\x0e\x32\x0b.TensorType\x12\x18\n\x05\x64type\x18\x06 \x01(\x0e\x32\t.DataType\x12\x15\n\rrequires_grad\x18\x08 \x01(\x08*\xda\x04\n\nReturnCode\x12\x0c\n\x08NoReturn\x10\x00\x12\x0b\n\x07Success\x10\x01\x12\x0b\n\x07Timeout\x10\x02\x12\x0b\n\x07\x42\x61\x63koff\x10\x03\x12\x0f\n\x0bUnavailable\x10\x04\x12\x12\n\x0eNotImplemented\x10\x05\x12\x10\n\x0c\x45mptyRequest\x10\x06\x12\x11\n\rEmptyResponse\x10\x07\x12\x13\n\x0fInvalidResponse\x10\x08\x12\x12\n\x0eInvalidRequest\x10\t\x12\x19\n\x15RequestShapeException\x10\n\x12\x1a\n\x16ResponseShapeException\x10\x0b\x12!\n\x1dRequestSerializationException\x10\x0c\x12\"\n\x1eResponseSerializationException\x10\r\x12#\n\x1fRequestDeserializationException\x10\x0e\x12$\n ResponseDeserializationException\x10\x0f\x12\x15\n\x11NotServingNucleus\x10\x10\x12\x12\n\x0eNucleusTimeout\x10\x11\x12\x0f\n\x0bNucleusFull\x10\x12\x12\x1e\n\x1aRequestIncompatibleVersion\x10\x13\x12\x1f\n\x1bResponseIncompatibleVersion\x10\x14\x12\x11\n\rSenderUnknown\x10\x15\x12\x14\n\x10UnknownException\x10\x16\x12\x13\n\x0fUnauthenticated\x10\x17\x12\x0f\n\x0b\x42\x61\x64\x45ndpoint\x10\x18\x12\x0f\n\x0b\x42lacklisted\x10\x19*&\n\nSerializer\x12\x0b\n\x07MSGPACK\x10\x00\x12\x0b\n\x07\x43MPPACK\x10\x01*2\n\nTensorType\x12\t\n\x05TORCH\x10\x00\x12\x0e\n\nTENSORFLOW\x10\x01\x12\t\n\x05NUMPY\x10\x02*h\n\x08\x44\x61taType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07\x46LOAT32\x10\x01\x12\x0b\n\x07\x46LOAT64\x10\x02\x12\t\n\x05INT32\x10\x03\x12\t\n\x05INT64\x10\x04\x12\x08\n\x04UTF8\x10\x05\x12\x0b\n\x07\x46LOAT16\x10\x06\x12\x08\n\x04\x42OOL\x10\x07\x32\xa6\x01\n\rTextPrompting\x12H\n\x07\x46orward\x12\x1c.ForwardTextPromptingRequest\x1a\x1d.ForwardTextPromptingResponse\"\x00\x12K\n\x08\x42\x61\x63kward\x12\x1d.BackwardTextPromptingRequest\x1a\x1e.BackwardTextPromptingResponse\"\x00\x62\x06proto3' + serialized_pb=b'\n bittensor/_proto/bittensor.proto\"Q\n\x1b\x46orwardTextPromptingRequest\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x10\n\x08messages\x18\x03 \x03(\t\x12\x0f\n\x07timeout\x18\x04 \x01(\x02\"{\n\x1c\x46orwardTextPromptingResponse\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x10\n\x08response\x18\x03 \x01(\t\x12\x16\n\x0ereturn_message\x18\x04 \x01(\t\x12 \n\x0breturn_code\x18\x05 \x01(\x0e\x32\x0b.ReturnCode\"u\n\x1c\x42\x61\x63kwardTextPromptingRequest\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0f\n\x07rewards\x18\x03 \x03(\x02\x12\x10\n\x08messages\x18\x04 \x03(\t\x12\x10\n\x08response\x18\x05 \x01(\t\x12\x0f\n\x07timeout\x18\x06 \x01(\x02\"j\n\x1d\x42\x61\x63kwardTextPromptingResponse\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x16\n\x0ereturn_message\x18\x04 \x01(\t\x12 \n\x0breturn_code\x18\x05 \x01(\x0e\x32\x0b.ReturnCode\"\xac\x01\n\x06Tensor\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0e\n\x06\x62uffer\x18\x02 \x01(\x0c\x12\r\n\x05shape\x18\x03 \x03(\x03\x12\x1f\n\nserializer\x18\x04 \x01(\x0e\x32\x0b.Serializer\x12 \n\x0btensor_type\x18\x05 \x01(\x0e\x32\x0b.TensorType\x12\x18\n\x05\x64type\x18\x06 \x01(\x0e\x32\t.DataType\x12\x15\n\rrequires_grad\x18\x08 \x01(\x08*\xda\x04\n\nReturnCode\x12\x0c\n\x08NoReturn\x10\x00\x12\x0b\n\x07Success\x10\x01\x12\x0b\n\x07Timeout\x10\x02\x12\x0b\n\x07\x42\x61\x63koff\x10\x03\x12\x0f\n\x0bUnavailable\x10\x04\x12\x12\n\x0eNotImplemented\x10\x05\x12\x10\n\x0c\x45mptyRequest\x10\x06\x12\x11\n\rEmptyResponse\x10\x07\x12\x13\n\x0fInvalidResponse\x10\x08\x12\x12\n\x0eInvalidRequest\x10\t\x12\x19\n\x15RequestShapeException\x10\n\x12\x1a\n\x16ResponseShapeException\x10\x0b\x12!\n\x1dRequestSerializationException\x10\x0c\x12\"\n\x1eResponseSerializationException\x10\r\x12#\n\x1fRequestDeserializationException\x10\x0e\x12$\n ResponseDeserializationException\x10\x0f\x12\x15\n\x11NotServingNucleus\x10\x10\x12\x12\n\x0eNucleusTimeout\x10\x11\x12\x0f\n\x0bNucleusFull\x10\x12\x12\x1e\n\x1aRequestIncompatibleVersion\x10\x13\x12\x1f\n\x1bResponseIncompatibleVersion\x10\x14\x12\x11\n\rSenderUnknown\x10\x15\x12\x14\n\x10UnknownException\x10\x16\x12\x13\n\x0fUnauthenticated\x10\x17\x12\x0f\n\x0b\x42\x61\x64\x45ndpoint\x10\x18\x12\x0f\n\x0b\x42lacklisted\x10\x19*&\n\nSerializer\x12\x0b\n\x07MSGPACK\x10\x00\x12\x0b\n\x07\x43MPPACK\x10\x01*2\n\nTensorType\x12\t\n\x05TORCH\x10\x00\x12\x0e\n\nTENSORFLOW\x10\x01\x12\t\n\x05NUMPY\x10\x02*h\n\x08\x44\x61taType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07\x46LOAT32\x10\x01\x12\x0b\n\x07\x46LOAT64\x10\x02\x12\t\n\x05INT32\x10\x03\x12\t\n\x05INT64\x10\x04\x12\x08\n\x04UTF8\x10\x05\x12\x0b\n\x07\x46LOAT16\x10\x06\x12\x08\n\x04\x42OOL\x10\x07\x32\xa6\x01\n\rTextPrompting\x12H\n\x07\x46orward\x12\x1c.ForwardTextPromptingRequest\x1a\x1d.ForwardTextPromptingResponse\"\x00\x12K\n\x08\x42\x61\x63kward\x12\x1d.BackwardTextPromptingRequest\x1a\x1e.BackwardTextPromptingResponse\"\x00\x62\x06proto3' ) _RETURNCODE = _descriptor.EnumDescriptor( @@ -163,8 +163,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=713, - serialized_end=1315, + serialized_start=647, + serialized_end=1249, ) _sym_db.RegisterEnumDescriptor(_RETURNCODE) @@ -189,8 +189,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1317, - serialized_end=1355, + serialized_start=1251, + serialized_end=1289, ) _sym_db.RegisterEnumDescriptor(_SERIALIZER) @@ -220,8 +220,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1357, - serialized_end=1407, + serialized_start=1291, + serialized_end=1341, ) _sym_db.RegisterEnumDescriptor(_TENSORTYPE) @@ -276,8 +276,8 @@ ], containing_type=None, serialized_options=None, - serialized_start=1409, - serialized_end=1513, + serialized_start=1343, + serialized_end=1447, ) _sym_db.RegisterEnumDescriptor(_DATATYPE) @@ -340,21 +340,14 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='hotkey', full_name='ForwardTextPromptingRequest.hotkey', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='messages', full_name='ForwardTextPromptingRequest.messages', index=2, + name='messages', full_name='ForwardTextPromptingRequest.messages', index=1, number=3, type=9, cpp_type=9, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='timeout', full_name='ForwardTextPromptingRequest.timeout', index=3, + name='timeout', full_name='ForwardTextPromptingRequest.timeout', index=2, number=4, type=2, cpp_type=6, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, @@ -373,7 +366,7 @@ oneofs=[ ], serialized_start=36, - serialized_end=133, + serialized_end=117, ) @@ -393,28 +386,21 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='hotkey', full_name='ForwardTextPromptingResponse.hotkey', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='response', full_name='ForwardTextPromptingResponse.response', index=2, + name='response', full_name='ForwardTextPromptingResponse.response', index=1, number=3, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='return_message', full_name='ForwardTextPromptingResponse.return_message', index=3, + name='return_message', full_name='ForwardTextPromptingResponse.return_message', index=2, number=4, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='return_code', full_name='ForwardTextPromptingResponse.return_code', index=4, + name='return_code', full_name='ForwardTextPromptingResponse.return_code', index=3, number=5, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -432,8 +418,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=136, - serialized_end=275, + serialized_start=119, + serialized_end=242, ) @@ -453,35 +439,28 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='hotkey', full_name='BackwardTextPromptingRequest.hotkey', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='rewards', full_name='BackwardTextPromptingRequest.rewards', index=2, + name='rewards', full_name='BackwardTextPromptingRequest.rewards', index=1, number=3, type=2, cpp_type=6, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='messages', full_name='BackwardTextPromptingRequest.messages', index=3, + name='messages', full_name='BackwardTextPromptingRequest.messages', index=2, number=4, type=9, cpp_type=9, label=3, has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='response', full_name='BackwardTextPromptingRequest.response', index=4, + name='response', full_name='BackwardTextPromptingRequest.response', index=3, number=5, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='timeout', full_name='BackwardTextPromptingRequest.timeout', index=5, + name='timeout', full_name='BackwardTextPromptingRequest.timeout', index=4, number=6, type=2, cpp_type=6, label=1, has_default_value=False, default_value=float(0), message_type=None, enum_type=None, containing_type=None, @@ -499,8 +478,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=278, - serialized_end=411, + serialized_start=244, + serialized_end=361, ) @@ -520,21 +499,14 @@ is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='hotkey', full_name='BackwardTextPromptingResponse.hotkey', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='return_message', full_name='BackwardTextPromptingResponse.return_message', index=2, + name='return_message', full_name='BackwardTextPromptingResponse.return_message', index=1, number=4, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='return_code', full_name='BackwardTextPromptingResponse.return_code', index=3, + name='return_code', full_name='BackwardTextPromptingResponse.return_code', index=2, number=5, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -552,8 +524,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=413, - serialized_end=535, + serialized_start=363, + serialized_end=469, ) @@ -626,8 +598,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=538, - serialized_end=710, + serialized_start=472, + serialized_end=644, ) _FORWARDTEXTPROMPTINGRESPONSE.fields_by_name['return_code'].enum_type = _RETURNCODE @@ -690,8 +662,8 @@ index=0, serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_start=1516, - serialized_end=1682, + serialized_start=1450, + serialized_end=1616, methods=[ _descriptor.MethodDescriptor( name='Forward',