Update file ext tests, only extend Assets

Author: duckontheweb

pystac/extensions/file.py

@@ -16,7 +16,7 @@
 )
 from pystac.utils import get_required
 
-T = TypeVar("T", pystac.Item, pystac.Asset)
+T = TypeVar("T", bound=pystac.Asset)
 
 SCHEMA_URI = "https://stac-extensions.github.io/file/v2.0.0/schema.json"
 
@@ -60,7 +60,7 @@ def apply(self, values: List[Any], summary: str) -> None:
 
     @classmethod
     def create(cls, values: List[Any], summary: str) -> "MappingObject":
-        """Creates a new :class:`~MapptingObject` instance.
+        """Creates a new :class:`~MappingObject` instance.
 
         Args:
             values : The value(s) in the file. At least one array element is required.
@@ -96,16 +96,15 @@ class FileExtension(
     """An abstract class that can be used to extend the properties of an
     :class:`~pystac.Item` or :class:`~pystac.Asset` with properties from the
     :stac-ext:`File Info Extension <file>`. This class is generic over the type of
-    STAC Object to be extended (e.g. :class:`~pystac.Item`,
-    :class:`~pystac.Asset`).
+    STAC Object to be extended (e.g. :class:`~pystac.Asset`).
 
     To create a concrete instance of :class:`FileExtension`, use the
     :meth:`FileExtension.ext` method. For example:
 
     .. code-block:: python
 
-       >>> item: pystac.Item = ...
-       >>> file_ext = FileExtension.ext(item)
+       >>> asset: pystac.Asset = ...
+       >>> file_ext = FileExtension.ext(asset)
     """
 
     def apply(
@@ -195,40 +194,20 @@ def ext(obj: T) -> "FileExtension[T]":
         """Extends the given STAC Object with properties from the :stac-ext:`File Info
         Extension <file>`.
 
-        This extension can be applied to instances of :class:`~pystac.Item` or
-        :class:`~pystac.Asset`.
+        This extension can be applied to instances of :class:`~pystac.Asset`.
 
         Raises:
 
             pystac.ExtensionTypeError : If an invalid object type is passed.
         """
-        if isinstance(obj, pystac.Item):
-            return cast(FileExtension[T], ItemFileExtension(obj))
-        elif isinstance(obj, pystac.Asset):
+        if isinstance(obj, pystac.Asset):
             return cast(FileExtension[T], AssetFileExtension(obj))
         else:
             raise pystac.ExtensionTypeError(
                 f"File extension does not apply to type {type(obj)}"
             )
 
 
-class ItemFileExtension(FileExtension[pystac.Item]):
-    """A concrete implementation of :class:`FileExtension` on an :class:`~pystac.Item`
-    that extends the properties of the Item to include properties defined in the
-    :stac-ext:`File Info Extension <file>`.
-
-    This class should generally not be instantiated directly. Instead, call
-    :meth:`FileExtension.ext` on an :class:`~pystac.Item` to extend it.
-    """
-
-    def __init__(self, item: pystac.Item):
-        self.item = item
-        self.properties = item.properties
-
-    def __repr__(self) -> str:
-        return "<ItemFileExtension Item id={}>".format(self.item.id)
-
-
 class AssetFileExtension(FileExtension[pystac.Asset]):
     """A concrete implementation of :class:`FileExtension` on an :class:`~pystac.Asset`
     that extends the Asset fields to include properties defined in the

tests/data-files/file/collection.json

@@ -0,0 +1,50 @@
+{
+    "stac_version": "1.0.0",
+    "stac_extensions": [
+      "https://stac-extensions.github.io/file/v2.0.0/schema.json"
+    ],
+    "id": "example",
+    "type": "Collection",
+    "title": "File Example",
+    "description": "This examples shows how to use the file extension for collection assets.",
+    "extent": {
+      "spatial": {
+        "bbox": [
+          [
+            -180,
+            -90,
+            180,
+            90
+          ]
+        ]
+      },
+      "temporal": {
+        "interval": [
+          [
+            "2012-01-15T12:00:00Z",
+            "2014-12-15T12:00:00Z"
+          ]
+        ]
+      }
+    },
+    "license": "Apache-2.0",
+    "links": [
+      {
+        "href": "https://example.com",
+        "type": "text/html",
+        "rel": "about"
+      }
+    ],
+    "assets": {
+      "thumbnail": {
+        "href": "logo.png",
+        "title": "A preview image for visualization.",
+        "type": "image/png",
+        "roles": [
+          "thumbnail"
+        ],
+        "file:checksum": "90e4021044a8995dd50b6657a037a7839304535b",
+        "file:size": 153600
+      }
+    }
+  }

tests/data-files/file/file-example.json renamed to tests/data-files/file/item.json

@@ -1,10 +1,16 @@
 {
+  "id": "S1A_EW_GRDM_1SSH_20181103T235855_20181103T235955_024430_02AD5D_5616",
   "type": "Feature",
   "stac_version": "1.0.0",
-  "id": "S1A_EW_GRDM_1SSH_20181103T235855_20181103T235955_024430_02AD5D_5616",
-  "properties": {
-    "datetime": "2018-11-03T23:58:55Z"
-  },
+  "stac_extensions": [
+    "https://stac-extensions.github.io/file/v2.0.0/schema.json"
+  ],
+  "bbox": [
+    -70.275032,
+    -64.72924,
+    -65.087479,
+    -51.105831
+  ],
   "geometry": {
     "type": "Polygon",
     "coordinates": [
@@ -32,54 +38,58 @@
       ]
     ]
   },
-  "links": [],
+  "properties": {
+    "datetime": "2018-11-03T23:58:55Z"
+  },
   "assets": {
     "noises": {
       "href": "./annotation/calibration/noise-s1a-ew-grd-hh-20181103t235855-20181103t235955-024430-02ad5d-001.xml",
-      "type": "text/xml",
       "title": "Calibration Schema",
+      "type": "text/xml",
       "file:checksum": "90e40210a30d1711e81a4b11ef67b28744321659"
     },
     "calibrations": {
       "href": "./annotation/calibration/calibration-s1a-ew-grd-hh-20181103t235855-20181103t235955-024430-02ad5d-001.xml",
-      "type": "text/xml",
       "title": "Noise Schema",
+      "type": "text/xml",
       "file:checksum": "90e402104fc5351af67db0b8f1746efe421a05e4"
     },
     "products": {
       "href": "./annotation/s1a-ew-grd-hh-20181103t235855-20181103t235955-024430-02ad5d-001.xml",
-      "type": "text/xml",
       "title": "Product Schema",
+      "type": "text/xml",
       "file:checksum": "90e402107a7f2588a85362b9beea2a12d4514d45"
     },
     "measurement": {
       "href": "./measurement/s1a-ew-grd-hh-20181103t235855-20181103t235955-024430-02ad5d-001.tiff",
-      "type": "image/tiff",
       "title": "Measurements",
+      "type": "image/tiff",
+      "sar:polarizations": [
+        "HH"
+      ],
       "file:byte_order": "little-endian",
-      "file:data_type": "uint16",
       "file:size": 209715200,
       "file:header_size": 4096,
       "file:checksum": "90e40210163700a8a6501eccd00b6d3b44ddaed0"
     },
     "thumbnail": {
       "href": "./preview/quick-look.png",
-      "type": "image/png",
       "title": "Thumbnail",
+      "type": "image/png",
       "file:byte_order": "big-endian",
-      "file:data_type": "uint8",
       "file:size": 146484,
-      "file:checksum": "90e40210f52acd32b09769d3b1871b420789456c",
-      "file:nodata": []
+      "file:checksum": "90e40210f52acd32b09769d3b1871b420789456c"
     }
   },
-  "bbox": [
-    -70.275032,
-    -64.72924,
-    -65.087479,
-    -51.105831
-  ],
-  "stac_extensions": [
-    "https://stac-extensions.github.io/file/v1.0.0/schema.json"
+  "links": [
+    {
+      "rel": "self",
+      "href": "./item.json"
+    },
+    {
+      "rel": "parent",
+      "href": "./collection.json",
+      "file:checksum": "11146d97123fd2c02dec9a1b6d3b13136dbe600cf966"
+    }
   ]
 }