PY: Generate primitive type extension fields and restore extension/modifierExtension

Makefile

@@ -139,6 +139,10 @@ test-python-sdk: typecheck format prepare-aidbox-runme lint generate-python-sdk
          . venv/bin/activate && \
          python -m pytest test_sdk.py -v
 
+	cd $(PYTHON_EXAMPLE) && \
+         . venv/bin/activate && \
+         python -m pytest test_raw_extension.py -v
+
 test-python-fhirpy-sdk: typecheck format prepare-aidbox-runme lint generate-python-sdk-fhirpy python-fhirpy-test-setup
     # Run mypy in strict mode
 	cd $(PYTHON_FHIRPY_EXAMPLE) && \

examples/python/__snapshots__/patient_with_extensions.json

@@ -0,0 +1,92 @@
+{
+  "_birthDate": {
+    "extension": [
+      {
+        "url": "http://hl7.org/fhir/StructureDefinition/patient-birthTime",
+        "valueDateTime": "1990-03-15T08:22:00-05:00"
+      }
+    ]
+  },
+  "birthDate": "1990-03-15",
+  "contact": [
+    {
+      "extension": [
+        {
+          "url": "http://example.org/fhir/StructureDefinition/contact-priority",
+          "valueInteger": 1
+        }
+      ],
+      "name": {
+        "family": "Watson",
+        "given": [
+          "John"
+        ]
+      },
+      "telecom": [
+        {
+          "system": "phone",
+          "value": "+44-20-7946-1234"
+        }
+      ]
+    }
+  ],
+  "extension": [
+    {
+      "url": "http://hl7.org/fhir/StructureDefinition/patient-birthPlace",
+      "valueAddress": {
+        "city": "Springfield",
+        "country": "US"
+      }
+    }
+  ],
+  "id": "ext-demo",
+  "modifierExtension": [
+    {
+      "url": "http://example.org/fhir/StructureDefinition/do-not-contact",
+      "valueBoolean": false
+    }
+  ],
+  "name": [
+    {
+      "_family": {
+        "extension": [
+          {
+            "url": "http://hl7.org/fhir/StructureDefinition/humanname-own-prefix",
+            "valueString": "van"
+          }
+        ]
+      },
+      "_given": [
+        {
+          "extension": [
+            {
+              "url": "http://example.org/fhir/StructureDefinition/name-source",
+              "valueCode": "birth-certificate"
+            }
+          ]
+        },
+        null,
+        {
+          "extension": [
+            {
+              "url": "http://example.org/fhir/StructureDefinition/name-source",
+              "valueCode": "baptism-record"
+            }
+          ]
+        }
+      ],
+      "extension": [
+        {
+          "url": "http://example.org/fhir/StructureDefinition/name-verified",
+          "valueBoolean": true
+        }
+      ],
+      "family": "van Beethoven",
+      "given": [
+        "Ludwig",
+        "Maria",
+        "Johann"
+      ]
+    }
+  ]
+}

examples/python/fhir_types/README.md

@@ -2,21 +2,6 @@
 
 ## Package: `hl7.fhir.r4.core`
 
-### Modified Canonicals
-
-#### `http://hl7.org/fhir/StructureDefinition/BackboneElement`
-
-Skipped fields:
-
-- `modifierExtension`
-
-#### `http://hl7.org/fhir/StructureDefinition/DomainResource`
-
-Skipped fields:
-
-- `extension`
-- `modifierExtension`
-
 ### Skipped Canonicals
 
 - `http://fhir-registry.smarthealthit.org/StructureDefinition/capabilities`

examples/python/fhir_types/hl7_fhir_r4_core/bundle.py

@@ -9,6 +9,7 @@
 from fhir_types.hl7_fhir_r4_core.base import BackboneElement, Identifier, Signature
 from fhir_types.hl7_fhir_r4_core.resource import Resource
 from fhir_types.hl7_fhir_r4_core.resource_families import ResourceFamily
+from fhir_types.hl7_fhir_r4_core.base import Element
 
 
 class BundleEntry(BackboneElement):
@@ -62,8 +63,11 @@ class Bundle(Resource):
     link: PyList[BundleLink] | None = Field(None, alias="link", serialization_alias="link")
     signature: Signature | None = Field(None, alias="signature", serialization_alias="signature")
     timestamp: str | None = Field(None, alias="timestamp", serialization_alias="timestamp")
