Split up image provider execution

Author: srwi

src/main/kotlin/com/github/srwi/pixellens/imageProviders/ImageProvider.kt

@@ -45,18 +45,19 @@ abstract class ImageProvider {
 
     private fun prepareData(frameAccessor: PyFrameAccessor, expression: String) {
         val functionDef = getDataPreparationFunction(FUNCTION_NAME)
-        val statement = wrapDataPreparationCommand(functionDef, expression)
+        Python.executeStatement(frameAccessor, functionDef)
+
+        val statement = wrapDataPreparationCommand(expression)
         Python.executeStatement(frameAccessor, statement)
     }
 
-    private fun wrapDataPreparationCommand(functionDef: String, variableName: String): String {
-        val tryBlock = """
+    private fun wrapDataPreparationCommand(variableName: String): String {
+        return """
             try:
                 $PAYLOAD_VARIABLE_NAME = $FUNCTION_NAME($variableName)
             finally:
                 del $FUNCTION_NAME
-        """
-        return functionDef.trimIndent() + "\n" + tryBlock.trimIndent()
+        """.trimIndent()
     }
 
     private fun cleanUpData(frameAccessor: PyFrameAccessor) {

src/main/kotlin/com/github/srwi/pixellens/imageProviders/JaxImageProvider.kt

@@ -19,7 +19,7 @@ class JaxImageProvider : ImageProvider() {
                     'dtype': str(variable.dtype)
                 }
                 return json.dumps(payload)
-        """
+        """.trimIndent()
     }
 
     override fun typeSupported(value: PyDebugValue): Boolean {

src/main/kotlin/com/github/srwi/pixellens/imageProviders/NumpyImageProvider.kt

@@ -19,7 +19,7 @@ class NumpyImageProvider : ImageProvider() {
                     'dtype': str(variable.dtype)
                 }
                 return json.dumps(payload)
-        """
+        """.trimIndent()
     }
 
     override fun typeSupported(value: PyDebugValue): Boolean {

src/main/kotlin/com/github/srwi/pixellens/imageProviders/PillowImageProvider.kt

@@ -17,7 +17,7 @@ class PillowImageProvider : ImageProvider() {
                     'dtype': variable.mode
                 }
                 return json.dumps(payload)
-        """
+        """.trimIndent()
     }
 
     override fun shapeSupported(value: PyDebugValue): Boolean {

src/main/kotlin/com/github/srwi/pixellens/imageProviders/PytorchImageProvider.kt

@@ -20,7 +20,7 @@ class PytorchImageProvider : ImageProvider() {
                     'dtype': str(variable.dtype)[6:]  # dtype starts with "torch."
                 }
                 return json.dumps(payload)
-        """
+        """.trimIndent()
     }
 
     override fun typeSupported(value: PyDebugValue): Boolean {

src/main/kotlin/com/github/srwi/pixellens/imageProviders/TensorflowImageProvider.kt

@@ -19,7 +19,7 @@ class TensorflowImageProvider : ImageProvider() {
                     'dtype': str(img_array.dtype)
                 }
                 return json.dumps(payload)
-        """
+        """.trimIndent()
     }
 
     override fun typeSupported(value: PyDebugValue): Boolean {