Skip to content

Commit f67f7f1

Browse files
rmkonnurrmkonnur
authored
Merge pull request #34 from merge-api/fern-bot/08-14-2023-0950PM
🌿 Fern Regeneration -- August 14, 2023
2 parents dd68ea9 + 9d1125e commit f67f7f1

17 files changed

+153
-15
lines changed

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "MergePythonClient"
3-
version = "0.2.2"
3+
version = "0.2.3"
44
description = ""
55
readme = "README.md"
66
authors = []

‎src/merge/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ def __init__(
3030
self.ats = AtsClient(environment=environment, client_wrapper=self._client_wrapper)
3131
self.crm = CrmClient(environment=environment, client_wrapper=self._client_wrapper)
3232
self.filestorage = FilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
33-
self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
3433
self.ticketing = TicketingClient(environment=environment, client_wrapper=self._client_wrapper)
3534
self.accounting = AccountingClient(environment=environment, client_wrapper=self._client_wrapper)
35+
self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
3636

3737

3838
class AsyncMerge:
@@ -51,6 +51,6 @@ def __init__(
5151
self.ats = AsyncAtsClient(environment=environment, client_wrapper=self._client_wrapper)
5252
self.crm = AsyncCrmClient(environment=environment, client_wrapper=self._client_wrapper)
5353
self.filestorage = AsyncFilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
54-
self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)
5554
self.ticketing = AsyncTicketingClient(environment=environment, client_wrapper=self._client_wrapper)
5655
self.accounting = AsyncAccountingClient(environment=environment, client_wrapper=self._client_wrapper)
56+
self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)

‎src/merge/core/client_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def get_headers(self) -> typing.Dict[str, str]:
1616
headers: typing.Dict[str, str] = {
1717
"X-Fern-Language": "Python",
1818
"X-Fern-SDK-Name": "MergePythonClient",
19-
"X-Fern-SDK-Version": "0.2.2",
19+
"X-Fern-SDK-Version": "0.2.3",
2020
}
2121
if self._account_token is not None:
2222
headers["X-Account-Token"] = self._account_token

‎src/merge/resources/crm/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,11 @@
169169
RemoteData,
170170
RemoteField,
171171
RemoteFieldClass,
172+
RemoteFieldClassFieldChoicesItem,
173+
RemoteFieldClassFieldFormat,
174+
RemoteFieldClassFieldType,
172175
RemoteFieldClassForCustomObjectClass,
176+
RemoteFieldClassForCustomObjectClassFieldChoicesItem,
173177
RemoteFieldClassForCustomObjectClassFieldFormat,
174178
RemoteFieldClassForCustomObjectClassFieldType,
175179
RemoteFieldClassForCustomObjectClassItemSchema,
@@ -403,7 +407,11 @@
403407
"RemoteData",
404408
"RemoteField",
405409
"RemoteFieldClass",
410+
"RemoteFieldClassFieldChoicesItem",
411+
"RemoteFieldClassFieldFormat",
412+
"RemoteFieldClassFieldType",
406413
"RemoteFieldClassForCustomObjectClass",
414+
"RemoteFieldClassForCustomObjectClassFieldChoicesItem",
407415
"RemoteFieldClassForCustomObjectClassFieldFormat",
408416
"RemoteFieldClassForCustomObjectClassFieldType",
409417
"RemoteFieldClassForCustomObjectClassItemSchema",

‎src/merge/resources/crm/types/__init__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,13 @@
168168
from .remote_data import RemoteData
169169
from .remote_field import RemoteField
170170
from .remote_field_class import RemoteFieldClass
171+
from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
172+
from .remote_field_class_field_format import RemoteFieldClassFieldFormat
173+
from .remote_field_class_field_type import RemoteFieldClassFieldType
171174
from .remote_field_class_for_custom_object_class import RemoteFieldClassForCustomObjectClass
175+
from .remote_field_class_for_custom_object_class_field_choices_item import (
176+
RemoteFieldClassForCustomObjectClassFieldChoicesItem,
177+
)
172178
from .remote_field_class_for_custom_object_class_field_format import RemoteFieldClassForCustomObjectClassFieldFormat
173179
from .remote_field_class_for_custom_object_class_field_type import RemoteFieldClassForCustomObjectClassFieldType
174180
from .remote_field_class_for_custom_object_class_item_schema import RemoteFieldClassForCustomObjectClassItemSchema
@@ -370,7 +376,11 @@
370376
"RemoteData",
371377
"RemoteField",
372378
"RemoteFieldClass",
379+
"RemoteFieldClassFieldChoicesItem",
380+
"RemoteFieldClassFieldFormat",
381+
"RemoteFieldClassFieldType",
373382
"RemoteFieldClassForCustomObjectClass",
383+
"RemoteFieldClassForCustomObjectClassFieldChoicesItem",
374384
"RemoteFieldClassForCustomObjectClassFieldFormat",
375385
"RemoteFieldClassForCustomObjectClassFieldType",
376386
"RemoteFieldClassForCustomObjectClassItemSchema",

