Skip to content

Remove third-party lazy imports from the Python client #2652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubernetes-prow merged 1 commit into from
Jul 27, 2026
Merged

Remove third-party lazy imports from the Python client #2652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kubernetes/.openapi-generator/COMMIT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requested Commit/Tag : v7.24.0
Actual Commit : 203d48678a3f51fc1e3bfe4f7257603530791ebb
Requested Commit/Tag : 830e9d156960bb7f51a5337f31636a7e73226474
Actual Commit : 830e9d156960bb7f51a5337f31636a7e73226474
2 changes: 1 addition & 1 deletion kubernetes/.openapi-generator/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.24.0
7.25.0-SNAPSHOT
2 changes: 1 addition & 1 deletion kubernetes/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https:

- API version: release-1.36
- Package version: 36.0.0+snapshot
- Generator version: 7.24.0
- Generator version: 7.25.0-SNAPSHOT
- Build package: org.openapitools.codegen.languages.PythonClientCodegen

## Requirements.
Expand Down
1,719 changes: 856 additions & 863 deletions kubernetes/client/__init__.py
View file
Open in desktop

Large diffs are not rendered by default.

227 changes: 147 additions & 80 deletions kubernetes/client/api/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,76 @@
# flake8: noqa

if __import__("typing").TYPE_CHECKING:
__all__ = [
"WellKnownApi",
"AdmissionregistrationApi",
"AdmissionregistrationV1Api",
"AdmissionregistrationV1alpha1Api",
"AdmissionregistrationV1beta1Api",
"ApiextensionsApi",
"ApiextensionsV1Api",
"ApiregistrationApi",
"ApiregistrationV1Api",
"ApisApi",
"AppsApi",
"AppsV1Api",
"AuthenticationApi",
"AuthenticationV1Api",
"AuthorizationApi",
"AuthorizationV1Api",
"AutoscalingApi",
"AutoscalingV1Api",
"AutoscalingV2Api",
"BatchApi",
"BatchV1Api",
"CertificatesApi",
"CertificatesV1Api",
"CertificatesV1alpha1Api",
"CertificatesV1beta1Api",
"CoordinationApi",
"CoordinationV1Api",
"CoordinationV1alpha2Api",
"CoordinationV1beta1Api",
"CoreApi",
"CoreV1Api",
"CustomObjectsApi",
"DiscoveryApi",
"DiscoveryV1Api",
"EventsApi",
"EventsV1Api",
"FlowcontrolApiserverApi",
"FlowcontrolApiserverV1Api",
"InternalApiserverApi",
"InternalApiserverV1alpha1Api",
"LogsApi",
"NetworkingApi",
"NetworkingV1Api",
"NetworkingV1beta1Api",
"NodeApi",
"NodeV1Api",
"OpenidApi",
"PolicyApi",
"PolicyV1Api",
"RbacAuthorizationApi",
"RbacAuthorizationV1Api",
"ResourceApi",
"ResourceV1Api",
"ResourceV1alpha3Api",
"ResourceV1beta1Api",
"ResourceV1beta2Api",
"SchedulingApi",
"SchedulingV1Api",
"SchedulingV1alpha2Api",
"StorageApi",
"StorageV1Api",
"StorageV1beta1Api",
"StoragemigrationApi",
"StoragemigrationV1beta1Api",
"VersionApi",
]

import typing as _typing

if _typing.TYPE_CHECKING:
# import apis into api package
from kubernetes.client.api.well_known_api import WellKnownApi
from kubernetes.client.api.admissionregistration_api import AdmissionregistrationApi
Expand Down Expand Up @@ -69,85 +139,82 @@
from kubernetes.client.api.version_api import VersionApi

else:
from lazy_imports import LazyModule, as_package, load
from importlib import import_module

