compass_api_sdk 0.3.1__tar.gz → 0.3.2__tar.gz

{compass_api_sdk-0.3.1 → compass_api_sdk-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: compass_api_sdk
-Version: 0.3.1
+Version: 0.3.2
 Summary: Compass API Python SDK
 Author: royalnine
 Requires-Python: >=3.9.2

{compass_api_sdk-0.3.1 → compass_api_sdk-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "compass_api_sdk"
-version = "0.3.1"
+version = "0.3.2"
 description = "Compass API Python SDK"
 authors = [{ name = "royalnine" },]
 readme = "README-PYPI.md"

{compass_api_sdk-0.3.1 → compass_api_sdk-0.3.2}/src/compassapisdk/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "compass_api_sdk"
-__version__: str = "0.3.1"
+__version__: str = "0.3.2"
 __openapi_doc_version__: str = "0.0.1"
-__gen_version__: str = "2.603.1"
-__user_agent__: str = "speakeasy-sdk/python 0.3.1 2.603.1 0.0.1 compass_api_sdk"
+__gen_version__: str = "2.604.2"
+__user_agent__: str = "speakeasy-sdk/python 0.3.2 2.604.2 0.0.1 compass_api_sdk"
 
 try:
     if __package__ is not None:

{compass_api_sdk-0.3.1 → compass_api_sdk-0.3.2}/src/compassapisdk/models/__init__.py

@@ -320,6 +320,12 @@ from .morpho_vaultsop import (
     MorphoVaultsRequest,
     MorphoVaultsRequestTypedDict,
 )
+from .morphoborrowparams import (
+    MorphoBorrowParams,
+    MorphoBorrowParamsAmount,
+    MorphoBorrowParamsAmountTypedDict,
+    MorphoBorrowParamsTypedDict,
+)
 from .morphoborrowrequest import (
     MorphoBorrowRequest,
     MorphoBorrowRequestAmount,
@@ -335,6 +341,12 @@ from .morphocheckvaultpositionresponse import (
     MorphoCheckVaultPositionResponse,
     MorphoCheckVaultPositionResponseTypedDict,
 )
+from .morphodepositparams import (
+    MorphoDepositParams,
+    MorphoDepositParamsAmount,
+    MorphoDepositParamsAmountTypedDict,
+    MorphoDepositParamsTypedDict,
+)
 from .morphodepositrequest import (
     MorphoDepositRequest,
     MorphoDepositRequestAmount,
@@ -351,11 +363,18 @@ from .morphogetvaultsresponse import (
     MorphoGetVaultsResponseTypedDict,
 )
 from .morphomarket import MorphoMarket, MorphoMarketTypedDict
+from .morphorepayparams import MorphoRepayParams, MorphoRepayParamsTypedDict
 from .morphorepayrequest import (
     MorphoRepayRequest,
     MorphoRepayRequestChain,
     MorphoRepayRequestTypedDict,
 )
+from .morphosetvaultallowanceparams import (
+    MorphoSetVaultAllowanceParams,
+    MorphoSetVaultAllowanceParamsAmount,
+    MorphoSetVaultAllowanceParamsAmountTypedDict,
+    MorphoSetVaultAllowanceParamsTypedDict,
+)
 from .morphosetvaultallowancerequest import (
     MorphoSetVaultAllowanceRequest,
     MorphoSetVaultAllowanceRequestAmount,
@@ -363,6 +382,12 @@ from .morphosetvaultallowancerequest import (
     MorphoSetVaultAllowanceRequestChain,
     MorphoSetVaultAllowanceRequestTypedDict,
 )
+from .morphosupplycollateralparams import (
+    MorphoSupplyCollateralParams,
+    MorphoSupplyCollateralParamsAmount,
+    MorphoSupplyCollateralParamsAmountTypedDict,
+    MorphoSupplyCollateralParamsTypedDict,
+)
 from .morphosupplycollateralrequest import (
     MorphoSupplyCollateralRequest,
     MorphoSupplyCollateralRequestAmount,
@@ -371,6 +396,12 @@ from .morphosupplycollateralrequest import (
     MorphoSupplyCollateralRequestTypedDict,
 )
 from .morphovault import MorphoVault, MorphoVaultTypedDict
+from .morphowithdrawcollateralparams import (
+    MorphoWithdrawCollateralParams,
+    MorphoWithdrawCollateralParamsAmount,
+    MorphoWithdrawCollateralParamsAmountTypedDict,
+    MorphoWithdrawCollateralParamsTypedDict,
+)
 from .morphowithdrawcollateralrequest import (
     MorphoWithdrawCollateralRequest,
     MorphoWithdrawCollateralRequestAmount,
@@ -378,6 +409,7 @@ from .morphowithdrawcollateralrequest import (
     MorphoWithdrawCollateralRequestChain,
     MorphoWithdrawCollateralRequestTypedDict,
 )
+from .morphowithdrawparams import MorphoWithdrawParams, MorphoWithdrawParamsTypedDict
 from .morphowithdrawrequest import (
     MorphoWithdrawRequest,
     MorphoWithdrawRequestChain,
@@ -416,30 +448,51 @@ from .signedauthorization import (
     SignedAuthorizationTypedDict,
 )
 from .sky_positionop import SkyPositionRequest, SkyPositionRequestTypedDict
+from .skybuyparams import (
+    SkyBuyParams,
+    SkyBuyParamsAmount,
+    SkyBuyParamsAmountTypedDict,
+    SkyBuyParamsTokenIn,
+    SkyBuyParamsTypedDict,
+)
 from .skybuyrequest import (
     SkyBuyRequest,
     SkyBuyRequestAmount,
     SkyBuyRequestAmountTypedDict,
+    SkyBuyRequestTokenIn,
     SkyBuyRequestTypedDict,
-    TokenIn,
 )
 from .skycheckpositionresponse import (
     SkyCheckPositionResponse,
     SkyCheckPositionResponseTypedDict,
 )
+from .skydepositparams import (
+    SkyDepositParams,
+    SkyDepositParamsAmount,
+    SkyDepositParamsAmountTypedDict,
+    SkyDepositParamsTypedDict,
+)
 from .skydepositrequest import (
     SkyDepositRequest,
     SkyDepositRequestAmount,
     SkyDepositRequestAmountTypedDict,
     SkyDepositRequestTypedDict,
 )
+from .skysellparams import (
+    SkySellParams,
+    SkySellParamsAmount,
+    SkySellParamsAmountTypedDict,
+    SkySellParamsTokenOut,
+    SkySellParamsTypedDict,
+)
 from .skysellrequest import (
     SkySellRequest,
     SkySellRequestAmount,
     SkySellRequestAmountTypedDict,
+    SkySellRequestTokenOut,
     SkySellRequestTypedDict,
-    TokenOut,
 )
+from .skywithdrawparams import SkyWithdrawParams, SkyWithdrawParamsTypedDict
 from .skywithdrawrequest import SkyWithdrawRequest, SkyWithdrawRequestTypedDict
 from .supply import Supply, SupplyTypedDict
 from .swapborrowrate import SwapBorrowRate, SwapBorrowRateTypedDict
@@ -894,6 +947,10 @@ __all__ = [
     "LocTypedDict",
     "MarketState",
     "MarketStateTypedDict",
+    "MorphoBorrowParams",
+    "MorphoBorrowParamsAmount",
+    "MorphoBorrowParamsAmountTypedDict",
+    "MorphoBorrowParamsTypedDict",
     "MorphoBorrowRequest",
     "MorphoBorrowRequestAmount",
     "MorphoBorrowRequestAmountTypedDict",
@@ -903,6 +960,10 @@ __all__ = [
     "MorphoCheckMarketPositionResponseTypedDict",
     "MorphoCheckVaultPositionResponse",
     "MorphoCheckVaultPositionResponseTypedDict",
+    "MorphoDepositParams",
+    "MorphoDepositParamsAmount",
+    "MorphoDepositParamsAmountTypedDict",
+    "MorphoDepositParamsTypedDict",
     "MorphoDepositRequest",
     "MorphoDepositRequestAmount",
     "MorphoDepositRequestAmountTypedDict",
@@ -920,14 +981,24 @@ __all__ = [
     "MorphoMarketsChain",
     "MorphoMarketsRequest",
     "MorphoMarketsRequestTypedDict",
+    "MorphoRepayParams",
+    "MorphoRepayParamsTypedDict",
     "MorphoRepayRequest",
     "MorphoRepayRequestChain",
     "MorphoRepayRequestTypedDict",
+    "MorphoSetVaultAllowanceParams",
+    "MorphoSetVaultAllowanceParamsAmount",
+    "MorphoSetVaultAllowanceParamsAmountTypedDict",
+    "MorphoSetVaultAllowanceParamsTypedDict",
     "MorphoSetVaultAllowanceRequest",
     "MorphoSetVaultAllowanceRequestAmount",
     "MorphoSetVaultAllowanceRequestAmountTypedDict",
     "MorphoSetVaultAllowanceRequestChain",
     "MorphoSetVaultAllowanceRequestTypedDict",
+    "MorphoSupplyCollateralParams",
+    "MorphoSupplyCollateralParamsAmount",
+    "MorphoSupplyCollateralParamsAmountTypedDict",
+    "MorphoSupplyCollateralParamsTypedDict",
     "MorphoSupplyCollateralRequest",
     "MorphoSupplyCollateralRequestAmount",
     "MorphoSupplyCollateralRequestAmountTypedDict",
@@ -941,11 +1012,17 @@ __all__ = [
     "MorphoVaultsChain",
     "MorphoVaultsRequest",
     "MorphoVaultsRequestTypedDict",
+    "MorphoWithdrawCollateralParams",
+    "MorphoWithdrawCollateralParamsAmount",
+    "MorphoWithdrawCollateralParamsAmountTypedDict",
+    "MorphoWithdrawCollateralParamsTypedDict",
     "MorphoWithdrawCollateralRequest",
     "MorphoWithdrawCollateralRequestAmount",
     "MorphoWithdrawCollateralRequestAmountTypedDict",
     "MorphoWithdrawCollateralRequestChain",
     "MorphoWithdrawCollateralRequestTypedDict",
+    "MorphoWithdrawParams",
+    "MorphoWithdrawParamsTypedDict",
     "MorphoWithdrawRequest",
     "MorphoWithdrawRequestChain",
     "MorphoWithdrawRequestTypedDict",
@@ -974,22 +1051,40 @@ __all__ = [
     "SecurityTypedDict",
     "SignedAuthorization",
     "SignedAuthorizationTypedDict",
+    "SkyBuyParams",
+    "SkyBuyParamsAmount",
+    "SkyBuyParamsAmountTypedDict",
+    "SkyBuyParamsTokenIn",
+    "SkyBuyParamsTypedDict",
     "SkyBuyRequest",
     "SkyBuyRequestAmount",
     "SkyBuyRequestAmountTypedDict",
+    "SkyBuyRequestTokenIn",
     "SkyBuyRequestTypedDict",
     "SkyCheckPositionResponse",
     "SkyCheckPositionResponseTypedDict",
+    "SkyDepositParams",
+    "SkyDepositParamsAmount",
+    "SkyDepositParamsAmountTypedDict",
+    "SkyDepositParamsTypedDict",
     "SkyDepositRequest",
     "SkyDepositRequestAmount",
     "SkyDepositRequestAmountTypedDict",
     "SkyDepositRequestTypedDict",
     "SkyPositionRequest",
     "SkyPositionRequestTypedDict",
+    "SkySellParams",
+    "SkySellParamsAmount",
+    "SkySellParamsAmountTypedDict",
+    "SkySellParamsTokenOut",
+    "SkySellParamsTypedDict",
     "SkySellRequest",
     "SkySellRequestAmount",
     "SkySellRequestAmountTypedDict",
+    "SkySellRequestTokenOut",
     "SkySellRequestTypedDict",
+    "SkyWithdrawParams",
+    "SkyWithdrawParamsTypedDict",
     "SkyWithdrawRequest",
     "SkyWithdrawRequestTypedDict",
     "Supply",
@@ -1012,10 +1107,8 @@ __all__ = [
     "TokenBalanceTokenTypedDict",
     "TokenBalanceTypedDict",
     "TokenEnum",
-    "TokenIn",
     "TokenInfo",
     "TokenInfoTypedDict",
-    "TokenOut",
     "TokenPriceChain",
     "TokenPriceRequest",
     "TokenPriceRequestTypedDict",

compass_api_sdk-0.3.2/src/compassapisdk/models/morphoborrowparams.py

@@ -0,0 +1,78 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from compassapisdk.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
+from pydantic import model_serializer
+from typing import Union
+from typing_extensions import NotRequired, TypeAliasType, TypedDict
+
+
+MorphoBorrowParamsAmountTypedDict = TypeAliasType(
+    "MorphoBorrowParamsAmountTypedDict", Union[float, str]
+)
+r"""Amount of the token to borrow from the market."""
+
+
+MorphoBorrowParamsAmount = TypeAliasType("MorphoBorrowParamsAmount", Union[float, str])
+r"""Amount of the token to borrow from the market."""
+
+
+class MorphoBorrowParamsTypedDict(TypedDict):
+    amount: MorphoBorrowParamsAmountTypedDict
+    r"""Amount of the token to borrow from the market."""
+    unique_market_key: str
+    r"""The key that uniquely identifies the market. This can be found using the 'Get Markets' endpoint."""
+    on_behalf_of: NotRequired[Nullable[str]]
+    r"""The address where the collateral is borrowed against. Defaults to sender."""
+    receiver: NotRequired[Nullable[str]]
+    r"""The address of the receiver of the tokens borrowed. Defaults to the transaction sender."""
+
+
+class MorphoBorrowParams(BaseModel):
+    amount: MorphoBorrowParamsAmount
+    r"""Amount of the token to borrow from the market."""
+
+    unique_market_key: str
+    r"""The key that uniquely identifies the market. This can be found using the 'Get Markets' endpoint."""
+
+    on_behalf_of: OptionalNullable[str] = UNSET
+    r"""The address where the collateral is borrowed against. Defaults to sender."""
+
+    receiver: OptionalNullable[str] = UNSET
+    r"""The address of the receiver of the tokens borrowed. Defaults to the transaction sender."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["on_behalf_of", "receiver"]
+        nullable_fields = ["on_behalf_of", "receiver"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in type(self).model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m

compass_api_sdk-0.3.2/src/compassapisdk/models/morphodepositparams.py

@@ -0,0 +1,75 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from compassapisdk.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
+from pydantic import model_serializer
+from typing import Union
+from typing_extensions import NotRequired, TypeAliasType, TypedDict
+
+
+MorphoDepositParamsAmountTypedDict = TypeAliasType(
+    "MorphoDepositParamsAmountTypedDict", Union[float, str]
+)
+r"""The amount of tokens to deposit into the vault."""
+
+
+MorphoDepositParamsAmount = TypeAliasType(
+    "MorphoDepositParamsAmount", Union[float, str]
+)
+r"""The amount of tokens to deposit into the vault."""
+
+
+class MorphoDepositParamsTypedDict(TypedDict):
+    vault_address: str
+    r"""The vault address you are depositing to."""
+    amount: MorphoDepositParamsAmountTypedDict
+    r"""The amount of tokens to deposit into the vault."""
+    receiver: NotRequired[Nullable[str]]
+    r"""The address which will receive the shares from the vault representing their proportional ownership of the vault's assets. Defaults to the sender."""
+
+
+class MorphoDepositParams(BaseModel):
+    vault_address: str
+    r"""The vault address you are depositing to."""
+
+    amount: MorphoDepositParamsAmount
+    r"""The amount of tokens to deposit into the vault."""
+
+    receiver: OptionalNullable[str] = UNSET
+    r"""The address which will receive the shares from the vault representing their proportional ownership of the vault's assets. Defaults to the sender."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["receiver"]
+        nullable_fields = ["receiver"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in type(self).model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m

compass_api_sdk-0.3.2/src/compassapisdk/models/morphorepayparams.py

@@ -0,0 +1,68 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from compassapisdk.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
+from pydantic import model_serializer
+from typing import Any
+from typing_extensions import NotRequired, TypedDict
+
+
+class MorphoRepayParamsTypedDict(TypedDict):
+    amount: Any
+    r"""Amount of the token to repay to the market. If set to 'ALL', all debt plus interest will be paid back if the user has a sufficient token balance in their wallet."""
+    unique_market_key: str
+    r"""The key that uniquely identifies the market. This can be found using the 'Get Markets' endpoint."""
+    on_behalf_of: NotRequired[Nullable[str]]
+    r"""The address on behalf of whom the repayment is made. Defaults to sender."""
+    callback_data: NotRequired[Nullable[bytes]]
+    r"""An optional field for callback byte data that will be triggered upon successful repaying of debt."""
+
+
+class MorphoRepayParams(BaseModel):
+    amount: Any
+    r"""Amount of the token to repay to the market. If set to 'ALL', all debt plus interest will be paid back if the user has a sufficient token balance in their wallet."""
+
+    unique_market_key: str
+    r"""The key that uniquely identifies the market. This can be found using the 'Get Markets' endpoint."""
+
+    on_behalf_of: OptionalNullable[str] = UNSET
+    r"""The address on behalf of whom the repayment is made. Defaults to sender."""
+
+    callback_data: OptionalNullable[bytes] = UNSET
+    r"""An optional field for callback byte data that will be triggered upon successful repaying of debt."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["on_behalf_of", "callback_data"]
+        nullable_fields = ["on_behalf_of", "callback_data"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in type(self).model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m

compass_api_sdk-0.3.2/src/compassapisdk/models/morphosetvaultallowanceparams.py

@@ -0,0 +1,33 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from compassapisdk.types import BaseModel
+from typing import Union
+from typing_extensions import TypeAliasType, TypedDict
+
+
+MorphoSetVaultAllowanceParamsAmountTypedDict = TypeAliasType(
+    "MorphoSetVaultAllowanceParamsAmountTypedDict", Union[float, str]
+)
+r"""The amount of tokens to increase the allowance by."""
+
+
+MorphoSetVaultAllowanceParamsAmount = TypeAliasType(
+    "MorphoSetVaultAllowanceParamsAmount", Union[float, str]
+)
+r"""The amount of tokens to increase the allowance by."""
+
+
+class MorphoSetVaultAllowanceParamsTypedDict(TypedDict):
+    vault_address: str
+    r"""The vault address you are increasing the allowance for."""
+    amount: MorphoSetVaultAllowanceParamsAmountTypedDict
+    r"""The amount of tokens to increase the allowance by."""
+
+
+class MorphoSetVaultAllowanceParams(BaseModel):
+    vault_address: str
+    r"""The vault address you are increasing the allowance for."""
+
+    amount: MorphoSetVaultAllowanceParamsAmount
+    r"""The amount of tokens to increase the allowance by."""

compass_api_sdk-0.3.2/src/compassapisdk/models/morphosupplycollateralparams.py

@@ -0,0 +1,80 @@
+"""Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
+
+from __future__ import annotations
+from compassapisdk.types import (
+    BaseModel,
+    Nullable,
+    OptionalNullable,
+    UNSET,
+    UNSET_SENTINEL,
+)
+from pydantic import model_serializer
+from typing import Union
+from typing_extensions import NotRequired, TypeAliasType, TypedDict
+
+
+MorphoSupplyCollateralParamsAmountTypedDict = TypeAliasType(
+    "MorphoSupplyCollateralParamsAmountTypedDict", Union[float, str]
+)
+r"""Amount of the token to supply to the market as collateral."""
+
+
+MorphoSupplyCollateralParamsAmount = TypeAliasType(
+    "MorphoSupplyCollateralParamsAmount", Union[float, str]
+)
+r"""Amount of the token to supply to the market as collateral."""
+
+
+class MorphoSupplyCollateralParamsTypedDict(TypedDict):
+    amount: MorphoSupplyCollateralParamsAmountTypedDict
+    r"""Amount of the token to supply to the market as collateral."""
+    unique_market_key: str
+    r"""The key that uniquely identifies the market. This can be found using the 'Get Markets' endpoint."""
+    on_behalf_of: NotRequired[Nullable[str]]
+    r"""The address on behalf of whom the supplied collateral is made. Defaults to sender."""
+    callback_data: NotRequired[Nullable[bytes]]
+    r"""An optional field for callback byte data that will be triggered upon successful supplying of collateral."""
+
+
+class MorphoSupplyCollateralParams(BaseModel):
+    amount: MorphoSupplyCollateralParamsAmount
+    r"""Amount of the token to supply to the market as collateral."""
+
+    unique_market_key: str
+    r"""The key that uniquely identifies the market. This can be found using the 'Get Markets' endpoint."""
+
+    on_behalf_of: OptionalNullable[str] = UNSET
+    r"""The address on behalf of whom the supplied collateral is made. Defaults to sender."""
+
+    callback_data: OptionalNullable[bytes] = UNSET
+    r"""An optional field for callback byte data that will be triggered upon successful supplying of collateral."""
+
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler):
+        optional_fields = ["on_behalf_of", "callback_data"]
+        nullable_fields = ["on_behalf_of", "callback_data"]
+        null_default_fields = []
+
+        serialized = handler(self)
+
+        m = {}
+
+        for n, f in type(self).model_fields.items():
+            k = f.alias or n
+            val = serialized.get(k)
+            serialized.pop(k, None)
+
+            optional_nullable = k in optional_fields and k in nullable_fields
+            is_set = (
+                self.__pydantic_fields_set__.intersection({n})
+                or k in null_default_fields
+            )  # pylint: disable=no-member
+
+            if val is not None and val != UNSET_SENTINEL:
+                m[k] = val
+            elif val != UNSET_SENTINEL and (
+                not k in optional_fields or (optional_nullable and is_set)
+            ):
+                m[k] = val
+
+        return m