🌿 Fern Regeneration -- April 9, 2026

README.md

@@ -263,3 +263,4 @@ while response.next is not None:
 
 
 
+

pyproject.toml

@@ -3,7 +3,7 @@ name = "MergePythonClient"
 
 [tool.poetry]
 name = "MergePythonClient"
-version = "2.6.2"
+version = "3.0.0"
 description = ""
 readme = "README.md"
 authors = []

src/merge/core/client_wrapper.py

@@ -24,10 +24,10 @@ def __init__(
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "MergePythonClient/2.6.2",
+            "User-Agent": "MergePythonClient/3.0.0",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "2.6.2",
+            "X-Fern-SDK-Version": "3.0.0",
             **(self.get_custom_headers() or {}),
         }
         if self._account_token is not None:

src/merge/resources/chat/__init__.py

@@ -28,6 +28,7 @@
         CommonModelScopesBodyRequest,
         CompletedAccountInitialScreenEnum,
         Conversation,
+        ConversationMembersItem,
         ConversationType,
         DataPassthroughRequest,
         DataPassthroughRequestMethod,
@@ -49,6 +50,7 @@
         FieldPermissionDeserializer,
         FieldPermissionDeserializerRequest,
         Group,
+        GroupUsersItem,
         IndividualCommonModelScopeDeserializer,
         IndividualCommonModelScopeDeserializerRequest,
         Issue,
@@ -58,6 +60,8 @@
         LastSyncResultEnum,
         LinkToken,
         Member,
+        MemberGroup,
+        MemberUser,
         Message,
         MethodEnum,
         ModelOperation,
@@ -93,6 +97,7 @@
         SyncStatusStatus,
         TypeEnum,
         User,
+        UserGroupsItem,
         ValidationProblemSource,
         WarningValidationProblem,
         WebhookReceiver,
@@ -151,6 +156,7 @@
     "CommonModelScopesBodyRequest": ".types",
     "CompletedAccountInitialScreenEnum": ".types",
     "Conversation": ".types",
+    "ConversationMembersItem": ".types",
     "ConversationType": ".types",
     "ConversationsMembersListRequestExpand": ".resources",
     "DataPassthroughRequest": ".types",
@@ -175,6 +181,7 @@
     "FieldPermissionDeserializer": ".types",
     "FieldPermissionDeserializerRequest": ".types",
     "Group": ".types",
+    "GroupUsersItem": ".types",
     "IndividualCommonModelScopeDeserializer": ".types",
     "IndividualCommonModelScopeDeserializerRequest": ".types",
     "Issue": ".types",
@@ -186,6 +193,8 @@
     "LinkToken": ".types",
     "LinkedAccountsListRequestCategory": ".resources",
     "Member": ".types",
+    "MemberGroup": ".types",
+    "MemberUser": ".types",
     "Message": ".types",
     "MessagesListRequestOrderBy": ".resources",
     "MessagesRepliesListRequestOrderBy": ".resources",
@@ -223,6 +232,7 @@
     "SyncStatusStatus": ".types",
     "TypeEnum": ".types",
     "User": ".types",
+    "UserGroupsItem": ".types",
     "ValidationProblemSource": ".types",
     "WarningValidationProblem": ".types",
     "WebhookReceiver": ".types",
@@ -292,6 +302,7 @@ def __dir__():
     "CommonModelScopesBodyRequest",
     "CompletedAccountInitialScreenEnum",
     "Conversation",
+    "ConversationMembersItem",
     "ConversationType",
     "ConversationsMembersListRequestExpand",
     "DataPassthroughRequest",
@@ -316,6 +327,7 @@ def __dir__():
     "FieldPermissionDeserializer",
     "FieldPermissionDeserializerRequest",
     "Group",
+    "GroupUsersItem",
     "IndividualCommonModelScopeDeserializer",
     "IndividualCommonModelScopeDeserializerRequest",
     "Issue",
@@ -327,6 +339,8 @@ def __dir__():
     "LinkToken",
     "LinkedAccountsListRequestCategory",
     "Member",
+    "MemberGroup",
+    "MemberUser",
     "Message",
     "MessagesListRequestOrderBy",
     "MessagesRepliesListRequestOrderBy",
@@ -364,6 +378,7 @@ def __dir__():
     "SyncStatusStatus",
     "TypeEnum",
     "User",
+    "UserGroupsItem",
     "ValidationProblemSource",
     "WarningValidationProblem",
     "WebhookReceiver",

src/merge/resources/chat/types/__init__.py

