lusid-sdk 2.1.405__py3-none-any.whl → 2.1.423__py3-none-any.whl

lusid/models/create_group_reconciliation_definition_request.py

@@ -0,0 +1,113 @@
+# 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
+from pydantic.v1 import BaseModel, Field, constr
+from lusid.models.break_code_source import BreakCodeSource
+from lusid.models.group_reconciliation_definition_comparison_ruleset_ids import GroupReconciliationDefinitionComparisonRulesetIds
+from lusid.models.group_reconciliation_definition_currencies import GroupReconciliationDefinitionCurrencies
+from lusid.models.group_reconciliation_definition_portfolio_entity_ids import GroupReconciliationDefinitionPortfolioEntityIds
+from lusid.models.group_reconciliation_definition_recipe_ids import GroupReconciliationDefinitionRecipeIds
+from lusid.models.resource_id import ResourceId
+from lusid.models.transaction_date_windows import TransactionDateWindows
+
+class CreateGroupReconciliationDefinitionRequest(BaseModel):
+    """
+    CreateGroupReconciliationDefinitionRequest
+    """
+    id: Optional[ResourceId] = None
+    display_name: constr(strict=True, min_length=1) = Field(..., alias="displayName", description="The name of the Group Reconciliation Definition")
+    description: constr(strict=True, min_length=1) = Field(..., description="The description of the Group Reconciliation Definition")
+    portfolio_entity_ids: GroupReconciliationDefinitionPortfolioEntityIds = Field(..., alias="portfolioEntityIds")
+    recipe_ids: Optional[GroupReconciliationDefinitionRecipeIds] = Field(None, alias="recipeIds")
+    currencies: Optional[GroupReconciliationDefinitionCurrencies] = None
+    transaction_date_windows: Optional[TransactionDateWindows] = Field(None, alias="transactionDateWindows")
+    comparison_ruleset_ids: Optional[GroupReconciliationDefinitionComparisonRulesetIds] = Field(None, alias="comparisonRulesetIds")
+    break_code_source: BreakCodeSource = Field(..., alias="breakCodeSource")
+    __properties = ["id", "displayName", "description", "portfolioEntityIds", "recipeIds", "currencies", "transactionDateWindows", "comparisonRulesetIds", "breakCodeSource"]
+
+    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) -> CreateGroupReconciliationDefinitionRequest:
+        """Create an instance of CreateGroupReconciliationDefinitionRequest 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 id
+        if self.id:
+            _dict['id'] = self.id.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of portfolio_entity_ids
+        if self.portfolio_entity_ids:
+            _dict['portfolioEntityIds'] = self.portfolio_entity_ids.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of recipe_ids
+        if self.recipe_ids:
+            _dict['recipeIds'] = self.recipe_ids.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of currencies
+        if self.currencies:
+            _dict['currencies'] = self.currencies.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of transaction_date_windows
+        if self.transaction_date_windows:
+            _dict['transactionDateWindows'] = self.transaction_date_windows.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of comparison_ruleset_ids
+        if self.comparison_ruleset_ids:
+            _dict['comparisonRulesetIds'] = self.comparison_ruleset_ids.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of break_code_source
+        if self.break_code_source:
+            _dict['breakCodeSource'] = self.break_code_source.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> CreateGroupReconciliationDefinitionRequest:
+        """Create an instance of CreateGroupReconciliationDefinitionRequest from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return CreateGroupReconciliationDefinitionRequest.parse_obj(obj)
+
+        _obj = CreateGroupReconciliationDefinitionRequest.parse_obj({
+            "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"),
+            "portfolio_entity_ids": GroupReconciliationDefinitionPortfolioEntityIds.from_dict(obj.get("portfolioEntityIds")) if obj.get("portfolioEntityIds") is not None else None,
+            "recipe_ids": GroupReconciliationDefinitionRecipeIds.from_dict(obj.get("recipeIds")) if obj.get("recipeIds") is not None else None,
+            "currencies": GroupReconciliationDefinitionCurrencies.from_dict(obj.get("currencies")) if obj.get("currencies") is not None else None,
+            "transaction_date_windows": TransactionDateWindows.from_dict(obj.get("transactionDateWindows")) if obj.get("transactionDateWindows") is not None else None,
+            "comparison_ruleset_ids": GroupReconciliationDefinitionComparisonRulesetIds.from_dict(obj.get("comparisonRulesetIds")) if obj.get("comparisonRulesetIds") is not None else None,
+            "break_code_source": BreakCodeSource.from_dict(obj.get("breakCodeSource")) if obj.get("breakCodeSource") is not None else None
+        })
+        return _obj

