🎉 FHIR release R5 support has been added, as a result all resources are created under root package.

* fixes tests, fixes lintings
* updated documents.

Author: nazrulworld

.travis.yml

@@ -64,5 +64,6 @@ script:
   - pytest fhir/resources/DSTU2/tests
   - pytest fhir/resources/STU3/tests
   - pytest -s --cov=fhir/resources/R4B/tests -s --tb=native -v --cov-report term-missing --cov-append fhir/resources/R4B/tests
+  - pytest -s --cov=fhir/resources/tests -s --tb=native -v --cov-report term-missing --cov-append fhir/resources/tests
 after_success:
   - codecov

HISTORY.rst

@@ -2,10 +2,17 @@
 History
 =======
 
-6.5.1 (unreleased)
+7.0.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+New Feature
+
+- `FHIR version R5 <https://www.hl7.org/fhir/R5/resourcelist.html>`_ support has been added under root package.
+
+
+Breaking
+
+- All root resources (FHIR version R4B) are moved under sub-package ``R4B``
 
 
 6.5.0 (2023-01-01)

README.rst

@@ -1,6 +1,6 @@
-==================================
-FHIR® Resources (R4B, STU3, DSTU2)
-==================================
+======================================
+FHIR® Resources (R5, R4B, STU3, DSTU2)
+======================================
 
 .. image:: https://img.shields.io/pypi/v/fhir.resources.svg
         :target: https://pypi.python.org/pypi/fhir.resources
@@ -54,12 +54,13 @@ and allows you to create and manipulate FHIR resources in Python. You can then u
 FHIR® Version Info
 ------------------
 
-FHIR® (Release R4B, version 4.3.0) is available as default. Also previous versions are available as Python sub-package
-(each release name string becomes sub-package name, i.e ``STU3`` ).
-From ``fhir.resources`` version 6.5.0; FHIR R4 is overlapped by R4B.
+FHIR® (Release R5, version 5.0.0) is available as default. Also previous versions are available as Python sub-package
+(each release name string becomes sub-package name, i.e ``R4B`` ).
+From ``fhir.resources`` version 7.0.0; there no FHIR ``R4`` instead of ``R4B`` is available as sub-package.
 
 **Available Previous Versions**:
 
+* ``R4B`` (4.3.0)
 * ``STU3`` (3.0.2)
 * ``DSTU2`` (1.0.2) [see `issue#13 <https://github.com/nazrulworld/fhir.resources/issues/13>`_][don't have full tests coverage]
 

fhir/resources/__init__.py

@@ -1,4 +1,29 @@
 # -*- coding: utf-8 -*-
+from pathlib import Path
+from typing import Any, Dict, Union
 
-__fhir_version__ = "4.3.0"
-__version__ = "6.5.0"
+from fhir.resources.core.fhirabstractmodel import FHIRAbstractModel
+
+from .fhirtypesvalidators import get_fhir_model_class
+
+__version__ = "7.0.0"
+__fhir_version__ = "5.0.0"
+
+
+def construct_fhir_element(
+    element_type: str, data: Union[Dict[str, Any], str, bytes, Path]
+) -> FHIRAbstractModel:
+    try:
+        klass = get_fhir_model_class(element_type)
+    except KeyError:
+        raise LookupError(
+            f"'{element_type}' is not valid FHIRModel (element type) name!"
+        )
+    if isinstance(data, (str, bytes)):
+        return klass.parse_raw(data, content_type="application/json")
+    elif isinstance(data, Path):
+        return klass.parse_file(data)
+    return klass.parse_obj(data)
+
+
+__all__ = ["get_fhir_model_class", "construct_fhir_element"]