most-client 1.0.45__py3-none-any.whl → 1.0.47__py3-none-any.whl

most/api.py

@@ -327,53 +327,57 @@ class MostClient(object):
             result = self.get_score_modifier().modify(result)
         return result
 
-    def get_job_status(self, audio_id) -> JobStatus:
+    def get_job_status(self, data_id,
+                       data_source: Literal["text", "audio"] = "audio") -> JobStatus:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
-        resp = self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_status")
+        resp = self.post(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/apply_status")
         return self.retort.load(resp.json(), JobStatus)
 
-    def fetch_results(self, audio_id,
-                      modify_scores: bool = False) -> Result:
+    def fetch_results(self, data_id,
+                      modify_scores: bool = False,
+                      data_source: Literal["text", "audio"] = "audio") -> Result:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
-        resp = self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
+        resp = self.get(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/results")
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.get_score_modifier().modify(result)
         return result
 
-    def fetch_text(self, audio_id: str) -> Result:
+    def fetch_text(self, data_id: str,
+                   data_source: Literal["text", "audio"] = "audio") -> Result:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
-        resp = self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
+        resp = self.get(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
-    def fetch_dialog(self, audio_id,
-                     transcribator_name: Optional[Literal["GroundTruth"]] = None) -> DialogResult:
+    def fetch_dialog(self, data_id: str,
+                     transcribator_name: Optional[Literal["GroundTruth"]] = None,
+                     data_source: Literal["text", "audio"] = "audio") -> DialogResult:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
         params = {}
         if transcribator_name is not None:
             params["transcribator_name"] = transcribator_name
 
-        resp = self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/dialog",
+        resp = self.get(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/dialog",
                         params=params)
         return self.retort.load(resp.json(), DialogResult)
 
@@ -470,3 +474,20 @@ class MostClient(object):
                                 'end_dt': end_dt.astimezone(timezone.utc).isoformat()})
         resp.raise_for_status()
         return self.retort.load(resp.json(), Usage)
+
+    def ask(self, question,
+            audio_ids: List[str],
+            text_ids: List[str]) -> str:
+        if not all(is_valid_id(text_id) for text_id in text_ids):
+            raise RuntimeError("Please use valid text_id. [try text.id from list_texts()]")
+
+        if not all(is_valid_id(audio_id) for audio_id in audio_ids):
+            raise RuntimeError("Please use valid text_id. [try text.id from list_texts()]")
+
+        resp = self.post(f"/{self.client_id}/model/{self.model_id}/ask",
+                         json={
+                             "question": question,
+                             "text_ids": text_ids,
+                             "audio_ids": audio_ids,
+                         })
+        return resp.json()

most/async_api.py

@@ -339,53 +339,57 @@ class AsyncMostClient(object):
             result = score_modifier.modify(result)
         return result
 
-    async def get_job_status(self, audio_id) -> JobStatus:
+    async def get_job_status(self, data_id: str,
+                             data_source: Literal["text", "audio"] = "audio") -> JobStatus:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
-        resp = await self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_status")
+        resp = await self.post(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/apply_status")
         return self.retort.load(resp.json(), JobStatus)
 
-    async def fetch_results(self, audio_id,
-                            modify_scores: bool = False) -> Result:
+    async def fetch_results(self, data_id: str,
+                            modify_scores: bool = False,
+                            data_source: Literal["text", "audio"] = "audio") -> Result:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
-        resp = await self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
+        resp = await self.get(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/results")
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             score_modifier = await self.get_score_modifier()
             result = score_modifier.modify(result)
         return result
 
-    async def fetch_text(self, audio_id) -> Result:
+    async def fetch_text(self, data_id: str,
+                         data_source: Literal["text", "audio"] = "audio") -> Result:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
-        resp = await self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
+        resp = await self.get(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
-    async def fetch_dialog(self, audio_id,
-                           transcribator_name: Optional[Literal["GroundTruth"]] = None) -> DialogResult:
+    async def fetch_dialog(self, data_id,
+                           transcribator_name: Optional[Literal["GroundTruth"]] = None,
+                           data_source: Literal["text", "audio"] = "audio") -> DialogResult:
         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()]")
+        if not is_valid_id(data_id):
+            raise RuntimeError("Please use valid data_id. [try audio.id / text.id from list_audios() / list_texts()]")
 
         params = {}
         if transcribator_name is not None:
             params["transcribator_name"] = transcribator_name
-        resp = await self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/dialog",
+        resp = await self.get(f"/{self.client_id}/{data_source}/{data_id}/model/{self.model_id}/dialog",
                               params=params)
         return self.retort.load(resp.json(), DialogResult)
 
@@ -478,3 +482,20 @@ class AsyncMostClient(object):
                                       'end_dt': end_dt.astimezone(timezone.utc).isoformat()})
         resp.raise_for_status()
         return self.retort.load(resp.json(), Usage)
+
+    async def ask(self, question,
+                  audio_ids: List[str],
+                  text_ids: List[str]) -> str:
+        if not all(is_valid_id(text_id) for text_id in text_ids):
+            raise RuntimeError("Please use valid text_id. [try text.id from list_texts()]")
+
+        if not all(is_valid_id(audio_id) for audio_id in audio_ids):
+            raise RuntimeError("Please use valid text_id. [try text.id from list_texts()]")
+
+        resp = await self.post(f"/{self.client_id}/model/{self.model_id}/ask",
+                               json={
+                                   "question": question,
+                                   "text_ids": text_ids,
+                                   "audio_ids": audio_ids,
+                               })
+        return resp.json()

{most_client-1.0.45.dist-info → most_client-1.0.47.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.45
+Version: 1.0.47
 Summary: Most AI API for https://the-most.ai
 Home-page: https://github.com/the-most-ai/most-client
 Author: George Kasparyants

{most_client-1.0.45.dist-info → most_client-1.0.47.dist-info}/RECORD

@@ -1,7 +1,7 @@
 most/__init__.py,sha256=ZA2n_h824tfGd5tFl3RsD0noUyv_T08fBoBxMEgxmzs,548
 most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
-most/api.py,sha256=oD7VmdxdoyQI05ISgVvOG1o6dlW97FLohLhmXyD5h4k,19773
-most/async_api.py,sha256=vg0Y-EOEMNxPOae9rIXxD4AeEvTwTEjpP_6Vzht2AZw,21092
+most/api.py,sha256=R2oLfklXUe-Pc5w3Wbu_CII8Cq1vpJm0YDIw75BVN_Y,20915
+most/async_api.py,sha256=zmVyUKZ5EbQZT0Lsg7OEQzSU188Kpf8SDUAZ9dCXpXI,22322
 most/async_catalog.py,sha256=LgQ5zghQtDMnqq-WjmRHqZkqcdixZnHtmoRaVv74VKM,1059
 most/async_glossary.py,sha256=nehgkQvqENxT5vnmMiRLSWgD0jFr2Hzs7yqNZfC9ahs,1281
 most/async_searcher.py,sha256=C0zViW20K7OhKO1BzBZktTbMJYBBvor3uK6LAHZTxz0,2238
@@ -13,8 +13,8 @@ most/search_types.py,sha256=GFwXaDJV4qI_gaFZToLMHoYH-JXVfIVwfVTgJ7RDWoY,7211
 most/searcher.py,sha256=9UdiSlScsE6EPc6RpK8xkRLeB5gHNxgPQpXTJ17i3lQ,2135
 most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
 most/types.py,sha256=7o8uqhQd8FbO7H50TMJPbSIG4VyyX-LumWYRlHeqwgg,5343
-most_client-1.0.45.dist-info/METADATA,sha256=adEOomfAq7CaqdscKedIhXOLxCKDl7nSX8aNAA9Icrw,1027
-most_client-1.0.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-most_client-1.0.45.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.45.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.45.dist-info/RECORD,,
+most_client-1.0.47.dist-info/METADATA,sha256=eDFZczK8eeAZXyOLWew3-pIFCNSfIikD39E20w7KQ6E,1027
+most_client-1.0.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+most_client-1.0.47.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.47.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.47.dist-info/RECORD,,