fix log-level and py3 tests, add copyright

Author: Jonathan Esterhazy

src/sagemaker/cli/__init__.py

@@ -0,0 +1,12 @@
+# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.

src/sagemaker/cli/common.py

@@ -1,3 +1,15 @@
+# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
 from __future__ import absolute_import
 
 import json

src/sagemaker/cli/main.py

@@ -1,3 +1,15 @@
+# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
 from __future__ import absolute_import
 
 import argparse
@@ -10,6 +22,9 @@
 
 logger = logging.getLogger(__name__)
 
+DEFAULT_LOG_LEVEL = 'info'
+DEFAULT_BOTOCORE_LOG_LEVEL = 'warning'
+
 
 def parse_arguments(args):
     parser = argparse.ArgumentParser(description='Launch SageMaker training jobs or hosting endpoints')
@@ -29,10 +44,6 @@ def parse_arguments(args):
     instance_group.add_argument('--instance-type', type=str, help='instance type', default='ml.m4.xlarge')
     instance_group.add_argument('--instance-count', type=int, help='instance count', default=1)
 
-    log_group = common_parser.add_argument_group('optional log settings')
-    log_group.add_argument('--log-level', help='log level for this command', type=str, default='info')
-    log_group.add_argument('--botocore-log-level', help='log level for botocore', type=str, default='warning')
-
     # common training args
     common_train_parser = argparse.ArgumentParser(add_help=False)
     common_train_parser.add_argument('--hyperparameters', help='path to training hyperparameters file',
@@ -73,6 +84,11 @@ def parse_arguments(args):
                                                               parents=[common_parser, common_host_parser])
     tensorflow_host_parser.set_defaults(func=sagemaker.cli.tensorflow.host)
 
+    log_group = parser.add_argument_group('optional log settings')
+    log_group.add_argument('--log-level', help='log level for this command', type=str, default=DEFAULT_LOG_LEVEL)
+    log_group.add_argument('--botocore-log-level', help='log level for botocore', type=str,
+                           default=DEFAULT_BOTOCORE_LOG_LEVEL)
+
     return parser.parse_args(args)
 
 

src/sagemaker/cli/mxnet.py

@@ -1,3 +1,15 @@
+# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
 from sagemaker.cli.common import HostCommand, TrainCommand
 
 

src/sagemaker/cli/tensorflow.py

@@ -1,3 +1,15 @@
+# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
 from sagemaker.cli.common import HostCommand, TrainCommand
 
 

tests/unit/test_cli.py

@@ -1,3 +1,15 @@
+# Copyright 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
 import pytest
 import sagemaker.cli.main as cli
 from mock import patch
@@ -62,8 +74,8 @@ def test_args_mxnet_train_defaults():
 
 
 def test_args_mxnet_train_non_defaults():
-    args = cli.parse_arguments('mxnet train --role-name role {} {} {}'
-                               .format(COMMON_ARGS, TRAIN_ARGS, LOG_ARGS)
+    args = cli.parse_arguments('{} mxnet train --role-name role {} {}'
+                               .format(LOG_ARGS, COMMON_ARGS, TRAIN_ARGS)
                                .split())
     assert_common_non_defaults(args)
     assert_train_non_defaults(args)
@@ -80,8 +92,8 @@ def test_args_mxnet_host_defaults():
 
 
 def test_args_mxnet_host_non_defaults():
-    args = cli.parse_arguments('mxnet host --role-name role {} {} {}'
-                               .format(COMMON_ARGS, HOST_ARGS, LOG_ARGS)
+    args = cli.parse_arguments('{} mxnet host --role-name role {} {}'
+                               .format(LOG_ARGS, COMMON_ARGS, HOST_ARGS)
                                .split())
     assert_common_non_defaults(args)
     assert_host_non_defaults(args)
@@ -100,8 +112,8 @@ def test_args_tensorflow_train_defaults():
 
 
 def test_args_tensorflow_train_non_defaults():
-    args = cli.parse_arguments('tensorflow train --role-name role --training-steps 10 --evaluation-steps 5 {} {} {}'
-                               .format(COMMON_ARGS, TRAIN_ARGS, LOG_ARGS)
+    args = cli.parse_arguments('{} tensorflow train --role-name role --training-steps 10 --evaluation-steps 5 {} {}'
+                               .format(LOG_ARGS, COMMON_ARGS, TRAIN_ARGS)
                                .split())
     assert_common_non_defaults(args)
     assert_train_non_defaults(args)
@@ -120,8 +132,8 @@ def test_args_tensorflow_host_defaults():
 
 
 def test_args_tensorflow_host_non_defaults():
-    args = cli.parse_arguments('tensorflow host --role-name role {} {} {}'
-                               .format(COMMON_ARGS, HOST_ARGS, LOG_ARGS)
+    args = cli.parse_arguments('{} tensorflow host --role-name role {} {}'
+                               .format(LOG_ARGS, COMMON_ARGS, HOST_ARGS)
                                .split())
     assert_common_non_defaults(args)
     assert_host_non_defaults(args)