most-client 1.0.20__py3-none-any.whl → 1.0.21__py3-none-any.whl

most/api.py

@@ -301,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/async_api.py

@@ -306,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/score_calculation.py

@@ -1,23 +1,27 @@
-import dataclasses
 from typing import Dict, Tuple, List, Optional
-
+from dataclasses_json import dataclass_json, DataClassJsonMixin
+from dataclasses import dataclass, replace
 from .types import Result, ScriptScoreMapping
 
 
-class ScoreCalculation:
-    def __init__(self, score_mapping: List[ScriptScoreMapping]):
-        super(ScoreCalculation, self).__init__()
-        self.score_mapping = {
-            (sm.column, sm.subcolumn, sm.from_score): sm.to_score
-            for sm in score_mapping
-        }
+@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 = dataclasses.replace(result)
+        result = replace(result)
         for column_result in result.results:
             for subcolumn_result in column_result.subcolumns:
-                subcolumn_result.score = self.score_mapping[(column_result.name, subcolumn_result.name, subcolumn_result.score)]
+                subcolumn_result.score = score_mapping.get((column_result.name,
+                                                            subcolumn_result.name,
+                                                            subcolumn_result.score),
+                                                           subcolumn_result.score)
 
         return result

{most_client-1.0.20.dist-info → most_client-1.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: most-client
-Version: 1.0.20
+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.21.dist-info/RECORD

@@ -0,0 +1,10 @@
+most/__init__.py,sha256=62uFFeM_1VVR83K3bTYWK3PEoqnmFCy9aWYerQ6U4Ds,67
+most/api.py,sha256=XasEgTSE6KzBfCSZTDdAQ324DnTgN-pt_IToorR2Zlw,14338
+most/async_api.py,sha256=x-akTsTAthRMB80JgK2dkRD_HLWe2LrNGWEOOmCNLQY,15247
+most/score_calculation.py,sha256=1XU1LfIH5LSCwAbAaKkr-EjH5qOTXrJKOUvhCCawka4,1054
+most/types.py,sha256=Qgyv261J8b1cfbmeITz1C9QgkoCMGQQd_L4t4M3dd6M,3603
+most_client-1.0.21.dist-info/METADATA,sha256=tsv9K4_6N3JpgcwIn0ElcAGSANUqW_dwjiu-REIt6Ik,1027
+most_client-1.0.21.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+most_client-1.0.21.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.21.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.21.dist-info/RECORD,,

most_client-1.0.20.dist-info/RECORD

@@ -1,10 +0,0 @@
-most/__init__.py,sha256=62uFFeM_1VVR83K3bTYWK3PEoqnmFCy9aWYerQ6U4Ds,67
-most/api.py,sha256=8OzUI_Af0Ct1hx0fopTf3bDGPU8gxWuuMP1VvxpAFiU,14227
-most/async_api.py,sha256=40orcOYLvFJTTlfYGIyyUXvvsfKYchDblRXzHNNGNPs,15124
-most/score_calculation.py,sha256=oGBEIzefKiqCS77BOX7-jHTvpLRkH0Vhnqu1IVDmsdM,800
-most/types.py,sha256=Qgyv261J8b1cfbmeITz1C9QgkoCMGQQd_L4t4M3dd6M,3603
-most_client-1.0.20.dist-info/METADATA,sha256=XTRaD7okJvsBLOJWUKlRTPaRhM423CFOkQ6wuT2_1XI,1027
-most_client-1.0.20.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-most_client-1.0.20.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.20.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.20.dist-info/RECORD,,