Skip to content

SDK regeneration #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waisshahbaz merged 1 commit into from
Jun 18, 2026
Merged

SDK regeneration #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,5 @@ while response.next is not None:





12 changes: 6 additions & 6 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "MergePythonClient"

[tool.poetry]
name = "MergePythonClient"
version = "3.1.0a2"
version = "3.1.0a3"
description = ""
readme = "README.md"
authors = []
Expand Down
17 changes: 11 additions & 6 deletions reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54440,9 +54440,6 @@ Returns a list of `Invitee` objects.

```python
from merge import Merge
from merge.resources.calendar.resources.events import (
EventsInviteesListRequestExpand,
)

client = Merge(
account_token="YOUR_ACCOUNT_TOKEN",
Expand All @@ -54451,7 +54448,6 @@ client = Merge(
client.calendar.events.invitees_list(
event_id="event_id",
cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
expand=EventsInviteesListRequestExpand.EVENT,
include_deleted_data=True,
include_remote_data=True,
include_shell_data=True,
Expand Down Expand Up @@ -54488,7 +54484,12 @@ client.calendar.events.invitees_list(
<dl>
<dd>

**expand:** `typing.Optional[EventsInviteesListRequestExpand]` — Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
**expand:** `typing.Optional[
typing.Union[
EventsInviteesListRequestExpandItem,
typing.Sequence[EventsInviteesListRequestExpandItem],
]
]` — Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

</dd>
</dl>
Expand Down Expand Up @@ -54612,7 +54613,11 @@ client.calendar.events.locations_list(
<dl>
<dd>

**expand:** `typing.Optional[typing.Literal["event"]]` — Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
**expand:** `typing.Optional[
typing.Union[
typing.Literal["event"], typing.Sequence[typing.Literal["event"]]
]
]` — Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

</dd>
</dl>
Expand Down
4 changes: 2 additions & 2 deletions src/merge/core/client_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ def __init__(

def get_headers(self) -> typing.Dict[str, str]:
headers: typing.Dict[str, str] = {
"User-Agent": "MergePythonClient/3.1.0a2",
"User-Agent": "MergePythonClient/3.1.0a3",
"X-Fern-Language": "Python",
"X-Fern-SDK-Name": "MergePythonClient",
"X-Fern-SDK-Version": "3.1.0a2",
"X-Fern-SDK-Version": "3.1.0a3",
**(self.get_custom_headers() or {}),
}
if self._account_token is not None:
Expand Down
6 changes: 3 additions & 3 deletions src/merge/resources/calendar/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
CalendarsListRequestType,
EndUserDetailsRequestCompletedAccountInitialScreen,
EndUserDetailsRequestLanguage,
EventsInviteesListRequestExpand,
EventsInviteesListRequestExpandItem,
EventsListRequestExpandItem,
EventsRetrieveRequestExpandItem,
GroupsListRequestExpandItem,
Expand Down Expand Up @@ -198,7 +198,7 @@
"Event": ".types",
"EventFieldMappings": ".types",
"EventTypeEnum": ".types",
"EventsInviteesListRequestExpand": ".resources",
"EventsInviteesListRequestExpandItem": ".resources",
"EventsListRequestExpandItem": ".resources",
"EventsRetrieveRequestExpandItem": ".resources",
"ExternalTargetFieldApi": ".types",
Expand Down Expand Up @@ -367,7 +367,7 @@ def __dir__():
"Event",
"EventFieldMappings",
"EventTypeEnum",
"EventsInviteesListRequestExpand",
"EventsInviteesListRequestExpandItem",
"EventsListRequestExpandItem",
"EventsRetrieveRequestExpandItem",
"ExternalTargetFieldApi",
Expand Down
10 changes: 7 additions & 3 deletions src/merge/resources/calendar/resources/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
)
from .async_passthrough import AsyncPassthroughRetrieveResponse
from .calendars import CalendarsListRequestType
from .events import EventsInviteesListRequestExpand, EventsListRequestExpandItem, EventsRetrieveRequestExpandItem
from .events import (
EventsInviteesListRequestExpandItem,
EventsListRequestExpandItem,
EventsRetrieveRequestExpandItem,
)
from .groups import GroupsListRequestExpandItem, GroupsRetrieveRequestExpandItem
from .issues import IssuesListRequestStatus
from .link_token import EndUserDetailsRequestCompletedAccountInitialScreen, EndUserDetailsRequestLanguage
Expand All @@ -42,7 +46,7 @@
"CalendarsListRequestType": ".calendars",
"EndUserDetailsRequestCompletedAccountInitialScreen": ".link_token",
"EndUserDetailsRequestLanguage": ".link_token",
"EventsInviteesListRequestExpand": ".events",
"EventsInviteesListRequestExpandItem": ".events",
"EventsListRequestExpandItem": ".events",
"EventsRetrieveRequestExpandItem": ".events",
"GroupsListRequestExpandItem": ".groups",
Expand Down Expand Up @@ -98,7 +102,7 @@ def __dir__():
"CalendarsListRequestType",
"EndUserDetailsRequestCompletedAccountInitialScreen",
"EndUserDetailsRequestLanguage",
"EventsInviteesListRequestExpand",
"EventsInviteesListRequestExpandItem",
"EventsListRequestExpandItem",
"EventsRetrieveRequestExpandItem",
"GroupsListRequestExpandItem",
Expand Down
6 changes: 3 additions & 3 deletions src/merge/resources/calendar/resources/events/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from importlib import import_module

if typing.TYPE_CHECKING:
from .types import EventsInviteesListRequestExpand, EventsListRequestExpandItem, EventsRetrieveRequestExpandItem
from .types import EventsInviteesListRequestExpandItem, EventsListRequestExpandItem, EventsRetrieveRequestExpandItem
_dynamic_imports: typing.Dict[str, str] = {
"EventsInviteesListRequestExpand": ".types",
"EventsInviteesListRequestExpandItem": ".types",
"EventsListRequestExpandItem": ".types",
"EventsRetrieveRequestExpandItem": ".types",
}
Expand All @@ -33,4 +33,4 @@ def __dir__():
return sorted(lazy_attrs)


__all__ = ["EventsInviteesListRequestExpand", "EventsListRequestExpandItem", "EventsRetrieveRequestExpandItem"]
__all__ = ["EventsInviteesListRequestExpandItem", "EventsListRequestExpandItem", "EventsRetrieveRequestExpandItem"]
30 changes: 13 additions & 17 deletions src/merge/resources/calendar/resources/events/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from ...types.paginated_invitee_list import PaginatedInviteeList
from ...types.paginated_location_list import PaginatedLocationList
from .raw_client import AsyncRawEventsClient, RawEventsClient
from .types.events_invitees_list_request_expand import EventsInviteesListRequestExpand
from .types.events_invitees_list_request_expand_item import EventsInviteesListRequestExpandItem
from .types.events_list_request_expand_item import EventsListRequestExpandItem
from .types.events_retrieve_request_expand_item import EventsRetrieveRequestExpandItem

Expand Down Expand Up @@ -198,7 +198,9 @@ def invitees_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[EventsInviteesListRequestExpand] = None,
expand: typing.Optional[
typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]
] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -215,7 +217,7 @@ def invitees_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[EventsInviteesListRequestExpand]
expand : typing.Optional[typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand All @@ -241,9 +243,6 @@ def invitees_list(
Examples
--------
from merge import Merge
from merge.resources.calendar.resources.events import (
EventsInviteesListRequestExpand,
)

client = Merge(
account_token="YOUR_ACCOUNT_TOKEN",
Expand All @@ -252,7 +251,6 @@ def invitees_list(
client.calendar.events.invitees_list(
event_id="event_id",
cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
expand=EventsInviteesListRequestExpand.EVENT,
include_deleted_data=True,
include_remote_data=True,
include_shell_data=True,
Expand All @@ -276,7 +274,7 @@ def locations_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[typing.Literal["event"]] = None,
expand: typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -293,7 +291,7 @@ def locations_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[typing.Literal["event"]]
expand : typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down Expand Up @@ -594,7 +592,9 @@ async def invitees_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[EventsInviteesListRequestExpand] = None,
expand: typing.Optional[
typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]
] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -611,7 +611,7 @@ async def invitees_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[EventsInviteesListRequestExpand]
expand : typing.Optional[typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down Expand Up @@ -639,9 +639,6 @@ async def invitees_list(
import asyncio

from merge import AsyncMerge
from merge.resources.calendar.resources.events import (
EventsInviteesListRequestExpand,
)

client = AsyncMerge(
account_token="YOUR_ACCOUNT_TOKEN",
Expand All @@ -653,7 +650,6 @@ async def main() -> None:
await client.calendar.events.invitees_list(
event_id="event_id",
cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
expand=EventsInviteesListRequestExpand.EVENT,
include_deleted_data=True,
include_remote_data=True,
include_shell_data=True,
Expand All @@ -680,7 +676,7 @@ async def locations_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[typing.Literal["event"]] = None,
expand: typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -697,7 +693,7 @@ async def locations_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[typing.Literal["event"]]
expand : typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down
22 changes: 13 additions & 9 deletions src/merge/resources/calendar/resources/events/raw_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from ...types.paginated_event_list import PaginatedEventList
from ...types.paginated_invitee_list import PaginatedInviteeList
from ...types.paginated_location_list import PaginatedLocationList
from .types.events_invitees_list_request_expand import EventsInviteesListRequestExpand
from .types.events_invitees_list_request_expand_item import EventsInviteesListRequestExpandItem
from .types.events_list_request_expand_item import EventsListRequestExpandItem
from .types.events_retrieve_request_expand_item import EventsRetrieveRequestExpandItem

Expand Down Expand Up @@ -166,7 +166,9 @@ def invitees_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[EventsInviteesListRequestExpand] = None,
expand: typing.Optional[
typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]
] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -183,7 +185,7 @@ def invitees_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[EventsInviteesListRequestExpand]
expand : typing.Optional[typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down Expand Up @@ -239,7 +241,7 @@ def locations_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[typing.Literal["event"]] = None,
expand: typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -256,7 +258,7 @@ def locations_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[typing.Literal["event"]]
expand : typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down Expand Up @@ -514,7 +516,9 @@ async def invitees_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[EventsInviteesListRequestExpand] = None,
expand: typing.Optional[
typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]
] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -531,7 +535,7 @@ async def invitees_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[EventsInviteesListRequestExpand]
expand : typing.Optional[typing.Union[EventsInviteesListRequestExpandItem, typing.Sequence[EventsInviteesListRequestExpandItem]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down Expand Up @@ -587,7 +591,7 @@ async def locations_list(
event_id: str,
*,
cursor: typing.Optional[str] = None,
expand: typing.Optional[typing.Literal["event"]] = None,
expand: typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]] = None,
include_deleted_data: typing.Optional[bool] = None,
include_remote_data: typing.Optional[bool] = None,
include_shell_data: typing.Optional[bool] = None,
Expand All @@ -604,7 +608,7 @@ async def locations_list(
cursor : typing.Optional[str]
The pagination cursor value.

expand : typing.Optional[typing.Literal["event"]]
expand : typing.Optional[typing.Union[typing.Literal["event"], typing.Sequence[typing.Literal["event"]]]]
Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.

include_deleted_data : typing.Optional[bool]
Expand Down
Loading
Loading