DEV-22328: client to hfapi2

buschwaker · buschwaker · commit cdaa167ad58e · 2026-04-06T10:38:59.000+03:00
diff --git a/huntflow_api_client/entities/__init__.py b/huntflow_api_client/entities/__init__.py
@@ -25,6 +25,7 @@
 from huntflow_api_client.entities.survey_type_a import SurveyTypeA
 from huntflow_api_client.entities.survey_type_q import SurveyTypeQ
 from huntflow_api_client.entities.tags import AccountTag, ApplicantTag
+from huntflow_api_client.entities.token import Token
 from huntflow_api_client.entities.user_settings import UserSettings
 from huntflow_api_client.entities.users import User
 from huntflow_api_client.entities.users_management import UsersManagement
@@ -61,6 +62,7 @@
     "Resume",
     "SurveyTypeA",
     "SurveyTypeQ",
+    "Token",
     "User",
     "UsersManagement",
     "UserSettings",
diff --git a/huntflow_api_client/entities/applicant_on_vacancy.py b/huntflow_api_client/entities/applicant_on_vacancy.py
@@ -77,6 +77,6 @@ async def move_applicant_to_child_vacancy(
         response = await self._api.request(
             "PUT",
             f"/accounts/{account_id}/applicants/vacancy/{vacancy_id}/split",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(exclude_unset=True),
         )
         return ApplicantVacancySplitResponse.model_validate(response.json())
diff --git a/huntflow_api_client/entities/applicants.py b/huntflow_api_client/entities/applicants.py
@@ -6,7 +6,7 @@
     GetEntityMixin,
     ListEntityMixin,
 )