load(
LazyModule(
*as_package(__file__),
"""# import apis into api package
from kubernetes.client.api.well_known_api import WellKnownApi
from kubernetes.client.api.admissionregistration_api import AdmissionregistrationApi
from kubernetes.client.api.admissionregistration_v1_api import AdmissionregistrationV1Api
from kubernetes.client.api.admissionregistration_v1alpha1_api import AdmissionregistrationV1alpha1Api
from kubernetes.client.api.admissionregistration_v1beta1_api import AdmissionregistrationV1beta1Api
from kubernetes.client.api.apiextensions_api import ApiextensionsApi
from kubernetes.client.api.apiextensions_v1_api import ApiextensionsV1Api
from kubernetes.client.api.apiregistration_api import ApiregistrationApi
from kubernetes.client.api.apiregistration_v1_api import ApiregistrationV1Api
from kubernetes.client.api.apis_api import ApisApi
from kubernetes.client.api.apps_api import AppsApi
from kubernetes.client.api.apps_v1_api import AppsV1Api
from kubernetes.client.api.authentication_api import AuthenticationApi
from kubernetes.client.api.authentication_v1_api import AuthenticationV1Api
from kubernetes.client.api.authorization_api import AuthorizationApi
from kubernetes.client.api.authorization_v1_api import AuthorizationV1Api
from kubernetes.client.api.autoscaling_api import AutoscalingApi
from kubernetes.client.api.autoscaling_v1_api import AutoscalingV1Api
from kubernetes.client.api.autoscaling_v2_api import AutoscalingV2Api
from kubernetes.client.api.batch_api import BatchApi
from kubernetes.client.api.batch_v1_api import BatchV1Api
from kubernetes.client.api.certificates_api import CertificatesApi
from kubernetes.client.api.certificates_v1_api import CertificatesV1Api
from kubernetes.client.api.certificates_v1alpha1_api import CertificatesV1alpha1Api
from kubernetes.client.api.certificates_v1beta1_api import CertificatesV1beta1Api
from kubernetes.client.api.coordination_api import CoordinationApi
from kubernetes.client.api.coordination_v1_api import CoordinationV1Api
from kubernetes.client.api.coordination_v1alpha2_api import CoordinationV1alpha2Api
from kubernetes.client.api.coordination_v1beta1_api import CoordinationV1beta1Api
from kubernetes.client.api.core_api import CoreApi
from kubernetes.client.api.core_v1_api import CoreV1Api
from kubernetes.client.api.custom_objects_api import CustomObjectsApi
from kubernetes.client.api.discovery_api import DiscoveryApi
from kubernetes.client.api.discovery_v1_api import DiscoveryV1Api
from kubernetes.client.api.events_api import EventsApi
from kubernetes.client.api.events_v1_api import EventsV1Api
from kubernetes.client.api.flowcontrol_apiserver_api import FlowcontrolApiserverApi
from kubernetes.client.api.flowcontrol_apiserver_v1_api import FlowcontrolApiserverV1Api
from kubernetes.client.api.internal_apiserver_api import InternalApiserverApi
from kubernetes.client.api.internal_apiserver_v1alpha1_api import InternalApiserverV1alpha1Api
from kubernetes.client.api.logs_api import LogsApi
from kubernetes.client.api.networking_api import NetworkingApi
from kubernetes.client.api.networking_v1_api import NetworkingV1Api
from kubernetes.client.api.networking_v1beta1_api import NetworkingV1beta1Api
from kubernetes.client.api.node_api import NodeApi
from kubernetes.client.api.node_v1_api import NodeV1Api
from kubernetes.client.api.openid_api import OpenidApi
from kubernetes.client.api.policy_api import PolicyApi
from kubernetes.client.api.policy_v1_api import PolicyV1Api
from kubernetes.client.api.rbac_authorization_api import RbacAuthorizationApi
from kubernetes.client.api.rbac_authorization_v1_api import RbacAuthorizationV1Api
from kubernetes.client.api.resource_api import ResourceApi
from kubernetes.client.api.resource_v1_api import ResourceV1Api
from kubernetes.client.api.resource_v1alpha3_api import ResourceV1alpha3Api
from kubernetes.client.api.resource_v1beta1_api import ResourceV1beta1Api
from kubernetes.client.api.resource_v1beta2_api import ResourceV1beta2Api
from kubernetes.client.api.scheduling_api import SchedulingApi
from kubernetes.client.api.scheduling_v1_api import SchedulingV1Api
from kubernetes.client.api.scheduling_v1alpha2_api import SchedulingV1alpha2Api
from kubernetes.client.api.storage_api import StorageApi
from kubernetes.client.api.storage_v1_api import StorageV1Api
from kubernetes.client.api.storage_v1beta1_api import StorageV1beta1Api
from kubernetes.client.api.storagemigration_api import StoragemigrationApi
from kubernetes.client.api.storagemigration_v1beta1_api import StoragemigrationV1beta1Api
from kubernetes.client.api.version_api import VersionApi
_exports = {
"WellKnownApi": ".well_known_api",
"AdmissionregistrationApi": ".admissionregistration_api",
"AdmissionregistrationV1Api": ".admissionregistration_v1_api",
"AdmissionregistrationV1alpha1Api": ".admissionregistration_v1alpha1_api",
"AdmissionregistrationV1beta1Api": ".admissionregistration_v1beta1_api",
"ApiextensionsApi": ".apiextensions_api",
"ApiextensionsV1Api": ".apiextensions_v1_api",
"ApiregistrationApi": ".apiregistration_api",
"ApiregistrationV1Api": ".apiregistration_v1_api",
"ApisApi": ".apis_api",
"AppsApi": ".apps_api",
"AppsV1Api": ".apps_v1_api",
"AuthenticationApi": ".authentication_api",
"AuthenticationV1Api": ".authentication_v1_api",
"AuthorizationApi": ".authorization_api",
"AuthorizationV1Api": ".authorization_v1_api",
"AutoscalingApi": ".autoscaling_api",
"AutoscalingV1Api": ".autoscaling_v1_api",
"AutoscalingV2Api": ".autoscaling_v2_api",
"BatchApi": ".batch_api",
"BatchV1Api": ".batch_v1_api",
"CertificatesApi": ".certificates_api",
"CertificatesV1Api": ".certificates_v1_api",
"CertificatesV1alpha1Api": ".certificates_v1alpha1_api",
"CertificatesV1beta1Api": ".certificates_v1beta1_api",
"CoordinationApi": ".coordination_api",
"CoordinationV1Api": ".coordination_v1_api",
"CoordinationV1alpha2Api": ".coordination_v1alpha2_api",
"CoordinationV1beta1Api": ".coordination_v1beta1_api",
"CoreApi": ".core_api",
"CoreV1Api": ".core_v1_api",
"CustomObjectsApi": ".custom_objects_api",
"DiscoveryApi": ".discovery_api",
"DiscoveryV1Api": ".discovery_v1_api",
"EventsApi": ".events_api",
"EventsV1Api": ".events_v1_api",
"FlowcontrolApiserverApi": ".flowcontrol_apiserver_api",
"FlowcontrolApiserverV1Api": ".flowcontrol_apiserver_v1_api",
"InternalApiserverApi": ".internal_apiserver_api",
"InternalApiserverV1alpha1Api": ".internal_apiserver_v1alpha1_api",
"LogsApi": ".logs_api",
"NetworkingApi": ".networking_api",
"NetworkingV1Api": ".networking_v1_api",
"NetworkingV1beta1Api": ".networking_v1beta1_api",
"NodeApi": ".node_api",
"NodeV1Api": ".node_v1_api",
"OpenidApi": ".openid_api",
"PolicyApi": ".policy_api",
"PolicyV1Api": ".policy_v1_api",
"RbacAuthorizationApi": ".rbac_authorization_api",
"RbacAuthorizationV1Api": ".rbac_authorization_v1_api",
"ResourceApi": ".resource_api",
"ResourceV1Api": ".resource_v1_api",
"ResourceV1alpha3Api": ".resource_v1alpha3_api",
"ResourceV1beta1Api": ".resource_v1beta1_api",
"ResourceV1beta2Api": ".resource_v1beta2_api",
"SchedulingApi": ".scheduling_api",
"SchedulingV1Api": ".scheduling_v1_api",
"SchedulingV1alpha2Api": ".scheduling_v1alpha2_api",
"StorageApi": ".storage_api",
"StorageV1Api": ".storage_v1_api",
"StorageV1beta1Api": ".storage_v1beta1_api",
"StoragemigrationApi": ".storagemigration_api",
"StoragemigrationV1beta1Api": ".storagemigration_v1beta1_api",
"VersionApi": ".version_api",
}

""",
name=__name__,
doc=__doc__,
)
)
def __getattr__(name: str) -> object:
if (module_name := _exports.get(name)) is None:
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
value = getattr(import_module(module_name, __name__), name)
globals()[name] = value
return value

