Skip to content

Start generating typed_dicts alongside with messages #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Start generating typed_dicts alongside with messages #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/asyncapi_python_codegen/generators/amqp/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ def generate(
for rs in (send_routes_dict, recv_routes_dict)
)

messages_code, typed_dicts_code = generate_message_types(ops, doc.filepath.parent)
return (
{
output_path / f: generate_routers(r, template_dir / "routes.py.j2")
Expand All @@ -68,8 +69,8 @@ def generate(
for f in ("application", "__init__")
}
| {
output_path
/ "messages.py": generate_message_types(ops, doc.filepath.parent),
output_path / "messages.py": messages_code,
output_path / "typed_dicts.py": typed_dicts_code,
output_path / "py.typed": "",
}
)
Expand Down Expand Up @@ -251,7 +252,7 @@ def get_channel_types(
return types, schemas


def generate_message_types(schemas: list[Operation], cwd: Path) -> str:
def generate_message_types(schemas: list[Operation], cwd: Path) -> tuple[str, str]:
inp = {
"$schema": "http://json-schema.org/draft-07/schema#",
"$defs": populate_jsonschema_defs(
Expand All @@ -269,11 +270,12 @@ def generate_message_types(schemas: list[Operation], cwd: Path) -> str:
with tempfile.TemporaryDirectory() as dir:
schema_path = Path(dir) / "schema.json"
models_path = Path(dir) / "models.py"
typed_dicts_path = Path(dir) / "typed_dicts.py"

args = f"""
args = lambda model_type, output_path: f"""
--input { str(schema_path.absolute()) }
--output { str(models_path.absolute()) }
--output-model-type pydantic_v2.BaseModel
--output { str(output_path.absolute()) }
--output-model-type {model_type}
--input-file-type jsonschema
--reuse-model
--allow-extra-fields
Expand All @@ -288,9 +290,13 @@ def generate_message_types(schemas: list[Operation], cwd: Path) -> str:
with schema_path.open("w") as schema:
json.dump(inp, schema)

datamodel_codegen(args=args)
datamodel_codegen(args=args("pydantic_v2.BaseModel", models_path))
datamodel_codegen(args=args("typing.TypedDict", typed_dicts_path))

with models_path.open() as f:
models_code = f.read()

return models_code
with typed_dicts_path.open() as f:
typed_dicts_code = f.read()

return models_code, typed_dicts_code