most-client 1.0.41__tar.gz → 1.0.43__tar.gz

{most_client-1.0.41/most_client.egg-info → most_client-1.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.41
+Version: 1.0.43
 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.41 → most_client-1.0.43}/most/__init__.py

@@ -4,4 +4,9 @@ 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
+from .search_types import SearchParams, IDCondition, ChannelsCondition, DurationCondition, ResultsCondition, StoredInfoCondition, TagsCondition
+from .glossary import Glossary
+from .async_glossary import AsyncGlossary
+from .catalog import Catalog
+from .async_catalog import AsyncCatalog
+from .types import GlossaryNGram, Item

{most_client-1.0.41 → most_client-1.0.43}/most/api.py

@@ -3,7 +3,7 @@ import os
 import uuid
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union, Literal
 import json5
 import httpx
 from adaptix import Retort, loader
@@ -361,14 +361,20 @@ class MostClient(object):
         resp = self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
-    def fetch_dialog(self, audio_id) -> DialogResult:
+    def fetch_dialog(self, audio_id,
+                     transcribator_name: Optional[Literal["GroundTruth"]] = None) -> DialogResult:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
         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}/model/{self.model_id}/dialog")
+        params = {}
+        if transcribator_name is not None:
+            params["transcribator_name"] = transcribator_name
+
+        resp = self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/dialog",
+                        params=params)
         return self.retort.load(resp.json(), DialogResult)
 
     def update_dialog(self, audio_id, dialog: Dialog) -> DialogResult:

{most_client-1.0.41 → most_client-1.0.43}/most/async_api.py

@@ -3,7 +3,7 @@ import os
 import uuid
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Dict, List, Optional, Union
+from typing import Dict, List, Optional, Union, Literal
 import httpx
 import json5
 from adaptix import Retort, loader
@@ -374,14 +374,19 @@ class AsyncMostClient(object):
         resp = await self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
-    async def fetch_dialog(self, audio_id) -> DialogResult:
+    async def fetch_dialog(self, audio_id,
+                           transcribator_name: Optional[Literal["GroundTruth"]] = None) -> DialogResult:
         if not is_valid_id(self.model_id):
             raise RuntimeError("Please choose valid model to apply. [try list_models()]")
 
         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}/model/{self.model_id}/dialog")
+        params = {}
+        if transcribator_name is not None:
+            params["transcribator_name"] = transcribator_name
+        resp = await self.get(f"/{self.client_id}/audio/{audio_id}/model/{self.model_id}/dialog",
+                              params=params)
         return self.retort.load(resp.json(), DialogResult)
 
     async def update_dialog(self, audio_id, dialog: Dialog) -> DialogResult:

most_client-1.0.43/most/async_catalog.py

@@ -0,0 +1,28 @@
+from typing import List
+
+from .async_api import AsyncMostClient
+from .types import Item
+
+
+class AsyncCatalog(object):
+    def __init__(self, client: AsyncMostClient):
+        super(AsyncCatalog, self).__init__()
+        self.client = client
+
+    async def add_items(self, items: List[Item] | Item) -> List[Item]:
+        if not isinstance(items, list):
+            items = [items]
+        resp = await self.client.post(f"/{self.client.client_id}/upload_items",
+                                      json=[item.to_dict() for item in items])
+        return self.client.retort.load(resp.json(), List[Item])
+
+    async def list_items(self) -> List[Item]:
+        resp = await self.client.get(f"/{self.client.client_id}/items")
+        return self.client.retort.load(resp.json(), List[Item])
+
+    async def delete_items(self, item_ids: List[str]):
+        if not isinstance(item_ids, list):
+            item_ids = [item_ids]
+        await self.client.post(f"/{self.client.client_id}/delete_items",
+                               json=item_ids)
+        return self

most_client-1.0.43/most/async_glossary.py

@@ -0,0 +1,32 @@
+from typing import List
+
+from .async_api import AsyncMostClient
+from .types import GlossaryNGram
+
+
+class AsyncGlossary(object):
+    def __init__(self, client: AsyncMostClient):
+        super(AsyncGlossary, self).__init__()
+        self.client = client
+
+    async def add_ngrams(self, ngrams: List[GlossaryNGram] | GlossaryNGram) -> List[GlossaryNGram]:
+        if not isinstance(ngrams, list):
+            ngrams = [ngrams]
+        resp = await self.client.post(f"/{self.client.client_id}/upload_glossary",
+                                      json=[ngram.to_dict() for ngram in ngrams])
+        return self.client.retort.load(resp.json(), List[GlossaryNGram])
+
+    async def list_ngrams(self) -> List[GlossaryNGram]:
+        resp = await self.client.get(f"/{self.client.client_id}/glossary")
+        return self.client.retort.load(resp.json(), List[GlossaryNGram])
+
+    async def del_ngrams(self, ngram_ids: List[str] | str):
+        if not isinstance(ngram_ids, list):
+            ngram_ids = [ngram_ids]
+        await self.client.post(f"/{self.client.client_id}/delete_glossary_ngrams",
+                               json=ngram_ids)
+        return self
+
+    async def drop(self):
+        await self.client.post(f"/{self.client.client_id}/delete_glossary")
+        return self

most_client-1.0.43/most/catalog.py

