Replace hard exception with soft logs (#14179)

This reverts commit eb91fde.
JohnSnowLabs · Feb 19, 2024 · 94f6900 · 94f6900
1 parent 5067417
commit 94f6900
Show file tree

Hide file tree

Showing 19 changed files with 156 additions and 129 deletions.
diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/Albert.scala b/src/main/scala/com/johnsnowlabs/ml/ai/Albert.scala
@@ -140,18 +140,20 @@ private[johnsnowlabs] class Albert(
               .asInstanceOf[OnnxTensor]
               .getFloatBuffer
               .array()
-            tokenTensors.close()
-            maskTensors.close()
-            segmentTensors.close()
 
             embeddings
           } finally if (results != null) results.close()
         } catch {
           case e: Exception =>
-            // Log the exception as a warning
-            logger.warn("Exception: ", e)
-          // Rethrow the exception to propagate it further
-          // throw e
+            // Handle exceptions by logging or other means.
+            e.printStackTrace()
+            Array.empty[Float] // Return an empty array or appropriate error handling
+        } finally {
+          // Close tensors outside the try-catch to avoid repeated null checks.
+          // These resources are initialized before the try-catch, so they should be closed here.
+          tokenTensors.close()
+          maskTensors.close()
+          segmentTensors.close()
         }
       case _ =>
         val tensors = new TensorResources()

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/AlbertClassification.scala b/src/main/scala/com/johnsnowlabs/ml/ai/AlbertClassification.scala
@@ -241,20 +241,20 @@ private[johnsnowlabs] class AlbertClassification(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
-        segmentTensors.close()
 
         embeddings
-      } finally {
-        if (results != null) results.close()
-      }
+      } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Float] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
+      segmentTensors.close()
     }
   }
 

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/BGE.scala b/src/main/scala/com/johnsnowlabs/ml/ai/BGE.scala
@@ -190,20 +190,22 @@ private[johnsnowlabs] class BGE(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
-        segmentTensors.close()
 
         val embeddings = LinAlg.avgPooling(flattenEmbeddings, attentionMask, shape)
         val normalizedEmbeddings = LinAlg.l2Normalize(embeddings)
         LinAlg.denseMatrixToArray(normalizedEmbeddings)
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Array[Float]] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
+      segmentTensors.close()
     }
   }
 

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/Bert.scala b/src/main/scala/com/johnsnowlabs/ml/ai/Bert.scala
@@ -121,20 +121,20 @@ private[johnsnowlabs] class Bert(
               .asInstanceOf[OnnxTensor]
               .getFloatBuffer
               .array()
-            tokenTensors.close()
-            maskTensors.close()
-            segmentTensors.close()
-            //    runner.close()
-            //    env.close()
-            //
+
             embeddings
           } finally if (results != null) results.close()
         } catch {
           case e: Exception =>
-            // Log the exception as a warning
-            logger.warn("Exception: ", e)
-            // Rethrow the exception to propagate it further
-            // throw e
+            // Handle exceptions by logging or other means.
+            e.printStackTrace()
+            Array.empty[Float] // Return an empty array or appropriate error handling
+        } finally {
+          // Close tensors outside the try-catch to avoid repeated null checks.
+          // These resources are initialized before the try-catch, so they should be closed here.
+          tokenTensors.close()
+          maskTensors.close()
+          segmentTensors.close()
         }
       case _ =>
         val tensors = new TensorResources()