‎src/merge/resources/crm/types/remote_field_class.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import pydantic
77

88
from ....core.datetime_utils import serialize_datetime
9-
from .field_format_enum import FieldFormatEnum
10-
from .field_type_enum import FieldTypeEnum
119
from .item_schema import ItemSchema
10+
from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
11+
from .remote_field_class_field_format import RemoteFieldClassFieldFormat
12+
from .remote_field_class_field_type import RemoteFieldClassFieldType
1213

1314

1415
class RemoteFieldClass(pydantic.BaseModel):
@@ -18,9 +19,9 @@ class RemoteFieldClass(pydantic.BaseModel):
1819
description: typing.Optional[str]
1920
is_custom: typing.Optional[bool]
2021
is_required: typing.Optional[bool]
21-
field_type: typing.Optional[FieldTypeEnum]
22-
field_format: typing.Optional[FieldFormatEnum]
23-
field_choices: typing.Optional[typing.List[str]]
22+
field_type: typing.Optional[RemoteFieldClassFieldType]
23+
field_format: typing.Optional[RemoteFieldClassFieldFormat]
24+
field_choices: typing.Optional[typing.List[RemoteFieldClassFieldChoicesItem]]
2425
item_schema: typing.Optional[ItemSchema]
2526

2627
def json(self, **kwargs: typing.Any) -> str:

‎src/merge/resources/crm/types/remote_field_class_field_choices_item.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import datetime as dt
4+
import typing
5+
6+
import pydantic
7+
8+
from ....core.datetime_utils import serialize_datetime
9+
10+
11+
class RemoteFieldClassFieldChoicesItem(pydantic.BaseModel):
12+
value: typing.Optional[typing.Any]
13+
display_name: typing.Optional[str]
14+
15+
def json(self, **kwargs: typing.Any) -> str:
16+
kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
17+
return super().json(**kwargs_with_defaults)
18+
19+
def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
20+
kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21+
return super().dict(**kwargs_with_defaults)
22+
23+
class Config:
24+
frozen = True
25+
json_encoders = {dt.datetime: serialize_datetime}

‎src/merge/resources/crm/types/remote_field_class_field_format.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import typing
4+
5+
from .field_format_enum import FieldFormatEnum
6+
7+
RemoteFieldClassFieldFormat = typing.Union[FieldFormatEnum, str]

‎src/merge/resources/crm/types/remote_field_class_field_type.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import typing
4+
5+
from .field_type_enum import FieldTypeEnum
6+
7+
RemoteFieldClassFieldType = typing.Union[FieldTypeEnum, str]

‎src/merge/resources/crm/types/remote_field_class_for_custom_object_class.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import pydantic
77

