[NRL-829] Cleanup new generate-models target in Makefile

Author: mattdean3-nhs

Makefile

@@ -199,12 +199,17 @@ generate-models: check-warn ## Generate Pydantic Models
 		--input-file-type openapi \
 		--output ./layer/nrlf/producer/fhir/r4/model.py \
 		--output-model-type "pydantic_v2.BaseModel"
-	poetry run datamodel-codegen --strict-types {str,bytes,int,float,bool} \
-		--input ./api/producer/swagger.yaml --input-file-type openapi \
-		--output ./layer/nrlf/producer/fhir/r4/strict_model.py --output-model-type "pydantic_v2.BaseModel"
+	poetry run datamodel-codegen \
+		--strict-types {str,bytes,int,float,bool} \
+		--input ./api/producer/swagger.yaml \
+		--input-file-type openapi \
+		--output ./layer/nrlf/producer/fhir/r4/strict_model.py \
+		--output-model-type "pydantic_v2.BaseModel"
 
 	@echo "Generating consumer model"
 	mkdir -p ./layer/nrlf/consumer/fhir/r4
 	poetry run datamodel-codegen \
-		--input ./api/consumer/swagger.yaml --input-file-type openapi \
-		--output ./layer/nrlf/consumer/fhir/r4/model.py --output-model-type "pydantic_v2.BaseModel"
+		--input ./api/consumer/swagger.yaml \
+		--input-file-type openapi \
+		--output ./layer/nrlf/consumer/fhir/r4/model.py \
+		--output-model-type "pydantic_v2.BaseModel"

pyproject.toml

@@ -9,7 +9,6 @@ package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.12"
-
 nhs-number = "1.3.4"
 aws-lambda-powertools = "^2.35.1"
 requests = "^2.31.0"
@@ -29,8 +28,6 @@ sh = "^2.0.6"
 moto = {extras = ["dynamodb", "s3"], version = "^5.0.5"}
 behave = "^1.2.6"
 pyyaml = "^6.0.1"
-#datamodel-code-generator = "^0.25.4"
-
 pre-commit = "^3.6.2"
 ruff = "^0.3.2"
 fire = "^0.6.0"