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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.13.21
+Version: 1.15.2
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: click (>=7.1.2)
-Requires-Dist: cryptography (>=46.0.7)
+Requires-Dist: cryptography (>=49.0.0)
 Requires-Dist: keyring (>=25.6.0,<26.0.0)
 Requires-Dist: packaging (>=21.0)
 Requires-Dist: pygments (>=2.20.0)

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

@@ -1,12 +1,14 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.13.21"
+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" }]
 include = [
     { path = "dff-editor/index.html", format = ["wheel", "sdist"] },
     { path = "dff-editor/editor.js", format = ["wheel", "sdist"] },
+    { path = "slcli/skills", format = ["wheel", "sdist"] },
+    { path = "slcli/webapp_templates", format = ["wheel", "sdist"] },
 ]
 
 
@@ -39,7 +41,7 @@ questionary = "^2.1.1"
 packaging = ">=21.0"
 rich = ">=15,<16"
 rich-click = ">=1.8,<2"
-cryptography = ">=46.0.7"
+cryptography = ">=49.0.0"
 pygments = ">=2.20.0"
 
 
@@ -55,9 +57,9 @@ flake8-import-order = ">=0.19.2"
 isort = ">=6.0.1,<9"
 pep8-naming = ">=0.15.1"
 lxml = ">=6.1.0"
-pyjwt = ">=2.12.0"
+pyjwt = ">=2.13.0"
 python-dotenv = ">=1.2.2"
-python-multipart = ">=0.0.26"
+python-multipart = ">=0.0.32"
 
 # Type checking
 mypy = ">=1.0"