lusid/models/custom_entity_entity.py

@@ -0,0 +1,146 @@
+# 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 datetime import datetime
+from typing import Any, Dict, List, Optional
+from pydantic.v1 import BaseModel, Field, StrictInt, StrictStr, conlist, constr
+from lusid.models.custom_entity_response import CustomEntityResponse
+from lusid.models.link import Link
+
+class CustomEntityEntity(BaseModel):
+    """
+    CustomEntityEntity
+    """
+    href: StrictStr = Field(..., description="The specific Uniform Resource Identifier (URI) for this resource at the requested effective and asAt datetime.")
+    entity_unique_id: constr(strict=True, min_length=1) = Field(..., alias="entityUniqueId", description="The unique id of the entity.")
+    as_at_version_number: Optional[StrictInt] = Field(None, alias="asAtVersionNumber", description="The integer version number for the entity (the entity was created at version 1)")
+    status: constr(strict=True, min_length=1) = Field(..., description="The status of the entity at the current time.")
+    as_at_deleted: Optional[datetime] = Field(None, alias="asAtDeleted", description="The asAt datetime at which the entity was deleted.")
+    user_id_deleted: Optional[StrictStr] = Field(None, alias="userIdDeleted", description="The unique id of the user who deleted the entity.")
+    request_id_deleted: Optional[StrictStr] = Field(None, alias="requestIdDeleted", description="The unique request id of the command that deleted the entity.")
+    effective_at_created: Optional[datetime] = Field(None, alias="effectiveAtCreated", description="The EffectiveAt this Entity is created, if entity does not currently exist in EffectiveAt.")
+    prevailing_custom_entity: Optional[CustomEntityResponse] = Field(None, alias="prevailingCustomEntity")
+    deleted_custom_entity: Optional[CustomEntityResponse] = Field(None, alias="deletedCustomEntity")
+    previewed_status: Optional[StrictStr] = Field(None, alias="previewedStatus", description="The status of the previewed entity.")
+    previewed_custom_entity: Optional[CustomEntityResponse] = Field(None, alias="previewedCustomEntity")
+    links: Optional[conlist(Link)] = None
+    __properties = ["href", "entityUniqueId", "asAtVersionNumber", "status", "asAtDeleted", "userIdDeleted", "requestIdDeleted", "effectiveAtCreated", "prevailingCustomEntity", "deletedCustomEntity", "previewedStatus", "previewedCustomEntity", "links"]
+
+    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) -> CustomEntityEntity:
+        """Create an instance of CustomEntityEntity 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 prevailing_custom_entity
+        if self.prevailing_custom_entity:
+            _dict['prevailingCustomEntity'] = self.prevailing_custom_entity.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of deleted_custom_entity
+        if self.deleted_custom_entity:
+            _dict['deletedCustomEntity'] = self.deleted_custom_entity.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of previewed_custom_entity
+        if self.previewed_custom_entity:
+            _dict['previewedCustomEntity'] = self.previewed_custom_entity.to_dict()
+        # override the default output from pydantic by calling `to_dict()` of each item in links (list)
+        _items = []
+        if self.links:
+            for _item in self.links:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['links'] = _items
+        # set to None if as_at_version_number (nullable) is None
+        # and __fields_set__ contains the field
+        if self.as_at_version_number is None and "as_at_version_number" in self.__fields_set__:
+            _dict['asAtVersionNumber'] = None
+
+        # set to None if as_at_deleted (nullable) is None
+        # and __fields_set__ contains the field
+        if self.as_at_deleted is None and "as_at_deleted" in self.__fields_set__:
+            _dict['asAtDeleted'] = None
+
+        # set to None if user_id_deleted (nullable) is None
+        # and __fields_set__ contains the field
+        if self.user_id_deleted is None and "user_id_deleted" in self.__fields_set__:
+            _dict['userIdDeleted'] = None
+
+        # set to None if request_id_deleted (nullable) is None
+        # and __fields_set__ contains the field
+        if self.request_id_deleted is None and "request_id_deleted" in self.__fields_set__:
+            _dict['requestIdDeleted'] = None
+
+        # set to None if effective_at_created (nullable) is None
+        # and __fields_set__ contains the field
+        if self.effective_at_created is None and "effective_at_created" in self.__fields_set__:
+            _dict['effectiveAtCreated'] = None
+
+        # set to None if previewed_status (nullable) is None
+        # and __fields_set__ contains the field
+        if self.previewed_status is None and "previewed_status" in self.__fields_set__:
+            _dict['previewedStatus'] = None
+
+        # set to None if links (nullable) is None
+        # and __fields_set__ contains the field
+        if self.links is None and "links" in self.__fields_set__:
+            _dict['links'] = None
+
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> CustomEntityEntity:
+        """Create an instance of CustomEntityEntity from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return CustomEntityEntity.parse_obj(obj)
+
+        _obj = CustomEntityEntity.parse_obj({
+            "href": obj.get("href"),
+            "entity_unique_id": obj.get("entityUniqueId"),
+            "as_at_version_number": obj.get("asAtVersionNumber"),
+            "status": obj.get("status"),
+            "as_at_deleted": obj.get("asAtDeleted"),
+            "user_id_deleted": obj.get("userIdDeleted"),
+            "request_id_deleted": obj.get("requestIdDeleted"),
+            "effective_at_created": obj.get("effectiveAtCreated"),
+            "prevailing_custom_entity": CustomEntityResponse.from_dict(obj.get("prevailingCustomEntity")) if obj.get("prevailingCustomEntity") is not None else None,
+            "deleted_custom_entity": CustomEntityResponse.from_dict(obj.get("deletedCustomEntity")) if obj.get("deletedCustomEntity") is not None else None,
+            "previewed_status": obj.get("previewedStatus"),
+            "previewed_custom_entity": CustomEntityResponse.from_dict(obj.get("previewedCustomEntity")) if obj.get("previewedCustomEntity") is not None else None,
+            "links": [Link.from_dict(_item) for _item in obj.get("links")] if obj.get("links") is not None else None
+        })
+        return _obj

