codestyles fixes

Author: vgvoleg

examples/query-service/basic_example.py

@@ -26,6 +26,5 @@ def main():
         print(f"rows: {str(result_set.rows)}")
 
 
-
 if __name__ == '__main__':
-    main()
+    main()

tests/query/conftest.py

@@ -13,6 +13,7 @@ def session(driver_sync):
     except BaseException:
         pass
 
+
 @pytest.fixture
 def tx(session):
     session.create()
@@ -24,4 +25,3 @@ def tx(session):
         transaction.rollback()
     except BaseException:
         pass
-

tests/query/test_query_session.py

@@ -1,14 +1,17 @@
 import pytest
 
+
 def _check_session_state_empty(session):
-    assert session._state.session_id == None
-    assert session._state.node_id == None
-    assert session._state.attached == False
+    assert session._state.session_id is None
+    assert session._state.node_id is None
+    assert not session._state.attached
+
 
 def _check_session_state_full(session):
-    assert session._state.session_id != None
-    assert session._state.node_id != None
-    assert session._state.attached == True
+    assert session._state.session_id is not None
+    assert session._state.node_id is not None
+    assert session._state.attached
+
 
 class TestQuerySession:
     def test_session_normal_lifecycle(self, session):
@@ -83,4 +86,4 @@ def test_basic_execute(self, session):
         assert len(result_sets) == 1
         assert len(result_sets[0].rows) == 1
         assert len(result_sets[0].columns) == 1
-        assert list(result_sets[0].rows[0].values()) == [1]
+        assert list(result_sets[0].rows[0].values()) == [1]

tests/query/test_query_transaction.py

@@ -2,10 +2,10 @@
 
 class TestQueryTransaction:
     def test_tx_begin(self, tx):
-        assert tx.tx_id == None
+        assert tx.tx_id is None
 
         tx.begin()
-        assert tx.tx_id != None
+        assert tx.tx_id is not None
 
     def test_tx_allow_double_commit(self, tx):
         tx.begin()
@@ -40,5 +40,3 @@ def text_tx_execute_raises_after_rollback(self, tx):
         tx.rollback()
         with pytest.raises(RuntimeError):
             tx.execute("select 1;")
-
-

ydb/_grpc/grpcwrapper/common_utils.py

@@ -247,7 +247,6 @@ async def _start_sync_driver(self, driver: ydb.Driver, request, stub, method):
         self.from_server_grpc = SyncToAsyncIterator(stream_call.__iter__(), self._wait_executor)
 
 
-
 @dataclass(init=False)
 class ServerStatus(IFromProto):
     __slots__ = ("_grpc_status_code", "_issues")

ydb/_grpc/grpcwrapper/ydb_query.py

@@ -2,7 +2,6 @@
 import typing
 from typing import Optional
 
-from google.protobuf.message import Message
 
 # Workaround for good IDE and universal for runtime
 if typing.TYPE_CHECKING:
@@ -14,16 +13,9 @@
 
 from .common_utils import (
     IFromProto,
-    IFromProtoWithProtoType,
     IToProto,
-    IToPublic,
     IFromPublic,
     ServerStatus,
-    UnknownGrpcMessageError,
-    proto_duration_from_timedelta,
-    proto_timestamp_from_datetime,
-    datetime_from_proto_timestamp,
-    timedelta_from_proto_duration,
 )
 
 @dataclass
@@ -57,14 +49,6 @@ class AttachSessionRequest(IToProto):
     def to_proto(self) -> ydb_query_pb2.AttachSessionRequest:
         return ydb_query_pb2.AttachSessionRequest(session_id=self.session_id)
 
-# @dataclass
-# class SessionState(IFromProto):
-#     status: Optional[ServerStatus]
-
-#     @staticmethod
-#     def from_proto(msg: ydb_query_pb2.SessionState) -> "SessionState":
-#         return SessionState(status=ServerStatus(msg.status, msg.issues))
-
 
 @dataclass
 class TransactionMeta(IFromProto):
@@ -93,6 +77,7 @@ def to_proto(self) -> ydb_query_pb2.TransactionSettings:
         if self.tx_mode.name == 'stale_read_only':
             return ydb_query_pb2.TransactionSettings(stale_read_only=self.tx_mode.to_proto())
 
+
 @dataclass
 class BeginTransactionRequest(IToProto):
     session_id: str
@@ -104,6 +89,7 @@ def to_proto(self) -> ydb_query_pb2.BeginTransactionRequest:
             tx_settings=self.tx_settings.to_proto(),
             )
 
+
 @dataclass
 class BeginTransactionResponse(IFromProto):
     status: Optional[ServerStatus]

ydb/_grpc/grpcwrapper/ydb_query_public_types.py

@@ -1,8 +1,6 @@
 import abc
 import typing
 
-from google.protobuf.message import Message
-
 from .common_utils import IToProto
 
 # Workaround for good IDE and universal for runtime

ydb/query/base.py

@@ -1,5 +1,4 @@
 import abc
-import enum
 import functools
 
 from typing import (
@@ -17,7 +16,9 @@
 from .. import convert
 from .. import issues
 
-class QueryClientSettings: ...
+
+class QueryClientSettings:
+    pass
 
 
 class IQuerySessionState(abc.ABC):
@@ -153,6 +154,7 @@ def create_execute_query_request(query: str, session_id: str, tx_id: str = None,
 
     return req.to_proto()
 
+
 def wrap_execute_query_response(rpc_state, response_pb):
     return convert.ResultSet.from_message(response_pb.result_set)
 
@@ -177,4 +179,4 @@ def decorator(rpc_state, response_pb, session_state, *args, **kwargs):
             session_state.reset()
             raise
 
-    return decorator
+    return decorator

ydb/query/session.py

@@ -1,14 +1,9 @@
 import abc
-from abc import abstractmethod
-import asyncio
-import concurrent
 import enum
 import logging
 import threading
 from typing import (
-    Any,
     Optional,
-    Set,
 )
 
 from . import base
@@ -168,6 +163,7 @@ def _execute_call(self, query: str, commit_tx: bool):
             _apis.QueryService.ExecuteQuery,
         )
 
+
 class QuerySessionSync(BaseQuerySession):
     _stream = None
 
@@ -236,4 +232,4 @@ def execute(self, query: str, parameters=None):
         return _utilities.SyncResponseIterator(
             stream_it,
             lambda resp: base.wrap_execute_query_response(rpc_state=None, response_pb=resp),
-        )
+        )

ydb/query/transaction.py

@@ -107,6 +107,7 @@ def _create_commit_transaction_request(session_state, tx_state):
     request.session_id = session_state.session_id
     return request
 
+
 def _create_rollback_transaction_request(session_state, tx_state):
     request = _apis.ydb_query.RollbackTransactionRequest()
     request.tx_id = tx_state.tx_id
@@ -132,6 +133,7 @@ def wrap_tx_commit_response(rpc_state, response_pb, session_state, tx_state, tx)
     tx_state._change_state(QueryTxStateEnum.COMMITTED)
     return tx
 
+
 @base.bad_session_handler
 @reset_tx_id_handler
 def wrap_tx_rollback_response(rpc_state, response_pb, session_state, tx_state, tx):