From 2c43d68a6b67e992a21382625d8b47281d75405a Mon Sep 17 00:00:00 2001
From: Daniel Mohns <daniel.mohns@posteo.de>
Date: Thu, 2 Nov 2023 16:47:09 +0100
Subject: [PATCH 1/3] Add linter configuration

---
 .ecrc                                         |  5 +++
 .editorconfig                                 |  6 +++
 .github/workflows/check-generic.yaml          | 42 +++++++++++++++++++
 .github/workflows/check.yaml                  | 30 +++++++++++++
 .../workflows/{ci-cd.yml => release-pypi.yml} |  6 +--
 .markdownlint-cli2.yaml                       | 12 ++++++
 .yamllint                                     | 13 ++++++
 7 files changed, 111 insertions(+), 3 deletions(-)
 create mode 100644 .ecrc
 create mode 100644 .editorconfig
 create mode 100644 .github/workflows/check-generic.yaml
 create mode 100644 .github/workflows/check.yaml
 rename .github/workflows/{ci-cd.yml => release-pypi.yml} (78%)
 create mode 100644 .markdownlint-cli2.yaml
 create mode 100644 .yamllint

diff --git a/.ecrc b/.ecrc
new file mode 100644
index 0000000..699516a
--- /dev/null
+++ b/.ecrc
@@ -0,0 +1,5 @@
+{
+    "Exclude": [
+        ".git"
+    ]
+}
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..30e849c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+[*]
+# Ensure consistent file encoding in UNIX style
+charset = utf-8
+end_of_line = lf
diff --git a/.github/workflows/check-generic.yaml b/.github/workflows/check-generic.yaml
new file mode 100644
index 0000000..04b93cb
--- /dev/null
+++ b/.github/workflows/check-generic.yaml
@@ -0,0 +1,42 @@
+# Generic checks to ease collaboration:
+# - consistent file encoding in UNIX style
+# - whitespaces in all purposes files like markdown, yaml, etc
+name: Check Generic
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  editorconfig-checker:
+    name: Run editorconfig-checker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install editorconfig-checker
+        run: pipx install "editorconfig-checker"
+      - name: Run editorconfig-checker
+        run: ec .
+
+  markdownlint:
+    name: Run markdownlint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run markdownlint-cli2
+        uses: DavidAnson/markdownlint-cli2-action@v13
+
+  yamllint:
+    name: Run yamllint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run yamllint
+        run: yamllint .
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
new file mode 100644
index 0000000..8066456
--- /dev/null
+++ b/.github/workflows/check.yaml
@@ -0,0 +1,30 @@
+name: Check
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  ruff:
+    name: Lint ruff
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install ruff
+        run: pipx ruff
+      - name: Run editorconfig-checker
+        run: ruff check .
+
+  black:
+    name: Lint Black
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run Black
+        uses: psf/black@stable
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/release-pypi.yml
similarity index 78%
rename from .github/workflows/ci-cd.yml
rename to .github/workflows/release-pypi.yml
index 01ccb30..ad8681f 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/release-pypi.yml
@@ -4,7 +4,7 @@ on: push
 jobs:
   pypi-publish:
     name: Upload release to PyPI
-    if: startsWith(github.ref, 'refs/tags/v') # On tagged release only
+    if: startsWith(github.ref, 'refs/tags/v')  # On tagged release only
     runs-on: ubuntu-latest
     environment:
       name: release
@@ -16,8 +16,8 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.x"
+          python-version: 3.x
       - name: Generate package distribution
         run: python3 setup.py sdist
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
\ No newline at end of file
+        uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml
new file mode 100644
index 0000000..e10ab3a
--- /dev/null
+++ b/.markdownlint-cli2.yaml
@@ -0,0 +1,12 @@
+# Disable some built-in rules
+config:
+  line-length: false
+  no-inline-html: false
+  first-line-h1: false
+  code-block-style: false  # conflicts with MkDocs Admontions: https://squidfunk.github.io/mkdocs-material/reference/admonitions/
+  code-fence-style:
+    style: backtick
+
+# Define glob expressions to use (only valid at root)
+globs:
+  - "**/*.md"
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..7f2054c
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,13 @@
+extends: default
+
+rules:
+  document-start: disable
+  indentation:
+    spaces: 2
+  line-length: disable
+  quoted-strings:
+    quote-type: double
+    required: only-when-needed
+    allow-quoted-quotes: true
+  truthy:
+    check-keys: false

