Skip to content

Commit ea25402

Browse files
Dragos0000Dragos0000
authored
Merge pull request #532 from OP-TED/feature/TED4-141
updates xpath validator
2 parents 02c3f7f + 0dbac92 commit ea25402

42 files changed

Lines changed: 273 additions & 1530 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV_FILE := .env
1313
PROJECT_PATH = $(shell pwd)
1414
AIRFLOW_INFRA_FOLDER ?= ${PROJECT_PATH}/.airflow
1515
RML_MAPPER_PATH = ${PROJECT_PATH}/.rmlmapper/rmlmapper.jar
16-
XML_PROCESSOR_PATH = ${PROJECT_PATH}/.saxon/saxon-he-10.6.jar
16+
XML_PROCESSOR_PATH = ${PROJECT_PATH}/.saxon/saxon-he-10.9.jar
1717
LIMES_ALIGNMENT_PATH = $(PROJECT_PATH)/.limes/limes.jar
1818
HOSTNAME = $(shell hostname)
1919
CAROOT = $(shell pwd)/infra/traefik/certs
@@ -222,8 +222,8 @@ init-limes:
222222

223223
init-saxon:
224224
@ echo -e "$(BUILD_PRINT)Saxon folder initialization $(END_BUILD_PRINT)"
225-
@ wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-6J.zip -P .saxon/
226-
@ cd .saxon && unzip SaxonHE10-6J.zip && rm -rf SaxonHE10-6J.zip
225+
@ wget -c https://github.com/Saxonica/Saxon-HE/releases/download/SaxonHE10-9/SaxonHE10-9J.zip -P .saxon/
226+
@ cd .saxon && unzip SaxonHE10-9J.zip && rm -rf SaxonHE10-9J.zip
227227

228228
start-project-services: | start-airflow start-mongo init-rml-mapper init-limes start-allegro-graph start-metabase
229229
stop-project-services: | stop-airflow stop-mongo stop-allegro-graph stop-metabase

‎infra/airflow-cluster/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN mkdir -p ./.rmlmapper
1818
RUN wget -c https://github.com/RMLio/rmlmapper-java/releases/download/v6.2.2/rmlmapper-6.2.2-r371-all.jar -O ./.rmlmapper/rmlmapper.jar
1919

2020

21-
RUN wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-6J.zip -P .saxon/
22-
RUN cd .saxon && unzip SaxonHE10-6J.zip && rm -rf SaxonHE10-6J.zip
21+
RUN wget -c https://github.com/Saxonica/Saxon-HE/releases/download/SaxonHE10-9/SaxonHE10-9J.zip -P .saxon/
22+
RUN cd .saxon && unzip SaxonHE10-9J.zip && rm -rf SaxonHE10-9J.zip
2323

2424

2525
RUN mkdir -p ./.limes

‎infra/airflow-cluster/docker-compose-worker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ x-airflow-common:
7676
PYTHONPATH: /opt/airflow/
7777
AIRFLOW_HOME: /opt/airflow
7878
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
79-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
79+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
8080
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
8181
DAG_LOGGER_CONFIG_HANDLERS: ${DAG_LOGGER_CONFIG_HANDLERS}
8282
volumes:

‎infra/airflow-cluster/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ x-airflow-common:
7878
PYTHONPATH: /opt/airflow/
7979
AIRFLOW_HOME: /opt/airflow
8080
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
81-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
81+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
8282
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
8383
DAG_LOGGER_CONFIG_HANDLERS: ${DAG_LOGGER_CONFIG_HANDLERS}
8484
volumes:

‎infra/airflow/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ RUN mkdir -p ./.rmlmapper ./dags ./ted_sws ./temp
1818
RUN wget -c https://github.com/RMLio/rmlmapper-java/releases/download/v6.2.2/rmlmapper-6.2.2-r371-all.jar -O ./.rmlmapper/rmlmapper.jar
1919

2020

