Merge pull request #18 from ai-forever/feature/check_credentials

Check credentials and log errors from server

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gigachat"
-version = "0.1.23"
+version = "0.1.24"
 description = "GigaChat. Python-library for GigaChain and LangChain"
 authors = ["Konstantin Krestnikov <[email protected]>", "Sergey Malyshev <[email protected]>"]
 license = "MIT"

src/gigachat/api/post_auth.py

@@ -1,3 +1,6 @@
+import base64
+import binascii
+import logging
 import uuid
 from http import HTTPStatus
 from typing import Any, Dict
@@ -8,6 +11,8 @@
 from gigachat.exceptions import AuthenticationError, ResponseError
 from gigachat.models import AccessToken
 
+_logger = logging.getLogger(__name__)
+
 
 def _get_kwargs(*, url: str, credentials: str, scope: str) -> Dict[str, Any]:
     headers = {
@@ -32,13 +37,24 @@ def _build_response(response: httpx.Response) -> AccessToken:
         raise ResponseError(response.url, response.status_code, response.content, response.headers)
 
 
+def _validate_credentials(credentials: str) -> None:
+    try:
+        base64.b64decode(credentials, validate=True)
+    except (ValueError, binascii.Error):
+        _logger.warning(
+            "Invalid credentials format. Please use only base64 credentials (Authorization data, not client secret!)"
+        )
+
+
 def sync(client: httpx.Client, *, url: str, credentials: str, scope: str) -> AccessToken:
+    _validate_credentials(credentials)
     kwargs = _get_kwargs(url=url, credentials=credentials, scope=scope)
     response = client.request(**kwargs)
     return _build_response(response)
 
 
 async def asyncio(client: httpx.AsyncClient, *, url: str, credentials: str, scope: str) -> AccessToken:
+    _validate_credentials(credentials)
     kwargs = _get_kwargs(url=url, credentials=credentials, scope=scope)
     response = await client.request(**kwargs)
     return _build_response(response)

src/gigachat/api/stream_chat.py

@@ -48,9 +48,18 @@ def _check_response(response: httpx.Response) -> None:
     if response.status_code == HTTPStatus.OK:
         _check_content_type(response)
     elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, b"", response.headers)
+        raise AuthenticationError(response.url, response.status_code, response.read(), response.headers)
     else:
-        raise ResponseError(response.url, response.status_code, b"", response.headers)
+        raise ResponseError(response.url, response.status_code, response.read(), response.headers)
+
+
+async def _acheck_response(response: httpx.Response) -> None:
+    if response.status_code == HTTPStatus.OK:
+        _check_content_type(response)
+    elif response.status_code == HTTPStatus.UNAUTHORIZED:
+        raise AuthenticationError(response.url, response.status_code, await response.aread(), response.headers)
+    else:
+        raise ResponseError(response.url, response.status_code, await response.aread(), response.headers)
 
 
 def sync(
@@ -75,7 +84,7 @@ async def asyncio(
 ) -> AsyncIterator[ChatCompletionChunk]:
     kwargs = _get_kwargs(chat=chat, access_token=access_token)
     async with client.stream(**kwargs) as response:
-        _check_response(response)
+        await _acheck_response(response)
         async for line in response.aiter_lines():
             if chunk := _parse_chunk(line):
                 yield chunk

src/gigachat/models/messages.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Any, Optional
 
 from gigachat.models.function_call import FunctionCall
 from gigachat.models.messages_role import MessagesRole
@@ -14,6 +14,7 @@ class Messages(BaseModel):
     """Текст сообщения"""
     function_call: Optional[FunctionCall] = None
     """Вызов функции"""
+    id: Optional[Any] = None  # noqa: A003
 
     class Config:
         use_enum_values = True