Skip to content

Commit 16d7a39

Browse files
devin-ai-integration[bot]aaronsteers
devin-ai-integration[bot]
and
aaronsteers
committed
chore(metadata-service): use datamodel-code-generator 0.30.2 instead of 0.35.0
- Update datamodel-code-generator from ^0.17.1 to ^0.30.2 - Version 0.35.0 requires Pydantic v2 internally, incompatible with project's Pydantic v1.10.6 - Version 0.30.2 still removes typed-ast dependency while maintaining Pydantic v1 compatibility - Verified: poetry install succeeds without typed-ast build failures - Verified: poetry run poe generate-models completes successfully - Verified: all 140 tests pass (poetry run poe test) - Generated code changes are formatting updates from the new generator version Co-Authored-By: AJ Steers <aj@airbyte.io>
1 parent 4acf611 commit 16d7a39

23 files changed

+81
-125
lines changed

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ActorDefinitionResourceRequirements.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
from __future__ import annotations
55

6-
from typing import List, Optional
6+
from typing import List, Literal, Optional
77

88
from pydantic import BaseModel, Extra, Field
9-
from typing_extensions import Literal
109

1110

1211
class ResourceRequirements(BaseModel):

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/AirbyteInternal.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
from __future__ import annotations
55

6-
from typing import Optional
6+
from typing import Literal, Optional
77

88
from pydantic import BaseModel, Extra, Field
9-
from typing_extensions import Literal
109

1110

1211
class AirbyteInternal(BaseModel):

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorBreakingChanges.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
from __future__ import annotations
55

66
from datetime import date
7-
from typing import Any, Dict, List, Optional
7+
from typing import Dict, List, Literal, Optional
88

99
from pydantic import AnyUrl, BaseModel, Extra, Field, constr
10-
from typing_extensions import Literal
1110

1211

1312
class StreamBreakingChangeScope(BaseModel):
1413
class Config:
1514
extra = Extra.forbid
1615