-from huntflow_api_client.models.consts import AgreementState, ApplicantSearchField
+from huntflow_api_client.models.consts import AgreementStateRequest, ApplicantSearchField
 from huntflow_api_client.models.request.applicants import (
     ApplicantCreateRequest,
     ApplicantUpdateRequest,
@@ -29,7 +29,7 @@ async def list(
         page: Optional[int] = 1,
         status: Optional[int] = None,
         vacancy_id: Optional[int] = None,
-        agreement_state: Optional[AgreementState] = None,
+        agreement_state: Optional[AgreementStateRequest] = None,
     ) -> ApplicantListResponse:
         """
         API method reference https://api.huntflow.ai/v2/docs#get-/accounts/-account_id-/applicants
diff --git a/huntflow_api_client/entities/dictionaries.py b/huntflow_api_client/entities/dictionaries.py
@@ -43,7 +43,11 @@ async def create(
         :return: An object that contains the task ID of the delayed background update task
         """
         path = f"/accounts/{account_id}/dictionaries"
-        response = await self._api.request("POST", path, json=data.jsonable_dict(exclude_none=True))
+        response = await self._api.request(
+            "POST",
+            path,
+            json=data.jsonable_dict(exclude_unset=True),
+        )
         return DictionaryTaskResponse.model_validate(response.json())
 
     async def get(self, account_id: int, dict_code: str) -> DictionaryResponse:
@@ -75,5 +79,5 @@ async def update(
         :return: An object that contains the task ID of the delayed background update task
         """
         path = f"/accounts/{account_id}/dictionaries/{dict_code}"
-        response = await self._api.request("PUT", path, json=data.jsonable_dict(exclude_none=True))
+        response = await self._api.request("PUT", path, json=data.jsonable_dict(exclude_unset=True))
         return DictionaryTaskResponse.model_validate(response.json())
diff --git a/huntflow_api_client/entities/multi_vacancies.py b/huntflow_api_client/entities/multi_vacancies.py
@@ -26,7 +26,7 @@ async def create(
         response = await self._api.request(
             "POST",
             f"/accounts/{account_id}/multi-vacancies",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(exclude_unset=True),
         )
         return MultiVacancyResponse.model_validate(response.json())
 
@@ -52,6 +52,6 @@ async def update(
         response = await self._api.request(
             method,
             f"/accounts/{account_id}/multi-vacancies/{vacancy_id}",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(exclude_unset=True),
         )
         return MultiVacancyResponse.model_validate(response.json())
diff --git a/huntflow_api_client/entities/production_calendars.py b/huntflow_api_client/entities/production_calendars.py
@@ -55,7 +55,7 @@ async def get_non_working_days_in_period(
         calendar_id: int,
         deadline: datetime.date,
         start: Optional[datetime.date] = None,
-        verbose: Optional[bool] = True,
+        verbose: Optional[bool] = False,
     ) -> NonWorkingDaysResponse:
         """
         API method reference
diff --git a/huntflow_api_client/entities/resume.py b/huntflow_api_client/entities/resume.py
@@ -83,7 +83,7 @@ async def update(
         response = await self._api.request(
             "PUT",
             f"/accounts/{account_id}/applicants/{applicant_id}/externals/{external_id}",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(),
         )
         return ApplicantResumeResponse.model_validate(response.json())
 
diff --git a/huntflow_api_client/entities/tags.py b/huntflow_api_client/entities/tags.py
@@ -43,7 +43,7 @@ async def create(
         response = await self._api.request(
             "POST",
             f"/accounts/{account_id}/tags",
-            json=account_tag.jsonable_dict(exclude_none=True),
+            json=account_tag.jsonable_dict(),
         )
         return AccountTagResponse.model_validate(response.json())
 
@@ -65,7 +65,7 @@ async def update(
         response = await self._api.request(
             "PUT",
             f"/accounts/{account_id}/tags/{account_tag_id}",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(),
         )
         return AccountTagResponse.model_validate(response.json())
 
@@ -112,7 +112,7 @@ async def update(
         response = await self._api.request(
             "POST",
             f"/accounts/{account_id}/applicants/{applicant_id}/tags",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(),
         )
         return ApplicantTagsListResponse.model_validate(response.json())
 
diff --git a/huntflow_api_client/entities/token.py b/huntflow_api_client/entities/token.py
@@ -0,0 +1,21 @@
+from huntflow_api_client.entities.base import BaseEntity, UpdateEntityMixin
+from huntflow_api_client.models.request.token import RefreshTokenRequest
+from huntflow_api_client.models.response.token import RefreshTokenResponse
+
+
+class Token(BaseEntity, UpdateEntityMixin):
+
+    async def update(self, data: RefreshTokenRequest) -> RefreshTokenResponse:
+        """
+        API method reference
+            https://api.huntflow.ru/latest/docs#post-/token/refresh
+
+        :param data: token request data
+        :return: refreshed token data
+        """
+        response = await self._api.request(
+            "POST",
+            "/token/refresh",
+            json=data.jsonable_dict(),
+        )
+        return RefreshTokenResponse.model_validate(response.json())
diff --git a/huntflow_api_client/entities/vacancies.py b/huntflow_api_client/entities/vacancies.py
@@ -96,7 +96,7 @@ async def create(self, account_id: int, data: VacancyCreateRequest) -> VacancyCr
         response = await self._api.request(
             "POST",
             f"/accounts/{account_id}/vacancies",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(exclude_unset=True),
         )
         return VacancyCreateResponse.model_validate(response.json())
 
@@ -118,7 +118,7 @@ async def update(
         response = await self._api.request(
             "PUT",
             f"/accounts/{account_id}/vacancies/{vacancy_id}",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(exclude_unset=True),
         )
         return VacancyResponse.model_validate(response.json())
 
@@ -150,7 +150,7 @@ async def patch(
         response = await self._api.request(
             "PATCH",
             f"/accounts/{account_id}/vacancies/{vacancy_id}",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(exclude_unset=True),
         )
         return VacancyResponse.model_validate(response.json())
 
@@ -174,7 +174,7 @@ async def assign_coworker(
         response = await self._api.request(
             "PUT",
             f"/accounts/{account_id}/vacancies/{vacancy_id}/members/{account_member_id}",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(),
         )
         return StatusResponse.model_validate(response.json())
 
@@ -304,7 +304,7 @@ async def close(self, account_id: int, vacancy_id: int, data: VacancyCloseReques
         await self._api.request(
             "POST",
             f"/accounts/{account_id}/vacancies/{vacancy_id}/state/close",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(),
         )
 
     async def hold(self, account_id: int, vacancy_id: int, data: VacancyHoldRequest) -> None:
@@ -319,7 +319,7 @@ async def hold(self, account_id: int, vacancy_id: int, data: VacancyHoldRequest)
         await self._api.request(
             "POST",
             f"/accounts/{account_id}/vacancies/{vacancy_id}/state/hold",
-            json=data.jsonable_dict(exclude_none=True),
+            json=data.jsonable_dict(),
         )
 
     async def resume(self, account_id: int, vacancy_id: int) -> None:
diff --git a/huntflow_api_client/entities/vacancy_requests.py b/huntflow_api_client/entities/vacancy_requests.py
@@ -76,6 +76,6 @@ async def create(
         response = await self._api.request(
             "POST",
             path,
-            json=request_data.jsonable_dict(exclude_none=True),
+            json=request_data.jsonable_dict(exclude_unset=True),
         )
         return VacancyRequestResponse.model_validate(response.json())
diff --git a/huntflow_api_client/entities/webhooks.py b/huntflow_api_client/entities/webhooks.py
@@ -41,7 +41,7 @@ async def create(self, account_id: int, data: WebhookRequest) -> WebhookResponse
         :return: Information about the webhook
         """
         path = f"/accounts/{account_id}/hooks"
-        response = await self._api.request("POST", path, json=data.jsonable_dict(exclude_none=True))
+        response = await self._api.request("POST", path, json=data.jsonable_dict())
         return WebhookResponse.model_validate(response.json())
 
     async def delete(self, account_id: int, webhook_id: int) -> None:
diff --git a/huntflow_api_client/models/consts.py b/huntflow_api_client/models/consts.py
@@ -1,5 +1,7 @@
 from enum import Enum
 
+from huntflow_api_client.utils import extend_enum
+
 
 class WebhookEvent(str, Enum):
     APPLICANT = "APPLICANT"
@@ -69,11 +71,15 @@ class FieldType(str, Enum):
     html = "html"
 
 
-class AgreementState(str, Enum):
+class AgreementStateRequest(str, Enum):
     not_sent = "not_sent"
     sent = "sent"
     accepted = "accepted"
     declined = "declined"
+
+
+@extend_enum(AgreementStateRequest)
+class AgreementStateResponse(str, Enum):
     send_error = "send_error"
 
 
diff --git a/huntflow_api_client/models/request/token.py b/huntflow_api_client/models/request/token.py
@@ -0,0 +1,7 @@
+from pydantic import Field
+
+from huntflow_api_client.models.common import JsonRequestModel
+
+
+class RefreshTokenRequest(JsonRequestModel):
+    refresh_token: str = Field(..., description="Refresh token")
diff --git a/huntflow_api_client/models/response/applicant_logs.py b/huntflow_api_client/models/response/applicant_logs.py
@@ -20,6 +20,7 @@
     Transparency,
 )
 from huntflow_api_client.models.response.applicant_offers import ApplicantVacancyOffer
+from huntflow_api_client.models.response.survey import SurveyTypeARespondent
 
 
 class BaseSurveySchemaType(BaseModel):
@@ -35,6 +36,10 @@ class SurveySchemaTypeQLogResponse(BaseSurveySchemaType):
     title: Optional[str] = Field(..., description="Survey title")
 
 
+class SurveySchemaTypeALogResponse(BaseSurveySchemaType):
+    pass
+
+
 class ApplicantLogSurveyQuestionary(BaseModel):
     id: int = Field(..., description="Survey questionary ID")
     survey: SurveySchemaTypeQLogResponse = Field(..., description="Survey schema")
@@ -48,6 +53,16 @@ class ApplicantLogSurveyQuestionary(BaseModel):
     )
 
 
+class ApplicantLogSurveyAnswerTypeA(BaseModel):
+    id: int = Field(..., description="Survey questionary ID")
+    created: datetime = Field(
+        ...,
+        description="Date and time of creating an survey questionary of type A",
+    )
+    respondent: SurveyTypeARespondent = Field(..., description="Who created the survey answer")
+    survey: SurveySchemaTypeALogResponse = Field(..., description="Survey schema")
+
+
 class EmailRecipient(BaseModel):
     type: Optional[EmailContactType] = Field(None, description="Type of the email contact")
     name: Optional[str] = Field(
@@ -172,6 +187,10 @@ class ApplicantLogItem(BaseModel):
         None,
         description="Survey questionary",
     )
+    survey_answer_of_type_a: Optional[ApplicantLogSurveyAnswerTypeA] = Field(
+        None,
+        description="Survey answer of type A object",
+    )
 
 
 class ApplicantLogResponse(PaginatedResponse):
diff --git a/huntflow_api_client/models/response/applicants.py b/huntflow_api_client/models/response/applicants.py
@@ -4,7 +4,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 
 from huntflow_api_client.models.common import Applicant, PaginatedResponse
-from huntflow_api_client.models.consts import AgreementState as AgreementStateEnum
+from huntflow_api_client.models.consts import AgreementStateResponse as AgreementStateEnum
 
 
 class ApplicantTag(BaseModel):
@@ -112,6 +112,7 @@ class ApplicantCreateResponse(Applicant):
     )
     external: List[ApplicantResume] = Field(..., description="Applicant's resume")
     social: List[ApplicantSocial] = Field(..., description="List of applicant's social accounts")
+    reindex_job_id: str
 
 
 class ApplicantSearchItem(BaseModel):
diff --git a/huntflow_api_client/models/response/token.py b/huntflow_api_client/models/response/token.py
@@ -0,0 +1,12 @@
+from pydantic import BaseModel, Field
+
+
+class RefreshTokenResponse(BaseModel):
+    access_token: str = Field(..., description="New access token")
+    token_type: str = Field(..., description="Token type")
+    expires_in: int = Field(..., description="Token lifetime in seconds")
+    refresh_token_expires_in: int = Field(
+        ...,
+        description="Refresh token lifetime in seconds",
+    )
+    refresh_token: str = Field(..., description="New refresh token")
diff --git a/huntflow_api_client/utils.py b/huntflow_api_client/utils.py
@@ -0,0 +1,13 @@
+from enum import Enum
+
+
+def extend_enum(inherited_enum):
+    def wrapper(added_enum):
+        joined = {}
+        for item in inherited_enum:
+            joined[item.name] = item.value
+        for item in added_enum:
+            joined[item.name] = item.value
+        return Enum(added_enum.__name__, joined)
+
+    return wrapper
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 
 [project]
 name = "huntflow-api-client"
-version = "2.13.2"
+version = "2.13.3"
 description = "Huntflow API Client for Python"
 authors = [
     {name = "Developers huntflow", email = "developer@huntflow.ru"},
diff --git a/tests/test_entities/test_applicants.py b/tests/test_entities/test_applicants.py
@@ -201,6 +201,7 @@
             "verification_date": "2020-01-01T00:00:00+03:00",
         },
     ],
+    "reindex_job_id": "12345",
 }
 APPLICANT_PATCH_REQUEST: Dict[str, Any] = {"first_name": "Newname", "social": []}
 APPLICANT_PATCH_RESPONSE: Dict[str, Any] = {
diff --git a/tests/test_entities/test_production_calendar.py b/tests/test_entities/test_production_calendar.py
@@ -110,7 +110,7 @@ async def test_get_non_working_days_in_period(
 ) -> None:
     httpx_mock.add_response(
         url=f"{VERSIONED_BASE_URL}/production_calendars/{CALENDAR_ID}/days/"
-        f"{DEADLINE_DATE.strftime('%Y-%m-%d')}?verbose=true",
+        f"{DEADLINE_DATE.strftime('%Y-%m-%d')}?verbose=false",
         json=NON_WORKING_DAYS_GET_RESPONSE,
     )
     api_client = HuntflowAPI(BASE_URL, token_proxy=token_proxy)
diff --git a/tests/test_entities/test_tokens.py b/tests/test_entities/test_tokens.py
@@ -0,0 +1,31 @@
+from pytest_httpx import HTTPXMock
+
+from huntflow_api_client import HuntflowAPI
+from huntflow_api_client.entities import Token
+from huntflow_api_client.models.request.token import RefreshTokenRequest
+from huntflow_api_client.models.response.token import RefreshTokenResponse
+from huntflow_api_client.tokens.proxy import HuntflowTokenProxy
+from tests.api import BASE_URL, VERSIONED_BASE_URL
+
+REFRESH_TOKEN_RESPONSE = {
+    "access_token": "1234",
+    "token_type": "1234",
+    "expires_in": 1234,
+    "refresh_token_expires_in": 1234,
+    "refresh_token": "1234",
+}
+
+
+async def test_refresh_token(
+    httpx_mock: HTTPXMock,
+    token_proxy: HuntflowTokenProxy,
+) -> None:
+    httpx_mock.add_response(
+        url=f"{VERSIONED_BASE_URL}/token/refresh",
+        json=REFRESH_TOKEN_RESPONSE,
+    )
+    api_client = HuntflowAPI(BASE_URL, token_proxy=token_proxy)
+    tags = Token(api_client)
+
+    response = await tags.update(data=RefreshTokenRequest(refresh_token="5678"))
+    assert response == RefreshTokenResponse(**REFRESH_TOKEN_RESPONSE)

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,6 @@ async def move_applicant_to_child_vacancy(`
`77`	`77`	`response = await self._api.request(`
`78`	`78`	`"PUT",`
`79`	`79`	`f"/accounts/{account_id}/applicants/vacancy/{vacancy_id}/split",`
`80`		`- json=data.jsonable_dict(exclude_none=True),`
	`80`	`+ json=data.jsonable_dict(exclude_unset=True),`
`81`	`81`	`)`
`82`	`82`	`return ApplicantVacancySplitResponse.model_validate(response.json())`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ async def update(`
`83`	`83`	`response = await self._api.request(`
`84`	`84`	`"PUT",`
`85`	`85`	`f"/accounts/{account_id}/applicants/{applicant_id}/externals/{external_id}",`
`86`		`- json=data.jsonable_dict(exclude_none=True),`
	`86`	`+ json=data.jsonable_dict(),`
`87`	`87`	`)`
`88`	`88`	`return ApplicantResumeResponse.model_validate(response.json())`
`89`	`89`