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

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.21.1}/.coderabbit.yaml

@@ -16,7 +16,18 @@ reviews:
   changed_files_summary: true
   labeling_instructions: []
   path_filters: ["!class_generator/schema/**"]
-  path_instructions: []
+  path_instructions:
+    - path: "**/ocp_resources/**"
+      instructions: |
+        SKIP reviewing any code between the markers:
+        - Start: `# Generated using https://github.com/RedHatQE/openshift-python-wrapper/blob/main/class_generator/README.md`
+        - End: `# End of generated code`
+
+        This is auto-generated code from the class-generator tool.
+        Only review code OUTSIDE these markers.
+        If someone modifies generated code directly, flag it as a violation -
+        changes should be made to the class-generator instead.
+
   abort_on_close: true
   auto_review:
     enabled: true

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.20.7 → openshift_python_wrapper-4.21.1}/.pre-commit-config.yaml

@@ -10,7 +10,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: "v6.0.0"
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
@@ -23,7 +23,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/PyCQA/flake8
-    rev: "7.3.0"
+    rev: 7.3.0
     hooks:
       - id: flake8
         args: [--config=.flake8]
@@ -45,7 +45,7 @@ repos:
           ]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.2
+    rev: v0.15.12
     hooks:
       - id: ruff
       - id: ruff-format

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.21.1}/OWNERS

@@ -4,4 +4,3 @@ approvers:
 reviewers:
   - myakove
   - rnetser
-  - dbasunag

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openshift-python-wrapper
-Version: 4.20.7
+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.20.7 → openshift_python_wrapper-4.21.1}/class_generator/README.md

@@ -155,18 +155,55 @@ class-generator --kind Pod --add-tests
 
 ## Update schema files
 
