Skip to content

Commit 970f0ef

Browse files
authored
Merge pull request #3 from NHSDigital/task/gr-small-fixes
Task/gr small fixes
2 parents 1a5b7ec + c755f50 commit 970f0ef

File tree

5 files changed

+154
-16
lines changed

5 files changed

+154
-16
lines changed
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: "🐛 Bug Report"
2+
description: Create a new ticket for a bug.
3+
title: "🐛 [BUG] - <title>"
4+
labels: [
5+
"bug"
6+
]
7+
body:
8+
- type: textarea
9+
id: description
10+
attributes:
11+
label: "Description"
12+
description: Please enter an explicit description of your issue
13+
placeholder: Short and explicit description of your incident...
14+
validations:
15+
required: true
16+
- type: input
17+
id: reprod-url
18+
attributes:
19+
label: "Reproduction URL"
20+
description: Please enter your GitHub URL to provide a reproduction of the issue
21+
placeholder: ex. https://github.com/USERNAME/REPO-NAME
22+
validations:
23+
required: false
24+
- type: textarea
25+
id: reprod
26+
attributes:
27+
label: "Reproduction steps"
28+
description: Please enter an explicit description of your issue
29+
value: |
30+
1. Go to '...'
31+
2. Click on '....'
32+
3. Scroll down to '....'
33+
4. See error
34+
render: bash
35+
validations:
36+
required: true
37+
- type: textarea
38+
id: screenshot
39+
attributes:
40+
label: "Screenshots"
41+
description: If applicable, add screenshots to help explain your problem.
42+
value: |
43+
![DESCRIPTION](LINK.png)
44+
render: bash
45+
validations:
46+
required: false
47+
- type: textarea
48+
id: logs
49+
attributes:
50+
label: "Logs"
51+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
52+
render: bash
53+
validations:
54+
required: false
55+
- type: dropdown
56+
id: os
57+
attributes:
58+
label: "OS"
59+
description: What is the impacted environment ?
60+
multiple: true
61+
options:
62+
- Windows
63+
- Linux
64+
- Mac
65+
validations:
66+
required: false
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: "💡 Feature Request"
2+
description: Create a new ticket for a new feature request
3+
title: "💡 [REQUEST] - <title>"
4+
labels: [
5+
"feature"
6+
]
7+
body:
8+
- type: input
9+
id: start_date
10+
attributes:
11+
label: "Start Date"
12+
description: Start of development
13+
placeholder: "month/day/year"
14+
validations:
15+
required: false
16+
- type: textarea
17+
id: implementation_pr
18+
attributes:
19+
label: "Implementation PR"
20+
description: Pull request used
21+
placeholder: "#Pull Request ID"
22+
validations:
23+
required: false
24+
- type: textarea
25+
id: reference_issues
26+
attributes:
27+
label: "Reference Issues"
28+
description: Common issues
29+
placeholder: "#Issues IDs"
30+
validations:
31+
required: false
32+
- type: textarea
33+
id: summary
34+
attributes:
35+
label: "Summary"
36+
description: Provide a brief explanation of the feature
37+
placeholder: Describe in a few lines your feature request
38+
validations:
39+
required: true
40+
- type: textarea
41+
id: basic_example
42+
attributes:
43+
label: "Basic Example"
44+
description: Indicate here some basic examples of your feature.
45+
placeholder: A few specific words about your feature request.
46+
validations:
47+
required: true
48+
- type: textarea
49+
id: drawbacks
50+
attributes:
51+
label: "Drawbacks"
52+
description: What are the drawbacks/impacts of your feature request ?
53+
placeholder: Identify the drawbacks and impacts while being neutral on your feature request
54+
validations:
55+
required: true
56+
- type: textarea
57+
id: unresolved_question
58+
attributes:
59+
label: "Unresolved questions"
60+
description: What questions still remain unresolved ?
61+
placeholder: Identify any unresolved issues.
62+
validations:
63+
required: false

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

README.md

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,47 @@
22

33
The Data Validation Engine (DVE) is a configuration driven data validation library built and utilised by NHS England.
44

5-
As mentioned above, the DVE is "configuration driven" which means the majority of development for you as a user will be building a JSON document to describe how the data will be validated. The JSON document is also typically known as a `dischema` file and example files can be accessed [here](./tests/testdata/). If you'd like to learn more about JSON document and how to build one from scratch, then please read the documentation [here](./docs/).
5+
As mentioned above, the DVE is "configuration driven" which means the majority of development for you as a user will be building a JSON document to describe how the data will be validated. The JSON document is known as a `dischema` file and example files can be accessed [here](./tests/testdata/). If you'd like to learn more about JSON document and how to build one from scratch, then please read the documentation [here](./docs/).
66

7-
Once a dischema file has been defined, you are ready to use the DVE. The DVE is typically orchestrated based on the four key "services". These are...
7+
Once a dischema file has been defined, you are ready to use the DVE. The DVE is typically orchestrated based on four key "services". These are...
88

