most-client 1.0.19__tar.gz → 1.0.21__tar.gz

{most_client-1.0.19/most_client.egg-info → most_client-1.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: most-client
-Version: 1.0.19
+Version: 1.0.21
 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.19 → most_client-1.0.21}/most/api.py

@@ -9,6 +9,7 @@ import requests
 from adaptix import Retort
 from pydub import AudioSegment
 
+from most.score_calculation import ScoreCalculation
 from most.types import (
     Audio,
     DialogResult,
@@ -17,7 +18,7 @@ from most.types import (
     Script,
     StoredAudioData,
     Text,
-    is_valid_id, SearchParams,
+    is_valid_id, SearchParams, ScriptScoreMapping,
 )
 
 
@@ -48,6 +49,7 @@ class MostClient(object):
         self.session = requests.Session()
         self.access_token = None
         self.model_id = model_id
+        self.score_modifier = None
 
         self.refresh_access_token()
 
@@ -77,11 +79,13 @@ class MostClient(object):
                             model_id=self.model_id)
         client.access_token = self.access_token
         client.session = self.session
+        client.score_modifier = self.score_modifier
         return client
 
     def with_model(self, model_id):
         client = self.clone()
         client.model_id = model_id
+        client.score_modifier = None
         return client
 
     def refresh_access_token(self):
@@ -176,12 +180,23 @@ class MostClient(object):
         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)
 
+    def get_score_modifier(self):
+        if self.score_modifier is None:
+            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}/score_mapping")
+            score_mapping = self.retort.load(resp.json(), List[ScriptScoreMapping])
+            self.score_modifier = ScoreCalculation(score_mapping)
+        return self.score_modifier
+
     def list_models(self):
         resp = self.get("https://api.the-most.ai/api/external/list_models")
         return [self.with_model(model['model'])
                 for model in resp.json()]
 
-    def apply(self, audio_id) -> Result:
+    def apply(self, audio_id,
+              modify_scores: bool = False) -> Result:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
@@ -189,9 +204,13 @@ class MostClient(object):
             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)
+        result = self.retort.load(resp.json(), Result)
+        if modify_scores:
+            result = self.score_modifier.modify(result)
+        return result
 
-    def apply_later(self, audio_id) -> Result:
+    def apply_later(self, audio_id,
+                    modify_scores: bool = False) -> Result:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
@@ -199,7 +218,10 @@ class MostClient(object):
             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)
+        result = self.retort.load(resp.json(), Result)
+        if modify_scores:
+            result = self.score_modifier.modify(result)
+        return result
 
     def get_job_status(self, audio_id) -> JobStatus:
         if not is_valid_id(self.model_id):
@@ -211,7 +233,8 @@ class MostClient(object):
         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:
+    def fetch_results(self, audio_id,
+                      modify_scores: bool = False) -> Result:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
@@ -219,7 +242,10 @@ class MostClient(object):
             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)
+        result = self.retort.load(resp.json(), Result)
+        if modify_scores:
+            result = self.score_modifier.modify(result)
+        return result
 
     def fetch_text(self, audio_id: str) -> Result:
         if not is_valid_id(self.model_id):
@@ -275,9 +301,11 @@ class MostClient(object):
         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):
+    def __call__(self, audio_path: Path,
+                 modify_scores: bool = False) -> Result:
         audio = self.upload_audio(audio_path)
-        return self.apply(audio.id)
+        return self.apply(audio.id,
+                          modify_scores=modify_scores)
 
     def __repr__(self):
         return "<MostClient(model_id='%s')>" % (self.model_id, )

{most_client-1.0.19 → most_client-1.0.21}/most/async_api.py

@@ -9,6 +9,7 @@ import json5
 from adaptix import Retort
 from pydub import AudioSegment
 
+from most.score_calculation import ScoreCalculation
 from most.types import (
     Audio,
     DialogResult,
@@ -17,7 +18,7 @@ from most.types import (
     Script,
     StoredAudioData,
     Text,
-    is_valid_id, SearchParams,
+    is_valid_id, SearchParams, ScriptScoreMapping,
 )
 
 
@@ -48,6 +49,7 @@ class AsyncMostClient(object):
         self.session = httpx.AsyncClient()
         self.access_token = None
         self.model_id = model_id
+        self.score_modifier: Optional[ScoreCalculation] = None
 
     async def __aenter__(self):
         await self.session.__aenter__()
@@ -83,6 +85,7 @@ class AsyncMostClient(object):
                                  model_id=self.model_id)
         client.access_token = self.access_token
         client.session = self.session
