most-client 1.0.37__tar.gz → 1.0.38__tar.gz

{most_client-1.0.37/most_client.egg-info → most_client-1.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.37
+Version: 1.0.38
 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.37 → most_client-1.0.38}/most/api.py

@@ -24,8 +24,8 @@ from most.types import (
 
 class MostClient(object):
     retort = Retort(recipe=[
-        loader(int, lambda x: int(x)),
-        loader(float, lambda x: float(x)),
+        loader(int, lambda x: x if isinstance(x, int) else int(x)),
+        loader(float, lambda x: x if isinstance(x, float) else float(x)),
         loader(datetime, lambda x: datetime.fromtimestamp(x).astimezone(tz=timezone.utc) if isinstance(x, (int, float)) else datetime.fromisoformat(x)),
     ],)
 
@@ -264,7 +264,7 @@ class MostClient(object):
                          params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            result = self.get_score_modifier().modify(result)
         return result
 
     def apply_on_text(self, text_id,
@@ -280,7 +280,7 @@ class MostClient(object):
                          params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            result = self.get_score_modifier().modify(result)
         return result
 
     def transcribe_later(self, audio_id,
@@ -308,7 +308,7 @@ class MostClient(object):
                          params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            result = self.get_score_modifier().modify(result)
         return result
 
     def apply_on_text_later(self, text_id,
@@ -324,7 +324,7 @@ class MostClient(object):
                          params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            result = self.get_score_modifier().modify(result)
         return result
 
     def get_job_status(self, audio_id) -> JobStatus:
@@ -348,7 +348,7 @@ class MostClient(object):
         resp = self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            result = self.get_score_modifier().modify(result)
         return result
 
     def fetch_text(self, audio_id: str) -> Result:
@@ -401,7 +401,7 @@ class MostClient(object):
 
     def store_info(self,
                    audio_id: str,
-                   data: Dict[str, str]) -> StoredAudioData:
+                   data: Dict[str, Union[str, int, float]]) -> StoredAudioData:
         if not is_valid_id(audio_id):
             raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
@@ -409,14 +409,14 @@ class MostClient(object):
                          json={
                              "data": data,
                          })
-        return self.retort.load(resp.json(), StoredAudioData)
+        return StoredAudioData.from_dict(resp.json())
 
     def fetch_info(self, audio_id: str) -> StoredAudioData:
         if not is_valid_id(audio_id):
             raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
         resp = self.get(f"/{self.client_id}/audio/{audio_id}/info")
-        return self.retort.load(resp.json(), StoredAudioData)
+        return StoredAudioData.from_dict(resp.json())
 
     def __call__(self, audio_path: Path,
                  modify_scores: bool = False) -> Result:

{most_client-1.0.37 → most_client-1.0.38}/most/async_api.py

@@ -24,8 +24,8 @@ from most.types import (
 
 class AsyncMostClient(object):
     retort = Retort(recipe=[
-        loader(int, lambda x: int(x)),
-        loader(float, lambda x: float(x)),
+        loader(int, lambda x: x if isinstance(x, int) else int(x)),
+        loader(float, lambda x: x if isinstance(x, float) else float(x)),
         loader(datetime, lambda x: datetime.fromtimestamp(x).astimezone(tz=timezone.utc) if isinstance(x, (int, float)) else datetime.fromisoformat(x)),
     ])
 
@@ -274,7 +274,8 @@ class AsyncMostClient(object):
                                params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            score_modifier = await self.get_score_modifier()
+            result = score_modifier.modify(result)
         return result
 
     async def apply_on_text(self, text_id,
@@ -290,7 +291,8 @@ class AsyncMostClient(object):
                                params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            score_modifier = await self.get_score_modifier()
+            result = score_modifier.modify(result)
         return result
 
     async def transcribe_later(self, audio_id,
@@ -318,7 +320,8 @@ class AsyncMostClient(object):
                                params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            score_modifier = await self.get_score_modifier()
+            result = score_modifier.modify(result)
         return result
 
     async def apply_on_text_later(self, text_id,
@@ -334,7 +337,8 @@ class AsyncMostClient(object):
                                params={"overwrite": overwrite})
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            score_modifier = await self.get_score_modifier()
+            result = score_modifier.modify(result)
         return result
 
     async def get_job_status(self, audio_id) -> JobStatus:
@@ -358,7 +362,8 @@ class AsyncMostClient(object):
         resp = await self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
         result = self.retort.load(resp.json(), Result)
         if modify_scores:
-            result = self.score_modifier.modify(result)
+            score_modifier = await self.get_score_modifier()
+            result = score_modifier.modify(result)
         return result
 
     async def fetch_text(self, audio_id) -> Result:
@@ -411,18 +416,18 @@ class AsyncMostClient(object):
 
     async def store_info(self,
                          audio_id: str,
-                         data: Dict[str, str]) -> StoredAudioData:
+                         data: Dict[str, Union[str, int, float]]) -> StoredAudioData:
         resp = await self.post(f"/{self.client_id}/audio/{audio_id}/info",
                                json={
                                    "data": data,
                                })
-        return self.retort.load(resp.json(), StoredAudioData)
+        return StoredAudioData.from_dict(resp.json())
 
     async def fetch_info(self, audio_id: str) -> StoredAudioData:
         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")
-        return self.retort.load(resp.json(), StoredAudioData)
+        return StoredAudioData.from_dict(resp.json())
 
     async def __call__(self, audio_path: Path,
                        modify_scores: bool = False) -> Result:

most_client-1.0.38/most/score_calculation.py

@@ -0,0 +1,79 @@
+from typing import Dict, Tuple, List, Optional, Literal
+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
+
+    def unmodify(self, result: Optional[Result]):
+        score_mapping = {
+            (sm.column, sm.subcolumn, sm.to_score): sm.from_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
+
+    def modify_single(self,
+                      column: str, subcolumn: str,
+                      from_score: int):
+        for sm in self.score_mapping:
+            if sm.column == column and sm.subcolumn == subcolumn and sm.from_score == from_score:
+                return sm.to_score
+
+    def unmodify_single(self,
+                        column: str, subcolumn: str,
+                        to_score: int,
+                        bound: Literal["strict", "upper", "lower"] = "strict"):
+        upper_from_score = None
+        lower_from_score = None
+
+        for sm in self.score_mapping:
+            if sm.column == column and sm.subcolumn == subcolumn:
+                if sm.to_score == to_score:
+                    return sm.from_score
+
+                if sm.to_score > to_score:
+                    if upper_from_score is None or sm.to_score < upper_from_score[1]:
+                        upper_from_score = (sm.from_score, sm.to_score)
+                elif sm.to_score < to_score:
+                    if lower_from_score is None or sm.to_score > lower_from_score[1]:
+                        lower_from_score = (sm.from_score, sm.to_score)
+
+        if bound == "strict":
+            return None
+        elif bound == "upper" and upper_from_score is not None:
+            return upper_from_score[0]
+        elif bound == "lower" and lower_from_score is not None:
+            return lower_from_score[0]
+        else:
+            return None

most_client-1.0.38/most/search_types.py

@@ -0,0 +1,143 @@
+from dataclasses import dataclass, field
+from typing import List, Optional
+
+from bson import ObjectId
+from dataclasses_json import DataClassJsonMixin, dataclass_json
+
+
+@dataclass_json
+@dataclass
+class IDCondition(DataClassJsonMixin):
+    equal: Optional[ObjectId] = None
+    in_set: Optional[List[ObjectId]] = None
+    greater_than: Optional[ObjectId] = None
+    less_than: Optional[ObjectId] = None
+
+
+@dataclass_json
+@dataclass
+class ChannelsCondition(DataClassJsonMixin):
+    equal: Optional[int] = None
+
+
+@dataclass_json
+@dataclass
+class DurationCondition(DataClassJsonMixin):
+    greater_than: Optional[int] = None
+    less_than: Optional[int] = None
+
+
+@dataclass_json
+@dataclass
+class StoredInfoCondition(DataClassJsonMixin):
+    key: str
+    match: Optional[int | str | float] = None
+    starts_with: Optional[str] = None
+    ends_with: Optional[str] = None
+    greater_than: Optional[int | str | float] = None
+    less_than: Optional[int | str | float] = None
+
+
+@dataclass_json
+@dataclass
+class ResultsCondition(DataClassJsonMixin):
+    column_idx: int
+    subcolumn_idx: int
+    model_id: str
+    score_equal: Optional[int] = None
+    score_in_set: Optional[List[int]] = None
+    score_greater_than: Optional[int] = None
+    score_less_than: Optional[int] = None
+
+    def create_from(self, client,
+                    column: str, subcolumn: str,
+                    score_equal: Optional[int] = None,
+                    score_in_set: Optional[List[int]] = None,
+                    score_greater_than: Optional[int] = None,
+                    score_less_than: Optional[int] = None,
+                    modified_scores: bool = False) -> 'ResultsCondition':
+        from .api import MostClient
+        client: MostClient
+        script = client.get_model_script()
+        column_idx = [column.name for column in script.columns].index(column)
+        subcolumn_idx = script.columns[column_idx].subcolumns.index(subcolumn)
+
+        if modified_scores:
+            score_modifier = client.get_score_modifier()
+            if score_equal is not None:
+                score_equal = score_modifier.unmodify_single(column, subcolumn,
+                                                             score_equal,
+                                                             bound="strict")
+            if score_in_set is not None:
+                score_in_set = [score_modifier.unmodify_single(column, subcolumn,
+                                                               score,
+                                                               bound="strict")
+                                for score in score_in_set]
+            if score_greater_than is not None:
+                score_greater_than = score_modifier.unmodify_single(column, subcolumn,
+                                                                    score_greater_than,
+                                                                    bound="upper")
+
+            if score_less_than is not None:
+                score_less_than = score_modifier.unmodify_single(column, subcolumn,
+                                                                 score_less_than,
+                                                                 bound="lower")
+
+        return ResultsCondition(model_id=client.model_id,
+                                column_idx=column_idx,
+                                subcolumn_idx=subcolumn_idx,
+                                score_equal=score_equal,
+                                score_in_set=score_in_set,
+                                score_greater_than=score_greater_than,
+                                score_less_than=score_less_than)
+
+    async def acreate_from(self, client,
+                           column: str, subcolumn: str,
+                           score_equal: Optional[int] = None,
+                           score_in_set: Optional[List[int]] = None,
+                           score_greater_than: Optional[int] = None,
+                           score_less_than: Optional[int] = None,
+                           modified_scores: bool = False) -> 'ResultsCondition':
+        from .async_api import AsyncMostClient
+        client: AsyncMostClient
+        script = await client.get_model_script()
+        column_idx = [column.name for column in script.columns].index(column)
+        subcolumn_idx = script.columns[column_idx].subcolumns.index(subcolumn)
+
+        if modified_scores:
+            score_modifier = await client.get_score_modifier()
+            if score_equal is not None:
+                score_equal = score_modifier.unmodify_single(column, subcolumn,
+                                                             score_equal,
+                                                             bound="strict")
+            if score_in_set is not None:
+                score_in_set = [score_modifier.unmodify_single(column, subcolumn,
+                                                               score,
+                                                               bound="strict")
+                                for score in score_in_set]
+            if score_greater_than is not None:
+                score_greater_than = score_modifier.unmodify_single(column, subcolumn,
+                                                                    score_greater_than,
+                                                                    bound="upper")
+
+            if score_less_than is not None:
+                score_less_than = score_modifier.unmodify_single(column, subcolumn,
+                                                                 score_less_than,
+                                                                 bound="lower")
+
+        return ResultsCondition(model_id=client.model_id,
+                                column_idx=column_idx,
+                                subcolumn_idx=subcolumn_idx,
+                                score_equal=score_equal,
+                                score_in_set=score_in_set,
+                                score_greater_than=score_greater_than,
+                                score_less_than=score_less_than)
+
+
+@dataclass_json
+@dataclass
+class SearchParams(DataClassJsonMixin):
+    must: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)
+    should: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)
+    must_not: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)
+    should_not: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)

{most_client-1.0.37 → most_client-1.0.38}/most/types.py

@@ -1,8 +1,7 @@
 import re
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Dict, List, Literal, Optional
-from .search_types import ResultsCondition
+from typing import Dict, List, Literal, Optional, Union
 from dataclasses_json import DataClassJsonMixin, dataclass_json
 
 
@@ -10,7 +9,7 @@ from dataclasses_json import DataClassJsonMixin, dataclass_json
 @dataclass
 class StoredAudioData(DataClassJsonMixin):
     id: str
-    data: Dict[str, str]
+    data: Dict[str, Union[str, int, float]]
 
 
 @dataclass_json
@@ -53,22 +52,6 @@ class Column(DataClassJsonMixin):
 class Script(DataClassJsonMixin):
     columns: List[Column]
 
-    def create_results_condition(self,
-                                 model_id: str,
-                                 column: str, subcolumn: str,
-                                 score_equal: Optional[int] = None,
-                                 score_greater_than: Optional[int] = None,
-                                 score_less_than: Optional[int] = None) -> ResultsCondition:
-
-        column_idx = [column.name for column in self.columns].index(column)
-        subcolumn_idx = self.columns[column_idx].subcolumns.index(subcolumn)
-        return ResultsCondition(model_id=model_id,
-                                column_idx=column_idx,
-                                subcolumn_idx=subcolumn_idx,
-                                score_equal=score_equal,
-                                score_greater_than=score_greater_than,
-                                score_less_than=score_less_than)
-
 
 @dataclass_json
 @dataclass

{most_client-1.0.37 → most_client-1.0.38/most_client.egg-info}/PKG-INFO

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

@@ -8,7 +8,7 @@ with open('requirements.txt', 'r') as f:
 
 setup(
     name='most-client',
-    version='1.0.37',
+    version='1.0.38',
     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.37/most/score_calculation.py

@@ -1,27 +0,0 @@
-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.37/most/search_types.py

@@ -1,59 +0,0 @@
-import re
-from dataclasses import dataclass, field
-from datetime import datetime
-from typing import Dict, List, Literal, Optional, Union
-
-from bson import ObjectId
-from dataclasses_json import DataClassJsonMixin, dataclass_json
-
-
-@dataclass_json
-@dataclass
-class IDCondition(DataClassJsonMixin):
-    equal: Optional[ObjectId] = None
-    in_set: Optional[List[ObjectId]] = None
-    greater_than: Optional[ObjectId] = None
-    less_than: Optional[ObjectId] = None
-
-
-@dataclass_json
-@dataclass
-class ChannelsCondition(DataClassJsonMixin):
-    equal: Optional[int] = None
-
-
-@dataclass_json
-@dataclass
-class DurationCondition(DataClassJsonMixin):
-    greater_than: Optional[int] = None
-    less_than: Optional[int] = None
-
-
-@dataclass_json
-@dataclass
-class StoredInfoCondition(DataClassJsonMixin):
-    key: str
-    match: Optional[str] = None
-    starts_with: Optional[str] = None
-    ends_with: Optional[str] = None
-
-
-@dataclass_json
-@dataclass
-class ResultsCondition(DataClassJsonMixin):
-    column_idx: int
-    subcolumn_idx: int
-    model_id: str
-    score_equal: Optional[int] = None
-    score_in_set: Optional[List[int]] = None
-    score_greater_than: Optional[int] = None
-    score_less_than: Optional[int] = None
-
-
-@dataclass_json
-@dataclass
-class SearchParams(DataClassJsonMixin):
-    must: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)
-    should: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)
-    must_not: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)
-    should_not: List[StoredInfoCondition | ResultsCondition | DurationCondition | ChannelsCondition | IDCondition ] = field(default_factory=list)