openshift-python-wrapper 4.21.0__tar.gz → 4.21.1__tar.gz

openshift_python_wrapper-4.21.1/.git

@@ -0,0 +1 @@
+gitdir: /tmp/github-webhook-openshift-python-wrapper-_9x9xkwp/.git/worktrees/github-webhook-openshift-python-wrapper-_9x9xkwp-worktree-de5dc74f-d1a4-4788-9b73-532fbafb75f5

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/.pre-commit-config.yaml

@@ -45,18 +45,18 @@ repos:
           ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.0
+    rev: v0.15.12
     hooks:
       - id: ruff
       - id: ruff-format
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.30.0
+    rev: v8.30.1
     hooks:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.19.1
+    rev: v1.20.2
     hooks:
       - id: mypy
         exclude: ^(tests/|examples/|docs/)

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 4.21.0
+Version: 4.21.1
 Summary: Wrapper around https://github.com/kubernetes-client/python
 Project-URL: homepage, https://github.com/RedHatQE/openshift-python-wrapper
 Project-URL: documentation, https://openshift-python-wrapper.readthedocs.io/en/latest/
@@ -20,7 +20,7 @@ Requires-Dist: deepdiff>=8.0.1
 Requires-Dist: fastmcp>=2.10.4
 Requires-Dist: jinja2>=3.1.4
 Requires-Dist: jsonschema>=4.20.0
-Requires-Dist: kubernetes>=31.0.0
+Requires-Dist: kubernetes!=36.0.0,>=31.0.0
 Requires-Dist: packaging>=24.1
 Requires-Dist: pyhelper-utils>=0.0.42
 Requires-Dist: python-benedict>=0.33.2

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/class_generator/cli.py

@@ -489,7 +489,7 @@ def handle_test_generation(add_tests: bool) -> None:
         # Run the generated test file
         LOGGER.info("Running generated tests...")
         test_file = "class_generator/tests/test_class_generator.py"
-        exit_code = os.system(f"uv run pytest {test_file}")
+        exit_code = os.system(f"uv run --group tests pytest {test_file}")
 
         # os.system returns the exit status shifted left by 8 bits
         if exit_code != 0:

openshift_python_wrapper-4.21.1/class_generator/formatters/file_writer.py

@@ -0,0 +1,71 @@
+"""File writing utilities for generated code."""
+
+from pathlib import Path
+
+from pyhelper_utils.shell import run_command
+from simple_logger.logger import get_logger
+
+LOGGER = get_logger(name=__name__)
+
+# Project root directory (contains pyproject.toml and .pre-commit-config.yaml)
+_PROJECT_ROOT = Path(__file__).resolve().parent.parent.parent
+
+
+def write_and_format_rendered(filepath: str, output: str) -> None:
+    """
+    Write rendered content to file and format with prek, falling back to ruff.
+
+    Args:
+        filepath: Path to write the file to
+        output: Content to write
+    """
+    with open(filepath, "w", encoding="utf-8") as fd:
+        fd.write(output)
+
+    pre_commit_config = str(_PROJECT_ROOT / ".pre-commit-config.yaml")
+    pyproject_toml = str(_PROJECT_ROOT / "pyproject.toml")
+
+    # Try prek first (runs all pre-commit hooks including ruff)
+    prek_success = False
+    try:
+        rc, stdout, stderr = run_command(
+            command=["uvx", "prek", "-c", pre_commit_config, "run", "--files", filepath],
+            verify_stderr=False,
+            check=False,
+            log_errors=False,
+        )
+        if not rc:
+            if stderr:
+                LOGGER.warning(f"Prek hooks failed for {filepath}, falling back to ruff.")
+                LOGGER.debug(f"prek stderr: {stderr}")
+            else:
+                prek_success = True
+
+            if stdout:
+                LOGGER.info(f"{filepath} fixed by prek")
+                LOGGER.debug(f"prek stdout: {stdout}")
+    except Exception as e:
+        LOGGER.warning(f"Failed to run prek for {filepath}, falling back to ruff: {e}")
+
+    if not prek_success:
+        _run_ruff_fallback(filepath=filepath, pyproject_toml=pyproject_toml)
+
+
+def _run_ruff_fallback(filepath: str, pyproject_toml: str) -> None:
+    """Run ruff check --fix and ruff format as fallback when prek fails."""
+    for ruff_cmd in (
+        ["uvx", "ruff", "check", "--fix", "--config", pyproject_toml, filepath],
+        ["uvx", "ruff", "format", "--config", pyproject_toml, filepath],
+    ):
+        try:
+            _, stdout, _ = run_command(
+                command=ruff_cmd,
+                verify_stderr=False,
+                check=False,
+                log_errors=False,
+            )
+            if stdout:
+                LOGGER.info(f"{filepath} fixed by ruff")
+                LOGGER.debug(f"ruff stdout: {stdout}")
+        except Exception as e:
+            LOGGER.error(f"Ruff fallback failed for {filepath}: {e}")

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/class_generator/manifests/class_generator_template.j2

