Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "MergePythonClient"
version = "1.0.6"
version = "1.0.7"
description = ""
readme = "README.md"
authors = []
Expand Down
4 changes: 2 additions & 2 deletions src/merge/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def __init__(
httpx_client=httpx.Client(timeout=timeout) if httpx_client is None else httpx_client,
)
self.ats = AtsClient(client_wrapper=self._client_wrapper)
self.crm = CrmClient(client_wrapper=self._client_wrapper)
self.filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
self.crm = CrmClient(client_wrapper=self._client_wrapper)
self.hris = HrisClient(client_wrapper=self._client_wrapper)
self.ticketing = TicketingClient(client_wrapper=self._client_wrapper)
self.accounting = AccountingClient(client_wrapper=self._client_wrapper)
Expand All @@ -57,8 +57,8 @@ def __init__(
httpx_client=httpx.AsyncClient(timeout=timeout) if httpx_client is None else httpx_client,
)
self.ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
self.crm = AsyncCrmClient(client_wrapper=self._client_wrapper)
self.filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
self.crm = AsyncCrmClient(client_wrapper=self._client_wrapper)
self.hris = AsyncHrisClient(client_wrapper=self._client_wrapper)
self.ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
self.accounting = AsyncAccountingClient(client_wrapper=self._client_wrapper)
Expand Down
2 changes: 1 addition & 1 deletion src/merge/core/client_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def get_headers(self) -> typing.Dict[str, str]:
headers: typing.Dict[str, str] = {
"X-Fern-Language": "Python",
"X-Fern-SDK-Name": "MergePythonClient",
"X-Fern-SDK-Version": "1.0.6",
"X-Fern-SDK-Version": "1.0.7",
}
if self._account_token is not None:
headers["X-Account-Token"] = self._account_token
Expand Down
3 changes: 2 additions & 1 deletion src/merge/resources/filestorage/types/file_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import typing

from .file_permissions_item import FilePermissionsItem
from .permission_request import PermissionRequest

FilePermissions = typing.Union[str, typing.Any, typing.List[FilePermissionsItem]]
FilePermissions = typing.Union[str, PermissionRequest, typing.List[FilePermissionsItem]]
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import typing

from .file_request_permissions_item import FileRequestPermissionsItem
from .permission_request import PermissionRequest

FileRequestPermissions = typing.Union[str, typing.Any, typing.List[FileRequestPermissionsItem]]
FileRequestPermissions = typing.Union[str, PermissionRequest, typing.List[FileRequestPermissionsItem]]
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import typing

from .folder_permissions_item import FolderPermissionsItem
from .permission_request import PermissionRequest

FolderPermissions = typing.Union[str, typing.Any, typing.List[FolderPermissionsItem]]
FolderPermissions = typing.Union[str, PermissionRequest, typing.List[FolderPermissionsItem]]
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import typing

from .folder_request_permissions_item import FolderRequestPermissionsItem
from .permission_request import PermissionRequest

FolderRequestPermissions = typing.Union[str, typing.Any, typing.List[FolderRequestPermissionsItem]]
FolderRequestPermissions = typing.Union[str, PermissionRequest, typing.List[FolderRequestPermissionsItem]]