import fhir resources from package __init__

Author: davidhamill1-nhs

gateway-api/src/fhir/__init__.py

@@ -1,9 +1,25 @@
 """FHIR data types and resources."""
 
-from .resources import OperationOutcome, Parameters, Patient
+from .elements import Issue, IssueCode, IssueSeverity
+from .resources import (
+    Bundle,
+    Device,
+    Endpoint,
+    OperationOutcome,
+    Parameters,
+    Patient,
+    Resource,
+)
 
 __all__ = [
+    "Bundle",
+    "Device",
+    "Endpoint",
+    "Issue",
+    "IssueCode",
+    "IssueSeverity",
     "OperationOutcome",
     "Parameters",
     "Patient",
+    "Resource",
 ]

gateway-api/src/gateway_api/common/error.py

@@ -2,8 +2,7 @@
 from dataclasses import dataclass
 from http.client import BAD_GATEWAY, BAD_REQUEST, INTERNAL_SERVER_ERROR, NOT_FOUND
 
-from fhir.elements import Issue, IssueCode, IssueSeverity
-from fhir.resources import OperationOutcome
+from fhir import Issue, IssueCode, IssueSeverity, OperationOutcome
 
 
 @dataclass

gateway-api/src/gateway_api/controller.py

@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from fhir.resources import Patient
+    from fhir import Patient
 
 from requests import Response
 

gateway-api/src/gateway_api/get_structured_record/request.py

@@ -1,7 +1,7 @@
 from collections.abc import Mapping
 from typing import ClassVar
 
-from fhir.resources import Parameters
+from fhir import Parameters
 
 # TODO: may be able to remove the use of the FHIR type entirely.
 from flask.wrappers import Request

gateway-api/src/gateway_api/pds/client.py

@@ -23,7 +23,7 @@
 from collections.abc import Callable
 
 import requests
-from fhir.resources import Patient
+from fhir import Patient
 from pydantic import ValidationError
 
 from gateway_api.common.error import PdsRequestFailedError

gateway-api/src/gateway_api/pds/test_client.py

@@ -6,7 +6,7 @@
 from uuid import UUID, uuid4
 
 import pytest
-from fhir.resources import Patient
+from fhir import Patient
 from pytest_mock import MockerFixture
 
 from gateway_api.common.error import PdsRequestFailedError

gateway-api/src/gateway_api/sds/client.py

@@ -12,7 +12,7 @@
 from enum import StrEnum
 from typing import Any
 
-from fhir.resources import Bundle, Device, Endpoint, Resource
+from fhir import Bundle, Device, Endpoint, Resource
 from stubs import SdsFhirApiStub
 
 from gateway_api.get_structured_record import ACCESS_RECORD_STRUCTURED_INTERACTION_ID

gateway-api/src/gateway_api/test_controller.py

@@ -3,7 +3,7 @@
 from typing import Any
 
 import pytest
-from fhir.resources import Patient
+from fhir import Patient
 from flask import Request
 from pytest_mock import MockerFixture