gnetclisdk 1.0.62__py3-none-any.whl → 1.0.68__py3-none-any.whl

gnetclisdk/exceptions.py

@@ -1,5 +1,5 @@
 from typing import Optional, Sequence, Tuple, Type, Union
-
+from google.rpc import error_details_pb2, status_pb2
 import grpc.aio
 
 MetadataType = Sequence[Tuple[str, Union[str, bytes]]]
@@ -65,6 +65,14 @@ class ExecError(GnetcliException):
     pass
 
 
+class EOFError(GnetcliException):
+    """
+    EOF error.
+    """
+
+    pass
+
+
 class NotReady(GnetcliException):
     """
     Server is not ready.
@@ -90,10 +98,28 @@ class PermissionDenied(GnetcliException):
 
 
 def parse_grpc_error(grpc_error: grpc.aio.AioRpcError) -> Tuple[Type[GnetcliException], str]:
+    rich_statuses = []
+    for key, value in grpc_error.trailing_metadata():
+        if key == "grpc-status-details-bin":
+            rich_status = status_pb2.Status.FromString(value)
+            for rdetail in rich_status.details:
+                if rdetail.Is(error_details_pb2.ErrorInfo.DESCRIPTOR):
+                    error_info = error_details_pb2.ErrorInfo()
+                    rdetail.Unpack(error_info)
+                    rich_statuses.append(error_info)
+            break
+    error_info = None
+    if len(rich_statuses) > 1:
+        raise Exception("unexpected rich_statuses len %s", len(rich_statuses))
+    elif len(rich_statuses) == 1:
+        error_info = rich_statuses[0]
+
     code = grpc_error.code()
     detail = ""
     if grpc_error.details():
         detail = grpc_error.details()  # type: ignore
+    reason = error_info.reason
+    metadata = dict(error_info.metadata)
     if code == grpc.StatusCode.UNAVAILABLE and detail == "not ready":
         return NotReady, ""
     if code == grpc.StatusCode.UNAUTHENTICATED:
@@ -103,10 +129,13 @@ def parse_grpc_error(grpc_error: grpc.aio.AioRpcError) -> Tuple[Type[GnetcliExce
     if code == grpc.StatusCode.OUT_OF_RANGE:
         return UnknownDevice, detail
     if code == grpc.StatusCode.INTERNAL:
-        if detail == "auth_device_error":
+        if reason == "error_eof":  # new way: pass errors using error_details
+            verbose = str(metadata)
+            return EOFError, verbose
+        elif detail == "auth_device_error":
             verbose = ""
             return DeviceAuthError, verbose
-        if detail in {"connection_error", "busy_error"}:
+        elif detail in {"connection_error", "busy_error"}:
             verbose = ""
             return DeviceConnectError, verbose
         elif detail in {"exec_error", "generic_error"}:

{gnetclisdk-1.0.62.dist-info → gnetclisdk-1.0.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gnetclisdk
-Version: 1.0.62
+Version: 1.0.68
 Summary: Client for Gnetcli GRPC-server
 Home-page: https://github.com/annetutil/gnetcli
 Author: Alexander Balezin

{gnetclisdk-1.0.62.dist-info → gnetclisdk-1.0.68.dist-info}/RECORD

@@ -1,11 +1,11 @@
 gnetclisdk/auth.py,sha256=GwM7H7Ecb-gwqUTkQorifNB_mtnZfgeS46gOW2Vx1U4,1246
 gnetclisdk/client.py,sha256=VjbXL11xAUYRX5e6tnedTt6X7_lvvhysYm04EFbhtl8,19773
-gnetclisdk/exceptions.py,sha256=d0Bcq8tnAzemCuCCrGJEmL_A1IQxCCLFRCwDhr9zvkU,2683
+gnetclisdk/exceptions.py,sha256=-dw6sIkPySymabb4XRcUA3FeqpJOtZU-t21sqvEQa8E,3728
 gnetclisdk/interceptors.py,sha256=apj3l4lnR2ZcsA49odptrBC0kTDmP6Mp0EzYkeEJz9Y,7010
 gnetclisdk/proto/server_pb2.py,sha256=OQsW6Oh38zf-h1ctcNyeOyxjl5wzWm_D9SRT2Usx5q4,8083
 gnetclisdk/proto/server_pb2.pyi,sha256=th-HnFVkR1ZEY-XmFmk8VMfDj_4uFAoSAXH61mSlVec,8295
 gnetclisdk/proto/server_pb2_grpc.py,sha256=H_CmevWcjvGTvp4TmzEV-TJRPq2SsQ6UgoCDc-hosyo,12805
-gnetclisdk-1.0.62.dist-info/METADATA,sha256=NBaUGP2HeX42xuV4LhMgFJ5x6Ebkujt4DSikK9sLCYc,1793
-gnetclisdk-1.0.62.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gnetclisdk-1.0.62.dist-info/top_level.txt,sha256=MNjS8LEt6d2rZ-dUbV2cnqkuTMu3EqEL2eiSvUZuUlA,11
-gnetclisdk-1.0.62.dist-info/RECORD,,
+gnetclisdk-1.0.68.dist-info/METADATA,sha256=7pCJowx1b22jywhn6kJgLE7VxMBEpR2xUae4IyVUsQM,1793
+gnetclisdk-1.0.68.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gnetclisdk-1.0.68.dist-info/top_level.txt,sha256=MNjS8LEt6d2rZ-dUbV2cnqkuTMu3EqEL2eiSvUZuUlA,11
+gnetclisdk-1.0.68.dist-info/RECORD,,