Merge pull request #73 from huntflow/INT-380_fix_optional_field_errors

[INT-380] Fix errors

Author: KlochkovHF

huntflow_api_client/models/consts.py

@@ -25,6 +25,22 @@ class VacancyState(str, Enum):
     CREATED = "CREATED"
 
 
+class AvailableVacancyCreateState(str, Enum):
+    OPEN = "OPEN"
+
+
+class AvailableMultiVacancyUpdateState(str, Enum):
+    OPEN = "OPEN"
+    CLOSED = "CLOSED"
+    HOLD = "HOLD"
+
+
+class AvailableVacancyListParameter(str, Enum):
+    OPEN = "OPEN"
+    CLOSED = "CLOSED"
+    HOLD = "HOLD"
+
+
 class FieldType(str, Enum):
     string = "string"
     integer = "integer"

huntflow_api_client/models/request/file.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import ConfigDict, Field, field_validator
+from pydantic import ConfigDict, Field, field_serializer
 
 from huntflow_api_client.models.common import JsonRequestModel
 
@@ -27,9 +27,8 @@ class UploadFileHeaders(JsonRequestModel):
         alias="x-ignore-phone",
     )
 
-    @field_validator("file_parse")
-    @classmethod
-    def convert_bool_to_str(cls, value: bool) -> str:
-        return str(value).lower()
-
     model_config = ConfigDict(populate_by_name=True)
+
+    @field_serializer("file_parse")
+    def serialize_file_parse(self, file_parse: bool) -> str:
+        return str(file_parse)

huntflow_api_client/models/request/multi_vacancies.py

@@ -3,7 +3,10 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 
 from huntflow_api_client.models.common import EditedFillQuota, FillQuota, JsonRequestModel
-from huntflow_api_client.models.request.vacancies import VacancyCreateState, VacancyUpdateState
+from huntflow_api_client.models.consts import (
+    AvailableMultiVacancyUpdateState,
+    AvailableVacancyCreateState,
+)
 
 HTML_TAGS = "ul, ol, li, p, br, a, strong, em, u, b, i"
 
@@ -32,7 +35,10 @@ class MultiVacancyCreateRequest(JsonRequestModel):
         description="Department name (ignored if the divisions are enabled)",
     )
     hidden: bool = Field(False, description="Is the vacancy hidden from coworkers?")
-    state: VacancyCreateState = Field(VacancyCreateState.OPEN, description="The state of a vacancy")
+    state: AvailableVacancyCreateState = Field(
+        AvailableVacancyCreateState.OPEN,
+        description="The state of a vacancy",
+    )
     coworkers: Optional[List[PositiveInt]] = Field(
         None,
         description="The list of coworker ID working with a vacancy",
@@ -75,7 +81,10 @@ class MultiVacancyUpdateRequest(JsonRequestModel):
         description="Department name (ignored if the divisions are enabled)",
     )
     hidden: bool = Field(False, description="Is the vacancy hidden from coworkers?")