+        client.score_modifier = self.score_modifier
         return client
 
     def with_model(self, model_id):
@@ -90,6 +93,7 @@ class AsyncMostClient(object):
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
         client.model_id = model_id
+        client.score_modifier = None
         return client
 
     async def refresh_access_token(self):
@@ -185,12 +189,23 @@ class AsyncMostClient(object):
         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)
 
+    async def get_score_modifier(self):
+        if self.score_modifier is None:
+            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}/score_mapping")
+            score_mapping = self.retort.load(resp.json(), List[ScriptScoreMapping])
+            self.score_modifier = ScoreCalculation(score_mapping)
+        return self.score_modifier
+
     async def list_models(self):
         resp = await self.get("https://api.the-most.ai/api/external/list_models")
         return [self.with_model(model['model'])
                 for model in resp.json()]
 
-    async def apply(self, audio_id) -> Result:
+    async def apply(self, audio_id,
+                    modify_scores: bool = False) -> Result:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
@@ -198,9 +213,13 @@ class AsyncMostClient(object):
             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)
+        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):
+    async def apply_later(self, audio_id,
+                          modify_scores: bool = False) -> Result:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
@@ -208,7 +227,10 @@ class AsyncMostClient(object):
             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)
+        result = self.retort.load(resp.json(), Result)
+        if modify_scores:
+            result = self.score_modifier.modify(result)
+        return result
 
     async def get_job_status(self, audio_id) -> JobStatus:
         if not is_valid_id(self.model_id):
@@ -220,7 +242,8 @@ class AsyncMostClient(object):
         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:
+    async def fetch_results(self, audio_id,
+                            modify_scores: bool = False) -> Result:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
@@ -228,7 +251,10 @@ class AsyncMostClient(object):
             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)
+        result = self.retort.load(resp.json(), Result)
+        if modify_scores:
+            result = self.score_modifier.modify(result)
+        return result
 
     async def fetch_text(self, audio_id) -> Result:
         if not is_valid_id(self.model_id):
@@ -280,9 +306,11 @@ class AsyncMostClient(object):
         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):
+    async def __call__(self, audio_path: Path,
+                       modify_scores: bool = False) -> Result:
         audio = await self.upload_audio(audio_path)
-        return await self.apply(audio.id)
+        return await self.apply(audio.id,
+                                modify_scores=modify_scores)
 
     def __repr__(self):
         return "<AsyncMostClient(model_id='%s')>" % (self.model_id, )

most_client-1.0.21/most/score_calculation.py

@@ -0,0 +1,27 @@
+from typing import Dict, Tuple, List, Optional
+from dataclasses_json import dataclass_json, DataClassJsonMixin
+from dataclasses import dataclass, replace
+from .types import Result, ScriptScoreMapping
+
+
+@dataclass_json
+@dataclass
+class ScoreCalculation(DataClassJsonMixin):
+    score_mapping: List[ScriptScoreMapping]
+
+    def modify(self, result: Optional[Result]):
+        score_mapping = {
+            (sm.column, sm.subcolumn, sm.from_score): sm.to_score
+            for sm in self.score_mapping
+        }
+        if result is None:
+            return None
+        result = replace(result)
+        for column_result in result.results:
+            for subcolumn_result in column_result.subcolumns:
+                subcolumn_result.score = score_mapping.get((column_result.name,
+                                                            subcolumn_result.name,
+                                                            subcolumn_result.score),
+                                                           subcolumn_result.score)
+
+        return result

{most_client-1.0.19 → most_client-1.0.21}/most/types.py

@@ -53,6 +53,15 @@ class Script(DataClassJsonMixin):
     columns: List[Column]
 
 
+@dataclass_json
+@dataclass
+class ScriptScoreMapping(DataClassJsonMixin):
+    column: str
+    subcolumn: str
+    from_score: int
+    to_score: int
+
+
 @dataclass_json
 @dataclass
 class JobStatus(DataClassJsonMixin):

{most_client-1.0.19 → most_client-1.0.21/most_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: most-client
-Version: 1.0.19
+Version: 1.0.21
 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.19 → most_client-1.0.21}/most_client.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ setup.py
 most/__init__.py
 most/api.py
 most/async_api.py
+most/score_calculation.py
 most/types.py
 most_client.egg-info/PKG-INFO
 most_client.egg-info/SOURCES.txt

{most_client-1.0.19 → most_client-1.0.21}/setup.py

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