21-
RUN wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-6J.zip -P .saxon/
22-
RUN cd .saxon && unzip SaxonHE10-6J.zip && rm -rf SaxonHE10-6J.zip
21+
RUN wget -c https://github.com/Saxonica/Saxon-HE/releases/download/SaxonHE10-9/SaxonHE10-9J.zip -P .saxon/
22+
RUN cd .saxon && unzip SaxonHE10-9J.zip && rm -rf SaxonHE10-9J.zip
2323

2424
RUN mkdir -p ./.limes
2525
RUN wget -c https://github.com/dice-group/LIMES/releases/download/1.7.9/limes.jar -P ./.limes

‎infra/airflow/docker-compose.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ x-airflow-common:
6868
PYTHONPATH: /opt/airflow/
6969
AIRFLOW_HOME: /opt/airflow
7070
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
71-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
71+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
7272
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
7373
DAG_LOGGER_CONFIG_HANDLERS: ${DAG_LOGGER_CONFIG_HANDLERS}
7474
volumes:

‎infra/aws/airflow.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
PYTHONPATH: /opt/airflow/
3333
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
3434
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
35-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
35+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
3636
AIRFLOW_UID: ${AIRFLOW_UID}
3737
image: ${AIRFLOW_IMAGE_URI}
3838
logging:
@@ -77,7 +77,7 @@ services:
7777
PYTHONPATH: /opt/airflow/
7878
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
7979
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
80-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
80+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
8181
healthcheck:
8282
test: ["CMD-SHELL", 'airflow jobs check --job-type SchedulerJob --hostname "$${HOSTNAME}"']
8383
interval: 10s
@@ -125,7 +125,7 @@ services:
125125
PYTHONPATH: /opt/airflow/
126126
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
127127
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
128-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
128+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
129129
image: ${AIRFLOW_IMAGE_URI}
130130
logging:
131131
driver: awslogs
@@ -168,7 +168,7 @@ services:
168168
PYTHONPATH: /opt/airflow/
169169
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
170170
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
171-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
171+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
172172
image: ${AIRFLOW_IMAGE_URI}
173173
logging:
174174
driver: awslogs
@@ -215,7 +215,7 @@ services:
215215
PYTHONPATH: /opt/airflow/
216216
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
217217
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
218-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
218+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
219219
image: ${AIRFLOW_IMAGE_URI}
220220
labels:
221221
ecs-local.task-definition-input.type: remote

‎infra/aws/worker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
PYTHONPATH: /opt/airflow/
2929
LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar
3030
RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar
31-
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar
31+
XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar
3232
image: ${AIRFLOW_IMAGE_URI}
3333
# hostname: "worker1"
3434
ports:

‎requirements.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ json2html~=1.3.0
2525
minio~=7.1.1
2626
certifi~=2022.12.7
2727
shortuuid~=1.0.11
28-
pendulum~=2.1.2
28+
pendulum~=2.1.2
29+
saxonche~=12.4

‎ted_sws/core/model/manifestation.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class ValidationManifestation(Manifestation):
6565

6666
class XPATHCoverageSummaryResult(PropertyBaseModel):
6767
xpath_covered: Optional[int] = 0
68-
xpath_not_covered: Optional[int] = 0
6968

7069

7170
class XPATHCoverageSummaryReport(PropertyBaseModel):
@@ -154,11 +153,6 @@ class XPATHCoverageValidationResultBase(PropertyBaseModel):
154153
"""
155154
xpath_assertions: Optional[List[XPATHCoverageValidationAssertion]] = []
156155
xpath_covered: Optional[List[str]] = []
157-
xpath_not_covered: Optional[List[str]] = []
158-
xpath_extra: Optional[List[str]] = []
159-
remarked_xpaths: Optional[List[str]] = []
160-
coverage: Optional[float]
161-
conceptual_coverage: Optional[float]
162156

163157

164158
class XPATHCoverageValidationResult(XPATHCoverageValidationResultBase):

0 commit comments

Comments
 (0)