{systemlink_cli-1.13.21 → 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.13.21"
+__version__ = "1.15.2"

{systemlink_cli-1.13.21 → 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"
 

{systemlink_cli-1.13.21 → systemlink_cli-1.15.2}/slcli/skill_click.py

@@ -1,25 +1,16 @@
 """Agent Skills install command for slcli."""
 
+import shutil
 import sys
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
 import click
 
-from .utils import ExitCodes
+from .utils import ExitCodes, format_success
 
 SKILL_NAME = "slcli"
-TEMPORARILY_UNAVAILABLE_MESSAGE = (
-    "AI skills are currently unavailable and cannot be installed right now."
-)
-_FALLBACK_SKILL_CHOICES = [
-    "nipkg-file-package",
-    "slcli",
-    "systemlink-job-debugging",
-    "systemlink-notebook",
-    "systemlink-python-test",
-    "systemlink-webapp",
-]
+_FALLBACK_SKILL_CHOICES = [SKILL_NAME]
 
 # Mapping of client name -> (personal skills dir, project subdir relative to repo root)
 # personal dir uses Path.home() so it's always resolved at call time via _personal_dir().
@@ -118,14 +109,49 @@ def _find_bundled_skills_dir() -> Path:
 PROJECT_SKILLS_SUBDIR = ".agents/skills"
 
 
+def _expand_skill_selection(skill_names: Optional[List[str]] = None) -> List[str]:
+    """Validate and normalize requested bundled skill names."""
+    requested = list(dict.fromkeys(skill_names or SKILL_CHOICES))
+    invalid = [name for name in requested if name not in SKILL_CHOICES]
+    if invalid:
+        invalid_display = ", ".join(sorted(invalid))
+        raise ValueError(f"Unknown bundled skill(s): {invalid_display}")
+    return requested
+
+
 def install_skills_to_directory(
     directory: Path,
     skill_names: Optional[List[str]] = None,
     subdir: str = PROJECT_SKILLS_SUBDIR,
+    force: bool = False,
 ) -> int:
-    """Return 0 because bundled skill installation is temporarily disabled."""
-    del directory, skill_names, subdir
-    return 0
+    """Install bundled skills into the requested directory and return the count."""
+    bundled_skills_dir = _find_bundled_skills_dir()
+    selected_skills = _expand_skill_selection(skill_names)
+    destination_root = directory / subdir if subdir else directory
+    destination_root.mkdir(parents=True, exist_ok=True)
+
+    for skill_name in selected_skills:
+        source_dir = bundled_skills_dir / skill_name
+        if not source_dir.exists():
+            raise FileNotFoundError(
+                f"Bundled skill '{skill_name}' not found in {bundled_skills_dir}"
+            )
+
+        destination_dir = destination_root / skill_name
+        if destination_dir.exists():
+            if not force:
+                raise FileExistsError(
+                    f"{destination_dir} already exists. Use --force to overwrite it."
+                )
+            if destination_dir.is_dir():
+                shutil.rmtree(destination_dir)
+            else:
+                destination_dir.unlink()
+
+        shutil.copytree(source_dir, destination_dir)
+
+    return len(selected_skills)
 
 
 def _resolve_destinations(clients: List[str], scope: str) -> List[Path]:
@@ -167,7 +193,7 @@ def register_skill_commands(cli: Any) -> None:
 
     @cli.group()
     def skill() -> None:
-        """Check the current status of AI assistant skills."""
+        """Install bundled AI assistant skills."""
 
     @skill.command(name="install")
     @click.option(
@@ -201,7 +227,42 @@ def register_skill_commands(cli: Any) -> None:
     def install_skill(
         skill: Optional[str], client: Optional[str], scope: Optional[str], force: bool
     ) -> None:
-        """Report that skill installation is currently unavailable."""
-        del skill, client, scope, force
-        click.echo(f"✗ {TEMPORARILY_UNAVAILABLE_MESSAGE}", err=True)
-        sys.exit(ExitCodes.GENERAL_ERROR)
+        """Install bundled skills for supported AI clients."""
+        requested_skills: Optional[List[str]]
+        if skill in (None, "all"):
+            requested_skills = None
+        else:
+            assert skill is not None
+            requested_skills = [skill.lower()]
+        selected_skill_names = _expand_skill_selection(requested_skills)
+        selected_clients = CLIENT_CHOICES if client == "all" else [client or "agents"]
+        selected_scope = scope or "project"
+        destinations = _resolve_destinations(selected_clients, selected_scope)
+
+        try:
+            installed_count = 0
+            for destination in destinations:
+                installed_count += install_skills_to_directory(
+                    destination,
+                    skill_names=selected_skill_names,
+                    subdir="",
+                    force=force,
+                )
+        except ValueError as exc:
+            click.echo(f"✗ {exc}", err=True)
+            sys.exit(ExitCodes.INVALID_INPUT)
+        except FileExistsError as exc:
+            click.echo(f"✗ {exc}", err=True)
+            sys.exit(ExitCodes.INVALID_INPUT)
+        except FileNotFoundError as exc:
+            click.echo(f"✗ {exc}", err=True)
+            sys.exit(ExitCodes.GENERAL_ERROR)
+
+        format_success(
+            "Installed bundled AI skills",
+            {
+                "Skills": ", ".join(selected_skill_names),
+                "Destinations": ", ".join(str(path) for path in destinations),
+                "Installed": str(installed_count),
+            },
+        )

systemlink_cli-1.15.2/slcli/skills/slcli/SKILL.md

@@ -0,0 +1,79 @@
+---
+name: slcli
+description: >-
+  Query and manage NI SystemLink resources using the slcli command-line interface.
+  Use when the user asks about test results, assets, systems, work items,
+  specifications, webapps, notebooks, dataframes, files, feeds, tags,
+  authorization, users, or other SystemLink resource workflows.
+argument-hint: >-
+  Describe the SystemLink workflow you want to inspect, automate, scaffold, or
+  troubleshoot.
+---
+
+# SystemLink CLI
+
+Use this skill when the task is primarily about `slcli` commands or a
+SystemLink resource workflow that should be driven from the CLI.
+
+## When to use it
+
+- Querying or managing SystemLink resources through `slcli`
+- Looking up exact command syntax, flags, or JSON output patterns
+- Building command sequences for analysis, provisioning, packaging, or cleanup
+- Troubleshooting CLI behavior, platform gating, or command selection
+
+## Reference docs
+
+Load only what the current task needs.
+
+| Topic | File | When to load |
+| --- | --- | --- |
+| CLI command reference | [commands.md](./references/commands.md) | Looking up command syntax, options, or examples |
+| Datasheet-to-spec workflow | [datasheet-workflow.md](./references/datasheet-workflow.md) | Importing specifications from PDF, CSV, or structured text |
+| Minimal spec import payload | [import-specs.min.json](./references/import-specs.min.json) | Need a bundled create-compatible starter payload or conditions |
+| Spec import helper | [spec_import_helper.py](./scripts/spec_import_helper.py) | Scaffold or validate a datasheet spec import payload |
+| Filtering guide | [filtering.md](./references/filtering.md) | Advanced filters, LINQ syntax, and query composition |
+| Analysis recipes | [analysis-recipes.md](./references/analysis-recipes.md) | Multi-step analysis workflows and reporting patterns |
+| Troubleshooting | [troubleshooting.md](./references/troubleshooting.md) | SSL, workspace IDs, encoding, or scripting pitfalls |
+| Notebook workflow | [notebook/overview.md](./references/notebook/overview.md) | Creating notebooks for SystemLink |
+| Webapp workflow | [webapp/overview.md](./references/webapp/overview.md) | Hosted Angular webapp scaffolding and deployment |
+| Python test workflow | [python-test/overview.md](./references/python-test/overview.md) | Python test app structure and deployment |
+| Job debugging | [job-debugging/overview.md](./references/job-debugging/overview.md) | Salt job triage and recovery |
+| NI package files | [nipkg/overview.md](./references/nipkg/overview.md) | File-package assembly and `nipkg pack` guidance |
+
+## Default approach
+
+1. Prefer long-form flags in generated commands.
+2. Use `-f json` when the result will be filtered, transformed, or piped into other tools.
+3. Use `--summary --group-by` for aggregation before fetching large raw result sets.
+4. Use convenience filters first, then fall back to `--filter` with `--substitution` for complex queries.
+5. Stay scoped to the user’s requested resource or workflow.
+6. Load deeper references only when the command surface alone is not enough.
+7. Prefer workspace IDs over names in scripted workflows when an endpoint is strict about identity.
+8. Use `make_api_request` from `slcli.utils` for helper scripts so auth, SSL, and error handling stay consistent.
+9. For datasheet imports, default to autonomy when the product or workspace can be resolved unambiguously.
+
+## Common command groups
+
+| Group | Purpose | Key subcommands |
+| --- | --- | --- |
+| `testmonitor` | Test results and products | `result list/get`, `product list/create/update` |
+| `spec` | Specifications | `list`, `query`, `get`, `create`, `import`, `export` |
+| `asset` | Assets and calibration | `list`, `get`, `summary`, `calibration` |
+| `system` | System fleet | `list`, `get`, `compare`, `summary`, `job` |
+| `tag` | Tag read/write | `list`, `get-value`, `set-value`, `create` |
+| `routine` | Event-action routines | `list`, `create`, `enable/disable` |
+| `comment` | Resource comments | `list`, `add`, `update`, `delete` |
+| `workitem` | Work items and workflows | `list`, `create`, `schedule`, `template`, `workflow` |
+| `file` | File management | `list`, `upload`, `download`, `query`, `watch` |
+| `notebook` | Jupyter notebooks | `manage list/create`, `execute start/sync` |
+| `feed` | Package feeds | `list`, `create`, `package upload` |
+| `customfield` | Dynamic form fields | `list`, `create`, `export`, `edit` |
+| `template` | Test plan templates | `list`, `import`, `export` |
+| `webapp` | Web applications | `init`, `pack`, `publish`, `list` |
+| `config` | Connection profiles | `list`, `use`, `add`, `delete` |
+| `user` | User management | `list`, `get`, `create`, `update` |
+| `auth` | Authorization policies | `policy list/create`, `template list` |
+| `workspace` | Workspaces | `list`, `get` |
+| `skill` | AI skill installation | `install` |
+| `example` | Demo provisioning | `list`, `install`, `delete` |