Merge branch 'main' into feature/eja-eli-173-create-postman-collection-automagically

Author: eddalmond1

README.md

@@ -80,6 +80,14 @@ make precommit
 
 There are `make` tasks for you to configure to run your tests.  Run `make test` to see how they work.  You should be able to use the same entry points for local development as in your CI pipeline.
 
+## Conflict with yanai
+
+If you have previously built [yanai](https://nhsd-confluence.digital.nhs.uk/pages/viewpage.action?pageId=48826732), which is the platform we use to supply data to this project, that uses an old version of localstack that does not support our Python version. We have pinned the correct version here and yanai have their version pinned as well so it should work fine, but sometimes issues can arise - if so then removing the docker image can solve that, before then rebuilding.
+
+```shell
+ docker rmi localstack/localstack
+```
+
 ## Design
 
 We'll be separating our [presentation](https://martinfowler.com/eaaDev/SeparatedPresentation.html) layer (where API logic lives, in [`views/`](src/eligibility_signposting_api/views)), [business services](https://martinfowler.com/eaaCatalog/serviceLayer.html) layer (where business logic lives, in [`services/`](src/eligibility_signposting_api/services)) and [repository](https://martinfowler.com/eaaCatalog/repository.html) layer (where database logic lives, [`repos/`](src/eligibility_signposting_api/repos)). We will be using [wireup](https://pypi.org/project/wireup/) for [dependency injection](https://pinboard.in/u:brunns/t:dependency-injection), so services get their dependencies given to them ("injection"), and wireup takes care of that. (We'll usually use the [`@service` annotation](https://maldoinc.github.io/wireup/latest/services/), but [factory functions](https://maldoinc.github.io/wireup/latest/factory_functions/) will be used where necessary, typically for creating resources from 3rd party libraries.)  We'll be using [Pydantic](https://pypi.org/project/pydantic/) for both response models and database models.

poetry.lock

@@ -31,6 +31,7 @@ botocore = "^1.37.3"
 eval-type-backport = "^0.2.2"
 mangum = "^0.19.0"
 wireup = "^0.16.0"
+python-json-logger = "^3.3.0"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.11.0"

pyproject.toml

@@ -21,3 +21,4 @@ pyenv
 colima
 wireup
 Pydantic
+yanai

scripts/config/vale/styles/config/vocabularies/words/accept.txt

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cd "$(git rev-parse --show-toplevel)"
+
+make dependencies install-python lint

scripts/tests/lint.sh

@@ -13,6 +13,9 @@
 from eligibility_signposting_api.views.eligibility import eligibility
 from eligibility_signposting_api.views.hello import hello
 
+init_logging()
+logger = logging.getLogger(__name__)
+
 
 def main() -> None:  # pragma: no cover
     """Run the Flask app as a local process."""
@@ -27,10 +30,8 @@ def lambda_handler(event: LambdaEvent, context: LambdaContext) -> dict[str, Any]
 
 
 def create_app() -> Flask:
-    init_logging()
-
     app = Flask(__name__)
-    app.logger.info("app created")
+    logger.info("app created")
 
     # Register views & error handler
     app.register_blueprint(eligibility, url_prefix="/eligibility")
@@ -41,7 +42,7 @@ def create_app() -> Flask:
     container = wireup.create_container(service_modules=[services, repos], parameters=config())
     wireup.integration.flask.setup(container, app, import_flask_config=True)
 
-    app.logger.info("app ready")
+    logger.info("app ready")
     return app
 
 

src/eligibility_signposting_api/app.py

@@ -1,11 +1,11 @@
 import logging
 import os
-from logging.config import dictConfig
 from typing import Any, NewType
 
+from pythonjsonlogger.json import JsonFormatter
 from yarl import URL
 
-LOG_LEVEL = logging.DEBUG
+LOG_LEVEL = logging.getLevelNamesMapping().get(os.getenv("LOG_LEVEL", ""), logging.WARNING)
 
 AwsRegion = NewType("AwsRegion", str)
 AwsAccessKey = NewType("AwsAccessKey", str)
@@ -22,22 +22,8 @@ def config() -> dict[str, Any]:
 
 
 def init_logging() -> None:
-    level = logging.getLevelName(LOG_LEVEL)
     log_format = "%(asctime)s %(levelname)-8s %(name)s %(module)s.py:%(funcName)s():%(lineno)d %(message)s"
-    dictConfig(
-        {
-            "version": 1,
-            "formatters": {
-                "default": {
-                    "format": log_format,
-                }
-            },
-            "handlers": {
-                "wsgi": {"class": "logging.StreamHandler", "stream": "ext://sys.stdout", "formatter": "default"}
-            },
-            "root": {"level": level, "handlers": ["wsgi"]},
-            "loggers": {
-                "eligibility_signposting_api.app": {"level": level, "handlers": ["wsgi"], "propagate": False},
-            },
-        }
-    )
+    formatter = JsonFormatter(log_format)
+    handler = logging.StreamHandler()
+    handler.setFormatter(formatter)
+    logging.basicConfig(level=LOG_LEVEL, format=log_format, handlers=[handler])