most-client 1.0.30__py3-none-any.whl → 1.0.32__py3-none-any.whl

most/api.py

@@ -18,7 +18,7 @@ from most.types import (
     Script,
     StoredAudioData,
     Text,
-    is_valid_id, SearchParams, ScriptScoreMapping, Dialog,
+    is_valid_id, SearchParams, ScriptScoreMapping, Dialog, Usage,
 )
 
 
@@ -26,7 +26,7 @@ class MostClient(object):
     retort = Retort(recipe=[
         loader(int, lambda x: int(x)),
         loader(float, lambda x: float(x)),
-        loader(datetime, lambda x: datetime.fromtimestamp(x).replace(tzinfo=timezone.utc)),
+        loader(datetime, lambda x: datetime.fromtimestamp(x).astimezone(tz=timezone.utc) if isinstance(x, (int, float)) else datetime.fromisoformat(x)),
     ],)
 
     def __init__(self,
@@ -248,56 +248,64 @@ class MostClient(object):
                 for model in resp.json()]
 
     def apply(self, audio_id,
-              modify_scores: bool = False) -> Result:
+              modify_scores: bool = False,
+              overwrite: bool = False) -> 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()]")
 
-        resp = self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply")
+        resp = self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply",
+                         params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
         return result
 
     def apply_on_text(self, text_id,
-                      modify_scores: bool = False) -> Result:
+                      modify_scores: bool = False,
+                      overwrite: bool = False) -> 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(text_id):
             raise RuntimeError("Please use valid text_id. [try text.id from list_texts()]")
 
-        resp = self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply")
+        resp = self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply",
+                         params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
         return result
 
     def apply_later(self, audio_id,
-                    modify_scores: bool = False) -> Result:
+                    modify_scores: bool = False,
+                    overwrite: bool = False) -> 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()]")
 
-        resp = self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_async")
+        resp = self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_async",
+                         params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
         return result
 
     def apply_on_text_later(self, text_id,
-                            modify_scores: bool = False) -> Result:
+                            modify_scores: bool = False,
+                            overwrite: bool = False) -> 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(text_id):
             raise RuntimeError("Please use valid text_id. [try audio.id from list_texts()]")
 
-        resp = self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply_async")
+        resp = self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply_async",
+                         params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
@@ -436,3 +444,12 @@ class MostClient(object):
             raise RuntimeError("Audio can't be indexed")
         audio_list = resp.json()
         return self.retort.load(audio_list, List[Audio])
+
+    def get_usage(self,
+                  start_dt: datetime,
+                  end_dt: datetime):
+        resp = self.get(f"/{self.client_id}/model/{self.model_id}/usage",
+                        params={'start_dt': start_dt.astimezone(timezone.utc).isoformat(),
+                                'end_dt': end_dt.astimezone(timezone.utc).isoformat()})
+        resp.raise_for_status()
+        return self.retort.load(resp.json(), Usage)

most/async_api.py

@@ -18,7 +18,7 @@ from most.types import (
     Script,
     StoredAudioData,
     Text,
-    is_valid_id, SearchParams, ScriptScoreMapping, Dialog,
+    is_valid_id, SearchParams, ScriptScoreMapping, Dialog, Usage,
 )
 
 
@@ -26,7 +26,7 @@ class AsyncMostClient(object):
     retort = Retort(recipe=[
         loader(int, lambda x: int(x)),
         loader(float, lambda x: float(x)),
-        loader(datetime, lambda x: datetime.fromtimestamp(x).replace(tzinfo=timezone.utc)),
+        loader(datetime, lambda x: datetime.fromtimestamp(x).astimezone(tz=timezone.utc) if isinstance(x, (int, float)) else datetime.fromisoformat(x)),
     ])
 
     def __init__(self,
@@ -258,56 +258,64 @@ class AsyncMostClient(object):
                 for model in resp.json()]
 
     async def apply(self, audio_id,
-                    modify_scores: bool = False) -> Result:
+                    modify_scores: bool = False,
+                    overwrite: bool = False) -> 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()]")
 
-        resp = await self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply")
+        resp = await self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply",
+                               params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
         return result
 
     async def apply_on_text(self, text_id,
-                            modify_scores: bool = False) -> Result:
+                            modify_scores: bool = False,
+                            overwrite: bool = False) -> 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(text_id):
             raise RuntimeError("Please use valid text_id. [try text.id from list_texts()]")
 
-        resp = await self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply")
+        resp = await self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply",
+                               params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
         return result
 
     async def apply_later(self, audio_id,
-                          modify_scores: bool = False) -> Result:
+                          modify_scores: bool = False,
+                          overwrite: bool = False) -> 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()]")
 
