most-client 1.0.36__py3-none-any.whl → 1.0.37__py3-none-any.whl

most/__init__.py

@@ -2,3 +2,6 @@ from .api import MostClient
 from .async_api import AsyncMostClient
 from .trainer_api import Trainer
 from .async_trainer_api import AsyncTrainer
+from .searcher import MostSearcher
+from .async_searcher import AsyncMostClient
+from .search_types import SearchParams, IDCondition, ChannelsCondition, DurationCondition, ResultsCondition, StoredInfoCondition

most/api.py

@@ -18,7 +18,7 @@ from most.types import (
     Script,
     StoredAudioData,
     Text,
-    is_valid_id, SearchParams, ScriptScoreMapping, Dialog, Usage,
+    is_valid_id, ScriptScoreMapping, Dialog, Usage,
 )
 
 
@@ -384,7 +384,8 @@ class MostClient(object):
 
     def export(self, audio_ids: List[str],
                aggregated_by: Optional[str] = None,
-               aggregation_title: Optional[str] = None) -> str:
+               aggregation_title: Optional[str] = None,
+               modify_scores: bool = False) -> str:
         if aggregation_title is None:
             aggregation_title = aggregated_by
 
@@ -394,12 +395,13 @@ class MostClient(object):
         resp = self.get(f"/{self.client_id}/model/{self.model_id}/export",
                         params={'audio_ids': ','.join(audio_ids),
                                 'aggregated_by': aggregated_by,
-                                'aggregation_title': aggregation_title})
+                                'aggregation_title': aggregation_title,
+                                'modify_scores': modify_scores})
         return resp.url
 
     def store_info(self,
                    audio_id: str,
-                   data: Dict[str, str]):
+                   data: Dict[str, str]) -> StoredAudioData:
         if not is_valid_id(audio_id):
             raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
@@ -409,7 +411,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) -> StoredAudioData:
         if not is_valid_id(audio_id):
             raise RuntimeError("Please use valid audio_id. [try audio.id from list_audios()]")
 
@@ -446,21 +448,6 @@ class MostClient(object):
             raise RuntimeError("Audio can't be indexed")
         return None
 
-    def search(self,
-               query: str,
-               filter: SearchParams,
-               limit: int = 10) -> List[Audio]:
-        resp = self.post(f"/{self.client_id}/model/{self.model_id}/search",
-                         json={
-                             "query": query,
-                             "filter": filter.to_dict(),
-                             "limit": limit,
-                         })
-        if resp.status_code >= 400:
-            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):

most/async_api.py

@@ -18,7 +18,7 @@ from most.types import (
     Script,
     StoredAudioData,
     Text,
-    is_valid_id, SearchParams, ScriptScoreMapping, Dialog, Usage,
+    is_valid_id, ScriptScoreMapping, Dialog, Usage,
 )
 
 
@@ -394,7 +394,8 @@ class AsyncMostClient(object):
 
     async def export(self, audio_ids: List[str],
                      aggregated_by: Optional[str] = None,
-                     aggregation_title: Optional[str] = None) -> str:
+                     aggregation_title: Optional[str] = None,
+                     modify_scores: bool = False) -> str:
         if aggregation_title is None:
             aggregation_title = aggregated_by
 
@@ -404,19 +405,20 @@ class AsyncMostClient(object):
         resp = await self.get(f"/{self.client_id}/model/{self.model_id}/export",
                               params={'audio_ids': ','.join(audio_ids),
                                       "aggregated_by": aggregated_by,
-                                      "aggregation_title": aggregation_title})
+                                      "aggregation_title": aggregation_title,
+                                      "modify_scores": modify_scores})
         return resp.next_request.url
 
     async def store_info(self,
                          audio_id: str,
-                         data: Dict[str, str]):
+                         data: Dict[str, str]) -> StoredAudioData:
         resp = await self.post(f"/{self.client_id}/audio/{audio_id}/info",
                                json={
                                    "data": data,
                                })
         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) -> 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")
@@ -452,21 +454,6 @@ class AsyncMostClient(object):
             raise RuntimeError("Audio can't be indexed")
         return None
 
