Skip to content

Commit 3f06fa4

Browse files
authored
Consolidate ParserConfig TypedDict profiles with inheritance preservation (#2883)
1 parent 20ad1a1 commit 3f06fa4

8 files changed

Lines changed: 26 additions & 474 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ repos:
3939
pass_filenames: false
4040
- id: config-types
4141
name: Generate config TypedDicts
42-
entry: bash -c '[ -x .tox/dev/bin/python ] && PREFIX=.tox/dev/bin || PREFIX=.tox/dev/Scripts; test -x "$PREFIX/python" || tox run -e dev --notest -qq; "$PREFIX/datamodel-codegen" --profile generate-config-dict && "$PREFIX/datamodel-codegen" --profile parser-config-dict && "$PREFIX/datamodel-codegen" --profile graphql-parser-config-dict && "$PREFIX/datamodel-codegen" --profile jsonschema-parser-config-dict && "$PREFIX/datamodel-codegen" --profile openapi-parser-config-dict && "$PREFIX/datamodel-codegen" --profile parse-config-dict'
42+
entry: bash -c '[ -x .tox/dev/bin/python ] && PREFIX=.tox/dev/bin || PREFIX=.tox/dev/Scripts; test -x "$PREFIX/python" || tox run -e dev --notest -qq; "$PREFIX/datamodel-codegen" --profile generate-config-dict && "$PREFIX/datamodel-codegen" --profile parser-config-dicts && "$PREFIX/datamodel-codegen" --profile parse-config-dict'
4343
language: system
4444
files: ^src/datamodel_code_generator/config\.py$
4545
pass_filenames: false

pyproject.toml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -274,29 +274,15 @@ input-model = "src/datamodel_code_generator/config.py:GenerateConfig"
274274
output = "src/datamodel_code_generator/_types/generate_config_dict.py"
275275
class-name = "GenerateConfigDict"
276276

277-
[tool.datamodel-codegen.profiles.parser-config-dict]
277+
[tool.datamodel-codegen.profiles.parser-config-dicts]
278278
extends = "config-types-base"
279-
input-model = "src/datamodel_code_generator/config.py:ParserConfig"
280-
output = "src/datamodel_code_generator/_types/parser_config_dict.py"
281-
class-name = "ParserConfigDict"
282-
283-
[tool.datamodel-codegen.profiles.graphql-parser-config-dict]
284-
extends = "config-types-base"
285-
input-model = "src/datamodel_code_generator/config.py:GraphQLParserConfig"
286-
output = "src/datamodel_code_generator/_types/graphql_parser_config_dict.py"
287-
class-name = "GraphQLParserConfigDict"
288-
289-
[tool.datamodel-codegen.profiles.jsonschema-parser-config-dict]
290-
extends = "config-types-base"
291-
input-model = "src/datamodel_code_generator/config.py:JSONSchemaParserConfig"
292-
output = "src/datamodel_code_generator/_types/jsonschema_parser_config_dict.py"
293-
class-name = "JSONSchemaParserConfigDict"
294-
295-
[tool.datamodel-codegen.profiles.openapi-parser-config-dict]
296-
extends = "config-types-base"
297-
input-model = "src/datamodel_code_generator/config.py:OpenAPIParserConfig"
298-
output = "src/datamodel_code_generator/_types/openapi_parser_config_dict.py"
299-
class-name = "OpenAPIParserConfigDict"
279+
input-model = [
280+
"src/datamodel_code_generator/config.py:ParserConfig",
281+
"src/datamodel_code_generator/config.py:GraphQLParserConfig",
282+
"src/datamodel_code_generator/config.py:JSONSchemaParserConfig",
283+
"src/datamodel_code_generator/config.py:OpenAPIParserConfig",
284+
]
285+
output = "src/datamodel_code_generator/_types/parser_config_dicts.py"
300286

301287
[tool.datamodel-codegen.profiles.parse-config-dict]
302288
extends = "config-types-base"

src/datamodel_code_generator/_types/__init__.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
from __future__ import annotations
44

55
from datamodel_code_generator._types.generate_config_dict import GenerateConfigDict
6-
from datamodel_code_generator._types.graphql_parser_config_dict import GraphQLParserConfigDict
7-
from datamodel_code_generator._types.jsonschema_parser_config_dict import JSONSchemaParserConfigDict
8-
from datamodel_code_generator._types.openapi_parser_config_dict import OpenAPIParserConfigDict
96
from datamodel_code_generator._types.parse_config_dict import ParseConfigDict
10-
from datamodel_code_generator._types.parser_config_dict import ParserConfigDict
7+
from datamodel_code_generator._types.parser_config_dicts import (
8+
GraphQLParserConfig as GraphQLParserConfigDict,
9+
JSONSchemaParserConfig as JSONSchemaParserConfigDict,
10+
OpenAPIParserConfig as OpenAPIParserConfigDict,
11+
ParserConfig as ParserConfigDict,
12+
)
1113

1214
__all__ = [
1315
"GenerateConfigDict",

src/datamodel_code_generator/_types/graphql_parser_config_dict.py

Lines changed: 0 additions & 149 deletions
This file was deleted.

src/datamodel_code_generator/_types/jsonschema_parser_config_dict.py

Lines changed: 0 additions & 148 deletions
This file was deleted.

0 commit comments

Comments
 (0)