@@ -27,6 +27,7 @@
     from .common_model_scopes_body_request import CommonModelScopesBodyRequest
     from .completed_account_initial_screen_enum import CompletedAccountInitialScreenEnum
     from .conversation import Conversation
+    from .conversation_members_item import ConversationMembersItem
     from .conversation_type import ConversationType
     from .data_passthrough_request import DataPassthroughRequest
     from .data_passthrough_request_method import DataPassthroughRequestMethod
@@ -50,6 +51,7 @@
     from .field_permission_deserializer import FieldPermissionDeserializer
     from .field_permission_deserializer_request import FieldPermissionDeserializerRequest
     from .group import Group
+    from .group_users_item import GroupUsersItem
     from .individual_common_model_scope_deserializer import IndividualCommonModelScopeDeserializer
     from .individual_common_model_scope_deserializer_request import IndividualCommonModelScopeDeserializerRequest
     from .issue import Issue
@@ -59,6 +61,8 @@
     from .last_sync_result_enum import LastSyncResultEnum
     from .link_token import LinkToken
     from .member import Member
+    from .member_group import MemberGroup
+    from .member_user import MemberUser
     from .message import Message
     from .method_enum import MethodEnum
     from .model_operation import ModelOperation
@@ -94,6 +98,7 @@
     from .sync_status_status import SyncStatusStatus
     from .type_enum import TypeEnum
     from .user import User
+    from .user_groups_item import UserGroupsItem
     from .validation_problem_source import ValidationProblemSource
     from .warning_validation_problem import WarningValidationProblem
     from .webhook_receiver import WebhookReceiver
@@ -119,6 +124,7 @@
     "CommonModelScopesBodyRequest": ".common_model_scopes_body_request",
     "CompletedAccountInitialScreenEnum": ".completed_account_initial_screen_enum",
     "Conversation": ".conversation",
+    "ConversationMembersItem": ".conversation_members_item",
     "ConversationType": ".conversation_type",
     "DataPassthroughRequest": ".data_passthrough_request",
     "DataPassthroughRequestMethod": ".data_passthrough_request_method",
@@ -140,6 +146,7 @@
     "FieldPermissionDeserializer": ".field_permission_deserializer",
     "FieldPermissionDeserializerRequest": ".field_permission_deserializer_request",
     "Group": ".group",
+    "GroupUsersItem": ".group_users_item",
     "IndividualCommonModelScopeDeserializer": ".individual_common_model_scope_deserializer",
     "IndividualCommonModelScopeDeserializerRequest": ".individual_common_model_scope_deserializer_request",
     "Issue": ".issue",
@@ -149,6 +156,8 @@
     "LastSyncResultEnum": ".last_sync_result_enum",
     "LinkToken": ".link_token",
     "Member": ".member",
+    "MemberGroup": ".member_group",
+    "MemberUser": ".member_user",
     "Message": ".message",
     "MethodEnum": ".method_enum",
     "ModelOperation": ".model_operation",
@@ -184,6 +193,7 @@
     "SyncStatusStatus": ".sync_status_status",
     "TypeEnum": ".type_enum",
     "User": ".user",
+    "UserGroupsItem": ".user_groups_item",
     "ValidationProblemSource": ".validation_problem_source",
     "WarningValidationProblem": ".warning_validation_problem",
     "WebhookReceiver": ".webhook_receiver",
@@ -231,6 +241,7 @@ def __dir__():
     "CommonModelScopesBodyRequest",
     "CompletedAccountInitialScreenEnum",
     "Conversation",
+    "ConversationMembersItem",
     "ConversationType",
     "DataPassthroughRequest",
     "DataPassthroughRequestMethod",
@@ -252,6 +263,7 @@ def __dir__():
     "FieldPermissionDeserializer",
     "FieldPermissionDeserializerRequest",
     "Group",
+    "GroupUsersItem",
     "IndividualCommonModelScopeDeserializer",
     "IndividualCommonModelScopeDeserializerRequest",
     "Issue",
@@ -261,6 +273,8 @@ def __dir__():
     "LastSyncResultEnum",
     "LinkToken",
     "Member",
+    "MemberGroup",
+    "MemberUser",
     "Message",
     "MethodEnum",
     "ModelOperation",
@@ -296,6 +310,7 @@ def __dir__():
     "SyncStatusStatus",
     "TypeEnum",
     "User",
+    "UserGroupsItem",
     "ValidationProblemSource",
     "WarningValidationProblem",
     "WebhookReceiver",

