Improve support for order weight in menu

Author: dgarros

infrahub_sdk/ctl/cli_commands.py

@@ -28,9 +28,13 @@
 from infrahub_sdk.ctl.repository import app as repository_app
 from infrahub_sdk.ctl.repository import get_repository_config
 from infrahub_sdk.ctl.schema import app as schema_app
-from infrahub_sdk.ctl.schema import load_schemas_from_disk_and_exit
 from infrahub_sdk.ctl.transform import list_transforms
-from infrahub_sdk.ctl.utils import catch_exception, execute_graphql_query, parse_cli_vars
+from infrahub_sdk.ctl.utils import (
+    catch_exception,
+    execute_graphql_query,
+    load_yamlfile_from_disk_and_exit,
+    parse_cli_vars,
+)
 from infrahub_sdk.ctl.validate import app as validate_app
 from infrahub_sdk.exceptions import GraphQLError, InfrahubTransformNotFoundError
 from infrahub_sdk.jinja2 import identify_faulty_jinja_code
@@ -41,6 +45,7 @@
 )
 from infrahub_sdk.transforms import get_transform_class_instance
 from infrahub_sdk.utils import get_branch, write_to_file
+from infrahub_sdk.yaml import SchemaFile
 
 from .exporter import dump
 from .importer import load
@@ -343,7 +348,7 @@ def protocols(  # noqa: PLR0915
     schema: dict[str, MainSchemaTypes] = {}
 
     if schemas:
-        schemas_data = load_schemas_from_disk_and_exit(schemas=schemas)
+        schemas_data = load_yamlfile_from_disk_and_exit(paths=schemas, file_type=SchemaFile, console=console)
 
         for data in schemas_data:
             data.load_content()

infrahub_sdk/ctl/menu.py

@@ -1,3 +1,4 @@
+import logging
 from pathlib import Path
 
 import typer
@@ -34,6 +35,8 @@ async def load(
 
     init_logging(debug=debug)
 
+    logging.getLogger("infrahub_sdk").setLevel(logging.INFO)
+
     files = load_yamlfile_from_disk_and_exit(paths=menus, file_type=MenuFile, console=console)
     client = await initialize_client()
 
@@ -46,7 +49,12 @@ async def load(
 
         schema = await client.schema.get(kind=file.spec.kind, branch=branch)
 
-        for item in file.spec.data:
+        for idx, item in enumerate(file.spec.data):
             await file.spec.create_node(
-                client=client, schema=schema, data=item, branch=branch, default_schema_kind=default_kind
+                client=client,
+                schema=schema,
+                data=item,
+                branch=branch,
+                default_schema_kind=default_kind,
+                context={"list_index": idx},
             )

infrahub_sdk/spec/menu.py

@@ -7,9 +7,13 @@
 
 class InfrahubMenuFileData(InfrahubObjectFileData):
     @classmethod
-    def enrich_node(cls, data: dict) -> dict:
+    def enrich_node(cls, data: dict, context: dict) -> dict:
         if "kind" in data and "path" not in data:
             data["path"] = "/objects/" + data["kind"]
+
+        if "list_index" in context and "order_weight" not in data:
+            data["order_weight"] = (context["list_index"] + 1) * 1000
+
         return data
 
 

infrahub_sdk/spec/object.py

@@ -12,7 +12,7 @@ class InfrahubObjectFileData(BaseModel):
     data: list[dict[str, Any]] = Field(default_factory=list)
 
     @classmethod
-    def enrich_node(cls, data: dict) -> dict:
+    def enrich_node(cls, data: dict, context: dict) -> dict:
         return data
 
     @classmethod
@@ -52,13 +52,19 @@ async def create_node(
                 remaining_rels.append(key)
 
         if context:
-            clean_data.update(context)
+            clean_context = {
+                ckey: cvalue
+                for ckey, cvalue in context.items()
+                if ckey in schema.relationship_names + schema.attribute_names
+            }
+            clean_data.update(clean_context)
 
-        clean_data = cls.enrich_node(data=clean_data)
+        clean_data = cls.enrich_node(data=clean_data, context=context or {})
 
         node = await client.create(kind=schema.kind, branch=branch, data=clean_data)
         await node.save(allow_upsert=True)
-        print(f"Created Node: {node.get_human_friendly_id_as_string()}")
+        display_label = node.get_human_friendly_id_as_string() or f"{node.get_kind()} : {node.id}"
+        client.log.info(f"Node: {display_label}")
 
         for rel in remaining_rels:
             # identify what is the name of the relationship on the other side
@@ -90,7 +96,8 @@ async def create_node(
                 )
 
             elif rel_schema.cardinality == "many" and isinstance(rel_data, list):
-                for peer_data in rel_data:
+                for idx, peer_data in enumerate(rel_data):
+                    context["list_index"] = idx
                     await cls.create_node(
                         client=client,
                         schema=peer_schema,