17-
scopeType: Any = Field("stream", const=True)
16+
scopeType: str = Field("stream", const=True)
1817
impactedScopes: List[str] = Field(
1918
...,
2019
description="List of streams that are impacted by the breaking change.",

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorIPCOptions.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# generated by datamodel-codegen:
2+
# filename: ConnectorIPCOptions.yaml
3+
4+
from __future__ import annotations
5+
6+
from typing import List, Literal
7+
8+
from pydantic import BaseModel, Extra
9+
10+
11+
class DataChannel(BaseModel):
12+
class Config:
13+
extra = Extra.forbid
14+
15+
version: str
16+
supportedSerialization: List[Literal["JSONL", "PROTOBUF", "FLATBUFFERS"]]
17+
supportedTransport: List[Literal["STDIO", "SOCKET"]]
18+
19+
20+
class ConnectorIPCOptions(BaseModel):
21+
class Config:
22+
extra = Extra.forbid
23+
24+
dataChannel: DataChannel

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"type": "array",
8181
"items": {
8282
"$schema": "http://json-schema.org/draft-07/schema#",
83-
"$id": "https://github.com/airbytehq/airbyte/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/TestSecret.yaml",
83+
"$id": "https://github.com/airbytehq/airbyte/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/Secret.yaml",
8484
"title": "Secret",
8585
"description": "An object describing a secret's metadata",
8686
"type": "object",
@@ -100,14 +100,10 @@
100100
},
101101
"secretStore": {
102102
"$schema": "http://json-schema.org/draft-07/schema#",
103-
"$id": "https://github.com/airbytehq/airbyte/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/TestSecret.yaml",
103+
"$id": "https://github.com/airbytehq/airbyte/airbyte-ci/connectors/metadata_service/lib/metadata_service/models/src/SecretStore.yaml",
104104
"title": "SecretStore",
105105
"description": "An object describing a secret store metadata",
106106
"type": "object",
107-
"required": [
108-
"name",
109-
"secretStore"
110-
],
111107
"additionalProperties": false,
112108
"properties": {
113109
"alias": {
@@ -456,7 +452,7 @@
456452
],
457453
"properties": {
458454
"scopeType": {
459-
"type": "const",
455+
"type": "string",
460456
"const": "stream"
461457
},
462458
"impactedScopes": {

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetadataDefinitionV0.py‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
from __future__ import annotations
55

66
from datetime import date, datetime
7-
from typing import Any, Dict, List, Optional, Union
7+
from typing import Any, Dict, List, Literal, Optional, Union
88
from uuid import UUID
99

1010
from pydantic import AnyUrl, BaseModel, Extra, Field, conint, constr
11-
from typing_extensions import Literal
1211

1312

1413
class ConnectorBuildOptions(BaseModel):
@@ -144,7 +143,7 @@ class StreamBreakingChangeScope(BaseModel):
144143
class Config:
145144
extra = Extra.forbid
146145

147-
scopeType: Any = Field("stream", const=True)
146+
scopeType: str = Field("stream", const=True)
148147
impactedScopes: List[str] = Field(
149148
...,
150149
description="List of streams that are impacted by the breaking change.",
@@ -165,16 +164,6 @@ class Config:
165164
)
166165

167166

168-
class ConnectorIPCDataChannel(BaseModel):
169-
version: str = Field(..., description="Version of the data channel specification")
170-
supportedSerialization: List[Literal["JSONL", "PROTOBUF", "FLATBUFFERS"]]
171-
supportedTransport: List[Literal["STDIO", "SOCKET"]]
172-
173-
174-
class ConnectorIPCOptions(BaseModel):
175-
dataChannel: ConnectorIPCDataChannel
176-
177-
178167
class PyPi(BaseModel):
179168
class Config:
180169
extra = Extra.forbid
@@ -228,6 +217,22 @@ class Config:
228217
connector_version: Optional[str] = None
229218

230219

220+
class DataChannel(BaseModel):
221+
class Config:
222+
extra = Extra.forbid
223+
224+
version: str
225+
supportedSerialization: List[Literal["JSONL", "PROTOBUF", "FLATBUFFERS"]]
226+
supportedTransport: List[Literal["STDIO", "SOCKET"]]
227+
228+
229+
class ConnectorIPCOptions(BaseModel):
230+
class Config:
231+
extra = Extra.forbid
232+
233+
dataChannel: DataChannel
234+
235+
231236
class Secret(BaseModel):
232237
class Config:
233238
extra = Extra.forbid
@@ -351,7 +356,7 @@ class Config:
351356
)
352357

353358

354-
class RegistryOverride(BaseModel):
359+
class RegistryOverridesModel(BaseModel):
355360
class Config:
356361
extra = Extra.forbid
357362

@@ -418,7 +423,7 @@ class Config:
418423
[],
419424
description="An array of tags that describe the connector. E.g: language:python, keyword:rds, etc.",
420425
)
421-
registryOverrides: Optional[RegistryOverride] = None
426+
registryOverrides: Optional[RegistryOverridesModel] = None
422427
allowedHosts: Optional[AllowedHosts] = None
423428
releases: Optional[ConnectorReleases] = None
424429
normalizationConfig: Optional[NormalizationDestinationDefinitionConfig] = None
@@ -430,10 +435,7 @@ class Config:
430435
generated: Optional[GeneratedFields] = None
431436
supportsFileTransfer: Optional[bool] = False
432437
supportsDataActivation: Optional[bool] = False
433-
connectorIPCOptions: Optional[ConnectorIPCOptions] = Field(
434-
None,
435-
description="Advanced options related to connector's inter-process communication"
436-
)
438+
connectorIPCOptions: Optional[ConnectorIPCOptions] = None
437439

438440

439441
class ConnectorMetadataDefinitionV0(BaseModel):

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorMetrics.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
from __future__ import annotations
55

6-
from typing import Any, Optional, Union
6+
from typing import Any, Literal, Optional, Union
77

88
from pydantic import BaseModel, Extra
9-
from typing_extensions import Literal
109

1110

1211
class ConnectorMetrics(BaseModel):

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryDestinationDefinition.py‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
from __future__ import annotations
55

66
from datetime import date, datetime
7-
from typing import Any, Dict, List, Optional, Union
7+
from typing import Any, Dict, List, Literal, Optional, Union
88
from uuid import UUID
99

1010
from pydantic import AnyUrl, BaseModel, Extra, Field, conint, constr
11-
from typing_extensions import Literal
1211

1312

1413
class ReleaseStage(BaseModel):
@@ -106,7 +105,7 @@ class StreamBreakingChangeScope(BaseModel):
106105
class Config:
107106
extra = Extra.forbid
108107

109-
scopeType: Any = Field("stream", const=True)
108+
scopeType: str = Field("stream", const=True)
110109
impactedScopes: List[str] = Field(
111110
...,
112111
description="List of streams that are impacted by the breaking change.",
@@ -137,16 +136,6 @@ class Config:
137136
)
138137

139138

140-
class ConnectorIPCDataChannel(BaseModel):
141-
version: str = Field(..., description="Version of the data channel specification")
142-
supportedSerialization: List[Literal["JSONL", "PROTOBUF", "FLATBUFFERS"]]
143-
supportedTransport: List[Literal["STDIO", "SOCKET"]]
144-
145-
146-
class ConnectorIPCOptions(BaseModel):
147-
dataChannel: ConnectorIPCDataChannel
148-
149-
150139
class GitInfo(BaseModel):
151140
class Config:
152141
extra = Extra.forbid
@@ -313,10 +302,6 @@ class Config:
313302
supportsRefreshes: Optional[bool] = False
314303
supportsFileTransfer: Optional[bool] = False
315304
supportsDataActivation: Optional[bool] = False
316-
connectorIPCOptions: Optional[ConnectorIPCOptions] = Field(
317-
None,
318-
description="Advanced options related to connector's inter-process communication"
319-
)
320305
generated: Optional[GeneratedFields] = None
321306
packageInfo: Optional[ConnectorPackageInfo] = None
322307
language: Optional[str] = Field(

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistryReleases.py‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
from __future__ import annotations
55

66
from datetime import date, datetime
7-
from typing import Any, Dict, List, Optional, Union
7+
from typing import Any, Dict, List, Literal, Optional, Union
88
from uuid import UUID
99

1010
from pydantic import AnyUrl, BaseModel, Extra, Field, conint, constr
11-
from typing_extensions import Literal
1211

1312

1413
class RolloutConfiguration(BaseModel):
@@ -36,7 +35,7 @@ class StreamBreakingChangeScope(BaseModel):
3635
class Config:
3736
extra = Extra.forbid
3837

39-
scopeType: Any = Field("stream", const=True)
38+
scopeType: str = Field("stream", const=True)
4039
impactedScopes: List[str] = Field(
4140
...,
4241
description="List of streams that are impacted by the breaking change.",
@@ -60,16 +59,6 @@ class SupportLevel(BaseModel):
6059
)
6160

6261

63-
class ConnectorIPCDataChannel(BaseModel):
64-
version: str = Field(..., description="Version of the data channel specification")
65-
supportedSerialization: List[Literal["JSONL", "PROTOBUF", "FLATBUFFERS"]]
66-
supportedTransport: List[Literal["STDIO", "SOCKET"]]
67-
68-
69-
class ConnectorIPCOptions(BaseModel):
70-
dataChannel: ConnectorIPCDataChannel
71-
72-
7362
class ResourceRequirements(BaseModel):
7463
class Config:
7564
extra = Extra.forbid
@@ -404,10 +393,6 @@ class Config:
404393
supportsRefreshes: Optional[bool] = False
405394
supportsFileTransfer: Optional[bool] = False
406395
supportsDataActivation: Optional[bool] = False
407-
connectorIPCOptions: Optional[ConnectorIPCOptions] = Field(
408-
None,
409-
description="Advanced options related to connector's inter-process communication"
410-
)
411396
generated: Optional[GeneratedFields] = None
412397
packageInfo: Optional[ConnectorPackageInfo] = None
413398
language: Optional[str] = Field(

‎airbyte-ci/connectors/metadata_service/lib/metadata_service/models/generated/ConnectorRegistrySourceDefinition.py‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
from __future__ import annotations
55

66
from datetime import date, datetime
7-
from typing import Any, Dict, List, Optional, Union
7+
from typing import Any, Dict, List, Literal, Optional, Union
88
from uuid import UUID
99

1010
from pydantic import AnyUrl, BaseModel, Extra, Field, conint, constr
11-
from typing_extensions import Literal
1211

1312

1413
class ReleaseStage(BaseModel):
@@ -98,7 +97,7 @@ class StreamBreakingChangeScope(BaseModel):
9897
class Config:
9998
extra = Extra.forbid
10099

101-
scopeType: Any = Field("stream", const=True)
100+
scopeType: str = Field("stream", const=True)
102101
impactedScopes: List[str] = Field(
103102
...,
104103
description="List of streams that are impacted by the breaking change.",
@@ -137,16 +136,6 @@ class Config:
137136
)
138137

139138

140-
class ConnectorIPCDataChannel(BaseModel):
141-
version: str = Field(..., description="Version of the data channel specification")
142-
supportedSerialization: List[Literal["JSONL", "PROTOBUF", "FLATBUFFERS"]]
143-
supportedTransport: List[Literal["STDIO", "SOCKET"]]
144-
145-
146-
class ConnectorIPCOptions(BaseModel):
147-
dataChannel: ConnectorIPCDataChannel
148-
149-
150139
class GitInfo(BaseModel):
151140
class Config:
152141
extra = Extra.forbid
@@ -404,10 +393,6 @@ class Config:
404393
supportsRefreshes: Optional[bool] = False
405394
supportsFileTransfer: Optional[bool] = False
406395
supportsDataActivation: Optional[bool] = False
407-
connectorIPCOptions: Optional[ConnectorIPCOptions] = Field(
408-
None,
409-
description="Advanced options related to connector's inter-process communication"
410-
)
411396
generated: Optional[GeneratedFields] = None
412397
packageInfo: Optional[ConnectorPackageInfo] = None
413398
language: Optional[str] = Field(

0 commit comments

Comments
 (0)