Updated to reflect support for new endpoints

Author: anthonyjb

README.md

@@ -29,7 +29,7 @@ with open('image.bmp') as f:
 
 # Analyze the image asset to find its dominant colours and focal point
 asset.analyze([
-    h51.transforms.images.DominantColours(),
+    h51.analyzers.images.DominantColors(),
     h51.analyzers.images.FocalPoint()
 ])
 
@@ -41,15 +41,15 @@ h51.resources.Variation.create(
             h51.transforms.images.AutoOrient(),
             h51.transforms.images.FocalPointCrop(aspect_ratio=0.5),
             h51.transforms.images.Fit(640, 640),
-            h51.transforms.images.Output('WEBP')
+            h51.transforms.images.Output('WebP')
         ],
         'x2': [
             h51.transforms.images.AutoOrient(),
             h51.transforms.images.FocalPointCrop(aspect_ratio=0.5),
             h51.transforms.images.Fit(1280, 1280),
-            h51.transforms.images.Output('WEBP')
+            h51.transforms.images.Output('WebP')
         ]
     }
-])
+)
 
 ```

h51/client.py

@@ -61,7 +61,6 @@ def __call__(self,
         path,
         params=None,
         data=None,
-        json_type_body=None,
         files=None,
         download=False
     ):
@@ -70,9 +69,6 @@ def __call__(self,
         # Build headers
         headers = {'X-H51-APIKey': self._api_key}
 
-        if json_type_body:
-            headers['Content-Type'] = 'application/json'
-
         if not download:
             headers['Accept'] = 'application/json'
 
@@ -90,7 +86,6 @@ def __call__(self,
             headers=headers,
             params=params,
             data=data,
-            json=json_type_body,
             files=files,
             timeout=self._timeout
         )
@@ -120,10 +115,7 @@ def __call__(self,
         try:
             error = r.json()
 
-        except json.decoder.JSONDecodeError:
-            error = {}
-
-        if not isinstance(error, dict):
+        except ValueError:
             error = {}
 
         error_cls = exceptions.H51Exception.get_class_by_status_code(

h51/resources.py

@@ -1,5 +1,6 @@
 
 from datetime import datetime
+import json
 
 from . import pagination
 
@@ -105,8 +106,12 @@ def analyze(self, analyzers, notification_url=None):
         r = self._client(
             'post',
             f'assets/{self.uid}/analyze',
-            params={'notification_url': notification_url},
-            json_type_body=[a.to_json_type() for a in analyzers]
+            data={
+                'analyzers': json.dumps([
+                    a.to_json_type() for a in analyzers
+                ]),
+                'notification_url': notification_url
+            }
         )
 
         if not notification_url:
@@ -183,6 +188,37 @@ def all(self, client, secure=None, type=None, q=None, rate_buffer=0):
 
         return assets
 
+    @classmethod
+    def analyze_many(
+        cls,
+        client,
+        uids,
+        analyzers,
+        local=False,
+        notification_url=None
+    ):
+        """Analyze one or more assets"""
+
+        if local:
+            analyzers_json = json.dumps({
+                uid: [a.to_json_type() for a in local_analyzers]
+                for uid, local_analyzers in analyzers.items()
+            })
+
+        else:
+            analyzers_json = json.dumps([a.to_json_type() for a in analyzers])
+
+        return client(
+            'post',
+            f'assets/analyze',
+            data={
+                'analyzers': analyzers_json,
+                'local': True if local else None,
+                'notification_url': notification_url,
+                'uids': uids
+            }
+        )
+
     @classmethod
     def create(cls, client, file, name=None, expire=None, secure=False):
         """Upload an asset to Hangar51"""
@@ -200,6 +236,25 @@ def create(cls, client, file, name=None, expire=None, secure=False):
             )
         )
 
+    @classmethod
+    def expire_many(cls, client, uids, seconds):
+        """
+        Find one or more assets matching the given uids and set them to
+        persist (remove the expires time).
+        """
+
+        if isinstance(seconds, datetime):
+            seconds = datetime.timestamp() - time.time()
+
+        return client(
+            'post',
+            'assets/expire',
+            data={
+                'seconds': seconds,
+                'uids': uids
+            }
+        )
+
     @classmethod
     def many(
         cls,
@@ -237,6 +292,17 @@ def one(cls, client, uid):
         """Return an asset matching the given uid"""
         return cls(client, client('get', f'assets/{uid}'))
 
+    @classmethod
+    def persist_many(cls, client, uids):
+        """
+        Find one or more assets matching the given uids and set them to
+        persist (remove the expires time).
+        """
+        return client(
+            'post',
+            'assets/persist',
+            data={'uids': uids}
+        )
 
 class Variation(_BaseResource):
     """
@@ -283,10 +349,12 @@ def create(cls, asset, variations, notification_url=None):
         r = asset._client(
             'put',
             f'assets/{asset.uid}/variations',
-            params={'notification_url': notification_url},
-            json_type_body={
-                name: [t.to_json_type() for t in transforms]
-                for name, transforms in variations.items()
+            data={
+                'notification_url': notification_url,
+                'variations': json.dumps({
+                    name: [t.to_json_type() for t in transforms]
+                    for name, transforms in variations.items()
+                }),
             }
         )
 
@@ -295,3 +363,43 @@ def create(cls, asset, variations, notification_url=None):
                 n: cls(asset._client, asset, n, v)
                 for n, v in r['variations'].items()
             }
+
+    @classmethod
+    def create_many(
+        cls,
+        client,
+        uids,
+        variations,
+        local=False,
+        notification_url=None
+    ):
+        """
+        Find one or more assets matching the given uids and create a set of
+        variations for them.
+        """
+
+        if local:
+            variations_json = json.dumps({
+                uid: {
+                    name: [t.to_json_type() for t in transforms]
+                    for name, transforms in local_variations.items()
+                }
+                for uid, local_variations in variations.items()
+            })
+
+        else:
+            variations_json = json.dumps({
+                name: [t.to_json_type() for t in transforms]
+                for name, transforms in variations.items()
+            })
+
+        return client(
+            'put',
+            f'assets/transform',
+            data={
+                'local': True if local else None,
+                'notification_url': notification_url,
+                'uids': uids,
+                'variations': variations_json
+            }
+        )

setup.py

@@ -21,7 +21,7 @@
     # Versions should comply with PEP440. For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='0.0.4',
+    version='0.0.5',
     description=\
         'The H51 Python library provides a pythonic interface to the H51 API.',
     long_description=long_description,

test.py

@@ -0,0 +1,50 @@
+import h51
+
+
+client = h51.Client(
+    'gY4uNgniLM6gps60dyYKDKklBVlb7zh8xUqI9ZBp2aLd4KOsEeQrrfNViPiQ_0Hbcu_frZ8BbwMOaWPfnpTaxGAaD93_BAr6nBA6uw6Id0Cgm4OCcG5MDi93aXMjsBkC0oYd9_sED_WaJLrg3S83A0RXd2sDqQobmKwZIGu5AHM',
+    api_base_url='http://api.h51.local'
+)
+
+asset = h51.resources.Asset.one(client, '3owuun')
+
+# r = h51.resources.Variation.create_many(
+#     client,
+#     ['3owuun', 'xvr8dj'],
+#     {
+#         '3owuun': {
+#             'x1': [
+#                 h51.transforms.images.AutoOrient(),
+#                 h51.transforms.images.FocalPointCrop(aspect_ratio=0.5),
+#                 h51.transforms.images.Fit(640, 640),
+#                 h51.transforms.images.Output('WebP')
+#             ]
+#         },
+#         'xvr8dj': {
+#             'x1': [
+#                 h51.transforms.images.AutoOrient(),
+#                 h51.transforms.images.FocalPointCrop(aspect_ratio=0.5),
+#                 h51.transforms.images.Fit(640, 640),
+#                 h51.transforms.images.Output('JPEG')
+#             ]
+#         }
+#     },
+#     local=True
+# )
+
+r = h51.resources.Asset.analyze_many(
+    client,
+    ['3owuun', 'ayj6wc'],
+    {
+        '3owuun': [
+            h51.analyzers.images.DominantColors(),
+            h51.analyzers.images.FocalPoint()
+        ],
+        'ayj6wc': [
+            h51.analyzers.images.Animation()
+        ]
+    },
+    local=True
+)
+
+print(r)