🌿 Fern Regeneration -- August 14, 2023

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "MergePythonClient"
-version = "0.2.2"
+version = "0.2.3"
 description = ""
 readme = "README.md"
 authors = []

src/merge/client.py

@@ -30,9 +30,9 @@ def __init__(
         self.ats = AtsClient(environment=environment, client_wrapper=self._client_wrapper)
         self.crm = CrmClient(environment=environment, client_wrapper=self._client_wrapper)
         self.filestorage = FilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
         self.ticketing = TicketingClient(environment=environment, client_wrapper=self._client_wrapper)
         self.accounting = AccountingClient(environment=environment, client_wrapper=self._client_wrapper)
+        self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
 
 
 class AsyncMerge:
@@ -51,6 +51,6 @@ def __init__(
         self.ats = AsyncAtsClient(environment=environment, client_wrapper=self._client_wrapper)
         self.crm = AsyncCrmClient(environment=environment, client_wrapper=self._client_wrapper)
         self.filestorage = AsyncFilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)
         self.ticketing = AsyncTicketingClient(environment=environment, client_wrapper=self._client_wrapper)
         self.accounting = AsyncAccountingClient(environment=environment, client_wrapper=self._client_wrapper)
+        self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)

src/merge/core/client_wrapper.py

@@ -16,7 +16,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": "0.2.2",
+            "X-Fern-SDK-Version": "0.2.3",
         }
         if self._account_token is not None:
             headers["X-Account-Token"] = self._account_token

src/merge/resources/crm/__init__.py

@@ -169,7 +169,11 @@
     RemoteData,
     RemoteField,
     RemoteFieldClass,
+    RemoteFieldClassFieldChoicesItem,
+    RemoteFieldClassFieldFormat,
+    RemoteFieldClassFieldType,
     RemoteFieldClassForCustomObjectClass,
+    RemoteFieldClassForCustomObjectClassFieldChoicesItem,
     RemoteFieldClassForCustomObjectClassFieldFormat,
     RemoteFieldClassForCustomObjectClassFieldType,
     RemoteFieldClassForCustomObjectClassItemSchema,
@@ -403,7 +407,11 @@
     "RemoteData",
     "RemoteField",
     "RemoteFieldClass",
+    "RemoteFieldClassFieldChoicesItem",
+    "RemoteFieldClassFieldFormat",
+    "RemoteFieldClassFieldType",
     "RemoteFieldClassForCustomObjectClass",
+    "RemoteFieldClassForCustomObjectClassFieldChoicesItem",
     "RemoteFieldClassForCustomObjectClassFieldFormat",
     "RemoteFieldClassForCustomObjectClassFieldType",
     "RemoteFieldClassForCustomObjectClassItemSchema",

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

@@ -168,7 +168,13 @@
 from .remote_data import RemoteData
 from .remote_field import RemoteField
 from .remote_field_class import RemoteFieldClass
+from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
+from .remote_field_class_field_format import RemoteFieldClassFieldFormat
+from .remote_field_class_field_type import RemoteFieldClassFieldType
 from .remote_field_class_for_custom_object_class import RemoteFieldClassForCustomObjectClass
+from .remote_field_class_for_custom_object_class_field_choices_item import (
+    RemoteFieldClassForCustomObjectClassFieldChoicesItem,
+)
 from .remote_field_class_for_custom_object_class_field_format import RemoteFieldClassForCustomObjectClassFieldFormat
 from .remote_field_class_for_custom_object_class_field_type import RemoteFieldClassForCustomObjectClassFieldType
 from .remote_field_class_for_custom_object_class_item_schema import RemoteFieldClassForCustomObjectClassItemSchema
@@ -370,7 +376,11 @@
     "RemoteData",
     "RemoteField",
     "RemoteFieldClass",
+    "RemoteFieldClassFieldChoicesItem",
+    "RemoteFieldClassFieldFormat",
+    "RemoteFieldClassFieldType",
     "RemoteFieldClassForCustomObjectClass",