-    async def search(self,
-                     query: str,
-                     filter: SearchParams,
-                     limit: int = 10) -> List[Audio]:
-        resp = await self.post(f"/{self.client_id}/model/{self.model_id}/search",
-                               json={
-                                   "query": query,
-                                   "filter": filter.to_dict(),
-                                   "limit": limit,
-                               })
-        if resp.status_code >= 400:
-            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):

most/async_searcher.py

@@ -0,0 +1,57 @@
+from typing import List, Literal, Optional
+from . import AsyncMostClient
+from .types import Audio
+from .search_types import SearchParams
+
+
+class AsyncMostSearcher(object):
+    def __init__(self, client: AsyncMostClient,
+                 data_source: Literal["text", "audio"]):
+        self.client = client
+        self.data_source = data_source
+
+    async def count(self,
+                    filter: Optional[SearchParams] = None):
+        if filter is None:
+            filter = SearchParams()
+
+        resp = await self.client.get(f"/{self.client.client_id}/{self.data_source}/count",
+                                     params={
+                                         "filter": filter.to_json(),
+                                     })
+        if resp.status_code >= 400:
+            raise RuntimeError("Audio can't be indexed")
+        return resp.json()
+
+
+    async def distinct(self,
+                       key: str,
+                       filter: Optional[SearchParams] = None) -> List[str]:
+        """
+        Distinct values of key.
+        :param key: key should be stored in info (fetch_info, store_info)
+        :return:
+        """
+        if filter is None:
+            filter = SearchParams()
+        resp = await self.client.get(f"/{self.client.client_id}/{self.data_source}/distinct",
+                               params={"filter": filter.to_json(),
+                                       "key": key})
+        if resp.status_code >= 400:
+            raise RuntimeError("Key is not valid")
+        return resp.json()
+
+    async def search(self,
+                     filter: Optional[SearchParams] = None,
+                     limit: int = 10) -> List[Audio]:
+        if filter is None:
+            filter = SearchParams()
+        resp = await self.client.get(f"/{self.client.client_id}/{self.data_source}/search",
+                                     params={
+                                         "filter": filter.to_json(),
+                                         "limit": limit,
+                                     })
+        if resp.status_code >= 400:
+            raise RuntimeError("Audio can't be indexed")
+        audio_list = resp.json()
+        return self.client.retort.load(audio_list, List[Audio])

most/search_types.py

@@ -0,0 +1,59 @@
+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)

most/searcher.py

@@ -0,0 +1,57 @@
+from typing import List, Literal, Optional
+
+from .api import MostClient
+from .search_types import SearchParams
+from .types import Audio, Text
+
+
+class MostSearcher(object):
+    def __init__(self, client: MostClient,
+                 data_source: Literal["text", "audio"]):
+        self.client = client
+        self.data_source = data_source
+
+    def count(self,
+              filter: Optional[SearchParams] = None):
+        if filter is None:
+            filter = SearchParams()
+
+        resp = self.client.get(f"/{self.client.client_id}/{self.data_source}/count",
+                               params={
+                                   "filter": filter.to_json(),
+                               })
+        if resp.status_code >= 400:
+            raise RuntimeError("Audio can't be indexed")
+        return resp.json()
+
+    def distinct(self,
+                 key: str,
+                 filter: Optional[SearchParams] = None) -> List[str]:
+        """
+        Distinct values of key.
+        :param key: key should be stored in info (fetch_info, store_info)
+        :return:
+        """
+        if filter is None:
+            filter = SearchParams()
+        resp = self.client.get(f"/{self.client.client_id}/{self.data_source}/distinct",
+                               params={"filter": filter.to_json(),
+                                       "key": key})
+        if resp.status_code >= 400:
+            raise RuntimeError("Key is not valid")
+        return resp.json()
+
+    def search(self,
+               filter: Optional[SearchParams] = None,
+               limit: int = 10) -> List[Audio | Text]:
+        if filter is None:
+            filter = SearchParams()
+        resp = self.client.get(f"/{self.client.client_id}/{self.data_source}/search",
+                                params={
+                                    "filter": filter.to_json(),
+                                    "limit": limit,
+                                })
+        if resp.status_code >= 400:
+            raise RuntimeError("Audio can't be indexed")
+        audio_list = resp.json()
+        return self.client.retort.load(audio_list, List[Audio])

most/types.py

@@ -1,8 +1,8 @@
 import re
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Dict, List, Literal, Optional, Union
-
+from typing import Dict, List, Literal, Optional
+from .search_types import ResultsCondition
 from dataclasses_json import DataClassJsonMixin, dataclass_json
 
 
