Skip to content

Commit 518232d

Browse files
committed
[NRL-829] WIP Regenerate API model for pydantic v2
1 parent c0dc200 commit 518232d

File tree

8 files changed

+755
-824
lines changed

8 files changed

+755
-824
lines changed

Makefile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,5 +191,20 @@ truststore-pull-ca: check-warn ## Pull a CA certificate
191191
swagger-merge: check-warn ## Generate Swagger Documentation
192192
@./scripts/swagger.sh merge "$(TYPE)"
193193

194-
generate-model: check-warn ## Generate Pydantic Models
195-
@./scripts/swagger.sh generate-model "$(TYPE)"
194+
generate-models: check-warn ## Generate Pydantic Models
195+
@echo "Generating producer models"
196+
mkdir -p ./layer/nrlf/producer/fhir/r4
197+
poetry run datamodel-codegen \
198+
--input ./api/producer/swagger.yaml \
199+
--input-file-type openapi \
200+
--output ./layer/nrlf/producer/fhir/r4/model.py \
201+
--output-model-type "pydantic_v2.BaseModel"
202+
poetry run datamodel-codegen --strict-types {str,bytes,int,float,bool} \
203+
--input ./api/producer/swagger.yaml --input-file-type openapi \
204+
--output ./layer/nrlf/producer/fhir/r4/strict_model.py --output-model-type "pydantic_v2.BaseModel"
205+
206+
@echo "Generating consumer model"
207+
mkdir -p ./layer/nrlf/consumer/fhir/r4
208+
poetry run datamodel-codegen \
209+
--input ./api/consumer/swagger.yaml --input-file-type openapi \
210+
--output ./layer/nrlf/consumer/fhir/r4/model.py --output-model-type "pydantic_v2.BaseModel"

layer/nrlf/consumer/fhir/r4/model.py

Lines changed: 268 additions & 288 deletions
Large diffs are not rendered by default.

layer/nrlf/producer/fhir/r4/model.py

Lines changed: 267 additions & 284 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)