mediacatch 0.2.0__tar.gz → 0.2.2__tar.gz

{mediacatch-0.2.0 → mediacatch-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mediacatch
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python package for easily interfacing with MediaCatch APIs and data formats.
 Project-URL: Documentation, https://github.com/mediacatch/mediacatch#readme
 Project-URL: Issues, https://github.com/mediacatch/mediacatch/issues

{mediacatch-0.2.0 → mediacatch-0.2.2}/mediacatch/__init__.py

@@ -14,4 +14,4 @@ logging.basicConfig(
 load_dotenv()
 mediacatch_api_key = os.environ['MEDIACATCH_API_KEY']
 
-__version__ = '0.2.0'
+__version__ = '0.2.2'

{mediacatch-0.2.0 → mediacatch-0.2.2}/mediacatch/speech/result.py

@@ -6,6 +6,8 @@ from typing import Any
 
 import requests
 
+from mediacatch.utils import MediacatchAPIError, MediacatchError, MediacatchTimeoutError
+
 logger = logging.getLogger('mediacatch.speech.result')
 
 
@@ -14,6 +16,7 @@ def wait_for_result(
     url: str = 'https://s2t.mediacatch.io/api/v2',
     timeout: int = 3600,
     delay: int = 10,
+    verbose: bool = True,
 ) -> dict[str, Any] | None:
     """Wait for result from a URL.
 
@@ -22,33 +25,42 @@ def wait_for_result(
         url (str): The URL to get the result from.
         timeout (int, optional): Timeout for waiting in seconds. Defaults to 3600.
         delay (int, optional): Delay between each request. Defaults to 10.
+        verbose (bool, optional): Show verbose output. Defaults to True.
 
     Returns:
         dict[str, Any] | None: Dictionary with the result from the URL or None if failed.
     """
     result_url = f'{url}/result/{file_id}'
-    logger.info(f'Waiting for result from {result_url}')
+    if verbose:
+        logger.info(f'Waiting for result from {result_url}')
     start_time = time.time()
     end_time = start_time + timeout
     while time.time() < end_time:
         try:
             response = requests.get(result_url)
             if response.status_code in [404, 500]:
-                pprint(response.json())
-                return None
+                if verbose:
+                    pprint(response.json())
+                raise MediacatchAPIError(response.status_code, response.json())
 
             response.raise_for_status()
             result = response.json()
             elapsed_time = time.time() - start_time
-            logger.info(f'Got result from {result_url} in {elapsed_time:.2f} seconds')
+            if verbose:
+                logger.info(f'Got result from {result_url} in {elapsed_time:.2f} seconds')
+
             return result
 
         except (requests.RequestException, json.JSONDecodeError):
             time.sleep(delay)
 
         except Exception as e:
-            logger.error(f'Failed to get result from {result_url}: {e}')
-            return None
+            if verbose:
+                logger.error(f'Failed to get result from {result_url}: {e}')
+
+            raise MediacatchError(f'Failed to get result from {result_url}: {e}')
+
+    if verbose:
+        logger.error(f'Timeout waiting for result from {result_url}, give up')
 
-    logger.error(f'Timeout waiting for result from {result_url}, give up')
-    return None
+    raise MediacatchTimeoutError(f'Timeout waiting for result from {result_url}')

{mediacatch-0.2.0 → mediacatch-0.2.2}/mediacatch/speech/upload.py

@@ -5,7 +5,7 @@ from pathlib import Path
 import requests
 
 from mediacatch import mediacatch_api_key
-from mediacatch.utils.general import make_request, read_file_in_chunks
+from mediacatch.utils import MediacatchUploadError, make_request, read_file_in_chunks
 
 logger = logging.getLogger('mediacatch.speech.upload')
 
@@ -19,6 +19,7 @@ def upload(
     request_delay: float = 0.5,
     chunk_size=100 * 1024 * 1024,  # 100 MB
     url: str = 'https://s2t.mediacatch.io/api/v2',
+    verbose: bool = True,
 ) -> str:
     """Uploads a file to MediaCatch Speech API.
 
@@ -30,6 +31,8 @@ def upload(
         max_request_retries (int, optional): Number of maximum retries for request. Defaults to 3.
         request_delay (float, optional): Delay between request retries. Defaults to 0.5.
         chunk_size (_type_, optional): Size of each chunk to upload. Defaults to 100*1024*1024.
+        url (str, optional): URL of the MediaCatch Speech API. Defaults to 'https://s2t.mediacatch.io/api/v2'.
+        verbose (bool, optional): Show verbose output. Defaults to True.
 
     Returns:
         str: File ID of the uploaded file.
@@ -37,9 +40,11 @@ def upload(
     if not isinstance(fpath, Path):
         fpath = Path(fpath)
 
-    assert fpath.is_file(), f'File {fpath} does not exist'
+    if not fpath.is_file():
+        raise MediacatchUploadError(f'File {fpath} does not exist')
 
-    logger.info(f'Uploading file {fpath} to MediaCatch Speech API')
+    if verbose:
+        logger.info(f'Uploading file {fpath} to MediaCatch Speech API')
 
     headers = {
         'Content-type': 'application/json',
@@ -99,14 +104,17 @@ def upload(
             try:
                 future.result()
             except Exception as e:
-                logger.error(f'Chunk {part_number} failed to upload due to: {e}')
+                if verbose:
+                    logger.error(f'Chunk {part_number} failed to upload due to: {e}')
 
     # Complete file upload
     complete_upload_url = f'{url}/upload/{file_id}/complete'
     response = make_request('post', complete_upload_url, json={'parts': etags}, headers=headers)
     estimated_processing_time = response.json()['estimated_processing_time']
 
-    logger.info(
-        f'File {fpath} uploaded successfully. Estimated processing time: {estimated_processing_time}'
-    )
+    if verbose:
+        logger.info(
+            f'File {fpath} uploaded successfully. Estimated processing time: {estimated_processing_time}'
+        )
+
     return file_id

{mediacatch-0.2.0 → mediacatch-0.2.2}/mediacatch/vision/upload.py

@@ -34,6 +34,13 @@ def upload(
     max_height_width_ratio: float | None = None,
     get_detection_histogram: bool | None = None,
     detection_histogram_bins: int | None = None,
+    get_frame_index: bool | None = None,
+    get_bbox: bool | None = None,
+    face_recognition: bool | None = None,
+    face_age: bool | None = None,
+    face_gender: bool | None = None,
+    face_expression: bool | None = None,
+    face_ethnicity: bool | None = None,
     max_retries: int = 5,
     delay: float = 10.0,
     verbose: bool = True,
@@ -55,6 +62,13 @@ def upload(
         max_height_width_ratio (float, optional): Discard detection if height/width ratio is greater than this value. Defaults to 2.0.
         get_detection_histogram (bool, optional): If true, get histogram of detection. Defaults to False.
         detection_histogram_bins (int, optional): Number of bins for histogram calculation. Defaults to 8.
+        get_frame_index (bool, optional): If true, get frame index. Defaults to None.
+        get_bbox (bool, optional): If true, get bounding box. Defaults to None.
+        face_recognition (bool, optional): If true, run face recognition. Defaults to None.
+        face_age (bool, optional): If true, get face age. Defaults to None.
+        face_gender (bool, optional): If true, get face gender. Defaults to None.
+        face_expression (bool, optional): If true, get face expression. Defaults to None.
+        face_ethnicity (bool, optional): If true, get face ethnicity. Defaults to None.
         max_retries (int, optional): Maximum number of retries. Defaults to 5.
         delay (float, optional): Delay between retries. Defaults to 10.0.
         verbose (bool, optional): If True, print log messages. Defaults to True.
@@ -88,6 +102,20 @@ def upload(
         extra['get_detection_histogram'] = get_detection_histogram
     if detection_histogram_bins is not None:
         extra['detection_histogram_bins'] = detection_histogram_bins
+    if get_frame_index is not None:
+        extra['frame'] = get_frame_index
+    if get_bbox is not None:
+        extra['bbox'] = get_bbox
+    if face_recognition is not None:
+        extra['recognition'] = face_recognition
+    if face_age is not None:
+        extra['age'] = face_age
+    if face_gender is not None:
+        extra['gender'] = face_gender
+    if face_expression is not None:
+        extra['expression'] = face_expression
+    if face_ethnicity is not None:
+        extra['ethnicity'] = face_ethnicity
 
     # Get presigned URL
     data = {'filename': fpath, 'type': type, 'extra': extra}