From 7b3c9c0ee157158d79f6b026084319d322bab740 Mon Sep 17 00:00:00 2001 From: Kelly Lockhart <2926089+kelockhart@users.noreply.github.com> Date: Tue, 14 Apr 2020 14:43:57 -0400 Subject: [PATCH] Make compatible with Python 2.7 and 3 --- .gitignore | 3 + Dockerfile | 6 +- adsmsg/__init__.py | 1 - adsmsg/msg.py | 7 +- adsmsg/protobuf/augmentrecord_pb2.py | 91 ++- adsmsg/protobuf/bibrecord_pb2.py | 551 +++++++++--------- .../citation_changes_content_type_pb2.py | 15 +- adsmsg/protobuf/citation_changes_pb2.py | 53 +- adsmsg/protobuf/denormalized_record_pb2.py | 281 +++++---- adsmsg/protobuf/fulltext_requests_pb2.py | 45 +- adsmsg/protobuf/fulltext_update_pb2.py | 37 +- adsmsg/protobuf/metrics_pb2.py | 110 ++-- adsmsg/protobuf/nonbibrecord_pb2.py | 123 ++-- adsmsg/protobuf/orcid_claims_pb2.py | 31 +- adsmsg/protobuf/status_pb2.py | 17 +- adsmsg/protobuf/turbobee_pb2.py | 181 ------ adsmsg/tests/test_bibrecord.py | 12 +- adsmsg/tests/test_denormalized_record.py | 7 +- adsmsg/tests/test_metrics_record.py | 6 +- adsmsg/tests/test_msg.py | 27 +- adsmsg/tests/test_turbobee.py | 67 --- adsmsg/turbobee.py | 77 --- dev-requirements.txt | 8 +- requirements.txt | 4 +- setup.py | 3 + specs/turbobee.proto | 59 -- 26 files changed, 737 insertions(+), 1085 deletions(-) delete mode 100644 adsmsg/protobuf/turbobee_pb2.py delete mode 100644 adsmsg/tests/test_turbobee.py delete mode 100644 adsmsg/turbobee.py delete mode 100644 specs/turbobee.proto diff --git a/.gitignore b/.gitignore index 74116c6..70a6b71 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,6 @@ python/ # emacs *~ + +**/.DS_Store +*.idea diff --git a/Dockerfile b/Dockerfile index c06e981..b957cc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ RUN \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes autoconf automake libtool curl make g++ unzip wget && \ rm -rf /var/lib/apt/lists/* && \ - wget https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-python-3.3.0.tar.gz && \ - tar -zxvf protobuf-python-3.3.0.tar.gz && \ - cd protobuf-3.3.0/ && \ + wget https://github.com/google/protobuf/releases/download/v3.11.3/protobuf-python-3.11.3.tar.gz && \ + tar -zxvf protobuf-python-3.11.3.tar.gz && \ + cd protobuf-3.11.3/ && \ ./configure && \ make -j 2 && \ make install && \ diff --git a/adsmsg/__init__.py b/adsmsg/__init__.py index 01b0ec3..5c4cf86 100644 --- a/adsmsg/__init__.py +++ b/adsmsg/__init__.py @@ -16,7 +16,6 @@ from .status import Status from .citation_changes import CitationChanges, CitationChange from .citation_changes_content_type import CitationChangeContentType -from .turbobee import TurboBeeMsg diff --git a/adsmsg/msg.py b/adsmsg/msg.py index e54e80e..70ed26e 100644 --- a/adsmsg/msg.py +++ b/adsmsg/msg.py @@ -1,3 +1,6 @@ +from builtins import str +from past.builtins import basestring +from builtins import object from datetime import datetime from google.protobuf import json_format from google.protobuf import timestamp_pb2 @@ -17,12 +20,12 @@ def __init__(self, instance, args, kwargs): if isinstance(kwargs['status'], basestring) and hasattr(Status, kwargs['status']): kwargs['status'] = getattr(Status, kwargs['status']) - for k, v in kwargs.items(): + for k, v in list(kwargs.items()): if isinstance(v, list) or isinstance(v, tuple): getattr(instance, k).extend(v) #TODO(rca): use some smarter reflection elif isinstance(v, dict): x = getattr(instance, k) - for dk in v.keys(): + for dk in list(v.keys()): x[dk] = v[dk] elif isinstance(v, datetime): getattr(instance, k).FromDatetime(v) diff --git a/adsmsg/protobuf/augmentrecord_pb2.py b/adsmsg/protobuf/augmentrecord_pb2.py index eb353e1..2392e0f 100644 --- a/adsmsg/protobuf/augmentrecord_pb2.py +++ b/adsmsg/protobuf/augmentrecord_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: augmentrecord.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='augmentrecord.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x13\x61ugmentrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"o\n\x1f\x41ugmentAffiliationRequestRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0b\n\x03\x61\x66\x66\x18\x03 \x03(\t\x12\x0e\n\x06\x61uthor\x18\x04 \x03(\t\"\x8c\x01\n#AugmentAffiliationRequestRecordList\x12\x45\n\x14\x61\x66\x66iliation_requests\x18\x01 \x03(\x0b\x32\'.adsmsg.AugmentAffiliationRequestRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\"\xfc\x01\n AugmentAffiliationResponseRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0b\n\x03\x61\x66\x66\x18\x03 \x03(\t\x12\x0e\n\x06\x61uthor\x18\x04 \x03(\t\x12\x12\n\naff_abbrev\x18\x05 \x03(\t\x12\x15\n\raff_canonical\x18\x06 \x03(\t\x12\x11\n\taff_facet\x18\x07 \x03(\t\x12\x16\n\x0e\x61\x66\x66_facet_hier\x18\x08 \x03(\t\x12\x0e\n\x06\x61\x66\x66_id\x18\t \x03(\t\x12\x13\n\x0binstitution\x18\n \x03(\t\x12\x0f\n\x07\x61\x66\x66_raw\x18\x0b \x03(\t\"\x8f\x01\n$AugmentAffiliationResponseRecordList\x12G\n\x15\x61\x66\x66iliation_responses\x18\x01 \x03(\x0b\x32(.adsmsg.AugmentAffiliationResponseRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x13\x61ugmentrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"o\n\x1f\x41ugmentAffiliationRequestRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0b\n\x03\x61\x66\x66\x18\x03 \x03(\t\x12\x0e\n\x06\x61uthor\x18\x04 \x03(\t\"\x8c\x01\n#AugmentAffiliationRequestRecordList\x12\x45\n\x14\x61\x66\x66iliation_requests\x18\x01 \x03(\x0b\x32\'.adsmsg.AugmentAffiliationRequestRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\"\xfc\x01\n AugmentAffiliationResponseRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0b\n\x03\x61\x66\x66\x18\x03 \x03(\t\x12\x0e\n\x06\x61uthor\x18\x04 \x03(\t\x12\x12\n\naff_abbrev\x18\x05 \x03(\t\x12\x15\n\raff_canonical\x18\x06 \x03(\t\x12\x11\n\taff_facet\x18\x07 \x03(\t\x12\x16\n\x0e\x61\x66\x66_facet_hier\x18\x08 \x03(\t\x12\x0e\n\x06\x61\x66\x66_id\x18\t \x03(\t\x12\x13\n\x0binstitution\x18\n \x03(\t\x12\x0f\n\x07\x61\x66\x66_raw\x18\x0b \x03(\t\"\x8f\x01\n$AugmentAffiliationResponseRecordList\x12G\n\x15\x61\x66\x66iliation_responses\x18\x01 \x03(\x0b\x32(.adsmsg.AugmentAffiliationResponseRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -37,38 +36,38 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.AugmentAffiliationRequestRecord.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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.AugmentAffiliationRequestRecord.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), _descriptor.FieldDescriptor( name='aff', full_name='adsmsg.AugmentAffiliationRequestRecord.aff', index=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author', full_name='adsmsg.AugmentAffiliationRequestRecord.author', index=3, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -92,21 +91,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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.AugmentAffiliationRequestRecordList.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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -127,87 +126,87 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.AugmentAffiliationResponseRecord.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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.AugmentAffiliationResponseRecord.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), _descriptor.FieldDescriptor( name='aff', full_name='adsmsg.AugmentAffiliationResponseRecord.aff', index=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author', full_name='adsmsg.AugmentAffiliationResponseRecord.author', index=3, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='aff_abbrev', full_name='adsmsg.AugmentAffiliationResponseRecord.aff_abbrev', index=4, number=5, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='aff_canonical', full_name='adsmsg.AugmentAffiliationResponseRecord.aff_canonical', index=5, number=6, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='aff_facet', full_name='adsmsg.AugmentAffiliationResponseRecord.aff_facet', index=6, number=7, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='aff_facet_hier', full_name='adsmsg.AugmentAffiliationResponseRecord.aff_facet_hier', index=7, number=8, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='aff_id', full_name='adsmsg.AugmentAffiliationResponseRecord.aff_id', index=8, number=9, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='institution', full_name='adsmsg.AugmentAffiliationResponseRecord.institution', index=9, number=10, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='aff_raw', full_name='adsmsg.AugmentAffiliationResponseRecord.aff_raw', index=10, number=11, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -231,21 +230,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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.AugmentAffiliationResponseRecordList.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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -267,32 +266,32 @@ DESCRIPTOR.message_types_by_name['AugmentAffiliationResponseRecordList'] = _AUGMENTAFFILIATIONRESPONSERECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -AugmentAffiliationRequestRecord = _reflection.GeneratedProtocolMessageType('AugmentAffiliationRequestRecord', (_message.Message,), dict( - DESCRIPTOR = _AUGMENTAFFILIATIONREQUESTRECORD, - __module__ = 'augmentrecord_pb2' +AugmentAffiliationRequestRecord = _reflection.GeneratedProtocolMessageType('AugmentAffiliationRequestRecord', (_message.Message,), { + 'DESCRIPTOR' : _AUGMENTAFFILIATIONREQUESTRECORD, + '__module__' : 'augmentrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.AugmentAffiliationRequestRecord) - )) + }) _sym_db.RegisterMessage(AugmentAffiliationRequestRecord) -AugmentAffiliationRequestRecordList = _reflection.GeneratedProtocolMessageType('AugmentAffiliationRequestRecordList', (_message.Message,), dict( - DESCRIPTOR = _AUGMENTAFFILIATIONREQUESTRECORDLIST, - __module__ = 'augmentrecord_pb2' +AugmentAffiliationRequestRecordList = _reflection.GeneratedProtocolMessageType('AugmentAffiliationRequestRecordList', (_message.Message,), { + 'DESCRIPTOR' : _AUGMENTAFFILIATIONREQUESTRECORDLIST, + '__module__' : 'augmentrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.AugmentAffiliationRequestRecordList) - )) + }) _sym_db.RegisterMessage(AugmentAffiliationRequestRecordList) -AugmentAffiliationResponseRecord = _reflection.GeneratedProtocolMessageType('AugmentAffiliationResponseRecord', (_message.Message,), dict( - DESCRIPTOR = _AUGMENTAFFILIATIONRESPONSERECORD, - __module__ = 'augmentrecord_pb2' +AugmentAffiliationResponseRecord = _reflection.GeneratedProtocolMessageType('AugmentAffiliationResponseRecord', (_message.Message,), { + 'DESCRIPTOR' : _AUGMENTAFFILIATIONRESPONSERECORD, + '__module__' : 'augmentrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.AugmentAffiliationResponseRecord) - )) + }) _sym_db.RegisterMessage(AugmentAffiliationResponseRecord) -AugmentAffiliationResponseRecordList = _reflection.GeneratedProtocolMessageType('AugmentAffiliationResponseRecordList', (_message.Message,), dict( - DESCRIPTOR = _AUGMENTAFFILIATIONRESPONSERECORDLIST, - __module__ = 'augmentrecord_pb2' +AugmentAffiliationResponseRecordList = _reflection.GeneratedProtocolMessageType('AugmentAffiliationResponseRecordList', (_message.Message,), { + 'DESCRIPTOR' : _AUGMENTAFFILIATIONRESPONSERECORDLIST, + '__module__' : 'augmentrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.AugmentAffiliationResponseRecordList) - )) + }) _sym_db.RegisterMessage(AugmentAffiliationResponseRecordList) diff --git a/adsmsg/protobuf/bibrecord_pb2.py b/adsmsg/protobuf/bibrecord_pb2.py index 656aaf9..67d18c0 100644 --- a/adsmsg/protobuf/bibrecord_pb2.py +++ b/adsmsg/protobuf/bibrecord_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: bibrecord.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='bibrecord.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x0f\x62ibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x85\x1b\n\tBibRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x18\n\x10JSON_fingerprint\x18\x02 \x01(\t\x12,\n\x08metadata\x18\x03 \x01(\x0b\x32\x1a.adsmsg.BibRecord.Metadata\x12$\n\x04text\x18\x04 \x01(\x0b\x32\x16.adsmsg.BibRecord.Text\x12\x1e\n\x06status\x18\x05 \x01(\x0e\x32\x0e.adsmsg.Status\x1a\xa2\x17\n\x08Metadata\x12\x33\n\x07general\x18\x01 \x01(\x0b\x32\".adsmsg.BibRecord.Metadata.General\x12\x39\n\nproperties\x18\x02 \x01(\x0b\x32%.adsmsg.BibRecord.Metadata.Properties\x12\x39\n\nreferences\x18\x03 \x03(\x0b\x32%.adsmsg.BibRecord.Metadata.References\x12\x37\n\trelations\x18\x04 \x01(\x0b\x32$.adsmsg.BibRecord.Metadata.Relations\x1a\xcb\r\n\x07General\x12\x17\n\x0f\x61rxivcategories\x18\x01 \x03(\t\x12<\n\x08keywords\x18\x02 \x03(\x0b\x32*.adsmsg.BibRecord.Metadata.General.Keyword\x12\x38\n\x06titles\x18\x03 \x03(\x0b\x32(.adsmsg.BibRecord.Metadata.General.Title\x12>\n\tabstracts\x18\x04 \x03(\x0b\x32+.adsmsg.BibRecord.Metadata.General.Abstract\x12\x39\n\x06\x61uthor\x18\x05 \x03(\x0b\x32).adsmsg.BibRecord.Metadata.General.Author\x12\x44\n\x0cpublications\x18\x06 \x03(\x0b\x32..adsmsg.BibRecord.Metadata.General.Publication\x12G\n\x0f\x61ltpublications\x18\x07 \x03(\x0b\x32..adsmsg.BibRecord.Metadata.General.Publication\x12\x30\n\rconf_metadata\x18\x08 \x01(\x0b\x32\x19.adsmsg.BibRecord.Content\x12*\n\x07pubnote\x18\t \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12(\n\x05isbns\x18\n \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12(\n\x05issns\x18\x0b \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12&\n\x03\x64oi\x18\x0c \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12,\n\tcopyright\x18\r \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12*\n\x07\x63omment\x18\x0e \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12>\n\x0b\x62ook_author\x18\x0f \x03(\x0b\x32).adsmsg.BibRecord.Metadata.General.Author\x12\x39\n\x06\x65\x64itor\x18\x10 \x03(\x0b\x32).adsmsg.BibRecord.Metadata.General.Author\x1a^\n\x07Keyword\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0f\n\x07\x63hannel\x18\x03 \x01(\t\x12\x10\n\x08original\x18\x04 \x01(\t\x12\x12\n\nnormalized\x18\x05 \x01(\t\x1a#\n\x05Title\x12\x0c\n\x04lang\x18\x01 \x01(\t\x12\x0c\n\x04text\x18\x02 \x01(\t\x1a\x36\n\x08\x41\x62stract\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04long\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x1a\xe2\x01\n\x06\x41uthor\x12\x0e\n\x06number\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x14\n\x0c\x61\x66\x66iliations\x18\x03 \x03(\t\x12\x0e\n\x06\x65mails\x18\x04 \x03(\t\x12\r\n\x05orcid\x18\x05 \x01(\t\x12\x42\n\x04name\x18\x06 \x01(\x0b\x32\x34.adsmsg.BibRecord.Metadata.General.Author.AuthorName\x1a\x41\n\nAuthorName\x12\x0e\n\x06native\x18\x01 \x01(\t\x12\x0f\n\x07western\x18\x02 \x01(\t\x12\x12\n\nnormalized\x18\x03 \x01(\t\x1a\xd3\x03\n\x0bPublication\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04page\x18\x02 \x01(\t\x12\x11\n\tpage_last\x18\x03 \x01(\t\x12\x12\n\npage_range\x18\x04 \x01(\t\x12\x12\n\npage_count\x18\x05 \x01(\t\x12\x15\n\relectronic_id\x18\x06 \x01(\t\x12\x0e\n\x06volume\x18\x07 \x01(\t\x12\r\n\x05issue\x18\x08 \x01(\t\x12L\n\x04name\x18\t \x01(\x0b\x32>.adsmsg.BibRecord.Metadata.General.Publication.PublicationName\x12M\n\x05\x64\x61tes\x18\n \x03(\x0b\x32>.adsmsg.BibRecord.Metadata.General.Publication.PublicationDate\x12\x0e\n\x06series\x18\x0b \x01(\t\x12\x11\n\tpublisher\x18\x0c \x01(\t\x12\x0f\n\x07version\x18\r \x01(\t\x1a\x32\n\x0fPublicationName\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x11\n\tcanonical\x18\x02 \x01(\t\x1a\x30\n\x0fPublicationDate\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\t\x1a\xbd\x03\n\nProperties\x12,\n\tdatabases\x18\x01 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12*\n\x07\x64octype\x18\x02 \x01(\x0b\x32\x19.adsmsg.BibRecord.Content\x12,\n\tbibgroups\x18\x03 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12-\n\nassociates\x18\x04 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12/\n\x0c\x64\x61ta_sources\x18\x05 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12\x30\n\rvizier_tables\x18\x06 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12\x12\n\nopenaccess\x18\x07 \x01(\x08\x12\x13\n\x0bocrabstract\x18\x08 \x01(\x08\x12\x0f\n\x07private\x18\t \x01(\x08\x12\x10\n\x08refereed\x18\n \x01(\x08\x12\x16\n\x0e\x61\x64s_openaccess\x18\x0b \x01(\x08\x12\x19\n\x11\x65print_openaccess\x18\x0c \x01(\x08\x12\x16\n\x0epub_openaccess\x18\r \x01(\x08\x1am\n\nReferences\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0f\n\x07\x62ibcode\x18\x02 \x01(\t\x12\x0b\n\x03\x64oi\x18\x03 \x01(\t\x12\r\n\x05score\x18\x04 \x01(\t\x12\x11\n\textension\x18\x05 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x06 \x01(\t\x1a\xb4\x03\n\tRelations\x12@\n\tpreprints\x18\x01 \x03(\x0b\x32-.adsmsg.BibRecord.Metadata.Relations.Preprint\x12J\n\nalternates\x18\x02 \x03(\x0b\x32\x36.adsmsg.BibRecord.Metadata.Relations.AlternateRelation\x12\x38\n\x05links\x18\x03 \x03(\x0b\x32).adsmsg.BibRecord.Metadata.Relations.Link\x1a:\n\x08Preprint\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\r\n\x05\x65\x63ode\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x1a\x42\n\x11\x41lternateRelation\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x1a_\n\x04Link\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x01(\t\x12\r\n\x05title\x18\x04 \x01(\t\x12\r\n\x05\x63ount\x18\x05 \x01(\t\x12\x0e\n\x06\x61\x63\x63\x65ss\x18\x06 \x01(\t\x1a\x87\x02\n\x04Text\x12)\n\x04\x62ody\x18\x01 \x01(\x0b\x32\x1b.adsmsg.BibRecord.Text.Body\x12?\n\x0f\x61\x63knowledgments\x18\x02 \x01(\x0b\x32&.adsmsg.BibRecord.Text.Acknowledgments\x1aL\n\x04\x42ody\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\t\x12\x10\n\x08provider\x18\x02 \x01(\t\x12\x10\n\x08language\x18\x03 \x01(\t\x12\x0f\n\x07modtime\x18\x04 \x01(\t\x1a\x45\n\x0f\x41\x63knowledgments\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\t\x12\x10\n\x08provider\x18\x02 \x01(\t\x12\x0f\n\x07modtime\x18\x03 \x01(\t\x1a*\n\x07\x43ontent\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\tb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x0f\x62ibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x85\x1b\n\tBibRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x18\n\x10JSON_fingerprint\x18\x02 \x01(\t\x12,\n\x08metadata\x18\x03 \x01(\x0b\x32\x1a.adsmsg.BibRecord.Metadata\x12$\n\x04text\x18\x04 \x01(\x0b\x32\x16.adsmsg.BibRecord.Text\x12\x1e\n\x06status\x18\x05 \x01(\x0e\x32\x0e.adsmsg.Status\x1a\xa2\x17\n\x08Metadata\x12\x33\n\x07general\x18\x01 \x01(\x0b\x32\".adsmsg.BibRecord.Metadata.General\x12\x39\n\nproperties\x18\x02 \x01(\x0b\x32%.adsmsg.BibRecord.Metadata.Properties\x12\x39\n\nreferences\x18\x03 \x03(\x0b\x32%.adsmsg.BibRecord.Metadata.References\x12\x37\n\trelations\x18\x04 \x01(\x0b\x32$.adsmsg.BibRecord.Metadata.Relations\x1a\xcb\r\n\x07General\x12\x17\n\x0f\x61rxivcategories\x18\x01 \x03(\t\x12<\n\x08keywords\x18\x02 \x03(\x0b\x32*.adsmsg.BibRecord.Metadata.General.Keyword\x12\x38\n\x06titles\x18\x03 \x03(\x0b\x32(.adsmsg.BibRecord.Metadata.General.Title\x12>\n\tabstracts\x18\x04 \x03(\x0b\x32+.adsmsg.BibRecord.Metadata.General.Abstract\x12\x39\n\x06\x61uthor\x18\x05 \x03(\x0b\x32).adsmsg.BibRecord.Metadata.General.Author\x12\x44\n\x0cpublications\x18\x06 \x03(\x0b\x32..adsmsg.BibRecord.Metadata.General.Publication\x12G\n\x0f\x61ltpublications\x18\x07 \x03(\x0b\x32..adsmsg.BibRecord.Metadata.General.Publication\x12\x30\n\rconf_metadata\x18\x08 \x01(\x0b\x32\x19.adsmsg.BibRecord.Content\x12*\n\x07pubnote\x18\t \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12(\n\x05isbns\x18\n \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12(\n\x05issns\x18\x0b \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12&\n\x03\x64oi\x18\x0c \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12,\n\tcopyright\x18\r \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12*\n\x07\x63omment\x18\x0e \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12>\n\x0b\x62ook_author\x18\x0f \x03(\x0b\x32).adsmsg.BibRecord.Metadata.General.Author\x12\x39\n\x06\x65\x64itor\x18\x10 \x03(\x0b\x32).adsmsg.BibRecord.Metadata.General.Author\x1a^\n\x07Keyword\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0f\n\x07\x63hannel\x18\x03 \x01(\t\x12\x10\n\x08original\x18\x04 \x01(\t\x12\x12\n\nnormalized\x18\x05 \x01(\t\x1a#\n\x05Title\x12\x0c\n\x04lang\x18\x01 \x01(\t\x12\x0c\n\x04text\x18\x02 \x01(\t\x1a\x36\n\x08\x41\x62stract\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04long\x18\x02 \x01(\t\x12\x0c\n\x04text\x18\x03 \x01(\t\x1a\xe2\x01\n\x06\x41uthor\x12\x0e\n\x06number\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x14\n\x0c\x61\x66\x66iliations\x18\x03 \x03(\t\x12\x0e\n\x06\x65mails\x18\x04 \x03(\t\x12\r\n\x05orcid\x18\x05 \x01(\t\x12\x42\n\x04name\x18\x06 \x01(\x0b\x32\x34.adsmsg.BibRecord.Metadata.General.Author.AuthorName\x1a\x41\n\nAuthorName\x12\x0e\n\x06native\x18\x01 \x01(\t\x12\x0f\n\x07western\x18\x02 \x01(\t\x12\x12\n\nnormalized\x18\x03 \x01(\t\x1a\xd3\x03\n\x0bPublication\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04page\x18\x02 \x01(\t\x12\x11\n\tpage_last\x18\x03 \x01(\t\x12\x12\n\npage_range\x18\x04 \x01(\t\x12\x12\n\npage_count\x18\x05 \x01(\t\x12\x15\n\relectronic_id\x18\x06 \x01(\t\x12\x0e\n\x06volume\x18\x07 \x01(\t\x12\r\n\x05issue\x18\x08 \x01(\t\x12L\n\x04name\x18\t \x01(\x0b\x32>.adsmsg.BibRecord.Metadata.General.Publication.PublicationName\x12M\n\x05\x64\x61tes\x18\n \x03(\x0b\x32>.adsmsg.BibRecord.Metadata.General.Publication.PublicationDate\x12\x0e\n\x06series\x18\x0b \x01(\t\x12\x11\n\tpublisher\x18\x0c \x01(\t\x12\x0f\n\x07version\x18\r \x01(\t\x1a\x32\n\x0fPublicationName\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x11\n\tcanonical\x18\x02 \x01(\t\x1a\x30\n\x0fPublicationDate\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\t\x1a\xbd\x03\n\nProperties\x12,\n\tdatabases\x18\x01 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12*\n\x07\x64octype\x18\x02 \x01(\x0b\x32\x19.adsmsg.BibRecord.Content\x12,\n\tbibgroups\x18\x03 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12-\n\nassociates\x18\x04 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12/\n\x0c\x64\x61ta_sources\x18\x05 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12\x30\n\rvizier_tables\x18\x06 \x03(\x0b\x32\x19.adsmsg.BibRecord.Content\x12\x12\n\nopenaccess\x18\x07 \x01(\x08\x12\x13\n\x0bocrabstract\x18\x08 \x01(\x08\x12\x0f\n\x07private\x18\t \x01(\x08\x12\x10\n\x08refereed\x18\n \x01(\x08\x12\x16\n\x0e\x61\x64s_openaccess\x18\x0b \x01(\x08\x12\x19\n\x11\x65print_openaccess\x18\x0c \x01(\x08\x12\x16\n\x0epub_openaccess\x18\r \x01(\x08\x1am\n\nReferences\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0f\n\x07\x62ibcode\x18\x02 \x01(\t\x12\x0b\n\x03\x64oi\x18\x03 \x01(\t\x12\r\n\x05score\x18\x04 \x01(\t\x12\x11\n\textension\x18\x05 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x06 \x01(\t\x1a\xb4\x03\n\tRelations\x12@\n\tpreprints\x18\x01 \x03(\x0b\x32-.adsmsg.BibRecord.Metadata.Relations.Preprint\x12J\n\nalternates\x18\x02 \x03(\x0b\x32\x36.adsmsg.BibRecord.Metadata.Relations.AlternateRelation\x12\x38\n\x05links\x18\x03 \x03(\x0b\x32).adsmsg.BibRecord.Metadata.Relations.Link\x1a:\n\x08Preprint\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\r\n\x05\x65\x63ode\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x1a\x42\n\x11\x41lternateRelation\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x03 \x01(\t\x1a_\n\x04Link\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0c\n\x04type\x18\x02 \x01(\t\x12\x0b\n\x03url\x18\x03 \x01(\t\x12\r\n\x05title\x18\x04 \x01(\t\x12\r\n\x05\x63ount\x18\x05 \x01(\t\x12\x0e\n\x06\x61\x63\x63\x65ss\x18\x06 \x01(\t\x1a\x87\x02\n\x04Text\x12)\n\x04\x62ody\x18\x01 \x01(\x0b\x32\x1b.adsmsg.BibRecord.Text.Body\x12?\n\x0f\x61\x63knowledgments\x18\x02 \x01(\x0b\x32&.adsmsg.BibRecord.Text.Acknowledgments\x1aL\n\x04\x42ody\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\t\x12\x10\n\x08provider\x18\x02 \x01(\t\x12\x10\n\x08language\x18\x03 \x01(\t\x12\x0f\n\x07modtime\x18\x04 \x01(\t\x1a\x45\n\x0f\x41\x63knowledgments\x12\x0f\n\x07\x63ontent\x18\x01 \x01(\t\x12\x10\n\x08provider\x18\x02 \x01(\t\x12\x0f\n\x07modtime\x18\x03 \x01(\t\x1a*\n\x07\x43ontent\x12\x0e\n\x06origin\x18\x01 \x01(\t\x12\x0f\n\x07\x63ontent\x18\x02 \x01(\tb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -37,45 +36,45 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.General.Keyword.origin', 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), _descriptor.FieldDescriptor( name='type', full_name='adsmsg.BibRecord.Metadata.General.Keyword.type', 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), _descriptor.FieldDescriptor( name='channel', full_name='adsmsg.BibRecord.Metadata.General.Keyword.channel', index=2, number=3, 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), _descriptor.FieldDescriptor( name='original', full_name='adsmsg.BibRecord.Metadata.General.Keyword.original', index=3, number=4, 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), _descriptor.FieldDescriptor( name='normalized', full_name='adsmsg.BibRecord.Metadata.General.Keyword.normalized', index=4, number=5, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -95,24 +94,24 @@ _descriptor.FieldDescriptor( name='lang', full_name='adsmsg.BibRecord.Metadata.General.Title.lang', 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), _descriptor.FieldDescriptor( name='text', full_name='adsmsg.BibRecord.Metadata.General.Title.text', 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -132,31 +131,31 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.General.Abstract.origin', 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), _descriptor.FieldDescriptor( name='long', full_name='adsmsg.BibRecord.Metadata.General.Abstract.long', 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), _descriptor.FieldDescriptor( name='text', full_name='adsmsg.BibRecord.Metadata.General.Abstract.text', index=2, number=3, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -176,31 +175,31 @@ _descriptor.FieldDescriptor( name='native', full_name='adsmsg.BibRecord.Metadata.General.Author.AuthorName.native', 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), _descriptor.FieldDescriptor( name='western', full_name='adsmsg.BibRecord.Metadata.General.Author.AuthorName.western', 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), _descriptor.FieldDescriptor( name='normalized', full_name='adsmsg.BibRecord.Metadata.General.Author.AuthorName.normalized', index=2, number=3, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -220,52 +219,52 @@ _descriptor.FieldDescriptor( name='number', full_name='adsmsg.BibRecord.Metadata.General.Author.number', 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), _descriptor.FieldDescriptor( name='type', full_name='adsmsg.BibRecord.Metadata.General.Author.type', 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), _descriptor.FieldDescriptor( name='affiliations', full_name='adsmsg.BibRecord.Metadata.General.Author.affiliations', index=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='emails', full_name='adsmsg.BibRecord.Metadata.General.Author.emails', index=3, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='orcid', full_name='adsmsg.BibRecord.Metadata.General.Author.orcid', index=4, number=5, 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), _descriptor.FieldDescriptor( name='name', full_name='adsmsg.BibRecord.Metadata.General.Author.name', index=5, number=6, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[_BIBRECORD_METADATA_GENERAL_AUTHOR_AUTHORNAME, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -285,24 +284,24 @@ _descriptor.FieldDescriptor( name='type', full_name='adsmsg.BibRecord.Metadata.General.Publication.PublicationName.type', 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), _descriptor.FieldDescriptor( name='canonical', full_name='adsmsg.BibRecord.Metadata.General.Publication.PublicationName.canonical', 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -322,24 +321,24 @@ _descriptor.FieldDescriptor( name='type', full_name='adsmsg.BibRecord.Metadata.General.Publication.PublicationDate.type', 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), _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Metadata.General.Publication.PublicationDate.content', 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -359,101 +358,101 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.General.Publication.origin', 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), _descriptor.FieldDescriptor( name='page', full_name='adsmsg.BibRecord.Metadata.General.Publication.page', 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), _descriptor.FieldDescriptor( name='page_last', full_name='adsmsg.BibRecord.Metadata.General.Publication.page_last', index=2, number=3, 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), _descriptor.FieldDescriptor( name='page_range', full_name='adsmsg.BibRecord.Metadata.General.Publication.page_range', index=3, number=4, 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), _descriptor.FieldDescriptor( name='page_count', full_name='adsmsg.BibRecord.Metadata.General.Publication.page_count', index=4, number=5, 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), _descriptor.FieldDescriptor( name='electronic_id', full_name='adsmsg.BibRecord.Metadata.General.Publication.electronic_id', index=5, number=6, 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), _descriptor.FieldDescriptor( name='volume', full_name='adsmsg.BibRecord.Metadata.General.Publication.volume', index=6, number=7, 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), _descriptor.FieldDescriptor( name='issue', full_name='adsmsg.BibRecord.Metadata.General.Publication.issue', index=7, number=8, 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), _descriptor.FieldDescriptor( name='name', full_name='adsmsg.BibRecord.Metadata.General.Publication.name', index=8, number=9, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='dates', full_name='adsmsg.BibRecord.Metadata.General.Publication.dates', index=9, number=10, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='series', full_name='adsmsg.BibRecord.Metadata.General.Publication.series', index=10, number=11, 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), _descriptor.FieldDescriptor( name='publisher', full_name='adsmsg.BibRecord.Metadata.General.Publication.publisher', index=11, number=12, 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), _descriptor.FieldDescriptor( name='version', full_name='adsmsg.BibRecord.Metadata.General.Publication.version', index=12, number=13, 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), ], extensions=[ ], nested_types=[_BIBRECORD_METADATA_GENERAL_PUBLICATION_PUBLICATIONNAME, _BIBRECORD_METADATA_GENERAL_PUBLICATION_PUBLICATIONDATE, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -476,119 +475,119 @@ 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), _descriptor.FieldDescriptor( name='keywords', full_name='adsmsg.BibRecord.Metadata.General.keywords', index=1, number=2, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='titles', full_name='adsmsg.BibRecord.Metadata.General.titles', index=2, number=3, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='abstracts', full_name='adsmsg.BibRecord.Metadata.General.abstracts', index=3, number=4, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='author', full_name='adsmsg.BibRecord.Metadata.General.author', index=4, number=5, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='publications', full_name='adsmsg.BibRecord.Metadata.General.publications', index=5, number=6, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='altpublications', full_name='adsmsg.BibRecord.Metadata.General.altpublications', index=6, number=7, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='conf_metadata', full_name='adsmsg.BibRecord.Metadata.General.conf_metadata', index=7, number=8, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='pubnote', full_name='adsmsg.BibRecord.Metadata.General.pubnote', index=8, number=9, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='isbns', full_name='adsmsg.BibRecord.Metadata.General.isbns', index=9, number=10, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='issns', full_name='adsmsg.BibRecord.Metadata.General.issns', index=10, number=11, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='doi', full_name='adsmsg.BibRecord.Metadata.General.doi', index=11, number=12, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='copyright', full_name='adsmsg.BibRecord.Metadata.General.copyright', index=12, number=13, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='comment', full_name='adsmsg.BibRecord.Metadata.General.comment', index=13, number=14, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='book_author', full_name='adsmsg.BibRecord.Metadata.General.book_author', index=14, number=15, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='editor', full_name='adsmsg.BibRecord.Metadata.General.editor', index=15, number=16, type=11, cpp_type=10, label=3, 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), ], extensions=[ ], nested_types=[_BIBRECORD_METADATA_GENERAL_KEYWORD, _BIBRECORD_METADATA_GENERAL_TITLE, _BIBRECORD_METADATA_GENERAL_ABSTRACT, _BIBRECORD_METADATA_GENERAL_AUTHOR, _BIBRECORD_METADATA_GENERAL_PUBLICATION, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -611,98 +610,98 @@ 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), _descriptor.FieldDescriptor( name='doctype', full_name='adsmsg.BibRecord.Metadata.Properties.doctype', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bibgroups', full_name='adsmsg.BibRecord.Metadata.Properties.bibgroups', index=2, number=3, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='associates', full_name='adsmsg.BibRecord.Metadata.Properties.associates', index=3, number=4, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='data_sources', full_name='adsmsg.BibRecord.Metadata.Properties.data_sources', index=4, number=5, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='vizier_tables', full_name='adsmsg.BibRecord.Metadata.Properties.vizier_tables', index=5, number=6, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='openaccess', full_name='adsmsg.BibRecord.Metadata.Properties.openaccess', index=6, number=7, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ocrabstract', full_name='adsmsg.BibRecord.Metadata.Properties.ocrabstract', index=7, number=8, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='private', full_name='adsmsg.BibRecord.Metadata.Properties.private', index=8, number=9, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='refereed', full_name='adsmsg.BibRecord.Metadata.Properties.refereed', index=9, number=10, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ads_openaccess', full_name='adsmsg.BibRecord.Metadata.Properties.ads_openaccess', index=10, number=11, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='eprint_openaccess', full_name='adsmsg.BibRecord.Metadata.Properties.eprint_openaccess', index=11, number=12, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='pub_openaccess', full_name='adsmsg.BibRecord.Metadata.Properties.pub_openaccess', index=12, number=13, 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), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -722,52 +721,52 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.References.origin', 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), _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.BibRecord.Metadata.References.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), _descriptor.FieldDescriptor( name='doi', full_name='adsmsg.BibRecord.Metadata.References.doi', index=2, number=3, 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), _descriptor.FieldDescriptor( name='score', full_name='adsmsg.BibRecord.Metadata.References.score', index=3, number=4, 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), _descriptor.FieldDescriptor( name='extension', full_name='adsmsg.BibRecord.Metadata.References.extension', index=4, number=5, 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), _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Metadata.References.content', index=5, number=6, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -787,31 +786,31 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.Relations.Preprint.origin', 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), _descriptor.FieldDescriptor( name='ecode', full_name='adsmsg.BibRecord.Metadata.Relations.Preprint.ecode', 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), _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Metadata.Relations.Preprint.content', index=2, number=3, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -831,31 +830,31 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.Relations.AlternateRelation.origin', 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), _descriptor.FieldDescriptor( name='type', full_name='adsmsg.BibRecord.Metadata.Relations.AlternateRelation.type', 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), _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Metadata.Relations.AlternateRelation.content', index=2, number=3, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -875,52 +874,52 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Metadata.Relations.Link.origin', 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), _descriptor.FieldDescriptor( name='type', full_name='adsmsg.BibRecord.Metadata.Relations.Link.type', 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), _descriptor.FieldDescriptor( name='url', full_name='adsmsg.BibRecord.Metadata.Relations.Link.url', index=2, number=3, 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), _descriptor.FieldDescriptor( name='title', full_name='adsmsg.BibRecord.Metadata.Relations.Link.title', index=3, number=4, 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), _descriptor.FieldDescriptor( name='count', full_name='adsmsg.BibRecord.Metadata.Relations.Link.count', index=4, number=5, 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), _descriptor.FieldDescriptor( name='access', full_name='adsmsg.BibRecord.Metadata.Relations.Link.access', index=5, number=6, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -943,28 +942,28 @@ 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), _descriptor.FieldDescriptor( name='alternates', full_name='adsmsg.BibRecord.Metadata.Relations.alternates', index=1, number=2, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='links', full_name='adsmsg.BibRecord.Metadata.Relations.links', index=2, number=3, type=11, cpp_type=10, label=3, 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), ], extensions=[ ], nested_types=[_BIBRECORD_METADATA_RELATIONS_PREPRINT, _BIBRECORD_METADATA_RELATIONS_ALTERNATERELATION, _BIBRECORD_METADATA_RELATIONS_LINK, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -987,35 +986,35 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='properties', full_name='adsmsg.BibRecord.Metadata.properties', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='references', full_name='adsmsg.BibRecord.Metadata.references', index=2, number=3, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='relations', full_name='adsmsg.BibRecord.Metadata.relations', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[_BIBRECORD_METADATA_GENERAL, _BIBRECORD_METADATA_PROPERTIES, _BIBRECORD_METADATA_REFERENCES, _BIBRECORD_METADATA_RELATIONS, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -1035,38 +1034,38 @@ _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Text.Body.content', 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), _descriptor.FieldDescriptor( name='provider', full_name='adsmsg.BibRecord.Text.Body.provider', 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), _descriptor.FieldDescriptor( name='language', full_name='adsmsg.BibRecord.Text.Body.language', index=2, number=3, 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), _descriptor.FieldDescriptor( name='modtime', full_name='adsmsg.BibRecord.Text.Body.modtime', index=3, number=4, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -1086,31 +1085,31 @@ _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Text.Acknowledgments.content', 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), _descriptor.FieldDescriptor( name='provider', full_name='adsmsg.BibRecord.Text.Acknowledgments.provider', 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), _descriptor.FieldDescriptor( name='modtime', full_name='adsmsg.BibRecord.Text.Acknowledgments.modtime', index=2, number=3, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -1133,21 +1132,21 @@ has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='acknowledgments', full_name='adsmsg.BibRecord.Text.acknowledgments', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[_BIBRECORD_TEXT_BODY, _BIBRECORD_TEXT_ACKNOWLEDGMENTS, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -1167,24 +1166,24 @@ _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.BibRecord.Content.origin', 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), _descriptor.FieldDescriptor( name='content', full_name='adsmsg.BibRecord.Content.content', 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -1204,45 +1203,45 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.BibRecord.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), _descriptor.FieldDescriptor( name='JSON_fingerprint', full_name='adsmsg.BibRecord.JSON_fingerprint', 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), _descriptor.FieldDescriptor( name='metadata', full_name='adsmsg.BibRecord.metadata', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='text', full_name='adsmsg.BibRecord.text', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.BibRecord.status', index=4, 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, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[_BIBRECORD_METADATA, _BIBRECORD_TEXT, _BIBRECORD_CONTENT, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -1311,151 +1310,151 @@ DESCRIPTOR.message_types_by_name['BibRecord'] = _BIBRECORD _sym_db.RegisterFileDescriptor(DESCRIPTOR) -BibRecord = _reflection.GeneratedProtocolMessageType('BibRecord', (_message.Message,), dict( +BibRecord = _reflection.GeneratedProtocolMessageType('BibRecord', (_message.Message,), { - Metadata = _reflection.GeneratedProtocolMessageType('Metadata', (_message.Message,), dict( + 'Metadata' : _reflection.GeneratedProtocolMessageType('Metadata', (_message.Message,), { - General = _reflection.GeneratedProtocolMessageType('General', (_message.Message,), dict( + 'General' : _reflection.GeneratedProtocolMessageType('General', (_message.Message,), { - Keyword = _reflection.GeneratedProtocolMessageType('Keyword', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_KEYWORD, - __module__ = 'bibrecord_pb2' + 'Keyword' : _reflection.GeneratedProtocolMessageType('Keyword', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_KEYWORD, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Keyword) - )) + }) , - Title = _reflection.GeneratedProtocolMessageType('Title', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_TITLE, - __module__ = 'bibrecord_pb2' + 'Title' : _reflection.GeneratedProtocolMessageType('Title', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_TITLE, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Title) - )) + }) , - Abstract = _reflection.GeneratedProtocolMessageType('Abstract', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_ABSTRACT, - __module__ = 'bibrecord_pb2' + 'Abstract' : _reflection.GeneratedProtocolMessageType('Abstract', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_ABSTRACT, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Abstract) - )) + }) , - Author = _reflection.GeneratedProtocolMessageType('Author', (_message.Message,), dict( + 'Author' : _reflection.GeneratedProtocolMessageType('Author', (_message.Message,), { - AuthorName = _reflection.GeneratedProtocolMessageType('AuthorName', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_AUTHOR_AUTHORNAME, - __module__ = 'bibrecord_pb2' + 'AuthorName' : _reflection.GeneratedProtocolMessageType('AuthorName', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_AUTHOR_AUTHORNAME, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Author.AuthorName) - )) + }) , - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_AUTHOR, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_AUTHOR, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Author) - )) + }) , - Publication = _reflection.GeneratedProtocolMessageType('Publication', (_message.Message,), dict( + 'Publication' : _reflection.GeneratedProtocolMessageType('Publication', (_message.Message,), { - PublicationName = _reflection.GeneratedProtocolMessageType('PublicationName', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_PUBLICATION_PUBLICATIONNAME, - __module__ = 'bibrecord_pb2' + 'PublicationName' : _reflection.GeneratedProtocolMessageType('PublicationName', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_PUBLICATION_PUBLICATIONNAME, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Publication.PublicationName) - )) + }) , - PublicationDate = _reflection.GeneratedProtocolMessageType('PublicationDate', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_PUBLICATION_PUBLICATIONDATE, - __module__ = 'bibrecord_pb2' + 'PublicationDate' : _reflection.GeneratedProtocolMessageType('PublicationDate', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_PUBLICATION_PUBLICATIONDATE, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Publication.PublicationDate) - )) + }) , - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL_PUBLICATION, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL_PUBLICATION, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General.Publication) - )) + }) , - DESCRIPTOR = _BIBRECORD_METADATA_GENERAL, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD_METADATA_GENERAL, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.General) - )) + }) , - Properties = _reflection.GeneratedProtocolMessageType('Properties', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_PROPERTIES, - __module__ = 'bibrecord_pb2' + 'Properties' : _reflection.GeneratedProtocolMessageType('Properties', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_PROPERTIES, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.Properties) - )) + }) , - References = _reflection.GeneratedProtocolMessageType('References', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_REFERENCES, - __module__ = 'bibrecord_pb2' + 'References' : _reflection.GeneratedProtocolMessageType('References', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_REFERENCES, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.References) - )) + }) , - Relations = _reflection.GeneratedProtocolMessageType('Relations', (_message.Message,), dict( + 'Relations' : _reflection.GeneratedProtocolMessageType('Relations', (_message.Message,), { - Preprint = _reflection.GeneratedProtocolMessageType('Preprint', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_RELATIONS_PREPRINT, - __module__ = 'bibrecord_pb2' + 'Preprint' : _reflection.GeneratedProtocolMessageType('Preprint', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_RELATIONS_PREPRINT, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.Relations.Preprint) - )) + }) , - AlternateRelation = _reflection.GeneratedProtocolMessageType('AlternateRelation', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_RELATIONS_ALTERNATERELATION, - __module__ = 'bibrecord_pb2' + 'AlternateRelation' : _reflection.GeneratedProtocolMessageType('AlternateRelation', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_RELATIONS_ALTERNATERELATION, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.Relations.AlternateRelation) - )) + }) , - Link = _reflection.GeneratedProtocolMessageType('Link', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_METADATA_RELATIONS_LINK, - __module__ = 'bibrecord_pb2' + 'Link' : _reflection.GeneratedProtocolMessageType('Link', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_METADATA_RELATIONS_LINK, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.Relations.Link) - )) + }) , - DESCRIPTOR = _BIBRECORD_METADATA_RELATIONS, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD_METADATA_RELATIONS, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata.Relations) - )) + }) , - DESCRIPTOR = _BIBRECORD_METADATA, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD_METADATA, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Metadata) - )) + }) , - Text = _reflection.GeneratedProtocolMessageType('Text', (_message.Message,), dict( + 'Text' : _reflection.GeneratedProtocolMessageType('Text', (_message.Message,), { - Body = _reflection.GeneratedProtocolMessageType('Body', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_TEXT_BODY, - __module__ = 'bibrecord_pb2' + 'Body' : _reflection.GeneratedProtocolMessageType('Body', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_TEXT_BODY, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Text.Body) - )) + }) , - Acknowledgments = _reflection.GeneratedProtocolMessageType('Acknowledgments', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_TEXT_ACKNOWLEDGMENTS, - __module__ = 'bibrecord_pb2' + 'Acknowledgments' : _reflection.GeneratedProtocolMessageType('Acknowledgments', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_TEXT_ACKNOWLEDGMENTS, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Text.Acknowledgments) - )) + }) , - DESCRIPTOR = _BIBRECORD_TEXT, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD_TEXT, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Text) - )) + }) , - Content = _reflection.GeneratedProtocolMessageType('Content', (_message.Message,), dict( - DESCRIPTOR = _BIBRECORD_CONTENT, - __module__ = 'bibrecord_pb2' + 'Content' : _reflection.GeneratedProtocolMessageType('Content', (_message.Message,), { + 'DESCRIPTOR' : _BIBRECORD_CONTENT, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord.Content) - )) + }) , - DESCRIPTOR = _BIBRECORD, - __module__ = 'bibrecord_pb2' + 'DESCRIPTOR' : _BIBRECORD, + '__module__' : 'bibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.BibRecord) - )) + }) _sym_db.RegisterMessage(BibRecord) _sym_db.RegisterMessage(BibRecord.Metadata) _sym_db.RegisterMessage(BibRecord.Metadata.General) diff --git a/adsmsg/protobuf/citation_changes_content_type_pb2.py b/adsmsg/protobuf/citation_changes_content_type_pb2.py index f4b7fa0..c6bacee 100644 --- a/adsmsg/protobuf/citation_changes_content_type_pb2.py +++ b/adsmsg/protobuf/citation_changes_content_type_pb2.py @@ -1,14 +1,12 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: citation_changes_content_type.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf.internal import enum_type_wrapper 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,8 @@ name='citation_changes_content_type.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n#citation_changes_content_type.proto\x12\x06\x61\x64smsg*6\n\x19\x43itationChangeContentType\x12\x07\n\x03\x64oi\x10\x00\x12\x07\n\x03pid\x10\x01\x12\x07\n\x03url\x10\x02\x62\x06proto3') + serialized_options=None, + serialized_pb=b'\n#citation_changes_content_type.proto\x12\x06\x61\x64smsg*6\n\x19\x43itationChangeContentType\x12\x07\n\x03\x64oi\x10\x00\x12\x07\n\x03pid\x10\x01\x12\x07\n\x03url\x10\x02\x62\x06proto3' ) _CITATIONCHANGECONTENTTYPE = _descriptor.EnumDescriptor( @@ -31,19 +30,19 @@ values=[ _descriptor.EnumValueDescriptor( name='doi', index=0, number=0, - options=None, + serialized_options=None, type=None), _descriptor.EnumValueDescriptor( name='pid', index=1, number=1, - options=None, + serialized_options=None, type=None), _descriptor.EnumValueDescriptor( name='url', index=2, number=2, - options=None, + serialized_options=None, type=None), ], containing_type=None, - options=None, + serialized_options=None, serialized_start=47, serialized_end=101, ) diff --git a/adsmsg/protobuf/citation_changes_pb2.py b/adsmsg/protobuf/citation_changes_pb2.py index 39ea22d..6eb9e1b 100644 --- a/adsmsg/protobuf/citation_changes_pb2.py +++ b/adsmsg/protobuf/citation_changes_pb2.py @@ -1,28 +1,27 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: citation_changes.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() from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -import status_pb2 as status__pb2 -import citation_changes_content_type_pb2 as citation__changes__content__type__pb2 +from . import status_pb2 as status__pb2 +from . import citation_changes_content_type_pb2 as citation__changes__content__type__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='citation_changes.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x16\x63itation_changes.proto\x12\x06\x61\x64smsg\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x0cstatus.proto\x1a#citation_changes_content_type.proto\":\n\x0f\x43itationChanges\x12\'\n\x07\x63hanges\x18\x01 \x03(\x0b\x32\x16.adsmsg.CitationChange\"\xda\x01\n\x0e\x43itationChange\x12\x0e\n\x06\x63iting\x18\x01 \x01(\t\x12\r\n\x05\x63ited\x18\x02 \x01(\t\x12\x37\n\x0c\x63ontent_type\x18\x03 \x01(\x0e\x32!.adsmsg.CitationChangeContentType\x12\x0f\n\x07\x63ontent\x18\x04 \x01(\t\x12\x10\n\x08resolved\x18\x05 \x01(\x08\x12\x1e\n\x06status\x18\x06 \x01(\x0e\x32\x0e.adsmsg.Status\x12-\n\ttimestamp\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestampb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x16\x63itation_changes.proto\x12\x06\x61\x64smsg\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x0cstatus.proto\x1a#citation_changes_content_type.proto\":\n\x0f\x43itationChanges\x12\'\n\x07\x63hanges\x18\x01 \x03(\x0b\x32\x16.adsmsg.CitationChange\"\xda\x01\n\x0e\x43itationChange\x12\x0e\n\x06\x63iting\x18\x01 \x01(\t\x12\r\n\x05\x63ited\x18\x02 \x01(\t\x12\x37\n\x0c\x63ontent_type\x18\x03 \x01(\x0e\x32!.adsmsg.CitationChangeContentType\x12\x0f\n\x07\x63ontent\x18\x04 \x01(\t\x12\x10\n\x08resolved\x18\x05 \x01(\x08\x12\x1e\n\x06status\x18\x06 \x01(\x0e\x32\x0e.adsmsg.Status\x12-\n\ttimestamp\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestampb\x06proto3' , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,status__pb2.DESCRIPTOR,citation__changes__content__type__pb2.DESCRIPTOR,]) @@ -42,14 +41,14 @@ 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -70,59 +69,59 @@ _descriptor.FieldDescriptor( name='citing', full_name='adsmsg.CitationChange.citing', 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), _descriptor.FieldDescriptor( name='cited', full_name='adsmsg.CitationChange.cited', 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), _descriptor.FieldDescriptor( name='content_type', full_name='adsmsg.CitationChange.content_type', index=2, number=3, 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), _descriptor.FieldDescriptor( name='content', full_name='adsmsg.CitationChange.content', index=3, number=4, 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), _descriptor.FieldDescriptor( name='resolved', full_name='adsmsg.CitationChange.resolved', 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.CitationChange.status', index=5, number=6, 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), _descriptor.FieldDescriptor( name='timestamp', full_name='adsmsg.CitationChange.timestamp', index=6, number=7, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -140,18 +139,18 @@ DESCRIPTOR.message_types_by_name['CitationChange'] = _CITATIONCHANGE _sym_db.RegisterFileDescriptor(DESCRIPTOR) -CitationChanges = _reflection.GeneratedProtocolMessageType('CitationChanges', (_message.Message,), dict( - DESCRIPTOR = _CITATIONCHANGES, - __module__ = 'citation_changes_pb2' +CitationChanges = _reflection.GeneratedProtocolMessageType('CitationChanges', (_message.Message,), { + 'DESCRIPTOR' : _CITATIONCHANGES, + '__module__' : 'citation_changes_pb2' # @@protoc_insertion_point(class_scope:adsmsg.CitationChanges) - )) + }) _sym_db.RegisterMessage(CitationChanges) -CitationChange = _reflection.GeneratedProtocolMessageType('CitationChange', (_message.Message,), dict( - DESCRIPTOR = _CITATIONCHANGE, - __module__ = 'citation_changes_pb2' +CitationChange = _reflection.GeneratedProtocolMessageType('CitationChange', (_message.Message,), { + 'DESCRIPTOR' : _CITATIONCHANGE, + '__module__' : 'citation_changes_pb2' # @@protoc_insertion_point(class_scope:adsmsg.CitationChange) - )) + }) _sym_db.RegisterMessage(CitationChange) diff --git a/adsmsg/protobuf/denormalized_record_pb2.py b/adsmsg/protobuf/denormalized_record_pb2.py index 673f794..2913073 100644 --- a/adsmsg/protobuf/denormalized_record_pb2.py +++ b/adsmsg/protobuf/denormalized_record_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: denormalized_record.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='denormalized_record.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x19\x64\x65normalized_record.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x88\x0f\n\x12\x44\x65normalizedRecord\x12\x10\n\x08\x61\x62stract\x18\x01 \x01(\t\x12\x0b\n\x03\x61\x63k\x18\x02 \x01(\t\x12\x0b\n\x03\x61\x66\x66\x18\x03 \x03(\t\x12\x19\n\x11\x61lternate_bibcode\x18\x04 \x03(\t\x12\x17\n\x0f\x61lternate_title\x18\x05 \x03(\t\x12\x13\n\x0b\x61rxiv_class\x18\x06 \x03(\t\x12\x0e\n\x06\x61uthor\x18\x07 \x03(\t\x12\x14\n\x0c\x61uthor_count\x18\x08 \x01(\x05\x12\x14\n\x0c\x61uthor_facet\x18\t \x03(\t\x12\x19\n\x11\x61uthor_facet_hier\x18\x0b \x03(\t\x12\x13\n\x0b\x61uthor_norm\x18\x0c \x03(\t\x12\x13\n\x0b\x62ook_author\x18` \x03(\t\x12\x0e\n\x06\x65\x64itor\x18\x61 \x03(\t\x12\x0f\n\x07\x62ibcode\x18\r \x01(\t\x12\x10\n\x08\x62ibgroup\x18\x0e \x03(\t\x12\x16\n\x0e\x62ibgroup_facet\x18\x0f \x03(\t\x12\x0f\n\x07\x62ibstem\x18\x10 \x03(\t\x12\x15\n\rbibstem_facet\x18\x11 \x01(\t\x12\x0c\n\x04\x62ody\x18\x12 \x01(\t\x12\x10\n\x08\x63itation\x18\x13 \x03(\t\x12\x16\n\x0e\x63itation_count\x18\x14 \x01(\x04\x12\x1b\n\x13\x63itation_count_norm\x18_ \x01(\x01\x12\x17\n\x0f\x63ite_read_boost\x18\x15 \x01(\x01\x12\x16\n\x0e\x63lassic_factor\x18\x16 \x01(\x04\x12\x0f\n\x07\x63omment\x18\x17 \x03(\t\x12\x11\n\tcopyright\x18\x18 \x03(\t\x12\x10\n\x08\x64\x61tabase\x18\x19 \x03(\t\x12\x12\n\ndata_count\x18] \x01(\x05\x12\x0c\n\x04\x64\x61te\x18\x1a \x01(\t\x12\x0f\n\x07\x64octype\x18\x1d \x01(\t\x12\x1a\n\x12\x64octype_facet_hier\x18\x1e \x03(\t\x12\x0b\n\x03\x64oi\x18\x1f \x03(\t\x12\x0b\n\x03\x65id\x18 \x01(\t\x12\r\n\x05\x65mail\x18! \x03(\t\x12\x12\n\nentry_date\x18L \x01(\t\x12\x10\n\x08\x65sources\x18^ \x03(\t\x12\x10\n\x08\x66\x61\x63ility\x18\" \x03(\t\x12\x14\n\x0c\x66irst_author\x18# \x01(\t\x12\x1f\n\x17\x66irst_author_facet_hier\x18$ \x03(\t\x12\x19\n\x11\x66irst_author_norm\x18% \x01(\t\x12\x16\n\x0e\x66ulltext_ctime\x18T \x01(\t\x12\x16\n\x0e\x66ulltext_mtime\x18U \x01(\t\x12\r\n\x05grant\x18& \x03(\t\x12\x18\n\x10grant_facet_hier\x18\' \x03(\t\x12\n\n\x02id\x18( \x01(\x04\x12\x12\n\nidentifier\x18) \x03(\t\x12\x0c\n\x04isbn\x18* \x03(\t\x12\x0c\n\x04issn\x18+ \x03(\t\x12\r\n\x05issue\x18, \x01(\t\x12\x0f\n\x07keyword\x18- \x03(\t\x12\x15\n\rkeyword_facet\x18. \x03(\t\x12\x14\n\x0ckeyword_norm\x18/ \x03(\t\x12\x16\n\x0ekeyword_schema\x18\x30 \x03(\t\x12\x0c\n\x04lang\x18\x31 \x01(\t\x12\x12\n\nlinks_data\x18\x32 \x03(\t\x12\x16\n\x0emetadata_ctime\x18R \x01(\t\x12\x16\n\x0emetadata_mtime\x18S \x01(\t\x12\x15\n\rmetrics_ctime\x18X \x01(\t\x12\x15\n\rmetrics_mtime\x18Y \x01(\t\x12\r\n\x05nedid\x18O \x03(\x05\x12\x0f\n\x07nedtype\x18P \x03(\t\x12\x1d\n\x15ned_object_facet_hier\x18Q \x03(\t\x12\x14\n\x0cnonbib_ctime\x18V \x01(\t\x12\x14\n\x0cnonbib_mtime\x18W \x01(\t\x12\r\n\x05orcid\x18\x33 \x03(\t\x12\x11\n\torcid_pub\x18\x34 \x03(\t\x12\x12\n\norcid_user\x18\x35 \x03(\t\x12\x13\n\x0borcid_other\x18\x36 \x03(\t\x12\x13\n\x0borcid_ctime\x18Z \x01(\t\x12\x13\n\x0borcid_mtime\x18[ \x01(\t\x12\x0e\n\x06origin\x18\\ \x03(\t\x12\x0c\n\x04page\x18\x37 \x03(\t\x12\x12\n\npage_count\x18K \x01(\x05\x12\x12\n\npage_range\x18M \x01(\t\x12\x10\n\x08property\x18\x38 \x03(\t\x12\x0b\n\x03pub\x18\x39 \x01(\t\x12\x0f\n\x07pub_raw\x18; \x01(\t\x12\x0f\n\x07pubnote\x18: \x03(\t\x12\x0f\n\x07pubdate\x18< \x01(\t\x12\x12\n\nread_count\x18= \x01(\x05\x12\x0e\n\x06reader\x18> \x03(\t\x12\r\n\x05recid\x18? \x01(\x04\x12\x11\n\treference\x18@ \x03(\t\x12\x0e\n\x06simbid\x18\x41 \x03(\x05\x12\x10\n\x08simbtype\x18\x42 \x03(\t\x12 \n\x18simbad_object_facet_hier\x18\x43 \x03(\t\x12\x1e\n\x06status\x18J \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0e\n\x06thesis\x18\x44 \x01(\t\x12\r\n\x05title\x18\x45 \x03(\t\x12\x18\n\x10update_timestamp\x18N \x01(\t\x12\x0e\n\x06vizier\x18\x46 \x03(\t\x12\x14\n\x0cvizier_facet\x18G \x03(\t\x12\x0e\n\x06volume\x18H \x01(\t\x12\x0c\n\x04year\x18I \x01(\t\x12\x0e\n\x06series\x18\x62 \x01(\t\x12\x11\n\tpublisher\x18\x63 \x01(\t\x12\x0f\n\x07version\x18\x64 \x01(\tb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x19\x64\x65normalized_record.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x88\x0f\n\x12\x44\x65normalizedRecord\x12\x10\n\x08\x61\x62stract\x18\x01 \x01(\t\x12\x0b\n\x03\x61\x63k\x18\x02 \x01(\t\x12\x0b\n\x03\x61\x66\x66\x18\x03 \x03(\t\x12\x19\n\x11\x61lternate_bibcode\x18\x04 \x03(\t\x12\x17\n\x0f\x61lternate_title\x18\x05 \x03(\t\x12\x13\n\x0b\x61rxiv_class\x18\x06 \x03(\t\x12\x0e\n\x06\x61uthor\x18\x07 \x03(\t\x12\x14\n\x0c\x61uthor_count\x18\x08 \x01(\x05\x12\x14\n\x0c\x61uthor_facet\x18\t \x03(\t\x12\x19\n\x11\x61uthor_facet_hier\x18\x0b \x03(\t\x12\x13\n\x0b\x61uthor_norm\x18\x0c \x03(\t\x12\x13\n\x0b\x62ook_author\x18` \x03(\t\x12\x0e\n\x06\x65\x64itor\x18\x61 \x03(\t\x12\x0f\n\x07\x62ibcode\x18\r \x01(\t\x12\x10\n\x08\x62ibgroup\x18\x0e \x03(\t\x12\x16\n\x0e\x62ibgroup_facet\x18\x0f \x03(\t\x12\x0f\n\x07\x62ibstem\x18\x10 \x03(\t\x12\x15\n\rbibstem_facet\x18\x11 \x01(\t\x12\x0c\n\x04\x62ody\x18\x12 \x01(\t\x12\x10\n\x08\x63itation\x18\x13 \x03(\t\x12\x16\n\x0e\x63itation_count\x18\x14 \x01(\x04\x12\x1b\n\x13\x63itation_count_norm\x18_ \x01(\x01\x12\x17\n\x0f\x63ite_read_boost\x18\x15 \x01(\x01\x12\x16\n\x0e\x63lassic_factor\x18\x16 \x01(\x04\x12\x0f\n\x07\x63omment\x18\x17 \x03(\t\x12\x11\n\tcopyright\x18\x18 \x03(\t\x12\x10\n\x08\x64\x61tabase\x18\x19 \x03(\t\x12\x12\n\ndata_count\x18] \x01(\x05\x12\x0c\n\x04\x64\x61te\x18\x1a \x01(\t\x12\x0f\n\x07\x64octype\x18\x1d \x01(\t\x12\x1a\n\x12\x64octype_facet_hier\x18\x1e \x03(\t\x12\x0b\n\x03\x64oi\x18\x1f \x03(\t\x12\x0b\n\x03\x65id\x18 \x01(\t\x12\r\n\x05\x65mail\x18! \x03(\t\x12\x12\n\nentry_date\x18L \x01(\t\x12\x10\n\x08\x65sources\x18^ \x03(\t\x12\x10\n\x08\x66\x61\x63ility\x18\" \x03(\t\x12\x14\n\x0c\x66irst_author\x18# \x01(\t\x12\x1f\n\x17\x66irst_author_facet_hier\x18$ \x03(\t\x12\x19\n\x11\x66irst_author_norm\x18% \x01(\t\x12\x16\n\x0e\x66ulltext_ctime\x18T \x01(\t\x12\x16\n\x0e\x66ulltext_mtime\x18U \x01(\t\x12\r\n\x05grant\x18& \x03(\t\x12\x18\n\x10grant_facet_hier\x18\' \x03(\t\x12\n\n\x02id\x18( \x01(\x04\x12\x12\n\nidentifier\x18) \x03(\t\x12\x0c\n\x04isbn\x18* \x03(\t\x12\x0c\n\x04issn\x18+ \x03(\t\x12\r\n\x05issue\x18, \x01(\t\x12\x0f\n\x07keyword\x18- \x03(\t\x12\x15\n\rkeyword_facet\x18. \x03(\t\x12\x14\n\x0ckeyword_norm\x18/ \x03(\t\x12\x16\n\x0ekeyword_schema\x18\x30 \x03(\t\x12\x0c\n\x04lang\x18\x31 \x01(\t\x12\x12\n\nlinks_data\x18\x32 \x03(\t\x12\x16\n\x0emetadata_ctime\x18R \x01(\t\x12\x16\n\x0emetadata_mtime\x18S \x01(\t\x12\x15\n\rmetrics_ctime\x18X \x01(\t\x12\x15\n\rmetrics_mtime\x18Y \x01(\t\x12\r\n\x05nedid\x18O \x03(\x05\x12\x0f\n\x07nedtype\x18P \x03(\t\x12\x1d\n\x15ned_object_facet_hier\x18Q \x03(\t\x12\x14\n\x0cnonbib_ctime\x18V \x01(\t\x12\x14\n\x0cnonbib_mtime\x18W \x01(\t\x12\r\n\x05orcid\x18\x33 \x03(\t\x12\x11\n\torcid_pub\x18\x34 \x03(\t\x12\x12\n\norcid_user\x18\x35 \x03(\t\x12\x13\n\x0borcid_other\x18\x36 \x03(\t\x12\x13\n\x0borcid_ctime\x18Z \x01(\t\x12\x13\n\x0borcid_mtime\x18[ \x01(\t\x12\x0e\n\x06origin\x18\\ \x03(\t\x12\x0c\n\x04page\x18\x37 \x03(\t\x12\x12\n\npage_count\x18K \x01(\x05\x12\x12\n\npage_range\x18M \x01(\t\x12\x10\n\x08property\x18\x38 \x03(\t\x12\x0b\n\x03pub\x18\x39 \x01(\t\x12\x0f\n\x07pub_raw\x18; \x01(\t\x12\x0f\n\x07pubnote\x18: \x03(\t\x12\x0f\n\x07pubdate\x18< \x01(\t\x12\x12\n\nread_count\x18= \x01(\x05\x12\x0e\n\x06reader\x18> \x03(\t\x12\r\n\x05recid\x18? \x01(\x04\x12\x11\n\treference\x18@ \x03(\t\x12\x0e\n\x06simbid\x18\x41 \x03(\x05\x12\x10\n\x08simbtype\x18\x42 \x03(\t\x12 \n\x18simbad_object_facet_hier\x18\x43 \x03(\t\x12\x1e\n\x06status\x18J \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0e\n\x06thesis\x18\x44 \x01(\t\x12\r\n\x05title\x18\x45 \x03(\t\x12\x18\n\x10update_timestamp\x18N \x01(\t\x12\x0e\n\x06vizier\x18\x46 \x03(\t\x12\x14\n\x0cvizier_facet\x18G \x03(\t\x12\x0e\n\x06volume\x18H \x01(\t\x12\x0c\n\x04year\x18I \x01(\t\x12\x0e\n\x06series\x18\x62 \x01(\t\x12\x11\n\tpublisher\x18\x63 \x01(\t\x12\x0f\n\x07version\x18\x64 \x01(\tb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -37,689 +36,689 @@ _descriptor.FieldDescriptor( name='abstract', full_name='adsmsg.DenormalizedRecord.abstract', 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), _descriptor.FieldDescriptor( name='ack', full_name='adsmsg.DenormalizedRecord.ack', 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), _descriptor.FieldDescriptor( name='aff', full_name='adsmsg.DenormalizedRecord.aff', index=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='alternate_bibcode', full_name='adsmsg.DenormalizedRecord.alternate_bibcode', index=3, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='alternate_title', full_name='adsmsg.DenormalizedRecord.alternate_title', index=4, number=5, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='arxiv_class', full_name='adsmsg.DenormalizedRecord.arxiv_class', index=5, number=6, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author', full_name='adsmsg.DenormalizedRecord.author', index=6, number=7, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author_count', full_name='adsmsg.DenormalizedRecord.author_count', index=7, number=8, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author_facet', full_name='adsmsg.DenormalizedRecord.author_facet', index=8, number=9, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author_facet_hier', full_name='adsmsg.DenormalizedRecord.author_facet_hier', index=9, number=11, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='author_norm', full_name='adsmsg.DenormalizedRecord.author_norm', index=10, number=12, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='book_author', full_name='adsmsg.DenormalizedRecord.book_author', index=11, number=96, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='editor', full_name='adsmsg.DenormalizedRecord.editor', index=12, number=97, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.DenormalizedRecord.bibcode', index=13, number=13, 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), _descriptor.FieldDescriptor( name='bibgroup', full_name='adsmsg.DenormalizedRecord.bibgroup', index=14, number=14, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bibgroup_facet', full_name='adsmsg.DenormalizedRecord.bibgroup_facet', index=15, number=15, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bibstem', full_name='adsmsg.DenormalizedRecord.bibstem', index=16, number=16, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bibstem_facet', full_name='adsmsg.DenormalizedRecord.bibstem_facet', index=17, number=17, 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), _descriptor.FieldDescriptor( name='body', full_name='adsmsg.DenormalizedRecord.body', index=18, number=18, 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), _descriptor.FieldDescriptor( name='citation', full_name='adsmsg.DenormalizedRecord.citation', index=19, number=19, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='citation_count', full_name='adsmsg.DenormalizedRecord.citation_count', index=20, number=20, type=4, cpp_type=4, 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), _descriptor.FieldDescriptor( name='citation_count_norm', full_name='adsmsg.DenormalizedRecord.citation_count_norm', index=21, number=95, 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), _descriptor.FieldDescriptor( name='cite_read_boost', full_name='adsmsg.DenormalizedRecord.cite_read_boost', index=22, number=21, 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), _descriptor.FieldDescriptor( name='classic_factor', full_name='adsmsg.DenormalizedRecord.classic_factor', index=23, number=22, type=4, cpp_type=4, 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), _descriptor.FieldDescriptor( name='comment', full_name='adsmsg.DenormalizedRecord.comment', index=24, number=23, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='copyright', full_name='adsmsg.DenormalizedRecord.copyright', index=25, number=24, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='database', full_name='adsmsg.DenormalizedRecord.database', index=26, number=25, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='data_count', full_name='adsmsg.DenormalizedRecord.data_count', index=27, number=93, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='date', full_name='adsmsg.DenormalizedRecord.date', index=28, number=26, 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), _descriptor.FieldDescriptor( name='doctype', full_name='adsmsg.DenormalizedRecord.doctype', index=29, number=29, 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), _descriptor.FieldDescriptor( name='doctype_facet_hier', full_name='adsmsg.DenormalizedRecord.doctype_facet_hier', index=30, number=30, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='doi', full_name='adsmsg.DenormalizedRecord.doi', index=31, number=31, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='eid', full_name='adsmsg.DenormalizedRecord.eid', index=32, number=32, 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), _descriptor.FieldDescriptor( name='email', full_name='adsmsg.DenormalizedRecord.email', index=33, number=33, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='entry_date', full_name='adsmsg.DenormalizedRecord.entry_date', index=34, number=76, 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), _descriptor.FieldDescriptor( name='esources', full_name='adsmsg.DenormalizedRecord.esources', index=35, number=94, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='facility', full_name='adsmsg.DenormalizedRecord.facility', index=36, number=34, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='first_author', full_name='adsmsg.DenormalizedRecord.first_author', index=37, number=35, 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), _descriptor.FieldDescriptor( name='first_author_facet_hier', full_name='adsmsg.DenormalizedRecord.first_author_facet_hier', index=38, number=36, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='first_author_norm', full_name='adsmsg.DenormalizedRecord.first_author_norm', index=39, number=37, 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), _descriptor.FieldDescriptor( name='fulltext_ctime', full_name='adsmsg.DenormalizedRecord.fulltext_ctime', index=40, number=84, 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), _descriptor.FieldDescriptor( name='fulltext_mtime', full_name='adsmsg.DenormalizedRecord.fulltext_mtime', index=41, number=85, 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), _descriptor.FieldDescriptor( name='grant', full_name='adsmsg.DenormalizedRecord.grant', index=42, number=38, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='grant_facet_hier', full_name='adsmsg.DenormalizedRecord.grant_facet_hier', index=43, number=39, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='id', full_name='adsmsg.DenormalizedRecord.id', index=44, number=40, type=4, cpp_type=4, 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), _descriptor.FieldDescriptor( name='identifier', full_name='adsmsg.DenormalizedRecord.identifier', index=45, number=41, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='isbn', full_name='adsmsg.DenormalizedRecord.isbn', index=46, number=42, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='issn', full_name='adsmsg.DenormalizedRecord.issn', index=47, number=43, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='issue', full_name='adsmsg.DenormalizedRecord.issue', index=48, number=44, 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), _descriptor.FieldDescriptor( name='keyword', full_name='adsmsg.DenormalizedRecord.keyword', index=49, number=45, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='keyword_facet', full_name='adsmsg.DenormalizedRecord.keyword_facet', index=50, number=46, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='keyword_norm', full_name='adsmsg.DenormalizedRecord.keyword_norm', index=51, number=47, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='keyword_schema', full_name='adsmsg.DenormalizedRecord.keyword_schema', index=52, number=48, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='lang', full_name='adsmsg.DenormalizedRecord.lang', index=53, number=49, 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), _descriptor.FieldDescriptor( name='links_data', full_name='adsmsg.DenormalizedRecord.links_data', index=54, number=50, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='metadata_ctime', full_name='adsmsg.DenormalizedRecord.metadata_ctime', index=55, number=82, 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), _descriptor.FieldDescriptor( name='metadata_mtime', full_name='adsmsg.DenormalizedRecord.metadata_mtime', index=56, number=83, 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), _descriptor.FieldDescriptor( name='metrics_ctime', full_name='adsmsg.DenormalizedRecord.metrics_ctime', index=57, number=88, 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), _descriptor.FieldDescriptor( name='metrics_mtime', full_name='adsmsg.DenormalizedRecord.metrics_mtime', index=58, number=89, 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), _descriptor.FieldDescriptor( name='nedid', full_name='adsmsg.DenormalizedRecord.nedid', index=59, number=79, type=5, cpp_type=1, label=3, 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), _descriptor.FieldDescriptor( name='nedtype', full_name='adsmsg.DenormalizedRecord.nedtype', index=60, number=80, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ned_object_facet_hier', full_name='adsmsg.DenormalizedRecord.ned_object_facet_hier', index=61, number=81, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='nonbib_ctime', full_name='adsmsg.DenormalizedRecord.nonbib_ctime', index=62, number=86, 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), _descriptor.FieldDescriptor( name='nonbib_mtime', full_name='adsmsg.DenormalizedRecord.nonbib_mtime', index=63, number=87, 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), _descriptor.FieldDescriptor( name='orcid', full_name='adsmsg.DenormalizedRecord.orcid', index=64, number=51, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='orcid_pub', full_name='adsmsg.DenormalizedRecord.orcid_pub', index=65, number=52, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='orcid_user', full_name='adsmsg.DenormalizedRecord.orcid_user', index=66, number=53, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='orcid_other', full_name='adsmsg.DenormalizedRecord.orcid_other', index=67, number=54, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='orcid_ctime', full_name='adsmsg.DenormalizedRecord.orcid_ctime', index=68, number=90, 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), _descriptor.FieldDescriptor( name='orcid_mtime', full_name='adsmsg.DenormalizedRecord.orcid_mtime', index=69, number=91, 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), _descriptor.FieldDescriptor( name='origin', full_name='adsmsg.DenormalizedRecord.origin', index=70, number=92, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='page', full_name='adsmsg.DenormalizedRecord.page', index=71, number=55, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='page_count', full_name='adsmsg.DenormalizedRecord.page_count', index=72, number=75, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='page_range', full_name='adsmsg.DenormalizedRecord.page_range', index=73, number=77, 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), _descriptor.FieldDescriptor( name='property', full_name='adsmsg.DenormalizedRecord.property', index=74, number=56, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='pub', full_name='adsmsg.DenormalizedRecord.pub', index=75, number=57, 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), _descriptor.FieldDescriptor( name='pub_raw', full_name='adsmsg.DenormalizedRecord.pub_raw', index=76, number=59, 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), _descriptor.FieldDescriptor( name='pubnote', full_name='adsmsg.DenormalizedRecord.pubnote', index=77, number=58, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='pubdate', full_name='adsmsg.DenormalizedRecord.pubdate', index=78, number=60, 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), _descriptor.FieldDescriptor( name='read_count', full_name='adsmsg.DenormalizedRecord.read_count', index=79, number=61, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='reader', full_name='adsmsg.DenormalizedRecord.reader', index=80, number=62, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='recid', full_name='adsmsg.DenormalizedRecord.recid', index=81, number=63, type=4, cpp_type=4, 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), _descriptor.FieldDescriptor( name='reference', full_name='adsmsg.DenormalizedRecord.reference', index=82, number=64, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='simbid', full_name='adsmsg.DenormalizedRecord.simbid', index=83, number=65, type=5, cpp_type=1, label=3, 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), _descriptor.FieldDescriptor( name='simbtype', full_name='adsmsg.DenormalizedRecord.simbtype', index=84, number=66, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='simbad_object_facet_hier', full_name='adsmsg.DenormalizedRecord.simbad_object_facet_hier', index=85, number=67, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DenormalizedRecord.status', index=86, number=74, 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), _descriptor.FieldDescriptor( name='thesis', full_name='adsmsg.DenormalizedRecord.thesis', index=87, number=68, 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), _descriptor.FieldDescriptor( name='title', full_name='adsmsg.DenormalizedRecord.title', index=88, number=69, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='update_timestamp', full_name='adsmsg.DenormalizedRecord.update_timestamp', index=89, number=78, 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), _descriptor.FieldDescriptor( name='vizier', full_name='adsmsg.DenormalizedRecord.vizier', index=90, number=70, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='vizier_facet', full_name='adsmsg.DenormalizedRecord.vizier_facet', index=91, number=71, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='volume', full_name='adsmsg.DenormalizedRecord.volume', index=92, number=72, 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), _descriptor.FieldDescriptor( name='year', full_name='adsmsg.DenormalizedRecord.year', index=93, number=73, 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), _descriptor.FieldDescriptor( name='series', full_name='adsmsg.DenormalizedRecord.series', index=94, number=98, 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), _descriptor.FieldDescriptor( name='publisher', full_name='adsmsg.DenormalizedRecord.publisher', index=95, number=99, 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), _descriptor.FieldDescriptor( name='version', full_name='adsmsg.DenormalizedRecord.version', index=96, number=100, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -733,11 +732,11 @@ DESCRIPTOR.message_types_by_name['DenormalizedRecord'] = _DENORMALIZEDRECORD _sym_db.RegisterFileDescriptor(DESCRIPTOR) -DenormalizedRecord = _reflection.GeneratedProtocolMessageType('DenormalizedRecord', (_message.Message,), dict( - DESCRIPTOR = _DENORMALIZEDRECORD, - __module__ = 'denormalized_record_pb2' +DenormalizedRecord = _reflection.GeneratedProtocolMessageType('DenormalizedRecord', (_message.Message,), { + 'DESCRIPTOR' : _DENORMALIZEDRECORD, + '__module__' : 'denormalized_record_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DenormalizedRecord) - )) + }) _sym_db.RegisterMessage(DenormalizedRecord) diff --git a/adsmsg/protobuf/fulltext_requests_pb2.py b/adsmsg/protobuf/fulltext_requests_pb2.py index 2d7a9dd..d842dc7 100644 --- a/adsmsg/protobuf/fulltext_requests_pb2.py +++ b/adsmsg/protobuf/fulltext_requests_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: fulltext_requests.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='fulltext_requests.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x17\x66ulltext_requests.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"=\n\x10\x46ulltextRequests\x12)\n\x08requests\x18\x01 \x03(\x0b\x32\x17.adsmsg.FulltextRequest\"g\n\x0f\x46ulltextRequest\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x10\n\x08provider\x18\x02 \x01(\t\x12\x11\n\tft_source\x18\x03 \x01(\t\x12\x1e\n\x06status\x18\x04 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x17\x66ulltext_requests.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"=\n\x10\x46ulltextRequests\x12)\n\x08requests\x18\x01 \x03(\x0b\x32\x17.adsmsg.FulltextRequest\"g\n\x0f\x46ulltextRequest\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x10\n\x08provider\x18\x02 \x01(\t\x12\x11\n\tft_source\x18\x03 \x01(\t\x12\x1e\n\x06status\x18\x04 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -40,14 +39,14 @@ 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -68,38 +67,38 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.FulltextRequest.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), _descriptor.FieldDescriptor( name='provider', full_name='adsmsg.FulltextRequest.provider', 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), _descriptor.FieldDescriptor( name='ft_source', full_name='adsmsg.FulltextRequest.ft_source', index=2, number=3, 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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.FulltextRequest.status', index=3, number=4, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -115,18 +114,18 @@ DESCRIPTOR.message_types_by_name['FulltextRequest'] = _FULLTEXTREQUEST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -FulltextRequests = _reflection.GeneratedProtocolMessageType('FulltextRequests', (_message.Message,), dict( - DESCRIPTOR = _FULLTEXTREQUESTS, - __module__ = 'fulltext_requests_pb2' +FulltextRequests = _reflection.GeneratedProtocolMessageType('FulltextRequests', (_message.Message,), { + 'DESCRIPTOR' : _FULLTEXTREQUESTS, + '__module__' : 'fulltext_requests_pb2' # @@protoc_insertion_point(class_scope:adsmsg.FulltextRequests) - )) + }) _sym_db.RegisterMessage(FulltextRequests) -FulltextRequest = _reflection.GeneratedProtocolMessageType('FulltextRequest', (_message.Message,), dict( - DESCRIPTOR = _FULLTEXTREQUEST, - __module__ = 'fulltext_requests_pb2' +FulltextRequest = _reflection.GeneratedProtocolMessageType('FulltextRequest', (_message.Message,), { + 'DESCRIPTOR' : _FULLTEXTREQUEST, + '__module__' : 'fulltext_requests_pb2' # @@protoc_insertion_point(class_scope:adsmsg.FulltextRequest) - )) + }) _sym_db.RegisterMessage(FulltextRequest) diff --git a/adsmsg/protobuf/fulltext_update_pb2.py b/adsmsg/protobuf/fulltext_update_pb2.py index 96429fa..7784c52 100644 --- a/adsmsg/protobuf/fulltext_update_pb2.py +++ b/adsmsg/protobuf/fulltext_update_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: fulltext_update.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='fulltext_update.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x15\x66ulltext_update.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x8c\x01\n\x0e\x46ulltextUpdate\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x0c\n\x04\x62ody\x18\x02 \x01(\t\x12\x1e\n\x06status\x18\x03 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x18\n\x10\x61\x63knowledgements\x18\x04 \x01(\t\x12\x0f\n\x07\x64\x61taset\x18\x05 \x03(\t\x12\x10\n\x08\x66\x61\x63ility\x18\x06 \x03(\tb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x15\x66ulltext_update.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x8c\x01\n\x0e\x46ulltextUpdate\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x0c\n\x04\x62ody\x18\x02 \x01(\t\x12\x1e\n\x06status\x18\x03 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x18\n\x10\x61\x63knowledgements\x18\x04 \x01(\t\x12\x0f\n\x07\x64\x61taset\x18\x05 \x03(\t\x12\x10\n\x08\x66\x61\x63ility\x18\x06 \x03(\tb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -37,52 +36,52 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.FulltextUpdate.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), _descriptor.FieldDescriptor( name='body', full_name='adsmsg.FulltextUpdate.body', 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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.FulltextUpdate.status', index=2, number=3, 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), _descriptor.FieldDescriptor( name='acknowledgements', full_name='adsmsg.FulltextUpdate.acknowledgements', index=3, number=4, 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), _descriptor.FieldDescriptor( name='dataset', full_name='adsmsg.FulltextUpdate.dataset', index=4, number=5, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='facility', full_name='adsmsg.FulltextUpdate.facility', index=5, number=6, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -96,11 +95,11 @@ DESCRIPTOR.message_types_by_name['FulltextUpdate'] = _FULLTEXTUPDATE _sym_db.RegisterFileDescriptor(DESCRIPTOR) -FulltextUpdate = _reflection.GeneratedProtocolMessageType('FulltextUpdate', (_message.Message,), dict( - DESCRIPTOR = _FULLTEXTUPDATE, - __module__ = 'fulltext_update_pb2' +FulltextUpdate = _reflection.GeneratedProtocolMessageType('FulltextUpdate', (_message.Message,), { + 'DESCRIPTOR' : _FULLTEXTUPDATE, + '__module__' : 'fulltext_update_pb2' # @@protoc_insertion_point(class_scope:adsmsg.FulltextUpdate) - )) + }) _sym_db.RegisterMessage(FulltextUpdate) diff --git a/adsmsg/protobuf/metrics_pb2.py b/adsmsg/protobuf/metrics_pb2.py index 1b9a6a3..94b8f57 100644 --- a/adsmsg/protobuf/metrics_pb2.py +++ b/adsmsg/protobuf/metrics_pb2.py @@ -1,27 +1,26 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: metrics.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() from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='metrics.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\rmetrics.proto\x12\x06\x61\x64smsg\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x0cstatus.proto\"i\n\x0f\x63itation_record\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x11\n\tauth_norm\x18\x02 \x01(\x02\x12\x0f\n\x07\x63ityear\x18\x03 \x01(\x05\x12\x0f\n\x07pubyear\x18\x04 \x01(\x05\x12\x10\n\x08ref_norm\x18\x05 \x01(\x02\"\xad\x04\n\rMetricsRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x14\n\x0c\x61n_citations\x18\x02 \x01(\x02\x12\x1d\n\x15\x61n_refereed_citations\x18\x03 \x01(\x02\x12\x12\n\nauthor_num\x18\x04 \x01(\x05\x12\x14\n\x0c\x63itation_num\x18\x05 \x01(\x05\x12\x11\n\tcitations\x18\x06 \x03(\t\x12\x11\n\tdownloads\x18\x07 \x03(\x05\x12+\n\x07modtime\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\r\n\x05reads\x18\t \x03(\x05\x12\x10\n\x08refereed\x18\n \x01(\x08\x12\x1d\n\x15refereed_citation_num\x18\x0b \x01(\x05\x12\x1a\n\x12refereed_citations\x18\x0c \x03(\t\x12\x15\n\rreference_num\x18\r \x01(\x05\x12\x14\n\x0crn_citations\x18\x0e \x01(\x02\x12\x31\n\x10rn_citation_data\x18\x0f \x03(\x0b\x32\x17.adsmsg.citation_record\x12\x45\n\x11rn_citations_hist\x18\x10 \x03(\x0b\x32*.adsmsg.MetricsRecord.RnCitationsHistEntry\x12\x1e\n\x06status\x18\x11 \x01(\x0e\x32\x0e.adsmsg.Status\x1a\x36\n\x14RnCitationsHistEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\"c\n\x11MetricsRecordList\x12.\n\x0fmetrics_records\x18\x01 \x03(\x0b\x32\x15.adsmsg.MetricsRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\rmetrics.proto\x12\x06\x61\x64smsg\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x0cstatus.proto\"i\n\x0f\x63itation_record\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x11\n\tauth_norm\x18\x02 \x01(\x02\x12\x0f\n\x07\x63ityear\x18\x03 \x01(\x05\x12\x0f\n\x07pubyear\x18\x04 \x01(\x05\x12\x10\n\x08ref_norm\x18\x05 \x01(\x02\"\xad\x04\n\rMetricsRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x14\n\x0c\x61n_citations\x18\x02 \x01(\x02\x12\x1d\n\x15\x61n_refereed_citations\x18\x03 \x01(\x02\x12\x12\n\nauthor_num\x18\x04 \x01(\x05\x12\x14\n\x0c\x63itation_num\x18\x05 \x01(\x05\x12\x11\n\tcitations\x18\x06 \x03(\t\x12\x11\n\tdownloads\x18\x07 \x03(\x05\x12+\n\x07modtime\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\r\n\x05reads\x18\t \x03(\x05\x12\x10\n\x08refereed\x18\n \x01(\x08\x12\x1d\n\x15refereed_citation_num\x18\x0b \x01(\x05\x12\x1a\n\x12refereed_citations\x18\x0c \x03(\t\x12\x15\n\rreference_num\x18\r \x01(\x05\x12\x14\n\x0crn_citations\x18\x0e \x01(\x02\x12\x31\n\x10rn_citation_data\x18\x0f \x03(\x0b\x32\x17.adsmsg.citation_record\x12\x45\n\x11rn_citations_hist\x18\x10 \x03(\x0b\x32*.adsmsg.MetricsRecord.RnCitationsHistEntry\x12\x1e\n\x06status\x18\x11 \x01(\x0e\x32\x0e.adsmsg.Status\x1a\x36\n\x14RnCitationsHistEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x02:\x02\x38\x01\"c\n\x11MetricsRecordList\x12.\n\x0fmetrics_records\x18\x01 \x03(\x0b\x32\x15.adsmsg.MetricsRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,status__pb2.DESCRIPTOR,]) @@ -38,45 +37,45 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.citation_record.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), _descriptor.FieldDescriptor( name='auth_norm', full_name='adsmsg.citation_record.auth_norm', index=1, number=2, type=2, cpp_type=6, 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), _descriptor.FieldDescriptor( name='cityear', full_name='adsmsg.citation_record.cityear', index=2, number=3, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='pubyear', full_name='adsmsg.citation_record.pubyear', 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ref_norm', full_name='adsmsg.citation_record.ref_norm', index=4, number=5, type=2, cpp_type=6, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -97,24 +96,24 @@ _descriptor.FieldDescriptor( name='key', full_name='adsmsg.MetricsRecord.RnCitationsHistEntry.key', 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), _descriptor.FieldDescriptor( name='value', full_name='adsmsg.MetricsRecord.RnCitationsHistEntry.value', index=1, number=2, type=2, cpp_type=6, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=_descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')), + serialized_options=b'8\001', is_extendable=False, syntax='proto3', extension_ranges=[], @@ -134,129 +133,129 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.MetricsRecord.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), _descriptor.FieldDescriptor( name='an_citations', full_name='adsmsg.MetricsRecord.an_citations', index=1, number=2, type=2, cpp_type=6, 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), _descriptor.FieldDescriptor( name='an_refereed_citations', full_name='adsmsg.MetricsRecord.an_refereed_citations', index=2, number=3, type=2, cpp_type=6, 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), _descriptor.FieldDescriptor( name='author_num', full_name='adsmsg.MetricsRecord.author_num', 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='citation_num', full_name='adsmsg.MetricsRecord.citation_num', index=4, number=5, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='citations', full_name='adsmsg.MetricsRecord.citations', index=5, number=6, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='downloads', full_name='adsmsg.MetricsRecord.downloads', index=6, number=7, type=5, cpp_type=1, label=3, 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), _descriptor.FieldDescriptor( name='modtime', full_name='adsmsg.MetricsRecord.modtime', index=7, number=8, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='reads', full_name='adsmsg.MetricsRecord.reads', index=8, number=9, type=5, cpp_type=1, label=3, 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), _descriptor.FieldDescriptor( name='refereed', full_name='adsmsg.MetricsRecord.refereed', index=9, number=10, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='refereed_citation_num', full_name='adsmsg.MetricsRecord.refereed_citation_num', index=10, number=11, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='refereed_citations', full_name='adsmsg.MetricsRecord.refereed_citations', index=11, number=12, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='reference_num', full_name='adsmsg.MetricsRecord.reference_num', index=12, number=13, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='rn_citations', full_name='adsmsg.MetricsRecord.rn_citations', index=13, number=14, type=2, cpp_type=6, 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), _descriptor.FieldDescriptor( name='rn_citation_data', full_name='adsmsg.MetricsRecord.rn_citation_data', index=14, number=15, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='rn_citations_hist', full_name='adsmsg.MetricsRecord.rn_citations_hist', index=15, number=16, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.MetricsRecord.status', index=16, number=17, 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), ], extensions=[ ], nested_types=[_METRICSRECORD_RNCITATIONSHISTENTRY, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -280,21 +279,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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.MetricsRecordList.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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -316,36 +315,35 @@ DESCRIPTOR.message_types_by_name['MetricsRecordList'] = _METRICSRECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -citation_record = _reflection.GeneratedProtocolMessageType('citation_record', (_message.Message,), dict( - DESCRIPTOR = _CITATION_RECORD, - __module__ = 'metrics_pb2' +citation_record = _reflection.GeneratedProtocolMessageType('citation_record', (_message.Message,), { + 'DESCRIPTOR' : _CITATION_RECORD, + '__module__' : 'metrics_pb2' # @@protoc_insertion_point(class_scope:adsmsg.citation_record) - )) + }) _sym_db.RegisterMessage(citation_record) -MetricsRecord = _reflection.GeneratedProtocolMessageType('MetricsRecord', (_message.Message,), dict( +MetricsRecord = _reflection.GeneratedProtocolMessageType('MetricsRecord', (_message.Message,), { - RnCitationsHistEntry = _reflection.GeneratedProtocolMessageType('RnCitationsHistEntry', (_message.Message,), dict( - DESCRIPTOR = _METRICSRECORD_RNCITATIONSHISTENTRY, - __module__ = 'metrics_pb2' + 'RnCitationsHistEntry' : _reflection.GeneratedProtocolMessageType('RnCitationsHistEntry', (_message.Message,), { + 'DESCRIPTOR' : _METRICSRECORD_RNCITATIONSHISTENTRY, + '__module__' : 'metrics_pb2' # @@protoc_insertion_point(class_scope:adsmsg.MetricsRecord.RnCitationsHistEntry) - )) + }) , - DESCRIPTOR = _METRICSRECORD, - __module__ = 'metrics_pb2' + 'DESCRIPTOR' : _METRICSRECORD, + '__module__' : 'metrics_pb2' # @@protoc_insertion_point(class_scope:adsmsg.MetricsRecord) - )) + }) _sym_db.RegisterMessage(MetricsRecord) _sym_db.RegisterMessage(MetricsRecord.RnCitationsHistEntry) -MetricsRecordList = _reflection.GeneratedProtocolMessageType('MetricsRecordList', (_message.Message,), dict( - DESCRIPTOR = _METRICSRECORDLIST, - __module__ = 'metrics_pb2' +MetricsRecordList = _reflection.GeneratedProtocolMessageType('MetricsRecordList', (_message.Message,), { + 'DESCRIPTOR' : _METRICSRECORDLIST, + '__module__' : 'metrics_pb2' # @@protoc_insertion_point(class_scope:adsmsg.MetricsRecordList) - )) + }) _sym_db.RegisterMessage(MetricsRecordList) -_METRICSRECORD_RNCITATIONSHISTENTRY.has_options = True -_METRICSRECORD_RNCITATIONSHISTENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) +_METRICSRECORD_RNCITATIONSHISTENTRY._options = None # @@protoc_insertion_point(module_scope) diff --git a/adsmsg/protobuf/nonbibrecord_pb2.py b/adsmsg/protobuf/nonbibrecord_pb2.py index db1479d..5a7f928 100644 --- a/adsmsg/protobuf/nonbibrecord_pb2.py +++ b/adsmsg/protobuf/nonbibrecord_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: nonbibrecord.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='nonbibrecord.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x12nonbibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x87\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\"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_options=None, + serialized_pb=b'\n\x12nonbibrecord.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"\x87\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\"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,]) @@ -37,129 +36,129 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.NonBibRecord.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), _descriptor.FieldDescriptor( name='simbad_objects', full_name='adsmsg.NonBibRecord.simbad_objects', 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='grants', full_name='adsmsg.NonBibRecord.grants', 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='boost', full_name='adsmsg.NonBibRecord.boost', index=3, 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, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='citation_count', full_name='adsmsg.NonBibRecord.citation_count', index=4, number=7, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='read_count', full_name='adsmsg.NonBibRecord.read_count', index=5, number=8, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='readers', full_name='adsmsg.NonBibRecord.readers', index=6, number=9, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='reference', full_name='adsmsg.NonBibRecord.reference', index=7, number=12, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ned_objects', full_name='adsmsg.NonBibRecord.ned_objects', index=8, number=13, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='data', full_name='adsmsg.NonBibRecord.data', index=9, number=14, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='total_link_counts', full_name='adsmsg.NonBibRecord.total_link_counts', index=10, number=15, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='esource', full_name='adsmsg.NonBibRecord.esource', index=11, number=17, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='property', full_name='adsmsg.NonBibRecord.property', index=12, number=18, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='data_links_rows', full_name='adsmsg.NonBibRecord.data_links_rows', index=13, number=19, type=11, cpp_type=10, label=3, 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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.NonBibRecord.status', index=14, number=20, 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), _descriptor.FieldDescriptor( name='norm_cites', full_name='adsmsg.NonBibRecord.norm_cites', index=15, number=21, 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), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='citation_count_norm', full_name='adsmsg.NonBibRecord.citation_count_norm', index=16, number=22, type=2, cpp_type=6, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -180,45 +179,45 @@ _descriptor.FieldDescriptor( name='link_type', full_name='adsmsg.DataLinksRow.link_type', 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), _descriptor.FieldDescriptor( name='link_sub_type', full_name='adsmsg.DataLinksRow.link_sub_type', 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), _descriptor.FieldDescriptor( name='url', full_name='adsmsg.DataLinksRow.url', index=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='title', full_name='adsmsg.DataLinksRow.title', index=3, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='item_count', full_name='adsmsg.DataLinksRow.item_count', index=4, number=5, 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), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -242,21 +241,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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.NonBibRecordList.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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -277,24 +276,24 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.DataLinksRecord.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), _descriptor.FieldDescriptor( name='data_links_rows', full_name='adsmsg.DataLinksRecord.data_links_rows', index=1, number=2, type=11, cpp_type=10, label=3, 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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -318,21 +317,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), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DataLinksRecordList.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), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -356,39 +355,39 @@ DESCRIPTOR.message_types_by_name['DataLinksRecordList'] = _DATALINKSRECORDLIST _sym_db.RegisterFileDescriptor(DESCRIPTOR) -NonBibRecord = _reflection.GeneratedProtocolMessageType('NonBibRecord', (_message.Message,), dict( - DESCRIPTOR = _NONBIBRECORD, - __module__ = 'nonbibrecord_pb2' +NonBibRecord = _reflection.GeneratedProtocolMessageType('NonBibRecord', (_message.Message,), { + 'DESCRIPTOR' : _NONBIBRECORD, + '__module__' : 'nonbibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.NonBibRecord) - )) + }) _sym_db.RegisterMessage(NonBibRecord) -DataLinksRow = _reflection.GeneratedProtocolMessageType('DataLinksRow', (_message.Message,), dict( - DESCRIPTOR = _DATALINKSROW, - __module__ = 'nonbibrecord_pb2' +DataLinksRow = _reflection.GeneratedProtocolMessageType('DataLinksRow', (_message.Message,), { + 'DESCRIPTOR' : _DATALINKSROW, + '__module__' : 'nonbibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DataLinksRow) - )) + }) _sym_db.RegisterMessage(DataLinksRow) -NonBibRecordList = _reflection.GeneratedProtocolMessageType('NonBibRecordList', (_message.Message,), dict( - DESCRIPTOR = _NONBIBRECORDLIST, - __module__ = 'nonbibrecord_pb2' +NonBibRecordList = _reflection.GeneratedProtocolMessageType('NonBibRecordList', (_message.Message,), { + 'DESCRIPTOR' : _NONBIBRECORDLIST, + '__module__' : 'nonbibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.NonBibRecordList) - )) + }) _sym_db.RegisterMessage(NonBibRecordList) -DataLinksRecord = _reflection.GeneratedProtocolMessageType('DataLinksRecord', (_message.Message,), dict( - DESCRIPTOR = _DATALINKSRECORD, - __module__ = 'nonbibrecord_pb2' +DataLinksRecord = _reflection.GeneratedProtocolMessageType('DataLinksRecord', (_message.Message,), { + 'DESCRIPTOR' : _DATALINKSRECORD, + '__module__' : 'nonbibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DataLinksRecord) - )) + }) _sym_db.RegisterMessage(DataLinksRecord) -DataLinksRecordList = _reflection.GeneratedProtocolMessageType('DataLinksRecordList', (_message.Message,), dict( - DESCRIPTOR = _DATALINKSRECORDLIST, - __module__ = 'nonbibrecord_pb2' +DataLinksRecordList = _reflection.GeneratedProtocolMessageType('DataLinksRecordList', (_message.Message,), { + 'DESCRIPTOR' : _DATALINKSRECORDLIST, + '__module__' : 'nonbibrecord_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DataLinksRecordList) - )) + }) _sym_db.RegisterMessage(DataLinksRecordList) diff --git a/adsmsg/protobuf/orcid_claims_pb2.py b/adsmsg/protobuf/orcid_claims_pb2.py index 4c33e69..3fc80e5 100644 --- a/adsmsg/protobuf/orcid_claims_pb2.py +++ b/adsmsg/protobuf/orcid_claims_pb2.py @@ -1,26 +1,25 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: orcid_claims.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() -import status_pb2 as status__pb2 +from . import status_pb2 as status__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name='orcid_claims.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x12orcid_claims.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"u\n\x0bOrcidClaims\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x0f\n\x07\x61uthors\x18\x02 \x03(\t\x12\x10\n\x08verified\x18\x03 \x03(\t\x12\x12\n\nunverified\x18\x04 \x03(\t\x12\x1e\n\x06status\x18\x05 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x12orcid_claims.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\"u\n\x0bOrcidClaims\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x0f\n\x07\x61uthors\x18\x02 \x03(\t\x12\x10\n\x08verified\x18\x03 \x03(\t\x12\x12\n\nunverified\x18\x04 \x03(\t\x12\x1e\n\x06status\x18\x05 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -37,45 +36,45 @@ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.OrcidClaims.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), _descriptor.FieldDescriptor( name='authors', full_name='adsmsg.OrcidClaims.authors', index=1, number=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='verified', full_name='adsmsg.OrcidClaims.verified', index=2, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unverified', full_name='adsmsg.OrcidClaims.unverified', index=3, 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, - options=None), + serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.OrcidClaims.status', index=4, 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, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -89,11 +88,11 @@ DESCRIPTOR.message_types_by_name['OrcidClaims'] = _ORCIDCLAIMS _sym_db.RegisterFileDescriptor(DESCRIPTOR) -OrcidClaims = _reflection.GeneratedProtocolMessageType('OrcidClaims', (_message.Message,), dict( - DESCRIPTOR = _ORCIDCLAIMS, - __module__ = 'orcid_claims_pb2' +OrcidClaims = _reflection.GeneratedProtocolMessageType('OrcidClaims', (_message.Message,), { + 'DESCRIPTOR' : _ORCIDCLAIMS, + '__module__' : 'orcid_claims_pb2' # @@protoc_insertion_point(class_scope:adsmsg.OrcidClaims) - )) + }) _sym_db.RegisterMessage(OrcidClaims) diff --git a/adsmsg/protobuf/status_pb2.py b/adsmsg/protobuf/status_pb2.py index 4944bba..a996943 100644 --- a/adsmsg/protobuf/status_pb2.py +++ b/adsmsg/protobuf/status_pb2.py @@ -1,14 +1,12 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: status.proto -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) from google.protobuf.internal import enum_type_wrapper 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,8 @@ name='status.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x0cstatus.proto\x12\x06\x61\x64smsg*7\n\x06Status\x12\n\n\x06\x61\x63tive\x10\x00\x12\x0b\n\x07\x64\x65leted\x10\x01\x12\x07\n\x03new\x10\x02\x12\x0b\n\x07updated\x10\x03\x62\x06proto3') + serialized_options=None, + serialized_pb=b'\n\x0cstatus.proto\x12\x06\x61\x64smsg*7\n\x06Status\x12\n\n\x06\x61\x63tive\x10\x00\x12\x0b\n\x07\x64\x65leted\x10\x01\x12\x07\n\x03new\x10\x02\x12\x0b\n\x07updated\x10\x03\x62\x06proto3' ) _STATUS = _descriptor.EnumDescriptor( @@ -31,23 +30,23 @@ values=[ _descriptor.EnumValueDescriptor( name='active', index=0, number=0, - options=None, + serialized_options=None, type=None), _descriptor.EnumValueDescriptor( name='deleted', index=1, number=1, - options=None, + serialized_options=None, type=None), _descriptor.EnumValueDescriptor( name='new', index=2, number=2, - options=None, + serialized_options=None, type=None), _descriptor.EnumValueDescriptor( name='updated', index=3, number=3, - options=None, + serialized_options=None, type=None), ], containing_type=None, - options=None, + serialized_options=None, serialized_start=24, serialized_end=79, ) diff --git a/adsmsg/protobuf/turbobee_pb2.py b/adsmsg/protobuf/turbobee_pb2.py deleted file mode 100644 index e2f9162..0000000 --- a/adsmsg/protobuf/turbobee_pb2.py +++ /dev/null @@ -1,181 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: turbobee.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() - - -import status_pb2 as status__pb2 -from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2 - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='turbobee.proto', - package='adsmsg', - syntax='proto3', - serialized_pb=_b('\n\x0eturbobee.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"\x8b\x03\n\x0bTurboBeeMsg\x12\x0b\n\x03qid\x18\x01 \x01(\t\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Status\x12\x0e\n\x06target\x18\x03 \x01(\t\x12+\n\x07\x63reated\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x07updated\x18\x05 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12+\n\x07\x65xpires\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\'\n\x03\x65ol\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\r\n\x05owner\x18\x08 \x01(\x05\x12(\n\x05\x63type\x18\t \x01(\x0e\x32\x19.adsmsg.TurboBeeMsg.CType\x12\r\n\x05value\x18\n \x01(\x0c\"G\n\x05\x43Type\x12\x0b\n\x07unknown\x10\x00\x12\x08\n\x04html\x10\x01\x12\x08\n\x04text\x10\x02\x12\x08\n\x04json\x10\x03\x12\n\n\x06\x62inary\x10\x04\x12\x07\n\x03png\x10\x05\x62\x06proto3') - , - dependencies=[status__pb2.DESCRIPTOR,google_dot_protobuf_dot_timestamp__pb2.DESCRIPTOR,]) - - - -_TURBOBEEMSG_CTYPE = _descriptor.EnumDescriptor( - name='CType', - full_name='adsmsg.TurboBeeMsg.CType', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='unknown', index=0, number=0, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='html', index=1, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='text', index=2, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='json', index=3, number=3, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='binary', index=4, number=4, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='png', index=5, number=5, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=398, - serialized_end=469, -) -_sym_db.RegisterEnumDescriptor(_TURBOBEEMSG_CTYPE) - - -_TURBOBEEMSG = _descriptor.Descriptor( - name='TurboBeeMsg', - full_name='adsmsg.TurboBeeMsg', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='qid', full_name='adsmsg.TurboBeeMsg.qid', index=0, - number=1, 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, - options=None), - _descriptor.FieldDescriptor( - name='status', full_name='adsmsg.TurboBeeMsg.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), - _descriptor.FieldDescriptor( - name='target', full_name='adsmsg.TurboBeeMsg.target', index=2, - 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, - options=None), - _descriptor.FieldDescriptor( - name='created', full_name='adsmsg.TurboBeeMsg.created', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='updated', full_name='adsmsg.TurboBeeMsg.updated', index=4, - number=5, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='expires', full_name='adsmsg.TurboBeeMsg.expires', index=5, - number=6, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='eol', full_name='adsmsg.TurboBeeMsg.eol', index=6, - number=7, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='owner', full_name='adsmsg.TurboBeeMsg.owner', index=7, - number=8, 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='ctype', full_name='adsmsg.TurboBeeMsg.ctype', index=8, - number=9, 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), - _descriptor.FieldDescriptor( - name='value', full_name='adsmsg.TurboBeeMsg.value', index=9, - number=10, 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), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _TURBOBEEMSG_CTYPE, - ], - options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=74, - serialized_end=469, -) - -_TURBOBEEMSG.fields_by_name['status'].enum_type = status__pb2._STATUS -_TURBOBEEMSG.fields_by_name['created'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP -_TURBOBEEMSG.fields_by_name['updated'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP -_TURBOBEEMSG.fields_by_name['expires'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP -_TURBOBEEMSG.fields_by_name['eol'].message_type = google_dot_protobuf_dot_timestamp__pb2._TIMESTAMP -_TURBOBEEMSG.fields_by_name['ctype'].enum_type = _TURBOBEEMSG_CTYPE -_TURBOBEEMSG_CTYPE.containing_type = _TURBOBEEMSG -DESCRIPTOR.message_types_by_name['TurboBeeMsg'] = _TURBOBEEMSG -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -TurboBeeMsg = _reflection.GeneratedProtocolMessageType('TurboBeeMsg', (_message.Message,), dict( - DESCRIPTOR = _TURBOBEEMSG, - __module__ = 'turbobee_pb2' - # @@protoc_insertion_point(class_scope:adsmsg.TurboBeeMsg) - )) -_sym_db.RegisterMessage(TurboBeeMsg) - - -# @@protoc_insertion_point(module_scope) diff --git a/adsmsg/tests/test_bibrecord.py b/adsmsg/tests/test_bibrecord.py index 94e107e..0a4f994 100644 --- a/adsmsg/tests/test_bibrecord.py +++ b/adsmsg/tests/test_bibrecord.py @@ -39,7 +39,17 @@ def test_serialization(self): data = bibrecord.serialize() - self.assertEqual(data, '\n\x13{0}\x12\x04{1}\x1a0\n.\n,{2}"\x1c\n\x1a\n\x18{3}'.format(bibcode, JSON_fingerprint, arxiv_category, content)) + if sys.version_info > (3,): + test_data = b'\n\x13%b\x12\x04%b\x1a0\n.\n,%b"\x1c\n\x1a\n\x18%b' % (bibcode.encode(), + JSON_fingerprint.encode(), + arxiv_category.encode(), + content.encode()) + else: + test_data = '\n\x13{0}\x12\x04{1}\x1a0\n.\n,{2}"\x1c\n\x1a\n\x18{3}'.format(bibcode, + JSON_fingerprint, + arxiv_category, + content) + self.assertEqual(data, test_data) data_str = str(bibrecord) self.assertEqual(data_str, 'bibcode: "{0}"\nJSON_fingerprint: "{1}"\nmetadata {{\n general {{\n arxivcategories: "{2}"\n }}\n}}\ntext {{\n body {{\n content: "{3}"\n }}\n}}\n'.format(bibcode, JSON_fingerprint, arxiv_category, content)) self.assertNotEqual(data, data_str) diff --git a/adsmsg/tests/test_denormalized_record.py b/adsmsg/tests/test_denormalized_record.py index 3e3adfa..8bf4322 100644 --- a/adsmsg/tests/test_denormalized_record.py +++ b/adsmsg/tests/test_denormalized_record.py @@ -29,7 +29,12 @@ def test_serialization(self): denormalized_record.data.author.append(author) denormalized_record.data.author_count = author_count data = denormalized_record.serialize() - self.assertEqual(data, '\n\x19{0}:\x07{1}@\x01'.format(abstract, author)) + if sys.version_info > (3,): + test_data = b'\n\x19%b:\x07%b@\x01' % (abstract.encode(), + author.encode()) + else: + test_data = '\n\x19{0}:\x07{1}@\x01'.format(abstract, author) + self.assertEqual(data, test_data) data_str = str(denormalized_record) self.assertEqual(data_str, 'abstract: "{0}"\nauthor: "{1}"\nauthor_count: {2}\n'.format(abstract, author, author_count)) self.assertNotEqual(data, data_str) diff --git a/adsmsg/tests/test_metrics_record.py b/adsmsg/tests/test_metrics_record.py index 38fdf21..debc45f 100644 --- a/adsmsg/tests/test_metrics_record.py +++ b/adsmsg/tests/test_metrics_record.py @@ -4,7 +4,11 @@ from datetime import datetime import time from json import dumps, loads -from __builtin__ import float +try: + from __builtin__ import float +except ModuleNotFoundError: + from builtins import float + class TestMsg(unittest.TestCase): diff --git a/adsmsg/tests/test_msg.py b/adsmsg/tests/test_msg.py index bdb78f7..f526418 100644 --- a/adsmsg/tests/test_msg.py +++ b/adsmsg/tests/test_msg.py @@ -5,9 +5,16 @@ import adsmsg from adsmsg import BibRecord, Status from adsmsg.msg import Msg -import json import base64 +try: + import simplejson as json +except ImportError: + import json + +from google.protobuf import json_format + + class TestMsg(unittest.TestCase): def setUp(self): @@ -34,7 +41,11 @@ def test_serializer(self): cls, data = b.dump() self.assertEqual('adsmsg.bibrecord.BibRecord', cls) - self.assertEqual('\n\x07bibcode', data) + if sys.version_info > (3,): + test_data = b'\n\x07bibcode' + else: + test_data = '\n\x07bibcode' + self.assertEqual(test_data, data) b2 = Msg.loads(cls, data) self.assertEqual(b2.bibcode, b.bibcode) @@ -45,14 +56,22 @@ def test_higher_char(self): cls, data = b.dump() self.assertEqual('adsmsg.bibrecord.BibRecord', cls) - self.assertEqual('\n\x02\xc6\xb5', data) + if sys.version_info > (3,): + test_data = b'\n\x02\xc6\xb5' + else: + test_data = '\n\x02\xc6\xb5' + self.assertEqual(test_data, data) b2 = Msg.loads(cls, data) self.assertEqual(b2.bibcode, b.bibcode) def test_json(self): - b = BibRecord(bibcode=u'\u01b5') + if sys.version_info > (3,): + test_bib = '\u01b5' + else: + test_bib = u'\u01b5' + b = BibRecord(bibcode=test_bib) cls, data = b.dump() x = json.dumps(b.__json__()) z = json.loads(x) diff --git a/adsmsg/tests/test_turbobee.py b/adsmsg/tests/test_turbobee.py deleted file mode 100644 index 2ccb931..0000000 --- a/adsmsg/tests/test_turbobee.py +++ /dev/null @@ -1,67 +0,0 @@ -import sys -import os - -import unittest -from adsmsg import TurboBeeMsg, Status -from datetime import datetime - -class TestTurboBee(unittest.TestCase): - - def setUp(self): - unittest.TestCase.setUp(self) - self.proj_home = os.path.join(os.path.dirname(__file__), '../..') - - - def tearDown(self): - unittest.TestCase.tearDown(self) - - - def test_is_valid(self): - rec = TurboBeeMsg() - rec.qid = 'foo' - self.assertTrue(rec.is_valid()) - - rec.qid = 'unlimiteeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed' * 512 - self.assertTrue(rec.is_valid()) - - rec.status = Status.new - now = datetime.utcnow() - - rec.created = rec.get_timestamp(now) - self.assertEqual(now, rec.get_datetime(rec.created)) - - rec.value = 'foobar' - rec.ctype = rec.ContentType.text - rec.ctype = 0 # unknown - self.assertTrue(rec.is_valid()) - - rec.set_value(1) - self.assertTrue(rec.is_valid()) - - rec.set_value(u'\ud789') - rec.ctype = rec.ContentType.text - - self.assertEqual(rec.get_value(), u'\ud789'.encode('utf8')) - rec.ctype = rec.ContentType.binary - self.assertEqual(rec.get_value(), u'\ud789'.encode('utf8')) - - rec.set_value({'foo': u'\ud789'}, rec.ContentType.json) - self.assertEqual(rec.get_value(), {'foo': u'\ud789'}) - - rec.set_value(u'\ud789', rec.ContentType.text) - self.assertEqual(rec.get_value(), u'\ud789'.encode('utf8')) - - - def test_serializer(self): - # check we are not movng dates (by loosing nanosec precision) - rec = TurboBeeMsg() - now = datetime.utcnow() - rec.created = rec.get_timestamp(now) - - for i in xrange(10050): - rec = rec.loads(*rec.dump()) - self.assertEqual(rec.get_datetime(rec.created), now) - - -if __name__ == '__main__': - unittest.main() diff --git a/adsmsg/turbobee.py b/adsmsg/turbobee.py deleted file mode 100644 index d7398f5..0000000 --- a/adsmsg/turbobee.py +++ /dev/null @@ -1,77 +0,0 @@ -from .msg import Msg -from .protobuf import turbobee_pb2 -from google.protobuf.timestamp_pb2 import Timestamp -from datetime import datetime -from collections import namedtuple -import json - -# helper for access attributes -#ContentTypes = namedtuple('turbobee_CType', turbobee_pb2.TurboBeeMsg.CType.keys()) -ContentTypes = namedtuple('CType', []) -for k,v in turbobee_pb2.TurboBeeMsg.CType.items(): - setattr(ContentTypes, k, v) - - -class TurboBeeMsg(Msg): - - def __init__(self, *args, **kwargs): - super(TurboBeeMsg, self).__init__(turbobee_pb2.TurboBeeMsg(), args, kwargs) - - @property - def ContentType(self): - return ContentTypes - - # TODO: maybe I should add smart @property getters/setters for timestamps instead - - def get_timestamp(self, dt=None): - """Makes timestamp out of a datatime (or returns timestamp - for current time)""" - ts = Timestamp() - if dt: - ts.FromDatetime(dt) - else: - ts.FromDatetime(datetime.utcnow()) - return ts - - def get_datetime(self, ts): - """Turns timestamp into a python datetime. - Python doesn't have nanoseconds (we are going - to loose precision). The returned datetime - is always UTC. """ - - return datetime.utcfromtimestamp(ts.seconds).replace(microsecond=ts.nanos/1000) - - def set_value(self, value, ctype=None): - """Always sets the value as utf8 encoded bytes""" - if ctype: - self.ctype = ctype - - # we can only deal with bytes - if isinstance(value, unicode): - value = value.encode('utf8') - - if self.ctype == ContentTypes.json: - if not isinstance(value, basestring): - self.value = json.dumps(value) - else: - self.value = bytes(value) - - - - - def get_value(self): - """Based on the content type, return property - assembled value. - text: -> utf8 encoded string - json: -> value loaded by calling json.loads() - html: -> utf8 encoded string - all the rest: returns bytes - """ - if self.ctype == ContentTypes.text or \ - self.ctype == ContentTypes.html: - return self.value - elif self.ctype == ContentTypes.json: - return json.loads(self.value) - else: - return self.value - \ No newline at end of file diff --git a/dev-requirements.txt b/dev-requirements.txt index ecccc9a..f5a046b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,7 +1,7 @@ -pytest==2.8.2 +pytest==4.6.9 coveralls==1.1.0 mock==1.3.0 -coverage==4.0.1 -pytest-cov==2.2.0 +coverage==5.0.4 +pytest-cov==2.8.1 pudb==2017.1.4 -pytest-pudb==0.5 +pytest-pudb==0.7 diff --git a/requirements.txt b/requirements.txt index 35bd95a..895356f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,3 @@ -protobuf==3.3.0 +protobuf==3.11.3 +future +simplejson diff --git a/setup.py b/setup.py index ce66d1c..51b75e7 100644 --- a/setup.py +++ b/setup.py @@ -49,6 +49,9 @@ def get_git_version(default="v0.0.1"): 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.7', 'Topic :: Software Development :: Libraries :: Python Modules' ] ) diff --git a/specs/turbobee.proto b/specs/turbobee.proto deleted file mode 100644 index eb262dd..0000000 --- a/specs/turbobee.proto +++ /dev/null @@ -1,59 +0,0 @@ -syntax = "proto3"; -import "status.proto"; -import "google/protobuf/timestamp.proto"; - -package adsmsg; - -// this is the message travelling inside our pipelines; if an object -// should be created, you'll typically set these two arguments -// status = new -// url = target url -// -// Then, something will work on building the object and will fill -// the other parameters: -// - value -// - ctype -// - timestamps - - - -message TurboBeeMsg { - - enum CType { - unknown = 0; /* default */ - html = 1; - text = 2; - json = 3; - binary = 4; - png = 5; - } - - // If set, then the object will be stored (on the remote side) - // using this key - - string qid = 1; - - // status of this object (we are re-using generic status) - // corresponds to actions to be taken on the object; this attr - // is only useful for pipelines - - Status status = 2; - - // remote resource to fetch/cache; can be a full url incl - // domain; or just path (in which case default domain will - // be set) - - string target = 3; - - google.protobuf.Timestamp created = 4; - google.protobuf.Timestamp updated = 5; - google.protobuf.Timestamp expires = 6; - google.protobuf.Timestamp eol = 7; - - // user account id - int32 owner = 8; - - CType ctype = 9; - bytes value = 10; - -} \ No newline at end of file