Skip to content

Update message_registry to ignore custom format for any/object types. #329

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
cglouch merged 1 commit into from
Mar 11, 2025
Merged

Update message_registry to ignore custom format for any/object types. #329

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
19 changes: 19 additions & 0 deletions apitools/gen/gen_client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,25 @@ def testGenClient_ApiVersioning(self):
self.assertIn('2015-02-02-preview', client_file)
self.assertIn('2015-03-03-preview', client_file)

def testGenClient_AnyObjectCustomFormat(self):
with test_utils.TempDir() as tmp_dir_path:
gen_client.main([
gen_client.__file__,
'--infile', GetTestDataPath(
'compute', 'compute_2025-01-01-preview.json'),
'--outdir', tmp_dir_path,
'--overwrite',
'--version-identifier', 'v2025_01_01_preview',
'--root_package', 'google.apis',
'client'
])
self.assertEqual(
set([
'compute_v2025_01_01_preview_client.py',
'compute_v2025_01_01_preview_messages.py',
'__init__.py']),
set(os.listdir(tmp_dir_path)))

def testGenPipPackage_SimpleDoc(self):
with test_utils.TempDir() as tmp_dir_path:
gen_client.main([
Expand Down
30 changes: 13 additions & 17 deletions apitools/gen/message_registry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,23 +402,19 @@ def __GetTypeInfo(self, attrs, name_hint):

if 'format' in attrs:
type_info = self.PRIMITIVE_FORMAT_MAP.get(attrs['format'])
if type_info is None:
# If we don't recognize the format, the spec says we fall back
# to just using the type name.
if type_name in self.PRIMITIVE_TYPE_INFO_MAP:
return self.PRIMITIVE_TYPE_INFO_MAP[type_name]
raise ValueError('Unknown type/format "%s"/"%s"' % (
attrs['format'], type_name))
if type_info.type_name.startswith((
'apitools.base.protorpclite.message_types.',
'message_types.')):
self.__AddImport(
'from %s import message_types as _message_types' %
self.__protorpc_package)
if type_info.type_name.startswith('extra_types.'):
self.__AddImport(
'from %s import extra_types' % self.__base_files_package)
return type_info
# NOTE: If we don't recognize the format, the spec says we fall back
# to just using the type name.
if type_info is not None:
if type_info.type_name.startswith((
'apitools.base.protorpclite.message_types.',
'message_types.')):
self.__AddImport(
'from %s import message_types as _message_types' %
self.__protorpc_package)
if type_info.type_name.startswith('extra_types.'):
self.__AddImport(
'from %s import extra_types' % self.__base_files_package)
return type_info

if type_name in self.PRIMITIVE_TYPE_INFO_MAP:
type_info = self.PRIMITIVE_TYPE_INFO_MAP[type_name]
Expand Down
Loading