chore(ndb): add missing format session and modernize lint and blacken sessions

packages/google-cloud-ndb/google/cloud/ndb/__init__.py

@@ -25,110 +25,115 @@
 
 __version__: str = version.__version__
 
+from google.cloud.ndb._datastore_api import EVENTUAL, EVENTUAL_CONSISTENCY, STRONG
+from google.cloud.ndb._datastore_query import Cursor, QueryIterator
+from google.cloud.ndb._transaction import (
+    in_transaction,
+    non_transactional,
+    transaction,
+    transaction_async,
+    transactional,
+    transactional_async,
+    transactional_tasklet,
+)
 from google.cloud.ndb.client import Client
-from google.cloud.ndb.context import AutoBatcher
-from google.cloud.ndb.context import Context
-from google.cloud.ndb.context import ContextOptions
-from google.cloud.ndb.context import get_context
-from google.cloud.ndb.context import get_toplevel_context
-from google.cloud.ndb.context import TransactionOptions
-from google.cloud.ndb._datastore_api import EVENTUAL
-from google.cloud.ndb._datastore_api import EVENTUAL_CONSISTENCY
-from google.cloud.ndb._datastore_api import STRONG
-from google.cloud.ndb._datastore_query import Cursor
-from google.cloud.ndb._datastore_query import QueryIterator
-from google.cloud.ndb.global_cache import GlobalCache
-from google.cloud.ndb.global_cache import MemcacheCache
-from google.cloud.ndb.global_cache import RedisCache
+from google.cloud.ndb.context import (
+    AutoBatcher,
+    Context,
+    ContextOptions,
+    TransactionOptions,
+    get_context,
+    get_toplevel_context,
+)
+from google.cloud.ndb.global_cache import GlobalCache, MemcacheCache, RedisCache
 from google.cloud.ndb.key import Key
-from google.cloud.ndb.model import BlobKey
-from google.cloud.ndb.model import BlobKeyProperty
-from google.cloud.ndb.model import BlobProperty
-from google.cloud.ndb.model import BooleanProperty
-from google.cloud.ndb.model import ComputedProperty
-from google.cloud.ndb.model import ComputedPropertyError
-from google.cloud.ndb.model import DateProperty
-from google.cloud.ndb.model import DateTimeProperty
-from google.cloud.ndb.model import delete_multi
-from google.cloud.ndb.model import delete_multi_async
-from google.cloud.ndb.model import Expando
-from google.cloud.ndb.model import FloatProperty
-from google.cloud.ndb.model import GenericProperty
-from google.cloud.ndb.model import GeoPt
-from google.cloud.ndb.model import GeoPtProperty
-from google.cloud.ndb.model import get_indexes
-from google.cloud.ndb.model import get_indexes_async
-from google.cloud.ndb.model import get_multi
-from google.cloud.ndb.model import get_multi_async
-from google.cloud.ndb.model import Index
-from google.cloud.ndb.model import IndexProperty
-from google.cloud.ndb.model import IndexState
-from google.cloud.ndb.model import IntegerProperty
-from google.cloud.ndb.model import InvalidPropertyError
-from google.cloud.ndb.model import BadProjectionError
-from google.cloud.ndb.model import JsonProperty
-from google.cloud.ndb.model import KeyProperty
-from google.cloud.ndb.model import KindError
-from google.cloud.ndb.model import LocalStructuredProperty
-from google.cloud.ndb.model import make_connection
-from google.cloud.ndb.model import MetaModel
-from google.cloud.ndb.model import Model
-from google.cloud.ndb.model import ModelAdapter
-from google.cloud.ndb.model import ModelAttribute
-from google.cloud.ndb.model import ModelKey
-from google.cloud.ndb.model import PickleProperty
-from google.cloud.ndb.model import Property
-from google.cloud.ndb.model import put_multi
-from google.cloud.ndb.model import put_multi_async
-from google.cloud.ndb.model import ReadonlyPropertyError
-from google.cloud.ndb.model import Rollback
-from google.cloud.ndb.model import StringProperty
-from google.cloud.ndb.model import StructuredProperty
-from google.cloud.ndb.model import TextProperty
-from google.cloud.ndb.model import TimeProperty
-from google.cloud.ndb.model import UnprojectedPropertyError
-from google.cloud.ndb.model import User
-from google.cloud.ndb.model import UserNotFoundError
-from google.cloud.ndb.model import UserProperty
+from google.cloud.ndb.model import (
+    BadProjectionError,
+    BlobKey,
+    BlobKeyProperty,
+    BlobProperty,
+    BooleanProperty,
+    ComputedProperty,
+    ComputedPropertyError,
+    DateProperty,
+    DateTimeProperty,
+    Expando,
+    FloatProperty,
+    GenericProperty,
+    GeoPt,
+    GeoPtProperty,
+    Index,
+    IndexProperty,
+    IndexState,
+    IntegerProperty,
+    InvalidPropertyError,
+    JsonProperty,
+    KeyProperty,
+    KindError,
+    LocalStructuredProperty,
+    MetaModel,
+    Model,
+    ModelAdapter,
+    ModelAttribute,
+    ModelKey,
+    PickleProperty,
+    Property,
+    ReadonlyPropertyError,
+    Rollback,
+    StringProperty,
+    StructuredProperty,
+    TextProperty,
+    TimeProperty,
+    UnprojectedPropertyError,
+    User,
+    UserNotFoundError,
+    UserProperty,
+    delete_multi,
+    delete_multi_async,
+    get_indexes,
+    get_indexes_async,
+    get_multi,
+    get_multi_async,
+    make_connection,
+    put_multi,
+    put_multi_async,
+)
 from google.cloud.ndb.polymodel import PolyModel