lusid/models/decimal_list.py

@@ -27,15 +27,15 @@ class DecimalList(ReferenceList):
     DecimalList
     """
     values: conlist(Union[StrictFloat, StrictInt], max_items=100, min_items=0) = Field(...)
-    reference_list_type: StrictStr = Field(..., alias="referenceListType", description="The reference list values. The available values are: PortfolioGroupIdList, PortfolioIdList, AddressKeyList, StringList, InstrumentList, DecimalList, PropertyList")
+    reference_list_type: StrictStr = Field(..., alias="referenceListType", description="The reference list values. The available values are: PortfolioGroupIdList, PortfolioIdList, AddressKeyList, StringList, InstrumentList, DecimalList, PropertyList, FundIdList")
     additional_properties: Dict[str, Any] = {}
     __properties = ["referenceListType", "values"]
 
     @validator('reference_list_type')
     def reference_list_type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ('PortfolioGroupIdList', 'PortfolioIdList', 'AddressKeyList', 'StringList', 'InstrumentList', 'DecimalList', 'PropertyList'):
-            raise ValueError("must be one of enum values ('PortfolioGroupIdList', 'PortfolioIdList', 'AddressKeyList', 'StringList', 'InstrumentList', 'DecimalList', 'PropertyList')")
+        if value not in ('PortfolioGroupIdList', 'PortfolioIdList', 'AddressKeyList', 'StringList', 'InstrumentList', 'DecimalList', 'PropertyList', 'FundIdList'):
+            raise ValueError("must be one of enum values ('PortfolioGroupIdList', 'PortfolioIdList', 'AddressKeyList', 'StringList', 'InstrumentList', 'DecimalList', 'PropertyList', 'FundIdList')")
         return value
 
     class Config:

lusid/models/diary_entry_request.py

@@ -26,12 +26,20 @@ class DiaryEntryRequest(BaseModel):
     """
     The request to add a diary entry  # noqa: E501
     """
+    diary_entry_code: constr(strict=True, max_length=64, min_length=1) = Field(..., alias="diaryEntryCode", description="The code of the diary entry.")
     name: Optional[constr(strict=True, max_length=512, min_length=1)] = Field(None, description="The name of the diary entry.")
     status: Optional[StrictStr] = Field(None, description="The status of a Diary Entry of Type 'Other'. Defaults to 'Undefined' and supports 'Undefined', 'Estimate', 'Candidate', and 'Final'.")
     effective_at: datetime = Field(..., alias="effectiveAt", description="The effective time of the diary entry.")
     query_as_at: Optional[datetime] = Field(None, alias="queryAsAt", description="The query time of the diary entry. Defaults to latest.")
     properties: Optional[Dict[str, ModelProperty]] = Field(None, description="A set of properties for the diary entry.")
-    __properties = ["name", "status", "effectiveAt", "queryAsAt", "properties"]
+    __properties = ["diaryEntryCode", "name", "status", "effectiveAt", "queryAsAt", "properties"]
+
+    @validator('diary_entry_code')
+    def diary_entry_code_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"^[a-zA-Z0-9\-_]+$", value):
+            raise ValueError(r"must validate the regular expression /^[a-zA-Z0-9\-_]+$/")
+        return value
 
     @validator('name')
     def name_validate_regular_expression(cls, value):
@@ -106,6 +114,7 @@ class DiaryEntryRequest(BaseModel):
             return DiaryEntryRequest.parse_obj(obj)
 
         _obj = DiaryEntryRequest.parse_obj({
+            "diary_entry_code": obj.get("diaryEntryCode"),
             "name": obj.get("name"),
             "status": obj.get("status"),
             "effective_at": obj.get("effectiveAt"),

lusid/models/fixed_schedule.py

@@ -29,15 +29,15 @@ class FixedSchedule(Schedule):
     """
     Schedule for fixed coupon payments  # noqa: E501
     """
-    start_date: datetime = Field(..., alias="startDate", description="Date to start generate from")
-    maturity_date: datetime = Field(..., alias="maturityDate", description="Date to generate to")
+    start_date: datetime = Field(..., alias="startDate", description="Date from which LUSID starts generating the payment schedule.")
+    maturity_date: datetime = Field(..., alias="maturityDate", description="Last date of the payment generation schedule. May not necessarily be the maturity date  of the underlying instrument (e.g. in case the instrument has multiple payment schedules).")
     flow_conventions: Optional[FlowConventions] = Field(None, alias="flowConventions")
     coupon_rate: Optional[Union[StrictFloat, StrictInt]] = Field(None, alias="couponRate", description="Coupon rate given as a fraction.")
     convention_name: Optional[FlowConventionName] = Field(None, alias="conventionName")
     ex_dividend_days: Optional[StrictInt] = Field(None, alias="exDividendDays", description="Optional. Number of calendar days in the ex-dividend period.  If the settlement date falls in the ex-dividend period then the coupon paid is zero and the accrued interest is negative.  If set, this must be a non-negative number.  If not set, or set to 0, then there is no ex-dividend period.                NOTE: This field is deprecated.  If you wish to set the ExDividendDays on a bond, please use the ExDividendConfiguration.")
     notional: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="Scaling factor, the quantity outstanding on which the rate will be paid.")
     payment_currency: StrictStr = Field(..., alias="paymentCurrency", description="Payment currency. This does not have to be the same as the nominal bond or observation/reset currency.")
-    stub_type: Optional[StrictStr] = Field(None, alias="stubType", description="StubType required of the schedule    Supported string (enumeration) values are: [ShortFront, ShortBack, LongBack, LongFront, Both].")
+    stub_type: Optional[StrictStr] = Field(None, alias="stubType", description="When a payment schedule doesn't have regular payment intervals just because of the  first and/or last coupons of the schedule, we call those irregular coupons stubs.  This configuration specifies what type of stub is used when building the schedule  Supported values are:  None = this is a regular payment schedule with no stubs. DO NOT use it with irregular schedules or you will get incorrect and unexpected behaviour.  ShortFront = this is an irregular payment schedule where only the first coupon is irregular, and covers a payment period that is shorter than the regular payment period.  ShortBack = this is an irregular payment schedule where only the last coupon is irregular, and covers a payment period that is shorter than the regular payment period.  LongFront = this is an irregular payment schedule where only the first coupon is irregular, and covers a payment period that is longer than the regular payment period.  LongBack = this is an irregular payment schedule where only the last coupon is irregular, and covers a payment period that is longer than the regular payment period.  Both = this is an irregular payment schedule where both the first and the last coupons are irregular, and the length of these periods is calculated based on the first coupon payment date that should have been explicitly set.")
     ex_dividend_configuration: Optional[ExDividendConfiguration] = Field(None, alias="exDividendConfiguration")
     schedule_type: StrictStr = Field(..., alias="scheduleType", description="The available values are: FixedSchedule, FloatSchedule, OptionalitySchedule, StepSchedule, Exercise, FxRateSchedule, FxLinkedNotionalSchedule, BondConversionSchedule, Invalid")
     additional_properties: Dict[str, Any] = {}

lusid/models/float_schedule.py

@@ -29,10 +29,10 @@ from lusid.models.schedule import Schedule
 
 class FloatSchedule(Schedule):
     """
