fixes for copilot reviews and add complex support for picklist attribute type

Author: vrathee-msft

src/PowerPlatform/Dataverse/data/_odata.py

@@ -1364,7 +1364,12 @@ def _build_localizedlabels_payload(self, translations: Dict[int, str]) -> Dict[s
         }
 
     def _enum_optionset_payload(
-        self, column_schema_name: str, enum_cls: type[Enum], is_primary_name: bool = False
+        self,
+        column_schema_name: str,
+        enum_cls: type[Enum],
+        is_primary_name: bool = False,
+        *,
+        complex: bool = False,
     ) -> Dict[str, Any]:
         """Create local (IsGlobal=False) PicklistAttributeMetadata from an Enum subclass.
 
@@ -1375,7 +1380,14 @@ def _enum_optionset_payload(
         Keys inside per-language dict may be either enum member objects or their names.
         If a language lacks a label for a member, member.name is used as fallback.
         The client's configured language code is always ensured to exist.
+
+        :param complex: When ``True``, emit ``ComplexPicklistAttributeMetadata`` /
+            ``ComplexOptionSetMetadata`` types required by the ``CreateEntities``
+            action. When ``False`` (default), emit the standard types used by the
+            ``EntityDefinitions/{id}/Attributes`` endpoint.
         """
+        prefix = "Microsoft.Dynamics.CRM.Complex" if complex else "Microsoft.Dynamics.CRM."
+
         all_member_items = list(enum_cls.__members__.items())
         if not all_member_items:
             raise ValueError(f"Enum {enum_cls.__name__} has no members")
@@ -1436,21 +1448,21 @@ def _enum_optionset_payload(
                 per_lang[lang] = label_text
             options.append(
                 {
-                    "@odata.type": "Microsoft.Dynamics.CRM.OptionMetadata",
+                    "@odata.type": f"{prefix}.OptionMetadata",
                     "Value": m.value,
                     "Label": self._build_localizedlabels_payload(per_lang),
                 }
             )
 
         attr_label = column_schema_name.split("_")[-1]
         return {
-            "@odata.type": "Microsoft.Dynamics.CRM.PicklistAttributeMetadata",
+            "@odata.type": f"{prefix}PicklistAttributeMetadata",
             "SchemaName": column_schema_name,
             "DisplayName": self._label(attr_label),
             "RequiredLevel": {"Value": "None"},
             "IsPrimaryName": bool(is_primary_name),
             "OptionSet": {
-                "@odata.type": "Microsoft.Dynamics.CRM.OptionSetMetadata",
+                "@odata.type": f"{prefix}OptionSetMetadata",
                 "IsGlobal": False,
                 "Options": options,
             },
@@ -1597,7 +1609,9 @@ def _attribute_payload(
         """
         # Enum-based local option set support
         if isinstance(dtype, type) and issubclass(dtype, Enum):
-            return self._enum_optionset_payload(column_schema_name, dtype, is_primary_name=is_primary_name)
+            return self._enum_optionset_payload(
+                column_schema_name, dtype, is_primary_name=is_primary_name, complex=complex
+            )
         if not isinstance(dtype, str):
             raise ValueError(
                 f"Unsupported column spec type for '{column_schema_name}': {type(dtype)} (expected str or Enum subclass)"

tests/unit/data/test_odata_internal.py

@@ -1519,7 +1519,7 @@ def test_int_dtype(self):
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.IntegerAttributeMetadata")
 
     def test_complex_int_dtype(self):
-        """'int' produces ComplexIntegerAttributeMetadata."""
+        """'int' with complex=True produces ComplexIntegerAttributeMetadata."""
         result = self.od._attribute_payload("new_Count", "int", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexIntegerAttributeMetadata")
 
@@ -1534,7 +1534,7 @@ def test_decimal_dtype(self):
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.DecimalAttributeMetadata")
 
     def test_complex_decimal_dtype(self):
-        """'decimal' produces ComplexDecimalAttributeMetadata."""
+        """'decimal' with complex=True produces ComplexDecimalAttributeMetadata."""
         result = self.od._attribute_payload("new_Price", "decimal", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexDecimalAttributeMetadata")
 
@@ -1549,7 +1549,7 @@ def test_float_dtype(self):
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.DoubleAttributeMetadata")
 
     def test_complex_float_dtype(self):
-        """'float' produces ComplexDoubleAttributeMetadata."""
+        """'float' with complex=True produces ComplexDoubleAttributeMetadata."""
         result = self.od._attribute_payload("new_Score", "float", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexDoubleAttributeMetadata")
 
@@ -1564,7 +1564,7 @@ def test_datetime_dtype(self):
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.DateTimeAttributeMetadata")
 
     def test_complex_datetime_dtype(self):
-        """'datetime' produces ComplexDateTimeAttributeMetadata."""
+        """'datetime' with complex=True produces ComplexDateTimeAttributeMetadata."""
         result = self.od._attribute_payload("new_CreatedDate", "datetime", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexDateTimeAttributeMetadata")
 
@@ -1579,7 +1579,7 @@ def test_bool_dtype(self):
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.BooleanAttributeMetadata")
 
     def test_complex_bool_dtype(self):
-        """'bool' produces ComplexBooleanAttributeMetadata."""
+        """'bool' with complex=True produces ComplexBooleanAttributeMetadata."""
         result = self.od._attribute_payload("new_IsActive", "bool", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexBooleanAttributeMetadata")
 
@@ -1594,7 +1594,7 @@ def test_file_dtype(self):
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.FileAttributeMetadata")
 
     def test_complex_file_dtype(self):
-        """'file' produces ComplexFileAttributeMetadata."""
+        """'file' with complex=True produces ComplexFileAttributeMetadata."""
         result = self.od._attribute_payload("new_Attachment", "file", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexFileAttributeMetadata")
 
@@ -1613,7 +1613,7 @@ def test_memo_type(self):
         self.assertNotIn("IsPrimaryName", result)
 
     def test_complex_memo_type(self):
-        """'memo' produces ComplexMemoAttributeMetadata with MaxLength 4000."""
+        """'memo' with complex=True produces ComplexMemoAttributeMetadata with MaxLength 4000."""
         result = self.od._attribute_payload("new_Notes", "memo", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexMemoAttributeMetadata")
         self.assertEqual(result["SchemaName"], "new_Notes")
@@ -1635,7 +1635,7 @@ def test_string_type_max_length(self):
         self.assertEqual(result["FormatName"], {"Value": "Text"})
 
     def test_complex_string_type_max_length(self):
-        """'string' produces ComplexStringAttributeMetadata with MaxLength 200."""
+        """'string' with complex=True produces ComplexStringAttributeMetadata with MaxLength 200."""
         result = self.od._attribute_payload("new_Title", "string", complex=True)
         self.assertEqual(result["@odata.type"], "Microsoft.Dynamics.CRM.ComplexStringAttributeMetadata")
         self.assertEqual(result["MaxLength"], 200)