+    "RemoteFieldClassForCustomObjectClassFieldChoicesItem",
     "RemoteFieldClassForCustomObjectClassFieldFormat",
     "RemoteFieldClassForCustomObjectClassFieldType",
     "RemoteFieldClassForCustomObjectClassItemSchema",

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

@@ -6,9 +6,10 @@
 import pydantic
 
 from ....core.datetime_utils import serialize_datetime
-from .field_format_enum import FieldFormatEnum
-from .field_type_enum import FieldTypeEnum
 from .item_schema import ItemSchema
+from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
+from .remote_field_class_field_format import RemoteFieldClassFieldFormat
+from .remote_field_class_field_type import RemoteFieldClassFieldType
 
 
 class RemoteFieldClass(pydantic.BaseModel):
@@ -18,9 +19,9 @@ class RemoteFieldClass(pydantic.BaseModel):
     description: typing.Optional[str]
     is_custom: typing.Optional[bool]
     is_required: typing.Optional[bool]
-    field_type: typing.Optional[FieldTypeEnum]
-    field_format: typing.Optional[FieldFormatEnum]
-    field_choices: typing.Optional[typing.List[str]]
+    field_type: typing.Optional[RemoteFieldClassFieldType]
+    field_format: typing.Optional[RemoteFieldClassFieldFormat]
+    field_choices: typing.Optional[typing.List[RemoteFieldClassFieldChoicesItem]]
     item_schema: typing.Optional[ItemSchema]
 
     def json(self, **kwargs: typing.Any) -> str:

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

@@ -0,0 +1,25 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import datetime as dt
+import typing
+
+import pydantic
+
+from ....core.datetime_utils import serialize_datetime
+
+
+class RemoteFieldClassFieldChoicesItem(pydantic.BaseModel):
+    value: typing.Optional[typing.Any]
+    display_name: typing.Optional[str]
+
+    def json(self, **kwargs: typing.Any) -> str:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().json(**kwargs_with_defaults)
+
+    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().dict(**kwargs_with_defaults)
+
+    class Config:
+        frozen = True
+        json_encoders = {dt.datetime: serialize_datetime}

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

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

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

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

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

@@ -6,6 +6,9 @@
 import pydantic
 
 from ....core.datetime_utils import serialize_datetime
+from .remote_field_class_for_custom_object_class_field_choices_item import (
+    RemoteFieldClassForCustomObjectClassFieldChoicesItem,
+)
 from .remote_field_class_for_custom_object_class_field_format import RemoteFieldClassForCustomObjectClassFieldFormat
 from .remote_field_class_for_custom_object_class_field_type import RemoteFieldClassForCustomObjectClassFieldType
 from .remote_field_class_for_custom_object_class_item_schema import RemoteFieldClassForCustomObjectClassItemSchema
@@ -18,7 +21,7 @@ class RemoteFieldClassForCustomObjectClass(pydantic.BaseModel):
     is_required: typing.Optional[bool]
     field_type: typing.Optional[RemoteFieldClassForCustomObjectClassFieldType]
     field_format: typing.Optional[RemoteFieldClassForCustomObjectClassFieldFormat]