_lazy_module = __import__("sys").modules[__name__]
_lazy_module.__package__ = __package__
_lazy_module.__loader__ = __loader__
_lazy_module.__spec__ = __spec__
def __dir__() -> list[str]:
return sorted(globals().keys() | _exports.keys())
7 changes: 2 additions & 5 deletions kubernetes/client/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,11 +790,8 @@ def _apply_auth_params(
headers['Cookie'] = ""
else:
headers['Cookie'] += "; "
# Account for cookie value containing spaces and special characters
cookie_value = str(auth_setting['value'])
if not re.match("^\".*\"$", cookie_value):
cookie_value = cookie_value.replace("\"", "\\\"")
cookie_value = f"\"{cookie_value}\""
# Account for cookie value containing spaces and special characters, excluding base64 delimiters
cookie_value = quote(str(auth_setting['value']), safe="!#$%&'()*+-./:<=>?@[]^_`{|}~%+/=")

@yliaog yliaog Jul 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is there this change?

@tamird tamird Jul 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comes directly from the upstream generator’s cookie-encoding fix, not a separate hand-written behavior change: OpenAPITools/openapi-generator@2f194fe. Regenerating with the dependency-free generator necessarily includes that template change; reverting only this output would make the committed client unreproducible from its generator.

[tamirdex]

headers['Cookie'] += f"{auth_setting['key']}={cookie_value}"
elif auth_setting['in'] == 'header':
if auth_setting['type'] != 'http-signature':
Expand Down
Loading