Skip to content

Commit a665f20

Browse files
sararobcopybara-github
sararob
authored and
copybara-github
committed
chore: resolve all remaining non-strict mypy errors
PiperOrigin-RevId: 737632813
1 parent 4d0c812 commit a665f20

File tree

8 files changed

+482
-380
lines changed

8 files changed

+482
-380
lines changed

‎google/genai/_replay_api_client.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ def upload_file(self, file_path: Union[str, io.IOBase], upload_url: str, upload_
482482
result = super().upload_file(file_path, upload_url, upload_size)
483483
except HTTPError as e:
484484
result = HttpResponse(
485-
e.response.headers, [json.dumps({'reason': e.response.reason})]
485+
dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
486486
)
487487
result.status_code = e.response.status_code
488488
raise e
@@ -519,7 +519,7 @@ async def async_upload_file(
519519
)
520520
except HTTPError as e:
521521
result = HttpResponse(
522-
e.response.headers, [json.dumps({'reason': e.response.reason})]
522+
dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
523523
)
524524
result.status_code = e.response.status_code
525525
raise e
@@ -538,7 +538,7 @@ def download_file(self, path: str, http_options: HttpOptions):
538538
result = super().download_file(path, http_options)
539539
except HTTPError as e:
540540
result = HttpResponse(
541-
e.response.headers, [json.dumps({'reason': e.response.reason})]
541+
dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
542542
)
543543
result.status_code = e.response.status_code
544544
raise e
@@ -557,7 +557,7 @@ async def async_download_file(self, path: str, http_options):
557557
result = await super().async_download_file(path, http_options)
558558
except HTTPError as e:
559559
result = HttpResponse(
560-
e.response.headers, [json.dumps({'reason': e.response.reason})]
560+
dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
561561
)
562562
result.status_code = e.response.status_code
563563
raise e

‎google/genai/_transformers.py

+18-9
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,26 @@ def t_models_url(
181181

182182
def t_extract_models(
183183
api_client: _api_client.BaseApiClient,
184-
response: dict[str, list[types.ModelDict]],
185-
) -> Optional[list[types.ModelDict]]:
184+
response: dict[str, Any],
185+
) -> list[dict[str, Any]]:
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[dict[str, Any]]] = response.get('models')
190+
if models is not None:
191+
return models
192+
193+
tuned_models: Optional[list[dict[str, Any]]] = response.get('tunedModels')
194+
if tuned_models is not None:
195+
return tuned_models
196+
197+
publisher_models: Optional[list[dict[str, Any]]] = 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

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

668-
http_options: Optional[types.HttpOptionsOrDict] = None
669-
if isinstance(config, dict):
670-
http_options = config.get('http_options', None)
671-
elif hasattr(config, 'http_options') and config is not None:
672-
http_options = config.http_options
668+
http_options: Optional[types.HttpOptions] = None
669+
if (
670+
parameter_model.config is not None
671+
and parameter_model.config.http_options is not None
672+
):
673+
http_options = parameter_model.config.http_options
673674

