Cleared up code and fixed versions for new version

Author: mmzeynalli

CHANGELOG.md

@@ -1,8 +1,17 @@
+## v1.1.0 (2025-10-28)
+
+### What's Changed
+
+* Bumped minimal pydantic version from 2.8 to 2.11.
+* Added new constant: `UNSET`. Used for differentiating None from missing (or unset) values. `UnsetField`/`UnsetOrNoneField` were also added as annotated pydantic fields.
+* Now all requests can also pass request header as argument (see Clopos).
+* Added function `_build_request_lambda` to enable subclasses to override without overriding whole `__getattribute__`. Can be used to enforce some arguments.
+
 ## v1.0.5 (2025-10-20)
 
 ### What's Changed
 
-Fixed and made integrify-core a namespace package.
+* Fixed and made integrify-core a namespace package.
 
 ## v1.0.3 (2025-07-19)
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "integrify-core"
-version = "1.0.5"
+version = "1.1.0"
 description = "Integrify API inteqrasiyalarını rahatlaşdıran bünovrə (core) kitabxanadır."
 authors = [{ name = "mmzeynalli", email = "miradil.zeynalli@gmail.com" }]
 requires-python = ">=3.9"
@@ -35,7 +35,7 @@ classifiers = [
     "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
     "Topic :: Internet :: WWW/HTTP",
 ]
-dependencies = ["pydantic>=2.8.2,<3", "httpx>=0.27.2,<0.28"]
+dependencies = ["pydantic>=2.11.10,<3", "httpx>=0.27.2,<0.28"]
 
 [project.urls]
 Homepage = "https://integrify.mmzeynalli.dev/"

src/integrify/schemas.py

@@ -1,10 +1,10 @@
 import json
 from typing import Any, ClassVar, Generic, Union
 
-from pydantic import BaseModel, Field, field_validator, model_serializer
+from pydantic import BaseModel, Field, field_validator
 from typing_extensions import TypedDict
 
-from integrify.utils import UNSET, _ResponseT
+from integrify.utils import _ResponseT
 
 
 class APIResponse(BaseModel, Generic[_ResponseT]):
@@ -66,9 +66,3 @@ def from_args(cls, *args, **kwds):
         EYNİ OLMALIDIR, əks halda, bu method yararsızdır.
         """
         return cls.model_validate({**dict(zip(cls.get_input_fields(), args)), **kwds})
-
-    @model_serializer(mode='wrap')
-    def _serialize(self, serializer):
-        data = serializer(self)
-        # Exclude UNSET values
-        return {k: v for k, v in data.items() if v is not UNSET}

src/integrify/utils.py

@@ -20,7 +20,7 @@ def __new__(cls):
         return cls._instance
 
     def __repr__(self):
-        return 'UNSET'
+        return '<UNSET>'
 
     def __str__(self):
         return 'UNSET'
@@ -30,18 +30,17 @@ def __bool__(self):
 
 
 UNSET = UnsetType()
-"""Set olunmamış argument dəyəri"""
 
 Unset = Union[T, Literal[UNSET]]  # type: ignore[valid-type]
 """ Optional argument tipi """
 
 UnsetOrNone = 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)]
+UnsetField = Annotated[Unset[T], Field(default=UNSET, exclude_if=lambda x: x is UNSET)]
 """Pydantic üçün set olunmamış argument dəyəri"""
 
-UnsetOrNoneField = Annotated[UnsetOrNone[T], Field(default=UNSET)]
+UnsetOrNoneField = Annotated[UnsetOrNone[T], Field(default=UNSET, exclude_if=lambda x: x is UNSET)]
 """Pydantic üçün set olunmamış və None dəyəri ala bilən argument dəyəri"""
 
 

tests/mocks.py

@@ -12,6 +12,14 @@ def test_ok_response():
     )
 
 
+@pytest.fixture(scope='package')
+def test_ok_response2():
+    return Response(
+        status_code=200,
+        json={'data1': 'output1'},
+    )
+
+
 @pytest.fixture(scope='package')
 def test_error_response():
     return Response(

tests/test_base.py

@@ -8,6 +8,7 @@
 
 from integrify.api import APIClient, APIPayloadHandler
 from integrify.schemas import PayloadBaseModel
+from integrify.utils import UNSET, UnsetField
 
 
 class RequestSchema(PayloadBaseModel):
@@ -18,11 +19,21 @@ class RequestWithURLParamSchema(RequestSchema):
     URL_PARAM_FIELDS = {'data1'}
 
 
+class RequestWithUnset(PayloadBaseModel):
+    data1: str
+    data2: UnsetField[str]
+
+
 class ResponseSchema(BaseModel):
     data1: str
     data2: str
 
 
+class ResponseSchemaWithUnset(BaseModel):
+    data1: str
+    data2: UnsetField[str]
+
+
 def test_unimplemented_function(api_client: APIClient):
     with pytest.raises(AttributeError):
         api_client.login()
@@ -189,3 +200,43 @@ def __init__(self):
     resp = dry_api_client.test(data1='input1')
     assert isinstance(resp['data'], dict)
     assert resp['data']['data1'] == 'input1'
+
+
+def test_unset_request(dry_api_client):
+    class Handler(APIPayloadHandler):
+        def __init__(self):
+            super().__init__(RequestWithUnset, ResponseSchema)
+
+    dry_api_client.add_url('test', 'url', 'GET')
+    dry_api_client.add_handler('test', Handler)
+    resp = dry_api_client.test(data1='input1', data2='input2')
+    assert isinstance(resp['data'], dict)
+    assert resp['data']['data1'] == 'input1'
+    assert resp['data']['data2'] == 'input2'
+
+
+def test_unset_request2(dry_api_client):
+    class Handler(APIPayloadHandler):
+        def __init__(self):
+            super().__init__(RequestWithUnset, ResponseSchema)
+
+    dry_api_client.add_url('test', 'url', 'GET')
+    dry_api_client.add_handler('test', Handler)
+    resp = dry_api_client.test(data1='input1')
+    assert isinstance(resp['data'], dict)
+    assert resp['data']['data1'] == 'input1'
+    assert 'data2' not in resp['data']
+
+
+def test_unset_response(api_client: APIClient, test_ok_response2, mocker: MockerFixture):
+    class Handler(APIPayloadHandler):
+        def __init__(self):
+            super().__init__(RequestWithUnset, ResponseSchemaWithUnset)
+
+    with mocker.patch('httpx.Client.request', return_value=test_ok_response2):
+        api_client.add_url('test', 'url', 'GET')
+        api_client.add_handler('test', Handler)
+        resp = api_client.test(data1='input1', data2='input2')
+        assert isinstance(resp.body, ResponseSchemaWithUnset)
+        assert resp.body.data1 == 'output1'
+        assert resp.body.data2 is UNSET