-- Dependencies
-  - Kubernetes/Openshift cluster
-  - [oc](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/) or [kubectl](https://kubernetes.io/docs/tasks/tools/) (latest version)
-  - [uv](https://github.com/astral-sh/uv)
+Schema files contain resource definitions used by the class generator. You can update these from a connected Kubernetes/OpenShift cluster.
 
-- Clone this repository
+### Dependencies
+
+- Kubernetes/OpenShift cluster
+- [oc](https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/) or [kubectl](https://kubernetes.io/docs/tasks/tools/) (latest version)
+- [uv](https://github.com/astral-sh/uv)
+
+### Setup
+
+Clone this repository:
 
 ```bash
 git clone https://github.com/RedHatQE/openshift-python-wrapper.git
 cd openshift-python-wrapper
 ```
 
-- Login to the cluster use admin user and password.
+Login to the cluster using admin user and password.
+
+### Full schema update
+
+Update the entire schema from the connected cluster:
+
+```bash
+class-generator --update-schema
+```
+
+This fetches all resource schemas from the cluster and updates the local cache.
+
+**Note:** If connected to an older cluster, existing schemas are preserved and only missing resources are added.
+
+### Single resource schema update
+
+Update the schema for a single resource without affecting others:
+
+```bash
+class-generator --update-schema-for LlamaStackDistribution
+```
+
+This is useful when:
+
+- Connected to an older cluster but need to update a specific CRD
+- A new operator was installed and you need its resource schema
+- You want to refresh just one resource without a full update
+
+After updating the schema, regenerate the class:
 
+```bash
+class-generator --kind LlamaStackDistribution --overwrite
 ```
+
+**Note:** `--update-schema` and `--update-schema-for` are mutually exclusive. Use one or the other, not both.

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

@@ -1,23 +1,28 @@
 """Command-line interface for the class generator."""
 
 import fnmatch
+import logging
+import os
 import shutil
 import sys
 from datetime import datetime
 from pathlib import Path
 from typing import Any
 
-import logging
-
 import cloup
-from cloup.constraints import If, IsSet, accept_none, require_one
+from cloup.constraints import If, IsSet, accept_none, mutually_exclusive, require_one
 from simple_logger.logger import get_logger
 
 from class_generator.constants import TESTS_MANIFESTS_DIR
 from class_generator.core.coverage import analyze_coverage, generate_report
 from class_generator.core.discovery import discover_generated_resources
 from class_generator.core.generator import class_generator
-from class_generator.core.schema import update_kind_schema, ClusterVersionError
+from class_generator.core.schema import (
+    ClusterVersionError,
+    update_kind_schema,
+    update_single_resource_schema,
+)
+from class_generator.exceptions import ResourceNotFoundError
 from class_generator.tests.test_generation import generate_class_generator_tests
 from class_generator.utils import execute_parallel_tasks
 from ocp_resources.utils.utils import convert_camel_case_to_snake_case
@@ -28,16 +33,25 @@ LOGGER = get_logger(name=__name__)
 def validate_actions(
     kind: str | None,
     update_schema: bool,
+    update_schema_for: str | None,
     discover_missing: bool,
     coverage_report: bool,
     generate_missing: bool,
     regenerate_all: bool,
 ) -> None:
     """Validate that at least one action is specified."""
-    actions = [kind, update_schema, discover_missing, coverage_report, generate_missing, regenerate_all]
+    actions = [
+        kind,
+        update_schema,
+        update_schema_for,
+        discover_missing,
+        coverage_report,
+        generate_missing,
+        regenerate_all,
+    ]
     if not any(actions):
         LOGGER.error(
-            "At least one action must be specified (--kind, --update-schema, --discover-missing, --coverage-report, --generate-missing, or --regenerate-all)"
+            "At least one action must be specified (--kind, --update-schema, --update-schema-for, --discover-missing, --coverage-report, --generate-missing, or --regenerate-all)"
         )
         sys.exit(1)
 
@@ -57,7 +71,7 @@ def handle_schema_update(update_schema: bool, generate_missing: bool) -> bool:
         LOGGER.info("Updating resource schema...")
         try:
             update_kind_schema()
-        except (RuntimeError, IOError, ClusterVersionError) as e:
+        except (OSError, RuntimeError, ClusterVersionError) as e:
             LOGGER.exception(f"Failed to update schema: {e}")
             sys.exit(1)
 
@@ -70,6 +84,33 @@ def handle_schema_update(update_schema: bool, generate_missing: bool) -> bool:
     return True
 
 
+def handle_single_schema_update(update_schema_for: str | None) -> bool:
+    """
+    Handle single resource schema update operations.
+
+    Args:
+        update_schema_for: The kind name to update schema for, or None
+
+    Returns:
+        True if processing should continue, False if it should exit
+    """
+    if update_schema_for:
+        LOGGER.info(f"Updating schema for single resource: {update_schema_for}")
+        try:
+            update_single_resource_schema(kind=update_schema_for)
+        except ResourceNotFoundError as e:
+            LOGGER.error(f"Resource not found: {e}")
+            sys.exit(1)
+        except (OSError, RuntimeError) as e:
+            LOGGER.exception(f"Failed to update schema for {update_schema_for}: {e}")
+            sys.exit(1)
+
+        LOGGER.info(f"Schema updated for {update_schema_for}.")
+        return False
+
+    return True
+
+
 def handle_coverage_analysis_and_reporting(
     coverage_report: bool,
     discover_missing: bool,
@@ -251,9 +292,9 @@ def handle_regenerate_all(
             return resource_kind, False, str(e)
 
     # Process results from parallel execution
-    def process_regeneration_result(resource: dict[str, Any], result: tuple[str, bool, str | None]) -> None:
+    def process_regeneration_result(_resource: dict[str, Any], result: tuple[str, bool, str | None]) -> None:
         nonlocal success_count, error_count
-        resource_kind, success, error = result
+        _resource_kind, success, _error = result
         if success:
             success_count += 1
         else:
@@ -391,7 +432,7 @@ def handle_normal_kind_generation(
                 return kind_to_generate, False, str(e)
 
         # Process results from parallel execution
-        def process_generation_result(kind_to_generate: str, result: tuple[str, bool, str | None]) -> None:
+        def process_generation_result(_kind_to_generate: str, result: tuple[str, bool, str | None]) -> None:
             nonlocal success_count, error_count, failed_kinds
             kind_name, success, error = result
             if success:
@@ -447,8 +488,6 @@ def handle_test_generation(add_tests: bool) -> None:
 
         # Run the generated test file
         LOGGER.info("Running generated tests...")
-        import os
-
         test_file = "class_generator/tests/test_class_generator.py"
         exit_code = os.system(f"uv run --group tests pytest {test_file}")
 
@@ -493,6 +532,17 @@ def handle_test_generation(add_tests: bool) -> None:
     is_flag=True,
     show_default=True,
 )
+@cloup.option(
+    "--update-schema-for",
+    type=cloup.STRING,
+    help="""
+    \b
+    Update schema for a single resource kind only, without affecting other resources.
+    Useful when connected to an older cluster but needing to update a specific CRD.
+    Example: --update-schema-for LlamaStackDistribution
+    Cannot be used together with --update-schema.
+""",
+)
 @cloup.option(
     "--discover-missing",
     help="Discover resources in the cluster that don't have wrapper classes",
@@ -557,6 +607,20 @@ def handle_test_generation(add_tests: bool) -> None:
         "regenerate_all",
     ],
 )
+@cloup.constraint(
+    mutually_exclusive,
+    ["update_schema", "update_schema_for"],
+)
+@cloup.constraint(
+    If(IsSet("update_schema_for"), then=accept_none),
+    [
+        "kind",
+        "discover_missing",
+        "coverage_report",
+        "generate_missing",
+        "regenerate_all",
+    ],
+)
 @cloup.constraint(
     If(IsSet("backup"), then=require_one),
     ["regenerate_all", "overwrite"],
@@ -579,6 +643,7 @@ def main(
     filter: str | None,
     json_output: bool,
     update_schema: bool,
+    update_schema_for: str | None,
     verbose: bool,
 ) -> None:
     """Generate Python module for K8S resource."""
@@ -612,13 +677,18 @@ def main(
     validate_actions(
         kind=kind,
         update_schema=update_schema,
+        update_schema_for=update_schema_for,
         discover_missing=discover_missing,
         coverage_report=coverage_report,
         generate_missing=generate_missing,
         regenerate_all=regenerate_all,
     )
 
-    # Handle schema update
+    # Handle single resource schema update (if specified)
+    if not handle_single_schema_update(update_schema_for=update_schema_for):
+        return
+
+    # Handle full schema update
     if not handle_schema_update(update_schema=update_schema, generate_missing=generate_missing):
         return
 

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.21.1}/class_generator/core/coverage.py

@@ -68,7 +68,7 @@ def analyze_coverage(
             continue
 
         try:
-            with open(filepath, "r") as f:
+            with open(filepath) as f:
                 content = f.read()
 
             # Check if file is auto-generated

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.21.1}/class_generator/core/discovery.py

@@ -1,8 +1,8 @@
 """Discovery functions for finding cluster resources and generated files."""
 
+from concurrent.futures import Future, ThreadPoolExecutor, as_completed
 from pathlib import Path
 from typing import Any
-from concurrent.futures import ThreadPoolExecutor, as_completed, Future
 
 from kubernetes.dynamic import DynamicClient
 from simple_logger.logger import get_logger
@@ -221,7 +221,7 @@ def discover_generated_resources() -> list[dict[str, Any]]:
     for info in resource_infos:
         # Read file to check for user code
         try:
-            with open(info.file_path, "r", encoding="utf-8") as f:
+            with open(info.file_path, encoding="utf-8") as f:
                 content = f.read()
         except FileNotFoundError:
             LOGGER.warning(f"File not found: {info.file_path}, skipping...")

{openshift_python_wrapper-4.20.7 → openshift_python_wrapper-4.21.1}/class_generator/core/generator.py

@@ -155,7 +155,7 @@ def class_generator(
             LOGGER.info("Updating schema")
             try:
                 update_kind_schema()
-            except (RuntimeError, IOError) as e:
+            except (OSError, RuntimeError) as e:
                 error_msg = f"Failed to update schema: {e}"
                 LOGGER.error(error_msg)
                 raise RuntimeError(error_msg) from e