most-client 1.0.10__py3-none-any.whl → 1.0.12__py3-none-any.whl

most/api.py

@@ -2,7 +2,7 @@ from typing import List, Dict
 import json5
 import requests
 from adaptix import Retort
-from most.types import Audio, Result, Script, JobStatus, Text, StoredAudioData
+from most.types import Audio, Result, Script, JobStatus, Text, StoredAudioData, is_valid_id
 from pathlib import Path
 
 
@@ -144,8 +144,9 @@ class MostClient(object):
         return self.retort.load(audio_list, List[Audio])
 
     def get_model_script(self) -> Script:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
         resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/model/{self.model_id}/script")
         return self.retort.load(resp.json(), Script)
 
@@ -155,40 +156,58 @@ class MostClient(object):
                 for model in resp.json()]
 
     def apply(self, audio_id) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply")
         return self.retort.load(resp.json(), Result)
 
     def apply_later(self, audio_id) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_async")
         return self.retort.load(resp.json(), Result)
 
     def get_job_status(self, audio_id) -> JobStatus:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_status")
         return self.retort.load(resp.json(), JobStatus)
 
     def fetch_results(self, audio_id) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
         resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
         return self.retort.load(resp.json(), Result)
 
     def fetch_text(self, audio_id: str) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
         resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
     def export(self, audio_ids: List[str]) -> str:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
         resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/model/{self.model_id}/export",
                         params={'audio_ids': ','.join(audio_ids)})
@@ -197,6 +216,9 @@ class MostClient(object):
     def store_info(self,
                    audio_id: str,
                    data: Dict[str, str]):
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/info",
                          json={
                              "data": data,
@@ -204,6 +226,9 @@ class MostClient(object):
         return self.retort.load(resp.json(), StoredAudioData)
 
     def fetch_info(self, audio_id: str) -> Dict[str, str]:
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/info")
         return self.retort.load(resp.json(), StoredAudioData)
 

most/async_api.py

@@ -1,7 +1,7 @@
 from typing import List, Dict
 import json5
 from adaptix import Retort
-from most.types import Audio, Result, Script, JobStatus, Text, StoredAudioData
+from most.types import Audio, Result, Script, JobStatus, Text, StoredAudioData, is_valid_id
 from pathlib import Path
 import httpx
 
@@ -72,6 +72,8 @@ class AsyncMostClient(object):
 
     def with_model(self, model_id):
         client = self.clone()
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
         client.model_id = model_id
         return client
 
@@ -151,8 +153,9 @@ class AsyncMostClient(object):
         return self.retort.load(audio_list, List[Audio])
 
     async def get_model_script(self) -> Script:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
         resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/model/{self.model_id}/script")
         return self.retort.load(resp.json(), Script)
 
@@ -162,40 +165,58 @@ class AsyncMostClient(object):
                 for model in resp.json()]
 
     async def apply(self, audio_id) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = await self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply")
         return self.retort.load(resp.json(), Result)
 
     async def apply_later(self, audio_id):
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = await self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_async")
         return self.retort.load(resp.json(), Result)
 
     async def get_job_status(self, audio_id) -> JobStatus:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
+
         resp = await self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_status")
         return self.retort.load(resp.json(), JobStatus)
 
     async def fetch_results(self, audio_id) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
         resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
         return self.retort.load(resp.json(), Result)
 
     async def fetch_text(self, audio_id) -> Result:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
+
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
         resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
     async def export(self, audio_ids: List[str]) -> str:
-        if self.model_id is None:
-            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        if not is_valid_id(self.model_id):
+            raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
         resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/model/{self.model_id}/export",
                               params={'audio_ids': ','.join(audio_ids)})
@@ -211,6 +232,8 @@ class AsyncMostClient(object):
         return self.retort.load(resp.json(), StoredAudioData)
 
     async def fetch_info(self, audio_id: str) -> Dict[str, str]:
+        if not is_valid_id(audio_id):
+            raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
         resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/info")
         return self.retort.load(resp.json(), StoredAudioData)
 

most/types.py

@@ -1,4 +1,6 @@
 from dataclasses import dataclass
+
+from bson import ObjectId
 from dataclasses_json import dataclass_json, DataClassJsonMixin
 from typing import Optional, List, Literal, Dict
 
@@ -73,3 +75,17 @@ class Result(DataClassJsonMixin):
                                       subcolumns=[subcolumn_result.name
                                                   for subcolumn_result in column_result.subcolumns])
                                for column_result in self.results])
+
+
+def is_valid_id(smth_id: Optional[str]) -> bool:
+    if smth_id is None:
+        return False
+
+    if smth_id.startswith("most-"):
+        smth_id = smth_id[5:]
+
+    try:
+        ObjectId(smth_id)
+        return True
+    except:
+        return False

{most_client-1.0.10.dist-info → most_client-1.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: most-client
-Version: 1.0.10
+Version: 1.0.12
 Summary: Most AI API for https://the-most.ai
 Home-page: https://github.com/the-most-ai/most-client
 Author: George Kasparyants
@@ -26,6 +26,7 @@ Requires-Dist: pytest
 Requires-Dist: tox
 Requires-Dist: twine
 Requires-Dist: httpx
+Requires-Dist: bson
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

most_client-1.0.12.dist-info/RECORD

@@ -0,0 +1,9 @@
+most/__init__.py,sha256=62uFFeM_1VVR83K3bTYWK3PEoqnmFCy9aWYerQ6U4Ds,67
+most/api.py,sha256=sGChrPUuwBjSdkkJK3BDOh3YYaxe9xAuGS82GcEdQk4,10074
+most/async_api.py,sha256=ZiUXdqRBG8yTEBHfuglN1eaBMr29S9ibWWfFM5EP61w,10735
+most/types.py,sha256=nSYmVm27y9py_HG6a7oKSObDRHCymmTYo-x5bYhKqug,1844
+most_client-1.0.12.dist-info/METADATA,sha256=8oMagstmNNBg12x6Y2E-Zv5zBfMpAnXgZdQZcCbJTI0,1026
+most_client-1.0.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+most_client-1.0.12.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.12.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.12.dist-info/RECORD,,

most_client-1.0.10.dist-info/RECORD

@@ -1,9 +0,0 @@
-most/__init__.py,sha256=62uFFeM_1VVR83K3bTYWK3PEoqnmFCy9aWYerQ6U4Ds,67
-most/api.py,sha256=tD6GkStvShdGTnjCLD34OSXLTV9mpJSQCKqo0UGsE60,9028
-most/async_api.py,sha256=ixUxEttK5ibcRdWV9DghU9ixQcJWxXqdnkFEYsc6crA,9691
-most/types.py,sha256=-GF8GBe0ojaAqyFl0yju030cZuUDe_6YU_5Q_5FT7UI,1565
-most_client-1.0.10.dist-info/METADATA,sha256=YF8cjUF9bVgJhPg1xf-a3GNx7VPvjM9vkPgsgB5dYJk,1006
-most_client-1.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-most_client-1.0.10.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.10.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.10.dist-info/RECORD,,