Merge pull request #384 from evaline-ju/err-details

🥅 Handle error details on inactive rpc errors
caikit · Aug 19, 2024 · a55b72e · a55b72e
2 parents d7cca1a + 723ade9
commit a55b72e
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/caikit_nlp/toolkit/text_generation/tgis_utils.py b/caikit_nlp/toolkit/text_generation/tgis_utils.py
@@ -476,13 +476,16 @@ def unary_generate(
                     request, timeout=self.tgis_req_timeout
                 )
             except grpc._channel._InactiveRpcError as err:
-                log.error("<NLP30829218E>", err.details)
+                details = err.details()
+                log.error("<NLP30829218E>", details)
                 caikit_status_code = GRPC_TO_CAIKIT_CORE_STATUS.get(
                     err.code(), CaikitCoreStatusCode.UNKNOWN
                 )
-                raise CaikitCoreException(
-                    caikit_status_code, INACTIVE_RPC_CONN_ERR_MESSAGE
-                ) from err
+                if caikit_status_code == CaikitCoreStatusCode.CONNECTION_ERROR:
+                    raise CaikitCoreException(
+                        caikit_status_code, INACTIVE_RPC_CONN_ERR_MESSAGE
+                    ) from err
+                raise CaikitCoreException(caikit_status_code, details) from err
             except grpc.RpcError as err:
                 raise_caikit_core_exception(err)
 
@@ -663,13 +666,16 @@ def stream_generate(
                     details=details,
                 )
         except grpc._channel._InactiveRpcError as err:
-            log.error("<NLP11829118E>", err.details)
+            details = err.details()
+            log.error("<NLP11829118E>", details)
             caikit_status_code = GRPC_TO_CAIKIT_CORE_STATUS.get(
                 err.code(), CaikitCoreStatusCode.UNKNOWN
             )
-            raise CaikitCoreException(
-                caikit_status_code, INACTIVE_RPC_CONN_ERR_MESSAGE
-            ) from err
+            if caikit_status_code == CaikitCoreStatusCode.CONNECTION_ERROR:
+                raise CaikitCoreException(
+                    caikit_status_code, INACTIVE_RPC_CONN_ERR_MESSAGE
+                ) from err
+            raise CaikitCoreException(caikit_status_code, details) from err
         except grpc.RpcError as err:
             raise_caikit_core_exception(err)