systemlink-cli 1.15.1__tar.gz → 1.15.2__tar.gz

{systemlink_cli-1.15.1 → systemlink_cli-1.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.15.1
+Version: 1.15.2
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser

{systemlink_cli-1.15.1 → systemlink_cli-1.15.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.15.1"
+version = "1.15.2"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]

{systemlink_cli-1.15.1 → systemlink_cli-1.15.2}/slcli/_version.py

@@ -1,4 +1,4 @@
 """Version information for slcli."""
 
 # This file is auto-generated. Do not edit manually.
-__version__ = "1.15.1"
+__version__ = "1.15.2"

{systemlink_cli-1.15.1 → systemlink_cli-1.15.2}/slcli/dff_click.py

@@ -49,6 +49,16 @@ VALID_FIELD_TYPES = [
     "LinkedResource",
 ]
 
+_FIELD_TYPE_CANONICAL_MAP = {
+    "text": "TEXT",
+    "number": "NUMBER",
+    "boolean": "BOOLEAN",
+    "enum": "ENUM",
+    "datetime": "DATE_TIME",
+    "table": "TABLE",
+    "linkedresource": "LINKED_RESOURCE",
+}
+
 # Help text for resource type parameter
 RESOURCE_TYPE_HELP = f"Resource type. Valid values: {', '.join(VALID_RESOURCE_TYPES)}"
 
@@ -162,13 +172,79 @@ def validate_field_type(field_type: str) -> None:
     Raises:
         click.ClickException: If the field type is not valid
     """
-    if field_type not in VALID_FIELD_TYPES:
+    if not isinstance(field_type, str):
+        raise click.ClickException(
+            f"Invalid field type: '{field_type}'. Field type must be a string."
+        )
+
+    normalized_field_type = "".join(ch for ch in field_type if ch.isalnum()).lower()
+    if normalized_field_type not in _FIELD_TYPE_CANONICAL_MAP:
         valid_types_str = ", ".join(VALID_FIELD_TYPES)
         raise click.ClickException(
             f"Invalid field type: '{field_type}'. " f"Valid types are: {valid_types_str}"
         )
 
 
+def _canonicalize_field_type(field_type: str) -> str:
+    """Convert user-facing or exported field type values to API enum values."""
+    validate_field_type(field_type)
+    normalized_field_type = "".join(ch for ch in field_type if ch.isalnum()).lower()
+    return _FIELD_TYPE_CANONICAL_MAP[normalized_field_type]
+
+
+def _coerce_dff_payload_to_import_format(data: Any) -> Dict[str, Any]:
+    """Normalize imported/exported DFF payloads into the create/update envelope."""
+    if isinstance(data, list):
+        return {"configurations": data}
+
+    if isinstance(data, dict):
+        if "configuration" in data and "configurations" not in data:
+            configuration = data.get("configuration")
+            return {
+                "configurations": [configuration] if configuration is not None else [],
+                "groups": data.get("groups", []),
+                "fields": data.get("fields", []),
+            }
+
+        if "configurations" not in data:
+            return {"configurations": [data]}
+
+        return data
+
+    raise click.ClickException(
+        "Invalid custom field payload: root JSON value must be an object or array."
+    )
+
+
+def _normalize_dff_payload_for_write(data: Any) -> Dict[str, Any]:
+    """Prepare DFF create/update payloads for API submission."""
+    normalized_data = _coerce_dff_payload_to_import_format(data)
+
+    configurations = normalized_data.get("configurations", [])
+    for i, config in enumerate(configurations):
+        if isinstance(config, dict):
+            resource_type = config.get("resourceType")
+            if resource_type:
+                try:
+                    validate_resource_type(resource_type)
+                except click.ClickException as e:
+                    raise click.ClickException(
+                        f"Invalid resource type in configuration {i + 1}: {e.message}"
+                    )
+
+    fields = normalized_data.get("fields", [])
+    for i, field in enumerate(fields):
+        if isinstance(field, dict):
+            field_type = field.get("type")
+            if field_type:
+                try:
+                    field["type"] = _canonicalize_field_type(field_type)
+                except click.ClickException as e:
+                    raise click.ClickException(f"Invalid field type in field {i + 1}: {e.message}")
+
+    return normalized_data
+
+
 def _query_all_groups(
     workspace_filter: Optional[str] = None, workspace_map: Optional[dict] = None
 ) -> List[Dict[str, Any]]:
@@ -441,41 +517,7 @@ def register_dff_commands(cli: Any) -> None:
         url = f"{get_base_url()}/nidynamicformfields/v1/configurations"
 
         try:
-            data = load_json_file(input_file)
-
-            # Ensure data is in the expected format
-            if isinstance(data, dict) and "configurations" not in data:
-                # Wrap single configuration
-                data = {"configurations": [data]}
-            elif isinstance(data, list):
-                # Wrap list of configurations
-                data = {"configurations": data}
-
-            # Validate resource types in configurations
-            configurations = data.get("configurations", [])
-            for i, config in enumerate(configurations):
-                if isinstance(config, dict):
-                    resource_type = config.get("resourceType")
-                    if resource_type:
-                        try:
-                            validate_resource_type(resource_type)
-                        except click.ClickException as e:
-                            raise click.ClickException(
-                                f"Invalid resource type in configuration {i + 1}: {e.message}"
-                            )
-
-            # Validate field types in fields
-            fields = data.get("fields", [])
-            for i, field in enumerate(fields):
-                if isinstance(field, dict):
-                    field_type = field.get("type")
-                    if field_type:
-                        try:
-                            validate_field_type(field_type)
-                        except click.ClickException as e:
-                            raise click.ClickException(
-                                f"Invalid field type in field {i + 1}: {e.message}"
-                            )
+            data = _normalize_dff_payload_for_write(load_json_file(input_file))
 
             # Make API request without automatic error handling to parse validation errors
             resp = make_api_request("POST", url, data, handle_errors=False)
@@ -523,6 +565,9 @@ def register_dff_commands(cli: Any) -> None:
 
                     sys.exit(ExitCodes.GENERAL_ERROR)
 
+        except click.ClickException as exc:
+            click.echo(f"✗ {exc.message}", err=True)
+            sys.exit(ExitCodes.INVALID_INPUT)
         except requests.RequestException as exc:
             # Handle HTTP errors with detailed validation error parsing
             if hasattr(exc, "response") and exc.response is not None:
@@ -563,13 +608,7 @@ def register_dff_commands(cli: Any) -> None:
         url = f"{get_base_url()}/nidynamicformfields/v1/update-configurations"
 
         try:
-            data = load_json_file(input_file)
-
-            # Ensure data is in the expected format
-            if isinstance(data, dict) and "configurations" not in data:
-                data = {"configurations": [data]}
-            elif isinstance(data, list):
-                data = {"configurations": data}
+            data = _normalize_dff_payload_for_write(load_json_file(input_file))
 
             resp = make_api_request("POST", url, data, handle_errors=False)
             response_data = resp.json() if resp.text.strip() else {}
@@ -613,6 +652,9 @@ def register_dff_commands(cli: Any) -> None:
                                 f"  - {config.get('name', 'Unknown')}: {config.get('id', '')}"
                             )
 
+        except click.ClickException as exc:
+            click.echo(f"✗ {exc.message}", err=True)
+            sys.exit(ExitCodes.INVALID_INPUT)
         except requests.RequestException as exc:
             # Handle HTTP errors with detailed validation error parsing
             if hasattr(exc, "response") and exc.response is not None:
@@ -774,11 +816,16 @@ def register_dff_commands(cli: Any) -> None:
             full_url = f"{url}?{query_string}"
 
             resp = make_api_request("GET", full_url)
-            data = resp.json()
+            data = _coerce_dff_payload_to_import_format(resp.json())
 
             # Generate output filename if not provided
             if not output:
-                config_name = data.get("configuration", {}).get("name", f"config-{config_id}")
+                configurations = data.get("configurations", [])
+                config_name = (
+                    configurations[0].get("name", f"config-{config_id}")
+                    if configurations
+                    else f"config-{config_id}"
+                )
                 safe_name = sanitize_filename(config_name, f"config-{config_id}")
                 output = f"{safe_name}.json"