Merge pull request #34 from mediacatch/33-switch-to-s2t-api-v2

Switch to s2t api v2

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mediacatch-s2t"
-version = '1.1.0'
+version = '2.0.0'
 description = "Upload a media file and get the transcription link."
 readme = "README.md"
 authors = [{ name = "MediaCatch", email = "[email protected]" }]

src/mediacatch_s2t/__init__.py

@@ -3,29 +3,22 @@
 """
 
 # Version of the mc-s2t-mediacatch_s2t
-__version__ = '1.1.0'
+__version__ = '2.0.0'
 
 import os
 
-URL: str = os.environ.get('MEDIACATCH_URL', 'https://s2t.mediacatch.io')
-SINGLE_UPLOAD_ENDPOINT: str = os.environ.get(
-    'MEDIACATCH_PRESIGN_ENDPOINT',
-    '/presigned-post-url')
-MULTIPART_UPLOAD_CREATE_ENDPOINT: str = os.environ.get(
-    'MEDIACATCH_MULTIPART_UPLOAD_CREATE_ENDPOINT',
-    '/multipart-upload/id')
-MULTIPART_UPLOAD_URL_ENDPOINT: str = os.environ.get(
-    'MEDIACATCH_MULTIPART_UPLOAD_URL_ENDPOINT',
-    '/multipart-upload/url')
-MULTIPART_UPLOAD_COMPLETE_ENDPOINT: str = os.environ.get(
-    'MEDIACATCH_MULTIPART_UPLOAD_COMPLETE_ENDPOINT',
-    '/multipart-upload/complete')
-UPDATE_STATUS_ENDPOINT: str = os.environ.get(
-    'MEDIACATCH_UPDATE_STATUS_ENDPOINT',
-    '/upload-completed')
+URL: str = os.environ.get('MEDIACATCH_URL', 'https://s2t.mediacatch.io/api/v2')
+UPLOAD_CREATE_ENDPOINT: str = os.environ.get(
+    'MEDIACATCH_UPLOAD_CREATE_ENDPOINT',
+    '/upload/')
+UPLOAD_URL_ENDPOINT: str = os.environ.get(
+    'MEDIACATCH_UPLOAD_URL_ENDPOINT',
+    '/upload/{file_id}/{part_number}')
+UPLOAD_COMPLETE_ENDPOINT: str = os.environ.get(
+    'MEDIACATCH_UPLOAD_COMPLETE_ENDPOINT',
+    '/upload/{file_id}/complete')
 TRANSCRIPT_ENDPOINT: str = os.environ.get(
-    'MEDIACATCH_TRANSCRIPT_ENDPOINT', '/result')
-PROCESSING_TIME_RATIO: float = 0.1
-MULTIPART_FILESIZE: int = 1 * 1024 * 1024 * 1024
+    'MEDIACATCH_TRANSCRIPT_ENDPOINT',
+    '/result/{file_id}')
 
 ENABLE_AUTOMATIC_UPDATE: bool = True

src/mediacatch_s2t/__main__.py

@@ -13,13 +13,13 @@ def main() -> None:
     )
     parser.add_argument("api_key", type=str, help="MediaCatch API key.")
     parser.add_argument("file", type=str, help="A media file.")
-    parser.add_argument("--language", type=str, default='da', help="The main language in the file.")
+    parser.add_argument("--quota", type=str, default=None, help="The quota to bill usage to. Defaults to None.")
     args = parser.parse_args()
 
     console = Console()
     with console.status(
             "[bold green]Uploading file to MediaCatch..."):
-        result = uploader.upload_and_get_transcription(args.file, args.api_key, args.language)
+        result = uploader.upload_and_get_transcription(args.file, args.api_key, args.quota)
         if result['status'] == 'error':
             sys.exit(
                 f"Error occurred:\n{result['message']}. "