-from google.cloud.ndb.query import ConjunctionNode
-from google.cloud.ndb.query import AND
-from google.cloud.ndb.query import DisjunctionNode
-from google.cloud.ndb.query import OR
-from google.cloud.ndb.query import FalseNode
-from google.cloud.ndb.query import FilterNode
-from google.cloud.ndb.query import gql
-from google.cloud.ndb.query import Node
-from google.cloud.ndb.query import Parameter
-from google.cloud.ndb.query import ParameterizedFunction
-from google.cloud.ndb.query import ParameterizedThing
-from google.cloud.ndb.query import ParameterNode
-from google.cloud.ndb.query import PostFilterNode
-from google.cloud.ndb.query import Query
-from google.cloud.ndb.query import QueryOptions
-from google.cloud.ndb.query import RepeatedStructuredPropertyPredicate
-from google.cloud.ndb.tasklets import add_flow_exception
-from google.cloud.ndb.tasklets import Future
-from google.cloud.ndb.tasklets import make_context
-from google.cloud.ndb.tasklets import make_default_context
-from google.cloud.ndb.tasklets import QueueFuture
-from google.cloud.ndb.tasklets import ReducingFuture
-from google.cloud.ndb.tasklets import Return
-from google.cloud.ndb.tasklets import SerialQueueFuture
-from google.cloud.ndb.tasklets import set_context
-from google.cloud.ndb.tasklets import sleep
-from google.cloud.ndb.tasklets import synctasklet
-from google.cloud.ndb.tasklets import tasklet
-from google.cloud.ndb.tasklets import toplevel
-from google.cloud.ndb.tasklets import wait_all
-from google.cloud.ndb.tasklets import wait_any
-from google.cloud.ndb._transaction import in_transaction
-from google.cloud.ndb._transaction import transaction
-from google.cloud.ndb._transaction import transaction_async
-from google.cloud.ndb._transaction import transactional
-from google.cloud.ndb._transaction import transactional_async
-from google.cloud.ndb._transaction import transactional_tasklet
-from google.cloud.ndb._transaction import non_transactional
+from google.cloud.ndb.query import (
+    AND,
+    OR,
+    ConjunctionNode,
+    DisjunctionNode,
+    FalseNode,
+    FilterNode,
+    Node,
+    Parameter,
+    ParameterizedFunction,
+    ParameterizedThing,
+    ParameterNode,
+    PostFilterNode,
+    Query,
+    QueryOptions,
+    RepeatedStructuredPropertyPredicate,
+    gql,
+)
+from google.cloud.ndb.tasklets import (
+    Future,
+    QueueFuture,
+    ReducingFuture,
+    Return,
+    SerialQueueFuture,
+    add_flow_exception,
+    make_context,
+    make_default_context,
+    set_context,
+    sleep,
+    synctasklet,
+    tasklet,
+    toplevel,
+    wait_all,
+    wait_any,
+)
 
 __all__ = [
     "__version__",

packages/google-cloud-ndb/google/cloud/ndb/_cache.py

@@ -20,10 +20,8 @@
 
 from google.api_core import retry as core_retry
 
-from google.cloud.ndb import _batch
+from google.cloud.ndb import _batch, tasklets, utils
 from google.cloud.ndb import context as context_module
-from google.cloud.ndb import tasklets
-from google.cloud.ndb import utils
 
 _LOCKED_FOR_READ = b"0-"
 _LOCKED_FOR_WRITE = b"00"

packages/google-cloud-ndb/google/cloud/ndb/_datastore_api.py

@@ -14,25 +14,27 @@
 
 """Functions that interact with Datastore backend."""
 
-import grpc
 import itertools
 import logging
 
+import grpc
 from google.api_core import exceptions as core_exceptions
 from google.api_core import gapic_v1
 from google.cloud.datastore import helpers
 from google.cloud.datastore_v1.types import datastore as datastore_pb2
 from google.cloud.datastore_v1.types import entity as entity_pb2
 
+from google.cloud.ndb import (
+    _batch,
+    _cache,
+    _eventloop,
+    _options,
+    _remote,
+    _retry,
+    tasklets,
+    utils,
+)
 from google.cloud.ndb import context as context_module
-from google.cloud.ndb import _batch
-from google.cloud.ndb import _cache
-from google.cloud.ndb import _eventloop
-from google.cloud.ndb import _options
-from google.cloud.ndb import _remote
-from google.cloud.ndb import _retry
-from google.cloud.ndb import tasklets
-from google.cloud.ndb import utils
 
 EVENTUAL = datastore_pb2.ReadOptions.ReadConsistency.EVENTUAL
 EVENTUAL_CONSISTENCY = EVENTUAL  # Legacy NDB

packages/google-cloud-ndb/google/cloud/ndb/_datastore_query.py

@@ -20,20 +20,15 @@
 import logging
 import os
 
-from google.cloud import environment_vars
-
+from google.cloud.datastore import Key, helpers
 from google.cloud.datastore_v1.types import datastore as datastore_pb2
 from google.cloud.datastore_v1.types import entity as entity_pb2
 from google.cloud.datastore_v1.types import query as query_pb2
-from google.cloud.datastore import helpers, Key
 
+from google.cloud import environment_vars
+from google.cloud.ndb import _datastore_api, exceptions, model, tasklets, utils
 from google.cloud.ndb import context as context_module
-from google.cloud.ndb import _datastore_api
-from google.cloud.ndb import exceptions
 from google.cloud.ndb import key as key_module
-from google.cloud.ndb import model
-from google.cloud.ndb import tasklets
-from google.cloud.ndb import utils
 
 log = logging.getLogger(__name__)
 

packages/google-cloud-ndb/google/cloud/ndb/_datastore_types.py

@@ -24,7 +24,6 @@
 
 from google.cloud.ndb import exceptions
 
-
 _MAX_STRING_LENGTH = 1500
 
 
@@ -55,12 +54,13 @@ def __init__(self, blob_key):
         if isinstance(blob_key, bytes):
             if len(blob_key) > _MAX_STRING_LENGTH:
                 raise exceptions.BadValueError(
-                    "blob key must be under {:d} " "bytes.".format(_MAX_STRING_LENGTH)
+                    "blob key must be under {:d} bytes.".format(_MAX_STRING_LENGTH)
                 )
         elif blob_key is not None:
             raise exceptions.BadValueError(
-                "blob key should be bytes; received "
-                "{} (a {})".format(blob_key, type(blob_key).__name__)
+                "blob key should be bytes; received {} (a {})".format(
+                    blob_key, type(blob_key).__name__
+                )
             )
 
         self._blob_key = blob_key

packages/google-cloud-ndb/google/cloud/ndb/_eventloop.py

@@ -16,12 +16,12 @@
 
 This should handle both asynchronous ``ndb`` objects and arbitrary callbacks.
 """
+
 import collections
 import logging
-import uuid
-import time
-
 import queue
+import time
+import uuid
 
 from google.cloud.ndb import utils
 

packages/google-cloud-ndb/google/cloud/ndb/_gql.py

@@ -3,12 +3,9 @@
 import time
 from typing import Any
 
+from google.cloud.ndb import _datastore_query, exceptions, key, model
 from google.cloud.ndb import context as context_module
-from google.cloud.ndb import exceptions
 from google.cloud.ndb import query as query_module
-from google.cloud.ndb import key
-from google.cloud.ndb import model
-from google.cloud.ndb import _datastore_query
 
 
 class GQL(object):

packages/google-cloud-ndb/google/cloud/ndb/_legacy_protocol_buffer.py

@@ -16,7 +16,6 @@
 import array
 import struct
 
-
 # Python 3 doesn't have "long" anymore
 long = int
 

packages/google-cloud-ndb/google/cloud/ndb/_options.py

@@ -17,9 +17,9 @@
 import functools
 import itertools
 import logging
+from typing import Any
 
 from google.cloud.ndb import exceptions
-from typing import Any
 
 log = logging.getLogger(__name__)
 
@@ -135,8 +135,7 @@ def __init__(self, config=None, **kwargs):
             global_cache_timeout = kwargs.get("global_cache_timeout")
             if global_cache_timeout is not None:
                 raise TypeError(
-                    "Can't specify both 'memcache_timeout' and "
-                    "'global_cache_timeout'"
+                    "Can't specify both 'memcache_timeout' and 'global_cache_timeout'"
                 )
             kwargs["global_cache_timeout"] = memcache_timeout
 
@@ -223,7 +222,7 @@ def __init__(self, config=None, **kwargs):
             )
             if kwargs.get("read_consistency"):
                 raise TypeError(
-                    "Cannot use both 'read_policy' and 'read_consistency' " "options."
+                    "Cannot use both 'read_policy' and 'read_consistency' options."
                 )
             kwargs["read_consistency"] = read_policy
 

packages/google-cloud-ndb/google/cloud/ndb/_remote.py

@@ -16,9 +16,10 @@
 
 # In its own module to avoid circular import between _datastore_api and
 # tasklets modules.
-import grpc
 import time
 
+import grpc
+
 from google.cloud.ndb import exceptions