diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 97ea10a..ebaa06c 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.7, 3.8, 3.9, '3.10'] + python: [3.7, 3.8, 3.9, '3.10', '3.11'] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/src/google/appengine/api/__init__.py b/src/google/appengine/api/__init__.py index f0e1a56..7735292 100755 --- a/src/google/appengine/api/__init__.py +++ b/src/google/appengine/api/__init__.py @@ -37,57 +37,79 @@ app.wsgi_app = google.appengine.api.wrap_wsgi_app(app.wsgi_app) ``` """ + import os -from google.appengine.api import full_app_id +from typing import Dict, Optional +def wrap_wsgi_app(app, *, use_deferred=False, **kwargs): + """Wrap a WSGI app with middlewares required to access App Engine APIs.""" + return WSGIAppWrapper().wrap_wsgi_app( + app, use_deferred=use_deferred, **kwargs) + + +class WSGIAppWrapper(): + """A mechanism for overriding wrap_wsgi_app's defaults.""" + + def __init__(self, *, legacy_behaviors: Optional[Dict[str, bool]] = None): + self.legacy_behaviors = dict( + use_legacy_context_mode=True, + patch_thread_creation=True) + if legacy_behaviors is not None: + self.legacy_behaviors.update(legacy_behaviors) + + + + def wrap_wsgi_app(self, app, *, use_deferred=False, **kwargs): + """Wrap a WSGI app with middlewares required to access App Engine APIs.""" + + + self.legacy_behaviors.update(kwargs) + -def wrap_wsgi_app(app, use_legacy_context_mode=True, use_deferred=False): - """Wrap a WSGI app with middlewares required to access App Engine APIs.""" + from google.appengine.runtime import initialize + from google.appengine.runtime import middlewares + from google.appengine.runtime import default_api_stub - from google.appengine.runtime import initialize - from google.appengine.runtime import middlewares - from google.appengine.runtime import default_api_stub + if self.legacy_behaviors['patch_thread_creation']: + initialize.InitializeThreadingApis() - initialize.InitializeThreadingApis() + default_api_stub.Register(default_api_stub.DefaultApiStub()) - default_api_stub.Register(default_api_stub.DefaultApiStub()) + def if_legacy_context_mode(f): + return f() if self.legacy_behaviors['use_legacy_context_mode'] else [] + def if_deferred_enabled(f): + return f() if use_deferred else [] - full_app_id.normalize() + return middlewares.Wrap( + app, + if_legacy_context_mode(lambda: [ - def if_legacy(array): - return array if use_legacy_context_mode else [] - def if_deferred_enabled(array): - return array if use_deferred else [] - return middlewares.Wrap( - app, - if_legacy([ - middlewares.MakeInitLegacyRequestOsEnvironMiddleware(), - ]) + [ - middlewares.RunInNewContextMiddleware, - middlewares.SetContextFromHeadersMiddleware, - middlewares.CallbackMiddleware, - middlewares.UseRequestSecurityTicketForApiMiddleware, - middlewares.WaitForResponseMiddleware, - middlewares.WsgiEnvSettingMiddleware, + middlewares.MakeInitLegacyRequestOsEnvironMiddleware(), + ]) + [ + middlewares.RunInNewContextMiddleware, + middlewares.SetContextFromHeadersMiddleware, + middlewares.CallbackMiddleware, + middlewares.WaitForResponseMiddleware, + middlewares.WsgiEnvSettingMiddleware, - middlewares.MakeLegacyWsgiEnvSettingMiddleware(), - ] + if_legacy([ - middlewares.LegacyWsgiRemoveXAppenginePrefixMiddleware, - middlewares.LegacyCopyWsgiEnvToOsEnvMiddleware, - ]) + [ - middlewares.ErrorLoggingMiddleware, - middlewares.BackgroundAndShutdownMiddleware, - middlewares.SetNamespaceFromHeader, - ] + if_deferred_enabled([ - middlewares.AddDeferredMiddleware, - ])) + middlewares.MakeLegacyWsgiEnvSettingMiddleware(), + ] + if_legacy_context_mode(lambda: [ + middlewares.LegacyWsgiRemoveXAppenginePrefixMiddleware, + middlewares.LegacyCopyWsgiEnvToOsEnvMiddleware, + ]) + [ + middlewares.ErrorLoggingMiddleware, + middlewares.BackgroundAndShutdownMiddleware, + middlewares.SetNamespaceFromHeader, + ] + if_deferred_enabled(lambda: [ + middlewares.AddDeferredMiddleware, + ])) diff --git a/src/google/appengine/api/api_base_pb2.py b/src/google/appengine/api/api_base_pb2.py index 3d384d6..5d8a7f1 100755 --- a/src/google/appengine/api/api_base_pb2.py +++ b/src/google/appengine/api/api_base_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,64 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#google/appengine/api/api_base.proto\x12\x15google.appengine.base\"\x1c\n\x0bStringProto\x12\r\n\x05value\x18\x01 \x02(\t\"\x1f\n\x0eInteger32Proto\x12\r\n\x05value\x18\x01 \x02(\x05\"\x1f\n\x0eInteger64Proto\x12\r\n\x05value\x18\x01 \x02(\x03\"\x1a\n\tBoolProto\x12\r\n\x05value\x18\x01 \x02(\x08\"\x1c\n\x0b\x44oubleProto\x12\r\n\x05value\x18\x01 \x02(\x01\"\x1f\n\nBytesProto\x12\x11\n\x05value\x18\x01 \x02(\x0c\x42\x02\x08\x01\"\x0b\n\tVoidProtoB,\n\x1f\x63om.google.google.appengine.apiB\tApiBasePb') - - -_STRINGPROTO = DESCRIPTOR.message_types_by_name['StringProto'] -_INTEGER32PROTO = DESCRIPTOR.message_types_by_name['Integer32Proto'] -_INTEGER64PROTO = DESCRIPTOR.message_types_by_name['Integer64Proto'] -_BOOLPROTO = DESCRIPTOR.message_types_by_name['BoolProto'] -_DOUBLEPROTO = DESCRIPTOR.message_types_by_name['DoubleProto'] -_BYTESPROTO = DESCRIPTOR.message_types_by_name['BytesProto'] -_VOIDPROTO = DESCRIPTOR.message_types_by_name['VoidProto'] -StringProto = _reflection.GeneratedProtocolMessageType('StringProto', (_message.Message,), { - 'DESCRIPTOR' : _STRINGPROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(StringProto) - -Integer32Proto = _reflection.GeneratedProtocolMessageType('Integer32Proto', (_message.Message,), { - 'DESCRIPTOR' : _INTEGER32PROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(Integer32Proto) - -Integer64Proto = _reflection.GeneratedProtocolMessageType('Integer64Proto', (_message.Message,), { - 'DESCRIPTOR' : _INTEGER64PROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(Integer64Proto) - -BoolProto = _reflection.GeneratedProtocolMessageType('BoolProto', (_message.Message,), { - 'DESCRIPTOR' : _BOOLPROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(BoolProto) - -DoubleProto = _reflection.GeneratedProtocolMessageType('DoubleProto', (_message.Message,), { - 'DESCRIPTOR' : _DOUBLEPROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(DoubleProto) - -BytesProto = _reflection.GeneratedProtocolMessageType('BytesProto', (_message.Message,), { - 'DESCRIPTOR' : _BYTESPROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(BytesProto) - -VoidProto = _reflection.GeneratedProtocolMessageType('VoidProto', (_message.Message,), { - 'DESCRIPTOR' : _VOIDPROTO, - '__module__' : 'google.appengine.api.api_base_pb2' - - }) -_sym_db.RegisterMessage(VoidProto) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.api_base_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/api_testutil.py b/src/google/appengine/api/api_testutil.py index 2783368..b34bcb9 100755 --- a/src/google/appengine/api/api_testutil.py +++ b/src/google/appengine/api/api_testutil.py @@ -18,8 +18,6 @@ """Base class useful for testing with API stubs.""" - - import os import shutil @@ -33,17 +31,16 @@ from google.appengine.datastore import cloud_datastore_v1_remote_stub from google.appengine.datastore import cloud_datastore_v1_stub from google.appengine.datastore import datastore_pbs +from google.appengine.datastore import datastore_sqlite_stub from google.appengine.datastore import datastore_v4_stub - - FLAGS = flags.FLAGS -flags.DEFINE_boolean("use_sqlite", False, - "uses the sqlite based datastore stub") +flags.DEFINE_boolean('use_sqlite', False, + 'uses the sqlite based datastore stub') _CLOUD_DATASTORE_ENABLED = datastore_pbs._CLOUD_DATASTORE_ENABLED @@ -99,10 +96,8 @@ def ConfigureDatastore(self, app_id='app', **kwargs): os.remove(filename) if flags.FLAGS.use_sqlite: - - - - + self.datastore_stub = datastore_sqlite_stub.DatastoreSqliteStub( + app_id, self.datastore_file, **kwargs) raise NotImplementedError('datastore_sqlite_stub not supported') else: diff --git a/src/google/appengine/api/app_identity/app_identity_service_pb2.py b/src/google/appengine/api/app_identity/app_identity_service_pb2.py index 18e9b32..f62c270 100755 --- a/src/google/appengine/api/app_identity/app_identity_service_pb2.py +++ b/src/google/appengine/api/app_identity/app_identity_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,105 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n str: Returns: Default application ID as a string. - We read from the environment APPLICATION_ID (deprecated) or else - GAE_APPLICATION. + We read from the environment GAE_APPLICATION. """ if environ is None: environ = os.environ - - return environ.get('APPLICATION_ID', environ.get('GAE_APPLICATION', '')) + return environ.get('GAE_APPLICATION', '') def put(app_id: str, environ: OsEnvironLike = None): @@ -62,16 +56,9 @@ def put(app_id: str, environ: OsEnvironLike = None): if environ is None: environ = os.environ - environ['APPLICATION_ID'] = app_id environ['GAE_APPLICATION'] = app_id -def normalize(environ: OsEnvironLike = None): - """Normalize the environment variables which set the app ID.""" - - put(get(environ=environ), environ=environ) - - def clear(environ: OsEnvironLike = None): """Unset the application ID in the environment. @@ -82,7 +69,6 @@ def clear(environ: OsEnvironLike = None): if environ is None: environ = os.environ - environ.pop('APPLICATION_ID', None) environ.pop('GAE_APPLICATION', None) diff --git a/src/google/appengine/api/images/images_service_pb2.py b/src/google/appengine/api/images/images_service_pb2.py index bc3e497..dc42c7c 100755 --- a/src/google/appengine/api/images/images_service_pb2.py +++ b/src/google/appengine/api/images/images_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,165 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n0google/appengine/api/images/images_service.proto\x12\x10google.appengine\"\xc8\x01\n\x12ImagesServiceError\"\xb1\x01\n\tErrorCode\x12\x15\n\x11UNSPECIFIED_ERROR\x10\x01\x12\x16\n\x12\x42\x41\x44_TRANSFORM_DATA\x10\x02\x12\r\n\tNOT_IMAGE\x10\x03\x12\x12\n\x0e\x42\x41\x44_IMAGE_DATA\x10\x04\x12\x13\n\x0fIMAGE_TOO_LARGE\x10\x05\x12\x14\n\x10INVALID_BLOB_KEY\x10\x06\x12\x11\n\rACCESS_DENIED\x10\x07\x12\x14\n\x10OBJECT_NOT_FOUND\x10\x08\"\x80\x01\n\x16ImagesServiceTransform\"f\n\x04Type\x12\n\n\x06RESIZE\x10\x01\x12\n\n\x06ROTATE\x10\x02\x12\x13\n\x0fHORIZONTAL_FLIP\x10\x03\x12\x11\n\rVERTICAL_FLIP\x10\x04\x12\x08\n\x04\x43ROP\x10\x05\x12\x14\n\x10IM_FEELING_LUCKY\x10\x06\"\x92\x04\n\tTransform\x12\r\n\x05width\x18\x01 \x01(\x05\x12\x0e\n\x06height\x18\x02 \x01(\x05\x12\x13\n\x0b\x63rop_to_fit\x18\x0b \x01(\x08\x12\x1a\n\rcrop_offset_x\x18\x0c \x01(\x02:\x03\x30.5\x12\x1a\n\rcrop_offset_y\x18\r \x01(\x02:\x03\x30.5\x12\x0e\n\x06rotate\x18\x03 \x01(\x05\x12\x17\n\x0fhorizontal_flip\x18\x04 \x01(\x08\x12\x15\n\rvertical_flip\x18\x05 \x01(\x08\x12\x13\n\x0b\x63rop_left_x\x18\x06 \x01(\x02\x12\x12\n\ncrop_top_y\x18\x07 \x01(\x02\x12\x17\n\x0c\x63rop_right_x\x18\x08 \x01(\x02:\x01\x31\x12\x18\n\rcrop_bottom_y\x18\t \x01(\x02:\x01\x31\x12\x12\n\nautolevels\x18\n \x01(\x08\x12\x15\n\rallow_stretch\x18\x0e \x01(\x08\x12\x1c\n\x14\x64\x65precated_width_set\x18\x65 \x01(\x08\x12\x1d\n\x15\x64\x65precated_height_set\x18\x66 \x01(\x08\x12$\n\x1c\x64\x65precated_crop_offset_x_set\x18p \x01(\x08\x12$\n\x1c\x64\x65precated_crop_offset_y_set\x18q \x01(\x08\x12#\n\x1b\x64\x65precated_crop_right_x_set\x18l \x01(\x08\x12$\n\x1c\x64\x65precated_crop_bottom_y_set\x18m \x01(\x08\"r\n\tImageData\x12\x13\n\x07\x63ontent\x18\x01 \x02(\x0c\x42\x02\x08\x01\x12\x10\n\x08\x62lob_key\x18\x02 \x01(\t\x12\r\n\x05width\x18\x03 \x01(\x05\x12\x0e\n\x06height\x18\x04 \x01(\x05\x12\x1f\n\x17\x64\x65precated_blob_key_set\x18\x66 \x01(\x08\"\xe5\x02\n\rInputSettings\x12]\n\x18\x63orrect_exif_orientation\x18\x01 \x01(\x0e\x32;.google.appengine.InputSettings.ORIENTATION_CORRECTION_TYPE\x12\x16\n\x0eparse_metadata\x18\x02 \x01(\x08\x12$\n\x1ctransparent_substitution_rgb\x18\x03 \x01(\x05\x12/\n\'deprecated_correct_exif_orientation_set\x18\x65 \x01(\x08\x12\x33\n+deprecated_transparent_substitution_rgb_set\x18g \x01(\x08\"Q\n\x1bORIENTATION_CORRECTION_TYPE\x12\x19\n\x15UNCHANGED_ORIENTATION\x10\x00\x12\x17\n\x13\x43ORRECT_ORIENTATION\x10\x01\"\x8a\x01\n\x0eOutputSettings\x12=\n\tmime_type\x18\x01 \x01(\x0e\x32*.google.appengine.OutputSettings.MIME_TYPE\x12\x0f\n\x07quality\x18\x02 \x01(\x05\"(\n\tMIME_TYPE\x12\x07\n\x03PNG\x10\x00\x12\x08\n\x04JPEG\x10\x01\x12\x08\n\x04WEBP\x10\x02\"\xd6\x01\n\x16ImagesTransformRequest\x12*\n\x05image\x18\x01 \x02(\x0b\x32\x1b.google.appengine.ImageData\x12.\n\ttransform\x18\x02 \x03(\x0b\x32\x1b.google.appengine.Transform\x12\x30\n\x06output\x18\x03 \x02(\x0b\x32 .google.appengine.OutputSettings\x12.\n\x05input\x18\x04 \x01(\x0b\x32\x1f.google.appengine.InputSettings\"^\n\x17ImagesTransformResponse\x12*\n\x05image\x18\x01 \x02(\x0b\x32\x1b.google.appengine.ImageData\x12\x17\n\x0fsource_metadata\x18\x02 \x01(\t\"\xa2\x02\n\x15\x43ompositeImageOptions\x12\x14\n\x0csource_index\x18\x01 \x02(\x05\x12\x10\n\x08x_offset\x18\x02 \x02(\x05\x12\x10\n\x08y_offset\x18\x03 \x02(\x05\x12\x0f\n\x07opacity\x18\x04 \x02(\x02\x12>\n\x06\x61nchor\x18\x05 \x02(\x0e\x32..google.appengine.CompositeImageOptions.ANCHOR\"~\n\x06\x41NCHOR\x12\x0c\n\x08TOP_LEFT\x10\x00\x12\x07\n\x03TOP\x10\x01\x12\r\n\tTOP_RIGHT\x10\x02\x12\x08\n\x04LEFT\x10\x03\x12\n\n\x06\x43\x45NTER\x10\x04\x12\t\n\x05RIGHT\x10\x05\x12\x0f\n\x0b\x42OTTOM_LEFT\x10\x06\x12\n\n\x06\x42OTTOM\x10\x07\x12\x10\n\x0c\x42OTTOM_RIGHT\x10\x08\"\x90\x01\n\x0cImagesCanvas\x12\r\n\x05width\x18\x01 \x02(\x05\x12\x0e\n\x06height\x18\x02 \x02(\x05\x12\x30\n\x06output\x18\x03 \x02(\x0b\x32 .google.appengine.OutputSettings\x12\x11\n\x05\x63olor\x18\x04 \x01(\x05:\x02-1\x12\x1c\n\x14\x64\x65precated_color_set\x18h \x01(\x08\"\xae\x01\n\x16ImagesCompositeRequest\x12*\n\x05image\x18\x01 \x03(\x0b\x32\x1b.google.appengine.ImageData\x12\x38\n\x07options\x18\x02 \x03(\x0b\x32\'.google.appengine.CompositeImageOptions\x12.\n\x06\x63\x61nvas\x18\x03 \x02(\x0b\x32\x1e.google.appengine.ImagesCanvas\"E\n\x17ImagesCompositeResponse\x12*\n\x05image\x18\x01 \x02(\x0b\x32\x1b.google.appengine.ImageData\"D\n\x16ImagesHistogramRequest\x12*\n\x05image\x18\x01 \x02(\x0b\x32\x1b.google.appengine.ImageData\";\n\x0fImagesHistogram\x12\x0b\n\x03red\x18\x01 \x03(\x05\x12\r\n\x05green\x18\x02 \x03(\x05\x12\x0c\n\x04\x62lue\x18\x03 \x03(\x05\"O\n\x17ImagesHistogramResponse\x12\x34\n\thistogram\x18\x01 \x02(\x0b\x32!.google.appengine.ImagesHistogram\"F\n\x17ImagesGetUrlBaseRequest\x12\x10\n\x08\x62lob_key\x18\x01 \x02(\t\x12\x19\n\x11\x63reate_secure_url\x18\x02 \x01(\x08\"\'\n\x18ImagesGetUrlBaseResponse\x12\x0b\n\x03url\x18\x01 \x02(\t\".\n\x1aImagesDeleteUrlBaseRequest\x12\x10\n\x08\x62lob_key\x18\x01 \x02(\t\"\x1d\n\x1bImagesDeleteUrlBaseResponseB5\n\x1f\x63om.google.appengine.api.imagesB\x0fImagesServicePb\x88\x01\x01') - - -_IMAGESSERVICEERROR = DESCRIPTOR.message_types_by_name['ImagesServiceError'] -_IMAGESSERVICETRANSFORM = DESCRIPTOR.message_types_by_name['ImagesServiceTransform'] -_TRANSFORM = DESCRIPTOR.message_types_by_name['Transform'] -_IMAGEDATA = DESCRIPTOR.message_types_by_name['ImageData'] -_INPUTSETTINGS = DESCRIPTOR.message_types_by_name['InputSettings'] -_OUTPUTSETTINGS = DESCRIPTOR.message_types_by_name['OutputSettings'] -_IMAGESTRANSFORMREQUEST = DESCRIPTOR.message_types_by_name['ImagesTransformRequest'] -_IMAGESTRANSFORMRESPONSE = DESCRIPTOR.message_types_by_name['ImagesTransformResponse'] -_COMPOSITEIMAGEOPTIONS = DESCRIPTOR.message_types_by_name['CompositeImageOptions'] -_IMAGESCANVAS = DESCRIPTOR.message_types_by_name['ImagesCanvas'] -_IMAGESCOMPOSITEREQUEST = DESCRIPTOR.message_types_by_name['ImagesCompositeRequest'] -_IMAGESCOMPOSITERESPONSE = DESCRIPTOR.message_types_by_name['ImagesCompositeResponse'] -_IMAGESHISTOGRAMREQUEST = DESCRIPTOR.message_types_by_name['ImagesHistogramRequest'] -_IMAGESHISTOGRAM = DESCRIPTOR.message_types_by_name['ImagesHistogram'] -_IMAGESHISTOGRAMRESPONSE = DESCRIPTOR.message_types_by_name['ImagesHistogramResponse'] -_IMAGESGETURLBASEREQUEST = DESCRIPTOR.message_types_by_name['ImagesGetUrlBaseRequest'] -_IMAGESGETURLBASERESPONSE = DESCRIPTOR.message_types_by_name['ImagesGetUrlBaseResponse'] -_IMAGESDELETEURLBASEREQUEST = DESCRIPTOR.message_types_by_name['ImagesDeleteUrlBaseRequest'] -_IMAGESDELETEURLBASERESPONSE = DESCRIPTOR.message_types_by_name['ImagesDeleteUrlBaseResponse'] -_IMAGESSERVICEERROR_ERRORCODE = _IMAGESSERVICEERROR.enum_types_by_name['ErrorCode'] -_IMAGESSERVICETRANSFORM_TYPE = _IMAGESSERVICETRANSFORM.enum_types_by_name['Type'] -_INPUTSETTINGS_ORIENTATION_CORRECTION_TYPE = _INPUTSETTINGS.enum_types_by_name['ORIENTATION_CORRECTION_TYPE'] -_OUTPUTSETTINGS_MIME_TYPE = _OUTPUTSETTINGS.enum_types_by_name['MIME_TYPE'] -_COMPOSITEIMAGEOPTIONS_ANCHOR = _COMPOSITEIMAGEOPTIONS.enum_types_by_name['ANCHOR'] -ImagesServiceError = _reflection.GeneratedProtocolMessageType('ImagesServiceError', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESSERVICEERROR, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesServiceError) - -ImagesServiceTransform = _reflection.GeneratedProtocolMessageType('ImagesServiceTransform', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESSERVICETRANSFORM, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesServiceTransform) - -Transform = _reflection.GeneratedProtocolMessageType('Transform', (_message.Message,), { - 'DESCRIPTOR' : _TRANSFORM, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(Transform) - -ImageData = _reflection.GeneratedProtocolMessageType('ImageData', (_message.Message,), { - 'DESCRIPTOR' : _IMAGEDATA, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImageData) - -InputSettings = _reflection.GeneratedProtocolMessageType('InputSettings', (_message.Message,), { - 'DESCRIPTOR' : _INPUTSETTINGS, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(InputSettings) - -OutputSettings = _reflection.GeneratedProtocolMessageType('OutputSettings', (_message.Message,), { - 'DESCRIPTOR' : _OUTPUTSETTINGS, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(OutputSettings) - -ImagesTransformRequest = _reflection.GeneratedProtocolMessageType('ImagesTransformRequest', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESTRANSFORMREQUEST, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesTransformRequest) - -ImagesTransformResponse = _reflection.GeneratedProtocolMessageType('ImagesTransformResponse', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESTRANSFORMRESPONSE, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesTransformResponse) - -CompositeImageOptions = _reflection.GeneratedProtocolMessageType('CompositeImageOptions', (_message.Message,), { - 'DESCRIPTOR' : _COMPOSITEIMAGEOPTIONS, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(CompositeImageOptions) - -ImagesCanvas = _reflection.GeneratedProtocolMessageType('ImagesCanvas', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESCANVAS, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesCanvas) - -ImagesCompositeRequest = _reflection.GeneratedProtocolMessageType('ImagesCompositeRequest', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESCOMPOSITEREQUEST, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesCompositeRequest) - -ImagesCompositeResponse = _reflection.GeneratedProtocolMessageType('ImagesCompositeResponse', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESCOMPOSITERESPONSE, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesCompositeResponse) - -ImagesHistogramRequest = _reflection.GeneratedProtocolMessageType('ImagesHistogramRequest', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESHISTOGRAMREQUEST, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesHistogramRequest) - -ImagesHistogram = _reflection.GeneratedProtocolMessageType('ImagesHistogram', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESHISTOGRAM, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesHistogram) - -ImagesHistogramResponse = _reflection.GeneratedProtocolMessageType('ImagesHistogramResponse', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESHISTOGRAMRESPONSE, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesHistogramResponse) - -ImagesGetUrlBaseRequest = _reflection.GeneratedProtocolMessageType('ImagesGetUrlBaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESGETURLBASEREQUEST, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesGetUrlBaseRequest) - -ImagesGetUrlBaseResponse = _reflection.GeneratedProtocolMessageType('ImagesGetUrlBaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESGETURLBASERESPONSE, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesGetUrlBaseResponse) - -ImagesDeleteUrlBaseRequest = _reflection.GeneratedProtocolMessageType('ImagesDeleteUrlBaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESDELETEURLBASEREQUEST, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesDeleteUrlBaseRequest) - -ImagesDeleteUrlBaseResponse = _reflection.GeneratedProtocolMessageType('ImagesDeleteUrlBaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _IMAGESDELETEURLBASERESPONSE, - '__module__' : 'google.appengine.api.images.images_service_pb2' - - }) -_sym_db.RegisterMessage(ImagesDeleteUrlBaseResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.images.images_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/mail_service_pb2.py b/src/google/appengine/api/mail_service_pb2.py index cc4e0fc..94e8eb5 100755 --- a/src/google/appengine/api/mail_service_pb2.py +++ b/src/google/appengine/api/mail_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,41 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'google/appengine/api/mail_service.proto\x12\x10google.appengine\"\xb4\x01\n\x10MailServiceError\"\x9f\x01\n\tErrorCode\x12\x06\n\x02OK\x10\x00\x12\x12\n\x0eINTERNAL_ERROR\x10\x01\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10\x02\x12\x17\n\x13UNAUTHORIZED_SENDER\x10\x03\x12\x1b\n\x17INVALID_ATTACHMENT_TYPE\x10\x04\x12\x17\n\x13INVALID_HEADER_NAME\x10\x05\x12\x16\n\x12INVALID_CONTENT_ID\x10\x06\"i\n\x0eMailAttachment\x12\x10\n\x08\x46ileName\x18\x01 \x02(\t\x12\x0c\n\x04\x44\x61ta\x18\x02 \x02(\x0c\x12\x11\n\tContentID\x18\x03 \x01(\t\x12$\n\x18\x44\x45PRECATED_ContentID_set\x18\r \x01(\x08\x42\x02\x18\x01\")\n\nMailHeader\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\r\n\x05value\x18\x02 \x02(\t\"\x81\x02\n\x0bMailMessage\x12\x0e\n\x06Sender\x18\x01 \x02(\t\x12\x0f\n\x07ReplyTo\x18\x02 \x01(\t\x12\n\n\x02To\x18\x03 \x03(\t\x12\n\n\x02\x43\x63\x18\x04 \x03(\t\x12\x0b\n\x03\x42\x63\x63\x18\x05 \x03(\t\x12\x0f\n\x07Subject\x18\x06 \x02(\t\x12\x10\n\x08TextBody\x18\x07 \x01(\t\x12\x10\n\x08HtmlBody\x18\x08 \x01(\t\x12\x13\n\x0b\x41mpHtmlBody\x18\x0b \x01(\t\x12\x34\n\nAttachment\x18\t \x03(\x0b\x32 .google.appengine.MailAttachment\x12,\n\x06Header\x18\n \x03(\x0b\x32\x1c.google.appengine.MailHeaderB.\n\x1d\x63om.google.appengine.api.mailB\rMailServicePb') - - -_MAILSERVICEERROR = DESCRIPTOR.message_types_by_name['MailServiceError'] -_MAILATTACHMENT = DESCRIPTOR.message_types_by_name['MailAttachment'] -_MAILHEADER = DESCRIPTOR.message_types_by_name['MailHeader'] -_MAILMESSAGE = DESCRIPTOR.message_types_by_name['MailMessage'] -_MAILSERVICEERROR_ERRORCODE = _MAILSERVICEERROR.enum_types_by_name['ErrorCode'] -MailServiceError = _reflection.GeneratedProtocolMessageType('MailServiceError', (_message.Message,), { - 'DESCRIPTOR' : _MAILSERVICEERROR, - '__module__' : 'google.appengine.api.mail_service_pb2' - - }) -_sym_db.RegisterMessage(MailServiceError) - -MailAttachment = _reflection.GeneratedProtocolMessageType('MailAttachment', (_message.Message,), { - 'DESCRIPTOR' : _MAILATTACHMENT, - '__module__' : 'google.appengine.api.mail_service_pb2' - - }) -_sym_db.RegisterMessage(MailAttachment) - -MailHeader = _reflection.GeneratedProtocolMessageType('MailHeader', (_message.Message,), { - 'DESCRIPTOR' : _MAILHEADER, - '__module__' : 'google.appengine.api.mail_service_pb2' - - }) -_sym_db.RegisterMessage(MailHeader) - -MailMessage = _reflection.GeneratedProtocolMessageType('MailMessage', (_message.Message,), { - 'DESCRIPTOR' : _MAILMESSAGE, - '__module__' : 'google.appengine.api.mail_service_pb2' - - }) -_sym_db.RegisterMessage(MailMessage) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.mail_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/mail_stub_service_pb2.py b/src/google/appengine/api/mail_stub_service_pb2.py index 89f6418..cd185b5 100755 --- a/src/google/appengine/api/mail_stub_service_pb2.py +++ b/src/google/appengine/api/mail_stub_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -34,56 +33,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n,google/appengine/api/mail_stub_service.proto\x12\x10google.appengine\x1a#google/appengine/api/api_base.proto\x1a\'google/appengine/api/mail_service.proto\"N\n\x17GetSentMessagesResponse\x12\x33\n\x0csent_message\x18\x01 \x03(\x0b\x32\x1d.google.appengine.MailMessage\"5\n\x19\x43learSentMessagesResponse\x12\x18\n\x10messages_cleared\x18\x01 \x01(\x05\"/\n\x16GetLogMailBodyResponse\x12\x15\n\rlog_mail_body\x18\x01 \x02(\x08\".\n\x15SetLogMailBodyRequest\x12\x15\n\rlog_mail_body\x18\x01 \x02(\x08\"1\n\x17GetLogMailLevelResponse\x12\x16\n\x0elog_mail_level\x18\x01 \x02(\t\"0\n\x16SetLogMailLevelRequest\x12\x16\n\x0elog_mail_level\x18\x01 \x02(\tB2\n\x1d\x63om.google.appengine.api.mailB\x11MailStubServicePb') - - -_GETSENTMESSAGESRESPONSE = DESCRIPTOR.message_types_by_name['GetSentMessagesResponse'] -_CLEARSENTMESSAGESRESPONSE = DESCRIPTOR.message_types_by_name['ClearSentMessagesResponse'] -_GETLOGMAILBODYRESPONSE = DESCRIPTOR.message_types_by_name['GetLogMailBodyResponse'] -_SETLOGMAILBODYREQUEST = DESCRIPTOR.message_types_by_name['SetLogMailBodyRequest'] -_GETLOGMAILLEVELRESPONSE = DESCRIPTOR.message_types_by_name['GetLogMailLevelResponse'] -_SETLOGMAILLEVELREQUEST = DESCRIPTOR.message_types_by_name['SetLogMailLevelRequest'] -GetSentMessagesResponse = _reflection.GeneratedProtocolMessageType('GetSentMessagesResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETSENTMESSAGESRESPONSE, - '__module__' : 'google.appengine.api.mail_stub_service_pb2' - - }) -_sym_db.RegisterMessage(GetSentMessagesResponse) - -ClearSentMessagesResponse = _reflection.GeneratedProtocolMessageType('ClearSentMessagesResponse', (_message.Message,), { - 'DESCRIPTOR' : _CLEARSENTMESSAGESRESPONSE, - '__module__' : 'google.appengine.api.mail_stub_service_pb2' - - }) -_sym_db.RegisterMessage(ClearSentMessagesResponse) - -GetLogMailBodyResponse = _reflection.GeneratedProtocolMessageType('GetLogMailBodyResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETLOGMAILBODYRESPONSE, - '__module__' : 'google.appengine.api.mail_stub_service_pb2' - - }) -_sym_db.RegisterMessage(GetLogMailBodyResponse) - -SetLogMailBodyRequest = _reflection.GeneratedProtocolMessageType('SetLogMailBodyRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETLOGMAILBODYREQUEST, - '__module__' : 'google.appengine.api.mail_stub_service_pb2' - - }) -_sym_db.RegisterMessage(SetLogMailBodyRequest) - -GetLogMailLevelResponse = _reflection.GeneratedProtocolMessageType('GetLogMailLevelResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETLOGMAILLEVELRESPONSE, - '__module__' : 'google.appengine.api.mail_stub_service_pb2' - - }) -_sym_db.RegisterMessage(GetLogMailLevelResponse) - -SetLogMailLevelRequest = _reflection.GeneratedProtocolMessageType('SetLogMailLevelRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETLOGMAILLEVELREQUEST, - '__module__' : 'google.appengine.api.mail_stub_service_pb2' - - }) -_sym_db.RegisterMessage(SetLogMailLevelRequest) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.mail_stub_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/memcache/__init__.py b/src/google/appengine/api/memcache/__init__.py index 231ddcc..d5d8cab 100755 --- a/src/google/appengine/api/memcache/__init__.py +++ b/src/google/appengine/api/memcache/__init__.py @@ -25,6 +25,7 @@ import hashlib import math import os +import pickle import types import six @@ -341,7 +342,7 @@ class Client(object): def __init__(self, servers=None, debug=0, - pickleProtocol=six.moves.cPickle.HIGHEST_PROTOCOL, + pickleProtocol=pickle.DEFAULT_PROTOCOL, pickler=six.moves.cPickle.Pickler, unpickler=six.moves.cPickle.Unpickler, pload=None, @@ -368,8 +369,13 @@ def __init__(self, - if os.environ.get('MEMCACHE_USE_CROSS_COMPATIBLE_PROTOCOL', None): - pickleProtocol = 2 + cross_compatible_protocol = os.environ.get( + 'MEMCACHE_USE_CROSS_COMPATIBLE_PROTOCOL', None) + if cross_compatible_protocol: + if cross_compatible_protocol.isdigit(): + pickleProtocol = int(cross_compatible_protocol) + else: + pickleProtocol = 2 self._pickler_factory = pickler self._unpickler_factory = unpickler diff --git a/src/google/appengine/api/memcache/memcache_service_pb2.py b/src/google/appengine/api/memcache/memcache_service_pb2.py index 6300645..c94d9b9 100755 --- a/src/google/appengine/api/memcache/memcache_service_pb2.py +++ b/src/google/appengine/api/memcache/memcache_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,186 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n4google/appengine/api/memcache/memcache_service.proto\x12\x10google.appengine\"\x94\x01\n\x14MemcacheServiceError\"|\n\tErrorCode\x12\x06\n\x02OK\x10\x00\x12\x15\n\x11UNSPECIFIED_ERROR\x10\x01\x12\x15\n\x11NAMESPACE_NOT_SET\x10\x02\x12\x15\n\x11PERMISSION_DENIED\x10\x03\x12\x11\n\rINVALID_VALUE\x10\x06\x12\x0f\n\x0bUNAVAILABLE\x10\t\"\x1d\n\x0b\x41ppOverride\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\t\"y\n\x12MemcacheGetRequest\x12\x0b\n\x03key\x18\x01 \x03(\x0c\x12\x14\n\nname_space\x18\x02 \x01(\t:\x00\x12\x0f\n\x07\x66or_cas\x18\x04 \x01(\x08\x12/\n\x08override\x18\x05 \x01(\x0b\x32\x1d.google.appengine.AppOverride\"\xe3\x02\n\x13MemcacheGetResponse\x12\x38\n\x04item\x18\x01 \x03(\n2*.google.appengine.MemcacheGetResponse.Item\x12G\n\nget_status\x18\x07 \x03(\x0e\x32\x33.google.appengine.MemcacheGetResponse.GetStatusCode\x1a]\n\x04Item\x12\x0b\n\x03key\x18\x02 \x02(\x0c\x12\r\n\x05value\x18\x03 \x02(\x0c\x12\r\n\x05\x66lags\x18\x04 \x01(\x07\x12\x0e\n\x06\x63\x61s_id\x18\x05 \x01(\x06\x12\x1a\n\x12\x65xpires_in_seconds\x18\x06 \x01(\x05\"j\n\rGetStatusCode\x12\x07\n\x03HIT\x10\x01\x12\x08\n\x04MISS\x10\x02\x12\r\n\tTRUNCATED\x10\x03\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x04\x12\x0f\n\x0bUNREACHABLE\x10\x05\x12\x0f\n\x0bOTHER_ERROR\x10\x06\"\x83\x03\n\x12MemcacheSetRequest\x12\x37\n\x04item\x18\x01 \x03(\n2).google.appengine.MemcacheSetRequest.Item\x12\x14\n\nname_space\x18\x07 \x01(\t:\x00\x12/\n\x08override\x18\n \x01(\x0b\x32\x1d.google.appengine.AppOverride\x1a\xb7\x01\n\x04Item\x12\x0b\n\x03key\x18\x02 \x02(\x0c\x12\r\n\x05value\x18\x03 \x02(\x0c\x12\r\n\x05\x66lags\x18\x04 \x01(\x07\x12G\n\nset_policy\x18\x05 \x01(\x0e\x32..google.appengine.MemcacheSetRequest.SetPolicy:\x03SET\x12\x1a\n\x0f\x65xpiration_time\x18\x06 \x01(\x07:\x01\x30\x12\x0e\n\x06\x63\x61s_id\x18\x08 \x01(\x06\x12\x0f\n\x07\x66or_cas\x18\t \x01(\x08\"3\n\tSetPolicy\x12\x07\n\x03SET\x10\x01\x12\x07\n\x03\x41\x44\x44\x10\x02\x12\x0b\n\x07REPLACE\x10\x03\x12\x07\n\x03\x43\x41S\x10\x04\"\xdb\x01\n\x13MemcacheSetResponse\x12G\n\nset_status\x18\x01 \x03(\x0e\x32\x33.google.appengine.MemcacheSetResponse.SetStatusCode\"{\n\rSetStatusCode\x12\n\n\x06STORED\x10\x01\x12\x0e\n\nNOT_STORED\x10\x02\x12\t\n\x05\x45RROR\x10\x03\x12\n\n\x06\x45XISTS\x10\x04\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x05\x12\x0f\n\x0bUNREACHABLE\x10\x06\x12\x0f\n\x0bOTHER_ERROR\x10\x07\"\xc7\x01\n\x15MemcacheDeleteRequest\x12:\n\x04item\x18\x01 \x03(\n2,.google.appengine.MemcacheDeleteRequest.Item\x12\x14\n\nname_space\x18\x04 \x01(\t:\x00\x12/\n\x08override\x18\x05 \x01(\x0b\x32\x1d.google.appengine.AppOverride\x1a+\n\x04Item\x12\x0b\n\x03key\x18\x02 \x02(\x0c\x12\x16\n\x0b\x64\x65lete_time\x18\x03 \x01(\x07:\x01\x30\"\xd3\x01\n\x16MemcacheDeleteResponse\x12P\n\rdelete_status\x18\x01 \x03(\x0e\x32\x39.google.appengine.MemcacheDeleteResponse.DeleteStatusCode\"g\n\x10\x44\x65leteStatusCode\x12\x0b\n\x07\x44\x45LETED\x10\x01\x12\r\n\tNOT_FOUND\x10\x02\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x03\x12\x0f\n\x0bUNREACHABLE\x10\x04\x12\x0f\n\x0bOTHER_ERROR\x10\x05\"\xad\x02\n\x18MemcacheIncrementRequest\x12\x0b\n\x03key\x18\x01 \x02(\x0c\x12\x14\n\nname_space\x18\x04 \x01(\t:\x00\x12\x10\n\x05\x64\x65lta\x18\x02 \x01(\x04:\x01\x31\x12R\n\tdirection\x18\x03 \x01(\x0e\x32\x34.google.appengine.MemcacheIncrementRequest.Direction:\tINCREMENT\x12\x15\n\rinitial_value\x18\x05 \x01(\x04\x12\x15\n\rinitial_flags\x18\x06 \x01(\x07\x12/\n\x08override\x18\x07 \x01(\x0b\x32\x1d.google.appengine.AppOverride\")\n\tDirection\x12\r\n\tINCREMENT\x10\x01\x12\r\n\tDECREMENT\x10\x02\"\xfd\x01\n\x19MemcacheIncrementResponse\x12\x11\n\tnew_value\x18\x01 \x01(\x04\x12Y\n\x10increment_status\x18\x02 \x01(\x0e\x32?.google.appengine.MemcacheIncrementResponse.IncrementStatusCode\"r\n\x13IncrementStatusCode\x12\x06\n\x02OK\x10\x01\x12\x0f\n\x0bNOT_CHANGED\x10\x02\x12\t\n\x05\x45RROR\x10\x03\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x04\x12\x0f\n\x0bUNREACHABLE\x10\x05\x12\x0f\n\x0bOTHER_ERROR\x10\x06\"\xa0\x01\n\x1dMemcacheBatchIncrementRequest\x12\x14\n\nname_space\x18\x01 \x01(\t:\x00\x12\x38\n\x04item\x18\x02 \x03(\x0b\x32*.google.appengine.MemcacheIncrementRequest\x12/\n\x08override\x18\x03 \x01(\x0b\x32\x1d.google.appengine.AppOverride\"[\n\x1eMemcacheBatchIncrementResponse\x12\x39\n\x04item\x18\x01 \x03(\x0b\x32+.google.appengine.MemcacheIncrementResponse\"G\n\x14MemcacheFlushRequest\x12/\n\x08override\x18\x01 \x01(\x0b\x32\x1d.google.appengine.AppOverride\"\x17\n\x15MemcacheFlushResponse\"d\n\x14MemcacheStatsRequest\x12/\n\x08override\x18\x01 \x01(\x0b\x32\x1d.google.appengine.AppOverride\x12\x1b\n\x10max_hotkey_count\x18\x02 \x01(\x05:\x01\x30\"\xb1\x01\n\x14MergedNamespaceStats\x12\x0c\n\x04hits\x18\x01 \x02(\x04\x12\x0e\n\x06misses\x18\x02 \x02(\x04\x12\x11\n\tbyte_hits\x18\x03 \x02(\x04\x12\r\n\x05items\x18\x04 \x02(\x04\x12\r\n\x05\x62ytes\x18\x05 \x02(\x04\x12\x17\n\x0foldest_item_age\x18\x06 \x02(\x07\x12\x31\n\x07hotkeys\x18\x07 \x03(\x0b\x32 .google.appengine.MemcacheHotKey\">\n\x0eMemcacheHotKey\x12\x0b\n\x03key\x18\x01 \x02(\x0c\x12\x0b\n\x03qps\x18\x02 \x02(\x01\x12\x12\n\nname_space\x18\x03 \x01(\t\"N\n\x15MemcacheStatsResponse\x12\x35\n\x05stats\x18\x01 \x01(\x0b\x32&.google.appengine.MergedNamespaceStatsB9\n!com.google.appengine.api.memcacheB\x11MemcacheServicePb\x88\x01\x01') - - -_MEMCACHESERVICEERROR = DESCRIPTOR.message_types_by_name['MemcacheServiceError'] -_APPOVERRIDE = DESCRIPTOR.message_types_by_name['AppOverride'] -_MEMCACHEGETREQUEST = DESCRIPTOR.message_types_by_name['MemcacheGetRequest'] -_MEMCACHEGETRESPONSE = DESCRIPTOR.message_types_by_name['MemcacheGetResponse'] -_MEMCACHEGETRESPONSE_ITEM = _MEMCACHEGETRESPONSE.nested_types_by_name['Item'] -_MEMCACHESETREQUEST = DESCRIPTOR.message_types_by_name['MemcacheSetRequest'] -_MEMCACHESETREQUEST_ITEM = _MEMCACHESETREQUEST.nested_types_by_name['Item'] -_MEMCACHESETRESPONSE = DESCRIPTOR.message_types_by_name['MemcacheSetResponse'] -_MEMCACHEDELETEREQUEST = DESCRIPTOR.message_types_by_name['MemcacheDeleteRequest'] -_MEMCACHEDELETEREQUEST_ITEM = _MEMCACHEDELETEREQUEST.nested_types_by_name['Item'] -_MEMCACHEDELETERESPONSE = DESCRIPTOR.message_types_by_name['MemcacheDeleteResponse'] -_MEMCACHEINCREMENTREQUEST = DESCRIPTOR.message_types_by_name['MemcacheIncrementRequest'] -_MEMCACHEINCREMENTRESPONSE = DESCRIPTOR.message_types_by_name['MemcacheIncrementResponse'] -_MEMCACHEBATCHINCREMENTREQUEST = DESCRIPTOR.message_types_by_name['MemcacheBatchIncrementRequest'] -_MEMCACHEBATCHINCREMENTRESPONSE = DESCRIPTOR.message_types_by_name['MemcacheBatchIncrementResponse'] -_MEMCACHEFLUSHREQUEST = DESCRIPTOR.message_types_by_name['MemcacheFlushRequest'] -_MEMCACHEFLUSHRESPONSE = DESCRIPTOR.message_types_by_name['MemcacheFlushResponse'] -_MEMCACHESTATSREQUEST = DESCRIPTOR.message_types_by_name['MemcacheStatsRequest'] -_MERGEDNAMESPACESTATS = DESCRIPTOR.message_types_by_name['MergedNamespaceStats'] -_MEMCACHEHOTKEY = DESCRIPTOR.message_types_by_name['MemcacheHotKey'] -_MEMCACHESTATSRESPONSE = DESCRIPTOR.message_types_by_name['MemcacheStatsResponse'] -_MEMCACHESERVICEERROR_ERRORCODE = _MEMCACHESERVICEERROR.enum_types_by_name['ErrorCode'] -_MEMCACHEGETRESPONSE_GETSTATUSCODE = _MEMCACHEGETRESPONSE.enum_types_by_name['GetStatusCode'] -_MEMCACHESETREQUEST_SETPOLICY = _MEMCACHESETREQUEST.enum_types_by_name['SetPolicy'] -_MEMCACHESETRESPONSE_SETSTATUSCODE = _MEMCACHESETRESPONSE.enum_types_by_name['SetStatusCode'] -_MEMCACHEDELETERESPONSE_DELETESTATUSCODE = _MEMCACHEDELETERESPONSE.enum_types_by_name['DeleteStatusCode'] -_MEMCACHEINCREMENTREQUEST_DIRECTION = _MEMCACHEINCREMENTREQUEST.enum_types_by_name['Direction'] -_MEMCACHEINCREMENTRESPONSE_INCREMENTSTATUSCODE = _MEMCACHEINCREMENTRESPONSE.enum_types_by_name['IncrementStatusCode'] -MemcacheServiceError = _reflection.GeneratedProtocolMessageType('MemcacheServiceError', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHESERVICEERROR, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheServiceError) - -AppOverride = _reflection.GeneratedProtocolMessageType('AppOverride', (_message.Message,), { - 'DESCRIPTOR' : _APPOVERRIDE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(AppOverride) - -MemcacheGetRequest = _reflection.GeneratedProtocolMessageType('MemcacheGetRequest', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEGETREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheGetRequest) - -MemcacheGetResponse = _reflection.GeneratedProtocolMessageType('MemcacheGetResponse', (_message.Message,), { - - 'Item' : _reflection.GeneratedProtocolMessageType('Item', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEGETRESPONSE_ITEM, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) - , - 'DESCRIPTOR' : _MEMCACHEGETRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheGetResponse) -_sym_db.RegisterMessage(MemcacheGetResponse.Item) - -MemcacheSetRequest = _reflection.GeneratedProtocolMessageType('MemcacheSetRequest', (_message.Message,), { - - 'Item' : _reflection.GeneratedProtocolMessageType('Item', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHESETREQUEST_ITEM, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) - , - 'DESCRIPTOR' : _MEMCACHESETREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheSetRequest) -_sym_db.RegisterMessage(MemcacheSetRequest.Item) - -MemcacheSetResponse = _reflection.GeneratedProtocolMessageType('MemcacheSetResponse', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHESETRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheSetResponse) - -MemcacheDeleteRequest = _reflection.GeneratedProtocolMessageType('MemcacheDeleteRequest', (_message.Message,), { - - 'Item' : _reflection.GeneratedProtocolMessageType('Item', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEDELETEREQUEST_ITEM, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) - , - 'DESCRIPTOR' : _MEMCACHEDELETEREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheDeleteRequest) -_sym_db.RegisterMessage(MemcacheDeleteRequest.Item) - -MemcacheDeleteResponse = _reflection.GeneratedProtocolMessageType('MemcacheDeleteResponse', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEDELETERESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheDeleteResponse) - -MemcacheIncrementRequest = _reflection.GeneratedProtocolMessageType('MemcacheIncrementRequest', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEINCREMENTREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheIncrementRequest) - -MemcacheIncrementResponse = _reflection.GeneratedProtocolMessageType('MemcacheIncrementResponse', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEINCREMENTRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheIncrementResponse) - -MemcacheBatchIncrementRequest = _reflection.GeneratedProtocolMessageType('MemcacheBatchIncrementRequest', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEBATCHINCREMENTREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheBatchIncrementRequest) - -MemcacheBatchIncrementResponse = _reflection.GeneratedProtocolMessageType('MemcacheBatchIncrementResponse', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEBATCHINCREMENTRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheBatchIncrementResponse) - -MemcacheFlushRequest = _reflection.GeneratedProtocolMessageType('MemcacheFlushRequest', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEFLUSHREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheFlushRequest) - -MemcacheFlushResponse = _reflection.GeneratedProtocolMessageType('MemcacheFlushResponse', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEFLUSHRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheFlushResponse) - -MemcacheStatsRequest = _reflection.GeneratedProtocolMessageType('MemcacheStatsRequest', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHESTATSREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheStatsRequest) - -MergedNamespaceStats = _reflection.GeneratedProtocolMessageType('MergedNamespaceStats', (_message.Message,), { - 'DESCRIPTOR' : _MERGEDNAMESPACESTATS, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MergedNamespaceStats) - -MemcacheHotKey = _reflection.GeneratedProtocolMessageType('MemcacheHotKey', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHEHOTKEY, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheHotKey) - -MemcacheStatsResponse = _reflection.GeneratedProtocolMessageType('MemcacheStatsResponse', (_message.Message,), { - 'DESCRIPTOR' : _MEMCACHESTATSRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_service_pb2' - - }) -_sym_db.RegisterMessage(MemcacheStatsResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.memcache.memcache_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/memcache/memcache_stub_service_pb2.py b/src/google/appengine/api/memcache/memcache_stub_service_pb2.py index e03212a..5f1ca78 100755 --- a/src/google/appengine/api/memcache/memcache_stub_service_pb2.py +++ b/src/google/appengine/api/memcache/memcache_stub_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -33,48 +32,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n9google/appengine/api/memcache/memcache_stub_service.proto\x12\x10google.appengine\x1a#google/appengine/api/api_base.proto\"+\n\x11SetMaxSizeRequest\x12\x16\n\x0emax_size_bytes\x18\x01 \x02(\x03\"1\n\x19GetLruChainLengthResponse\x12\x14\n\x0c\x63hain_length\x18\x01 \x02(\x03\"2\n\x0fSetClockRequest\x12\x1f\n\x17\x63lock_time_milliseconds\x18\x01 \x02(\x03\"+\n\x13\x41\x64vanceClockRequest\x12\x14\n\x0cmilliseconds\x18\x01 \x02(\x03\"7\n\x14\x41\x64vanceClockResponse\x12\x1f\n\x17\x63lock_time_milliseconds\x18\x01 \x02(\x03\x42:\n!com.google.appengine.api.memcacheB\x15MemcacheStubServicePb') - - -_SETMAXSIZEREQUEST = DESCRIPTOR.message_types_by_name['SetMaxSizeRequest'] -_GETLRUCHAINLENGTHRESPONSE = DESCRIPTOR.message_types_by_name['GetLruChainLengthResponse'] -_SETCLOCKREQUEST = DESCRIPTOR.message_types_by_name['SetClockRequest'] -_ADVANCECLOCKREQUEST = DESCRIPTOR.message_types_by_name['AdvanceClockRequest'] -_ADVANCECLOCKRESPONSE = DESCRIPTOR.message_types_by_name['AdvanceClockResponse'] -SetMaxSizeRequest = _reflection.GeneratedProtocolMessageType('SetMaxSizeRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETMAXSIZEREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_stub_service_pb2' - - }) -_sym_db.RegisterMessage(SetMaxSizeRequest) - -GetLruChainLengthResponse = _reflection.GeneratedProtocolMessageType('GetLruChainLengthResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETLRUCHAINLENGTHRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_stub_service_pb2' - - }) -_sym_db.RegisterMessage(GetLruChainLengthResponse) - -SetClockRequest = _reflection.GeneratedProtocolMessageType('SetClockRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETCLOCKREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_stub_service_pb2' - - }) -_sym_db.RegisterMessage(SetClockRequest) - -AdvanceClockRequest = _reflection.GeneratedProtocolMessageType('AdvanceClockRequest', (_message.Message,), { - 'DESCRIPTOR' : _ADVANCECLOCKREQUEST, - '__module__' : 'google.appengine.api.memcache.memcache_stub_service_pb2' - - }) -_sym_db.RegisterMessage(AdvanceClockRequest) - -AdvanceClockResponse = _reflection.GeneratedProtocolMessageType('AdvanceClockResponse', (_message.Message,), { - 'DESCRIPTOR' : _ADVANCECLOCKRESPONSE, - '__module__' : 'google.appengine.api.memcache.memcache_stub_service_pb2' - - }) -_sym_db.RegisterMessage(AdvanceClockResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.memcache.memcache_stub_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/modules/modules.py b/src/google/appengine/api/modules/modules.py index a96e1fb..f90ac5a 100755 --- a/src/google/appengine/api/modules/modules.py +++ b/src/google/appengine/api/modules/modules.py @@ -86,7 +86,7 @@ def get_current_module_name(): If this is version "v1" of module "module5" for app "my-app", this function will return "module5". """ - return os.environ.get('GAE_SERVICE') or os.environ.get('CURRENT_MODULE_ID') + return os.environ.get('GAE_SERVICE') def get_current_version_name(): diff --git a/src/google/appengine/api/modules/modules_service_pb2.py b/src/google/appengine/api/modules/modules_service_pb2.py index a4fa4ba..476d12c 100755 --- a/src/google/appengine/api/modules/modules_service_pb2.py +++ b/src/google/appengine/api/modules/modules_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,145 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n2google/appengine/api/modules/modules_service.proto\x12\x10google.appengine\"\x95\x01\n\x13ModulesServiceError\"~\n\tErrorCode\x12\x06\n\x02OK\x10\x00\x12\x12\n\x0eINVALID_MODULE\x10\x01\x12\x13\n\x0fINVALID_VERSION\x10\x02\x12\x15\n\x11INVALID_INSTANCES\x10\x03\x12\x13\n\x0fTRANSIENT_ERROR\x10\x04\x12\x14\n\x10UNEXPECTED_STATE\x10\x05\"\x13\n\x11GetModulesRequest\"$\n\x12GetModulesResponse\x12\x0e\n\x06module\x18\x01 \x03(\t\"$\n\x12GetVersionsRequest\x12\x0e\n\x06module\x18\x01 \x01(\t\"&\n\x13GetVersionsResponse\x12\x0f\n\x07version\x18\x01 \x03(\t\"*\n\x18GetDefaultVersionRequest\x12\x0e\n\x06module\x18\x01 \x01(\t\",\n\x19GetDefaultVersionResponse\x12\x0f\n\x07version\x18\x01 \x01(\t\"9\n\x16GetNumInstancesRequest\x12\x0e\n\x06module\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\",\n\x17GetNumInstancesResponse\x12\x11\n\tinstances\x18\x01 \x01(\x03\"L\n\x16SetNumInstancesRequest\x12\x0e\n\x06module\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x11\n\tinstances\x18\x03 \x02(\x03\"\x19\n\x17SetNumInstancesResponse\"5\n\x12StartModuleRequest\x12\x0e\n\x06module\x18\x01 \x02(\t\x12\x0f\n\x07version\x18\x02 \x02(\t\"\x15\n\x13StartModuleResponse\"4\n\x11StopModuleRequest\x12\x0e\n\x06module\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\"\x14\n\x12StopModuleResponse\"G\n\x12GetHostnameRequest\x12\x0e\n\x06module\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x10\n\x08instance\x18\x03 \x01(\t\"\'\n\x13GetHostnameResponse\x12\x10\n\x08hostname\x18\x01 \x01(\tB4\n com.google.appengine.api.modulesB\x10ModulesServicePb') - - -_MODULESSERVICEERROR = DESCRIPTOR.message_types_by_name['ModulesServiceError'] -_GETMODULESREQUEST = DESCRIPTOR.message_types_by_name['GetModulesRequest'] -_GETMODULESRESPONSE = DESCRIPTOR.message_types_by_name['GetModulesResponse'] -_GETVERSIONSREQUEST = DESCRIPTOR.message_types_by_name['GetVersionsRequest'] -_GETVERSIONSRESPONSE = DESCRIPTOR.message_types_by_name['GetVersionsResponse'] -_GETDEFAULTVERSIONREQUEST = DESCRIPTOR.message_types_by_name['GetDefaultVersionRequest'] -_GETDEFAULTVERSIONRESPONSE = DESCRIPTOR.message_types_by_name['GetDefaultVersionResponse'] -_GETNUMINSTANCESREQUEST = DESCRIPTOR.message_types_by_name['GetNumInstancesRequest'] -_GETNUMINSTANCESRESPONSE = DESCRIPTOR.message_types_by_name['GetNumInstancesResponse'] -_SETNUMINSTANCESREQUEST = DESCRIPTOR.message_types_by_name['SetNumInstancesRequest'] -_SETNUMINSTANCESRESPONSE = DESCRIPTOR.message_types_by_name['SetNumInstancesResponse'] -_STARTMODULEREQUEST = DESCRIPTOR.message_types_by_name['StartModuleRequest'] -_STARTMODULERESPONSE = DESCRIPTOR.message_types_by_name['StartModuleResponse'] -_STOPMODULEREQUEST = DESCRIPTOR.message_types_by_name['StopModuleRequest'] -_STOPMODULERESPONSE = DESCRIPTOR.message_types_by_name['StopModuleResponse'] -_GETHOSTNAMEREQUEST = DESCRIPTOR.message_types_by_name['GetHostnameRequest'] -_GETHOSTNAMERESPONSE = DESCRIPTOR.message_types_by_name['GetHostnameResponse'] -_MODULESSERVICEERROR_ERRORCODE = _MODULESSERVICEERROR.enum_types_by_name['ErrorCode'] -ModulesServiceError = _reflection.GeneratedProtocolMessageType('ModulesServiceError', (_message.Message,), { - 'DESCRIPTOR' : _MODULESSERVICEERROR, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(ModulesServiceError) - -GetModulesRequest = _reflection.GeneratedProtocolMessageType('GetModulesRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETMODULESREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetModulesRequest) - -GetModulesResponse = _reflection.GeneratedProtocolMessageType('GetModulesResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETMODULESRESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetModulesResponse) - -GetVersionsRequest = _reflection.GeneratedProtocolMessageType('GetVersionsRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETVERSIONSREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetVersionsRequest) - -GetVersionsResponse = _reflection.GeneratedProtocolMessageType('GetVersionsResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETVERSIONSRESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetVersionsResponse) - -GetDefaultVersionRequest = _reflection.GeneratedProtocolMessageType('GetDefaultVersionRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETDEFAULTVERSIONREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetDefaultVersionRequest) - -GetDefaultVersionResponse = _reflection.GeneratedProtocolMessageType('GetDefaultVersionResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETDEFAULTVERSIONRESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetDefaultVersionResponse) - -GetNumInstancesRequest = _reflection.GeneratedProtocolMessageType('GetNumInstancesRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETNUMINSTANCESREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetNumInstancesRequest) - -GetNumInstancesResponse = _reflection.GeneratedProtocolMessageType('GetNumInstancesResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETNUMINSTANCESRESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetNumInstancesResponse) - -SetNumInstancesRequest = _reflection.GeneratedProtocolMessageType('SetNumInstancesRequest', (_message.Message,), { - 'DESCRIPTOR' : _SETNUMINSTANCESREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(SetNumInstancesRequest) - -SetNumInstancesResponse = _reflection.GeneratedProtocolMessageType('SetNumInstancesResponse', (_message.Message,), { - 'DESCRIPTOR' : _SETNUMINSTANCESRESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(SetNumInstancesResponse) - -StartModuleRequest = _reflection.GeneratedProtocolMessageType('StartModuleRequest', (_message.Message,), { - 'DESCRIPTOR' : _STARTMODULEREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(StartModuleRequest) - -StartModuleResponse = _reflection.GeneratedProtocolMessageType('StartModuleResponse', (_message.Message,), { - 'DESCRIPTOR' : _STARTMODULERESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(StartModuleResponse) - -StopModuleRequest = _reflection.GeneratedProtocolMessageType('StopModuleRequest', (_message.Message,), { - 'DESCRIPTOR' : _STOPMODULEREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(StopModuleRequest) - -StopModuleResponse = _reflection.GeneratedProtocolMessageType('StopModuleResponse', (_message.Message,), { - 'DESCRIPTOR' : _STOPMODULERESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(StopModuleResponse) - -GetHostnameRequest = _reflection.GeneratedProtocolMessageType('GetHostnameRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETHOSTNAMEREQUEST, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetHostnameRequest) - -GetHostnameResponse = _reflection.GeneratedProtocolMessageType('GetHostnameResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETHOSTNAMERESPONSE, - '__module__' : 'google.appengine.api.modules.modules_service_pb2' - - }) -_sym_db.RegisterMessage(GetHostnameResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.modules.modules_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/system/system_service_pb2.py b/src/google/appengine/api/system/system_service_pb2.py index 738bb8b..de92c0a 100755 --- a/src/google/appengine/api/system/system_service_pb2.py +++ b/src/google/appengine/api/system/system_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,57 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n0google/appengine/api/system/system_service.proto\x12\x10google.appengine\"f\n\x12SystemServiceError\"P\n\tErrorCode\x12\x06\n\x02OK\x10\x00\x12\x12\n\x0eINTERNAL_ERROR\x10\x01\x12\x14\n\x10\x42\x41\x43KEND_REQUIRED\x10\x02\x12\x11\n\rLIMIT_REACHED\x10\x03\"t\n\nSystemStat\x12\x0f\n\x07\x63urrent\x18\x01 \x01(\x01\x12\x11\n\taverage1m\x18\x03 \x01(\x01\x12\x12\n\naverage10m\x18\x04 \x01(\x01\x12\r\n\x05total\x18\x02 \x01(\x01\x12\x0e\n\x06rate1m\x18\x05 \x01(\x01\x12\x0f\n\x07rate10m\x18\x06 \x01(\x01\"\x17\n\x15GetSystemStatsRequest\"q\n\x16GetSystemStatsResponse\x12)\n\x03\x63pu\x18\x01 \x01(\x0b\x32\x1c.google.appengine.SystemStat\x12,\n\x06memory\x18\x02 \x01(\x0b\x32\x1c.google.appengine.SystemStat\"\x1f\n\x1dStartBackgroundRequestRequest\"4\n\x1eStartBackgroundRequestResponse\x12\x12\n\nrequest_id\x18\x01 \x01(\tB2\n\x1f\x63om.google.appengine.api.systemB\x0fSystemServicePb') - - -_SYSTEMSERVICEERROR = DESCRIPTOR.message_types_by_name['SystemServiceError'] -_SYSTEMSTAT = DESCRIPTOR.message_types_by_name['SystemStat'] -_GETSYSTEMSTATSREQUEST = DESCRIPTOR.message_types_by_name['GetSystemStatsRequest'] -_GETSYSTEMSTATSRESPONSE = DESCRIPTOR.message_types_by_name['GetSystemStatsResponse'] -_STARTBACKGROUNDREQUESTREQUEST = DESCRIPTOR.message_types_by_name['StartBackgroundRequestRequest'] -_STARTBACKGROUNDREQUESTRESPONSE = DESCRIPTOR.message_types_by_name['StartBackgroundRequestResponse'] -_SYSTEMSERVICEERROR_ERRORCODE = _SYSTEMSERVICEERROR.enum_types_by_name['ErrorCode'] -SystemServiceError = _reflection.GeneratedProtocolMessageType('SystemServiceError', (_message.Message,), { - 'DESCRIPTOR' : _SYSTEMSERVICEERROR, - '__module__' : 'google.appengine.api.system.system_service_pb2' - - }) -_sym_db.RegisterMessage(SystemServiceError) - -SystemStat = _reflection.GeneratedProtocolMessageType('SystemStat', (_message.Message,), { - 'DESCRIPTOR' : _SYSTEMSTAT, - '__module__' : 'google.appengine.api.system.system_service_pb2' - - }) -_sym_db.RegisterMessage(SystemStat) - -GetSystemStatsRequest = _reflection.GeneratedProtocolMessageType('GetSystemStatsRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETSYSTEMSTATSREQUEST, - '__module__' : 'google.appengine.api.system.system_service_pb2' - - }) -_sym_db.RegisterMessage(GetSystemStatsRequest) - -GetSystemStatsResponse = _reflection.GeneratedProtocolMessageType('GetSystemStatsResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETSYSTEMSTATSRESPONSE, - '__module__' : 'google.appengine.api.system.system_service_pb2' - - }) -_sym_db.RegisterMessage(GetSystemStatsResponse) - -StartBackgroundRequestRequest = _reflection.GeneratedProtocolMessageType('StartBackgroundRequestRequest', (_message.Message,), { - 'DESCRIPTOR' : _STARTBACKGROUNDREQUESTREQUEST, - '__module__' : 'google.appengine.api.system.system_service_pb2' - - }) -_sym_db.RegisterMessage(StartBackgroundRequestRequest) - -StartBackgroundRequestResponse = _reflection.GeneratedProtocolMessageType('StartBackgroundRequestResponse', (_message.Message,), { - 'DESCRIPTOR' : _STARTBACKGROUNDREQUESTRESPONSE, - '__module__' : 'google.appengine.api.system.system_service_pb2' - - }) -_sym_db.RegisterMessage(StartBackgroundRequestResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.system.system_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/taskqueue/taskqueue_service_bytes_pb2.py b/src/google/appengine/api/taskqueue/taskqueue_service_bytes_pb2.py index 7fe76ca..1383bc5 100755 --- a/src/google/appengine/api/taskqueue/taskqueue_service_bytes_pb2.py +++ b/src/google/appengine/api/taskqueue/taskqueue_service_bytes_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -33,414 +32,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\n\x0fheader_override\x18\n \x03(\x0b\x32%.apphosting_bytes.TaskQueueHttpHeader\"\x1e\n\x1cTaskQueueUpdateQueueResponse\"?\n\x1bTaskQueueFetchQueuesRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x01(\x0c\x12\x10\n\x08max_rows\x18\x02 \x02(\x05\"\x97\x04\n\x1cTaskQueueFetchQueuesResponse\x12\x43\n\x05queue\x18\x01 \x03(\n24.apphosting_bytes.TaskQueueFetchQueuesResponse.Queue\x1a\xb1\x03\n\x05Queue\x12\x12\n\nqueue_name\x18\x02 \x02(\x0c\x12 \n\x18\x62ucket_refill_per_second\x18\x03 \x02(\x01\x12\x17\n\x0f\x62ucket_capacity\x18\x04 \x02(\x01\x12\x1b\n\x13user_specified_rate\x18\x05 \x01(\t\x12\x0e\n\x06paused\x18\x06 \x02(\x08\x12\x44\n\x10retry_parameters\x18\x07 \x01(\x0b\x32*.apphosting_bytes.TaskQueueRetryParameters\x12\x1f\n\x17max_concurrent_requests\x18\x08 \x01(\x05\x12\x32\n\x04mode\x18\t \x01(\x0e\x32$.apphosting_bytes.TaskQueueMode.Mode\x12+\n\x03\x61\x63l\x18\n \x01(\x0b\x32\x1e.apphosting_bytes.TaskQueueAcl\x12>\n\x0fheader_override\x18\x0b \x03(\x0b\x32%.apphosting_bytes.TaskQueueHttpHeader\x12$\n\x0c\x63reator_name\x18\x0c \x01(\t:\napphostingB\x02\x08\x01\"\\\n\x1fTaskQueueFetchQueueStatsRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x01(\x0c\x12\x12\n\nqueue_name\x18\x02 \x03(\x0c\x12\x15\n\rmax_num_tasks\x18\x03 \x01(\x05\"\xab\x01\n\x19TaskQueueScannerQueueInfo\x12\x1c\n\x14\x65xecuted_last_minute\x18\x01 \x02(\x03\x12\x1a\n\x12\x65xecuted_last_hour\x18\x02 \x02(\x03\x12!\n\x19sampling_duration_seconds\x18\x03 \x02(\x01\x12\x1a\n\x12requests_in_flight\x18\x04 \x01(\x05\x12\x15\n\renforced_rate\x18\x05 \x01(\x01\"\xf2\x01\n TaskQueueFetchQueueStatsResponse\x12Q\n\nqueuestats\x18\x01 \x03(\n2=.apphosting_bytes.TaskQueueFetchQueueStatsResponse.QueueStats\x1a{\n\nQueueStats\x12\x11\n\tnum_tasks\x18\x02 \x02(\x05\x12\x17\n\x0foldest_eta_usec\x18\x03 \x02(\x03\x12\x41\n\x0cscanner_info\x18\x04 \x01(\x0b\x32+.apphosting_bytes.TaskQueueScannerQueueInfo\"O\n\x1aTaskQueuePauseQueueRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\x0c\x12\x12\n\nqueue_name\x18\x02 \x02(\x0c\x12\r\n\x05pause\x18\x03 \x02(\x08\"\x1d\n\x1bTaskQueuePauseQueueResponse\"@\n\x1aTaskQueuePurgeQueueRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x01(\x0c\x12\x12\n\nqueue_name\x18\x02 \x02(\x0c\"\x1d\n\x1bTaskQueuePurgeQueueResponse\"A\n\x1bTaskQueueDeleteQueueRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\x0c\x12\x12\n\nqueue_name\x18\x02 \x02(\x0c\"\x1e\n\x1cTaskQueueDeleteQueueResponse\"-\n\x1bTaskQueueDeleteGroupRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\x0c\"\x1e\n\x1cTaskQueueDeleteGroupResponse\"\x99\x01\n\x1aTaskQueueQueryTasksRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x01(\x0c\x12\x12\n\nqueue_name\x18\x02 \x02(\x0c\x12\x17\n\x0fstart_task_name\x18\x03 \x01(\x0c\x12\x16\n\x0estart_eta_usec\x18\x04 \x01(\x03\x12\x11\n\tstart_tag\x18\x06 \x01(\x0c\x12\x13\n\x08max_rows\x18\x05 \x01(\x05:\x01\x31\"\xb0\x08\n\x1bTaskQueueQueryTasksResponse\x12@\n\x04task\x18\x01 \x03(\n22.apphosting_bytes.TaskQueueQueryTasksResponse.Task\x1a\xce\x07\n\x04Task\x12\x11\n\ttask_name\x18\x02 \x02(\x0c\x12\x10\n\x08\x65ta_usec\x18\x03 \x02(\x03\x12\x0b\n\x03url\x18\x04 \x01(\x0c\x12P\n\x06method\x18\x05 \x01(\x0e\x32@.apphosting_bytes.TaskQueueQueryTasksResponse.Task.RequestMethod\x12\x13\n\x0bretry_count\x18\x06 \x01(\x05\x12I\n\x06header\x18\x07 \x03(\n29.apphosting_bytes.TaskQueueQueryTasksResponse.Task.Header\x12\x11\n\tbody_size\x18\n \x01(\x05\x12\x10\n\x04\x62ody\x18\x0b \x01(\x0c\x42\x02\x08\x01\x12\x1a\n\x12\x63reation_time_usec\x18\x0c \x02(\x03\x12W\n\rcrontimetable\x18\r \x01(\n2@.apphosting_bytes.TaskQueueQueryTasksResponse.Task.CronTimetable\x12I\n\x06runlog\x18\x10 \x01(\n29.apphosting_bytes.TaskQueueQueryTasksResponse.Task.RunLog\x12\x13\n\x0b\x64\x65scription\x18\x15 \x01(\x0c\x12.\n\x07payload\x18\x16 \x01(\x0b\x32\x1d.apphosting_bytes.TaskPayload\x12\x44\n\x10retry_parameters\x18\x17 \x01(\x0b\x32*.apphosting_bytes.TaskQueueRetryParameters\x12\x16\n\x0e\x66irst_try_usec\x18\x18 \x01(\x03\x12\x0b\n\x03tag\x18\x19 \x01(\x0c\x12\x17\n\x0f\x65xecution_count\x18\x1a \x01(\x05\x12\x1e\n\x16\x64ispatch_deadline_usec\x18\x1c \x01(\x03\x1a$\n\x06Header\x12\x0b\n\x03key\x18\x08 \x02(\x0c\x12\r\n\x05value\x18\t \x02(\x0c\x1a\x33\n\rCronTimetable\x12\x10\n\x08schedule\x18\x0e \x02(\x0c\x12\x10\n\x08timezone\x18\x0f \x02(\x0c\x1av\n\x06RunLog\x12\x17\n\x0f\x64ispatched_usec\x18\x11 \x02(\x03\x12\x10\n\x08lag_usec\x18\x12 \x02(\x03\x12\x14\n\x0c\x65lapsed_usec\x18\x13 \x02(\x03\x12\x15\n\rresponse_code\x18\x14 \x01(\x03\x12\x14\n\x0cretry_reason\x18\x1b \x01(\t\"A\n\rRequestMethod\x12\x07\n\x03GET\x10\x01\x12\x08\n\x04POST\x10\x02\x12\x08\n\x04HEAD\x10\x03\x12\x07\n\x03PUT\x10\x04\x12\n\n\x06\x44\x45LETE\x10\x05\"R\n\x19TaskQueueFetchTaskRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x01(\x0c\x12\x12\n\nqueue_name\x18\x02 \x02(\x0c\x12\x11\n\ttask_name\x18\x03 \x02(\x0c\"Y\n\x1aTaskQueueFetchTaskResponse\x12;\n\x04task\x18\x01 \x02(\x0b\x32-.apphosting_bytes.TaskQueueQueryTasksResponse\"C\n\"TaskQueueUpdateStorageLimitRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\x0c\x12\r\n\x05limit\x18\x02 \x02(\x03\"8\n#TaskQueueUpdateStorageLimitResponse\x12\x11\n\tnew_limit\x18\x01 \x02(\x03\"\x83\x01\n TaskQueueQueryAndOwnTasksRequest\x12\x12\n\nqueue_name\x18\x01 \x02(\x0c\x12\x15\n\rlease_seconds\x18\x02 \x02(\x01\x12\x11\n\tmax_tasks\x18\x03 \x02(\x03\x12\x14\n\x0cgroup_by_tag\x18\x04 \x01(\x08\x12\x0b\n\x03tag\x18\x05 \x01(\x0c\"\xcc\x01\n!TaskQueueQueryAndOwnTasksResponse\x12\x46\n\x04task\x18\x01 \x03(\n28.apphosting_bytes.TaskQueueQueryAndOwnTasksResponse.Task\x1a_\n\x04Task\x12\x11\n\ttask_name\x18\x02 \x02(\x0c\x12\x10\n\x08\x65ta_usec\x18\x03 \x02(\x03\x12\x13\n\x0bretry_count\x18\x04 \x01(\x05\x12\x10\n\x04\x62ody\x18\x05 \x01(\x0c\x42\x02\x08\x01\x12\x0b\n\x03tag\x18\x06 \x01(\x0c\"q\n\x1fTaskQueueModifyTaskLeaseRequest\x12\x12\n\nqueue_name\x18\x01 \x02(\x0c\x12\x11\n\ttask_name\x18\x02 \x02(\x0c\x12\x10\n\x08\x65ta_usec\x18\x03 \x02(\x03\x12\x15\n\rlease_seconds\x18\x04 \x02(\x01\"<\n TaskQueueModifyTaskLeaseResponse\x12\x18\n\x10updated_eta_usec\x18\x01 \x02(\x03\x42\x31\n\"com.google.appengine.api.taskqueueB\x0bTaskQueuePb') - - -_TASKQUEUESERVICEERROR = DESCRIPTOR.message_types_by_name['TaskQueueServiceError'] -_TASKPAYLOAD = DESCRIPTOR.message_types_by_name['TaskPayload'] -_TASKQUEUERETRYPARAMETERS = DESCRIPTOR.message_types_by_name['TaskQueueRetryParameters'] -_TASKQUEUEACL = DESCRIPTOR.message_types_by_name['TaskQueueAcl'] -_TASKQUEUEHTTPHEADER = DESCRIPTOR.message_types_by_name['TaskQueueHttpHeader'] -_TASKQUEUEMODE = DESCRIPTOR.message_types_by_name['TaskQueueMode'] -_TASKQUEUEADDREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueAddRequest'] -_TASKQUEUEADDREQUEST_HEADER = _TASKQUEUEADDREQUEST.nested_types_by_name['Header'] -_TASKQUEUEADDREQUEST_CRONTIMETABLE = _TASKQUEUEADDREQUEST.nested_types_by_name['CronTimetable'] -_TASKQUEUEADDRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueAddResponse'] -_TASKQUEUEBULKADDREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueBulkAddRequest'] -_TASKQUEUEBULKADDRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueBulkAddResponse'] -_TASKQUEUEBULKADDRESPONSE_TASKRESULT = _TASKQUEUEBULKADDRESPONSE.nested_types_by_name['TaskResult'] -_TASKQUEUEDELETEREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueDeleteRequest'] -_TASKQUEUEDELETERESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueDeleteResponse'] -_TASKQUEUEFORCERUNREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueForceRunRequest'] -_TASKQUEUEFORCERUNRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueForceRunResponse'] -_TASKQUEUEUPDATEQUEUEREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueUpdateQueueRequest'] -_TASKQUEUEUPDATEQUEUERESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueUpdateQueueResponse'] -_TASKQUEUEFETCHQUEUESREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueFetchQueuesRequest'] -_TASKQUEUEFETCHQUEUESRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueFetchQueuesResponse'] -_TASKQUEUEFETCHQUEUESRESPONSE_QUEUE = _TASKQUEUEFETCHQUEUESRESPONSE.nested_types_by_name['Queue'] -_TASKQUEUEFETCHQUEUESTATSREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueFetchQueueStatsRequest'] -_TASKQUEUESCANNERQUEUEINFO = DESCRIPTOR.message_types_by_name['TaskQueueScannerQueueInfo'] -_TASKQUEUEFETCHQUEUESTATSRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueFetchQueueStatsResponse'] -_TASKQUEUEFETCHQUEUESTATSRESPONSE_QUEUESTATS = _TASKQUEUEFETCHQUEUESTATSRESPONSE.nested_types_by_name['QueueStats'] -_TASKQUEUEPAUSEQUEUEREQUEST = DESCRIPTOR.message_types_by_name['TaskQueuePauseQueueRequest'] -_TASKQUEUEPAUSEQUEUERESPONSE = DESCRIPTOR.message_types_by_name['TaskQueuePauseQueueResponse'] -_TASKQUEUEPURGEQUEUEREQUEST = DESCRIPTOR.message_types_by_name['TaskQueuePurgeQueueRequest'] -_TASKQUEUEPURGEQUEUERESPONSE = DESCRIPTOR.message_types_by_name['TaskQueuePurgeQueueResponse'] -_TASKQUEUEDELETEQUEUEREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueDeleteQueueRequest'] -_TASKQUEUEDELETEQUEUERESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueDeleteQueueResponse'] -_TASKQUEUEDELETEGROUPREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueDeleteGroupRequest'] -_TASKQUEUEDELETEGROUPRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueDeleteGroupResponse'] -_TASKQUEUEQUERYTASKSREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueQueryTasksRequest'] -_TASKQUEUEQUERYTASKSRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueQueryTasksResponse'] -_TASKQUEUEQUERYTASKSRESPONSE_TASK = _TASKQUEUEQUERYTASKSRESPONSE.nested_types_by_name['Task'] -_TASKQUEUEQUERYTASKSRESPONSE_TASK_HEADER = _TASKQUEUEQUERYTASKSRESPONSE_TASK.nested_types_by_name['Header'] -_TASKQUEUEQUERYTASKSRESPONSE_TASK_CRONTIMETABLE = _TASKQUEUEQUERYTASKSRESPONSE_TASK.nested_types_by_name['CronTimetable'] -_TASKQUEUEQUERYTASKSRESPONSE_TASK_RUNLOG = _TASKQUEUEQUERYTASKSRESPONSE_TASK.nested_types_by_name['RunLog'] -_TASKQUEUEFETCHTASKREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueFetchTaskRequest'] -_TASKQUEUEFETCHTASKRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueFetchTaskResponse'] -_TASKQUEUEUPDATESTORAGELIMITREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueUpdateStorageLimitRequest'] -_TASKQUEUEUPDATESTORAGELIMITRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueUpdateStorageLimitResponse'] -_TASKQUEUEQUERYANDOWNTASKSREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueQueryAndOwnTasksRequest'] -_TASKQUEUEQUERYANDOWNTASKSRESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueQueryAndOwnTasksResponse'] -_TASKQUEUEQUERYANDOWNTASKSRESPONSE_TASK = _TASKQUEUEQUERYANDOWNTASKSRESPONSE.nested_types_by_name['Task'] -_TASKQUEUEMODIFYTASKLEASEREQUEST = DESCRIPTOR.message_types_by_name['TaskQueueModifyTaskLeaseRequest'] -_TASKQUEUEMODIFYTASKLEASERESPONSE = DESCRIPTOR.message_types_by_name['TaskQueueModifyTaskLeaseResponse'] -_TASKQUEUESERVICEERROR_ERRORCODE = _TASKQUEUESERVICEERROR.enum_types_by_name['ErrorCode'] -_TASKQUEUEMODE_MODE = _TASKQUEUEMODE.enum_types_by_name['Mode'] -_TASKQUEUEADDREQUEST_REQUESTMETHOD = _TASKQUEUEADDREQUEST.enum_types_by_name['RequestMethod'] -_TASKQUEUEQUERYTASKSRESPONSE_TASK_REQUESTMETHOD = _TASKQUEUEQUERYTASKSRESPONSE_TASK.enum_types_by_name['RequestMethod'] -TaskQueueServiceError = _reflection.GeneratedProtocolMessageType('TaskQueueServiceError', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUESERVICEERROR, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueServiceError) - -TaskPayload = _reflection.GeneratedProtocolMessageType('TaskPayload', (_message.Message,), { - 'DESCRIPTOR' : _TASKPAYLOAD, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskPayload) - -TaskQueueRetryParameters = _reflection.GeneratedProtocolMessageType('TaskQueueRetryParameters', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUERETRYPARAMETERS, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueRetryParameters) - -TaskQueueAcl = _reflection.GeneratedProtocolMessageType('TaskQueueAcl', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEACL, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueAcl) - -TaskQueueHttpHeader = _reflection.GeneratedProtocolMessageType('TaskQueueHttpHeader', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEHTTPHEADER, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueHttpHeader) - -TaskQueueMode = _reflection.GeneratedProtocolMessageType('TaskQueueMode', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEMODE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueMode) - -TaskQueueAddRequest = _reflection.GeneratedProtocolMessageType('TaskQueueAddRequest', (_message.Message,), { - - 'Header' : _reflection.GeneratedProtocolMessageType('Header', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEADDREQUEST_HEADER, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - - 'CronTimetable' : _reflection.GeneratedProtocolMessageType('CronTimetable', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEADDREQUEST_CRONTIMETABLE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEADDREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueAddRequest) -_sym_db.RegisterMessage(TaskQueueAddRequest.Header) -_sym_db.RegisterMessage(TaskQueueAddRequest.CronTimetable) - -TaskQueueAddResponse = _reflection.GeneratedProtocolMessageType('TaskQueueAddResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEADDRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueAddResponse) - -TaskQueueBulkAddRequest = _reflection.GeneratedProtocolMessageType('TaskQueueBulkAddRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEBULKADDREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueBulkAddRequest) - -TaskQueueBulkAddResponse = _reflection.GeneratedProtocolMessageType('TaskQueueBulkAddResponse', (_message.Message,), { - - 'TaskResult' : _reflection.GeneratedProtocolMessageType('TaskResult', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEBULKADDRESPONSE_TASKRESULT, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEBULKADDRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueBulkAddResponse) -_sym_db.RegisterMessage(TaskQueueBulkAddResponse.TaskResult) - -TaskQueueDeleteRequest = _reflection.GeneratedProtocolMessageType('TaskQueueDeleteRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEDELETEREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueDeleteRequest) - -TaskQueueDeleteResponse = _reflection.GeneratedProtocolMessageType('TaskQueueDeleteResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEDELETERESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueDeleteResponse) - -TaskQueueForceRunRequest = _reflection.GeneratedProtocolMessageType('TaskQueueForceRunRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFORCERUNREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueForceRunRequest) - -TaskQueueForceRunResponse = _reflection.GeneratedProtocolMessageType('TaskQueueForceRunResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFORCERUNRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueForceRunResponse) - -TaskQueueUpdateQueueRequest = _reflection.GeneratedProtocolMessageType('TaskQueueUpdateQueueRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEUPDATEQUEUEREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueUpdateQueueRequest) - -TaskQueueUpdateQueueResponse = _reflection.GeneratedProtocolMessageType('TaskQueueUpdateQueueResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEUPDATEQUEUERESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueUpdateQueueResponse) - -TaskQueueFetchQueuesRequest = _reflection.GeneratedProtocolMessageType('TaskQueueFetchQueuesRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFETCHQUEUESREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueFetchQueuesRequest) - -TaskQueueFetchQueuesResponse = _reflection.GeneratedProtocolMessageType('TaskQueueFetchQueuesResponse', (_message.Message,), { - - 'Queue' : _reflection.GeneratedProtocolMessageType('Queue', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFETCHQUEUESRESPONSE_QUEUE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEFETCHQUEUESRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueFetchQueuesResponse) -_sym_db.RegisterMessage(TaskQueueFetchQueuesResponse.Queue) - -TaskQueueFetchQueueStatsRequest = _reflection.GeneratedProtocolMessageType('TaskQueueFetchQueueStatsRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFETCHQUEUESTATSREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueFetchQueueStatsRequest) - -TaskQueueScannerQueueInfo = _reflection.GeneratedProtocolMessageType('TaskQueueScannerQueueInfo', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUESCANNERQUEUEINFO, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueScannerQueueInfo) - -TaskQueueFetchQueueStatsResponse = _reflection.GeneratedProtocolMessageType('TaskQueueFetchQueueStatsResponse', (_message.Message,), { - - 'QueueStats' : _reflection.GeneratedProtocolMessageType('QueueStats', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFETCHQUEUESTATSRESPONSE_QUEUESTATS, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEFETCHQUEUESTATSRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueFetchQueueStatsResponse) -_sym_db.RegisterMessage(TaskQueueFetchQueueStatsResponse.QueueStats) - -TaskQueuePauseQueueRequest = _reflection.GeneratedProtocolMessageType('TaskQueuePauseQueueRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEPAUSEQUEUEREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueuePauseQueueRequest) - -TaskQueuePauseQueueResponse = _reflection.GeneratedProtocolMessageType('TaskQueuePauseQueueResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEPAUSEQUEUERESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueuePauseQueueResponse) - -TaskQueuePurgeQueueRequest = _reflection.GeneratedProtocolMessageType('TaskQueuePurgeQueueRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEPURGEQUEUEREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueuePurgeQueueRequest) - -TaskQueuePurgeQueueResponse = _reflection.GeneratedProtocolMessageType('TaskQueuePurgeQueueResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEPURGEQUEUERESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueuePurgeQueueResponse) - -TaskQueueDeleteQueueRequest = _reflection.GeneratedProtocolMessageType('TaskQueueDeleteQueueRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEDELETEQUEUEREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueDeleteQueueRequest) - -TaskQueueDeleteQueueResponse = _reflection.GeneratedProtocolMessageType('TaskQueueDeleteQueueResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEDELETEQUEUERESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueDeleteQueueResponse) - -TaskQueueDeleteGroupRequest = _reflection.GeneratedProtocolMessageType('TaskQueueDeleteGroupRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEDELETEGROUPREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueDeleteGroupRequest) - -TaskQueueDeleteGroupResponse = _reflection.GeneratedProtocolMessageType('TaskQueueDeleteGroupResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEDELETEGROUPRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueDeleteGroupResponse) - -TaskQueueQueryTasksRequest = _reflection.GeneratedProtocolMessageType('TaskQueueQueryTasksRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEQUERYTASKSREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueQueryTasksRequest) - -TaskQueueQueryTasksResponse = _reflection.GeneratedProtocolMessageType('TaskQueueQueryTasksResponse', (_message.Message,), { - - 'Task' : _reflection.GeneratedProtocolMessageType('Task', (_message.Message,), { - - 'Header' : _reflection.GeneratedProtocolMessageType('Header', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEQUERYTASKSRESPONSE_TASK_HEADER, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - - 'CronTimetable' : _reflection.GeneratedProtocolMessageType('CronTimetable', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEQUERYTASKSRESPONSE_TASK_CRONTIMETABLE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - - 'RunLog' : _reflection.GeneratedProtocolMessageType('RunLog', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEQUERYTASKSRESPONSE_TASK_RUNLOG, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEQUERYTASKSRESPONSE_TASK, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEQUERYTASKSRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueQueryTasksResponse) -_sym_db.RegisterMessage(TaskQueueQueryTasksResponse.Task) -_sym_db.RegisterMessage(TaskQueueQueryTasksResponse.Task.Header) -_sym_db.RegisterMessage(TaskQueueQueryTasksResponse.Task.CronTimetable) -_sym_db.RegisterMessage(TaskQueueQueryTasksResponse.Task.RunLog) - -TaskQueueFetchTaskRequest = _reflection.GeneratedProtocolMessageType('TaskQueueFetchTaskRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFETCHTASKREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueFetchTaskRequest) - -TaskQueueFetchTaskResponse = _reflection.GeneratedProtocolMessageType('TaskQueueFetchTaskResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEFETCHTASKRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueFetchTaskResponse) - -TaskQueueUpdateStorageLimitRequest = _reflection.GeneratedProtocolMessageType('TaskQueueUpdateStorageLimitRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEUPDATESTORAGELIMITREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueUpdateStorageLimitRequest) - -TaskQueueUpdateStorageLimitResponse = _reflection.GeneratedProtocolMessageType('TaskQueueUpdateStorageLimitResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEUPDATESTORAGELIMITRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueUpdateStorageLimitResponse) - -TaskQueueQueryAndOwnTasksRequest = _reflection.GeneratedProtocolMessageType('TaskQueueQueryAndOwnTasksRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEQUERYANDOWNTASKSREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueQueryAndOwnTasksRequest) - -TaskQueueQueryAndOwnTasksResponse = _reflection.GeneratedProtocolMessageType('TaskQueueQueryAndOwnTasksResponse', (_message.Message,), { - - 'Task' : _reflection.GeneratedProtocolMessageType('Task', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEQUERYANDOWNTASKSRESPONSE_TASK, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TASKQUEUEQUERYANDOWNTASKSRESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueQueryAndOwnTasksResponse) -_sym_db.RegisterMessage(TaskQueueQueryAndOwnTasksResponse.Task) - -TaskQueueModifyTaskLeaseRequest = _reflection.GeneratedProtocolMessageType('TaskQueueModifyTaskLeaseRequest', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEMODIFYTASKLEASEREQUEST, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueModifyTaskLeaseRequest) - -TaskQueueModifyTaskLeaseResponse = _reflection.GeneratedProtocolMessageType('TaskQueueModifyTaskLeaseResponse', (_message.Message,), { - 'DESCRIPTOR' : _TASKQUEUEMODIFYTASKLEASERESPONSE, - '__module__' : 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2' - - }) -_sym_db.RegisterMessage(TaskQueueModifyTaskLeaseResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.taskqueue.taskqueue_service_bytes_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/urlfetch_service_pb2.py b/src/google/appengine/api/urlfetch_service_pb2.py index 33673c1..bd4069b 100755 --- a/src/google/appengine/api/urlfetch_service_pb2.py +++ b/src/google/appengine/api/urlfetch_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,52 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+google/appengine/api/urlfetch_service.proto\x12\x10google.appengine\"\xc2\x02\n\x14URLFetchServiceError\"\xa9\x02\n\tErrorCode\x12\x06\n\x02OK\x10\x00\x12\x0f\n\x0bINVALID_URL\x10\x01\x12\x0f\n\x0b\x46\x45TCH_ERROR\x10\x02\x12\x15\n\x11UNSPECIFIED_ERROR\x10\x03\x12\x16\n\x12RESPONSE_TOO_LARGE\x10\x04\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x05\x12\x19\n\x15SSL_CERTIFICATE_ERROR\x10\x06\x12\r\n\tDNS_ERROR\x10\x07\x12\n\n\x06\x43LOSED\x10\x08\x12\x1c\n\x18INTERNAL_TRANSIENT_ERROR\x10\t\x12\x16\n\x12TOO_MANY_REDIRECTS\x10\n\x12\x13\n\x0fMALFORMED_REPLY\x10\x0b\x12\x14\n\x10\x43ONNECTION_ERROR\x10\x0c\x12\x15\n\x11PAYLOAD_TOO_LARGE\x10\r\"\x80\x03\n\x0fURLFetchRequest\x12?\n\x06Method\x18\x01 \x02(\x0e\x32/.google.appengine.URLFetchRequest.RequestMethod\x12\x0b\n\x03Url\x18\x02 \x02(\t\x12\x38\n\x06header\x18\x03 \x03(\n2(.google.appengine.URLFetchRequest.Header\x12\x13\n\x07Payload\x18\x06 \x01(\x0c\x42\x02\x08\x01\x12\x1d\n\x0f\x46ollowRedirects\x18\x07 \x01(\x08:\x04true\x12\x10\n\x08\x44\x65\x61\x64line\x18\x08 \x01(\x01\x12+\n\x1dMustValidateServerCertificate\x18\t \x01(\x08:\x04true\x1a$\n\x06Header\x12\x0b\n\x03Key\x18\x04 \x02(\t\x12\r\n\x05Value\x18\x05 \x02(\t\"L\n\rRequestMethod\x12\x07\n\x03GET\x10\x01\x12\x08\n\x04POST\x10\x02\x12\x08\n\x04HEAD\x10\x03\x12\x07\n\x03PUT\x10\x04\x12\n\n\x06\x44\x45LETE\x10\x05\x12\t\n\x05PATCH\x10\x06\"\xdd\x02\n\x10URLFetchResponse\x12\x0f\n\x07\x43ontent\x18\x01 \x01(\x0c\x12\x12\n\nStatusCode\x18\x02 \x02(\x05\x12\x39\n\x06header\x18\x03 \x03(\n2).google.appengine.URLFetchResponse.Header\x12\"\n\x13\x43ontentWasTruncated\x18\x06 \x01(\x08:\x05\x66\x61lse\x12\x19\n\x11\x45xternalBytesSent\x18\x07 \x01(\x03\x12\x1d\n\x15\x45xternalBytesReceived\x18\x08 \x01(\x03\x12\x10\n\x08\x46inalUrl\x18\t \x01(\t\x12\x1d\n\x12\x41piCpuMilliseconds\x18\n \x01(\x03:\x01\x30\x12\x17\n\x0c\x41piBytesSent\x18\x0b \x01(\x03:\x01\x30\x12\x1b\n\x10\x41piBytesReceived\x18\x0c \x01(\x03:\x01\x30\x1a$\n\x06Header\x12\x0b\n\x03Key\x18\x04 \x02(\t\x12\r\n\x05Value\x18\x05 \x02(\tB9\n!com.google.appengine.api.urlfetchB\x11URLFetchServicePb\x88\x01\x01') - - -_URLFETCHSERVICEERROR = DESCRIPTOR.message_types_by_name['URLFetchServiceError'] -_URLFETCHREQUEST = DESCRIPTOR.message_types_by_name['URLFetchRequest'] -_URLFETCHREQUEST_HEADER = _URLFETCHREQUEST.nested_types_by_name['Header'] -_URLFETCHRESPONSE = DESCRIPTOR.message_types_by_name['URLFetchResponse'] -_URLFETCHRESPONSE_HEADER = _URLFETCHRESPONSE.nested_types_by_name['Header'] -_URLFETCHSERVICEERROR_ERRORCODE = _URLFETCHSERVICEERROR.enum_types_by_name['ErrorCode'] -_URLFETCHREQUEST_REQUESTMETHOD = _URLFETCHREQUEST.enum_types_by_name['RequestMethod'] -URLFetchServiceError = _reflection.GeneratedProtocolMessageType('URLFetchServiceError', (_message.Message,), { - 'DESCRIPTOR' : _URLFETCHSERVICEERROR, - '__module__' : 'google.appengine.api.urlfetch_service_pb2' - - }) -_sym_db.RegisterMessage(URLFetchServiceError) - -URLFetchRequest = _reflection.GeneratedProtocolMessageType('URLFetchRequest', (_message.Message,), { - - 'Header' : _reflection.GeneratedProtocolMessageType('Header', (_message.Message,), { - 'DESCRIPTOR' : _URLFETCHREQUEST_HEADER, - '__module__' : 'google.appengine.api.urlfetch_service_pb2' - - }) - , - 'DESCRIPTOR' : _URLFETCHREQUEST, - '__module__' : 'google.appengine.api.urlfetch_service_pb2' - - }) -_sym_db.RegisterMessage(URLFetchRequest) -_sym_db.RegisterMessage(URLFetchRequest.Header) - -URLFetchResponse = _reflection.GeneratedProtocolMessageType('URLFetchResponse', (_message.Message,), { - - 'Header' : _reflection.GeneratedProtocolMessageType('Header', (_message.Message,), { - 'DESCRIPTOR' : _URLFETCHRESPONSE_HEADER, - '__module__' : 'google.appengine.api.urlfetch_service_pb2' - - }) - , - 'DESCRIPTOR' : _URLFETCHRESPONSE, - '__module__' : 'google.appengine.api.urlfetch_service_pb2' - - }) -_sym_db.RegisterMessage(URLFetchResponse) -_sym_db.RegisterMessage(URLFetchResponse.Header) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.urlfetch_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/user_service_pb2.py b/src/google/appengine/api/user_service_pb2.py index cc645a0..122b42d 100755 --- a/src/google/appengine/api/user_service_pb2.py +++ b/src/google/appengine/api/user_service_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,65 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'google/appengine/api/user_service.proto\x12\x10google.appengine\"\x99\x01\n\x10UserServiceError\"\x84\x01\n\tErrorCode\x12\x06\n\x02OK\x10\x00\x12\x19\n\x15REDIRECT_URL_TOO_LONG\x10\x01\x12\x0f\n\x0bNOT_ALLOWED\x10\x02\x12\x17\n\x13OAUTH_INVALID_TOKEN\x10\x03\x12\x19\n\x15OAUTH_INVALID_REQUEST\x10\x04\x12\x0f\n\x0bOAUTH_ERROR\x10\x05\"a\n\x15\x43reateLoginURLRequest\x12\x17\n\x0f\x64\x65stination_url\x18\x01 \x02(\t\x12\x13\n\x0b\x61uth_domain\x18\x02 \x01(\t\x12\x1a\n\x12\x66\x65\x64\x65rated_identity\x18\x03 \x01(\t\"+\n\x16\x43reateLoginURLResponse\x12\x11\n\tlogin_url\x18\x01 \x01(\t\"F\n\x16\x43reateLogoutURLRequest\x12\x17\n\x0f\x64\x65stination_url\x18\x01 \x02(\t\x12\x13\n\x0b\x61uth_domain\x18\x02 \x01(\t\"-\n\x17\x43reateLogoutURLResponse\x12\x12\n\nlogout_url\x18\x01 \x01(\t\"[\n\x13GetOAuthUserRequest\x12\r\n\x05scope\x18\x01 \x01(\t\x12\x0e\n\x06scopes\x18\x02 \x03(\t\x12%\n\x19request_writer_permission\x18\x03 \x01(\x08\x42\x02\x18\x01\"\xba\x01\n\x14GetOAuthUserResponse\x12\r\n\x05\x65mail\x18\x01 \x01(\t\x12\x0f\n\x07user_id\x18\x02 \x01(\t\x12\x13\n\x0b\x61uth_domain\x18\x03 \x01(\t\x12\x19\n\x11user_organization\x18\x04 \x01(\t\x12\x10\n\x08is_admin\x18\x05 \x01(\x08\x12\x11\n\tclient_id\x18\x06 \x01(\t\x12\x0e\n\x06scopes\x18\x07 \x03(\t\x12\x1d\n\x11is_project_writer\x18\x08 \x01(\x08\x42\x02\x18\x01\x42\x30\n\x1f\x63om.google.google.appengine.apiB\rUserServicePb') - - -_USERSERVICEERROR = DESCRIPTOR.message_types_by_name['UserServiceError'] -_CREATELOGINURLREQUEST = DESCRIPTOR.message_types_by_name['CreateLoginURLRequest'] -_CREATELOGINURLRESPONSE = DESCRIPTOR.message_types_by_name['CreateLoginURLResponse'] -_CREATELOGOUTURLREQUEST = DESCRIPTOR.message_types_by_name['CreateLogoutURLRequest'] -_CREATELOGOUTURLRESPONSE = DESCRIPTOR.message_types_by_name['CreateLogoutURLResponse'] -_GETOAUTHUSERREQUEST = DESCRIPTOR.message_types_by_name['GetOAuthUserRequest'] -_GETOAUTHUSERRESPONSE = DESCRIPTOR.message_types_by_name['GetOAuthUserResponse'] -_USERSERVICEERROR_ERRORCODE = _USERSERVICEERROR.enum_types_by_name['ErrorCode'] -UserServiceError = _reflection.GeneratedProtocolMessageType('UserServiceError', (_message.Message,), { - 'DESCRIPTOR' : _USERSERVICEERROR, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(UserServiceError) - -CreateLoginURLRequest = _reflection.GeneratedProtocolMessageType('CreateLoginURLRequest', (_message.Message,), { - 'DESCRIPTOR' : _CREATELOGINURLREQUEST, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(CreateLoginURLRequest) - -CreateLoginURLResponse = _reflection.GeneratedProtocolMessageType('CreateLoginURLResponse', (_message.Message,), { - 'DESCRIPTOR' : _CREATELOGINURLRESPONSE, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(CreateLoginURLResponse) - -CreateLogoutURLRequest = _reflection.GeneratedProtocolMessageType('CreateLogoutURLRequest', (_message.Message,), { - 'DESCRIPTOR' : _CREATELOGOUTURLREQUEST, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(CreateLogoutURLRequest) - -CreateLogoutURLResponse = _reflection.GeneratedProtocolMessageType('CreateLogoutURLResponse', (_message.Message,), { - 'DESCRIPTOR' : _CREATELOGOUTURLRESPONSE, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(CreateLogoutURLResponse) - -GetOAuthUserRequest = _reflection.GeneratedProtocolMessageType('GetOAuthUserRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETOAUTHUSERREQUEST, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(GetOAuthUserRequest) - -GetOAuthUserResponse = _reflection.GeneratedProtocolMessageType('GetOAuthUserResponse', (_message.Message,), { - 'DESCRIPTOR' : _GETOAUTHUSERRESPONSE, - '__module__' : 'google.appengine.api.user_service_pb2' - - }) -_sym_db.RegisterMessage(GetOAuthUserResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.api.user_service_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/api/yaml_listener.py b/src/google/appengine/api/yaml_listener.py index 0126212..317c967 100755 --- a/src/google/appengine/api/yaml_listener.py +++ b/src/google/appengine/api/yaml_listener.py @@ -15,7 +15,6 @@ # limitations under the License. # - """PyYAML event listener. Contains class which interprets YAML events and forwards them to @@ -25,21 +24,22 @@ import copy from google.appengine.api import yaml_errors -from ruamel import yaml - +from ruamel.yaml import error as ruamel_yaml_error +from ruamel.yaml import events as yaml_events +from ruamel.yaml import loader as yaml_loader _EVENT_METHOD_MAP = { - yaml.events.StreamStartEvent: 'StreamStart', - yaml.events.StreamEndEvent: 'StreamEnd', - yaml.events.DocumentStartEvent: 'DocumentStart', - yaml.events.DocumentEndEvent: 'DocumentEnd', - yaml.events.AliasEvent: 'Alias', - yaml.events.ScalarEvent: 'Scalar', - yaml.events.SequenceStartEvent: 'SequenceStart', - yaml.events.SequenceEndEvent: 'SequenceEnd', - yaml.events.MappingStartEvent: 'MappingStart', - yaml.events.MappingEndEvent: 'MappingEnd', + yaml_events.StreamStartEvent: 'StreamStart', + yaml_events.StreamEndEvent: 'StreamEnd', + yaml_events.DocumentStartEvent: 'DocumentStart', + yaml_events.DocumentEndEvent: 'DocumentEnd', + yaml_events.AliasEvent: 'Alias', + yaml_events.ScalarEvent: 'Scalar', + yaml_events.SequenceStartEvent: 'SequenceStart', + yaml_events.SequenceEndEvent: 'SequenceEnd', + yaml_events.MappingStartEvent: 'MappingStart', + yaml_events.MappingEndEvent: 'MappingEnd', } @@ -50,6 +50,7 @@ class EventHandler(object): Implementing classes instances are passed to the constructor of `EventListener` to act as a receiver of YAML parse events. """ + def StreamStart(self, event, loader): """Handles start of stream event.""" @@ -126,15 +127,15 @@ def __init__(self, event_handler): Args: event_handler: Event handler that will receive mapped events. Must - implement at least one appropriate handler method named from - the values of the `_EVENT_METHOD_MAP`. + implement at least one appropriate handler method named from the values + of the `_EVENT_METHOD_MAP`. Raises: `ListenerConfigurationError` if `event_handler` is not an `EventHandler`. """ if not isinstance(event_handler, EventHandler): raise yaml_errors.ListenerConfigurationError( - 'Must provide event handler of type yaml_listener.EventHandler') + 'Must provide event handler of type yaml_listener.EventHandler') self._event_method_map = {} for event, method in _EVENT_METHOD_MAP.items(): @@ -152,8 +153,8 @@ def HandleEvent(self, event, loader=None): """ if event.__class__ not in _EVENT_METHOD_MAP: - raise yaml_errors.IllegalEvent( - "%s is not a valid PyYAML class" % event.__class__.__name__) + raise yaml_errors.IllegalEvent('%s is not a valid PyYAML class' % + event.__class__.__name__) if event.__class__ in self._event_method_map: self._event_method_map[event.__class__](event, loader) @@ -167,8 +168,7 @@ def _HandleEvents(self, events): Args: events: Iterator or generator containing events to process. - raises: - EventListenerParserError when a yaml.parser.ParserError is raised. + raises: EventListenerParserError when a yaml.parser.ParserError is raised. EventError when an exception occurs during the handling of an event. """ for event in events: @@ -180,9 +180,8 @@ def _HandleEvents(self, events): def _GenerateEventParameters(self, stream, - loader_class=yaml.loader.SafeLoader, - **loader_args - ): + loader_class=yaml_loader.SafeLoader, + **loader_args): """Creates a generator that yields event, loader parameter pairs. For use as parameters to HandleEvent method for use by Parse method. @@ -203,7 +202,6 @@ def _GenerateEventParameters(self, instantiate new yaml.loader instance. **loader_args: Pass to the loader on construction - Yields: Tuple(event, loader) where: event: Event emitted by PyYAML loader. @@ -214,10 +212,10 @@ def _GenerateEventParameters(self, loader = loader_class(stream, **loader_args) while loader.check_event(): yield (loader.get_event(), loader) - except yaml.error.YAMLError as e: + except ruamel_yaml_error.YAMLError as e: raise yaml_errors.EventListenerYAMLError(e) - def Parse(self, stream, loader_class=yaml.loader.SafeLoader, **loader_args): + def Parse(self, stream, loader_class=yaml_loader.SafeLoader, **loader_args): """Calls YAML parser to generate and handle all events. Calls PyYAML parser and sends resulting generator to `handle_event` method @@ -237,5 +235,6 @@ def Parse(self, stream, loader_class=yaml.loader.SafeLoader, **loader_args): loader_args = copy.copy(loader_args) version = loader_args['version'] del loader_args['version'] - self._HandleEvents(self._GenerateEventParameters( - stream, loader_class, version=version, **loader_args)) + self._HandleEvents( + self._GenerateEventParameters( + stream, loader_class, version=version, **loader_args)) diff --git a/src/google/appengine/api/yaml_object.py b/src/google/appengine/api/yaml_object.py index 2735c50..17a03ee 100755 --- a/src/google/appengine/api/yaml_object.py +++ b/src/google/appengine/api/yaml_object.py @@ -15,7 +15,6 @@ # limitations under the License. # - """Builder for mapping YAML documents to object instances. `ObjectBuilder` is responsible for mapping a YAML document to classes defined @@ -27,15 +26,13 @@ - import google -from ruamel import yaml - from google.appengine.api import validation from google.appengine.api import yaml_builder from google.appengine.api import yaml_errors from google.appengine.api import yaml_listener +from ruamel.yaml import loader as yaml_loader @@ -84,8 +81,8 @@ def set_constructor(self, constructor): """Set object used for constructing new sequence instances. Args: - constructor: Callable which can accept no arguments. Must return - an instance of the appropriate class for the container. + constructor: Callable which can accept no arguments. Must return an + instance of the appropriate class for the container. """ self.constructor = constructor @@ -282,7 +279,7 @@ def AppendTo(self, subject, value): subject.value.append(value) -def BuildObjects(default_class, stream, loader=yaml.loader.SafeLoader): +def BuildObjects(default_class, stream, loader=yaml_loader.SafeLoader): """Build objects from stream. Handles the basic case of loading all the objects from a stream. @@ -293,7 +290,7 @@ def BuildObjects(default_class, stream, loader=yaml.loader.SafeLoader): stream: String document or open file object to process as per the `yaml.parse` method. Any object that implements a `read()` method which returns a string document will work with the YAML parser. - loader_class: Used for dependency injection. + loader: Used for dependency injection. Returns: List of `default_class` instances parsed from the stream. @@ -306,7 +303,7 @@ def BuildObjects(default_class, stream, loader=yaml.loader.SafeLoader): return handler.GetResults() -def BuildSingleObject(default_class, stream, loader=yaml.loader.SafeLoader): +def BuildSingleObject(default_class, stream, loader=yaml_loader.SafeLoader): """Build object from stream. Handles the basic case of loading a single object from a stream. @@ -314,10 +311,10 @@ def BuildSingleObject(default_class, stream, loader=yaml.loader.SafeLoader): Args: default_class: Class that is instantiated upon the detection of a new document. An instance of this class will act as the document itself. - stream: String document or open file object to process as per the - yaml.parse method. Any object that implements a 'read()' method which - returns a string document will work with the YAML parser. - loader_class: Used for dependency injection. + stream: String document or open file object to process as per the yaml.parse + method. Any object that implements a 'read()' method which returns a + string document will work with the YAML parser. + loader: Used for dependency injection. """ definitions = BuildObjects(default_class, stream, loader) diff --git a/src/google/appengine/base/capabilities_pb2.py b/src/google/appengine/base/capabilities_pb2.py index 5cd632c..42344f1 100755 --- a/src/google/appengine/base/capabilities_pb2.py +++ b/src/google/appengine/base/capabilities_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,25 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(google/appengine/base/capabilities.proto\x12\x10google.appengine\"\x86\x01\n\x14\x43\x61pabilityConfigList\x12\x32\n\x06\x63onfig\x18\x01 \x03(\x0b\x32\".google.appengine.CapabilityConfig\x12:\n\x0e\x64\x65\x66\x61ult_config\x18\x02 \x01(\x0b\x32\".google.appengine.CapabilityConfig\"\xa9\x02\n\x10\x43\x61pabilityConfig\x12\x0f\n\x07package\x18\x01 \x02(\t\x12\x12\n\ncapability\x18\x02 \x02(\t\x12\x42\n\x06status\x18\x03 \x01(\x0e\x32).google.appengine.CapabilityConfig.Status:\x07UNKNOWN\x12\x16\n\x0escheduled_time\x18\x07 \x01(\t\x12\x18\n\x10internal_message\x18\x04 \x01(\t\x12\x15\n\radmin_message\x18\x05 \x01(\t\x12\x15\n\rerror_message\x18\x06 \x01(\t\"L\n\x06Status\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0b\n\x07\x45NABLED\x10\x01\x12\r\n\tSCHEDULED\x10\x02\x12\x0c\n\x08\x44ISABLED\x10\x03\x12\x0b\n\x07UNKNOWN\x10\x04\x42:\n%com.google.appengine.api.capabilitiesB\x0e\x43\x61pabilitiesPb\xf8\x01\x01') - - -_CAPABILITYCONFIGLIST = DESCRIPTOR.message_types_by_name['CapabilityConfigList'] -_CAPABILITYCONFIG = DESCRIPTOR.message_types_by_name['CapabilityConfig'] -_CAPABILITYCONFIG_STATUS = _CAPABILITYCONFIG.enum_types_by_name['Status'] -CapabilityConfigList = _reflection.GeneratedProtocolMessageType('CapabilityConfigList', (_message.Message,), { - 'DESCRIPTOR' : _CAPABILITYCONFIGLIST, - '__module__' : 'google.appengine.base.capabilities_pb2' - - }) -_sym_db.RegisterMessage(CapabilityConfigList) - -CapabilityConfig = _reflection.GeneratedProtocolMessageType('CapabilityConfig', (_message.Message,), { - 'DESCRIPTOR' : _CAPABILITYCONFIG, - '__module__' : 'google.appengine.base.capabilities_pb2' - - }) -_sym_db.RegisterMessage(CapabilityConfig) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.base.capabilities_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/datastore/action_pb2.py b/src/google/appengine/datastore/action_pb2.py index eef93aa..c788e28 100755 --- a/src/google/appengine/datastore/action_pb2.py +++ b/src/google/appengine/datastore/action_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,32 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'google/appengine/datastore/action.proto\x12\x13storage_onestore_v3\"\x93\x01\n\x06\x41\x63tion\x12>\n\x10transaction_data\x18\x02 \x01(\x0b\x32$.storage_onestore_v3.TransactionData\x12;\n\x0f\x61\x63tion_rpc_info\x18\x03 \x01(\x0b\x32\".storage_onestore_v3.ActionRpcInfo\x12\x0c\n\x04uuid\x18\x04 \x01(\t\"F\n\x0fTransactionData\x12\x0e\n\x06handle\x18\x01 \x01(\x06\x12\x0e\n\x06\x61pp_id\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x03 \x01(\t\"Z\n\rActionRpcInfo\x12\x1f\n\x17\x65nqueuing_rpc_global_id\x18\x01 \x01(\x03\x12(\n enqueuing_rpc_start_timestamp_us\x18\x02 \x01(\x03\x42\x45\n\x1e\x63om.google.storage.onestore.v3B\x0eOnestoreActionZ\x13storage_onestore_v3') - - -_ACTION = DESCRIPTOR.message_types_by_name['Action'] -_TRANSACTIONDATA = DESCRIPTOR.message_types_by_name['TransactionData'] -_ACTIONRPCINFO = DESCRIPTOR.message_types_by_name['ActionRpcInfo'] -Action = _reflection.GeneratedProtocolMessageType('Action', (_message.Message,), { - 'DESCRIPTOR' : _ACTION, - '__module__' : 'google.appengine.datastore.action_pb2' - - }) -_sym_db.RegisterMessage(Action) - -TransactionData = _reflection.GeneratedProtocolMessageType('TransactionData', (_message.Message,), { - 'DESCRIPTOR' : _TRANSACTIONDATA, - '__module__' : 'google.appengine.datastore.action_pb2' - - }) -_sym_db.RegisterMessage(TransactionData) - -ActionRpcInfo = _reflection.GeneratedProtocolMessageType('ActionRpcInfo', (_message.Message,), { - 'DESCRIPTOR' : _ACTIONRPCINFO, - '__module__' : 'google.appengine.datastore.action_pb2' - - }) -_sym_db.RegisterMessage(ActionRpcInfo) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.datastore.action_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/datastore/datastore_v3_bytes_pb2.py b/src/google/appengine/datastore/datastore_v3_bytes_pb2.py index 54caa23..c90bf00 100755 --- a/src/google/appengine/datastore/datastore_v3_bytes_pb2.py +++ b/src/google/appengine/datastore/datastore_v3_bytes_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -33,355 +32,10 @@ from google.appengine.datastore import snapshot_pb2 as google_dot_appengine_dot_datastore_dot_snapshot__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3google/appengine/datastore/datastore_v3_bytes.proto\x12\x1d\x61pphosting_datastore_v3_bytes\x1a\'google/appengine/datastore/action.proto\x1a-google/appengine/datastore/entity_bytes.proto\x1a)google/appengine/datastore/snapshot.proto\"\xa0\x01\n\x0bTransaction\x12\x0e\n\x06handle\x18\x01 \x02(\x06\x12\x0b\n\x03\x61pp\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x06 \x01(\t\x12\x1b\n\x0cmark_changes\x18\x03 \x01(\x08:\x05\x66\x61lse\x12\x42\n\x0f\x63omposite_index\x18\x05 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\"\xe1\x0c\n\x05Query\x12\x0b\n\x03\x61pp\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18* \x01(\t\x12\x12\n\nname_space\x18\x1d \x01(\t\x12\x0c\n\x04kind\x18\x03 \x01(\t\x12\x36\n\x08\x61ncestor\x18\x11 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0f\n\x07shallow\x18+ \x01(\x08\x12;\n\x06\x66ilter\x18\x04 \x03(\n2+.apphosting_datastore_v3_bytes.Query.Filter\x12\x39\n\x05order\x18\t \x03(\n2*.apphosting_datastore_v3_bytes.Query.Order\x12\r\n\x05\x63ount\x18\x17 \x01(\x05\x12\x11\n\x06offset\x18\x0c \x01(\x05:\x01\x30\x12\r\n\x05limit\x18\x10 \x01(\x05\x12\x46\n\x0f\x63ompiled_cursor\x18\x1e \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12J\n\x13\x65nd_compiled_cursor\x18\x1f \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12\x42\n\x0f\x63omposite_index\x18\x13 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x18\n\tkeys_only\x18\x15 \x01(\x08:\x05\x66\x61lse\x12?\n\x0btransaction\x18\x16 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x13\n\x0b\x66\x61ilover_ms\x18\x1a \x01(\x03\x12\x0e\n\x06strong\x18 \x01(\x08\x12\x15\n\rproperty_name\x18! \x03(\t\x12\x1e\n\x16group_by_property_name\x18\" \x03(\t\x12\x10\n\x08\x64istinct\x18\x18 \x01(\x08\x12\x1d\n\x15min_safe_time_seconds\x18# \x01(\x03\x12\x19\n\x11safe_replica_name\x18$ \x03(\t\x12\x18\n\x0cread_time_us\x18, \x01(\x03\x42\x02\x18\x01\x12\x1e\n\x16read_time_epoch_micros\x18- \x01(\x03\x12;\n\x04hint\x18\x12 \x01(\x0e\x32).apphosting_datastore_v3_bytes.Query.HintB\x02\x18\x01\x12\x18\n\x0csearch_query\x18\x08 \x01(\tB\x02\x18\x01\x12\'\n\x14require_perfect_plan\x18\x14 \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12\x1a\n\x07\x63ompile\x18\x19 \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12 \n\x0epersist_offset\x18% \x01(\x08:\x04trueB\x02\x18\x01\x1a\xf3\x02\n\x06\x46ilter\x12@\n\x02op\x18\x06 \x02(\x0e\x32\x34.apphosting_datastore_v3_bytes.Query.Filter.Operator\x12\x35\n\x08property\x18\x0e \x03(\x0b\x32#.storage_onestore_v3_bytes.Property\x12<\n\ngeo_region\x18( \x01(\x0b\x32(.apphosting_datastore_v3_bytes.GeoRegion\"\xb1\x01\n\x08Operator\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x04\x12\t\n\x05\x45QUAL\x10\x05\x12\x06\n\x02IN\x10\x06\x12\n\n\x06\x45XISTS\x10\x07\x12\x17\n\x13\x43ONTAINED_IN_REGION\x10\x08\x12\r\n\tNOT_EQUAL\x10\t\x12\n\n\x06NOT_IN\x10\n\x1a\x99\x01\n\x05Order\x12\x10\n\x08property\x18\n \x02(\t\x12R\n\tdirection\x18\x0b \x01(\x0e\x32\x34.apphosting_datastore_v3_bytes.Query.Order.Direction:\tASCENDING\"*\n\tDirection\x12\r\n\tASCENDING\x10\x01\x12\x0e\n\nDESCENDING\x10\x02\"=\n\x04Hint\x12\x0f\n\x0bORDER_FIRST\x10\x01\x12\x12\n\x0e\x41NCESTOR_FIRST\x10\x02\x12\x10\n\x0c\x46ILTER_FIRST\x10\x03\"2\n\x0bRegionPoint\x12\x10\n\x08latitude\x18\x01 \x02(\x01\x12\x11\n\tlongitude\x18\x02 \x02(\x01\"a\n\x0c\x43ircleRegion\x12:\n\x06\x63\x65nter\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.RegionPoint\x12\x15\n\rradius_meters\x18\x02 \x02(\x01\"\x8f\x01\n\x0fRectangleRegion\x12=\n\tsouthwest\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.RegionPoint\x12=\n\tnortheast\x18\x02 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.RegionPoint\"\x8b\x01\n\tGeoRegion\x12;\n\x06\x63ircle\x18\x01 \x01(\x0b\x32+.apphosting_datastore_v3_bytes.CircleRegion\x12\x41\n\trectangle\x18\x02 \x01(\x0b\x32..apphosting_datastore_v3_bytes.RectangleRegion\"\xec\x06\n\rCompiledQuery\x12M\n\x0bprimaryscan\x18\x01 \x02(\n28.apphosting_datastore_v3_bytes.CompiledQuery.PrimaryScan\x12Q\n\rmergejoinscan\x18\x07 \x03(\n2:.apphosting_datastore_v3_bytes.CompiledQuery.MergeJoinScan\x12\x33\n\tindex_def\x18\x15 \x01(\x0b\x32 .storage_onestore_v3_bytes.Index\x12\x11\n\x06offset\x18\n \x01(\x05:\x01\x30\x12\r\n\x05limit\x18\x0b \x01(\x05\x12\x11\n\tkeys_only\x18\x0c \x02(\x08\x12\x15\n\rproperty_name\x18\x18 \x03(\t\x12\x1b\n\x13\x64istinct_infix_size\x18\x19 \x01(\x05\x12\x17\n\x0fkey_path_length\x18\x1b \x01(\x05\x12O\n\x0c\x65ntityfilter\x18\r \x01(\n29.apphosting_datastore_v3_bytes.CompiledQuery.EntityFilter\x12\x12\n\nplan_label\x18\x1a \x01(\t\x1a\xd5\x01\n\x0bPrimaryScan\x12\x12\n\nindex_name\x18\x02 \x01(\t\x12\x11\n\tstart_key\x18\x03 \x01(\x0c\x12\x17\n\x0fstart_inclusive\x18\x04 \x01(\x08\x12\x0f\n\x07\x65nd_key\x18\x05 \x01(\x0c\x12\x15\n\rend_inclusive\x18\x06 \x01(\x08\x12\x1b\n\x13start_postfix_value\x18\x16 \x03(\x0c\x12\x19\n\x11\x65nd_postfix_value\x18\x17 \x03(\x0c\x12&\n\x1e\x65nd_unapplied_log_timestamp_us\x18\x13 \x01(\x03\x1aV\n\rMergeJoinScan\x12\x12\n\nindex_name\x18\x08 \x02(\t\x12\x14\n\x0cprefix_value\x18\t \x03(\x0c\x12\x1b\n\x0cvalue_prefix\x18\x14 \x01(\x08:\x05\x66\x61lse\x1am\n\x0c\x45ntityFilter\x12\x17\n\x08\x64istinct\x18\x0e \x01(\x08:\x05\x66\x61lse\x12\x0c\n\x04kind\x18\x11 \x01(\t\x12\x36\n\x08\x61ncestor\x18\x12 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\"\xbe\x04\n\x0e\x43ompiledCursor\x12L\n\x08position\x18\x02 \x01(\n26.apphosting_datastore_v3_bytes.CompiledCursor.PositionB\x02\x18\x01\x12\x41\n\x10postfix_position\x18\x01 \x01(\x0b\x32\'.storage_onestore_v3_bytes.IndexPostfix\x12\x43\n\x11\x61\x62solute_position\x18\x03 \x01(\x0b\x32(.storage_onestore_v3_bytes.IndexPosition\x1a\xd5\x02\n\x08Position\x12\x15\n\tstart_key\x18\x1b \x01(\x0c\x42\x02\x18\x01\x12Y\n\nindexvalue\x18\x1d \x03(\n2A.apphosting_datastore_v3_bytes.CompiledCursor.Position.IndexValueB\x02\x18\x01\x12\x35\n\x03key\x18 \x01(\x0b\x32$.storage_onestore_v3_bytes.ReferenceB\x02\x18\x01\x12!\n\x0fstart_inclusive\x18\x1c \x01(\x08:\x04trueB\x02\x18\x01\x12\x1c\n\x10\x62\x65\x66ore_ascending\x18! \x01(\x08\x42\x02\x18\x01\x1a_\n\nIndexValue\x12\x14\n\x08property\x18\x1e \x01(\tB\x02\x18\x01\x12;\n\x05value\x18\x1f \x02(\x0b\x32(.storage_onestore_v3_bytes.PropertyValueB\x02\x18\x01\":\n\x06\x43ursor\x12\x0e\n\x06\x63ursor\x18\x01 \x02(\x06\x12\x0b\n\x03\x61pp\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x03 \x01(\t\"\x9f\x03\n\x05\x45rror\"\x95\x03\n\tErrorCode\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10\x01\x12\x1a\n\x16\x43ONCURRENT_TRANSACTION\x10\x02\x12\x12\n\x0eINTERNAL_ERROR\x10\x03\x12\x0e\n\nNEED_INDEX\x10\x04\x12\x0b\n\x07TIMEOUT\x10\x05\x12\x15\n\x11PERMISSION_DENIED\x10\x06\x12\x12\n\x0e\x42IGTABLE_ERROR\x10\x07\x12 \n\x1c\x43OMMITTED_BUT_STILL_APPLYING\x10\x08\x12\x17\n\x13\x43\x41PABILITY_DISABLED\x10\t\x12\x19\n\x15TRY_ALTERNATE_BACKEND\x10\n\x12\x15\n\x11SAFE_TIME_TOO_OLD\x10\x0b\x12\x16\n\x12RESOURCE_EXHAUSTED\x10\x0c\x12\x1c\n\x18SNAPSHOT_VERSION_TOO_OLD\x10\x12\x12\r\n\tNOT_FOUND\x10\r\x12\x12\n\x0e\x41LREADY_EXISTS\x10\x0e\x12\x17\n\x13\x46\x41ILED_PRECONDITION\x10\x0f\x12\x13\n\x0fUNAUTHENTICATED\x10\x10\x12\x0b\n\x07\x41\x42ORTED\x10\x11\"\xbd\x02\n\x04\x43ost\x12\x14\n\x0cindex_writes\x18\x01 \x01(\x05\x12\x19\n\x11index_write_bytes\x18\x02 \x01(\x05\x12\x15\n\rentity_writes\x18\x03 \x01(\x05\x12\x1a\n\x12\x65ntity_write_bytes\x18\x04 \x01(\x05\x12\x42\n\ncommitcost\x18\x05 \x01(\n2..apphosting_datastore_v3_bytes.Cost.CommitCost\x12!\n\x19\x61pproximate_storage_delta\x18\x08 \x01(\x05\x12\x1b\n\x13id_sequence_updates\x18\t \x01(\x05\x1aM\n\nCommitCost\x12\x1d\n\x15requested_entity_puts\x18\x06 \x01(\x05\x12 \n\x18requested_entity_deletes\x18\x07 \x01(\x05\"\xe4\x01\n\nGetRequest\x12\x31\n\x03key\x18\x01 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12?\n\x0btransaction\x18\x02 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x13\n\x0b\x66\x61ilover_ms\x18\x03 \x01(\x03\x12\x0e\n\x06strong\x18\x04 \x01(\x08\x12\x1d\n\x0e\x61llow_deferred\x18\x05 \x01(\x08:\x05\x66\x61lse\x12\x1e\n\x16read_time_epoch_micros\x18\x06 \x01(\x03\"\xe9\x02\n\x0bGetResponse\x12\x41\n\x06\x65ntity\x18\x01 \x03(\n21.apphosting_datastore_v3_bytes.GetResponse.Entity\x12\x36\n\x08\x64\x65\x66\x65rred\x18\x05 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x16\n\x08in_order\x18\x06 \x01(\x08:\x04true\x12\x1e\n\x16read_time_epoch_micros\x18\x07 \x01(\x03\x1a\xa6\x01\n\x06\x45ntity\x12\x36\n\x06\x65ntity\x18\x02 \x01(\x0b\x32&.storage_onestore_v3_bytes.EntityProto\x12\x31\n\x03key\x18\x04 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0f\n\x07version\x18\x03 \x01(\x03\x12 \n\x18update_time_epoch_micros\x18\x08 \x01(\x03\"\xe4\x03\n\nPutRequest\x12\x36\n\x06\x65ntity\x18\x01 \x03(\x0b\x32&.storage_onestore_v3_bytes.EntityProto\x12?\n\x0btransaction\x18\x02 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x42\n\x0f\x63omposite_index\x18\x03 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x16\n\x07trusted\x18\x04 \x01(\x08:\x05\x66\x61lse\x12\x14\n\x05\x66orce\x18\x07 \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0cmark_changes\x18\x08 \x01(\x08:\x05\x66\x61lse\x12/\n\x08snapshot\x18\t \x03(\x0b\x32\x1d.storage_onestore_v3.Snapshot\x12W\n\x0e\x61uto_id_policy\x18\n \x01(\x0e\x32\x36.apphosting_datastore_v3_bytes.PutRequest.AutoIdPolicy:\x07\x43URRENT\x12\x17\n\x0fsequence_number\x18\x0c \x01(\x03\"+\n\x0c\x41utoIdPolicy\x12\x0b\n\x07\x43URRENT\x10\x00\x12\x0e\n\nSEQUENTIAL\x10\x01\"\xa6\x01\n\x0bPutResponse\x12\x31\n\x03key\x18\x01 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x31\n\x04\x63ost\x18\x02 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\x12\x0f\n\x07version\x18\x03 \x03(\x03\x12 \n\x18update_time_epoch_micros\x18\x04 \x03(\x03\"\xcc\x01\n\x0cTouchRequest\x12\x31\n\x03key\x18\x01 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x42\n\x0f\x63omposite_index\x18\x02 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x14\n\x05\x66orce\x18\x03 \x01(\x08:\x05\x66\x61lse\x12/\n\x08snapshot\x18\t \x03(\x0b\x32\x1d.storage_onestore_v3.Snapshot\"B\n\rTouchResponse\x12\x31\n\x04\x63ost\x18\x01 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\"\xdc\x02\n\rDeleteRequest\x12\x31\n\x03key\x18\x06 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12?\n\x0btransaction\x18\x05 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x42\n\x0f\x63omposite_index\x18\x0b \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x16\n\x07trusted\x18\x04 \x01(\x08:\x05\x66\x61lse\x12\x14\n\x05\x66orce\x18\x07 \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0cmark_changes\x18\x08 \x01(\x08:\x05\x66\x61lse\x12/\n\x08snapshot\x18\t \x03(\x0b\x32\x1d.storage_onestore_v3.Snapshot\x12\x17\n\x0fsequence_number\x18\x0c \x01(\x03\"v\n\x0e\x44\x65leteResponse\x12\x31\n\x04\x63ost\x18\x01 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\x12\x0f\n\x07version\x18\x03 \x03(\x03\x12 \n\x18\x64\x65lete_time_epoch_micros\x18\x04 \x03(\x03\"\x82\x01\n\x0bNextRequest\x12\x35\n\x06\x63ursor\x18\x01 \x02(\x0b\x32%.apphosting_datastore_v3_bytes.Cursor\x12\r\n\x05\x63ount\x18\x02 \x01(\x05\x12\x15\n\x06offset\x18\x04 \x01(\x05:\x01\x30\x42\x02\x18\x01\x12\x16\n\x07\x63ompile\x18\x03 \x01(\x08:\x05\x66\x61lse\"\xa7\x05\n\x0bQueryResult\x12\x35\n\x06\x63ursor\x18\x01 \x01(\x0b\x32%.apphosting_datastore_v3_bytes.Cursor\x12\x36\n\x06result\x18\x02 \x03(\x0b\x32&.storage_onestore_v3_bytes.EntityProto\x12\x17\n\x0fskipped_results\x18\x07 \x01(\x05\x12\x14\n\x0cmore_results\x18\x03 \x02(\x08\x12\x11\n\tkeys_only\x18\x04 \x01(\x08\x12\x12\n\nindex_only\x18\t \x01(\x08\x12\x11\n\tsmall_ops\x18\n \x01(\x08\x12\x44\n\x0e\x63ompiled_query\x18\x05 \x01(\x0b\x32,.apphosting_datastore_v3_bytes.CompiledQuery\x12\x46\n\x0f\x63ompiled_cursor\x18\x06 \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12\x38\n\x05index\x18\x08 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x0f\n\x07version\x18\x0b \x03(\x03\x12 \n\x18update_time_epoch_micros\x18\x0f \x03(\x03\x12\x1e\n\x16read_time_epoch_micros\x18\x0e \x01(\x03\x12M\n\x16result_compiled_cursor\x18\x0c \x03(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12V\n\x1fskipped_results_compiled_cursor\x18\r \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\"\xb7\x01\n\x12\x41llocateIdsRequest\x12\x37\n\tmodel_key\x18\x01 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0c\n\x04size\x18\x02 \x01(\x03\x12\x0b\n\x03max\x18\x03 \x01(\x03\x12\x35\n\x07reserve\x18\x05 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x16\n\x07trusted\x18\x06 \x01(\x08:\x05\x66\x61lse\"d\n\x13\x41llocateIdsResponse\x12\r\n\x05start\x18\x01 \x02(\x03\x12\x0b\n\x03\x65nd\x18\x02 \x02(\x03\x12\x31\n\x04\x63ost\x18\x03 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\"L\n\x10\x43ompositeIndices\x12\x38\n\x05index\x18\x01 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\"\x81\x01\n\x11\x41\x64\x64\x41\x63tionsRequest\x12?\n\x0btransaction\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12+\n\x06\x61\x63tion\x18\x02 \x03(\x0b\x32\x1b.storage_onestore_v3.Action\"\x14\n\x12\x41\x64\x64\x41\x63tionsResponse\"\xc5\x02\n\x17\x42\x65ginTransactionRequest\x12\x0b\n\x03\x61pp\x18\x01 \x02(\t\x12 \n\x11\x61llow_multiple_eg\x18\x02 \x01(\x08:\x05\x66\x61lse\x12\x13\n\x0b\x64\x61tabase_id\x18\x04 \x01(\t\x12]\n\x04mode\x18\x05 \x01(\x0e\x32\x46.apphosting_datastore_v3_bytes.BeginTransactionRequest.TransactionMode:\x07UNKNOWN\x12H\n\x14previous_transaction\x18\x07 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\"=\n\x0fTransactionMode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tREAD_ONLY\x10\x01\x12\x0e\n\nREAD_WRITE\x10\x02\"\xaa\x02\n\x0e\x43ommitResponse\x12\x31\n\x04\x63ost\x18\x01 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\x12 \n\x18\x63ommit_time_epoch_micros\x18\x07 \x01(\x03\x12\x46\n\x07version\x18\x03 \x03(\n25.apphosting_datastore_v3_bytes.CommitResponse.Version\x1a{\n\x07Version\x12=\n\x0froot_entity_key\x18\x04 \x02(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0f\n\x07version\x18\x05 \x02(\x03\x12 \n\x18update_time_epoch_micros\x18\x06 \x01(\x03\"8\n\x11GetIndicesRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x02 \x01(\t\"6\n\x13UpdateIndexResponse\x12\x10\n\x08type_url\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\"\x86\x02\n\x12\x44\x61tastoreService_3\"\xef\x01\n\x06Method\x12\x07\n\x03Get\x10\x01\x12\x07\n\x03Put\x10\x02\x12\t\n\x05Touch\x10\x03\x12\n\n\x06\x44\x65lete\x10\x04\x12\x0c\n\x08RunQuery\x10\x05\x12\x0e\n\nAddActions\x10\x06\x12\x08\n\x04Next\x10\x07\x12\x10\n\x0c\x44\x65leteCursor\x10\x08\x12\x14\n\x10\x42\x65ginTransaction\x10\t\x12\n\n\x06\x43ommit\x10\n\x12\x0c\n\x08Rollback\x10\x0b\x12\x0f\n\x0b\x41llocateIds\x10\x0c\x12\x0f\n\x0b\x43reateIndex\x10\r\x12\x0f\n\x0bUpdateIndex\x10\x0e\x12\x0e\n\nGetIndices\x10\x0f\x12\x0f\n\x0b\x44\x65leteIndex\x10\x10\x42\x36\n%com.google.google.appengine.datastoreB\rDatastoreV3Pb') - - - -_TRANSACTION = DESCRIPTOR.message_types_by_name['Transaction'] -_QUERY = DESCRIPTOR.message_types_by_name['Query'] -_QUERY_FILTER = _QUERY.nested_types_by_name['Filter'] -_QUERY_ORDER = _QUERY.nested_types_by_name['Order'] -_REGIONPOINT = DESCRIPTOR.message_types_by_name['RegionPoint'] -_CIRCLEREGION = DESCRIPTOR.message_types_by_name['CircleRegion'] -_RECTANGLEREGION = DESCRIPTOR.message_types_by_name['RectangleRegion'] -_GEOREGION = DESCRIPTOR.message_types_by_name['GeoRegion'] -_COMPILEDQUERY = DESCRIPTOR.message_types_by_name['CompiledQuery'] -_COMPILEDQUERY_PRIMARYSCAN = _COMPILEDQUERY.nested_types_by_name['PrimaryScan'] -_COMPILEDQUERY_MERGEJOINSCAN = _COMPILEDQUERY.nested_types_by_name['MergeJoinScan'] -_COMPILEDQUERY_ENTITYFILTER = _COMPILEDQUERY.nested_types_by_name['EntityFilter'] -_COMPILEDCURSOR = DESCRIPTOR.message_types_by_name['CompiledCursor'] -_COMPILEDCURSOR_POSITION = _COMPILEDCURSOR.nested_types_by_name['Position'] -_COMPILEDCURSOR_POSITION_INDEXVALUE = _COMPILEDCURSOR_POSITION.nested_types_by_name['IndexValue'] -_CURSOR = DESCRIPTOR.message_types_by_name['Cursor'] -_ERROR = DESCRIPTOR.message_types_by_name['Error'] -_COST = DESCRIPTOR.message_types_by_name['Cost'] -_COST_COMMITCOST = _COST.nested_types_by_name['CommitCost'] -_GETREQUEST = DESCRIPTOR.message_types_by_name['GetRequest'] -_GETRESPONSE = DESCRIPTOR.message_types_by_name['GetResponse'] -_GETRESPONSE_ENTITY = _GETRESPONSE.nested_types_by_name['Entity'] -_PUTREQUEST = DESCRIPTOR.message_types_by_name['PutRequest'] -_PUTRESPONSE = DESCRIPTOR.message_types_by_name['PutResponse'] -_TOUCHREQUEST = DESCRIPTOR.message_types_by_name['TouchRequest'] -_TOUCHRESPONSE = DESCRIPTOR.message_types_by_name['TouchResponse'] -_DELETEREQUEST = DESCRIPTOR.message_types_by_name['DeleteRequest'] -_DELETERESPONSE = DESCRIPTOR.message_types_by_name['DeleteResponse'] -_NEXTREQUEST = DESCRIPTOR.message_types_by_name['NextRequest'] -_QUERYRESULT = DESCRIPTOR.message_types_by_name['QueryResult'] -_ALLOCATEIDSREQUEST = DESCRIPTOR.message_types_by_name['AllocateIdsRequest'] -_ALLOCATEIDSRESPONSE = DESCRIPTOR.message_types_by_name['AllocateIdsResponse'] -_COMPOSITEINDICES = DESCRIPTOR.message_types_by_name['CompositeIndices'] -_ADDACTIONSREQUEST = DESCRIPTOR.message_types_by_name['AddActionsRequest'] -_ADDACTIONSRESPONSE = DESCRIPTOR.message_types_by_name['AddActionsResponse'] -_BEGINTRANSACTIONREQUEST = DESCRIPTOR.message_types_by_name['BeginTransactionRequest'] -_COMMITRESPONSE = DESCRIPTOR.message_types_by_name['CommitResponse'] -_COMMITRESPONSE_VERSION = _COMMITRESPONSE.nested_types_by_name['Version'] -_GETINDICESREQUEST = DESCRIPTOR.message_types_by_name['GetIndicesRequest'] -_UPDATEINDEXRESPONSE = DESCRIPTOR.message_types_by_name['UpdateIndexResponse'] -_DATASTORESERVICE_3 = DESCRIPTOR.message_types_by_name['DatastoreService_3'] -_QUERY_FILTER_OPERATOR = _QUERY_FILTER.enum_types_by_name['Operator'] -_QUERY_ORDER_DIRECTION = _QUERY_ORDER.enum_types_by_name['Direction'] -_QUERY_HINT = _QUERY.enum_types_by_name['Hint'] -_ERROR_ERRORCODE = _ERROR.enum_types_by_name['ErrorCode'] -_PUTREQUEST_AUTOIDPOLICY = _PUTREQUEST.enum_types_by_name['AutoIdPolicy'] -_BEGINTRANSACTIONREQUEST_TRANSACTIONMODE = _BEGINTRANSACTIONREQUEST.enum_types_by_name['TransactionMode'] -_DATASTORESERVICE_3_METHOD = _DATASTORESERVICE_3.enum_types_by_name['Method'] -Transaction = _reflection.GeneratedProtocolMessageType('Transaction', (_message.Message,), { - 'DESCRIPTOR' : _TRANSACTION, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(Transaction) - -Query = _reflection.GeneratedProtocolMessageType('Query', (_message.Message,), { - - 'Filter' : _reflection.GeneratedProtocolMessageType('Filter', (_message.Message,), { - 'DESCRIPTOR' : _QUERY_FILTER, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - - 'Order' : _reflection.GeneratedProtocolMessageType('Order', (_message.Message,), { - 'DESCRIPTOR' : _QUERY_ORDER, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _QUERY, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(Query) -_sym_db.RegisterMessage(Query.Filter) -_sym_db.RegisterMessage(Query.Order) - -RegionPoint = _reflection.GeneratedProtocolMessageType('RegionPoint', (_message.Message,), { - 'DESCRIPTOR' : _REGIONPOINT, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(RegionPoint) - -CircleRegion = _reflection.GeneratedProtocolMessageType('CircleRegion', (_message.Message,), { - 'DESCRIPTOR' : _CIRCLEREGION, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(CircleRegion) - -RectangleRegion = _reflection.GeneratedProtocolMessageType('RectangleRegion', (_message.Message,), { - 'DESCRIPTOR' : _RECTANGLEREGION, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(RectangleRegion) - -GeoRegion = _reflection.GeneratedProtocolMessageType('GeoRegion', (_message.Message,), { - 'DESCRIPTOR' : _GEOREGION, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(GeoRegion) - -CompiledQuery = _reflection.GeneratedProtocolMessageType('CompiledQuery', (_message.Message,), { - - 'PrimaryScan' : _reflection.GeneratedProtocolMessageType('PrimaryScan', (_message.Message,), { - 'DESCRIPTOR' : _COMPILEDQUERY_PRIMARYSCAN, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - - 'MergeJoinScan' : _reflection.GeneratedProtocolMessageType('MergeJoinScan', (_message.Message,), { - 'DESCRIPTOR' : _COMPILEDQUERY_MERGEJOINSCAN, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - - 'EntityFilter' : _reflection.GeneratedProtocolMessageType('EntityFilter', (_message.Message,), { - 'DESCRIPTOR' : _COMPILEDQUERY_ENTITYFILTER, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _COMPILEDQUERY, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(CompiledQuery) -_sym_db.RegisterMessage(CompiledQuery.PrimaryScan) -_sym_db.RegisterMessage(CompiledQuery.MergeJoinScan) -_sym_db.RegisterMessage(CompiledQuery.EntityFilter) - -CompiledCursor = _reflection.GeneratedProtocolMessageType('CompiledCursor', (_message.Message,), { - - 'Position' : _reflection.GeneratedProtocolMessageType('Position', (_message.Message,), { - - 'IndexValue' : _reflection.GeneratedProtocolMessageType('IndexValue', (_message.Message,), { - 'DESCRIPTOR' : _COMPILEDCURSOR_POSITION_INDEXVALUE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _COMPILEDCURSOR_POSITION, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _COMPILEDCURSOR, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(CompiledCursor) -_sym_db.RegisterMessage(CompiledCursor.Position) -_sym_db.RegisterMessage(CompiledCursor.Position.IndexValue) - -Cursor = _reflection.GeneratedProtocolMessageType('Cursor', (_message.Message,), { - 'DESCRIPTOR' : _CURSOR, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(Cursor) - -Error = _reflection.GeneratedProtocolMessageType('Error', (_message.Message,), { - 'DESCRIPTOR' : _ERROR, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(Error) - -Cost = _reflection.GeneratedProtocolMessageType('Cost', (_message.Message,), { - - 'CommitCost' : _reflection.GeneratedProtocolMessageType('CommitCost', (_message.Message,), { - 'DESCRIPTOR' : _COST_COMMITCOST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _COST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(Cost) -_sym_db.RegisterMessage(Cost.CommitCost) - -GetRequest = _reflection.GeneratedProtocolMessageType('GetRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(GetRequest) - -GetResponse = _reflection.GeneratedProtocolMessageType('GetResponse', (_message.Message,), { - - 'Entity' : _reflection.GeneratedProtocolMessageType('Entity', (_message.Message,), { - 'DESCRIPTOR' : _GETRESPONSE_ENTITY, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _GETRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(GetResponse) -_sym_db.RegisterMessage(GetResponse.Entity) - -PutRequest = _reflection.GeneratedProtocolMessageType('PutRequest', (_message.Message,), { - 'DESCRIPTOR' : _PUTREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(PutRequest) - -PutResponse = _reflection.GeneratedProtocolMessageType('PutResponse', (_message.Message,), { - 'DESCRIPTOR' : _PUTRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(PutResponse) - -TouchRequest = _reflection.GeneratedProtocolMessageType('TouchRequest', (_message.Message,), { - 'DESCRIPTOR' : _TOUCHREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(TouchRequest) - -TouchResponse = _reflection.GeneratedProtocolMessageType('TouchResponse', (_message.Message,), { - 'DESCRIPTOR' : _TOUCHRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(TouchResponse) - -DeleteRequest = _reflection.GeneratedProtocolMessageType('DeleteRequest', (_message.Message,), { - 'DESCRIPTOR' : _DELETEREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(DeleteRequest) - -DeleteResponse = _reflection.GeneratedProtocolMessageType('DeleteResponse', (_message.Message,), { - 'DESCRIPTOR' : _DELETERESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(DeleteResponse) - -NextRequest = _reflection.GeneratedProtocolMessageType('NextRequest', (_message.Message,), { - 'DESCRIPTOR' : _NEXTREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(NextRequest) - -QueryResult = _reflection.GeneratedProtocolMessageType('QueryResult', (_message.Message,), { - 'DESCRIPTOR' : _QUERYRESULT, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(QueryResult) - -AllocateIdsRequest = _reflection.GeneratedProtocolMessageType('AllocateIdsRequest', (_message.Message,), { - 'DESCRIPTOR' : _ALLOCATEIDSREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(AllocateIdsRequest) - -AllocateIdsResponse = _reflection.GeneratedProtocolMessageType('AllocateIdsResponse', (_message.Message,), { - 'DESCRIPTOR' : _ALLOCATEIDSRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(AllocateIdsResponse) - -CompositeIndices = _reflection.GeneratedProtocolMessageType('CompositeIndices', (_message.Message,), { - 'DESCRIPTOR' : _COMPOSITEINDICES, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(CompositeIndices) - -AddActionsRequest = _reflection.GeneratedProtocolMessageType('AddActionsRequest', (_message.Message,), { - 'DESCRIPTOR' : _ADDACTIONSREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(AddActionsRequest) - -AddActionsResponse = _reflection.GeneratedProtocolMessageType('AddActionsResponse', (_message.Message,), { - 'DESCRIPTOR' : _ADDACTIONSRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(AddActionsResponse) - -BeginTransactionRequest = _reflection.GeneratedProtocolMessageType('BeginTransactionRequest', (_message.Message,), { - 'DESCRIPTOR' : _BEGINTRANSACTIONREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(BeginTransactionRequest) - -CommitResponse = _reflection.GeneratedProtocolMessageType('CommitResponse', (_message.Message,), { - - 'Version' : _reflection.GeneratedProtocolMessageType('Version', (_message.Message,), { - 'DESCRIPTOR' : _COMMITRESPONSE_VERSION, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _COMMITRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(CommitResponse) -_sym_db.RegisterMessage(CommitResponse.Version) - -GetIndicesRequest = _reflection.GeneratedProtocolMessageType('GetIndicesRequest', (_message.Message,), { - 'DESCRIPTOR' : _GETINDICESREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(GetIndicesRequest) - -UpdateIndexResponse = _reflection.GeneratedProtocolMessageType('UpdateIndexResponse', (_message.Message,), { - 'DESCRIPTOR' : _UPDATEINDEXRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(UpdateIndexResponse) - -DatastoreService_3 = _reflection.GeneratedProtocolMessageType('DatastoreService_3', (_message.Message,), { - 'DESCRIPTOR' : _DATASTORESERVICE_3, - '__module__' : 'google.appengine.datastore.datastore_v3_bytes_pb2' - - }) -_sym_db.RegisterMessage(DatastoreService_3) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n3google/appengine/datastore/datastore_v3_bytes.proto\x12\x1d\x61pphosting_datastore_v3_bytes\x1a\'google/appengine/datastore/action.proto\x1a-google/appengine/datastore/entity_bytes.proto\x1a)google/appengine/datastore/snapshot.proto\"\xa0\x01\n\x0bTransaction\x12\x0e\n\x06handle\x18\x01 \x02(\x06\x12\x0b\n\x03\x61pp\x18\x02 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x06 \x01(\t\x12\x1b\n\x0cmark_changes\x18\x03 \x01(\x08:\x05\x66\x61lse\x12\x42\n\x0f\x63omposite_index\x18\x05 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\"\xe1\x0c\n\x05Query\x12\x0b\n\x03\x61pp\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18* \x01(\t\x12\x12\n\nname_space\x18\x1d \x01(\t\x12\x0c\n\x04kind\x18\x03 \x01(\t\x12\x36\n\x08\x61ncestor\x18\x11 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0f\n\x07shallow\x18+ \x01(\x08\x12;\n\x06\x66ilter\x18\x04 \x03(\n2+.apphosting_datastore_v3_bytes.Query.Filter\x12\x39\n\x05order\x18\t \x03(\n2*.apphosting_datastore_v3_bytes.Query.Order\x12\r\n\x05\x63ount\x18\x17 \x01(\x05\x12\x11\n\x06offset\x18\x0c \x01(\x05:\x01\x30\x12\r\n\x05limit\x18\x10 \x01(\x05\x12\x46\n\x0f\x63ompiled_cursor\x18\x1e \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12J\n\x13\x65nd_compiled_cursor\x18\x1f \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12\x42\n\x0f\x63omposite_index\x18\x13 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x18\n\tkeys_only\x18\x15 \x01(\x08:\x05\x66\x61lse\x12?\n\x0btransaction\x18\x16 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x13\n\x0b\x66\x61ilover_ms\x18\x1a \x01(\x03\x12\x0e\n\x06strong\x18 \x01(\x08\x12\x15\n\rproperty_name\x18! \x03(\t\x12\x1e\n\x16group_by_property_name\x18\" \x03(\t\x12\x10\n\x08\x64istinct\x18\x18 \x01(\x08\x12\x1d\n\x15min_safe_time_seconds\x18# \x01(\x03\x12\x19\n\x11safe_replica_name\x18$ \x03(\t\x12\x18\n\x0cread_time_us\x18, \x01(\x03\x42\x02\x18\x01\x12\x1e\n\x16read_time_epoch_micros\x18- \x01(\x03\x12;\n\x04hint\x18\x12 \x01(\x0e\x32).apphosting_datastore_v3_bytes.Query.HintB\x02\x18\x01\x12\x18\n\x0csearch_query\x18\x08 \x01(\tB\x02\x18\x01\x12\'\n\x14require_perfect_plan\x18\x14 \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12\x1a\n\x07\x63ompile\x18\x19 \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12 \n\x0epersist_offset\x18% \x01(\x08:\x04trueB\x02\x18\x01\x1a\xf3\x02\n\x06\x46ilter\x12@\n\x02op\x18\x06 \x02(\x0e\x32\x34.apphosting_datastore_v3_bytes.Query.Filter.Operator\x12\x35\n\x08property\x18\x0e \x03(\x0b\x32#.storage_onestore_v3_bytes.Property\x12<\n\ngeo_region\x18( \x01(\x0b\x32(.apphosting_datastore_v3_bytes.GeoRegion\"\xb1\x01\n\x08Operator\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x04\x12\t\n\x05\x45QUAL\x10\x05\x12\x06\n\x02IN\x10\x06\x12\n\n\x06\x45XISTS\x10\x07\x12\x17\n\x13\x43ONTAINED_IN_REGION\x10\x08\x12\r\n\tNOT_EQUAL\x10\t\x12\n\n\x06NOT_IN\x10\n\x1a\x99\x01\n\x05Order\x12\x10\n\x08property\x18\n \x02(\t\x12R\n\tdirection\x18\x0b \x01(\x0e\x32\x34.apphosting_datastore_v3_bytes.Query.Order.Direction:\tASCENDING\"*\n\tDirection\x12\r\n\tASCENDING\x10\x01\x12\x0e\n\nDESCENDING\x10\x02\"=\n\x04Hint\x12\x0f\n\x0bORDER_FIRST\x10\x01\x12\x12\n\x0e\x41NCESTOR_FIRST\x10\x02\x12\x10\n\x0c\x46ILTER_FIRST\x10\x03\"2\n\x0bRegionPoint\x12\x10\n\x08latitude\x18\x01 \x02(\x01\x12\x11\n\tlongitude\x18\x02 \x02(\x01\"a\n\x0c\x43ircleRegion\x12:\n\x06\x63\x65nter\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.RegionPoint\x12\x15\n\rradius_meters\x18\x02 \x02(\x01\"\x8f\x01\n\x0fRectangleRegion\x12=\n\tsouthwest\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.RegionPoint\x12=\n\tnortheast\x18\x02 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.RegionPoint\"\x8b\x01\n\tGeoRegion\x12;\n\x06\x63ircle\x18\x01 \x01(\x0b\x32+.apphosting_datastore_v3_bytes.CircleRegion\x12\x41\n\trectangle\x18\x02 \x01(\x0b\x32..apphosting_datastore_v3_bytes.RectangleRegion\"\xec\x06\n\rCompiledQuery\x12M\n\x0bprimaryscan\x18\x01 \x02(\n28.apphosting_datastore_v3_bytes.CompiledQuery.PrimaryScan\x12Q\n\rmergejoinscan\x18\x07 \x03(\n2:.apphosting_datastore_v3_bytes.CompiledQuery.MergeJoinScan\x12\x33\n\tindex_def\x18\x15 \x01(\x0b\x32 .storage_onestore_v3_bytes.Index\x12\x11\n\x06offset\x18\n \x01(\x05:\x01\x30\x12\r\n\x05limit\x18\x0b \x01(\x05\x12\x11\n\tkeys_only\x18\x0c \x02(\x08\x12\x15\n\rproperty_name\x18\x18 \x03(\t\x12\x1b\n\x13\x64istinct_infix_size\x18\x19 \x01(\x05\x12\x17\n\x0fkey_path_length\x18\x1b \x01(\x05\x12O\n\x0c\x65ntityfilter\x18\r \x01(\n29.apphosting_datastore_v3_bytes.CompiledQuery.EntityFilter\x12\x12\n\nplan_label\x18\x1a \x01(\t\x1a\xd5\x01\n\x0bPrimaryScan\x12\x12\n\nindex_name\x18\x02 \x01(\t\x12\x11\n\tstart_key\x18\x03 \x01(\x0c\x12\x17\n\x0fstart_inclusive\x18\x04 \x01(\x08\x12\x0f\n\x07\x65nd_key\x18\x05 \x01(\x0c\x12\x15\n\rend_inclusive\x18\x06 \x01(\x08\x12\x1b\n\x13start_postfix_value\x18\x16 \x03(\x0c\x12\x19\n\x11\x65nd_postfix_value\x18\x17 \x03(\x0c\x12&\n\x1e\x65nd_unapplied_log_timestamp_us\x18\x13 \x01(\x03\x1aV\n\rMergeJoinScan\x12\x12\n\nindex_name\x18\x08 \x02(\t\x12\x14\n\x0cprefix_value\x18\t \x03(\x0c\x12\x1b\n\x0cvalue_prefix\x18\x14 \x01(\x08:\x05\x66\x61lse\x1am\n\x0c\x45ntityFilter\x12\x17\n\x08\x64istinct\x18\x0e \x01(\x08:\x05\x66\x61lse\x12\x0c\n\x04kind\x18\x11 \x01(\t\x12\x36\n\x08\x61ncestor\x18\x12 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\"\xbe\x04\n\x0e\x43ompiledCursor\x12L\n\x08position\x18\x02 \x01(\n26.apphosting_datastore_v3_bytes.CompiledCursor.PositionB\x02\x18\x01\x12\x41\n\x10postfix_position\x18\x01 \x01(\x0b\x32\'.storage_onestore_v3_bytes.IndexPostfix\x12\x43\n\x11\x61\x62solute_position\x18\x03 \x01(\x0b\x32(.storage_onestore_v3_bytes.IndexPosition\x1a\xd5\x02\n\x08Position\x12\x15\n\tstart_key\x18\x1b \x01(\x0c\x42\x02\x18\x01\x12Y\n\nindexvalue\x18\x1d \x03(\n2A.apphosting_datastore_v3_bytes.CompiledCursor.Position.IndexValueB\x02\x18\x01\x12\x35\n\x03key\x18 \x01(\x0b\x32$.storage_onestore_v3_bytes.ReferenceB\x02\x18\x01\x12!\n\x0fstart_inclusive\x18\x1c \x01(\x08:\x04trueB\x02\x18\x01\x12\x1c\n\x10\x62\x65\x66ore_ascending\x18! \x01(\x08\x42\x02\x18\x01\x1a_\n\nIndexValue\x12\x14\n\x08property\x18\x1e \x01(\tB\x02\x18\x01\x12;\n\x05value\x18\x1f \x02(\x0b\x32(.storage_onestore_v3_bytes.PropertyValueB\x02\x18\x01\":\n\x06\x43ursor\x12\x0e\n\x06\x63ursor\x18\x01 \x02(\x06\x12\x0b\n\x03\x61pp\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x03 \x01(\t\"\x9f\x03\n\x05\x45rror\"\x95\x03\n\tErrorCode\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10\x01\x12\x1a\n\x16\x43ONCURRENT_TRANSACTION\x10\x02\x12\x12\n\x0eINTERNAL_ERROR\x10\x03\x12\x0e\n\nNEED_INDEX\x10\x04\x12\x0b\n\x07TIMEOUT\x10\x05\x12\x15\n\x11PERMISSION_DENIED\x10\x06\x12\x12\n\x0e\x42IGTABLE_ERROR\x10\x07\x12 \n\x1c\x43OMMITTED_BUT_STILL_APPLYING\x10\x08\x12\x17\n\x13\x43\x41PABILITY_DISABLED\x10\t\x12\x19\n\x15TRY_ALTERNATE_BACKEND\x10\n\x12\x15\n\x11SAFE_TIME_TOO_OLD\x10\x0b\x12\x16\n\x12RESOURCE_EXHAUSTED\x10\x0c\x12\x1c\n\x18SNAPSHOT_VERSION_TOO_OLD\x10\x12\x12\r\n\tNOT_FOUND\x10\r\x12\x12\n\x0e\x41LREADY_EXISTS\x10\x0e\x12\x17\n\x13\x46\x41ILED_PRECONDITION\x10\x0f\x12\x13\n\x0fUNAUTHENTICATED\x10\x10\x12\x0b\n\x07\x41\x42ORTED\x10\x11\"\xbd\x02\n\x04\x43ost\x12\x14\n\x0cindex_writes\x18\x01 \x01(\x05\x12\x19\n\x11index_write_bytes\x18\x02 \x01(\x05\x12\x15\n\rentity_writes\x18\x03 \x01(\x05\x12\x1a\n\x12\x65ntity_write_bytes\x18\x04 \x01(\x05\x12\x42\n\ncommitcost\x18\x05 \x01(\n2..apphosting_datastore_v3_bytes.Cost.CommitCost\x12!\n\x19\x61pproximate_storage_delta\x18\x08 \x01(\x05\x12\x1b\n\x13id_sequence_updates\x18\t \x01(\x05\x1aM\n\nCommitCost\x12\x1d\n\x15requested_entity_puts\x18\x06 \x01(\x05\x12 \n\x18requested_entity_deletes\x18\x07 \x01(\x05\"\xe8\x01\n\nGetRequest\x12\x31\n\x03key\x18\x01 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12?\n\x0btransaction\x18\x02 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x0e\n\x06strong\x18\x04 \x01(\x08\x12\x1d\n\x0e\x61llow_deferred\x18\x05 \x01(\x08:\x05\x66\x61lse\x12\x1e\n\x16read_time_epoch_micros\x18\x06 \x01(\x03\x12\x17\n\x0b\x66\x61ilover_ms\x18\x03 \x01(\x03\x42\x02\x18\x01\"\xe9\x02\n\x0bGetResponse\x12\x41\n\x06\x65ntity\x18\x01 \x03(\n21.apphosting_datastore_v3_bytes.GetResponse.Entity\x12\x36\n\x08\x64\x65\x66\x65rred\x18\x05 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x16\n\x08in_order\x18\x06 \x01(\x08:\x04true\x12\x1e\n\x16read_time_epoch_micros\x18\x07 \x01(\x03\x1a\xa6\x01\n\x06\x45ntity\x12\x36\n\x06\x65ntity\x18\x02 \x01(\x0b\x32&.storage_onestore_v3_bytes.EntityProto\x12\x31\n\x03key\x18\x04 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0f\n\x07version\x18\x03 \x01(\x03\x12 \n\x18update_time_epoch_micros\x18\x08 \x01(\x03\"\xe4\x03\n\nPutRequest\x12\x36\n\x06\x65ntity\x18\x01 \x03(\x0b\x32&.storage_onestore_v3_bytes.EntityProto\x12?\n\x0btransaction\x18\x02 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x42\n\x0f\x63omposite_index\x18\x03 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x16\n\x07trusted\x18\x04 \x01(\x08:\x05\x66\x61lse\x12\x14\n\x05\x66orce\x18\x07 \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0cmark_changes\x18\x08 \x01(\x08:\x05\x66\x61lse\x12/\n\x08snapshot\x18\t \x03(\x0b\x32\x1d.storage_onestore_v3.Snapshot\x12W\n\x0e\x61uto_id_policy\x18\n \x01(\x0e\x32\x36.apphosting_datastore_v3_bytes.PutRequest.AutoIdPolicy:\x07\x43URRENT\x12\x17\n\x0fsequence_number\x18\x0c \x01(\x03\"+\n\x0c\x41utoIdPolicy\x12\x0b\n\x07\x43URRENT\x10\x00\x12\x0e\n\nSEQUENTIAL\x10\x01\"\xa6\x01\n\x0bPutResponse\x12\x31\n\x03key\x18\x01 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x31\n\x04\x63ost\x18\x02 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\x12\x0f\n\x07version\x18\x03 \x03(\x03\x12 \n\x18update_time_epoch_micros\x18\x04 \x03(\x03\"\xcc\x01\n\x0cTouchRequest\x12\x31\n\x03key\x18\x01 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x42\n\x0f\x63omposite_index\x18\x02 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x14\n\x05\x66orce\x18\x03 \x01(\x08:\x05\x66\x61lse\x12/\n\x08snapshot\x18\t \x03(\x0b\x32\x1d.storage_onestore_v3.Snapshot\"B\n\rTouchResponse\x12\x31\n\x04\x63ost\x18\x01 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\"\xdc\x02\n\rDeleteRequest\x12\x31\n\x03key\x18\x06 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12?\n\x0btransaction\x18\x05 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12\x42\n\x0f\x63omposite_index\x18\x0b \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x16\n\x07trusted\x18\x04 \x01(\x08:\x05\x66\x61lse\x12\x14\n\x05\x66orce\x18\x07 \x01(\x08:\x05\x66\x61lse\x12\x1b\n\x0cmark_changes\x18\x08 \x01(\x08:\x05\x66\x61lse\x12/\n\x08snapshot\x18\t \x03(\x0b\x32\x1d.storage_onestore_v3.Snapshot\x12\x17\n\x0fsequence_number\x18\x0c \x01(\x03\"v\n\x0e\x44\x65leteResponse\x12\x31\n\x04\x63ost\x18\x01 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\x12\x0f\n\x07version\x18\x03 \x03(\x03\x12 \n\x18\x64\x65lete_time_epoch_micros\x18\x04 \x03(\x03\"\x82\x01\n\x0bNextRequest\x12\x35\n\x06\x63ursor\x18\x01 \x02(\x0b\x32%.apphosting_datastore_v3_bytes.Cursor\x12\r\n\x05\x63ount\x18\x02 \x01(\x05\x12\x15\n\x06offset\x18\x04 \x01(\x05:\x01\x30\x42\x02\x18\x01\x12\x16\n\x07\x63ompile\x18\x03 \x01(\x08:\x05\x66\x61lse\"\xa7\x05\n\x0bQueryResult\x12\x35\n\x06\x63ursor\x18\x01 \x01(\x0b\x32%.apphosting_datastore_v3_bytes.Cursor\x12\x36\n\x06result\x18\x02 \x03(\x0b\x32&.storage_onestore_v3_bytes.EntityProto\x12\x17\n\x0fskipped_results\x18\x07 \x01(\x05\x12\x14\n\x0cmore_results\x18\x03 \x02(\x08\x12\x11\n\tkeys_only\x18\x04 \x01(\x08\x12\x12\n\nindex_only\x18\t \x01(\x08\x12\x11\n\tsmall_ops\x18\n \x01(\x08\x12\x44\n\x0e\x63ompiled_query\x18\x05 \x01(\x0b\x32,.apphosting_datastore_v3_bytes.CompiledQuery\x12\x46\n\x0f\x63ompiled_cursor\x18\x06 \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12\x38\n\x05index\x18\x08 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\x12\x0f\n\x07version\x18\x0b \x03(\x03\x12 \n\x18update_time_epoch_micros\x18\x0f \x03(\x03\x12\x1e\n\x16read_time_epoch_micros\x18\x0e \x01(\x03\x12M\n\x16result_compiled_cursor\x18\x0c \x03(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\x12V\n\x1fskipped_results_compiled_cursor\x18\r \x01(\x0b\x32-.apphosting_datastore_v3_bytes.CompiledCursor\"\xb7\x01\n\x12\x41llocateIdsRequest\x12\x37\n\tmodel_key\x18\x01 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0c\n\x04size\x18\x02 \x01(\x03\x12\x0b\n\x03max\x18\x03 \x01(\x03\x12\x35\n\x07reserve\x18\x05 \x03(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x16\n\x07trusted\x18\x06 \x01(\x08:\x05\x66\x61lse\"d\n\x13\x41llocateIdsResponse\x12\r\n\x05start\x18\x01 \x02(\x03\x12\x0b\n\x03\x65nd\x18\x02 \x02(\x03\x12\x31\n\x04\x63ost\x18\x03 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\"L\n\x10\x43ompositeIndices\x12\x38\n\x05index\x18\x01 \x03(\x0b\x32).storage_onestore_v3_bytes.CompositeIndex\"\x81\x01\n\x11\x41\x64\x64\x41\x63tionsRequest\x12?\n\x0btransaction\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\x12+\n\x06\x61\x63tion\x18\x02 \x03(\x0b\x32\x1b.storage_onestore_v3.Action\"\x14\n\x12\x41\x64\x64\x41\x63tionsResponse\"\xc5\x02\n\x17\x42\x65ginTransactionRequest\x12\x0b\n\x03\x61pp\x18\x01 \x02(\t\x12 \n\x11\x61llow_multiple_eg\x18\x02 \x01(\x08:\x05\x66\x61lse\x12\x13\n\x0b\x64\x61tabase_id\x18\x04 \x01(\t\x12]\n\x04mode\x18\x05 \x01(\x0e\x32\x46.apphosting_datastore_v3_bytes.BeginTransactionRequest.TransactionMode:\x07UNKNOWN\x12H\n\x14previous_transaction\x18\x07 \x01(\x0b\x32*.apphosting_datastore_v3_bytes.Transaction\"=\n\x0fTransactionMode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tREAD_ONLY\x10\x01\x12\x0e\n\nREAD_WRITE\x10\x02\"\xaa\x02\n\x0e\x43ommitResponse\x12\x31\n\x04\x63ost\x18\x01 \x01(\x0b\x32#.apphosting_datastore_v3_bytes.Cost\x12 \n\x18\x63ommit_time_epoch_micros\x18\x07 \x01(\x03\x12\x46\n\x07version\x18\x03 \x03(\n25.apphosting_datastore_v3_bytes.CommitResponse.Version\x1a{\n\x07Version\x12=\n\x0froot_entity_key\x18\x04 \x02(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0f\n\x07version\x18\x05 \x02(\x03\x12 \n\x18update_time_epoch_micros\x18\x06 \x01(\x03\"8\n\x11GetIndicesRequest\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x02 \x01(\t\"6\n\x13UpdateIndexResponse\x12\x10\n\x08type_url\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x0c\"\x86\x02\n\x12\x44\x61tastoreService_3\"\xef\x01\n\x06Method\x12\x07\n\x03Get\x10\x01\x12\x07\n\x03Put\x10\x02\x12\t\n\x05Touch\x10\x03\x12\n\n\x06\x44\x65lete\x10\x04\x12\x0c\n\x08RunQuery\x10\x05\x12\x0e\n\nAddActions\x10\x06\x12\x08\n\x04Next\x10\x07\x12\x10\n\x0c\x44\x65leteCursor\x10\x08\x12\x14\n\x10\x42\x65ginTransaction\x10\t\x12\n\n\x06\x43ommit\x10\n\x12\x0c\n\x08Rollback\x10\x0b\x12\x0f\n\x0b\x41llocateIds\x10\x0c\x12\x0f\n\x0b\x43reateIndex\x10\r\x12\x0f\n\x0bUpdateIndex\x10\x0e\x12\x0e\n\nGetIndices\x10\x0f\x12\x0f\n\x0b\x44\x65leteIndex\x10\x10\x42\x36\n%com.google.google.appengine.datastoreB\rDatastoreV3Pb') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.datastore.datastore_v3_bytes_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None @@ -414,6 +68,8 @@ _COMPILEDCURSOR_POSITION.fields_by_name['before_ascending']._serialized_options = b'\030\001' _COMPILEDCURSOR.fields_by_name['position']._options = None _COMPILEDCURSOR.fields_by_name['position']._serialized_options = b'\030\001' + _GETREQUEST.fields_by_name['failover_ms']._options = None + _GETREQUEST.fields_by_name['failover_ms']._serialized_options = b'\030\001' _NEXTREQUEST.fields_by_name['offset']._options = None _NEXTREQUEST.fields_by_name['offset']._serialized_options = b'\030\001' _TRANSACTION._serialized_start=218 @@ -463,53 +119,53 @@ _COST_COMMITCOST._serialized_start=4630 _COST_COMMITCOST._serialized_end=4707 _GETREQUEST._serialized_start=4710 - _GETREQUEST._serialized_end=4938 - _GETRESPONSE._serialized_start=4941 - _GETRESPONSE._serialized_end=5302 - _GETRESPONSE_ENTITY._serialized_start=5136 - _GETRESPONSE_ENTITY._serialized_end=5302 - _PUTREQUEST._serialized_start=5305 - _PUTREQUEST._serialized_end=5789 - _PUTREQUEST_AUTOIDPOLICY._serialized_start=5746 - _PUTREQUEST_AUTOIDPOLICY._serialized_end=5789 - _PUTRESPONSE._serialized_start=5792 - _PUTRESPONSE._serialized_end=5958 - _TOUCHREQUEST._serialized_start=5961 - _TOUCHREQUEST._serialized_end=6165 - _TOUCHRESPONSE._serialized_start=6167 - _TOUCHRESPONSE._serialized_end=6233 - _DELETEREQUEST._serialized_start=6236 - _DELETEREQUEST._serialized_end=6584 - _DELETERESPONSE._serialized_start=6586 - _DELETERESPONSE._serialized_end=6704 - _NEXTREQUEST._serialized_start=6707 - _NEXTREQUEST._serialized_end=6837 - _QUERYRESULT._serialized_start=6840 - _QUERYRESULT._serialized_end=7519 - _ALLOCATEIDSREQUEST._serialized_start=7522 - _ALLOCATEIDSREQUEST._serialized_end=7705 - _ALLOCATEIDSRESPONSE._serialized_start=7707 - _ALLOCATEIDSRESPONSE._serialized_end=7807 - _COMPOSITEINDICES._serialized_start=7809 - _COMPOSITEINDICES._serialized_end=7885 - _ADDACTIONSREQUEST._serialized_start=7888 - _ADDACTIONSREQUEST._serialized_end=8017 - _ADDACTIONSRESPONSE._serialized_start=8019 - _ADDACTIONSRESPONSE._serialized_end=8039 - _BEGINTRANSACTIONREQUEST._serialized_start=8042 - _BEGINTRANSACTIONREQUEST._serialized_end=8367 - _BEGINTRANSACTIONREQUEST_TRANSACTIONMODE._serialized_start=8306 - _BEGINTRANSACTIONREQUEST_TRANSACTIONMODE._serialized_end=8367 - _COMMITRESPONSE._serialized_start=8370 - _COMMITRESPONSE._serialized_end=8668 - _COMMITRESPONSE_VERSION._serialized_start=8545 - _COMMITRESPONSE_VERSION._serialized_end=8668 - _GETINDICESREQUEST._serialized_start=8670 - _GETINDICESREQUEST._serialized_end=8726 - _UPDATEINDEXRESPONSE._serialized_start=8728 - _UPDATEINDEXRESPONSE._serialized_end=8782 - _DATASTORESERVICE_3._serialized_start=8785 - _DATASTORESERVICE_3._serialized_end=9047 - _DATASTORESERVICE_3_METHOD._serialized_start=8808 - _DATASTORESERVICE_3_METHOD._serialized_end=9047 + _GETREQUEST._serialized_end=4942 + _GETRESPONSE._serialized_start=4945 + _GETRESPONSE._serialized_end=5306 + _GETRESPONSE_ENTITY._serialized_start=5140 + _GETRESPONSE_ENTITY._serialized_end=5306 + _PUTREQUEST._serialized_start=5309 + _PUTREQUEST._serialized_end=5793 + _PUTREQUEST_AUTOIDPOLICY._serialized_start=5750 + _PUTREQUEST_AUTOIDPOLICY._serialized_end=5793 + _PUTRESPONSE._serialized_start=5796 + _PUTRESPONSE._serialized_end=5962 + _TOUCHREQUEST._serialized_start=5965 + _TOUCHREQUEST._serialized_end=6169 + _TOUCHRESPONSE._serialized_start=6171 + _TOUCHRESPONSE._serialized_end=6237 + _DELETEREQUEST._serialized_start=6240 + _DELETEREQUEST._serialized_end=6588 + _DELETERESPONSE._serialized_start=6590 + _DELETERESPONSE._serialized_end=6708 + _NEXTREQUEST._serialized_start=6711 + _NEXTREQUEST._serialized_end=6841 + _QUERYRESULT._serialized_start=6844 + _QUERYRESULT._serialized_end=7523 + _ALLOCATEIDSREQUEST._serialized_start=7526 + _ALLOCATEIDSREQUEST._serialized_end=7709 + _ALLOCATEIDSRESPONSE._serialized_start=7711 + _ALLOCATEIDSRESPONSE._serialized_end=7811 + _COMPOSITEINDICES._serialized_start=7813 + _COMPOSITEINDICES._serialized_end=7889 + _ADDACTIONSREQUEST._serialized_start=7892 + _ADDACTIONSREQUEST._serialized_end=8021 + _ADDACTIONSRESPONSE._serialized_start=8023 + _ADDACTIONSRESPONSE._serialized_end=8043 + _BEGINTRANSACTIONREQUEST._serialized_start=8046 + _BEGINTRANSACTIONREQUEST._serialized_end=8371 + _BEGINTRANSACTIONREQUEST_TRANSACTIONMODE._serialized_start=8310 + _BEGINTRANSACTIONREQUEST_TRANSACTIONMODE._serialized_end=8371 + _COMMITRESPONSE._serialized_start=8374 + _COMMITRESPONSE._serialized_end=8672 + _COMMITRESPONSE_VERSION._serialized_start=8549 + _COMMITRESPONSE_VERSION._serialized_end=8672 + _GETINDICESREQUEST._serialized_start=8674 + _GETINDICESREQUEST._serialized_end=8730 + _UPDATEINDEXRESPONSE._serialized_start=8732 + _UPDATEINDEXRESPONSE._serialized_end=8786 + _DATASTORESERVICE_3._serialized_start=8789 + _DATASTORESERVICE_3._serialized_end=9051 + _DATASTORESERVICE_3_METHOD._serialized_start=8812 + _DATASTORESERVICE_3_METHOD._serialized_end=9051 diff --git a/src/google/appengine/datastore/datastore_v4_pb2.py b/src/google/appengine/datastore/datastore_v4_pb2.py index da73f8e..196f8f9 100755 --- a/src/google/appengine/datastore/datastore_v4_pb2.py +++ b/src/google/appengine/datastore/datastore_v4_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -33,274 +32,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n-google/appengine/datastore/datastore_v4.proto\x12\x1dgoogle.appengine.datastore.v4\x1a*google/appengine/datastore/entity_v4.proto\"\x9f\x03\n\x05\x45rror\"\x95\x03\n\tErrorCode\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10\x01\x12\x1a\n\x16\x43ONCURRENT_TRANSACTION\x10\x02\x12\x12\n\x0eINTERNAL_ERROR\x10\x03\x12\x0e\n\nNEED_INDEX\x10\x04\x12\x0b\n\x07TIMEOUT\x10\x05\x12\x15\n\x11PERMISSION_DENIED\x10\x06\x12\x12\n\x0e\x42IGTABLE_ERROR\x10\x07\x12 \n\x1c\x43OMMITTED_BUT_STILL_APPLYING\x10\x08\x12\x17\n\x13\x43\x41PABILITY_DISABLED\x10\t\x12\x19\n\x15TRY_ALTERNATE_BACKEND\x10\n\x12\x15\n\x11SAFE_TIME_TOO_OLD\x10\x0b\x12\x16\n\x12RESOURCE_EXHAUSTED\x10\x0c\x12\x1c\n\x18SNAPSHOT_VERSION_TOO_OLD\x10\x12\x12\r\n\tNOT_FOUND\x10\r\x12\x12\n\x0e\x41LREADY_EXISTS\x10\x0e\x12\x17\n\x13\x46\x41ILED_PRECONDITION\x10\x0f\x12\x13\n\x0fUNAUTHENTICATED\x10\x10\x12\x0b\n\x07\x41\x42ORTED\x10\x11\"\x9c\x01\n\x0c\x45ntityResult\x12\x35\n\x06\x65ntity\x18\x01 \x02(\x0b\x32%.google.appengine.datastore.v4.Entity\x12\x0f\n\x07version\x18\x02 \x01(\x03\x12\x0e\n\x06\x63ursor\x18\x03 \x01(\x0c\"4\n\nResultType\x12\x08\n\x04\x46ULL\x10\x01\x12\x0e\n\nPROJECTION\x10\x02\x12\x0c\n\x08KEY_ONLY\x10\x03\"\x8f\x03\n\x05Query\x12\x45\n\nprojection\x18\x02 \x03(\x0b\x32\x31.google.appengine.datastore.v4.PropertyExpression\x12;\n\x04kind\x18\x03 \x03(\x0b\x32-.google.appengine.datastore.v4.KindExpression\x12\x35\n\x06\x66ilter\x18\x04 \x01(\x0b\x32%.google.appengine.datastore.v4.Filter\x12;\n\x05order\x18\x05 \x03(\x0b\x32,.google.appengine.datastore.v4.PropertyOrder\x12\x42\n\x08group_by\x18\x06 \x03(\x0b\x32\x30.google.appengine.datastore.v4.PropertyReference\x12\x14\n\x0cstart_cursor\x18\x07 \x01(\x0c\x12\x12\n\nend_cursor\x18\x08 \x01(\x0c\x12\x11\n\x06offset\x18\n \x01(\x05:\x01\x30\x12\r\n\x05limit\x18\x0b \x01(\x05\"\x1e\n\x0eKindExpression\x12\x0c\n\x04name\x18\x01 \x02(\t\"!\n\x11PropertyReference\x12\x0c\n\x04name\x18\x02 \x02(\t\"\xdf\x01\n\x12PropertyExpression\x12\x42\n\x08property\x18\x01 \x02(\x0b\x32\x30.google.appengine.datastore.v4.PropertyReference\x12\x63\n\x14\x61ggregation_function\x18\x02 \x01(\x0e\x32\x45.google.appengine.datastore.v4.PropertyExpression.AggregationFunction\" \n\x13\x41ggregationFunction\x12\t\n\x05\x46IRST\x10\x01\"\xd5\x01\n\rPropertyOrder\x12\x42\n\x08property\x18\x01 \x02(\x0b\x32\x30.google.appengine.datastore.v4.PropertyReference\x12T\n\tdirection\x18\x02 \x01(\x0e\x32\x36.google.appengine.datastore.v4.PropertyOrder.Direction:\tASCENDING\"*\n\tDirection\x12\r\n\tASCENDING\x10\x01\x12\x0e\n\nDESCENDING\x10\x02\"\x9a\x01\n\x06\x46ilter\x12H\n\x10\x63omposite_filter\x18\x01 \x01(\x0b\x32..google.appengine.datastore.v4.CompositeFilter\x12\x46\n\x0fproperty_filter\x18\x02 \x01(\x0b\x32-.google.appengine.datastore.v4.PropertyFilter\"\xa8\x01\n\x0f\x43ompositeFilter\x12I\n\x08operator\x18\x01 \x02(\x0e\x32\x37.google.appengine.datastore.v4.CompositeFilter.Operator\x12\x35\n\x06\x66ilter\x18\x02 \x03(\x0b\x32%.google.appengine.datastore.v4.Filter\"\x13\n\x08Operator\x12\x07\n\x03\x41ND\x10\x01\"\xd0\x02\n\x0ePropertyFilter\x12\x42\n\x08property\x18\x01 \x02(\x0b\x32\x30.google.appengine.datastore.v4.PropertyReference\x12H\n\x08operator\x18\x02 \x02(\x0e\x32\x36.google.appengine.datastore.v4.PropertyFilter.Operator\x12\x33\n\x05value\x18\x03 \x02(\x0b\x32$.google.appengine.datastore.v4.Value\"{\n\x08Operator\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x04\x12\t\n\x05\x45QUAL\x10\x05\x12\x10\n\x0cHAS_ANCESTOR\x10\x0b\"\xbc\x01\n\x08GqlQuery\x12\x14\n\x0cquery_string\x18\x01 \x02(\t\x12\x1c\n\rallow_literal\x18\x02 \x01(\x08:\x05\x66\x61lse\x12<\n\x08name_arg\x18\x03 \x03(\x0b\x32*.google.appengine.datastore.v4.GqlQueryArg\x12>\n\nnumber_arg\x18\x04 \x03(\x0b\x32*.google.appengine.datastore.v4.GqlQueryArg\"`\n\x0bGqlQueryArg\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x33\n\x05value\x18\x02 \x01(\x0b\x32$.google.appengine.datastore.v4.Value\x12\x0e\n\x06\x63ursor\x18\x03 \x01(\x0c\"\xbb\x03\n\x10QueryResultBatch\x12R\n\x12\x65ntity_result_type\x18\x01 \x02(\x0e\x32\x36.google.appengine.datastore.v4.EntityResult.ResultType\x12\x42\n\rentity_result\x18\x02 \x03(\x0b\x32+.google.appengine.datastore.v4.EntityResult\x12\x16\n\x0eskipped_cursor\x18\x03 \x01(\x0c\x12\x12\n\nend_cursor\x18\x04 \x01(\x0c\x12U\n\x0cmore_results\x18\x05 \x02(\x0e\x32?.google.appengine.datastore.v4.QueryResultBatch.MoreResultsType\x12\x1a\n\x0fskipped_results\x18\x06 \x01(\x05:\x01\x30\x12\x18\n\x10snapshot_version\x18\x07 \x01(\x03\"V\n\x0fMoreResultsType\x12\x10\n\x0cNOT_FINISHED\x10\x01\x12\x1c\n\x18MORE_RESULTS_AFTER_LIMIT\x10\x02\x12\x13\n\x0fNO_MORE_RESULTS\x10\x03\"\x84\x02\n\x08Mutation\x12\x46\n\x02op\x18\x01 \x01(\x0e\x32\x31.google.appengine.datastore.v4.Mutation.Operation:\x07UNKNOWN\x12/\n\x03key\x18\x02 \x01(\x0b\x32\".google.appengine.datastore.v4.Key\x12\x35\n\x06\x65ntity\x18\x03 \x01(\x0b\x32%.google.appengine.datastore.v4.Entity\"H\n\tOperation\x12\x0b\n\x07UNKNOWN\x10\x00\x12\n\n\x06INSERT\x10\x01\x12\n\n\x06UPDATE\x10\x02\x12\n\n\x06UPSERT\x10\x03\x12\n\n\x06\x44\x45LETE\x10\x04\"Y\n\x0eMutationResult\x12/\n\x03key\x18\x03 \x01(\x0b\x32\".google.appengine.datastore.v4.Key\x12\x16\n\x0bnew_version\x18\x04 \x01(\x03:\x01\x30\"\xbb\x02\n\x12\x44\x65precatedMutation\x12\x35\n\x06upsert\x18\x01 \x03(\x0b\x32%.google.appengine.datastore.v4.Entity\x12\x35\n\x06update\x18\x02 \x03(\x0b\x32%.google.appengine.datastore.v4.Entity\x12\x35\n\x06insert\x18\x03 \x03(\x0b\x32%.google.appengine.datastore.v4.Entity\x12=\n\x0einsert_auto_id\x18\x04 \x03(\x0b\x32%.google.appengine.datastore.v4.Entity\x12\x32\n\x06\x64\x65lete\x18\x05 \x03(\x0b\x32\".google.appengine.datastore.v4.Key\x12\r\n\x05\x66orce\x18\x06 \x01(\x08\"\xf1\x01\n\x18\x44\x65precatedMutationResult\x12\x15\n\rindex_updates\x18\x01 \x02(\x05\x12>\n\x12insert_auto_id_key\x18\x02 \x03(\x0b\x32\".google.appengine.datastore.v4.Key\x12\x16\n\x0eupsert_version\x18\x03 \x03(\x03\x12\x16\n\x0eupdate_version\x18\x04 \x03(\x03\x12\x16\n\x0einsert_version\x18\x05 \x03(\x03\x12\x1e\n\x16insert_auto_id_version\x18\x06 \x03(\x03\x12\x16\n\x0e\x64\x65lete_version\x18\x07 \x03(\x03\"\xbb\x01\n\x0bReadOptions\x12]\n\x10read_consistency\x18\x01 \x01(\x0e\x32:.google.appengine.datastore.v4.ReadOptions.ReadConsistency:\x07\x44\x45\x46\x41ULT\x12\x13\n\x0btransaction\x18\x02 \x01(\x0c\"8\n\x0fReadConsistency\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\n\n\x06STRONG\x10\x01\x12\x0c\n\x08\x45VENTUAL\x10\x02\"\x82\x01\n\rLookupRequest\x12@\n\x0cread_options\x18\x01 \x01(\x0b\x32*.google.appengine.datastore.v4.ReadOptions\x12/\n\x03key\x18\x03 \x03(\x0b\x32\".google.appengine.datastore.v4.Key\"\xc0\x01\n\x0eLookupResponse\x12:\n\x05\x66ound\x18\x01 \x03(\x0b\x32+.google.appengine.datastore.v4.EntityResult\x12<\n\x07missing\x18\x02 \x03(\x0b\x32+.google.appengine.datastore.v4.EntityResult\x12\x34\n\x08\x64\x65\x66\x65rred\x18\x03 \x03(\x0b\x32\".google.appengine.datastore.v4.Key\"\xc3\x02\n\x0fRunQueryRequest\x12@\n\x0cread_options\x18\x01 \x01(\x0b\x32*.google.appengine.datastore.v4.ReadOptions\x12@\n\x0cpartition_id\x18\x02 \x01(\x0b\x32*.google.appengine.datastore.v4.PartitionId\x12\x33\n\x05query\x18\x03 \x01(\x0b\x32$.google.appengine.datastore.v4.Query\x12:\n\tgql_query\x18\x07 \x01(\x0b\x32\'.google.appengine.datastore.v4.GqlQuery\x12\x1d\n\x15min_safe_time_seconds\x18\x04 \x01(\x03\x12\x1c\n\x14suggested_batch_size\x18\x05 \x01(\x05\"h\n\x10RunQueryResponse\x12>\n\x05\x62\x61tch\x18\x01 \x02(\x0b\x32/.google.appengine.datastore.v4.QueryResultBatch\x12\x14\n\x0cquery_handle\x18\x02 \x01(\x0c\",\n\x14\x43ontinueQueryRequest\x12\x14\n\x0cquery_handle\x18\x01 \x02(\x0c\"W\n\x15\x43ontinueQueryResponse\x12>\n\x05\x62\x61tch\x18\x01 \x02(\x0b\x32/.google.appengine.datastore.v4.QueryResultBatch\"S\n\x17\x42\x65ginTransactionRequest\x12\x1a\n\x0b\x63ross_group\x18\x01 \x01(\x08:\x05\x66\x61lse\x12\x1c\n\rcross_request\x18\x02 \x01(\x08:\x05\x66\x61lse\"/\n\x18\x42\x65ginTransactionResponse\x12\x13\n\x0btransaction\x18\x01 \x02(\x0c\"&\n\x0fRollbackRequest\x12\x13\n\x0btransaction\x18\x01 \x02(\x0c\"\x12\n\x10RollbackResponse\"\xd2\x02\n\rCommitRequest\x12\x13\n\x0btransaction\x18\x01 \x01(\x0c\x12\x39\n\x08mutation\x18\x05 \x03(\x0b\x32\'.google.appengine.datastore.v4.Mutation\x12N\n\x13\x64\x65precated_mutation\x18\x02 \x01(\x0b\x32\x31.google.appengine.datastore.v4.DeprecatedMutation\x12N\n\x04mode\x18\x04 \x01(\x0e\x32\x31.google.appengine.datastore.v4.CommitRequest.Mode:\rTRANSACTIONAL\x12\x1f\n\x10ignore_read_only\x18\x06 \x01(\x08:\x05\x66\x61lse\"0\n\x04Mode\x12\x11\n\rTRANSACTIONAL\x10\x01\x12\x15\n\x11NON_TRANSACTIONAL\x10\x02\"\xcc\x01\n\x0e\x43ommitResponse\x12\x46\n\x0fmutation_result\x18\x03 \x03(\x0b\x32-.google.appengine.datastore.v4.MutationResult\x12[\n\x1a\x64\x65precated_mutation_result\x18\x01 \x01(\x0b\x32\x37.google.appengine.datastore.v4.DeprecatedMutationResult\x12\x15\n\rindex_updates\x18\x04 \x01(\x05\"\x7f\n\x12\x41llocateIdsRequest\x12\x34\n\x08\x61llocate\x18\x01 \x03(\x0b\x32\".google.appengine.datastore.v4.Key\x12\x33\n\x07reserve\x18\x02 \x03(\x0b\x32\".google.appengine.datastore.v4.Key\"L\n\x13\x41llocateIdsResponse\x12\x35\n\tallocated\x18\x01 \x03(\x0b\x32\".google.appengine.datastore.v4.KeyB\'\n%com.google.google.appengine.datastore') - - -_ERROR = DESCRIPTOR.message_types_by_name['Error'] -_ENTITYRESULT = DESCRIPTOR.message_types_by_name['EntityResult'] -_QUERY = DESCRIPTOR.message_types_by_name['Query'] -_KINDEXPRESSION = DESCRIPTOR.message_types_by_name['KindExpression'] -_PROPERTYREFERENCE = DESCRIPTOR.message_types_by_name['PropertyReference'] -_PROPERTYEXPRESSION = DESCRIPTOR.message_types_by_name['PropertyExpression'] -_PROPERTYORDER = DESCRIPTOR.message_types_by_name['PropertyOrder'] -_FILTER = DESCRIPTOR.message_types_by_name['Filter'] -_COMPOSITEFILTER = DESCRIPTOR.message_types_by_name['CompositeFilter'] -_PROPERTYFILTER = DESCRIPTOR.message_types_by_name['PropertyFilter'] -_GQLQUERY = DESCRIPTOR.message_types_by_name['GqlQuery'] -_GQLQUERYARG = DESCRIPTOR.message_types_by_name['GqlQueryArg'] -_QUERYRESULTBATCH = DESCRIPTOR.message_types_by_name['QueryResultBatch'] -_MUTATION = DESCRIPTOR.message_types_by_name['Mutation'] -_MUTATIONRESULT = DESCRIPTOR.message_types_by_name['MutationResult'] -_DEPRECATEDMUTATION = DESCRIPTOR.message_types_by_name['DeprecatedMutation'] -_DEPRECATEDMUTATIONRESULT = DESCRIPTOR.message_types_by_name['DeprecatedMutationResult'] -_READOPTIONS = DESCRIPTOR.message_types_by_name['ReadOptions'] -_LOOKUPREQUEST = DESCRIPTOR.message_types_by_name['LookupRequest'] -_LOOKUPRESPONSE = DESCRIPTOR.message_types_by_name['LookupResponse'] -_RUNQUERYREQUEST = DESCRIPTOR.message_types_by_name['RunQueryRequest'] -_RUNQUERYRESPONSE = DESCRIPTOR.message_types_by_name['RunQueryResponse'] -_CONTINUEQUERYREQUEST = DESCRIPTOR.message_types_by_name['ContinueQueryRequest'] -_CONTINUEQUERYRESPONSE = DESCRIPTOR.message_types_by_name['ContinueQueryResponse'] -_BEGINTRANSACTIONREQUEST = DESCRIPTOR.message_types_by_name['BeginTransactionRequest'] -_BEGINTRANSACTIONRESPONSE = DESCRIPTOR.message_types_by_name['BeginTransactionResponse'] -_ROLLBACKREQUEST = DESCRIPTOR.message_types_by_name['RollbackRequest'] -_ROLLBACKRESPONSE = DESCRIPTOR.message_types_by_name['RollbackResponse'] -_COMMITREQUEST = DESCRIPTOR.message_types_by_name['CommitRequest'] -_COMMITRESPONSE = DESCRIPTOR.message_types_by_name['CommitResponse'] -_ALLOCATEIDSREQUEST = DESCRIPTOR.message_types_by_name['AllocateIdsRequest'] -_ALLOCATEIDSRESPONSE = DESCRIPTOR.message_types_by_name['AllocateIdsResponse'] -_ERROR_ERRORCODE = _ERROR.enum_types_by_name['ErrorCode'] -_ENTITYRESULT_RESULTTYPE = _ENTITYRESULT.enum_types_by_name['ResultType'] -_PROPERTYEXPRESSION_AGGREGATIONFUNCTION = _PROPERTYEXPRESSION.enum_types_by_name['AggregationFunction'] -_PROPERTYORDER_DIRECTION = _PROPERTYORDER.enum_types_by_name['Direction'] -_COMPOSITEFILTER_OPERATOR = _COMPOSITEFILTER.enum_types_by_name['Operator'] -_PROPERTYFILTER_OPERATOR = _PROPERTYFILTER.enum_types_by_name['Operator'] -_QUERYRESULTBATCH_MORERESULTSTYPE = _QUERYRESULTBATCH.enum_types_by_name['MoreResultsType'] -_MUTATION_OPERATION = _MUTATION.enum_types_by_name['Operation'] -_READOPTIONS_READCONSISTENCY = _READOPTIONS.enum_types_by_name['ReadConsistency'] -_COMMITREQUEST_MODE = _COMMITREQUEST.enum_types_by_name['Mode'] -Error = _reflection.GeneratedProtocolMessageType('Error', (_message.Message,), { - 'DESCRIPTOR' : _ERROR, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(Error) - -EntityResult = _reflection.GeneratedProtocolMessageType('EntityResult', (_message.Message,), { - 'DESCRIPTOR' : _ENTITYRESULT, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(EntityResult) - -Query = _reflection.GeneratedProtocolMessageType('Query', (_message.Message,), { - 'DESCRIPTOR' : _QUERY, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(Query) - -KindExpression = _reflection.GeneratedProtocolMessageType('KindExpression', (_message.Message,), { - 'DESCRIPTOR' : _KINDEXPRESSION, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(KindExpression) - -PropertyReference = _reflection.GeneratedProtocolMessageType('PropertyReference', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYREFERENCE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(PropertyReference) - -PropertyExpression = _reflection.GeneratedProtocolMessageType('PropertyExpression', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYEXPRESSION, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(PropertyExpression) - -PropertyOrder = _reflection.GeneratedProtocolMessageType('PropertyOrder', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYORDER, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(PropertyOrder) - -Filter = _reflection.GeneratedProtocolMessageType('Filter', (_message.Message,), { - 'DESCRIPTOR' : _FILTER, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(Filter) - -CompositeFilter = _reflection.GeneratedProtocolMessageType('CompositeFilter', (_message.Message,), { - 'DESCRIPTOR' : _COMPOSITEFILTER, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(CompositeFilter) - -PropertyFilter = _reflection.GeneratedProtocolMessageType('PropertyFilter', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYFILTER, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(PropertyFilter) - -GqlQuery = _reflection.GeneratedProtocolMessageType('GqlQuery', (_message.Message,), { - 'DESCRIPTOR' : _GQLQUERY, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(GqlQuery) - -GqlQueryArg = _reflection.GeneratedProtocolMessageType('GqlQueryArg', (_message.Message,), { - 'DESCRIPTOR' : _GQLQUERYARG, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(GqlQueryArg) - -QueryResultBatch = _reflection.GeneratedProtocolMessageType('QueryResultBatch', (_message.Message,), { - 'DESCRIPTOR' : _QUERYRESULTBATCH, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(QueryResultBatch) - -Mutation = _reflection.GeneratedProtocolMessageType('Mutation', (_message.Message,), { - 'DESCRIPTOR' : _MUTATION, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(Mutation) - -MutationResult = _reflection.GeneratedProtocolMessageType('MutationResult', (_message.Message,), { - 'DESCRIPTOR' : _MUTATIONRESULT, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(MutationResult) - -DeprecatedMutation = _reflection.GeneratedProtocolMessageType('DeprecatedMutation', (_message.Message,), { - 'DESCRIPTOR' : _DEPRECATEDMUTATION, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(DeprecatedMutation) - -DeprecatedMutationResult = _reflection.GeneratedProtocolMessageType('DeprecatedMutationResult', (_message.Message,), { - 'DESCRIPTOR' : _DEPRECATEDMUTATIONRESULT, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(DeprecatedMutationResult) - -ReadOptions = _reflection.GeneratedProtocolMessageType('ReadOptions', (_message.Message,), { - 'DESCRIPTOR' : _READOPTIONS, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(ReadOptions) - -LookupRequest = _reflection.GeneratedProtocolMessageType('LookupRequest', (_message.Message,), { - 'DESCRIPTOR' : _LOOKUPREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(LookupRequest) - -LookupResponse = _reflection.GeneratedProtocolMessageType('LookupResponse', (_message.Message,), { - 'DESCRIPTOR' : _LOOKUPRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(LookupResponse) - -RunQueryRequest = _reflection.GeneratedProtocolMessageType('RunQueryRequest', (_message.Message,), { - 'DESCRIPTOR' : _RUNQUERYREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(RunQueryRequest) - -RunQueryResponse = _reflection.GeneratedProtocolMessageType('RunQueryResponse', (_message.Message,), { - 'DESCRIPTOR' : _RUNQUERYRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(RunQueryResponse) - -ContinueQueryRequest = _reflection.GeneratedProtocolMessageType('ContinueQueryRequest', (_message.Message,), { - 'DESCRIPTOR' : _CONTINUEQUERYREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(ContinueQueryRequest) - -ContinueQueryResponse = _reflection.GeneratedProtocolMessageType('ContinueQueryResponse', (_message.Message,), { - 'DESCRIPTOR' : _CONTINUEQUERYRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(ContinueQueryResponse) - -BeginTransactionRequest = _reflection.GeneratedProtocolMessageType('BeginTransactionRequest', (_message.Message,), { - 'DESCRIPTOR' : _BEGINTRANSACTIONREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(BeginTransactionRequest) - -BeginTransactionResponse = _reflection.GeneratedProtocolMessageType('BeginTransactionResponse', (_message.Message,), { - 'DESCRIPTOR' : _BEGINTRANSACTIONRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(BeginTransactionResponse) - -RollbackRequest = _reflection.GeneratedProtocolMessageType('RollbackRequest', (_message.Message,), { - 'DESCRIPTOR' : _ROLLBACKREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(RollbackRequest) - -RollbackResponse = _reflection.GeneratedProtocolMessageType('RollbackResponse', (_message.Message,), { - 'DESCRIPTOR' : _ROLLBACKRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(RollbackResponse) - -CommitRequest = _reflection.GeneratedProtocolMessageType('CommitRequest', (_message.Message,), { - 'DESCRIPTOR' : _COMMITREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(CommitRequest) - -CommitResponse = _reflection.GeneratedProtocolMessageType('CommitResponse', (_message.Message,), { - 'DESCRIPTOR' : _COMMITRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(CommitResponse) - -AllocateIdsRequest = _reflection.GeneratedProtocolMessageType('AllocateIdsRequest', (_message.Message,), { - 'DESCRIPTOR' : _ALLOCATEIDSREQUEST, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(AllocateIdsRequest) - -AllocateIdsResponse = _reflection.GeneratedProtocolMessageType('AllocateIdsResponse', (_message.Message,), { - 'DESCRIPTOR' : _ALLOCATEIDSRESPONSE, - '__module__' : 'google.appengine.datastore.datastore_v4_pb2' - - }) -_sym_db.RegisterMessage(AllocateIdsResponse) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.datastore.datastore_v4_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/datastore/entity_bytes_pb2.py b/src/google/appengine/datastore/entity_bytes_pb2.py index 85030b1..1d69ed2 100755 --- a/src/google/appengine/datastore/entity_bytes_pb2.py +++ b/src/google/appengine/datastore/entity_bytes_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,199 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n-google/appengine/datastore/entity_bytes.proto\x12\x19storage_onestore_v3_bytes\"\xe9\x05\n\rPropertyValue\x12\x12\n\nint64Value\x18\x01 \x01(\x03\x12\x14\n\x0c\x62ooleanValue\x18\x02 \x01(\x08\x12\x13\n\x0bstringValue\x18\x03 \x01(\x0c\x12\x13\n\x0b\x64oubleValue\x18\x04 \x01(\x01\x12G\n\npointvalue\x18\x05 \x01(\n23.storage_onestore_v3_bytes.PropertyValue.PointValue\x12\x45\n\tuservalue\x18\x08 \x01(\n22.storage_onestore_v3_bytes.PropertyValue.UserValue\x12O\n\x0ereferencevalue\x18\x0c \x01(\n27.storage_onestore_v3_bytes.PropertyValue.ReferenceValue\x1a\"\n\nPointValue\x12\t\n\x01x\x18\x06 \x02(\x01\x12\t\n\x01y\x18\x07 \x02(\x01\x1a\xa4\x01\n\tUserValue\x12\r\n\x05\x65mail\x18\t \x02(\t\x12\x13\n\x0b\x61uth_domain\x18\n \x02(\t\x12\x10\n\x08nickname\x18\x0b \x01(\t\x12\x0e\n\x06gaiaid\x18\x12 \x02(\x03\x12\x19\n\x11obfuscated_gaiaid\x18\x13 \x01(\t\x12\x1a\n\x12\x66\x65\x64\x65rated_identity\x18\x15 \x01(\t\x12\x1a\n\x12\x66\x65\x64\x65rated_provider\x18\x16 \x01(\t\x1a\xd7\x01\n\x0eReferenceValue\x12\x0b\n\x03\x61pp\x18\r \x02(\t\x12\x12\n\nname_space\x18\x14 \x01(\t\x12X\n\x0bpathelement\x18\x0e \x03(\n2C.storage_onestore_v3_bytes.PropertyValue.ReferenceValue.PathElement\x12\x13\n\x0b\x64\x61tabase_id\x18\x17 \x01(\t\x1a\x35\n\x0bPathElement\x12\x0c\n\x04type\x18\x0f \x02(\t\x12\n\n\x02id\x18\x10 \x01(\x03\x12\x0c\n\x04name\x18\x11 \x01(\t\"\xc8\x04\n\x08Property\x12H\n\x07meaning\x18\x01 \x01(\x0e\x32+.storage_onestore_v3_bytes.Property.Meaning:\nNO_MEANING\x12\x13\n\x0bmeaning_uri\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x02(\t\x12\x37\n\x05value\x18\x05 \x02(\x0b\x32(.storage_onestore_v3_bytes.PropertyValue\x12\x10\n\x08multiple\x18\x04 \x02(\x08\x12\x13\n\x07stashed\x18\x06 \x01(\x05:\x02-1\x12\x17\n\x08\x63omputed\x18\x07 \x01(\x08:\x05\x66\x61lse\"\xd5\x02\n\x07Meaning\x12\x0e\n\nNO_MEANING\x10\x00\x12\x08\n\x04\x42LOB\x10\x0e\x12\x08\n\x04TEXT\x10\x0f\x12\x0e\n\nBYTESTRING\x10\x10\x12\x11\n\rATOM_CATEGORY\x10\x01\x12\r\n\tATOM_LINK\x10\x02\x12\x0e\n\nATOM_TITLE\x10\x03\x12\x10\n\x0c\x41TOM_CONTENT\x10\x04\x12\x10\n\x0c\x41TOM_SUMMARY\x10\x05\x12\x0f\n\x0b\x41TOM_AUTHOR\x10\x06\x12\x0b\n\x07GD_WHEN\x10\x07\x12\x0c\n\x08GD_EMAIL\x10\x08\x12\x10\n\x0cGEORSS_POINT\x10\t\x12\t\n\x05GD_IM\x10\n\x12\x12\n\x0eGD_PHONENUMBER\x10\x0b\x12\x14\n\x10GD_POSTALADDRESS\x10\x0c\x12\r\n\tGD_RATING\x10\r\x12\x0b\n\x07\x42LOBKEY\x10\x11\x12\x10\n\x0c\x45NTITY_PROTO\x10\x13\x12\x0e\n\nEMPTY_LIST\x10\x18\x12\x0f\n\x0bINDEX_VALUE\x10\x12\"s\n\x04Path\x12\x38\n\x07\x65lement\x18\x01 \x03(\n2\'.storage_onestore_v3_bytes.Path.Element\x1a\x31\n\x07\x45lement\x12\x0c\n\x04type\x18\x02 \x02(\t\x12\n\n\x02id\x18\x03 \x01(\x03\x12\x0c\n\x04name\x18\x04 \x01(\t\"p\n\tReference\x12\x0b\n\x03\x61pp\x18\r \x02(\t\x12\x12\n\nname_space\x18\x14 \x01(\t\x12-\n\x04path\x18\x0e \x02(\x0b\x32\x1f.storage_onestore_v3_bytes.Path\x12\x13\n\x0b\x64\x61tabase_id\x18\x17 \x01(\t\"\x9f\x01\n\x04User\x12\r\n\x05\x65mail\x18\x01 \x02(\t\x12\x13\n\x0b\x61uth_domain\x18\x02 \x02(\t\x12\x10\n\x08nickname\x18\x03 \x01(\t\x12\x0e\n\x06gaiaid\x18\x04 \x02(\x03\x12\x19\n\x11obfuscated_gaiaid\x18\x05 \x01(\t\x12\x1a\n\x12\x66\x65\x64\x65rated_identity\x18\x06 \x01(\t\x12\x1a\n\x12\x66\x65\x64\x65rated_provider\x18\x07 \x01(\t\"\x9c\x03\n\x0b\x45ntityProto\x12\x31\n\x03key\x18\r \x02(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x35\n\x0c\x65ntity_group\x18\x10 \x02(\x0b\x32\x1f.storage_onestore_v3_bytes.Path\x12.\n\x05owner\x18\x11 \x01(\x0b\x32\x1f.storage_onestore_v3_bytes.User\x12\x39\n\x04kind\x18\x04 \x01(\x0e\x32+.storage_onestore_v3_bytes.EntityProto.Kind\x12\x10\n\x08kind_uri\x18\x05 \x01(\t\x12\x35\n\x08property\x18\x0e \x03(\x0b\x32#.storage_onestore_v3_bytes.Property\x12\x39\n\x0craw_property\x18\x0f \x03(\x0b\x32#.storage_onestore_v3_bytes.Property\"4\n\x04Kind\x12\x0e\n\nGD_CONTACT\x10\x01\x12\x0c\n\x08GD_EVENT\x10\x02\x12\x0e\n\nGD_MESSAGE\x10\x03\"B\n\x0e\x45ntityMetadata\x12\x17\n\x0f\x63reated_version\x18\x01 \x01(\x03\x12\x17\n\x0fupdated_version\x18\x02 \x01(\x03\"\xbb\x01\n\rEntitySummary\x12T\n\x12large_raw_property\x18\x01 \x03(\x0b\x32\x38.storage_onestore_v3_bytes.EntitySummary.PropertySummary\x1aT\n\x0fPropertySummary\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x1f\n\x17property_type_for_stats\x18\x02 \x01(\t\x12\x12\n\nsize_bytes\x18\x03 \x01(\x05\"4\n\x11\x43ompositeProperty\x12\x10\n\x08index_id\x18\x01 \x02(\x03\x12\r\n\x05value\x18\x02 \x03(\x0c\"\xda\x04\n\x05Index\x12\x13\n\x0b\x65ntity_type\x18\x01 \x02(\t\x12\x10\n\x08\x61ncestor\x18\x05 \x02(\x08\x12\x0e\n\x06parent\x18\x07 \x01(\x08\x12N\n\x07version\x18\x08 \x01(\x0e\x32(.storage_onestore_v3_bytes.Index.Version:\x13VERSION_UNSPECIFIED\x12;\n\x08property\x18\x02 \x03(\n2).storage_onestore_v3_bytes.Index.Property\x1a\xd0\x02\n\x08Property\x12\x0c\n\x04name\x18\x03 \x02(\t\x12]\n\tdirection\x18\x04 \x01(\x0e\x32\x33.storage_onestore_v3_bytes.Index.Property.Direction:\x15\x44IRECTION_UNSPECIFIED\x12N\n\x04mode\x18\x06 \x01(\x0e\x32..storage_onestore_v3_bytes.Index.Property.Mode:\x10MODE_UNSPECIFIED\"E\n\tDirection\x12\x19\n\x15\x44IRECTION_UNSPECIFIED\x10\x00\x12\r\n\tASCENDING\x10\x01\x12\x0e\n\nDESCENDING\x10\x02\"@\n\x04Mode\x12\x14\n\x10MODE_UNSPECIFIED\x10\x00\x12\x0e\n\nGEOSPATIAL\x10\x03\x12\x12\n\x0e\x41RRAY_CONTAINS\x10\x04\":\n\x07Version\x12\x17\n\x13VERSION_UNSPECIFIED\x10\x00\x12\x06\n\x02V1\x10\x01\x12\x06\n\x02V2\x10\x02\x12\x06\n\x02V3\x10\x03\"\xc0\x04\n\x0e\x43ompositeIndex\x12\x0e\n\x06\x61pp_id\x18\x01 \x02(\t\x12\x13\n\x0b\x64\x61tabase_id\x18\x0c \x01(\t\x12\n\n\x02id\x18\x02 \x02(\x03\x12\x34\n\ndefinition\x18\x03 \x02(\x0b\x32 .storage_onestore_v3_bytes.Index\x12>\n\x05state\x18\x04 \x02(\x0e\x32/.storage_onestore_v3_bytes.CompositeIndex.State\x12S\n\x0eworkflow_state\x18\n \x01(\x0e\x32\x37.storage_onestore_v3_bytes.CompositeIndex.WorkflowStateB\x02\x18\x01\x12\x19\n\rerror_message\x18\x0b \x01(\tB\x02\x18\x01\x12\'\n\x14only_use_if_required\x18\x06 \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12!\n\x0e\x64isabled_index\x18\t \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12\'\n\x1f\x64\x65precated_read_division_family\x18\x07 \x03(\t\x12(\n deprecated_write_division_family\x18\x08 \x01(\t\"?\n\x05State\x12\x0e\n\nWRITE_ONLY\x10\x01\x12\x0e\n\nREAD_WRITE\x10\x02\x12\x0b\n\x07\x44\x45LETED\x10\x03\x12\t\n\x05\x45RROR\x10\x04\"7\n\rWorkflowState\x12\x0b\n\x07PENDING\x10\x01\x12\n\n\x06\x41\x43TIVE\x10\x02\x12\r\n\tCOMPLETED\x10\x03\"w\n\x10SearchIndexEntry\x12\x10\n\x08index_id\x18\x01 \x02(\x03\x12\x1d\n\x15write_division_family\x18\x02 \x02(\t\x12\x18\n\x10\x66ingerprint_1999\x18\x03 \x01(\x06\x12\x18\n\x10\x66ingerprint_2011\x18\x04 \x01(\x06\"\x98\x02\n\x0cIndexPostfix\x12G\n\x0bindex_value\x18\x01 \x03(\x0b\x32\x32.storage_onestore_v3_bytes.IndexPostfix.IndexValue\x12\x31\n\x03key\x18\x02 \x01(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x14\n\x06\x62\x65\x66ore\x18\x03 \x01(\x08:\x04true\x12\x18\n\x10\x62\x65\x66ore_ascending\x18\x04 \x01(\x08\x1a\\\n\nIndexValue\x12\x15\n\rproperty_name\x18\x01 \x02(\t\x12\x37\n\x05value\x18\x02 \x02(\x0b\x32(.storage_onestore_v3_bytes.PropertyValue\"L\n\rIndexPosition\x12\x0b\n\x03key\x18\x01 \x01(\x0c\x12\x14\n\x06\x62\x65\x66ore\x18\x02 \x01(\x08:\x04true\x12\x18\n\x10\x62\x65\x66ore_ascending\x18\x03 \x01(\x08\x42\x45\n\x1e\x63om.google.storage.onestore.v3B\x0eOnestoreEntityZ\x13storage_onestore_v3') - - -_PROPERTYVALUE = DESCRIPTOR.message_types_by_name['PropertyValue'] -_PROPERTYVALUE_POINTVALUE = _PROPERTYVALUE.nested_types_by_name['PointValue'] -_PROPERTYVALUE_USERVALUE = _PROPERTYVALUE.nested_types_by_name['UserValue'] -_PROPERTYVALUE_REFERENCEVALUE = _PROPERTYVALUE.nested_types_by_name['ReferenceValue'] -_PROPERTYVALUE_REFERENCEVALUE_PATHELEMENT = _PROPERTYVALUE_REFERENCEVALUE.nested_types_by_name['PathElement'] -_PROPERTY = DESCRIPTOR.message_types_by_name['Property'] -_PATH = DESCRIPTOR.message_types_by_name['Path'] -_PATH_ELEMENT = _PATH.nested_types_by_name['Element'] -_REFERENCE = DESCRIPTOR.message_types_by_name['Reference'] -_USER = DESCRIPTOR.message_types_by_name['User'] -_ENTITYPROTO = DESCRIPTOR.message_types_by_name['EntityProto'] -_ENTITYMETADATA = DESCRIPTOR.message_types_by_name['EntityMetadata'] -_ENTITYSUMMARY = DESCRIPTOR.message_types_by_name['EntitySummary'] -_ENTITYSUMMARY_PROPERTYSUMMARY = _ENTITYSUMMARY.nested_types_by_name['PropertySummary'] -_COMPOSITEPROPERTY = DESCRIPTOR.message_types_by_name['CompositeProperty'] -_INDEX = DESCRIPTOR.message_types_by_name['Index'] -_INDEX_PROPERTY = _INDEX.nested_types_by_name['Property'] -_COMPOSITEINDEX = DESCRIPTOR.message_types_by_name['CompositeIndex'] -_SEARCHINDEXENTRY = DESCRIPTOR.message_types_by_name['SearchIndexEntry'] -_INDEXPOSTFIX = DESCRIPTOR.message_types_by_name['IndexPostfix'] -_INDEXPOSTFIX_INDEXVALUE = _INDEXPOSTFIX.nested_types_by_name['IndexValue'] -_INDEXPOSITION = DESCRIPTOR.message_types_by_name['IndexPosition'] -_PROPERTY_MEANING = _PROPERTY.enum_types_by_name['Meaning'] -_ENTITYPROTO_KIND = _ENTITYPROTO.enum_types_by_name['Kind'] -_INDEX_PROPERTY_DIRECTION = _INDEX_PROPERTY.enum_types_by_name['Direction'] -_INDEX_PROPERTY_MODE = _INDEX_PROPERTY.enum_types_by_name['Mode'] -_INDEX_VERSION = _INDEX.enum_types_by_name['Version'] -_COMPOSITEINDEX_STATE = _COMPOSITEINDEX.enum_types_by_name['State'] -_COMPOSITEINDEX_WORKFLOWSTATE = _COMPOSITEINDEX.enum_types_by_name['WorkflowState'] -PropertyValue = _reflection.GeneratedProtocolMessageType('PropertyValue', (_message.Message,), { - - 'PointValue' : _reflection.GeneratedProtocolMessageType('PointValue', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYVALUE_POINTVALUE, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - - 'UserValue' : _reflection.GeneratedProtocolMessageType('UserValue', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYVALUE_USERVALUE, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - - 'ReferenceValue' : _reflection.GeneratedProtocolMessageType('ReferenceValue', (_message.Message,), { - - 'PathElement' : _reflection.GeneratedProtocolMessageType('PathElement', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTYVALUE_REFERENCEVALUE_PATHELEMENT, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _PROPERTYVALUE_REFERENCEVALUE, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _PROPERTYVALUE, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(PropertyValue) -_sym_db.RegisterMessage(PropertyValue.PointValue) -_sym_db.RegisterMessage(PropertyValue.UserValue) -_sym_db.RegisterMessage(PropertyValue.ReferenceValue) -_sym_db.RegisterMessage(PropertyValue.ReferenceValue.PathElement) - -Property = _reflection.GeneratedProtocolMessageType('Property', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTY, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(Property) - -Path = _reflection.GeneratedProtocolMessageType('Path', (_message.Message,), { - - 'Element' : _reflection.GeneratedProtocolMessageType('Element', (_message.Message,), { - 'DESCRIPTOR' : _PATH_ELEMENT, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _PATH, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(Path) -_sym_db.RegisterMessage(Path.Element) - -Reference = _reflection.GeneratedProtocolMessageType('Reference', (_message.Message,), { - 'DESCRIPTOR' : _REFERENCE, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(Reference) - -User = _reflection.GeneratedProtocolMessageType('User', (_message.Message,), { - 'DESCRIPTOR' : _USER, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(User) - -EntityProto = _reflection.GeneratedProtocolMessageType('EntityProto', (_message.Message,), { - 'DESCRIPTOR' : _ENTITYPROTO, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(EntityProto) - -EntityMetadata = _reflection.GeneratedProtocolMessageType('EntityMetadata', (_message.Message,), { - 'DESCRIPTOR' : _ENTITYMETADATA, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(EntityMetadata) - -EntitySummary = _reflection.GeneratedProtocolMessageType('EntitySummary', (_message.Message,), { - - 'PropertySummary' : _reflection.GeneratedProtocolMessageType('PropertySummary', (_message.Message,), { - 'DESCRIPTOR' : _ENTITYSUMMARY_PROPERTYSUMMARY, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _ENTITYSUMMARY, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(EntitySummary) -_sym_db.RegisterMessage(EntitySummary.PropertySummary) - -CompositeProperty = _reflection.GeneratedProtocolMessageType('CompositeProperty', (_message.Message,), { - 'DESCRIPTOR' : _COMPOSITEPROPERTY, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(CompositeProperty) - -Index = _reflection.GeneratedProtocolMessageType('Index', (_message.Message,), { - - 'Property' : _reflection.GeneratedProtocolMessageType('Property', (_message.Message,), { - 'DESCRIPTOR' : _INDEX_PROPERTY, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _INDEX, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(Index) -_sym_db.RegisterMessage(Index.Property) - -CompositeIndex = _reflection.GeneratedProtocolMessageType('CompositeIndex', (_message.Message,), { - 'DESCRIPTOR' : _COMPOSITEINDEX, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(CompositeIndex) - -SearchIndexEntry = _reflection.GeneratedProtocolMessageType('SearchIndexEntry', (_message.Message,), { - 'DESCRIPTOR' : _SEARCHINDEXENTRY, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(SearchIndexEntry) - -IndexPostfix = _reflection.GeneratedProtocolMessageType('IndexPostfix', (_message.Message,), { - - 'IndexValue' : _reflection.GeneratedProtocolMessageType('IndexValue', (_message.Message,), { - 'DESCRIPTOR' : _INDEXPOSTFIX_INDEXVALUE, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _INDEXPOSTFIX, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(IndexPostfix) -_sym_db.RegisterMessage(IndexPostfix.IndexValue) - -IndexPosition = _reflection.GeneratedProtocolMessageType('IndexPosition', (_message.Message,), { - 'DESCRIPTOR' : _INDEXPOSITION, - '__module__' : 'google.appengine.datastore.entity_bytes_pb2' - - }) -_sym_db.RegisterMessage(IndexPosition) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.datastore.entity_bytes_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/datastore/entity_v4_pb2.py b/src/google/appengine/datastore/entity_v4_pb2.py index e555046..b741aa9 100755 --- a/src/google/appengine/datastore/entity_v4_pb2.py +++ b/src/google/appengine/datastore/entity_v4_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,66 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n*google/appengine/datastore/entity_v4.proto\x12\x1dgoogle.appengine.datastore.v4\"X\n\x0bPartitionId\x12\x12\n\ndataset_id\x18\x03 \x01(\t\x12\x11\n\tnamespace\x18\x04 \x01(\t\"\"\n\tConstants\x12\x15\n\x11MAX_DIMENSION_TAG\x10\x64\"\xc4\x01\n\x03Key\x12@\n\x0cpartition_id\x18\x01 \x01(\x0b\x32*.google.appengine.datastore.v4.PartitionId\x12\x44\n\x0cpath_element\x18\x02 \x03(\x0b\x32..google.appengine.datastore.v4.Key.PathElement\x1a\x35\n\x0bPathElement\x12\x0c\n\x04kind\x18\x01 \x02(\t\x12\n\n\x02id\x18\x02 \x01(\x03\x12\x0c\n\x04name\x18\x03 \x01(\t\"/\n\x08GeoPoint\x12\x10\n\x08latitude\x18\x01 \x02(\x01\x12\x11\n\tlongitude\x18\x02 \x02(\x01\"\xcb\x03\n\x05Value\x12\x15\n\rboolean_value\x18\x01 \x01(\x08\x12\x15\n\rinteger_value\x18\x02 \x01(\x03\x12\x14\n\x0c\x64ouble_value\x18\x03 \x01(\x01\x12$\n\x1ctimestamp_microseconds_value\x18\x04 \x01(\x03\x12\x35\n\tkey_value\x18\x05 \x01(\x0b\x32\".google.appengine.datastore.v4.Key\x12\x16\n\x0e\x62lob_key_value\x18\x10 \x01(\t\x12\x14\n\x0cstring_value\x18\x11 \x01(\t\x12\x12\n\nblob_value\x18\x12 \x01(\x0c\x12;\n\x0c\x65ntity_value\x18\x06 \x01(\x0b\x32%.google.appengine.datastore.v4.Entity\x12@\n\x0fgeo_point_value\x18\x08 \x01(\x0b\x32\'.google.appengine.datastore.v4.GeoPoint\x12\x38\n\nlist_value\x18\x07 \x03(\x0b\x32$.google.appengine.datastore.v4.Value\x12\x0f\n\x07meaning\x18\x0e \x01(\x05\x12\x15\n\x07indexed\x18\x0f \x01(\x08:\x04true\"\xb6\x01\n\x08Property\x12\x0c\n\x04name\x18\x01 \x02(\t\x12#\n\x10\x64\x65precated_multi\x18\x02 \x01(\x08:\x05\x66\x61lseB\x02\x18\x01\x12\x42\n\x10\x64\x65precated_value\x18\x03 \x03(\x0b\x32$.google.appengine.datastore.v4.ValueB\x02\x18\x01\x12\x33\n\x05value\x18\x04 \x01(\x0b\x32$.google.appengine.datastore.v4.Value\"t\n\x06\x45ntity\x12/\n\x03key\x18\x01 \x01(\x0b\x32\".google.appengine.datastore.v4.Key\x12\x39\n\x08property\x18\x02 \x03(\x0b\x32\'.google.appengine.datastore.v4.PropertyB\'\n%com.google.google.appengine.datastore') - - -_PARTITIONID = DESCRIPTOR.message_types_by_name['PartitionId'] -_KEY = DESCRIPTOR.message_types_by_name['Key'] -_KEY_PATHELEMENT = _KEY.nested_types_by_name['PathElement'] -_GEOPOINT = DESCRIPTOR.message_types_by_name['GeoPoint'] -_VALUE = DESCRIPTOR.message_types_by_name['Value'] -_PROPERTY = DESCRIPTOR.message_types_by_name['Property'] -_ENTITY = DESCRIPTOR.message_types_by_name['Entity'] -_PARTITIONID_CONSTANTS = _PARTITIONID.enum_types_by_name['Constants'] -PartitionId = _reflection.GeneratedProtocolMessageType('PartitionId', (_message.Message,), { - 'DESCRIPTOR' : _PARTITIONID, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) -_sym_db.RegisterMessage(PartitionId) - -Key = _reflection.GeneratedProtocolMessageType('Key', (_message.Message,), { - - 'PathElement' : _reflection.GeneratedProtocolMessageType('PathElement', (_message.Message,), { - 'DESCRIPTOR' : _KEY_PATHELEMENT, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) - , - 'DESCRIPTOR' : _KEY, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) -_sym_db.RegisterMessage(Key) -_sym_db.RegisterMessage(Key.PathElement) - -GeoPoint = _reflection.GeneratedProtocolMessageType('GeoPoint', (_message.Message,), { - 'DESCRIPTOR' : _GEOPOINT, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) -_sym_db.RegisterMessage(GeoPoint) - -Value = _reflection.GeneratedProtocolMessageType('Value', (_message.Message,), { - 'DESCRIPTOR' : _VALUE, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) -_sym_db.RegisterMessage(Value) - -Property = _reflection.GeneratedProtocolMessageType('Property', (_message.Message,), { - 'DESCRIPTOR' : _PROPERTY, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) -_sym_db.RegisterMessage(Property) - -Entity = _reflection.GeneratedProtocolMessageType('Entity', (_message.Message,), { - 'DESCRIPTOR' : _ENTITY, - '__module__' : 'google.appengine.datastore.entity_v4_pb2' - - }) -_sym_db.RegisterMessage(Entity) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.datastore.entity_v4_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/datastore/snapshot_pb2.py b/src/google/appengine/datastore/snapshot_pb2.py index 8fab74e..b05d2d3 100755 --- a/src/google/appengine/datastore/snapshot_pb2.py +++ b/src/google/appengine/datastore/snapshot_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -32,17 +31,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n)google/appengine/datastore/snapshot.proto\x12\x13storage_onestore_v3\":\n\x08Snapshot\x12\n\n\x02ts\x18\x01 \x02(\x03\"\"\n\x06Status\x12\x0c\n\x08INACTIVE\x10\x00\x12\n\n\x06\x41\x43TIVE\x10\x01\x42G\n\x1e\x63om.google.storage.onestore.v3B\x10OnestoreSnapshotZ\x13storage_onestore_v3') - - -_SNAPSHOT = DESCRIPTOR.message_types_by_name['Snapshot'] -_SNAPSHOT_STATUS = _SNAPSHOT.enum_types_by_name['Status'] -Snapshot = _reflection.GeneratedProtocolMessageType('Snapshot', (_message.Message,), { - 'DESCRIPTOR' : _SNAPSHOT, - '__module__' : 'google.appengine.datastore.snapshot_pb2' - - }) -_sym_db.RegisterMessage(Snapshot) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.datastore.snapshot_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/ext/ndb/context.py b/src/google/appengine/ext/ndb/context.py index 2286895..c744493 100755 --- a/src/google/appengine/ext/ndb/context.py +++ b/src/google/appengine/ext/ndb/context.py @@ -342,7 +342,7 @@ def __init__(self, conn=None, auto_batcher_class=AutoBatcher, config=None, - _memcache_prefix = b'NDB9:' + _memcache_prefix = 'NDB9:' @tasklets.tasklet def flush(self): diff --git a/src/google/appengine/ext/ndb/key.py b/src/google/appengine/ext/ndb/key.py index 43189f8..4814d4d 100755 --- a/src/google/appengine/ext/ndb/key.py +++ b/src/google/appengine/ext/ndb/key.py @@ -593,7 +593,7 @@ def urlsafe(self): """ urlsafe = base64.b64encode(self.reference().SerializeToString()) - return urlsafe.rstrip(b'=').replace(b'+', b'-').replace(b'/', b'_') + return urlsafe.rstrip(b'=').replace(b'+', b'-').replace(b'/', b'_').decode() diff --git a/src/google/appengine/ext/ndb/key_test.py b/src/google/appengine/ext/ndb/key_test.py index eb95f49..6efb068 100755 --- a/src/google/appengine/ext/ndb/key_test.py +++ b/src/google/appengine/ext/ndb/key_test.py @@ -92,7 +92,7 @@ def testSerialized(self): e.name = flat[3] serialized = r.SerializeToString() ref_bytes = six.ensure_binary(r.SerializeToString()) - urlsafe = base64.urlsafe_b64encode(ref_bytes).rstrip(b'=') + urlsafe = base64.urlsafe_b64encode(ref_bytes).rstrip(b'=').decode() k = key.Key(flat=flat) self.assertEqual(k.serialized(), serialized) @@ -122,7 +122,7 @@ def testSerialized(self): self.assertEqual(k.reference(), r) k1 = key.Key('A', 1) - self.assertEqual(k1.urlsafe(), b'ag9uZGItdGVzdC1hcHAtaWRyBwsSAUEYAQw') + self.assertEqual(k1.urlsafe(), 'ag9uZGItdGVzdC1hcHAtaWRyBwsSAUEYAQw') k2 = key.Key(urlsafe=k1.urlsafe()) self.assertEqual(k1, k2) @@ -252,7 +252,7 @@ def testUnicode(self): r = k.reference() serialized = k.serialized() urlsafe = k.urlsafe() - key.Key(urlsafe=urlsafe.decode('utf8')) + key.Key(urlsafe=urlsafe) key.Key(serialized=serialized.decode('utf8')) key.Key(reference=r) diff --git a/src/google/appengine/ext/ndb/model.py b/src/google/appengine/ext/ndb/model.py index 254fa6b..11a7393 100755 --- a/src/google/appengine/ext/ndb/model.py +++ b/src/google/appengine/ext/ndb/model.py @@ -1819,7 +1819,7 @@ def _validate(self, value): raise datastore_errors.BadValueError('Expected valid UTF-8, got %r' % (value,)) elif isinstance(value, six.text_type): - length = len(value.encode('utf-8')) + length = len(value.encode('utf-8', 'surrogatepass')) else: raise datastore_errors.BadValueError('Expected string, got %r' % (value,)) @@ -1830,12 +1830,12 @@ def _validate(self, value): def _to_base_type(self, value): if isinstance(value, six.text_type): - return value.encode('utf-8') + return value.encode('utf-8', 'surrogatepass') def _from_base_type(self, value): if isinstance(value, six.binary_type): try: - return six.text_type(value, 'utf-8') + return six.text_type(value, 'utf-8', 'surrogatepass') except UnicodeDecodeError: @@ -1905,7 +1905,7 @@ def _to_base_type(self, value): if os.environ.get('NDB_USE_CROSS_COMPATIBLE_PICKLE_PROTOCOL', False): protocol = 2 else: - protocol = pickle.HIGHEST_PROTOCOL + protocol = pickle.DEFAULT_PROTOCOL return pickle.dumps(value, protocol) def _from_base_type(self, value): diff --git a/src/google/appengine/ext/remote_api/remote_api_bytes_pb2.py b/src/google/appengine/ext/remote_api/remote_api_bytes_pb2.py index 761ec2e..4d537d8 100755 --- a/src/google/appengine/ext/remote_api/remote_api_bytes_pb2.py +++ b/src/google/appengine/ext/remote_api/remote_api_bytes_pb2.py @@ -18,10 +18,9 @@ """Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database @@ -34,66 +33,8 @@ DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n6google/appengine/ext/remote_api/remote_api_bytes.proto\x12%google.appengine.ext.remote_api_bytes\x1a\x33google/appengine/datastore/datastore_v3_bytes.proto\x1a-google/appengine/datastore/entity_bytes.proto\"k\n\x07Request\x12\x14\n\x0cservice_name\x18\x02 \x02(\t\x12\x0e\n\x06method\x18\x03 \x02(\t\x12\x0f\n\x07request\x18\x04 \x02(\x0c\x12\x12\n\nrequest_id\x18\x05 \x01(\t\x12\x15\n\rtrace_context\x18\x06 \x01(\x0c\"0\n\x10\x41pplicationError\x12\x0c\n\x04\x63ode\x18\x01 \x02(\x05\x12\x0e\n\x06\x64\x65tail\x18\x02 \x02(\t\"\xb7\x02\n\x08RpcError\x12\x0c\n\x04\x63ode\x18\x01 \x02(\x05\x12\x0e\n\x06\x64\x65tail\x18\x02 \x01(\t\"\x8c\x02\n\tErrorCode\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x12\n\x0e\x43\x41LL_NOT_FOUND\x10\x01\x12\x0f\n\x0bPARSE_ERROR\x10\x02\x12\x16\n\x12SECURITY_VIOLATION\x10\x03\x12\x0e\n\nOVER_QUOTA\x10\x04\x12\x15\n\x11REQUEST_TOO_LARGE\x10\x05\x12\x17\n\x13\x43\x41PABILITY_DISABLED\x10\x06\x12\x14\n\x10\x46\x45\x41TURE_DISABLED\x10\x07\x12\x0f\n\x0b\x42\x41\x44_REQUEST\x10\x08\x12\x16\n\x12RESPONSE_TOO_LARGE\x10\t\x12\r\n\tCANCELLED\x10\n\x12\x10\n\x0cREPLAY_ERROR\x10\x0b\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x0c\"\xdf\x01\n\x08Response\x12\x10\n\x08response\x18\x01 \x01(\x0c\x12\x11\n\texception\x18\x02 \x01(\x0c\x12R\n\x11\x61pplication_error\x18\x03 \x01(\x0b\x32\x37.google.appengine.ext.remote_api_bytes.ApplicationError\x12\x16\n\x0ejava_exception\x18\x04 \x01(\x0c\x12\x42\n\trpc_error\x18\x05 \x01(\x0b\x32/.google.appengine.ext.remote_api_bytes.RpcError\"\xd6\x02\n\x12TransactionRequest\x12\\\n\x0cprecondition\x18\x01 \x03(\n2F.google.appengine.ext.remote_api_bytes.TransactionRequest.Precondition\x12\x37\n\x04puts\x18\x04 \x01(\x0b\x32).apphosting_datastore_v3_bytes.PutRequest\x12=\n\x07\x64\x65letes\x18\x05 \x01(\x0b\x32,.apphosting_datastore_v3_bytes.DeleteRequest\x12\x19\n\x11\x61llow_multiple_eg\x18\x06 \x01(\x08\x1aO\n\x0cPrecondition\x12\x31\n\x03key\x18\x02 \x02(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12\x0c\n\x04hash\x18\x03 \x01(\x0c\"\xd2\x01\n\x16TransactionQueryResult\x12:\n\x06result\x18\x01 \x02(\x0b\x32*.apphosting_datastore_v3_bytes.QueryResult\x12>\n\x10\x65ntity_group_key\x18\x02 \x02(\x0b\x32$.storage_onestore_v3_bytes.Reference\x12<\n\x0c\x65ntity_group\x18\x03 \x01(\x0b\x32&.storage_onestore_v3_bytes.EntityProtoBF\n+com.google.google.appengine.utils.remoteapiB\x0bRemoteApiPbZ\nremote_api') - - -_REQUEST = DESCRIPTOR.message_types_by_name['Request'] -_APPLICATIONERROR = DESCRIPTOR.message_types_by_name['ApplicationError'] -_RPCERROR = DESCRIPTOR.message_types_by_name['RpcError'] -_RESPONSE = DESCRIPTOR.message_types_by_name['Response'] -_TRANSACTIONREQUEST = DESCRIPTOR.message_types_by_name['TransactionRequest'] -_TRANSACTIONREQUEST_PRECONDITION = _TRANSACTIONREQUEST.nested_types_by_name['Precondition'] -_TRANSACTIONQUERYRESULT = DESCRIPTOR.message_types_by_name['TransactionQueryResult'] -_RPCERROR_ERRORCODE = _RPCERROR.enum_types_by_name['ErrorCode'] -Request = _reflection.GeneratedProtocolMessageType('Request', (_message.Message,), { - 'DESCRIPTOR' : _REQUEST, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) -_sym_db.RegisterMessage(Request) - -ApplicationError = _reflection.GeneratedProtocolMessageType('ApplicationError', (_message.Message,), { - 'DESCRIPTOR' : _APPLICATIONERROR, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) -_sym_db.RegisterMessage(ApplicationError) - -RpcError = _reflection.GeneratedProtocolMessageType('RpcError', (_message.Message,), { - 'DESCRIPTOR' : _RPCERROR, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) -_sym_db.RegisterMessage(RpcError) - -Response = _reflection.GeneratedProtocolMessageType('Response', (_message.Message,), { - 'DESCRIPTOR' : _RESPONSE, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) -_sym_db.RegisterMessage(Response) - -TransactionRequest = _reflection.GeneratedProtocolMessageType('TransactionRequest', (_message.Message,), { - - 'Precondition' : _reflection.GeneratedProtocolMessageType('Precondition', (_message.Message,), { - 'DESCRIPTOR' : _TRANSACTIONREQUEST_PRECONDITION, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) - , - 'DESCRIPTOR' : _TRANSACTIONREQUEST, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) -_sym_db.RegisterMessage(TransactionRequest) -_sym_db.RegisterMessage(TransactionRequest.Precondition) - -TransactionQueryResult = _reflection.GeneratedProtocolMessageType('TransactionQueryResult', (_message.Message,), { - 'DESCRIPTOR' : _TRANSACTIONQUERYRESULT, - '__module__' : 'google.appengine.ext.remote_api.remote_api_bytes_pb2' - - }) -_sym_db.RegisterMessage(TransactionQueryResult) - +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'google.appengine.ext.remote_api.remote_api_bytes_pb2', globals()) if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None diff --git a/src/google/appengine/ext/testbed/__init__.py b/src/google/appengine/ext/testbed/__init__.py index 4dea714..9467724 100755 --- a/src/google/appengine/ext/testbed/__init__.py +++ b/src/google/appengine/ext/testbed/__init__.py @@ -155,12 +155,10 @@ def testInsertEntity(self): mail_stub = None - - - - - - +try: + from google.appengine.datastore import datastore_sqlite_stub +except ImportError: + datastore_sqlite_stub = None try: @@ -182,13 +180,13 @@ def testInsertEntity(self): 'GOOGLE_CLOUD_PROJECT': 'testbed-test', 'AUTH_DOMAIN': 'gmail.com', 'HTTP_HOST': 'testbed.example.com', - 'CURRENT_MODULE_ID': 'default', 'CURRENT_VERSION_ID': 'testbed-version', 'GAE_RUNTIME': 'python3' + str(sys.version_info.minor), + 'GAE_SERVICE': 'default', + 'GAE_ENV': 'localdev', 'REQUEST_ID_HASH': 'testbed-request-id-hash', 'REQUEST_LOG_ID': '7357B3D7091D', 'SERVER_NAME': 'testbed.example.com', - 'SERVER_SOFTWARE': 'Development/1.0 (testbed)', 'SERVER_PORT': '80', 'USER_EMAIL': '', 'USER_ID': '', @@ -199,7 +197,6 @@ def testInsertEntity(self): DEFAULT_APP_ID = DEFAULT_ENVIRONMENT['GAE_APPLICATION'] DEFAULT_AUTH_DOMAIN = DEFAULT_ENVIRONMENT['AUTH_DOMAIN'] DEFAULT_SERVER_NAME = DEFAULT_ENVIRONMENT['SERVER_NAME'] -DEFAULT_SERVER_SOFTWARE = DEFAULT_ENVIRONMENT['SERVER_SOFTWARE'] DEFAULT_SERVER_PORT = DEFAULT_ENVIRONMENT['SERVER_PORT'] @@ -763,18 +760,15 @@ def init_datastore_v3_stub(self, enable=True, datastore_file=None, self._disable_stub(cloud_datastore_v1_stub.SERVICE_NAME) return if use_sqlite: - - - - - - - - - - - - raise NotImplementedError('datastore_sqlite_stub not supported') + if datastore_sqlite_stub is None: + raise StubNotSupportedError( + 'The sqlite stub is not supported in production.') + stub = datastore_sqlite_stub.DatastoreSqliteStub( + full_app_id.get(), + datastore_file, + use_atexit=False, + auto_id_policy=auto_id_policy, + **stub_kw_args) else: stub_kw_args.setdefault('save_changes', False) stub = datastore_file_stub.DatastoreFileStub( diff --git a/src/google/appengine/runtime/default_api_stub.py b/src/google/appengine/runtime/default_api_stub.py index eb44865..c71727a 100755 --- a/src/google/appengine/runtime/default_api_stub.py +++ b/src/google/appengine/runtime/default_api_stub.py @@ -25,7 +25,6 @@ import logging import os import sys -import threading from google.appengine.api import apiproxy_rpc from google.appengine.api import apiproxy_stub_map from google.appengine.ext.remote_api import remote_api_bytes_pb2 as remote_api_pb2 @@ -47,8 +46,9 @@ TICKET_HEADER = 'HTTP_X_APPENGINE_API_TICKET' DEV_TICKET_HEADER = 'HTTP_X_APPENGINE_DEV_REQUEST_ID' DAPPER_ENV_KEY = 'HTTP_X_GOOGLE_DAPPERTRACEINFO' -SERVICE_BRIDGE_HOST = 'appengine.googleapis.internal' -API_PORT = 10001 +SERVICE_BRIDGE_HOST = os.environ.get('API_HOST', + 'appengine.googleapis.internal') +API_PORT = os.environ.get('API_PORT', '10001') SERVICE_ENDPOINT_NAME = 'app-engine-apis' APIHOST_METHOD = '/VMRemoteAPI.CallRemoteAPI' PROXY_PATH = '/rpc_http' @@ -164,23 +164,17 @@ def _MakeCallImpl(self): - ticket = None - if DefaultApiStub.ShouldUseRequestSecurityTicketForThread(): - if context.READ_FROM_OS_ENVIRON: - ticket = os.environ.get(TICKET_HEADER, - os.environ.get(DEV_TICKET_HEADER)) - else: - + if context.READ_FROM_OS_ENVIRON: + ticket = os.environ.get(TICKET_HEADER, + os.environ.get(DEV_TICKET_HEADER)) + else: - ticket = context.gae_headers.API_TICKET.get( - context.gae_headers.DEV_REQUEST_ID.get(None)) - if not ticket: - raise apiproxy_errors.RPCFailedError( - 'Attempted RPC call without active security ticket') + ticket = context.gae_headers.API_TICKET.get( + context.gae_headers.DEV_REQUEST_ID.get(None)) request = remote_api_pb2.Request( service_name=self.package, @@ -290,14 +284,6 @@ def _SendRequestAndFinish(self, **kwargs): self._state = apiproxy_rpc.RPC.FINISHING -class _UseRequestSecurityTicketLocal(threading.local): - """Thread local holding if the default ticket should always be used.""" - - def __init__(self): - super(_UseRequestSecurityTicketLocal, self).__init__() - self.use_ticket_header_value = False - - class DefaultApiStub(object): """A stub for calling services through a VM service bridge. @@ -305,28 +291,6 @@ class DefaultApiStub(object): """ - _USE_REQUEST_SECURITY_TICKET_LOCAL = _UseRequestSecurityTicketLocal() - - @classmethod - def SetUseRequestSecurityTicketForThread(cls, value): - """Sets if the in environment security ticket should be used. - - Security tickets are set in the context, which gets inherited by a - child thread. Child threads should not use the security ticket of their - parent by default, because once the parent thread returns and the request - is complete, the security ticket is no longer valid. - - Args: - value: Boolean value describing if we should use the security ticket. - """ - cls._USE_REQUEST_SECURITY_TICKET_LOCAL.use_ticket_header_value = value - - @classmethod - def ShouldUseRequestSecurityTicketForThread(cls): - """Gets if thie security ticket should be used for this thread.""" - return cls._USE_REQUEST_SECURITY_TICKET_LOCAL.use_ticket_header_value - - def __init__(self): self.thread_pool = futures.ThreadPoolExecutor(MAX_CONCURRENT_API_CALLS) self.http = urllib3.PoolManager( diff --git a/src/google/appengine/runtime/initialize.py b/src/google/appengine/runtime/initialize.py index aa3a038..2306d2e 100755 --- a/src/google/appengine/runtime/initialize.py +++ b/src/google/appengine/runtime/initialize.py @@ -26,11 +26,6 @@ import typing import wsgiref.util - - - - -from google.appengine.runtime import default_api_stub from google.appengine.runtime import thread_hooks import six @@ -179,21 +174,10 @@ def InitializeLogging(custom_json_formatter=None): logger.addHandler(logging_handler) -class SecurityTicketThreadHook(thread_hooks.ThreadHook): - """Sets and clears UseRequestSecurityTicket on a thread.""" - - def PreTarget(self): - default_api_stub.DefaultApiStub.SetUseRequestSecurityTicketForThread(True) - - def PostTarget(self): - default_api_stub.DefaultApiStub.SetUseRequestSecurityTicketForThread(False) - - @functools.lru_cache(maxsize=None) def InitializeThreadingApis(): """Helper to monkey-patch various threading APIs.""" - thread_hooks.PatchStartNewThread(hooks=[ - SecurityTicketThreadHook, thread_hooks.RequestEnvironmentThreadHook - ]) + thread_hooks.PatchStartNewThread( + hooks=[thread_hooks.RequestEnvironmentThreadHook]) diff --git a/src/google/appengine/runtime/middlewares.py b/src/google/appengine/runtime/middlewares.py index e0efa2d..fcd477b 100755 --- a/src/google/appengine/runtime/middlewares.py +++ b/src/google/appengine/runtime/middlewares.py @@ -31,7 +31,6 @@ from google.appengine.runtime import background from google.appengine.runtime import callback from google.appengine.runtime import context -from google.appengine.runtime import default_api_stub from google.appengine.runtime import request_environment import six from six.moves import urllib @@ -88,29 +87,6 @@ def Wrap(app, middlewares): return functools.reduce(lambda app, mw: mw(app), reversed(middlewares), app) -@middleware -def UseRequestSecurityTicketForApiMiddleware(app, wsgi_env, start_response): - """WSGI middleware wrapper that sets the thread to use the security ticket. - - This sets up the appengine api so that if a security ticket is passed in with - the request, it will be used. - - Args: - app: (callable) a WSGI app per PEP 3333. - wsgi_env: see PEP 3333 - start_response: see PEP 3333 - - Returns: - A wrapped , which is also a valid WSGI app. - """ - try: - default_api_stub.DefaultApiStub.SetUseRequestSecurityTicketForThread(True) - return app(wsgi_env, start_response) - finally: - - default_api_stub.DefaultApiStub.SetUseRequestSecurityTicketForThread(False) - - @middleware def WaitForResponseMiddleware(app, wsgi_env, start_response): """WSGI middleware wrapper that waits until response is ready. diff --git a/tests/google/appengine/api/memcache/memcache_unittest.py b/tests/google/appengine/api/memcache/memcache_unittest.py index 8cecbe8..6531eec 100755 --- a/tests/google/appengine/api/memcache/memcache_unittest.py +++ b/tests/google/appengine/api/memcache/memcache_unittest.py @@ -23,6 +23,8 @@ import collections import hashlib +import os +import pickle import google @@ -426,6 +428,29 @@ def testDecodeValueHelperPickledValue(self): six.moves.cPickle.loads) self.assertEqual(my_value, value) + def testPickleCrossCompatibleProtocol(self): + old_proto = pickle.HIGHEST_PROTOCOL - 1 + original_value = {'foo': 'some text', 'bar': ['list', b'of', 3]} + with mock.patch.object( + os, + 'environ', + new={'MEMCACHE_USE_CROSS_COMPATIBLE_PROTOCOL': str(old_proto)}): + client = memcache.Client() + data = client._do_pickle(original_value) + self.assertStartsWith(data, b'\x80' + chr(old_proto).encode()) + value = client._do_unpickle(data) + self.assertEqual(value, original_value) + + def testPickleCrossCompatibleProtocolOldBehavior(self): + original_value = {'foo': 'some text', 'bar': ['list', b'of', 3]} + with mock.patch.object( + os, 'environ', new={'MEMCACHE_USE_CROSS_COMPATIBLE_PROTOCOL': 'true'}): + client = memcache.Client() + data = client._do_pickle(original_value) + self.assertStartsWith(data, b'\x80\x02') + value = client._do_unpickle(data) + self.assertEqual(value, original_value) + def testDecodeValueHelperIntValue(self): """Tests encoding the server value when it's an int.""" my_value = 42 @@ -1770,7 +1795,7 @@ def testDoPickle(self): client = memcache.Client(pickler=six.moves.cPickle.Pickler) stored_value = client._do_pickle(my_value) expected_value = six.moves.cPickle.dumps( - my_value, protocol=six.moves.cPickle.HIGHEST_PROTOCOL) + my_value, protocol=pickle.DEFAULT_PROTOCOL) self.assertEqual(expected_value, stored_value) @@ -1786,7 +1811,7 @@ def testDoPickleWithPersistentId(self): stored_value = client._do_pickle(my_value) pickle_value = six.BytesIO() pickler = six.moves.cPickle.Pickler( - pickle_value, protocol=six.moves.cPickle.HIGHEST_PROTOCOL) + pickle_value, protocol=pickle.DEFAULT_PROTOCOL) pickler.persistent_id = self.PersistentId pickler.dump(my_value) expected_value = pickle_value.getvalue() @@ -1801,7 +1826,7 @@ def testDoUnpickle(self): 'bar': 1.0, } my_value = six.moves.cPickle.dumps( - expected_value, protocol=six.moves.cPickle.HIGHEST_PROTOCOL) + expected_value, protocol=pickle.DEFAULT_PROTOCOL) client = memcache.Client() retrieved_value = client._do_unpickle(my_value) @@ -1817,7 +1842,7 @@ def testDoUnpickleWithPersistentLoad(self): expected_value = {str(my_value): 2} pickle_value = six.BytesIO() pickler = six.moves.cPickle.Pickler( - pickle_value, protocol=six.moves.cPickle.HIGHEST_PROTOCOL) + pickle_value, protocol=pickle.DEFAULT_PROTOCOL) pickler.persistent_id = self.PersistentId pickler.dump(my_value) pickled_value = pickle_value.getvalue() diff --git a/tests/google/appengine/api/modules/modules_test.py b/tests/google/appengine/api/modules/modules_test.py index 2c2209a..68cc7ed 100755 --- a/tests/google/appengine/api/modules/modules_test.py +++ b/tests/google/appengine/api/modules/modules_test.py @@ -44,13 +44,13 @@ def tearDown(self): def testGetCurrentModuleName_DefaultModule(self): """Test get_current_module_name for default engine.""" - os.environ['CURRENT_MODULE_ID'] = 'default' + os.environ['GAE_SERVICE'] = 'default' os.environ['CURRENT_VERSION_ID'] = 'v1.123' self.assertEqual('default', modules.get_current_module_name()) def testGetCurrentModuleName_NonDefaultModule(self): """Test get_current_module_name for a non default engine.""" - os.environ['CURRENT_MODULE_ID'] = 'module1' + os.environ['GAE_SERVICE'] = 'module1' os.environ['CURRENT_VERSION_ID'] = 'v1.123' self.assertEqual('module1', modules.get_current_module_name()) @@ -67,13 +67,13 @@ def testGetCurrentVersionName_DefaultModule(self): def testGetCurrentVersionName_NonDefaultModule(self): """Test get_current_version_name for a non default engine.""" - os.environ['CURRENT_MODULE_ID'] = 'module1' + os.environ['GAE_SERVICE'] = 'module1' os.environ['CURRENT_VERSION_ID'] = 'v1.123' self.assertEqual('v1', modules.get_current_version_name()) def testGetCurrentVersionName_VersionIdContainsNone(self): """Test get_current_version_name when 'None' is in version id.""" - os.environ['CURRENT_MODULE_ID'] = 'module1' + os.environ['GAE_SERVICE'] = 'module1' os.environ['CURRENT_VERSION_ID'] = 'None.123' self.assertEqual(None, modules.get_current_version_name()) diff --git a/tests/google/appengine/ext/ndb/key_test.py b/tests/google/appengine/ext/ndb/key_test.py index eb95f49..6efb068 100755 --- a/tests/google/appengine/ext/ndb/key_test.py +++ b/tests/google/appengine/ext/ndb/key_test.py @@ -92,7 +92,7 @@ def testSerialized(self): e.name = flat[3] serialized = r.SerializeToString() ref_bytes = six.ensure_binary(r.SerializeToString()) - urlsafe = base64.urlsafe_b64encode(ref_bytes).rstrip(b'=') + urlsafe = base64.urlsafe_b64encode(ref_bytes).rstrip(b'=').decode() k = key.Key(flat=flat) self.assertEqual(k.serialized(), serialized) @@ -122,7 +122,7 @@ def testSerialized(self): self.assertEqual(k.reference(), r) k1 = key.Key('A', 1) - self.assertEqual(k1.urlsafe(), b'ag9uZGItdGVzdC1hcHAtaWRyBwsSAUEYAQw') + self.assertEqual(k1.urlsafe(), 'ag9uZGItdGVzdC1hcHAtaWRyBwsSAUEYAQw') k2 = key.Key(urlsafe=k1.urlsafe()) self.assertEqual(k1, k2) @@ -252,7 +252,7 @@ def testUnicode(self): r = k.reference() serialized = k.serialized() urlsafe = k.urlsafe() - key.Key(urlsafe=urlsafe.decode('utf8')) + key.Key(urlsafe=urlsafe) key.Key(serialized=serialized.decode('utf8')) key.Key(reference=r) diff --git a/tests/google/appengine/ext/ndb/query_test.py b/tests/google/appengine/ext/ndb/query_test.py index d86f16d..c22a099 100755 --- a/tests/google/appengine/ext/ndb/query_test.py +++ b/tests/google/appengine/ext/ndb/query_test.py @@ -2036,7 +2036,7 @@ def fetch_from_queue(qry, offset): self.hugeOffsetTestHelper(fetch_from_queue) def testQueryPickleFilter(self): - for protocol in (0, pickle.HIGHEST_PROTOCOL): + for protocol in (0, pickle.DEFAULT_PROTOCOL): q = query.Query(kind='Foo').filter(Foo.rate == 1) new_q = pickle.loads(pickle.dumps(q, protocol=protocol)) @@ -2045,7 +2045,7 @@ def testQueryPickleFilter(self): self.assertIsInstance(new_q.filters, query.FilterNode) def testQueryPickleParameterAndConjunction(self): - for protocol in (0, pickle.HIGHEST_PROTOCOL): + for protocol in (0, pickle.DEFAULT_PROTOCOL): q = query.gql('SELECT * FROM Foo WHERE name = :1 AND rate = :foo') new_q = pickle.loads(pickle.dumps(q, protocol=protocol)) @@ -2062,7 +2062,7 @@ class Struct(model.Model): class Bar(model.Model): prop = model.StructuredProperty(Struct, repeated=True) - for protocol in (0, pickle.HIGHEST_PROTOCOL): + for protocol in (0, pickle.DEFAULT_PROTOCOL): q = query.Query(kind='Bar').filter( Bar.prop == Struct(other_prop='foo', other_other_prop=1)) new_q = pickle.loads(pickle.dumps(q, protocol=protocol)) diff --git a/tests/google/appengine/ext/ndb/utils_test.py b/tests/google/appengine/ext/ndb/utils_test.py index 039ad71..282379f 100755 --- a/tests/google/appengine/ext/ndb/utils_test.py +++ b/tests/google/appengine/ext/ndb/utils_test.py @@ -69,7 +69,7 @@ def testWrapping(self): def testDecoratorPicklingUnpickling(self): tup = (sum_func, 3, 3) - s = pickle.dumps(tup, protocol=pickle.HIGHEST_PROTOCOL) + s = pickle.dumps(tup, protocol=pickle.DEFAULT_PROTOCOL) f, x, y = pickle.loads(s) actual = f(x, y) self.assertEqual(36, actual) diff --git a/tox.ini b/tox.ini index 5abcffc..c08d9c2 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ python_files = *_test.py *_unittest.py [tox] -envlist = py{37,38,39,310} +envlist = py{37,38,39,310,311} [testenv] setenv = @@ -23,7 +23,7 @@ deps = google-auth mock Pillow - protobuf + protobuf < 4 pytz requests ruamel.yaml