Skip to content

Commit b83b0d0

Browse files
committed
Remove type annotations from public APIs
This is to conform to the existing style adopted in the sagemaker python sdk.
1 parent 8d554fa commit b83b0d0

File tree

6 files changed

+117
-135
lines changed

6 files changed

+117
-135
lines changed

src/sagemaker/mxnet/processing.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
"""
1818
from __future__ import absolute_import
1919

20-
from typing import Any, Dict, List, Optional
21-
2220
from sagemaker.mxnet.estimator import MXNet
23-
from sagemaker.network import NetworkConfig
2421
from sagemaker.processing import FrameworkProcessor
25-
from sagemaker.session import Session
2622

2723

2824
class MXNetProcessor(FrameworkProcessor):
@@ -32,22 +28,22 @@ class MXNetProcessor(FrameworkProcessor):
3228

3329
def __init__(
3430
self,
35-
framework_version: str, # New arg
36-
s3_prefix: str, # New arg
37-
role: str,
38-
instance_count: int,
39-
instance_type: str,
40-
py_version: str = "py3", # New kwarg
41-
image_uri: Optional[str] = None,
42-
volume_size_in_gb: int = 30,
43-
volume_kms_key: Optional[str] = None,
44-
output_kms_key: Optional[str] = None,
45-
max_runtime_in_seconds: Optional[int] = None,
46-
base_job_name: Optional[str] = None,
47-
sagemaker_session: Optional[Session] = None,
48-
env: Optional[Dict[str, str]] = None,
49-
tags: Optional[List[Dict[str, Any]]] = None,
50-
network_config: Optional[NetworkConfig] = None,
31+
framework_version, # New arg
32+
s3_prefix, # New arg
33+
role,
34+
instance_count,
35+
instance_type,
36+
py_version="py3", # New kwarg
37+
image_uri=None,
38+
volume_size_in_gb=30,
39+
volume_kms_key=None,
40+
output_kms_key=None,
41+
max_runtime_in_seconds=None,
42+
base_job_name=None,
43+
sagemaker_session=None,
44+
env=None,
45+
tags=None,
46+
network_config=None,
5147
):
5248
"""This processor executes a Python script in a managed MXNet execution environment.
5349

src/sagemaker/processing.py

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
from six.moves.urllib.parse import urlparse
2727
from six.moves.urllib.request import url2pathname
28-
from typing import Any, Dict, List, Optional, Tuple, Type
28+
from typing import Dict, List, Optional, Tuple
2929

