reconfigured ternary contour op to most recent PR merge

Author: ELin2025

common/workflow-operator/src/main/scala/org/apache/texera/amber/operator/visualization/ternaryContour/TernaryContourOpDesc.scala

@@ -23,10 +23,13 @@ import com.fasterxml.jackson.annotation.{JsonProperty, JsonPropertyDescription}
 import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle
 import org.apache.texera.amber.core.tuple.{AttributeType, Schema}
 import org.apache.texera.amber.core.workflow.OutputPort.OutputMode
+import org.apache.texera.amber.pybuilder.PythonTemplateBuilder.PythonTemplateBuilderStringContext
+import org.apache.texera.amber.pybuilder.PyStringTypes.EncodableString
 import org.apache.texera.amber.core.workflow.{InputPort, OutputPort, PortIdentity}
 import org.apache.texera.amber.operator.PythonOperatorDescriptor
 import org.apache.texera.amber.operator.metadata.annotations.AutofillAttributeName
 import org.apache.texera.amber.operator.metadata.{OperatorGroupConstants, OperatorInfo}
+import org.apache.texera.amber.pybuilder.PythonTemplateBuilder
 
 /**
   * Visualization Operator for Ternary Plots.
@@ -41,25 +44,25 @@ class TernaryContourOpDesc extends PythonOperatorDescriptor {
   @JsonProperty(value = "firstVariable", required = true)
   @JsonSchemaTitle("Variable 1")
   @JsonPropertyDescription("First variable data field")
-  @AutofillAttributeName var firstVariable: String = ""
+  @AutofillAttributeName var firstVariable: EncodableString = ""
 
   // Add annotations for the second variable
   @JsonProperty(value = "secondVariable", required = true)
   @JsonSchemaTitle("Variable 2")
   @JsonPropertyDescription("Second variable data field")
-  @AutofillAttributeName var secondVariable: String = ""
+  @AutofillAttributeName var secondVariable: EncodableString = ""
 
   // Add annotations for the third variable
   @JsonProperty(value = "thirdVariable", required = true)
   @JsonSchemaTitle("Variable 3")
   @JsonPropertyDescription("Third variable data field")
-  @AutofillAttributeName var thirdVariable: String = ""
+  @AutofillAttributeName var thirdVariable: EncodableString = ""
 
   // Add annotations for the fourth variable
   @JsonProperty(value = "fourthVariable", required = true)
-  @JsonSchemaTitle("Variable 4")
-  @JsonPropertyDescription("Fourth variable data field")
-  @AutofillAttributeName var fourthVariable: String = ""
+  @JsonSchemaTitle("Measured Value")
+  @JsonPropertyDescription("Measured value data field")
+  @AutofillAttributeName var fourthVariable: EncodableString = ""
 
   // OperatorInfo instance describing ternary plot
   override def operatorInfo: OperatorInfo =
@@ -82,37 +85,39 @@ class TernaryContourOpDesc extends PythonOperatorDescriptor {
   }
 
   /** Returns a Python string that drops any tuples with missing values */
-  def manipulateTable(): String = {
+  def manipulateTable(): PythonTemplateBuilder = {
     // Check for any empty data field names
-    assert(firstVariable.nonEmpty && secondVariable.nonEmpty && thirdVariable.nonEmpty)
-    s"""
+    assert(
+      firstVariable.nonEmpty && secondVariable.nonEmpty && thirdVariable.nonEmpty && fourthVariable.nonEmpty
+    )
+    pyb"""
        |        # Remove any tuples that contain missing values
-       |        table.dropna(subset=['$firstVariable', '$secondVariable', '$thirdVariable', '$fourthVariable'], inplace = True)
+       |        table.dropna(subset=[$firstVariable, $secondVariable, $thirdVariable, $fourthVariable], inplace = True)
        |
        |        #Remove rows where any of the first three variables are negative
-       |        table = table[(table[['$firstVariable', '$secondVariable', '$thirdVariable']] >= 0).all(axis=1)]
+       |        table = table[(table[[$firstVariable, $secondVariable, $thirdVariable]] >= 0).all(axis=1)]
        |
        |        #Remove zero-sum rows
-       |        s = table['$firstVariable'] + table['$secondVariable'] + table['$thirdVariable']
+       |        s = table[$firstVariable] + table[$secondVariable] + table[$thirdVariable]
        |        table = table[s > 0]
-       |""".stripMargin
+       |"""
   }
 
   /** Returns a Python string that creates the ternary contour plot figure */
-  def createPlotlyFigure(): String = {
-    s"""
-       |        A = table['$firstVariable'].to_numpy()
-       |        B = table['$secondVariable'].to_numpy()
-       |        C = table['$thirdVariable'].to_numpy()
-       |        Z = table['$fourthVariable'].to_numpy()
-       |        fig = ff.create_ternary_contour(np.array([A,B,C]), Z, pole_labels=['$firstVariable', '$secondVariable', '$thirdVariable'], interp_mode='cartesian')
-       |""".stripMargin
+  def createPlotlyFigure(): PythonTemplateBuilder = {
+    pyb"""
+         |        A = table[$firstVariable].to_numpy()
+         |        B = table[$secondVariable].to_numpy()
+         |        C = table[$thirdVariable].to_numpy()
+         |        Z = table[$fourthVariable].to_numpy()
+         |        fig = ff.create_ternary_contour(np.array([A,B,C]), Z, pole_labels=[$firstVariable, $secondVariable, $thirdVariable], interp_mode='cartesian')
+         |"""
   }
 
   /** Returns a Python string that yields the html content of the ternary contour plot */
   override def generatePythonCode(): String = {
     val finalCode =
-      s"""
+      pyb"""
          |from pytexera import *
          |
          |import plotly.express as px
@@ -141,8 +146,8 @@ class TernaryContourOpDesc extends PythonOperatorDescriptor {
          |        # Convert fig to html content
          |        html = plotly.io.to_html(fig, include_plotlyjs = 'cdn', auto_play = False)
          |        yield {'html-content':html}
-         |""".stripMargin
-    finalCode
+         |"""
+    finalCode.encode
   }
 
 }