@@ -53,6 +53,22 @@ 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
@@ -125,32 +141,6 @@ class DialogResult(DataClassJsonMixin):
     results: Optional[List[ColumnResult]] = 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: str
-    subcolumn: str
-    score_greater_than: Optional[int] = None
-    score_less_than: Optional[int] = None
-
-
-@dataclass_json
-@dataclass
-class SearchParams(DataClassJsonMixin):
-    must: List[StoredInfoCondition | ResultsCondition]
-    should: List[StoredInfoCondition | ResultsCondition]
-    must_not: List[StoredInfoCondition | ResultsCondition]
-
-
 @dataclass_json
 @dataclass
 class HumanFeedback(DataClassJsonMixin):

{most_client-1.0.36.dist-info → most_client-1.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.36
+Version: 1.0.37
 Summary: Most AI API for https://the-most.ai
 Home-page: https://github.com/the-most-ai/most-client
 Author: George Kasparyants
@@ -27,6 +27,7 @@ Requires-Dist: tox
 Requires-Dist: twine
 Requires-Dist: httpx
 Requires-Dist: pydub
+Requires-Dist: bson
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

most_client-1.0.37.dist-info/RECORD

@@ -0,0 +1,16 @@
+most/__init__.py,sha256=yoPKMxjZYAzrVqZ7l9rN0Skh0HPuttPX7ub0wlZMby4,351
+most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
+most/api.py,sha256=fwVmqyuCGhALQFOsgRW7IyX7ELY4sePPA5uHFRprCKQ,19052
+most/async_api.py,sha256=Kgy4sHZMLr4FD3dOop1BwfrNHeg5n7Ny0v7ZiYv1_ig,20219
+most/async_searcher.py,sha256=C0zViW20K7OhKO1BzBZktTbMJYBBvor3uK6LAHZTxz0,2238
+most/async_trainer_api.py,sha256=99rED8RjnOn8VezeEgrTgoVfQrO7DdmOE2Jajumno2g,1052
+most/score_calculation.py,sha256=1XU1LfIH5LSCwAbAaKkr-EjH5qOTXrJKOUvhCCawka4,1054
+most/search_types.py,sha256=fuuIkWEuYPTqljl-EMcoNgL5SOiHOVx9j5iH46ecVp8,1857
+most/searcher.py,sha256=9UdiSlScsE6EPc6RpK8xkRLeB5gHNxgPQpXTJ17i3lQ,2135
+most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
+most/types.py,sha256=og32qmGnUGTvC0qTH2wzLnhYKeFTIcEmkpIDnclmhYM,5226
+most_client-1.0.37.dist-info/METADATA,sha256=VdEUqqsSRBSfiCdpwYh3bGdKcundkUeHReMTjCbHd2s,1047
+most_client-1.0.37.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+most_client-1.0.37.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.37.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.37.dist-info/RECORD,,

{most_client-1.0.36.dist-info → most_client-1.0.37.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

most_client-1.0.36.dist-info/RECORD

@@ -1,13 +0,0 @@
-most/__init__.py,sha256=b0EXXaPA4kmt-FtGXKRWZr7SCwjipMLcpC6uT5WRIdY,144
-most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
-most/api.py,sha256=vg7zYsRebQjVOmTLRQE6jqmK-zG1j-k-KMN68gzFpk4,19538
-most/async_api.py,sha256=iRIjHLVkrjBKimlVmz5Ev_pPNB0dwCa5QgKRy1rCF3c,20753
-most/async_trainer_api.py,sha256=99rED8RjnOn8VezeEgrTgoVfQrO7DdmOE2Jajumno2g,1052
-most/score_calculation.py,sha256=1XU1LfIH5LSCwAbAaKkr-EjH5qOTXrJKOUvhCCawka4,1054
-most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
-most/types.py,sha256=KP34dzS8ayQUhToIxwxTL9O8-7TZz1ySfJzA3ZNGIGw,4921
-most_client-1.0.36.dist-info/METADATA,sha256=GnPH3grUAX3tLjJKswpB1_vDWtZ8i59zX0miAxZTRx8,1027
-most_client-1.0.36.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-most_client-1.0.36.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.36.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.36.dist-info/RECORD,,