-        resp = await self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_async")
+        resp = await self.post(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply_async",
+                               params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
         return result
 
     async def apply_on_text_later(self, text_id,
-                                  modify_scores: bool = False) -> Result:
+                                  modify_scores: bool = False,
+                                  overwrite: bool = False) -> 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(text_id):
             raise RuntimeError("Please use valid text_id. [try audio.id from list_texts()]")
 
-        resp = await self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply_async")
+        resp = await self.post(f"/{self.client_id}/text/{text_id}/model/{self.model_id}/apply_async",
+                               params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
             result = self.score_modifier.modify(result)
@@ -442,3 +450,12 @@ class AsyncMostClient(object):
             raise RuntimeError("Audio can't be indexed")
         audio_list = resp.json()
         return self.retort.load(audio_list, List[Audio])
+
+    async def get_usage(self,
+                        start_dt: datetime,
+                        end_dt: datetime):
+        resp = await self.get(f"/{self.client_id}/model/{self.model_id}/usage",
+                              params={'start_dt': start_dt.astimezone(timezone.utc).isoformat(),
+                                      'end_dt': end_dt.astimezone(timezone.utc).isoformat()})
+        resp.raise_for_status()
+        return self.retort.load(resp.json(), Usage)

most/types.py

@@ -173,6 +173,25 @@ class HumanFeedback(DataClassJsonMixin):
         return sum((preds[key] == gt[key]) for key in common_keys) / len(common_keys)
 
 
+@dataclass_json
+@dataclass
+class Usage(DataClassJsonMixin):
+    apply_audio_async: int
+    apply_audio_async_duration: int
+    apply_text_async: int
+
+    apply_audio: int
+    apply_audio_duration: int
+    apply_text: int
+
+    upload_audio: int
+    upload_audio_duration: int
+    upload_text: int
+
+    start_dt: datetime
+    end_dt: datetime
+
+
 def is_valid_objectid(oid: str) -> bool:
     """
     Check if a given string is a valid MongoDB ObjectId (24-character hex).

{most_client-1.0.30.dist-info → most_client-1.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.30
+Version: 1.0.32
 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.32.dist-info/RECORD

@@ -0,0 +1,13 @@
+most/__init__.py,sha256=b0EXXaPA4kmt-FtGXKRWZr7SCwjipMLcpC6uT5WRIdY,144
+most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
+most/api.py,sha256=3PzHr61qKQ0_BIo9rdsm2SRi43yD0HdQc8GPpW-ehgk,18816
+most/async_api.py,sha256=uSfdZuWCdPr05JiO2hJ9HraF0uFRiRSPTYVYuUZLCDQ,19973
+most/async_trainer_api.py,sha256=99rED8RjnOn8VezeEgrTgoVfQrO7DdmOE2Jajumno2g,1052
+most/score_calculation.py,sha256=1XU1LfIH5LSCwAbAaKkr-EjH5qOTXrJKOUvhCCawka4,1054
+most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
+most/types.py,sha256=KP34dzS8ayQUhToIxwxTL9O8-7TZz1ySfJzA3ZNGIGw,4921
+most_client-1.0.32.dist-info/METADATA,sha256=YMrdEObidHQio4UzTc1yINdEEXnhr12EeqWrR110ssY,1027
+most_client-1.0.32.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+most_client-1.0.32.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.32.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.32.dist-info/RECORD,,

most_client-1.0.30.dist-info/RECORD

@@ -1,13 +0,0 @@
-most/__init__.py,sha256=b0EXXaPA4kmt-FtGXKRWZr7SCwjipMLcpC6uT5WRIdY,144
-most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
-most/api.py,sha256=_xqIj24dm1bINPy54zZ4Xqp5V8DQa05TN3zocuZW7io,17895
-most/async_api.py,sha256=7uymQ643SVzFU-j_iR-8MqT5wkNad9v54nR9vT87QoY,18968
-most/async_trainer_api.py,sha256=99rED8RjnOn8VezeEgrTgoVfQrO7DdmOE2Jajumno2g,1052
-most/score_calculation.py,sha256=1XU1LfIH5LSCwAbAaKkr-EjH5qOTXrJKOUvhCCawka4,1054
-most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
-most/types.py,sha256=-voecFH0E4ScMHu0DR_2S6XNdlkGuVJgy0Z1Oui2iM8,4578
-most_client-1.0.30.dist-info/METADATA,sha256=f-x0jH2hHk7uYN2DMTohvxYEJFRczhoH0eQVHBSn8dg,1027
-most_client-1.0.30.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-most_client-1.0.30.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.30.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.30.dist-info/RECORD,,