You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2022/02/04 22:45:59 UTC
[GitHub] [spark] zero323 opened a new pull request #35399: [WIP][SPARK-37416] Inline type hints for pyspark.ml.wrapper
zero323 opened a new pull request #35399:
URL: https://github.com/apache/spark/pull/35399
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This PR migrates type `pyspark.ml.wrapper` annotations from stub file to inline type hints.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
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.
-->
Part of ongoing migration of type hints.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some 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.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Existing tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zero323 commented on pull request #35399: [SPARK-37416][PYTHON][ML] Inline type hints for pyspark.ml.wrapper
Posted by GitBox <gi...@apache.org>.
zero323 commented on pull request #35399:
URL: https://github.com/apache/spark/pull/35399#issuecomment-1030933947
Merged into master.
Thanks @HyukjinKwon!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zero323 closed pull request #35399: [SPARK-37416][PYTHON][ML] Inline type hints for pyspark.ml.wrapper
Posted by GitBox <gi...@apache.org>.
zero323 closed pull request #35399:
URL: https://github.com/apache/spark/pull/35399
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zero323 commented on a change in pull request #35399: [WIP][SPARK-37416][PYTHON][ML] Inline type hints for pyspark.ml.wrapper
Posted by GitBox <gi...@apache.org>.
zero323 commented on a change in pull request #35399:
URL: https://github.com/apache/spark/pull/35399#discussion_r799927110
##########
File path: python/pyspark/ml/classification.pyi
##########
@@ -231,6 +233,7 @@ class LinearSVC(
def setWeightCol(self, value: str) -> LinearSVC: ...
def setAggregationDepth(self, value: int) -> LinearSVC: ...
def setMaxBlockSizeInMB(self, value: float) -> LinearSVC: ...
+ def _create_model(self, java_model: JavaObject) -> LinearSVCModel: ...
Review comment:
All of these are added to avoid errors caused by exposing abstract methods in wrapper.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zero323 commented on a change in pull request #35399: [WIP][SPARK-37416][PYTHON][ML] Inline type hints for pyspark.ml.wrapper
Posted by GitBox <gi...@apache.org>.
zero323 commented on a change in pull request #35399:
URL: https://github.com/apache/spark/pull/35399#discussion_r799927023
##########
File path: python/pyspark/ml/wrapper.py
##########
@@ -17,57 +17,76 @@
from abc import ABCMeta, abstractmethod
+from typing import Any, Generic, Optional, List, Type, TypeVar, TYPE_CHECKING
+
from pyspark import since
from pyspark import SparkContext
from pyspark.sql import DataFrame
from pyspark.ml import Estimator, Predictor, PredictionModel, Transformer, Model
from pyspark.ml.base import _PredictorParams
-from pyspark.ml.param import Params
-from pyspark.ml.util import _jvm
+from pyspark.ml.param import Param, Params
+from pyspark.ml.util import _jvm # type: ignore[attr-defined]
from pyspark.ml.common import inherit_doc, _java2py, _py2java
+if TYPE_CHECKING:
+ from pyspark.ml._typing import ParamMap
+ from py4j.java_gateway import JavaObject, JavaClass
+
+
+T = TypeVar("T")
+JW = TypeVar("JW", bound="JavaWrapper")
+JM = TypeVar("JM", bound="JavaTransformer")
+JP = TypeVar("JP", bound="JavaParams")
+
+
class JavaWrapper:
"""
Wrapper class for a Java companion object
"""
- def __init__(self, java_obj=None):
+ def __init__(self, java_obj: Optional["JavaObject"] = None):
super(JavaWrapper, self).__init__()
self._java_obj = java_obj
- def __del__(self):
+ def __del__(self) -> None:
if SparkContext._active_spark_context and self._java_obj is not None:
- SparkContext._active_spark_context._gateway.detach(self._java_obj)
+ SparkContext._active_spark_context._gateway.detach( # type: ignore[union-attr]
Review comment:
Making exception from `assert not None` here, to improve readability.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zero323 commented on a change in pull request #35399: [WIP][SPARK-37416][PYTHON][ML] Inline type hints for pyspark.ml.wrapper
Posted by GitBox <gi...@apache.org>.
zero323 commented on a change in pull request #35399:
URL: https://github.com/apache/spark/pull/35399#discussion_r799927332
##########
File path: python/pyspark/ml/wrapper.py
##########
@@ -17,57 +17,76 @@
from abc import ABCMeta, abstractmethod
+from typing import Any, Generic, Optional, List, Type, TypeVar, TYPE_CHECKING
+
from pyspark import since
from pyspark import SparkContext
from pyspark.sql import DataFrame
from pyspark.ml import Estimator, Predictor, PredictionModel, Transformer, Model
from pyspark.ml.base import _PredictorParams
-from pyspark.ml.param import Params
-from pyspark.ml.util import _jvm
+from pyspark.ml.param import Param, Params
+from pyspark.ml.util import _jvm # type: ignore[attr-defined]
from pyspark.ml.common import inherit_doc, _java2py, _py2java
+if TYPE_CHECKING:
+ from pyspark.ml._typing import ParamMap
+ from py4j.java_gateway import JavaObject, JavaClass
+
+
+T = TypeVar("T")
+JW = TypeVar("JW", bound="JavaWrapper")
+JM = TypeVar("JM", bound="JavaTransformer")
+JP = TypeVar("JP", bound="JavaParams")
Review comment:
For runtime generics we need actual types.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
[GitHub] [spark] zero323 commented on a change in pull request #35399: [WIP][SPARK-37416][PYTHON][ML] Inline type hints for pyspark.ml.wrapper
Posted by GitBox <gi...@apache.org>.
zero323 commented on a change in pull request #35399:
URL: https://github.com/apache/spark/pull/35399#discussion_r799927208
##########
File path: python/pyspark/ml/base.py
##########
@@ -104,7 +104,7 @@ def next(self) -> Tuple[int, M]:
@inherit_doc
-class Estimator(Generic[M], Params, metaclass=ABCMeta):
+class Estimator(Params, Generic[M], metaclass=ABCMeta):
Review comment:
To ensure consistent MRO. Same as #35367
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org