Merge pull request #95 from opsmill/copilot/fix-94

Add support for List attribute kind in schema generator

Author: BeArchiTek

infrahub_sync/__init__.py

@@ -6,7 +6,8 @@
 
 import pydantic
 from diffsync.enum import DiffSyncFlags
-from jinja2 import Template
+from jinja2 import StrictUndefined
+from jinja2.nativetypes import NativeEnvironment
 from netutils.ip import is_ip_within as netutils_is_ip_within
 from packaging import version
 
@@ -170,17 +171,29 @@ def apply_filters(cls, item: dict[str, Any], filters: list[SchemaMappingFilter])
 
     @classmethod
     def apply_transform(cls, item: dict[str, Any], transform_expr: str, field: str) -> None:
-        """Apply a transformation expression using Jinja2 to a specified field in the item."""
-        try:
-            # Create a Jinja2 template from the transformation expression
-            template = Template(transform_expr)
+        """Apply a transformation expression using Jinja2 to a specified field in the item.
 
-            # Render the template using the item's context
+        Uses Jinja's NativeEnvironment so expressions return native Python types
+        (list/dict/bool/int/str) instead of always strings.
+        """
+        try:
+            native_env = NativeEnvironment(
+                undefined=StrictUndefined,  # fail fast on missing keys
+                autoescape=False,
+                trim_blocks=True,
+                lstrip_blocks=True,
+            )
+            # Compile the template with the native env
+            template = native_env.from_string(transform_expr)
+
+            # Render with the item as context → returns a native Python value
             transformed_value = template.render(**item)
 
-            # Assign the result back to the item if not empty
-            if transformed_value:
+            # Always assign the result, even if it's an empty list/dict/False/0.
+            # Only skip if the result is literally None (meaning "don't set").
+            if transformed_value is not None:
                 item[field] = transformed_value
+
         except Exception as exc:
             msg = f"Failed to transform '{field}' with '{transform_expr}': {exc}"
             raise ValueError(msg) from exc

infrahub_sync/adapters/infrahub.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import copy
+import ipaddress
 import os
 from typing import TYPE_CHECKING, Any
 
@@ -294,6 +295,14 @@ def infrahub_node_to_diffsync(self, node: InfrahubNodeSync) -> dict[str, Any]:
                 # got a ValidationError from pydantic while trying to get the model(**data)
                 # for IPHost and IPInterface
                 data[attr_name] = str(attr.value) if attr.value and not isinstance(attr.value, str) else attr.value
+                val = attr.value
+                if isinstance(
+                    val,
+                    (ipaddress.IPv4Interface, ipaddress.IPv6Interface, ipaddress.IPv4Network, ipaddress.IPv6Network),
+                ):
+                    data[attr_name] = str(val)
+                else:
+                    data[attr_name] = val
 
         for rel_schema in node._schema.relationships:
             if not has_field(config=self.config, name=node._schema.kind, field=rel_schema.name):

infrahub_sync/adapters/ipfabricsync.py

@@ -6,6 +6,7 @@
     from typing import Self
 except ImportError:
     from typing_extensions import Self
+import json
 
 try:
     from ipfabric import IPFClient
@@ -81,7 +82,9 @@ def model_loader(self, model_name: str, model: IpfabricsyncModel) -> None:
                 transformed_objs = table
 
             for obj in transformed_objs:
+                print(f"Object to load: {obj}")
                 data = self.ipfabric_dict_to_diffsync(obj=obj, mapping=element, model=model)
+                print(f"Data to load: {data}")
                 item = model(**data)
                 self.update_or_add_model_instance(item)
 
@@ -102,8 +105,25 @@ def ipfabric_dict_to_diffsync(self, obj: dict, mapping: SchemaMappingModel, mode
                     else:
                         data[field.name] = value
             elif field_is_list and field.mapping and not field.reference:
-                msg = "it's not supported yet to have an attribute of type list with a simple mapping"
-                raise NotImplementedError(msg)
+                # Handle list data for attributes like ntp_servers
+                list_value = obj.get(field.mapping)
+                if list_value is not None:
+                    # Ensure we end up with a real Python list.
+                    if isinstance(list_value, str):
+                        # Try to parse as JSON first.
+                        s = list_value.strip()
+                        try:
+                            parsed = json.loads(s)
+                        except (json.JSONDecodeError, TypeError):
+                            # Fallbacks: comma-separated -> list; otherwise singleton list
+                            parsed = [part.strip() for part in s.split(",")] if "," in s else [s]
+                        list_value = parsed
+                    # If it's not a list yet, wrap it.
+                    if not isinstance(list_value, list):
+                        list_value = [list_value]
+                    data[field.name] = list_value
+                else:
+                    data[field.name] = []
 
             elif field.mapping and field.reference:
                 all_nodes_for_reference = self.store.get_all(model=field.reference)

infrahub_sync/generator/__init__.py

@@ -25,6 +25,7 @@
     "Integer": "int",
     "Boolean": "bool",
     "Checkbox": "bool",
+    "List": "list[Any]",
 }