mergepythonclient 3.1.0__py3-none-any.whl → 4.0.0__py3-none-any.whl

merge/resources/ticketing/resources/webhook_receivers/raw_client.py

@@ -6,9 +6,11 @@ from json.decoder import JSONDecodeError
 from .....core.api_error import ApiError
 from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from .....core.http_response import AsyncHttpResponse, HttpResponse
+from .....core.parse_error import ParsingError
 from .....core.request_options import RequestOptions
 from .....core.unchecked_base_model import construct_type
 from ...types.webhook_receiver import WebhookReceiver
+from pydantic import ValidationError
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -52,6 +54,10 @@ class RawWebhookReceiversClient:
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        except ValidationError as e:
+            raise ParsingError(
+                status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e
+            )
         raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create(
@@ -108,6 +114,10 @@ class RawWebhookReceiversClient:
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        except ValidationError as e:
+            raise ParsingError(
+                status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e
+            )
         raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
@@ -149,6 +159,10 @@ class AsyncRawWebhookReceiversClient:
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        except ValidationError as e:
+            raise ParsingError(
+                status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e
+            )
         raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create(
@@ -205,4 +219,8 @@ class AsyncRawWebhookReceiversClient:
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        except ValidationError as e:
+            raise ParsingError(
+                status_code=_response.status_code, headers=dict(_response.headers), body=_response.json(), cause=e
+            )
         raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)

merge/resources/ticketing/types/__init__.py

@@ -390,8 +390,10 @@ def __getattr__(attr_name: str) -> typing.Any:
         raise AttributeError(f"No {attr_name} found in _dynamic_imports for module name -> {__name__}")
     try:
         module = import_module(module_name, __package__)
-        result = getattr(module, attr_name)
-        return result
+        if module_name == f".{attr_name}":
+            return module
+        else:
+            return getattr(module, attr_name)
     except ImportError as e:
         raise ImportError(f"Failed to import {attr_name} from {module_name}: {e}") from e
     except AttributeError as e:

merge/resources/ticketing/types/account.py

@@ -52,7 +52,7 @@ class Account(UncheckedBaseModel):
     Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
     """
 
-    field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    field_mappings: typing.Optional[typing.Dict[str, typing.Any]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
 
     if IS_PYDANTIC_V2:

merge/resources/ticketing/types/account_details_and_actions.py

@@ -42,7 +42,7 @@ class AccountDetailsAndActions(UncheckedBaseModel):
     integration: typing.Optional[AccountDetailsAndActionsIntegration] = None
     account_type: str
     completed_at: dt.datetime
-    integration_specific_fields: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    integration_specific_fields: typing.Optional[typing.Dict[str, typing.Any]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/ticketing/types/account_details_and_actions_status_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class AccountDetailsAndActionsStatusEnum(str, enum.Enum):
+class AccountDetailsAndActionsStatusEnum(enum.StrEnum):
     """
     * `COMPLETE` - COMPLETE
     * `INCOMPLETE` - INCOMPLETE

merge/resources/ticketing/types/account_integration.py

@@ -40,9 +40,7 @@ class AccountIntegration(UncheckedBaseModel):
     """
 
     slug: typing.Optional[str] = None
-    api_endpoints_to_documentation_urls: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = (
-        pydantic.Field(default=None)
-    )
+    api_endpoints_to_documentation_urls: typing.Optional[typing.Dict[str, typing.Any]] = pydantic.Field(default=None)
     """
     Mapping of API endpoints to documentation urls for support. Example: {'GET': [['/common-model-scopes', 'https://docs.merge.dev/accounting/common-model-scopes/#common_model_scopes_retrieve'],['/common-model-actions', 'https://docs.merge.dev/accounting/common-model-actions/#common_model_actions_retrieve']], 'POST': []}
     """
@@ -52,7 +50,7 @@ class AccountIntegration(UncheckedBaseModel):
     Setup guide URL for third party webhook creation. Exposed in Merge Docs.
     """
 
-    category_beta_status: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = pydantic.Field(default=None)
+    category_beta_status: typing.Optional[typing.Dict[str, typing.Any]] = pydantic.Field(default=None)
     """
     Category or categories this integration is in beta status for.
     """

merge/resources/ticketing/types/actions_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class ActionsEnum(str, enum.Enum):
+class ActionsEnum(enum.StrEnum):
     """
     * `VIEW` - VIEW
     * `CREATE` - CREATE

merge/resources/ticketing/types/advanced_metadata.py

@@ -13,7 +13,7 @@ class AdvancedMetadata(UncheckedBaseModel):
     description: typing.Optional[str] = None
     is_required: typing.Optional[bool] = None
     is_custom: typing.Optional[bool] = None
-    field_choices: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
+    field_choices: typing.Optional[typing.List[typing.Any]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/ticketing/types/attachment.py

@@ -72,7 +72,7 @@ class Attachment(UncheckedBaseModel):
     Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
     """
 
-    field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    field_mappings: typing.Optional[typing.Dict[str, typing.Any]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
 
     if IS_PYDANTIC_V2:
@@ -85,8 +85,15 @@ class Attachment(UncheckedBaseModel):
             extra = pydantic.Extra.allow
 
 
-from .collection import Collection  # noqa: E402, F401, I001
-from .ticket import Ticket  # noqa: E402, F401, I001
-from .attachment_ticket import AttachmentTicket  # noqa: E402, F401, I001
+from .attachment_ticket import AttachmentTicket  # noqa: E402, I001
+from .ticket import Ticket  # noqa: E402, I001
+from .ticket_attachments_item import TicketAttachmentsItem  # noqa: E402, I001
+from .ticket_parent_ticket import TicketParentTicket  # noqa: E402, I001
 
-update_forward_refs(Attachment)
+update_forward_refs(
+    Attachment,
+    AttachmentTicket=AttachmentTicket,
+    Ticket=Ticket,
+    TicketAttachmentsItem=TicketAttachmentsItem,
+    TicketParentTicket=TicketParentTicket,
+)

merge/resources/ticketing/types/attachment_request.py

@@ -45,8 +45,8 @@ class AttachmentRequest(UncheckedBaseModel):
     The user who uploaded the attachment.
     """
 
-    integration_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
-    linked_account_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    integration_params: typing.Optional[typing.Dict[str, typing.Any]] = None
+    linked_account_params: typing.Optional[typing.Dict[str, typing.Any]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
@@ -58,8 +58,4 @@ class AttachmentRequest(UncheckedBaseModel):
             extra = pydantic.Extra.allow
 
 
-from .attachment import Attachment  # noqa: E402, F401, I001
-from .collection import Collection  # noqa: E402, F401, I001
-from .ticket import Ticket  # noqa: E402, F401, I001
-
 update_forward_refs(AttachmentRequest)

merge/resources/ticketing/types/categories_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class CategoriesEnum(str, enum.Enum):
+class CategoriesEnum(enum.StrEnum):
     """
     * `hris` - hris
     * `ats` - ats

merge/resources/ticketing/types/category_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class CategoryEnum(str, enum.Enum):
+class CategoryEnum(enum.StrEnum):
     """
     * `hris` - hris
     * `ats` - ats

merge/resources/ticketing/types/collection.py

@@ -94,7 +94,7 @@ class Collection(UncheckedBaseModel):
     Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
     """
 
-    field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    field_mappings: typing.Optional[typing.Dict[str, typing.Any]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
 
     if IS_PYDANTIC_V2:
@@ -107,6 +107,6 @@ class Collection(UncheckedBaseModel):
             extra = pydantic.Extra.allow
 
 
-from .collection_parent_collection import CollectionParentCollection  # noqa: E402, F401, I001
+from .collection_parent_collection import CollectionParentCollection  # noqa: E402, I001
 
-update_forward_refs(Collection)
+update_forward_refs(Collection, CollectionParentCollection=CollectionParentCollection)

merge/resources/ticketing/types/collection_access_level_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class CollectionAccessLevelEnum(str, enum.Enum):
+class CollectionAccessLevelEnum(enum.StrEnum):
     """
     * `PRIVATE` - PRIVATE
     * `COMPANY` - COMPANY

merge/resources/ticketing/types/collection_type_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class CollectionTypeEnum(str, enum.Enum):
+class CollectionTypeEnum(enum.StrEnum):
     """
     * `LIST` - LIST
     * `PROJECT` - PROJECT

merge/resources/ticketing/types/comment.py

@@ -80,7 +80,7 @@ class Comment(UncheckedBaseModel):
     Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
     """
 
-    field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    field_mappings: typing.Optional[typing.Dict[str, typing.Any]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
 
     if IS_PYDANTIC_V2:
@@ -93,8 +93,4 @@ class Comment(UncheckedBaseModel):
             extra = pydantic.Extra.allow
 
 
-from .attachment import Attachment  # noqa: E402, F401, I001
-from .collection import Collection  # noqa: E402, F401, I001
-from .ticket import Ticket  # noqa: E402, F401, I001
-
 update_forward_refs(Comment)

merge/resources/ticketing/types/comment_request.py

@@ -52,8 +52,8 @@ class CommentRequest(UncheckedBaseModel):
     Whether or not the comment is internal.
     """
 
-    integration_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
-    linked_account_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    integration_params: typing.Optional[typing.Dict[str, typing.Any]] = None
+    linked_account_params: typing.Optional[typing.Dict[str, typing.Any]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
@@ -65,8 +65,4 @@ class CommentRequest(UncheckedBaseModel):
             extra = pydantic.Extra.allow
 
 
-from .attachment import Attachment  # noqa: E402, F401, I001
-from .collection import Collection  # noqa: E402, F401, I001
-from .ticket import Ticket  # noqa: E402, F401, I001
-
 update_forward_refs(CommentRequest)

merge/resources/ticketing/types/comment_response.py

@@ -29,8 +29,4 @@ class CommentResponse(UncheckedBaseModel):
             extra = pydantic.Extra.allow
 
 
-from .attachment import Attachment  # noqa: E402, F401, I001
-from .collection import Collection  # noqa: E402, F401, I001
-from .ticket import Ticket  # noqa: E402, F401, I001
-
 update_forward_refs(CommentResponse)

merge/resources/ticketing/types/contact.py

@@ -66,7 +66,7 @@ class Contact(UncheckedBaseModel):
     Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
     """
 
-    field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    field_mappings: typing.Optional[typing.Dict[str, typing.Any]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
 
     if IS_PYDANTIC_V2:

merge/resources/ticketing/types/contact_request.py

@@ -43,8 +43,8 @@ class ContactRequest(UncheckedBaseModel):
     The contact's account.
     """
 
-    integration_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
-    linked_account_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    integration_params: typing.Optional[typing.Dict[str, typing.Any]] = None
+    linked_account_params: typing.Optional[typing.Dict[str, typing.Any]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/ticketing/types/data_passthrough_request.py

@@ -41,7 +41,7 @@ class DataPassthroughRequest(UncheckedBaseModel):
     Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     """
 
-    headers: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = pydantic.Field(default=None)
+    headers: typing.Optional[typing.Dict[str, typing.Any]] = pydantic.Field(default=None)
     """
     The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     """

merge/resources/ticketing/types/effect_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class EffectEnum(str, enum.Enum):
+class EffectEnum(enum.StrEnum):
     """
     * `ALLOWED` - ALLOWED
     * `DENIED` - DENIED

merge/resources/ticketing/types/enabled_actions_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class EnabledActionsEnum(str, enum.Enum):
+class EnabledActionsEnum(enum.StrEnum):
     """
     * `READ` - READ
     * `WRITE` - WRITE

merge/resources/ticketing/types/encoding_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class EncodingEnum(str, enum.Enum):
+class EncodingEnum(enum.StrEnum):
     """
     * `RAW` - RAW
     * `BASE64` - BASE64

merge/resources/ticketing/types/event_type_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class EventTypeEnum(str, enum.Enum):
+class EventTypeEnum(enum.StrEnum):
     """
     * `CREATED_REMOTE_PRODUCTION_API_KEY` - CREATED_REMOTE_PRODUCTION_API_KEY
     * `DELETED_REMOTE_PRODUCTION_API_KEY` - DELETED_REMOTE_PRODUCTION_API_KEY

merge/resources/ticketing/types/external_target_field_api_response.py

@@ -3,23 +3,61 @@
 import typing
 
 import pydantic
+import typing_extensions
 from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.serialization import FieldMetadata
 from ....core.unchecked_base_model import UncheckedBaseModel
 from .external_target_field_api import ExternalTargetFieldApi
 
 
 class ExternalTargetFieldApiResponse(UncheckedBaseModel):
-    ticket: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Ticket", default=None)
-    comment: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Comment", default=None)
-    project: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Project", default=None)
-    collection: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Collection", default=None)
-    user: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="User", default=None)
-    role: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Role", default=None)
-    account: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Account", default=None)
-    team: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Team", default=None)
-    attachment: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Attachment", default=None)
-    tag: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Tag", default=None)
-    contact: typing.Optional[typing.List[ExternalTargetFieldApi]] = pydantic.Field(alias="Contact", default=None)
+    ticket: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Ticket"),
+        pydantic.Field(alias="Ticket"),
+    ] = None
+    comment: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Comment"),
+        pydantic.Field(alias="Comment"),
+    ] = None
+    project: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Project"),
+        pydantic.Field(alias="Project"),
+    ] = None
+    collection: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Collection"),
+        pydantic.Field(alias="Collection"),
+    ] = None
+    user: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]], FieldMetadata(alias="User"), pydantic.Field(alias="User")
+    ] = None
+    role: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]], FieldMetadata(alias="Role"), pydantic.Field(alias="Role")
+    ] = None
+    account: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Account"),
+        pydantic.Field(alias="Account"),
+    ] = None
+    team: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]], FieldMetadata(alias="Team"), pydantic.Field(alias="Team")
+    ] = None
+    attachment: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Attachment"),
+        pydantic.Field(alias="Attachment"),
+    ] = None
+    tag: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]], FieldMetadata(alias="Tag"), pydantic.Field(alias="Tag")
+    ] = None
+    contact: typing_extensions.Annotated[
+        typing.Optional[typing.List[ExternalTargetFieldApi]],
+        FieldMetadata(alias="Contact"),
+        pydantic.Field(alias="Contact"),
+    ] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/ticketing/types/field_format_enum.py

@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import enum
 import typing
 
+from ....core import enum
+
 T_Result = typing.TypeVar("T_Result")
 
 
-class FieldFormatEnum(str, enum.Enum):
+class FieldFormatEnum(enum.StrEnum):
     """
     * `string` - string
     * `number` - number

merge/resources/ticketing/types/field_mapping_api_instance_remote_field.py

@@ -3,7 +3,9 @@
 import typing
 
 import pydantic
+import typing_extensions
 from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.serialization import FieldMetadata
 from ....core.unchecked_base_model import UncheckedBaseModel
 from .field_mapping_api_instance_remote_field_remote_endpoint_info import (
     FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo,
@@ -12,9 +14,9 @@ from .field_mapping_api_instance_remote_field_remote_endpoint_info import (
 
 class FieldMappingApiInstanceRemoteField(UncheckedBaseModel):
     remote_key_name: typing.Optional[str] = None
-    schema_: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = pydantic.Field(
-        alias="schema", default=None
-    )
+    schema_: typing_extensions.Annotated[
+        typing.Optional[typing.Dict[str, typing.Any]], FieldMetadata(alias="schema"), pydantic.Field(alias="schema")
+    ] = None
     remote_endpoint_info: FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo
 
     if IS_PYDANTIC_V2:

merge/resources/ticketing/types/field_mapping_api_instance_response.py

@@ -3,23 +3,61 @@
 import typing
 
 import pydantic
+import typing_extensions
 from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.serialization import FieldMetadata
 from ....core.unchecked_base_model import UncheckedBaseModel
 from .field_mapping_api_instance import FieldMappingApiInstance
 
 
 class FieldMappingApiInstanceResponse(UncheckedBaseModel):
-    ticket: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Ticket", default=None)
-    comment: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Comment", default=None)
-    project: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Project", default=None)
-    collection: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Collection", default=None)
-    user: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="User", default=None)
-    role: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Role", default=None)
-    account: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Account", default=None)
-    team: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Team", default=None)
-    attachment: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Attachment", default=None)
-    tag: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Tag", default=None)
-    contact: typing.Optional[typing.List[FieldMappingApiInstance]] = pydantic.Field(alias="Contact", default=None)
+    ticket: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Ticket"),
+        pydantic.Field(alias="Ticket"),
+    ] = None
+    comment: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Comment"),
+        pydantic.Field(alias="Comment"),
+    ] = None
+    project: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Project"),
+        pydantic.Field(alias="Project"),
+    ] = None
+    collection: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Collection"),
+        pydantic.Field(alias="Collection"),
+    ] = None
+    user: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]], FieldMetadata(alias="User"), pydantic.Field(alias="User")
+    ] = None
+    role: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]], FieldMetadata(alias="Role"), pydantic.Field(alias="Role")
+    ] = None
+    account: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Account"),
+        pydantic.Field(alias="Account"),
+    ] = None
+    team: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]], FieldMetadata(alias="Team"), pydantic.Field(alias="Team")
+    ] = None
+    attachment: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Attachment"),
+        pydantic.Field(alias="Attachment"),
+    ] = None
+    tag: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]], FieldMetadata(alias="Tag"), pydantic.Field(alias="Tag")
+    ] = None
+    contact: typing_extensions.Annotated[
+        typing.Optional[typing.List[FieldMappingApiInstance]],
+        FieldMetadata(alias="Contact"),
+        pydantic.Field(alias="Contact"),
+    ] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/ticketing/types/field_permission_deserializer.py

@@ -8,8 +8,8 @@ from ....core.unchecked_base_model import UncheckedBaseModel
 
 
 class FieldPermissionDeserializer(UncheckedBaseModel):
-    enabled_fields: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
-    disabled_fields: typing.Optional[typing.List[typing.Optional[typing.Any]]] = None
+    enabled_fields: typing.Optional[typing.List[typing.Any]] = None
+    disabled_fields: typing.Optional[typing.List[typing.Any]] = None
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2