@@ -242,7 +242,7 @@ private[johnsnowlabs] class Bert(
             // Log the exception as a warning
             logger.warn("Exception: ", e)
             // Rethrow the exception to propagate it further
-            // throw e
+            throw e
         }
       case _ =>
         val tensors = new TensorResources()

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/BertClassification.scala b/src/main/scala/com/johnsnowlabs/ml/ai/BertClassification.scala
@@ -252,18 +252,20 @@ private[johnsnowlabs] class BertClassification(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
-        segmentTensors.close()
 
         embeddings
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Float] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
+      segmentTensors.close()
     }
 
   }

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/CamemBert.scala b/src/main/scala/com/johnsnowlabs/ml/ai/CamemBert.scala
@@ -108,17 +108,19 @@ private[johnsnowlabs] class CamemBert(
               .asInstanceOf[OnnxTensor]
               .getFloatBuffer
               .array()
-            tokenTensors.close()
-            maskTensors.close()
 
             embeddings
           } finally if (results != null) results.close()
         } catch {
           case e: Exception =>
-            // Log the exception as a warning
-            logger.warn("Exception: ", e)
-            // Rethrow the exception to propagate it further
-            // throw e
+            // Handle exceptions by logging or other means.
+            e.printStackTrace()
+            Array.empty[Float] // Return an empty array or appropriate error handling
+        } finally {
+          // Close tensors outside the try-catch to avoid repeated null checks.
+          // These resources are initialized before the try-catch, so they should be closed here.
+          tokenTensors.close()
+          maskTensors.close()
         }
       case _ =>
         val tensors = new TensorResources()

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/CamemBertClassification.scala b/src/main/scala/com/johnsnowlabs/ml/ai/CamemBertClassification.scala
@@ -215,17 +215,19 @@ private[johnsnowlabs] class CamemBertClassification(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
 
         embeddings
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Float] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
     }
   }
 

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/DeBerta.scala b/src/main/scala/com/johnsnowlabs/ml/ai/DeBerta.scala
@@ -95,20 +95,20 @@ class DeBerta(
               .asInstanceOf[OnnxTensor]
               .getFloatBuffer
               .array()
-            tokenTensors.close()
-            maskTensors.close()
-            segmentTensors.close()
-            //    runner.close()
-            //    env.close()
-            //
+
             embeddings
           } finally if (results != null) results.close()
         } catch {
           case e: Exception =>
-            // Log the exception as a warning
-            logger.warn("Exception: ", e)
-            // Rethrow the exception to propagate it further
-            // throw e
+            // Handle exceptions by logging or other means.
+            e.printStackTrace()
+            Array.empty[Float] // Return an empty array or appropriate error handling
+        } finally {
+          // Close tensors outside the try-catch to avoid repeated null checks.
+          // These resources are initialized before the try-catch, so they should be closed here.
+          tokenTensors.close()
+          maskTensors.close()
+          segmentTensors.close()
         }
       case _ =>
         val tensors = new TensorResources()

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/DeBertaClassification.scala b/src/main/scala/com/johnsnowlabs/ml/ai/DeBertaClassification.scala
@@ -224,17 +224,19 @@ private[johnsnowlabs] class DeBertaClassification(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
 
         embeddings
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Float] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
     }
   }
 

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/DistilBert.scala b/src/main/scala/com/johnsnowlabs/ml/ai/DistilBert.scala
@@ -128,17 +128,19 @@ private[johnsnowlabs] class DistilBert(
               .asInstanceOf[OnnxTensor]
               .getFloatBuffer
               .array()
-            tokenTensors.close()
-            maskTensors.close()
 
             embeddings
           } finally if (results != null) results.close()
         } catch {
           case e: Exception =>
-            // Log the exception as a warning
-            logger.warn("Exception: ", e)
-            // Rethrow the exception to propagate it further
-            // throw e
+            // Handle exceptions by logging or other means.
+            e.printStackTrace()
+            Array.empty[Float] // Return an empty array or appropriate error handling
+        } finally {
+          // Close tensors outside the try-catch to avoid repeated null checks.
+          // These resources are initialized before the try-catch, so they should be closed here.
+          tokenTensors.close()
+          maskTensors.close()
         }
       case _ =>
         val tensors = new TensorResources()

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/DistilBertClassification.scala b/src/main/scala/com/johnsnowlabs/ml/ai/DistilBertClassification.scala
@@ -236,17 +236,19 @@ private[johnsnowlabs] class DistilBertClassification(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
 
         embeddings
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Float] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
     }
   }
 

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/E5.scala b/src/main/scala/com/johnsnowlabs/ml/ai/E5.scala
@@ -189,20 +189,22 @@ private[johnsnowlabs] class E5(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
-        segmentTensors.close()
 
         val embeddings = LinAlg.avgPooling(flattenEmbeddings, attentionMask, shape)
         val normalizedEmbeddings = LinAlg.l2Normalize(embeddings)
         LinAlg.denseMatrixToArray(normalizedEmbeddings)
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Array[Float]] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
+      segmentTensors.close()
     }
   }
 

diff --git a/src/main/scala/com/johnsnowlabs/ml/ai/MPNet.scala b/src/main/scala/com/johnsnowlabs/ml/ai/MPNet.scala
@@ -188,19 +188,21 @@ private[johnsnowlabs] class MPNet(
           .asInstanceOf[OnnxTensor]
           .getFloatBuffer
           .array()
-        tokenTensors.close()
-        maskTensors.close()
 
         val embeddings = LinAlg.avgPooling(flattenEmbeddings, attentionMask, shape)
         val normalizedEmbeddings = LinAlg.l2Normalize(embeddings)
         LinAlg.denseMatrixToArray(normalizedEmbeddings)
       } finally if (results != null) results.close()
     } catch {
       case e: Exception =>
-        // Log the exception as a warning
-        logger.warn("Exception: ", e)
-        // Rethrow the exception to propagate it further
-        throw e
+        // Handle exceptions by logging or other means.
+        e.printStackTrace()
+        Array.empty[Array[Float]] // Return an empty array or appropriate error handling
+    } finally {
+      // Close tensors outside the try-catch to avoid repeated null checks.
+      // These resources are initialized before the try-catch, so they should be closed here.
+      tokenTensors.close()
+      maskTensors.close()
     }
   }