Skip to content

Commit 039c4a3

Browse files
refactor(tools): extract _get_py_name helper to reduce duplication
Address review feedback by extracting the duplicated py_name determination logic into a single _get_py_name() method.
1 parent 5419b33 commit 039c4a3

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

src/google/adk/tools/openapi_tool/openapi_spec_parser/operation_parser.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ def load(
8686
parser._return_value = return_value
8787
return parser
8888

89+
def _get_py_name(self, original_name: str) -> str:
90+
"""Determines the Python parameter name based on preserve_property_names."""
91+
if self._preserve_property_names:
92+
return rename_python_keywords(original_name)
93+
return ''
94+
8995
def _process_operation_parameters(self):
9096
"""Processes parameters from the OpenAPI operation."""
9197
parameters = self._operation.parameters or []
@@ -101,19 +107,14 @@ def _process_operation_parameters(self):
101107
# param.required can be None
102108
required = param.required if param.required is not None else False
103109

104-
py_name = (
105-
rename_python_keywords(original_name)
106-
if self._preserve_property_names
107-
else ''
108-
)
109110
self._params.append(
110111
ApiParameter(
111112
original_name=original_name,
112113
param_location=location,
113114
param_schema=schema,
114115
description=description,
115116
required=required,
116-
py_name=py_name,
117+
py_name=self._get_py_name(original_name),
117118
)
118119
)
119120

@@ -135,18 +136,13 @@ def _process_request_body(self):
135136
if schema and schema.type == 'object':
136137
properties = schema.properties or {}
137138
for prop_name, prop_details in properties.items():
138-
py_name = (
139-
rename_python_keywords(prop_name)
140-
if self._preserve_property_names
141-
else ''
142-
)
143139
self._params.append(
144140
ApiParameter(
145141
original_name=prop_name,
146142
param_location='body',
147143
param_schema=prop_details,
148144
description=prop_details.description,
149-
py_name=py_name,
145+
py_name=self._get_py_name(prop_name),
150146
)
151147
)
152148

0 commit comments

Comments
 (0)