examples: regenerate python-r4-us-core fhir_types with the fhirpy client

Author: ryukzak

examples/python-r4-us-core/fhir_types/fhirpy_base_model.py

@@ -0,0 +1,42 @@
+from typing import TYPE_CHECKING, Any, Union, Optional, Iterator, Tuple, Dict
+from pydantic import BaseModel, Field
+from typing import Protocol
+
+
+class ResourceProtocol(Protocol):
+    resourceType: Any
+    id: Union[str, None]
+
+
+class FhirpyBaseModel(BaseModel):
+    """
+    This class satisfies ResourceProtocol.
+    Uses __pydantic_init_subclass__ to set resourceType as a class-level attribute
+    after Pydantic finishes model construction, so that fhirpy can detect it
+    via cls.resourceType for search/fetch operations.
+    """
+
+    if TYPE_CHECKING:
+        # Set at runtime per-subclass by __pydantic_init_subclass__ below. Declared here
+        # so static type-checkers see it: fhirpy's ResourceProtocol requires a settable
+        # `resourceType`, and snake_case models expose the field as `resource_type`
+        # (alias "resourceType"). A settable instance attr (not ClassVar) satisfies the
+        # protocol's mutable member; the default keeps it optional for the pydantic mypy plugin.
+        resourceType: str = ""
+
+    id: Optional[str] = Field(None, alias="id")
+
+    @classmethod
+    def __pydantic_init_subclass__(cls, **kwargs: Any) -> None:
+        super().__pydantic_init_subclass__(**kwargs)
+        field = cls.model_fields.get("resource_type") or cls.model_fields.get("resourceType")
+        if field is not None and field.default is not None:
+            type.__setattr__(cls, "resourceType", str(field.default))
+
+    def __iter__(self) -> Iterator[Tuple[str, Any]]:  # type: ignore[override]
+        data = self.model_dump(mode='json', by_alias=True, exclude_none=True)
+        return iter(data.items())
+
+    def serialize(self) -> Dict[str, Any]:
+        """Serialize to dict (compatible with fhirpy's serialize method)"""
+        return self.model_dump(mode='json', by_alias=True, exclude_none=True)

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/bundle.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, model_validator
 from typing import Any, Generic, List as PyList, Literal
 from typing_extensions import Self, TypeVar
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import BackboneElement, Identifier, Signature
 from fhir_types.hl7_fhir_r4_core.resource import Resource
@@ -74,7 +75,6 @@ class Bundle(Resource, Generic[T1, T2]):
         default='Bundle',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='Bundle'
     )
     entry: PyList[BundleEntry[T1, T2]] | None = Field(None, alias="entry", serialization_alias="entry")

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/domain_resource.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, model_validator
 from typing import Any, Generic, List as PyList, Literal
 from typing_extensions import Self, TypeVar
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import Extension, Narrative
 from fhir_types.hl7_fhir_r4_core.resource import Resource
@@ -20,7 +21,6 @@ class DomainResource(Resource, Generic[T]):
         default='DomainResource',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='DomainResource'
     )
     contained: PyList[T] | None = Field(None, alias="contained", serialization_alias="contained")

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/observation.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing import Any, List as PyList, Literal
 from typing_extensions import Self
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import (
     Annotation, BackboneElement, CodeableConcept, Identifier, Period, Quantity, Range, Ratio, Reference, SampledData, \
@@ -49,7 +50,6 @@ class Observation(DomainResource):
         default='Observation',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='Observation'
     )
     based_on: PyList[Reference] | None = Field(None, alias="basedOn", serialization_alias="basedOn")

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/operation_outcome.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing import Any, List as PyList, Literal
 from typing_extensions import Self
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import BackboneElement, CodeableConcept
 from fhir_types.hl7_fhir_r4_core.domain_resource import DomainResource
@@ -27,7 +28,6 @@ class OperationOutcome(DomainResource):
         default='OperationOutcome',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='OperationOutcome'
     )
     issue: PyList[OperationOutcomeIssue] = Field(alias="issue", serialization_alias="issue")

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/organization.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing import Any, List as PyList, Literal
 from typing_extensions import Self
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import (
     Address, BackboneElement, CodeableConcept, ContactPoint, HumanName, Identifier, Reference
@@ -28,7 +29,6 @@ class Organization(DomainResource):
         default='Organization',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='Organization'
     )
     active: bool | None = Field(None, alias="active", serialization_alias="active")

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/patient.py

@@ -6,6 +6,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing import Any, List as PyList, Literal
 from typing_extensions import Self
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import (
     Address, Attachment, BackboneElement, CodeableConcept, ContactPoint, HumanName, Identifier, Period, Reference
@@ -41,7 +42,6 @@ class Patient(DomainResource):
         default='Patient',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='Patient'
     )
     active: bool | None = Field(None, alias="active", serialization_alias="active")

examples/python-r4-us-core/fhir_types/hl7_fhir_r4_core/resource.py

@@ -6,18 +6,18 @@
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt
 from typing import Any, List as PyList, Literal
 from typing_extensions import Self
+from fhir_types.fhirpy_base_model import FhirpyBaseModel
 
 from fhir_types.hl7_fhir_r4_core.base import Meta
 from fhir_types.hl7_fhir_r4_core.base import Element
 
 
-class Resource(BaseModel):
+class Resource(FhirpyBaseModel):
     model_config = ConfigDict(validate_by_name=True, serialize_by_alias=True, extra="forbid")
     resource_type: str = Field(
         default='Resource',
         alias='resourceType',
         serialization_alias='resourceType',
-        frozen=True,
         pattern='Resource'
     )
     id: str | None = Field(None, alias="id", serialization_alias="id")