Changed Unset structure and added possibility to send headers in requests

Author: mmzeynalli

docs/az/docs/integrations/core/api-reference.md

@@ -48,8 +48,12 @@
 
 ## Extras
 
-::: integrify.utils._UNSET
+::: integrify.utils.UNSET
 
-::: integrify.utils.Unsettable
+::: integrify.utils.Unset
 
-::: integrify.utils.UnsettableAndNone
+::: integrify.utils.UnsettOrNone
+
+::: integrify.utils.UnsetField
+
+::: integrify.utils.UnsetOrNoneField

src/integrify/api.py

@@ -7,7 +7,7 @@
 
 from integrify.logger import LOGGER_FUNCTION
 from integrify.schemas import APIResponse, DryResponse, PayloadBaseModel
-from integrify.utils import _UNSET, _ResponseT
+from integrify.utils import UNSET, _ResponseT
 
 
 class APIClient:
@@ -105,8 +105,8 @@ def __getattribute__(self, name: str) -> Any:
                 verb,
                 handler,
                 # Exclude unset values, to trigger pydantic defaults
-                *(arg for arg in args if arg is not _UNSET),
-                **{k: v for k, v in kwds.items() if v is not _UNSET},
+                *(arg for arg in args if arg is not UNSET),
+                **{k: v for k, v in kwds.items() if v is not UNSET},
             )
 
 
@@ -178,7 +178,7 @@ def handle_payload(self, *args, **kwds):
             return self.__req_model.model_dump(
                 by_alias=True,
                 exclude=self.req_model.URL_PARAM_FIELDS,
-                exclude_none=True,
+                exclude_unset=True,
                 mode='json',
             )
 
@@ -275,6 +275,7 @@ def sync_req(
         verb: str,
         handler: APIPayloadHandler,
         *args,
+        headers: Optional[dict] = None,
         **kwds,
     ) -> Union[httpx.Response, APIResponse[_ResponseT], DryResponse]:
         """Sync sorğu atan funksiya
@@ -287,19 +288,19 @@ def sync_req(
         assert isinstance(self.client, httpx.Client)
 
         data = handler.handle_request(*args, **kwds)
-        headers = handler.headers
+        full_headers = {**handler.headers, **(headers or {})}
         full_url = handler.set_urlparams(url)
 
         if self.dry or handler.dry:
             return DryResponse(
                 url=full_url,
                 verb=verb,
                 request_args=handler.req_args,
-                headers=headers,
+                headers=full_headers,
                 data=data,
             )
 
-        request_kwds = {'headers': headers, **handler.req_args}
+        request_kwds = {'headers': full_headers, **handler.req_args}
 
         if verb == 'GET':
             request_kwds['params'] = data
@@ -325,6 +326,7 @@ async def async_req(  # pragma: no cover
         verb: str,
         handler: APIPayloadHandler,
         *args,
+        headers: Optional[dict] = None,
         **kwds,
     ) -> Union[httpx.Response, APIResponse[_ResponseT], DryResponse]:
         """Async sorğu atan funksiya
@@ -337,7 +339,7 @@ async def async_req(  # pragma: no cover
         assert isinstance(self.client, httpx.AsyncClient)
 
         data = handler.handle_request(*args, **kwds)
-        headers = handler.headers
+        full_headers = {**handler.headers, **(headers or {})}
         full_url = handler.set_urlparams(url)
 
         if self.dry:
@@ -346,11 +348,11 @@ async def async_req(  # pragma: no cover
                 url=full_url,
                 verb=verb,
                 request_args=handler.req_args,
-                headers=headers,
+                headers=full_headers,
                 data=data,
             )
 
-        request_kwds = {'headers': headers, **handler.req_args}
+        request_kwds = {'headers': full_headers, **handler.req_args}
 
         if verb == 'GET':
             request_kwds['params'] = data

src/integrify/utils.py

@@ -1,22 +1,49 @@
 from enum import Enum
-from typing import Literal, TypeVar, Union
+from typing import Annotated, Literal, TypeVar, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 _ResponseT = TypeVar('_ResponseT', bound=Union[BaseModel, dict])
 """Dynamic response type."""
 
 T = TypeVar('T')
 
-_UNSET = object()
+
+class UnsetType:
+    """Sentinel type to indicate an unset field value."""
+
+    _instance = None
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    def __repr__(self):
+        return 'UNSET'
+
+    def __str__(self):
+        return 'UNSET'
+
+    def __bool__(self):
+        return False
+
+
+UNSET = UnsetType()
 """Set olunmamış argument dəyəri"""
 
-Unsettable = Union[T, Literal[_UNSET]]  # type: ignore[valid-type]
+Unset = Union[T, Literal[UNSET]]  # type: ignore[valid-type]
 """ Optional argument tipi """
 
-UnsettableAndNone = Union[T, Literal[_UNSET], None]  # type: ignore[valid-type]
+UnsettOrNone = Union[T, Literal[UNSET], None]  # type: ignore[valid-type]
 """None dəyəri ala bilən optional argument tipi"""
 
+UnsetField = Annotated[Unset[T], Field(default=UNSET)]
+"""Pydantic üçün set olunmamış argument dəyəri"""
+
+UnsetOrNoneField = Annotated[UnsettOrNone[T], Field(default=UNSET)]
+"""Pydantic üçün set olunmamış və None dəyəri ala bilən argument dəyəri"""
+
 
 class Environment(str, Enum):
     TEST = 'test'