+    timestamp_extension: Element | None = Field(None, alias="_timestamp", serialization_alias="_timestamp")
     total: int | None = Field(None, alias="total", serialization_alias="total")
+    total_extension: Element | None = Field(None, alias="_total", serialization_alias="_total")
     type: Literal["document", "message", "transaction", "transaction-response", "batch", "batch-response", "history", "searchset", "collection"] = Field(alias="type", serialization_alias="type")
+    type_extension: Element | None = Field(None, alias="_type", serialization_alias="_type")
 
     def to_json(self, indent: int | None = None) -> str:
         return self.model_dump_json(exclude_unset=True, exclude_none=True, indent=indent)

examples/python/fhir_types/hl7_fhir_r4_core/domain_resource.py

@@ -6,7 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing import List as PyList, Literal
 
-from fhir_types.hl7_fhir_r4_core.base import Narrative
+from fhir_types.hl7_fhir_r4_core.base import Extension, Narrative
 from fhir_types.hl7_fhir_r4_core.resource import Resource
 from fhir_types.hl7_fhir_r4_core.resource_families import ResourceFamily
 
@@ -21,6 +21,8 @@ class DomainResource(Resource):
         pattern='DomainResource'
     )
     contained: PyList[ResourceFamily] | None = Field(None, alias="contained", serialization_alias="contained")
+    extension: PyList[Extension] | None = Field(None, alias="extension", serialization_alias="extension")
+    modifier_extension: PyList[Extension] | None = Field(None, alias="modifierExtension", serialization_alias="modifierExtension")
     text: Narrative | None = Field(None, alias="text", serialization_alias="text")
 
     def to_json(self, indent: int | None = None) -> str:

examples/python/fhir_types/hl7_fhir_r4_core/observation.py

@@ -12,6 +12,7 @@
 )
 from fhir_types.hl7_fhir_r4_core.domain_resource import DomainResource
 from fhir_types.hl7_fhir_r4_core.resource_families import DomainResourceFamily
+from fhir_types.hl7_fhir_r4_core.base import Element
 
 
 class ObservationComponent(BackboneElement):
@@ -60,7 +61,9 @@ class Observation(DomainResource):
     derived_from: PyList[Reference] | None = Field(None, alias="derivedFrom", serialization_alias="derivedFrom")
     device: Reference | None = Field(None, alias="device", serialization_alias="device")
     effective_date_time: str | None = Field(None, alias="effectiveDateTime", serialization_alias="effectiveDateTime")
+    effective_date_time_extension: Element | None = Field(None, alias="_effectiveDateTime", serialization_alias="_effectiveDateTime")
     effective_instant: str | None = Field(None, alias="effectiveInstant", serialization_alias="effectiveInstant")
+    effective_instant_extension: Element | None = Field(None, alias="_effectiveInstant", serialization_alias="_effectiveInstant")
     effective_period: Period | None = Field(None, alias="effectivePeriod", serialization_alias="effectivePeriod")
     effective_timing: Timing | None = Field(None, alias="effectiveTiming", serialization_alias="effectiveTiming")
     encounter: Reference | None = Field(None, alias="encounter", serialization_alias="encounter")
@@ -69,25 +72,32 @@ class Observation(DomainResource):
     identifier: PyList[Identifier] | None = Field(None, alias="identifier", serialization_alias="identifier")
     interpretation: PyList[CodeableConcept[Literal["_GeneticObservationInterpretation", "CAR", "Carrier", "_ObservationInterpretationChange", "B", "D", "U", "W", "_ObservationInterpretationExceptions", "<", ">", "AC", "IE", "QCF", "TOX", "_ObservationInterpretationNormality", "A", "AA", "HH", "LL", "H", "H>", "HU", "L", "L<", "LU", "N", "_ObservationInterpretationSusceptibility", "I", "MS", "NCL", "NS", "R", "SYN-R", "S", "SDD", "SYN-S", "VS", "EX", "HX", "LX", "HM", "ObservationInterpretationDetection", "IND", "E", "NEG", "ND", "POS", "DET", "ObservationInterpretationExpectation", "EXP", "UNE", "OBX", "ReactivityObservationInterpretation", "NR", "RR", "WR"] | str]] | None = Field(None, alias="interpretation", serialization_alias="interpretation")
     issued: str | None = Field(None, alias="issued", serialization_alias="issued")