-    field_choices: typing.Optional[typing.List[typing.Optional[str]]]
+    field_choices: typing.Optional[typing.List[RemoteFieldClassForCustomObjectClassFieldChoicesItem]]
     item_schema: typing.Optional[RemoteFieldClassForCustomObjectClassItemSchema]
     modified_at: typing.Optional[dt.datetime] = pydantic.Field(
         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

@@ -0,0 +1,25 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import datetime as dt
+import typing
+
+import pydantic
+
+from ....core.datetime_utils import serialize_datetime
+
+
+class RemoteFieldClassForCustomObjectClassFieldChoicesItem(pydantic.BaseModel):
+    value: typing.Optional[typing.Any]
+    display_name: typing.Optional[str]
+
+    def json(self, **kwargs: typing.Any) -> str:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().json(**kwargs_with_defaults)
+
+    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().dict(**kwargs_with_defaults)
+
+    class Config:
+        frozen = True
+        json_encoders = {dt.datetime: serialize_datetime}

src/merge/resources/ticketing/__init__.py

@@ -93,6 +93,9 @@
     RemoteData,
     RemoteField,
     RemoteFieldClass,
+    RemoteFieldClassFieldChoicesItem,
+    RemoteFieldClassFieldFormat,
+    RemoteFieldClassFieldType,
     RemoteFieldRequest,
     RemoteFieldRequestRemoteFieldClass,
     RemoteKey,
@@ -265,6 +268,9 @@
     "RemoteData",
     "RemoteField",
     "RemoteFieldClass",
+    "RemoteFieldClassFieldChoicesItem",
+    "RemoteFieldClassFieldFormat",
+    "RemoteFieldClassFieldType",
     "RemoteFieldRequest",
     "RemoteFieldRequestRemoteFieldClass",
     "RemoteKey",

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

@@ -92,6 +92,9 @@
 from .remote_data import RemoteData
 from .remote_field import RemoteField
 from .remote_field_class import RemoteFieldClass
+from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
+from .remote_field_class_field_format import RemoteFieldClassFieldFormat
+from .remote_field_class_field_type import RemoteFieldClassFieldType
 from .remote_field_request import RemoteFieldRequest
 from .remote_field_request_remote_field_class import RemoteFieldRequestRemoteFieldClass
 from .remote_key import RemoteKey
@@ -236,6 +239,9 @@
     "RemoteData",
     "RemoteField",
     "RemoteFieldClass",
+    "RemoteFieldClassFieldChoicesItem",
+    "RemoteFieldClassFieldFormat",
+    "RemoteFieldClassFieldType",
     "RemoteFieldRequest",
     "RemoteFieldRequestRemoteFieldClass",
     "RemoteKey",

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

@@ -6,9 +6,10 @@
 import pydantic
 
 from ....core.datetime_utils import serialize_datetime
-from .field_format_enum import FieldFormatEnum
-from .field_type_enum import FieldTypeEnum
 from .item_schema import ItemSchema
+from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
+from .remote_field_class_field_format import RemoteFieldClassFieldFormat
+from .remote_field_class_field_type import RemoteFieldClassFieldType
 
 
 class RemoteFieldClass(pydantic.BaseModel):
@@ -18,9 +19,9 @@ class RemoteFieldClass(pydantic.BaseModel):
     description: typing.Optional[str]
     is_custom: typing.Optional[bool]
     is_required: typing.Optional[bool]
-    field_type: typing.Optional[FieldTypeEnum]
-    field_format: typing.Optional[FieldFormatEnum]
-    field_choices: typing.Optional[typing.List[str]]
+    field_type: typing.Optional[RemoteFieldClassFieldType]
+    field_format: typing.Optional[RemoteFieldClassFieldFormat]
+    field_choices: typing.Optional[typing.List[RemoteFieldClassFieldChoicesItem]]
     item_schema: typing.Optional[ItemSchema]
 
     def json(self, **kwargs: typing.Any) -> str:

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

@@ -0,0 +1,25 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import datetime as dt
+import typing
+
+import pydantic
+
+from ....core.datetime_utils import serialize_datetime
+
+
+class RemoteFieldClassFieldChoicesItem(pydantic.BaseModel):
+    value: typing.Optional[typing.Any]
+    display_name: typing.Optional[str]
+
+    def json(self, **kwargs: typing.Any) -> str:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().json(**kwargs_with_defaults)
+
+    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().dict(**kwargs_with_defaults)
+
+    class Config:
+        frozen = True
+        json_encoders = {dt.datetime: serialize_datetime}

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

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

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

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