src/merge/resources/chat/types/conversation.py

@@ -1,11 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from __future__ import annotations
+
 import datetime as dt
 import typing
 
 import pydantic
-from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ....core.unchecked_base_model import UncheckedBaseModel
+from .conversation_members_item import ConversationMembersItem
 from .conversation_type import ConversationType
 from .remote_data import RemoteData
 
@@ -59,9 +62,12 @@ class Conversation(UncheckedBaseModel):
     * `PRIVATE_EXTERNAL` - PRIVATE_EXTERNAL
     * `PUBLIC_INTERNAL` - PUBLIC_INTERNAL
     * `PUBLIC_EXTERNAL` - PUBLIC_EXTERNAL
+    * `ONE_ON_ONE_CHAT` - ONE_ON_ONE_CHAT
+    * `GROUP_CHAT` - GROUP_CHAT
+    * `MEETING_CHAT` - MEETING_CHAT
     """
 
-    members: typing.Optional[typing.List[typing.Optional[str]]] = None
+    members: typing.Optional[typing.List[typing.Optional[ConversationMembersItem]]] = None
     remote_created_at: typing.Optional[dt.datetime] = pydantic.Field(default=None)
     """
     When the third party's conversation was created.
@@ -88,3 +94,9 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .group import Group  # noqa: E402, F401, I001
+from .user import User  # noqa: E402, F401, I001
+
+update_forward_refs(Conversation)

src/merge/resources/chat/types/conversation_members_item.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .member import Member
+
+ConversationMembersItem = typing.Union[str, Member]

src/merge/resources/chat/types/group.py

@@ -1,10 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from __future__ import annotations
+
 import datetime as dt
 import typing
 
 import pydantic
-from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ....core.unchecked_base_model import UncheckedBaseModel
 from .remote_data import RemoteData
 
@@ -39,7 +41,7 @@ class Group(UncheckedBaseModel):
     The name of the Group
     """
 
-    users: typing.Optional[typing.List[typing.Optional[str]]] = None
+    users: typing.Optional[typing.List[typing.Optional["GroupUsersItem"]]] = None
     remote_created_at: typing.Optional[dt.datetime] = pydantic.Field(default=None)
     """
     When the third party's group was created.
@@ -66,3 +68,9 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .user import User  # noqa: E402, F401, I001
+from .group_users_item import GroupUsersItem  # noqa: E402, F401, I001
+
+update_forward_refs(Group)

src/merge/resources/chat/types/group_users_item.py

@@ -0,0 +1,9 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from __future__ import annotations
+
+import typing
+
+if typing.TYPE_CHECKING:
+    from .user import User
+GroupUsersItem = typing.Union[str, "User"]

src/merge/resources/chat/types/member.py

@@ -1,11 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from __future__ import annotations
+
 import datetime as dt
 import typing
 
 import pydantic
-from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ....core.unchecked_base_model import UncheckedBaseModel
+from .member_group import MemberGroup
+from .member_user import MemberUser
 from .remote_data import RemoteData
 
 
@@ -35,12 +39,12 @@ class Member(UncheckedBaseModel):
     The datetime that this object was modified by Merge.
     """
 
-    user: typing.Optional[str] = pydantic.Field(default=None)
+    user: typing.Optional[MemberUser] = pydantic.Field(default=None)
     """
     The user that is a member of the conversation. Only populated if the member is a user.
     """
 
-    group: typing.Optional[str] = pydantic.Field(default=None)
+    group: typing.Optional[MemberGroup] = pydantic.Field(default=None)
     """
     The group that is a member of the conversation. Only populated if the member is a group.
     """
@@ -71,3 +75,9 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .group import Group  # noqa: E402, F401, I001
+from .user import User  # noqa: E402, F401, I001
+
+update_forward_refs(Member)

src/merge/resources/chat/types/member_group.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .group import Group
+
+MemberGroup = typing.Union[str, Group]

src/merge/resources/chat/types/member_user.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .user import User
+
+MemberUser = typing.Union[str, User]

src/merge/resources/chat/types/paginated_conversation_list.py

@@ -1,9 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from __future__ import annotations
+
 import typing
 
 import pydantic
-from ....core.pydantic_utilities import IS_PYDANTIC_V2
+from ....core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ....core.unchecked_base_model import UncheckedBaseModel
 from .conversation import Conversation
 
@@ -21,3 +23,9 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .group import Group  # noqa: E402, F401, I001
+from .user import User  # noqa: E402, F401, I001
+
+update_forward_refs(PaginatedConversationList)