From 7a956ebfd5aac3a54d39057eaf73025c76b784b5 Mon Sep 17 00:00:00 2001 From: Mugdha Polimera Date: Wed, 22 Nov 2023 12:52:44 -0500 Subject: [PATCH 1/3] added gpn (planetary names) to protobuf --- .gitignore | 2 ++ adsmsg/protobuf/docmatch_pb2.py | 46 +++++++++++++++-------------- adsmsg/protobuf/nonbibrecord_pb2.py | 27 ++++++++++------- specs/nonbibrecord.proto | 1 + 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 70a6b71..22677d1 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,5 @@ python/ **/.DS_Store *.idea + +sed* diff --git a/adsmsg/protobuf/docmatch_pb2.py b/adsmsg/protobuf/docmatch_pb2.py index 59a7178..1396205 100644 --- a/adsmsg/protobuf/docmatch_pb2.py +++ b/adsmsg/protobuf/docmatch_pb2.py @@ -1,13 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: docmatch.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" 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() @@ -20,7 +18,9 @@ name='docmatch.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -33,35 +33,36 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='source_bibcode', full_name='adsmsg.DocMatchRecord.source_bibcode', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + 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, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='matched_bibcode', full_name='adsmsg.DocMatchRecord.matched_bibcode', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + 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, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='confidence', full_name='adsmsg.DocMatchRecord.confidence', index=2, number=3, 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), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -78,6 +79,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='docmatch_records', full_name='adsmsg.DocMatchRecordList.docmatch_records', index=0, @@ -85,21 +87,21 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DocMatchRecordList.status', index=1, number=2, type=14, cpp_type=8, 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), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -115,18 +117,18 @@ DESCRIPTOR.message_types_by_name['DocMatchRecordList'] = _DOCMATCHRECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), dict( - DESCRIPTOR = _DOCMATCHRECORD, - __module__ = 'docmatch_pb2' +DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), { + 'DESCRIPTOR' : _DOCMATCHRECORD, + '__module__' : 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecord) - )) + }) _sym_db.RegisterMessage(DocMatchRecord) -DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), dict( - DESCRIPTOR = _DOCMATCHRECORDLIST, - __module__ = 'docmatch_pb2' +DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), { + 'DESCRIPTOR' : _DOCMATCHRECORDLIST, + '__module__' : 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecordList) - )) + }) _sym_db.RegisterMessage(DocMatchRecordList) diff --git a/adsmsg/protobuf/nonbibrecord_pb2.py b/adsmsg/protobuf/nonbibrecord_pb2.py index d84e202..c466464 100644 --- a/adsmsg/protobuf/nonbibrecord_pb2.py +++ b/adsmsg/protobuf/nonbibrecord_pb2.py @@ -20,7 +20,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x12nonbibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\xb1\x03\n\x0cNonBibRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x16\n\x0esimbad_objects\x18\x03 \x03(\t\x12\x0e\n\x06grants\x18\x04 \x03(\t\x12\r\n\x05\x62oost\x18\x06 \x01(\x02\x12\x16\n\x0e\x63itation_count\x18\x07 \x01(\x05\x12\x12\n\nread_count\x18\x08 \x01(\x05\x12\x0f\n\x07readers\x18\t \x03(\t\x12\x11\n\treference\x18\x0c \x03(\t\x12\x13\n\x0bned_objects\x18\r \x03(\t\x12\x0c\n\x04\x64\x61ta\x18\x0e \x03(\t\x12\x19\n\x11total_link_counts\x18\x0f \x01(\x05\x12\x0f\n\x07\x65source\x18\x11 \x03(\t\x12\x10\n\x08property\x18\x12 \x03(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x13 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\x12\x1e\n\x06status\x18\x14 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x12\n\nnorm_cites\x18\x15 \x01(\x05\x12\x1b\n\x13\x63itation_count_norm\x18\x16 \x01(\x02\x12\x10\n\x08\x62ibgroup\x18\x17 \x03(\t\x12\x16\n\x0e\x62ibgroup_facet\x18\x18 \x03(\t\"h\n\x0c\x44\x61taLinksRow\x12\x11\n\tlink_type\x18\x01 \x01(\t\x12\x15\n\rlink_sub_type\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x03(\t\x12\r\n\x05title\x18\x04 \x03(\t\x12\x12\n\nitem_count\x18\x05 \x01(\x05\"`\n\x10NonBibRecordList\x12,\n\x0enonbib_records\x18\x01 \x03(\x0b\x32\x14.adsmsg.NonBibRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\"Q\n\x0f\x44\x61taLinksRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x02 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\"i\n\x13\x44\x61taLinksRecordList\x12\x32\n\x11\x64\x61talinks_records\x18\x01 \x03(\x0b\x32\x17.adsmsg.DataLinksRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' + serialized_pb=b'\n\x12nonbibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\xbe\x03\n\x0cNonBibRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x16\n\x0esimbad_objects\x18\x03 \x03(\t\x12\x0e\n\x06grants\x18\x04 \x03(\t\x12\r\n\x05\x62oost\x18\x06 \x01(\x02\x12\x16\n\x0e\x63itation_count\x18\x07 \x01(\x05\x12\x12\n\nread_count\x18\x08 \x01(\x05\x12\x0f\n\x07readers\x18\t \x03(\t\x12\x11\n\treference\x18\x0c \x03(\t\x12\x13\n\x0bned_objects\x18\r \x03(\t\x12\x0c\n\x04\x64\x61ta\x18\x0e \x03(\t\x12\x19\n\x11total_link_counts\x18\x0f \x01(\x05\x12\x0f\n\x07\x65source\x18\x11 \x03(\t\x12\x10\n\x08property\x18\x12 \x03(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x13 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\x12\x1e\n\x06status\x18\x14 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x12\n\nnorm_cites\x18\x15 \x01(\x05\x12\x1b\n\x13\x63itation_count_norm\x18\x16 \x01(\x02\x12\x10\n\x08\x62ibgroup\x18\x17 \x03(\t\x12\x16\n\x0e\x62ibgroup_facet\x18\x18 \x03(\t\x12\x0b\n\x03gpn\x18\x1a \x03(\t\"h\n\x0c\x44\x61taLinksRow\x12\x11\n\tlink_type\x18\x01 \x01(\t\x12\x15\n\rlink_sub_type\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x03(\t\x12\r\n\x05title\x18\x04 \x03(\t\x12\x12\n\nitem_count\x18\x05 \x01(\x05\"`\n\x10NonBibRecordList\x12,\n\x0enonbib_records\x18\x01 \x03(\x0b\x32\x14.adsmsg.NonBibRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\"Q\n\x0f\x44\x61taLinksRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x02 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\"i\n\x13\x44\x61taLinksRecordList\x12\x32\n\x11\x64\x61talinks_records\x18\x01 \x03(\x0b\x32\x17.adsmsg.DataLinksRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -168,6 +168,13 @@ 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='gpn', full_name='adsmsg.NonBibRecord.gpn', index=19, + number=26, 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), ], extensions=[ ], @@ -181,7 +188,7 @@ oneofs=[ ], serialized_start=45, - serialized_end=478, + serialized_end=491, ) @@ -240,8 +247,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=480, - serialized_end=584, + serialized_start=493, + serialized_end=597, ) @@ -279,8 +286,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=586, - serialized_end=682, + serialized_start=599, + serialized_end=695, ) @@ -318,8 +325,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=684, - serialized_end=765, + serialized_start=697, + serialized_end=778, ) @@ -357,8 +364,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=767, - serialized_end=872, + serialized_start=780, + serialized_end=885, ) _NONBIBRECORD.fields_by_name['data_links_rows'].message_type = _DATALINKSROW diff --git a/specs/nonbibrecord.proto b/specs/nonbibrecord.proto index 2d12c41..453408d 100644 --- a/specs/nonbibrecord.proto +++ b/specs/nonbibrecord.proto @@ -24,6 +24,7 @@ message NonBibRecord { float citation_count_norm = 22; repeated string bibgroup = 23; repeated string bibgroup_facet = 24; + repeated string gpn = 26; } From d4b0bd5913454f022f93b8082f659e4e292716d1 Mon Sep 17 00:00:00 2001 From: Mugdha Polimera Date: Mon, 27 Nov 2023 02:18:47 -0500 Subject: [PATCH 2/3] doctmatch reverted to previous state --- adsmsg/protobuf/docmatch_pb2.py | 48 ++++++++++++++++----------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/adsmsg/protobuf/docmatch_pb2.py b/adsmsg/protobuf/docmatch_pb2.py index 1396205..ac96e7a 100644 --- a/adsmsg/protobuf/docmatch_pb2.py +++ b/adsmsg/protobuf/docmatch_pb2.py @@ -1,11 +1,13 @@ -# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: docmatch.proto -"""Generated protocol buffer code.""" + +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() @@ -18,9 +20,7 @@ name='docmatch.proto', package='adsmsg', syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' + serialized_pb=_b('\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') , dependencies=[status__pb2.DESCRIPTOR,]) @@ -33,36 +33,35 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='source_bibcode', full_name='adsmsg.DocMatchRecord.source_bibcode', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), + 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), + options=None), _descriptor.FieldDescriptor( name='matched_bibcode', full_name='adsmsg.DocMatchRecord.matched_bibcode', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), + 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), + options=None), _descriptor.FieldDescriptor( name='confidence', full_name='adsmsg.DocMatchRecord.confidence', index=2, number=3, 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, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + options=None), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -79,7 +78,6 @@ filename=None, file=DESCRIPTOR, containing_type=None, - create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='docmatch_records', full_name='adsmsg.DocMatchRecordList.docmatch_records', index=0, @@ -87,21 +85,21 @@ 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), + options=None), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DocMatchRecordList.status', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, 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), + options=None), ], extensions=[ ], nested_types=[], enum_types=[ ], - serialized_options=None, + options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -117,19 +115,19 @@ DESCRIPTOR.message_types_by_name['DocMatchRecordList'] = _DOCMATCHRECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), { - 'DESCRIPTOR' : _DOCMATCHRECORD, - '__module__' : 'docmatch_pb2' +DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), dict( + DESCRIPTOR = _DOCMATCHRECORD, + __module__ = 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecord) - }) + )) _sym_db.RegisterMessage(DocMatchRecord) -DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), { - 'DESCRIPTOR' : _DOCMATCHRECORDLIST, - '__module__' : 'docmatch_pb2' +DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), dict( + DESCRIPTOR = _DOCMATCHRECORDLIST, + __module__ = 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecordList) - }) + )) _sym_db.RegisterMessage(DocMatchRecordList) -# @@protoc_insertion_point(module_scope) +# @@protoc_insertion_point(module_scope) \ No newline at end of file From b0ba24cd3473b729741a5ee48cc59dd6e932e2b0 Mon Sep 17 00:00:00 2001 From: Mugdha Polimera Date: Mon, 27 Nov 2023 06:33:45 -0500 Subject: [PATCH 3/3] docmatch_pb2 update --- adsmsg/protobuf/docmatch_pb2.py | 46 +++++++++++++++-------------- adsmsg/protobuf/nonbibrecord_pb2.py | 29 +++++++----------- specs/nonbibrecord.proto | 3 +- 3 files changed, 36 insertions(+), 42 deletions(-) diff --git a/adsmsg/protobuf/docmatch_pb2.py b/adsmsg/protobuf/docmatch_pb2.py index ac96e7a..6631860 100644 --- a/adsmsg/protobuf/docmatch_pb2.py +++ b/adsmsg/protobuf/docmatch_pb2.py @@ -1,13 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: docmatch.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" 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() @@ -20,7 +18,9 @@ name='docmatch.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0e\x64ocmatch.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"U\n\x0e\x44ocMatchRecord\x12\x16\n\x0esource_bibcode\x18\x01 \x01(\t\x12\x17\n\x0fmatched_bibcode\x18\x02 \x01(\t\x12\x12\n\nconfidence\x18\x03 \x01(\x01\"f\n\x12\x44ocMatchRecordList\x12\x30\n\x10\x64ocmatch_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocMatchRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -33,35 +33,36 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='source_bibcode', full_name='adsmsg.DocMatchRecord.source_bibcode', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + 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, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='matched_bibcode', full_name='adsmsg.DocMatchRecord.matched_bibcode', index=1, number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + 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, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='confidence', full_name='adsmsg.DocMatchRecord.confidence', index=2, number=3, 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), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -78,6 +79,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='docmatch_records', full_name='adsmsg.DocMatchRecordList.docmatch_records', index=0, @@ -85,21 +87,21 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DocMatchRecordList.status', index=1, number=2, type=14, cpp_type=8, 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), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -115,18 +117,18 @@ DESCRIPTOR.message_types_by_name['DocMatchRecordList'] = _DOCMATCHRECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), dict( - DESCRIPTOR = _DOCMATCHRECORD, - __module__ = 'docmatch_pb2' +DocMatchRecord = _reflection.GeneratedProtocolMessageType('DocMatchRecord', (_message.Message,), { + 'DESCRIPTOR' : _DOCMATCHRECORD, + '__module__' : 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecord) - )) + }) _sym_db.RegisterMessage(DocMatchRecord) -DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), dict( - DESCRIPTOR = _DOCMATCHRECORDLIST, - __module__ = 'docmatch_pb2' +DocMatchRecordList = _reflection.GeneratedProtocolMessageType('DocMatchRecordList', (_message.Message,), { + 'DESCRIPTOR' : _DOCMATCHRECORDLIST, + '__module__' : 'docmatch_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocMatchRecordList) - )) + }) _sym_db.RegisterMessage(DocMatchRecordList) diff --git a/adsmsg/protobuf/nonbibrecord_pb2.py b/adsmsg/protobuf/nonbibrecord_pb2.py index c466464..0a25840 100644 --- a/adsmsg/protobuf/nonbibrecord_pb2.py +++ b/adsmsg/protobuf/nonbibrecord_pb2.py @@ -20,7 +20,7 @@ syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x12nonbibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\xbe\x03\n\x0cNonBibRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x16\n\x0esimbad_objects\x18\x03 \x03(\t\x12\x0e\n\x06grants\x18\x04 \x03(\t\x12\r\n\x05\x62oost\x18\x06 \x01(\x02\x12\x16\n\x0e\x63itation_count\x18\x07 \x01(\x05\x12\x12\n\nread_count\x18\x08 \x01(\x05\x12\x0f\n\x07readers\x18\t \x03(\t\x12\x11\n\treference\x18\x0c \x03(\t\x12\x13\n\x0bned_objects\x18\r \x03(\t\x12\x0c\n\x04\x64\x61ta\x18\x0e \x03(\t\x12\x19\n\x11total_link_counts\x18\x0f \x01(\x05\x12\x0f\n\x07\x65source\x18\x11 \x03(\t\x12\x10\n\x08property\x18\x12 \x03(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x13 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\x12\x1e\n\x06status\x18\x14 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x12\n\nnorm_cites\x18\x15 \x01(\x05\x12\x1b\n\x13\x63itation_count_norm\x18\x16 \x01(\x02\x12\x10\n\x08\x62ibgroup\x18\x17 \x03(\t\x12\x16\n\x0e\x62ibgroup_facet\x18\x18 \x03(\t\x12\x0b\n\x03gpn\x18\x1a \x03(\t\"h\n\x0c\x44\x61taLinksRow\x12\x11\n\tlink_type\x18\x01 \x01(\t\x12\x15\n\rlink_sub_type\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x03(\t\x12\r\n\x05title\x18\x04 \x03(\t\x12\x12\n\nitem_count\x18\x05 \x01(\x05\"`\n\x10NonBibRecordList\x12,\n\x0enonbib_records\x18\x01 \x03(\x0b\x32\x14.adsmsg.NonBibRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\"Q\n\x0f\x44\x61taLinksRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x02 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\"i\n\x13\x44\x61taLinksRecordList\x12\x32\n\x11\x64\x61talinks_records\x18\x01 \x03(\x0b\x32\x17.adsmsg.DataLinksRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' + serialized_pb=b'\n\x12nonbibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\xb1\x03\n\x0cNonBibRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x16\n\x0esimbad_objects\x18\x03 \x03(\t\x12\x0e\n\x06grants\x18\x04 \x03(\t\x12\r\n\x05\x62oost\x18\x06 \x01(\x02\x12\x16\n\x0e\x63itation_count\x18\x07 \x01(\x05\x12\x12\n\nread_count\x18\x08 \x01(\x05\x12\x0f\n\x07readers\x18\t \x03(\t\x12\x11\n\treference\x18\x0c \x03(\t\x12\x13\n\x0bned_objects\x18\r \x03(\t\x12\x0c\n\x04\x64\x61ta\x18\x0e \x03(\t\x12\x19\n\x11total_link_counts\x18\x0f \x01(\x05\x12\x0f\n\x07\x65source\x18\x11 \x03(\t\x12\x10\n\x08property\x18\x12 \x03(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x13 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\x12\x1e\n\x06status\x18\x14 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x12\n\nnorm_cites\x18\x15 \x01(\x05\x12\x1b\n\x13\x63itation_count_norm\x18\x16 \x01(\x02\x12\x10\n\x08\x62ibgroup\x18\x17 \x03(\t\x12\x16\n\x0e\x62ibgroup_facet\x18\x18 \x03(\t\"h\n\x0c\x44\x61taLinksRow\x12\x11\n\tlink_type\x18\x01 \x01(\t\x12\x15\n\rlink_sub_type\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x03(\t\x12\r\n\x05title\x18\x04 \x03(\t\x12\x12\n\nitem_count\x18\x05 \x01(\x05\"`\n\x10NonBibRecordList\x12,\n\x0enonbib_records\x18\x01 \x03(\x0b\x32\x14.adsmsg.NonBibRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\"Q\n\x0f\x44\x61taLinksRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12-\n\x0f\x64\x61ta_links_rows\x18\x02 \x03(\x0b\x32\x14.adsmsg.DataLinksRow\"i\n\x13\x44\x61taLinksRecordList\x12\x32\n\x11\x64\x61talinks_records\x18\x01 \x03(\x0b\x32\x17.adsmsg.DataLinksRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -168,13 +168,6 @@ 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='gpn', full_name='adsmsg.NonBibRecord.gpn', index=19, - number=26, 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), ], extensions=[ ], @@ -188,7 +181,7 @@ oneofs=[ ], serialized_start=45, - serialized_end=491, + serialized_end=478, ) @@ -247,8 +240,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=493, - serialized_end=597, + serialized_start=480, + serialized_end=584, ) @@ -286,8 +279,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=599, - serialized_end=695, + serialized_start=586, + serialized_end=682, ) @@ -325,8 +318,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=697, - serialized_end=778, + serialized_start=684, + serialized_end=765, ) @@ -364,8 +357,8 @@ extension_ranges=[], oneofs=[ ], - serialized_start=780, - serialized_end=885, + serialized_start=767, + serialized_end=872, ) _NONBIBRECORD.fields_by_name['data_links_rows'].message_type = _DATALINKSROW @@ -418,4 +411,4 @@ _sym_db.RegisterMessage(DataLinksRecordList) -# @@protoc_insertion_point(module_scope) +# @@protoc_insertion_point(module_scope) \ No newline at end of file diff --git a/specs/nonbibrecord.proto b/specs/nonbibrecord.proto index 453408d..be8d77b 100644 --- a/specs/nonbibrecord.proto +++ b/specs/nonbibrecord.proto @@ -24,7 +24,6 @@ message NonBibRecord { float citation_count_norm = 22; repeated string bibgroup = 23; repeated string bibgroup_facet = 24; - repeated string gpn = 26; } @@ -52,4 +51,4 @@ message DataLinksRecord { message DataLinksRecordList { repeated DataLinksRecord datalinks_records = 1; Status status = 2; -} +} \ No newline at end of file