lusid-sdk 2.1.261__py3-none-any.whl → 2.1.322__py3-none-any.whl

lusid/models/component_rule.py

@@ -18,23 +18,16 @@ import re  # noqa: F401
 import json
 
 
-from typing import Any, Dict, Optional
-from pydantic.v1 import BaseModel, Field, StrictStr, constr, validator
+from typing import Any, Dict, List, Optional
+from pydantic.v1 import BaseModel, conlist
+from lusid.models.component_filter import ComponentFilter
 
 class ComponentRule(BaseModel):
     """
     ComponentRule
     """
-    match_criteria: constr(strict=True, max_length=16384, min_length=1) = Field(..., alias="matchCriteria")
-    components: Optional[Dict[str, StrictStr]] = None
-    __properties = ["matchCriteria", "components"]
-
-    @validator('match_criteria')
-    def match_criteria_validate_regular_expression(cls, value):
-        """Validates the regular expression"""
-        if not re.match(r"^[\s\S]*$", value):
-            raise ValueError(r"must validate the regular expression /^[\s\S]*$/")
-        return value
+    components: Optional[conlist(ComponentFilter)] = None
+    __properties = ["components"]
 
     class Config:
         """Pydantic configuration"""
@@ -60,11 +53,13 @@ class ComponentRule(BaseModel):
                           exclude={
                           },
                           exclude_none=True)
-        # set to None if components (nullable) is None
-        # and __fields_set__ contains the field
-        if self.components is None and "components" in self.__fields_set__:
-            _dict['components'] = None
-
+        # override the default output from pydantic by calling `to_dict()` of each item in components (list)
+        _items = []
+        if self.components:
+            for _item in self.components:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['components'] = _items
         return _dict
 
     @classmethod
@@ -77,7 +72,6 @@ class ComponentRule(BaseModel):
             return ComponentRule.parse_obj(obj)
 
         _obj = ComponentRule.parse_obj({
-            "match_criteria": obj.get("matchCriteria"),
-            "components": obj.get("components")
+            "components": [ComponentFilter.from_dict(_item) for _item in obj.get("components")] if obj.get("components") is not None else None
         })
         return _obj

lusid/models/contract_for_difference.py

@@ -35,9 +35,10 @@ class ContractForDifference(LusidInstrument):
     type: constr(strict=True, min_length=1) = Field(..., description="The type of CFD.    Supported string (enumeration) values are: [Cash, Futures].")
     underlying_ccy: StrictStr = Field(..., alias="underlyingCcy", description="The currency of the underlying")
     underlying_identifier: constr(strict=True, min_length=1) = Field(..., alias="underlyingIdentifier", description="External market codes and identifiers for the CFD, e.g. RIC.    Supported string (enumeration) values are: [LusidInstrumentId, Isin, Sedol, Cusip, ClientInternal, Figi, RIC, QuotePermId, REDCode, BBGId, ICECode].")
+    lot_size: Optional[StrictInt] = Field(None, alias="lotSize", description="CFD LotSize, the minimum number of shares that can be bought or sold at once.  Optional, if set must be non-negative, if not set defaults to 1.")
     instrument_type: StrictStr = Field(..., alias="instrumentType", description="The available values are: QuotedSecurity, InterestRateSwap, FxForward, Future, ExoticInstrument, FxOption, CreditDefaultSwap, InterestRateSwaption, Bond, EquityOption, FixedLeg, FloatingLeg, BespokeCashFlowsLeg, Unknown, TermDeposit, ContractForDifference, EquitySwap, CashPerpetual, CapFloor, CashSettled, CdsIndex, Basket, FundingLeg, FxSwap, ForwardRateAgreement, SimpleInstrument, Repo, Equity, ExchangeTradedOption, ReferenceInstrument, ComplexBond, InflationLinkedBond, InflationSwap, SimpleCashFlowLoan, TotalReturnSwap, InflationLeg, FundShareClass, FlexibleLoan, UnsettledCash, Cash")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["instrumentType", "startDate", "maturityDate", "code", "contractSize", "payCcy", "referenceRate", "type", "underlyingCcy", "underlyingIdentifier"]
+    __properties = ["instrumentType", "startDate", "maturityDate", "code", "contractSize", "payCcy", "referenceRate", "type", "underlyingCcy", "underlyingIdentifier", "lotSize"]
 
     @validator('instrument_type')
     def instrument_type_validate_enum(cls, value):
@@ -97,7 +98,8 @@ class ContractForDifference(LusidInstrument):
             "reference_rate": obj.get("referenceRate"),
             "type": obj.get("type"),
             "underlying_ccy": obj.get("underlyingCcy"),