-    state: VacancyUpdateState = Field(VacancyUpdateState.OPEN, description="The state of a vacancy")
+    state: AvailableMultiVacancyUpdateState = Field(
+        AvailableMultiVacancyUpdateState.OPEN,
+        description="The state of a vacancy",
+    )
     body: Optional[str] = Field(
         None,
         description=(

huntflow_api_client/models/request/vacancies.py

@@ -1,35 +1,19 @@
 import datetime
-from enum import Enum
 from typing import List, Optional, Union
 
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 
 from huntflow_api_client.models.common import EditedFillQuota, FillQuota, JsonRequestModel, Vacancy
-
-
-class VacancyListState(str, Enum):
-    OPEN = "OPEN"
-    CLOSED = "CLOSED"
-    HOLD = "HOLD"
-
-
-class VacancyUpdateState(str, Enum):
-    OPEN = "OPEN"
-    CLOSED = "CLOSED"
-    HOLD = "HOLD"
-
-
-class VacancyCreateState(str, Enum):
-    OPEN = "OPEN"
+from huntflow_api_client.models.consts import AvailableVacancyCreateState
 
 
 class VacancyCreateRequest(Vacancy, JsonRequestModel):
     account_applicant_offer: Optional[PositiveInt] = Field(
         None,
         description="Organization offer ID",
     )
-    state: VacancyCreateState = Field(  # type: ignore
-        VacancyCreateState.OPEN,
+    state: AvailableVacancyCreateState = Field(  # type: ignore
+        AvailableVacancyCreateState.OPEN,
         description="The state of a vacancy",
     )
     coworkers: Optional[List[PositiveInt]] = Field(

huntflow_api_client/models/response/resume.py

@@ -84,7 +84,7 @@ class EducationInfoWithResult(BaseEducationInfo):
 
 class ExtendedEducationInfo(BaseEducationInfo):
     faculty: t.Optional[str] = Field(None, description="Faculty name")
-    form: t.Optional[ExternalEntity]
+    form: t.Optional[ExternalEntity] = None
 
 
 class Experience(BaseModel):
@@ -103,11 +103,11 @@ class Experience(BaseModel):
 
 
 class Attestation(BaseModel):
-    date: t.Optional[DateWithPrecision]
-    name: t.Optional[str]
-    organization: t.Optional[str]
-    description: t.Optional[str]
-    result: t.Optional[str]
+    date: t.Optional[DateWithPrecision] = None
+    name: t.Optional[str] = None
+    organization: t.Optional[str] = None
+    description: t.Optional[str] = None
+    result: t.Optional[str] = None
 
 
 class Education(BaseModel):
@@ -147,10 +147,10 @@ class Certificate(BaseModel):
 
 
 class ContactFullValue(BaseModel):
-    country: str = Field()
-    city: str = Field()
-    number: str = Field()
-    formatted: str = Field()
+    country: str
+    city: str
+    number: str
+    formatted: str
 
 
 class Contact(BaseModel):
@@ -213,11 +213,11 @@ class Military(BaseModel):
 
 
 class SocialRating(BaseModel):
-    kind: t.Optional[str]
-    stats: t.Optional[t.Any]
-    tags: t.Optional[t.List[str]]
-    url: t.Optional[str]
-    login: t.Optional[str]
+    kind: t.Optional[str] = None
+    stats: t.Optional[t.Any] = None
+    tags: t.Optional[t.List[str]] = None
+    url: t.Optional[str] = None
+    login: t.Optional[str] = None
     registered_at: t.Optional[str] = Field(None, description="ISO datetime")
 
 

huntflow_api_client/models/response/vacancies.py

@@ -40,7 +40,7 @@ class VacancyItem(Vacancy):
     )
     multiple: Optional[bool] = Field(
         None,
-        description="Flag indicating if this vacancy is a " "multiple",
+        description="Flag indicating if this vacancy is a multiple",
     )
     parent: Optional[PositiveInt] = Field(None, description="Vacancy parent ID")
     account_vacancy_status_group: Optional[PositiveInt] = Field(
@@ -50,10 +50,6 @@ class VacancyItem(Vacancy):
 
     model_config = ConfigDict(extra="allow")
 
-    def dict(self, *args, **kwargs):  # type: ignore
-        include = set(self.__fields__) | set(self.additional_fields_list)
-        return super().dict(include=include)
-
 
 class VacancyListResponse(PaginatedResponse):
     total_items: Optional[int] = Field(..., description="Total number of items")
@@ -91,10 +87,6 @@ class VacancyResponse(VacancyChild):
 
     model_config = ConfigDict(extra="allow")
 
-    def dict(self, *args, **kwargs):  # type: ignore
-        include = set(self.__fields__) | set(self.additional_fields_list)
-        return super().dict(include=include)
-
 
 class VacancyCreateResponse(Vacancy):
     id: PositiveInt = Field(..., description="Vacancy ID")

huntflow_api_client/models/response/vacancy_requests.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import datetime
 import typing as t