most-client 1.0.31__tar.gz → 1.0.33__tar.gz

{most_client-1.0.31/most_client.egg-info → most_client-1.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.31
+Version: 1.0.33
 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.31 → most_client-1.0.33}/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,
@@ -133,7 +133,7 @@ class MostClient(object):
                             headers=headers,
                             **kwargs)
         if resp.status_code >= 400:
-            raise RuntimeError(resp.json()['message'] if resp.headers.get("Content-Type") == "application/json" else "Something went wrong.")
+            raise RuntimeError(resp.json()['message'] if resp.headers.get("Content-Type") == "application/json" else resp.content)
         return resp
 
     def put(self, url, **kwargs):
@@ -151,7 +151,7 @@ class MostClient(object):
                             headers=headers,
                             **kwargs)
         if resp.status_code >= 400:
-            raise RuntimeError(resp.json()['message'] if resp.headers.get("Content-Type") == "application/json" else "Something went wrong.")
+            raise RuntimeError(resp.json()['message'] if resp.headers.get("Content-Type") == "application/json" else resp.content)
         return resp
 
     def post(self, url,
@@ -393,7 +393,7 @@ class MostClient(object):
                          })
         return self.retort.load(resp.json(), StoredAudioData)
 
-    def fetch_info(self, audio_id: str) -> Dict[str, str]:
+    def fetch_info(self, audio_id: str) -> Dict[str, str | int | float]:
         if not is_valid_id(audio_id):
             raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
@@ -444,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_client-1.0.31 → most_client-1.0.33}/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,
@@ -400,7 +400,7 @@ class AsyncMostClient(object):
                                })
         return self.retort.load(resp.json(), StoredAudioData)
 
-    async def fetch_info(self, audio_id: str) -> Dict[str, str]:
+    async def fetch_info(self, audio_id: str) -> Dict[str, str | int | float]:
         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"/{self.client_id}/audio/{audio_id}/info")
@@ -450,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_client-1.0.31 → most_client-1.0.33}/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.31 → most_client-1.0.33/most_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.31
+Version: 1.0.33
 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.31 → most_client-1.0.33}/setup.py

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