+    issued_extension: Element | None = Field(None, alias="_issued", serialization_alias="_issued")
     method: CodeableConcept | None = Field(None, alias="method", serialization_alias="method")
     note: PyList[Annotation] | None = Field(None, alias="note", serialization_alias="note")
     part_of: PyList[Reference] | None = Field(None, alias="partOf", serialization_alias="partOf")
     performer: PyList[Reference] | None = Field(None, alias="performer", serialization_alias="performer")
     reference_range: PyList[ObservationReferenceRange] | None = Field(None, alias="referenceRange", serialization_alias="referenceRange")
     specimen: Reference | None = Field(None, alias="specimen", serialization_alias="specimen")
     status: Literal["registered", "preliminary", "final", "amended", "corrected", "cancelled", "entered-in-error", "unknown"] = Field(alias="status", serialization_alias="status")
+    status_extension: Element | None = Field(None, alias="_status", serialization_alias="_status")
     subject: Reference | None = Field(None, alias="subject", serialization_alias="subject")
     value_boolean: bool | None = Field(None, alias="valueBoolean", serialization_alias="valueBoolean")
+    value_boolean_extension: Element | None = Field(None, alias="_valueBoolean", serialization_alias="_valueBoolean")
     value_codeable_concept: CodeableConcept | None = Field(None, alias="valueCodeableConcept", serialization_alias="valueCodeableConcept")
     value_date_time: str | None = Field(None, alias="valueDateTime", serialization_alias="valueDateTime")
+    value_date_time_extension: Element | None = Field(None, alias="_valueDateTime", serialization_alias="_valueDateTime")
     value_integer: int | None = Field(None, alias="valueInteger", serialization_alias="valueInteger")
+    value_integer_extension: Element | None = Field(None, alias="_valueInteger", serialization_alias="_valueInteger")
     value_period: Period | None = Field(None, alias="valuePeriod", serialization_alias="valuePeriod")
     value_quantity: Quantity | None = Field(None, alias="valueQuantity", serialization_alias="valueQuantity")
     value_range: Range | None = Field(None, alias="valueRange", serialization_alias="valueRange")
     value_ratio: Ratio | None = Field(None, alias="valueRatio", serialization_alias="valueRatio")
     value_sampled_data: SampledData | None = Field(None, alias="valueSampledData", serialization_alias="valueSampledData")
     value_string: str | None = Field(None, alias="valueString", serialization_alias="valueString")
+    value_string_extension: Element | None = Field(None, alias="_valueString", serialization_alias="_valueString")
     value_time: str | None = Field(None, alias="valueTime", serialization_alias="valueTime")
+    value_time_extension: Element | None = Field(None, alias="_valueTime", serialization_alias="_valueTime")
 
     def to_json(self, indent: int | None = None) -> str:
         return self.model_dump_json(exclude_unset=True, exclude_none=True, indent=indent)

examples/python/fhir_types/hl7_fhir_r4_core/patient.py

@@ -11,6 +11,7 @@
 )
 from fhir_types.hl7_fhir_r4_core.domain_resource import DomainResource
 from fhir_types.hl7_fhir_r4_core.resource_families import DomainResourceFamily
+from fhir_types.hl7_fhir_r4_core.base import Element
 
 
 class PatientCommunication(BackboneElement):
@@ -44,20 +45,27 @@ class Patient(DomainResource):
         pattern='Patient'
     )
     active: bool | None = Field(None, alias="active", serialization_alias="active")
+    active_extension: Element | None = Field(None, alias="_active", serialization_alias="_active")
     address: PyList[Address] | None = Field(None, alias="address", serialization_alias="address")
     birth_date: str | None = Field(None, alias="birthDate", serialization_alias="birthDate")
+    birth_date_extension: Element | None = Field(None, alias="_birthDate", serialization_alias="_birthDate")
     communication: PyList[PatientCommunication] | None = Field(None, alias="communication", serialization_alias="communication")
     contact: PyList[PatientContact] | None = Field(None, alias="contact", serialization_alias="contact")
     deceased_boolean: bool | None = Field(None, alias="deceasedBoolean", serialization_alias="deceasedBoolean")
+    deceased_boolean_extension: Element | None = Field(None, alias="_deceasedBoolean", serialization_alias="_deceasedBoolean")
     deceased_date_time: str | None = Field(None, alias="deceasedDateTime", serialization_alias="deceasedDateTime")