-    Schedule for fixed coupon payments  # noqa: E501
+    Schedule for floating rate coupon payments.  # noqa: E501
     """
-    start_date: Optional[datetime] = Field(None, alias="startDate", description="Date to start generate from")
-    maturity_date: Optional[datetime] = Field(None, alias="maturityDate", description="Date to generate to")
+    start_date: Optional[datetime] = Field(None, alias="startDate", description="Date from which LUSID starts generating the payment schedule.")
+    maturity_date: Optional[datetime] = Field(None, alias="maturityDate", description="Last date of the payment generation schedule. May not necessarily be the maturity date  of the underlying instrument (e.g. in case the instrument has multiple payment schedules).")
     flow_conventions: Optional[FlowConventions] = Field(None, alias="flowConventions")
     convention_name: Optional[FlowConventionName] = Field(None, alias="conventionName")
     ex_dividend_days: Optional[StrictInt] = Field(None, alias="exDividendDays", description="Optional. Number of calendar days in the ex-dividend period.  If the settlement date falls in the ex-dividend period then the coupon paid is zero and the accrued interest is negative.  If set, this must be a non-negative number.  If not set, or set to 0, then there is no ex-dividend period.                NOTE: This field is deprecated.  If you wish to set the ExDividendDays on a bond, please use the ExDividendConfiguration.")
@@ -41,7 +41,7 @@ class FloatSchedule(Schedule):
     notional: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="Scaling factor, the quantity outstanding on which the rate will be paid.")
     payment_currency: StrictStr = Field(..., alias="paymentCurrency", description="Payment currency. This does not have to be the same as the nominal bond or observation/reset currency.")
     spread: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="Spread over floating rate given as a fraction.")
-    stub_type: Optional[StrictStr] = Field(None, alias="stubType", description="StubType required of the schedule    Supported string (enumeration) values are: [ShortFront, ShortBack, LongBack, LongFront, Both].")
+    stub_type: Optional[StrictStr] = Field(None, alias="stubType", description="When a payment schedule doesn't have regular payment intervals just because of the  first and/or last coupons of the schedule, we call those irregular coupons stubs.  This configuration specifies what type of stub is used when building the schedule  Supported values are:  None = this is a regular payment schedule with no stubs. DO NOT use it with irregular schedules or you will get incorrect and unexpected behaviour.  ShortFront = this is an irregular payment schedule where only the first coupon is irregular, and covers a payment period that is shorter than the regular payment period.  ShortBack = this is an irregular payment schedule where only the last coupon is irregular, and covers a payment period that is shorter than the regular payment period.  LongFront = this is an irregular payment schedule where only the first coupon is irregular, and covers a payment period that is longer than the regular payment period.  LongBack = this is an irregular payment schedule where only the last coupon is irregular, and covers a payment period that is longer than the regular payment period.  Both = this is an irregular payment schedule where both the first and the last coupons are irregular, and the length of these periods is calculated based on the first coupon payment date that should have been explicitly set.")
     ex_dividend_configuration: Optional[ExDividendConfiguration] = Field(None, alias="exDividendConfiguration")
     compounding: Optional[Compounding] = None
     reset_convention: Optional[constr(strict=True, max_length=16, min_length=0)] = Field(None, alias="resetConvention", description="Control how resets are generated relative to payment convention(s).    Supported string (enumeration) values are: [InAdvance, InArrears].")

lusid/models/flow_conventions.py

@@ -20,6 +20,7 @@ import json
 
 from typing import Any, Dict, List, Optional
 from pydantic.v1 import BaseModel, Field, StrictBool, StrictInt, StrictStr, conlist, constr, validator
+from lusid.models.relative_date_offset import RelativeDateOffset
 
 class FlowConventions(BaseModel):
     """
