finbourne-sdk-utils 0.0.32__py3-none-any.whl → 0.0.33__py3-none-any.whl

finbourne_sdk_utils/cocoon/utilities.py

@@ -692,48 +692,26 @@ def get_required_attributes_from_model(model_object) -> list:
         The required attributes
     """
 
-    # Get the source code for the model
-    model_details = inspect.getsource(model_object)
-
-    # bit of cleansing to aid the regex
-    model_details = model_details.replace('"""','')
-    model_details = model_details.replace( r"\n","\n")
-    
-    
-    required_attributes = re.findall(r'(\w+):.*?= Field\(\.\.\.,', model_details)
-    all_attributes = re.findall(r'^\s*(\w+):', model_details, re.MULTILINE)
-    
-
-    # Set the status (required or optional) for each attribute based on whether "is None:" exists in the setter function
-    '''
-    Here are two examples
-    
-    A) A None value is not allowed and hence this is required. Notice the "if identifiers is None:" condition. 
+    required_attributes = []
     
-    @identifiers.setter
-    def identifiers(self, identifiers):
-        """Sets the identifiers of this InstrumentDefinition.
-        A set of identifiers that can be used to identify the instrument. At least one of these must be configured to be a unique identifier.  # noqa: E501
-        :param identifiers: The identifiers of this InstrumentDefinition.  # noqa: E501
-        :type: dict(str, InstrumentIdValue)
-        """
-        if identifiers is None:
-            raise ValueError("Invalid value for `identifiers`, must not be `None`")  # noqa: E501
+    # Use pydantic's __fields__ to determine required fields
+    # This is more reliable than parsing source code
+    if hasattr(model_object, '__fields__'):
+        for field_name, field_info in model_object.__fields__.items():
+            # In Pydantic v1, required fields have field_info.required = True
+            if field_info.required:
+                required_attributes.append(field_name)
+    else:
+        # Fallback to old regex-based approach for backwards compatibility
+        # Get the source code for the model
+        model_details = inspect.getsource(model_object)
 
-        self._identifiers = identifiers
+        # bit of cleansing to aid the regex
+        model_details = model_details.replace('"""','')
+        model_details = model_details.replace( r"\n","\n")
         
-    B) A None value is allowed and hence this is optional
+        required_attributes = re.findall(r'(\w+):.*?= Field\(\.\.\.,', model_details)
     
-    @look_through_portfolio_id.setter
-    def look_through_portfolio_id(self, look_through_portfolio_id):
-        """Sets the look_through_portfolio_id of this InstrumentDefinition.
-        :param look_through_portfolio_id: The look_through_portfolio_id of this InstrumentDefinition.  # noqa: E501
-        :type: ResourceId
-        """
-
-        self._look_through_portfolio_id = look_through_portfolio_id
-
-    '''
     return required_attributes
 
 

{finbourne_sdk_utils-0.0.32.dist-info → finbourne_sdk_utils-0.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: finbourne-sdk-utils
-Version: 0.0.32
+Version: 0.0.33
 Summary: Python utilities for LUSID V2 SDK
 Home-page: https://github.com/finbourne/finbourne-sdk-utils
 Author: FINBOURNE Technology

{finbourne_sdk_utils-0.0.32.dist-info → finbourne_sdk_utils-0.0.33.dist-info}/RECORD

@@ -11,7 +11,7 @@ finbourne_sdk_utils/cocoon/properties.py,sha256=wxGZDopWSg_hruCwADYRuWI9ZiXBvG3q
 finbourne_sdk_utils/cocoon/seed_sample_data.py,sha256=SYvuq08j8BbzE3uQMoTmS-xrNtbJ2IRg6KJ1PBm-uVI,4390
 finbourne_sdk_utils/cocoon/systemConfiguration.py,sha256=qheX-jVTaKuD34DSJn57RyTu4jlLMyXjkSYGVe8goIM,3284
 finbourne_sdk_utils/cocoon/transaction_type_upload.py,sha256=xASAzh7ycOzksW--azya-QMtgci48w4phfhyxw7v-gg,4439
-finbourne_sdk_utils/cocoon/utilities.py,sha256=3YNRll7OlxtCZIPlyvSyBiw9KWpLMTBI1pHCX6J6A_w,63103
+finbourne_sdk_utils/cocoon/utilities.py,sha256=_WMjKbuVJdr01WZm16x8GSx-Hd-XUpJ7NdfZC3Zo5Nk,62206
 finbourne_sdk_utils/cocoon/validator.py,sha256=Cguv5O6FR4y4OtRIFrXLy7oQ_XfjHnBo9PNplYi2y_M,7381
 finbourne_sdk_utils/cocoon/config/domain_settings.json,sha256=qFcdoiNRLIBD1QNBKwvyfPSUdYLE0DgQfVk_0qH4xcs,3504
 finbourne_sdk_utils/cocoon/config/seed_sample_data.json,sha256=V7PQoe8x3TIzvnVFoSfynP9dqlo6Z_68lvLlmKxD5xc,1186
@@ -45,8 +45,8 @@ finbourne_sdk_utils/lpt/txn_config.py,sha256=4WIEzypXXuoHdbEDJLl90iZj7dYfV-KaE8d
 finbourne_sdk_utils/lpt/txn_config_yaml.py,sha256=F5kHG-7l5khJvnaLEndHurgmannCi-Pt3U6MMJRuJ9Y,17717
 finbourne_sdk_utils/pandas_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 finbourne_sdk_utils/pandas_utils/lusid_pandas.py,sha256=rJENs5lIYEKcwvYaagKc-ei_3sOnbNZT9oFLuO8PU6Y,4900
-finbourne_sdk_utils-0.0.32.dist-info/LICENSE,sha256=pT32QD9c76jv4OMjXhZrYpjqlZTuiex52qmKUsLKRQc,1066
-finbourne_sdk_utils-0.0.32.dist-info/METADATA,sha256=PLmD0Pd_HPpmGPiZli8d9M_QDDKbxBPPeeKIcaPifHw,731
-finbourne_sdk_utils-0.0.32.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-finbourne_sdk_utils-0.0.32.dist-info/top_level.txt,sha256=DiS6bVuYtHoXKSgWOlYhiXKPVFCJqhdtmQgMCGNZxxY,29
-finbourne_sdk_utils-0.0.32.dist-info/RECORD,,
+finbourne_sdk_utils-0.0.33.dist-info/LICENSE,sha256=pT32QD9c76jv4OMjXhZrYpjqlZTuiex52qmKUsLKRQc,1066
+finbourne_sdk_utils-0.0.33.dist-info/METADATA,sha256=z1o4qEZd8G3F3zajULuZaXEy0IXmmrzJe0Of7qCPNZ4,731
+finbourne_sdk_utils-0.0.33.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+finbourne_sdk_utils-0.0.33.dist-info/top_level.txt,sha256=DiS6bVuYtHoXKSgWOlYhiXKPVFCJqhdtmQgMCGNZxxY,29
+finbourne_sdk_utils-0.0.33.dist-info/RECORD,,