88
from ....core.datetime_utils import serialize_datetime
9+
from .remote_field_class_for_custom_object_class_field_choices_item import (
10+
RemoteFieldClassForCustomObjectClassFieldChoicesItem,
11+
)
912
from .remote_field_class_for_custom_object_class_field_format import RemoteFieldClassForCustomObjectClassFieldFormat
1013
from .remote_field_class_for_custom_object_class_field_type import RemoteFieldClassForCustomObjectClassFieldType
1114
from .remote_field_class_for_custom_object_class_item_schema import RemoteFieldClassForCustomObjectClassItemSchema
@@ -18,7 +21,7 @@ class RemoteFieldClassForCustomObjectClass(pydantic.BaseModel):
1821
is_required: typing.Optional[bool]
1922
field_type: typing.Optional[RemoteFieldClassForCustomObjectClassFieldType]
2023
field_format: typing.Optional[RemoteFieldClassForCustomObjectClassFieldFormat]
21-
field_choices: typing.Optional[typing.List[typing.Optional[str]]]
24+
field_choices: typing.Optional[typing.List[RemoteFieldClassForCustomObjectClassFieldChoicesItem]]
2225
item_schema: typing.Optional[RemoteFieldClassForCustomObjectClassItemSchema]
2326
modified_at: typing.Optional[dt.datetime] = pydantic.Field(
2427
description="This is the datetime that this object was last updated by Merge"

‎src/merge/resources/crm/types/remote_field_class_for_custom_object_class_field_choices_item.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import datetime as dt
4+
import typing
5+
6+
import pydantic
7+
8+
from ....core.datetime_utils import serialize_datetime
9+
10+
11+
class RemoteFieldClassForCustomObjectClassFieldChoicesItem(pydantic.BaseModel):
12+
value: typing.Optional[typing.Any]
13+
display_name: typing.Optional[str]
14+
15+
def json(self, **kwargs: typing.Any) -> str:
16+
kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
17+
return super().json(**kwargs_with_defaults)
18+
19+
def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
20+
kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21+
return super().dict(**kwargs_with_defaults)
22+
23+
class Config:
24+
frozen = True
25+
json_encoders = {dt.datetime: serialize_datetime}

‎src/merge/resources/ticketing/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@
9393
RemoteData,
9494
RemoteField,
9595
RemoteFieldClass,
96+
RemoteFieldClassFieldChoicesItem,
97+
RemoteFieldClassFieldFormat,
98+
RemoteFieldClassFieldType,
9699
RemoteFieldRequest,
97100
RemoteFieldRequestRemoteFieldClass,
98101
RemoteKey,
@@ -265,6 +268,9 @@
265268
"RemoteData",
266269
"RemoteField",
267270
"RemoteFieldClass",
271+
"RemoteFieldClassFieldChoicesItem",
272+
"RemoteFieldClassFieldFormat",
273+
"RemoteFieldClassFieldType",
268274
"RemoteFieldRequest",
269275
"RemoteFieldRequestRemoteFieldClass",
270276
"RemoteKey",

‎src/merge/resources/ticketing/types/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
from .remote_data import RemoteData
9393
from .remote_field import RemoteField
9494
from .remote_field_class import RemoteFieldClass
95+
from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
96+
from .remote_field_class_field_format import RemoteFieldClassFieldFormat
97+
from .remote_field_class_field_type import RemoteFieldClassFieldType
9598
from .remote_field_request import RemoteFieldRequest
9699
from .remote_field_request_remote_field_class import RemoteFieldRequestRemoteFieldClass
97100
from .remote_key import RemoteKey
@@ -236,6 +239,9 @@
236239
"RemoteData",
237240
"RemoteField",
238241
"RemoteFieldClass",
242+
"RemoteFieldClassFieldChoicesItem",
243+
"RemoteFieldClassFieldFormat",
244+
"RemoteFieldClassFieldType",
239245
"RemoteFieldRequest",
240246
"RemoteFieldRequestRemoteFieldClass",
241247
"RemoteKey",

‎src/merge/resources/ticketing/types/remote_field_class.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import pydantic
77

88
from ....core.datetime_utils import serialize_datetime
9-
from .field_format_enum import FieldFormatEnum
10-
from .field_type_enum import FieldTypeEnum
119
from .item_schema import ItemSchema
10+
from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
11+
from .remote_field_class_field_format import RemoteFieldClassFieldFormat
12+
from .remote_field_class_field_type import RemoteFieldClassFieldType
1213

1314

1415
class RemoteFieldClass(pydantic.BaseModel):
@@ -18,9 +19,9 @@ class RemoteFieldClass(pydantic.BaseModel):
1819
description: typing.Optional[str]
1920
is_custom: typing.Optional[bool]
2021
is_required: typing.Optional[bool]
21-
field_type: typing.Optional[FieldTypeEnum]
22-
field_format: typing.Optional[FieldFormatEnum]
23-
field_choices: typing.Optional[typing.List[str]]
22+
field_type: typing.Optional[RemoteFieldClassFieldType]
23+
field_format: typing.Optional[RemoteFieldClassFieldFormat]
24+
field_choices: typing.Optional[typing.List[RemoteFieldClassFieldChoicesItem]]
2425
item_schema: typing.Optional[ItemSchema]
2526

2627
def json(self, **kwargs: typing.Any) -> str:

‎src/merge/resources/ticketing/types/remote_field_class_field_choices_item.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import datetime as dt
4+
import typing
5+
6+
import pydantic
7+
8+
from ....core.datetime_utils import serialize_datetime
9+
10+
11+
class RemoteFieldClassFieldChoicesItem(pydantic.BaseModel):
12+
value: typing.Optional[typing.Any]
13+
display_name: typing.Optional[str]
14+
15+
def json(self, **kwargs: typing.Any) -> str:
16+
kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
17+
return super().json(**kwargs_with_defaults)
18+
19+
def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
20+
kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
21+
return super().dict(**kwargs_with_defaults)
22+
23+
class Config:
24+
frozen = True
25+
json_encoders = {dt.datetime: serialize_datetime}

‎src/merge/resources/ticketing/types/remote_field_class_field_format.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import typing
4+
5+
from .field_format_enum import FieldFormatEnum
6+
7+
RemoteFieldClassFieldFormat = typing.Union[str, FieldFormatEnum]

‎src/merge/resources/ticketing/types/remote_field_class_field_type.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+
3+
import typing
4+
5+
from .field_type_enum import FieldTypeEnum
6+
7+
RemoteFieldClassFieldType = typing.Union[str, FieldTypeEnum]

0 commit comments

Comments
 (0)