3030
from sagemaker import s3
3131
from sagemaker.job import _Job
@@ -1231,23 +1231,23 @@ class FrameworkProcessor(ScriptProcessor):
12311231
# Added new (kw)args for estimator. The rest are from ScriptProcessor with same defaults.
12321232
def __init__(
12331233
self,
1234-
estimator_cls: Type[Framework], # New arg
1235-
framework_version: str, # New arg
1236-
s3_prefix: str, # New arg
1237-
role: str,
1238-
instance_count: int,
1239-
instance_type: str,
1240-
py_version: str = "py3", # New kwarg
1241-
image_uri: Optional[str] = None,
1242-
volume_size_in_gb: int = 30,
1243-
volume_kms_key: Optional[str] = None,
1244-
output_kms_key: Optional[str] = None,
1245-
max_runtime_in_seconds: Optional[int] = None,
1246-
base_job_name: Optional[str] = None,
1247-
sagemaker_session: Optional[Session] = None,
1248-
env: Optional[Dict[str, str]] = None,
1249-
tags: Optional[List[Dict[str, Any]]] = None,
1250-
network_config: Optional[NetworkConfig] = None,
1234+
estimator_cls, # New arg
1235+
framework_version, # New arg
1236+
s3_prefix, # New arg
1237+
role,
1238+
instance_count,
1239+
instance_type,
1240+
py_version="py3", # New kwarg
1241+
image_uri=None,
1242+
volume_size_in_gb=30,
1243+
volume_kms_key=None,
1244+
output_kms_key=None,
1245+
max_runtime_in_seconds=None,
1246+
base_job_name=None,
1247+
sagemaker_session=None,
1248+
env=None,
1249+
tags=None,
1250+
network_config=None,
12511251
):
12521252
"""Initializes a ``FrameworkProcessor`` instance.
12531253
@@ -1256,7 +1256,8 @@ def __init__(
12561256
to be run as part of the Processing Job.
12571257
12581258
Args:
1259-
estimator_cls (type): A subclass of ``Framework`` estimator
1259+
estimator_cls (type): A subclass of the :class:`~sagemaker.network.NetworkConfig`
1260+
estimator
12601261
framework_version (str): The version of the framework
12611262
s3_prefix (str): The S3 prefix URI where custom code will be
12621263
uploaded - don't include a trailing slash since a string prepended
@@ -1271,7 +1272,7 @@ def __init__(
12711272
model training code. One of 'py2' or 'py3'. Defaults to 'py3'. Value
12721273
is ignored when ``image_uri`` is provided.
12731274
image_uri (str): The URI of the Docker image to use for the
1274-
processing jobs.
1275+
processing jobs (default: None).
12751276
volume_size_in_gb (int): Size in GB of the EBS volume
12761277
to use for storing data during processing (default: 30).
12771278
volume_kms_key (str): A KMS key for the processing volume (default: None).
@@ -1282,11 +1283,11 @@ def __init__(
12821283
specified, the default value is 24 hours.
12831284
base_job_name (str): Prefix for processing name. If not specified,
12841285
the processor generates a default job name, based on the
1285-
processing image name and current timestamp.
1286+
processing image name and current timestamp (default: None).
12861287
sagemaker_session (:class:`~sagemaker.session.Session`):
12871288
Session object which manages interactions with Amazon SageMaker and
12881289
any other AWS services needed. If not specified, the processor creates
1289-
one using the default AWS configuration chain.
1290+
one using the default AWS configuration chain (default: None).
12901291
env (dict[str, str]): Environment variables to be passed to
12911292
the processing jobs (default: None).
12921293
tags (list[dict]): List of tags to be passed to the processing job
@@ -1295,7 +1296,7 @@ def __init__(
12951296
network_config (:class:`~sagemaker.network.NetworkConfig`):
12961297
A :class:`~sagemaker.network.NetworkConfig`
12971298
object that configures network isolation, encryption of
1298-
inter-container traffic, security group IDs, and subnets.
1299+
inter-container traffic, security group IDs, and subnets (default: None).
12991300
"""
13001301
self.estimator_cls = estimator_cls
13011302
self.framework_version = framework_version
@@ -1357,18 +1358,18 @@ def _pre_init_normalization(
13571358

13581359
def run( # type: ignore[override]
13591360
self,
1360-
entry_point: str,
1361-
source_dir: Optional[str] = None,
1362-
dependencies: Optional[List[str]] = None,
1363-
git_config: Optional[Dict[str, str]] = None,
1364-
inputs: Optional[List[ProcessingInput]] = None,
1365-
outputs: Optional[List[ProcessingOutput]] = None,
1366-
arguments: Optional[List[str]] = None,
1367-
wait: bool = True,
1368-
logs: bool = True,
1369-
job_name: Optional[str] = None,
1370-
experiment_config: Optional[Dict[str, str]] = None,
1371-
kms_key: Optional[str] = None,
1361+
entry_point,
1362+
source_dir=None,
1363+
dependencies=None,
1364+
git_config=None,
1365+
inputs=None,
1366+
outputs=None,
1367+
arguments=None,
1368+
wait=True,
1369+
logs=True,
1370+
job_name=None,
1371+
experiment_config=None,
1372+
kms_key=None,
13721373
):
13731374
"""Runs a processing job.
13741375
@@ -1388,7 +1389,7 @@ def run( # type: ignore[override]
13881389
copied to SageMaker in the same folder where the entrypoint is
13891390
copied. If 'git_config' is provided, 'dependencies' should be a
13901391
list of relative locations to directories with any additional
1391-
libraries needed in the Git repo.
1392+
libraries needed in the Git repo (default: None).
13921393
git_config (dict[str, str]): Git configurations used for cloning
13931394
files, including ``repo``, ``branch``, ``commit``,
13941395
``2FA_enabled``, ``username``, ``password`` and ``token``. The

src/sagemaker/pytorch/processing.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
"""
1818
from __future__ import absolute_import
1919

20-
from typing import Any, Dict, List, Optional
21-
22-
from sagemaker.network import NetworkConfig
2320
from sagemaker.processing import FrameworkProcessor
2421
from sagemaker.pytorch.estimator import PyTorch
25-
from sagemaker.session import Session
2622

2723

2824
class PyTorchProcessor(FrameworkProcessor):
@@ -32,22 +28,22 @@ class PyTorchProcessor(FrameworkProcessor):
3228

3329
def __init__(
3430
self,
35-
framework_version: str, # New arg
36-
s3_prefix: str, # New arg
37-
role: str,
38-
instance_count: int,
39-
instance_type: str,
40-
py_version: str = "py3", # New kwarg
41-
image_uri: Optional[str] = None,
42-
volume_size_in_gb: int = 30,
43-
volume_kms_key: Optional[str] = None,
44-
output_kms_key: Optional[str] = None,
45-
max_runtime_in_seconds: Optional[int] = None,
46-
base_job_name: Optional[str] = None,
47-
sagemaker_session: Optional[Session] = None,
48-
env: Optional[Dict[str, str]] = None,
49-
tags: Optional[List[Dict[str, Any]]] = None,
50-
network_config: Optional[NetworkConfig] = None,
31+
framework_version, # New arg
32+
s3_prefix, # New arg
33+
role,
34+
instance_count,
35+
instance_type,
36+
py_version="py3", # New kwarg
37+
image_uri=None,
38+
volume_size_in_gb=30,
39+
volume_kms_key=None,
40+
output_kms_key=None,
41+
max_runtime_in_seconds=None,
42+
base_job_name=None,
43+
sagemaker_session=None,
44+
env=None,
45+
tags=None,
46+
network_config=None,
5147
):
5248
"""This processor executes a Python script in a PyTorch execution environment.
5349

src/sagemaker/sklearn/processing.py

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
"""
1818
from __future__ import absolute_import
1919

20-
from typing import Any, Dict, List, Optional
21-
2220
from sagemaker import Session, image_uris
23-
from sagemaker.network import NetworkConfig
2421
from sagemaker.processing import FrameworkProcessor, ScriptProcessor
2522
from sagemaker.sklearn import defaults
2623
from sagemaker.sklearn.estimator import SKLearn
@@ -120,22 +117,22 @@ class SKLearnProcessorAlt(FrameworkProcessor):
120117

121118
def __init__(
122119
self,
123-
framework_version: str, # New arg
124-
s3_prefix: str, # New arg
125-
role: str,
126-
instance_count: int,
127-
instance_type: str,
128-
py_version: str = "py3", # New kwarg
129-
image_uri: Optional[str] = None,
130-
volume_size_in_gb: int = 30,
131-
volume_kms_key: Optional[str] = None,
132-
output_kms_key: Optional[str] = None,
133-
max_runtime_in_seconds: Optional[int] = None,
134-
base_job_name: Optional[str] = None,
135-
sagemaker_session: Optional[Session] = None,
136-
env: Optional[Dict[str, str]] = None,
137-
tags: Optional[List[Dict[str, Any]]] = None,
138-
network_config: Optional[NetworkConfig] = None,
120+
framework_version, # New arg
121+
s3_prefix, # New arg
122+
role,
123+
instance_count,
124+
instance_type,
125+
py_version="py3", # New kwarg
126+
image_uri=None,
127+
volume_size_in_gb=30,
128+
volume_kms_key=None,
129+
output_kms_key=None,
130+
max_runtime_in_seconds=None,
131+
base_job_name=None,
132+
sagemaker_session=None,
133+
env=None,
134+
tags=None,
135+
network_config=None,
139136
):
140137
"""This processor executes a Python script in a scikit-learn execution environment.
141138

src/sagemaker/tensorflow/processing.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
"""
1818
from __future__ import absolute_import
1919

20-
from typing import Any, Dict, List, Optional
21-
22-
from sagemaker.network import NetworkConfig
2320
from sagemaker.processing import FrameworkProcessor
24-
from sagemaker.session import Session
2521
from sagemaker.tensorflow.estimator import TensorFlow
2622

2723

@@ -32,22 +28,22 @@ class TensorFlowProcessor(FrameworkProcessor):
3228

3329
def __init__(
3430
self,
35-
framework_version: str, # New arg
36-
s3_prefix: str, # New arg
37-
role: str,
38-
instance_count: int,
39-
instance_type: str,
40-
py_version: str = "py3", # New kwarg
41-
image_uri: Optional[str] = None,
42-
volume_size_in_gb: int = 30,
43-
volume_kms_key: Optional[str] = None,
44-
output_kms_key: Optional[str] = None,
45-
max_runtime_in_seconds: Optional[int] = None,
46-
base_job_name: Optional[str] = None,
47-
sagemaker_session: Optional[Session] = None,
48-
env: Optional[Dict[str, str]] = None,
49-
tags: Optional[List[Dict[str, Any]]] = None,
50-
network_config: Optional[NetworkConfig] = None,
31+
framework_version, # New arg
32+
s3_prefix, # New arg
33+
role,
34+
instance_count,
35+
instance_type,
36+
py_version="py3", # New kwarg
37+
image_uri=None,
38+
volume_size_in_gb=30,
39+
volume_kms_key=None,
40+
output_kms_key=None,
41+
max_runtime_in_seconds=None,
42+
base_job_name=None,
43+
sagemaker_session=None,
44+
env=None,
45+
tags=None,
46+
network_config=None,
5147
):
5248
"""This processor executes a Python script in a TensorFlow execution environment.
5349

src/sagemaker/xgboost/processing.py

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@
1717
"""
1818
from __future__ import absolute_import
1919

20-
from typing import Any, Dict, List, Optional
21-
22-
from sagemaker.network import NetworkConfig
2320
from sagemaker.processing import FrameworkProcessor
24-
from sagemaker.session import Session
2521
from sagemaker.xgboost.estimator import XGBoost
2622

2723

@@ -32,22 +28,22 @@ class XGBoostEstimator(FrameworkProcessor):
3228

3329
def __init__(
3430
self,
35-
framework_version: str, # New arg
36-
s3_prefix: str, # New arg
37-
role: str,
38-
instance_count: int,
39-
instance_type: str,
40-
py_version: str = "py3", # New kwarg
41-
image_uri: Optional[str] = None,
42-
volume_size_in_gb: int = 30,
43-
volume_kms_key: Optional[str] = None,
44-
output_kms_key: Optional[str] = None,
45-
max_runtime_in_seconds: Optional[int] = None,
46-
base_job_name: Optional[str] = None,
47-
sagemaker_session: Optional[Session] = None,
48-
env: Optional[Dict[str, str]] = None,
49-
tags: Optional[List[Dict[str, Any]]] = None,
50-
network_config: Optional[NetworkConfig] = None,
31+
framework_version, # New arg
32+
s3_prefix, # New arg
33+
role,
34+
instance_count,
35+
instance_type,
36+
py_version="py3", # New kwarg
37+
image_uri=None,
38+
volume_size_in_gb=30,
39+
volume_kms_key=None,
40+
output_kms_key=None,
41+
max_runtime_in_seconds=None,
42+
base_job_name=None,
43+
sagemaker_session=None,
44+
env=None,
45+
tags=None,
46+
network_config=None,
5147
):
5248
"""This processor executes a Python script in an XGBoost execution environment.
5349

0 commit comments

Comments
 (0)