pingram-python 1.0.37__py3-none-any.whl → 1.0.38__py3-none-any.whl

pingram/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.0.37"
+__version__ = "1.0.38"
 
 # Define package exports
 __all__ = [
@@ -90,9 +90,9 @@ __all__ = [
     "CampaignWebhookResponse",
     "CancelSubscriptionRequest",
     "Chained",
-    "ChangeEmailRequest",
     "ChangePhoneRequest",
     "ChannelsEnum",
+    "ConfirmChangeEmailRequest",
     "CreateAccountRequest",
     "CreateAccountRequestPlan",
     "CreateAccountResponse",
@@ -308,6 +308,7 @@ __all__ = [
     "SetDefaultTemplateRequest",
     "SlackConnectInviteResponse",
     "SlackInteractivityResponse",
+    "StartChangeEmailRequest",
     "SubNotification",
     "SubNotificationPUTRequest",
     "SuccessResponse",
@@ -438,9 +439,9 @@ from pingram.models.broadcast_response_audience import BroadcastResponseAudience
 from pingram.models.campaign_webhook_response import CampaignWebhookResponse as CampaignWebhookResponse
 from pingram.models.cancel_subscription_request import CancelSubscriptionRequest as CancelSubscriptionRequest
 from pingram.models.chained import Chained as Chained
-from pingram.models.change_email_request import ChangeEmailRequest as ChangeEmailRequest
 from pingram.models.change_phone_request import ChangePhoneRequest as ChangePhoneRequest
 from pingram.models.channels_enum import ChannelsEnum as ChannelsEnum
+from pingram.models.confirm_change_email_request import ConfirmChangeEmailRequest as ConfirmChangeEmailRequest
 from pingram.models.create_account_request import CreateAccountRequest as CreateAccountRequest
 from pingram.models.create_account_request_plan import CreateAccountRequestPlan as CreateAccountRequestPlan
 from pingram.models.create_account_response import CreateAccountResponse as CreateAccountResponse
@@ -656,6 +657,7 @@ from pingram.models.sender_post_response import SenderPostResponse as SenderPost
 from pingram.models.set_default_template_request import SetDefaultTemplateRequest as SetDefaultTemplateRequest
 from pingram.models.slack_connect_invite_response import SlackConnectInviteResponse as SlackConnectInviteResponse
 from pingram.models.slack_interactivity_response import SlackInteractivityResponse as SlackInteractivityResponse
+from pingram.models.start_change_email_request import StartChangeEmailRequest as StartChangeEmailRequest
 from pingram.models.sub_notification import SubNotification as SubNotification
 from pingram.models.sub_notification_put_request import SubNotificationPUTRequest as SubNotificationPUTRequest
 from pingram.models.success_response import SuccessResponse as SuccessResponse

pingram/api/library_api.py

@@ -59,7 +59,7 @@ class LibraryApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> CreateLibraryResponse:
-        """Create an upload slot in the account library. PUT the file to the returned uploadUrl with the same Content-Type, then use the returned url in emails and the editor.
+        """Create an upload slot in the account library. contentType must be image/png, image/jpeg, image/gif, or image/webp. PUT the file to the returned uploadUrl with that Content-Type, then use the returned url in emails and the editor.
 
 
         :param use_case: Library use-case (required)
@@ -134,7 +134,7 @@ class LibraryApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[CreateLibraryResponse]:
-        """Create an upload slot in the account library. PUT the file to the returned uploadUrl with the same Content-Type, then use the returned url in emails and the editor.
+        """Create an upload slot in the account library. contentType must be image/png, image/jpeg, image/gif, or image/webp. PUT the file to the returned uploadUrl with that Content-Type, then use the returned url in emails and the editor.
 
 
         :param use_case: Library use-case (required)
@@ -209,7 +209,7 @@ class LibraryApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Create an upload slot in the account library. PUT the file to the returned uploadUrl with the same Content-Type, then use the returned url in emails and the editor.
+        """Create an upload slot in the account library. contentType must be image/png, image/jpeg, image/gif, or image/webp. PUT the file to the returned uploadUrl with that Content-Type, then use the returned url in emails and the editor.
 
 
         :param use_case: Library use-case (required)

pingram/api/logs_api.py

@@ -26,6 +26,7 @@ from pingram.models.logs_query_response import LogsQueryResponse
 from pingram.models.logs_query_result_response import LogsQueryResultResponse
 from pingram.models.logs_retention_response import LogsRetentionResponse
 from pingram.models.logs_tail_response import LogsTailResponse
+from pingram.models.message_response import MessageResponse
 
 from pingram.api_client import ApiClient, RequestSerialized
 from pingram.api_response import ApiResponse
@@ -1153,6 +1154,282 @@ class LogsApi:
 
 
 
+    @validate_call
+    async def logs_retry_inbound(
+        self,
+        tracking_id: Annotated[StrictStr, Field(description="Tracking ID of the inbound email")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> MessageResponse:
+        """Resend the EMAIL_INBOUND webhook for one inbound email. Uses the original tracking ID and does not count another email. Refused when the message is older than 30 days.
+
+
+        :param tracking_id: Tracking ID of the inbound email (required)
+        :type tracking_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._logs_retry_inbound_serialize(
+            tracking_id=tracking_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "MessageResponse",
+            '400': "ApiErrorResponse",
+            '401': None,
+            '402': "ApiErrorResponse",
+            '500': None,
+            '502': "ApiErrorResponse",
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    async def logs_retry_inbound_with_http_info(
+        self,
+        tracking_id: Annotated[StrictStr, Field(description="Tracking ID of the inbound email")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[MessageResponse]:
+        """Resend the EMAIL_INBOUND webhook for one inbound email. Uses the original tracking ID and does not count another email. Refused when the message is older than 30 days.
+
+
+        :param tracking_id: Tracking ID of the inbound email (required)
+        :type tracking_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._logs_retry_inbound_serialize(
+            tracking_id=tracking_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "MessageResponse",
+            '400': "ApiErrorResponse",
+            '401': None,
+            '402': "ApiErrorResponse",
+            '500': None,
+            '502': "ApiErrorResponse",
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        await response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    async def logs_retry_inbound_without_preload_content(
+        self,
+        tracking_id: Annotated[StrictStr, Field(description="Tracking ID of the inbound email")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Resend the EMAIL_INBOUND webhook for one inbound email. Uses the original tracking ID and does not count another email. Refused when the message is older than 30 days.
+
+
+        :param tracking_id: Tracking ID of the inbound email (required)
+        :type tracking_id: str
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._logs_retry_inbound_serialize(
+            tracking_id=tracking_id,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '200': "MessageResponse",
+            '400': "ApiErrorResponse",
+            '401': None,
+            '402': "ApiErrorResponse",
+            '500': None,
+            '502': "ApiErrorResponse",
+        }
+        response_data = await self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _logs_retry_inbound_serialize(
+        self,
+        tracking_id,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[
+            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
+        ] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if tracking_id is not None:
+            _path_params['trackingId'] = tracking_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'endUserHashed', 
+            'endUser', 
+            'apiKey', 
+            'clientCredentials'
+        ]
+
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/logs/retry/{trackingId}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+
+
+
     @validate_call
     async def logs_start_logs_query(
         self,

pingram/api/profile_api.py

@@ -20,7 +20,6 @@ from pydantic import Field, StrictStr
 from typing_extensions import Annotated
 from pingram.models.accept_invite_request import AcceptInviteRequest
 from pingram.models.accept_invite_response import AcceptInviteResponse
-from pingram.models.change_email_request import ChangeEmailRequest
 from pingram.models.delete_account_request import DeleteAccountRequest
 from pingram.models.mfa_setup_request import MFASetupRequest
 from pingram.models.mfa_setup_response import MFASetupResponse
@@ -331,295 +330,6 @@ class ProfileApi:
 
 
 
-    @validate_call
-    async def profile_change_email(
-        self,
-        change_email_request: ChangeEmailRequest,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[
-                Annotated[StrictFloat, Field(gt=0)],
-                Annotated[StrictFloat, Field(gt=0)]
-            ]
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> SuccessResponse:
-        """Change the email address of the authenticated user
-
-
-        :param change_email_request: (required)
-        :type change_email_request: ChangeEmailRequest
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :type _request_timeout: int, tuple(int, int), optional
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the
-                              authentication in the spec for a single request.
-        :type _request_auth: dict, optional
-        :param _content_type: force content-type for the request.
-        :type _content_type: str, Optional
-        :param _headers: set to override the headers for a single
-                         request; this effectively ignores the headers
-                         in the spec for a single request.
-        :type _headers: dict, optional
-        :param _host_index: set to override the host_index for a single
-                            request; this effectively ignores the host_index
-                            in the spec for a single request.
-        :type _host_index: int, optional
-        :return: Returns the result object.
-        """ # noqa: E501
-
-        _param = self._profile_change_email_serialize(
-            change_email_request=change_email_request,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index
-        )
-
-        _response_types_map: Dict[str, Optional[str]] = {
-            '200': "SuccessResponse",
-            '400': "ApiErrorResponse",
-            '401': None,
-            '402': "ApiErrorResponse",
-            '500': None,
-            '502': "ApiErrorResponse",
-        }
-        response_data = await self.api_client.call_api(
-            *_param,
-            _request_timeout=_request_timeout
-        )
-        await response_data.read()
-        return self.api_client.response_deserialize(
-            response_data=response_data,
-            response_types_map=_response_types_map,
-        ).data
-
-
-    @validate_call
-    async def profile_change_email_with_http_info(
-        self,
-        change_email_request: ChangeEmailRequest,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[
-                Annotated[StrictFloat, Field(gt=0)],
-                Annotated[StrictFloat, Field(gt=0)]
-            ]
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> ApiResponse[SuccessResponse]:
-        """Change the email address of the authenticated user
-
-
-        :param change_email_request: (required)
-        :type change_email_request: ChangeEmailRequest
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :type _request_timeout: int, tuple(int, int), optional
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the
-                              authentication in the spec for a single request.
-        :type _request_auth: dict, optional
-        :param _content_type: force content-type for the request.
-        :type _content_type: str, Optional
-        :param _headers: set to override the headers for a single
-                         request; this effectively ignores the headers
-                         in the spec for a single request.
-        :type _headers: dict, optional
-        :param _host_index: set to override the host_index for a single
-                            request; this effectively ignores the host_index
-                            in the spec for a single request.
-        :type _host_index: int, optional
-        :return: Returns the result object.
-        """ # noqa: E501
-
-        _param = self._profile_change_email_serialize(
-            change_email_request=change_email_request,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index
-        )
-
-        _response_types_map: Dict[str, Optional[str]] = {
-            '200': "SuccessResponse",
-            '400': "ApiErrorResponse",
-            '401': None,
-            '402': "ApiErrorResponse",
-            '500': None,
-            '502': "ApiErrorResponse",
-        }
-        response_data = await self.api_client.call_api(
-            *_param,
-            _request_timeout=_request_timeout
-        )
-        await response_data.read()
-        return self.api_client.response_deserialize(
-            response_data=response_data,
-            response_types_map=_response_types_map,
-        )
-
-
-    @validate_call
-    async def profile_change_email_without_preload_content(
-        self,
-        change_email_request: ChangeEmailRequest,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[
-                Annotated[StrictFloat, Field(gt=0)],
-                Annotated[StrictFloat, Field(gt=0)]
-            ]
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> RESTResponseType:
-        """Change the email address of the authenticated user
-
-
-        :param change_email_request: (required)
-        :type change_email_request: ChangeEmailRequest
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :type _request_timeout: int, tuple(int, int), optional
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the
-                              authentication in the spec for a single request.
-        :type _request_auth: dict, optional
-        :param _content_type: force content-type for the request.
-        :type _content_type: str, Optional
-        :param _headers: set to override the headers for a single
-                         request; this effectively ignores the headers
-                         in the spec for a single request.
-        :type _headers: dict, optional
-        :param _host_index: set to override the host_index for a single
-                            request; this effectively ignores the host_index
-                            in the spec for a single request.
-        :type _host_index: int, optional
-        :return: Returns the result object.
-        """ # noqa: E501
-
-        _param = self._profile_change_email_serialize(
-            change_email_request=change_email_request,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index
-        )
-
-        _response_types_map: Dict[str, Optional[str]] = {
-            '200': "SuccessResponse",
-            '400': "ApiErrorResponse",
-            '401': None,
-            '402': "ApiErrorResponse",
-            '500': None,
-            '502': "ApiErrorResponse",
-        }
-        response_data = await self.api_client.call_api(
-            *_param,
-            _request_timeout=_request_timeout
-        )
-        return response_data.response
-
-
-    def _profile_change_email_serialize(
-        self,
-        change_email_request,
-        _request_auth,
-        _content_type,
-        _headers,
-        _host_index,
-    ) -> RequestSerialized:
-
-        _host = None
-
-        _collection_formats: Dict[str, str] = {
-        }
-
-        _path_params: Dict[str, str] = {}
-        _query_params: List[Tuple[str, str]] = []
-        _header_params: Dict[str, Optional[str]] = _headers or {}
-        _form_params: List[Tuple[str, str]] = []
-        _files: Dict[
-            str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
-        ] = {}
-        _body_params: Optional[bytes] = None
-
-        # process the path parameters
-        # process the query parameters
-        # process the header parameters
-        # process the form parameters
-        # process the body parameter
-        if change_email_request is not None:
-            _body_params = change_email_request
-
-
-        # set the HTTP header `Accept`
-        if 'Accept' not in _header_params:
-            _header_params['Accept'] = self.api_client.select_header_accept(
-                [
-                    'application/json'
-                ]
-            )
-
-        # set the HTTP header `Content-Type`
-        if _content_type:
-            _header_params['Content-Type'] = _content_type
-        else:
-            _default_content_type = (
-                self.api_client.select_header_content_type(
-                    [
-                        'application/json'
-                    ]
-                )
-            )
-            if _default_content_type is not None:
-                _header_params['Content-Type'] = _default_content_type
-
-        # authentication setting
-        _auth_settings: List[str] = [
-            'endUserHashed', 
-            'endUser', 
-            'apiKey', 
-            'clientCredentials'
-        ]
-
-        return self.api_client.param_serialize(
-            method='POST',
-            resource_path='/profile/change-email',
-            path_params=_path_params,
-            query_params=_query_params,
-            header_params=_header_params,
-            body=_body_params,
-            post_params=_form_params,
-            files=_files,
-            auth_settings=_auth_settings,
-            collection_formats=_collection_formats,
-            _host=_host,
-            _request_auth=_request_auth
-        )
-
-
-
-
     @validate_call
     async def profile_delete_account(
         self,

pingram/api/webhooks_api.py

@@ -57,7 +57,7 @@ class WebhooksApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> WebhookEndpoint:
-        """Create a webhook endpoint. Pingram POSTs signed JSON to the URL when one of the subscribed events happens. The response includes id and a signing secret starting with pingram_whsecret_. Save it and verify the X-Pingram-Signature header. Updates keep this secret. At most 10 endpoints per account. The URL must be http or https and should return 2xx.
+        """Create a webhook endpoint. Pingram POSTs signed JSON to the URL when one of the subscribed events happens. The response includes id and a signing secret starting with pingram_whsecret_. Save it and verify the X-Pingram-Signature header. Updates keep this secret. At most 10 endpoints per account. The URL must be a public HTTPS URL and should return 2xx.
 
 
         :param webhook_endpoint_upsert_request: (required)
@@ -128,7 +128,7 @@ class WebhooksApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[WebhookEndpoint]:
-        """Create a webhook endpoint. Pingram POSTs signed JSON to the URL when one of the subscribed events happens. The response includes id and a signing secret starting with pingram_whsecret_. Save it and verify the X-Pingram-Signature header. Updates keep this secret. At most 10 endpoints per account. The URL must be http or https and should return 2xx.
+        """Create a webhook endpoint. Pingram POSTs signed JSON to the URL when one of the subscribed events happens. The response includes id and a signing secret starting with pingram_whsecret_. Save it and verify the X-Pingram-Signature header. Updates keep this secret. At most 10 endpoints per account. The URL must be a public HTTPS URL and should return 2xx.
 
 
         :param webhook_endpoint_upsert_request: (required)
@@ -199,7 +199,7 @@ class WebhooksApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Create a webhook endpoint. Pingram POSTs signed JSON to the URL when one of the subscribed events happens. The response includes id and a signing secret starting with pingram_whsecret_. Save it and verify the X-Pingram-Signature header. Updates keep this secret. At most 10 endpoints per account. The URL must be http or https and should return 2xx.
+        """Create a webhook endpoint. Pingram POSTs signed JSON to the URL when one of the subscribed events happens. The response includes id and a signing secret starting with pingram_whsecret_. Save it and verify the X-Pingram-Signature header. Updates keep this secret. At most 10 endpoints per account. The URL must be a public HTTPS URL and should return 2xx.
 
 
         :param webhook_endpoint_upsert_request: (required)
@@ -884,7 +884,7 @@ class WebhooksApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> WebhookEndpoint:
-        """Replace one webhook endpoint's URL and its full event subscription. endpointId comes from list or create. The signing secret stays the same. events is the complete set; omitting an event unsubscribes it. The URL must be http or https.
+        """Replace one webhook endpoint's URL and its full event subscription. endpointId comes from list or create. The signing secret stays the same. events is the complete set; omitting an event unsubscribes it. The URL must be a public HTTPS URL.
 
 
         :param endpoint_id: Id of the webhook endpoint, from list or create. (required)
@@ -959,7 +959,7 @@ class WebhooksApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> ApiResponse[WebhookEndpoint]:
-        """Replace one webhook endpoint's URL and its full event subscription. endpointId comes from list or create. The signing secret stays the same. events is the complete set; omitting an event unsubscribes it. The URL must be http or https.
+        """Replace one webhook endpoint's URL and its full event subscription. endpointId comes from list or create. The signing secret stays the same. events is the complete set; omitting an event unsubscribes it. The URL must be a public HTTPS URL.
 
 
         :param endpoint_id: Id of the webhook endpoint, from list or create. (required)
@@ -1034,7 +1034,7 @@ class WebhooksApi:
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> RESTResponseType:
-        """Replace one webhook endpoint's URL and its full event subscription. endpointId comes from list or create. The signing secret stays the same. events is the complete set; omitting an event unsubscribes it. The URL must be http or https.
+        """Replace one webhook endpoint's URL and its full event subscription. endpointId comes from list or create. The signing secret stays the same. events is the complete set; omitting an event unsubscribes it. The URL must be a public HTTPS URL.
 
 
         :param endpoint_id: Id of the webhook endpoint, from list or create. (required)

pingram/api_client.py

@@ -91,7 +91,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'pingram-python/1.0.37'
+        self.user_agent = 'pingram-python/1.0.38'
         self.client_side_validation = configuration.client_side_validation
 
     async def __aenter__(self):

pingram/configuration.py

@@ -551,7 +551,7 @@ conf = pingram.Configuration(
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.0.0\n"\
-               "SDK Package Version: 1.0.37".\
+               "SDK Package Version: 1.0.38".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

pingram/models/__init__.py

@@ -48,9 +48,9 @@ from pingram.models.broadcast_response_audience import BroadcastResponseAudience
 from pingram.models.campaign_webhook_response import CampaignWebhookResponse
 from pingram.models.cancel_subscription_request import CancelSubscriptionRequest
 from pingram.models.chained import Chained
-from pingram.models.change_email_request import ChangeEmailRequest
 from pingram.models.change_phone_request import ChangePhoneRequest
 from pingram.models.channels_enum import ChannelsEnum
+from pingram.models.confirm_change_email_request import ConfirmChangeEmailRequest
 from pingram.models.create_account_request import CreateAccountRequest
 from pingram.models.create_account_request_plan import CreateAccountRequestPlan
 from pingram.models.create_account_response import CreateAccountResponse
@@ -266,6 +266,7 @@ from pingram.models.sender_post_response import SenderPostResponse
 from pingram.models.set_default_template_request import SetDefaultTemplateRequest
 from pingram.models.slack_connect_invite_response import SlackConnectInviteResponse
 from pingram.models.slack_interactivity_response import SlackInteractivityResponse
+from pingram.models.start_change_email_request import StartChangeEmailRequest
 from pingram.models.sub_notification import SubNotification
 from pingram.models.sub_notification_put_request import SubNotificationPUTRequest
 from pingram.models.success_response import SuccessResponse

pingram/models/{change_email_request.py → confirm_change_email_request.py}

@@ -17,17 +17,17 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List
 from typing import Optional, Set
 from typing_extensions import Self
 
-class ChangeEmailRequest(BaseModel):
+class ConfirmChangeEmailRequest(BaseModel):
     """
-    ChangeEmailRequest
+    ConfirmChangeEmailRequest
     """ # noqa: E501
-    new_email: StrictStr = Field(alias="newEmail")
-    __properties: ClassVar[List[str]] = ["newEmail"]
+    code: StrictStr
+    __properties: ClassVar[List[str]] = ["code"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -47,7 +47,7 @@ class ChangeEmailRequest(BaseModel):
 
     @classmethod
     def from_json(cls, json_str: str) -> Optional[Self]:
-        """Create an instance of ChangeEmailRequest from a JSON string"""
+        """Create an instance of ConfirmChangeEmailRequest from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self) -> Dict[str, Any]:
@@ -72,7 +72,7 @@ class ChangeEmailRequest(BaseModel):
 
     @classmethod
     def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
-        """Create an instance of ChangeEmailRequest from a dict"""
+        """Create an instance of ConfirmChangeEmailRequest from a dict"""
         if obj is None:
             return None
 
@@ -80,7 +80,7 @@ class ChangeEmailRequest(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "newEmail": obj.get("newEmail")
+            "code": obj.get("code")
         })
         return _obj
 

pingram/models/create_library_request.py

@@ -27,7 +27,7 @@ class CreateLibraryRequest(BaseModel):
     CreateLibraryRequest
     """ # noqa: E501
     filename: StrictStr = Field(description="Original filename, including extension (e.g. hero.png).")
-    content_type: StrictStr = Field(description="MIME type of the file that will be uploaded to the returned URL.", alias="contentType")
+    content_type: StrictStr = Field(description="Image MIME type. One of image/png, image/jpeg, image/gif, or image/webp.", alias="contentType")
     __properties: ClassVar[List[str]] = ["filename", "contentType"]
 
     model_config = ConfigDict(

pingram/models/get_logs_response_messages_inner.py

@@ -32,13 +32,13 @@ class GetLogsResponseMessagesInner(BaseModel):
     event_type: StrictStr = Field(alias="eventType")
     timestamp: StrictStr
     epoch_ms: Union[StrictFloat, StrictInt] = Field(alias="epochMs")
-    inbox: Optional[StrictStr] = None
+    inbox: Optional[StrictStr] = Field(default=None, description="Address that received the mail. Same value as `matched.email` on the EMAIL_INBOUND webhook, including when that address was only in Cc or Bcc.")
     var_from: Optional[StrictStr] = Field(default=None, alias="from")
     from_name: Optional[StrictStr] = Field(default=None, alias="fromName")
     subject: Optional[StrictStr] = None
-    to: Optional[List[StrictStr]] = None
-    cc: Optional[List[StrictStr]] = None
-    bcc: Optional[List[StrictStr]] = None
+    to: Optional[List[StrictStr]] = Field(default=None, description="Original To header addresses. Not the address that received the mail.")
+    cc: Optional[List[StrictStr]] = Field(default=None, description="Original Cc header addresses.")
+    bcc: Optional[List[StrictStr]] = Field(default=None, description="Bcc header addresses still on the delivered message. Usually omitted, because the Bcc header is removed before delivery.")
     reply_to: Optional[StrictStr] = Field(default=None, alias="replyTo")
     body_text: Optional[StrictStr] = Field(default=None, alias="bodyText")
     body_html: Optional[StrictStr] = Field(default=None, alias="bodyHtml")

pingram/models/get_logs_response_messages_inner_attachments_inner.py

@@ -17,7 +17,7 @@ import pprint
 import re  # noqa: F401
 import json
 
-from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional, Union
 from typing import Optional, Set
 from typing_extensions import Self
@@ -26,11 +26,22 @@ class GetLogsResponseMessagesInnerAttachmentsInner(BaseModel):
     """
     GetLogsResponseMessagesInnerAttachmentsInner
     """ # noqa: E501
-    filename: StrictStr
-    content_type: StrictStr = Field(alias="contentType")
-    size: Union[StrictFloat, StrictInt]
-    content_id: Optional[StrictStr] = Field(default=None, alias="contentId")
-    __properties: ClassVar[List[str]] = ["filename", "contentType", "size", "contentId"]
+    filename: StrictStr = Field(description="Original filename from the message.")
+    content_type: StrictStr = Field(description="MIME type of the file.", alias="contentType")
+    size: Union[StrictFloat, StrictInt] = Field(description="Size in bytes. This response does not include the file bytes.")
+    content_id: Optional[StrictStr] = Field(default=None, description="Content-ID with angle brackets removed, so it matches `cid:` references in `bodyHtml`. Omitted when the part has no Content-ID.", alias="contentId")
+    content_disposition: Optional[StrictStr] = Field(default=None, description="`inline` when the HTML body references this file; `attachment` when it is a separate file. Omitted when the message does not say which.", alias="contentDisposition")
+    __properties: ClassVar[List[str]] = ["filename", "contentType", "size", "contentId", "contentDisposition"]
+
+    @field_validator('content_disposition')
+    def content_disposition_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['inline', 'attachment']):
+            raise ValueError("must be one of enum values ('inline', 'attachment')")
+        return value
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -86,7 +97,8 @@ class GetLogsResponseMessagesInnerAttachmentsInner(BaseModel):
             "filename": obj.get("filename"),
             "contentType": obj.get("contentType"),
             "size": obj.get("size"),
-            "contentId": obj.get("contentId")
+            "contentId": obj.get("contentId"),
+            "contentDisposition": obj.get("contentDisposition")
         })
         return _obj
 

pingram/models/logs_get_response_logs_inner.py

@@ -79,25 +79,29 @@ class LogsGetResponseLogsInner(BaseModel):
     email_clicked_link: Optional[StrictStr] = None
     email_clicked_link_tags: Optional[StrictStr] = None
     email_clicked_webhook_res: Optional[StrictStr] = None
-    email_inbound_at: Optional[StrictStr] = None
-    email_inbound_from: Optional[StrictStr] = None
-    email_inbound_from_name: Optional[StrictStr] = None
-    email_inbound_to: Optional[StrictStr] = None
-    email_inbound_cc: Optional[StrictStr] = None
-    email_inbound_bcc: Optional[StrictStr] = None
-    email_inbound_reply_to: Optional[StrictStr] = None
-    email_inbound_inbox: Optional[StrictStr] = None
-    email_inbound_subject: Optional[StrictStr] = None
-    email_inbound_body_text: Optional[StrictStr] = None
-    email_inbound_body_html: Optional[StrictStr] = None
-    email_inbound_has_attachments: Optional[StrictBool] = None
-    email_inbound_attachment_count: Optional[Union[StrictFloat, StrictInt]] = None
-    email_inbound_message_id: Optional[StrictStr] = None
-    email_inbound_in_reply_to: Optional[StrictStr] = None
-    email_inbound_references: Optional[StrictStr] = None
-    email_inbound_webhook_delivered: Optional[StrictBool] = None
-    email_inbound_webhook_res: Optional[StrictStr] = None
-    email_inbound_resolution_type: Optional[StrictStr] = None
+    email_inbound_at: Optional[StrictStr] = Field(default=None, description="When the message was accepted, ISO 8601. Log order and the 30-day resend window use this time.")
+    email_inbound_from: Optional[StrictStr] = Field(default=None, description="Sender email address.")
+    email_inbound_from_name: Optional[StrictStr] = Field(default=None, description="Sender display name, when the From header includes one.")
+    email_inbound_to: Optional[StrictStr] = Field(default=None, description="Comma-separated To header addresses. This is the header, not necessarily the Pingram inbox.")
+    email_inbound_cc: Optional[StrictStr] = Field(default=None, description="Comma-separated CC header addresses.")
+    email_inbound_bcc: Optional[StrictStr] = Field(default=None, description="Comma-separated BCC header addresses. Often empty because that header is stripped before delivery.")
+    email_inbound_reply_to: Optional[StrictStr] = Field(default=None, description="Reply-To header address.")
+    email_inbound_inbox: Optional[StrictStr] = Field(default=None, description="Address that received the mail. Same value as `matched.email` on the EMAIL_INBOUND webhook, including when that address was only in Cc or Bcc.")
+    email_inbound_to_name: Optional[StrictStr] = Field(default=None, description="Display name of `email_inbound_inbox` when the headers include one. Same value as `matched.name`. Omitted when that address has no display name.")
+    email_inbound_sent_at: Optional[StrictStr] = Field(default=None, description="Sender Date header, ISO 8601. Omitted when that header is missing or invalid.")
+    email_inbound_retry_key: Optional[StrictStr] = Field(default=None, description="Key used to resend this inbound email for 30 days.")
+    email_inbound_user_id: Optional[StrictStr] = Field(default=None, description="User id from the original notification when this mail is a reply to one.")
+    email_inbound_subject: Optional[StrictStr] = Field(default=None, description="Subject line.")
+    email_inbound_body_text: Optional[StrictStr] = Field(default=None, description="Plain-text body.")
+    email_inbound_body_html: Optional[StrictStr] = Field(default=None, description="HTML body. Inline images use `cid:` values that match attachment content IDs on the webhook payload.")
+    email_inbound_has_attachments: Optional[StrictBool] = Field(default=None, description="True when the message includes at least one attachment.")
+    email_inbound_attachment_count: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="Number of attachments. File bytes are not stored on this log.")
+    email_inbound_message_id: Optional[StrictStr] = Field(default=None, description="Message-ID header. Use it to thread later replies.")
+    email_inbound_in_reply_to: Optional[StrictStr] = Field(default=None, description="In-Reply-To header: the Message-ID this mail replies to.")
+    email_inbound_references: Optional[StrictStr] = Field(default=None, description="References header: the chain of Message-IDs in the thread.")
+    email_inbound_webhook_delivered: Optional[StrictBool] = Field(default=None, description="True when an EMAIL_INBOUND webhook endpoint returned a 2xx response.")
+    email_inbound_webhook_res: Optional[StrictStr] = Field(default=None, description="JSON delivery result for each EMAIL_INBOUND endpoint.")
+    email_inbound_resolution_type: Optional[StrictStr] = Field(default=None, description="How the inbox was matched: `reply` for a reply to a sent notification, `builtin` for a Pingram inbox, or `custom` for a custom domain.")
     sms_inbound_at: Optional[StrictStr] = None
     sms_inbound_from: Optional[StrictStr] = None
     sms_inbound_to: Optional[StrictStr] = Field(default=None, description="Pingram number that received the inbound message.")
@@ -200,7 +204,7 @@ class LogsGetResponseLogsInner(BaseModel):
     schedule_updated_at: Optional[StrictStr] = None
     schedule_updated_to: Optional[StrictStr] = None
     schedule_deleted_at: Optional[StrictStr] = None
-    __properties: ClassVar[List[str]] = ["received_at", "type", "envId", "clientId", "agent", "ip", "request", "test", "trackingId", "accountId", "failed_at", "failed_code", "failed_internal", "inapp_sent_at", "inapp_sent_after", "inapp_delivered_at", "inapp_delivered_after", "inapp_failed_at", "inapp_failed_code", "inapp_failed_internal", "mobile_push_failed_at", "mobile_push_failed_code", "mobile_push_failed_token", "mobile_push_failed_internal", "mobile_push_sent_at", "mobile_push_sent_after", "mobile_push_sent_token", "mobile_push_delivered_at", "mobile_push_delivered_after", "email_sent_at", "email_sent_message_id", "email_sent_after", "email_preview", "email_delivered_at", "email_delivered_recipients", "email_delivered_after", "email_delivered_webhook_res", "email_failed_at", "email_failed_code", "email_failed_recipient", "email_failed_diagnostic_code", "email_failed_internal", "email_failed_webhook_res", "email_opened_at", "email_opened_user_agent", "email_opened_ip", "email_opened_webhook_res", "email_clicked_at", "email_clicked_user_agent", "email_clicked_ip", "email_clicked_link", "email_clicked_link_tags", "email_clicked_webhook_res", "email_inbound_at", "email_inbound_from", "email_inbound_from_name", "email_inbound_to", "email_inbound_cc", "email_inbound_bcc", "email_inbound_reply_to", "email_inbound_inbox", "email_inbound_subject", "email_inbound_body_text", "email_inbound_body_html", "email_inbound_has_attachments", "email_inbound_attachment_count", "email_inbound_message_id", "email_inbound_in_reply_to", "email_inbound_references", "email_inbound_webhook_delivered", "email_inbound_webhook_res", "email_inbound_resolution_type", "sms_inbound_at", "sms_inbound_from", "sms_inbound_to", "sms_inbound_text", "sms_inbound_webhook_delivered", "sms_inbound_webhook_res", "sms_inbound_media", "sms_replied_at", "sms_replied_to", "sms_replied_text", "sms_replied_segments", "sms_replied_encoding", "sms_unsubscribe_at", "sms_unsubscribe_from", "sms_unsubscribe_keyword", "sms_unsubscribe_webhook_delivered", "sms_unsubscribe_webhook_res", "sms_subscribe_at", "sms_subscribe_from", "sms_subscribe_keyword", "sms_subscribe_webhook_delivered", "sms_subscribe_webhook_res", "web_push_sent_token", "web_push_sent_at", "web_push_sent_after", "web_push_delivered_at", "web_push_delivered_after", "web_push_delivered_token", "web_push_delivered_internal", "web_push_failed_at", "web_push_failed_token", "web_push_failed_code", "web_push_failed_internal", "processed_at", "ignored", "scheduled_for", "user_id", "user_email", "user_number", "email_routing", "email_routing_reason", "sms_routing", "sms_routing_reason", "web_push_routing", "web_push_routing_reason", "mobile_push_routing", "mobile_push_routing_reason", "call_routing", "call_routing_reason", "inapp_routing", "inapp_routing_reason", "slack_routing", "slack_routing_reason", "sms_preview", "call_preview", "web_push_preview", "mobile_push_preview", "slack_preview", "inapp_preview", "slack_sent_at", "slack_sent_after", "slack_delivered_at", "slack_delivered_after", "slack_delivered_internal", "slack_failed_at", "slack_failed_code", "slack_failed_internal", "call_sent_at", "call_sent_after", "call_sent_from", "call_delivered_at", "call_delivered_after", "call_delivered_code", "call_delivered_cost_internal", "call_delivered_cost", "call_failed_at", "call_failed_code", "call_failed_internal", "sms_failed_at", "sms_failed_code", "sms_failed_internal", "sms_sent_at", "sms_sent_after", "sms_sent_from", "sms_sent_carrier", "sms_sent_line_type", "sms_sent_encoding", "sms_sent_segments", "sms_sent_parts", "sms_sent_cost", "sms_sent_country", "sms_sent_messageId", "sms_sent_mms", "sms_carrier_cost_internal", "sms_carrier_fee_internal", "sms_rate_internal", "sms_delivered_at", "sms_delivered_after", "sms_delivered_cost_internal", "schedule_updated_at", "schedule_updated_to", "schedule_deleted_at"]
+    __properties: ClassVar[List[str]] = ["received_at", "type", "envId", "clientId", "agent", "ip", "request", "test", "trackingId", "accountId", "failed_at", "failed_code", "failed_internal", "inapp_sent_at", "inapp_sent_after", "inapp_delivered_at", "inapp_delivered_after", "inapp_failed_at", "inapp_failed_code", "inapp_failed_internal", "mobile_push_failed_at", "mobile_push_failed_code", "mobile_push_failed_token", "mobile_push_failed_internal", "mobile_push_sent_at", "mobile_push_sent_after", "mobile_push_sent_token", "mobile_push_delivered_at", "mobile_push_delivered_after", "email_sent_at", "email_sent_message_id", "email_sent_after", "email_preview", "email_delivered_at", "email_delivered_recipients", "email_delivered_after", "email_delivered_webhook_res", "email_failed_at", "email_failed_code", "email_failed_recipient", "email_failed_diagnostic_code", "email_failed_internal", "email_failed_webhook_res", "email_opened_at", "email_opened_user_agent", "email_opened_ip", "email_opened_webhook_res", "email_clicked_at", "email_clicked_user_agent", "email_clicked_ip", "email_clicked_link", "email_clicked_link_tags", "email_clicked_webhook_res", "email_inbound_at", "email_inbound_from", "email_inbound_from_name", "email_inbound_to", "email_inbound_cc", "email_inbound_bcc", "email_inbound_reply_to", "email_inbound_inbox", "email_inbound_to_name", "email_inbound_sent_at", "email_inbound_retry_key", "email_inbound_user_id", "email_inbound_subject", "email_inbound_body_text", "email_inbound_body_html", "email_inbound_has_attachments", "email_inbound_attachment_count", "email_inbound_message_id", "email_inbound_in_reply_to", "email_inbound_references", "email_inbound_webhook_delivered", "email_inbound_webhook_res", "email_inbound_resolution_type", "sms_inbound_at", "sms_inbound_from", "sms_inbound_to", "sms_inbound_text", "sms_inbound_webhook_delivered", "sms_inbound_webhook_res", "sms_inbound_media", "sms_replied_at", "sms_replied_to", "sms_replied_text", "sms_replied_segments", "sms_replied_encoding", "sms_unsubscribe_at", "sms_unsubscribe_from", "sms_unsubscribe_keyword", "sms_unsubscribe_webhook_delivered", "sms_unsubscribe_webhook_res", "sms_subscribe_at", "sms_subscribe_from", "sms_subscribe_keyword", "sms_subscribe_webhook_delivered", "sms_subscribe_webhook_res", "web_push_sent_token", "web_push_sent_at", "web_push_sent_after", "web_push_delivered_at", "web_push_delivered_after", "web_push_delivered_token", "web_push_delivered_internal", "web_push_failed_at", "web_push_failed_token", "web_push_failed_code", "web_push_failed_internal", "processed_at", "ignored", "scheduled_for", "user_id", "user_email", "user_number", "email_routing", "email_routing_reason", "sms_routing", "sms_routing_reason", "web_push_routing", "web_push_routing_reason", "mobile_push_routing", "mobile_push_routing_reason", "call_routing", "call_routing_reason", "inapp_routing", "inapp_routing_reason", "slack_routing", "slack_routing_reason", "sms_preview", "call_preview", "web_push_preview", "mobile_push_preview", "slack_preview", "inapp_preview", "slack_sent_at", "slack_sent_after", "slack_delivered_at", "slack_delivered_after", "slack_delivered_internal", "slack_failed_at", "slack_failed_code", "slack_failed_internal", "call_sent_at", "call_sent_after", "call_sent_from", "call_delivered_at", "call_delivered_after", "call_delivered_code", "call_delivered_cost_internal", "call_delivered_cost", "call_failed_at", "call_failed_code", "call_failed_internal", "sms_failed_at", "sms_failed_code", "sms_failed_internal", "sms_sent_at", "sms_sent_after", "sms_sent_from", "sms_sent_carrier", "sms_sent_line_type", "sms_sent_encoding", "sms_sent_segments", "sms_sent_parts", "sms_sent_cost", "sms_sent_country", "sms_sent_messageId", "sms_sent_mms", "sms_carrier_cost_internal", "sms_carrier_fee_internal", "sms_rate_internal", "sms_delivered_at", "sms_delivered_after", "sms_delivered_cost_internal", "schedule_updated_at", "schedule_updated_to", "schedule_deleted_at"]
 
     @field_validator('failed_code')
     def failed_code_validate_enum(cls, value):
@@ -564,6 +568,10 @@ class LogsGetResponseLogsInner(BaseModel):
             "email_inbound_bcc": obj.get("email_inbound_bcc"),
             "email_inbound_reply_to": obj.get("email_inbound_reply_to"),
             "email_inbound_inbox": obj.get("email_inbound_inbox"),
+            "email_inbound_to_name": obj.get("email_inbound_to_name"),
+            "email_inbound_sent_at": obj.get("email_inbound_sent_at"),
+            "email_inbound_retry_key": obj.get("email_inbound_retry_key"),
+            "email_inbound_user_id": obj.get("email_inbound_user_id"),
             "email_inbound_subject": obj.get("email_inbound_subject"),
             "email_inbound_body_text": obj.get("email_inbound_body_text"),
             "email_inbound_body_html": obj.get("email_inbound_body_html"),

pingram/models/start_change_email_request.py

@@ -0,0 +1,91 @@
+# coding: utf-8
+
+"""
+    Pingram
+
+    Internal API for notification delivery and management
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
+
+class StartChangeEmailRequest(BaseModel):
+    """
+    StartChangeEmailRequest
+    """ # noqa: E501
+    new_email: StrictStr = Field(alias="newEmail")
+    password: StrictStr = Field(description="Current account password. Required before a login-email change starts.")
+    mfa_code: Optional[StrictStr] = Field(default=None, description="TOTP code. Required when software-token MFA is enabled.", alias="mfaCode")
+    __properties: ClassVar[List[str]] = ["newEmail", "password", "mfaCode"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of StartChangeEmailRequest from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of StartChangeEmailRequest from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "newEmail": obj.get("newEmail"),
+            "password": obj.get("password"),
+            "mfaCode": obj.get("mfaCode")
+        })
+        return _obj
+
+

pingram/models/webhook_endpoint_upsert_request.py

@@ -26,7 +26,7 @@ class WebhookEndpointUpsertRequest(BaseModel):
     """
     Request body for creating or updating an events webhook endpoint.
     """ # noqa: E501
-    webhook: StrictStr = Field(description="Public http or https URL that accepts POST with a JSON event body. Return 2xx to acknowledge. Requests include X-Pingram-Id, X-Pingram-Signature (v1 HMAC-SHA256), and X-Pingram-Timestamp.")
+    webhook: StrictStr = Field(description="Public HTTPS URL that accepts POST with a JSON event body. Return 2xx to acknowledge. Private, loopback, and link-local addresses are rejected. Requests include X-Pingram-Id, X-Pingram-Signature (v1 HMAC-SHA256), and X-Pingram-Timestamp.")
     events: List[StrictStr] = Field(description="Full set of event types to deliver to this URL. Omitting an event on update unsubscribes it. Inbound SMS to the free shared number only works when that person has already received a text from this number. Inbound SMS to a dedicated number works normally.")
     __properties: ClassVar[List[str]] = ["webhook", "events"]
 

{pingram_python-1.0.37.dist-info → pingram_python-1.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pingram-python
-Version: 1.0.37
+Version: 1.0.38
 Summary: Official Python SDK for Pingram - Send notifications via Email, SMS, Push, In-App, and more
 Author: Pingram
 License: MIT

{pingram_python-1.0.37.dist-info → pingram_python-1.0.38.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pingram/__init__.py,sha256=K2jUTwcoAm6RnFyVpIrnlcSXWxnjytXILytI0MS_CkQ,50491
-pingram/api_client.py,sha256=uP8Vpoyl6p2PxoE9gmV1ChJma43xIPjC1eX4EriqzrY,27792
+pingram/__init__.py,sha256=madtC0oG5OhYW-k-QMzV_YWdcJyM7Gh8yzVwysKZ_j0,50656
+pingram/api_client.py,sha256=VzyYEibIFV0pYkK7CpHzv62w9FleHNs1tkght7JDVkw,27792
 pingram/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
 pingram/client_wrapper.py,sha256=sreT63NgmWEWLUzdYQWZTN0PneHhYITsfPTSjthCjqw,15358
-pingram/configuration.py,sha256=nuumSYv2-P9KMSfUOw5AokMvuUSvXqdV_WWTAH_APw0,19466
+pingram/configuration.py,sha256=jUP8ffj7fQp01o4R1dILyDE_d8xuLHqnMWK3-OilyX8,19466
 pingram/exceptions.py,sha256=0l6B9dlFRwmPx-sfytj3wC9rdGgVPJY3AQ39qHx3GS4,8483
 pingram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pingram/rest.py,sha256=soB0_p6OMFlXrz5pDmdf2nIZchqPua9hgtuj8A5Yea4,6426
@@ -21,11 +21,11 @@ pingram/api/environments_api.py,sha256=V7WMAxQZo_m02kbyC2-IZRUoki3WpNinqt4SHobCU
 pingram/api/health_api.py,sha256=0c0CcuVQ2VaATvYlhjiIuGNuCygErc4oZjQUIRGoO-k,10787
 pingram/api/insights_api.py,sha256=SJcLUrd9PyU5WmMjo-RQPTfqA2XiH0GiBHFXMeg2i-o,12387
 pingram/api/keys_api.py,sha256=sonPmnG5rfk80Gm2j-DQ_pdvbO3qMDPHwHjiO7UebTA,32790
-pingram/api/library_api.py,sha256=s_Mk7V2OgRtrAWArBudzgt0FGERiMA4MVFtYqvKXOR8,25860
-pingram/api/logs_api.py,sha256=BGNLMIdrh_D-DvRAmDGLgqfLX1GPKt2w0I_fdhFA768,66313
+pingram/api/library_api.py,sha256=CboFtuoW2ZaLTa3AIvIYzfcdu-0Hzq6XtbnoPpYZpDg,26055
+pingram/api/logs_api.py,sha256=t9vc3C_wvKVpU6S_0ksMUxagexWhFxn-UIxSQoqvdQY,77468
 pingram/api/members_api.py,sha256=mo5TGL3TQMMcbHo24abKozxac0KseswMQMGN_8tZvSY,70113
 pingram/api/numbers_api.py,sha256=2v0O4THsnhc0D1HV-JjPd1hufiUWbfIvSRW0TLB74QE,58330
-pingram/api/profile_api.py,sha256=JvWxOWYR35oXSZ4uOMR4UMxuG8qRxtM1KrRqYGpgN2I,77661
+pingram/api/profile_api.py,sha256=e-x3zcGCTwuS42Yra2-wzUWIjHx-6FM_rvoTK3Neer8,66434
 pingram/api/registrations_api.py,sha256=xj9ZGY28RpSuaIGVPYvr_kjCfHv3ltNPW96pk1ssnXs,57220
 pingram/api/sender_api.py,sha256=LDst-NVk9N5kOKixZp_s2_S276KvmCaf-dHWKNCMiSY,35372
 pingram/api/sms_api.py,sha256=gQV3E0NcjIjgtG4mcP5mcF268sVAUzwY3YVRyZpxEYA,12283
@@ -35,8 +35,8 @@ pingram/api/types_api.py,sha256=AL7Hj6hLe-pWYiXRUGYnevVDfZeVJDi2V8x70uYgqfg,5639
 pingram/api/user_api.py,sha256=333C444u7EnCowDoIRY6bogaoqlTf_exvM76xeM7QP4,33489
 pingram/api/users_api.py,sha256=AERWQ8wGRve3TovcVBp9CamZOUV8lpjJb_P9HnsxV4g,37532
 pingram/api/voice_api.py,sha256=ML4Xbnn64f47nkM7_Bn2kwvcvng_T4Nv1uLg6Jhd3-Y,125242
-pingram/api/webhooks_api.py,sha256=Dbe_E7SGxZlopNdxKzuGnD8IQP43CcYLDgDTLFFGrfo,47833
-pingram/models/__init__.py,sha256=NjwIJxHTmMSmaOxU2hGdHYtEuSBjACGOQKuFN1XmQOg,26917
+pingram/api/webhooks_api.py,sha256=U0CHXmPzK9W6U_ktArfZRHaArlhlUSyngeYXeg7NgCk,47863
+pingram/models/__init__.py,sha256=JSITLkeXSW6oto0huBysdyWHi8diHOkG4GEm2-3cQmo,27010
 pingram/models/accept_invite_request.py,sha256=ZXIkBQFXWjD0g0Akfuz6CuWTWZ8AWpWXHfY8EMgo4XE,2443
 pingram/models/accept_invite_response.py,sha256=R-fqCEzKwX1XxJscgtPSU7MUCeKGmuBkzh8fha-9KEM,2869
 pingram/models/account_addresses_response.py,sha256=0nev-caxYCmHQHHTXSvpmrz6yYPx92UcB8Umzkt2RK8,3068
@@ -72,9 +72,9 @@ pingram/models/broadcast_response_audience.py,sha256=33Dzou7tVPbK-nyuN3aJ8w7es2Q
 pingram/models/campaign_webhook_response.py,sha256=gyQNeLXCSiYq-6dsaXwy_LEjPa1pwv00QbwRpB7P-YU,2489
 pingram/models/cancel_subscription_request.py,sha256=20D7UTpBQQ0tTZeRsndXyR9xsBvK_ae6VjHtsnY65gQ,2696
 pingram/models/chained.py,sha256=8popCOK-R43PUusrXv9K3l6IQ4XDo-6QLv8izjL1A0U,3827
-pingram/models/change_email_request.py,sha256=Go8lqBknowjhU9ORXbgEtgE1Zi_vucXx6Kp-HDC4Si4,2485
 pingram/models/change_phone_request.py,sha256=lYxKSwEtu-6LSTkFwSe823JoR72wEF6YLbDT_XQuoRw,2500
 pingram/models/channels_enum.py,sha256=h_ZOhc2M5OKhT6mfdHn53ULNn4eFud-C4NO2FpuVHWo,818
+pingram/models/confirm_change_email_request.py,sha256=uUMvhYCdVITJPya5QQeoqSRtHldTaqzQJ8Cm21_Dtnc,2463
 pingram/models/create_account_request.py,sha256=y5SNInmj6ZqnqAv-NhIKCld9lrffqYry4v1mpryYt7Y,3220
 pingram/models/create_account_request_plan.py,sha256=RqELmToZvFKyAkBpkyFOzPPN_4KU8Zoa6aSSwpYim2M,3193
 pingram/models/create_account_response.py,sha256=ub9xzw97D7AoFgMrJmGUKv9sfDlYU5-AEF-MEkxBhtA,3967
@@ -82,7 +82,7 @@ pingram/models/create_address_request.py,sha256=yJePVB_5sqZYGB_q8yT_O5_-B8M2Pegk
 pingram/models/create_broadcast_request.py,sha256=dTx7lBR1xY7xbiId_mCj2OANL379h4JKN9PeN9lCXHU,4330
 pingram/models/create_key_request.py,sha256=VdtYzV06gx27l39UyFtQ4Bj5D1XaxvaxK6RPFEtEO-U,3285
 pingram/models/create_key_response.py,sha256=Ery7qLao-9IS6s3QHrYyc13kc-1quB6fDQ5_mkQ3riw,3714
-pingram/models/create_library_request.py,sha256=VsiM9b2ucWMDEjistoIjvolQaPTic0F0dW5eplItfj0,2748
+pingram/models/create_library_request.py,sha256=919AJi8wQ7iwvZXq7alDn4bXVDrzXh1TnZO8EwDKGlM,2756
 pingram/models/create_library_response.py,sha256=79ZAqnWFY6bGrk9Y0NPwl8oPwcLdoBiNGuxQBw7Ty_g,3443
 pingram/models/create_personal_access_token_request.py,sha256=4-nTn1fL1pc3orqH7vsssT5C4G9Mv80vSIIBeUlIcJc,2774
 pingram/models/create_personal_access_token_response.py,sha256=_m0ewoRCefhkjvW8_bJ59RlsPRQl0XH6ZDniq9Qesnc,3356
@@ -120,8 +120,8 @@ pingram/models/get_inapp_notifications_response_notifications_inner_template_any
 pingram/models/get_keys_response.py,sha256=rRU2_r2GSsPjUPz1UpMxnU3gYiRWBRDZxrBcRogu1SY,3084
 pingram/models/get_keys_response_keys_inner.py,sha256=Qz5Q_hjqLjdtmQ2NIPsBU_6Ot65450Qe39CNxn_wBwo,4183
 pingram/models/get_logs_response.py,sha256=yw-MbS9oSphSfSEh49rEarAAu0yE7RrOSqQi__8rPGY,3150
-pingram/models/get_logs_response_messages_inner.py,sha256=xYGxyOvRcIUpV7QNPkGCsmxxU3QTwRqEIFW9nbHVNi4,6391
-pingram/models/get_logs_response_messages_inner_attachments_inner.py,sha256=ql-OcUfIVt84AtIdXmJdb4deLrVzf0siv5p4M3FfDYI,2948
+pingram/models/get_logs_response_messages_inner.py,sha256=0Xn8WLFPas3TDWpeKylumIq8b_yUCIGc5HapoIA0jlM,6875
+pingram/models/get_logs_response_messages_inner_attachments_inner.py,sha256=iB9DTim30vmOA88op-Q2SMhGkiMAAtyJ-gNaIZ2dUJ0,3968
 pingram/models/get_logs_response_messages_inner_media_inner.py,sha256=CV5LL4clLNwQ4KJIBKjtYdeRv-jNoC1avdW5gZvQmm4,2675
 pingram/models/get_members_response_inner.py,sha256=bwXtll4mIifY9BC_kzAQT63eKRkwSZ3RqxgUrUI1tcs,3757
 pingram/models/get_metrics_response_inner.py,sha256=2O5rpUGYHOD81H6hmxNpvXDKc2fOXyecLvN7B7I6RE0,5199
@@ -223,7 +223,7 @@ pingram/models/list_voice_calls_response_calls_inner.py,sha256=ncBMGwHrTayeLJV6w
 pingram/models/log_query_post_body.py,sha256=ti396ju2KidR5YJTVczSHbIWpgr8--4XODJGIz3pyvQ,4090
 pingram/models/logs_bulk_request.py,sha256=Gm7dbaWACc2MdKYYA-YhG3ZufTIkGSxdAdjVvItndDc,2511
 pingram/models/logs_get_response.py,sha256=AqWy0tdIKLgtSDA6dL6Yzv4sfFhv2co0JxjEsW4Sn9c,2962
-pingram/models/logs_get_response_logs_inner.py,sha256=_xAFY2Qyc2jusY-R61BbmDkUTog31Gfkh2JzKNnnbCU,42073
+pingram/models/logs_get_response_logs_inner.py,sha256=OmVLA0zeVaD1clmenTglh96s9R5PAD-fI-ibgGxGmVk,44962
 pingram/models/logs_query_response.py,sha256=ym1yEiQUcc_1Y72Fqbqb2z9MmCUY2wB9Yk3fY_rQhlQ,2493
 pingram/models/logs_query_result_response.py,sha256=DUcg_wocJDbHJVv4P1uk0mXVstbTCnMGcXsyF9AcTO4,3259
 pingram/models/logs_retention_response.py,sha256=HnaIpS4TU4RYy_0VXpti5Ef8TxkIWxsdQKrSJCv56dY,2589
@@ -290,6 +290,7 @@ pingram/models/sender_post_response.py,sha256=CLUFGdzNVbJEY8Oh9Ut0DBhzeJgK62VN-L
 pingram/models/set_default_template_request.py,sha256=gY8rMuEUcJ6NKBx1yntIE1d3YgVF-q6qXNyEOJO__uk,2965
 pingram/models/slack_connect_invite_response.py,sha256=HLdU2UPCduNekQ2ttrHOi_CRI3gVOB9wWZaazmgM5zI,2645
 pingram/models/slack_interactivity_response.py,sha256=eNsfRl-0wRzZiDIVfOvaft_9hLLEBmk2_x_H0EOTyzk,2524
+pingram/models/start_change_email_request.py,sha256=pJsVRMqbQelQU1PNdsaXBAA2Oom_E_vyfAdDu5cW2yY,2888
 pingram/models/sub_notification.py,sha256=mMMCA4x34DtNS7F1r8H1Zby9y32Ok77xrB-TgULRSxc,2839
 pingram/models/sub_notification_put_request.py,sha256=amZToL4DqVyBcGXFgm7CCARzXffTvEaVuJyGImTpDlY,2467
 pingram/models/success_response.py,sha256=eDmPsP27a51wmPvcTq7JDTnn-uQLXTPdmRRHyq2hLIQ,2437
@@ -335,14 +336,14 @@ pingram/models/voice_browser_call_response.py,sha256=Hi-6mtkCv1Rb6ILB6-hVbYhzG--
 pingram/models/voice_call_request.py,sha256=nO7Ci5yB_jqJrVkMBt5p59gLsYsVDT5fsZl0stuHCn8,3287
 pingram/models/voice_call_response.py,sha256=wxVY-uyUvw8uvGPRbQBLmCOE5RYOQl8c_zS6RPtFIQE,2788
 pingram/models/webhook_endpoint.py,sha256=_suPfjuHzFMdqTf_DN_s5Zfl8YzlVXLScm72FP1SKWw,4161
-pingram/models/webhook_endpoint_upsert_request.py,sha256=l8ERb7fioD5alBNlTf4rrLcew-C-kcOhqLgvQUDk3CY,4158
+pingram/models/webhook_endpoint_upsert_request.py,sha256=LdtEE5LfFZSep7g38pOGS0TEFnAbZNaZ0naRdgTkZC0,4208
 pingram/models/webhook_endpoints_response.py,sha256=ukoMTHiFVi1h2lUsZKCzxhOcwZqZI8YxUSS5jJDxjM0,3187
 pingram/models/webhook_endpoints_response_endpoints_inner.py,sha256=CGjdTpATE7lCvuzMFZwdQs1ixhDoSk1U9k3C0DoqZ0g,4230
 pingram/models/webhook_event.py,sha256=Njpdjk6KdTvoXl-WYEOuQhFcuZcs3vPHCfYeoclo6aQ,7262
 pingram/models/webhook_event_usage_value.py,sha256=6oTIeL15GY-JTn_2x8304bz-9Av66OEVMH5ukHKFgjM,2770
 pingram/models/webhook_response.py,sha256=rwCh3OTCE3TK6tVEKOKVlq9w0b1fZ-fKKEoe9Tz0tIc,3233
-pingram_python-1.0.37.dist-info/licenses/LICENSE,sha256=jFcP99OXuZ-3f_86j4Q4OjmvvHNm7SG94ytcAhqvldk,1059
-pingram_python-1.0.37.dist-info/METADATA,sha256=pncqYuBgSC44gRdxy3sZkLm8-_TZWlNfwqKMaShHPM4,2268
-pingram_python-1.0.37.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-pingram_python-1.0.37.dist-info/top_level.txt,sha256=6BmMatn4_wswGo1u11HkRU892yP2gG5dddsmmRhSjD8,8
-pingram_python-1.0.37.dist-info/RECORD,,
+pingram_python-1.0.38.dist-info/licenses/LICENSE,sha256=jFcP99OXuZ-3f_86j4Q4OjmvvHNm7SG94ytcAhqvldk,1059
+pingram_python-1.0.38.dist-info/METADATA,sha256=NdjC31aAnKnA8a9QNyEkfXHjCmki0EAHGtpdhIXSRrQ,2268
+pingram_python-1.0.38.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+pingram_python-1.0.38.dist-info/top_level.txt,sha256=6BmMatn4_wswGo1u11HkRU892yP2gG5dddsmmRhSjD8,8
+pingram_python-1.0.38.dist-info/RECORD,,