most-client 1.0.42__py3-none-any.whl → 1.0.44__py3-none-any.whl

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, TagsCondition
+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/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/async_glossary.py

@@ -6,13 +6,27 @@ from .types import GlossaryNGram
 
 class AsyncGlossary(object):
     def __init__(self, client: AsyncMostClient):
+        super(AsyncGlossary, self).__init__()
         self.client = client
 
-    async def add_ngram(self, ngram: GlossaryNGram):
-        pass
+    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]:
-        return []
+        resp = await self.client.get(f"/{self.client.client_id}/glossary")
+        return self.client.retort.load(resp.json(), List[GlossaryNGram])
 
-    async def del_ngram(self, ngram_id: str):
-        pass
+    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/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/glossary.py

@@ -6,13 +6,27 @@ from .types import GlossaryNGram
 
 class Glossary(object):
     def __init__(self, client: MostClient):
+        super(Glossary, self).__init__()
         self.client = client
 
-    def add_ngram(self, ngram: GlossaryNGram):
-        pass
+    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]:
-        return []
+        resp = self.client.get(f"/{self.client.client_id}/glossary")
+        return self.client.retort.load(resp.json(), List[GlossaryNGram])
 
-    def del_ngram(self, ngram_id: str):
-        pass
+    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/types.py

@@ -131,8 +131,18 @@ class Dialog(DataClassJsonMixin):
 @dataclass_json
 @dataclass
 class GlossaryNGram(DataClassJsonMixin):
-    pronunciation: List[str]
     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
 
 
@@ -193,6 +203,13 @@ def is_valid_objectid(oid: str) -> bool:
     return bool(re.fullmatch(r"^[0-9a-fA-F]{24}$", oid))
 
 
+def is_valid_english_word(text: str) -> bool:
+    """
+    Returns True if the text starts with a letter and contains only English letters and digits.
+    """
+    return bool(re.fullmatch(r"[A-Za-z][A-Za-z0-9]*", text))
+
+
 def is_valid_id(smth_id: Optional[str]) -> bool:
     if smth_id is None:
         return False
@@ -200,4 +217,4 @@ def is_valid_id(smth_id: Optional[str]) -> bool:
     if smth_id.startswith("most-"):
         smth_id = smth_id[5:]
 
-    return is_valid_objectid(smth_id)
+    return is_valid_objectid(smth_id) or is_valid_english_word(smth_id)

{most_client-1.0.42.dist-info → most_client-1.0.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: most-client
-Version: 1.0.42
+Version: 1.0.44
 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.44.dist-info/RECORD

@@ -0,0 +1,20 @@
+most/__init__.py,sha256=ZA2n_h824tfGd5tFl3RsD0noUyv_T08fBoBxMEgxmzs,548
+most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
+most/api.py,sha256=-DZK8TZ7_OdgUZTknqLW27i8YigXKM33W0vjr8b92gE,19401
+most/async_api.py,sha256=RJkdQGuNJ9s-PuyHbcuVqGmp_GN5ry8bWbVzi8k4ed0,20696
+most/async_catalog.py,sha256=LgQ5zghQtDMnqq-WjmRHqZkqcdixZnHtmoRaVv74VKM,1059
+most/async_glossary.py,sha256=nehgkQvqENxT5vnmMiRLSWgD0jFr2Hzs7yqNZfC9ahs,1281
+most/async_searcher.py,sha256=C0zViW20K7OhKO1BzBZktTbMJYBBvor3uK6LAHZTxz0,2238
+most/async_trainer_api.py,sha256=99rED8RjnOn8VezeEgrTgoVfQrO7DdmOE2Jajumno2g,1052
+most/catalog.py,sha256=XFu-pZdPyxyBcLDl9O3yiYvESXUolXTm0jsQKrQlHxc,985
+most/glossary.py,sha256=64ld6cyvBe8jYW7OR1AVDoEPEAif5PFYu0Hgyng3Gkg,1195
+most/score_calculation.py,sha256=vLtGqXrR43xZhGjrH5dpQZfWX1q3s74LvTaHn-SKBAg,3254
+most/search_types.py,sha256=GFwXaDJV4qI_gaFZToLMHoYH-JXVfIVwfVTgJ7RDWoY,7211
+most/searcher.py,sha256=9UdiSlScsE6EPc6RpK8xkRLeB5gHNxgPQpXTJ17i3lQ,2135
+most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
+most/types.py,sha256=7o8uqhQd8FbO7H50TMJPbSIG4VyyX-LumWYRlHeqwgg,5343
+most_client-1.0.44.dist-info/METADATA,sha256=yZy3T34ZtdnW-C28iBLyf0kTEjKq0tA6-Wdha3gRF74,1027
+most_client-1.0.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+most_client-1.0.44.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.44.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.44.dist-info/RECORD,,

{most_client-1.0.42.dist-info → most_client-1.0.44.dist-info}/WHEEL

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

most_client-1.0.42.dist-info/RECORD

@@ -1,18 +0,0 @@
-most/__init__.py,sha256=UPx7vJhrRrSNsROGFJQr6-7Lw55qit0z-PIORw_HHFg,366
-most/_constrants.py,sha256=SlHKcBoXwe_sPzk8tdbb7lqhQz-Bfo__FhSoeFWodZE,217
-most/api.py,sha256=-DZK8TZ7_OdgUZTknqLW27i8YigXKM33W0vjr8b92gE,19401
-most/async_api.py,sha256=RJkdQGuNJ9s-PuyHbcuVqGmp_GN5ry8bWbVzi8k4ed0,20696
-most/async_glossary.py,sha256=kYb-6lptBJuBSHL1-dIPIEeT5RKuUkzyCAJWmKoZ7ec,408
-most/async_searcher.py,sha256=C0zViW20K7OhKO1BzBZktTbMJYBBvor3uK6LAHZTxz0,2238
-most/async_trainer_api.py,sha256=99rED8RjnOn8VezeEgrTgoVfQrO7DdmOE2Jajumno2g,1052
-most/glossary.py,sha256=EO6TNJThqimU_gs7zN87JX0QKkSXbLtojPox57SL4XE,369
-most/score_calculation.py,sha256=vLtGqXrR43xZhGjrH5dpQZfWX1q3s74LvTaHn-SKBAg,3254
-most/search_types.py,sha256=GFwXaDJV4qI_gaFZToLMHoYH-JXVfIVwfVTgJ7RDWoY,7211
-most/searcher.py,sha256=9UdiSlScsE6EPc6RpK8xkRLeB5gHNxgPQpXTJ17i3lQ,2135
-most/trainer_api.py,sha256=ZwOv4mhROfY97n6i7IY_ZpafsuNRazOqMBAf2dh708k,992
-most/types.py,sha256=mxE2KbvP88TzI6s6Aw_6JkV4uQXXEGG_hM310QOG-bo,4909
-most_client-1.0.42.dist-info/METADATA,sha256=iF1o_VepUfy-s1rJZw-BcF0S5Rq2QpdK1goJwFRfsdI,1027
-most_client-1.0.42.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-most_client-1.0.42.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.42.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.42.dist-info/RECORD,,