@@ -37,9 +38,10 @@ class FlowConventions(BaseModel):
     accrual_date_adjustment: Optional[constr(strict=True, max_length=50, min_length=0)] = Field(None, alias="accrualDateAdjustment", description="Indicates if the accrual dates are adjusted using the business day convention. The default value is 'Adjusted'.    Supported string (enumeration) values are: [Adjusted, Unadjusted].")
     business_day_convention: Optional[StrictStr] = Field(None, alias="businessDayConvention", description="When generating a set of dates, what convention should be used for adjusting dates that coincide with a non-business day.    Supported string (enumeration) values are: [NoAdjustment, None, Previous, P, Following, F, ModifiedPrevious, MP, ModifiedFollowing, MF, HalfMonthModifiedFollowing, Nearest].")
     accrual_day_count_convention: Optional[constr(strict=True, max_length=50, min_length=0)] = Field(None, alias="accrualDayCountConvention", description="Optional, if not set the main DayCountConvention is used for all accrual calculations.  This only needs to be set when accrual uses a different day count to the coupon calculation.")
+    coupon_payment_lag: Optional[RelativeDateOffset] = Field(None, alias="couponPaymentLag")
     scope: Optional[constr(strict=True, max_length=256, min_length=1)] = Field(None, description="The scope used when updating or inserting the convention.")
     code: Optional[constr(strict=True, max_length=256, min_length=1)] = Field(None, description="The code of the convention.")
