most-client 1.0.0__py3-none-any.whl → 1.0.2__py3-none-any.whl

most/api.py

@@ -2,7 +2,7 @@ from typing import List
 import json5
 import requests
 from adaptix import Retort
-from most.types import Audio, Result
+from most.types import Audio, Result, Script
 from pathlib import Path
 
 
@@ -126,12 +126,20 @@ class MostClient(object):
         audio_list = resp.json()
         return self.retort.load(audio_list, List[Audio])
 
+    def get_model_script(self) -> Script:
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/model/{self.model_id}/script")
+        return self.retort.load(resp.json(), Script)
+
     def list_models(self):
         resp = self.get("https://api.the-most.ai/api/external/list_models")
         return [self.with_model(model['model'])
                 for model in resp.json()]
 
     def apply(self, audio_id) -> Result:
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
         resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply")
         return self.retort.load(resp.json(), Result)
 
@@ -139,11 +147,17 @@ class MostClient(object):
         raise NotImplementedError()
 
     def fetch_results(self, audio_id) -> Result:
-        resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+
+        resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
         return self.retort.load(resp.json(), Result)
 
     def fetch_text(self, audio_id) -> Result:
-        resp = self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+
+        resp = self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
         return self.retort.load(resp.json(), Result)
 
     def __call__(self, audio_path: Path):

most/async_api.py

@@ -0,0 +1,176 @@
+from typing import List
+import json5
+from adaptix import Retort
+from most.types import Audio, Result, Script
+from pathlib import Path
+import httpx
+
+
+class AsyncMostClient(object):
+    retort = Retort()
+
+    def __init__(self,
+                 client_id=None,
+                 client_secret=None,
+                 model_id=None):
+        super(AsyncMostClient, self).__init__()
+        self.client_id = client_id
+        self.client_secret = client_secret
+
+        if self.client_id is None:
+            credentials = self.load_credentials()
+            self.client_id = credentials.get('client_id')
+            self.client_secret = credentials.get('client_secret')
+
+            if self.client_id is None:
+                print("Visit: https://app.the-most.ai/integrations and get clientId, clientSecret")
+                self.client_id = input("Please enter your client ID: ")
+                self.client_secret = input("Please enter your client secret: ")
+                self.save_credentials()
+        else:
+            self.save_credentials()
+
+        self.session = httpx.AsyncClient()
+        self.access_token = None
+        self.model_id = model_id
+
+    async def __aenter__(self):
+        await self.session.__aenter__()
+        await self.refresh_access_token()
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.session.__aexit__(exc_type, exc_val, exc_tb)
+
+    @property
+    def cache_path(self):
+        path = Path.home() / ".most"
+        path.mkdir(parents=True, exist_ok=True)
+        return path
+
+    def load_credentials(self):
+        path = self.cache_path / "credentials.json"
+        if not path.exists():
+            return {}
+        else:
+            return json5.loads(path.read_text())
+
+    def save_credentials(self):
+        path = self.cache_path / "credentials.json"
+        path.write_text(json5.dumps({
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+        }))
+
+    def clone(self):
+        client = AsyncMostClient(client_id=self.client_id,
+                                 client_secret=self.client_secret,
+                                 model_id=self.model_id)
+        client.access_token = self.access_token
+        client.session = self.session
+        return client
+
+    def with_model(self, model_id):
+        client = self.clone()
+        client.model_id = model_id
+        return client
+
+    async def refresh_access_token(self):
+        resp = await self.session.post("https://api.the-most.ai/api/external/access_token",
+                                       json={"client_id": self.client_id,
+                                             "client_secret": self.client_secret})
+        access_token = resp.json()
+        self.access_token = access_token
+
+    async def get(self, url, **kwargs):
+        if self.access_token is None:
+            await self.refresh_access_token()
+        headers = kwargs.pop("headers", {})
+        headers.update({"Authorization": "Bearer %s" % self.access_token})
+        resp = await self.session.get(url,
+                                      headers=headers,
+                                      **kwargs)
+        if resp.status_code == 401:
+            await self.refresh_access_token()
+            return await self.get(url,
+                                  headers=headers,
+                                  **kwargs)
+        return resp
+
+    async def post(self, url,
+                   data=None,
+                   json=None,
+                   **kwargs):
+        if self.access_token is None:
+            await self.refresh_access_token()
+        headers = kwargs.pop("headers", {})
+        headers.update({"Authorization": "Bearer %s" % self.access_token})
+        resp = await self.session.post(url,
+                                       data=data,
+                                       json=json,
+                                       headers=headers,
+                                       **kwargs)
+        if resp.status_code == 401:
+            await self.refresh_access_token()
+            return await self.post(url,
+                                   data=data,
+                                   json=json,
+                                   headers=headers,
+                                   **kwargs)
+        return resp
+
+    async def upload_audio(self, audio_path) -> Audio:
+        with open(audio_path, mode='rb') as f:
+            resp = await self.post(f"https://api.the-most.ai/api/external/{self.client_id}/upload",
+                                   files={"audio_file": f},
+                                   timeout=None)
+        return self.retort.load(resp.json(), Audio)
+
+    async def list_audios(self,
+                    offset: int = 0,
+                    limit: int = 10) -> List[Audio]:
+        resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/list?offset={offset}&limit={limit}")
+        audio_list = resp.json()
+        return self.retort.load(audio_list, List[Audio])
+
+    async def get_model_script(self) -> Script:
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/model/{self.model_id}/script")
+        return self.retort.load(resp.json(), Script)
+
+    async def list_models(self):
+        resp = await self.get("https://api.the-most.ai/api/external/list_models")
+        return [self.with_model(model['model'])
+                for model in resp.json()]
+
+    async def apply(self, audio_id) -> Result:
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+        resp = await self.post(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/apply",
+                               timeout=None)
+        return self.retort.load(resp.json(), Result)
+
+    async def apply_later(self, audio_id):
+        raise NotImplementedError()
+
+    async def fetch_results(self, audio_id) -> Result:
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+
+        resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/results")
+        return self.retort.load(resp.json(), Result)
+
+    async def fetch_text(self, audio_id) -> Result:
+        if self.model_id is None:
+            raise RuntimeError("Please choose a model to apply. [try list_models()]")
+
+        resp = await self.get(f"https://api.the-most.ai/api/external/{self.client_id}/audio/{audio_id}/model/{self.model_id}/text")
+        return self.retort.load(resp.json(), Result)
+
+    async def __call__(self, audio_path: Path):
+        audio = await self.upload_audio(audio_path)
+        return await self.apply(audio.id)
+
+    def __repr__(self):
+        return "<MostClient(model_id='%s')>" % (self.model_id, )