@@ -14,8 +14,12 @@
 {% endfor %}
 
 from typing import Any
-from ocp_resources.resource import {{ base_class }}
+
+{% if all_required_args %}
 from ocp_resources.exceptions import MissingRequiredArgumentError
+{% endif %}
+from ocp_resources.resource import {{ base_class }}
+
 
 class {{ kind }}({{ base_class }}):
     """

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/class_generator/tests/manifests/test_parse_explain.j2

@@ -1,16 +1,15 @@
 # Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/scripts/resource/README.md#adding-tests
 
 import filecmp
+import traceback
 from pathlib import Path
-import pytest
-from typing import List, Tuple, Optional
 
 from class_generator.constants import TESTS_MANIFESTS_DIR
 from class_generator.core.generator import class_generator
 from class_generator.utils import execute_parallel_tasks
 
 
-def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]]:
+def _test_single_resource(kind: str, tmp_path: Path) -> tuple[str, str] | None:
     """
     Test a single resource kind and return failure info if test fails.
 
@@ -45,9 +44,9 @@ def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]
             if not filecmp.cmp(output_file, expected_file):
                 try:
                     # Read both files to show diff details
-                    with open(output_file, "r") as f:
+                    with open(output_file) as f:
                         generated_content = f.read()
-                    with open(expected_file, "r") as f:
+                    with open(expected_file) as f:
                         expected_content = f.read()
 
                     # Find first difference for debugging
@@ -60,7 +59,7 @@ def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]
                     diff_info += f"\nGenerated lines: {len(generated_lines)}, Expected lines: {len(expected_lines)}"
 
                     # Find first differing line
-                    for i, (gen_line, exp_line) in enumerate(zip(generated_lines, expected_lines)):
+                    for i, (gen_line, exp_line) in enumerate(zip(generated_lines, expected_lines, strict=True)):
                         if gen_line != exp_line:
                             diff_info += f"\nFirst difference at line {i + 1}:"
                             diff_info += f"\nGenerated: {repr(gen_line[:100])}..."
@@ -81,8 +80,6 @@ def _test_single_resource(kind: str, tmp_path: Path) -> Optional[Tuple[str, str]
         return None
 
     except Exception as e:
-        import traceback
-
         error_details = f"Exception during generation: {str(e)}\n"
         error_details += f"Traceback:\n{traceback.format_exc()}"
         return (kind, error_details)
@@ -97,17 +94,17 @@ def test_parse_explain(tmp_path: Path) -> None:
     {% endfor %}
     ]
 
-    failures: List[Tuple[str, str]] = []
+    failures: list[tuple[str, str]] = []
 
     # Process test results and collect failures
-    def process_test_result(kind: str, result: Optional[Tuple[str, str]]) -> None:
+    def process_test_result(kind: str, result: tuple[str, str] | None) -> None:
         if result is not None:
             failures.append(result)
 
     def handle_test_error(kind: str, exc: Exception) -> None:
         failures.append((kind, f"Task execution failed: {str(exc)}"))
 
-    def create_test_task(kind: str) -> Optional[Tuple[str, str]]:
+    def create_test_task(kind: str) -> tuple[str, str] | None:
         return _test_single_resource(kind, tmp_path / f"test-{kind}")
 
     # Run tests in parallel
@@ -136,12 +133,10 @@ def test_parse_explain(tmp_path: Path) -> None:
 
         # Create a concise failure message for pytest
         failed_kinds = [kind for kind, _ in failures]
-        failure_summary = f"{len(failures)} resource(s) failed: {', '.join(failed_kinds[:5])}"
-        if len(failed_kinds) > 5:
-            failure_summary += f" and {len(failed_kinds) - 5} more"
+        failure_summary = f"{len(failures)} resource(s) failed: {','.join(failed_kinds)}"
 
         # Fail the test with summary - detailed output is already printed above
-        assert False, failure_summary
+        raise AssertionError(failure_summary)
 
     # If we get here, all tests passed
     print(f"\nAll {len(resource_kinds)} resource generation tests passed successfully!")

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/class_generator/tests/test_class_generator.py

@@ -96,15 +96,15 @@ def test_parse_explain(tmp_path: Path) -> None:
         "Deployment",
         "ImageContentSourcePolicy",
         "Machine",