From ddd0009cb40957f31b162964a1502a7b01b33220 Mon Sep 17 00:00:00 2001
From: Daniel Mohns <daniel.mohns@posteo.de>
Date: Thu, 2 Nov 2023 16:48:11 +0100
Subject: [PATCH 2/3] Fix CI

---
 .github/workflows/check.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index 8066456..d1c07cd 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install ruff
-        run: pipx ruff
+        run: pipx install ruff
       - name: Run editorconfig-checker
         run: ruff check .
 

From e89ad7f366ae64145636d60d79c080883fc94e94 Mon Sep 17 00:00:00 2001
From: Daniel Mohns <daniel.mohns@posteo.de>
Date: Thu, 2 Nov 2023 16:48:58 +0100
Subject: [PATCH 3/3] Fix whitespaces in `README`

---
 README.md | 146 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 75 insertions(+), 71 deletions(-)

diff --git a/README.md b/README.md
index f2264aa..7e1f5c2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # OpenPAYGO - Python Lib
 
-This repository contains the Python library for using implementing the different OpenPAYGOToken Suite technologies on your server (for generating tokens and decoding openpaygo metrics payloads) or device (for decoding tokens and making openpaygo metrics payloads).  
+This repository contains the Python library for using implementing the different OpenPAYGOToken Suite technologies on your server (for generating tokens and decoding openpaygo metrics payloads) or device (for decoding tokens and making openpaygo metrics payloads).
 
 <p align="center">
   <img
@@ -21,46 +21,45 @@ This repository contains the Python library for using implementing the different
 
 ## Credits
 
-This open-source project was developped by Solaris Offgrid. Sponsorship for the original OpenPAYGO Token implementation was provided by EnAccess and sponsorphip for OpenPAYGO Metrics was provided by Solaris Offgrid. 
-
+This open-source project was developped by Solaris Offgrid. Sponsorship for the original OpenPAYGO Token implementation was provided by EnAccess and sponsorphip for OpenPAYGO Metrics was provided by Solaris Offgrid.
 
 ## Table of Contents