-    __properties = ["currency", "paymentFrequency", "dayCountConvention", "rollConvention", "paymentCalendars", "resetCalendars", "settleDays", "resetDays", "leapDaysIncluded", "accrualDateAdjustment", "businessDayConvention", "accrualDayCountConvention", "scope", "code"]
+    __properties = ["currency", "paymentFrequency", "dayCountConvention", "rollConvention", "paymentCalendars", "resetCalendars", "settleDays", "resetDays", "leapDaysIncluded", "accrualDateAdjustment", "businessDayConvention", "accrualDayCountConvention", "couponPaymentLag", "scope", "code"]
 
     @validator('scope')
     def scope_validate_regular_expression(cls, value):
@@ -85,6 +87,9 @@ class FlowConventions(BaseModel):
                           exclude={
                           },
                           exclude_none=True)
+        # override the default output from pydantic by calling `to_dict()` of coupon_payment_lag
+        if self.coupon_payment_lag:
+            _dict['couponPaymentLag'] = self.coupon_payment_lag.to_dict()
         # set to None if leap_days_included (nullable) is None
         # and __fields_set__ contains the field
         if self.leap_days_included is None and "leap_days_included" in self.__fields_set__:
@@ -139,6 +144,7 @@ class FlowConventions(BaseModel):
             "accrual_date_adjustment": obj.get("accrualDateAdjustment"),
             "business_day_convention": obj.get("businessDayConvention"),
             "accrual_day_count_convention": obj.get("accrualDayCountConvention"),
