Skip to content

Commit 3ee79bb

Browse files
sararobcopybara-github
sararob
authored and
copybara-github
committed
chore: resolve mypy errors in models module
PiperOrigin-RevId: 737632813
1 parent f335107 commit 3ee79bb

File tree

7 files changed

+939
-243
lines changed

7 files changed

+939
-243
lines changed

‎google/genai/_transformers.py

+17-8
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,25 @@ def t_models_url(
182182
def t_extract_models(
183183
api_client: _api_client.BaseApiClient,
184184
response: dict[str, list[types.ModelDict]],
185-
) -> Optional[list[types.ModelDict]]:
185+
) -> list[types.ModelDict]:
186186
if not response:
187187
return []
188-
elif response.get('models') is not None:
189-
return response.get('models')
190-
elif response.get('tunedModels') is not None:
191-
return response.get('tunedModels')
192-
elif response.get('publisherModels') is not None:
193-
return response.get('publisherModels')
194-
elif (
188+
189+
models: Optional[list[types.ModelDict]] = response.get('models')
190+
if models is not None:
191+
return models
192+
193+
tuned_models: Optional[list[types.ModelDict]] = response.get('tunedModels')
194+
if tuned_models is not None:
195+
return tuned_models
196+
197+
publisher_models: Optional[list[types.ModelDict]] = response.get(
198+
'publisherModels'
199+
)
200+
if publisher_models is not None:
201+
return publisher_models
202+
203+
if (
195204
response.get('httpHeaders') is not None
196205
and response.get('jsonPayload') is None
197206
):

‎google/genai/batches.py

+130-30
Original file line numberDiff line numberDiff line change
@@ -665,11 +665,21 @@ def _create(
665665
# TODO: remove the hack that pops config.
666666
request_dict.pop('config', None)
667667

668-
http_options: Optional[types.HttpOptionsOrDict] = None
668+
http_options: Optional[types.HttpOptionsDict] = None
669669
if isinstance(config, dict):
670670
http_options = config.get('http_options', None)
671-
elif hasattr(config, 'http_options') and config is not None:
672-
http_options = config.http_options
671+
elif (
672+
hasattr(config, 'http_options')
673+
and config is not None
674+
and config.http_options is not None
675+
):
676+
http_options_dict = config.http_options.model_dump()
677+
http_options = types.HttpOptionsDict(
678+
base_url=http_options_dict.get('base_url'),
679+
api_version=http_options_dict.get('api_version'),
680+
headers=http_options_dict.get('headers'),
681+
timeout=http_options_dict.get('timeout'),
682+
)
673683

674684
request_dict = _common.convert_to_dict(request_dict)
675685
request_dict = _common.encode_unserializable_types(request_dict)
@@ -734,11 +744,21 @@ def get(
734744
# TODO: remove the hack that pops config.
735745
request_dict.pop('config', None)
736746

737-
http_options: Optional[types.HttpOptionsOrDict] = None
747+
http_options: Optional[types.HttpOptionsDict] = None
738748
if isinstance(config, dict):
739749
http_options = config.get('http_options', None)
740-
elif hasattr(config, 'http_options') and config is not None:
741-
http_options = config.http_options
750+
elif (
751+
hasattr(config, 'http_options')
752+
and config is not None
753+
and config.http_options is not None
754+
):
755+
http_options_dict = config.http_options.model_dump()
756+
http_options = types.HttpOptionsDict(
757+
base_url=http_options_dict.get('base_url'),
758+
api_version=http_options_dict.get('api_version'),
759+
headers=http_options_dict.get('headers'),
760+
timeout=http_options_dict.get('timeout'),
761+
)
742762

743763
request_dict = _common.convert_to_dict(request_dict)
744764
request_dict = _common.encode_unserializable_types(request_dict)
@@ -804,11 +824,21 @@ def cancel(
804824
# TODO: remove the hack that pops config.
805825
request_dict.pop('config', None)
806826

807-
http_options: Optional[types.HttpOptionsOrDict] = None
827+
http_options: Optional[types.HttpOptionsDict] = None
808828
if isinstance(config, dict):
809829
http_options = config.get('http_options', None)
810-
elif hasattr(config, 'http_options') and config is not None:
811-
http_options = config.http_options
830+
elif (
831+
hasattr(config, 'http_options')
832+
and config is not None
833+
and config.http_options is not None
834+
):
835+
http_options_dict = config.http_options.model_dump()
836+
http_options = types.HttpOptionsDict(
837+
base_url=http_options_dict.get('base_url'),
838+
api_version=http_options_dict.get('api_version'),
839+
headers=http_options_dict.get('headers'),
840+
timeout=http_options_dict.get('timeout'),
841+
)
812842

813843
request_dict = _common.convert_to_dict(request_dict)
814844
request_dict = _common.encode_unserializable_types(request_dict)
@@ -843,11 +873,21 @@ def _list(
843873
# TODO: remove the hack that pops config.
844874
request_dict.pop('config', None)
845875

846-
http_options: Optional[types.HttpOptionsOrDict] = None
876+
http_options: Optional[types.HttpOptionsDict] = None
847877
if isinstance(config, dict):
848878
http_options = config.get('http_options', None)
849-
elif hasattr(config, 'http_options') and config is not None:
850-
http_options = config.http_options
879+
elif (
880+
hasattr(config, 'http_options')
881+
and config is not None
882+
and config.http_options is not None
883+
):
884+
http_options_dict = config.http_options.model_dump()
885+
http_options = types.HttpOptionsDict(
886+
base_url=http_options_dict.get('base_url'),
887+
api_version=http_options_dict.get('api_version'),
888+
headers=http_options_dict.get('headers'),
889+
timeout=http_options_dict.get('timeout'),
890+
)
851891

852892
request_dict = _common.convert_to_dict(request_dict)
853893
request_dict = _common.encode_unserializable_types(request_dict)
@@ -918,11 +958,21 @@ def delete(
918958
# TODO: remove the hack that pops config.
919959
request_dict.pop('config', None)
920960

921-
http_options: Optional[types.HttpOptionsOrDict] = None
961+
http_options: Optional[types.HttpOptionsDict] = None
922962
if isinstance(config, dict):
923963
http_options = config.get('http_options', None)
924-
elif hasattr(config, 'http_options') and config is not None:
925-
http_options = config.http_options
964+
elif (
965+
hasattr(config, 'http_options')
966+
and config is not None
967+
and config.http_options is not None
968+
):
969+
http_options_dict = config.http_options.model_dump()
970+
http_options = types.HttpOptionsDict(
971+
base_url=http_options_dict.get('base_url'),
972+
api_version=http_options_dict.get('api_version'),
973+
headers=http_options_dict.get('headers'),
974+
timeout=http_options_dict.get('timeout'),
975+
)
926976

927977
request_dict = _common.convert_to_dict(request_dict)
928978
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1042,11 +1092,21 @@ async def _create(
10421092
# TODO: remove the hack that pops config.
10431093
request_dict.pop('config', None)
10441094

1045-
http_options: Optional[types.HttpOptionsOrDict] = None
1095+
http_options: Optional[types.HttpOptionsDict] = None
10461096
if isinstance(config, dict):
10471097
http_options = config.get('http_options', None)
1048-
elif hasattr(config, 'http_options') and config is not None:
1049-
http_options = config.http_options
1098+
elif (
1099+
hasattr(config, 'http_options')
1100+
and config is not None
1101+
and config.http_options is not None
1102+
):
1103+
http_options_dict = config.http_options.model_dump()
1104+
http_options = types.HttpOptionsDict(
1105+
base_url=http_options_dict.get('base_url'),
1106+
api_version=http_options_dict.get('api_version'),
1107+
headers=http_options_dict.get('headers'),
1108+
timeout=http_options_dict.get('timeout'),
1109+
)
10501110

10511111
request_dict = _common.convert_to_dict(request_dict)
10521112
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1111,11 +1171,21 @@ async def get(
11111171
# TODO: remove the hack that pops config.
11121172
request_dict.pop('config', None)
11131173

1114-
http_options: Optional[types.HttpOptionsOrDict] = None
1174+
http_options: Optional[types.HttpOptionsDict] = None
11151175
if isinstance(config, dict):
11161176
http_options = config.get('http_options', None)
1117-
elif hasattr(config, 'http_options') and config is not None:
1118-
http_options = config.http_options
1177+
elif (
1178+
hasattr(config, 'http_options')
1179+
and config is not None
1180+
and config.http_options is not None
1181+
):
1182+
http_options_dict = config.http_options.model_dump()
1183+
http_options = types.HttpOptionsDict(
1184+
base_url=http_options_dict.get('base_url'),
1185+
api_version=http_options_dict.get('api_version'),
1186+
headers=http_options_dict.get('headers'),
1187+
timeout=http_options_dict.get('timeout'),
1188+
)
11191189

11201190
request_dict = _common.convert_to_dict(request_dict)
11211191
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1181,11 +1251,21 @@ async def cancel(
11811251
# TODO: remove the hack that pops config.
11821252
request_dict.pop('config', None)
11831253

1184-
http_options: Optional[types.HttpOptionsOrDict] = None
1254+
http_options: Optional[types.HttpOptionsDict] = None
11851255
if isinstance(config, dict):
11861256
http_options = config.get('http_options', None)
1187-
elif hasattr(config, 'http_options') and config is not None:
1188-
http_options = config.http_options
1257+
elif (
1258+
hasattr(config, 'http_options')
1259+
and config is not None
1260+
and config.http_options is not None
1261+
):
1262+
http_options_dict = config.http_options.model_dump()
1263+
http_options = types.HttpOptionsDict(
1264+
base_url=http_options_dict.get('base_url'),
1265+
api_version=http_options_dict.get('api_version'),
1266+
headers=http_options_dict.get('headers'),
1267+
timeout=http_options_dict.get('timeout'),
1268+
)
11891269

11901270
request_dict = _common.convert_to_dict(request_dict)
11911271
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1220,11 +1300,21 @@ async def _list(
12201300
# TODO: remove the hack that pops config.
12211301
request_dict.pop('config', None)
12221302

1223-
http_options: Optional[types.HttpOptionsOrDict] = None
1303+
http_options: Optional[types.HttpOptionsDict] = None
12241304
if isinstance(config, dict):
12251305
http_options = config.get('http_options', None)
1226-
elif hasattr(config, 'http_options') and config is not None:
1227-
http_options = config.http_options
1306+
elif (
1307+
hasattr(config, 'http_options')
1308+
and config is not None
1309+
and config.http_options is not None
1310+
):
1311+
http_options_dict = config.http_options.model_dump()
1312+
http_options = types.HttpOptionsDict(
1313+
base_url=http_options_dict.get('base_url'),
1314+
api_version=http_options_dict.get('api_version'),
1315+
headers=http_options_dict.get('headers'),
1316+
timeout=http_options_dict.get('timeout'),
1317+
)
12281318

12291319
request_dict = _common.convert_to_dict(request_dict)
12301320
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1295,11 +1385,21 @@ async def delete(
12951385
# TODO: remove the hack that pops config.
12961386
request_dict.pop('config', None)
12971387

1298-
http_options: Optional[types.HttpOptionsOrDict] = None
1388+
http_options: Optional[types.HttpOptionsDict] = None
12991389
if isinstance(config, dict):
13001390
http_options = config.get('http_options', None)
1301-
elif hasattr(config, 'http_options') and config is not None:
1302-
http_options = config.http_options
1391+
elif (
1392+
hasattr(config, 'http_options')
1393+
and config is not None
1394+
and config.http_options is not None
1395+
):
1396+
http_options_dict = config.http_options.model_dump()
1397+
http_options = types.HttpOptionsDict(
1398+
base_url=http_options_dict.get('base_url'),
1399+
api_version=http_options_dict.get('api_version'),
1400+
headers=http_options_dict.get('headers'),
1401+
timeout=http_options_dict.get('timeout'),
1402+
)
13031403

13041404
request_dict = _common.convert_to_dict(request_dict)
13051405
request_dict = _common.encode_unserializable_types(request_dict)

0 commit comments

Comments
 (0)