systemlink-cli 1.26.2__tar.gz → 1.27.0__tar.gz

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/PKG-INFO

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

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.26.2"
+version = "1.27.0"
 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.26.2 → systemlink_cli-1.27.0}/slcli/_version.py

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

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/slcli/alarm_click.py

@@ -11,7 +11,7 @@ from urllib.parse import quote
 import click
 import questionary
 
-from .cli_utils import confirm_bulk_operation, validate_output_format
+from .cli_utils import confirm_bulk_operation, is_interactive_environment, validate_output_format
 from .rich_output import render_table
 from .universal_handlers import FilteredResponse, UniversalResponseHandler
 from .utils import (
@@ -501,6 +501,8 @@ def _run_list_alarms(
         )
         if not continuation_token:
             break
+        if not is_interactive_environment():
+            break
         if not questionary.confirm("Show next set of alarms?", default=True).ask():
             break
 

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/slcli/asset_click.py

@@ -12,11 +12,12 @@ from typing import Any, Dict, List, Optional, Tuple
 import click
 import questionary
 
-from .cli_utils import validate_output_format
+from .cli_utils import is_interactive_environment, validate_output_format
 from .universal_handlers import FilteredResponse, UniversalResponseHandler
 from .utils import (
     ExitCodes,
     check_readonly_mode,
+    escape_filter_value,
     format_success,
     get_base_url,
     get_workspace_map,
@@ -29,24 +30,14 @@ from .workspace_utils import (
     resolve_workspace_filter,
 )
 
+_escape_filter_value = escape_filter_value
+
 
 def _get_asset_base_url() -> str:
     """Get the base URL for the Asset Management API."""
     return f"{get_base_url()}/niapm/v1"
 
 
-def _escape_filter_value(value: str) -> str:
-    """Escape double quotes in filter values to prevent injection.
-
-    Args:
-        value: Raw filter value from user input.
-
-    Returns:
-        Escaped value safe for embedding in filter expressions.
-    """
-    return value.replace('"', '\\"')
-
-
 def _parse_properties(properties: Tuple[str, ...]) -> Dict[str, str]:
     """Parse key=value property strings into a dictionary.
 
@@ -100,10 +91,10 @@ def _build_asset_filter(
     parts: List[str] = []
 
     if model:
-        escaped = _escape_filter_value(model)
+        escaped = escape_filter_value(model)
         parts.append(f'ModelName.Contains("{escaped}")')
     if serial_number:
-        escaped = _escape_filter_value(serial_number)
+        escaped = escape_filter_value(serial_number)
         parts.append(f'SerialNumber = "{escaped}"')
     if bus_type:
         parts.append(f'BusType = "{bus_type}"')
@@ -117,7 +108,7 @@ def _build_asset_filter(
             ' and Location.AssetState.AssetPresence = "PRESENT"'
         )
     if workspace_id:
-        escaped = _escape_filter_value(workspace_id)
+        escaped = escape_filter_value(workspace_id)
         parts.append(f'Workspace = "{escaped}"')
     if custom_filter:
         parts.append(custom_filter)
@@ -302,6 +293,9 @@ def _handle_asset_interactive_pagination(
         if shown_count >= total_count:
             break
 
+        if not is_interactive_environment():
+            break
+
         if not questionary.confirm("Show next set of results?", default=True).ask():
             break
 

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/slcli/cli_utils.py

@@ -1,5 +1,6 @@
 """Common utility functions for all CLI commands."""
 
+import os
 import sys
 from typing import Any, Callable, Dict, List, Optional
 
@@ -11,6 +12,19 @@ from .rich_output import print_json, render_table
 from .utils import ExitCodes, handle_api_error
 
 
+def is_interactive_environment() -> bool:
+    """Return whether interactive prompts should be displayed.
+
+    In-process pytest callers remain interactive so prompt behavior can be tested with mocks.
+    Captured E2E subprocesses set ``SLCLI_NON_INTERACTIVE`` explicitly.
+    """
+    if os.getenv("SLCLI_NON_INTERACTIVE", "").lower() == "true":
+        return False
+    if os.getenv("PYTEST_CURRENT_TEST") is not None:
+        return True
+    return sys.stdin.isatty() and sys.stdout.isatty() and os.getenv("CI", "").lower() != "true"
+
+
 def resolve_resource_by_name_or_id(
     session: requests.Session,
     base_url: str,
@@ -408,26 +422,13 @@ def paginate_list_output(
                 f"{remaining} more available."
             )
 
-            # Check if we're in an interactive environment
-            # If stdin is not a TTY or we're in a test environment, disable interactive pagination
-            import os
-            import sys
-
-            is_non_interactive = (
-                not sys.stdin.isatty()  # Piped input
-                or not sys.stdout.isatty()  # Piped output
-                or os.getenv("CI") == "true"  # CI environment
-                or os.getenv("PYTEST_CURRENT_TEST") is not None  # pytest
-                or os.getenv("SLCLI_NON_INTERACTIVE") == "true"  # Explicit override
-            )
-
-            if is_non_interactive:
+            if not is_interactive_environment():
                 click.echo("Non-interactive environment detected. Showing all remaining results...")
                 # Continue to show all remaining pages without prompting
                 current_page += 1
                 continue
 
-            if not questionary.confirm("Show next 25 results?", default=True).ask():
+            if not questionary.confirm(f"Show next {page_size} results?", default=True).ask():
                 break
 
             click.echo()  # Add blank line between pages

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/slcli/example_click.py

@@ -408,7 +408,13 @@ def register_example_commands(cli: Any) -> None:
             handle_api_error(exc)
 
     @example.command(name="delete")
-    @click.argument("example_name")
+    @click.argument("example_name", required=False)
+    @click.option(
+        "--file",
+        "config_file",
+        type=click.Path(exists=True, dir_okay=False, readable=True, resolve_path=True),
+        help="Path to an example config.yaml; referenced files are relative to its directory.",
+    )
     @click.option("--workspace", "-w", required=True, help="Workspace name or ID for resources")
     @click.option(
         "--format",
@@ -429,7 +435,8 @@ def register_example_commands(cli: Any) -> None:
         help="Path to write deletion results as JSON for auditing.",
     )
     def delete_example(
-        example_name: str,
+        example_name: Optional[str],
+        config_file: Optional[str],
         workspace: Optional[str],
         format: str,
         dry_run: bool,
@@ -442,14 +449,29 @@ def register_example_commands(cli: Any) -> None:
 
         try:
             loader = ExampleLoader()
-            config = loader.load_config(example_name)
+            example_dir: Optional[Path] = None
+            if config_file and example_name:
+                raise ValueError("Specify either EXAMPLE_NAME or --file, not both.")
+            if not config_file and not example_name:
+                raise ValueError("Provide an EXAMPLE_NAME or --file path to config.yaml.")
+
+            if config_file:
+                config_path = Path(config_file)
+                config = loader.load_config_file(config_path)
+                example_name = str(config["name"])
+                example_dir = config_path.parent
+            else:
+                config = loader.load_config(example_name or "")
 
             workspace_id = _resolve_workspace_id(get_effective_workspace(workspace))
-            provisioner = ExampleProvisioner(
-                workspace_id=workspace_id,
-                example_name=example_name,
-                dry_run=dry_run,
-            )
+            provisioner_options: Dict[str, Any] = {
+                "workspace_id": workspace_id,
+                "example_name": example_name,
+                "dry_run": dry_run,
+            }
+            if example_dir is not None:
+                provisioner_options["example_dir"] = example_dir
+            provisioner = ExampleProvisioner(**provisioner_options)
 
             results, err = provisioner.delete(config)
             if err:

{systemlink_cli-1.26.2 → systemlink_cli-1.27.0}/slcli/example_loader.py

@@ -24,6 +24,7 @@ class ExampleLoader:
         "product",
         "system",
         "asset",
+        "fixture",
         "dut",
         "testtemplate",
         "workflow",