-            "underlying_identifier": obj.get("underlyingIdentifier")
+            "underlying_identifier": obj.get("underlyingIdentifier"),
+            "lot_size": obj.get("lotSize")
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

lusid/models/fund.py

@@ -35,6 +35,7 @@ class Fund(BaseModel):
     id: ResourceId = Field(...)
     display_name: Optional[constr(strict=True, max_length=256, min_length=1)] = Field(None, alias="displayName", description="The name of the Fund.")
     description: Optional[constr(strict=True, max_length=1024, min_length=0)] = Field(None, description="A description for the Fund.")
+    fund_configuration_id: Optional[ResourceId] = Field(None, alias="fundConfigurationId")
     abor_id: ResourceId = Field(..., alias="aborId")
     share_class_instruments: Optional[conlist(InstrumentResolutionDetail)] = Field(None, alias="shareClassInstruments", description="Details the user-provided instrument identifiers and the instrument resolved from them.")
     type: constr(strict=True, min_length=1) = Field(..., description="The type of fund; 'Standalone', 'Master' or 'Feeder'")
@@ -44,7 +45,7 @@ class Fund(BaseModel):
     properties: Optional[Dict[str, ModelProperty]] = Field(None, description="A set of properties for the Fund.")
     version: Optional[Version] = None
     links: Optional[conlist(Link)] = None
-    __properties = ["href", "id", "displayName", "description", "aborId", "shareClassInstruments", "type", "inceptionDate", "decimalPlaces", "yearEndDate", "properties", "version", "links"]
+    __properties = ["href", "id", "displayName", "description", "fundConfigurationId", "aborId", "shareClassInstruments", "type", "inceptionDate", "decimalPlaces", "yearEndDate", "properties", "version", "links"]
 
     @validator('description')
     def description_validate_regular_expression(cls, value):
