feat: Добавил X-Headers

pyproject.toml

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

src/gigachat/api/assistants/get_assistants.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models.assistants import Assistants
 
 
@@ -24,15 +22,6 @@ def _get_kwargs(
     return params
 
 
-def _build_response(response: httpx.Response) -> Assistants:
-    if response.status_code == HTTPStatus.OK:
-        return Assistants(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -42,7 +31,7 @@ def sync(
     """Возвращает массив объектов с данными доступных ассистентов"""
     kwargs = _get_kwargs(assistant_id=assistant_id, access_token=access_token)
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Assistants)
 
 
 async def asyncio(
@@ -54,4 +43,4 @@ async def asyncio(
     """Возвращает массив объектов с данными доступных ассистентов"""
     kwargs = _get_kwargs(assistant_id=assistant_id, access_token=access_token)
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Assistants)

src/gigachat/api/assistants/post_assistant_delete.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models.assistants import AssistantDelete
 
 
@@ -25,15 +23,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> AssistantDelete:
-    if response.status_code == HTTPStatus.OK:
-        return AssistantDelete(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -42,7 +31,7 @@ def sync(
 ) -> AssistantDelete:
     kwargs = _get_kwargs(assistant_id=assistant_id, access_token=access_token)
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, AssistantDelete)
 
 
 async def asyncio(
@@ -53,4 +42,4 @@ async def asyncio(
 ) -> AssistantDelete:
     kwargs = _get_kwargs(assistant_id=assistant_id, access_token=access_token)
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, AssistantDelete)

src/gigachat/api/assistants/post_assistant_files_delete.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models.assistants import AssistantFileDelete
 
 
@@ -27,15 +25,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> AssistantFileDelete:
-    if response.status_code == HTTPStatus.OK:
-        return AssistantFileDelete(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -45,7 +34,7 @@ def sync(
 ) -> AssistantFileDelete:
     kwargs = _get_kwargs(assistant_id=assistant_id, file_id=file_id, access_token=access_token)
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, AssistantFileDelete)
 
 
 async def asyncio(
@@ -57,4 +46,4 @@ async def asyncio(
 ) -> AssistantFileDelete:
     kwargs = _get_kwargs(assistant_id=assistant_id, file_id=file_id, access_token=access_token)
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, AssistantFileDelete)

src/gigachat/api/assistants/post_assistant_modify.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, List, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models import Function
 from gigachat.models.assistants import Assistant
 
@@ -41,15 +39,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> Assistant:
-    if response.status_code == HTTPStatus.OK:
-        return Assistant(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -73,7 +62,7 @@ def sync(
         access_token=access_token,
     )
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Assistant)
 
 
 async def asyncio(
@@ -99,4 +88,4 @@ async def asyncio(
         access_token=access_token,
     )
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Assistant)

src/gigachat/api/assistants/post_assistants.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, List, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models import Function
 from gigachat.models.assistants import CreateAssistant
 
@@ -40,15 +38,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> CreateAssistant:
-    if response.status_code == HTTPStatus.OK:
-        return CreateAssistant(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -73,7 +62,7 @@ def sync(
         access_token=access_token,
     )
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, CreateAssistant)
 
 
 async def asyncio(
@@ -100,4 +89,4 @@ async def asyncio(
         access_token=access_token,
     )
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, CreateAssistant)

src/gigachat/api/get_balance.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models.balance import Balance
 
 
@@ -21,15 +19,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> Balance:
-    if response.status_code == HTTPStatus.OK:
-        return Balance(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -39,7 +28,7 @@ def sync(
     Только для клиентов с предоплатой иначе http 403"""
     kwargs = _get_kwargs(access_token=access_token)
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Balance)
 
 
 async def asyncio(
@@ -51,4 +40,4 @@ async def asyncio(
     Только для клиентов с предоплатой иначе http 403"""
     kwargs = _get_kwargs(access_token=access_token)
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Balance)

src/gigachat/api/get_image.py

@@ -4,7 +4,7 @@
 
 import httpx
 
-from gigachat.api.utils import build_headers
+from gigachat.api.utils import build_headers, build_x_headers
 from gigachat.exceptions import AuthenticationError, ResponseError
 from gigachat.models import Image
 
@@ -25,7 +25,8 @@ def _get_kwargs(
 
 def _build_response(response: httpx.Response) -> Image:
     if response.status_code == HTTPStatus.OK:
-        return Image(content=base64.b64encode(response.content).decode())
+        x_headers = build_x_headers(response)
+        return Image(x_headers=x_headers, content=base64.b64encode(response.content).decode())
     elif response.status_code == HTTPStatus.UNAUTHORIZED:
         raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
     else:

src/gigachat/api/get_model.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models import Model
 
 
@@ -22,15 +20,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> Model:
-    if response.status_code == HTTPStatus.OK:
-        return Model(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -40,7 +29,7 @@ def sync(
     """Возвращает объект с описанием указанной модели"""
     kwargs = _get_kwargs(model=model, access_token=access_token)
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Model)
 
 
 async def asyncio(
@@ -52,4 +41,4 @@ async def asyncio(
     """Возвращает объект с описанием указанной модели"""
     kwargs = _get_kwargs(model=model, access_token=access_token)
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Model)

src/gigachat/api/get_models.py

@@ -1,10 +1,8 @@
-from http import HTTPStatus
 from typing import Any, Dict, Optional
 
 import httpx
 
-from gigachat.api.utils import build_headers
-from gigachat.exceptions import AuthenticationError, ResponseError
+from gigachat.api.utils import build_headers, build_response
 from gigachat.models import Models
 
 
@@ -21,15 +19,6 @@ def _get_kwargs(
     }
 
 
-def _build_response(response: httpx.Response) -> Models:
-    if response.status_code == HTTPStatus.OK:
-        return Models(**response.json())
-    elif response.status_code == HTTPStatus.UNAUTHORIZED:
-        raise AuthenticationError(response.url, response.status_code, response.content, response.headers)
-    else:
-        raise ResponseError(response.url, response.status_code, response.content, response.headers)
-
-
 def sync(
     client: httpx.Client,
     *,
@@ -38,7 +27,7 @@ def sync(
     """Возвращает массив объектов с данными доступных моделей"""
     kwargs = _get_kwargs(access_token=access_token)
     response = client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Models)
 
 
 async def asyncio(
@@ -49,4 +38,4 @@ async def asyncio(
     """Возвращает массив объектов с данными доступных моделей"""
     kwargs = _get_kwargs(access_token=access_token)
     response = await client.request(**kwargs)
-    return _build_response(response)
+    return build_response(response, Models)