Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace import all syntax with explicit import #2003

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Replace import all syntax with explicit import #2003

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5950934
use explicit import
Yicong-Huang Jun 14, 2023
d4bc072
apply to other UDFs
Yicong-Huang Jun 14, 2023
fb0b165
fix import
Yicong-Huang Jun 14, 2023
cafe94a
add a blank line
Yicong-Huang Jun 14, 2023
9d969c3
fix format
Yicong-Huang Jun 14, 2023
b7bd8ab
Merge branch 'master' into yicong-remove-import-all
aglinxinyuan Jun 14, 2023
505ab96
Merge branch 'master' into yicong-remove-import-all
Yicong-Huang Jun 21, 2023
ab3678c
Merge branch 'master' into yicong-remove-import-all
Yicong-Huang Jun 21, 2023
611f24e
Merge branch 'master' into yicong-remove-import-all
Yicong-Huang Jul 28, 2023
a77461a
refactor and change to ptx
Yicong-Huang Jul 28, 2023
16a9832
use back the string format
Yicong-Huang Jul 28, 2023
a8024cb
fix format
Yicong-Huang Jul 28, 2023
f891f8f
minor fix
Yicong-Huang Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions ...la/edu/uci/ics/texera/workflow/operators/udf/python/DualInputPortsPythonUDFOpDescV2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,28 @@ class DualInputPortsPythonUDFOpDescV2 extends OperatorDescriptor {
defaultValue =
"# Choose from the following templates:\n" +
"# \n" +
"# from pytexera import *\n" +
"# import pytexera as pt\n" +
"# from overrides import overrides\n" +
"# from typing import Iterator, Optional\n" +
"# \n" +
"# class ProcessTupleOperator(UDFOperatorV2):\n" +
"# \n" +
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I am adding a new line to fix the warning of single blank line between imports and class definitions.

"# class ProcessTupleOperator(pt.UDFOperatorV2):\n" +
"# \n" +
"# @overrides\n" +
"# def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:\n" +
"# def process_tuple(self, tuple_: pt.Tuple, port: int) -> Iterator[Optional[pt.TupleLike]]:\n" +
"# yield tuple_\n" +
"# \n" +
"# class ProcessBatchOperator(UDFBatchOperator):\n" +
"# class ProcessBatchOperator(pt.UDFBatchOperator):\n" +
"# BATCH_SIZE = 10 # must be a positive integer\n" +
"# \n" +
"# @overrides\n" +
"# def process_batch(self, batch: Batch, port: int) -> Iterator[Optional[BatchLike]]:\n" +
"# def process_batch(self, batch: pt.Batch, port: int) -> Iterator[Optional[pt.BatchLike]]:\n" +
"# yield batch\n" +
"# \n" +
"# class ProcessTableOperator(UDFTableOperator):\n" +
"# class ProcessTableOperator(pt.UDFTableOperator):\n" +
"# \n" +
"# @overrides\n" +
"# def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n" +
"# def process_table(self, table: pt.Table, port: int) -> Iterator[Optional[pt.TableLike]]:\n" +
"# yield table\n"
)
@JsonSchemaTitle("Python script")
Expand Down
17 changes: 10 additions & 7 deletions ...r/src/main/scala/edu/uci/ics/texera/workflow/operators/udf/python/PythonUDFOpDescV2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,28 @@ class PythonUDFOpDescV2 extends OperatorDescriptor with PortDescriptor {
defaultValue =
"# Choose from the following templates:\n" +
"# \n" +
"# from pytexera import *\n" +
"# import pytexera as pt\n" +
"# from overrides import overrides\n" +
"# from typing import Iterator, Optional\n" +
"# \n" +
"# class ProcessTupleOperator(UDFOperatorV2):\n" +
"# \n" +
"# class ProcessTupleOperator(pt.UDFOperatorV2):\n" +
"# \n" +
"# @overrides\n" +
"# def process_tuple(self, tuple_: Tuple, port: int) -> Iterator[Optional[TupleLike]]:\n" +
"# def process_tuple(self, tuple_: pt.Tuple, port: int) -> Iterator[Optional[pt.TupleLike]]:\n" +
"# yield tuple_\n" +
"# \n" +
"# class ProcessBatchOperator(UDFBatchOperator):\n" +
"# class ProcessBatchOperator(pt.UDFBatchOperator):\n" +
"# BATCH_SIZE = 10 # must be a positive integer\n" +
"# \n" +
"# @overrides\n" +
"# def process_batch(self, batch: Batch, port: int) -> Iterator[Optional[BatchLike]]:\n" +
"# def process_batch(self, batch: pt.Batch, port: int) -> Iterator[Optional[pt.BatchLike]]:\n" +
"# yield batch\n" +
"# \n" +
"# class ProcessTableOperator(UDFTableOperator):\n" +
"# class ProcessTableOperator(pt.UDFTableOperator):\n" +
"# \n" +
"# @overrides\n" +
"# def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike]]:\n" +
"# def process_table(self, table: pt.Table, port: int) -> Iterator[Optional[pt.TableLike]]:\n" +
"# yield table\n"
)
@JsonSchemaTitle("Python script")
Expand Down
20 changes: 10 additions & 10 deletions ...cala/edu/uci/ics/texera/workflow/operators/udf/python/source/PythonUDFSourceOpDescV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaTitle;
import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecConfig;
import edu.uci.ics.amber.engine.architecture.deploysemantics.layer.OpExecFunc;
import edu.uci.ics.texera.workflow.common.metadata.InputPort;
import edu.uci.ics.texera.workflow.common.metadata.OperatorGroupConstants;
import edu.uci.ics.texera.workflow.common.metadata.OperatorInfo;
import edu.uci.ics.texera.workflow.common.metadata.OutputPort;
Expand All @@ -25,15 +24,16 @@
public class PythonUDFSourceOpDescV2 extends SourceOperatorDescriptor {

@JsonProperty(required = true, defaultValue =
"# Choose from the following templates:\n" +
"# \n" +
"# from pytexera import *\n" +
"# \n" +
"# class GenerateOperator(UDFSourceOperator):\n" +
"# \n" +
"# @overrides\n" +
"# def produce(self) -> Iterator[Union[TupleLike, TableLike, None]]:\n" +
"# yield\n")
"import pytexera as pt\n" +
"from overrides import overrides\n" +
"from typing import Iterator, Union\n" +
"\n" +
"\n" +
"class GenerateOperator(pt.UDFSourceOperator):\n" +
"\n" +
" @overrides\n" +
" def produce(self) -> Iterator[Union[pt.TupleLike, pt.TableLike, None]]:\n" +
" yield\n")
@JsonSchemaTitle("Python script")
@JsonPropertyDescription("Input your code here")
public String code;
Expand Down
Loading