Skip to content

Commit 116e321

Browse files
musa-cfmusa-cf
committed
fix: resolve type errors and Pydantic failures from codegen overwrites
- asset_create_params: restore missing Required import - organization_profile: inline Result type alias from deleted module - ai/to_markdown: add type-checker suppression for files kwarg in _get_api_list; fix mypy comment placement on call site - radar/ai/to_markdown: fix mypy comment placement on call site - pipelines params (sink_create_params, stream_create_params): restore TypedDict base class on SchemaFieldStruct/SchemaFieldList with object for recursive field refs to avoid Pydantic schema generation errors - pipelines responses (6 files): add BaseModel base class, type discriminator, and standard fields to SchemaFieldStruct/SchemaFieldList stubs with object for recursive refs All fixes address codegen overwrites of manual patches from earlier commits (1c415a2, f280942).
1 parent 9707100 commit 116e321

13 files changed

Lines changed: 205 additions & 45 deletions

‎src/cloudflare/resources/ai/to_markdown.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ def transform(
111111
# sent to the server will contain a `boundary` parameter, e.g.
112112
# multipart/form-data; boundary=---abc--
113113
extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
114-
return self._get_api_list(
114+
return self._get_api_list( # type: ignore[call-arg]
115115
path_template("/accounts/{account_id}/ai/tomarkdown", account_id=account_id),
116116
page=SyncSinglePage[ToMarkdownTransformResponse],
117117
body=maybe_transform(body, to_markdown_transform_params.ToMarkdownTransformParams),
118-
files=files,
118+
files=files, # pyright: ignore[reportCallIssue]
119119
options=make_request_options(
120120
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
121121
),
@@ -210,11 +210,11 @@ def transform(
210210
# sent to the server will contain a `boundary` parameter, e.g.
211211
# multipart/form-data; boundary=---abc--
212212
extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
213-
return self._get_api_list(
213+
return self._get_api_list( # type: ignore[call-arg]
214214
path_template("/accounts/{account_id}/ai/tomarkdown", account_id=account_id),
215215
page=AsyncSinglePage[ToMarkdownTransformResponse],
216216
body=maybe_transform(body, to_markdown_transform_params.ToMarkdownTransformParams),
217-
files=files,
217+
files=files, # pyright: ignore[reportCallIssue]
218218
options=make_request_options(
219219
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
220220
),

‎src/cloudflare/resources/organizations/organization_profile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from ..._wrappers import ResultWrapper
2020
from ..._base_client import make_request_options
2121
from ...types.organizations import organization_profile_update_params
22-
from ...types.organizations.organization_profile_get_params import Result
22+
from ...types.organizations.organization_profile import OrganizationProfile as Result
2323

2424
__all__ = ["OrganizationProfileResource", "AsyncOrganizationProfileResource"]
2525

‎src/cloudflare/resources/radar/ai/to_markdown.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ def create(
8888
# sent to the server will contain a `boundary` parameter, e.g.
8989
# multipart/form-data; boundary=---abc--
9090
extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
91-
return self._get_api_list(
91+
return self._get_api_list( # type: ignore[call-arg]
9292
path_template("/accounts/{account_id}/ai/tomarkdown", account_id=account_id),
9393
page=SyncSinglePage[ToMarkdownCreateResponse],
9494
body=maybe_transform(body, to_markdown_create_params.ToMarkdownCreateParams),
95-
files=extracted_files, # pyright: ignore[reportCallIssue] # type: ignore[call-arg]
95+
files=extracted_files, # pyright: ignore[reportCallIssue]
9696
options=make_request_options(
9797
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
9898
),
@@ -156,11 +156,11 @@ def create(
156156
# sent to the server will contain a `boundary` parameter, e.g.
157157
# multipart/form-data; boundary=---abc--
158158
extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
159-
return self._get_api_list(
159+
return self._get_api_list( # type: ignore[call-arg]
160160
path_template("/accounts/{account_id}/ai/tomarkdown", account_id=account_id),
161161
page=AsyncSinglePage[ToMarkdownCreateResponse],
162162
body=maybe_transform(body, to_markdown_create_params.ToMarkdownCreateParams),
163-
files=extracted_files, # pyright: ignore[reportCallIssue] # type: ignore[call-arg]
163+
files=extracted_files, # pyright: ignore[reportCallIssue]
164164
options=make_request_options(
165165
extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
166166
),

‎src/cloudflare/types/ai/finetunes/asset_create_params.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing_extensions import TypedDict
5+
from typing_extensions import Required, TypedDict
66

77
from ...._types import FileTypes
88

‎src/cloudflare/types/pipelines/sink_create_params.py‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import Union, Iterable, Optional
5+
from typing import List, Union, Iterable, Optional
66
from typing_extensions import Literal, Required, TypeAlias, TypedDict
77

88
__all__ = [
@@ -290,12 +290,32 @@ class SchemaFieldJson(TypedDict, total=False):
290290
sql_name: str
291291

292292

293-
class SchemaFieldStruct(total=False):
294-
pass
293+
class SchemaFieldStruct(TypedDict, total=False):
294+
type: Required[Literal["struct"]]
295295

296+
metadata_key: Optional[str]
297+
298+
name: str
299+
300+
required: bool
301+
302+
sql_name: str
303+
304+
fields: Optional[List[object]] # recursive SchemaField
305+
306+
307+
class SchemaFieldList(TypedDict, total=False):
308+
type: Required[Literal["list"]]
309+
310+
metadata_key: Optional[str]
311+
312+
name: str
313+
314+
required: bool
315+
316+
sql_name: str
296317

297-
class SchemaFieldList(total=False):
298-
pass
318+
element: Optional[object] # recursive SchemaField
299319

300320

301321
SchemaField: TypeAlias = Union[

‎src/cloudflare/types/pipelines/sink_create_response.py‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,32 @@ class SchemaFieldJson(BaseModel):
276276
sql_name: Optional[str] = None
277277

278278

279-
class SchemaFieldStruct:
280-
pass
279+
class SchemaFieldStruct(BaseModel):
280+
type: Literal["struct"]
281281

282+
metadata_key: Optional[str] = None
283+
284+
name: Optional[str] = None
285+
286+
required: Optional[bool] = None
287+
288+
sql_name: Optional[str] = None
289+
290+
fields: Optional[List[object]] = None # recursive SchemaField
291+
292+
293+
class SchemaFieldList(BaseModel):
294+
type: Literal["list"]
295+
296+
metadata_key: Optional[str] = None
297+
298+
name: Optional[str] = None
299+
300+
required: Optional[bool] = None
301+
302+
sql_name: Optional[str] = None
282303

283-
class SchemaFieldList:
284-
pass
304+
element: Optional[object] = None # recursive SchemaField
285305

286306

287307
SchemaField: TypeAlias = Annotated[

‎src/cloudflare/types/pipelines/sink_get_response.py‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,32 @@ class SchemaFieldJson(BaseModel):
264264
sql_name: Optional[str] = None
265265

266266

267-
class SchemaFieldStruct:
268-
pass
267+
class SchemaFieldStruct(BaseModel):
268+
type: Literal["struct"]
269269

270+
metadata_key: Optional[str] = None
271+
272+
name: Optional[str] = None
273+
274+
required: Optional[bool] = None
275+
276+
sql_name: Optional[str] = None
277+
278+
fields: Optional[List[object]] = None # recursive SchemaField
279+
280+
281+
class SchemaFieldList(BaseModel):
282+
type: Literal["list"]
283+
284+
metadata_key: Optional[str] = None
285+
286+
name: Optional[str] = None
287+
288+
required: Optional[bool] = None
289+
290+
sql_name: Optional[str] = None
270291

271-
class SchemaFieldList:
272-
pass
292+
element: Optional[object] = None # recursive SchemaField
273293

274294

275295
SchemaField: TypeAlias = Annotated[

‎src/cloudflare/types/pipelines/sink_list_response.py‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,32 @@ class SchemaFieldJson(BaseModel):
264264
sql_name: Optional[str] = None
265265

266266

267-
class SchemaFieldStruct:
268-
pass
267+
class SchemaFieldStruct(BaseModel):
268+
type: Literal["struct"]
269269

270+
metadata_key: Optional[str] = None
271+
272+
name: Optional[str] = None
273+
274+
required: Optional[bool] = None
275+
276+
sql_name: Optional[str] = None
277+
278+
fields: Optional[List[object]] = None # recursive SchemaField
279+
280+
281+
class SchemaFieldList(BaseModel):
282+
type: Literal["list"]
283+
284+
metadata_key: Optional[str] = None
285+
286+
name: Optional[str] = None
287+
288+
required: Optional[bool] = None
289+
290+
sql_name: Optional[str] = None
270291

271-
class SchemaFieldList:
272-
pass
292+
element: Optional[object] = None # recursive SchemaField
273293

274294

275295
SchemaField: TypeAlias = Annotated[

‎src/cloudflare/types/pipelines/stream_create_params.py‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from __future__ import annotations
44

5-
from typing import Union, Iterable, Optional
5+
from typing import List, Union, Iterable, Optional
66
from typing_extensions import Literal, Required, TypeAlias, TypedDict
77

88
from ..._types import SequenceNotStr
@@ -198,12 +198,32 @@ class SchemaFieldJson(TypedDict, total=False):
198198
sql_name: str
199199

200200

201-
class SchemaFieldStruct(total=False):
202-
pass
201+
class SchemaFieldStruct(TypedDict, total=False):
202+
type: Required[Literal["struct"]]
203203

204+
metadata_key: Optional[str]
205+
206+
name: str
207+
208+
required: bool
209+
210+
sql_name: str
211+
212+
fields: Optional[List[object]] # recursive SchemaField
213+
214+
215+
class SchemaFieldList(TypedDict, total=False):
216+
type: Required[Literal["list"]]
217+
218+
metadata_key: Optional[str]
219+
220+
name: str
221+
222+
required: bool
223+
224+
sql_name: str
204225

205-
class SchemaFieldList(total=False):
206-
pass
226+
element: Optional[object] # recursive SchemaField
207227

208228

209229
SchemaField: TypeAlias = Union[

‎src/cloudflare/types/pipelines/stream_create_response.py‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,32 @@ class SchemaFieldJson(BaseModel):
189189
sql_name: Optional[str] = None
190190

191191

192-
class SchemaFieldStruct:
193-
pass
192+
class SchemaFieldStruct(BaseModel):
193+
type: Literal["struct"]
194194

195+
metadata_key: Optional[str] = None
196+
197+
name: Optional[str] = None
198+
199+
required: Optional[bool] = None
200+
201+
sql_name: Optional[str] = None
202+
203+
fields: Optional[List[object]] = None # recursive SchemaField
204+
205+
206+
class SchemaFieldList(BaseModel):
207+
type: Literal["list"]
208+
209+
metadata_key: Optional[str] = None
210+
211+
name: Optional[str] = None
212+
213+
required: Optional[bool] = None
214+
215+
sql_name: Optional[str] = None
195216

196-
class SchemaFieldList:
197-
pass
217+
element: Optional[object] = None # recursive SchemaField
198218

199219

200220
SchemaField: TypeAlias = Annotated[

0 commit comments

Comments
 (0)