674675
request_dict = _common.convert_to_dict(request_dict)
675676
request_dict = _common.encode_unserializable_types(request_dict)
@@ -734,11 +735,12 @@ def get(
734735
# TODO: remove the hack that pops config.
735736
request_dict.pop('config', None)
736737

737-
http_options: Optional[types.HttpOptionsOrDict] = None
738-
if isinstance(config, dict):
739-
http_options = config.get('http_options', None)
740-
elif hasattr(config, 'http_options') and config is not None:
741-
http_options = config.http_options
738+
http_options: Optional[types.HttpOptions] = None
739+
if (
740+
parameter_model.config is not None
741+
and parameter_model.config.http_options is not None
742+
):
743+
http_options = parameter_model.config.http_options
742744

743745
request_dict = _common.convert_to_dict(request_dict)
744746
request_dict = _common.encode_unserializable_types(request_dict)
@@ -804,11 +806,12 @@ def cancel(
804806
# TODO: remove the hack that pops config.
805807
request_dict.pop('config', None)
806808

807-
http_options: Optional[types.HttpOptionsOrDict] = None
808-
if isinstance(config, dict):
809-
http_options = config.get('http_options', None)
810-
elif hasattr(config, 'http_options') and config is not None:
811-
http_options = config.http_options
809+
http_options: Optional[types.HttpOptions] = None
810+
if (
811+
parameter_model.config is not None
812+
and parameter_model.config.http_options is not None
813+
):
814+
http_options = parameter_model.config.http_options
812815

813816
request_dict = _common.convert_to_dict(request_dict)
814817
request_dict = _common.encode_unserializable_types(request_dict)
@@ -843,11 +846,12 @@ def _list(
843846
# TODO: remove the hack that pops config.
844847
request_dict.pop('config', None)
845848

846-
http_options: Optional[types.HttpOptionsOrDict] = None
847-
if isinstance(config, dict):
848-
http_options = config.get('http_options', None)
849-
elif hasattr(config, 'http_options') and config is not None:
850-
http_options = config.http_options
849+
http_options: Optional[types.HttpOptions] = None
850+
if (
851+
parameter_model.config is not None
852+
and parameter_model.config.http_options is not None
853+
):
854+
http_options = parameter_model.config.http_options
851855

852856
request_dict = _common.convert_to_dict(request_dict)
853857
request_dict = _common.encode_unserializable_types(request_dict)
@@ -918,11 +922,12 @@ def delete(
918922
# TODO: remove the hack that pops config.
919923
request_dict.pop('config', None)
920924

921-
http_options: Optional[types.HttpOptionsOrDict] = None
922-
if isinstance(config, dict):
923-
http_options = config.get('http_options', None)
924-
elif hasattr(config, 'http_options') and config is not None:
925-
http_options = config.http_options
925+
http_options: Optional[types.HttpOptions] = None
926+
if (
927+
parameter_model.config is not None
928+
and parameter_model.config.http_options is not None
929+
):
930+
http_options = parameter_model.config.http_options
926931

927932
request_dict = _common.convert_to_dict(request_dict)
928933
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1042,11 +1047,12 @@ async def _create(
10421047
# TODO: remove the hack that pops config.
10431048
request_dict.pop('config', None)
10441049

1045-
http_options: Optional[types.HttpOptionsOrDict] = None
1046-
if isinstance(config, dict):
1047-
http_options = config.get('http_options', None)
1048-
elif hasattr(config, 'http_options') and config is not None:
1049-
http_options = config.http_options
1050+
http_options: Optional[types.HttpOptions] = None
1051+
if (
1052+
parameter_model.config is not None
1053+
and parameter_model.config.http_options is not None
1054+
):
1055+
http_options = parameter_model.config.http_options
10501056

10511057
request_dict = _common.convert_to_dict(request_dict)
10521058
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1111,11 +1117,12 @@ async def get(
11111117
# TODO: remove the hack that pops config.
11121118
request_dict.pop('config', None)
11131119

1114-
http_options: Optional[types.HttpOptionsOrDict] = None
1115-
if isinstance(config, dict):
1116-
http_options = config.get('http_options', None)
1117-
elif hasattr(config, 'http_options') and config is not None:
1118-
http_options = config.http_options
1120+
http_options: Optional[types.HttpOptions] = None
1121+
if (
1122+
parameter_model.config is not None
1123+
and parameter_model.config.http_options is not None
1124+
):
1125+
http_options = parameter_model.config.http_options
11191126

11201127
request_dict = _common.convert_to_dict(request_dict)
11211128
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1181,11 +1188,12 @@ async def cancel(
11811188
# TODO: remove the hack that pops config.
11821189
request_dict.pop('config', None)
11831190

1184-
http_options: Optional[types.HttpOptionsOrDict] = None
1185-
if isinstance(config, dict):
1186-
http_options = config.get('http_options', None)
1187-
elif hasattr(config, 'http_options') and config is not None:
1188-
http_options = config.http_options
1191+
http_options: Optional[types.HttpOptions] = None
1192+
if (
1193+
parameter_model.config is not None
1194+
and parameter_model.config.http_options is not None
1195+
):
1196+
http_options = parameter_model.config.http_options
11891197

11901198
request_dict = _common.convert_to_dict(request_dict)
11911199
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1220,11 +1228,12 @@ async def _list(
12201228
# TODO: remove the hack that pops config.
12211229
request_dict.pop('config', None)
12221230

1223-
http_options: Optional[types.HttpOptionsOrDict] = None
1224-
if isinstance(config, dict):
1225-
http_options = config.get('http_options', None)
1226-
elif hasattr(config, 'http_options') and config is not None:
1227-
http_options = config.http_options
1231+
http_options: Optional[types.HttpOptions] = None
1232+
if (
1233+
parameter_model.config is not None
1234+
and parameter_model.config.http_options is not None
1235+
):
1236+
http_options = parameter_model.config.http_options
12281237

12291238
request_dict = _common.convert_to_dict(request_dict)
12301239
request_dict = _common.encode_unserializable_types(request_dict)
@@ -1295,11 +1304,12 @@ async def delete(
12951304
# TODO: remove the hack that pops config.
12961305
request_dict.pop('config', None)
12971306

1298-
http_options: Optional[types.HttpOptionsOrDict] = None
1299-
if isinstance(config, dict):
1300-
http_options = config.get('http_options', None)
1301-
elif hasattr(config, 'http_options') and config is not None:
1302-
http_options = config.http_options
1307+
http_options: Optional[types.HttpOptions] = None
1308+
if (
1309+
parameter_model.config is not None
1310+
and parameter_model.config.http_options is not None
1311+
):
1312+
http_options = parameter_model.config.http_options
13031313

13041314
request_dict = _common.convert_to_dict(request_dict)
13051315
request_dict = _common.encode_unserializable_types(request_dict)

0 commit comments

Comments
 (0)