Merge branch 'Update-TMP-PyPNM-Dir-process'

Author: mgarcia01752

CODING_AGENTS.md

@@ -53,10 +53,18 @@ Before introducing new types, validators, formats, or storage conventions:
 - When asked for a commit message, respond with the specified format, keep it succinct, and include all changes since the last commit message request.
 - Commit messages must be returned in Markdown text format (use a code block).
 
-### Commit Message Format
-
+## Commit Message Format
+- If request via chat request starts with commit-msg, then preface command ./tools/git/git-save.sh with commit-msg "<commit-msg>"
 - One line summary (max 50 characters)
+- One line Summary start: Feature: , Bugfix: , Docs: , Refactor: , Test:
 - Detailed description lines (max 72 characters per line); every line after the first must start with `-`
+- When the user asks for a commit message, provide plain text for direct paste into the terminal or UI text box.
+- Do not wrap commit message suggestions in quotes (`"`), backticks (`` ` ``), or code fences unless the user explicitly asks for that format.
+- Prefer detailed commit messages that describe the current change set clearly.
+- Do not default to a one-line commit message when the change set is broad; provide a title plus concise bullet points.
+- Avoid redundant wording and avoid repeating the exact prior commit message suggestion unless the diff is unchanged and the user explicitly asks to reuse it.
+- If the user asks for "in a text box", return plain text only (no markdown fence).
+- If the user asks for "in a markdown text box", return the commit message inside a fenced code block with `text`.
 
 ## Agent Constraints
 

deploy/docker/install.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 COMPOSE_DIR="${SCRIPT_DIR}/compose"
 CONFIG_DIR="${SCRIPT_DIR}/config"
+PYPNM_SHARED_GROUP="${PYPNM_SHARED_GROUP:-pypnm}"
 
 create_file_if_missing() {
   local src="$1"
@@ -21,6 +22,12 @@ create_file_if_missing() {
 create_file_if_missing "${COMPOSE_DIR}/.env.example" "${COMPOSE_DIR}/.env" "compose/.env"
 create_file_if_missing "${CONFIG_DIR}/system.json.template" "${CONFIG_DIR}/system.json" "config/system.json"
 
+if [[ "$(uname -s)" == "Linux" ]]; then
+  mkdir -p /tmp/pypnm >/dev/null 2>&1 || true
+  chgrp "${PYPNM_SHARED_GROUP}" /tmp/pypnm >/dev/null 2>&1 || true
+  chmod 2775 /tmp/pypnm >/dev/null 2>&1 || true
+fi
+
 cat <<'MSG'
 Next steps:
   1. Edit deploy/docker/config/system.json with your environment details.

install.sh

@@ -15,6 +15,8 @@ CLEAN_MODE="0"
 PURGE_CACHE="0"
 UNINSTALL_MODE="0"
 GITLEAKS_VERSION="8.18.1"
+PYPNM_SHARED_GROUP="pypnm"
+GROUP_MEMBERSHIP_CHANGED="0"
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="${SCRIPT_DIR}"
@@ -658,6 +660,72 @@ run_pnm_alias_installer_if_available() {
   fi
 }
 
+run_with_privilege_if_needed() {
+  if [[ "$(id -u)" -eq 0 ]]; then
+    "$@"
+    return $?
+  fi
+  if command -v sudo >/dev/null 2>&1; then
+    sudo "$@"
+    return $?
+  fi
+  return 1
+}
+
+ensure_pypnm_shared_group() {
+  local target_user
+  target_user="${SUDO_USER:-${USER:-$(id -un)}}"
+
+  if [[ "$(uname -s)" != "Linux" ]]; then
+    echo "ℹ️  Skipping '${PYPNM_SHARED_GROUP}' group setup on non-Linux host."
+    return
+  fi
+
+  if getent group "${PYPNM_SHARED_GROUP}" >/dev/null 2>&1; then
+    echo "👥 Group '${PYPNM_SHARED_GROUP}' already exists."
+  else
+    if run_with_privilege_if_needed groupadd "${PYPNM_SHARED_GROUP}"; then
+      echo "👥 Created group '${PYPNM_SHARED_GROUP}'."
+    else
+      echo "⚠️  Unable to create group '${PYPNM_SHARED_GROUP}'."
+      return
+    fi
+  fi
+
+  if id -nG "${target_user}" 2>/dev/null | tr ' ' '\n' | grep -qx "${PYPNM_SHARED_GROUP}"; then
+    echo "👤 User '${target_user}' is already in group '${PYPNM_SHARED_GROUP}'."
+    return
+  fi
+
+  if run_with_privilege_if_needed usermod -aG "${PYPNM_SHARED_GROUP}" "${target_user}"; then
+    echo "👤 Added user '${target_user}' to group '${PYPNM_SHARED_GROUP}'."
+    GROUP_MEMBERSHIP_CHANGED="1"
+  else
+    echo "⚠️  Unable to add user '${target_user}' to group '${PYPNM_SHARED_GROUP}'."
+  fi
+}
+
+ensure_tmp_pypnm_permissions() {
+  local tmp_root="/tmp/pypnm"
+
+  mkdir -p "${tmp_root}" || {
+    echo "⚠️  Unable to create ${tmp_root}."
+    return
+  }
+
+  if chgrp "${PYPNM_SHARED_GROUP}" "${tmp_root}" >/dev/null 2>&1 || run_with_privilege_if_needed chgrp "${PYPNM_SHARED_GROUP}" "${tmp_root}" >/dev/null 2>&1; then
+    :
+  else
+    echo "⚠️  Unable to set group '${PYPNM_SHARED_GROUP}' on ${tmp_root}."
+  fi
+
+  if chmod 2775 "${tmp_root}" >/dev/null 2>&1 || run_with_privilege_if_needed chmod 2775 "${tmp_root}" >/dev/null 2>&1; then
+    echo "📁 Ensured ${tmp_root} exists with group '${PYPNM_SHARED_GROUP}' and permissions 2775."
+  else
+    echo "⚠️  Unable to set permissions 2775 on ${tmp_root}."
+  fi
+}
+
 run_tmp_cleanup_cron_installer_if_available() {
   if [[ -x "${PROJECT_ROOT}/scripts/install-tmp-cleanup-cron.sh" ]]; then
     echo "🧹 Installing tmp cache cleanup cron job..."
@@ -676,6 +744,8 @@ else
   echo "      ./tools/pnm/pnm_file_retrieval_setup.py"
 fi
 
+ensure_pypnm_shared_group
+ensure_tmp_pypnm_permissions
 run_pnm_alias_installer_if_available
 run_tmp_cleanup_cron_installer_if_available
 
@@ -686,6 +756,9 @@ fi
 if [[ "$PRODUCTION_MODE" == "1" ]]; then
   echo "👉 Production mode is restored: system settings have been reverted from backup."
 fi
+if [[ "${GROUP_MEMBERSHIP_CHANGED}" == "1" ]]; then
+  echo "👉 Group membership changed for '${SUDO_USER:-${USER:-$(id -un)}}'. Start a new login session for group changes to take effect."
+fi
 echo "👉 Next steps:"
 echo "   1) source '$VENV_DIR/bin/activate'"
 echo "   2) (optional) ./tools/pnm/pnm_file_retrieval_setup.py"

pyproject.toml

@@ -197,6 +197,9 @@ ignore = [
   "B006"
 ]
 
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*.py" = ["ANN"]
+
 [tool.pyright]
 pythonVersion = "3.10"
 pythonPlatform = "Linux"

scripts/install-pypnm-docker-container.sh

@@ -14,6 +14,7 @@ PYPNM_TAG="${PYPNM_TAG:-}"
 PYPNM_PORT="${PYPNM_PORT:-8000}"
 PYPNM_DEPLOY_DIR="${PYPNM_DEPLOY_DIR:-/opt/pypnm}"
 PYPNM_USER="${PYPNM_USER:-${USER}}"
+PYPNM_SHARED_GROUP="${PYPNM_SHARED_GROUP:-pypnm}"
 PYPNM_IMAGE="ghcr.io/PyPNMApps/pypnm:${PYPNM_TAG}"
 PYPNM_FALLBACK_TAG="${PYPNM_FALLBACK_TAG:-v0.9.34.0}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
@@ -37,6 +38,18 @@ require_cmd() {
   command -v "$1" >/dev/null 2>&1 || { echo "Error: missing required command: $1" >&2; exit 1; }
 }
 
+run_with_privilege_if_needed() {
+  if [[ "$(id -u)" -eq 0 ]]; then
+    "$@"
+    return $?
+  fi
+  if command -v sudo >/dev/null 2>&1; then
+    sudo "$@"
+    return $?
+  fi
+  return 1
+}
+
 usage() {
   cat <<'EOF'
 Usage: install-pypnm-docker-container.sh [options]
@@ -230,6 +243,57 @@ ensure_compose_ok() {
   exit 1
 }
 
+ensure_pypnm_shared_group() {
+  local users=("${PYPNM_USER}" "${SUDO_USER:-}" "${USER}")
+  local target_user=""
+
+  if [[ "$(uname -s)" != "Linux" ]]; then
+    echo "Skipping '${PYPNM_SHARED_GROUP}' group setup on non-Linux host."
+    return
+  fi
+
+  if getent group "${PYPNM_SHARED_GROUP}" >/dev/null 2>&1; then
+    echo "Group '${PYPNM_SHARED_GROUP}' already exists."
+  else
+    run_with_privilege_if_needed groupadd "${PYPNM_SHARED_GROUP}" || {
+      echo "Unable to create group '${PYPNM_SHARED_GROUP}'." >&2
+      return
+    }
+    echo "Created group '${PYPNM_SHARED_GROUP}'."
+  fi
+
+  for target_user in "${users[@]}"; do
+    [[ -z "${target_user}" ]] && continue
+    if ! id "${target_user}" >/dev/null 2>&1; then
+      continue
+    fi
+    if id -nG "${target_user}" 2>/dev/null | tr ' ' '\n' | grep -qx "${PYPNM_SHARED_GROUP}"; then
+      continue
+    fi
+    if run_with_privilege_if_needed usermod -aG "${PYPNM_SHARED_GROUP}" "${target_user}"; then
+      echo "Added user '${target_user}' to group '${PYPNM_SHARED_GROUP}'."
+    else
+      echo "Unable to add user '${target_user}' to group '${PYPNM_SHARED_GROUP}'." >&2
+    fi
+  done
+}
+
+ensure_tmp_pypnm_shared_permissions() {
+  local tmp_root="/tmp/pypnm"
+  mkdir -p "${tmp_root}" || {
+    echo "Unable to create ${tmp_root}" >&2
+    return
+  }
+
+  chgrp "${PYPNM_SHARED_GROUP}" "${tmp_root}" >/dev/null 2>&1 || run_with_privilege_if_needed chgrp "${PYPNM_SHARED_GROUP}" "${tmp_root}" >/dev/null 2>&1 || {
+    echo "Unable to set group '${PYPNM_SHARED_GROUP}' on ${tmp_root}" >&2
+  }
+
+  chmod 2775 "${tmp_root}" >/dev/null 2>&1 || run_with_privilege_if_needed chmod 2775 "${tmp_root}" >/dev/null 2>&1 || {
+    echo "Unable to set permissions 2775 on ${tmp_root}" >&2
+  }
+}
+
 set_env_var() {
   local file="$1"
   local key="$2"
@@ -348,7 +412,8 @@ sync_deploy_bundle() {
   sudo rm -rf "${PYPNM_DEPLOY_DIR}"
   sudo mkdir -p "${PYPNM_DEPLOY_DIR}"
   (cd "${source_dir}" && sudo tar -cf - .) | (cd "${PYPNM_DEPLOY_DIR}" && sudo tar -xf -)
-  sudo chown -R "${PYPNM_USER}:${PYPNM_USER}" "${PYPNM_DEPLOY_DIR}"
+  sudo chown -R "${PYPNM_USER}:${PYPNM_SHARED_GROUP}" "${PYPNM_DEPLOY_DIR}"
+  sudo chmod 2775 "${PYPNM_DEPLOY_DIR}" || true
 }
 
 initialize_bundle() {
@@ -409,6 +474,8 @@ main() {
   require_cmd python3
   ensure_docker_ok
   ensure_compose_ok
+  ensure_pypnm_shared_group
+  ensure_tmp_pypnm_shared_permissions
   sync_deploy_bundle
   initialize_bundle
   pull_and_start

src/pypnm/pnm/lib/pnm_artifact_store.py

@@ -3,6 +3,7 @@
 
 from __future__ import annotations
 
+import grp
 import json
 import logging
 import os
@@ -57,6 +58,8 @@ def __init__(self, config: PnmArtifactStorageConfig | None = None, pnm_dir: Path
         self._last_cleanup = 0.0
 
         self._pnm_dir.mkdir(parents=True, exist_ok=True)
+        self._tmp_root.mkdir(parents=True, exist_ok=True)
+        self._ensure_tmp_pypnm_permissions()
         self._ingress_dir.mkdir(parents=True, exist_ok=True)
         self._materialized_dir.mkdir(parents=True, exist_ok=True)
 
@@ -76,6 +79,8 @@ def ingress_path(self, filename: FileNameStr, transaction_id: TransactionId | No
         Path
             Filesystem path where callers can write the ingress artifact.
         """
+        self._tmp_root.mkdir(parents=True, exist_ok=True)
+        self._ensure_tmp_pypnm_permissions()
         self._ingress_dir.mkdir(parents=True, exist_ok=True)
         return self._ingress_dir / self._normalize_ingress_name(filename)
 
@@ -117,6 +122,34 @@ def find_ingress_by_filename(self, filename: FileNameStr) -> Path | None:
             return matches[0]
         return None
 
+    def _ensure_tmp_pypnm_permissions(self) -> None:
+        """Ensure /tmp/pypnm uses shared-group permissions when configured as cache root."""
+        expected = Path("/tmp/pypnm")
+        try:
+            if self._tmp_root.resolve() != expected:
+                return
+        except OSError:
+            if self._tmp_root != expected:
+                return
+
+        try:
+            pypnm_gid = grp.getgrnam("pypnm").gr_gid
+        except KeyError:
+            pypnm_gid = None
+
+        if pypnm_gid is not None:
+            try:
+                os.chown(self._tmp_root, -1, pypnm_gid)
+            except OSError as exc:
+                self.logger.warning("Unable to set group 'pypnm' on %s: %s", self._tmp_root, exc)
+        else:
+            self.logger.warning("Group 'pypnm' not found; continuing without chgrp for %s", self._tmp_root)
+
+        try:
+            os.chmod(self._tmp_root, 0o2775)
+        except OSError as exc:
+            self.logger.warning("Unable to set permissions 2775 on %s: %s", self._tmp_root, exc)
+
     @staticmethod
     def _normalize_ingress_name(filename: FileNameStr) -> str:
         name = Path(str(filename)).name

tests/test_cable_modem_precheck_channel_ids.py

@@ -5,12 +5,12 @@
 
 import pytest
 
-from pypnm.api.routes.common.classes.operation.cable_modem_precheck import (
-    CableModemServicePreCheck,
-)
 from pypnm.api.routes.common.classes.common_endpoint_classes.common_req_resp import (
     TftpConfig,
 )
+from pypnm.api.routes.common.classes.operation.cable_modem_precheck import (
+    CableModemServicePreCheck,
+)
 from pypnm.api.routes.common.service.status_codes import ServiceStatusCode
 from pypnm.lib.types import ChannelId, InterfaceIndex
 

tests/test_capture_group_concurrency.py

@@ -7,8 +7,6 @@
 from multiprocessing.synchronize import Event
 from pathlib import Path
 
-import pytest
-
 from pypnm.api.routes.common.classes.file_capture.capture_group import CaptureGroup
 from pypnm.lib.types import GroupId, TransactionId
 

tests/test_common_process_service.py

@@ -5,6 +5,7 @@
 
 import logging
 from pathlib import Path
+
 import pytest
 
 from pypnm.api.routes.common.extended.common_messaging_service import MessageResponse

tests/test_complex_array_ops.py

@@ -16,7 +16,7 @@ def pairs(*vals: float) -> list[tuple[float, float]]:
     """Build (re, im) pairs from flat numbers: r1,i1,r2,i2,..."""
     assert len(vals) % 2 == 0
     it = iter(vals)
-    return [(float(r), float(i)) for r, i in zip(it, it)]
+    return [(float(r), float(i)) for r, i in zip(it, it, strict=False)]
 
 
 def test_init_and_len_and_repr() -> None: