lint/typing fixes and change Sentinel-1 to Sentinel-2

Author: jreiberkyle

planet/clients/__init__.py

@@ -16,8 +16,4 @@
 from .orders import OrdersClient
 from .subscriptions import SubscriptionsClient
 
-__all__ = [
-    'DataClient',
-    'OrdersClient',
-    'SubscriptionsClient'
-]
+__all__ = ['DataClient', 'OrdersClient', 'SubscriptionsClient']

planet/order_request.py

@@ -448,10 +448,9 @@ def harmonize_tool(target_sensor: str) -> dict:
     '''
 
     try:
-        target_sensor = specs.get_match(
-            target_sensor,
-            specs.HARMONIZE_TOOL_TARGET_SENSORS,
-            'target_sensor')
+        target_sensor = specs.get_match(target_sensor,
+                                        specs.HARMONIZE_TOOL_TARGET_SENSORS,
+                                        'target_sensor')
     except specs.SpecificationException as e:
         raise ClientError(e)
 

planet/specs.py

@@ -33,7 +33,7 @@
 SUPPORTED_ORDER_TYPES = ['full', 'partial']
 SUPPORTED_ARCHIVE_TYPES = ['zip']
 SUPPORTED_FILE_FORMATS = ['COG', 'PL_NITF']
-HARMONIZE_TOOL_TARGET_SENSORS = ('Sentinel-1')
+HARMONIZE_TOOL_TARGET_SENSORS = ('Sentinel-2', )
 
 LOGGER = logging.getLogger(__name__)
 

planet/subscription_request.py

@@ -13,7 +13,7 @@
 # the License.
 """Functionality for preparing subscription requests."""
 from datetime import datetime
-from typing import Optional, List
+from typing import Any, Dict, Optional, List
 
 from . import geojson, specs
 from .exceptions import ClientError
@@ -50,8 +50,8 @@
 def build_request(name: str,
                   source: dict,
                   delivery: dict,
-                  notifications: dict = None,
-                  tools: List[dict] = None) -> dict:
+                  notifications: Optional[dict] = None,
+                  tools: Optional[List[dict]] = None) -> dict:
     """Prepare a subscriptions request.
 
 
@@ -88,11 +88,7 @@ def build_request(name: str,
         tools: Tools to apply to the products. Order defines
             the toolchain order of operatations.
     """
-    details = {
-        "name": name,
-        "source": source,
-        "delivery": delivery
-    }
+    details = {"name": name, "source": source, "delivery": delivery}
 
     if notifications:
         details['notifications'] = notifications
@@ -428,7 +424,7 @@ def reproject_tool(projection: str,
     except specs.SpecificationException as e:
         raise ClientError(e)
 
-    parameters = {"projection": projection, "kernel": kernel}
+    parameters: Dict[str, Any] = {"projection": projection, "kernel": kernel}
     if resolution is not None:
         parameters['resolution'] = resolution
 

tests/unit/test_order_request.py

@@ -263,10 +263,9 @@ def test_toar_tool():
     assert tt_empty == expected_empty
 
 
-@pytest.mark.parametrize("target_sensor", ["PS2", "Sentinel-2"])
-def test_harmonization_tool_success(target_sensor):
-    ht = order_request.harmonize_tool(target_sensor)
-    expected = {'harmonize': {'target_sensor': target_sensor}}
+def test_harmonization_tool_success():
+    ht = order_request.harmonize_tool("Sentinel-2")
+    expected = {'harmonize': {'target_sensor': "Sentinel-2"}}
     assert ht == expected
 
 

tests/unit/test_subscription_request.py

@@ -229,9 +229,13 @@ def test_file_format_tool_invalid_format():
 
 
 def test_harmonize_tool_success():
-    res = subscription_request.harmonize_tool('PS2')
+    res = subscription_request.harmonize_tool('Sentinel-2')
 
-    expected = {"type": "harmonize", "parameters": {"target_sensor": "PS2"}}
+    expected = {
+        "type": "harmonize", "parameters": {
+            "target_sensor": "Sentinel-2"
+        }
+    }
     assert res == expected