@@ -16,15 +16,15 @@ class Resource(BaseModel):
1616 """A FHIR R4 Resource base class."""
1717
1818 # class variable to hold class mappings per resource_type
19- __resource_types__ : ClassVar [dict [str , type ["Resource" ]]] = {}
20- __expected_resource_type__ : ClassVar [dict [type ["Resource" ], str ]] = {}
19+ __resource_types : ClassVar [dict [str , type ["Resource" ]]] = {}
20+ __expected_resource_type : ClassVar [dict [type ["Resource" ], str ]] = {}
2121
2222 meta : Annotated [Meta | None , Field (alias = "meta" , frozen = True )] = None
2323 resource_type : str = Field (alias = "resourceType" , frozen = True )
2424
2525 def __init_subclass__ (cls , resource_type : str , ** kwargs : Any ) -> None :
26- cls .__resource_types__ [resource_type ] = cls
27- cls .__expected_resource_type__ [cls ] = resource_type
26+ cls .__resource_types [resource_type ] = cls
27+ cls .__expected_resource_type [cls ] = resource_type
2828
2929 super ().__init_subclass__ (** kwargs )
3030
@@ -47,7 +47,7 @@ def validate_with_subtype(
4747
4848 resource_type = value ["resourceType" ]
4949
50- subclass = cls .__resource_types__ .get (resource_type )
50+ subclass = cls .__resource_types .get (resource_type )
5151 if subclass is None :
5252 raise TypeError (f"Unknown resource type: { resource_type } " )
5353
@@ -57,12 +57,12 @@ def validate_with_subtype(
5757 @classmethod
5858 def create (cls , ** kwargs : Any ) -> Self :
5959 """Create a Resource instance with the correct resourceType."""
60- return cls (resourceType = cls .__expected_resource_type__ [cls ], ** kwargs )
60+ return cls (resourceType = cls .__expected_resource_type [cls ], ** kwargs )
6161
6262 @field_validator ("resource_type" , mode = "after" )
6363 @classmethod
6464 def _validate_resource_type (cls , value : str ) -> str :
65- expected_resource_type = cls .__expected_resource_type__ [cls ]
65+ expected_resource_type = cls .__expected_resource_type [cls ]
6666 if value != expected_resource_type :
6767 raise ValueError (
6868 f"Resource type '{ value } ' does not match expected "
@@ -115,7 +115,7 @@ class PatientIdentifier(
115115 """A FHIR R4 Patient Identifier utilising the NHS Number system."""
116116
117117 def __init__ (self , value : str ):
118- super ().__init__ (value = value , system = self .__expected_system__ )
118+ super ().__init__ (value = value , system = self .__expected_system )
119119
120120 @classmethod
121121 def from_nhs_number (cls , nhs_number : str ) -> "Patient.PatientIdentifier" :
0 commit comments