+            "coupon_payment_lag": RelativeDateOffset.from_dict(obj.get("couponPaymentLag")) if obj.get("couponPaymentLag") is not None else None,
             "scope": obj.get("scope"),
             "code": obj.get("code")
         })

lusid/models/fund_configuration.py

@@ -20,7 +20,7 @@ import json
 
 from typing import Any, Dict, List, Optional
 from pydantic.v1 import BaseModel, Field, StrictStr, conlist
-from lusid.models.component_rule import ComponentRule
+from lusid.models.component_filter import ComponentFilter
 from lusid.models.link import Link
 from lusid.models.model_property import ModelProperty
 from lusid.models.resource_id import ResourceId
@@ -34,13 +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.")
-    dealing_rule: Optional[ComponentRule] = Field(None, alias="dealingRule")
-    pnl_rule: Optional[ComponentRule] = Field(None, alias="pnlRule")
-    back_out_rule: Optional[ComponentRule] = Field(None, alias="backOutRule")
+    dealing_filters: Optional[conlist(ComponentFilter)] = Field(None, alias="dealingFilters", description="The set of filters used to decide which JE lines are included in the dealing.")
+    pnl_filters: Optional[conlist(ComponentFilter)] = Field(None, alias="pnlFilters", description="The set of filters used to decide which JE lines are included in the PnL.")
+    back_out_filters: Optional[conlist(ComponentFilter)] = Field(None, alias="backOutFilters", description="The set of filters used to decide which JE lines are included in the back outs.")
     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", "dealingRule", "pnlRule", "backOutRule", "properties", "version", "links"]
+    __properties = ["href", "id", "displayName", "description", "dealingFilters", "pnlFilters", "backOutFilters", "properties", "version", "links"]
 
     class Config:
         """Pydantic configuration"""
