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

{most_client-1.0.20/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.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.20 → most_client-1.0.21}/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_client-1.0.20 → most_client-1.0.21}/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_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.20 → 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.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.20 → 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.20',
+    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',

most_client-1.0.20/most/score_calculation.py

@@ -1,23 +0,0 @@
-import dataclasses
-from typing import Dict, Tuple, List, Optional
-
-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
-        }
-
-    def modify(self, result: Optional[Result]):
-        if result is None:
-            return None
-        result = dataclasses.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)]
-
-        return result