@@ -0,0 +1,28 @@
+from typing import List
+
+from .api import MostClient
+from .types import Item
+
+
+class Catalog(object):
+    def __init__(self, client: MostClient):
+        super(Catalog, self).__init__()
+        self.client = client
+
+    def add_items(self, items: List[Item] | Item) -> List[Item]:
+        if not isinstance(items, list):
+            items = [items]
+        resp = self.client.post(f"/{self.client.client_id}/upload_items",
+                                json=[item.to_dict() for item in items])
+        return self.client.retort.load(resp.json(), List[Item])
+
+    def list_items(self) -> List[Item]:
+        resp = self.client.get(f"/{self.client.client_id}/items")
+        return self.client.retort.load(resp.json(), List[Item])
+
+    def delete_items(self, item_ids: List[str]):
+        if not isinstance(item_ids, list):
+            item_ids = [item_ids]
+        self.client.post(f"/{self.client.client_id}/delete_items",
+                         json=item_ids)
+        return self

most_client-1.0.43/most/glossary.py

@@ -0,0 +1,32 @@
+from typing import List
+
+from .api import MostClient
+from .types import GlossaryNGram
+
+
+class Glossary(object):
+    def __init__(self, client: MostClient):
+        super(Glossary, self).__init__()
+        self.client = client
+
+    def add_ngrams(self, ngrams: List[GlossaryNGram] | GlossaryNGram) -> List[GlossaryNGram]:
+        if not isinstance(ngrams, list):
+            ngrams = [ngrams]
+        resp = self.client.post(f"/{self.client.client_id}/upload_glossary",
+                                json=[ngram.to_dict() for ngram in ngrams])
+        return self.client.retort.load(resp.json(), List[GlossaryNGram])
+
+    def list_ngrams(self) -> List[GlossaryNGram]:
+        resp = self.client.get(f"/{self.client.client_id}/glossary")
+        return self.client.retort.load(resp.json(), List[GlossaryNGram])
+
+    def del_ngrams(self, ngram_ids: List[str] | str):
+        if not isinstance(ngram_ids, list):
+            ngram_ids = [ngram_ids]
+        self.client.post(f"/{self.client.client_id}/delete_glossary_ngrams",
+                         json=ngram_ids)
+        return self
+
+    def drop(self):
+        self.client.post(f"/{self.client.client_id}/delete_glossary")
+        return self

{most_client-1.0.41 → most_client-1.0.43}/most/search_types.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from typing import List, Optional
+from typing import List, Optional, Literal
 from dataclasses_json import DataClassJsonMixin, dataclass_json
 
 
@@ -10,12 +10,14 @@ class IDCondition(DataClassJsonMixin):
     in_set: Optional[List[str]] = None
     greater_than: Optional[str] = None
     less_than: Optional[str] = None
+    type: Literal["IDCondition"] = "IDCondition"
 
 
 @dataclass_json
 @dataclass
 class ChannelsCondition(DataClassJsonMixin):
     equal: Optional[int] = None
+    type: Literal["ChannelsCondition"] = "ChannelsCondition"
 
 
 @dataclass_json
@@ -23,12 +25,14 @@ class ChannelsCondition(DataClassJsonMixin):
 class DurationCondition(DataClassJsonMixin):
     greater_than: Optional[int] = None
     less_than: Optional[int] = None
+    type: Literal["DurationCondition"] = "DurationCondition"
 
 
 @dataclass_json
 @dataclass
 class TagsCondition(DataClassJsonMixin):
     in_set: Optional[List[str]] = None
+    type: Literal["TagsCondition"] = "TagsCondition"
 
 
 @dataclass_json
@@ -40,6 +44,7 @@ class StoredInfoCondition(DataClassJsonMixin):
     ends_with: Optional[str] = None
     greater_than: Optional[int | str | float] = None
     less_than: Optional[int | str | float] = None
+    type: Literal["StoredInfoCondition"] = "StoredInfoCondition"
 
 
 @dataclass_json
@@ -52,6 +57,7 @@ class ResultsCondition(DataClassJsonMixin):
     score_in_set: Optional[List[int]] = None
     score_greater_than: Optional[int] = None
     score_less_than: Optional[int] = None
+    type: Literal["ResultsCondition"] = "ResultsCondition"
 
     def create_from(self, client,
                     column: str, subcolumn: str,

{most_client-1.0.41 → most_client-1.0.43}/most/types.py

@@ -114,6 +114,37 @@ class Dialog(DataClassJsonMixin):
         return ''.join([segment.to_text()
                         for segment in self.segments])
 
+    def to_raw_text(self):
+        return ' '.join([segment.text
+                         for segment in self.segments])
+
+    def to_raw_speaker_text(self, speaker):
+        return ' '.join([segment.text
+                         for segment in self.segments
+                         if segment.speaker == speaker])
+
+    def get_speaker_names(self):
+        return list(set([segment.speaker
+                         for segment in self.segments]))
+
+
+@dataclass_json
+@dataclass
+class GlossaryNGram(DataClassJsonMixin):
+    original: List[str]
+    pronunciation: List[str]
+    weight: float = 2
+    id: Optional[str] = None
+
+
+@dataclass_json
+@dataclass
+class Item(DataClassJsonMixin):
+    title: str
+    pronunciation: str
+    metadata: Dict[str, str]
+    id: Optional[str] = None
+
 
 @dataclass_json
 @dataclass

{most_client-1.0.41 → most_client-1.0.43/most_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.41
+Version: 1.0.43
 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.41 → most_client-1.0.43}/most_client.egg-info/SOURCES.txt

@@ -6,8 +6,12 @@ most/__init__.py
 most/_constrants.py
 most/api.py
 most/async_api.py
+most/async_catalog.py
+most/async_glossary.py
 most/async_searcher.py
 most/async_trainer_api.py
+most/catalog.py
+most/glossary.py
 most/score_calculation.py
 most/search_types.py
 most/searcher.py

{most_client-1.0.41 → most_client-1.0.43}/setup.py

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