systemlink-cli 1.11.1__tar.gz → 1.11.4__tar.gz

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.11.1
+Version: 1.11.4
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser
@@ -11,8 +11,10 @@ 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: keyring (>=25.6.0,<26.0.0)
 Requires-Dist: packaging (>=21.0)
+Requires-Dist: pygments (>=2.20.0)
 Requires-Dist: pyyaml (>=6.0.3,<7.0.0)
 Requires-Dist: questionary (>=2.1.1,<3.0.0)
 Requires-Dist: requests (>=2.32.4,<3.0.0)

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.11.1"
+version = "1.11.4"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]
@@ -14,6 +14,7 @@ include = [
 [tool.poetry.scripts]
 slcli = "slcli.__main__:cli"
 slcli-mcp = "slcli.mcp_server:main"
+ni-python-styleguide = "scripts.styleguide:main"
 build-pyinstaller = "scripts.build_pyinstaller:main"
 update-version = "scripts.update_version:main"
 release-from-changes = "scripts.towncrier_release:main"
@@ -39,13 +40,25 @@ questionary = "^2.1.1"
 packaging = ">=21.0"
 rich = ">=13.7,<15"
 rich-click = ">=1.8,<2"
+cryptography = ">=46.0.7"
+pygments = ">=2.20.0"
 
 
 [tool.poetry.group.dev.dependencies]
 # Lint
-ni-python-styleguide = ">=0.4.3"
 cyclonedx-bom = "^7.0.0"
 setuptools = "<81"  # pin to retain pkg_resources used by flake8-import-order
+black = ">=26.3.1"
+flake8 = ">=7.3.0"
+flake8-black = ">=0.4.0"
+flake8-docstrings = ">=1.7.0"
+flake8-import-order = ">=0.19.2"
+isort = ">=6.0.1,<9"
+pep8-naming = ">=0.15.1"
+lxml = ">=6.1.0"
+pyjwt = ">=2.12.0"
+python-dotenv = ">=1.2.2"
+python-multipart = ">=0.0.26"
 
 # Type checking
 mypy = ">=1.0"
@@ -96,15 +109,6 @@ markers = [
 [tool.black]
 line-length = 100
 
-[tool.ni-python-styleguide]
-# D301 ("Use r""" if any backslashes in a docstring") is suppressed because
-# Click uses \b (backspace chr(8)) as a paragraph-formatting marker in docstrings
-# to prevent line-wrapping in --help output. This requires a regular """ string;
-# using r""" passes the literal two-char sequence \b which Click does not recognise.
-
-[tool.ni-python-styleguide.lint]
-extend_ignore = "D301"
-
 [tool.mypy]
 python_version = "3.13"
 files = "**/*.py"

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/_version.py

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

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/main.py

@@ -1,6 +1,7 @@
 """slcli entry points."""
 
 import json
+import tomllib
 from pathlib import Path
 from types import ModuleType
 from typing import Optional
@@ -8,7 +9,6 @@ from typing import Optional
 import click as base_click
 import keyring
 import questionary
-import tomllib
 
 from .asset_click import register_asset_commands
 from .comment_click import register_comment_commands
@@ -21,13 +21,10 @@ from .file_click import register_file_commands
 from .function_click import register_function_commands
 from .mcp_click import register_mcp_commands
 from .notebook_click import register_notebook_commands
-from .platform import (
-    get_platform_info,
-)
+from .platform import get_platform_info
 from .policy_click import register_policy_commands
 from .profiles import set_profile_override
-from .rich_output import install_rich_output
-from .rich_output import render_table
+from .rich_output import install_rich_output, render_table
 from .routine_click import register_routine_commands
 from .skill_click import register_skill_commands
 from .spec_click import register_spec_commands

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/notebook_click.py

@@ -33,7 +33,6 @@ from .utils import (
 )
 from .workspace_utils import get_effective_workspace, get_workspace_display_name
 
-
 # Predefined notebook interfaces - must be assigned exactly as shown
 PREDEFINED_NOTEBOOK_INTERFACES = [
     "Assets Grid",

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/platform.py

@@ -16,7 +16,6 @@ import requests
 
 from .utils import ExitCodes, get_ssl_verify
 
-
 # Platform identifiers
 PLATFORM_SLE = "SLE"  # SystemLink Enterprise (cloud)
 PLATFORM_SLS = "SLS"  # SystemLink Server (on-premises)

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/rich_output.py

@@ -20,7 +20,6 @@ from rich.table import Table
 from rich.text import Text
 from rich.theme import Theme
 
-
 _THEME = Theme(
     {
         "brand": "bold cyan",

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/routine_click.py

@@ -28,7 +28,6 @@ from .workspace_utils import (
     resolve_workspace_filter,
 )
 
-
 # ---------------------------------------------------------------------------
 # Helpers
 # ---------------------------------------------------------------------------

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/skills/nipkg-file-package/SKILL.md

@@ -224,23 +224,25 @@ dependencies, create a Salt state file (`deploy/install.sls`) and apply it throu
 SystemLink Systems Manager. A typical SLS for a Python test package covers:
 
 1. **Download and install Python** — use the official Windows installer with `/quiet`,
-   `InstallAllUsers=1`, `PrependPath=1`. Pass `TargetDir` using a verified-safe pattern:
+   `InstallAllUsers=1`, `PrependPath=1`. For `TargetDir`, pass the full
+   `key=value` as one quoted argument when using `Program Files`:
    ```yaml
-    install-python:
-      cmd.run:
-        - name: >-
-            "C:\Windows\Temp\python-3.12.9-amd64.exe"
-            /quiet InstallAllUsers=1 PrependPath=1
-            TargetDir=C:\PROGRA~1\Python312
-            Include_launcher=1
-        - shell: cmd
-        - unless: >-
-            "C:\Program Files\Python312\python.exe" --version
+   install-python:
+     cmd.run:
+       - name: >-
+           "C:\Windows\Temp\python-3.12.9-amd64.exe"
+           /quiet
+           InstallAllUsers=1
+           PrependPath=1
+           "TargetDir=C:\Program Files\Python312"
+           Include_launcher=1
+       - shell: cmd
+       - unless: >-
+           powershell -Command "$r64 = Get-ChildItem 'HKLM:\SOFTWARE\Python\PythonCore' -ErrorAction SilentlyContinue; if ($r64) { exit 0 }; $r32 = Get-ChildItem 'HKLM:\SOFTWARE\WOW6432Node\Python\PythonCore' -ErrorAction SilentlyContinue; if ($r32) { exit 0 }; if (Test-Path 'C:\Program Files\Python312\python.exe') { exit 0 }; exit 1"
    ```
-   **Critical**: Do not quote the entire `TargetDir=...` pair. Prefer an unquoted
-   key=value argument with a short path (for example,
-   `TargetDir=C:\PROGRA~1\Python312`). If you must use a path with spaces, quote only
-   the value portion (`TargetDir="C:\Program Files\Python312"`).
+   **Critical**: In SystemLink/Salt `cmd.run` contexts, keep `TargetDir` as a single
+   quoted argument (for example `"TargetDir=C:\Program Files\Python312"`) and verify
+   install path checks.
 
 2. **Add Python to PATH** — `win_path.exists` for both the install dir and `Scripts\`.
 
@@ -326,26 +328,69 @@ SystemLink Systems Manager. A typical SLS for a Python test package covers:
 
 ## Auto-Versioning Build Script Pattern
 
-Stamp a datetime-based version into the package on every build so each nipkg uploaded
-to a feed has a unique, sortable version string:
+Use an incrementing build counter stored in `package/build_number.txt` alongside a base
+version in `package/version.txt`. This produces short, valid Debian version strings
+(`major.minor.patch.build`) that NI Package Manager and SystemLink accept reliably.
+
+**Why not timestamps?** A timestamp-based suffix like `1.0.0.20260420083348` exceeds the
+length that SystemLink's `pkg.installed` Salt state can resolve correctly. The feed lookup
+fails silently and the state reports the package as not found. Always use a short numeric
+build counter instead.
+
+### File layout
+
+```text
+package/
+├── version.txt        # base version, e.g. "1.0.1"  (edit when bumping major/minor/patch)
+├── build_number.txt   # next build number to use, e.g. "0"  (auto-incremented by build script)
+├── control
+├── instructions
+├── postinstall.bat
+└── preuninstall.bat
+```
+
+If your build script stamps versions through `control.template`, keep
+`control.template` in source control as the input template and write the stamped
+result to `control` during the build.
+
+### Build script snippet
 
 ```bat
-REM Generate version: 1.0.0.yyyyMMddHHmmss
-for /f "usebackq delims=" %%V in (`powershell -NoProfile -Command "Get-Date -Format '1.0.0.yyyyMMddHHmmss'"`) do set PACKAGE_VERSION=%%V
+set SCRIPT_DIR=%~dp0
+set CONTROL_DIR=%SCRIPT_DIR%build\nipkg\control
+set DEPLOY_SLS=%SCRIPT_DIR%deploy\install.sls
+set VERSION_FILE=%SCRIPT_DIR%package\version.txt
+set BUILD_NUMBER_FILE=%SCRIPT_DIR%package\build_number.txt
+set BASE_VERSION=
+set NEXT_BUILD=
+
+set /p BASE_VERSION=<"%VERSION_FILE%"
+set /p NEXT_BUILD=<"%BUILD_NUMBER_FILE%"
+if "%BASE_VERSION%"=="" (
+    echo Failed to read package\version.txt.
+    exit /b 1
+)
+if "%NEXT_BUILD%"=="" set NEXT_BUILD=0
+set PACKAGE_VERSION=%BASE_VERSION%.%NEXT_BUILD%
+set /a WRITE_BUILD=%NEXT_BUILD%+1
+echo %WRITE_BUILD%>"%BUILD_NUMBER_FILE%"
+echo Version for this build: %PACKAGE_VERSION%
 
 REM Stamp version into control file
 powershell -NoProfile -Command ^
-  "(Get-Content -Raw '%CONTROL_DIR%\control') -replace '(?m)^Version:\s*.*$','Version: %PACKAGE_VERSION%' ^
-  | Set-Content -Encoding ASCII '%CONTROL_DIR%\control'"
+  "$p='%CONTROL_DIR%\control.template'; $o='%CONTROL_DIR%\control'; (Get-Content -Raw $p) -replace '(?m)^Version:\s*.*$','Version: %PACKAGE_VERSION%' | Set-Content -Encoding ASCII $o"
 
 REM Stamp version into deploy\install.sls (keeps SLS in sync with feed)
 powershell -NoProfile -Command ^
-  "(Get-Content -Raw '%DEPLOY_SLS%') -replace '(?m)^\s*-\s*my-package:\s*.*$','      - my-package: %PACKAGE_VERSION%' ^
-  | Set-Content -Encoding ASCII '%DEPLOY_SLS%'"
+  "$p='%DEPLOY_SLS%'; (Get-Content -Raw $p) -replace '(?m)^\s*-\s*my-package:\s*.*$','      - my-package: %PACKAGE_VERSION%' | Set-Content -Encoding ASCII $p"
 ```
 
-This ensures the package version in the feed, the control file, and the SLS are always
-consistent without manual edits.
+### Workflow
+
+1. On the first build: `version.txt` = `1.0.1`, `build_number.txt` = `0` → produces `1.0.1.0`, writes `1` back.
+2. On the next build: reads `1`, produces `1.0.1.1`, writes `2` back, and so on.
+3. To bump major/minor/patch: edit `version.txt` and reset `build_number.txt` to `0`.
+4. Commit both files so the counter is shared across machines / CI runs.
 
 ## Complete Working SLS Example
 
@@ -370,7 +415,7 @@ install-python:
         /quiet
         InstallAllUsers=1
         PrependPath=1
-        TargetDir=C:\PROGRA~1\Python312
+        "TargetDir=C:\Program Files\Python312"
         Include_launcher=1
     - shell: cmd
     - unless: >-
@@ -407,7 +452,7 @@ install-my-test-package:
   pkg.installed:
     - install_recommends: true
     - pkgs:
-      - my-package: 1.0.0.20260420083348
+      - my-package: 1.0.1.0
     - require:
       - module: add-my-test-feed
 
@@ -443,9 +488,9 @@ install-pip-deps:
 ```
 
 **Key rules from testing:**
-- `TargetDir` must use the 8.3 path `C:\PROGRA~1\Python312` — quoting `Program Files`
-  inside `cmd.run` with nested Salt string interpolation truncates at the space even
-  with outer quotes.
+- Pass `TargetDir` as one quoted key/value argument when using `Program Files`
+  (`"TargetDir=C:\Program Files\Python312"`) and keep explicit registry/path checks
+  in `unless` guards.
 - `unless` guards for Python install must check the registry AND the file path; using
   only `python --version` can match the Salt minion's bundled Python, not the system one.
 - The `require` type for `pkg.installed` after `module.run` is `module:`, not `pkgrepo:`.
@@ -464,7 +509,7 @@ file server-side and rejects anything that is not parseable as YAML.
   supported**. Hardcode all values (Python version, paths, URLs) directly.
 - **Validate locally** before uploading: `python -c "import yaml; yaml.safe_load(open('install.sls'))"`
 - **Salt state functions that work**: `cmd.run`, `file.managed`, `file.serialize`,
-  `file.absent`, `win_path.exists`, `system.reboot`, `pkg.installed`, `pkgrepo.managed`
+  `file.absent`, `win_path.exists`, `system.reboot`, `module.run`, `pkg.installed`
   — any valid Salt state module is accepted as long as the YAML parses.
 
 ### Uploading States to SystemLink
@@ -474,8 +519,9 @@ The SystemLink Systems State API (`/nisystemsstate/v1/`) provides two ways to cr
 #### Option 1: JSON API — Package/Feed States Only
 
 `POST /nisystemsstate/v1/states` with a JSON body. This only supports `packages` and
-`feeds` arrays (rendered as `pkg.installed` and `pkgrepo.managed` in the SLS). Use this
-when the state only needs to install nipkg packages.
+`feeds` arrays for package/feed-only workflows. Use this when the state only needs to
+install nipkg packages. For custom SLS uploads, continue using the verified
+`module.run` + `pkg.mod_repo` pattern.
 
 ```python
 state = {

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/system_click.py

@@ -2797,6 +2797,7 @@ def register_system_commands(cli: Any) -> None:
                     filter_expr,
                     api_order_by,
                     _parse_simple_response,
+                    take=take,
                 )
                 mock_resp: Any = FilteredResponse({"jobs": jobs})
                 UniversalResponseHandler.handle_list_response(

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/user_click.py

@@ -26,7 +26,6 @@ from .utils import (
 )
 from .workspace_utils import get_workspace_display_name, resolve_workspace_id
 
-
 USER_QUERY_PAGE_SIZE = 100
 USER_JSON_DEFAULT_TAKE = 1000
 AUTH_WILDCARD_VALUES = {"*", "*/*", "*:*"}

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/web_editor.py

@@ -17,6 +17,48 @@ import requests
 from .utils import ExitCodes, get_base_url, get_headers, get_ssl_verify
 
 
+def _validated_proxy_origin(api_base: str) -> tuple[str, str]:
+    """Return a validated scheme and netloc for proxy requests.
+
+    Args:
+        api_base: Configured SystemLink base URL.
+
+    Returns:
+        Tuple of scheme and network location.
+
+    Raises:
+        ValueError: If the configured base URL is not a plain HTTP(S) origin.
+    """
+    parsed = urllib.parse.urlsplit(api_base)
+    if parsed.scheme not in {"http", "https"}:
+        raise ValueError("Editor proxy requires an HTTP(S) SystemLink base URL")
+    if not parsed.netloc or parsed.username or parsed.password:
+        raise ValueError("Editor proxy requires a base URL without embedded credentials")
+    if parsed.path not in {"", "/"} or parsed.query or parsed.fragment:
+        raise ValueError("Editor proxy requires a base URL without path, query, or fragment")
+    return parsed.scheme, parsed.netloc
+
+
+def _build_proxy_url(
+    origin_scheme: str,
+    origin_netloc: str,
+    target_path: str,
+    query: str = "",
+) -> str:
+    """Build a proxy URL from a validated origin and allowlisted path."""
+    return urllib.parse.urlunsplit((origin_scheme, origin_netloc, target_path, query, ""))
+
+
+def _validated_proxy_path(request_path: str) -> str:
+    """Return a decoded absolute proxy path without dot-segments."""
+    decoded_path = urllib.parse.unquote(request_path)
+    if not decoded_path.startswith("/"):
+        raise ValueError("Editor proxy requires an absolute request path")
+    if any(segment in {".", ".."} for segment in decoded_path.split("/")):
+        raise ValueError("Editor proxy rejects paths containing dot-segments")
+    return decoded_path
+
+
 class DFFWebEditor:
     """Web-based editor for custom fields configurations."""
 
@@ -132,6 +174,7 @@ class DFFWebEditor:
         editor_dir = self._editor_dir  # Capture for closure
         temp_path = self._temp_path  # Capture for closure
         api_base = get_base_url().rstrip("/")
+        api_scheme, api_netloc = _validated_proxy_origin(api_base)
         default_headers = get_headers()
         ssl_verify = get_ssl_verify()
         secret = self._secret
@@ -149,9 +192,14 @@ class DFFWebEditor:
 
             def _proxy_request(self, method: str) -> bool:
                 parsed = urllib.parse.urlparse(self.path)
+                try:
+                    request_path = _validated_proxy_path(parsed.path)
+                except ValueError as exc:
+                    self.send_error(400, str(exc))
+                    return True
 
                 # Serve slcli-config.json from temp directory
-                if parsed.path == "/slcli-config.json" and method == "GET":
+                if request_path == "/slcli-config.json" and method == "GET":
                     config_file = temp_path / "slcli-config.json"
                     if config_file.exists():
                         self.send_response(200)
@@ -164,7 +212,7 @@ class DFFWebEditor:
                         return True
 
                 # Serve config.json (the DFF configuration) from temp directory
-                if parsed.path == "/config.json" and method == "GET":
+                if request_path == "/config.json" and method == "GET":
                     config_file = temp_path / "config.json"
                     if config_file.exists():
                         self.send_response(200)
@@ -182,12 +230,12 @@ class DFFWebEditor:
                     "/api/dff/update-configurations": "/nidynamicformfields/v1/update-configurations",
                 }
 
-                if parsed.path in path_map:
-                    target_path = path_map[parsed.path]
-                elif parsed.path.startswith("/nidynamicformfields/v1/"):
-                    target_path = parsed.path
-                elif parsed.path.startswith("/niuser/v1/workspaces"):
-                    target_path = parsed.path
+                if request_path in path_map:
+                    target_path = path_map[request_path]
+                elif request_path.startswith("/nidynamicformfields/v1/"):
+                    target_path = request_path
+                elif request_path.startswith("/niuser/v1/workspaces"):
+                    target_path = request_path
                 else:
                     return False
 
@@ -197,9 +245,12 @@ class DFFWebEditor:
                     self.send_error(403, "Forbidden: Missing or invalid editor secret")
                     return True
 
-                target_url = f"{api_base}{target_path}"
-                if parsed.query:
-                    target_url = f"{target_url}?{parsed.query}"
+                target_url = _build_proxy_url(
+                    origin_scheme=api_scheme,
+                    origin_netloc=api_netloc,
+                    target_path=target_path,
+                    query=parsed.query,
+                )
 
                 headers = dict(default_headers)
                 data = None

{systemlink_cli-1.11.1 → systemlink_cli-1.11.4}/slcli/workitem_click.py

@@ -35,7 +35,6 @@ from .workspace_utils import (
     resolve_workspace_filter,
 )
 
-
 # ---------------------------------------------------------------------------
 # URL helpers
 # ---------------------------------------------------------------------------