From 2b1802ceb9a3da4735f1d3e2c46fd53f933dd7ed Mon Sep 17 00:00:00 2001 From: Sergi Blanco-Cuaresma Date: Fri, 13 May 2022 14:18:17 -0400 Subject: [PATCH 1/2] Updated protobuf to 3.17.3 + fixed Dockerfile --- Dockerfile | 8 ++++---- README.md | 6 +++--- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32ad15e..abaeea3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ # - Compile and install protobuf RUN \ DEBIAN_FRONTEND=noninteractive apt-get install -y autoconf automake libtool curl make g++ unzip wget && \ - 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/ && \ + wget https://github.com/google/protobuf/releases/download/v3.17.3/protobuf-python-3.17.3.tar.gz && \ + tar -zxvf protobuf-python-3.17.3.tar.gz && \ + cd protobuf-3.17.3/ && \ ./configure && \ make -j 2 && \ make install && \ @@ -23,7 +23,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y git curl wget nano vim les # - Python 2 & 3 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential libpq-dev libxslt1-dev poppler-utils RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python2 python2-dev python-setuptools python-libxml2 -RUN curl https://bootstrap.pypa.io/get-pip.py --output /tmp/get-pip.py && \ +RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip.py && \ python2 /tmp/get-pip.py && \ rm -f /tmp/get-pip.py RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-dev python3-pip python3-setuptools python3-libxml2 diff --git a/README.md b/README.md index 04f7f47..e470f81 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ To modify message definition, Protocol Buffers compiler should be installed: ``` sudo apt-get install autoconf automake libtool curl make g++ unzip -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.17.3/protobuf-python-3.17.3.tar.gz +tar -zxvf protobuf-python-3.17.3.tar.gz +cd protobuf-3.17.3/ ./configure make sudo make install diff --git a/requirements.txt b/requirements.txt index b6b5d33..256a561 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -protobuf==3.14.0 +protobuf==3.17.3 future==0.18.2 simplejson==3.17.6 From dcbd24c7f3ab5bf43cefd0492a4c8930e49b26d0 Mon Sep 17 00:00:00 2001 From: Sergi Blanco-Cuaresma Date: Fri, 13 May 2022 14:39:38 -0400 Subject: [PATCH 2/2] Re-generated protobuf code --- adsmsg/protobuf/augmentrecord_pb2.py | 2 +- adsmsg/protobuf/bibrecord_pb2.py | 2 +- .../citation_changes_content_type_pb2.py | 2 +- adsmsg/protobuf/citation_changes_pb2.py | 2 +- adsmsg/protobuf/denormalized_record_pb2.py | 2 +- adsmsg/protobuf/fulltext_requests_pb2.py | 2 +- adsmsg/protobuf/fulltext_update_pb2.py | 2 +- adsmsg/protobuf/master_pb2.py | 144 +++++++++--------- adsmsg/protobuf/metrics_pb2.py | 2 +- adsmsg/protobuf/nonbibrecord_pb2.py | 4 +- adsmsg/protobuf/orcid_claims_pb2.py | 2 +- adsmsg/protobuf/status_pb2.py | 2 +- 12 files changed, 86 insertions(+), 82 deletions(-) diff --git a/adsmsg/protobuf/augmentrecord_pb2.py b/adsmsg/protobuf/augmentrecord_pb2.py index d74f782..72dd6cd 100644 --- a/adsmsg/protobuf/augmentrecord_pb2.py +++ b/adsmsg/protobuf/augmentrecord_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: augmentrecord.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/bibrecord_pb2.py b/adsmsg/protobuf/bibrecord_pb2.py index d037127..ee7f49e 100644 --- a/adsmsg/protobuf/bibrecord_pb2.py +++ b/adsmsg/protobuf/bibrecord_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: bibrecord.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/citation_changes_content_type_pb2.py b/adsmsg/protobuf/citation_changes_content_type_pb2.py index f6a48ee..26bc3da 100644 --- a/adsmsg/protobuf/citation_changes_content_type_pb2.py +++ b/adsmsg/protobuf/citation_changes_content_type_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: citation_changes_content_type.proto - +"""Generated protocol buffer code.""" from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message diff --git a/adsmsg/protobuf/citation_changes_pb2.py b/adsmsg/protobuf/citation_changes_pb2.py index d269b9a..7f3a205 100644 --- a/adsmsg/protobuf/citation_changes_pb2.py +++ b/adsmsg/protobuf/citation_changes_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: citation_changes.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/denormalized_record_pb2.py b/adsmsg/protobuf/denormalized_record_pb2.py index 50171f3..c35ad1b 100644 --- a/adsmsg/protobuf/denormalized_record_pb2.py +++ b/adsmsg/protobuf/denormalized_record_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: denormalized_record.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/fulltext_requests_pb2.py b/adsmsg/protobuf/fulltext_requests_pb2.py index 5cdbd62..4fcc0d4 100644 --- a/adsmsg/protobuf/fulltext_requests_pb2.py +++ b/adsmsg/protobuf/fulltext_requests_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: fulltext_requests.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/fulltext_update_pb2.py b/adsmsg/protobuf/fulltext_update_pb2.py index e1f0816..1ad2a74 100644 --- a/adsmsg/protobuf/fulltext_update_pb2.py +++ b/adsmsg/protobuf/fulltext_update_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: fulltext_update.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/master_pb2.py b/adsmsg/protobuf/master_pb2.py index 331e7dd..2362436 100644 --- a/adsmsg/protobuf/master_pb2.py +++ b/adsmsg/protobuf/master_pb2.py @@ -1,13 +1,11 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: master.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -20,7 +18,9 @@ name='master.proto', package='adsmsg', syntax='proto3', - serialized_pb=_b('\n\x0cmaster.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\";\n\x0eLinkTypeRecord\x12\x0b\n\x03url\x18\x01 \x03(\t\x12\r\n\x05title\x18\x02 \x03(\t\x12\r\n\x05\x63ount\x18\x03 \x01(\x05\"\xd0\x04\n\nLinkRecord\x12\r\n\x05\x41RXIV\x18\x01 \x03(\t\x12\x0b\n\x03\x44OI\x18\x02 \x03(\t\x12*\n\x04\x44\x41TA\x18\x03 \x03(\x0b\x32\x1c.adsmsg.LinkRecord.DATAEntry\x12\x30\n\x07\x45SOURCE\x18\x04 \x03(\x0b\x32\x1f.adsmsg.LinkRecord.ESOURCEEntry\x12*\n\nASSOCIATED\x18\x05 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12\'\n\x07INSPIRE\x18\x06 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12.\n\x0eLIBRARYCATALOG\x18\x07 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12,\n\x0cPRESENTATION\x18\x08 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12\x10\n\x08\x41\x42STRACT\x18\t \x01(\x08\x12\x11\n\tCITATIONS\x18\n \x01(\x08\x12\x10\n\x08GRAPHICS\x18\x0b \x01(\x08\x12\x0f\n\x07METRICS\x18\x0c \x01(\x08\x12\x0f\n\x07OPENURL\x18\r \x01(\x08\x12\x12\n\nREFERENCES\x18\x0e \x01(\x08\x12\x0b\n\x03TOC\x18\x0f \x01(\x08\x12\x0e\n\x06\x43OREAD\x18\x10 \x01(\x08\x1a\x43\n\tDATAEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord:\x02\x38\x01\x1a\x46\n\x0c\x45SOURCEEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord:\x02\x38\x01\"X\n\x0e\x44ocumentRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x12\n\nidentifier\x18\x02 \x03(\t\x12!\n\x05links\x18\x03 \x01(\x0b\x32\x12.adsmsg.LinkRecord\"c\n\x0f\x44ocumentRecords\x12\x30\n\x10\x64ocument_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocumentRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3') + serialized_options=None, + create_key=_descriptor._internal_create_key, + serialized_pb=b'\n\x0cmaster.proto\x12\x06\x61\x64smsg\x1a\x0cstatus.proto\";\n\x0eLinkTypeRecord\x12\x0b\n\x03url\x18\x01 \x03(\t\x12\r\n\x05title\x18\x02 \x03(\t\x12\r\n\x05\x63ount\x18\x03 \x01(\x05\"\xd0\x04\n\nLinkRecord\x12\r\n\x05\x41RXIV\x18\x01 \x03(\t\x12\x0b\n\x03\x44OI\x18\x02 \x03(\t\x12*\n\x04\x44\x41TA\x18\x03 \x03(\x0b\x32\x1c.adsmsg.LinkRecord.DATAEntry\x12\x30\n\x07\x45SOURCE\x18\x04 \x03(\x0b\x32\x1f.adsmsg.LinkRecord.ESOURCEEntry\x12*\n\nASSOCIATED\x18\x05 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12\'\n\x07INSPIRE\x18\x06 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12.\n\x0eLIBRARYCATALOG\x18\x07 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12,\n\x0cPRESENTATION\x18\x08 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord\x12\x10\n\x08\x41\x42STRACT\x18\t \x01(\x08\x12\x11\n\tCITATIONS\x18\n \x01(\x08\x12\x10\n\x08GRAPHICS\x18\x0b \x01(\x08\x12\x0f\n\x07METRICS\x18\x0c \x01(\x08\x12\x0f\n\x07OPENURL\x18\r \x01(\x08\x12\x12\n\nREFERENCES\x18\x0e \x01(\x08\x12\x0b\n\x03TOC\x18\x0f \x01(\x08\x12\x0e\n\x06\x43OREAD\x18\x10 \x01(\x08\x1a\x43\n\tDATAEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord:\x02\x38\x01\x1a\x46\n\x0c\x45SOURCEEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12%\n\x05value\x18\x02 \x01(\x0b\x32\x16.adsmsg.LinkTypeRecord:\x02\x38\x01\"X\n\x0e\x44ocumentRecord\x12\x0f\n\x07\x62ibcode\x18\x01 \x01(\t\x12\x12\n\nidentifier\x18\x02 \x03(\t\x12!\n\x05links\x18\x03 \x01(\x0b\x32\x12.adsmsg.LinkRecord\"c\n\x0f\x44ocumentRecords\x12\x30\n\x10\x64ocument_records\x18\x01 \x03(\x0b\x32\x16.adsmsg.DocumentRecord\x12\x1e\n\x06status\x18\x02 \x01(\x0e\x32\x0e.adsmsg.Statusb\x06proto3' , dependencies=[status__pb2.DESCRIPTOR,]) @@ -33,6 +33,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='url', full_name='adsmsg.LinkTypeRecord.url', index=0, @@ -40,28 +41,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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='title', full_name='adsmsg.LinkTypeRecord.title', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='count', full_name='adsmsg.LinkTypeRecord.count', 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, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -78,28 +79,29 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='key', full_name='adsmsg.LinkRecord.DATAEntry.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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='value', full_name='adsmsg.LinkRecord.DATAEntry.value', 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, create_key=_descriptor._internal_create_key), ], 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=[], @@ -115,28 +117,29 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='key', full_name='adsmsg.LinkRecord.ESOURCEEntry.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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='value', full_name='adsmsg.LinkRecord.ESOURCEEntry.value', 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, create_key=_descriptor._internal_create_key), ], 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=[], @@ -152,6 +155,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='ARXIV', full_name='adsmsg.LinkRecord.ARXIV', index=0, @@ -159,119 +163,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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='DOI', full_name='adsmsg.LinkRecord.DOI', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='DATA', full_name='adsmsg.LinkRecord.DATA', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='ESOURCE', full_name='adsmsg.LinkRecord.ESOURCE', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='ASSOCIATED', full_name='adsmsg.LinkRecord.ASSOCIATED', 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), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='INSPIRE', full_name='adsmsg.LinkRecord.INSPIRE', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='LIBRARYCATALOG', full_name='adsmsg.LinkRecord.LIBRARYCATALOG', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='PRESENTATION', full_name='adsmsg.LinkRecord.PRESENTATION', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='ABSTRACT', full_name='adsmsg.LinkRecord.ABSTRACT', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='CITATIONS', full_name='adsmsg.LinkRecord.CITATIONS', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='GRAPHICS', full_name='adsmsg.LinkRecord.GRAPHICS', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='METRICS', full_name='adsmsg.LinkRecord.METRICS', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='OPENURL', full_name='adsmsg.LinkRecord.OPENURL', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='REFERENCES', full_name='adsmsg.LinkRecord.REFERENCES', index=13, number=14, 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='TOC', full_name='adsmsg.LinkRecord.TOC', index=14, number=15, 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='COREAD', full_name='adsmsg.LinkRecord.COREAD', index=15, number=16, 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, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[_LINKRECORD_DATAENTRY, _LINKRECORD_ESOURCEENTRY, ], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -288,35 +292,36 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='bibcode', full_name='adsmsg.DocumentRecord.bibcode', index=0, number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=_b("").decode('utf-8'), + has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='identifier', full_name='adsmsg.DocumentRecord.identifier', 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, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='links', full_name='adsmsg.DocumentRecord.links', 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, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -333,6 +338,7 @@ filename=None, file=DESCRIPTOR, containing_type=None, + create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( name='document_records', full_name='adsmsg.DocumentRecords.document_records', index=0, @@ -340,21 +346,21 @@ has_default_value=False, default_value=[], message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( name='status', full_name='adsmsg.DocumentRecords.status', index=1, number=2, type=14, cpp_type=8, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), ], extensions=[ ], nested_types=[], enum_types=[ ], - options=None, + serialized_options=None, is_extendable=False, syntax='proto3', extension_ranges=[], @@ -383,53 +389,51 @@ DESCRIPTOR.message_types_by_name['DocumentRecords'] = _DOCUMENTRECORDS _sym_db.RegisterFileDescriptor(DESCRIPTOR) -LinkTypeRecord = _reflection.GeneratedProtocolMessageType('LinkTypeRecord', (_message.Message,), dict( - DESCRIPTOR = _LINKTYPERECORD, - __module__ = 'master_pb2' +LinkTypeRecord = _reflection.GeneratedProtocolMessageType('LinkTypeRecord', (_message.Message,), { + 'DESCRIPTOR' : _LINKTYPERECORD, + '__module__' : 'master_pb2' # @@protoc_insertion_point(class_scope:adsmsg.LinkTypeRecord) - )) + }) _sym_db.RegisterMessage(LinkTypeRecord) -LinkRecord = _reflection.GeneratedProtocolMessageType('LinkRecord', (_message.Message,), dict( +LinkRecord = _reflection.GeneratedProtocolMessageType('LinkRecord', (_message.Message,), { - DATAEntry = _reflection.GeneratedProtocolMessageType('DATAEntry', (_message.Message,), dict( - DESCRIPTOR = _LINKRECORD_DATAENTRY, - __module__ = 'master_pb2' + 'DATAEntry' : _reflection.GeneratedProtocolMessageType('DATAEntry', (_message.Message,), { + 'DESCRIPTOR' : _LINKRECORD_DATAENTRY, + '__module__' : 'master_pb2' # @@protoc_insertion_point(class_scope:adsmsg.LinkRecord.DATAEntry) - )) + }) , - ESOURCEEntry = _reflection.GeneratedProtocolMessageType('ESOURCEEntry', (_message.Message,), dict( - DESCRIPTOR = _LINKRECORD_ESOURCEENTRY, - __module__ = 'master_pb2' + 'ESOURCEEntry' : _reflection.GeneratedProtocolMessageType('ESOURCEEntry', (_message.Message,), { + 'DESCRIPTOR' : _LINKRECORD_ESOURCEENTRY, + '__module__' : 'master_pb2' # @@protoc_insertion_point(class_scope:adsmsg.LinkRecord.ESOURCEEntry) - )) + }) , - DESCRIPTOR = _LINKRECORD, - __module__ = 'master_pb2' + 'DESCRIPTOR' : _LINKRECORD, + '__module__' : 'master_pb2' # @@protoc_insertion_point(class_scope:adsmsg.LinkRecord) - )) + }) _sym_db.RegisterMessage(LinkRecord) _sym_db.RegisterMessage(LinkRecord.DATAEntry) _sym_db.RegisterMessage(LinkRecord.ESOURCEEntry) -DocumentRecord = _reflection.GeneratedProtocolMessageType('DocumentRecord', (_message.Message,), dict( - DESCRIPTOR = _DOCUMENTRECORD, - __module__ = 'master_pb2' +DocumentRecord = _reflection.GeneratedProtocolMessageType('DocumentRecord', (_message.Message,), { + 'DESCRIPTOR' : _DOCUMENTRECORD, + '__module__' : 'master_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocumentRecord) - )) + }) _sym_db.RegisterMessage(DocumentRecord) -DocumentRecords = _reflection.GeneratedProtocolMessageType('DocumentRecords', (_message.Message,), dict( - DESCRIPTOR = _DOCUMENTRECORDS, - __module__ = 'master_pb2' +DocumentRecords = _reflection.GeneratedProtocolMessageType('DocumentRecords', (_message.Message,), { + 'DESCRIPTOR' : _DOCUMENTRECORDS, + '__module__' : 'master_pb2' # @@protoc_insertion_point(class_scope:adsmsg.DocumentRecords) - )) + }) _sym_db.RegisterMessage(DocumentRecords) -_LINKRECORD_DATAENTRY.has_options = True -_LINKRECORD_DATAENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) -_LINKRECORD_ESOURCEENTRY.has_options = True -_LINKRECORD_ESOURCEENTRY._options = _descriptor._ParseOptions(descriptor_pb2.MessageOptions(), _b('8\001')) +_LINKRECORD_DATAENTRY._options = None +_LINKRECORD_ESOURCEENTRY._options = None # @@protoc_insertion_point(module_scope) diff --git a/adsmsg/protobuf/metrics_pb2.py b/adsmsg/protobuf/metrics_pb2.py index 931b45d..bf95cac 100644 --- a/adsmsg/protobuf/metrics_pb2.py +++ b/adsmsg/protobuf/metrics_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: metrics.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/nonbibrecord_pb2.py b/adsmsg/protobuf/nonbibrecord_pb2.py index a12ab22..d84e202 100644 --- a/adsmsg/protobuf/nonbibrecord_pb2.py +++ b/adsmsg/protobuf/nonbibrecord_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: nonbibrecord.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection @@ -411,4 +411,4 @@ _sym_db.RegisterMessage(DataLinksRecordList) -# @@protoc_insertion_point(module_scope) \ No newline at end of file +# @@protoc_insertion_point(module_scope) diff --git a/adsmsg/protobuf/orcid_claims_pb2.py b/adsmsg/protobuf/orcid_claims_pb2.py index 9e844f3..ef8dc66 100644 --- a/adsmsg/protobuf/orcid_claims_pb2.py +++ b/adsmsg/protobuf/orcid_claims_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: orcid_claims.proto - +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message from google.protobuf import reflection as _reflection diff --git a/adsmsg/protobuf/status_pb2.py b/adsmsg/protobuf/status_pb2.py index c53c3c1..9886e5e 100644 --- a/adsmsg/protobuf/status_pb2.py +++ b/adsmsg/protobuf/status_pb2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: status.proto - +"""Generated protocol buffer code.""" from google.protobuf.internal import enum_type_wrapper from google.protobuf import descriptor as _descriptor from google.protobuf import message as _message