most-client 1.0.9__tar.gz → 1.0.11__tar.gz

{most_client-1.0.9/most_client.egg-info → most_client-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: most-client
-Version: 1.0.9
+Version: 1.0.11
 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.9 → most_client-1.0.11}/README.md

@@ -27,4 +27,10 @@ print(results)
         }
     ]
 }
+
+most.store_info(results['id'], {
+    "key1": "value1"
+})
+
+most.fetch_info(results['id'])
 ```

{most_client-1.0.9 → most_client-1.0.11}/most/api.py

@@ -1,8 +1,8 @@
-from typing import List
+from typing import List, Dict
 import json5
 import requests
 from adaptix import Retort
-from most.types import Audio, Result, Script, JobStatus, Text
+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,45 +156,82 @@ 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)})
         return resp.url
 
+    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,
+                         })
+        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)
+
     def __call__(self, audio_path: Path):
         audio = self.upload_audio(audio_path)
         return self.apply(audio.id)

{most_client-1.0.9 → most_client-1.0.11}/most/async_api.py

@@ -1,7 +1,7 @@
-from typing import List
+from typing import List, Dict
 import json5
 from adaptix import Retort
-from most.types import Audio, Result, Script, JobStatus, Text
+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,45 +165,78 @@ 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)})
         return resp.next_request.url
 
+    async def store_info(self,
+                         audio_id: str,
+                         data: Dict[str, str]):
+        resp = await self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/info",
+                               json={
+                                   "data": data,
+                               })
+        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)
+
     async def __call__(self, audio_path: Path):
         audio = await self.upload_audio(audio_path)
         return await self.apply(audio.id)

{most_client-1.0.9 → most_client-1.0.11}/most/types.py

@@ -1,6 +1,15 @@
 from dataclasses import dataclass
+
+from bson import ObjectId
 from dataclasses_json import dataclass_json, DataClassJsonMixin
-from typing import Optional, List, Literal
+from typing import Optional, List, Literal, Dict
+
+
+@dataclass_json
+@dataclass
+class StoredAudioData(DataClassJsonMixin):
+    id: str
+    data: Dict[str, str]
 
 
 @dataclass_json
@@ -66,3 +75,13 @@ 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
+    try:
+        ObjectId(smth_id)
+        return True
+    except:
+        return False

{most_client-1.0.9 → most_client-1.0.11/most_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: most-client
-Version: 1.0.9
+Version: 1.0.11
 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.9 → most_client-1.0.11}/most_client.egg-info/requires.txt

@@ -12,3 +12,4 @@ pytest
 tox
 twine
 httpx
+bson

{most_client-1.0.9 → most_client-1.0.11}/requirements.txt

@@ -12,3 +12,4 @@ pytest
 tox
 twine
 httpx
+bson

{most_client-1.0.9 → most_client-1.0.11}/setup.py

@@ -8,7 +8,7 @@ with open('requirements.txt', 'r') as f:
 
 setup(
     name='most-client',
-    version='1.0.9',
+    version='1.0.11',
     python_requires=f'>=3.6',
     description='Most AI API for https://the-most.ai',
     url='https://github.com/the-most-ai/most-client',