@@ -69,15 +69,27 @@ 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 dealing_rule
-        if self.dealing_rule:
-            _dict['dealingRule'] = self.dealing_rule.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of pnl_rule
-        if self.pnl_rule:
-            _dict['pnlRule'] = self.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 item in dealing_filters (list)
+        _items = []
+        if self.dealing_filters:
+            for _item in self.dealing_filters:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['dealingFilters'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in pnl_filters (list)
+        _items = []
+        if self.pnl_filters:
+            for _item in self.pnl_filters:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['pnlFilters'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in back_out_filters (list)
+        _items = []
+        if self.back_out_filters:
+            for _item in self.back_out_filters:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['backOutFilters'] = _items
         # override the default output from pydantic by calling `to_dict()` of each value in properties (dict)
         _field_dict = {}
         if self.properties:
@@ -110,6 +122,21 @@ class FundConfiguration(BaseModel):
         if self.description is None and "description" in self.__fields_set__:
             _dict['description'] = None
 
+        # set to None if dealing_filters (nullable) is None
+        # and __fields_set__ contains the field
+        if self.dealing_filters is None and "dealing_filters" in self.__fields_set__:
+            _dict['dealingFilters'] = None
+
+        # set to None if pnl_filters (nullable) is None
+        # and __fields_set__ contains the field
+        if self.pnl_filters is None and "pnl_filters" in self.__fields_set__:
+            _dict['pnlFilters'] = None
+
+        # set to None if back_out_filters (nullable) is None
+        # and __fields_set__ contains the field
+        if self.back_out_filters is None and "back_out_filters" in self.__fields_set__:
+            _dict['backOutFilters'] = 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__:
@@ -136,9 +163,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"),
-            "dealing_rule": ComponentRule.from_dict(obj.get("dealingRule")) if obj.get("dealingRule") is not None else None,
-            "pnl_rule": ComponentRule.from_dict(obj.get("pnlRule")) if obj.get("pnlRule") is not None else None,
-            "back_out_rule": ComponentRule.from_dict(obj.get("backOutRule")) if obj.get("backOutRule") is not None else None,
+            "dealing_filters": [ComponentFilter.from_dict(_item) for _item in obj.get("dealingFilters")] if obj.get("dealingFilters") is not None else None,
+            "pnl_filters": [ComponentFilter.from_dict(_item) for _item in obj.get("pnlFilters")] if obj.get("pnlFilters") is not None else None,
+            "back_out_filters": [ComponentFilter.from_dict(_item) for _item in obj.get("backOutFilters")] if obj.get("backOutFilters") 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,9 +18,9 @@ import re  # noqa: F401
 import json
 
 
-from typing import Any, Dict, Optional
-from pydantic.v1 import BaseModel, Field, constr, validator
-from lusid.models.component_rule import ComponentRule
+from typing import Any, Dict, List, Optional
+from pydantic.v1 import BaseModel, Field, conlist, constr, validator
+from lusid.models.component_filter import ComponentFilter
 from lusid.models.model_property import ModelProperty
 
 class FundConfigurationRequest(BaseModel):
@@ -30,11 +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.")
-    dealing_rule: ComponentRule = Field(..., alias="dealingRule")
-    pnl_rule: ComponentRule = Field(..., alias="pnlRule")
-    back_out_rule: ComponentRule = Field(..., alias="backOutRule")
+    dealing_filters: conlist(ComponentFilter) = Field(..., alias="dealingFilters", description="The set of filters used to decide which JE lines are included in the dealing.")
+    pnl_filters: conlist(ComponentFilter) = Field(..., alias="pnlFilters", description="The set of filters used to decide which JE lines are included in the PnL.")
+    back_out_filters: conlist(ComponentFilter) = Field(..., alias="backOutFilters", description="The set of filters used to decide which JE lines are included in the back outs.")
     properties: Optional[Dict[str, ModelProperty]] = Field(None, description="A set of properties for the Fund Configuration.")
-    __properties = ["code", "displayName", "description", "dealingRule", "pnlRule", "backOutRule", "properties"]
+    __properties = ["code", "displayName", "description", "dealingFilters", "pnlFilters", "backOutFilters", "properties"]
 
     @validator('code')
     def code_validate_regular_expression(cls, value):
@@ -77,15 +77,27 @@ class FundConfigurationRequest(BaseModel):
                           exclude={
                           },
                           exclude_none=True)
-        # 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 pnl_rule
-        if self.pnl_rule:
-            _dict['pnlRule'] = self.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 item in dealing_filters (list)
+        _items = []
+        if self.dealing_filters:
+            for _item in self.dealing_filters:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['dealingFilters'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in pnl_filters (list)
+        _items = []
+        if self.pnl_filters:
+            for _item in self.pnl_filters:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['pnlFilters'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in back_out_filters (list)
+        _items = []
+        if self.back_out_filters:
+            for _item in self.back_out_filters:
+                if _item:
+                    _items.append(_item.to_dict())
+            _dict['backOutFilters'] = _items
         # override the default output from pydantic by calling `to_dict()` of each value in properties (dict)
         _field_dict = {}
         if self.properties:
@@ -123,9 +135,9 @@ class FundConfigurationRequest(BaseModel):
             "code": obj.get("code"),
             "display_name": obj.get("displayName"),
             "description": obj.get("description"),
-            "dealing_rule": ComponentRule.from_dict(obj.get("dealingRule")) if obj.get("dealingRule") is not None else None,
-            "pnl_rule": ComponentRule.from_dict(obj.get("pnlRule")) if obj.get("pnlRule") is not None else None,
-            "back_out_rule": ComponentRule.from_dict(obj.get("backOutRule")) if obj.get("backOutRule") is not None else None,
+            "dealing_filters": [ComponentFilter.from_dict(_item) for _item in obj.get("dealingFilters")] if obj.get("dealingFilters") is not None else None,
+            "pnl_filters": [ComponentFilter.from_dict(_item) for _item in obj.get("pnlFilters")] if obj.get("pnlFilters") is not None else None,
+            "back_out_filters": [ComponentFilter.from_dict(_item) for _item in obj.get("backOutFilters")] if obj.get("backOutFilters") is not None else None,
             "properties": dict(
                 (_k, ModelProperty.from_dict(_v))
                 for _k, _v in obj.get("properties").items()