+        "NMState",
         "Pod",
         "Secret",
-        "NMState",
         "ServiceMeshMember",
-        "ServingRuntime",
+        "Ingress",
         "OAuth",
         "Pipeline",
-        "Ingress",
         "RouteAdvertisements",
+        "ServingRuntime",
     ]
 
     failures: list[tuple[str, str]] = []
@@ -146,9 +146,7 @@ def test_parse_explain(tmp_path: Path) -> None:
 
         # Create a concise failure message for pytest
         failed_kinds = [kind for kind, _ in failures]
-        failure_summary = f"{len(failures)} resource(s) failed: {', '.join(failed_kinds[:5])}"
-        if len(failed_kinds) > 5:
-            failure_summary += f" and {len(failed_kinds) - 5} more"
+        failure_summary = f"{len(failures)} resource(s) failed: {','.join(failed_kinds)}"
 
         # Fail the test with summary - detailed output is already printed above
         raise AssertionError(failure_summary)

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/class_generator/tests/test_cli.py

@@ -170,7 +170,9 @@ class TestCLIFunctionality:
 
             assert result.exit_code == 0
             mock_test_gen.assert_called_once()
-            mock_os_system.assert_called_once_with("uv run pytest class_generator/tests/test_class_generator.py")
+            mock_os_system.assert_called_once_with(
+                "uv run --group tests pytest class_generator/tests/test_class_generator.py"
+            )
 
     def test_add_tests_requires_kind(self):
         """Test that --add-tests cannot be used alone."""

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/mcp_server/tests/test_server.py

@@ -14,16 +14,16 @@ from mcp_server.server import (
 from ocp_resources.config_map import ConfigMap
 
 # Get the actual function implementations from the decorated tools
-list_resources_func = mcp_server.server.list_resources.fn
-get_resource_func = mcp_server.server.get_resource.fn
-create_resource_func = mcp_server.server.create_resource.fn
-update_resource_func = mcp_server.server.update_resource.fn
-delete_resource_func = mcp_server.server.delete_resource.fn
-get_pod_logs_func = mcp_server.server.get_pod_logs.fn
-exec_in_pod_func = mcp_server.server.exec_in_pod.fn
-get_resource_events_func = mcp_server.server.get_resource_events.fn
-apply_yaml_func = mcp_server.server.apply_yaml.fn
-get_resource_types_func = mcp_server.server.get_resource_types.fn
+list_resources_func = mcp_server.server.list_resources
+get_resource_func = mcp_server.server.get_resource
+create_resource_func = mcp_server.server.create_resource
+update_resource_func = mcp_server.server.update_resource
+delete_resource_func = mcp_server.server.delete_resource
+get_pod_logs_func = mcp_server.server.get_pod_logs
+exec_in_pod_func = mcp_server.server.exec_in_pod
+get_resource_events_func = mcp_server.server.get_resource_events
+apply_yaml_func = mcp_server.server.apply_yaml
+get_resource_types_func = mcp_server.server.get_resource_types
 
 
 @pytest.fixture

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/pyproject.toml

@@ -72,7 +72,7 @@ include = [
 [project]
 requires-python = ">=3.10"
 name = "openshift-python-wrapper"
-version = "4.21.0"
+version = "4.21.1"
 description = "Wrapper around https://github.com/kubernetes-client/python"
 readme = "README.md"
 license = "Apache-2.0"
@@ -87,7 +87,7 @@ dependencies = [
   "deepdiff>=8.0.1",
   "jinja2>=3.1.4",
   "jsonschema>=4.20.0",
-  "kubernetes>=31.0.0",
+  "kubernetes>=31.0.0,!=36.0.0",  # Excluded: v36.0.0 has broken bearer-token auth (https://github.com/kubernetes-client/python/issues/2582), remove once v36.0.1+ ships with the fix
   "packaging>=24.1",
   "pyhelper-utils>=0.0.42",
   "python-benedict>=0.33.2",

{openshift_python_wrapper-4.21.0 → openshift_python_wrapper-4.21.1}/tests/scripts/generate_pytest_test.py

@@ -517,7 +517,7 @@ def run_ruff_on_files(filepaths: list[str]) -> bool:
 
         # Run ruff format and check on all files
         for op in ("format", "check"):
-            cmd_str = f"uvx ruff {op} {' '.join(filepaths)}"
+            cmd_str = f"uvx ruff --config pyproject.toml {op} {' '.join(filepaths)}"
             rc, _, _ = run_command(
                 command=shlex.split(cmd_str),
                 verify_stderr=False,