Item type and asset type validation in Data and Subscriptions

planet/cli/data.py

@@ -407,10 +407,6 @@ async def search_run(ctx, search_id, sort, limit, pretty):
             echo_json(item, pretty)
 
 
-# TODO: search-update
-# TODO: search-delete
-
-
 @data.command(epilog=valid_item_string)
 @click.pass_context
 @translate_exceptions
@@ -471,7 +467,7 @@ async def search_delete(ctx, search_id):
         await cl.delete_search(search_id)
 
 
-@data.command()
+@data.command(epilog=valid_item_string)
 @click.pass_context
 @translate_exceptions
 @coro
@@ -507,14 +503,14 @@ async def search_update(ctx,
     """
     async with data_client(ctx) as cl:
         items = await cl.update_search(search_id,
+                                       name,
                                        item_types,
                                        filter,
-                                       name,
                                        daily_email)
         echo_json(items, pretty)
 
 
-@data.command()
+@data.command(epilog=valid_item_string)
 @click.pass_context
 @translate_exceptions
 @coro
@@ -576,7 +572,7 @@ async def asset_download(ctx,
             cl.validate_checksum(asset, path)
 
 
-@data.command()
+@data.command(epilog=valid_item_string)
 @click.pass_context
 @translate_exceptions
 @coro
@@ -590,7 +586,7 @@ async def asset_activate(ctx, item_type, item_id, asset_type):
         await cl.activate_asset(asset)
 
 
-@data.command()
+@data.command(epilog=valid_item_string)
 @click.pass_context
 @translate_exceptions
 @coro

planet/cli/subscriptions.py

@@ -10,6 +10,7 @@
 from .session import CliSession
 from planet.clients.subscriptions import SubscriptionsClient
 from .. import subscription_request
+from ..specs import get_item_types
 
 
 @asynccontextmanager
@@ -161,6 +162,7 @@ async def list_subscription_results_cmd(ctx,
 
 
 @subscriptions.command()
+@translate_exceptions
 @click.option('--name',
               required=True,
               type=str,
@@ -195,8 +197,8 @@ def request(name, source, delivery, notifications, tools, pretty):
 @subscriptions.command()
 @click.option('--item-types',
               required=True,
-              type=types.CommaSeparatedString(),
-              help='One or more comma-separated item types.')
+              help='Item type for requested item ids.',
+              type=click.Choice(get_item_types(), case_sensitive=False))
 @click.option('--asset-types',
               required=True,
               type=types.CommaSeparatedString(),

planet/clients/data.py

@@ -533,6 +533,7 @@ async def get_asset(self,
             planet.exceptions.ClientError: If asset type identifier is not
             valid.
         """
+        item_type_id = validate_item_type(item_type_id)
         assets = await self.list_item_assets(item_type_id, item_id)
 
         try:

planet/specs.py

@@ -109,6 +109,13 @@ def validate_supported_bundles(item_type, bundle, all_product_bundles):
     return _validate_field(bundle, supported_bundles, 'bundle')
 
 
+def validate_asset_type(item_type, asset_type):
+    item_type = validate_item_type(item_type)
+    supported_assets = get_supported_assets(item_type)
+
+    return _validate_field(asset_type, supported_assets, 'asset_type')
+
+
 def _get_product_bundle_spec():
     with open(DATA_DIR / PRODUCT_BUNDLE_SPEC_NAME) as f:
         data = json.load(f)
@@ -162,3 +169,17 @@ def get_item_types(product_bundle=None):
                 for bundle in get_product_bundles()))
 
     return item_types
+
+
+def get_supported_assets(item_type):
+    '''Get all assets supported by a given item type.'''
+    item_type = validate_item_type(item_type)
+    supported_bundles = get_product_bundles(item_type)
+    spec = _get_product_bundle_spec()
+    supported_assets = [
+        spec['bundles'][bundle]["assets"][item_type]
+        for bundle in supported_bundles
+    ]
+    supported_assets = list(set(list(itertools.chain(*supported_assets))))
+
+    return supported_assets

planet/subscription_request.py

@@ -127,6 +127,11 @@ def catalog_source(
         planet.exceptions.ClientError: If start_time or end_time are not valid
             datetimes
     '''
+
+    asset_types = [
+        specs.validate_asset_type(item_types, asset_type)
+        for asset_type in asset_types
+    ]
     parameters = {
         "item_types": item_types,
         "asset_types": asset_types,

tests/unit/test_specs.py

@@ -66,6 +66,25 @@
     'MYD09GQ',
     'SkySatScene'
 ]
+TEST_ASSET_TYPE = "basic_udm2"
+ALL_SUPPORTED_ASSET_TYPES_PSSCENE = [
+    'ortho_analytic_8b_xml',
+    'basic_analytic_4b_xml',
+    'ortho_analytic_4b_sr',
+    'ortho_analytic_3b',
+    'basic_udm2',
+    'ortho_analytic_8b_sr',
+    'basic_analytic_8b',
+    'basic_analytic_4b_rpc',
+    'basic_analytic_8b_xml',
+    'ortho_udm2',
+    'ortho_analytic_3b_xml',
+    'ortho_analytic_8b',
+    'ortho_analytic_4b_xml',
+    'basic_analytic_4b',
+    'ortho_visual',
+    'ortho_analytic_4b'
+]
 
 
 def test_get_type_match():
@@ -162,3 +181,25 @@ def test_validate_supported_bundles_fail():
         specs.validate_supported_bundles(TEST_ITEM_TYPE,
                                          'analytic',
                                          ALL_PRODUCT_BUNDLES)
+
+
+def test_get_supported_assets_success():
+    supported_assets = specs.get_supported_assets(TEST_ITEM_TYPE)
+    supported_assets.sort()
+    ALL_SUPPORTED_ASSET_TYPES_PSSCENE.sort()
+    assert supported_assets == ALL_SUPPORTED_ASSET_TYPES_PSSCENE
+
+
+def test_get_supported_assets_not_supported_item_type():
+    with pytest.raises(specs.SpecificationException):
+        specs.get_supported_assets('POOP')
+
+
+def test_validate_asset_type():
+    assert TEST_ASSET_TYPE == specs.validate_asset_type(
+        TEST_ITEM_TYPE, TEST_ASSET_TYPE)
+
+
+def test_validate_asset_type_notsupported():
+    with pytest.raises(specs.SpecificationException):
+        specs.validate_asset_type(TEST_ITEM_TYPE, 'notsupported')