diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index f637eb4f8b30d5fa1d6d018ad7f692c61ec7d7e6..f3c33b643bf85812ccefe632938805aece99ad21 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -114,7 +114,7 @@ services:
init: true
restart: "no"
container_name: dbrepo-auth-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.5
environment:
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
@@ -135,7 +135,7 @@ services:
restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.5
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
@@ -198,7 +198,7 @@ services:
restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
- image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.5
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -253,7 +253,7 @@ services:
restart: "no"
container_name: dbrepo-search-db
hostname: search-db
- image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.6.5
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
@@ -277,7 +277,7 @@ services:
restart: "no"
container_name: dbrepo-search-service
hostname: search-service
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.5
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -301,7 +301,7 @@ services:
restart: "no"
container_name: dbrepo-ui
hostname: ui
- image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.5
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://gateway-service}"
@@ -381,7 +381,7 @@ services:
init: true
container_name: dbrepo-search-service-init
hostname: search-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.5
environment:
LOG_LEVEL: ${LOG_LEVEL:-info}
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
@@ -438,7 +438,7 @@ services:
restart: "no"
container_name: dbrepo-dashboard-service
hostname: dashboard-service
- image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.6.5
ports:
- "3000:3000"
volumes:
@@ -465,7 +465,7 @@ services:
init: true
container_name: dbrepo-storage-service-init
hostname: storage-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.5
environment:
S3_ACCESS_KEY_ID: ${S3_ACCESS_KEY_ID:-seaweedfsadmin}
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -511,7 +511,7 @@ services:
restart: "no"
container_name: dbrepo-data-service
hostname: data-service
- image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.4
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.5
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
diff --git a/.docs/.openapi/api.base.yaml b/.docs/.openapi/api.base.yaml
index f37d861b0955c50fd655e671716e0484d2d0502d..f0420d1412b6c86f3397593aa001abe31fcb7840 100644
--- a/.docs/.openapi/api.base.yaml
+++ b/.docs/.openapi/api.base.yaml
@@ -24,7 +24,7 @@ info:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0
title: DBRepo REST API
- version: 1.6.4
+ version: 1.6.5
openapi: 3.1.0
servers:
- description: Test Instance
diff --git a/.docs/api/data-db.md b/.docs/api/data-db.md
index caeee6d171a2190e732302977e806034cfb3c4ac..f84ab8aad1d9c513db17e693bff445c7aaa74a34 100644
--- a/.docs/api/data-db.md
+++ b/.docs/api/data-db.md
@@ -22,6 +22,14 @@ Any number of MariaDB ata databases can be integrated into DBRepo, even non-empt
registered in the Metadata Database to be visible in the [User Interface](../ui) and usable from e.g. the Python
Library.
+## Configuration
+
+By default, the Data Database is configured as a cluster of three nodes where each node has a maximum of 2048 MiB RAM
+available. As recommended by
+[MariaDB](https://mariadb.com/kb/en/mariadb-memory-allocation/#allocating-ram-for-mariadb-the-short-answer), we set
+`innodb_buffer_pool_size=1430M` (70% of the available RAM). If you have more RAM available, you should set the variable
+accordingly to improve the performance.
+
## Data
The procedures requires the in parameter of the `hash_table` stored procedure to have the same collation as the
diff --git a/.docs/api/metadata-db.md b/.docs/api/metadata-db.md
index 05d164cf3cf616ec9972d6cc9210a92e1019f362..a3f3f2b8b70d1e3a480e09b1fbc5d42e6b33b402 100644
--- a/.docs/api/metadata-db.md
+++ b/.docs/api/metadata-db.md
@@ -34,6 +34,14 @@ services:
...
```
+## Configuration
+
+By default, the Metadata Database is configured as a cluster of three nodes where each node has a maximum of 2048 MiB
+RAM available. As recommended by
+[MariaDB](https://mariadb.com/kb/en/mariadb-memory-allocation/#allocating-ram-for-mariadb-the-short-answer), we set
+`innodb_buffer_pool_size=1430M` (70% of the available RAM). If you have more RAM available, you should set the variable
+accordingly to improve the performance.
+
## Image
:octicons-tag-16:{ title="Minimum version" } 1.4.4
diff --git a/.docs/changelog.md b/.docs/changelog.md
index 3e3d479073ca75622e172a659e038b686ba7b1f1..f70f2769981a64cd0b6ed749865872aa2f038551 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -2,6 +2,16 @@
author: Martin Weise
---
+## v1.6.5 (2025-02-18)
+
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.6.5)
+
+### What's Changed
+
+#### Fixes
+
+* Fixed a bug where listing the views in the Python library did not work.
+
## v1.6.4 (2025-02-14)
[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.6.4)
diff --git a/.docs/index.md b/.docs/index.md
index cf54cf46ccafc0bbf5c3d15b7d4c3e25b0c4975d..f4c159d7bcfc3693a8e742a3b6b2a82e1250b240 100644
--- a/.docs/index.md
+++ b/.docs/index.md
@@ -14,7 +14,7 @@ author: Martin Weise
-Documentation for version: [v1.6.4](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.6.5](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md
index ea377171d37d2538502faa3a65a61309681c3f16..e2aa101097df87728a250cc96a8fd17004f839e5 100644
--- a/.docs/kubernetes.md
+++ b/.docs/kubernetes.md
@@ -14,7 +14,7 @@ helm upgrade --install dbrepo \
-n dbrepo \
"oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
--values ./values.yaml \
- --version "1.6.4" \
+ --version "1.6.5" \
--create-namespace \
--cleanup-on-fail
```
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a47aa19e5568c17770f12645ec0d504c8f885da..65f52bea3896d6ed5aea9f06ded440861ae4bf5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,8 +10,8 @@ variables:
SONARQUBE_VERSION: "10.0"
BUN_VERSION: "1.1.40"
DOC_VERSION: "1.6"
- APP_VERSION: "1.6.4"
- CHART_VERSION: "1.6.4"
+ APP_VERSION: "1.6.5"
+ CHART_VERSION: "1.6.5"
CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
@@ -302,7 +302,7 @@ test-analyse-service:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-analyse-service/ && coverage run -m pytest test/test_determine_dt.py test/test_determine_pk.py test/test_s3_client.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
+ - cd ./dbrepo-analyse-service/ && coverage run -m pytest tests/test_determine_dt.py tests/test_determine_pk.py tests/test_s3_client.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -324,7 +324,7 @@ test-auth-service-init:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
script:
- - cd ./dbrepo-auth-service/init/ && coverage run -m pytest test/test_unit_app.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
+ - cd ./dbrepo-auth-service/init/ && coverage run -m pytest tests/test_unit_app.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -346,16 +346,16 @@ test-search-service:
dependencies:
- build-search-service
before_script:
- - "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service/clients"
- - "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service/omlib"
- - "cp -r ./dbrepo-search-service/init/test/rsa ./dbrepo-search-service/test/rsa"
- - "cp ./dbrepo-search-service/init/test/test_keycloak_client.py ./dbrepo-search-service/test"
- - "cp ./dbrepo-search-service/init/test/test_opensearch_client.py ./dbrepo-search-service/test"
+ - "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service"
+ - "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service"
+ - "cp -r ./dbrepo-search-service/init/tests/rsa ./dbrepo-search-service/tests"
+ - "cp ./dbrepo-search-service/init/tests/test_keycloak_client.py ./dbrepo-search-service/tests"
+ - "cp ./dbrepo-search-service/init/tests/test_opensearch_client.py ./dbrepo-search-service/tests"
- "cp ./dbrepo-search-service/init/friendly_names_overrides.json ./dbrepo-search-service/friendly_names_overrides.json"
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_app.py test/test_jwt.py test/test_opensearch_client.py test/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
+ - cd ./dbrepo-search-service/ && coverage run -m pytest tests/test_app.py tests/test_jwt.py tests/test_opensearch_client.py tests/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -379,7 +379,7 @@ test-search-service-init:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/init/ && coverage run -m pytest test/test_app.py test/test_keycloak_client.py test/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
+ - cd ./dbrepo-search-service/init/ && coverage run -m pytest tests/test_app.py tests/test_keycloak_client.py tests/test_opensearch_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -403,7 +403,7 @@ test-lib:
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./lib/python/ && coverage run -m pytest tests/test_unit_analyse.py tests/test_unit_container.py tests/test_unit_database.py tests/test_unit_identifier.py tests/test_unit_license.py tests/test_unit_query.py tests/test_unit_rest_client.py tests/test_unit_table.py tests/test_unit_user.py tests/test_unit_view.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
+ - cd ./lib/python/ && coverage run -m pytest tests/test_unit_analyse.py tests/test_unit_container.py tests/test_unit_database.py tests/test_unit_identifier.py tests/test_unit_license.py tests/test_unit_query.py tests/test_unit_rest_client.py tests/test_unit_table.py tests/test_unit_user.py tests/test_unit_view.py tests/test_unit_rest_client.py --junitxml=report.xml && coverage html --omit="tests/*" && coverage report --omit="tests/*" > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -428,7 +428,7 @@ test-ui:
- "docker run --name dbrepo-ui -e NODE_OPTIONS='--max_old_space_size=256' -p 3000:3000 -d dbrepo-ui:latest"
script:
- "sleep 30"
- - "ENDPOINT=http://localhost:3000 bash ./dbrepo-ui/test/test_heap.sh"
+ - "ENDPOINT=http://localhost:3000 bash ./dbrepo-ui/tests/test_heap.sh"
release-images:
stage: release
diff --git a/Makefile b/Makefile
index c81307ab1f26f6d77a1457301b764e751d7e837f..e84c4f80a83a72c864c8a3f85060ef08b9c48f66 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all
-APP_VERSION ?= 1.6.4
-CHART_VERSION ?= 1.6.4
+APP_VERSION ?= 1.6.5
+CHART_VERSION ?= 1.6.5
REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 3d7911147c825d17bebf78e8f5aeaa64050c7eb0..06b6434be71e054367e1ef521a3dae8e9401e360 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.4.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.5.tar.gz"}
opensearch-py = "*"
[dev-packages]
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index c3a282c98512ad5c6dd6d1bed525bf3b3060827b..96591a28b95119b0725038b3c2fa66e883d5ba7e 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "b24e4e03891018663e2746e2dbe5a9fe716f823be5ccb310c90e8e68b9ffd1d5"
+ "sha256": "1013ec1b081d79912b7ec0878b4824cb4f885a96fec148ae728d746de601b493"
},
"pipfile-spec": 6,
"requires": {
@@ -180,20 +180,20 @@
},
"boto3": {
"hashes": [
- "sha256:7784590369a9d545bb07b2de56b6ce4d5a5e232883a957f704c3f842caeba155",
- "sha256:8c2c2a4ccdfe35dd2611ee1b7473dd2383948415c777e42dc4e7f1ebe371fe8c"
+ "sha256:39957eabdce009353d72d131046489fbbfa15891865d5f069f1e8bfa414e6b81",
+ "sha256:768c8a4d4a6227fe2258105efa086f1424cba5ca915a5eb2305b2cd979306ad1"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==1.36.19"
+ "version": "==1.36.22"
},
"botocore": {
"hashes": [
- "sha256:98882c106fec4c08678ea028199f7f5119550fab95d682b30846f7aae04b7bec",
- "sha256:cdf6729f601f82b1acdb9004b1f88b57cfb470f576394cdb3bbf5150f7fafb5b"
+ "sha256:59520247d5a479731724f97c995d5a1c2aae3b303b324f39d99efcfad1d3019e",
+ "sha256:75d6b34acb0686ee4d54ff6eb285e78ccfe318407428769d1e3e13351714d890"
],
"markers": "python_version >= '3.8'",
- "version": "==1.36.19"
+ "version": "==1.36.22"
},
"certifi": {
"hashes": [
@@ -421,9 +421,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:a518aee79540d9e302b161e7e10072f50730489da19368f00a1e68204009ce44"
+ "sha256:e2312f0d3cff34934578a16b01d646d8309e3a3d1bb4cbda9f984acf97824e00"
],
- "path": "./lib/dbrepo-1.6.4.tar.gz"
+ "path": "./lib/dbrepo-1.6.5.tar.gz"
},
"events": {
"hashes": [
@@ -953,65 +953,65 @@
},
"numpy": {
"hashes": [
- "sha256:02935e2c3c0c6cbe9c7955a8efa8908dd4221d7755644c59d1bba28b94fd334f",
- "sha256:0349b025e15ea9d05c3d63f9657707a4e1d471128a3b1d876c095f328f8ff7f0",
- "sha256:09d6a2032faf25e8d0cadde7fd6145118ac55d2740132c1d845f98721b5ebcfd",
- "sha256:0bc61b307655d1a7f9f4b043628b9f2b721e80839914ede634e3d485913e1fb2",
- "sha256:0eec19f8af947a61e968d5429f0bd92fec46d92b0008d0a6685b40d6adf8a4f4",
- "sha256:106397dbbb1896f99e044efc90360d098b3335060375c26aa89c0d8a97c5f648",
- "sha256:128c41c085cab8a85dc29e66ed88c05613dccf6bc28b3866cd16050a2f5448be",
- "sha256:149d1113ac15005652e8d0d3f6fd599360e1a708a4f98e43c9c77834a28238cb",
- "sha256:159ff6ee4c4a36a23fe01b7c3d07bd8c14cc433d9720f977fcd52c13c0098160",
- "sha256:22ea3bb552ade325530e72a0c557cdf2dea8914d3a5e1fecf58fa5dbcc6f43cd",
- "sha256:23ae9f0c2d889b7b2d88a3791f6c09e2ef827c2446f1c4a3e3e76328ee4afd9a",
- "sha256:250c16b277e3b809ac20d1f590716597481061b514223c7badb7a0f9993c7f84",
- "sha256:2ec6c689c61df613b783aeb21f945c4cbe6c51c28cb70aae8430577ab39f163e",
- "sha256:2ffbb1acd69fdf8e89dd60ef6182ca90a743620957afb7066385a7bbe88dc748",
- "sha256:3074634ea4d6df66be04f6728ee1d173cfded75d002c75fac79503a880bf3825",
- "sha256:356ca982c188acbfa6af0d694284d8cf20e95b1c3d0aefa8929376fea9146f60",
- "sha256:3fbe72d347fbc59f94124125e73fc4976a06927ebc503ec5afbfb35f193cd957",
- "sha256:40c7ff5da22cd391944a28c6a9c638a5eef77fcf71d6e3a79e1d9d9e82752715",
- "sha256:41184c416143defa34cc8eb9d070b0a5ba4f13a0fa96a709e20584638254b317",
- "sha256:451e854cfae0febe723077bd0cf0a4302a5d84ff25f0bfece8f29206c7bed02e",
- "sha256:4525b88c11906d5ab1b0ec1f290996c0020dd318af8b49acaa46f198b1ffc283",
- "sha256:463247edcee4a5537841d5350bc87fe8e92d7dd0e8c71c995d2c6eecb8208278",
- "sha256:4dbd80e453bd34bd003b16bd802fac70ad76bd463f81f0c518d1245b1c55e3d9",
- "sha256:57b4012e04cc12b78590a334907e01b3a85efb2107df2b8733ff1ed05fce71de",
- "sha256:5a8c863ceacae696aff37d1fd636121f1a512117652e5dfb86031c8d84836369",
- "sha256:5acea83b801e98541619af398cc0109ff48016955cc0818f478ee9ef1c5c3dcb",
- "sha256:642199e98af1bd2b6aeb8ecf726972d238c9877b0f6e8221ee5ab945ec8a2189",
- "sha256:64bd6e1762cd7f0986a740fee4dff927b9ec2c5e4d9a28d056eb17d332158014",
- "sha256:6d9fc9d812c81e6168b6d405bf00b8d6739a7f72ef22a9214c4241e0dc70b323",
- "sha256:7079129b64cb78bdc8d611d1fd7e8002c0a2565da6a47c4df8062349fee90e3e",
- "sha256:7dca87ca328f5ea7dafc907c5ec100d187911f94825f8700caac0b3f4c384b49",
- "sha256:860fd59990c37c3ef913c3ae390b3929d005243acca1a86facb0773e2d8d9e50",
- "sha256:8e6da5cffbbe571f93588f562ed130ea63ee206d12851b60819512dd3e1ba50d",
- "sha256:8ec0636d3f7d68520afc6ac2dc4b8341ddb725039de042faf0e311599f54eb37",
- "sha256:9491100aba630910489c1d0158034e1c9a6546f0b1340f716d522dc103788e39",
- "sha256:97b974d3ba0fb4612b77ed35d7627490e8e3dff56ab41454d9e8b23448940576",
- "sha256:995f9e8181723852ca458e22de5d9b7d3ba4da3f11cc1cb113f093b271d7965a",
- "sha256:9dd47ff0cb2a656ad69c38da850df3454da88ee9a6fde0ba79acceee0e79daba",
- "sha256:9fad446ad0bc886855ddf5909cbf8cb5d0faa637aaa6277fb4b19ade134ab3c7",
- "sha256:a972cec723e0563aa0823ee2ab1df0cb196ed0778f173b381c871a03719d4826",
- "sha256:ac9bea18d6d58a995fac1b2cb4488e17eceeac413af014b1dd26170b766d8467",
- "sha256:b0531f0b0e07643eb089df4c509d30d72c9ef40defa53e41363eca8a8cc61495",
- "sha256:b208cfd4f5fe34e1535c08983a1a6803fdbc7a1e86cf13dd0c61de0b51a0aadc",
- "sha256:b3482cb7b3325faa5f6bc179649406058253d91ceda359c104dac0ad320e1391",
- "sha256:b6fb9c32a91ec32a689ec6410def76443e3c750e7cfc3fb2206b985ffb2b85f0",
- "sha256:b78ea78450fd96a498f50ee096f69c75379af5138f7881a51355ab0e11286c97",
- "sha256:bd249bc894af67cbd8bad2c22e7cbcd46cf87ddfca1f1289d1e7e54868cc785c",
- "sha256:c7d1fd447e33ee20c1f33f2c8e6634211124a9aabde3c617687d8b739aa69eac",
- "sha256:d0bbe7dd86dca64854f4b6ce2ea5c60b51e36dfd597300057cf473d3615f2369",
- "sha256:d6d6a0910c3b4368d89dde073e630882cdb266755565155bc33520283b2d9df8",
- "sha256:da1eeb460ecce8d5b8608826595c777728cdf28ce7b5a5a8c8ac8d949beadcf2",
- "sha256:e0c8854b09bc4de7b041148d8550d3bd712b5c21ff6a8ed308085f190235d7ff",
- "sha256:e0d4142eb40ca6f94539e4db929410f2a46052a0fe7a2c1c59f6179c39938d2a",
- "sha256:e9e82dcb3f2ebbc8cb5ce1102d5f1c5ed236bf8a11730fb45ba82e2841ec21df",
- "sha256:ed6906f61834d687738d25988ae117683705636936cc605be0bb208b23df4d8f"
+ "sha256:0391ea3622f5c51a2e29708877d56e3d276827ac5447d7f45e9bc4ade8923c52",
+ "sha256:12c045f43b1d2915eca6b880a7f4a256f59d62df4f044788c8ba67709412128d",
+ "sha256:136553f123ee2951bfcfbc264acd34a2fc2f29d7cdf610ce7daf672b6fbaa693",
+ "sha256:1402da8e0f435991983d0a9708b779f95a8c98c6b18a171b9f1be09005e64d9d",
+ "sha256:16372619ee728ed67a2a606a614f56d3eabc5b86f8b615c79d01957062826ca8",
+ "sha256:1ad78ce7f18ce4e7df1b2ea4019b5817a2f6a8a16e34ff2775f646adce0a5027",
+ "sha256:1b416af7d0ed3271cad0f0a0d0bee0911ed7eba23e66f8424d9f3dfcdcae1304",
+ "sha256:1f45315b2dc58d8a3e7754fe4e38b6fce132dab284a92851e41b2b344f6441c5",
+ "sha256:2376e317111daa0a6739e50f7ee2a6353f768489102308b0d98fcf4a04f7f3b5",
+ "sha256:23c9f4edbf4c065fddb10a4f6e8b6a244342d95966a48820c614891e5059bb50",
+ "sha256:246535e2f7496b7ac85deffe932896a3577be7af8fb7eebe7146444680297e9a",
+ "sha256:2e8da03bd561504d9b20e7a12340870dfc206c64ea59b4cfee9fceb95070ee94",
+ "sha256:34c1b7e83f94f3b564b35f480f5652a47007dd91f7c839f404d03279cc8dd021",
+ "sha256:39261798d208c3095ae4f7bc8eaeb3481ea8c6e03dc48028057d3cbdbdb8937e",
+ "sha256:3b787adbf04b0db1967798dba8da1af07e387908ed1553a0d6e74c084d1ceafe",
+ "sha256:3c2ec8a0f51d60f1e9c0c5ab116b7fc104b165ada3f6c58abf881cb2eb16044d",
+ "sha256:435e7a933b9fda8126130b046975a968cc2d833b505475e588339e09f7672890",
+ "sha256:4d8335b5f1b6e2bce120d55fb17064b0262ff29b459e8493d1785c18ae2553b8",
+ "sha256:4d9828d25fb246bedd31e04c9e75714a4087211ac348cb39c8c5f99dbb6683fe",
+ "sha256:52659ad2534427dffcc36aac76bebdd02b67e3b7a619ac67543bc9bfe6b7cdb1",
+ "sha256:5266de33d4c3420973cf9ae3b98b54a2a6d53a559310e3236c4b2b06b9c07d4e",
+ "sha256:5521a06a3148686d9269c53b09f7d399a5725c47bbb5b35747e1cb76326b714b",
+ "sha256:596140185c7fa113563c67c2e894eabe0daea18cf8e33851738c19f70ce86aeb",
+ "sha256:5b732c8beef1d7bc2d9e476dbba20aaff6167bf205ad9aa8d30913859e82884b",
+ "sha256:5ebeb7ef54a7be11044c33a17b2624abe4307a75893c001a4800857956b41094",
+ "sha256:712a64103d97c404e87d4d7c47fb0c7ff9acccc625ca2002848e0d53288b90ea",
+ "sha256:7678556eeb0152cbd1522b684dcd215250885993dd00adb93679ec3c0e6e091c",
+ "sha256:77974aba6c1bc26e3c205c2214f0d5b4305bdc719268b93e768ddb17e3fdd636",
+ "sha256:783145835458e60fa97afac25d511d00a1eca94d4a8f3ace9fe2043003c678e4",
+ "sha256:7bfdb06b395385ea9b91bf55c1adf1b297c9fdb531552845ff1d3ea6e40d5aba",
+ "sha256:7c8dde0ca2f77828815fd1aedfdf52e59071a5bae30dac3b4da2a335c672149a",
+ "sha256:83807d445817326b4bcdaaaf8e8e9f1753da04341eceec705c001ff342002e5d",
+ "sha256:87eed225fd415bbae787f93a457af7f5990b92a334e346f72070bf569b9c9c95",
+ "sha256:8fb62fe3d206d72fe1cfe31c4a1106ad2b136fcc1606093aeab314f02930fdf2",
+ "sha256:95172a21038c9b423e68be78fd0be6e1b97674cde269b76fe269a5dfa6fadf0b",
+ "sha256:9f48ba6f6c13e5e49f3d3efb1b51c8193215c42ac82610a04624906a9270be6f",
+ "sha256:a0c03b6be48aaf92525cccf393265e02773be8fd9551a2f9adbe7db1fa2b60f1",
+ "sha256:a5ae282abe60a2db0fd407072aff4599c279bcd6e9a2475500fc35b00a57c532",
+ "sha256:aee2512827ceb6d7f517c8b85aa5d3923afe8fc7a57d028cffcd522f1c6fd082",
+ "sha256:c8b0451d2ec95010d1db8ca733afc41f659f425b7f608af569711097fd6014e2",
+ "sha256:c9aa4496fd0e17e3843399f533d62857cef5900facf93e735ef65aa4bbc90ef0",
+ "sha256:cbc6472e01952d3d1b2772b720428f8b90e2deea8344e854df22b0618e9cce71",
+ "sha256:cdfe0c22692a30cd830c0755746473ae66c4a8f2e7bd508b35fb3b6a0813d787",
+ "sha256:cf802eef1f0134afb81fef94020351be4fe1d6681aadf9c5e862af6602af64ef",
+ "sha256:d42f9c36d06440e34226e8bd65ff065ca0963aeecada587b937011efa02cdc9d",
+ "sha256:d5b47c440210c5d1d67e1cf434124e0b5c395eee1f5806fdd89b553ed1acd0a3",
+ "sha256:d9b4a8148c57ecac25a16b0e11798cbe88edf5237b0df99973687dd866f05e1b",
+ "sha256:daf43a3d1ea699402c5a850e5313680ac355b4adc9770cd5cfc2940e7861f1bf",
+ "sha256:dbdc15f0c81611925f382dfa97b3bd0bc2c1ce19d4fe50482cb0ddc12ba30020",
+ "sha256:deaa09cd492e24fd9b15296844c0ad1b3c976da7907e1c1ed3a0ad21dded6f76",
+ "sha256:e37242f5324ffd9f7ba5acf96d774f9276aa62a966c0bad8dae692deebec7716",
+ "sha256:ed2cf9ed4e8ebc3b754d398cba12f24359f018b416c380f577bbae112ca52fc9",
+ "sha256:f2712c5179f40af9ddc8f6727f2bd910ea0eb50206daea75f58ddd9fa3f715bb",
+ "sha256:f4ca91d61a4bf61b0f2228f24bbfa6a9facd5f8af03759fe2a655c50ae2c6610",
+ "sha256:f6b3dfc7661f8842babd8ea07e9897fe3d9b69a1d7e5fbb743e4160f9387833b"
],
"index": "pypi",
"markers": "python_version >= '3.10'",
- "version": "==2.2.2"
+ "version": "==2.2.3"
},
"opensearch-py": {
"hashes": [
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.2-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.2-py3-none-any.whl
deleted file mode 100644
index 256d325e8bdbdacd8c967d852c98e39d8d3b9eb9..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.2-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.2.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.2.tar.gz
deleted file mode 100644
index ad4d6f9c5590836360d1a919f4be84b5cc5f9ade..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.2.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.3.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.3.tar.gz
deleted file mode 100644
index 2aa4f75ed8dd08245bd29d34c151dbe9b7eb2253..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.3.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.4.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.4.tar.gz
deleted file mode 100644
index 87e9a503ebc621238ebe7efca15f2bdf0a6e1a85..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.4.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.4-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.5-py3-none-any.whl
similarity index 57%
rename from dbrepo-search-service/lib/dbrepo-1.6.4-py3-none-any.whl
rename to dbrepo-analyse-service/lib/dbrepo-1.6.5-py3-none-any.whl
index d083b0bafc937528fdcc09634c41132578cbf345..2a5cda78c55f725af708e7ff1d7f4b281586613d 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.4-py3-none-any.whl and b/dbrepo-analyse-service/lib/dbrepo-1.6.5-py3-none-any.whl differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.5.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5117abc68daa9a4e776392855c6022c8d20d5d31
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.6.5.tar.gz differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.3-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl
similarity index 55%
rename from dbrepo-search-service/init/lib/dbrepo-1.6.3-py3-none-any.whl
rename to dbrepo-analyse-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl
index b7f45eecc067d496a9d39d189e619ac7524c66b1..b4ceb85027aa4164b602f876080c0f8979534b0e 100644
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.3-py3-none-any.whl and b/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e8de842c2945231eb547737851eb6269ee5ba84e
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.6.5rc0.tar.gz differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.7.0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.7.0.tar.gz
deleted file mode 100644
index 123a1b2e8f1e901405809d63a1d9aaece647a12b..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.7.0.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/test/conftest.py b/dbrepo-analyse-service/tests/conftest.py
similarity index 100%
rename from dbrepo-analyse-service/test/conftest.py
rename to dbrepo-analyse-service/tests/conftest.py
diff --git a/dbrepo-analyse-service/test/s3_config.json b/dbrepo-analyse-service/tests/s3_config.json
similarity index 100%
rename from dbrepo-analyse-service/test/s3_config.json
rename to dbrepo-analyse-service/tests/s3_config.json
diff --git a/dbrepo-analyse-service/test/test_determine_dt.py b/dbrepo-analyse-service/tests/test_determine_dt.py
similarity index 100%
rename from dbrepo-analyse-service/test/test_determine_dt.py
rename to dbrepo-analyse-service/tests/test_determine_dt.py
diff --git a/dbrepo-analyse-service/test/test_determine_pk.py b/dbrepo-analyse-service/tests/test_determine_pk.py
similarity index 100%
rename from dbrepo-analyse-service/test/test_determine_pk.py
rename to dbrepo-analyse-service/tests/test_determine_pk.py
diff --git a/dbrepo-analyse-service/test/test_s3_client.py b/dbrepo-analyse-service/tests/test_s3_client.py
similarity index 100%
rename from dbrepo-analyse-service/test/test_s3_client.py
rename to dbrepo-analyse-service/tests/test_s3_client.py
diff --git a/dbrepo-auth-service/init/test/conftest.py b/dbrepo-auth-service/init/tests/conftest.py
similarity index 100%
rename from dbrepo-auth-service/init/test/conftest.py
rename to dbrepo-auth-service/init/tests/conftest.py
diff --git a/dbrepo-auth-service/init/test/test_integration_app.py b/dbrepo-auth-service/init/tests/test_integration_app.py
similarity index 100%
rename from dbrepo-auth-service/init/test/test_integration_app.py
rename to dbrepo-auth-service/init/tests/test_integration_app.py
diff --git a/dbrepo-auth-service/init/test/test_unit_app.py b/dbrepo-auth-service/init/tests/test_unit_app.py
similarity index 100%
rename from dbrepo-auth-service/init/test/test_unit_app.py
rename to dbrepo-auth-service/init/tests/test_unit_app.py
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 0e2001b9319f1d755eca5f3f6dbe6335b1cbede3..3f049bd040829373491e3991f7443f31f08c5299 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<name>dbrepo-data-service</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<description>Service that manages the data</description>
diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml
index 0c01d6893c9d39bfea9890b2a848030d0373146f..6270990971c7d35275152c3c27dc07d8543f276c 100644
--- a/dbrepo-data-service/querystore/pom.xml
+++ b/dbrepo-data-service/querystore/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-data-service-querystore</artifactId>
<name>dbrepo-data-service-querystore</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies/>
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index ed4826a38d5aa6f820914db64def695882261d9c..b78405d9de1c4b93dcaa5fac40f505797cd9209f 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>report</artifactId>
<name>dbrepo-data-service-report</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
respective modules
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index 836782387040df14680ade1af7b49f2fffb10895..4ac7c352a08ddab420e340d13726ed3be9d7a3d1 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>rest-service</artifactId>
<name>dbrepo-data-service-rest-service</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>services</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index 3f645dda320c2774eba62b273c5f851f7a3b3e8d..3b1ea7b0e925cc60074d23407d8be6b1eba5abbb 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>services</artifactId>
<name>dbrepo-data-service-services</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service-querystore</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
index 3f68887ec008b41db2d0afe027ce3d65eaa8a7d1..37e8bec63f5b772f35dc97529c899edea14200fe 100644
--- a/dbrepo-metadata-service/api/pom.xml
+++ b/dbrepo-metadata-service/api/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<name>dbrepo-metadata-service-api</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service-entities</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
index 382fa2e7e81dcd2629b0c4cc3c25b8bce3364b4f..b73a11050c8d9ea55bf8649a1694bfc1c00c7600 100644
--- a/dbrepo-metadata-service/entities/pom.xml
+++ b/dbrepo-metadata-service/entities/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<name>dbrepo-metadata-service-entity</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index 76beb8d88f596107f16e135c7aa17cedd5fb2d2b..a9c3a1f388e6f1e7e55c6e1ec47f4e3d7acf70fc 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<name>dbrepo-metadata-service-oai</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index ae5c004e0cbdb64c3adac5d091e39cafd5376ad7..54115d9e16441c6f651c9dad9579089bee2d6e1e 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<name>dbrepo-metadata-service</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<description>Service that manages the metadata</description>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index be6e86a4d08965220aaf87d6ec93b8162514f943..f78cb7c2599f35692bbf13b8e001c683eadb01d3 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
<name>dbrepo-metadata-service-report</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index cf327942a45f9efeb7e8e06374ffdec8c443fa4c..696b3c223ae7a5ac113efe544b21a6b5ba67f3a0 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<name>dbrepo-metadata-service-repositories</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index e1524f79715ffbd081c170257c1ab295d45a5052..f3d420f35ec25fb27dd66a8df3a90561e649b33d 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<name>dbrepo-metadata-service-rest</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index e918d3ae24adf706455b8ca7767b166198f5028f..b817658a09424af38fb372ce440258e0b8be7b38 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<name>dbrepo-metadata-service-services</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml
index 4aa6188f9fa7b26d9181a1cdc42a0ee00bce3b39..a68140ebac0f0d0289e88e14a754a8f72a6f18cc 100644
--- a/dbrepo-metadata-service/test/pom.xml
+++ b/dbrepo-metadata-service/test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.6.4</version>
+ <version>1.6.5</version>
</parent>
<artifactId>dbrepo-metadata-service-test</artifactId>
<name>dbrepo-metadata-service-test</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<dependencies>
<dependency>
diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile
index 4e3f9968022e35187cec3fbe92fdc33e70898ab8..536a5f3a9172dfa50a38671ff50a7d06b9e4a8b2 100644
--- a/dbrepo-search-service/Pipfile
+++ b/dbrepo-search-service/Pipfile
@@ -18,7 +18,7 @@ jwt = "~=1.3"
testcontainers-opensearch = "*"
pytest = "*"
rdflib = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.4.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.5.tar.gz"}
gunicorn = "*"
[dev-packages]
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index 87013913cdcee8520ff2760de0e16e81d0082d3c..ee4559cd98d5de000c481dde00e5176390b61fc9 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "c22580f5873b7bd3fc1edb71c84b7269ae79da6a2554225fe8d95cab6af9f14d"
+ "sha256": "2f5a0ee9d98b5e49a8d4957fb07a5231178b3fe8cc2016850c9b42c67780004d"
},
"pipfile-spec": 6,
"requires": {
@@ -369,9 +369,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:a518aee79540d9e302b161e7e10072f50730489da19368f00a1e68204009ce44"
+ "sha256:e2312f0d3cff34934578a16b01d646d8309e3a3d1bb4cbda9f984acf97824e00"
],
- "path": "./lib/dbrepo-1.6.4.tar.gz"
+ "path": "./lib/dbrepo-1.6.5.tar.gz"
},
"docker": {
"hashes": [
@@ -854,64 +854,64 @@
},
"numpy": {
"hashes": [
- "sha256:02935e2c3c0c6cbe9c7955a8efa8908dd4221d7755644c59d1bba28b94fd334f",
- "sha256:0349b025e15ea9d05c3d63f9657707a4e1d471128a3b1d876c095f328f8ff7f0",
- "sha256:09d6a2032faf25e8d0cadde7fd6145118ac55d2740132c1d845f98721b5ebcfd",
- "sha256:0bc61b307655d1a7f9f4b043628b9f2b721e80839914ede634e3d485913e1fb2",
- "sha256:0eec19f8af947a61e968d5429f0bd92fec46d92b0008d0a6685b40d6adf8a4f4",
- "sha256:106397dbbb1896f99e044efc90360d098b3335060375c26aa89c0d8a97c5f648",
- "sha256:128c41c085cab8a85dc29e66ed88c05613dccf6bc28b3866cd16050a2f5448be",
- "sha256:149d1113ac15005652e8d0d3f6fd599360e1a708a4f98e43c9c77834a28238cb",
- "sha256:159ff6ee4c4a36a23fe01b7c3d07bd8c14cc433d9720f977fcd52c13c0098160",
- "sha256:22ea3bb552ade325530e72a0c557cdf2dea8914d3a5e1fecf58fa5dbcc6f43cd",
- "sha256:23ae9f0c2d889b7b2d88a3791f6c09e2ef827c2446f1c4a3e3e76328ee4afd9a",
- "sha256:250c16b277e3b809ac20d1f590716597481061b514223c7badb7a0f9993c7f84",
- "sha256:2ec6c689c61df613b783aeb21f945c4cbe6c51c28cb70aae8430577ab39f163e",
- "sha256:2ffbb1acd69fdf8e89dd60ef6182ca90a743620957afb7066385a7bbe88dc748",
- "sha256:3074634ea4d6df66be04f6728ee1d173cfded75d002c75fac79503a880bf3825",
- "sha256:356ca982c188acbfa6af0d694284d8cf20e95b1c3d0aefa8929376fea9146f60",
- "sha256:3fbe72d347fbc59f94124125e73fc4976a06927ebc503ec5afbfb35f193cd957",
- "sha256:40c7ff5da22cd391944a28c6a9c638a5eef77fcf71d6e3a79e1d9d9e82752715",
- "sha256:41184c416143defa34cc8eb9d070b0a5ba4f13a0fa96a709e20584638254b317",
- "sha256:451e854cfae0febe723077bd0cf0a4302a5d84ff25f0bfece8f29206c7bed02e",
- "sha256:4525b88c11906d5ab1b0ec1f290996c0020dd318af8b49acaa46f198b1ffc283",
- "sha256:463247edcee4a5537841d5350bc87fe8e92d7dd0e8c71c995d2c6eecb8208278",
- "sha256:4dbd80e453bd34bd003b16bd802fac70ad76bd463f81f0c518d1245b1c55e3d9",
- "sha256:57b4012e04cc12b78590a334907e01b3a85efb2107df2b8733ff1ed05fce71de",
- "sha256:5a8c863ceacae696aff37d1fd636121f1a512117652e5dfb86031c8d84836369",
- "sha256:5acea83b801e98541619af398cc0109ff48016955cc0818f478ee9ef1c5c3dcb",
- "sha256:642199e98af1bd2b6aeb8ecf726972d238c9877b0f6e8221ee5ab945ec8a2189",
- "sha256:64bd6e1762cd7f0986a740fee4dff927b9ec2c5e4d9a28d056eb17d332158014",
- "sha256:6d9fc9d812c81e6168b6d405bf00b8d6739a7f72ef22a9214c4241e0dc70b323",
- "sha256:7079129b64cb78bdc8d611d1fd7e8002c0a2565da6a47c4df8062349fee90e3e",
- "sha256:7dca87ca328f5ea7dafc907c5ec100d187911f94825f8700caac0b3f4c384b49",
- "sha256:860fd59990c37c3ef913c3ae390b3929d005243acca1a86facb0773e2d8d9e50",
- "sha256:8e6da5cffbbe571f93588f562ed130ea63ee206d12851b60819512dd3e1ba50d",
- "sha256:8ec0636d3f7d68520afc6ac2dc4b8341ddb725039de042faf0e311599f54eb37",
- "sha256:9491100aba630910489c1d0158034e1c9a6546f0b1340f716d522dc103788e39",
- "sha256:97b974d3ba0fb4612b77ed35d7627490e8e3dff56ab41454d9e8b23448940576",
- "sha256:995f9e8181723852ca458e22de5d9b7d3ba4da3f11cc1cb113f093b271d7965a",
- "sha256:9dd47ff0cb2a656ad69c38da850df3454da88ee9a6fde0ba79acceee0e79daba",
- "sha256:9fad446ad0bc886855ddf5909cbf8cb5d0faa637aaa6277fb4b19ade134ab3c7",
- "sha256:a972cec723e0563aa0823ee2ab1df0cb196ed0778f173b381c871a03719d4826",
- "sha256:ac9bea18d6d58a995fac1b2cb4488e17eceeac413af014b1dd26170b766d8467",
- "sha256:b0531f0b0e07643eb089df4c509d30d72c9ef40defa53e41363eca8a8cc61495",
- "sha256:b208cfd4f5fe34e1535c08983a1a6803fdbc7a1e86cf13dd0c61de0b51a0aadc",
- "sha256:b3482cb7b3325faa5f6bc179649406058253d91ceda359c104dac0ad320e1391",
- "sha256:b6fb9c32a91ec32a689ec6410def76443e3c750e7cfc3fb2206b985ffb2b85f0",
- "sha256:b78ea78450fd96a498f50ee096f69c75379af5138f7881a51355ab0e11286c97",
- "sha256:bd249bc894af67cbd8bad2c22e7cbcd46cf87ddfca1f1289d1e7e54868cc785c",
- "sha256:c7d1fd447e33ee20c1f33f2c8e6634211124a9aabde3c617687d8b739aa69eac",
- "sha256:d0bbe7dd86dca64854f4b6ce2ea5c60b51e36dfd597300057cf473d3615f2369",
- "sha256:d6d6a0910c3b4368d89dde073e630882cdb266755565155bc33520283b2d9df8",
- "sha256:da1eeb460ecce8d5b8608826595c777728cdf28ce7b5a5a8c8ac8d949beadcf2",
- "sha256:e0c8854b09bc4de7b041148d8550d3bd712b5c21ff6a8ed308085f190235d7ff",
- "sha256:e0d4142eb40ca6f94539e4db929410f2a46052a0fe7a2c1c59f6179c39938d2a",
- "sha256:e9e82dcb3f2ebbc8cb5ce1102d5f1c5ed236bf8a11730fb45ba82e2841ec21df",
- "sha256:ed6906f61834d687738d25988ae117683705636936cc605be0bb208b23df4d8f"
+ "sha256:0391ea3622f5c51a2e29708877d56e3d276827ac5447d7f45e9bc4ade8923c52",
+ "sha256:12c045f43b1d2915eca6b880a7f4a256f59d62df4f044788c8ba67709412128d",
+ "sha256:136553f123ee2951bfcfbc264acd34a2fc2f29d7cdf610ce7daf672b6fbaa693",
+ "sha256:1402da8e0f435991983d0a9708b779f95a8c98c6b18a171b9f1be09005e64d9d",
+ "sha256:16372619ee728ed67a2a606a614f56d3eabc5b86f8b615c79d01957062826ca8",
+ "sha256:1ad78ce7f18ce4e7df1b2ea4019b5817a2f6a8a16e34ff2775f646adce0a5027",
+ "sha256:1b416af7d0ed3271cad0f0a0d0bee0911ed7eba23e66f8424d9f3dfcdcae1304",
+ "sha256:1f45315b2dc58d8a3e7754fe4e38b6fce132dab284a92851e41b2b344f6441c5",
+ "sha256:2376e317111daa0a6739e50f7ee2a6353f768489102308b0d98fcf4a04f7f3b5",
+ "sha256:23c9f4edbf4c065fddb10a4f6e8b6a244342d95966a48820c614891e5059bb50",
+ "sha256:246535e2f7496b7ac85deffe932896a3577be7af8fb7eebe7146444680297e9a",
+ "sha256:2e8da03bd561504d9b20e7a12340870dfc206c64ea59b4cfee9fceb95070ee94",
+ "sha256:34c1b7e83f94f3b564b35f480f5652a47007dd91f7c839f404d03279cc8dd021",
+ "sha256:39261798d208c3095ae4f7bc8eaeb3481ea8c6e03dc48028057d3cbdbdb8937e",
+ "sha256:3b787adbf04b0db1967798dba8da1af07e387908ed1553a0d6e74c084d1ceafe",
+ "sha256:3c2ec8a0f51d60f1e9c0c5ab116b7fc104b165ada3f6c58abf881cb2eb16044d",
+ "sha256:435e7a933b9fda8126130b046975a968cc2d833b505475e588339e09f7672890",
+ "sha256:4d8335b5f1b6e2bce120d55fb17064b0262ff29b459e8493d1785c18ae2553b8",
+ "sha256:4d9828d25fb246bedd31e04c9e75714a4087211ac348cb39c8c5f99dbb6683fe",
+ "sha256:52659ad2534427dffcc36aac76bebdd02b67e3b7a619ac67543bc9bfe6b7cdb1",
+ "sha256:5266de33d4c3420973cf9ae3b98b54a2a6d53a559310e3236c4b2b06b9c07d4e",
+ "sha256:5521a06a3148686d9269c53b09f7d399a5725c47bbb5b35747e1cb76326b714b",
+ "sha256:596140185c7fa113563c67c2e894eabe0daea18cf8e33851738c19f70ce86aeb",
+ "sha256:5b732c8beef1d7bc2d9e476dbba20aaff6167bf205ad9aa8d30913859e82884b",
+ "sha256:5ebeb7ef54a7be11044c33a17b2624abe4307a75893c001a4800857956b41094",
+ "sha256:712a64103d97c404e87d4d7c47fb0c7ff9acccc625ca2002848e0d53288b90ea",
+ "sha256:7678556eeb0152cbd1522b684dcd215250885993dd00adb93679ec3c0e6e091c",
+ "sha256:77974aba6c1bc26e3c205c2214f0d5b4305bdc719268b93e768ddb17e3fdd636",
+ "sha256:783145835458e60fa97afac25d511d00a1eca94d4a8f3ace9fe2043003c678e4",
+ "sha256:7bfdb06b395385ea9b91bf55c1adf1b297c9fdb531552845ff1d3ea6e40d5aba",
+ "sha256:7c8dde0ca2f77828815fd1aedfdf52e59071a5bae30dac3b4da2a335c672149a",
+ "sha256:83807d445817326b4bcdaaaf8e8e9f1753da04341eceec705c001ff342002e5d",
+ "sha256:87eed225fd415bbae787f93a457af7f5990b92a334e346f72070bf569b9c9c95",
+ "sha256:8fb62fe3d206d72fe1cfe31c4a1106ad2b136fcc1606093aeab314f02930fdf2",
+ "sha256:95172a21038c9b423e68be78fd0be6e1b97674cde269b76fe269a5dfa6fadf0b",
+ "sha256:9f48ba6f6c13e5e49f3d3efb1b51c8193215c42ac82610a04624906a9270be6f",
+ "sha256:a0c03b6be48aaf92525cccf393265e02773be8fd9551a2f9adbe7db1fa2b60f1",
+ "sha256:a5ae282abe60a2db0fd407072aff4599c279bcd6e9a2475500fc35b00a57c532",
+ "sha256:aee2512827ceb6d7f517c8b85aa5d3923afe8fc7a57d028cffcd522f1c6fd082",
+ "sha256:c8b0451d2ec95010d1db8ca733afc41f659f425b7f608af569711097fd6014e2",
+ "sha256:c9aa4496fd0e17e3843399f533d62857cef5900facf93e735ef65aa4bbc90ef0",
+ "sha256:cbc6472e01952d3d1b2772b720428f8b90e2deea8344e854df22b0618e9cce71",
+ "sha256:cdfe0c22692a30cd830c0755746473ae66c4a8f2e7bd508b35fb3b6a0813d787",
+ "sha256:cf802eef1f0134afb81fef94020351be4fe1d6681aadf9c5e862af6602af64ef",
+ "sha256:d42f9c36d06440e34226e8bd65ff065ca0963aeecada587b937011efa02cdc9d",
+ "sha256:d5b47c440210c5d1d67e1cf434124e0b5c395eee1f5806fdd89b553ed1acd0a3",
+ "sha256:d9b4a8148c57ecac25a16b0e11798cbe88edf5237b0df99973687dd866f05e1b",
+ "sha256:daf43a3d1ea699402c5a850e5313680ac355b4adc9770cd5cfc2940e7861f1bf",
+ "sha256:dbdc15f0c81611925f382dfa97b3bd0bc2c1ce19d4fe50482cb0ddc12ba30020",
+ "sha256:deaa09cd492e24fd9b15296844c0ad1b3c976da7907e1c1ed3a0ad21dded6f76",
+ "sha256:e37242f5324ffd9f7ba5acf96d774f9276aa62a966c0bad8dae692deebec7716",
+ "sha256:ed2cf9ed4e8ebc3b754d398cba12f24359f018b416c380f577bbae112ca52fc9",
+ "sha256:f2712c5179f40af9ddc8f6727f2bd910ea0eb50206daea75f58ddd9fa3f715bb",
+ "sha256:f4ca91d61a4bf61b0f2228f24bbfa6a9facd5f8af03759fe2a655c50ae2c6610",
+ "sha256:f6b3dfc7661f8842babd8ea07e9897fe3d9b69a1d7e5fbb743e4160f9387833b"
],
"markers": "python_version == '3.11'",
- "version": "==2.2.2"
+ "version": "==2.2.3"
},
"opensearch-py": {
"hashes": [
diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile
index 171460cd231737e3dfb350a02db513b2a768deb2..b9a274061348045bc48b80501425bcef8c907721 100644
--- a/dbrepo-search-service/init/Pipfile
+++ b/dbrepo-search-service/init/Pipfile
@@ -9,7 +9,7 @@ opensearch-py = "~=2.2"
python-dotenv = "~=1.0"
testcontainers-opensearch = "*"
pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.4.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.5.tar.gz"}
rdflib = "*"
[dev-packages]
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index c565195173bc6a5fca334f50c962a38b582de8ba..5fa254a95c9d93d6bece70f256d29c91983bd25e 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "e9b86cb78a55fb9906d294b2ce675933832658ad12ad1ed4f7f3d5893bc0a301"
+ "sha256": "ff7c99ed5a6bbe231e029a957724c779f019be7456f43ef9cc08df576991d7c3"
},
"pipfile-spec": 6,
"requires": {
@@ -259,9 +259,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:a518aee79540d9e302b161e7e10072f50730489da19368f00a1e68204009ce44"
+ "sha256:e2312f0d3cff34934578a16b01d646d8309e3a3d1bb4cbda9f984acf97824e00"
],
- "path": "./lib/dbrepo-1.6.4.tar.gz"
+ "path": "./lib/dbrepo-1.6.5.tar.gz"
},
"docker": {
"hashes": [
@@ -639,7 +639,7 @@
"sha256:f4ca91d61a4bf61b0f2228f24bbfa6a9facd5f8af03759fe2a655c50ae2c6610",
"sha256:f6b3dfc7661f8842babd8ea07e9897fe3d9b69a1d7e5fbb743e4160f9387833b"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version == '3.11'",
"version": "==2.2.3"
},
"opensearch-py": {
@@ -1043,7 +1043,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.9'",
+ "markers": "python_version >= '3.10'",
"version": "==2.3.0"
},
"werkzeug": {
@@ -1307,7 +1307,7 @@
"sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87",
"sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"
],
- "markers": "python_version >= '3.8'",
+ "markers": "platform_python_implementation != 'PyPy'",
"version": "==1.17.1"
},
"charset-normalizer": {
@@ -1594,7 +1594,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.9'",
+ "markers": "python_version >= '3.10'",
"version": "==2.3.0"
}
}
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.2-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.2-py3-none-any.whl
deleted file mode 100644
index 24256263e2fb3156ac0eea01079116e4b40e36fd..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.2-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.2.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.2.tar.gz
deleted file mode 100644
index 2ae1ea50b1610050f5bd5746f7e9596b1c483c9d..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.2.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.3.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.3.tar.gz
deleted file mode 100644
index 2aa4f75ed8dd08245bd29d34c151dbe9b7eb2253..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.3.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.4.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.4.tar.gz
deleted file mode 100644
index 87e9a503ebc621238ebe7efca15f2bdf0a6e1a85..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.4.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.4-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.5-py3-none-any.whl
similarity index 57%
rename from dbrepo-search-service/init/lib/dbrepo-1.6.4-py3-none-any.whl
rename to dbrepo-search-service/init/lib/dbrepo-1.6.5-py3-none-any.whl
index d083b0bafc937528fdcc09634c41132578cbf345..2a5cda78c55f725af708e7ff1d7f4b281586613d 100644
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.4-py3-none-any.whl and b/dbrepo-search-service/init/lib/dbrepo-1.6.5-py3-none-any.whl differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.5.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5117abc68daa9a4e776392855c6022c8d20d5d31
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.6.5.tar.gz differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.7.0-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0-py3-none-any.whl
similarity index 55%
rename from dbrepo-analyse-service/lib/dbrepo-1.7.0-py3-none-any.whl
rename to dbrepo-search-service/init/lib/dbrepo-1.6.5rc0-py3-none-any.whl
index 7c52a50da5b0254652134c5e798d6dd64f134548..b4ceb85027aa4164b602f876080c0f8979534b0e 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.7.0-py3-none-any.whl and b/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0-py3-none-any.whl differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e8de842c2945231eb547737851eb6269ee5ba84e
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.6.5rc0.tar.gz differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.7.0-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.7.0-py3-none-any.whl
deleted file mode 100644
index 7c52a50da5b0254652134c5e798d6dd64f134548..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.7.0-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.7.0.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.7.0.tar.gz
deleted file mode 100644
index 123a1b2e8f1e901405809d63a1d9aaece647a12b..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.7.0.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/test/conftest.py b/dbrepo-search-service/init/tests/conftest.py
similarity index 100%
rename from dbrepo-search-service/init/test/conftest.py
rename to dbrepo-search-service/init/tests/conftest.py
diff --git a/dbrepo-search-service/init/test/rsa/rs256.key b/dbrepo-search-service/init/tests/rsa/rs256.key
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rs256.key
rename to dbrepo-search-service/init/tests/rsa/rs256.key
diff --git a/dbrepo-search-service/init/test/rsa/rsa/rsa256.pkey b/dbrepo-search-service/init/tests/rsa/rsa256.pkey
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rsa/rsa256.pkey
rename to dbrepo-search-service/init/tests/rsa/rsa256.pkey
diff --git a/dbrepo-search-service/init/test/test_app.py b/dbrepo-search-service/init/tests/test_app.py
similarity index 100%
rename from dbrepo-search-service/init/test/test_app.py
rename to dbrepo-search-service/init/tests/test_app.py
diff --git a/dbrepo-search-service/init/test/test_keycloak_client.py b/dbrepo-search-service/init/tests/test_keycloak_client.py
similarity index 96%
rename from dbrepo-search-service/init/test/test_keycloak_client.py
rename to dbrepo-search-service/init/tests/test_keycloak_client.py
index 0c43da230102f4d9c5a7401d7adbd6a9843e90f1..f52faf78c69ae7ec816721036d8f3c3fc58692e8 100644
--- a/dbrepo-search-service/init/test/test_keycloak_client.py
+++ b/dbrepo-search-service/init/tests/test_keycloak_client.py
@@ -23,7 +23,7 @@ class JwtTest(unittest.TestCase):
'roles': roles
}
}
- with open('test/rsa/rs256.key', 'rb') as fh:
+ with open('tests/rsa/rs256.key', 'rb') as fh:
return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
def test_obtain_user_token_succeeds(self):
diff --git a/dbrepo-search-service/init/test/test_opensearch_client.py b/dbrepo-search-service/init/tests/test_opensearch_client.py
similarity index 100%
rename from dbrepo-search-service/init/test/test_opensearch_client.py
rename to dbrepo-search-service/init/tests/test_opensearch_client.py
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.2-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.2-py3-none-any.whl
deleted file mode 100644
index 24256263e2fb3156ac0eea01079116e4b40e36fd..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.2-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.2.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.2.tar.gz
deleted file mode 100644
index 2ae1ea50b1610050f5bd5746f7e9596b1c483c9d..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.2.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.3-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.3-py3-none-any.whl
deleted file mode 100644
index b7f45eecc067d496a9d39d189e619ac7524c66b1..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.3-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.3.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.3.tar.gz
deleted file mode 100644
index 2aa4f75ed8dd08245bd29d34c151dbe9b7eb2253..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.3.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz
deleted file mode 100644
index 87e9a503ebc621238ebe7efca15f2bdf0a6e1a85..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.4.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.4-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.5-py3-none-any.whl
similarity index 57%
rename from dbrepo-analyse-service/lib/dbrepo-1.6.4-py3-none-any.whl
rename to dbrepo-search-service/lib/dbrepo-1.6.5-py3-none-any.whl
index d083b0bafc937528fdcc09634c41132578cbf345..2a5cda78c55f725af708e7ff1d7f4b281586613d 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.4-py3-none-any.whl and b/dbrepo-search-service/lib/dbrepo-1.6.5-py3-none-any.whl differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.5.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..5117abc68daa9a4e776392855c6022c8d20d5d31
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.6.5.tar.gz differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.6.3-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl
similarity index 55%
rename from dbrepo-analyse-service/lib/dbrepo-1.6.3-py3-none-any.whl
rename to dbrepo-search-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl
index b7f45eecc067d496a9d39d189e619ac7524c66b1..b4ceb85027aa4164b602f876080c0f8979534b0e 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.6.3-py3-none-any.whl and b/dbrepo-search-service/lib/dbrepo-1.6.5rc0-py3-none-any.whl differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.5rc0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.5rc0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e8de842c2945231eb547737851eb6269ee5ba84e
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.6.5rc0.tar.gz differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.7.0-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.7.0-py3-none-any.whl
deleted file mode 100644
index 7c52a50da5b0254652134c5e798d6dd64f134548..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.7.0-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.7.0.tar.gz b/dbrepo-search-service/lib/dbrepo-1.7.0.tar.gz
deleted file mode 100644
index 123a1b2e8f1e901405809d63a1d9aaece647a12b..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.7.0.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/test/.testpickle b/dbrepo-search-service/tests/.testpickle
similarity index 100%
rename from dbrepo-search-service/test/.testpickle
rename to dbrepo-search-service/tests/.testpickle
diff --git a/dbrepo-search-service/test/__init__.py b/dbrepo-search-service/tests/__init__.py
similarity index 100%
rename from dbrepo-search-service/test/__init__.py
rename to dbrepo-search-service/tests/__init__.py
diff --git a/dbrepo-search-service/test/conftest.py b/dbrepo-search-service/tests/conftest.py
similarity index 100%
rename from dbrepo-search-service/test/conftest.py
rename to dbrepo-search-service/tests/conftest.py
diff --git a/dbrepo-search-service/init/test/rsa/rsa/rs256.key b/dbrepo-search-service/tests/rsa/rs256.key
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rsa/rs256.key
rename to dbrepo-search-service/tests/rsa/rs256.key
diff --git a/dbrepo-search-service/init/test/rsa/rsa256.pkey b/dbrepo-search-service/tests/rsa/rsa256.pkey
similarity index 100%
rename from dbrepo-search-service/init/test/rsa/rsa256.pkey
rename to dbrepo-search-service/tests/rsa/rsa256.pkey
diff --git a/dbrepo-search-service/test/test_app.py b/dbrepo-search-service/tests/test_app.py
similarity index 99%
rename from dbrepo-search-service/test/test_app.py
rename to dbrepo-search-service/tests/test_app.py
index 0c577b228a951064ffd650b860100ad17f80ba72..2b765b77544239bc0f6f3352ced6b07625ab291b 100644
--- a/dbrepo-search-service/test/test_app.py
+++ b/dbrepo-search-service/tests/test_app.py
@@ -61,7 +61,7 @@ class JwtTest(unittest.TestCase):
'roles': roles
}
}
- with open('test/rsa/rs256.key', 'rb') as fh:
+ with open('tests/rsa/rs256.key', 'rb') as fh:
return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
def test_update_database_media_type_fails(self):
diff --git a/dbrepo-search-service/test/test_jwt.py b/dbrepo-search-service/tests/test_jwt.py
similarity index 98%
rename from dbrepo-search-service/test/test_jwt.py
rename to dbrepo-search-service/tests/test_jwt.py
index 1f23853a7cbd6b6d30cdf29a09daafac012b7916..6c2b16989300e49196f6ece00ad18b5296f7cff6 100644
--- a/dbrepo-search-service/test/test_jwt.py
+++ b/dbrepo-search-service/tests/test_jwt.py
@@ -25,7 +25,7 @@ class JwtTest(unittest.TestCase):
'roles': roles
}
}
- with open('test/rsa/rs256.key', 'rb') as fh:
+ with open('tests/rsa/rs256.key', 'rb') as fh:
return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
def test_verify_token_no_token_fails(self):
diff --git a/dbrepo-ui/test/test_heap.sh b/dbrepo-ui/tests/test_heap.sh
similarity index 100%
rename from dbrepo-ui/test/test_heap.sh
rename to dbrepo-ui/tests/test_heap.sh
diff --git a/dbrepo-upload-service/pom.xml b/dbrepo-upload-service/pom.xml
index 7e4f27586e27b6a76a5ccd9fccd7f4e1d34b8542..44b77d7bf59f95af8cabcee93d055e25216db130 100644
--- a/dbrepo-upload-service/pom.xml
+++ b/dbrepo-upload-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-upload-service</artifactId>
<name>dbrepo-upload-service</name>
- <version>1.6.4</version>
+ <version>1.6.5</version>
<url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/</url>
<developers>
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index 9418fa7c6628c3b26154d460bdf02404114dabf8..63f5f997ffc71fbe57e0d42d10d8694a315761c7 100644
--- a/helm/dbrepo/Chart.yaml
+++ b/helm/dbrepo/Chart.yaml
@@ -7,8 +7,8 @@ description: Helm Chart for installing DBRepo
sources:
- https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
type: application
-version: "1.6.4"
-appVersion: "1.6.4"
+version: "1.6.5"
+appVersion: "1.6.5"
keywords:
- dbrepo
maintainers:
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 88051e6035586bdc5f27ff4c6c78a4d33e041671..c2803738dd5ed945c86333ab8c59b8f169c25bd0 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -11,7 +11,7 @@ sample [
for your deployment and update the variables, especially `hostname`.
```bash
-helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.6.4"
+helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.6.5"
```
## Prerequisites
@@ -28,7 +28,7 @@ helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo"
To install the chart with the release name `my-release`:
```bash
-helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.6.4"
+helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.6.5"
```
The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index d5260781df5e8e68484bf939e5b254e55b7365af..504c87f10a1f6cae29b6ea35475304321ffd77a6 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -118,7 +118,7 @@ authservice:
setupJob:
image:
## @skip authservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.5
## @param authservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param authservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -401,7 +401,7 @@ analyseservice:
enabled: true
image:
## @skip analyseservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.5
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param analyseservice.podSecurityContext.enabled Enable pods' Security Context
@@ -462,7 +462,7 @@ metadataservice:
enabled: true
image:
## @skip metadataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.5
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param metadataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -559,7 +559,7 @@ dataservice:
endpoint: http://data-service
image:
## @skip dataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.5
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param dataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -645,7 +645,7 @@ searchservice:
endpoint: http://search-service
image:
## @skip searchservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.5
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param searchservice.podSecurityContext.enabled Enable pods' Security Context
@@ -692,7 +692,7 @@ searchservice:
init:
image:
## @skip searchservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.5
## @param searchservice.init.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param searchservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -753,7 +753,7 @@ storageservice:
init:
image:
## @skip storageservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.5
s3:
## @param storageservice.init.s3.endpoint The S3-capable endpoint the microservice connects to.
endpoint: http://storage-service-s3:8333
@@ -862,7 +862,7 @@ ui:
enabled: true
image:
## @skip ui.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.4
+ name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.5
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
podSecurityContext:
## @param ui.podSecurityContext.enabled Enable pods' Security Context
diff --git a/install.sh b/install.sh
index c5f130f5b7a4b59ea9a8d98e172984e09ae7ff48..004a29ff1f5ff20445ba5f49f9ed8520eb228429 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# preset
-VERSION="1.6.4"
+VERSION="1.6.5"
MIN_CPU=8
MIN_RAM=4
MIN_MAP_COUNT=262144
diff --git a/lib/python/.coveragerc b/lib/python/.coveragerc
deleted file mode 100644
index 2301243c8400da8046858a8cbfc8a5abfad9b5d7..0000000000000000000000000000000000000000
--- a/lib/python/.coveragerc
+++ /dev/null
@@ -1,3 +0,0 @@
-[report]
-omit =
- */tests/*
diff --git a/lib/python/dbrepo/RestClient.py b/lib/python/dbrepo/RestClient.py
index a0b4bf60c43f2065ffd2f73f5010407fb0d20287..54d377079d4e8f32304f05652c8d9da01857bdd0 100644
--- a/lib/python/dbrepo/RestClient.py
+++ b/lib/python/dbrepo/RestClient.py
@@ -822,7 +822,7 @@ class RestClient:
raise ResponseCodeError(f'Failed to get table history: response code: {response.status_code} is not '
f'200 (OK): {response.text}')
- def get_views(self, database_id: int) -> List[View]:
+ def get_views(self, database_id: int) -> List[ViewBrief]:
"""
Gets views of a database with given database id.
@@ -837,7 +837,7 @@ class RestClient:
response = self._wrapper(method="get", url=url)
if response.status_code == 200:
body = response.json()
- return TypeAdapter(List[View]).validate_python(body)
+ return TypeAdapter(List[ViewBrief]).validate_python(body)
if response.status_code == 404:
raise NotExistsError(f'Failed to find views: not found')
raise ResponseCodeError(f'Failed to find views: response code: {response.status_code} is not '
diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py
index bd0d13dc1894d1a83891abdcdd6fb438de27f3f4..582f40c9b16a8fe60fd7b2f4a14901958a7a7b3b 100644
--- a/lib/python/dbrepo/api/dto.py
+++ b/lib/python/dbrepo/api/dto.py
@@ -677,6 +677,7 @@ class View(BaseModel):
owner: UserBrief
internal_name: str
is_public: bool
+ is_schema_public: bool
initial_view: bool
columns: List[ViewColumn]
identifiers: List[Identifier] = field(default_factory=list)
@@ -959,6 +960,7 @@ class Column(BaseModel):
class ViewColumn(BaseModel):
id: int
name: str
+ ord: int
database_id: int
internal_name: str
type: ColumnType
diff --git a/lib/python/docs/index.rst b/lib/python/docs/index.rst
index 6c0c17e37503b68240274f7a6081efc598dea544..8951bf165f7c5738843ccdcb011c8b932f1531e5 100644
--- a/lib/python/docs/index.rst
+++ b/lib/python/docs/index.rst
@@ -6,7 +6,7 @@ Pandas `DataFrame <https://pandas.pydata.org/docs/reference/api/pandas.DataFrame
provides an object-oriented API as well as low-level access to DBRepo services.
.. note::
- The SDK has been implemented and documented for DBRepo version 1.6.4, earlier versions may be supported but are not tested for compatibility.
+ The SDK has been implemented and documented for DBRepo version 1.6.5, earlier versions may be supported but are not tested for compatibility.
Quickstart
----------
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index b956d6afd0ff66f7ae83f38112b7443001e98da1..cbebfbc8a90c462e808d50def00390739c217b80 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.6.4"
+version = "1.6.5"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
diff --git a/lib/python/setup.py b/lib/python/setup.py
index 53f4832404814c0e1468082add0b090ea106de84..19600afc0be83a18d00fff7a75cc082bb73408c1 100644
--- a/lib/python/setup.py
+++ b/lib/python/setup.py
@@ -2,7 +2,7 @@
from distutils.core import setup
setup(name="dbrepo",
- version="1.6.4",
+ version="1.6.5",
description="A library for communicating with DBRepo",
url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/",
author="Martin Weise",
diff --git a/lib/python/tests/test_unit_rest_client.py b/lib/python/tests/test_unit_rest_client.py
index e50914719c3a74c550f3bb91bc66869a9cc6dfdc..61a9432ce41cb36a0ea2f4295c7d6136e3a7a696 100644
--- a/lib/python/tests/test_unit_rest_client.py
+++ b/lib/python/tests/test_unit_rest_client.py
@@ -1,41 +1,100 @@
import os
-from unittest import TestCase, mock, main
+import unittest
+
+import requests_mock
from dbrepo.RestClient import RestClient
+from dbrepo.api.dto import JwtAuth
+from dbrepo.api.exceptions import MalformedError, ServiceConnectionError, ServiceError, ForbiddenError, \
+ AuthenticationError, ResponseCodeError
-class DatabaseUnitTest(TestCase):
+class RestClientUnitTest(unittest.TestCase):
def test_constructor_succeeds(self):
- # test
- client = RestClient()
- self.assertEqual("http://localhost", client.endpoint)
- self.assertIsNone(client.username)
- self.assertIsNone(client.password)
- self.assertTrue(client.secure)
-
- @mock.patch.dict(os.environ, {
- "REST_API_ENDPOINT": "https://test.dbrepo.tuwien.ac.at",
- "REST_API_USERNAME": "foo",
- "REST_API_PASSWORD": "bar",
- "REST_API_SECURE": "false",
- })
- def test_constructor_environment_succeeds(self):
- # test
- client = RestClient()
- self.assertEqual("https://test.dbrepo.tuwien.ac.at", client.endpoint)
- self.assertEqual("foo", client.username)
- self.assertEqual("bar", client.password)
- self.assertFalse(client.secure)
-
- def test_constructor_credentials_succeeds(self):
- # test
- client = RestClient(username='admin', password='pass')
- self.assertEqual("http://localhost", client.endpoint)
- self.assertEqual('admin', client.username)
- self.assertEqual('pass', client.password)
- self.assertTrue(client.secure)
+ with requests_mock.Mocker() as mock:
+ # test
+ os.environ['REST_API_SECURE'] = 'True'
+ response = RestClient()
+ self.assertTrue(response.secure)
+
+ def test_get_jwt_auth_empty_succeeds(self):
+ with requests_mock.Mocker() as mock:
+ exp = JwtAuth(access_token='ey123',
+ refresh_token='ey456',
+ id_token='ey789',
+ expires_in=3600,
+ scope='scope',
+ token_type='Bearer',
+ not_before_policy=0,
+ session_state='session_state',
+ refresh_expires_in=7200)
+ # mock
+ mock.post('/api/user/token', json=exp.model_dump(), status_code=202)
+ # test
+ response = RestClient().get_jwt_auth()
+ self.assertEqual(exp, response)
+
+ def test_get_jwt_auth_400_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('/api/user/token', status_code=400)
+ # test
+ try:
+ response = RestClient().get_jwt_auth()
+ except MalformedError:
+ pass
+
+ def test_get_jwt_auth_403_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('/api/user/token', status_code=403)
+ # test
+ try:
+ response = RestClient().get_jwt_auth()
+ except ForbiddenError:
+ pass
+
+ def test_get_jwt_auth_428_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('/api/user/token', status_code=428)
+ # test
+ try:
+ response = RestClient().get_jwt_auth()
+ except AuthenticationError:
+ pass
+
+ def test_get_jwt_auth_502_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('/api/user/token', status_code=502)
+ # test
+ try:
+ response = RestClient().get_jwt_auth()
+ except ServiceConnectionError:
+ pass
+
+ def test_get_jwt_auth_503_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('/api/user/token', status_code=503)
+ # test
+ try:
+ response = RestClient().get_jwt_auth()
+ except ServiceError:
+ pass
+
+ def test_get_jwt_auth_unknown_fails(self):
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('/api/user/token', status_code=418)
+ # test
+ try:
+ response = RestClient().get_jwt_auth()
+ except ResponseCodeError:
+ pass
if __name__ == "__main__":
- main()
+ unittest.main()
diff --git a/lib/python/tests/test_unit_view.py b/lib/python/tests/test_unit_view.py
index 52ea405b28369e20244b9fa111cb745580fb9d30..29fd6aac2f7942fa978c492a5b95ea31e724e0b9 100644
--- a/lib/python/tests/test_unit_view.py
+++ b/lib/python/tests/test_unit_view.py
@@ -5,7 +5,7 @@ import requests_mock
from pandas import DataFrame
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import View, ViewColumn, ColumnType, UserBrief
+from dbrepo.api.dto import View, ViewColumn, ColumnType, UserBrief, ViewBrief
from dbrepo.api.exceptions import ForbiddenError, NotExistsError, MalformedError, AuthenticationError
@@ -21,26 +21,16 @@ class ViewUnitTest(unittest.TestCase):
def test_get_views_succeeds(self):
with requests_mock.Mocker() as mock:
- exp = [View(id=1,
+ exp = [ViewBrief(id=1,
name="Data",
internal_name="data",
database_id=1,
initial_view=False,
query="SELECT id FROM mytable WHERE deg > 0",
query_hash="94c74728b11a690e51d64719868824735f0817b7",
- owner=UserBrief(id='8638c043-5145-4be8-a3e4-4b79991b0a16', username='mweise'),
+ owned_by='8638c043-5145-4be8-a3e4-4b79991b0a16',
is_public=True,
- is_schema_public=True,
- columns=[ViewColumn(id=1,
- ord=0,
- name="id",
- internal_name="id",
- database_id=1,
- auto_generated=False,
- type=ColumnType.BIGINT,
- is_public=True,
- is_null_allowed=False)],
- identifiers=[])]
+ is_schema_public=True)]
# mock
mock.get('/api/database/1/view', json=[exp[0].model_dump()])
# test
@@ -74,9 +64,7 @@ class ViewUnitTest(unittest.TestCase):
name="id",
internal_name="id",
database_id=1,
- auto_generated=False,
type=ColumnType.BIGINT,
- is_public=True,
is_null_allowed=False)],
identifiers=[])
# mock
@@ -122,9 +110,7 @@ class ViewUnitTest(unittest.TestCase):
name="id",
internal_name="id",
database_id=1,
- auto_generated=False,
type=ColumnType.BIGINT,
- is_public=True,
is_null_allowed=False)],
identifiers=[])
# mock
diff --git a/make/build.mk b/make/build.mk
index 61f2f7448fb24d8ec5817a4a133c5b3e4680be1b..968bd94d552e16d689d40c0eb47641fa7450e14e 100644
--- a/make/build.mk
+++ b/make/build.mk
@@ -25,17 +25,17 @@ build-ui: ## Build the UI.
.PHONY: build-lib
build-lib: ## Build the Python Library.
- rm -rf ./dbrepo-analyse-service/venv/ ./dbrepo-analyse-service/Pipfile.lock ./dbrepo-analyse-service/lib/dbrepo-${APP_VERSION}*
- rm -rf ./dbrepo-search-service/venv/ ./dbrepo-search-service/Pipfile.lock ./dbrepo-search-service/lib/dbrepo-${APP_VERSION}*
- rm -rf ./dbrepo-search-service/init/venv/ ./dbrepo-search-service/init/Pipfile.lock ./dbrepo-search-service/init/lib/dbrepo-${APP_VERSION}*
+ rm -rf ./dbrepo-analyse-service/venv/ ./dbrepo-analyse-service/Pipfile.lock ./dbrepo-analyse-service/lib/*
+ rm -rf ./dbrepo-search-service/venv/ ./dbrepo-search-service/Pipfile.lock ./dbrepo-search-service/lib/*
+ rm -rf ./dbrepo-search-service/init/venv/ ./dbrepo-search-service/init/Pipfile.lock ./dbrepo-search-service/init/lib/*
python3 -m build --sdist ./lib/python
python3 -m build --wheel ./lib/python
cp -r ./lib/python/dist/dbrepo-${APP_VERSION}* ./dbrepo-analyse-service/lib
- (cd ./dbrepo-analyse-service && python3 -m venv venv && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install --dev)
+ (cd ./dbrepo-analyse-service && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install --dev)
cp -r ./lib/python/dist/dbrepo-${APP_VERSION}* ./dbrepo-search-service/lib
- (cd ./dbrepo-search-service && python3 -m venv venv && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install --dev)
+ (cd ./dbrepo-search-service && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install --dev)
cp -r ./lib/python/dist/dbrepo-${APP_VERSION}* ./dbrepo-search-service/init/lib
- (cd ./dbrepo-search-service/init && python3 -m venv venv && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install --dev)
+ (cd ./dbrepo-search-service/init && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install --dev)
.PHONY: build-helm
build-helm: ## Build the DBRepo and DBRepo MariaDB Galera Helm Charts.
diff --git a/sonar-project.properties b/sonar-project.properties
index e118258889d85c43894ea7493ba9c16bcc83c5fa..c044de9ff1cd165bdd794b1959d5bae87369f5a0 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@
sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77
sonar.host.url=https://s39.datalab.tuwien.ac.at
# project
-sonar.projectVersion=1.6.4
+sonar.projectVersion=1.6.5
# general
sonar.qualitygate.wait=true
sonar.projectCreation.mainBranchName=master