-  - [Key Features](#key-features)
-  - [Installing the library](#installing-the-library)
-  - [Getting Started - OpenPAYGO Token](#getting-started---openpaygo-token)
-    - [Generating Tokens (Server Side)](#generating-tokens-server-side)
-    - [Decoding Tokens (Device Side)](#decoding-tokens-device-side)
-  - [Getting Started - OpenPAYGO Metrics](#getting-started---openpaygo-metrics)
-    - [Generating a Request (Device Side)](#generating-a-request-device-side)
-    - [Handling a Request and Generating a Response (Server Side)](#handling-a-request-and-generating-a-response-server-side)
-  - [Changelog](#changelog)
-  
+
+- [Key Features](#key-features)
+- [Installing the library](#installing-the-library)
+- [Getting Started - OpenPAYGO Token](#getting-started---openpaygo-token)
+  - [Generating Tokens (Server Side)](#generating-tokens-server-side)
+  - [Decoding Tokens (Device Side)](#decoding-tokens-device-side)
+- [Getting Started - OpenPAYGO Metrics](#getting-started---openpaygo-metrics)
+  - [Generating a Request (Device Side)](#generating-a-request-device-side)
+  - [Handling a Request and Generating a Response (Server Side)](#handling-a-request-and-generating-a-response-server-side)
+- [Changelog](#changelog)
 
 ## Key Features
-- Implements token generation and decoding with full support for the v2.3 of the [OpenPAYGO Token](https://github.com/EnAccess/OpenPAYGO-Token) specifications. 
-- Implements payload authentication (verification + signing) and conversion from simple to condensed payload (and back) with full support of the v1.0-rc1 of the [OpenPAYGO Metrics](https://github.com/openpaygo/metrics) specifications. 
+
+- Implements token generation and decoding with full support for the v2.3 of the [OpenPAYGO Token](https://github.com/EnAccess/OpenPAYGO-Token) specifications.
+- Implements payload authentication (verification + signing) and conversion from simple to condensed payload (and back) with full support of the v1.0-rc1 of the [OpenPAYGO Metrics](https://github.com/openpaygo/metrics) specifications.
 
 ## Installing the library
 
-You can install the library by running `pip install openpaygo` or adding `openpaygo` in your requirements.txt file and running `pip install -r requirements.txt`. 
+You can install the library by running `pip install openpaygo` or adding `openpaygo` in your requirements.txt file and running `pip install -r requirements.txt`.
 
 ## Getting Started - OpenPAYGO Token
 
 ### Generating Tokens (Server Side)
 
-You can use the `generate_token()` function to generate an OpenPAYGOToken Token. The function takes the following parameters, and they should match the configuration in the hardware of the device: 
+You can use the `generate_token()` function to generate an OpenPAYGOToken Token. The function takes the following parameters, and they should match the configuration in the hardware of the device:
 
-- `secret_key` (required): The secret key of the device. Must be passed as an hexadecimal string with 32 characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`). 
+- `secret_key` (required): The secret key of the device. Must be passed as an hexadecimal string with 32 characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`).
 - `count` (required): The token count used to make the last token.
-- `value` (optional): The value to be passed in the token (typically the number of days of activation). Optional if the `token_type` is Disable PAYG or Counter Sync. The value must be between 0 and 995. 
-- `token_type` (optional): Used to set the type of token (default is Add Time). Token types can be found in the `TokenType` class: ADD_TIME, SET_TIME, DISABLE_PAYG, COUNTER_SYNC. 
+- `value` (optional): The value to be passed in the token (typically the number of days of activation). Optional if the `token_type` is Disable PAYG or Counter Sync. The value must be between 0 and 995.
+- `token_type` (optional): Used to set the type of token (default is Add Time). Token types can be found in the `TokenType` class: ADD_TIME, SET_TIME, DISABLE_PAYG, COUNTER_SYNC.
 - `starting_code` (optional): If not provided, it is generated according to the method defined in the standard (SipHash-2-4 of the key, transformed to digit by the same method as the token generation).
-- `value_divider` (optional): The dividing factor used for the value. 
-- `restricted_digit_set` (optional): If set to `true`, the the restricted digit set will be used (only digits from 1 to 4). 
-- `extended_token` (optional): If set to `true` then a larger token will be generated, able to contain values up to 999999. This is for special use cases of each device, such as settings change, and is not set in the standard. 
-
-The function returns the `updated_count` as a number as well as the `token` as a string, in that order. The function will raise a `ValueError` if the key is in the wrong format or the value invalid. 
+- `value_divider` (optional): The dividing factor used for the value.
+- `restricted_digit_set` (optional): If set to `true`, the the restricted digit set will be used (only digits from 1 to 4).
+- `extended_token` (optional): If set to `true` then a larger token will be generated, able to contain values up to 999999. This is for special use cases of each device, such as settings change, and is not set in the standard.
 
+The function returns the `updated_count` as a number as well as the `token` as a string, in that order. The function will raise a `ValueError` if the key is in the wrong format or the value invalid.
 
 **Example 1 - Add 7 days:**
 
@@ -100,28 +99,26 @@ print('Token: '+new_token)
 device.save() # We save the new count that we set for the device
 ```
 
-
 ### Decoding Tokens (Device Side)
 
-You can use the `decode_token()` function to generate an OpenPAYGOToken Token. The function takes the following parameters, and they should match the configuration in the hardware of the device: 
+You can use the `decode_token()` function to generate an OpenPAYGOToken Token. The function takes the following parameters, and they should match the configuration in the hardware of the device:
 
 - `token` (required): The token that was given by the user, as a string
 - `secret_key` (required): The secret key of the device as a string with 32 hexadecimal characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`)
-- `count` (required): The token count of the last valid token. When a device is new, this is 1. 
-- `used_counts` (optional): An array of recently used token counts, as returned by the function itself after the last valid token was decoded. This allows for handling unordered token entry. 
+- `count` (required): The token count of the last valid token. When a device is new, this is 1.
+- `used_counts` (optional): An array of recently used token counts, as returned by the function itself after the last valid token was decoded. This allows for handling unordered token entry.
 - `starting_code` (optional): If not provided, it is generated according to the method defined in the standard (SipHash-2-4 of the key, transformed to digit by the same method as the token generation).
-- `value_divider` (optional): The dividing factor used for the value. 
-- `restricted_digit_set` (optional): If set to `true`, the the restricted digit set will be used (only digits from 1 to 4). 
+- `value_divider` (optional): The dividing factor used for the value.
+- `restricted_digit_set` (optional): If set to `true`, the the restricted digit set will be used (only digits from 1 to 4).
 
+The function returns the following variable in this order:
 
-The function returns the following variable in this order: 
-- `value`: The value associated with the token (if the token is ADD_TIME or SET_TIME). 
-- `token_type`: The type of the token that was provided. Token types can be found in the `TokenType` class: ADD_TIME, SET_TIME, DISABLE_PAYG, COUNTER_SYNC or ALREADY_USED (if the token is valid but already used), INVALID (if the token was invalid). 
-- `updated_count`: The token count of the token, if it was valid. 
-- `updated_used_counts`: The updated array of recently used token, if the token was valid. 
-
-The function will raise a `ValueError` if the key is in the wrong format, but will not raise an error if the token is invalid (as it is a common expected behaviour), to check the validity of the token you must check the return `token_type` and proceed accordingly depending on the type of token. 
+- `value`: The value associated with the token (if the token is ADD_TIME or SET_TIME).
+- `token_type`: The type of the token that was provided. Token types can be found in the `TokenType` class: ADD_TIME, SET_TIME, DISABLE_PAYG, COUNTER_SYNC or ALREADY_USED (if the token is valid but already used), INVALID (if the token was invalid).
+- `updated_count`: The token count of the token, if it was valid.
+- `updated_used_counts`: The updated array of recently used token, if the token was valid.
 
+The function will raise a `ValueError` if the key is in the wrong format, but will not raise an error if the token is invalid (as it is a common expected behaviour), to check the validity of the token you must check the return `token_type` and proceed accordingly depending on the type of token.
 
 **Example:**
 
@@ -162,25 +159,25 @@ elif token_type == TokenType.INVALID:
   print('Token is invalid')
 ```
 
-
 ## Getting Started - OpenPAYGO Metrics
 
 ### Generating a Request (Device Side)
 
-You can use the `MetricsRequestHandler` object to create a new OpenPAYGO Metrics request from start to finish. It accepts the following initial inputs: 
+You can use the `MetricsRequestHandler` object to create a new OpenPAYGO Metrics request from start to finish. It accepts the following initial inputs:
+
 - `serial_number` (required): The serial number of the device
-- `data_format` (optional): The data format, provided as dictionnary matching the data format object specifications. 
-- `secret_key` (optional): The secret key provided as a string containing 32 hexadecimal characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`). Required if `auth_method` is defined. 
-- `auth_method` (optional): One of the auth method contained in the `AuthMethod` class. 
+- `data_format` (optional): The data format, provided as dictionnary matching the data format object specifications.
+- `secret_key` (optional): The secret key provided as a string containing 32 hexadecimal characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`). Required if `auth_method` is defined.
+- `auth_method` (optional): One of the auth method contained in the `AuthMethod` class.
 
 It provides the following methods:
-- `set_timestamp(timestamp)`: Used to set the `timestamp` of the request. 
-- `set_request_count(request_count)`: Used to set the `request_count` of the request. 
-- `set_data(data)`: Used to set the `data` of the request, should be set in simple format as a dictionnay. 
-- `set_historical_data(data)`: Used to set the `historical_data` of the request, should be set in simple format as a dictionnary. The data is assumed to be separated by the `historical_data_interval` unless an explicit timestamp is provided. 
-- `get_simple_request_payload()`: Returns the payload in simple format as a string containing JSON and including the authentication signature. 
-- `get_condensed_request_payload()`: Returns the payload in condensed format as a string containing JSON and including the authentication signature. It requires `data_format` to be set. The data is automatically condensed from the set data and the data format and the signature is automatically generated. 
 
+- `set_timestamp(timestamp)`: Used to set the `timestamp` of the request.
+- `set_request_count(request_count)`: Used to set the `request_count` of the request.
+- `set_data(data)`: Used to set the `data` of the request, should be set in simple format as a dictionnay.
+- `set_historical_data(data)`: Used to set the `historical_data` of the request, should be set in simple format as a dictionnary. The data is assumed to be separated by the `historical_data_interval` unless an explicit timestamp is provided.
+- `get_simple_request_payload()`: Returns the payload in simple format as a string containing JSON and including the authentication signature.
+- `get_condensed_request_payload()`: Returns the payload in condensed format as a string containing JSON and including the authentication signature. It requires `data_format` to be set. The data is automatically condensed from the set data and the data format and the signature is automatically generated.
 
 **Example - Full Request flow from device side:**
 
@@ -231,33 +228,33 @@ try:
     ...
 ```
 
-
 ### Handling a Request and Generating a Response (Server Side)
 
-You can use the `MetricsResponseHandler` object to process your OpenPAYGO Metrics request from start to finish. It accepts the following initial inputs: 
-- `metrics_payload` (required): The OpenPAYGO Metrics payload, as a string containing the JSON payload. 
-- `secret_key` (optional): The secret key provided as a string containing 32 hexadecimal characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`). If the secret key is not set later using `set_device_parameters()`, then you will not be able to verify the auth of the request (it will throw an error if you try) and the response will not be signed. 
+You can use the `MetricsResponseHandler` object to process your OpenPAYGO Metrics request from start to finish. It accepts the following initial inputs:
+
+- `metrics_payload` (required): The OpenPAYGO Metrics payload, as a string containing the JSON payload.
+- `secret_key` (optional): The secret key provided as a string containing 32 hexadecimal characters (e.g. `dac86b1a29ab82edc5fbbc41ec9530f6`). If the secret key is not set later using `set_device_parameters()`, then you will not be able to verify the auth of the request (it will throw an error if you try) and the response will not be signed.
 - `skip_auth`
-- `data_format` (optional): The data format, provided as dictionnary matching the data format object specifications. 
+- `data_format` (optional): The data format, provided as dictionnary matching the data format object specifications.
 - `last_request_count` (optional): The request count of the last valid request (used for avoiding request replay)
 - `last_request_timestamp` (optional): The timestamp of the last valid request (used for avoiding request replay)
 
 It provides the following methods:
-- `get_device_serial()`: Returns the serial number of the device as a string. 
-- `set_device_parameters(secret_key, data_format, last_request_count, last_request_timestamp)`: Used to set the device data required for proper processing of the request in the handler if it was not set initially, which is often the case as the serial number is usually required to fetch that data. It will return `ValueError` if either of the parameters is invalid. 
-- `is_auth_valid()`: Returns `true` if the authentication provided is valid or `false` if not. Note that it checks both that the signature is valid and that the `request_count` or `timestamp` are more recent than the one provided in the device parameters. 
-- `get_simple_metrics()`: Returns the metrics provided in the simple expanded format. It will also convert relative timestamps into explicit timestamps for easier processing. 
-- `get_data_timestamp()`: Returns the timestamp of the data, either the `data_collection_timestamp` if available or the timestamp `timestamp` or the time of the request as fallback. 
-- `get_request_timestamp()`: This is the `timestamp` that was explicitely set in the request and was signed, used to avoid replay attacks. It might be different from the data timestamp. 
-- `get_request_count()`: This is the `request_count` set in the request and was signed, used to avoid replay attacks. 
-- `get_token_count()`: Returns the token count provided in the request (if any). 
-- `expects_token_answer()`: Return `true` if the payload requested tokens in the answer. You can set the tokens to be returned by calling `add_tokens_to_answer(token_list)` with `token_list` being a list of token strings. 
-- `expects_time_answer()`: Return `true` if the payload requested either relative time or absolute time in the answer. You can set the time to be returned by calling `add_time_to_answer(target_datetime)` with `target_datetime` being a datetime object. The function will automatically provide it in the correct format based on the request.  
-- `add_settings_to_answer(settings_dict)`: Will add the provided settings dictionnary to the answer. 
-- `add_extra_data_to_answer(extra_data_dict)`: Will add the provided extra data dictionnary to the answer. 
-- `add_new_base_url_to_answer(new_base_url)`: Will tell the device to change the base URL to send the data to. 
-- `get_answer_payload()`: Will return the answer as a string based on the request and the data added to answer, it will automatically handle the authentication and fomatting. 
 
+- `get_device_serial()`: Returns the serial number of the device as a string.
+- `set_device_parameters(secret_key, data_format, last_request_count, last_request_timestamp)`: Used to set the device data required for proper processing of the request in the handler if it was not set initially, which is often the case as the serial number is usually required to fetch that data. It will return `ValueError` if either of the parameters is invalid.
+- `is_auth_valid()`: Returns `true` if the authentication provided is valid or `false` if not. Note that it checks both that the signature is valid and that the `request_count` or `timestamp` are more recent than the one provided in the device parameters.
+- `get_simple_metrics()`: Returns the metrics provided in the simple expanded format. It will also convert relative timestamps into explicit timestamps for easier processing.
+- `get_data_timestamp()`: Returns the timestamp of the data, either the `data_collection_timestamp` if available or the timestamp `timestamp` or the time of the request as fallback.
+- `get_request_timestamp()`: This is the `timestamp` that was explicitely set in the request and was signed, used to avoid replay attacks. It might be different from the data timestamp.
+- `get_request_count()`: This is the `request_count` set in the request and was signed, used to avoid replay attacks.
+- `get_token_count()`: Returns the token count provided in the request (if any).
+- `expects_token_answer()`: Return `true` if the payload requested tokens in the answer. You can set the tokens to be returned by calling `add_tokens_to_answer(token_list)` with `token_list` being a list of token strings.
+- `expects_time_answer()`: Return `true` if the payload requested either relative time or absolute time in the answer. You can set the time to be returned by calling `add_time_to_answer(target_datetime)` with `target_datetime` being a datetime object. The function will automatically provide it in the correct format based on the request.
+- `add_settings_to_answer(settings_dict)`: Will add the provided settings dictionnary to the answer.
+- `add_extra_data_to_answer(extra_data_dict)`: Will add the provided extra data dictionnary to the answer.
+- `add_new_base_url_to_answer(new_base_url)`: Will tell the device to change the base URL to send the data to.
+- `get_answer_payload()`: Will return the answer as a string based on the request and the data added to answer, it will automatically handle the authentication and fomatting.
 
 **Example - Full Request flow from server side:**
 
@@ -306,46 +303,53 @@ def device_data():
   # We can add extra data
   metrics.add_settings_to_answer({'language': 'fr-FR'})
   # We update the request timestamp or the count if provided to be able to reject duplicate or replay requests
-  if metrics.get_request_count(): 
+  if metrics.get_request_count():
     device.last_request_count = metrics.get_request_count()
-  if metrics.get_request_timestamp(): 
+  if metrics.get_request_timestamp():
     device.last_request_timestamp = metrics.get_request_timestamp()
   # The handler handles the signature, etc.
   return metrics.get_answer_payload(), 200
 ```
 
-
 ## Changelog
 
 ### 2023-10-13 - v0.5.4
+
 - Safe handling of datetime before UNIX timestamp minimum when generating answer timestamp
 
 ### 2023-10-13 - v0.5.3
+
 - Fix handling of `last_request_timestamp` when checking auth
 
 ### 2023-10-12 - v0.5.2
+
 - Clarification in the doc of the behaviour when `secret_key` is missing
 - Implemented coherent behaviour when `secret_key` is missing
 
 ### 2023-10-12 - v0.5.1
+
 - Fixes typo in function name
 
 ### 2023-10-12 - v0.5.0
+
 - Added convenience functions for accessing the current request count and request timestamp
 - Improved documentation on how to avoid replay attacks
 
 ### 2023-10-12 - v0.4.0
+
 - Added convenience functions for accessing token count and data timestamp
 - Added automatic verification of last request count or timestamp during auth
 - Fixed issues in documentation
 
 ### 2023-10-09 - v0.3.0
+
 - Fix token generation issue
 - Add support for OpenPAYGO Metrics Request Generation
 - Add support for OpenPAYGO Metrics Request Decoding
 - Add support for OpenPAYGO Metrics Response Generation
 
 ### 2023-10-03 - v0.2.0
+
 - First working version published on PyPI
 - Has support for OpenPAYGO Token
 - Has working CI for pushing to PyPI