This is an automated email from the ASF dual-hosted git repository.
kunwp1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/texera.git
The following commit(s) were added to refs/heads/main by this push:
new 5695cbbbcb fix(scatterplot): avoid malformed Python when optionals are
absent (#4023)
5695cbbbcb is described below
commit 5695cbbbcbea316d8b27ed84fc93acb2671d03b2
Author: Meng Wang <[email protected]>
AuthorDate: Wed Nov 5 13:25:16 2025 -0800
fix(scatterplot): avoid malformed Python when optionals are absent (#4023)
<!--
Thanks for sending a pull request (PR)! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines:
[Contributing to
Texera](https://github.com/apache/texera/blob/main/CONTRIBUTING.md)
2. Ensure you have added or run the appropriate tests for your PR
3. If the PR is work in progress, mark it a draft on GitHub.
4. Please write your PR title to summarize what this PR proposes, we
are following Conventional Commits style for PR titles as well.
5. Be sure to keep the PR description updated to reflect all changes.
-->
### What changes were proposed in this PR?
Modified scatterplot operator to build Plotly kwargs into a list and
mkString(", ") them, preventing stray commas when colorColumn is empty
and log_x/log_y are set.
<!--
Please clarify what changes you are proposing. The purpose of this
section
is to outline the changes. Here are some tips for you:
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
3. If it is a refactoring, clarify what has been changed.
3. It would be helpful to include a before-and-after comparison using
screenshots or GIFs.
4. Please consider writing useful notes for better and faster reviews.
-->
### Any related issues, documentation, discussions?
Fixes #4022
<!--
Please use this section to link other resources if not mentioned
already.
1. If this PR fixes an issue, please include `Fixes #1234`, `Resolves
#1234`
or `Closes #1234`. If it is only related, simply mention the issue
number.
2. If there is design documentation, please add the link.
3. If there is a discussion in the mailing list, please add the link.
-->
### How was this PR tested?
Manual checks
<!--
If tests were added, say they were added here. Or simply mention that if
the PR
is tested with existing test cases. Make sure to include/update test
cases that
check the changes thoroughly including negative and positive cases if
possible.
If it was tested in a way different from regular unit tests, please
clarify how
you tested step by step, ideally copy and paste-able, so that other
reviewers can
test and check, and descendants can verify in the future. If tests were
not added,
please describe why they were not added and/or why it was difficult to
add.
-->
### Was this PR authored or co-authored using generative AI tooling?
co-authored with ChatGPT
<!--
If generative AI tooling has been used in the process of authoring this
PR,
please include the phrase: 'Generated-by: ' followed by the name of the
tool
and its version. If no, write 'No'.
Please refer to the [ASF Generative Tooling
Guidance](https://www.apache.org/legal/generative-tooling.html) for
details.
-->
---
.../scatterplot/ScatterplotOpDesc.scala | 23 ++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git
a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
b/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
index 3dfb3da25c..cb3fe7d454 100644
---
a/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
+++
b/common/workflow-operator/src/main/scala/org/apache/amber/operator/visualization/scatterplot/ScatterplotOpDesc.scala
@@ -119,17 +119,20 @@ class ScatterplotOpDesc extends PythonOperatorDescriptor {
def createPlotlyFigure(): String = {
assert(xColumn.nonEmpty && yColumn.nonEmpty)
- val colorColExpr = if (colorColumn.nonEmpty) {
- s"color='$colorColumn'"
- } else {
- ""
- }
- var argDetails = ""
- if (xLogScale) argDetails = argDetails + ", log_x=True"
- if (yLogScale) argDetails = argDetails + ", log_y=True"
- if (hoverName.nonEmpty) argDetails = argDetails + s""",
hover_name='$hoverName'"""
+
+ val args = scala.collection.mutable.ArrayBuffer[String](
+ s"x='$xColumn'",
+ s"y='$yColumn'",
+ s"opacity=$alpha"
+ )
+ if (colorColumn.nonEmpty) args += s"color='$colorColumn'"
+ if (xLogScale) args += "log_x=True"
+ if (yLogScale) args += "log_y=True"
+ if (hoverName.nonEmpty) args += s"hover_name='$hoverName'"
+
+ val joined = args.mkString(", ")
s"""
- | fig = go.Figure(px.scatter(table, x='$xColumn', y='$yColumn',
opacity=$alpha, $colorColExpr $argDetails))
+ | fig = go.Figure(px.scatter(table, $joined))
| fig.update_layout(margin=dict(l=0, r=0, t=0, b=0))
|""".stripMargin
}
