From 9a2865458f98688806c3ab529ded58128d4a3871 Mon Sep 17 00:00:00 2001 From: Amund Isaksen <31344542+Teddy-1000@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:48:14 +0100 Subject: [PATCH] Update landingpage info (#217) * Update openapi and landing page info * Set new contact info * Fix imports * Use openapi metadata in ladingpage metadata --- api/main.py | 2 ++ api/metadata_endpoints.py | 57 +++++++++++++++++++++++++++------ api/openapi/openapi_metadata.py | 16 +++++++++ 3 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 api/openapi/openapi_metadata.py diff --git a/api/main.py b/api/main.py index eb9cf955..6855b66f 100644 --- a/api/main.py +++ b/api/main.py @@ -16,6 +16,7 @@ from utilities import create_url_from_request from export_metrics import add_metrics +from openapi.openapi_metadata import openapi_metadata def setup_logging(): @@ -34,6 +35,7 @@ def setup_logging(): app = FastAPI( swagger_ui_parameters={"tryItOutEnabled": True}, root_path=os.getenv("FASTAPI_ROOT_PATH", ""), + **openapi_metadata, ) app.add_middleware(BrotliMiddleware) add_metrics(app) diff --git a/api/metadata_endpoints.py b/api/metadata_endpoints.py index 34eb3312..668db06d 100644 --- a/api/metadata_endpoints.py +++ b/api/metadata_endpoints.py @@ -26,7 +26,12 @@ from grpc_getter import get_ts_ag_request import datastore_pb2 as dstore -from utilities import get_unique_values_for_metadata, seconds_to_iso_8601_duration, convert_cm_to_m +from utilities import get_unique_values_for_metadata +from utilities import seconds_to_iso_8601_duration +from utilities import convert_cm_to_m + +from openapi.openapi_metadata import openapi_metadata + logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) @@ -56,14 +61,35 @@ def datetime_to_iso_string(value: datetime) -> str: def get_landing_page(request): return LandingPageModel( - title="E-SOH EDR API", - description="The E-SOH EDR API", - keywords=["weather", "temperature", "wind", "humidity", "pressure", "clouds", "radiation"], - provider=Provider(name="RODEO", url="https://rodeo-project.eu/"), - contact=Contact(email="rodeoproject@fmi.fi"), + title=openapi_metadata["title"], + description=openapi_metadata["description"], + keywords=[ + "weather", + "temperature", + "wind", + "humidity", + "pressure", + "clouds", + "radiation", + ], + provider=Provider( + name=openapi_metadata["contact"]["name"], + url=openapi_metadata["contact"]["url"], + ), + contact=Contact(email=openapi_metadata["contact"]["email"]), links=[ - Link(href=f"{request.url}", rel="self", title="Landing Page in JSON", type="application/json"), - Link(href=f"{request.url}docs", rel="service-doc", title="API description in HTML", type="text/html"), + Link( + href=f"{request.url}", + rel="self", + title="Landing Page in JSON", + type="application/json", + ), + Link( + href=f"{request.url}docs", + rel="service-doc", + title="API description in HTML", + type="text/html", + ), Link( href=f"{request.url}openapi.json", rel="service-desc", @@ -76,7 +102,11 @@ def get_landing_page(request): title="Conformance Declaration in JSON", type="application/json", ), - Link(href=f"{request.url}collections", rel="data", title="Collections metadata in JSON"), + Link( + href=f"{request.url}collections", + rel="data", + title="Collections metadata in JSON", + ), ], ) @@ -155,7 +185,14 @@ async def get_collection_metadata(base_url: str, is_self) -> Collection: ], extent=Extent( spatial=Spatial( - bbox=[[spatial_extent.left, spatial_extent.bottom, spatial_extent.right, spatial_extent.top]], + bbox=[ + [ + spatial_extent.left, + spatial_extent.bottom, + spatial_extent.right, + spatial_extent.top, + ] + ], crs="EPSG:4326", ), temporal=Temporal( diff --git a/api/openapi/openapi_metadata.py b/api/openapi/openapi_metadata.py new file mode 100644 index 00000000..8c05b4dc --- /dev/null +++ b/api/openapi/openapi_metadata.py @@ -0,0 +1,16 @@ +openapi_metadata = { + "title": "EDR Observations API Europe EUMETNET", + "description": ( + "OGC EDR API data service for European meteoroligical observations from EUMETNET," + " co-funded by the European Union." + ), + "contact": { + "name": "EUMETNET", + "url": "https://www.eumetnet.eu/about-us/", + "email": "eucos@metoffice.gov.uk", + }, + "license_info": { + "name": "CC-BY-4.0", + "url": "https://creativecommons.org/licenses/by/4.0/", + }, +}