@@ -83,6 +84,9 @@ class Fund(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of id
         if self.id:
             _dict['id'] = self.id.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of fund_configuration_id
+        if self.fund_configuration_id:
+            _dict['fundConfigurationId'] = self.fund_configuration_id.to_dict()
         # override the default output from pydantic by calling `to_dict()` of abor_id
         if self.abor_id:
             _dict['aborId'] = self.abor_id.to_dict()
@@ -164,6 +168,7 @@ class Fund(BaseModel):
             "id": ResourceId.from_dict(obj.get("id")) if obj.get("id") is not None else None,
             "display_name": obj.get("displayName"),
             "description": obj.get("description"),
+            "fund_configuration_id": ResourceId.from_dict(obj.get("fundConfigurationId")) if obj.get("fundConfigurationId") is not None else None,
             "abor_id": ResourceId.from_dict(obj.get("aborId")) if obj.get("aborId") is not None else None,
             "share_class_instruments": [InstrumentResolutionDetail.from_dict(_item) for _item in obj.get("shareClassInstruments")] if obj.get("shareClassInstruments") is not None else None,
             "type": obj.get("type"),

lusid/models/fund_amount.py

@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    LUSID API
+
+    FINBOURNE Technology  # noqa: E501
+
+    Contact: info@finbourne.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+from typing import Any, Dict, Optional, Union
+from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt
+
+class FundAmount(BaseModel):
+    """
+    FundAmount
+    """
+    value: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The value of the amount.")
+    __properties = ["value"]
+
+    class Config:
+        """Pydantic configuration"""
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> FundAmount:
+        """Create an instance of FundAmount from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True,
+                          exclude={
+                          },
+                          exclude_none=True)
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> FundAmount:
+        """Create an instance of FundAmount from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return FundAmount.parse_obj(obj)
+
+        _obj = FundAmount.parse_obj({
+            "value": obj.get("value")
+        })
+        return _obj

lusid/models/fund_configuration.py

@@ -34,11 +34,13 @@ class FundConfiguration(BaseModel):
     id: ResourceId = Field(...)
     display_name: Optional[StrictStr] = Field(None, alias="displayName", description="The name of the FundConfiguration.")
     description: Optional[StrictStr] = Field(None, description="A description for the FundConfiguration.")
-    component_rules: Optional[conlist(ComponentRule)] = Field(None, alias="componentRules", description="The first matching rule decides the set of filters used.")
+    dealing_rule: Optional[ComponentRule] = Field(None, alias="dealingRule")
+    fund_pnl_rule: Optional[ComponentRule] = Field(None, alias="fundPnlRule")
+    back_out_rule: Optional[ComponentRule] = Field(None, alias="backOutRule")
     properties: Optional[Dict[str, ModelProperty]] = Field(None, description="A set of properties for the Fund Configuration.")
     version: Optional[Version] = None
     links: Optional[conlist(Link)] = None
-    __properties = ["href", "id", "displayName", "description", "componentRules", "properties", "version", "links"]
+    __properties = ["href", "id", "displayName", "description", "dealingRule", "fundPnlRule", "backOutRule", "properties", "version", "links"]
 
     class Config:
         """Pydantic configuration"""
@@ -67,13 +69,15 @@ class FundConfiguration(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of id
         if self.id:
             _dict['id'] = self.id.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of each item in component_rules (list)
-        _items = []
-        if self.component_rules:
-            for _item in self.component_rules:
-                if _item:
-                    _items.append(_item.to_dict())
-            _dict['componentRules'] = _items
+        # override the default output from pydantic by calling `to_dict()` of dealing_rule
+        if self.dealing_rule:
+            _dict['dealingRule'] = self.dealing_rule.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of fund_pnl_rule
+        if self.fund_pnl_rule:
+            _dict['fundPnlRule'] = self.fund_pnl_rule.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of back_out_rule
+        if self.back_out_rule:
+            _dict['backOutRule'] = self.back_out_rule.to_dict()
         # override the default output from pydantic by calling `to_dict()` of each value in properties (dict)
         _field_dict = {}
         if self.properties:
@@ -106,11 +110,6 @@ class FundConfiguration(BaseModel):
         if self.description is None and "description" in self.__fields_set__:
             _dict['description'] = None
 
-        # set to None if component_rules (nullable) is None
-        # and __fields_set__ contains the field
-        if self.component_rules is None and "component_rules" in self.__fields_set__:
-            _dict['componentRules'] = None
-
         # set to None if properties (nullable) is None
         # and __fields_set__ contains the field
         if self.properties is None and "properties" in self.__fields_set__:
@@ -137,7 +136,9 @@ class FundConfiguration(BaseModel):
             "id": ResourceId.from_dict(obj.get("id")) if obj.get("id") is not None else None,
             "display_name": obj.get("displayName"),
             "description": obj.get("description"),
-            "component_rules": [ComponentRule.from_dict(_item) for _item in obj.get("componentRules")] if obj.get("componentRules") is not None else None,
+            "dealing_rule": ComponentRule.from_dict(obj.get("dealingRule")) if obj.get("dealingRule") is not None else None,
+            "fund_pnl_rule": ComponentRule.from_dict(obj.get("fundPnlRule")) if obj.get("fundPnlRule") is not None else None,
+            "back_out_rule": ComponentRule.from_dict(obj.get("backOutRule")) if obj.get("backOutRule") is not None else None,
             "properties": dict(
                 (_k, ModelProperty.from_dict(_v))
                 for _k, _v in obj.get("properties").items()

lusid/models/fund_configuration_request.py

@@ -18,8 +18,8 @@ import re  # noqa: F401
 import json
 
 
-from typing import Any, Dict, List, Optional
-from pydantic.v1 import BaseModel, Field, conlist, constr, validator
+from typing import Any, Dict, Optional
+from pydantic.v1 import BaseModel, Field, constr, validator
 from lusid.models.component_rule import ComponentRule
 from lusid.models.model_property import ModelProperty
 
@@ -30,9 +30,11 @@ class FundConfigurationRequest(BaseModel):
     code: constr(strict=True, max_length=64, min_length=1) = Field(...)
     display_name: Optional[constr(strict=True, max_length=256, min_length=1)] = Field(None, alias="displayName", description="The name of the Fund.")
     description: Optional[constr(strict=True, max_length=1024, min_length=0)] = Field(None, description="A description for the Fund.")
-    component_rules: conlist(ComponentRule) = Field(..., alias="componentRules")
+    dealing_rule: ComponentRule = Field(..., alias="dealingRule")
+    fund_pnl_rule: ComponentRule = Field(..., alias="fundPnlRule")
+    back_out_rule: ComponentRule = Field(..., alias="backOutRule")
     properties: Optional[Dict[str, ModelProperty]] = Field(None, description="A set of properties for the Fund Configuration.")
-    __properties = ["code", "displayName", "description", "componentRules", "properties"]
+    __properties = ["code", "displayName", "description", "dealingRule", "fundPnlRule", "backOutRule", "properties"]
 
     @validator('code')
     def code_validate_regular_expression(cls, value):
@@ -75,13 +77,15 @@ class FundConfigurationRequest(BaseModel):
                           exclude={
                           },
                           exclude_none=True)
-        # override the default output from pydantic by calling `to_dict()` of each item in component_rules (list)
-        _items = []
-        if self.component_rules:
-            for _item in self.component_rules:
-                if _item:
-                    _items.append(_item.to_dict())
-            _dict['componentRules'] = _items
+        # override the default output from pydantic by calling `to_dict()` of dealing_rule
+        if self.dealing_rule:
+            _dict['dealingRule'] = self.dealing_rule.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of fund_pnl_rule
+        if self.fund_pnl_rule:
+            _dict['fundPnlRule'] = self.fund_pnl_rule.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of back_out_rule
+        if self.back_out_rule:
+            _dict['backOutRule'] = self.back_out_rule.to_dict()
         # override the default output from pydantic by calling `to_dict()` of each value in properties (dict)
         _field_dict = {}
         if self.properties:
@@ -119,7 +123,9 @@ class FundConfigurationRequest(BaseModel):
             "code": obj.get("code"),
             "display_name": obj.get("displayName"),
             "description": obj.get("description"),
-            "component_rules": [ComponentRule.from_dict(_item) for _item in obj.get("componentRules")] if obj.get("componentRules") is not None else None,
+            "dealing_rule": ComponentRule.from_dict(obj.get("dealingRule")) if obj.get("dealingRule") is not None else None,
+            "fund_pnl_rule": ComponentRule.from_dict(obj.get("fundPnlRule")) if obj.get("fundPnlRule") is not None else None,
+            "back_out_rule": ComponentRule.from_dict(obj.get("backOutRule")) if obj.get("backOutRule") is not None else None,
             "properties": dict(
                 (_k, ModelProperty.from_dict(_v))
                 for _k, _v in obj.get("properties").items()

lusid/models/fund_pnl_breakdown.py

@@ -0,0 +1,110 @@
+# coding: utf-8
+
+"""
+    LUSID API
+
+    FINBOURNE Technology  # noqa: E501
+
+    Contact: info@finbourne.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+from typing import Any, Dict
+from pydantic.v1 import BaseModel, Field
+from lusid.models.fund_amount import FundAmount
+
+class FundPnlBreakdown(BaseModel):
+    """
+    The breakdown of PnL for a Fund on a specified date.  # noqa: E501
+    """
+    non_class_specific_pnl: Dict[str, FundAmount] = Field(..., alias="nonClassSpecificPnl", description="Bucket of detail for PnL within the queried period that is not specific to any share class.")
+    aggregated_class_pnl: Dict[str, FundAmount] = Field(..., alias="aggregatedClassPnl", description="Bucket of detail for the sum of class PnL across all share classes in a fund and within the queried period.")
+    total_pnl: Dict[str, FundAmount] = Field(..., alias="totalPnl", description="Bucket of detail for the sum of class PnL and PnL not specific to a class within the queried period.")
+    __properties = ["nonClassSpecificPnl", "aggregatedClassPnl", "totalPnl"]
+
+    class Config:
+        """Pydantic configuration"""
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> FundPnlBreakdown:
+        """Create an instance of FundPnlBreakdown from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True,
+                          exclude={
+                          },
+                          exclude_none=True)
+        # override the default output from pydantic by calling `to_dict()` of each value in non_class_specific_pnl (dict)
+        _field_dict = {}
+        if self.non_class_specific_pnl:
+            for _key in self.non_class_specific_pnl:
+                if self.non_class_specific_pnl[_key]:
+                    _field_dict[_key] = self.non_class_specific_pnl[_key].to_dict()
+            _dict['nonClassSpecificPnl'] = _field_dict
+        # override the default output from pydantic by calling `to_dict()` of each value in aggregated_class_pnl (dict)
+        _field_dict = {}
+        if self.aggregated_class_pnl:
+            for _key in self.aggregated_class_pnl:
+                if self.aggregated_class_pnl[_key]:
+                    _field_dict[_key] = self.aggregated_class_pnl[_key].to_dict()
+            _dict['aggregatedClassPnl'] = _field_dict
+        # override the default output from pydantic by calling `to_dict()` of each value in total_pnl (dict)
+        _field_dict = {}
+        if self.total_pnl:
+            for _key in self.total_pnl:
+                if self.total_pnl[_key]:
+                    _field_dict[_key] = self.total_pnl[_key].to_dict()
+            _dict['totalPnl'] = _field_dict
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> FundPnlBreakdown:
+        """Create an instance of FundPnlBreakdown from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return FundPnlBreakdown.parse_obj(obj)
+
+        _obj = FundPnlBreakdown.parse_obj({
+            "non_class_specific_pnl": dict(
+                (_k, FundAmount.from_dict(_v))
+                for _k, _v in obj.get("nonClassSpecificPnl").items()
+            )
+            if obj.get("nonClassSpecificPnl") is not None
+            else None,
+            "aggregated_class_pnl": dict(
+                (_k, FundAmount.from_dict(_v))
+                for _k, _v in obj.get("aggregatedClassPnl").items()
+            )
+            if obj.get("aggregatedClassPnl") is not None
+            else None,
+            "total_pnl": dict(
+                (_k, FundAmount.from_dict(_v))
+                for _k, _v in obj.get("totalPnl").items()
+            )
+            if obj.get("totalPnl") is not None
+            else None
+        })
+        return _obj

lusid/models/fund_previous_nav.py

@@ -0,0 +1,69 @@
+# coding: utf-8
+
+"""
+    LUSID API
+
+    FINBOURNE Technology  # noqa: E501
+
+    Contact: info@finbourne.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+
+from typing import Any, Dict, Optional, Union
+from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt
+
+class FundPreviousNAV(BaseModel):
+    """
+    FundPreviousNAV
+    """
+    amount: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The amount of the previous NAV.")
+    __properties = ["amount"]
+
+    class Config:
+        """Pydantic configuration"""
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> FundPreviousNAV:
+        """Create an instance of FundPreviousNAV from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True,
+                          exclude={
+                          },
+                          exclude_none=True)
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> FundPreviousNAV:
+        """Create an instance of FundPreviousNAV from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return FundPreviousNAV.parse_obj(obj)
+
+        _obj = FundPreviousNAV.parse_obj({
+            "amount": obj.get("amount")
+        })
+        return _obj

lusid/models/fund_request.py

@@ -32,6 +32,7 @@ class FundRequest(BaseModel):
     code: constr(strict=True, max_length=64, min_length=1) = Field(..., description="The code given for the Fund.")
     display_name: Optional[constr(strict=True, max_length=256, min_length=1)] = Field(None, alias="displayName", description="The name of the Fund.")
     description: Optional[constr(strict=True, max_length=1024, min_length=0)] = Field(None, description="A description for the Fund.")
+    fund_configuration_id: Optional[ResourceId] = Field(None, alias="fundConfigurationId")
     abor_id: ResourceId = Field(..., alias="aborId")
     share_class_instrument_scopes: Optional[conlist(StrictStr, max_items=1)] = Field(None, alias="shareClassInstrumentScopes", description="The scopes in which the instruments lie, currently limited to one.")
     share_class_instruments: Optional[conlist(InstrumentResolutionDetail)] = Field(None, alias="shareClassInstruments", description="Details the user-provided instrument identifiers and the instrument resolved from them.")
@@ -40,7 +41,7 @@ class FundRequest(BaseModel):
     decimal_places: Optional[conint(strict=True, le=30, ge=0)] = Field(None, alias="decimalPlaces", description="Number of decimal places for reporting")
     year_end_date: DayMonth = Field(..., alias="yearEndDate")
     properties: Optional[Dict[str, ModelProperty]] = Field(None, description="A set of properties for the Fund.")
-    __properties = ["code", "displayName", "description", "aborId", "shareClassInstrumentScopes", "shareClassInstruments", "type", "inceptionDate", "decimalPlaces", "yearEndDate", "properties"]
+    __properties = ["code", "displayName", "description", "fundConfigurationId", "aborId", "shareClassInstrumentScopes", "shareClassInstruments", "type", "inceptionDate", "decimalPlaces", "yearEndDate", "properties"]
 
     @validator('code')
     def code_validate_regular_expression(cls, value):
@@ -83,6 +84,9 @@ class FundRequest(BaseModel):
                           exclude={
                           },
                           exclude_none=True)
+        # override the default output from pydantic by calling `to_dict()` of fund_configuration_id
+        if self.fund_configuration_id:
+            _dict['fundConfigurationId'] = self.fund_configuration_id.to_dict()
         # override the default output from pydantic by calling `to_dict()` of abor_id
         if self.abor_id:
             _dict['aborId'] = self.abor_id.to_dict()
@@ -148,6 +152,7 @@ class FundRequest(BaseModel):
             "code": obj.get("code"),
             "display_name": obj.get("displayName"),
             "description": obj.get("description"),
+            "fund_configuration_id": ResourceId.from_dict(obj.get("fundConfigurationId")) if obj.get("fundConfigurationId") is not None else None,
             "abor_id": ResourceId.from_dict(obj.get("aborId")) if obj.get("aborId") is not None else None,
             "share_class_instrument_scopes": obj.get("shareClassInstrumentScopes"),
             "share_class_instruments": [InstrumentResolutionDetail.from_dict(_item) for _item in obj.get("shareClassInstruments")] if obj.get("shareClassInstruments") is not None else None,