most/types.py

@@ -27,3 +27,14 @@ class Result:
     text: Optional[str]
     url: Optional[str]
     results: Optional[List[ColumnResult]]
+
+
+@dataclass
+class Column:
+    name: str
+    subcolumns: List[str]
+
+
+@dataclass
+class Script:
+    columns: List[Column]

{most_client-1.0.0.dist-info → most_client-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: most-client
-Version: 1.0.0
+Version: 1.0.2
 Summary: Most AI API for https://the-most.ai
 Home-page: https://github.com/the-most-ai/most-client
 Author: George Kasparyants
@@ -25,4 +25,5 @@ Requires-Dist: pylint
 Requires-Dist: pytest
 Requires-Dist: tox
 Requires-Dist: twine
+Requires-Dist: httpx
 

most_client-1.0.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+most/__init__.py,sha256=zfyI5dry-rsHP2Rr9YuPPo_fNFUtguZPAt-mbxDQ57I,28
+most/api.py,sha256=MRg52eg6Lf_sFwfTy2XYDHiD9VZSQ22BbvvkqQA1Fv0,6373
+most/async_api.py,sha256=ypdQ1P-aDblDlM6LbxNDjVjrkp-INJvg5an1n0vhi-E,7003
+most/types.py,sha256=7FgmaE7xHXggoU859BucqB13DA83CqmUPmBEuikNqE8,548
+most/__pycache__/__init__.cpython-310.pyc,sha256=5RlgyJsgWSNkWEufVPFWDKxat0cEMCdwD8QFz5FvIj8,193
+most/__pycache__/api.cpython-310.pyc,sha256=vAmUcfJHdL-59JuzcMpDfQedBaTk62nomDuzTt-thx0,5894
+most/__pycache__/async_api.cpython-310.pyc,sha256=ng8wYkVziihVAMlv1ugFQQf-qFqP0NgAIfqKqE-K4k8,6615
+most/__pycache__/types.cpython-310.pyc,sha256=OE7jIlp_0lo6XAwsnVnbsYsjjppGzTUcVo5ve6uHnQg,1492
+most_client-1.0.2.dist-info/METADATA,sha256=7gIy21ifYHR1jPNd-_rxkb-mDHK9pNRt18w7vwlxPto,864
+most_client-1.0.2.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+most_client-1.0.2.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
+most_client-1.0.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+most_client-1.0.2.dist-info/RECORD,,

{most_client-1.0.0.dist-info → most_client-1.0.2.dist-info}/WHEEL

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

most_client-1.0.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-most/__init__.py,sha256=zfyI5dry-rsHP2Rr9YuPPo_fNFUtguZPAt-mbxDQ57I,28
-most/api.py,sha256=XUkhHtDUmE2aPM4pBtxePiHlYOfkr94Lt_ablddk2pw,5678
-most/types.py,sha256=DtuMK8TgdjTDXYVtakqEN1ZLH6v1z_LR1jWya9CyCqI,428
-most/__pycache__/__init__.cpython-310.pyc,sha256=XaR2imVldQ5SeAZZVkYYJ6DxDXnSAdbt5h5VXh8yqB8,142
-most/__pycache__/api.cpython-310.pyc,sha256=YRvQJLdHA8FseBFvlZnsQtRNB0rV6Gjqz1sQdG9O70E,5292
-most/__pycache__/types.cpython-310.pyc,sha256=gwNy34k4XAZ8en1VT3S3QbJOoRuqAeUZEBJjgzSEpIg,1131
-most_client-1.0.0.dist-info/METADATA,sha256=ix_NTtXNoY7ZuFa7sX24txcPkU6xdqnnJogG01W9vtI,843
-most_client-1.0.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-most_client-1.0.0.dist-info/top_level.txt,sha256=2g5fk02LKkM1hV3pVVti_LQ60TToLBcR2zQ3JEKGVk8,5
-most_client-1.0.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-most_client-1.0.0.dist-info/RECORD,,