9-
| Order | Service | Purpose |
10-
| ----- | ------- | ------- |
11-
| 1. | File Transformation | This service will take ingest submitted files and turn them into stringified parquet files to ensure that a consistent data structure can be passed through the DVE. |
12-
| 2. | Data Contract | This service will validate and cast a stringified parquet submission against a [pyantic model](https://docs.pydantic.dev/latest/). |
9+
| | Service | Purpose |
10+
| -- | ------- | ------- |
11+
| 1. | File Transformation | This service will take submitted files and turn them into stringified parquet file(s) to ensure that a consistent data structure can be passed through the other services. |
12+
| 2. | Data Contract | This service will validate and peform type casting against a stringified parquet file using [pydantic models](https://docs.pydantic.dev/1.10/). |
1313
| 3. | Business Rules | The business rules service will perform more complex validations such as comparisons between fields and tables, aggregations, filters etc to generate new entities. |
14-
| 4. | Error Reports | The error reports service will take all the errors raised in previous services and surface them into a readable format for a downstream users/service. Currently, this implemented to be an excel spreadsheet but could be reconfigure to meet other requirements/use cases. |
14+
| 4. | Error Reports | The error reports service will take all the errors raised in previous services and surface them into a readable format for a downstream users/service. Currently, this implemented to be an excel spreadsheet but could be reconfigured to meet other requirements/use cases. |
1515

16-
We have more detailed documentation around these services [here](./docs/).
16+
If you'd like more detailed documentation around these services the please read the extended documentation [here](./docs/).
17+
18+
The DVE has been designed in a way that's modular and can support users who just want to utilise specific "services" from the DVE (i.e. just the file transformation + data contract). Additionally, the DVE is designed to support different backend implementations. As part of the base installation of DVE, you will find backend support for `Spark` and `DuckDB`. So, if you need a `MySQL` backend implementation, you can implement this yourself. Given our organisations requirements, it will be unlikely that we add anymore specific backend implementations into the base package beyond Spark and DuckDB. So, if you are unable to implement this yourself, I would recommend reading the guidance on [requesting new features and raising bug reports here](#requesting-new-features-and-raising-bug-reports).
19+
20+
Additionally, if you'd like to contribute a new backend implementation into the base DVE package, then please look at the [Contributing][#Contributing] section.
1721

1822
## Installation and usage
1923

20-
The DVE is a Python package and can be installed using `pip`. As of release (version 1+) only supports Python 3.7, with Spark version 3.2.1 and DuckDB version of 1.1.0. We are currently working on upgrading the DVE to work on Python 3.11+ and this will be made available asap with version 2.0.0 release.
24+
The DVE is a Python package and can be installed using `pip`. As of release v1.0.0 we currently only supports Python 3.7, with Spark version 3.2.1 and DuckDB version of 1.1.0. We are currently working on upgrading the DVE to work on Python 3.11+ and this will be made available asap with version 2.0.0 release.
2125

22-
In addition to a working Python 3.7+ installation you will need OpenJDK 11 installed.
26+
In addition to a working Python 3.7+ installation you will need OpenJDK 11 installed if you're planning to use the Spark backend implementation.
2327

2428
Python dependencies are listed in `pyproject.toml`.
2529

2630
To install the DVE package you can simply install using a package manager such as [pip](https://pypi.org/project/pip/).
2731

2832
```
29-
pip install https://github.com/nhsengland/Data-Validation-Engine
33+
pip install git+https://github.com/NHSDigital/data-validation-engine.git@v1.0.0
3034
```
3135

32-
Once you have installed the DVE you are ready to use it. For guidance on how to create your dischema json document (configuration), please read the [documentation](/docs/).
36+
Once you have installed the DVE you are ready to use it. For guidance on how to create your dischema json document (configuration), please read the [documentation](./docs/).
3337

34-
The long term aim is to make the DVE available via PyPi and Conda but we are not quite there yet. Once available this documentation will be updated to reflect the new installation options.
38+
Please note - The long term aim is to make the DVE available via PyPi and Conda but we are not quite there yet. Once available this documentation will be updated to contain the new installation options.
3539

3640
## Requesting new features and raising bug reports
37-
If you have spotted a bug with the DVE then please raise an issue [here](https://github.com/nhsengland/Data-Validation-Engine/issues). Same for any feature requests.
41+
**Before creating new issues, please check to see if the same bug/feature has been created already. Where a duplicate is created, the ticket will be closed and referenced to an existing issue.**
42+
43+
If you have spotted a bug with the DVE then please raise an issue [here](https://github.com/nhsengland/Data-Validation-Engine/issues) using the "bug template".
44+
45+
If you have feature request then please follow the same process whilst using the "Feature request template".
3846

3947
## Upcoming features
4048
Below is a list of features that we would like to implement or have been requested.
@@ -45,7 +53,7 @@ Below is a list of features that we would like to implement or have been request
4553
| Upgrade to Pydantic 2.0 | Not yet confirmed | No |
4654
| Create a more user friendly interface for building and modifying dischema files | Not yet confirmed | No |
4755

48-
Beyond the Python upgrade, we cannot confirm the other features will be made available any time soon. Therefore, if you have the interest and desire to make these features available, then please feel free to read the [contributing section](#contributing) and get involved.
56+
Beyond the Python upgrade, we cannot confirm the other features will be made available anytime soon. Therefore, if you have the interest and desire to make these features available, then please read the [Contributing](#contributing) section and get involved.
4957

5058
## Contributing
5159
Please see guidance [here](./CONTRIBUTE.md).

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ redefining-builtins-modules = [
673673

674674
[tool.commitizen]
675675
name = "cz_conventional_commits"
676-
tag_format = "$version"
676+
tag_format = "v$major.$minor.$patch"
677677
version_scheme = "pep440"
678678
version_provider = "poetry"
679679
update_changelog_on_bump = true

0 commit comments

Comments
 (0)