+    deceased_date_time_extension: Element | None = Field(None, alias="_deceasedDateTime", serialization_alias="_deceasedDateTime")
     gender: Literal["male", "female", "other", "unknown"] | None = Field(None, alias="gender", serialization_alias="gender")
+    gender_extension: Element | None = Field(None, alias="_gender", serialization_alias="_gender")
     general_practitioner: PyList[Reference] | None = Field(None, alias="generalPractitioner", serialization_alias="generalPractitioner")
     identifier: PyList[Identifier] | None = Field(None, alias="identifier", serialization_alias="identifier")
     link: PyList[PatientLink] | None = Field(None, alias="link", serialization_alias="link")
     managing_organization: Reference | None = Field(None, alias="managingOrganization", serialization_alias="managingOrganization")
     marital_status: CodeableConcept[Literal["A", "D", "I", "L", "M", "P", "S", "T", "U", "W", "UNK"] | str] | None = Field(None, alias="maritalStatus", serialization_alias="maritalStatus")
     multiple_birth_boolean: bool | None = Field(None, alias="multipleBirthBoolean", serialization_alias="multipleBirthBoolean")
+    multiple_birth_boolean_extension: Element | None = Field(None, alias="_multipleBirthBoolean", serialization_alias="_multipleBirthBoolean")
     multiple_birth_integer: int | None = Field(None, alias="multipleBirthInteger", serialization_alias="multipleBirthInteger")
+    multiple_birth_integer_extension: Element | None = Field(None, alias="_multipleBirthInteger", serialization_alias="_multipleBirthInteger")
     name: PyList[HumanName] | None = Field(None, alias="name", serialization_alias="name")
     photo: PyList[Attachment] | None = Field(None, alias="photo", serialization_alias="photo")
     telecom: PyList[ContactPoint] | None = Field(None, alias="telecom", serialization_alias="telecom")

examples/python/fhir_types/hl7_fhir_r4_core/resource.py

@@ -7,6 +7,7 @@
 from typing import List as PyList, Literal
 
 from fhir_types.hl7_fhir_r4_core.base import Meta
+from fhir_types.hl7_fhir_r4_core.base import Element
 
 
 class Resource(BaseModel):
@@ -19,8 +20,11 @@ class Resource(BaseModel):
         pattern='Resource'
     )
     id: str | None = Field(None, alias="id", serialization_alias="id")
+    id_extension: Element | None = Field(None, alias="_id", serialization_alias="_id")
     implicit_rules: str | None = Field(None, alias="implicitRules", serialization_alias="implicitRules")
+    implicit_rules_extension: Element | None = Field(None, alias="_implicitRules", serialization_alias="_implicitRules")
     language: str | None = Field(None, alias="language", serialization_alias="language")
+    language_extension: Element | None = Field(None, alias="_language", serialization_alias="_language")
     meta: Meta | None = Field(None, alias="meta", serialization_alias="meta")
 
     def to_json(self, indent: int | None = None) -> str:

examples/python/generate.ts

@@ -12,6 +12,7 @@ const builder = new APIBuilder({ logger })
     .fromPackage("hl7.fhir.r4.core", "4.0.1")
     .python({
         allowExtraFields: false,
+        primitiveTypeExtension: true,
         fhirpyClient: false,
         fieldFormat: "snake_case",
     })
@@ -20,12 +21,8 @@ const builder = new APIBuilder({ logger })
             "hl7.fhir.r4.core": {
                 "http://hl7.org/fhir/StructureDefinition/Bundle": {},
                 "http://hl7.org/fhir/StructureDefinition/OperationOutcome": {},
-                "http://hl7.org/fhir/StructureDefinition/DomainResource": {
-                    ignoreFields: ["extension", "modifierExtension"],
-                },
-                "http://hl7.org/fhir/StructureDefinition/BackboneElement": {
-                    ignoreFields: ["modifierExtension"],
-                },
+                "http://hl7.org/fhir/StructureDefinition/DomainResource": {},
+                "http://hl7.org/fhir/StructureDefinition/BackboneElement": {},
                 "http://hl7.org/fhir/StructureDefinition/Element": {},
                 "http://hl7.org/fhir/StructureDefinition/Patient": {},
                 "http://hl7.org/fhir/StructureDefinition/Observation": {},