diff --git a/.docker/.env b/.docker/.env
index d191e59edda36e8ca7795d1da35710d28129cfdc..8d853a59c1daed935f68a1f1aab5cdbd387f8cdc 100644
--- a/.docker/.env
+++ b/.docker/.env
@@ -1,4 +1,4 @@
-APP_VERSION=1.9.2
+APP_VERSION=1.9.3
FLUENTBIT_VERSION=4.0.0
GRAFANA_VERSION=11.4.0
MARIADB_VERSION=11.3.2
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 833e44e38550953f02544a3bb78a4e2fbb650f43..efbb13dbc106314438259a898ead7f85eeab915e 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -158,7 +158,8 @@ services:
KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
KEYCLOAK_HOSTNAME: "${BASE_URL:-http://localhost}"
- KEYCLOAK_HOSTNAME_ADMIN: "${BASE_URL:-http://localhost}:8080"
+ KEYCLOAK_HOSTNAME_ADMIN: "${BASE_URL:-http://localhost}/admin/"
+ KEYCLOAK_PROXY_HEADERS: "xforwarded"
METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}"
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
diff --git a/.docs/api/open-api.md b/.docs/api/open-api.md
deleted file mode 100644
index 575ce9483dce794061572b54e1c485960b52bae7..0000000000000000000000000000000000000000
--- a/.docs/api/open-api.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-author: Martin Weise
----
-
-
-
-## tl;dr
-
-[:simple-swagger: View Swagger-UI](../../rest/){ .md-button .md-button--primary tabindex=-1 }
-
-## Overview
-
-All services are documented using the [OpenAPI 3.1](https://www.openapis.org/) documentation standard.
\ No newline at end of file
diff --git a/.docs/api/python.md b/.docs/api/python.md
deleted file mode 100644
index aa0c17fec9f2d24d7f03d3b107ddac9692df7a88..0000000000000000000000000000000000000000
--- a/.docs/api/python.md
+++ /dev/null
@@ -1,116 +0,0 @@
----
-author: Martin Weise
----
-
-[](https://pypi.org/project/dbrepo/){ tabindex=-1 }
-
-## tl;dr
-
-[:fontawesome-solid-cube: View Docs](../../python){ .md-button .md-button--primary }
-
-## Overview
-
-The DBRepo Python library is using some of the most pupular and maintained Python packages for Data Scientists under the
-hood. For example: [`requests`](https://requests.readthedocs.io/) to interact with the HTTP API
-endpoints, [`pandas`](https://pandas.pydata.org/) for data operations and [`pydantic`](https://docs.pydantic.dev/) for
-information representation from/to the HTTP API.
-
-## Installing
-
-:octicons-tag-16:{ title="Minimum version" } 1.4.2
-
-```console
-$ python -m pip install dbrepo
-```
-
-To use DBRepo in your Jupyter notebook, install the `dbrepo` library` directly in a code cell and type:
-
-```jupyter
-!pip install dbrepo
-```
-
-This package supports Python 3.11+.
-
-## Quickstart
-
-Get public data from a table as pandas `DataFrame`:
-
-```python
-from dbrepo.RestClient import RestClient
-
-client = RestClient(endpoint="https://dbrepo1.ec.tuwien.ac.at")
-# Get a small data slice of just three rows
-df = client.get_table_data(database_id=7, table_id=13, page=0, size=3, df=True)
-print(df)
-# x_coord component unit ... value stationid meantype
-# 0 16.52617 Feinstaub (PM10) µg/m³ ... 21.0 01:0001 HMW
-# 1 16.52617 Feinstaub (PM10) µg/m³ ... 23.0 01:0001 HMW
-# 2 16.52617 Feinstaub (PM10) µg/m³ ... 26.0 01:0001 HMW
-#
-# [3 rows x 12 columns]
-```
-
-Import data into a table:
-
-```python
-import pandas as pd
-from dbrepo.RestClient import RestClient
-
-client = RestClient(endpoint="https://dbrepo1.ec.tuwien.ac.at", username="foo",
- password="bar")
-df = pd.DataFrame(data={'x_coord': 16.52617, 'component': 'Feinstaub (PM10)',
- 'unit': 'µg/m³', ...})
-client.import_table_data(database_id=7, table_id=13, file_name_or_data_frame=df)
-```
-
-## Supported Features & Best-Practices
-
-- Manage user
- account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#create-user-account))
-- Manage
- databases ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo//usage-overview/#create-database))
-- Manage database access &
- visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#create-database))
-- Import
- dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#import-dataset))
-- Create persistent
- identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#assign-database-pid))
-- Execute
- queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.5/api/#export-subset))
-- Get data from tables/views/subsets
-
-## Configure
-
-All credentials can optionally be set/overridden with environment variables. This is especially useful when sharing
-Jupyter Notebooks by creating an invisible `.env` file and loading it:
-
-``` title=".env"
-REST_API_ENDPOINT="https://dbrepo1.ec.tuwien.ac.at"
-REST_API_USERNAME="foo"
-REST_API_PASSWORD="bar"
-REST_API_SECURE="True"
-AMQP_API_HOST="https://dbrepo1.ec.tuwien.ac.at"
-AMQP_API_PORT="5672"
-AMQP_API_USERNAME="foo"
-AMQP_API_PASSWORD="bar"
-AMQP_API_VIRTUAL_HOST="dbrepo"
-REST_UPLOAD_ENDPOINT="https://dbrepo1.ec.tuwien.ac.at/api/upload/files"
-```
-
-You can disable logging by setting the log level to e.g. `INFO`:
-
-```python
-from dbrepo.RestClient import RestClient
-import logging
-logging.getLogger().setLevel(logging.INFO)
-...
-client = RestClient(...)
-```
-
-## Future
-
-- Searching
-
-## Links
-
-This information is also mirrored on [PyPI](https://pypi.org/project/dbrepo/).
\ No newline at end of file
diff --git a/.docs/examples/manufacturing.md b/.docs/examples/manufacturing.md
deleted file mode 100644
index f3eb32600f44a77f046865f6da212212a0bfdc08..0000000000000000000000000000000000000000
--- a/.docs/examples/manufacturing.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-author: Martin Weise
----
-
-## tl;dr
-
-tbd
-
-## Description
-
-TBD
-
-## Solution
-
-TBD
-
-## DBRepo Features
-
-- [x] TBD
diff --git a/.docs/help.md b/.docs/help.md
deleted file mode 100644
index 63ede84f973867d044c8438a7dd774fb60b5a39c..0000000000000000000000000000000000000000
--- a/.docs/help.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-author: Martin Weise
----
-
-## Concepts Documentation
-
-The [concepts documentation](../concepts/) is the most complete guide on how to use DBRepo.
-
-## API Documentation
-
-The [API documentation](../api/) present reference docs for all APIs.
-
-!!! info "Additional Help"
-
- [Contact us](../contact) via e-mail.
\ No newline at end of file
diff --git a/.docs/images/architecture.drawio b/.docs/images/architecture.drawio
deleted file mode 100644
index bc93b1622773bfa8eca538dadb348868e5905ffd..0000000000000000000000000000000000000000
--- a/.docs/images/architecture.drawio
+++ /dev/null
@@ -1,1115 +0,0 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/26.2.15 Chrome/134.0.6998.205 Electron/35.2.1 Safari/537.36" version="26.2.15" pages="9">
- <diagram id="mvBsv1rP8O80Qe3yGnn_" name="docker-compose">
- <mxGraphModel dx="982" dy="396" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-97" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;jumpStyle=arc;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="775" y="480" />
- <mxPoint x="660" y="480" />
- <mxPoint x="660" y="240" />
- <mxPoint x="618" y="240" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-98" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-97" vertex="1" connectable="0">
- <mxGeometry x="0.7012" y="1" relative="1" as="geometry">
- <mxPoint x="-19" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-143" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;jumpStyle=arc;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="395" y="480" />
- <mxPoint x="500" y="480" />
- <mxPoint x="500" y="240" />
- <mxPoint x="553" y="240" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-144" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-143" vertex="1" connectable="0">
- <mxGeometry x="0.6707" relative="1" as="geometry">
- <mxPoint x="17" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-77" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=classic;endFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-108" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="668" y="206" />
- <mxPoint x="668" y="400" />
- <mxPoint x="775" y="400" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-78" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-77" vertex="1" connectable="0">
- <mxGeometry x="-0.2051" y="1" relative="1" as="geometry">
- <mxPoint x="61" y="40" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-79" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-77" vertex="1" connectable="0">
- <mxGeometry x="-0.3724" relative="1" as="geometry">
- <mxPoint x="62" y="105" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-81" value="LDAP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-96" target="FWEJ_FGA9GBXbfwohBE8-104" edge="1">
- <mxGeometry x="-0.2381" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-82" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="352.5" y="658" width="85" height="20" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-83" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=0;exitDx=0;exitDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-92" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-84" value="AMQP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-83" vertex="1" connectable="0">
- <mxGeometry x="-0.0476" y="-1" relative="1" as="geometry">
- <mxPoint x="-1" y="-4" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-85" value="Data Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="330" y="504" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-86" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-137" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-87" value="JDBC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-86" vertex="1" connectable="0">
- <mxGeometry x="0.3566" relative="1" as="geometry">
- <mxPoint y="-11" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-88" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-92" target="FWEJ_FGA9GBXbfwohBE8-96" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-89" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-88" vertex="1" connectable="0">
- <mxGeometry x="-0.1051" y="-1" relative="1" as="geometry">
- <mxPoint x="3" y="-1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-90" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-92" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="395" y="400" />
- <mxPoint x="490" y="400" />
- <mxPoint x="490" y="206" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-91" value="<div>AMQP,<br>MQTT</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-90" vertex="1" connectable="0">
- <mxGeometry x="-0.1797" y="2" relative="1" as="geometry">
- <mxPoint x="-18" y="23" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-92" value="<b>Broker Service</b><div><i>rabbitmq</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="330" y="422" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-96" value="<b>Identity Service</b><div><i>openldap</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="520" y="422" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-99" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;jumpStyle=arc;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-85" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="743" y="490" />
- <mxPoint x="427" y="490" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-100" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-99" vertex="1" connectable="0">
- <mxGeometry x="0.3494" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-101" value="Metadata Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="710" y="504" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-102" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-104" target="FWEJ_FGA9GBXbfwohBE8-101" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-103" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-102" vertex="1" connectable="0">
- <mxGeometry x="-0.1111" relative="1" as="geometry">
- <mxPoint x="3" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-106" value="<i>mariadb</i>" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="750" y="256" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-107" value="search-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="732.5" y="320.5" width="85" height="17" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-111" value="psql" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;fontStyle=2" parent="1" vertex="1">
- <mxGeometry x="560" y="584" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-112" value="auth-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="542.5" y="648" width="85" height="20" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-115" value="HTTP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0;entryY=0.25;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-105" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-117" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-123" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="480" y="196" />
- <mxPoint x="480" y="360" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-118" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-117" vertex="1" connectable="0">
- <mxGeometry x="0.5551" y="-1" relative="1" as="geometry">
- <mxPoint x="-9" y="-20" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="uDJ2bVtIrgoZBCZFZmDG-12" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-119" value="<b>Gateway Service</b><div><i>nginx</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="520" y="176" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-121" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-123" target="FWEJ_FGA9GBXbfwohBE8-120" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-122" value="S3" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-121" vertex="1" connectable="0">
- <mxGeometry x="0.0536" relative="1" as="geometry">
- <mxPoint y="1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-123" value="Analyse Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="330" y="340" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-125" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-105" target="FWEJ_FGA9GBXbfwohBE8-106" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-126" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-125" vertex="1" connectable="0">
- <mxGeometry x="-0.0782" y="-1" relative="1" as="geometry">
- <mxPoint x="2" y="1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-127" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-128" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="585" y="110" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-128" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="520" y="69" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-129" value="Database<div>Engineer</div>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="490" y="586" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-133" value="JDBC" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-104" target="FWEJ_FGA9GBXbfwohBE8-111" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-134" value="System<div>Engineer</div>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="650" y="586" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-135" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="339.5" y="584" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-136" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="399.5" y="584" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-137" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="369.5" y="594" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-138" value="mariadb-galera" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;fontStyle=2" parent="1" vertex="1">
- <mxGeometry x="320" y="575" width="150" height="105" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-139" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;dashed=1;entryX=1.004;entryY=0.397;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-129" target="FWEJ_FGA9GBXbfwohBE8-138" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="460" y="616" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-140" value="User Interface" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="710" y="340" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-141" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-142" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="585" y="110" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-142" value="Machine" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="620" y="69" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-147" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-140" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="683" y="196" />
- <mxPoint x="683" y="360" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-148" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-147" vertex="1" connectable="0">
- <mxGeometry x="0.0179" relative="1" as="geometry">
- <mxPoint y="8" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-149" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.25;entryDx=0;entryDy=0;jumpStyle=arc;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-105" target="FWEJ_FGA9GBXbfwohBE8-101" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="697" y="206" />
- <mxPoint x="697" y="514" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-150" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-149" vertex="1" connectable="0">
- <mxGeometry x="-0.5289" y="-1" relative="1" as="geometry">
- <mxPoint x="4" y="34" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="a_cl7nsyDpLQFaXOHeFD-3" value="prom" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;fontStyle=2;fontSize=12;" parent="1" vertex="1">
- <mxGeometry x="370" y="164" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="a_cl7nsyDpLQFaXOHeFD-4" value="metric-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="352" y="228" width="85" height="17" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-5" target="FWEJ_FGA9GBXbfwohBE8-105" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-5" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="850" y="189" width="40" height="14" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-8" target="FWEJ_FGA9GBXbfwohBE8-108" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-8" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="850" y="435.5" width="40" height="13" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-10" target="FWEJ_FGA9GBXbfwohBE8-120" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-10" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="280" y="272" width="40" height="12" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-12" value="<b>Dashboard UI</b><div><i>grafana</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="520" y="258" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-14" target="FWEJ_FGA9GBXbfwohBE8-104" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-18" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endSize=0;startSize=0;jumpSize=3;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-14" target="FWEJ_FGA9GBXbfwohBE8-104" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-14" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="470" y="517.5" width="40" height="13" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-104" value="<b>Auth Service</b><br><i>keycloak</i>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="520" y="504" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-120" value="<b>Storage Service</b><div><i>seaweedfs</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="329.5" y="258" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-105" value="Search Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="710" y="176" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-108" value="<b>Dashboard Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="710" y="422" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-21" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="732.5" y="657.61" width="85" height="20" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-23" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="719.5" y="583.61" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-24" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="779.5" y="583.61" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-25" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="750.5" y="593.61" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="774.86" y="544" as="sourcePoint" />
- <mxPoint x="774.86" y="594" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-30" value="JDBC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="uDJ2bVtIrgoZBCZFZmDG-29" vertex="1" connectable="0">
- <mxGeometry x="0.3566" relative="1" as="geometry">
- <mxPoint x="1" y="-12" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="CEhTLEpK94wtDmjaM6P2-1" value="<i>psql</i>" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" vertex="1" parent="1">
- <mxGeometry x="560" y="328" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="CEhTLEpK94wtDmjaM6P2-2" value="dashboard-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" vertex="1" parent="1">
- <mxGeometry x="542.5" y="392" width="85" height="17" as="geometry" />
- </mxCell>
- <mxCell id="CEhTLEpK94wtDmjaM6P2-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-12" target="CEhTLEpK94wtDmjaM6P2-1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="CEhTLEpK94wtDmjaM6P2-4" value="JDBC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="CEhTLEpK94wtDmjaM6P2-3">
- <mxGeometry x="-0.3333" relative="1" as="geometry">
- <mxPoint y="1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="uDJ2bVtIrgoZBCZFZmDG-26" value="mariadb-galera" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;fontStyle=2" parent="1" vertex="1">
- <mxGeometry x="700" y="574.61" width="150" height="105" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram name="ui" id="GYXS_N4ymJ7hX3zLKvDC">
- <mxGraphModel dx="1372" dy="1098" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="ihsuRJ9dWuDPEHVUeUyY-0" />
- <mxCell id="ihsuRJ9dWuDPEHVUeUyY-1" parent="ihsuRJ9dWuDPEHVUeUyY-0" />
- <mxCell id="IRxpwOfG2jHF0YoYJLJK-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;fillColor=default;strokeColor=#000000;gradientColor=none;shadow=0;gradientDirection=radial;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="30" y="320" width="465" height="278" as="geometry" />
- </mxCell>
- <mxCell id="IRxpwOfG2jHF0YoYJLJK-0" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;fillColor=#FFFFFF;strokeColor=#000000;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="30" y="116" width="464" height="201" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-0" value="User Interface" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="197" y="259" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-1" value="Vuetify<br>(ui library)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="359" y="410" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="5if0HzVKwC5VdDnFuonI-9" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="kLNLoM7m2o6o68vp3Wb9-1" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="5if0HzVKwC5VdDnFuonI-6" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-30" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="5if0HzVKwC5VdDnFuonI-27" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-2" value="Vue.js<br>(framework)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="197" y="410" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-3" target="kLNLoM7m2o6o68vp3Wb9-4" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-3" value="Pinia Persist Plugin<br>(state)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DAE8FC;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="37" y="259" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-4" value="Local Storage" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;fillColor=#DAE8FC;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="72" y="146.6" width="60" height="80" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-10" target="kLNLoM7m2o6o68vp3Wb9-12" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-10" target="kLNLoM7m2o6o68vp3Wb9-2" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-10" value="Node<br>(runtime)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="197" y="478" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-13" target="kLNLoM7m2o6o68vp3Wb9-18" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-20" value="refresh_token" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="kLNLoM7m2o6o68vp3Wb9-19" vertex="1" connectable="0">
- <mxGeometry x="0.5604" y="1" relative="1" as="geometry">
- <mxPoint x="1" y="34" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-12" target="kLNLoM7m2o6o68vp3Wb9-13" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-12" value="Axios" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="197" y="548" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-13" value="Storage Service<br style="border-color: var(--border-color);">(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="530" y="548" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="kLNLoM7m2o6o68vp3Wb9-18" value="Authentication Service<br style="border-color: var(--border-color);">(Keycloak)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="530" y="410" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="4DtipyiVSSVc0IyAwunU-1" value="client-side" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="33" y="120" width="60" height="20" as="geometry" />
- </mxCell>
- <mxCell id="4DtipyiVSSVc0IyAwunU-2" value="server-side" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="34" y="324" width="64" height="20" as="geometry" />
- </mxCell>
- <mxCell id="4DtipyiVSSVc0IyAwunU-4" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/e/e1/Google_Chrome_icon_%28February_2022%29.svg/2048px-Google_Chrome_icon_%28February_2022%29.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="98" y="120" width="20" height="20" as="geometry" />
- </mxCell>
- <mxCell id="4DtipyiVSSVc0IyAwunU-6" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Firefox_logo%2C_2019.svg/1200px-Firefox_logo%2C_2019.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="123" y="119.59999999999997" width="20" height="20.8" as="geometry" />
- </mxCell>
- <mxCell id="GqgzYKxcxpW_CC4_t2HJ-0" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="508" y="606" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="GqgzYKxcxpW_CC4_t2HJ-1" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="545.5" y="606" width="114.5" height="16" as="geometry" />
- </mxCell>
- <mxCell id="GqgzYKxcxpW_CC4_t2HJ-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="508" y="626" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="GqgzYKxcxpW_CC4_t2HJ-3" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="545.5" y="626" width="114.5" height="16" as="geometry" />
- </mxCell>
- <mxCell id="GqgzYKxcxpW_CC4_t2HJ-4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="523" y="606" width="15" height="16" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="wEgBe73B2rnMap29lm9I-0" target="kLNLoM7m2o6o68vp3Wb9-0" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="wEgBe73B2rnMap29lm9I-0" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="46" y="20" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="5if0HzVKwC5VdDnFuonI-6" target="kLNLoM7m2o6o68vp3Wb9-0" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-6" value="Vite<br>(builder)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="197" y="339" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="5if0HzVKwC5VdDnFuonI-9" target="kLNLoM7m2o6o68vp3Wb9-3" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-9" value="Pinia<br>(state)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DAE8FC;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="37" y="410" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-10" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/Pinialogo.svg/1200px-Pinialogo.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="49" y="418.41999999999996" width="15.5" height="23.17" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-11" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/9/95/Vue.js_Logo_2.svg/640px-Vue.js_Logo_2.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="209.87" y="420.57" width="21.75" height="18.86" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-26" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://seeklogo.com/images/V/vite-logo-BFD4283991-seeklogo.com.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="210.75" y="348" width="20" height="20" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="5if0HzVKwC5VdDnFuonI-27" target="5if0HzVKwC5VdDnFuonI-6" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-27" value="Nuxt<br>(framework)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="359" y="339" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-33" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://cdn.vuetifyjs.com/images/logos/logo.svg;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="370.62" y="419.78" width="23" height="20.44" as="geometry" />
- </mxCell>
- <mxCell id="5if0HzVKwC5VdDnFuonI-34" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://nuxt.com/assets/design-kit/icon-green.svg;clipPath=inset(21.33% 8.33% 22% 7.67%);" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
- <mxGeometry x="371.72" y="350.98" width="20.8" height="14.03" as="geometry" />
- </mxCell>
- <mxCell id="wjwh4gSCingDzarWVrMb-1" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Node.js_logo.svg/590px-Node.js_logo.svg.png;" vertex="1" parent="ihsuRJ9dWuDPEHVUeUyY-1">
- <mxGeometry x="201" y="487" width="35.86" height="22" as="geometry" />
- </mxCell>
- <mxCell id="wjwh4gSCingDzarWVrMb-2" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://user-images.githubusercontent.com/43313420/105893220-1bae8780-6013-11eb-87be-eeac845ecc6f.png;" vertex="1" parent="ihsuRJ9dWuDPEHVUeUyY-1">
- <mxGeometry x="211.8" y="553.22" width="17.9" height="29.55" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram name="upload-service" id="Intd5LFI1o1DnwmU276U">
- <mxGraphModel dx="1372" dy="1098" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="583" pageHeight="413" math="0" shadow="0">
- <root>
- <mxCell id="t3MVFbP-u93KWKySnz03-0" />
- <mxCell id="t3MVFbP-u93KWKySnz03-1" parent="t3MVFbP-u93KWKySnz03-0" />
- <mxCell id="t3MVFbP-u93KWKySnz03-21" value="Storage Service<br style="border-color: var(--border-color);">(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="388" y="254" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="XXOSSsn7GNvguvu12Izz-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;" parent="t3MVFbP-u93KWKySnz03-1" source="t3MVFbP-u93KWKySnz03-22" target="t3MVFbP-u93KWKySnz03-21" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="XXOSSsn7GNvguvu12Izz-2" value="S3" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="XXOSSsn7GNvguvu12Izz-1" vertex="1" connectable="0">
- <mxGeometry x="-0.214" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="t3MVFbP-u93KWKySnz03-22" value="Upload Service<br>(TUSd)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="388" y="170" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="t3MVFbP-u93KWKySnz03-28" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="368" y="326" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="t3MVFbP-u93KWKySnz03-29" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="405.5" y="326" width="114.5" height="16" as="geometry" />
- </mxCell>
- <mxCell id="t3MVFbP-u93KWKySnz03-30" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="368" y="346" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="t3MVFbP-u93KWKySnz03-31" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="405.5" y="346" width="114.5" height="16" as="geometry" />
- </mxCell>
- <mxCell id="t3MVFbP-u93KWKySnz03-32" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="383" y="326" width="15" height="16" as="geometry" />
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-0" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=9;fillColor=#FFFFFF;strokeColor=#000000;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="17" y="250" width="320" height="48" as="geometry" />
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=6;fillColor=#FFFFFF;strokeColor=#000000;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="17" y="160" width="320" height="80" as="geometry" />
- </mxCell>
- <mxCell id="XXOSSsn7GNvguvu12Izz-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="t3MVFbP-u93KWKySnz03-1" source="lcH7hTO0wd4oNimF5SfX-2" target="t3MVFbP-u93KWKySnz03-22" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="XXOSSsn7GNvguvu12Izz-3" value="TUSd" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="XXOSSsn7GNvguvu12Izz-0" vertex="1" connectable="0">
- <mxGeometry x="0.2482" relative="1" as="geometry">
- <mxPoint x="-4" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-2" value="User Interface" style="rounded=1;whiteSpace=wrap;html=1;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="190" y="170" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-16" value="client-side" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="23" y="167" width="60" height="20" as="geometry" />
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-17" value="server-side<br>(Nuxt)" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="24" y="261" width="64" height="20" as="geometry" />
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-18" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/e/e1/Google_Chrome_icon_%28February_2022%29.svg/2048px-Google_Chrome_icon_%28February_2022%29.svg.png;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="88" y="167" width="20" height="20" as="geometry" />
- </mxCell>
- <mxCell id="lcH7hTO0wd4oNimF5SfX-19" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Firefox_logo%2C_2019.svg/1200px-Firefox_logo%2C_2019.svg.png;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="113" y="166.59999999999997" width="20" height="20.8" as="geometry" />
- </mxCell>
- <mxCell id="l6EjH4y-yBJY-nxj2eUf-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="t3MVFbP-u93KWKySnz03-1" source="l6EjH4y-yBJY-nxj2eUf-1" target="lcH7hTO0wd4oNimF5SfX-2" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="255" y="170" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="xlAJL46O4fjLn4VFTtzb-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="t3MVFbP-u93KWKySnz03-1" source="l6EjH4y-yBJY-nxj2eUf-1" target="t3MVFbP-u93KWKySnz03-22" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="xlAJL46O4fjLn4VFTtzb-2" value="TUSd" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="xlAJL46O4fjLn4VFTtzb-1" vertex="1" connectable="0">
- <mxGeometry x="-0.4123" y="2" relative="1" as="geometry">
- <mxPoint x="-4" y="2" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="l6EjH4y-yBJY-nxj2eUf-1" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
- <mxGeometry x="340" y="50" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="L91YYZmKAeZpfxyys9hG-0" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://nuxt.com/assets/design-kit/icon-green.svg;clipPath=inset(21.33% 8.33% 22% 7.67%);" vertex="1" parent="t3MVFbP-u93KWKySnz03-1">
- <mxGeometry x="92.20000000000005" y="266.98" width="20.8" height="14.03" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram id="n3Gsc6DDUkQ8nNTTz0wk" name="data-db">
- <mxGraphModel dx="1434" dy="172" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1019" pageHeight="650" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="S8wz9ZtwZs3Sd4maCRdY-9" value="shared filesystem<br>/tmp" style="rounded=1;whiteSpace=wrap;html=1;arcSize=3;verticalAlign=bottom;fontStyle=2" parent="1" vertex="1">
- <mxGeometry x="425" y="840" width="248" height="130" as="geometry" />
- </mxCell>
- <mxCell id="S8wz9ZtwZs3Sd4maCRdY-11" value="jdbc" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;exitPerimeter=0;endArrow=none;endFill=0;startArrow=classic;startFill=1;" parent="1" source="S8wz9ZtwZs3Sd4maCRdY-1" edge="1">
- <mxGeometry x="0.3769" relative="1" as="geometry">
- <mxPoint x="472.71428571428555" y="810" as="targetPoint" />
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="S8wz9ZtwZs3Sd4maCRdY-1" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="447.5" y="857" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="S8wz9ZtwZs3Sd4maCRdY-2" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="431.5" y="919" width="85" height="20" as="geometry" />
- </mxCell>
- <mxCell id="S8wz9ZtwZs3Sd4maCRdY-12" value="http" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="S8wz9ZtwZs3Sd4maCRdY-7" edge="1">
- <mxGeometry x="0.4743" relative="1" as="geometry">
- <mxPoint x="585.0952380952381" y="810" as="targetPoint" />
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="m0IQrUpga-DAo2afT193-3" value="S3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="S8wz9ZtwZs3Sd4maCRdY-7" target="m0IQrUpga-DAo2afT193-1" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="S8wz9ZtwZs3Sd4maCRdY-7" value="Data DB Sidecar" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="520" y="869" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="m0IQrUpga-DAo2afT193-1" value="Storage Service<br style="border-color: var(--border-color);">(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="720" y="869" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="WQwfQuj7Yb_D7RAfNHcl-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="667.5" y="980" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="WQwfQuj7Yb_D7RAfNHcl-2" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="705" y="980" width="140" height="16" as="geometry" />
- </mxCell>
- <mxCell id="WQwfQuj7Yb_D7RAfNHcl-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="667.5" y="1000" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="WQwfQuj7Yb_D7RAfNHcl-4" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="705" y="1000" width="140" height="16" as="geometry" />
- </mxCell>
- <mxCell id="WQwfQuj7Yb_D7RAfNHcl-5" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="682.5" y="980" width="15" height="16" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram id="Uhf8Gh-EQdBRKzm7U-8d" name="auth-service">
- <mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="Gou0UibUgwIY_gQY8MW6-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-3" target="Gou0UibUgwIY_gQY8MW6-4" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-2" value="include" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="Gou0UibUgwIY_gQY8MW6-1" vertex="1" connectable="0">
- <mxGeometry x="-0.2248" y="1" relative="1" as="geometry">
- <mxPoint x="-9" y="-1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-3" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=7;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="223.5" y="156" width="141" height="424" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-4" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=7;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="2" y="156" width="141" height="424" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-6" target="Gou0UibUgwIY_gQY8MW6-12" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-6" value="Researchers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="12" y="4" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-8" target="Gou0UibUgwIY_gQY8MW6-14" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-8" value="Developers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="234" y="4" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gou0UibUgwIY_gQY8MW6-10" target="Gou0UibUgwIY_gQY8MW6-16" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-10" value="Data Steward" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="452" y="4" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-12" target="Gou0UibUgwIY_gQY8MW6-4" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-12" value="default-researcher-roles" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12" y="74" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-14" target="Gou0UibUgwIY_gQY8MW6-3" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="294.17499999999995" y="155.27999999999997" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-14" value="default-developer-roles" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="234" y="74" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-16" target="Gou0UibUgwIY_gQY8MW6-27" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-16" value="default-data-steward-roles" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="452" y="74" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-17" value="default-user-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12.5" y="466" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-18" value="default-identifier-handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12.5" y="406" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-19" value="default-database-handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12.5" y="226" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-20" value="default-container-handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12.5" y="166" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-21" value="default-table-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12.5" y="286" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-22" value="default-query-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12.5" y="346" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-23" value="escalated-container-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="234" y="226" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-24" value="escalated-database-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="234" y="286" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-25" value="escalated-query-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="234" y="406" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-26" value="escalated-table-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="234" y="346" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-27" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=7;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="441.5" y="156" width="141" height="424" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-28" value="escalated-identifier-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="452" y="286" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-29" value="default-semantics-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="12" y="530" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-30" value="default-maintenance-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="234" y="166" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-31" value="default-user-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="452" y="166" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-32" value="default-semantics-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="452" y="226" width="120" height="40" as="geometry" />
- </mxCell>
- <mxCell id="Gou0UibUgwIY_gQY8MW6-33" value="escalated-semantics-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="452" y="346" width="120" height="40" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram id="e2fuorb2m_XjboQ7R7_y" name="data-ingest">
- <mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="0VJCIkSjTVNNat6pGbHc-1" value="5672/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;startArrow=none;startFill=0;dashed=1;" parent="1" target="0VJCIkSjTVNNat6pGbHc-3" edge="1">
- <mxGeometry x="-0.028" relative="1" as="geometry">
- <mxPoint x="448" y="220" as="sourcePoint" />
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-2" value="<b>AMQP</b>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="432.5" y="137" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-30" value="5672/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-3" target="0VJCIkSjTVNNat6pGbHc-29" edge="1">
- <mxGeometry x="-0.1905" y="-1" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-3" target="0VJCIkSjTVNNat6pGbHc-33" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="395" y="318" as="sourcePoint" />
- <Array as="points">
- <mxPoint x="415" y="340" />
- <mxPoint x="364" y="340" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-42" value="80/tcp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="0VJCIkSjTVNNat6pGbHc-41" vertex="1" connectable="0">
- <mxGeometry x="0.1277" y="-1" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="8uG5b6AFywpmQrgs9zUp-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-3" target="JkB3rZmVi6YrdEwAjtGV-5" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="415" y="340" />
- <mxPoint x="285" y="340" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="8uG5b6AFywpmQrgs9zUp-2" value="9000/tcp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="8uG5b6AFywpmQrgs9zUp-1" vertex="1" connectable="0">
- <mxGeometry x="0.6408" y="-2" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-3" value="Gateway Service<br style="border-color: var(--border-color);">(NGINX)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="382.5" y="278" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-7" value="<b>JDBC</b>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="584" y="170" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-8" value="3307/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#000000;startArrow=classic;startFill=1;dashed=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="yvNGLmbJRMNvVS071MuP-1" edge="1">
- <mxGeometry x="-0.0158" relative="1" as="geometry">
- <mxPoint x="513" y="300" as="sourcePoint" />
- <mxPoint as="offset" />
- <mxPoint x="600" y="250" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-9" value="<b>API</b>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
- <mxGeometry x="280" y="170" width="30" height="60" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-10" value="80/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#000000;startArrow=classic;startFill=1;dashed=1;" parent="1" edge="1">
- <mxGeometry x="0.2319" relative="1" as="geometry">
- <mxPoint x="295" y="250" as="sourcePoint" />
- <mxPoint as="offset" />
- <mxPoint x="383" y="300" as="targetPoint" />
- <Array as="points">
- <mxPoint x="295" y="300" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-26" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="575" y="440" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-38" value="3306/tcp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="0VJCIkSjTVNNat6pGbHc-37" vertex="1" connectable="0">
- <mxGeometry x="-0.1716" y="1" relative="1" as="geometry">
- <mxPoint x="3" y="-8" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-26" value="Data Service<br>(Spring AMQP)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="399.5" y="420" width="96" height="40" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-29" target="0VJCIkSjTVNNat6pGbHc-26" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-29" value="Broker Service<br style="border-color: var(--border-color);">(RabbitMQ)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="399.5" y="360" width="96" height="40" as="geometry" />
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-33" target="yvNGLmbJRMNvVS071MuP-1" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="530" y="500" />
- <mxPoint x="530" y="440" />
- </Array>
- <mxPoint x="570" y="440" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="0VJCIkSjTVNNat6pGbHc-33" value="Metadata Service<br>(Spring AMQP)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="316" y="480" width="96" height="40" as="geometry" />
- </mxCell>
- <mxCell id="SPLHNWc1rHttcZ-O3PPf-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="JkB3rZmVi6YrdEwAjtGV-5" target="0VJCIkSjTVNNat6pGbHc-33" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="JkB3rZmVi6YrdEwAjtGV-5" value="Storage Service<br>(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="237" y="394" width="96" height="40" as="geometry" />
- </mxCell>
- <mxCell id="yvNGLmbJRMNvVS071MuP-1" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="575" y="408" width="50" height="64" as="geometry" />
- </mxCell>
- <mxCell id="yvNGLmbJRMNvVS071MuP-2" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
- <mxGeometry x="559" y="470" width="85" height="20" as="geometry" />
- </mxCell>
- <mxCell id="jJosZR_OhRTGx9p3jnjP-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
- <mxGeometry x="447.5" y="540" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="jJosZR_OhRTGx9p3jnjP-2" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="485" y="540" width="140" height="16" as="geometry" />
- </mxCell>
- <mxCell id="jJosZR_OhRTGx9p3jnjP-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="447.5" y="560" width="30" height="16" as="geometry" />
- </mxCell>
- <mxCell id="jJosZR_OhRTGx9p3jnjP-4" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="485" y="560" width="140" height="16" as="geometry" />
- </mxCell>
- <mxCell id="jJosZR_OhRTGx9p3jnjP-5" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
- <mxGeometry x="462.5" y="540" width="15" height="16" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram id="0gRvLy_AUZ0Xau8SBKI8" name="Gitlab Runner">
- <mxGraphModel dx="925" dy="530" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;" parent="1" vertex="1">
- <mxGeometry x="250" y="40" width="760" height="260" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-3" value="Kubernetes" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="292" y="50" width="110" height="10" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-4" value="<font style="font-weight: normal; font-size: 10px;">azimuth.datalab.tuwien.ac.at</font>" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
- <mxGeometry x="292" y="65" width="110" height="10" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-6" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-7" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-8" edge="1">
- <mxGeometry relative="1" as="geometry">
- <Array as="points">
- <mxPoint x="625" y="124" />
- <mxPoint x="625" y="124" />
- </Array>
- </mxGeometry>
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-22" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-29" edge="1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-5" value="<b>agentpool</b><br>8 vCPU, 32GB RAM" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
- <mxGeometry x="567.5" y="75" width="115" height="40" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-6" value="<b>gitlab-runner</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
- <mxGeometry x="270" y="140" width="100" height="40" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-7" value="<b>seaweedfs-s3</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
- <mxGeometry x="390" y="140" width="100" height="40" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-20" value="" style="group" parent="1" vertex="1" connectable="0">
- <mxGeometry x="540" y="140" width="170" height="140" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-8" value="<b>runner-xyz-001</b>" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;arcSize=5;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
- <mxGeometry width="170" height="140" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="r9iJ3a_E54lvpWGN0BaG-20" target="r9iJ3a_E54lvpWGN0BaG-14" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="45" y="70" as="sourcePoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="3q8h414pSOnjdSIywmwI-4" value="<div style="text-align: left; font-size: 10px;"><font style="font-size: 10px;">/var/run/dind/docker.sock</font></div><div style="text-align: left; font-size: 10px;"><font style="font-size: 10px;">/tmp</font></div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=10;labelBackgroundColor=none;" parent="r9iJ3a_E54lvpWGN0BaG-18" vertex="1" connectable="0">
- <mxGeometry x="-0.1361" relative="1" as="geometry">
- <mxPoint x="58" y="-1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-13" value="<b>svc-0</b><br>docker:24-dind-rootless" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
- <mxGeometry x="10" y="30" width="150" height="40" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-14" value="<b>build<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
- <mxGeometry x="10" y="110" width="70" height="20" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-16" value="<b>helper<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
- <mxGeometry x="90" y="110" width="70" height="20" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-37" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/Docker_%28container_engine%29_logo.svg/2560px-Docker_%28container_engine%29_logo.svg.png;clipPath=inset(0% 58% 0% 0.33%);" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
- <mxGeometry x="33.25" y="37" width="23.5" height="13.35" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-21" value="" style="group" parent="1" vertex="1" connectable="0">
- <mxGeometry x="820" y="140" width="170" height="140" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-22" value="<b>runner-xyz-010</b>" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;arcSize=5;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
- <mxGeometry width="170" height="140" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="r9iJ3a_E54lvpWGN0BaG-21" target="r9iJ3a_E54lvpWGN0BaG-26" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="45" y="70" as="sourcePoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-24" value="/var/run/dind/docker.sock<br style="font-size: 10px;">/tmp" style="edgeLabel;html=1;align=left;verticalAlign=middle;resizable=0;points=[];fontSize=10;labelBackgroundColor=none;" parent="r9iJ3a_E54lvpWGN0BaG-23" vertex="1" connectable="0">
- <mxGeometry x="0.049" relative="1" as="geometry">
- <mxPoint x="1" y="-5" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-25" value="<b>svc-0</b><br>docker:24-dind-rootless" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
- <mxGeometry x="10" y="30" width="150" height="40" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-39" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/Docker_%28container_engine%29_logo.svg/2560px-Docker_%28container_engine%29_logo.svg.png;clipPath=inset(0% 58% 0% 0.33%);" parent="r9iJ3a_E54lvpWGN0BaG-25" vertex="1">
- <mxGeometry x="23.25" y="7" width="23.5" height="13.35" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-26" value="<b>build<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
- <mxGeometry x="10" y="110" width="70" height="20" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-27" value="<b>helper<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
- <mxGeometry x="90" y="110" width="70" height="20" as="geometry" />
- </mxCell>
- <mxCell id="r9iJ3a_E54lvpWGN0BaG-29" value="•&nbsp;&nbsp;•&nbsp;&nbsp;•&nbsp; •&nbsp;&nbsp;•" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
- <mxGeometry x="734" y="193" width="60" height="30" as="geometry" />
- </mxCell>
- <mxCell id="EFzMD_oVcaiTEb37ajv_-6" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://cdn4.iconfinder.com/data/icons/logos-and-brands/512/144_Gitlab_logo_logos-512.png;" vertex="1" parent="1">
- <mxGeometry x="259" y="47" width="30" height="30" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram id="DNBJDzVGt1bZ_wE9aRrb" name="Authentication (TU)">
- <mxGraphModel dx="1182" dy="678" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="H5geC8BQpTcnQeXLB8gK-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-2">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-4" value="Force" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-3">
- <mxGeometry x="0.0781" y="-2" relative="1" as="geometry">
- <mxPoint x="7" y="2" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-5">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-20" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-9">
- <mxGeometry x="-0.0962" y="-1" relative="1" as="geometry">
- <mxPoint x="6" y="-1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-7">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-19" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-10">
- <mxGeometry x="-0.1281" y="2" relative="1" as="geometry">
- <mxPoint x="-2" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-6">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-18" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-11">
- <mxGeometry x="0.1536" relative="1" as="geometry">
- <mxPoint x="9" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-1" value="<b>Auth Service</b><br>Keycloak" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="455" y="335" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-2" target="H5geC8BQpTcnQeXLB8gK-8">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-16" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-12">
- <mxGeometry x="-0.0986" y="-1" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-2" target="H5geC8BQpTcnQeXLB8gK-13">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-17" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-15">
- <mxGeometry x="0.0932" y="-2" relative="1" as="geometry">
- <mxPoint x="6" y="1" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-2" value="<b>Identity Service</b><br>OpenLDAP" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="224" y="335" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-5" value="<b>UI</b>" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="530" y="470" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-6" value="<b>Metadata Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="380" y="470" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-7" value="<b>Data Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="455" y="530" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-8" value="<b>Broker Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="224" y="530" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-13" value="<b>Dashboard UI</b>" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
- <mxGeometry x="150" y="470" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-21" target="H5geC8BQpTcnQeXLB8gK-1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-23" value="SAML 2.0" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="H5geC8BQpTcnQeXLB8gK-22">
- <mxGeometry x="0.0113" y="1" relative="1" as="geometry">
- <mxPoint as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-21" value="<b>IdP</b>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" vertex="1" parent="1">
- <mxGeometry x="455" y="190" width="130" height="40" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="H5geC8BQpTcnQeXLB8gK-24" target="H5geC8BQpTcnQeXLB8gK-1">
- <mxGeometry relative="1" as="geometry" />
- </mxCell>
- <mxCell id="H5geC8BQpTcnQeXLB8gK-24" value="Browser / REST API" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" vertex="1" parent="1">
- <mxGeometry x="730" y="325" width="30" height="60" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
- <diagram id="7HywRA3nQAgvNxZjCRq2" name="data-versioning">
- <mxGraphModel dx="988" dy="563" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
- <root>
- <mxCell id="0" />
- <mxCell id="1" parent="0" />
- <mxCell id="795Xv0Ka93fOG331V9Xn-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="795Xv0Ka93fOG331V9Xn-4" edge="1">
- <mxGeometry relative="1" as="geometry">
- <mxPoint x="622" y="141" as="targetPoint" />
- </mxGeometry>
- </mxCell>
- <mxCell id="795Xv0Ka93fOG331V9Xn-8" value="t3:<b> UPDATE</b>&nbsp;tbl<br><b>SET</b> `Temp` = <font style="color: light-dark(rgb(251, 35, 108), rgb(251, 35, 108));">22.1</font><br><b>WHERE</b> `ID` = 1" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=default;fontSize=17;" parent="795Xv0Ka93fOG331V9Xn-7" vertex="1" connectable="0">
- <mxGeometry x="-0.1405" y="3" relative="1" as="geometry">
- <mxPoint x="22" y="3" as="offset" />
- </mxGeometry>
- </mxCell>
- <mxCell id="795Xv0Ka93fOG331V9Xn-4" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=4;" parent="1" vertex="1">
- <mxGeometry x="120" y="80" width="284" height="122" as="geometry" />
- </mxCell>
- <mxCell id="795Xv0Ka93fOG331V9Xn-18" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=data:image/png,iVBORw0KGgoAAAANSUhEUgAABJEAAAHoCAYAAAD5W34cAACAAElEQVR4XuydB5iV1bWGTTP2buyxRGNFNHYMEcUGoiiKgg0RFOzYqWIHLIiKPYiKEkWxoCioFCsR0RhbTJPYk1yvN7m5aQbcl3fBd7LPP2eQGc4MM+b7nmc95y9773//ex+G2e+stfZSybIsy7Isy7Isy7Isy7K+REsVL1iWZTVV/eMf/7DZbHU0y7Isy7Isy6qWDJEsy2o2YkH8y1/+0mazLaL99a9/Lf4zsizLsizLsqx6yxDJsqxmI0Mkm61uZohkWZZlWZZlVVOGSJZlNRsZItlsdTNDJMuyLMuyLKuaMkSyLKvZyBDJZqubGSJZlmVZlmVZ1ZQhkmVZzUaGSDZb3cwQybIsy7Isy6qmDJEsy2o2MkSy2epmhkiWZVmWZVlWNWWIZFlWs5Ehks1WNzNEsizLsizLsqopQyTLspqNDJFstrqZIZJlWZZlWZZVTRkiWZbVbGSIZLPVzQyRLMuyLMuyrGrKEMmyrGYjQySbrW5miGRZlmVZlmVVU4ZIlmU1Gxki2Wx1M0Mky7Isy7Isq5oyRLIsq9nIEMlmq5sZIlmWZVmWZVnVlCGSZVnNRg0FkV5//fX09ttv17huszWWvfnmm2HF64trhkiWZVmWZVlWNWWIZFlWs1FDQKRRo0alXXbZJb322mtxvvvuu6fvf//7DQaVZsyYkdZaa63UtWvXGvdqs2KdcePGpY4dO6allloqXXnllTXKyyZNmpROOOGEtOKKK6bWrVvXuF8ta+gx+0+wmTNnpl133TWNHTu2xr3FMUMky7Isy7Isq5oyRLIsq9mo2hBpwIABaeutt04vv/xy6RpA6Xvf+16DAZEXX3wxrbHGGqlz58417tVmleqMHz/+SyGSbOONN25QiNTQY/afYsBCYNzQoUNr3KuvGSJZlmVZlmVZ1ZQhkmVZzUbVhEgjR45M3/72t9O0adNq3GsOJoh01VVX1bhXtGpBJMKtttxyyxrXm5o1l35WsokTJ6ZvfetbacyYMTXu1ccMkSzLsizLsqxqyhDJsqxmo2pBpDfeeCM8e4444oga95qLCSJdffXVNe4VrVoQ6bLLLkurrLJKjetNzZpLP2uz9u3bpw033DD94he/qHGvrmaIZFmWZVmWZVVThkiWZTUbVQsi4b0DgCEfUn6d8DaAyze+8Y3StWuuuSatu+66Uf7kk09OW221VVpmmWXS6quvnvr16xdlpk+fnvbaa68os9lmm6W+ffuW6g8aNCi8Ylq2bBn5bo4//vjIUbTbbruVPfvyyy+P0LqddtopQppatWoV13/+859XrCOIdMghh0Sfll122bTaaqulww47rCw8D6sEkV566aXUqVOntNFGG8VzseJ45Na/f/+05pprxtjwLoSwcb3SmPXo0SOtsMIKAUJ69uwZz2DM+Bw+fHi6+eab0z777BOgZ+WVV069evUqexbw5Iwzzoh2W7RoEZ8aa4ywue7du0efd9hhh7TJJpuk3r17L7SfGDmlGFvGgs999903xoF7hAWut956MaZnnnlmPJd3oC36x3h36dIlvguMNfP9s5/9LOoOGzYsoORyyy2XjjzyyCiz9NJLp8033zzeNX+32uY5txEjRlT8ftbHDJEsy7Isy7KsasoQybKsZqNqQSRAC4t0ctAU7x111FFlQATr06dPlL/22mvTk08+mZ544omAE1//+tfT1KlTowyJuQEiQKRim9tss0168MEHS+eUyYHQfffdl772ta9F25wDSYrQp1hHEOmss85Kr776asAm4AOAA0CR1y1CpHfeeSdtt912AV8EnE4//fQAH0899VRZ3dwOPPDAih4+lcaM5wFWbrzxxvTII48EEFl77bWj3JAhQ9L9998fY9KmTZt4jwkTJpTqkgycvlCP87vvvrss/9M555yTvvvd78auepyTM4q+fVk/mTPGiuMXXnghffOb3wwYpftnn312POeiiy5KDzzwQPSROlwDhtEP+nnSSSfFtYEDB5bqduvWLa5Nnjw55o8wScaA933ssceizKLMM0YbembxXl3NEMmyLMuyLMuqpgyRLMtqNqoWRNp2221rQA9ZJSAiiPTTn/60dO2mm26Ka7feemvpGot+rt15552la4CS7bffvqy9IhC6+OKLA0gBQ3Qtf1alOrUl1j722GPjeg6tihAJjyjK4LWja88991xcwwMoby+32uBMpTHjeTw3v4YnF8/IPaUEiABgnBNqCAhr27ZtWV28mNi9jOMOHTqEFw8wTPfz8aqtn+xql59vsMEGaY899iidCyIBmHTtjjvuiGvk0NI14A/vm++wJ4iUt//MM89EObzFOF+UecbwcKKtSoCprmaIZFmWZVmWZVVThkiWZTUbVQsiEWa10kor1biOVQIilSDS6NGj49oNN9xQukZYG3X33nvv0rXDDz+8Rt6iIhDCUwWvGLxrBg8eXNFDqlinNojEs7hO2JSuFSESIWiUue2228rqAjgOOuigGs+W1QZnKo1ZJYhUCdIU3wPvI86LXjh4BOHJxDEwhjI777xzuu6660oeSbLa+lm04rhU6h/eQ1wjDC+vC+jCo03nlSASRogc4YYcL8o8y2gL2Fm8XlczRLIsy7Isy7KqKUMky7KajaoFkdZaa60IPStexyoBkUWFSFi7du2iPuFMhE4BrN56662yMkUghN1+++3hsUSbgAagRJ5YuVinCF9keEZxHUiha0VYovcBbgBiZACP3LumaLXBmUpjVl+IJC+p9ddfv6xvhN4JxmCEkuFJRFnm8oorrijdq9RPPJzOPffc8DwiFxLJq5dffvkGh0j0mbxKOv+yeZYB9PC2Kl6vqxkiWZZlWZZlWdWUIZJlWc1G1YJIAAkSPRevY5WASF0gkqADnjQXXnhhOvXUU2s8owiEcgM+kfCaNnIwUqxThC+yoUOHxnXyN+laESLJEwlgU3z+wqwSnMEqjVl9IRI5hzhnzIvPqWTkLSKBNs+fMmVKXKvUz+OOOy4SZTO+ulYcl0r9W1yIRJLtSnmyaptnDODF9WIYZH3MEMmyLMuyLMuqpgyRLMtqNqoWRNpxxx0jwTG5bYr3KgGRukAkDKiBdwxeKM8//3yN+0UgdM8995R2+sLwTKH+iSeeWGudInyRHXHEEdH//LlFWKI8RBdccEFZ3S8zQt2KcAarNGb1hUiEpgH49t9//xrPkeV5qLCHHnoo2tBuZpX6yZxg+bXiuFTq3+JAJNphXJgTzhdlnjF2jKOtYl6o+pghkmVZlmVZllVNGSJZltVsVC2IpAV/pZ3IKgGRukIk5SUiAXTxHlYEQiS4zj1v2PGNPpC8u7Y6RfiCkTiabeZJrp0/rwhLgBcArtVWWy3ACzCNa0CPWbNmldXNjXYJs5o0aVLsBofHDNcrjVl9IVL+nEGDBpWgC8m4VY+cU7kXFXWBOrpfqZ9AKcLXHn744YA0JD9fffXVGxQikQ+LctqNbVHmGdOYLCzJ+aKaIZJlWZZlWZZVTRkiWZbVbFQtiAQ4YZGeh3wBG/AIAXzgpURuIDx2yGGzzTbbRHk8Slj4s8jfa6+94tqPfvSjsu3pMaAMSaDvvffesutPPPFEAI4VV1wxrbHGGrG9PGFN9Aeos/XWWwco4lPbx9dWB6BFiBY7lpEzaNNNN42+k/dHOXaAKITVEcZFHii2ppeHEqCEcCraXHrppSN3E2FgebhX0SZOnBjlAFUkfX700Ucrjhl9/853vhPP5fkkkCbRd4sWLWLMgC/sHjdmzJiAO1zjvQWGGD/CAElA/a1vfSvGEthD29znHQlJJNyL9//BD34QUK+2fgJxHn/88Rhj2uNe3759U5s2bcITiF3jSDJO2WL/yJ+k/pHEm/ln3IE/7BhH+CDPBCIBrmiTvtI/6vBdUb8WNs+5KXF4Xre+ZohkWZZlWZZlVVOGSJZlNRtVCyKxNTxJi/fbb78a92y2+hgQqeiNVV8DMO2www41rtfHDJEsy7Isy7KsasoQybKsZqNqQSQMT5Nvf/vbEQJWvGez1dUqhbPVx/B8w4Nq8uTJNe7VxwyRLMuyLMuyrGrKEMmyrGajakIkjAU7oViPPfZYjXs2W12sGhAJsEmIHHmYivfqa4ZIlmVZlmVZVjVliGRZVrNRtSESRnJt8t688sorNe7ZbItiJPYmB5LyKQEni2W+zMhRdcABB6Rnn322xr3FMUMky7Isy7Isq5oyRLIsq9moISCSzfZVNkMky7Isy7Isq5oyRLIsq9nIEMlmq5sZIlmWZVmWZVnVlCGSZVnNRoZINlvdzBDJsizLsizLqqYMkSzLajYyRLLZ6maGSJZlWZZlWVY1ZYhkWVazkSGSzVY3M0SyLMuyLMuyqilDJMuymo0MkWy2upkhkmVZlmVZllVNGSJZltVsZIhks9XNDJEsy7Isy7KsasoQybKsZiNDJJutbmaIZFmWZVmWZVVTS82dOzdhH330UWrbtm1aaqmlwr72ta+Fcfz1r389ffOb34xPXbPZbDabzdb07Bvf+EYY/1/z/7ZlWZZlWZZlVUtLffHFFwn7+OOPDZFsNpvNZmvmBkDi/2xDJMuyLMuyLKvainC2OXPmpM8++yyNGzcuDR8+POyaa64J0/GIESNK5zabzbYk7JJLLkn9+vWz2WwVrH///mEDBgxIAwcOjM/zzz+/+P++ZVmWZVmWZdVbAZH+9a9/pb///e8Bk/BKQvJQ0jEhb7pms9lsS8L+67/+q0bOF5vN9m/79a9/nX71q1+Fcfzzn//83//jW5ZlWZZlWdZiqpQTCQMi8Yk4xtDnn38eCW1ZxFmWZS0pAZHeeecdm81WwYBIwCOOf/GLX4TNmjWr+M/IsizLsizLsuqtUk4kTN5GSGCJc2AS3kqGSJZlLUkZItlsC7eiZ5IhkmVZlmVZllVNRTibAFKuSmDJsixrSara4Wz5ohsPjuL9olVapC+sbm0L+2J7tdVvTFtYP5uyKXTry8ZatqjlFmZ5G182d4vyrC9ro1LZSu1yDe8jyvz2t79Nv/nNb9Krr75a/GdkWZZlWZZlWfVWQCTLsqzmoPpAJEGG3MgVw2L7rbfeSm+//XYstt99992yOvkx5Tl+8803o7wW8IIJLNgpwz0+VZ7z/Fpu3H/jjTfi/uzZs0u5bHSPdnVMX2t7l2JfMfWRY/VRbfOumNpVmfy9mpLpndQ3+q7+cp2xxzSXGt+8jtrI5zwfH8roO6Ex4Vo+Lho/rtMGxnV9byinupRTXcqpD/k78ann0YbeS/eoq7L5HPKuXOe7qGt528W+GiJZlmVZlmVZ1ZQhkmU1J33wafpixq/SFw/MSHNHTJxv59yV5nQZkea0HpT+tfEpYRyHzbvOfYw6YdSfZ81R1YBIAila5LOI55zFOcdczyFEDld0X8Y1tafy+bNVXs/Vwl7nAAZBBIGAHBrQroCE2iw+O7/Gud5D/caK/civCYAV+95UTO9Q7F/xXO+TX8vnXXXyOVQZzY3GLX+GzgWrKA/AETAS1KFcDpwq9VP3ZIJMgki0Wel99H3M+0S9/LuXP0vtc/7KK68U/xlZlmVZlmVZVr1liGRZTVlAowXASICoWgZkElxqLqoPRMpNi2stynWshbjggOANx6+99lp4DHGsECHa0iIeL6IcPuXeJ4JT+bN1T+CAa9TPTXCLMphgEdfpozyiBH9Unmf97ne/K/VP74Plx+zYxX2eTf+xHEY0JePdXn/99dI570E/Bct4l5/97GclyKMxyudLY8x45eNOexpjjgWXiuCQeu+9916MLXW5T9vUUzk+5aGkueG+5kNzlH//1Ff1h3PKqgzlOX///fdL7wYU4jvJ82ibueOYsoZIlmVZlmVZVkPLEMmympo++DSgEV5ERfDTUFbyWpr33KbspVQfiKQFuwCBTCCChbhATb4Yz+vRDteBGbon2CBooPbyZ+WASnAo74Mgh+BB/kzKFz2RBAd0rLa5Lzgl4CTTszhWe3lIl+41dcvHVOCLMdK7CA4VAZDmU2On8cvb1dzkY8onls+v6qover7mWRBJ9/OxVb/zucqfL9N3QpBPc6b30XeFclznXJCNsnyqr7RtiGRZlmVZlmVVU4ZIltUUtAAcFeHOItvO/cLmtB+S5nS7Yf7nPIvrxbKLYOGlNK8/TU11hUg5FJBXhxbtAhICSJTJQZLOc7CTgxquyZNEkEKLeLVRCSKpLYEPeZio3byNvKzeJzf1g3s5MKmtrfxdKllx/JqCaVwZA0weQFzL5zEfZ40P5StBJM2PTG1rjPI2dT//VH3V0/cEmMN16mnecs+pHCLVNt5qS33Qe+RzSPvyxJLHmepqzPSehkiWZVmWZVlWNWWIZFlLUnWBRzv3S3PPGZPmDns4zR01NX0xYVYpv9GXGmXnGfWoL9BU4xkFa2owqa4QSQtqPllQs/gWWNHiGyNcjU95dxQX+AJCn3zySXguaYFOWwIaKkdbWA4i8r7kIEehVAIOOZBQvwUrVIa25R2j6/lzBFF0Tc8S0JCHi+4rlK04bk3J6C/vLY8b3kVjoHcQ2OG+5k/zqWuCLxxr/jWHGm/aVAijxlbfCXka6ftQDJcjrI42PvjggxLkUZ/VRj5XglIKlaMdgagPP/wwzvX95FhzRTsK2eOc+hwLJhkiWZZlWZZlWQ0lQyTLWhJaFHiEZ1G3GwIc1YBC1TLA0gKoVOP5TRAm1RciCQDoXGABywEO9+TpokW/FueqzzVBiqJRX14mLOwFLJTDJvd6yvsCCBAY0TmfPFf9Up8FifQsrgmkcCyQIKBFHzBBh7yv6gfXF+YdsySNPgq6qH/qO/3GuJ6/S/4emkMBN64JDOVzwT1BJq4zHoI3Kpc/S0Apn6+8f/rUdUE8ruXwUJ5s6o++aznYo47a4FPGPfpLziSO8++46hgiWZZlWZZlWdWUIZJlNaYWAR6FtxGeRkXg09AmT6V5zy/2qanApMWFSAIwWvQXYQL3OQbIqJ7qAhRI4iwYIzigdrWoF4zAG0VwSBBJ7cpUj3I//elP0+TJk9PDDz+cHnroofTII4+kRx99NM2YMaPUX8EJecDknkg5RFK/eC6wgnvqx/PPP58efPDBNH78+LD77rsvPf30000eImkMuCZwI7CCFUFPcW6KZTUuXFcZXQcA8hxBPEDMtGnTYm4eeOCBmB+McVO9HOTJW4z+4GFEGdoS4FNoG/cpx3Xmhu8Acz5u3Lgw5uepp54q9VuAifb0XeC58mISJDREsizLsizLshpKhkiW1UgC1BShTMkWhKrVADtLygBKXwKTAGKNrfpAJBmLagEjFt7yvuEzBy1c41PhTPIoog7lVI9zLdwFAxTOxDMEnrhPG9TlngCAvJQAA9S75ZZb0vHHH5+23HLL9L3vfS+1bNkyHXbYYenWW28tgw0CEQIqXMc4pk9qlzrqL+dcnzBhQurbt2/aZptt0uabb5622mqreBbXuC8w0RRNIIU+ap64ns8L7ym4xHkOBQVt1I7gj9qnHiDn1VdfjXvyFgIcjhkzJp188slp5513TptssknabLPNUvv27dPFF18ccydopLA45ohr6i/taz54Jv3iPtfpFxBo6tSp6Yorrkj7779/2mKLLeIZ2KGHHhqwirKASdXP30PeU3oXQyTLsizLsiyroWSIZFmNoFq9j5oaPCraQmDSkvBKqi9E0qI6ByosujlmMf/ss8+mn/zkJwFTTjvttHT66aenM844I5199tlpwIAB4XUCLFAdyl977bVxj3J9+vQJoDBq1Kj00ksvlaCPIJLy25Dvhk95zah/tInXyZlnnpk23njjtMIKK6SVV1457bLLLgEWBIUoC9S4/vrro2+Uv/POO8ODRW0JLOi9OVb95557Ll133XXphz/8YVpnnXXSt771rfS1r30t9erVq8lCpJkzZ4ZX1qWXXlqaEz4x5uv2229PL7zwQmnnPMb7xz/+cerfv3+UOeuss9LgwYPjGl49gjeUlVeSQhjl7cM4yPuJ9iZNmpSGDRuWdtttt7TKKqukr3/962nrrbeO78msWbOinmDi3XffHdf5TowcOTL6xpwJcPFsgUhd49l8b+65557UtWvXtOmmm8YzMOYKLyjalqcTpu8zxrkAqe4ZIlmWZVmWZVkNIUMky2pIffBpmtNlRA0A0+ThUdEWApPmnnNX8a0bTPWBSFpQC+IACRROxAKea4QonXPOOWnDDTdMSy+9dIAVPoE5a6+9drrkkksCHAnQ4NFz0EEHpfXXX79Udqeddkrnn39+eI0Ixqg8niZAA7xccjhBOQACOW3wgsHrqHXr1vFMINL222+fLrvssihLG5SljXbt2gUAWmqppdJJJ50UcITnyBtKMIV3FVzQe0+fPj0Ax7bbbhv1sRNOOKFJAiQMgAKwA+Asu+yyMdbAlW9/+9tp3XXXTT179owwM8aF8ozjiSeeGB5D3/jGN2KcNtpoo9S9e/cAbsy3YAtjojA0eR4xRhj3GUMdM//HHHNMQD6e//3vfz/GHojE2NEm833KKaeU+nfggQcGgAQQCTQJZApI5uFp9A1Y1bZt25gXvls/+tGPor76I+8mebapTfWBa4ZIlmVZlmVZVkPJEMmyGkjAlyJwCQ+e9kNqQprmYhNmBQCr8U6tB8X9hlZdIRKLaIV/KTcNi3DdZ9ENQAC83HvvvemII44o8wIBFBx33HGRQ0hhY7Tx4osvhkfPXnvtFWCD8CPCnR5//PHwOhEgyGGSnifAI5iQ95U+0CZeQiuuuGLabrvtAioADOTFArTYZ599on9ABiAKnjpcpw1Bj7xteb7wOWXKlPDMAXoJVNBGsT9NxYBCgCS8ioBqyyyzTLz7GmusESDvpptuKuUKYpwBMXiEHXnkkWm55ZZL3/3ud9PBBx8cOYZefvnlaLP4nVBdgZgiUOMckCOIBJhizk899dTS3MqrCS8kxpQ+7rfffpFziufmbep7xzWFKXKd42uuuSYgoeYXqIg3VhE4YfJCUgijzg2RLMuyLMuyrIaSIZJlNYBqC19rVt5HtVktXkmNEd62uBBJC2sZ5wIJeOgQOrbnnnuWIAB5ic4999z05JNPlrw8KAuwIfzskEMOSauuump8ErqksKXcI4RPFv8cs9iXN4kW/HxqFzW8VoBIeCIBkXbYYYd05ZVXloEhIAkQ6PDDDw/ohZcO+XTkiQOcEAwSeNK5INKFF14YoXK8J9ajR4+yMLimZBofYFHnzp3T8ssvH3PDGHXr1i3CEJUTSUAGzyTCEvHmAsIMGjQoYIoAkWCM5kOAkOdpzgRiBImYc7yZyCH1zW9+M3JKCSIJ6PB58803x9xgzBNeYnwv1Baf8nqiDwp55DrHzOcBBxwQ8wLko/+EK1I2B6AaGz4NkSzLsizLsqzGkiGSZVVZhHcVAUuEr42aWhPINGObO+zhmu8JKGtAkFRXiJQvtAEqgjv5YptrgBm8i5544ol09NFHxwIeUEACajyM2DGL8gI0eKUQAgc8IqQKWEBdAEbetqCGPnkOQEFhdVroaxc1PIratGmTvvOd76SVVlopQriASMADGW0BG7DcAycHQDrn3fRswRLy+xB2B6ACxgAq8EQqttFUjD7Rb8b3vPPOi3Gh34wREG306NFRLh8f5oZ5W2211cKTDA8v2tGc6BPwxlwwlvrUmNIm4yfIA0QiTA7vNJ5P0mvC2eR5Rpu0kbcnWEVbtKGyym3EvCunEmWBRVdddVV4IinUkJxIfDcpL8ClY7Wt6/m5IZJlWZZlWZbVEDJEsqwqqhJAatbha19mE2bF+xXfuaFA0uJAJC30c48Orim3DIt+FvF4l5ALiZCl9dZbL+27776R8Jh68mbC8wdvHryGyC101113lXb1AlYBEZ555pnYcY3kz8cee2zq1KlTeJiw+xY5iAhbAuhQjz7SF+AHoWo8F1jygx/8IA0dOrQEBtglDHDVoUOHAA3YiBEj0vPPPx/PpIwSZOMBg1cLuZ4Iw2I3McrvvffeAafIE0S4F0AEOFIpjKspmOYIcIenGHmoyDfE+Oy6665xDQBDOcaeub3hhhvCE4iwwIEDB0Zya8aY+WGeyW/EnJLrChBEWeaFMSIMDs8lwtAEeOgH3w08toBHjFmLFi0isTkgiDKTJ0+Otgidoy3GmsTrJDNnjgWU6CPhbbfddlvq169ffDeow7P5ru2xxx4BquSJZIhkWZZlWZZlNSUZIllWlfTFAzNqwJQ53W6oCV6+alYhvC1yJM0bj2qrPhCp0kJbQEGAQmFfeKEAhwhZArAAKsh9c+ONNwZ8UAgSibUBD4QaAQDIhaRnADsAEIAIAAHJlSkDvCE8jnAsAA75fMirRL4fnk+71AM+bLDBBhGKBaC6/PLLo5/AIcAD4GT11VcvQQY8boBRwAyBA9oEPgEm8Djiua1atQogQS4k8vqQU4h3JPl0U4ZIjA3wjjnD6wiwRgghIAmgRLihQtUYI8YBcAbgI2SP8DKBROANXmUkK+edAXIYYw5Yw7sJ7yXqAZ8YV3kuzZgxI+AfYWyMWREi0W6XLl0ioTfzAmhi/JVYW6AQoMVOcZTlObTHnDA3GOfMjSGSZVmWZVmW1RRliGRZVRAw5T8SIMlqA0kzqptsuz4QSaaFtRbb+YJbXix8knuHhMgs5PFGAioAZAAB1AE0sY07EAEwBHTC60f5bthyHkAALCJJN8eEqQGeSJINQCJUDhDUq1evSPhMeBOQgfw+gAd2iQMiEU4H8ACOAFLwOMK7iATTggyADQAGMIP+0c+LLroodvUCtPAeHTt2jD7gLUPuJsASIEa5n2hDYK04bkvaND8APN7z0EMPjfFRyCHhanh9AXt4ByANY0hScpJx894KIWMOAEyAHsIQAWuM58SJEyOPEqGEahfPMeaScaU+4wqw23rrrWPMAI29e/cODzDuA2vwbgIOqg12WaMNEmMrr9X1118f88H8k/eK9oYPHx59oH/0PYeEhkiWZVmWZVlWU5IhkmUtpgAlNQDSVzmErTarENoGSEoffFocsnprcSBSvrguwqQcntx///2xTTveQMACvHXYcQvIQE4bwpNY9HMfbyQgEOFKgARABqFUeB4BoPCGufTSSyMsih3g8DTC+wR4QLuEt+GNRF15IhEKhYcNXlCAkCFDhpS8hPCGAWDRBn3jGXjUAFcULkUScMLdSDzNfbyQzj777OgD/ccz5qijjkpbbbVV7CwnT6TiWDUVAwwB7hgDkp/j4YU3knaWY6zJecT7AXqYP+AQY0Q4IaFragtIx7sSLggEZJ4fe+yxmBvC1RiXNddcM8YWzyS8kZhv+sDYA/223HLLAER4qFFfHmB8MrZ8J7jPuBKayHzRN30/qMOOcUsvvXSExvFMQBf1gU14NzFnzolkWZZlWZZlNUUZIlnWYgpQ8h8PkGSVQFKXEcUhq7cWByIVPY+08AYQ4EUkTxx2LyOZtfLSAGLwfiGkjYX+gw8+GCFUgACAAPBBoVSEvJEfiZ3B8PY595xzojzPwtMJTyAAD7l6ADiADpJyK9wKAEJeHO4DmnbcccfwXuIeAAIvG0ATIW2ADjyNABtAJN6B/gFKAETc5xl4xuD9onfn/cjTBGgh95MgUg4ompLxXowrx0AWoAweYPLUweOKMcJLC4DG8c477xwhapwDiKjLGDMX5CnCQ4id1u68884S4AFUAQsBO0AgYBEeWk8//XSMPSCHBOSEm/GdwIOI8vSNseM5gEaSfXOf/gGRlFtJbRDeKEBEOCSQkesCUVdffXV4whkiWZZlWZZlWU1RhkiWtRgigbQBUsEmzIrd6PJxqVZ+pPpAJBbSAARBIgGdfLc2eSNxjwX/2LFjwwsIwIIBJfCAoSyeRoSoAXJIzIx3j+oDCjgHaAAU8JwBLmgLdnYYI3EzgAqAQ84jgBQAg7ZJrC2IhCcSkInE0Wobr5o77rgjcujIE4eQKkKh8IYCmgDAACAAJp6hkDm9KxCJd+GdAE20ARxpquFsMvoGZGEMgHr0HcMjiITX5IHiPfHsATKRIJ2xZ04Zf+abMQREAfMIgQMACeBRjlA3ABwQCFh0/PHHR7uUAeRwrsTajHGfPn1KUJJ8SzyfMDgBLiASUA8PKWAjx3vuuWcpZxJAkTxX1OU7wDP4fpGnyRDJsizLsizLaooyRLKs+uqDT8tAScCSCbNqQpX/QJs7amo5XCOsrQqqD0TS4roIkmR5OYUcARkIKyM3DV4pJKIGtACYAA2AAIACnix4yggi0QbAgmss/AlvIoky27YTGoX3C3CKkCnC2ch5BERSKBoQieeSrwdPJGARnjVqG08kcuxwXeFs8kQCiOA1Q3kgFf2mDULZCNnSOLCzHPALQCUQhcdNUwVIyodE/8g/BKRjF7S11lorQsJIhk0uo/Hjx8eOd4wvkAn4RnlBIiVPZ6yBNiTNZrc7ckThDcQ44RlEe4BD5hzgBwjke0I4G4nSyafEc4FIeCLRPn3ku4EnWefOneO+PJEAR9wDXpEzSXmXmDvKAiwBPbwf0AuvsdxbyRDJsizLsizLakoyRLKseoowrRyUkFi6CFP+k43E4uXjc1dxCOus+kAkha4J9BQtLyuvErxGACt4uQBjSHIN3AEKASjIyUPYEUCmuLAHIOGJBDwgdAqvJXIjEd5GMmY8jAAIeArhiURomcLpgBDkSSInEgCIOiT1pm3gFCBDEAnQscwyy0QoGjl1qI93Df3iOYAK2jjvvPPCA0rPwLOGHd/I+UMZ2gFEFYFaU7F8dzZ5bF188cUR6oenFeMI2CFBNp5BJEIHMhFGRnlMO6zJkwlYxxgcffTRkVMJUEMb1KU9xoScV4cddlhAJH0n8HICLgEA8VginFHhbMAa2mW+teudIBL38BTjPqF0AEDmDkjFNe5rhz5AGOFsTqxtWZZlWZZlNUUZIllWPUR4VpmnjcPYalqlsLYZi7dbW30hkkCSFtsACaCKwIo8lLQIZ+ENvGHBDwwA+gCUyHWEB8/uu+8ei388RxQaR11AAXl3AEN4xFAHWEM9cirdeuutAQjwNAJWsMsaoIm6OUQCYACbACX0Q/0jyTOeTfQBuAWMACLhaQQsYZc4EnHjiYQ3DPALbxngl8aDcDaeSdvaRQzowjs0VZAkOKcd8EaPHh1AB08x5gf4wzkePIwdQAmPpffff780Nxjhfso5RE4jvIm6desWO+AB54A6hKsxdsCirl27BpgD4OFNhPcZgE6JtZlXJf3mOwO4IpyNPlGG0ES8j4B/hLThLcV3inFn7gCS3Oce78b3h6TtfAeATLRjiGRZlmVZlmU1JRkiWVY9lIOR8LIZNbUmRLGlucMeLodtixnWVh+IpIV1DpMEbYoASWXxLsGDBDChvEGrrrpqeAYBhwhDAi5QnvYUKgVoANAAjhQSBVQAegASqAOo4DoQCY8myqsPQCQSQrN7WJ4TSdALiEROJK7TPv0SRCJ0C88oIEkezkYIHcmoBRcIeQNyAZEog+GJVBy3pmKMi0IGOWcOyQHFO7ADHeOA5w9QiDxPQBfmjjlRLiTN+U033RSJxglZoy7JxYF0hC8y54QW4h3G3ACL8FSSJxIhcOReAjLxTAAUEAlYRfsAIOZPOZEoA0Ri7Jl7wtmAeUoKzveqffv20ScgEnNMGyNGjAgYBsiijCGSZVmWZVmW1ZRkiGQtUX3xxRfFS01ehGWVgZFuN9SAJ7Z/W3G3tsVJsl1XiMQimlAmFuiCPUWPGy24lXiaY8oDbNhuXRBJ+YMAFf379y8lbQZwUI92uYaXCwCA8uS/wcuFMCr6AqwAQG244YbhaYInEm3RR9rAu4kQKCXWBnKQKFteOOREwnMFiCQQQa6mCRMmBEQCVuDtpJ3leAbhWiRr1vvirUReJ0LigCW0AWjKk0w3JdPubIy1oBDvCWzB6wgvMQEXvIMAYkAm6jHu8l5i/Al3wzuL8i1atAgIhGcWOZd4FnmRlFh70003jRxIgDnq8kwl1tbubNQHHHKfZxFWyPwqcTZeR+zWB0ACEHEfsARgog/sLEdoHqFyvBdACi8q4FKlnEi5Fb/DfBoiWZZlWZZlWQ2tRoNIwIK5c+fWgAZc++c//5nmzJlTOlcZjrFcxfqc5+X/9a9/1WiDtis9u7FUfI+8H3n/c+XX+eS9Pv/889I4cp7Xq+09i+2rPmWx4rM5Vzs6L5ZBaqN4T+2rnsoU20W8w9/+9rfS3OfP0nHeXrGMzvN+VCpbHJO6irr6XqF/tR5UDpFefCd9/vzb8SlwMnfGL8PKYMq8+1h+vbbjYrm8zUrtzHnhnfTPZ98q6wN9wlQu6r4wv+6XPaPYn2Lf8ufkZYrXo+wjM8s9t7pcU/Y9qIvqCpG0sC4urotlclMZoAwJlwmZUqJkwAA5bwADQAGBKe2+Ri4kPF3wWsLDB0+js846K0ADAIiQtpYtW6bll1++LCeSvG0ARIAFkkbjRQTooA/cB3LRxqhRo8KLSIm1gRZcA2DRZ4ASOZjUB3YZI6QNQIHHC2FbgCq8nQTIjjvuuBJwKY7HkrY8FxJjwDnvwlgxDkAhvQdjd/PNN8c4UV4JywVUmAvNJ8AJKMR4AXEAPHgAqT15IgGRaEs5kQCAjCv3yZvF94D7jD878jEfChMk7BEIiAca7wCIAtgRzgjgI/cVoWv0QfmauK+cVkAkQCL1eWdgGs/Sd5jvHmOi73jxe26IZFmWZVmWZVVbjQKRWDD++c9/TrNnz46/+pIzBLd+ffKLN78c/8///E8Yx1wjfwTGscqrDr908xd1FgssnFhcAiRY7GMCC4IlOdhYXKhQV+XARX36+9//nj7++ONYWLDwZKcgvR+LGRLhsuBgIfCXv/wl/eMf/wjYpvcTRNL75O+pY6QyOuZ+XqYIYNS2xigfK9XNy+pa0fJ31bHmRW0IIuXPy/tarKc6OlY/ihCS40rvoLbrItUvvev9hVxI3UYGKPnnc2+lt0c/kp65clTYs1feHqbzkl3x47Di/Zeuuyf9duzk9NmkmSXQw+e/nv9FDXhUtIA1CyBSwCzqc/7c/PNS3QXtCR7lECk/rwSR9Ky8H8XrxTb0zHhu+8vLx23etfqoPhCprsa/OXklAX3wFhKQYeFPyBNeSvycEtx5d4EnC6ABUIG3Ep5EwADAxHXXXRdw48ILL4xQtzXWWCPa++53v1vaRp4d1tg1jTCpVVZZJS277LIBG9iqHogAEOFnA94veBop786uu+4aybNpg58n/EzEg4rnAEzIFwRcIWGz+sA54VyACgyohAcTP3OK49EULIckAih4GzG2gmGMF4mwgT4AF8oIimk+CfXbY4894t032mij8BRjPBgXhZHJu4kyeJUBq/j5zE58eBYpDxMhcR07doxQQkAN3wm8zgBHCmcDVAGFxo0bF5CIOSQ8kZBFYBTfKxJ6AxJvueWWCG075JBDItyR+rwXHk+AKPI5FSGfvOrycD/MEMmyLMuyLMtqKDU4RGIRziKfX2bJDcFfVfkrPLvq8Mkv0fwyzS/y+ksr4R0sfPhLPEYZPlWPY/5Sz+KOxKQXXHBB/AL/xz/+MZ6Hx46Ai4CF+iLowL3GVA5UAEKffPJJevzxx+O9WYiwcNT7sThh8XH44YfH4nP27Nnpr3/9a9Tnk/p5m5zn78n7AamK0CTvg5QDKerRfhG+SNznWbqm9qifj3klUVbl5FGVX8/BUC71K+8jJnEdyJZf45hrRdiUj9GiSu/Hs+N9i6Fsj8ycD0xeeCcNPaRH2m/V74W1X+P7qcOaW6T9V900zvk8YI3N4zrn7VbbLLVbfbNS+WO+v1u6ref56bVbHyh5FAGA/jbt9RL44Rk52OE6oCiHPv945s30t+mvx6fKY7SlsjkoytvC8msy1c8BlO6p3SI8UnuCTJ/f9lT5uF3zaHGoF0mNAZEADkrGTG4dbetO3p0111wzQIQW70ABIDbHgCSuAxUIF+PnGv+WqQMsAg7069cvQqoADQp5AjgBFs4444yAOUqorMTZ5NDh5wA/40iaTXv8nAB0ACv4eUh7QA4gED9D6QM/Rwl7045jgCnaAmrgeYSXE+3zLO7x85TE0MXxWNImSMdYA0tIlj173s9EoFnv3r1L4WcANwCb8kvJg0n1mSNgHKF9hIgB8hgXwtPwBjr//PNj3gBR2kGPOeQaxvwBljRmfPLswYMHB9ACFDGmwCyFovGdAQgBl/Ayoi/0G2AFSAJY4RVFu+Tb4hnMD/PE85XXSrvPffjhhyU4xNjwyZjIU0uAzRDJsizLsizLaig1CkRiIf7pp5/GL7P8Ms5iRa76LK5YCPBX+D/84Q9hHHONewoLYKFF6MD1118fCy7aIdcHiyfukayWXW0I12ChKY+X2jxT6gMU6qocsghEoPfeey8WhYRKtG7dOhYtLCz5a/OwYcMiLwchMSx0CJ8gES5eS/QZACPoonfhmt6t0vNyUKNrlAcI6Xpt9XJTmRwcaSxzU/vFPuVl9AyktvIynKu/xf7J8rJ6rsoDkvByElzSO9RV6lupD3lYVvvLS5AEYHJxh2PTvqtskrpsvGO67KDuacxpg9Mtx5+bTtu5XWqz7Pqp7QobpqM22yVdfMCxaVSvfunOkwelKzv3Ssdu3iodsdEO6dae56U3fvxgCf4IJAWM0bUFnj0lL6AMFKkfQB1AksoVywoM5aCo5DWUeQ/VsAWgSMfFdsvaWGC6/s+Hflo+dj8cVPZdW1Q1BkTKw4LIRQNI4mcLXkJsC4835ezZs8vKyRNEu3ThKQls4t8zdYAIo0ePjp9teFLedttt0R4AHDgA9CEfEmFplCWEjU/KsBsbPwOAQ3ij8POP++TSwQBLeNJMmzYtvF2UoBlvRryLeD7t0B+ei2cNsIifQRdddFHUJ7k0YAOvyOJ4LGmTZ5ggEkCI6yS6xnMTbzHekfdjbAVPNB8K92JsGEPyEzHOvPegQYPi5y7jIi9Qxkdzw/zRJkZCc7y5GHvqUWbkyJGlcDjGjrnU3PAHAo757jC/zAmQke8Hnk30gfb0/aDumDFjIjk3IYfUHzx4cLTFnPNHh/w7h2lMONa7aswMkSzLsizLsqyGUINDJCSIQagavyQDTZTDgp2OyC/CL7yCAyzQ+EWafCKAJv7qC0xhkYWnDECKBQSLBpKU8ld5vJUIU+AXcnJT4IkjyJCDgMaUgIa8bzgGbLDY6NChQ/zlHK+CU045JRYZn332WbwbCxIWL4SpYPfee28snPQ+RSgj2KJx5rwIVQRpJPVF/VJ7qrMwozwASmOc31P9HBZp/IvtqJzu57BGgEttqlwOjvI+axzy/vBdoY+LI41d9Gvci+XeNMMeLoETQaRO622b+rc9PE0dckv6w4QX0i/ueDRd1bl3QKS9lv9uOnWn/dP484ZF6NrvJzyfXrnpvjRg7yPSkd/bOTyR3hj1UA1vIUGcHCLVgDbZdfqCJ5JC4QSNcnCk+vn9/F1yU7sqV/Rayuvm0CuHSJGf6Zjry8bv8+feLs3voqoxIBKLchbnynXENS3I8fjgWNe1cOe6kmNzLo8QTB4xfBYX+dThXg4ClPxb+W7UVn5NbeRlaEOJsblGHzG1/cEHH5TKqV/Y7Hk/b5XTqTgWTcXUbyw/pu+YPMMwQSOOuScApRxWePPofTX2jIPmjzKaM0xtqT2ehfeZvh/qSzF5u4BP3l/1hfp8ap6Uu0n95Vh90nzRFyU/V3/kdaVzTO+AGSJZlmVZlmVZ1VaDQyQWiVrws6jnL+BHHHFEKSSAHYKAJPzSLWiApw7ASBCJsoRfkBvpT3/6U8nLhAUlf6UFxBACQq4K6vBXXNrI4UoOFxpTeibvRp+BQfxFm3A1+oy3FX/NZrGgsC1gEosDPK0IR+Ev3Sx8eIc8tEvAJX8njTfldKzk1cVygjEqm9fPgY0ATV6f+6rHPY7zsoI7KiuIlMMgrgF58nmSVFbzVula3i7QSaF4Ul63vlK/4tm1hLIJrOB9dPzWP0r3nX1Z+vXdT6S/TPlZ+uWYiQGR9lhmvQBJvbZvm+4989L0u/uejrC1/33q1XTtkaem7lu1TiOP7ZNevWlcGbwpgho9DwPMAIv+/swb80PKFoAkeQHlsEeAJ29DOZTyZ8RzC8/JAZLazfsWnkbz2tLzeG+F4eV1546aWj5+88azrmoMiKRFPmFTgBcW9fy7xTjmHsbPGBbqHFNPMEcgqAiTZNzj37eAgECCynKeQw0BDQEnnkf53/3ud2XAgXYpnwMN+pxDC/VP7QtucT3vQ1My9Zn31Ltxzvt/9NFH0W+Ni0CNTHCJdjjnnZWcOr+vMVR92mXsOM/HSFAn7xNh2IJAmkvqCjSqX5pHPVuQCeMadfi+5XOsPvJd07ypPOdcpxzlcxhpiGRZlmVZlmU1lBoFIgkqAAyAQ4SeAYaUDwRIwi/P8ojhF2PCB7hHKBs5I4455pio+7//+79RTiL8AM8mciRRjjwXgCX+6izgknu0CEQsLlxYFAmY6Jn0h4UCoRPsykN/Se5KyAOeVeoXYIScPgA3wlFYDODFJbjz3//937FQICSCZKyDL7ggjLAM8k4RrkF+KMoyVoQIki+F5yhEggSu5E8hPIZwHby6uE9YC+csSnKAgvFcrpPsnNAL2sEI++Dzqquuirkk3xPgSmNMXwgl4R7AjFAQwmh4Fu1wnYUdcysPJ0Aa1ymr9gk/oc+0xfeDMBHu0RbeXYJa+s7lc6zvQV2ltuK7lIdjHXt9CZDI04aE2RMGXJ1+eddj6U+TZwVI+dWYx9PVh5+U2iw3P5zt5B32DYg0+76nSl4/M6+/Jz3c76pIrv3RQ8+UIBBt/OaeJ9KUy29J9511aRrde0C6vVf/9JM+l6RpQ28Lb6a/Tv15ABzAzYfjp6cJA4dHqBz24xP6pkf6X53eGzclzRhxV7r/nCHprlMuSHecNCDdc/pFaerQW9M7dz6WPnvipfCIemzQiLjPc+jj88PviDbpC+9JO5Muuj7q0j59eajvFdEX4NfTl91c6iftPHj+Fennt45P/zVxxnzgNGFWmpMl2J7TelBxuL9UjQGRMHl3cCxoIA8TzoEGggSCM1q0a/HPdRb9ao9Plcuv0SZARMCCujnMEdwQ6BCw0L28HfUhf0YOO/Qs1RWQKbbV1Kw4H3oveRQJkum6xqIIXfjMx1NtYJpbLIeGAkeUL1olMKRnqo7gnq7re6Tvh95LYErAUO+A6bum75PGpNgX3c+/j4ZIlmVZlmVZVjXV4BAJaTEPHABAEJoGQMLLCFA0efLk9Pvf/z7KsVhnkYPXEaFcJD7FY6dr167hsfR///d/ZRCIX9RJlEpiatqkPPmUACw8j/aKnjbyhGloAR+U9Jrn8ol3A7kw1llnnYBIwCQS95KHgzEAHgl25J5G8ijCCNcDRJ144omxyxLJXzGSvLJ7ELCFXC7siEd9xpMxz7f01tbhALeTTz45PJ4AcYQFkmQWby71RQAMOEUeFTykCEPkmew+xSdt80neKoAQEIg6tMFuUcAickAx33hfsbsU/WWLc66T64p6ACdgEiCRvFfaFYs+kyCYcEXAWo8ePSIhLt5sJKAlt4jGmXdmvPLvCX3Jk4Ivqmgjxn766+WhWJePL3nplLx8shAuDMCDR9LwLienPZffIO2z0sYRzgZoEUTKPYfy9v7y9M/Sm6MeDq+mfnt1Tt222D0dteku6bANtktHb7ZrhMABiN6/f0p4IgGcXr/twXTujw6JpN14PeH9dGLLvQJCAZTObHVgOnyjH0RC7w7f2SLaABYBkMjfdMF+R0bbJP8+ZN0W6aL2x6Tpw34cMIw+vTzyJ+mSDt0ifxPvAxij/OD9j4p3ApadvOO+cb/T+ttGsvCbu5+TXrnx3pKH05yzy7256qrGgEgs3lm0A134tyZPEu6xyC9CHpnghOCDduPSIp8yqsd9lRPY4Tk8U2BD8EGm59KWvFVoP7+n/uVwhbZ5Fv3hOj+DcnAxe/bsOJZnVPG9lrQJnGmsdC7PG441DoInAkbyIhJk4f15X9UR1BE0ooy8emiDsgJC3BPYEVgqgiGBQIy55J7CCDkWsBIsUl36Sps8OwdB6jef6rPekWcxp7nXksbMEMmyLMuyLMtqKDUKRJIAIMCSzp07l3YW2nHHHUvhWohFPgAB2MQ9oAcQAdDANYU/ycOHX9DxUGrZsmW0R7t77bVXeLwI4AgY8SmvqLrChPpI4Ch/Fv0F0JAPSdBLW0kDdYA/ePyovtrAADIsPPAmApoBcAgNZFzIITVw4MCAOWwJzbbheGMBZDCgGiGB2tKbcsAikvayaxAeTJwzfoQHduvWLT311FPhxUR9FlhsIw48AjYBkvA8Inkvc8q9zTffPHbLAzaR2wkgNG3atMj5xPwQwke/8IoiiS27R9FXdh4iiTi7I1GXuQUW8l7MOztc8R0AIvHc008/PZKPU1dQDHCmXdo0x/LEQvn3oC7SHBTzIX0+5MEIJVMYl0K95LXDNULV8CQCIgF1gC69t9+7FM6Wh4tFSNhzb4UBhIA3w484KR235Q/De4ljvIkeOG9oGtqpZ+RQAtjccOyZ6aMHpwdI+uSR56JtYFFAnnnPBDyR3PuZK0cFBLqp+9mp13Ztwyuq49pbpxO23TPAEKBp1g33pof6XZlO36V97Bh38LrbRPu8A55Of3zsxWij756HxU5ztA+wOm2XdmnyxTeENxLeS5d17J6O3aJVtNF1k50iTO/TiT+dn+y7AJF497qoMSCSTIt8hY0JXrDoBy6wSBc8EDiQZ4lAlBbztJFDIYEl2qGc2uaTf2sAAuAAx9RTeYEq9YF2BRTk+SJApPL5+whI5GX1DgIkxXFY0qb3UF8FS/Jx1f0ieFEdygvqCN6pfcY5hzeUYayoq/FXu9zXXBXHmk/BKEFArtO2+qv509xTVte5JgjItfyTstTTO6i9HJbxmY+N+myIZFmWZVmWZVVTDQ6R5BnCAh6INHbs2Ni6Hi8cvEjwTCEkDXCUgyHCldjyGEiAJxLhbEWIhBHmBXghtxLtsb0y9fCwUS6gHCIVoU5jKAcY9Hfq1KnhWQUEos9AEEAJnld4BQF28IAAJuUgijwdePTsueeeMX54ExHmhQcTsIfxAawQ0kduKMAQixnGgYUMnj14f/E8PIFOPfXUgDw8h8UYz9bW1Ww1DuzhOjBo1qxZETZIEnPlqAIy8T70i62zGXN2SmJhJOAF2AIG4lFEnwBPzDUwAG8z2gRoAYgoR5J1ABQAcPr06encc88NDyfgFmWAUHie8Z3p0qVL1KXPJCJXonCNdT73gkF1FfWjnftnlMGPOQ/PLOUUUn4gASGOuf6nJ2eVwtnwCsKASOPOvjw8iASPShBpXnvAIELIRnQ9NUAMu73h6TPp4pEBct6998kISwPwdFhzi3TGrgeEJxHPwnsJGIQHEcAKyNN969YRcka9zybNjJC7gft2mZ+jabn592867qxIAA68Am6RIBzIBIgatG/X9OyVt0fIG/0jNI0cTsAh2j9ora3SwH26xK5y/zPp5fTfj7+Unrjw+gBN2pHu/DaHBmACJM0dVZ4XqSlDJEECwSDBFxbqAhGCCECAHNjk8AIreooIdAiK5BABYMA5/37y+7lxTV4tOdTguqCKvGUEFNRPQQyBJ91XmaZomgvejbHnGu+iedB9zZNAC6b3EqQTfBE4k1dTPn85ZFNbxXnK51/PzNsVRFIOJrWlNjS3tfVZ3zvO9V2iX/mYqA1dy+urXUMky7Isy7Isq5pqFIgEEFA4Fh4z5EQCggAGACdse83Cifss2oESXAMqUGallVYKiERdIJLAlHbwYiGx++67R9lVVlklvGWAF/JMUfLlJSXlMpKAMuzGRogZ/ZVXFoAHw2sHryR++c8TVrMYwctq5ZVXTiuuuGJpTBg32mdXNwAdeZYAL3gH4WXEOJBz6Ywzzig9gzC4iRMnBrATpGLMmBf6sscee8S24SxSPv7444BEBx10UEA67nfv3j2x1TmLeuZB+afUFsfkWwISAn/wtmLe8TpTiB4LN6CYvMiAU3379o2/tpMkG8CFxxGeSoJI9IlwHEQ+qHbt2oXnFJ5nlSR4lIO8ukiJx0kCXQaRHplZIwG1Ek3LE+nPT71Stjsb4OakH+wT3kRApFKS6gUeTHgh/d/U19Lbd0wIDyHK77/qpunu0y6M8DeeAcjBI4lwsbYrbpiO3bxVenTgNemDB6ZF2BkeTEAgQas+rTpEXdoFMinRt3aLAyjxPACS+sN9ABL38Wqiv3989MV4L0L0xpx6QSQIB0IRZgeEAiCpfx8/9Gx4POkZvDPgLLyvChDpiwdmFId8oWoMiCRYkXuSaPHONS3s+RSsycOUqEN5QQsBIQEM1VddPgUD+MyBk+CCwEP+XJ4hDyjBLX6OAn5pl58X3FMIF59qk+dQR4BDxzlIaUomQKN3kVcOnxpjyml8NX4aG+rL60fgLB+XIhDiU/PDczimvuaQn5sCO5TXc/P50D31LZ9fyjLeCk/T90ahdOov9QS5qJsnU9d3h3OFKBbHwRDJsizLsizLqrYaHCIhFu9ABcKigB7AE6CAEmsDjJRYmwU/oW14mgCYKAfYwHNn3LhxpW3llS+IY37ZJhwKjxTCw7bffvtItpyXzfMg1dcrpa7KAYaexyf9Aszw3goRAyYpNAuvHXIFAX2ALgAVdqXD8wdvHkAO3kZnnXVWeDUpBxC5hwSRuE/oF6F+1Ce07cwzzyztitemTZsAWYy7+tavX79Sriogk7yKmDcWPswb8IoyPIPwN3IUAaO4D6zSu+LdNGbMmAjbw5OM8oShAYY0Jizg6B/zrDC7Xr16BZwinA1whScSOZQIZwNE4aEGNEP07bnnnosxYsGk74/GWd5q+VzUVYJPRYhUCkNbkBxbO5/lu5jhOSSIpPAy4Av5gwAqRQhFW+8/MDU9Pvi68EKKcLHVN0vjzxsWoWoBmxbkJjp0g5bRZucNt0+jTuwbnkBAIpJlA5G4h5EjiTA0+ghIwjMq3y2OvEhv3f5IQCT1QYnAsbN/2DFyL9EGzydEj/xK7EJH+4JIqs9zgFmAJoXw4e10W8/zI+E4Hlxl4zhiYnHIF6rGgEi5CQgJHghE5FBHoIdjFvSCGgIZAj45BOIeJm+hHEgISqit/DmCHwIeeT/VxyKAUhlBBY4Fw1RPbedtNiUTFMnhSN5vLAdy1NG4c0/vq3cUbBG8K94T3OG+npPPbd4PhZKpLdXXHOfzqXfRc3Q9f0b+bnp/Qal8bvVZnOd8vLhuiGRZlmVZlmVVU40CkRAL8RwiAQVyiAQ40iIfsEGoE8meKQf0IPcPu5XlYIhPzvmL7m677VaCSBwT3oQHCaJdIEueH6c+QKGuqgQudA0jDA0IAvAC/uB5hVcN4Ix32WabbcITh/AvFq+8P7mQuI83EqFgQBzGlHuXXXZZeGQRGgeUat26dYSHAV1YSACRaJcxJSTu8ccfD68vCYgkTyXq4t3Dcxk7IBa7v1GPZODLLbdcAKVWrVpFMm0SWwN/6Cvvxl/GSZat8De8iQBm7KKGmAOeTVJ1niVPLJKM830AIuFFRQieEoIDpChfSfpOFCGS5nxxxU5iJfixc7+y7e1ziCQQwydeOzUg0nZtY3c1eRbl3kucs1saAIacRwAYwtmAOngbAYjYCY3dzwgj436n9bZN1x11euQzAvCwQ9qF7Y4ueRIRSiYvIfpD+1d27lWCRP3bHh4JvEsQ6cUMIi07HyKx4xthbIJIt/Y4N3I18YzuW7WO5Nl5fd6F3EwBkRbkZbri0BMj8TfjVAaRzrmrONQLVX0gUr4gFzAQRNBiO4cIueULdOry74HjfFFfhDZqm7Kcq2xu1JE3kLyI1Ne87RwSqN3ccyZ/fjFcS++jZ3CcwwUd614lONVULO9XDkz0HryvYF8OYvKxyOcyP87nX+OvOZH3lsqp3XxONS+aU8255obz/Dh/rq7nc6A28zkr9l3XVZa5z6/pfShriGRZlmVZlmVVU40GkZDC2fAqkkeMwtkUVoUAEOT3IbeRkmUDkdh6Xl4olAUSAWLw0KEsHkvAlX333TcASA6R8lCrPFfOkhR90pb2hEzQZwDY8ssvH0CF8cEjCNBEqBo7spHLSHmUeF+8kgA6hPwBbLSTGRCJungD4YlEfTyB5AGGJ9LTTz+dPvnkk1J/gEiCOTlE0pixQCLPEmFteAepD4A7PJ+Ut4ryLIyATnoXyuM5BRiSeDYhb3iRCV7RBl5oQCRyIvXp0yfgEfeAYyQIXxLKIdKcbjeUwZ8iCBJQErRR+Jgg0tg+F4cnUqW6eBThtUPOIYGnvVfaKGBS2MqbxC5vhLJxn13Urj/6jMg5xPNIcE2ImkLJgEjkKZJnFO0DdKhPviI8kd4Y9VDkSxIEI4m3nn3W7gdFsm08kegj3kx4IgGPuN9jmz3iXBBJ7wIoU94ldpQ7r02nNHPk2PkQaed+/x7LLiOKQ71Q1RUisYjGU0SLbL7PfI/zRMQs3OVFogV4fs4iXWFInAsyqBxtzp49P9E24UiCBlynnMLdcm8jPVv9zIGCgEEODfRMjgUK8nocKwwq7zvn8naiLP2kL4B3QQpBEHnrqO3mbowB78v7KXG2xlEgTuOSjyHGeRHeqByf+ZjxDK6r/XzeZJTT/DeGGSJZlmVZlmVZDaUGh0gAhTwn0r333hteN4AMjITYgAd5sCBCvQi1wjMHUJHvzqZk2fIy4Rfl0aNHl3bqAlqQfJkQJ4EjQaPcS6XoIdQQ4hl6rkBMfpz3iwTVLHSuvvrq2KlNUAWoRMgaibaBaGxrz3sCjYBxl1xySYSd3XTTTZEjCOOY5NzAGBYRhJkBqfDqoS7juffee0e7gByNEfmIAFSAIXIv0Y4gEoYnGQshQA6eRz169IhQPAASIWubbrppeE5pxygSYAtscY/d1/BE0vvjiQQAzCGSPM7wfAI4UQfPpxwiUZ+5bYw5lHLvmS+DSIIxkd9o9CMBbfLE2oSzvfuTJ0tJuRUSh+G5RA6kSFy93PqRE+maLqdESBkeQRMGXD3/eMB8I+E2Hj5/mPBCPA9vJRJrK1wNeCNARLgb/cETCYBE+0Ckip5IC6DXOa0PThMvGDE/Kfa8+7Qxqle/gEdAqjycLR8H3jFA1LxnHL3ZrgGmCJuLd92p77/HsvWg4lAvVHWFSJgAQe7ZUVz0c15c5HNf0EbQQdfUTu4FUskEkXKvmOIz1CaW94nyORBSH2Xcp6yu5+8hWKLncC8/V7iWPKtyWPJVMN5VYy5jbDTGs2fPjnHKcyZxX1Zsj/ESIMzb1zypXe5Rv5hnSfNcbLehzBDJsizLsizLaig1OERSyBkgCY8YIBKgQOFsgCLy4lSCSAAmeSLhocK28EoirfA0dmYbMGBA7HQmjxh2CXvttdfi2SrbmMBBymGRwBdJtfnlnt3OFEomkITnFO+Dx47yIxHSBzhhAcInsAzQQ9gb29oDl3g/Je+mHfIR0TZgijEH/rDoAcgAYxh7vLWmTZsWEEl9AyJxj3Fs27ZtKScSXkF4imnhST85JxzupJNOCpAEeKLPHTt2jHdjEUUoHeAHbynmB08owJXmhTlnngmJU2JtEnaTY+nPf/5zDYi01lprxRhQP9+FrTFU5onUfkgNeFSESJgg0pWH/Tt8TEmmfzt2ciShznMqYcAlPH+O+f5uAWE6fGeLCFHDy6jU/oI6eBh99NAzcY+6eBqx+9olHbqVoNV5e3QqJc3mPom1gUQCPDlEUvslz6l596nPbmtAJIWzkYMJiASIInfTDceeWQqZkwfWmNMGzwdV89rpuW2bdM/pF8UOcRH+l0Gkhg5nE4gR8BEsACJwLC+d4sJbHipFE0QQHKBcnkhZMCeHBmovBw7qn8oVYRL3BDT0bNoWnMjfic+8HCaIRFsqq37qObTFOKhPeb+au/GOGgPej3flZ5neVeNFOY0L55TBNEa0xXW+J0rkrbGqNHc5iMrnRH0p9rOhTM+lT4ZIlmVZlmVZVjXV4BAJCabgEYM3EdvDy0MFUEQ4W56bB08WvFEIUaMMXi55OBvtARAAU2PHjk3t27cP0EDiZaAUCbgBKfJYWVIQCfFcIJp2lQOCAL06deoU76g+Mj70EyjEfUE2xgd4xmIPOINnEuFrJN8mCTUghzY0JrQ1c+bMSEA9Y8aMgD2MO39FJ0k1MAZgg6cRQAdgJw+p/v37B6DiuXgH4W2kPCnsita7d+90wQUXBJyirwAogA+AD1BEXULd2AmO+QQQKWk40It7zI08xGgXLzLmmWcCosjxBFyifXIsnXrqqRHORp9zT6Tcs6wxRNhVyRspy4lUNADP3595IyAPMIVk0sO7nBxhaISlnbzjvpEviJxI8ljKjQTaeBP1bNEmIEy71TYLrx52XysBqgXeSy8MvzNC4z56cHoAKZ5HzqSLD/j37mw5RAJqAXLwbALu0P7AfbqEJxMQSO+gnEjcJzE3Hk/szibvqluOPzfgESCKBNucf/bE/JA53p1QvZHH9inlVTplx/3SpIuuD+BFG7lXV0NDJBbRCmUCDggm8O9JHid8CgZxLEDAd5jvYr5jlv49CBzQlnbGytsSMOA5tAHIEbCQ55LC4wQrBHUwwSjKKsRKAAjjOvf5Wcm5wtNUVm1QTvCJ8oILmCCHAEo+Js3d5MHF+2usFFLIMX9k4L15Z8rncA3jXB5keSii2tL4at41pmpL3xnq52Ne7GdDmZ5niGRZlmVZlmVVW40CkRALfjxa7rnnnghnw9sF6MBuY8AUfikXbOKXduAQu6wBF/BE6tKlS3gxAZGAIizeAAonn3xy7PxFeBeABQjBX4zxlhFsECRRPxRG1tCSxwx9kecMYIU+k9sILxsWGrwPZT799NOAP0A2xgavKmATUAZww6LltNNOC28koA35pC699NJYSOJtRDtKaE1YGaFiQCS8kVg04eGkXdDw/mE8GWuNDzmReC7jzdgT/qZFGInKAU/syAbcIRfVZ599FhCLROkAIGAfc8v48y4AMZ7ZokWLAF+E4g0dOjTgE+9D/wBTJN0GEJG0m+8C9xgrPKXIiUQ+JY0HIJH7jS1gxyJBpBffqZETCSgDkCH8i4TUJMKOncrwylkQxsYx9fH0IW/RoH27pk7rbxvwafD+R8WObXgD/W3661EGjyIA0rVHnRZt8Sxs+rAfx+5sgkh9WnUIcMQ9QtEIKRvW6YQSROrXtnMk5abtfz73VpQZ2qlnACAg0Wk7t0tjz7ho/u5wL7yT/vTkrEikTRgb70NOJsLn8KyiX4TV0dd+e3WO9juus3UaekiP8LDi/twJL5dDpGseKw71QlVXiFQ0QSD+3XHOvymM8Ncrrrgiks/jXcf3ku8eOyRyfsoppwTQlHHOdXKECTLkHijAA/7NFeFFDoKwYv9y4CAIIKiVgw5BIMEp7uXeSYJhwAyej6nuwp5ZvNdcTe+pMSSvHD8X+RnHvLEZAJ/MMfOpOednMwagxzT3AwcODM9MvCMF3TReTXFc8++PIZJlWZZlWZZVTTUKRAJQKAn2VVddFUmd5fHCbmOABbxngB2AJn7pxQtmq622KuVE6tChQ7r22msDULCVPZAJQEFb7N4FoACwsDgkFEoASZZ76+Q7tTWkeAbeUno+53j/AGfwnMIzh4UJSa9ZcHJv0KBBaZ999glgQmJsch4BZGiDBTSJyckPhdcVRvgYY8EiiTFk9zIWRuxy9swzz6Q//OEPMR5cJ1RMYWOAnQsvvDC99NJLAaCYG8LNmBdgEOFnBx98cICcV199NV133XXhnUQ9FlTAMDydRowYEWAJzyjAGItwFqwALdoE9NHfddZZJ5Ked+vWLbyXSJrNoh0QBgTkXckHhbcV3wE8t3hGz5490wYbbBDfATyaGA/GqrHFVvQ5/PhiQnkOoKIBktjRDG8hdksT1AEM4d3z/NWjw0PoH8+8GfBGIInjTx5+Lt11ygXpzFYHpoPX3SZC2y498LioA5QCBJEfCQ8ggA55lIA7tPfYoBEBcJQT6cSWe6Upl9+SPn7o2fAWeuqym+K+Em+fsesBUefD8dOjPkAKaKXE2sCiEV1PTb+++4kAUeRXurXneeGBpLxKeE09demN6bVb7o/3BRoR7kbfgVgPnn9FjEl4Uo2aUg6R7p9RHOqFqq4QiYU0gFpeKZwDAfgZI8DDPZLW4+0IzFRyerz2+M7ys4WfU3y/+S7yXQeCU4afOfL2EcTheXwCf/EQkjcK/REA4ppAljyCuJaH1wlICVAJKHFPXlWCUXquIBnl5MWkvsmzRlBKx/KIkpdNcQybo8kLiHFi7ICE2hCAn2+ExvJzB4DNLpP83GO+ubfaaqvFvQ033DDKAdU5P/TQQ2PXUM2RxlDHejZjzVwA9+UBls9dY5ghkmVZlmVZltVQanCIJIDEL/P8Ar7//vun1VdfPX5ZZ7HGIq1ly5YBFLQYGz58eGxvzy/3lCFZNos7kjMTrob30s477xxhbCR3JgcSiwQWDgq1koARwCl5JNGXxgqFysOuZCw4Ro0aFeAFbyC8p3gXwtZ4Nz5JrM1fxYFDLAK0yxzvRU4lwv/wkCAMjEUQ48cx8Im/nNM+C1jKAohYTABjKKtwNoAMkA6IBZQDBgHkBJnwdGLBhacT0AfvoxNPPDHGnnqEqXG8+eabR5/xmALyAZYYc401YYX0F3DGe1J32223jXelzxieTCThzj2q+B7gNcCine+KdoLDQwro2NgqQqS5o6bWAEe5AZBevOaudMF+R6bDN/pBCSLhWXToBi3TkIN7pKlDbgmIpDxHhKQBn/A2wrNn4uBr0+Udj0/dt26dOm+4fXgxnb5L+4BSAKQnL7kxPJIIRQMQAZPYma3j2lsH3AESdVpv23T2Dzum564aHd5A/dseHt5DgkwHrbVV5Gl6eeRP4pnsDEcOI3lOEU7HTmzkacKjibxKd5w8MHaZ477yNvXavm0Y8AjoRZuE1dHH9++fUgrdmzPkoXIYN2+s6qK6QiRMkIUFPf/+5LUj4IK3DiD3jjvuiF0JCb3UDoh437HDIXnb8ILje0o+MX428e8E8Ko2BRdoU+0L5qgMfRHUAW7IS6joyUS/1SbtCRpxLNiTt80nwCoPu+PfE8a5wuGoLyClPuXQoTh2zdk054wtP4OASIBAoCDzxlzys5KfKYKG/MzjZxkes4BFgDwgiZDadu3axf9haj+HcRo/jamAEcdKyN2Y42uIZFmWZVmWZTWUGgUikQOH3DskjQYA8Nd7fonnk1/SzzvvvAjjYsFDOX7hJxxLZQAmfOZGHbyV8MwBXOBxA7xQvh3BG0AG3kB5cuvGAEioEkRiEcwv9SxYAWfkP+I9CalgLMhLRNgFHjwsgAjfEwBT7iRC1oA6vH/f88+PerRBXXZUAyDhfaRQOsYUWATIUTgOY8o5HkosQMm7xNxwj3AOQji4z/jSXxaxlKHP5FbSnPDcyy67LICXIJ68rhQm9+GHH4bnEZCJPmregUQ8k2ewAOY9EfNIGB6hQvoO6FnUoXweotgYAnYsCkQSEALsvH3HhAg5G3nMGZGsmlxEhLKRiHr8ecPSqzeNC88j5UMCICm8Da8f8iY9e+XtkZSaHEN4BN3Y7aw4J2/Sb8ZOihxFEYY25Wfp/QemRv4kypGH6doj55e/vVf/SJ5NSBqhadcffUbcCzvqtHRT97PD0wgPqMkX35DuOGlA6R6fgKWfXnt3eDP9+alX0ujeA9IJ2+4ZAAlgxY5zlI12530CuO47+7IIrcPDCSjGmMTYnJ2FBc6z9MGnxaFeqOoDkXIPEHmM8H0GLnBPi/wnn3wyvO8Al0AkDO8kwR/BJn72AB6A23jeCejkz8vBD9eoK4ijcjnkENTJgYQgka7lcEnwIveAESjK26YPXMshkp6pvsqDSp5J+dg1V8thHO/ETpV4bQKygfQk/ccLE4Ce7w4JFOfnH6G4/Bzl5zT3Ad9AKP5vUpv6FOjTPOZgSfcpa4hkWZZlWZZlfRXU4BBJyoEKMES7rEk5+MmvAYDwTsnLCsgghYzhbcSnrgm4qCzHghSNJZ4naKX35zwHWXwqvI5j7WSH+My9ehgzrhXHQuOm9hkLeV/lyvtRHOu8DM/SM/gUiKvUnsY6f09Mfc8hmgBfXr/YH53zTOWSyvupZwoMNpo++LQcIp0zpgZAwiIk7dn54Wm6pqTXgJS8XDEfkq5rpzZBpZIXz4Kk2nGN5NqcL7in+4JYeDjlUErla/R3gQcUZajLNY7zEDuucY9reFjd2uPc8I7C2wnvKCAU0EwJv9VO3ucSROp2Q7knUoXv4MJUV4gkaMJiGlCp8DDuCf4I+pCji9xrG2+8cSmMlrBQefMI6OCZRL4cQj6BwNwDEtE+4baElSqUjedQj3BToAX3ARRKhM19AA/lybdDCCrlWPgTtklZ6tB+Ho4myEH4J+V0H6M8wB5AAvRSGSXdxng+YaoYbVKPMjmUas4mgMS7MjZApK5du4aXEQD8+eefjzJFiETYIgCd8Wd++E4AsDt37hy56oDutCtvMNrmjxgaY8aTunxyXzBLUKfYz4YyQyTLsizLsiyrodTgEEmL/hzo5NdygMBnDkk4ByIARAQpBFQoV2xLlgOkvA85qKjr4rU+0jvl/aDvgiuY+qV+876CMlzT+1MvH6/iu+TX8/GWiv3I7xXHR89WvfyepL4Vn8lxXk/gqPgMvaeeX3yHSqZn6rl5fxpcBYhUW3JtgRMADBBHUEeQRucAGaxYVveL4KgEYRac5+BIeZXK4E3WRm41AJZg1IJnCEwVnxP9ffat8ETCs4lcS+w2R/gaeZn++NiLpXA8ta0E42ojru/Ut9wTqY6qK0TSgppPeYdwDCBQOBlQCdhAqBJ5bwibJYQSTySgUrENwAz5um655ZbwGARIAJUIc2vbtm0kiCfMFtiE9x2eS3jBcJ/27rzzzoAXgAhgDzsW4s0HpCBkivqE/QI9gFSU5xmCSAALPPrIE0e4HXbkkUeGFyJhqXgKEi5LeCrPPP744yMXHd6At956a3h5HnjggXGPkGDylI0cObIETorj1xxNnkIKKwTwEJKIMWeaf8aVEEZtOMDck3SbMdb3gnBeQhnZiABAR3vMBe0wv4wfXkp77713zD/HzD/hckAo9cUQybIsy7Isy/oqqNEgkhb9RbCh64IE8oJR2fyaQIW8VPI28zYqPa8IJBoLQBTfWSFmORRR3wVcdCwIgwdSXi5/h/zdK71Tfr+2Olg+ZpXKIl1HOUQqPiM3zUc+L5i8jGqrT9nic/VMwafG1pwuI8q9kWoJaSuDNAsgShlkeuHf3kYCTGUQ6cV/e/8UIZKu5UAIeBNAakGZSlBLdXVeAyJllret8oJIJPC+6biz0rFbtEptV9ww8h8R8kYoHDBLbVaESEMeLBu/OefcVRziL1V9IFJxcc2nQrsABe+++25AASDSYYcdFiCBxNnkPCKcLQ8xy0O+FLYEnDnmmGOiHnUw8u6QQww75JBDItcO4W8kaCYkFI8WQBLwhjxmwAdgEJ8AJHKGsQsjXjIkxAcO4c1EP4EChJoSUqcNCkjUj9cU19lwgDbIgcZ74FkFLBo8eHAkxcezRvmByO1E+B4Aa/z48QFPimPWHE3eZbNnz4755VhhZXkIIRCJpP6aN7zLAECCSHnIIyAK8ISXEd8VxpK5JT8c8wREAkiR900bEwAHAUl4jhX72JBmiGRZlmVZlmU1lBocIkk5kBAcyCVgkgOFvFwOX4plsNx7BukaZaQinGgs1fbO9I93Kt7Tu8nrRueCKHrP4jjk9fN7emeONcYc5+NZbCMvK2kOdI1PgSEp77f6ybHCz1RX7asPak/3imF7TUGAlTKIVCGkDVgieKJzQZkc5JTgzLPz4U8R+gji5CAmBzx5O9Gv538REEd1ZQJAekYlUCSPqOK7qKzKU+4PE16IneIOXGvLSMxNTqSL2h+TPnpwetwve48MfAW0OnZk2fh9Pvv3Zd+vRVF9IFLuCSIDBgAVgEmzZ8/fvQ2wg/dPnoAez6HcCynPW0TeLuoRvoY3ESCJ5O+AHYARYIcwKDxVyLVDMnsg0uWXXx7A5r777gvwwG5v7AAGBCJXDwCDMsCNlVZaKXZq3H333eMeMIL3wRMKGMTzqMuOYoRi4aE0ZcqUaJ/nysOGRPlsToBXFJ41ACnA0QorrJCWW265yBWEB9PTTz9dY/yaqzE3ACTmjPA9xo1zwhMVwgdE2mOPPSJ0EYgkTySFo+WwUWGQ5O8jbxJzyrizwcCQIUNi7MjXBnjEkw2Ax7yR9417jenlZYhkWZZlWZZlNZQaDSJ9mQQy8vNc3CuCjuJxpfNK1xpbtT1X77ywezlgqVS+tral/H7xOG+r2EaldvP+SMVyajdvm+MivKtULr9XLN8ktAghbUXYszDLQUvxeqW2iuVyC9hTS1v5dUGdsvu19Fdl1cY7dz6W7jrlgtSzRZsIZQMi7bPSxrF7249P6JveHv1Ijbr5M8q8kLpcU+O7tCiqL0SSsbDGE2X27NklOKT8OU888URAH0APEAkYBFRSniASbwNpSGhPknlCnWiDECc8U4A2ghF4/xx99NHpuuuui7A3gA0eKlwfNmxYJM/HY2iLLbYIbyB2hLvooosCavA82if5PNcBEtQjtI0+0t/HH3887gOHeCaeTjyD0Dc8Zgi5I/ePcv0AtAip086NgAWAEt5IAC8+CYkDTmms8jEUeONTMK04zk3NNNcc0195IgkI8T7kMwLWMYZAH+YD7zHAoNqQcc515g9gBxQEOAKd2FgAwMf9QYMGxVwzr+utt17smkkoXHFMG9IMkSzLsizLsqyGUpOBSJbVHDT3nPLdxebWEtL2VTDBJQxPop/fOj52exuw9xHpjF0PKFm/vTrHzmzsNldsQzZ32MNl4/bFAzOKQ7tIqg9EEgCQ5bmQBEZYbANoyIm04YYbBggCIhFeBphhp0DCwQhdArYQXobHEHWVuBmIRD08f/BOATbhgQIYYrt4wtLIRXT77beniy++OHIf4WW08sorB5QgX5FAF8m1yalDqBlt4q0E0KIu9/EmAhLhRcR9IJA8XvQ+7GSoretpn1xIwCd5YV1yySURNoc3EpCJHEu8B2MkcFYcO503JhCpj1VKaK3wQ44198A2eSIBkYA/vXv3jusqxyfvCzRUom2Fv7FrG+GJjLtgJDthEk7I3OIpttZaawU0VKL1xjBDJMuyLMuyLKuhZIhkWXUQQKTMo6bbDTWAyVfBAEfK2aTz/5v6WvrkkefS7yc8H2FtGOd8fjZpZvr7M2/UaEc2p/2QsnHDq6s+qitEYiH97rvvhgmeaIc0eaYIOOBphCcS3iUs/oEECkvD8AoCNAAIhg8fHu1QXzlycohEGBPJmEmcjRcMAILjadOmxaL+wgsvDECEJxGQAW8YEnELVtD2PffcE+FVwCxgEfl2CHPj/oQJE9Lpp58e9XkmkIgkz+zuJpiB55JyJuFhQ3lA2XvvvReeWEAkIAgQCU8mABeQCXBCn5WUWqCMPtE29T/88MO4LijT1Iz3o//0mz7Sb67JM4nrGICPXFTMN/PGOBKqBkRS/iuM8WCeCVvE40seXuSluvnmm8OjifYpB+gD+DGvtMn4Mt/svtdY8M0QybIsy7Isy2ooGSJZVh1VlmCbkLYJs2pAk+ZuOURSOFspGfiCPEnK51QMkSsa3lpl3lv1SKgt1RUiYbn3ic4BSCyylTiZY7xMDj/88IBIgi8tW7ZMZ555ZiSsPuqoo8LjB9AERFISajxM8OABLlAPcLDLLrtE6BhwAYDFc3iuoAYhT4RDkc9o7bXXDpABRAJCKO8SO4mRoFk5lmiTkDfuA3voF1CL5+FBw+5sQCSFmgGRBLVI0t23b9/wYBJYI+kznlVKrs2ObrwH41EEbAIpfHKucWssKFJXkxcS78Ex76t5FkxkjPH4wiMMTySMcTrllFMi5E/vJigHRMJbrFOnTiWIhMeZ5pkxAfDhtUZIHOCR8Qf04RWGt1JjjZchkmVZlmVZltVQMkSyrDqKUKwyb6T2Q2qAk+ZuAkcKaQMeEdKm+xz/bdrrpWu15VWKewUvpPqGsqG6QiRAAZBHMCHPhyPPFBb+lMMTiaTIeU4kzpWUGcBC8mtyCRGeJtAgzyBBJIxE1ey8BlzAc4cFfZ6Xh529AEOUFUQibE4AiP6RF4lcSIAIvFl22mmngEg8k74CtsiXJEhE7iUgEqCKNoBIShDeokWLAFePPvpo9Jf2gUg77LBDJO8GIrVr1y7AlQCLPHEE2wSOuE8bgkrFMW8KlvcdgMQ8C+AJJjIGABbC2RhjvJEYx1NPPTXySgnC6N25hrcXO90JIjF+eB6x0x5tMi7kPyLkTWGRQKTzzz8/5qyxxssQybIsy7Isy2ooGSJZVl31wadpTutB5d41X8HcSPIwqmQAJgBSpV3dyto4Z0w5cOsyojiadVJdIVK+oOZY3jMKceIakAggwiL/sMMOi8W/4AsQiXuUBSLgyQOo0ZbtWqTn4WyAnTZt2qQ77rgjIBJ1cyjDOTmRCI8DXLBrGlvE48GSQy6ADkCLfhDOBrAgLxP9mTRpUkAkABDeTMAPknhPnz699K4kAec9dJ8cSiTOFtAinI02AVS8M1vSA8oALtp5TuF/tKewQOrLu6upmvrHTmy8KwBJIY2aC+7jiUSYoOZ7s802i3A27mluBf4YB4ARnmja9Q5PJOAdu93RNgZEItk2SbU1d0BDQhkNkSzLsizLsqzmLkMky6qHACQ5HKm0U9tXwQSL5GUUAGlBOFsZVKrkiTRhVvkY4YU07/riqD4QSbBIXj6YgA6fggSEsx1yyCHhlSOo0KVLl7gH2GFRDowQCBKsUTgbEIk6gCEgknIi6RnyjKHu1VdfHfmIgEAk1iYcDegEwKEcwALPJCASYIoyQB68m/B2AWaxuxveTIRhkcuHRN4ALvrKuxK+Rl3ub7PNNgGdgEgai0svvbSUWJucSAcddFBsX899gEs+Tuq3IJzONbZNzeQlxXto/BVWyH29B7mPgEiCQoQrnnTSSTH+1JNXF8Y843FGqJrK4+FFYu0pU6aUxoJ5JCfSOuusE0CRzyuvvDKAlSGSZVmWZVmW1dxliGRZ9VRZbiS8bL5iSbYVxha5jzKPowhzW5BwO4BSLV5JxTC2uSMmFoewzqoPRMKACsAXIEK+7bs8krgGRAKk4EGSQyQBEy3KBZ/UHtcJEwMiKcxJibXxUAFEUJZnCmLg0QKwWnfddQM0rL766rEbG20DK/AoIu8SHkJ4EgEiyKvDc2iPTzyLyInE8zbffPN01VVXhbcLfQWCnHvuuaUcTcAOvJiASIJmJOkmRA4QRT/222+/SBzN83kG48O7vf/++zE+nAMkuKcxa8oQKQ8NlHdXEXwBdkhqDmxjrEhADiQi4bYgFGGPjAPjgmcZYYLMGXAO6ATMAy5p7vAII/k6ibXxMmOMAUsa98YwQyTLsizLsiyroWSIZFn11Qef1vBG+qqFtVXyMhI0EjjKPZJK9QrJtAn/q4bqA5FYSAMUWMQrXEznLLTZaYxrABaSSwNUADOABUKXWISTVBkQBFAQhBBcAqooX5I8fwhzIucQYWcAJ8oCXTDOCZ3DO4VyhDsBg3r16pXGjx8ffdMOX6uttlok4MZjaPTo0ZHMm34rnI18O0AidnEjXxIJtxW+RR4e7vEueCpRnrA7wSHKA5d4/qqrrpp23XXXCKFjLHhPwTKNGe8MJGEcdK+xPGvqaoJ7uQcY1znPc2QRlojXmKAh0IeQRuCS2hJA5H2py25sgCcgESGJrVq1SiNGjIg6eIL16dMnvNnw8GJ+yaHFfKsPjWGGSJZlWZZlWVZDyRDJshZDxSTbX8Xd2oBDAYwK3kfamU3XShCpAcLYpPpAJC2mgScCAvJC4j7eJngMkTSZhNgAFWAQBiDAI4idtShPjh0BBdUHHgwZMiRghBI0kxC7Y8eOAYPIpZR7MlGHhT3eRCRx5hl4GgEmevbsGR5FPXr0CG8mcvTQLjux0Qfq8ly8lmhfu7ORnPvQQw+N62wlj0fR0UcfHffwsGGnMLxj2MGNd506dWrq3bt3eF3RX0ASzxo6dGh4Qam/PE8Qhmv5uOVj0NRMoE/haDlUUqgaY0AIIKF+GifGAWAH4MMzTZ5nen/aAuCR02rfffeNMWOuAX54euEtBojkGgAJMHj//ffHfAvENYYZIlmWZVmWZVkNJUMky1ockWS7ENb2VcuPBCBiJ7Z/PPNmjXtYCTIRzgZAmvf+ZV5Ii5lMO1ddIRILaQGE3HNGYACoMHPmzIAvhK4BkIAJeBMBFvAmIWTpnnvuiV3WBFIAEUq6DIwgrw5hYdQB7AAjMLxQgDI8mzp4NGm7eXZ34x4go23btgGCFFaFR8x2220X28nj5UIfleAaIz+SdmbD6C/P6969e+RS4pNk2tyjnMqyaxj3gUUk81b4HfV593322Sc8qHge7wo0EyhSKJhCAhvTs6auhreUwvLoK3OX95ljwB/eRApN45OxB6qtscYakXicsvLcwjtLuaIAg8A+QhI32WSTGDvmndBDzgFJeHqRY0r18zC6hjZDJMuyLMuyLKuhZIhkWYurYlgb4OQrkB8pD1WTJ5KOMcoo3E1li3mQqhXGJtUVIuUL6vyaIJJAEomRAUV4I+GFMmzYsDCOuUaCbCW9znMpUZ8QMzyOgAqqh3FOAmyAg7x2MPWFdginwsMIsMNzgDvUBSwRNjV27Njom7anpx6flKccXlLqLwme8Xohnw9haewaxnVgCe3SH7yf2I6e8KrbbrstgBH1Me7TLh44+TjpuRorruUJqovj3RRMwFAAUdcFwTiePHlyADrGSONDniiOSWCucWCeaEsQSGNC/ik8vvDuoi7jTFvUveuuu8JjCRhX7FtjmCGSZVmWZVmW1VAyRLKsaqgCSGJ7+yKYaS5WKReSrpNsuwiROC4CJIzr1VR9IFK+sNZxHqIk7yIACaBIkEGLcCVE5jwHQfJMyu9znpcRaNLzaFvgRceCNGpD5QVCdKz+cyyYg6dQEeioDb0bZXk/7U6mdriGKUF2Dl5oV++uvlNHMIvy6ls+xk3J6CPeQxzzHuq3YKD6rmPeUYCQekrArnHJj3OPLM2jPI6KdXStMccq/x4ZIv0/e28BJleVvV/j7g6DS5AEgru7y+AuwTVYIHiABJnBXYO7a9DG3XX+vwEat48BwgAzQ7r7fFm7eSunb1enJV2VTvpdz7Ofqrpe59xKclb22dcYY4wxxnQmlkjGdBLN6iONJRlJxSgW0SaqIZBgVCRSa5HLkuLy4jJidMgBRVFQjCxa27bc8pa+W/FzV49y36Pc9y1GW7Zpz3bVDkskY4wxxhhTKSyRjOlEeIx9UaaMjcW2S1GmBlKlBBJUUiI5HGNLWCIZY4wxxphKYYlkTCfTkkgak6e3lQu+T7PvWUGBBJZIDkfrYYlkjDHGGGMqhSWSMRWgrEiaZ8yuk1SK+14rO32t0gIJLJEcjtbDEskYY4wxxlQKSyRjKsUXP8TTyYqiZUye3lZ/1ZPNv888fz6Fbfj3rTSWSA5H62GJZIwxxhhjKoUlkjGV5IsfymclaXrbmCKThl9nS9PX+H7VwhLJ4Wg9LJGMMcYYY0ylsEQypgqUFUljgkwaiTwi+4htqoklksPRelgiGWOMMcaYSmGJZEy1aGl6258yqW7Xi7qOTKLu0fDraXadEkjbnVv8dlXBEsnhaD0skYwxxhhjTKWwRDKmmrQ0va0gk+rPuKe52Kl0/Jl11FLR7JBHqxxf1elrRSyRHI7WwxLJGGOMMcZUCkskY0YHf8qkFjOT/hRKmu5GQetm0qczog3iqCvII2GJ5HC0HpZIxhhjjDGmUlgiGTM6aYtMyqSSspQirnqybXKJKXLIIrZnvzZII0VXkUfCEsnhaD0skYwxxhhjTKWwRDKmK/DFD6nhjhej1lBR5LQ5/sxcQhC1VRK1FFE0e/j1dDUskRyO1sMSyRhjjDHGVIqSRBo6dGi69NJL0xGHH56OOOKIdNRRR0Xwvl+/fqX3sd7hcFQsBu53WLp5q77ppdUPbiZ3KhXf9zwwzjdkw0OaXU9XigMOOCDtscceDodjJNGnT59S7Lrrrtlf+cYYY4wxxowa4zQ0NCTi+++/T3vuuWdabLHFUu/evdPSSy8dwfslllgiLbnkkvHe4XBULzZYdLm0R69V00ULbZJemn+nZvJnVOLz+frEcTl+8bxdNXr27JkWWmghh8PRhlhkkUXi1RhjjDHGmM5inP/973+prq4u/fHHH5H+/uabb6a33347vfvuuxHvvPNOeuutt0rL+exwOEZPfPj48xEf3TQkfXbu7RE/9Dk/YugmAyN+X+7oCN6z/Jv+V0ewLfsRxeOOKfHMM8+k+++/3+FwtBAPPPBAuu+++yL4fMsttxT/3jfGGGOMMabDjDNs2LCUB0Kpvr4+spMEn1meLzPGmGrjmkgOx8hDtZA+/PDD+PzGG28Uf0bGGGOMMcZ0mJjOhjz6z3/+UxJIuUhSGGPM6AaJxADZ4XA0j6JE4j2ZxMYYY4wxxnQWpUwkxNF///vfmNYmacRrLpN4X5RLDofDUa1AIunJUw6Ho2kgkZSBxOd//vOf6dVXXy38tW+MMcYYY0zHCYkkMYRAIoriiG1YXi5DyeFwOKoVlkgOR8uBPCILifcIJF4tkYwxxhhjTGcyTv6BQZqKbOc1kJjq9uuvv4ZAMsaY0YWnszkcLQcSCXkkgURWkqezGWOMMcaYziRqIiGNytVEEmQi6SluEkvGGFNtXFjb4Wg5EEcfffRRvH///ffjiYavvfZa8WdkjDHGGGNMh2kmkTRtRDIpf2JbUS4ZY0w1sURyOFoOTWMjK+mDDz4IkWSJZIwxxhhjOpOYziZxlINY+u2339LQoUMjC0kUa5Q4HA5HtcISyeFoOZBHeirbxx9/nD799FNPZzPGGGOMMZ3KOCqUDXr6mt4jknhiG9lIbJNva4wx1cYSyeFoOSSReE9GElPb3njjjeLPyBhjjDHGmA7TRCIxXY0oIoHUGdPZlFFQ/KxlxfWiuLzcNqZzKLa1lpV7b0ZOubYc2fIixXbPfyfllncWxePnVOJ8baWrSiQVNc6fklVufTHy/YrLWlrvcIws8kLbCCVPZzPGGGOMMZ1J1EQSrQ0OR7aurajGEiCkikW7JbIkt3TOPEuKZfn6zriu7oraT+2rPsllobLS1Oa5eGzP/dNdyNuGe5v2LK5nWXF5jtpZvwvec6xiHxC53NWyPIrHLPZRcVudN3+f78O9QGh9fq9Umq4okRisv/feezFg/+STT0qFjfmswTzrec2fnMU21K1hOVOP9DQt6tiwjs96z3EtkhxtDclM7qfXX3+9+DMyxhhjjDGmw0RNpEqTD1A1eNYySQsNhPPItym3LBdSpn3QfrkYImhPluUSD7ROy4rryr3v7pS7RyVIWZe/F3lfKFjGdvnvJj9+8Tgt7Z//vtTP2kb767220/F0/uL30Pv8uipNV5RIhOrQ1NbWlmQPr8oGKWaHFDOM8uwj1uf7qFiyJZKjrSGJxP1jiWSMMcYYYzqTqkikfFCqQWc+YM6X54NfvS8nMHhVvSbTfmjv33//vSQDaFM9pU/9NTI5IYrv88/dGd2jgvdkEimDJ99G7ZbLnryt88yfHLaVDCqiZRxL++v3paL5EkOSibpGXbeOwSu/tXLXkAupatBVJZLqz5BRJAHEZ0kjZSeReURWEhlGeQbSu+++W8pUUgYJ27KfPueiyeEYWVgiGWOMMcaYSlEViZQPiDVwljTSQDbPtMgHtvngujjAzpdXaxA7NqD2V7tJLKgv8v5Qe4Pbuu3k97vaM2+7/LeQb6vI2z/vA33We/1m8vNynuLUt/z3peMjDLWdZFD+u+O9rlnXr3MUz6drrTRdWSIxYEcGIYgkfSSXCAmiPKMon86WCyPtJ5lkieRoT1giGWOMMcaYSlEViQQabGoQy4CTQarqISkkOFj+888/x+DpwQcfjFc+a5t8gGyx0T5yEZELo7z9ae9bbrkl3X777emVV14p7SeRYMqje1L3p+77ctk6ZPf88MMPkZlSU1OT7rrrrnTDDTekq6++Ol133XXpgQceiCcrff/99/F7yI8NP/30U8iGF154Id1zzz3pqquuin2vvfbadNNNN6VnnnkmffLJJyXBo98YnzkeEknZRVqu3xKvv/76a+n4FOf94osvSteua8m/Y3eXSPxm3nnnndIUtFz6aFAvgSRJpKwkJFIumRBHL7/8crrjjjsihgwZEo9qL57X4SgXlkjGGGOMMaZSVE0iSQzlA00+M5DW4JpXCQ0GuPwD+KKLLkqrrbZauvLKK2PQlYuO4qDctB/an7bOZQevCIn5558/9ejRIx1xxBElWZD3ldu/OdybEqP5suL9yvsff/wxBnjnnntu2m677VLv3r3TTDPNlCaZZJJ4XWuttdKAAQNC4iCM8rbnmMiH66+/Ph1wwAFpqaWWShNOOGHsO/3006cFFlgg7bHHHiGTkEHqL66Nz7/88kv8zsrBdtwT3333XUit/fbbL51wwgnpkUceKW2j71kNcZTTVSWS5BB/ZtXW1kbwmcwkxBJSiP5CGrGM7T/99NNYzmdlG7EPQumll16Ktt9///2jfwcNGpSeffbZZud1OMqFJZIxxhhjjKkUVZNIGvhq2hTk2RG8ZzkDXP4H/rzzzks777xzWnrppdMss8yS/va3v8U/iJXRoQF1uQG6GTnl2k/v//3vf8dA98QTT0xzzTVXCAn6AaGAWBBsq0wUMwLaI7+ntUztpTb79ttv0913350222yztMEGG6Sddtop7nmyiBCmhx56aNpoo41CDg0cODCkgn4j9AVZRv379499+/btm84555wQRtdcc0065ZRT0lZbbZVWWmmltMMOO6THH388ff3113EtOkYxM0r3BEHGCxlNyKPVV189ruHoo49OTzzxROm3pu9UnAZXabqqRMprGUko8TviPfIHGdivX7902mmnpRdffLE0yJdYQiLxmX6m7Q888MC05pprpkUWWSRtuOGG8Xt8+umnm53X4SgXlkjGGGOMMaZSjFaJpAGoptEMHTo0ps3wP/DHHntsDKLJhpl44oljEMZgS4Wf82NaIrWPltqN9//617/SnXfemQ477LC04oorpummmy6tv/76IfYYwIty+5tG8vbN2ygXSUgHxOiUU06ZVllllRA/CAUyhIgnn3wy7bXXXmmyySZLW2+9dbrxxhtLv5dPPvkkDR48OG288cZpoYUWCoH09ttvx3oKZr/66qshnshsWnTRRdOFF14Yx+Y6inIrD35/SBD6n/1322231KtXrzTjjDOmQw45JGSU9tc+lkiNoZpIKphNO5JhxHKmJSKCVl111ZCFNTU1sQ/bqNYR8fzzz8cUUoTRLrvsEr+/qaaaKq2wwgqRCWaJ5GhrWCIZY4wxxphKUTWJpKyFfKBJ1gt1jjTgZnB8/PHHx/Se5557LmohkZHBQAqJRIYEmUoamEs+mfZDu/F0tuKUJjJWTj/99HTUUUeFyGM62/LLL5+uuOKKGBAL9mffooSyVGpEwiZ/gqDah/udzBPaeeqpp46MIuQD/aFtmCp2wQUXxL1P+7Mtx2Lfzz77LF1++eVpm222CdFK3STkkfrzq6++iho6a6yxRlpwwQVDQCCW2JdtlIVUFEBcE78zppA+/PDDUQOJqYyIRKbG3X///U2+W7XEUU5XlUjIIGUV8TmXSkjxZZZZJi2xxBJp2223TY8++miTqWu1tbXxZx+y78gjj4xsJUQeGUlzzjlnyKSTTz45ss+K53U4yoUlkjHGGGOMqRRVkUiSRMpgECruy2CWoO4LUz/IRmKgzCsigzovyKU333yzySPoi1LKtA31h9qPoC8QDAx6yZZAbNTU1MR0q+WWWy716dMnxJ6knY6R92ee5dJdkWDRvV6uTVhOxhcFyxEH1DwiC4jtEDO6x5E5k046aUzpJDNIy9kW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Y8wYgyWSw9F6WCIZY4wxxphKYYlkjBljsERyOFoPSyRjjDHGGFMpLJFMh2loaCguMl2Iurq69L///S/997//jfedzejo/zFdIjGoLy5zODo7LJGMMcYYY0ylqJpEqq+vT3/88Ue8CgahfCZ4n38uLmMQXNx32LBhTZaZtkP70aZqY/qmKBqKkkD9ArQ9giLvAx2ruF93pHgv634WeVtqe6AP6Iv83qedWab91E+80v75cfP2ZxD51FNPpfvuuy999NFHZfslP4+uh+Pq3tA2nJ9zCbatlJwaGV1ZIjFg//DDD+OVtqfNeWUd7z/44IP07rvvxvt//vOfTYSS3ueDf46Vf9Z69uc963W+fF+d09F9wxLJGGOMMcZUiqpIJAahGhxrMK3BsOSQBqXff/99DIyee+659OCDD6Y77rgj3XLLLemee+6JATGDr59++im2t0TqGHn7v/POO+n+++9PN910U7r55pvTbbfdlm699dYmceedd6YHHnggPfPMM9E3//73v6OvJBbyPlT/dmfUBrmcURtpOZ//85//pB9//DEGey+++GJ6+OGHo63ph9tvvz09/vjj6b333ks//PBDiKT8OPDmm2+mG2+8MX4f6ive6/Npp52Wjj322HTmmWem1157rXRu9U8ui3Rs+hRJQV8jn/j96dj8Hl9++eX0+eefp6FDh8Y9oN9gftxK0lUlEoN1iR8+FyUSr0gk+pM/wySRcpH09ttvp2effTb+rLv22mvTJZdcki688MJ0wQUXxHvuCf4M5DiSR/n+uUAqrnN0r7BEMsYYY4wxlaIqEkkD6fwzg2JlsjD45PVf//pXeumll2LQtP3226eePXumaaedNk088cRprrnmSptuumm6+OKLQ3woW8O0n7w/BgwYkHr06JEmn3zyaOdJJpkkTTTRRKX3vNIH888/f9pqq63SueeeG4PjX3/9tcnx6A/1Z3eGe7KYcaflyhzSK3LojTfeSBdddFHaddddU+/evdMss8ySpphiijT11FOn1VdfPZ1xxhkxEGQfiSRxzDHHRF+1FBNOOGFaZJFF0vHHH59eeeWVJlKL90ggjim4buQQAmO77bZL88wzT5pqqqniPuAeWGqppVKfPn1CZnzyySel7ySZWPzOlaCrSqRiBhKSSEKJ5e+//36813Jtq/fs8/TTT6dLL7007bLLLmnFFVdMc845Z/wuib/85S9pyy23TGeddVZ64YUXIqOJY3388cclWZBnIClLqXidju4RlkjGGGOMMaZSjDaJlGcxAP/gJRtm5513jsHSnnvumQYNGpTOP//8dM4556Tddtstrb322mmVVVaJgRbZEL/99lvVp9OMDUja0X5klpx66qlpttlmi6B9aferrroqXXnllSHtkBUIvOWWWy6tv/76MZB96623SsfJM5Hy7JbuiESNMnNyUapg/XfffRfZXTvttFPaZJNNQtogjLi3kagHHHBA2mijjdIKK6yQ/va3v6VXX301joOwkfw54ogjQvLwuzjyyCOjv4grrrgijsMrmWX0MeeT9NH1qe/g999/j+04DkJr9913T6effnoIrssuuyzkIde06qqrpq233jp+l2RRcS25mKo0XV0i5cs0kCeri77ld0SbkhUm+VNbWxtC6LHHHksHH3xwWnPNNeM3uO+++8bv8KSTTor33AtIvG222SZdfvnl6fnnnw+JpKltOncuD4rX4+g+YYlkjDHGGGMqRdUkUj7A5LOyKggGxgy0GGSR/bDWWmvFIJXpHWQnEVdffXXaYostIiuCwSwZSwxiu3vmS0egL2hzpqXRD2RAkI204IILhqxjECLhgWhi2tR5552XlllmmRBN2267bRoyZEjpOBIREiTVykrpquSyiClreY0jLUcAIOOmm266yDo57rjjQib8/PPPMV3zySefTHvttVdkgm2++ebpuuuuK2UjcUzkDcKH/jjkkEPSE088Ufqd6fcloZf3R/5b1O+PQDKRgTT33HOn9dZbLw0cODDEiKatMc0UyYtMXGihhdIOO+wQg9RffvmlyXerNF1RIjFQZ4qZMop4pe00bY1pgfzZtdJKK4WA4886JBL7fvrppyGVmJbI+llnnTVtuOGGMX2NwT+/PfZHJi2wwAJp0UUXTQcddFB66KGHmgkjSSPOWbxGR/cKSyRjjDHGGFMpqiKRijDYVEYEA2wGzfxPPANp/rf9hBNOKGU5aBDMQIvlU045ZUgMarUwoHQmUvuh3fPsoZqampB38847b2TGMCCWbKB/mLpGf9DuM888c2TOUEdJx8rlhTORmhZ8V9vonldQG+eUU06JqUrULWLAh7BTphGC7+9//3tMSeM3QVZKMaOJ3wvShwwWpB5ySeeTcCJa6gv9ttiGwSa1k/h9HXbYYZH5xDUo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e8VVV12Vttlmm9ju8MMPb7a+M6Ij38fRPK6//vq0zjrrpJqammbrOiOaSSQGZoihP/74I/6X/5tvvmkWX3/9dfryyy/TZ599lr744ot473A4HNWO9957Lz333HMOh6NMPP/88+mll16K12eeeSY99dRT6ZFHHmnyl74xxhjTnaiUROLv2QUXXDCddtpppWUvvPBCmmGGGdLWW2/dbPvOiquvvjpNOumk6Ywzzmi2rqU46KCD0pRTTpkeeuih0rJ+/fq1KpEI/k1RSYnUke/jKB+33nprmmOOOdJdd93VbN2oRlmJRIbRd999l4466qi03nrrhcVae+21S7H++uunDTbYoNlyh8PhqGasuuqqaYUVVnA4HGVixRVXTCuttFK88nn55ZdPyy23XJO/9I0xxpjuRCUk0vvvv5969epV0YyjSockEjKsuC6PzpRIDzzwQHiF4vKuFmPKdZaLAQMGhMhEaBbXjUo0k0hkISGR+F9+JNH444+fxhtvvDTuuOPGDUNMOOGEaeKJJ451LHc4HI7REfozyeFwtBz8VvT3OH9vG2OMMd2VSkikY489Nv6ebU3AdOWQRCKTubguj86USJtuumkkrBSXd7UYU66zXPCUXqZUbrXVVs3WjUo0k0h66hpT1viffv7BOcEEE8SrhBKfEUn67HA4HA6Ho2sGf2dPNNFE8fc2YYwxxnRXKiGR5pprrrTEEks0Wfb222+nPfbYI6aNkQ3MMh5usdZaa4WEWX311UNMkCXC39HUJFL9moEDB6bpppsuttt2223T/fffH8uZfrbjjjvGGJwpaXzecsstYzvqHOncyKx11103romYd9550wUXXBDrLrvssshMZp+bbrqptI8kEtfMFCiuafbZZ0+HHnpo6eEcREsS6fzzz0+LLLJI6tmzZ5p77rnTdtttF22Qb6OgHAVZW/ybZOqpp069e/eO85b7PhQpp834jzDabPPNN0+zzDJLTHlbfPHFY8rWySefnJZZZplYNuuss8a15Oe777770sorr5zmn3/+CGYyPPbYY6X1t9xyS1pyySXjGFz/QgstlB5//PEWr5N97rzzzvi+tC/9O88885TqOI3qNe+6666RsMPxOc7000+fJplkksguf/jhh0vbjayf8+A7cLxXX3212bqORjOJpIK1v/32WzTejTfeGEFxJuKGG25o8t7hcDgcDkfXDf2dTVx55ZVN/tI3xhhjuhOdLZGoIYT02GGHHZqtIxZYYIGSRFIggVZZZZUQEYgj5AP/6YNA0TbIG4573nnnNdn30ksvTWuuuWbpM7UPixKJY2+yySZN9jnmmGNKnxEWLUkk/q3w7rvvppdffjntv//+sYxXbVdOIl1xxRWxjKlTfFYtqNayX8iQKWb4lPs+BFJr2WWXTYMHDw4pNGjQoGhHhBXf5+67745rn3POOaNoOE+mZT8yq6aaaqq00UYbxTIyc5Ax7Md7xB6C6NRTTy2dC1F0zz33jPQ6aVNEnj7vvPPO8Z92r7zyyihfM4HIWnjhheP6uc477rgjpN5ss80W/cM2rfWzAmFFm9JPxXUdjWYS6ffffw+BRPBekS/T++I2DofD4XA4ulbkf2cTxhhjTHelsyWSBEpReihakkhkFOXLyDpZdNFFS5+ROGSfLL300k22W2ONNeIpafpcTrrMOOOMaaeddip9Rk5wPH0emUQqFtamWDgSRtlI5SQS3w8JguzQMp7iRvYL9aLy4+VRTs6U+z4EQobspnwZ2VtcX77s4IMPjv1VA4jj8DmXQkg7lpEowwNHeJ9nAr355pshl/S53HXSTvn0xTPPPDOOg+zRso5eM4FEQkDl25111lmxnYq3t9bPCuRSsc9GNZpJpCafjDHGGGOMMcaYsYDOlkgSEtRFKq4j2iqRmE6FOMiXMZUtFyA8ZZXpWHnGSjnpsvHGG8dUqr/+9a8hSvLtifZIJF3DE088EZ/LSSQk02KLLdZkP4mRfNpYMcrJmXLfhygnZMjEYRpZvqz4PSjPw+d8ah1Z2ixj2iDii+lkU0wxRWRcDRkypMnxiHLXWYyzzz47jslUNS3r6DUT5SQSWWtst9tuu8Xn1vpZQbYT++25557N1nU0LJGMMcYYY4wxxoz1dLZEYhoUA/Tjjjuu2TpiVCTSgw8+GMfWtDAkx/HHH99km3LShUwa6uowTYt1SIv8Me/tkUiIB5ZzLXwuJ5H4PpwL6aFgKhZTr8j0yY+XRzk5U+77EB0VMrQ9oiW/NuoScW1nnHFGbPPoo4/GdVD7iH05LtcxsutkKuIWW2yRVltttXhqPTWJKi2RXn/99dgOecTn1vpZIWmWZy2NalgiGWOMMcYYY4wZ6+lsiXTOOefEAP3II49sto4YFYlEUBCaaW1MdaJwMkWb8/UtSReCqWQXXnhh1CeiWLaWt0cikeXC8hdffDE+l5NISIzid2xLlJMzLX2fjgoZPW0+36aleO2112J/ts/rORWvkzagT8gIUvZPNTKRyAZju+K901I/K5j+yH777LNPs3UdDUskY4wxxhhjjDFjPZ0tka699toYoOfFp/MYVYmkmks8yatcJkk56XL55Zc32aZ///6xjer8tEciITzmm2++0udyEmm55ZYLgZHXRGpL8MSySkskTat74IEHmmynePbZZ9O9997bZBmFy8lW0ufidfKQEo7Jq5ZVQyKp36iNxOfW+rm4X7mi2x0NSyRjjDHGGGOMMWM9nS2ReGw606U23XTTZuuIUZVIZLqQgcQ5ytXrKSddevToEbJHn7feeuso3K3PbZVIJ554Ypw3LzpdTiKRBcMysnd4mhjLqEFEDR9tUy4oMI1Qeeutt0qPny/3fYiOChnqSE022WRRswmRRHuSucO1Ib2oN0Wxcj3x7L333ou6U6o7VO46Nc2Q6+EzdZ94Ol8lJRJT2Xr27Bn3E9fIstb6uXh86iYV13U0LJGMMcYYY4wxxoz1dLZEIqiHg3jIlz388MNpl112SVNOOWVk6ey+++4hG/r06RNihuweCjuzLcJk+umnj2lh5abFDRgwIB5LX1xOltLmm28egoAaRGRDIUl4nD2iguwl5NRaa61VKnBNTSUyh9gHeaInfSFTmLrGOp4gxuPke/funS655JLS+ZgWhShiX6TMYYcdVlpHJg6SgyeyTTvttJHJc8oppzS75jyYCsh35slu1BYis6b4fRA3tNl4440X3wl5hfzZb7/90kwzzRQFsanbxHS7QYMGxXVJaEnKUCcIecO2k08+ecgXjomMYRtkDXKG796rV6/I+MoLcRevkzbed999YxmCiswlFVin7W6//fZRvmYkEvfE6quvnpZffvk011xzpc0226yJNBpZP+dBDSWuvZihNCphiWSMMcYYY4wxZqynEhJJmT0tTZlyONobSKQVV1yx2fL2BhIOkdnSdMuOhiWSMcYYY4wxxpixnkpIJIKaOWSNFJc7HB2J4nS2jgYZU2RedWYWEmGJZIwxxhhjjDFmrKdSEonpTzwJjFo67S0w7XAUozMkElPlmJ6XT4HrrLBEMsYYY4wxxhgz1lMpiUR8+OGH6aSTTopCxsV1Dkdbg6lnU001VZpuuunSzjvvnB59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41XT1DiG2pjjsC39q6ev5cdXX0lMcT1sL8mEONp8883TXHPNFX0088wzp6WWWioNGDAgffnll6X7g304rqZFSlqpwDrbFSUjwfkQh8cde2zq2bNnmnHGGSOmnXbatOOOO8Z+o9IflkjGGGOMMcYYY8ZqKiWRFAzchwwZkk477bR08MEHp9122y1Ey0477ZR23nnndMABB0S2jgQFYuKxxx4LcbD77ruXtmVfslKee+650vQqZaZIQEnSKEuIZZJOZJogcxZYYIE03njjpXHHHTdtvPHGkZGE6JIYeuaZZ9LZZ5+ddthhhzgv75VVkwsYzsln3it76emnn05XXHFFWmONNdI000yTxhlnnJAVfMcXX3yxtK8Eko5XbLNKhASPxJGWaT3XTnZO37590y677BLtTtBfe+21V3yvF154oZRFhKQ79dRT0z777FPq00MOOSSde+650X+cg/Opb/J+0nnVrpI+ZAhxzCWXXDLEzqSTTpp69+6djj/++JIQUvYX5+G89NHf/va39OSTTzaRXPpe+fdFVpF5huxDVs0///xpsskmS+OPP37acsstS2Kto31iiWSMMcYYY4wxZqymUhKJ40jy3HfffWnfffeNTKCJJpooBA5Btg6ZJgMHDixljCB0mBJGltCss84awmfqqadOK6ywQoiDRx55JLJZOIfEhDJ7lOXCMokaHRdBxHGXXXbZkDscd6ONNgqJRBYR2yCw7r777rTddtuFWOAat91221KWC8dHYChDin1Yh3TgMzKJ4s3IDbJp2H+hhRZK++23X3r11Vdje7WLpFe1RBLnJDuI95JfeV8z5Q6BQ/vQ3uqjKaaYIs0777zpuOOOC9GkjC9kzB577BEiRtvRl4cddli64447YjtlGOXZQJxLGWV8b9qU7CFleHGvbLjhhmm22WYLicQxkUiSglw7/UXmEAKIfkQA3X777XEezqnsJLWr2lgZUzU1Nemoo45KK664YppkkklKx9A15RKqPWGJZIwxxhgzFtHwxQ/FRcYY0+2plERSRgcZJgiFJ554Igbq0003XZpggglCJs0333zp6KOPTvfff39J9Kig8jnnnJM22GCDNOGEE6ZVVlklnXjiiZFtgkBACnAOtlONHgmAPJNE7/WdyDJCHEgikYmEmGI6G8ekXg4ZS0gkSRTeS4AQOrbeS1Yo4wlZhDDr0aNH7M8r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LcvybL8lx6Ns27KCSKVSqVQqlUqlrU4c4J///OcNJEXe//KXv5w4yL/61a8mjnLa33DDDcNPf/rT9pr3N954Y9su7UvzUw8HelhgTH/yk59Mxrq3LPf6ox/9qL3/xS9+MWvOAhMs64FDaf0yVu6F3AOub+P84x//eNb177N1c0Efc2de+vnz+Yc//GFbdtlllw3vete7htNOO2245JJLZsEh2wbw9lAo96d92jcQNb4uXAP9vbsUmrnm+lkQ6fq/OWviCI+d46UyECggqIdFPlseOPTVr351Fkj6yle+0l6vvPLKBvm0s8x2y5cvn7QB/770pS9NzHx+/vOfb+az7S6//PJ2LNnefsfHWVY2lxVEKpVKpVKpVCptdQoo4pjGxpEVef+DH/ygOUdvf/vbh+OPP3448MADh8c//vHDfvvtNxx66KHDK17xiuEjH/nI8P3vf38CnJYyCmJ71cc+9rHhkEMOGZ7whCcMj33sY2fZ4x73uGbWmYMTTzxxOPfcc5ujCjL0MGoMOErrl7ECY6655pphampqOOOMM4bjjjtuOPjgg9vYP+lJTxqOPvro4eyzzx6+8IUvNLjaQzrbf/SjHx323nvvYZ999mk2nr8999yz2bHHHjtcfPHFc953AUq5L+3nM5/5zPDqV796eMYznjEccMABbf71/9SnPrXdh5deeunwne98px3/UoHDMUS69pTzJo7w2DneGixRQQE7YBHgY1lA09VXX93agkzWJSrpqquuanPwtre9bXjpS186PP3pTx/22muv4RGPeMTwyEc+cth///2Hk046aXjPe94zfO5zn2t9BFqNj6OsbF1WEKlUKpVKpVKptFUpzir1IKmHP145sFJtOLkvfOELh8MOO6w50IEaHKcHPOD/t3cmcFfPaf9/nmeesa/zGLswY4nKLoqUFjOy7yFlGSJKaJGQFgppoUKhlJIplRIhrXRLyb7MDBqyC+NvbKPb99/7quv4nt85d/c5932rc+4+79frep1zfts59+93fofvu+u6vvXD0UcfHdq3bx+ef/55y4bgWJIWuZMUPTxyDhER5557bthll13CRhttFH7/+9+HBg0apMQEkoIBbMOGDcORRx5pYm/s2LE24M2WHSNyA1mDWLjvvvtM8rRs2dKuA4+c9yZNmoTGjRubxLv77rtNPLi48/N+zz33hPXWWy/suuuu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;clipPath=inset(0.4% 57.33% 56.4% 0%);" parent="1" vertex="1">
- <mxGeometry x="122" y="82" width="279.7" height="118" as="geometry" />
- </mxCell>
- <mxCell id="795Xv0Ka93fOG331V9Xn-20" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=4;" parent="1" vertex="1">
- <mxGeometry x="621" y="79.5" width="284" height="151" as="geometry" />
- </mxCell>
- <mxCell id="795Xv0Ka93fOG331V9Xn-2" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=data:image/png,iVBORw0KGgoAAAANSUhEUgAABJEAAAHoCAYAAAD5W34cAACAAElEQVR4XuydB5iV1bWGTTP2buyxRGNFNHYMEcUGoiiKgg0RFOzYqWIHLIiKPYiKEkWxoCioFCsR0RhbTJPYk1yvN7m5aQbcl3fBd7LPP2eQGc4MM+b7nmc95y9773//ex+G2e+stfZSybIsy7Isy7Isy7Isy7K+REsVL1iWZTVV/eMf/7DZbHU0y7Isy7Isy6qWDJEsy2o2YkH8y1/+0mazLaL99a9/Lf4zsizLsizLsqx6yxDJsqxmI0Mkm61uZohkWZZlWZZlVVOGSJZlNRsZItlsdTNDJMuyLMuyLKuaMkSyLKvZyBDJZqubGSJZlmVZlmVZ1ZQhkmVZzUaGSDZb3cwQybIsy7Isy6qmDJEsy2o2MkSy2epmhkiWZVmWZVlWNWWIZFlWs5Ehks1WNzNEsizLsizLsqopQyTLspqNDJFstrqZIZJlWZZlWZZVTRkiWZbVbGSIZLPVzQyRLMuyLMuyrGrKEMmyrGYjQySbrW5miGRZlmVZlmVVU4ZIlmU1Gxki2Wx1M0Mky7Isy7Isq5oyRLIsq9nIEMlmq5sZIlmWZVmWZVnVlCGSZVnNRg0FkV5//fX09ttv17huszWWvfnmm2HF64trhkiWZVmWZVlWNWWIZFlWs1FDQKRRo0alXXbZJb322mtxvvvuu6fvf//7DQaVZsyYkdZaa63UtWvXGvdqs2KdcePGpY4dO6allloqXXnllTXKyyZNmpROOOGEtOKKK6bWrVvXuF8ta+gx+0+wmTNnpl133TWNHTu2xr3FMUMky7Isy7Isq5oyRLIsq9mo2hBpwIABaeutt04vv/xy6RpA6Xvf+16DAZEXX3wxrbHGGqlz58417tVmleqMHz/+SyGSbOONN25QiNTQY/afYsBCYNzQoUNr3KuvGSJZlmVZlmVZ1ZQhkmVZzUbVhEgjR45M3/72t9O0adNq3GsOJoh01VVX1bhXtGpBJMKtttxyyxrXm5o1l35WsokTJ6ZvfetbacyYMTXu1ccMkSzLsizLsqxqyhDJsqxmo2pBpDfeeCM8e4444oga95qLCSJdffXVNe4VrVoQ6bLLLkurrLJKjetNzZpLP2uz9u3bpw033DD94he/qHGvrmaIZFmWZVmWZVVThkiWZTUbVQsi4b0DgCEfUn6d8DaAyze+8Y3StWuuuSatu+66Uf7kk09OW221VVpmmWXS6quvnvr16xdlpk+fnvbaa68os9lmm6W+ffuW6g8aNCi8Ylq2bBn5bo4//vjIUbTbbruVPfvyyy+P0LqddtopQppatWoV13/+859XrCOIdMghh0Sfll122bTaaqulww47rCw8D6sEkV566aXUqVOntNFGG8VzseJ45Na/f/+05pprxtjwLoSwcb3SmPXo0SOtsMIKAUJ69uwZz2DM+Bw+fHi6+eab0z777BOgZ+WVV069evUqexbw5Iwzzoh2W7RoEZ8aa4ywue7du0efd9hhh7TJJpuk3r17L7SfGDmlGFvGgs999903xoF7hAWut956MaZnnnlmPJd3oC36x3h36dIlvguMNfP9s5/9LOoOGzYsoORyyy2XjjzyyCiz9NJLp8033zzeNX+32uY5txEjRlT8ftbHDJEsy7Isy7KsasoQybKsZqNqQSRAC4t0ctAU7x111FFlQATr06dPlL/22mvTk08+mZ544omAE1//+tfT1KlTowyJuQEiQKRim9tss0168MEHS+eUyYHQfffdl772ta9F25wDSYrQp1hHEOmss85Kr776asAm4AOAA0CR1y1CpHfeeSdtt912AV8EnE4//fQAH0899VRZ3dwOPPDAih4+lcaM5wFWbrzxxvTII48EEFl77bWj3JAhQ9L9998fY9KmTZt4jwkTJpTqkgycvlCP87vvvrss/9M555yTvvvd78auepyTM4q+fVk/mTPGiuMXXnghffOb3wwYpftnn312POeiiy5KDzzwQPSROlwDhtEP+nnSSSfFtYEDB5bqduvWLa5Nnjw55o8wScaA933ssceizKLMM0YbembxXl3NEMmyLMuyLMuqpgyRLMtqNqoWRNp2221rQA9ZJSAiiPTTn/60dO2mm26Ka7feemvpGot+rt15552la4CS7bffvqy9IhC6+OKLA0gBQ3Qtf1alOrUl1j722GPjeg6tihAJjyjK4LWja88991xcwwMoby+32uBMpTHjeTw3v4YnF8/IPaUEiABgnBNqCAhr27ZtWV28mNi9jOMOHTqEFw8wTPfz8aqtn+xql59vsMEGaY899iidCyIBmHTtjjvuiGvk0NI14A/vm++wJ4iUt//MM89EObzFOF+UecbwcKKtSoCprmaIZFmWZVmWZVVThkiW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pTb79ttv0913350222yztMEGG6Sddtop7nmyiBCmhx56aNpoo41CDg0cODCkgn4j9AVZRv379499+/btm84555wQRtdcc0065ZRT0lZbbZVWWmmltMMOO6THH388ff3113EtOkYxM0r3BEHGCxlNyKPVV189ruHoo49OTzzxROm3pu9UnAZXabqqRMprGUko8TviPfIHGdivX7902mmnpRdffLE0yJdYQiLxmX6m7Q888MC05pprpkUWWSRtuOGG8Xt8+umnm53X4SgXlkjGGGOMMaZSjFaJpAGoptEMHTo0ps3wP/DHHntsDKLJhpl44oljEMZgS4Wf82NaIrWPltqN9//617/SnXfemQ477LC04oorpummmy6tv/76IfYYwIty+5tG8vbN2ygXSUgHxOiUU06ZVllllRA/CAUyhIgnn3wy7bXXXmmyySZLW2+9dbrxxhtLv5dPPvkkDR48OG288cZpoYUWCoH09ttvx3oKZr/66qshnshsWnTRRdOFF14Yx+Y6inIrD35/SBD6n/1322231KtXrzTjjDOmQw45JGSU9tc+lkiNoZpIKphNO5JhxHKmJSKCVl111ZCFNTU1sQ/bqNYR8fzzz8cUUoTRLrvsEr+/qaaaKq2wwgqRCWaJ5GhrWCIZY4wxxphKUTWJpKyFfKBJ1gt1jjTgZnB8/PHHx/Se5557LmohkZHBQAqJRIYEmUoamEs+mfZDu/F0tuKUJjJWTj/99HTUUUeFyGM62/LLL5+uuOKKGBAL9mffooSyVGpEwiZ/gqDah/udzBPaeeqpp46MIuQD/aFtmCp2wQUXxL1P+7Mtx2Lfzz77LF1++eVpm222CdFK3STkkfrzq6++iho6a6yxRlpwwQVDQCCW2JdtlIVUFEBcE78zppA+/PDDUQOJqYyIRKbG3X///U2+W7XEUU5XlUjIIGUV8TmXSkjxZZZZJi2xxBJp2223TY8++miTqWu1tbXxZx+y78gjj4xsJUQeGUlzzjlnyKSTTz45ss+K53U4yoUlkjHGGGOMqRRVkUiSRMpgECruy2CWoO4LUz/IRmKgzCsigzovyKU333yzySPoi1LKtA31h9qPoC8QDAx6yZZAbNTU1MR0q+WWWy716dMnxJ6knY6R92ee5dJdkWDRvV6uTVhOxhcFyxEH1DwiC4jtEDO6x5E5k046aUzpJDNIy9kW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Y8wYgyWSw9F6WCIZY4wxxphKYYlkjBljsERyOFoPSyRjjDHGGFMpLJFMh2loaCguMl2Iurq69L///S/997//jfedzejo/zFdIjGoLy5zODo7LJGMMcYYY0ylqJpEqq+vT3/88Ue8CgahfCZ4n38uLmMQXNx32LBhTZaZtkP70aZqY/qmKBqKkkD9ArQ9giLvAx2ruF93pHgv634WeVtqe6AP6Iv83qedWab91E+80v75cfP2ZxD51FNPpfvuuy999NFHZfslP4+uh+Pq3tA2nJ9zCbatlJwaGV1ZIjFg//DDD+OVtqfNeWUd7z/44IP07rvvxvt//vOfTYSS3ueDf46Vf9Z69uc963W+fF+d09F9wxLJGGOMMcZUiqpIJAahGhxrMK3BsOSQBqXff/99DIyee+659OCDD6Y77rgj3XLLLemee+6JATGDr59++im2t0TqGHn7v/POO+n+++9PN910U7r55pvTbbfdlm699dYmceedd6YHHnggPfPMM9E3//73v6OvJBbyPlT/dmfUBrmcURtpOZ//85//pB9//DEGey+++GJ6+OGHo63ph9tvvz09/vjj6b333ks//PBDiKT8OPDmm2+mG2+8MX4f6ive6/Npp52Wjj322HTmmWem1157rXRu9U8ui3Rs+hRJQV8jn/j96dj8Hl9++eX0+eefp6FDh8Y9oN9gftxK0lUlEoN1iR8+FyUSr0gk+pM/wySRcpH09ttvp2effTb+rLv22mvTJZdcki688MJ0wQUXxHvuCf4M5DiSR/n+uUAqrnN0r7BEMsYYY4wxlaIqEkkD6fwzg2JlsjD45PVf//pXeumll2LQtP3226eePXumaaedNk088cRprrnmSptuumm6+OKLQ3woW8O0n7w/BgwYkHr06JEmn3zyaOdJJpkkTTTRRKX3vNIH888/f9pqq63SueeeG4PjX3/9tcnx6A/1Z3eGe7KYcaflyhzSK3LojTfeSBdddFHaddddU+/evdMss8ySpphiijT11FOn1VdfPZ1xxhkxEGQfiSRxzDHHRF+1FBNOOGFaZJFF0vHHH59eeeWVJlKL90ggjim4buQQAmO77bZL88wzT5pqqqniPuAeWGqppVKfPn1CZnzyySel7ySZWPzOlaCrSqRiBhKSSEKJ5e+//36813Jtq/fs8/TTT6dLL7007bLLLmnFFVdMc845Z/wuib/85S9pyy23TGeddVZ64YUXIqOJY3388cclWZBnIClLqXidju4RlkjGGGOMMaZSjDaJlGcxAP/gJRtm5513jsHSnnvumQYNGpTOP//8dM4556Tddtstrb322mmVVVaJgRbZEL/99lvVp9OMDUja0X5klpx66qlpttlmi6B9aferrroqXXnllSHtkBUIvOWWWy6tv/76MZB96623SsfJM5Hy7JbuiESNMnNyUapg/XfffRfZXTvttFPaZJNNQtogjLi3kagHHHBA2mijjdIKK6yQ/va3v6VXX301joOwkfw54ogjQvLwuzjyyCOjv4grrrgijsMrmWX0MeeT9NH1qe/g999/j+04DkJr9913T6effnoIrssuuyzkIde06qqrpq233jp+l2RRcS25mKo0XV0i5cs0kCeri77ld0SbkhUm+VNbWxtC6LHHHksHH3xwWnPNNeM3uO+++8bv8KSTTor33AtIvG222SZdfvnl6fnnnw+JpKltOncuD4rX4+g+YYlkjDHGGGMqRdUkUj7A5LOyKggGxgy0GGSR/bDWWmvFIJXpHWQnEVdffXXaYostIiuCwSwZSwxiu3vmS0egL2hzpqXRD2RAkI204IILhqxjECLhgWhi2tR5552XlllmmRBN2267bRoyZEjpOBIREiTVykrpquSyiClreY0jLUcAIOOmm266yDo57rjjQib8/PPPMV3zySefTHvttVdkgm2++ebpuuuuK2UjcUzkDcKH/jjkkEPSE088Ufqd6fcloZf3R/5b1O+PQDKRgTT33HOn9dZbLw0cODDEiKatMc0UyYtMXGihhdIOO+wQg9RffvmlyXerNF1RIjFQZ4qZMop4pe00bY1pgfzZtdJKK4WA4886JBL7fvrppyGVmJbI+llnnTVtuOGGMX2NwT+/PfZHJi2wwAJp0UUXTQcddFB66KGHmgkjSSPOWbxGR/cKSyRjjDHGGFMpqiKRijDYVEYEA2wGzfxPPANp/rf9hBNOKGU5aBDMQIvlU045ZUgMarUwoHQmUvuh3fPsoZqampB38847b2TGMCCWbKB/mLpGf9DuM888c2TOUEdJx8rlhTORmhZ8V9vonldQG+eUU06JqUrULWLAh7BTphGC7+9//3tMSeM3QVZKMaOJ3wvShwwWpB5ySeeTcCJa6gv9ttiGwSa1k/h9HXbYYZH5xDUo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e8VVV12Vttlmm9ju8MMPb7a+M6Ij38fRPK6//vq0zjrrpJqammbrOiOaSSQGZoihP/74I/6X/5tvvmkWX3/9dfryyy/TZ599lr744ot473A4HNWO9957Lz333HMOh6NMPP/88+mll16K12eeeSY99dRT6ZFHHmnyl74xxhjTnaiUROLv2QUXXDCddtpppWUvvPBCmmGGGdLWW2/dbPvOiquvvjpNOumk6Ywzzmi2rqU46KCD0pRTTpkeeuih0rJ+/fq1KpEI/k1RSYnUke/jKB+33nprmmOOOdJdd93VbN2oRlmJRIbRd999l4466qi03nrrhcVae+21S7H++uunDTbYoNlyh8PhqGasuuqqaYUVVnA4HGVixRVXTCuttFK88nn55ZdPyy23XJO/9I0xxpjuRCUk0vvvv5969epV0YyjSockEjKsuC6PzpRIDzzwQHiF4vKuFmPKdZaLAQMGhMhEaBbXjUo0k0hkISGR+F9+JNH444+fxhtvvDTuuOPGDUNMOOGEaeKJJ451LHc4HI7REfozyeFwtBz8VvT3OH9vG2OMMd2VSkikY489Nv6ebU3AdOWQRCKTubguj86USJtuumkkrBSXd7UYU66zXPCUXqZUbrXVVs3WjUo0k0h66hpT1viffv7BOcEEE8SrhBKfEUn67HA4HA6Ho2sGf2dPNNFE8fc2YYwxxnRXKiGR5pprrrTEEks0Wfb222+nPfbYI6aNkQ3MMh5usdZaa4WEWX311UNMkCXC39HUJFL9moEDB6bpppsuttt2223T/fffH8uZfrbjjjvGGJwpaXzecsstYzvqHOncyKx11103romYd9550wUXXBDrLrvssshMZp+bbrqptI8kEtfMFCiuafbZZ0+HHnpo6eEcREsS6fzzz0+LLLJI6tmzZ5p77rnTdtttF22Qb6OgHAVZW/ybZOqpp069e/eO85b7PhQpp834jzDabPPNN0+zzDJLTHlbfPHFY8rWySefnJZZZplYNuuss8a15Oe777770sorr5zmn3/+CGYyPPbYY6X1t9xyS1pyySXjGFz/QgstlB5//PEWr5N97rzzzvi+tC/9O88885TqOI3qNe+6666RsMPxOc7000+fJplkksguf/jhh0vbjayf8+A7cLxXX3212bqORjOJpIK1v/32WzTejTfeGEFxJuKGG25o8t7hcDgcDkfXDf2dTVx55ZVN/tI3xhhjuhOdLZGoIYT02GGHHZqtIxZYYIGSRFIggVZZZZUQEYgj5AP/6YNA0TbIG4573nnnNdn30ksvTWuuuWbpM7UPixKJY2+yySZN9jnmmGNKnxEWLUkk/q3w7rvvppdffjntv//+sYxXbVdOIl1xxRWxjKlTfFYtqNayX8iQKWb4lPs+BFJr2WWXTYMHDw4pNGjQoGhHhBXf5+67745rn3POOaNoOE+mZT8yq6aaaqq00UYbxTIyc5Ax7Md7xB6C6NRTTy2dC1F0zz33jPQ6aVNEnj7vvPPO8Z92r7zyyihfM4HIWnjhheP6uc477rgjpN5ss80W/cM2rfWzAmFFm9JPxXUdjWYS6ffffw+BRPBekS/T++I2DofD4XA4ulbkf2cTxhhjTHelsyWSBEpReihakkhkFOXLyDpZdNFFS5+ROGSfLL300k22W2ONNeIpafpcTrrMOOOMaaeddip9Rk5wPH0emUQqFtamWDgSRtlI5SQS3w8JguzQMp7iRvYL9aLy4+VRTs6U+z4EQobspnwZ2VtcX77s4IMPjv1VA4jj8DmXQkg7lpEowwNHeJ9nAr355pshl/S53HXSTvn0xTPPPDOOg+zRso5eM4FEQkDl25111lmxnYq3t9bPCuRSsc9GNZpJpCafjDHGGGOMMcaYsYDOlkgSEtRFKq4j2iqRmE6FOMiXMZUtFyA8ZZXpWHnGSjnpsvHGG8dUqr/+9a8hSvLtifZIJF3DE088EZ/LSSQk02KLLdZkP4mRfNpYMcrJmXLfhygnZMjEYRpZvqz4PSjPw+d8ah1Z2ixj2iDii+lkU0wxRWRcDRkypMnxiHLXWYyzzz47jslUNS3r6DUT5SQSWWtst9tuu8Xn1vpZQbYT++25557N1nU0LJGMMcYYY4wxxoz1dLZEYhoUA/Tjjjuu2TpiVCTSgw8+GMfWtDAkx/HHH99km3LShUwa6uowTYt1SIv8Me/tkUiIB5ZzLXwuJ5H4PpwL6aFgKhZTr8j0yY+XRzk5U+77EB0VMrQ9oiW/NuoScW1nnHFGbPPoo4/GdVD7iH05LtcxsutkKuIWW2yRVltttXhqPTWJKi2RXn/99dgOecTn1vpZIWmWZy2NalgiGWOMMcYYY4wZ6+lsiXTOOefEAP3II49sto4YFYlEUBCaaW1MdaJwMkWb8/UtSReCqWQXXnhh1CeiWLaWt0cikeXC8hdffDE+l5NISIzid2xLlJMzLX2fjgoZPW0+36aleO2112J/ts/rORWvkzagT8gIUvZPNTKRyAZju+K901I/K5j+yH777LNPs3UdDUskY4wxxhhjjDFjPZ0tka699toYoOfFp/MYVYmkmks8yatcJkk56XL55Zc32aZ///6xjer8tEciITzmm2++0udyEmm55ZYLgZHXRGpL8MSySkskTat74IEHmmynePbZZ9O9997bZBmFy8lW0ufidfKQEo7Jq5ZVQyKp36iNxOfW+rm4X7mi2x0NSyRjjDHGGGOMMWM9nS2ReGw606U23XTTZuuIUZVIZLqQgcQ5ytXrKSddevToEbJHn7feeuso3K3PbZVIJ554Ypw3LzpdTiKRBcMysnd4mhjLqEFEDR9tUy4oMI1Qeeutt0qPny/3fYiOChnqSE022WRRswmRRHuSucO1Ib2oN0Wxcj3x7L333ou6U6o7VO46Nc2Q6+EzdZ94Ol8lJRJT2Xr27Bn3E9fIstb6uXh86iYV13U0LJGMMcYYY4wxxoz1dLZEIqiHg3jIlz388MNpl112SVNOOWVk6ey+++4hG/r06RNihuweCjuzLcJk+umnj2lh5abFDRgwIB5LX1xOltLmm28egoAaRGRDIUl4nD2iguwl5NRaa61VKnBNTSUyh9gHeaInfSFTmLrGOp4gxuPke/funS655JLS+ZgWhShiX6TMYYcdVlpHJg6SgyeyTTvttJHJc8oppzS75jyYCsh35slu1BYis6b4fRA3tNl4440X3wl5hfzZb7/90kwzzRQFsanbxHS7QYMGxXVJaEnKUCcIecO2k08+ecgXjomMYRtkDXKG796rV6/I+MoLcRevkzbed999YxmCiswlFVin7W6//fZRvmYkEvfE6quvnpZffvk011xzpc0226yJNBpZP+dBDSWuvZihNCphiWSMMcYYY4wxZqynEhJJmT0tTZlyONobSKQVV1yx2fL2BhIOkdnSdMuOhiWSMcYYY4wxxpixnkpIJIKaOWSNFJc7HB2J4nS2jgYZU2RedWYWEmGJZIwxxhhjjDFmrKdSEonpTzwJjFo67S0w7XAUozMkElPlmJ6XT4HrrLBEMsYYY4wxxhgz1lMpiUR8+OGH6aSTTopCxsV1Dkdbg6lnU001VZpuuunSzjvvnB59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41XT1DiG2pjjsC39q6ev5cdXX0lMcT1sL8mEONp8883TXHPNFX0088wzp6WWWioNGDAgffnll6X7g304rqZFSlqpwDrbFSUjwfkQh8cde2zq2bNnmnHGGSOmnXbatOOOO8Z+o9IflkjGGGOMMcYYY8ZqKiWRFAzchwwZkk477bR08MEHp9122y1Ey0477ZR23nnndMABB0S2jgQFYuKxxx4LcbD77ruXtmVfslKee+650vQqZaZIQEnSKEuIZZJOZJogcxZYYIE03njjpXHHHTdtvPHGkZGE6JIYeuaZZ9LZZ5+ddthhhzgv75VVkwsYzsln3it76emnn05XXHFFWmONNdI000yTxhlnnJAVfMcXX3yxtK8Eko5XbLNKhASPxJGWaT3XTnZO37590y677BLtTtBfe+21V3yvF154oZRFhKQ79dRT0z777FPq00MOOSSde+650X+cg/Opb/J+0nnVrpI+ZAhxzCWXXDLEzqSTTpp69+6djj/++JIQUvYX5+G89NHf/va39OSTTzaRXPpe+fdFVpF5huxDVs0///xpsskmS+OPP37acsstS2Kto31iiWSMMcYYY4wxZqymUhKJ40jy3HfffWnfffeNTKCJJpooBA5Btg6ZJgMHDixljCB0mBJGltCss84awmfqqadOK6ywQoiDRx55JLJZOIfEhDJ7lOXCMokaHRdBxHGXXXbZkDscd6ONNgqJRBYR2yCw7r777rTddtuFWOAat91221KWC8dHYChDin1Yh3TgMzKJ4s3IDbJp2H+hhRZK++23X3r11Vdje7WLpFe1RBLnJDuI95JfeV8z5Q6BQ/vQ3uqjKaaYIs0777zpuOOOC9GkjC9kzB577BEiRtvRl4cddli64447YjtlGOXZQJxLGWV8b9qU7CFleHGvbLjhhmm22WYLicQxkUiSglw7/UXmEAKIfkQA3X777XEezqnsJLWr2lgZUzU1Nemoo45KK664YppkkklKx9A15RKqPWGJZIwxxhgzFtHwxQ/FRcYY0+2plERSRgcZJgiFJ554Igbq0003XZpggglCJs0333zp6KOPTvfff39J9Kig8jnnnJM22GCDNOGEE6ZVVlklnXjiiZFtgkBACnAOtlONHgmAPJNE7/WdyDJCHEgikYmEmGI6G8ekXg4ZS0gkSRTeS4AQOrbeS1Yo4wlZhDDr0aNH7M8r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LcvybL8lx6Ns27KCSKVSqVQqlUqlrU4c4J///OcNJEXe//KXv5w4yL/61a8mjnLa33DDDcNPf/rT9pr3N954Y9su7UvzUw8HelhgTH/yk59Mxrq3LPf6ox/9qL3/xS9+MWvOAhMs64FDaf0yVu6F3AOub+P84x//eNb177N1c0Efc2de+vnz+Yc//GFbdtlllw3vete7htNOO2245JJLZsEh2wbw9lAo96d92jcQNb4uXAP9vbsUmrnm+lkQ6fq/OWviCI+d46UyECggqIdFPlseOPTVr351Fkj6yle+0l6vvPLKBvm0s8x2y5cvn7QB/770pS9NzHx+/vOfb+az7S6//PJ2LNnefsfHWVY2lxVEKpVKpVKpVCptdQoo4pjGxpEVef+DH/ygOUdvf/vbh+OPP3448MADh8c//vHDfvvtNxx66KHDK17xiuEjH/nI8P3vf38CnJYyCmJ71cc+9rHhkEMOGZ7whCcMj33sY2fZ4x73uGbWmYMTTzxxOPfcc5ujCjL0MGoMOErrl7ECY6655pphampqOOOMM4bjjjtuOPjgg9vYP+lJTxqOPvro4eyzzx6+8IUvNLjaQzrbf/SjHx323nvvYZ999mk2nr8999yz2bHHHjtcfPHFc953AUq5L+3nM5/5zPDqV796eMYznjEccMABbf71/9SnPrXdh5deeunwne98px3/UoHDMUS69pTzJo7w2DneGixRQQE7YBHgY1lA09VXX93agkzWJSrpqquuanPwtre9bXjpS186PP3pTx/22muv4RGPeMTwyEc+cth///2Hk046aXjPe94zfO5zn2t9BFqNj6OsbF1WEKlUKpVKpVKptFUpzir1IKmHP145sFJtOLkvfOELh8MOO6w50IEaHKcHPOD/t3cmcFfPaf9/nmeesa/zGLswY4nKLoqUFjOy7yFlGSJKaJGQFgppoUKhlJIplRIhrXRLyb7MDBqyC+NvbKPb99/7quv4nt85d/c5932rc+4+79frep1zfts59+93fofvu+u6vvXD0UcfHdq3bx+ef/55y4bgWJIWuZMUPTxyDhER5557bthll13CRhttFH7/+9+HBg0apMQEkoIBbMOGDcORRx5pYm/s2LE24M2WHSNyA1mDWLjvvvtM8rRs2dKuA4+c9yZNmoTGjRubxLv77rtNPLi48/N+zz33hPXWWy/suuuu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;clipPath=inset(42% 0.33% 0% 56.33%);" parent="1" vertex="1">
- <mxGeometry x="623.13" y="82.5" width="279.73" height="156" as="geometry" />
- </mxCell>
- </root>
- </mxGraphModel>
- </diagram>
-</mxfile>
diff --git a/.docs/images/branching-strategy.png b/.docs/images/branching-strategy.png
deleted file mode 100644
index b0972fc50b2e0c432a068014474441667245fec0..0000000000000000000000000000000000000000
Binary files a/.docs/images/branching-strategy.png and /dev/null differ
diff --git a/.docs/stylesheets/extra.css.map b/.docs/stylesheets/extra.css.map
deleted file mode 100644
index c3ef178e381d3e218393d408142f135d54cd5bb1..0000000000000000000000000000000000000000
--- a/.docs/stylesheets/extra.css.map
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "AAAA;6BAC8B;EAC5B,qBAAqB,CAAC,QAAQ;EAC9B,oBAAoB,CAAC,QAAQ;EAAE,gBAAgB;EAC/C,2BAA2B,CAAC,QAAQ;EAAE,gBAAgB;;AAGxD,8BAA+B;EAC7B,QAAQ,CAAC,IAAI;EACb,qBAAqB,CAAC,uBAAuB;;AAG/C,cAAe;EACb,MAAM,EAAE,iBAAiB;;AAG3B,yCAA0C;EACxC,KAAK,EAAE,gBAAgB;;AAIvB,oGACQ;EACN,KAAK,EAAE,gCAAgC;EACvC,UAAU,EAAE,OAAO;;AAIvB;0DAC2D;EACzD,KAAK,EAAE,0BAA0B;EACjC,aAAa,EAAE,oCAAoC;EAEnD;;kEACQ;IACN,KAAK,EAAE,gCAAgC;IACvC,aAAa,EAAE,0CAA0C;;AAK7D,UAAW;EACT,gBAAgB,EAAE,gCAAgC",
-"sources": ["extra.scss"],
-"names": [],
-"file": "extra.css"
-}
diff --git a/.env b/.env
index d191e59edda36e8ca7795d1da35710d28129cfdc..8d853a59c1daed935f68a1f1aab5cdbd387f8cdc 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-APP_VERSION=1.9.2
+APP_VERSION=1.9.3
FLUENTBIT_VERSION=4.0.0
GRAFANA_VERSION=11.4.0
MARIADB_VERSION=11.3.2
diff --git a/.gitignore b/.gitignore
index e3181c1faa7031474b35ea0580e15852ce977c24..beb4a2437320a63bb9fec14e7a83930ba2394487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,6 @@ venv/
# Docs
swagger.json
container.md
-database.md
query.md
table.md
.git.bfg-report/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 343f177b69367fc944664e0afbcb6db54fa1c00f..75cb231afe22c55eb73f8f3c7d19f8e5ebee331b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,9 +12,9 @@ variables:
REGCLIENT_VERSION: "0.8.2"
BUN_VERSION: "1.1.40"
DOC_VERSION: "1.9"
- APP_VERSION: "1.9.2"
- CHART_VERSION: "1.9.2"
- SUPPORTED_VERSIONS: "1.8.0, 1.8.1, 1.8.2, 1.9.0, 1.9.1, 1.9.2"
+ APP_VERSION: "1.9.3"
+ CHART_VERSION: "1.9.3"
+ SUPPORTED_VERSIONS: "1.8.0, 1.8.1, 1.8.2, 1.9.0, 1.9.1, 1.9.2, 1.9.3"
SUPPORTED_ARCH: "linux/amd64"
MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-service, search-service-init, storage-service-init, ui"
CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
@@ -149,9 +149,9 @@ lint-open-api-version:
- 'apk add --no-cache bash wget'
- 'wget https://github.com/mikefarah/yq/releases/download/v${VERSION}/${BINARY} -O /usr/bin/yq && chmod +x /usr/bin/yq'
script:
- - yq '.externalDocs.url' ./.docs/.openapi/api.base.yaml | grep -o "${DOC_VERSION}" > ./openapi-doc-version.txt
+ - yq '.externalDocs.url' ./docs/.openapi/api.base.yaml | grep -o "${DOC_VERSION}" > ./openapi-doc-version.txt
- diff ./openapi-doc-version.txt ./doc-version.txt
- - yq '.info.version' ./.docs/.openapi/api.base.yaml | grep -o "${APP_VERSION}" > ./openapi-app-version.txt
+ - yq '.info.version' ./docs/.openapi/api.base.yaml | grep -o "${APP_VERSION}" > ./openapi-app-version.txt
- diff ./openapi-app-version.txt ./app-version.txt
build-metadata-service:
@@ -509,7 +509,7 @@ test-storage-service-init:
before_script:
- "apk --no-cache add s3cmd bash libxml2-utils"
- "docker compose build dbrepo-storage-service-init"
- - "mkdir -p /app/"
+ - "mkdir -p /app/config /var/log/app/service/storage"
- "echo ${CI_S3_CONFIG} | base64 -d > /app/.s3cfg"
script:
- "bash ./dbrepo-storage-service/init/tests/test_integration_expire.sh"
@@ -575,6 +575,7 @@ release-images:
script:
- "make release-images"
- "APP_VERSION=$DOC_VERSION make release-images"
+ - "make release-jupyter-image"
release-helm:
stage: release
@@ -617,12 +618,12 @@ release-docs:
script:
- "make gen-lib-doc gen-docs-doc package-config"
- "cp -r ./lib/python/docs/build/html ./final/${DOC_VERSION}/python" # sphinx
- - "cp .docs/.openapi/api.yaml ./final/${DOC_VERSION}/rest/api.yaml" # openapi
- - "cp .docs/.openapi/swagger-ui.html ./final/${DOC_VERSION}/rest/index.html" # openapi
- - "cp .docs/.openapi/custom.css ./final/${DOC_VERSION}/rest/custom.css" # openapi
+ - "cp ./docs/.openapi/api.yaml ./final/${DOC_VERSION}/rest/api.yaml" # openapi
+ - "cp ./docs/.openapi/swagger-ui.html ./final/${DOC_VERSION}/rest/index.html" # openapi
+ - "cp ./docs/.openapi/custom.css ./final/${DOC_VERSION}/rest/custom.css" # openapi
- "cp -r ./site/* ./final/${DOC_VERSION}" # mkdocs
- "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist
- - "cp .docs/index.html.tpl ./final/index.html" # redirect patch docs
+ - "cp ./docs/index.html.tpl ./final/index.html" # redirect patch docs
- sed -i "s/DOC_VERSION/$DOC_VERSION/g" ./final/index.html
- "bash ./.gitlab/gen-badge.sh"
- eval $(ssh-agent -s)
@@ -633,7 +634,7 @@ release-docs:
- tar czf ./final.tar.gz ./final
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa final.tar.gz $CI_DOC_USER@$CI_DOC_IP:final.tar.gz"
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa versions.json $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/versions.json"
- - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa .docs/index.html.tpl $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/index.html"
+ - "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa ./docs/index.html.tpl $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/index.html"
- 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo; rm -rf ./final"'
release-libs:
diff --git a/.jupyter/.env b/.jupyter/.env
deleted file mode 100644
index d4f516cc68269c6ff8aa6ce5e0202e8999d8e237..0000000000000000000000000000000000000000
--- a/.jupyter/.env
+++ /dev/null
@@ -1,4 +0,0 @@
-# Set your credentials here
-REST_API_ENDPOINT="https://dbrepo.example.com"
-REST_API_USERNAME="foo"
-REST_API_PASSWORD="bar"
\ No newline at end of file
diff --git a/.jupyter/.ipynb_checkpoints/starter-checkpoint.ipynb b/.jupyter/.ipynb_checkpoints/starter-checkpoint.ipynb
new file mode 100644
index 0000000000000000000000000000000000000000..4580f03e61969806595be9a84bd31b5c7d8e1935
--- /dev/null
+++ b/.jupyter/.ipynb_checkpoints/starter-checkpoint.ipynb
@@ -0,0 +1,324 @@
+{
+ "cells": [
+ {
+ "cell_type": "markdown",
+ "id": "3ca0c15a13bd6882",
+ "metadata": {},
+ "source": [
+ "# DBRepo Starter Notebook\n",
+ "\n",
+ "## Environment\n",
+ "\n",
+ "Set the REST API endpoint and your username + password in the `.env` file. This ensures it is not revealed in the code."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 2,
+ "id": "4eb6c2470f464173",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:08:17.369993Z",
+ "start_time": "2025-06-04T07:08:17.362901Z"
+ }
+ },
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "2025-06-04 09:13:12,070 dotenv.main WARNING python-dotenv could not parse statement starting at line 3\n",
+ "2025-06-04 09:13:12,071 dotenv.main WARNING python-dotenv could not parse statement starting at line 4\n"
+ ]
+ }
+ ],
+ "source": [
+ "import dotenv\n",
+ "from pandas.core.interchange.dataframe_protocol import DataFrame\n",
+ "%load_ext dotenv\n",
+ "%dotenv"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "2cbd7a83a800b879",
+ "metadata": {},
+ "source": [
+ "The code above loads the values from the `.env` file into this Jupyter Notebook. Alternatively you can set all parameters directly in the method:\n",
+ " \n",
+ "```python\n",
+ "client = RestClient(endpoint='https://test.dbrepo.tuwien.ac.at', username='foo', password='bar')\n",
+ "```\n",
+ "\n",
+ "## Global Imports"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 3,
+ "id": "319e797ebb89b17b",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:08:17.403777Z",
+ "start_time": "2025-06-04T07:08:17.399725Z"
+ }
+ },
+ "outputs": [],
+ "source": [
+ "from dbrepo.RestClient import RestClient\n",
+ "\n",
+ "client = RestClient()"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "dc1ee2ab9378917",
+ "metadata": {},
+ "source": [
+ "## Tables\n",
+ "\n",
+ "Load data from any table into a `pandas` DataFrame."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 5,
+ "id": "initial_id",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:08:18.062219Z",
+ "start_time": "2025-06-04T07:08:17.505168Z"
+ }
+ },
+ "outputs": [
+ {
+ "data": {
+ "text/html": [
+ "<div>\n",
+ "<style scoped>\n",
+ " .dataframe tbody tr th:only-of-type {\n",
+ " vertical-align: middle;\n",
+ " }\n",
+ "\n",
+ " .dataframe tbody tr th {\n",
+ " vertical-align: top;\n",
+ " }\n",
+ "\n",
+ " .dataframe thead th {\n",
+ " text-align: right;\n",
+ " }\n",
+ "</style>\n",
+ "<table border=\"1\" class=\"dataframe\">\n",
+ " <thead>\n",
+ " <tr style=\"text-align: right;\">\n",
+ " <th></th>\n",
+ " <th>acronym</th>\n",
+ " <th>organization</th>\n",
+ " <th>ror</th>\n",
+ " <th>lat</th>\n",
+ " <th>lng</th>\n",
+ " <th>url</th>\n",
+ " </tr>\n",
+ " </thead>\n",
+ " <tbody>\n",
+ " <tr>\n",
+ " <th>0</th>\n",
+ " <td>dataLab</td>\n",
+ " <td>TU Wien</td>\n",
+ " <td>https://ror.org/04d836q62</td>\n",
+ " <td>48.19952574</td>\n",
+ " <td>16.36693332</td>\n",
+ " <td>https://s34.datalab.tuwien.ac.at/</td>\n",
+ " </tr>\n",
+ " <tr>\n",
+ " <th>1</th>\n",
+ " <td>DS-IFS</td>\n",
+ " <td>TU Wien</td>\n",
+ " <td>https://ror.org/04d836q62</td>\n",
+ " <td>48.19889447</td>\n",
+ " <td>16.36987750</td>\n",
+ " <td>https://dbrepo1.ec.tuwien.ac.at</td>\n",
+ " </tr>\n",
+ " <tr>\n",
+ " <th>2</th>\n",
+ " <td>TUDa</td>\n",
+ " <td>TU Darmstadt</td>\n",
+ " <td>https://ror.org/05n911h24</td>\n",
+ " <td>49.87486230</td>\n",
+ " <td>8.65636633</td>\n",
+ " <td>https://tudatabases.ulb.tu-darmstadt.de</td>\n",
+ " </tr>\n",
+ " <tr>\n",
+ " <th>3</th>\n",
+ " <td>UHH</td>\n",
+ " <td>Universität Hamburg</td>\n",
+ " <td>https://ror.org/00g30e956</td>\n",
+ " <td>53.56304986</td>\n",
+ " <td>9.98838274</td>\n",
+ " <td>https://dbrepo.fdm.uni-hamburg.de</td>\n",
+ " </tr>\n",
+ " <tr>\n",
+ " <th>4</th>\n",
+ " <td>UPCE</td>\n",
+ " <td>University of the Philippines Diliman</td>\n",
+ " <td>https://ror.org/03tbh6y23</td>\n",
+ " <td>14.65490814</td>\n",
+ " <td>121.07216843</td>\n",
+ " <td>None</td>\n",
+ " </tr>\n",
+ " <tr>\n",
+ " <th>5</th>\n",
+ " <td>USM</td>\n",
+ " <td>Universiti Sains Malaysia</td>\n",
+ " <td>https://ror.org/02rgb2k63</td>\n",
+ " <td>5.14588662</td>\n",
+ " <td>100.49289291</td>\n",
+ " <td>https://atmosfera.usm.my/dbrepo/</td>\n",
+ " </tr>\n",
+ " <tr>\n",
+ " <th>6</th>\n",
+ " <td>UTeM</td>\n",
+ " <td>Technical University of Malaysia Malacca</td>\n",
+ " <td>https://ror.org/01xb6rs26</td>\n",
+ " <td>2.31371743</td>\n",
+ " <td>102.32115732</td>\n",
+ " <td>https://dbrepo.utem.edu.my/</td>\n",
+ " </tr>\n",
+ " </tbody>\n",
+ "</table>\n",
+ "</div>"
+ ],
+ "text/plain": [
+ " acronym organization \\\n",
+ "0 dataLab TU Wien \n",
+ "1 DS-IFS TU Wien \n",
+ "2 TUDa TU Darmstadt \n",
+ "3 UHH Universität Hamburg \n",
+ "4 UPCE University of the Philippines Diliman \n",
+ "5 USM Universiti Sains Malaysia \n",
+ "6 UTeM Technical University of Malaysia Malacca \n",
+ "\n",
+ " ror lat lng \\\n",
+ "0 https://ror.org/04d836q62 48.19952574 16.36693332 \n",
+ "1 https://ror.org/04d836q62 48.19889447 16.36987750 \n",
+ "2 https://ror.org/05n911h24 49.87486230 8.65636633 \n",
+ "3 https://ror.org/00g30e956 53.56304986 9.98838274 \n",
+ "4 https://ror.org/03tbh6y23 14.65490814 121.07216843 \n",
+ "5 https://ror.org/02rgb2k63 5.14588662 100.49289291 \n",
+ "6 https://ror.org/01xb6rs26 2.31371743 102.32115732 \n",
+ "\n",
+ " url \n",
+ "0 https://s34.datalab.tuwien.ac.at/ \n",
+ "1 https://dbrepo1.ec.tuwien.ac.at \n",
+ "2 https://tudatabases.ulb.tu-darmstadt.de \n",
+ "3 https://dbrepo.fdm.uni-hamburg.de \n",
+ "4 None \n",
+ "5 https://atmosfera.usm.my/dbrepo/ \n",
+ "6 https://dbrepo.utem.edu.my/ "
+ ]
+ },
+ "metadata": {},
+ "output_type": "display_data"
+ }
+ ],
+ "source": [
+ "deployments = client.get_table_data('71183815-021d-40d1-884e-3e58bd43b169', '0b533238-e73e-43ec-a773-04ed75349b7a')\n",
+ "display(deployments)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "39095623-65a4-4de9-bbab-419946e5c428",
+ "metadata": {},
+ "source": [
+ "Import data from a `pandas` DataFrame."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "f85f8c85-16f9-4b42-88af-e5a50b4729e4",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# optional: update table data from `pandas` DataFrame\n",
+ "# df = DataFrame()\n",
+ "# client.import_table_data('71183815-021d-40d1-884e-3e58bd43b169', '0b533238-e73e-43ec-a773-04ed75349b7a', df)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "9098ea798a2ab598",
+ "metadata": {},
+ "source": [
+ "## Views\n",
+ "\n",
+ "Load data from any view into a `pandas` DataFrame."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "ddd433035e632df9",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:08:18.155004278Z",
+ "start_time": "2024-12-14T07:22:44.708283Z"
+ }
+ },
+ "outputs": [],
+ "source": [
+ "beton_acc = client.get_view_data(database_id, 70)\n",
+ "beton_acc\n",
+ "\n",
+ "# optional: export view data as .csv\n",
+ "# beton_acc.to_csv('beton_acc.csv')"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "54b9b1f732219331",
+ "metadata": {},
+ "source": [
+ "## Subsets"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "f165e5e3861a0dda",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:08:18.180071407Z",
+ "start_time": "2024-12-14T07:22:45.197517Z"
+ }
+ },
+ "outputs": [],
+ "source": [
+ "subset = client.create_subset(database_id, \"SELECT m.mix, date_production, b.name, ta.k_ac_mm_root_day, ta.test_procedure, ta.mean_depth_t0_mm FROM mix m JOIN betonvariante b ON b.id = m.betonvariante_id JOIN test_result_carb_acc ta ON m.id = ta.mix_id\")\n",
+ "subset"
+ ]
+ }
+ ],
+ "metadata": {
+ "kernelspec": {
+ "display_name": "Python 3 (ipykernel)",
+ "language": "python",
+ "name": "python3"
+ },
+ "language_info": {
+ "codemirror_mode": {
+ "name": "ipython",
+ "version": 3
+ },
+ "file_extension": ".py",
+ "mimetype": "text/x-python",
+ "name": "python",
+ "nbconvert_exporter": "python",
+ "pygments_lexer": "ipython3",
+ "version": "3.11.2"
+ }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/.jupyter/Dockerfile b/.jupyter/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0b1f6d93a9074a8496727601f3b25434278a4933
--- /dev/null
+++ b/.jupyter/Dockerfile
@@ -0,0 +1,4 @@
+FROM docker.io/jupyter/datascience-notebook:python-3.11 AS runtime
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
+
+COPY ./environment.yml ./environment.yml
\ No newline at end of file
diff --git a/.jupyter/Pipfile b/.jupyter/Pipfile
deleted file mode 100644
index 97e298ffc2374df88251883a94c34fc826eeed95..0000000000000000000000000000000000000000
--- a/.jupyter/Pipfile
+++ /dev/null
@@ -1,12 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-dbrepo = "*"
-notebook = "*"
-python-dotenv = "*"
-
-[requires]
-python_version = "3.11"
\ No newline at end of file
diff --git a/.jupyter/Pipfile.lock b/.jupyter/Pipfile.lock
deleted file mode 100644
index ccef0d6cb2da3a33509c99d1d066fb0e1152242d..0000000000000000000000000000000000000000
--- a/.jupyter/Pipfile.lock
+++ /dev/null
@@ -1,2048 +0,0 @@
-{
- "_meta": {
- "hash": {
- "sha256": "921f345d232de371dfd5eb427f6862ff74be2271547be3163c57becd680dd6f6"
- },
- "pipfile-spec": 6,
- "requires": {
- "python_version": "3.11"
- },
- "sources": [
- {
- "name": "pypi",
- "url": "https://pypi.org/simple",
- "verify_ssl": true
- }
- ]
- },
- "default": {
- "aiohappyeyeballs": {
- "hashes": [
- "sha256:5fdd7d87889c63183afc18ce9271f9b0a7d32c2303e394468dd45d514a757745",
- "sha256:a980909d50efcd44795c4afeca523296716d50cd756ddca6af8c65b996e27de8"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.4.4"
- },
- "aiohttp": {
- "hashes": [
- "sha256:012f176945af138abc10c4a48743327a92b4ca9adc7a0e078077cdb5dbab7be0",
- "sha256:02c13415b5732fb6ee7ff64583a5e6ed1c57aa68f17d2bda79c04888dfdc2769",
- "sha256:03b6002e20938fc6ee0918c81d9e776bebccc84690e2b03ed132331cca065ee5",
- "sha256:04814571cb72d65a6899db6099e377ed00710bf2e3eafd2985166f2918beaf59",
- "sha256:0580f2e12de2138f34debcd5d88894786453a76e98febaf3e8fe5db62d01c9bf",
- "sha256:06a8e2ee1cbac16fe61e51e0b0c269400e781b13bcfc33f5425912391a542985",
- "sha256:076bc454a7e6fd646bc82ea7f98296be0b1219b5e3ef8a488afbdd8e81fbac50",
- "sha256:0c9527819b29cd2b9f52033e7fb9ff08073df49b4799c89cb5754624ecd98299",
- "sha256:0dc49f42422163efb7e6f1df2636fe3db72713f6cd94688e339dbe33fe06d61d",
- "sha256:14cdb5a9570be5a04eec2ace174a48ae85833c2aadc86de68f55541f66ce42ab",
- "sha256:15fccaf62a4889527539ecb86834084ecf6e9ea70588efde86e8bc775e0e7542",
- "sha256:24213ba85a419103e641e55c27dc7ff03536c4873470c2478cce3311ba1eee7b",
- "sha256:31d5093d3acd02b31c649d3a69bb072d539d4c7659b87caa4f6d2bcf57c2fa2b",
- "sha256:3691ed7726fef54e928fe26344d930c0c8575bc968c3e239c2e1a04bd8cf7838",
- "sha256:386fbe79863eb564e9f3615b959e28b222259da0c48fd1be5929ac838bc65683",
- "sha256:3bbbfff4c679c64e6e23cb213f57cc2c9165c9a65d63717108a644eb5a7398df",
- "sha256:3de34936eb1a647aa919655ff8d38b618e9f6b7f250cc19a57a4bf7fd2062b6d",
- "sha256:40d1c7a7f750b5648642586ba7206999650208dbe5afbcc5284bcec6579c9b91",
- "sha256:44224d815853962f48fe124748227773acd9686eba6dc102578defd6fc99e8d9",
- "sha256:47ad15a65fb41c570cd0ad9a9ff8012489e68176e7207ec7b82a0940dddfd8be",
- "sha256:482cafb7dc886bebeb6c9ba7925e03591a62ab34298ee70d3dd47ba966370d2c",
- "sha256:49c7dbbc1a559ae14fc48387a115b7d4bbc84b4a2c3b9299c31696953c2a5219",
- "sha256:4b2c7ac59c5698a7a8207ba72d9e9c15b0fc484a560be0788b31312c2c5504e4",
- "sha256:4cca22a61b7fe45da8fc73c3443150c3608750bbe27641fc7558ec5117b27fdf",
- "sha256:4cfce37f31f20800a6a6620ce2cdd6737b82e42e06e6e9bd1b36f546feb3c44f",
- "sha256:502a1464ccbc800b4b1995b302efaf426e8763fadf185e933c2931df7db9a199",
- "sha256:53bf2097e05c2accc166c142a2090e4c6fd86581bde3fd9b2d3f9e93dda66ac1",
- "sha256:593c114a2221444f30749cc5e5f4012488f56bd14de2af44fe23e1e9894a9c60",
- "sha256:5d6958671b296febe7f5f859bea581a21c1d05430d1bbdcf2b393599b1cdce77",
- "sha256:5ef359ebc6949e3a34c65ce20230fae70920714367c63afd80ea0c2702902ccf",
- "sha256:613e5169f8ae77b1933e42e418a95931fb4867b2991fc311430b15901ed67079",
- "sha256:61b9bae80ed1f338c42f57c16918853dc51775fb5cb61da70d590de14d8b5fb4",
- "sha256:6362cc6c23c08d18ddbf0e8c4d5159b5df74fea1a5278ff4f2c79aed3f4e9f46",
- "sha256:65a96e3e03300b41f261bbfd40dfdbf1c301e87eab7cd61c054b1f2e7c89b9e8",
- "sha256:65e55ca7debae8faaffee0ebb4b47a51b4075f01e9b641c31e554fd376595c6c",
- "sha256:68386d78743e6570f054fe7949d6cb37ef2b672b4d3405ce91fafa996f7d9b4d",
- "sha256:68ff6f48b51bd78ea92b31079817aff539f6c8fc80b6b8d6ca347d7c02384e33",
- "sha256:6ab29b8a0beb6f8eaf1e5049252cfe74adbaafd39ba91e10f18caeb0e99ffb34",
- "sha256:77ae58586930ee6b2b6f696c82cf8e78c8016ec4795c53e36718365f6959dc82",
- "sha256:77c4aa15a89847b9891abf97f3d4048f3c2d667e00f8a623c89ad2dccee6771b",
- "sha256:78153314f26d5abef3239b4a9af20c229c6f3ecb97d4c1c01b22c4f87669820c",
- "sha256:7852bbcb4d0d2f0c4d583f40c3bc750ee033265d80598d0f9cb6f372baa6b836",
- "sha256:7e97d622cb083e86f18317282084bc9fbf261801b0192c34fe4b1febd9f7ae69",
- "sha256:7f3dc0e330575f5b134918976a645e79adf333c0a1439dcf6899a80776c9ab39",
- "sha256:80886dac673ceaef499de2f393fc80bb4481a129e6cb29e624a12e3296cc088f",
- "sha256:811f23b3351ca532af598405db1093f018edf81368e689d1b508c57dcc6b6a32",
- "sha256:86a5dfcc39309470bd7b68c591d84056d195428d5d2e0b5ccadfbaf25b026ebc",
- "sha256:8b3cf2dc0f0690a33f2d2b2cb15db87a65f1c609f53c37e226f84edb08d10f52",
- "sha256:8cc5203b817b748adccb07f36390feb730b1bc5f56683445bfe924fc270b8816",
- "sha256:909af95a72cedbefe5596f0bdf3055740f96c1a4baa0dd11fd74ca4de0b4e3f1",
- "sha256:974d3a2cce5fcfa32f06b13ccc8f20c6ad9c51802bb7f829eae8a1845c4019ec",
- "sha256:98283b94cc0e11c73acaf1c9698dea80c830ca476492c0fe2622bd931f34b487",
- "sha256:98f5635f7b74bcd4f6f72fcd85bea2154b323a9f05226a80bc7398d0c90763b0",
- "sha256:99b7920e7165be5a9e9a3a7f1b680f06f68ff0d0328ff4079e5163990d046767",
- "sha256:9bca390cb247dbfaec3c664326e034ef23882c3f3bfa5fbf0b56cad0320aaca5",
- "sha256:9e2e576caec5c6a6b93f41626c9c02fc87cd91538b81a3670b2e04452a63def6",
- "sha256:9ef405356ba989fb57f84cac66f7b0260772836191ccefbb987f414bcd2979d9",
- "sha256:a55d2ad345684e7c3dd2c20d2f9572e9e1d5446d57200ff630e6ede7612e307f",
- "sha256:ab7485222db0959a87fbe8125e233b5a6f01f4400785b36e8a7878170d8c3138",
- "sha256:b1fc6b45010a8d0ff9e88f9f2418c6fd408c99c211257334aff41597ebece42e",
- "sha256:b78f053a7ecfc35f0451d961dacdc671f4bcbc2f58241a7c820e9d82559844cf",
- "sha256:b99acd4730ad1b196bfb03ee0803e4adac371ae8efa7e1cbc820200fc5ded109",
- "sha256:be2b516f56ea883a3e14dda17059716593526e10fb6303189aaf5503937db408",
- "sha256:beb39a6d60a709ae3fb3516a1581777e7e8b76933bb88c8f4420d875bb0267c6",
- "sha256:bf3d1a519a324af764a46da4115bdbd566b3c73fb793ffb97f9111dbc684fc4d",
- "sha256:c49a76c1038c2dd116fa443eba26bbb8e6c37e924e2513574856de3b6516be99",
- "sha256:c5532f0441fc09c119e1dca18fbc0687e64fbeb45aa4d6a87211ceaee50a74c4",
- "sha256:c6b9e6d7e41656d78e37ce754813fa44b455c3d0d0dced2a047def7dc5570b74",
- "sha256:c87bf31b7fdab94ae3adbe4a48e711bfc5f89d21cf4c197e75561def39e223bc",
- "sha256:cbad88a61fa743c5d283ad501b01c153820734118b65aee2bd7dbb735475ce0d",
- "sha256:cf14627232dfa8730453752e9cdc210966490992234d77ff90bc8dc0dce361d5",
- "sha256:db1d0b28fcb7f1d35600150c3e4b490775251dea70f894bf15c678fdd84eda6a",
- "sha256:ddf5f7d877615f6a1e75971bfa5ac88609af3b74796ff3e06879e8422729fd01",
- "sha256:e44a9a3c053b90c6f09b1bb4edd880959f5328cf63052503f892c41ea786d99f",
- "sha256:efb15a17a12497685304b2d976cb4939e55137df7b09fa53f1b6a023f01fcb4e",
- "sha256:fbbaea811a2bba171197b08eea288b9402faa2bab2ba0858eecdd0a4105753a3"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==3.11.10"
- },
- "aiosignal": {
- "hashes": [
- "sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5",
- "sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==1.3.2"
- },
- "annotated-types": {
- "hashes": [
- "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53",
- "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.7.0"
- },
- "anyio": {
- "hashes": [
- "sha256:2f834749c602966b7d456a7567cafcb309f96482b5081d14ac93ccd457f9dd48",
- "sha256:ea60c3723ab42ba6fff7e8ccb0488c898ec538ff4df1f1d5e642c3601d07e352"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==4.7.0"
- },
- "argon2-cffi": {
- "hashes": [
- "sha256:879c3e79a2729ce768ebb7d36d4609e3a78a4ca2ec3a9f12286ca057e3d0db08",
- "sha256:c670642b78ba29641818ab2e68bd4e6a78ba53b7eff7b4c3815ae16abf91c7ea"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==23.1.0"
- },
- "argon2-cffi-bindings": {
- "hashes": [
- "sha256:20ef543a89dee4db46a1a6e206cd015360e5a75822f76df533845c3cbaf72670",
- "sha256:2c3e3cc67fdb7d82c4718f19b4e7a87123caf8a93fde7e23cf66ac0337d3cb3f",
- "sha256:3b9ef65804859d335dc6b31582cad2c5166f0c3e7975f324d9ffaa34ee7e6583",
- "sha256:3e385d1c39c520c08b53d63300c3ecc28622f076f4c2b0e6d7e796e9f6502194",
- "sha256:58ed19212051f49a523abb1dbe954337dc82d947fb6e5a0da60f7c8471a8476c",
- "sha256:5e00316dabdaea0b2dd82d141cc66889ced0cdcbfa599e8b471cf22c620c329a",
- "sha256:603ca0aba86b1349b147cab91ae970c63118a0f30444d4bc80355937c950c082",
- "sha256:6a22ad9800121b71099d0fb0a65323810a15f2e292f2ba450810a7316e128ee5",
- "sha256:8cd69c07dd875537a824deec19f978e0f2078fdda07fd5c42ac29668dda5f40f",
- "sha256:93f9bf70084f97245ba10ee36575f0c3f1e7d7724d67d8e5b08e61787c320ed7",
- "sha256:9524464572e12979364b7d600abf96181d3541da11e23ddf565a32e70bd4dc0d",
- "sha256:b2ef1c30440dbbcba7a5dc3e319408b59676e2e039e2ae11a8775ecf482b192f",
- "sha256:b746dba803a79238e925d9046a63aa26bf86ab2a2fe74ce6b009a1c3f5c8f2ae",
- "sha256:bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3",
- "sha256:bd46088725ef7f58b5a1ef7ca06647ebaf0eb4baff7d1d0d177c6cc8744abd86",
- "sha256:ccb949252cb2ab3a08c02024acb77cfb179492d5701c7cbdbfd776124d4d2367",
- "sha256:d4966ef5848d820776f5f562a7d45fdd70c2f330c961d0d745b784034bd9f48d",
- "sha256:e415e3f62c8d124ee16018e491a009937f8cf7ebf5eb430ffc5de21b900dad93",
- "sha256:ed2937d286e2ad0cc79a7087d3c272832865f779430e0cc2b4f3718d3159b0cb",
- "sha256:f1152ac548bd5b8bcecfb0b0371f082037e47128653df2e8ba6e914d384f3c3e",
- "sha256:f9f8b450ed0547e3d473fdc8612083fd08dd2120d6ac8f73828df9b7d45bb351"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==21.2.0"
- },
- "arrow": {
- "hashes": [
- "sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80",
- "sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.3.0"
- },
- "asttokens": {
- "hashes": [
- "sha256:0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7",
- "sha256:e3078351a059199dd5138cb1c706e6430c05eff2ff136af5eb4790f9d28932e2"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==3.0.0"
- },
- "async-lru": {
- "hashes": [
- "sha256:b8a59a5df60805ff63220b2a0c5b5393da5521b113cd5465a44eb037d81a5627",
- "sha256:ff02944ce3c288c5be660c42dbcca0742b32c3b279d6dceda655190240b99224"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.0.4"
- },
- "attrs": {
- "hashes": [
- "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
- "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==24.2.0"
- },
- "babel": {
- "hashes": [
- "sha256:368b5b98b37c06b7daf6696391c3240c938b37767d4584413e8438c5c435fa8b",
- "sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.16.0"
- },
- "beautifulsoup4": {
- "hashes": [
- "sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051",
- "sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed"
- ],
- "markers": "python_full_version >= '3.6.0'",
- "version": "==4.12.3"
- },
- "bleach": {
- "hashes": [
- "sha256:117d9c6097a7c3d22fd578fcd8d35ff1e125df6736f554da4e432fdd63f31e5e",
- "sha256:123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==6.2.0"
- },
- "certifi": {
- "hashes": [
- "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
- "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==2024.8.30"
- },
- "cffi": {
- "hashes": [
- "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8",
- "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2",
- "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1",
- "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15",
- "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36",
- "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824",
- "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8",
- "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36",
- "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17",
- "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf",
- "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc",
- "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3",
- "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed",
- "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702",
- "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1",
- "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8",
- "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903",
- "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6",
- "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d",
- "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b",
- "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e",
- "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be",
- "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c",
- "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683",
- "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9",
- "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c",
- "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8",
- "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1",
- "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4",
- "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655",
- "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67",
- "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595",
- "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0",
- "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65",
- "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41",
- "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6",
- "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401",
- "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6",
- "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3",
- "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16",
- "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93",
- "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e",
- "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4",
- "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964",
- "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c",
- "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576",
- "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0",
- "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3",
- "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662",
- "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3",
- "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff",
- "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5",
- "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd",
- "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f",
- "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5",
- "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14",
- "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d",
- "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9",
- "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7",
- "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382",
- "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a",
- "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e",
- "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a",
- "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4",
- "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99",
- "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87",
- "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.17.1"
- },
- "charset-normalizer": {
- "hashes": [
- "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621",
- "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6",
- "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8",
- "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912",
- "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c",
- "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b",
- "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d",
- "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d",
- "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95",
- "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e",
- "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565",
- "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64",
- "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab",
- "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be",
- "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e",
- "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907",
- "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0",
- "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2",
- "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62",
- "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62",
- "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23",
- "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc",
- "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284",
- "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca",
- "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455",
- "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858",
- "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b",
- "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594",
- "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc",
- "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db",
- "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b",
- "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea",
- "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6",
- "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920",
- "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749",
- "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7",
- "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd",
- "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99",
- "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242",
- "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee",
- "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129",
- "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2",
- "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51",
- "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee",
- "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8",
- "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b",
- "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613",
- "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742",
- "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe",
- "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3",
- "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5",
- "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631",
- "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7",
- "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15",
- "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c",
- "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea",
- "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417",
- "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250",
- "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88",
- "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca",
- "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa",
- "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99",
- "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149",
- "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41",
- "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574",
- "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0",
- "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f",
- "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d",
- "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654",
- "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3",
- "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19",
- "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90",
- "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578",
- "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9",
- "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1",
- "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51",
- "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719",
- "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236",
- "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a",
- "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c",
- "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade",
- "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944",
- "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc",
- "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6",
- "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6",
- "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27",
- "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6",
- "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2",
- "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12",
- "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf",
- "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114",
- "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7",
- "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf",
- "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d",
- "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b",
- "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed",
- "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03",
- "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4",
- "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67",
- "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365",
- "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a",
- "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748",
- "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b",
- "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079",
- "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482"
- ],
- "markers": "python_full_version >= '3.7.0'",
- "version": "==3.4.0"
- },
- "comm": {
- "hashes": [
- "sha256:3fd7a84065306e07bea1773df6eb8282de51ba82f77c72f9c85716ab11fe980e",
- "sha256:e6fb86cb70ff661ee8c9c14e7d36d6de3b4066f1441be4063df9c5009f0a64d3"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.2.2"
- },
- "dbrepo": {
- "hashes": [
- "sha256:19086c6f7aa3bc30de813c0622eac3a31ecc21c62ed7f2cd98406b2b308ec80f",
- "sha256:6d5ad9fa36de8ef7ff16a6a860bec0188dd78fc8fd9c55c84d9d1c68e6df486b"
- ],
- "index": "pypi",
- "version": "==1.5.3"
- },
- "debugpy": {
- "hashes": [
- "sha256:0e22f846f4211383e6a416d04b4c13ed174d24cc5d43f5fd52e7821d0ebc8920",
- "sha256:116bf8342062246ca749013df4f6ea106f23bc159305843491f64672a55af2e5",
- "sha256:189058d03a40103a57144752652b3ab08ff02b7595d0ce1f651b9acc3a3a35a0",
- "sha256:23dc34c5e03b0212fa3c49a874df2b8b1b8fda95160bd79c01eb3ab51ea8d851",
- "sha256:28e45b3f827d3bf2592f3cf7ae63282e859f3259db44ed2b129093ca0ac7940b",
- "sha256:2b26fefc4e31ff85593d68b9022e35e8925714a10ab4858fb1b577a8a48cb8cd",
- "sha256:32db46ba45849daed7ccf3f2e26f7a386867b077f39b2a974bb5c4c2c3b0a280",
- "sha256:40499a9979c55f72f4eb2fc38695419546b62594f8af194b879d2a18439c97a9",
- "sha256:44b1b8e6253bceada11f714acf4309ffb98bfa9ac55e4fce14f9e5d4484287a1",
- "sha256:52c3cf9ecda273a19cc092961ee34eb9ba8687d67ba34cc7b79a521c1c64c4c0",
- "sha256:52d8a3166c9f2815bfae05f386114b0b2d274456980d41f320299a8d9a5615a7",
- "sha256:61bc8b3b265e6949855300e84dc93d02d7a3a637f2aec6d382afd4ceb9120c9f",
- "sha256:654130ca6ad5de73d978057eaf9e582244ff72d4574b3e106fb8d3d2a0d32458",
- "sha256:6ad2688b69235c43b020e04fecccdf6a96c8943ca9c2fb340b8adc103c655e57",
- "sha256:6c1f6a173d1140e557347419767d2b14ac1c9cd847e0b4c5444c7f3144697e4e",
- "sha256:84e511a7545d11683d32cdb8f809ef63fc17ea2a00455cc62d0a4dbb4ed1c308",
- "sha256:85de8474ad53ad546ff1c7c7c89230db215b9b8a02754d41cb5a76f70d0be296",
- "sha256:8988f7163e4381b0da7696f37eec7aca19deb02e500245df68a7159739bbd0d3",
- "sha256:8da1db4ca4f22583e834dcabdc7832e56fe16275253ee53ba66627b86e304da1",
- "sha256:8ffc382e4afa4aee367bf413f55ed17bd91b191dcaf979890af239dda435f2a1",
- "sha256:987bce16e86efa86f747d5151c54e91b3c1e36acc03ce1ddb50f9d09d16ded0e",
- "sha256:ad7efe588c8f5cf940f40c3de0cd683cc5b76819446abaa50dc0829a30c094db",
- "sha256:bb3b15e25891f38da3ca0740271e63ab9db61f41d4d8541745cfc1824252cb28",
- "sha256:c928bbf47f65288574b78518449edaa46c82572d340e2750889bbf8cd92f3737",
- "sha256:ce291a5aca4985d82875d6779f61375e959208cdf09fcec40001e65fb0a54768",
- "sha256:d8768edcbeb34da9e11bcb8b5c2e0958d25218df7a6e56adf415ef262cd7b6d1"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.8.11"
- },
- "decorator": {
- "hashes": [
- "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330",
- "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"
- ],
- "markers": "python_version >= '3.5'",
- "version": "==5.1.1"
- },
- "defusedxml": {
- "hashes": [
- "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69",
- "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
- "version": "==0.7.1"
- },
- "executing": {
- "hashes": [
- "sha256:8d63781349375b5ebccc3142f4b30350c0cd9c79f921cde38be2be4637e98eaf",
- "sha256:8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.1.0"
- },
- "fastjsonschema": {
- "hashes": [
- "sha256:794d4f0a58f848961ba16af7b9c85a3e88cd360df008c59aac6fc5ae9323b5d4",
- "sha256:c9e5b7e908310918cf494a434eeb31384dd84a98b57a30bcb1f535015b554667"
- ],
- "version": "==2.21.1"
- },
- "fqdn": {
- "hashes": [
- "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f",
- "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014"
- ],
- "version": "==1.5.1"
- },
- "frozenlist": {
- "hashes": [
- "sha256:000a77d6034fbad9b6bb880f7ec073027908f1b40254b5d6f26210d2dab1240e",
- "sha256:03d33c2ddbc1816237a67f66336616416e2bbb6beb306e5f890f2eb22b959cdf",
- "sha256:04a5c6babd5e8fb7d3c871dc8b321166b80e41b637c31a995ed844a6139942b6",
- "sha256:0996c66760924da6e88922756d99b47512a71cfd45215f3570bf1e0b694c206a",
- "sha256:0cc974cc93d32c42e7b0f6cf242a6bd941c57c61b618e78b6c0a96cb72788c1d",
- "sha256:0f253985bb515ecd89629db13cb58d702035ecd8cfbca7d7a7e29a0e6d39af5f",
- "sha256:11aabdd62b8b9c4b84081a3c246506d1cddd2dd93ff0ad53ede5defec7886b28",
- "sha256:12f78f98c2f1c2429d42e6a485f433722b0061d5c0b0139efa64f396efb5886b",
- "sha256:140228863501b44b809fb39ec56b5d4071f4d0aa6d216c19cbb08b8c5a7eadb9",
- "sha256:1431d60b36d15cda188ea222033eec8e0eab488f39a272461f2e6d9e1a8e63c2",
- "sha256:15538c0cbf0e4fa11d1e3a71f823524b0c46299aed6e10ebb4c2089abd8c3bec",
- "sha256:15b731db116ab3aedec558573c1a5eec78822b32292fe4f2f0345b7f697745c2",
- "sha256:17dcc32fc7bda7ce5875435003220a457bcfa34ab7924a49a1c19f55b6ee185c",
- "sha256:1893f948bf6681733aaccf36c5232c231e3b5166d607c5fa77773611df6dc336",
- "sha256:189f03b53e64144f90990d29a27ec4f7997d91ed3d01b51fa39d2dbe77540fd4",
- "sha256:1a8ea951bbb6cacd492e3948b8da8c502a3f814f5d20935aae74b5df2b19cf3d",
- "sha256:1b96af8c582b94d381a1c1f51ffaedeb77c821c690ea5f01da3d70a487dd0a9b",
- "sha256:1e76bfbc72353269c44e0bc2cfe171900fbf7f722ad74c9a7b638052afe6a00c",
- "sha256:2150cc6305a2c2ab33299453e2968611dacb970d2283a14955923062c8d00b10",
- "sha256:226d72559fa19babe2ccd920273e767c96a49b9d3d38badd7c91a0fdeda8ea08",
- "sha256:237f6b23ee0f44066219dae14c70ae38a63f0440ce6750f868ee08775073f942",
- "sha256:29d94c256679247b33a3dc96cce0f93cbc69c23bf75ff715919332fdbb6a32b8",
- "sha256:2b5e23253bb709ef57a8e95e6ae48daa9ac5f265637529e4ce6b003a37b2621f",
- "sha256:2d0da8bbec082bf6bf18345b180958775363588678f64998c2b7609e34719b10",
- "sha256:2f3f7a0fbc219fb4455264cae4d9f01ad41ae6ee8524500f381de64ffaa077d5",
- "sha256:30c72000fbcc35b129cb09956836c7d7abf78ab5416595e4857d1cae8d6251a6",
- "sha256:31115ba75889723431aa9a4e77d5f398f5cf976eea3bdf61749731f62d4a4a21",
- "sha256:31a9ac2b38ab9b5a8933b693db4939764ad3f299fcaa931a3e605bc3460e693c",
- "sha256:366d8f93e3edfe5a918c874702f78faac300209a4d5bf38352b2c1bdc07a766d",
- "sha256:374ca2dabdccad8e2a76d40b1d037f5bd16824933bf7bcea3e59c891fd4a0923",
- "sha256:44c49271a937625619e862baacbd037a7ef86dd1ee215afc298a417ff3270608",
- "sha256:45e0896250900b5aa25180f9aec243e84e92ac84bd4a74d9ad4138ef3f5c97de",
- "sha256:498524025a5b8ba81695761d78c8dd7382ac0b052f34e66939c42df860b8ff17",
- "sha256:50cf5e7ee9b98f22bdecbabf3800ae78ddcc26e4a435515fc72d97903e8488e0",
- "sha256:52ef692a4bc60a6dd57f507429636c2af8b6046db8b31b18dac02cbc8f507f7f",
- "sha256:561eb1c9579d495fddb6da8959fd2a1fca2c6d060d4113f5844b433fc02f2641",
- "sha256:5a3ba5f9a0dfed20337d3e966dc359784c9f96503674c2faf015f7fe8e96798c",
- "sha256:5b6a66c18b5b9dd261ca98dffcb826a525334b2f29e7caa54e182255c5f6a65a",
- "sha256:5c28f4b5dbef8a0d8aad0d4de24d1e9e981728628afaf4ea0792f5d0939372f0",
- "sha256:5d7f5a50342475962eb18b740f3beecc685a15b52c91f7d975257e13e029eca9",
- "sha256:6321899477db90bdeb9299ac3627a6a53c7399c8cd58d25da094007402b039ab",
- "sha256:6482a5851f5d72767fbd0e507e80737f9c8646ae7fd303def99bfe813f76cf7f",
- "sha256:666534d15ba8f0fda3f53969117383d5dc021266b3c1a42c9ec4855e4b58b9d3",
- "sha256:683173d371daad49cffb8309779e886e59c2f369430ad28fe715f66d08d4ab1a",
- "sha256:6e9080bb2fb195a046e5177f10d9d82b8a204c0736a97a153c2466127de87784",
- "sha256:73f2e31ea8dd7df61a359b731716018c2be196e5bb3b74ddba107f694fbd7604",
- "sha256:7437601c4d89d070eac8323f121fcf25f88674627505334654fd027b091db09d",
- "sha256:76e4753701248476e6286f2ef492af900ea67d9706a0155335a40ea21bf3b2f5",
- "sha256:7707a25d6a77f5d27ea7dc7d1fc608aa0a478193823f88511ef5e6b8a48f9d03",
- "sha256:7948140d9f8ece1745be806f2bfdf390127cf1a763b925c4a805c603df5e697e",
- "sha256:7a1a048f9215c90973402e26c01d1cff8a209e1f1b53f72b95c13db61b00f953",
- "sha256:7d57d8f702221405a9d9b40f9da8ac2e4a1a8b5285aac6100f3393675f0a85ee",
- "sha256:7f3c8c1dacd037df16e85227bac13cca58c30da836c6f936ba1df0c05d046d8d",
- "sha256:81d5af29e61b9c8348e876d442253723928dce6433e0e76cd925cd83f1b4b817",
- "sha256:828afae9f17e6de596825cf4228ff28fbdf6065974e5ac1410cecc22f699d2b3",
- "sha256:87f724d055eb4785d9be84e9ebf0f24e392ddfad00b3fe036e43f489fafc9039",
- "sha256:8969190d709e7c48ea386db202d708eb94bdb29207a1f269bab1196ce0dcca1f",
- "sha256:90646abbc7a5d5c7c19461d2e3eeb76eb0b204919e6ece342feb6032c9325ae9",
- "sha256:91d6c171862df0a6c61479d9724f22efb6109111017c87567cfeb7b5d1449fdf",
- "sha256:9272fa73ca71266702c4c3e2d4a28553ea03418e591e377a03b8e3659d94fa76",
- "sha256:92b5278ed9d50fe610185ecd23c55d8b307d75ca18e94c0e7de328089ac5dcba",
- "sha256:97160e245ea33d8609cd2b8fd997c850b56db147a304a262abc2b3be021a9171",
- "sha256:977701c081c0241d0955c9586ffdd9ce44f7a7795df39b9151cd9a6fd0ce4cfb",
- "sha256:9b7dc0c4338e6b8b091e8faf0db3168a37101943e687f373dce00959583f7439",
- "sha256:9b93d7aaa36c966fa42efcaf716e6b3900438632a626fb09c049f6a2f09fc631",
- "sha256:9bbcdfaf4af7ce002694a4e10a0159d5a8d20056a12b05b45cea944a4953f972",
- "sha256:9c2623347b933fcb9095841f1cc5d4ff0b278addd743e0e966cb3d460278840d",
- "sha256:a2fe128eb4edeabe11896cb6af88fca5346059f6c8d807e3b910069f39157869",
- "sha256:a72b7a6e3cd2725eff67cd64c8f13335ee18fc3c7befc05aed043d24c7b9ccb9",
- "sha256:a9fe0f1c29ba24ba6ff6abf688cb0b7cf1efab6b6aa6adc55441773c252f7411",
- "sha256:b97f7b575ab4a8af9b7bc1d2ef7f29d3afee2226bd03ca3875c16451ad5a7723",
- "sha256:bdac3c7d9b705d253b2ce370fde941836a5f8b3c5c2b8fd70940a3ea3af7f4f2",
- "sha256:c03eff4a41bd4e38415cbed054bbaff4a075b093e2394b6915dca34a40d1e38b",
- "sha256:c16d2fa63e0800723139137d667e1056bee1a1cf7965153d2d104b62855e9b99",
- "sha256:c1fac3e2ace2eb1052e9f7c7db480818371134410e1f5c55d65e8f3ac6d1407e",
- "sha256:ce3aa154c452d2467487765e3adc730a8c153af77ad84096bc19ce19a2400840",
- "sha256:cee6798eaf8b1416ef6909b06f7dc04b60755206bddc599f52232606e18179d3",
- "sha256:d1b3eb7b05ea246510b43a7e53ed1653e55c2121019a97e60cad7efb881a97bb",
- "sha256:d994863bba198a4a518b467bb971c56e1db3f180a25c6cf7bb1949c267f748c3",
- "sha256:dd47a5181ce5fcb463b5d9e17ecfdb02b678cca31280639255ce9d0e5aa67af0",
- "sha256:dd94994fc91a6177bfaafd7d9fd951bc8689b0a98168aa26b5f543868548d3ca",
- "sha256:de537c11e4aa01d37db0d403b57bd6f0546e71a82347a97c6a9f0dcc532b3a45",
- "sha256:df6e2f325bfee1f49f81aaac97d2aa757c7646534a06f8f577ce184afe2f0a9e",
- "sha256:e66cc454f97053b79c2ab09c17fbe3c825ea6b4de20baf1be28919460dd7877f",
- "sha256:e79225373c317ff1e35f210dd5f1344ff31066ba8067c307ab60254cd3a78ad5",
- "sha256:f1577515d35ed5649d52ab4319db757bb881ce3b2b796d7283e6634d99ace307",
- "sha256:f1e6540b7fa044eee0bb5111ada694cf3dc15f2b0347ca125ee9ca984d5e9e6e",
- "sha256:f2ac49a9bedb996086057b75bf93538240538c6d9b38e57c82d51f75a73409d2",
- "sha256:f47c9c9028f55a04ac254346e92977bf0f166c483c74b4232bee19a6697e4778",
- "sha256:f5f9da7f5dbc00a604fe74aa02ae7c98bcede8a3b8b9666f9f86fc13993bc71a",
- "sha256:fd74520371c3c4175142d02a976aee0b4cb4a7cc912a60586ffd8d5929979b30",
- "sha256:feeb64bc9bcc6b45c6311c9e9b99406660a9c05ca8a5b30d14a78555088b0b3a"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.5.0"
- },
- "h11": {
- "hashes": [
- "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d",
- "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==0.14.0"
- },
- "httpcore": {
- "hashes": [
- "sha256:8551cb62a169ec7162ac7be8d4817d561f60e08eaa485234898414bb5a8a0b4c",
- "sha256:a3fff8f43dc260d5bd363d9f9cf1830fa3a458b332856f34282de498ed420edd"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.0.7"
- },
- "httpx": {
- "hashes": [
- "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc",
- "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.28.1"
- },
- "idna": {
- "hashes": [
- "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
- "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==3.10"
- },
- "ipykernel": {
- "hashes": [
- "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5",
- "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==6.29.5"
- },
- "ipython": {
- "hashes": [
- "sha256:85ec56a7e20f6c38fce7727dcca699ae4ffc85985aa7b23635a8008f918ae321",
- "sha256:cb0a405a306d2995a5cbb9901894d240784a9f341394c6ba3f4fe8c6eb89ff6e"
- ],
- "markers": "python_version >= '3.10'",
- "version": "==8.30.0"
- },
- "isoduration": {
- "hashes": [
- "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9",
- "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042"
- ],
- "version": "==20.11.0"
- },
- "jedi": {
- "hashes": [
- "sha256:4770dc3de41bde3966b02eb84fbcf557fb33cce26ad23da12c742fb50ecb11f0",
- "sha256:a8ef22bde8490f57fe5c7681a3c83cb58874daf72b4784de3cce5b6ef6edb5b9"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==0.19.2"
- },
- "jinja2": {
- "hashes": [
- "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369",
- "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==3.1.4"
- },
- "json5": {
- "hashes": [
- "sha256:19b23410220a7271e8377f81ba8aacba2fdd56947fbb137ee5977cbe1f5e8dfa",
- "sha256:e66941c8f0a02026943c52c2eb34ebeb2a6f819a0be05920a6f5243cd30fd559"
- ],
- "markers": "python_full_version >= '3.8.0'",
- "version": "==0.10.0"
- },
- "jsonpointer": {
- "hashes": [
- "sha256:13e088adc14fca8b6aa8177c044e12701e6ad4b28ff10e65f2267a90109c9942",
- "sha256:2b2d729f2091522d61c3b31f82e11870f60b68f43fbc705cb76bf4b832af59ef"
- ],
- "version": "==3.0.0"
- },
- "jsonschema": {
- "hashes": [
- "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4",
- "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==4.23.0"
- },
- "jsonschema-specifications": {
- "hashes": [
- "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272",
- "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==2024.10.1"
- },
- "jupyter-client": {
- "hashes": [
- "sha256:35b3a0947c4a6e9d589eb97d7d4cd5e90f910ee73101611f01283732bd6d9419",
- "sha256:e8a19cc986cc45905ac3362915f410f3af85424b4c0905e94fa5f2cb08e8f23f"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==8.6.3"
- },
- "jupyter-core": {
- "hashes": [
- "sha256:4f7315d2f6b4bcf2e3e7cb6e46772eba760ae459cd1f59d29eb57b0a01bd7409",
- "sha256:aa5f8d32bbf6b431ac830496da7392035d6f61b4f54872f15c4bd2a9c3f536d9"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==5.7.2"
- },
- "jupyter-events": {
- "hashes": [
- "sha256:4b72130875e59d57716d327ea70d3ebc3af1944d3717e5a498b8a06c6c159960",
- "sha256:670b8229d3cc882ec782144ed22e0d29e1c2d639263f92ca8383e66682845e22"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.10.0"
- },
- "jupyter-lsp": {
- "hashes": [
- "sha256:45fbddbd505f3fbfb0b6cb2f1bc5e15e83ab7c79cd6e89416b248cb3c00c11da",
- "sha256:793147a05ad446f809fd53ef1cd19a9f5256fd0a2d6b7ce943a982cb4f545001"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.2.5"
- },
- "jupyter-server": {
- "hashes": [
- "sha256:47ff506127c2f7851a17bf4713434208fc490955d0e8632e95014a9a9afbeefd",
- "sha256:66095021aa9638ced276c248b1d81862e4c50f292d575920bbe960de1c56b12b"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.14.2"
- },
- "jupyter-server-terminals": {
- "hashes": [
- "sha256:41ee0d7dc0ebf2809c668e0fc726dfaf258fcd3e769568996ca731b6194ae9aa",
- "sha256:5ae0295167220e9ace0edcfdb212afd2b01ee8d179fe6f23c899590e9b8a5269"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.5.3"
- },
- "jupyterlab": {
- "hashes": [
- "sha256:32a8fd30677e734ffcc3916a4758b9dab21b02015b668c60eb36f84357b7d4b1",
- "sha256:76fa39e548fdac94dc1204af5956c556f54c785f70ee26aa47ea08eda4d5bbcd"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==4.3.3"
- },
- "jupyterlab-pygments": {
- "hashes": [
- "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d",
- "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.3.0"
- },
- "jupyterlab-server": {
- "hashes": [
- "sha256:e697488f66c3db49df675158a77b3b017520d772c6e1548c7d9bcc5df7944ee4",
- "sha256:eb36caca59e74471988f0ae25c77945610b887f777255aa21f8065def9e51ed4"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.27.3"
- },
- "markupsafe": {
- "hashes": [
- "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4",
- "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30",
- "sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0",
- "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9",
- "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396",
- "sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13",
- "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028",
- "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca",
- "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557",
- "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832",
- "sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0",
- "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b",
- "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579",
- "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a",
- "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c",
- "sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff",
- "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c",
- "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22",
- "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094",
- "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb",
- "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e",
- "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5",
- "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a",
- "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d",
- "sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a",
- "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b",
- "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8",
- "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225",
- "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c",
- "sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144",
- "sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f",
- "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87",
- "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d",
- "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93",
- "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf",
- "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158",
- "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84",
- "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb",
- "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48",
- "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171",
- "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c",
- "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6",
- "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd",
- "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d",
- "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1",
- "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d",
- "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca",
- "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a",
- "sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29",
- "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe",
- "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798",
- "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c",
- "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8",
- "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f",
- "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f",
- "sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a",
- "sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178",
- "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0",
- "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79",
- "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430",
- "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==3.0.2"
- },
- "matplotlib-inline": {
- "hashes": [
- "sha256:8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90",
- "sha256:df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.1.7"
- },
- "mistune": {
- "hashes": [
- "sha256:71481854c30fdbc938963d3605b72501f5c10a9320ecd412c121c163a1c7d205",
- "sha256:fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==3.0.2"
- },
- "multidict": {
- "hashes": [
- "sha256:052e10d2d37810b99cc170b785945421141bf7bb7d2f8799d431e7db229c385f",
- "sha256:06809f4f0f7ab7ea2cabf9caca7d79c22c0758b58a71f9d32943ae13c7ace056",
- "sha256:071120490b47aa997cca00666923a83f02c7fbb44f71cf7f136df753f7fa8761",
- "sha256:0c3f390dc53279cbc8ba976e5f8035eab997829066756d811616b652b00a23a3",
- "sha256:0e2b90b43e696f25c62656389d32236e049568b39320e2735d51f08fd362761b",
- "sha256:0e5f362e895bc5b9e67fe6e4ded2492d8124bdf817827f33c5b46c2fe3ffaca6",
- "sha256:10524ebd769727ac77ef2278390fb0068d83f3acb7773792a5080f2b0abf7748",
- "sha256:10a9b09aba0c5b48c53761b7c720aaaf7cf236d5fe394cd399c7ba662d5f9966",
- "sha256:16e5f4bf4e603eb1fdd5d8180f1a25f30056f22e55ce51fb3d6ad4ab29f7d96f",
- "sha256:188215fc0aafb8e03341995e7c4797860181562380f81ed0a87ff455b70bf1f1",
- "sha256:189f652a87e876098bbc67b4da1049afb5f5dfbaa310dd67c594b01c10388db6",
- "sha256:1ca0083e80e791cffc6efce7660ad24af66c8d4079d2a750b29001b53ff59ada",
- "sha256:1e16bf3e5fc9f44632affb159d30a437bfe286ce9e02754759be5536b169b305",
- "sha256:2090f6a85cafc5b2db085124d752757c9d251548cedabe9bd31afe6363e0aff2",
- "sha256:20b9b5fbe0b88d0bdef2012ef7dee867f874b72528cf1d08f1d59b0e3850129d",
- "sha256:22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a",
- "sha256:22f3105d4fb15c8f57ff3959a58fcab6ce36814486500cd7485651230ad4d4ef",
- "sha256:23bfd518810af7de1116313ebd9092cb9aa629beb12f6ed631ad53356ed6b86c",
- "sha256:27e5fc84ccef8dfaabb09d82b7d179c7cf1a3fbc8a966f8274fcb4ab2eb4cadb",
- "sha256:3380252550e372e8511d49481bd836264c009adb826b23fefcc5dd3c69692f60",
- "sha256:3702ea6872c5a2a4eeefa6ffd36b042e9773f05b1f37ae3ef7264b1163c2dcf6",
- "sha256:37bb93b2178e02b7b618893990941900fd25b6b9ac0fa49931a40aecdf083fe4",
- "sha256:3914f5aaa0f36d5d60e8ece6a308ee1c9784cd75ec8151062614657a114c4478",
- "sha256:3a37ffb35399029b45c6cc33640a92bef403c9fd388acce75cdc88f58bd19a81",
- "sha256:3c8b88a2ccf5493b6c8da9076fb151ba106960a2df90c2633f342f120751a9e7",
- "sha256:3e97b5e938051226dc025ec80980c285b053ffb1e25a3db2a3aa3bc046bf7f56",
- "sha256:3ec660d19bbc671e3a6443325f07263be452c453ac9e512f5eb935e7d4ac28b3",
- "sha256:3efe2c2cb5763f2f1b275ad2bf7a287d3f7ebbef35648a9726e3b69284a4f3d6",
- "sha256:483a6aea59cb89904e1ceabd2b47368b5600fb7de78a6e4a2c2987b2d256cf30",
- "sha256:4867cafcbc6585e4b678876c489b9273b13e9fff9f6d6d66add5e15d11d926cb",
- "sha256:48e171e52d1c4d33888e529b999e5900356b9ae588c2f09a52dcefb158b27506",
- "sha256:4a9cb68166a34117d6646c0023c7b759bf197bee5ad4272f420a0141d7eb03a0",
- "sha256:4b820514bfc0b98a30e3d85462084779900347e4d49267f747ff54060cc33925",
- "sha256:4e18b656c5e844539d506a0a06432274d7bd52a7487e6828c63a63d69185626c",
- "sha256:4e9f48f58c2c523d5a06faea47866cd35b32655c46b443f163d08c6d0ddb17d6",
- "sha256:50b3a2710631848991d0bf7de077502e8994c804bb805aeb2925a981de58ec2e",
- "sha256:55b6d90641869892caa9ca42ff913f7ff1c5ece06474fbd32fb2cf6834726c95",
- "sha256:57feec87371dbb3520da6192213c7d6fc892d5589a93db548331954de8248fd2",
- "sha256:58130ecf8f7b8112cdb841486404f1282b9c86ccb30d3519faf301b2e5659133",
- "sha256:5845c1fd4866bb5dd3125d89b90e57ed3138241540897de748cdf19de8a2fca2",
- "sha256:59bfeae4b25ec05b34f1956eaa1cb38032282cd4dfabc5056d0a1ec4d696d3aa",
- "sha256:5b48204e8d955c47c55b72779802b219a39acc3ee3d0116d5080c388970b76e3",
- "sha256:5c09fcfdccdd0b57867577b719c69e347a436b86cd83747f179dbf0cc0d4c1f3",
- "sha256:6180c0ae073bddeb5a97a38c03f30c233e0a4d39cd86166251617d1bbd0af436",
- "sha256:682b987361e5fd7a139ed565e30d81fd81e9629acc7d925a205366877d8c8657",
- "sha256:6b5d83030255983181005e6cfbac1617ce9746b219bc2aad52201ad121226581",
- "sha256:6bb5992037f7a9eff7991ebe4273ea7f51f1c1c511e6a2ce511d0e7bdb754492",
- "sha256:73eae06aa53af2ea5270cc066dcaf02cc60d2994bbb2c4ef5764949257d10f43",
- "sha256:76f364861c3bfc98cbbcbd402d83454ed9e01a5224bb3a28bf70002a230f73e2",
- "sha256:820c661588bd01a0aa62a1283f20d2be4281b086f80dad9e955e690c75fb54a2",
- "sha256:82176036e65644a6cc5bd619f65f6f19781e8ec2e5330f51aa9ada7504cc1926",
- "sha256:87701f25a2352e5bf7454caa64757642734da9f6b11384c1f9d1a8e699758057",
- "sha256:9079dfc6a70abe341f521f78405b8949f96db48da98aeb43f9907f342f627cdc",
- "sha256:90f8717cb649eea3504091e640a1b8568faad18bd4b9fcd692853a04475a4b80",
- "sha256:957cf8e4b6e123a9eea554fa7ebc85674674b713551de587eb318a2df3e00255",
- "sha256:99f826cbf970077383d7de805c0681799491cb939c25450b9b5b3ced03ca99f1",
- "sha256:9f636b730f7e8cb19feb87094949ba54ee5357440b9658b2a32a5ce4bce53972",
- "sha256:a114d03b938376557927ab23f1e950827c3b893ccb94b62fd95d430fd0e5cf53",
- "sha256:a185f876e69897a6f3325c3f19f26a297fa058c5e456bfcff8015e9a27e83ae1",
- "sha256:a7a9541cd308eed5e30318430a9c74d2132e9a8cb46b901326272d780bf2d423",
- "sha256:aa466da5b15ccea564bdab9c89175c762bc12825f4659c11227f515cee76fa4a",
- "sha256:aaed8b0562be4a0876ee3b6946f6869b7bcdb571a5d1496683505944e268b160",
- "sha256:ab7c4ceb38d91570a650dba194e1ca87c2b543488fe9309b4212694174fd539c",
- "sha256:ac10f4c2b9e770c4e393876e35a7046879d195cd123b4f116d299d442b335bcd",
- "sha256:b04772ed465fa3cc947db808fa306d79b43e896beb677a56fb2347ca1a49c1fa",
- "sha256:b1c416351ee6271b2f49b56ad7f308072f6f44b37118d69c2cad94f3fa8a40d5",
- "sha256:b225d95519a5bf73860323e633a664b0d85ad3d5bede6d30d95b35d4dfe8805b",
- "sha256:b2f59caeaf7632cc633b5cf6fc449372b83bbdf0da4ae04d5be36118e46cc0aa",
- "sha256:b58c621844d55e71c1b7f7c498ce5aa6985d743a1a59034c57a905b3f153c1ef",
- "sha256:bf6bea52ec97e95560af5ae576bdac3aa3aae0b6758c6efa115236d9e07dae44",
- "sha256:c08be4f460903e5a9d0f76818db3250f12e9c344e79314d1d570fc69d7f4eae4",
- "sha256:c7053d3b0353a8b9de430a4f4b4268ac9a4fb3481af37dfe49825bf45ca24156",
- "sha256:c943a53e9186688b45b323602298ab727d8865d8c9ee0b17f8d62d14b56f0753",
- "sha256:ce2186a7df133a9c895dea3331ddc5ddad42cdd0d1ea2f0a51e5d161e4762f28",
- "sha256:d093be959277cb7dee84b801eb1af388b6ad3ca6a6b6bf1ed7585895789d027d",
- "sha256:d094ddec350a2fb899fec68d8353c78233debde9b7d8b4beeafa70825f1c281a",
- "sha256:d1a9dd711d0877a1ece3d2e4fea11a8e75741ca21954c919406b44e7cf971304",
- "sha256:d569388c381b24671589335a3be6e1d45546c2988c2ebe30fdcada8457a31008",
- "sha256:d618649d4e70ac6efcbba75be98b26ef5078faad23592f9b51ca492953012429",
- "sha256:d83a047959d38a7ff552ff94be767b7fd79b831ad1cd9920662db05fec24fe72",
- "sha256:d8fff389528cad1618fb4b26b95550327495462cd745d879a8c7c2115248e399",
- "sha256:da1758c76f50c39a2efd5e9859ce7d776317eb1dd34317c8152ac9251fc574a3",
- "sha256:db7457bac39421addd0c8449933ac32d8042aae84a14911a757ae6ca3eef1392",
- "sha256:e27bbb6d14416713a8bd7aaa1313c0fc8d44ee48d74497a0ff4c3a1b6ccb5167",
- "sha256:e617fb6b0b6953fffd762669610c1c4ffd05632c138d61ac7e14ad187870669c",
- "sha256:e9aa71e15d9d9beaad2c6b9319edcdc0a49a43ef5c0a4c8265ca9ee7d6c67774",
- "sha256:ec2abea24d98246b94913b76a125e855eb5c434f7c46546046372fe60f666351",
- "sha256:f179dee3b863ab1c59580ff60f9d99f632f34ccb38bf67a33ec6b3ecadd0fd76",
- "sha256:f4c035da3f544b1882bac24115f3e2e8760f10a0107614fc9839fd232200b875",
- "sha256:f67f217af4b1ff66c68a87318012de788dd95fcfeb24cc889011f4e1c7454dfd",
- "sha256:f90c822a402cb865e396a504f9fc8173ef34212a342d92e362ca498cad308e28",
- "sha256:ff3827aef427c89a25cc96ded1759271a93603aba9fb977a6d264648ebf989db"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==6.1.0"
- },
- "nbclient": {
- "hashes": [
- "sha256:3e93e348ab27e712acd46fccd809139e356eb9a31aab641d1a7991a6eb4e6f68",
- "sha256:949019b9240d66897e442888cfb618f69ef23dc71c01cb5fced8499c2cfc084d"
- ],
- "markers": "python_full_version >= '3.8.0'",
- "version": "==0.10.1"
- },
- "nbconvert": {
- "hashes": [
- "sha256:05873c620fe520b6322bf8a5ad562692343fe3452abda5765c7a34b7d1aa3eb3",
- "sha256:86ca91ba266b0a448dc96fa6c5b9d98affabde2867b363258703536807f9f7f4"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==7.16.4"
- },
- "nbformat": {
- "hashes": [
- "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a",
- "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==5.10.4"
- },
- "nest-asyncio": {
- "hashes": [
- "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe",
- "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c"
- ],
- "markers": "python_version >= '3.5'",
- "version": "==1.6.0"
- },
- "notebook": {
- "hashes": [
- "sha256:212e1486b2230fe22279043f33c7db5cf9a01d29feb063a85cb139747b7c9483",
- "sha256:84381c2a82d867517fd25b86e986dae1fe113a70b98f03edff9b94e499fec8fa"
- ],
- "index": "pypi",
- "version": "==7.3.1"
- },
- "notebook-shim": {
- "hashes": [
- "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef",
- "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==0.2.4"
- },
- "numpy": {
- "hashes": [
- "sha256:0557eebc699c1c34cccdd8c3778c9294e8196df27d713706895edc6f57d29608",
- "sha256:0798b138c291d792f8ea40fe3768610f3c7dd2574389e37c3f26573757c8f7ef",
- "sha256:0da8495970f6b101ddd0c38ace92edea30e7e12b9a926b57f5fabb1ecc25bb90",
- "sha256:0f0986e917aca18f7a567b812ef7ca9391288e2acb7a4308aa9d265bd724bdae",
- "sha256:122fd2fcfafdefc889c64ad99c228d5a1f9692c3a83f56c292618a59aa60ae83",
- "sha256:140dd80ff8981a583a60980be1a655068f8adebf7a45a06a6858c873fcdcd4a0",
- "sha256:16757cf28621e43e252c560d25b15f18a2f11da94fea344bf26c599b9cf54b73",
- "sha256:18142b497d70a34b01642b9feabb70156311b326fdddd875a9981f34a369b671",
- "sha256:1c92113619f7b272838b8d6702a7f8ebe5edea0df48166c47929611d0b4dea69",
- "sha256:1e25507d85da11ff5066269d0bd25d06e0a0f2e908415534f3e603d2a78e4ffa",
- "sha256:30bf971c12e4365153afb31fc73f441d4da157153f3400b82db32d04de1e4066",
- "sha256:3579eaeb5e07f3ded59298ce22b65f877a86ba8e9fe701f5576c99bb17c283da",
- "sha256:36b2b43146f646642b425dd2027730f99bac962618ec2052932157e213a040e9",
- "sha256:3905a5fffcc23e597ee4d9fb3fcd209bd658c352657548db7316e810ca80458e",
- "sha256:3a4199f519e57d517ebd48cb76b36c82da0360781c6a0353e64c0cac30ecaad3",
- "sha256:3f2f5cddeaa4424a0a118924b988746db6ffa8565e5829b1841a8a3bd73eb59a",
- "sha256:40deb10198bbaa531509aad0cd2f9fadb26c8b94070831e2208e7df543562b74",
- "sha256:440cfb3db4c5029775803794f8638fbdbf71ec702caf32735f53b008e1eaece3",
- "sha256:4723a50e1523e1de4fccd1b9a6dcea750c2102461e9a02b2ac55ffeae09a4410",
- "sha256:4bddbaa30d78c86329b26bd6aaaea06b1e47444da99eddac7bf1e2fab717bd72",
- "sha256:4e58666988605e251d42c2818c7d3d8991555381be26399303053b58a5bbf30d",
- "sha256:54dc1d6d66f8d37843ed281773c7174f03bf7ad826523f73435deb88ba60d2d4",
- "sha256:57fcc997ffc0bef234b8875a54d4058afa92b0b0c4223fc1f62f24b3b5e86038",
- "sha256:58b92a5828bd4d9aa0952492b7de803135038de47343b2aa3cc23f3b71a3dc4e",
- "sha256:5a145e956b374e72ad1dff82779177d4a3c62bc8248f41b80cb5122e68f22d13",
- "sha256:6ab153263a7c5ccaf6dfe7e53447b74f77789f28ecb278c3b5d49db7ece10d6d",
- "sha256:7832f9e8eb00be32f15fdfb9a981d6955ea9adc8574c521d48710171b6c55e95",
- "sha256:7fe4bb0695fe986a9e4deec3b6857003b4cfe5c5e4aac0b95f6a658c14635e31",
- "sha256:7fe8f3583e0607ad4e43a954e35c1748b553bfe9fdac8635c02058023277d1b3",
- "sha256:85ad7d11b309bd132d74397fcf2920933c9d1dc865487128f5c03d580f2c3d03",
- "sha256:9874bc2ff574c40ab7a5cbb7464bf9b045d617e36754a7bc93f933d52bd9ffc6",
- "sha256:a184288538e6ad699cbe6b24859206e38ce5fba28f3bcfa51c90d0502c1582b2",
- "sha256:a222d764352c773aa5ebde02dd84dba3279c81c6db2e482d62a3fa54e5ece69b",
- "sha256:a50aeff71d0f97b6450d33940c7181b08be1441c6c193e678211bff11aa725e7",
- "sha256:a55dc7a7f0b6198b07ec0cd445fbb98b05234e8b00c5ac4874a63372ba98d4ab",
- "sha256:a62eb442011776e4036af5c8b1a00b706c5bc02dc15eb5344b0c750428c94219",
- "sha256:a7d41d1612c1a82b64697e894b75db6758d4f21c3ec069d841e60ebe54b5b571",
- "sha256:a98f6f20465e7618c83252c02041517bd2f7ea29be5378f09667a8f654a5918d",
- "sha256:afe8fb968743d40435c3827632fd36c5fbde633b0423da7692e426529b1759b1",
- "sha256:b0b227dcff8cdc3efbce66d4e50891f04d0a387cce282fe1e66199146a6a8fca",
- "sha256:b30042fe92dbd79f1ba7f6898fada10bdaad1847c44f2dff9a16147e00a93661",
- "sha256:b606b1aaf802e6468c2608c65ff7ece53eae1a6874b3765f69b8ceb20c5fa78e",
- "sha256:b6207dc8fb3c8cb5668e885cef9ec7f70189bec4e276f0ff70d5aa078d32c88e",
- "sha256:c2aed8fcf8abc3020d6a9ccb31dbc9e7d7819c56a348cc88fd44be269b37427e",
- "sha256:cb24cca1968b21355cc6f3da1a20cd1cebd8a023e3c5b09b432444617949085a",
- "sha256:cff210198bb4cae3f3c100444c5eaa573a823f05c253e7188e1362a5555235b3",
- "sha256:d35717333b39d1b6bb8433fa758a55f1081543de527171543a2b710551d40881",
- "sha256:df12a1f99b99f569a7c2ae59aa2d31724e8d835fc7f33e14f4792e3071d11221",
- "sha256:e09d40edfdb4e260cb1567d8ae770ccf3b8b7e9f0d9b5c2a9992696b30ce2742",
- "sha256:e12c6c1ce84628c52d6367863773f7c8c8241be554e8b79686e91a43f1733773",
- "sha256:e2b8cd48a9942ed3f85b95ca4105c45758438c7ed28fff1e4ce3e57c3b589d8e",
- "sha256:e500aba968a48e9019e42c0c199b7ec0696a97fa69037bea163b55398e390529",
- "sha256:ebe5e59545401fbb1b24da76f006ab19734ae71e703cdb4a8b347e84a0cece67",
- "sha256:f0dd071b95bbca244f4cb7f70b77d2ff3aaaba7fa16dc41f58d14854a6204e6c",
- "sha256:f8c8b141ef9699ae777c6278b52c706b653bf15d135d302754f6b2e90eb30367"
- ],
- "markers": "python_version == '3.11'",
- "version": "==2.2.0"
- },
- "overrides": {
- "hashes": [
- "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a",
- "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==7.7.0"
- },
- "packaging": {
- "hashes": [
- "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759",
- "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==24.2"
- },
- "pandas": {
- "hashes": [
- "sha256:062309c1b9ea12a50e8ce661145c6aab431b1e99530d3cd60640e255778bd43a",
- "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d",
- "sha256:1948ddde24197a0f7add2bdc4ca83bf2b1ef84a1bc8ccffd95eda17fd836ecb5",
- "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4",
- "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0",
- "sha256:29401dbfa9ad77319367d36940cd8a0b3a11aba16063e39632d98b0e931ddf32",
- "sha256:31d0ced62d4ea3e231a9f228366919a5ea0b07440d9d4dac345376fd8e1477ea",
- "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28",
- "sha256:37e0aced3e8f539eccf2e099f65cdb9c8aa85109b0be6e93e2baff94264bdc6f",
- "sha256:381175499d3802cde0eabbaf6324cce0c4f5d52ca6f8c377c29ad442f50f6348",
- "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18",
- "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468",
- "sha256:3fc6873a41186404dad67245896a6e440baacc92f5b716ccd1bc9ed2995ab2c5",
- "sha256:4850ba03528b6dd51d6c5d273c46f183f39a9baf3f0143e566b89450965b105e",
- "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667",
- "sha256:56534ce0746a58afaf7942ba4863e0ef81c9c50d3f0ae93e9497d6a41a057645",
- "sha256:59ef3764d0fe818125a5097d2ae867ca3fa64df032331b7e0917cf5d7bf66b13",
- "sha256:5dbca4c1acd72e8eeef4753eeca07de9b1db4f398669d5994086f788a5d7cc30",
- "sha256:5de54125a92bb4d1c051c0659e6fcb75256bf799a732a87184e5ea503965bce3",
- "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d",
- "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb",
- "sha256:63cc132e40a2e084cf01adf0775b15ac515ba905d7dcca47e9a251819c575ef3",
- "sha256:66108071e1b935240e74525006034333f98bcdb87ea116de573a6a0dccb6c039",
- "sha256:6dfcb5ee8d4d50c06a51c2fffa6cff6272098ad6540aed1a76d15fb9318194d8",
- "sha256:7c2875855b0ff77b2a64a0365e24455d9990730d6431b9e0ee18ad8acee13dbd",
- "sha256:7eee9e7cea6adf3e3d24e304ac6b8300646e2a5d1cd3a3c2abed9101b0846761",
- "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659",
- "sha256:86976a1c5b25ae3f8ccae3a5306e443569ee3c3faf444dfd0f41cda24667ad57",
- "sha256:8cd6d7cc958a3910f934ea8dbdf17b2364827bb4dafc38ce6eef6bb3d65ff09c",
- "sha256:99df71520d25fade9db7c1076ac94eb994f4d2673ef2aa2e86ee039b6746d20c",
- "sha256:a5a1595fe639f5988ba6a8e5bc9649af3baf26df3998a0abe56c02609392e0a4",
- "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a",
- "sha256:b1d432e8d08679a40e2a6d8b2f9770a5c21793a6f9f47fdd52c5ce1948a5a8a9",
- "sha256:b8661b0238a69d7aafe156b7fa86c44b881387509653fdf857bebc5e4008ad42",
- "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2",
- "sha256:bc6b93f9b966093cb0fd62ff1a7e4c09e6d546ad7c1de191767baffc57628f39",
- "sha256:c124333816c3a9b03fbeef3a9f230ba9a737e9e5bb4060aa2107a86cc0a497fc",
- "sha256:cd8d0c3be0515c12fed0bdbae072551c8b54b7192c7b1fda0ba56059a0179698",
- "sha256:d9c45366def9a3dd85a6454c0e7908f2b3b8e9c138f5dc38fed7ce720d8453ed",
- "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015",
- "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24",
- "sha256:fffb8ae78d8af97f849404f21411c95062db1496aeb3e56f146f0355c9989319"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==2.2.3"
- },
- "pandocfilters": {
- "hashes": [
- "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e",
- "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
- "version": "==1.5.1"
- },
- "parso": {
- "hashes": [
- "sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18",
- "sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d"
- ],
- "markers": "python_version >= '3.6'",
- "version": "==0.8.4"
- },
- "pexpect": {
- "hashes": [
- "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523",
- "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"
- ],
- "markers": "sys_platform != 'win32' and sys_platform != 'emscripten'",
- "version": "==4.9.0"
- },
- "pika": {
- "hashes": [
- "sha256:0779a7c1fafd805672796085560d290213a465e4f6f76a6fb19e378d8041a14f",
- "sha256:b2a327ddddf8570b4965b3576ac77091b850262d34ce8c1d8cb4e4146aa4145f"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==1.3.2"
- },
- "platformdirs": {
- "hashes": [
- "sha256:357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907",
- "sha256:73e575e1408ab8103900836b97580d5307456908a03e92031bab39e4554cc3fb"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==4.3.6"
- },
- "prometheus-client": {
- "hashes": [
- "sha256:252505a722ac04b0456be05c05f75f45d760c2911ffc45f2a06bcaed9f3ae3fb",
- "sha256:594b45c410d6f4f8888940fe80b5cc2521b305a1fafe1c58609ef715a001f301"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.21.1"
- },
- "prompt-toolkit": {
- "hashes": [
- "sha256:d6623ab0477a80df74e646bdbc93621143f5caf104206aa29294d53de1a03d90",
- "sha256:f49a827f90062e411f1ce1f854f2aedb3c23353244f8108b89283587397ac10e"
- ],
- "markers": "python_full_version >= '3.7.0'",
- "version": "==3.0.48"
- },
- "propcache": {
- "hashes": [
- "sha256:03ff9d3f665769b2a85e6157ac8b439644f2d7fd17615a82fa55739bc97863f4",
- "sha256:049324ee97bb67285b49632132db351b41e77833678432be52bdd0289c0e05e4",
- "sha256:081a430aa8d5e8876c6909b67bd2d937bfd531b0382d3fdedb82612c618bc41a",
- "sha256:0f022d381747f0dfe27e99d928e31bc51a18b65bb9e481ae0af1380a6725dd1f",
- "sha256:12d1083f001ace206fe34b6bdc2cb94be66d57a850866f0b908972f90996b3e9",
- "sha256:14d86fe14b7e04fa306e0c43cdbeebe6b2c2156a0c9ce56b815faacc193e320d",
- "sha256:160291c60081f23ee43d44b08a7e5fb76681221a8e10b3139618c5a9a291b84e",
- "sha256:1672137af7c46662a1c2be1e8dc78cb6d224319aaa40271c9257d886be4363a6",
- "sha256:19a0f89a7bb9d8048d9c4370c9c543c396e894c76be5525f5e1ad287f1750ddf",
- "sha256:1ac2f5fe02fa75f56e1ad473f1175e11f475606ec9bd0be2e78e4734ad575034",
- "sha256:1cd9a1d071158de1cc1c71a26014dcdfa7dd3d5f4f88c298c7f90ad6f27bb46d",
- "sha256:1ffc3cca89bb438fb9c95c13fc874012f7b9466b89328c3c8b1aa93cdcfadd16",
- "sha256:297878dc9d0a334358f9b608b56d02e72899f3b8499fc6044133f0d319e2ec30",
- "sha256:2d3af2e79991102678f53e0dbf4c35de99b6b8b58f29a27ca0325816364caaba",
- "sha256:30b43e74f1359353341a7adb783c8f1b1c676367b011709f466f42fda2045e95",
- "sha256:3156628250f46a0895f1f36e1d4fbe062a1af8718ec3ebeb746f1d23f0c5dc4d",
- "sha256:31f5af773530fd3c658b32b6bdc2d0838543de70eb9a2156c03e410f7b0d3aae",
- "sha256:3935bfa5fede35fb202c4b569bb9c042f337ca4ff7bd540a0aa5e37131659348",
- "sha256:39d51fbe4285d5db5d92a929e3e21536ea3dd43732c5b177c7ef03f918dff9f2",
- "sha256:3f77ce728b19cb537714499928fe800c3dda29e8d9428778fc7c186da4c09a64",
- "sha256:4160d9283bd382fa6c0c2b5e017acc95bc183570cd70968b9202ad6d8fc48dce",
- "sha256:4a571d97dbe66ef38e472703067021b1467025ec85707d57e78711c085984e54",
- "sha256:4e6281aedfca15301c41f74d7005e6e3f4ca143584ba696ac69df4f02f40d629",
- "sha256:52277518d6aae65536e9cea52d4e7fd2f7a66f4aa2d30ed3f2fcea620ace3c54",
- "sha256:556fc6c10989f19a179e4321e5d678db8eb2924131e64652a51fe83e4c3db0e1",
- "sha256:574faa3b79e8ebac7cb1d7930f51184ba1ccf69adfdec53a12f319a06030a68b",
- "sha256:58791550b27d5488b1bb52bc96328456095d96206a250d28d874fafe11b3dfaf",
- "sha256:5b750a8e5a1262434fb1517ddf64b5de58327f1adc3524a5e44c2ca43305eb0b",
- "sha256:5d97151bc92d2b2578ff7ce779cdb9174337390a535953cbb9452fb65164c587",
- "sha256:5eee736daafa7af6d0a2dc15cc75e05c64f37fc37bafef2e00d77c14171c2097",
- "sha256:6445804cf4ec763dc70de65a3b0d9954e868609e83850a47ca4f0cb64bd79fea",
- "sha256:647894f5ae99c4cf6bb82a1bb3a796f6e06af3caa3d32e26d2350d0e3e3faf24",
- "sha256:66d4cfda1d8ed687daa4bc0274fcfd5267873db9a5bc0418c2da19273040eeb7",
- "sha256:6a9a8c34fb7bb609419a211e59da8887eeca40d300b5ea8e56af98f6fbbb1541",
- "sha256:6b3f39a85d671436ee3d12c017f8fdea38509e4f25b28eb25877293c98c243f6",
- "sha256:6b6fb63ae352e13748289f04f37868099e69dba4c2b3e271c46061e82c745634",
- "sha256:70693319e0b8fd35dd863e3e29513875eb15c51945bf32519ef52927ca883bc3",
- "sha256:781e65134efaf88feb447e8c97a51772aa75e48b794352f94cb7ea717dedda0d",
- "sha256:819ce3b883b7576ca28da3861c7e1a88afd08cc8c96908e08a3f4dd64a228034",
- "sha256:857112b22acd417c40fa4595db2fe28ab900c8c5fe4670c7989b1c0230955465",
- "sha256:887d9b0a65404929641a9fabb6452b07fe4572b269d901d622d8a34a4e9043b2",
- "sha256:8b3489ff1ed1e8315674d0775dc7d2195fb13ca17b3808721b54dbe9fd020faf",
- "sha256:92fc4500fcb33899b05ba73276dfb684a20d31caa567b7cb5252d48f896a91b1",
- "sha256:9403db39be1393618dd80c746cb22ccda168efce239c73af13c3763ef56ffc04",
- "sha256:98110aa363f1bb4c073e8dcfaefd3a5cea0f0834c2aab23dda657e4dab2f53b5",
- "sha256:999779addc413181912e984b942fbcc951be1f5b3663cd80b2687758f434c583",
- "sha256:9caac6b54914bdf41bcc91e7eb9147d331d29235a7c967c150ef5df6464fd1bb",
- "sha256:a7a078f5d37bee6690959c813977da5291b24286e7b962e62a94cec31aa5188b",
- "sha256:a7e65eb5c003a303b94aa2c3852ef130230ec79e349632d030e9571b87c4698c",
- "sha256:a96dc1fa45bd8c407a0af03b2d5218392729e1822b0c32e62c5bf7eeb5fb3958",
- "sha256:aca405706e0b0a44cc6bfd41fbe89919a6a56999157f6de7e182a990c36e37bc",
- "sha256:accb6150ce61c9c4b7738d45550806aa2b71c7668c6942f17b0ac182b6142fd4",
- "sha256:ad1af54a62ffe39cf34db1aa6ed1a1873bd548f6401db39d8e7cd060b9211f82",
- "sha256:ae1aa1cd222c6d205853b3013c69cd04515f9d6ab6de4b0603e2e1c33221303e",
- "sha256:b2d0a12018b04f4cb820781ec0dffb5f7c7c1d2a5cd22bff7fb055a2cb19ebce",
- "sha256:b480c6a4e1138e1aa137c0079b9b6305ec6dcc1098a8ca5196283e8a49df95a9",
- "sha256:b74c261802d3d2b85c9df2dfb2fa81b6f90deeef63c2db9f0e029a3cac50b518",
- "sha256:ba278acf14471d36316159c94a802933d10b6a1e117b8554fe0d0d9b75c9d536",
- "sha256:bb6178c241278d5fe853b3de743087be7f5f4c6f7d6d22a3b524d323eecec505",
- "sha256:bf72af5e0fb40e9babf594308911436c8efde3cb5e75b6f206c34ad18be5c052",
- "sha256:bfd3223c15bebe26518d58ccf9a39b93948d3dcb3e57a20480dfdd315356baff",
- "sha256:c214999039d4f2a5b2073ac506bba279945233da8c786e490d411dfc30f855c1",
- "sha256:c2f992c07c0fca81655066705beae35fc95a2fa7366467366db627d9f2ee097f",
- "sha256:cba4cfa1052819d16699e1d55d18c92b6e094d4517c41dd231a8b9f87b6fa681",
- "sha256:cea7daf9fc7ae6687cf1e2c049752f19f146fdc37c2cc376e7d0032cf4f25347",
- "sha256:cf6c4150f8c0e32d241436526f3c3f9cbd34429492abddbada2ffcff506c51af",
- "sha256:d09c333d36c1409d56a9d29b3a1b800a42c76a57a5a8907eacdbce3f18768246",
- "sha256:d27b84d5880f6d8aa9ae3edb253c59d9f6642ffbb2c889b78b60361eed449787",
- "sha256:d2ccec9ac47cf4e04897619c0e0c1a48c54a71bdf045117d3a26f80d38ab1fb0",
- "sha256:d71264a80f3fcf512eb4f18f59423fe82d6e346ee97b90625f283df56aee103f",
- "sha256:d93f3307ad32a27bda2e88ec81134b823c240aa3abb55821a8da553eed8d9439",
- "sha256:d9631c5e8b5b3a0fda99cb0d29c18133bca1e18aea9effe55adb3da1adef80d3",
- "sha256:ddfab44e4489bd79bda09d84c430677fc7f0a4939a73d2bba3073036f487a0a6",
- "sha256:e7048abd75fe40712005bcfc06bb44b9dfcd8e101dda2ecf2f5aa46115ad07ca",
- "sha256:e73091191e4280403bde6c9a52a6999d69cdfde498f1fdf629105247599b57ec",
- "sha256:e800776a79a5aabdb17dcc2346a7d66d0777e942e4cd251defeb084762ecd17d",
- "sha256:edc9fc7051e3350643ad929df55c451899bb9ae6d24998a949d2e4c87fb596d3",
- "sha256:f089118d584e859c62b3da0892b88a83d611c2033ac410e929cb6754eec0ed16",
- "sha256:f174bbd484294ed9fdf09437f889f95807e5f229d5d93588d34e92106fbf6717",
- "sha256:f508b0491767bb1f2b87fdfacaba5f7eddc2f867740ec69ece6d1946d29029a6",
- "sha256:f7a31fc1e1bd362874863fdeed71aed92d348f5336fd84f2197ba40c59f061bd",
- "sha256:f9479aa06a793c5aeba49ce5c5692ffb51fcd9a7016e017d555d5e2b0045d212"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==0.2.1"
- },
- "psutil": {
- "hashes": [
- "sha256:000d1d1ebd634b4efb383f4034437384e44a6d455260aaee2eca1e9c1b55f047",
- "sha256:045f00a43c737f960d273a83973b2511430d61f283a44c96bf13a6e829ba8fdc",
- "sha256:0895b8414afafc526712c498bd9de2b063deaac4021a3b3c34566283464aff8e",
- "sha256:1209036fbd0421afde505a4879dee3b2fd7b1e14fee81c0069807adcbbcca747",
- "sha256:1ad45a1f5d0b608253b11508f80940985d1d0c8f6111b5cb637533a0e6ddc13e",
- "sha256:353815f59a7f64cdaca1c0307ee13558a0512f6db064e92fe833784f08539c7a",
- "sha256:498c6979f9c6637ebc3a73b3f87f9eb1ec24e1ce53a7c5173b8508981614a90b",
- "sha256:5cd2bcdc75b452ba2e10f0e8ecc0b57b827dd5d7aaffbc6821b2a9a242823a76",
- "sha256:6d3fbbc8d23fcdcb500d2c9f94e07b1342df8ed71b948a2649b5cb060a7c94ca",
- "sha256:6e2dcd475ce8b80522e51d923d10c7871e45f20918e027ab682f94f1c6351688",
- "sha256:9118f27452b70bb1d9ab3198c1f626c2499384935aaf55388211ad982611407e",
- "sha256:9dcbfce5d89f1d1f2546a2090f4fcf87c7f669d1d90aacb7d7582addece9fb38",
- "sha256:a8506f6119cff7015678e2bce904a4da21025cc70ad283a53b099e7620061d85",
- "sha256:a8fb3752b491d246034fa4d279ff076501588ce8cbcdbb62c32fd7a377d996be",
- "sha256:c0e0c00aa18ca2d3b2b991643b799a15fc8f0563d2ebb6040f64ce8dc027b942",
- "sha256:d905186d647b16755a800e7263d43df08b790d709d575105d419f8b6ef65423a",
- "sha256:ff34df86226c0227c52f38b919213157588a678d049688eded74c76c8ba4a5d0"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
- "version": "==6.1.0"
- },
- "ptyprocess": {
- "hashes": [
- "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35",
- "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"
- ],
- "markers": "os_name != 'nt'",
- "version": "==0.7.0"
- },
- "pure-eval": {
- "hashes": [
- "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0",
- "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42"
- ],
- "version": "==0.2.3"
- },
- "pycparser": {
- "hashes": [
- "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6",
- "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.22"
- },
- "pydantic": {
- "hashes": [
- "sha256:be04d85bbc7b65651c5f8e6b9976ed9c6f41782a55524cef079a34a0bb82144d",
- "sha256:cb5ac360ce894ceacd69c403187900a02c4b20b693a9dd1d643e1effab9eadf9"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.10.3"
- },
- "pydantic-core": {
- "hashes": [
- "sha256:00e6424f4b26fe82d44577b4c842d7df97c20be6439e8e685d0d715feceb9fb9",
- "sha256:029d9757eb621cc6e1848fa0b0310310de7301057f623985698ed7ebb014391b",
- "sha256:02a3d637bd387c41d46b002f0e49c52642281edacd2740e5a42f7017feea3f2c",
- "sha256:0325336f348dbee6550d129b1627cb8f5351a9dc91aad141ffb96d4937bd9529",
- "sha256:062f60e512fc7fff8b8a9d680ff0ddaaef0193dba9fa83e679c0c5f5fbd018bc",
- "sha256:0b3dfe500de26c52abe0477dde16192ac39c98f05bf2d80e76102d394bd13854",
- "sha256:0e4216e64d203e39c62df627aa882f02a2438d18a5f21d7f721621f7a5d3611d",
- "sha256:121ceb0e822f79163dd4699e4c54f5ad38b157084d97b34de8b232bcaad70278",
- "sha256:159cac0a3d096f79ab6a44d77a961917219707e2a130739c64d4dd46281f5c2a",
- "sha256:15aae984e46de8d376df515f00450d1522077254ef6b7ce189b38ecee7c9677c",
- "sha256:15cc53a3179ba0fcefe1e3ae50beb2784dede4003ad2dfd24f81bba4b23a454f",
- "sha256:161c27ccce13b6b0c8689418da3885d3220ed2eae2ea5e9b2f7f3d48f1d52c27",
- "sha256:19910754e4cc9c63bc1c7f6d73aa1cfee82f42007e407c0f413695c2f7ed777f",
- "sha256:1ba5e3963344ff25fc8c40da90f44b0afca8cfd89d12964feb79ac1411a260ac",
- "sha256:1c00666a3bd2f84920a4e94434f5974d7bbc57e461318d6bb34ce9cdbbc1f6b2",
- "sha256:1c39b07d90be6b48968ddc8c19e7585052088fd7ec8d568bb31ff64c70ae3c97",
- "sha256:206b5cf6f0c513baffaeae7bd817717140770c74528f3e4c3e1cec7871ddd61a",
- "sha256:258c57abf1188926c774a4c94dd29237e77eda19462e5bb901d88adcab6af919",
- "sha256:2cdf7d86886bc6982354862204ae3b2f7f96f21a3eb0ba5ca0ac42c7b38598b9",
- "sha256:2d4567c850905d5eaaed2f7a404e61012a51caf288292e016360aa2b96ff38d4",
- "sha256:35c14ac45fcfdf7167ca76cc80b2001205a8d5d16d80524e13508371fb8cdd9c",
- "sha256:38de0a70160dd97540335b7ad3a74571b24f1dc3ed33f815f0880682e6880131",
- "sha256:3af385b0cee8df3746c3f406f38bcbfdc9041b5c2d5ce3e5fc6637256e60bbc5",
- "sha256:3b748c44bb9f53031c8cbc99a8a061bc181c1000c60a30f55393b6e9c45cc5bd",
- "sha256:3bbd5d8cc692616d5ef6fbbbd50dbec142c7e6ad9beb66b78a96e9c16729b089",
- "sha256:3ccaa88b24eebc0f849ce0a4d09e8a408ec5a94afff395eb69baf868f5183107",
- "sha256:3fa80ac2bd5856580e242dbc202db873c60a01b20309c8319b5c5986fbe53ce6",
- "sha256:4228b5b646caa73f119b1ae756216b59cc6e2267201c27d3912b592c5e323b60",
- "sha256:42b0e23f119b2b456d07ca91b307ae167cc3f6c846a7b169fca5326e32fdc6cf",
- "sha256:45cf8588c066860b623cd11c4ba687f8d7175d5f7ef65f7129df8a394c502de5",
- "sha256:45d9c5eb9273aa50999ad6adc6be5e0ecea7e09dbd0d31bd0c65a55a2592ca08",
- "sha256:4603137322c18eaf2e06a4495f426aa8d8388940f3c457e7548145011bb68e05",
- "sha256:46ccfe3032b3915586e469d4972973f893c0a2bb65669194a5bdea9bacc088c2",
- "sha256:4fefee876e07a6e9aad7a8c8c9f85b0cdbe7df52b8a9552307b09050f7512c7e",
- "sha256:5556470f1a2157031e676f776c2bc20acd34c1990ca5f7e56f1ebf938b9ab57c",
- "sha256:57866a76e0b3823e0b56692d1a0bf722bffb324839bb5b7226a7dbd6c9a40b17",
- "sha256:5897bec80a09b4084aee23f9b73a9477a46c3304ad1d2d07acca19723fb1de62",
- "sha256:58ca98a950171f3151c603aeea9303ef6c235f692fe555e883591103da709b23",
- "sha256:5ca038c7f6a0afd0b2448941b6ef9d5e1949e999f9e5517692eb6da58e9d44be",
- "sha256:5f6c8a66741c5f5447e047ab0ba7a1c61d1e95580d64bce852e3df1f895c4067",
- "sha256:5f8c4718cd44ec1580e180cb739713ecda2bdee1341084c1467802a417fe0f02",
- "sha256:5fde892e6c697ce3e30c61b239330fc5d569a71fefd4eb6512fc6caec9dd9e2f",
- "sha256:62a763352879b84aa31058fc931884055fd75089cccbd9d58bb6afd01141b235",
- "sha256:62ba45e21cf6571d7f716d903b5b7b6d2617e2d5d67c0923dc47b9d41369f840",
- "sha256:64c65f40b4cd8b0e049a8edde07e38b476da7e3aaebe63287c899d2cff253fa5",
- "sha256:655d7dd86f26cb15ce8a431036f66ce0318648f8853d709b4167786ec2fa4807",
- "sha256:66ff044fd0bb1768688aecbe28b6190f6e799349221fb0de0e6f4048eca14c16",
- "sha256:672ebbe820bb37988c4d136eca2652ee114992d5d41c7e4858cdd90ea94ffe5c",
- "sha256:6b9af86e1d8e4cfc82c2022bfaa6f459381a50b94a29e95dcdda8442d6d83864",
- "sha256:6e0bd57539da59a3e4671b90a502da9a28c72322a4f17866ba3ac63a82c4498e",
- "sha256:71a5e35c75c021aaf400ac048dacc855f000bdfed91614b4a726f7432f1f3d6a",
- "sha256:7597c07fbd11515f654d6ece3d0e4e5093edc30a436c63142d9a4b8e22f19c35",
- "sha256:764be71193f87d460a03f1f7385a82e226639732214b402f9aa61f0d025f0737",
- "sha256:7699b1df36a48169cdebda7ab5a2bac265204003f153b4bd17276153d997670a",
- "sha256:7ccebf51efc61634f6c2344da73e366c75e735960b5654b63d7e6f69a5885fa3",
- "sha256:7f7059ca8d64fea7f238994c97d91f75965216bcbe5f695bb44f354893f11d52",
- "sha256:8065914ff79f7eab1599bd80406681f0ad08f8e47c880f17b416c9f8f7a26d05",
- "sha256:816f5aa087094099fff7edabb5e01cc370eb21aa1a1d44fe2d2aefdfb5599b31",
- "sha256:81f2ec23ddc1b476ff96563f2e8d723830b06dceae348ce02914a37cb4e74b89",
- "sha256:84286494f6c5d05243456e04223d5a9417d7f443c3b76065e75001beb26f88de",
- "sha256:8bf7b66ce12a2ac52d16f776b31d16d91033150266eb796967a7e4621707e4f6",
- "sha256:8f1edcea27918d748c7e5e4d917297b2a0ab80cad10f86631e488b7cddf76a36",
- "sha256:981fb88516bd1ae8b0cbbd2034678a39dedc98752f264ac9bc5839d3923fa04c",
- "sha256:98476c98b02c8e9b2eec76ac4156fd006628b1b2d0ef27e548ffa978393fd154",
- "sha256:992cea5f4f3b29d6b4f7f1726ed8ee46c8331c6b4eed6db5b40134c6fe1768bb",
- "sha256:9a3b0793b1bbfd4146304e23d90045f2a9b5fd5823aa682665fbdaf2a6c28f3e",
- "sha256:9a42d6a8156ff78981f8aa56eb6394114e0dedb217cf8b729f438f643608cbcd",
- "sha256:9c10c309e18e443ddb108f0ef64e8729363adbfd92d6d57beec680f6261556f3",
- "sha256:9cbd94fc661d2bab2bc702cddd2d3370bbdcc4cd0f8f57488a81bcce90c7a54f",
- "sha256:9fdcf339322a3fae5cbd504edcefddd5a50d9ee00d968696846f089b4432cf78",
- "sha256:a0697803ed7d4af5e4c1adf1670af078f8fcab7a86350e969f454daf598c4960",
- "sha256:a28af0695a45f7060e6f9b7092558a928a28553366519f64083c63a44f70e618",
- "sha256:a2e02889071850bbfd36b56fd6bc98945e23670773bc7a76657e90e6b6603c08",
- "sha256:a33cd6ad9017bbeaa9ed78a2e0752c5e250eafb9534f308e7a5f7849b0b1bfb4",
- "sha256:a3cb37038123447cf0f3ea4c74751f6a9d7afef0eb71aa07bf5f652b5e6a132c",
- "sha256:a57847b090d7892f123726202b7daa20df6694cbd583b67a592e856bff603d6c",
- "sha256:a5a8e19d7c707c4cadb8c18f5f60c843052ae83c20fa7d44f41594c644a1d330",
- "sha256:ac3b20653bdbe160febbea8aa6c079d3df19310d50ac314911ed8cc4eb7f8cb8",
- "sha256:ac6c2c45c847bbf8f91930d88716a0fb924b51e0c6dad329b793d670ec5db792",
- "sha256:acc07b2cfc5b835444b44a9956846b578d27beeacd4b52e45489e93276241025",
- "sha256:aee66be87825cdf72ac64cb03ad4c15ffef4143dbf5c113f64a5ff4f81477bf9",
- "sha256:af52d26579b308921b73b956153066481f064875140ccd1dfd4e77db89dbb12f",
- "sha256:b94d4ba43739bbe8b0ce4262bcc3b7b9f31459ad120fb595627eaeb7f9b9ca01",
- "sha256:ba630d5e3db74c79300d9a5bdaaf6200172b107f263c98a0539eeecb857b2337",
- "sha256:bed0f8a0eeea9fb72937ba118f9db0cb7e90773462af7962d382445f3005e5a4",
- "sha256:bf99c8404f008750c846cb4ac4667b798a9f7de673ff719d705d9b2d6de49c5f",
- "sha256:c3027001c28434e7ca5a6e1e527487051136aa81803ac812be51802150d880dd",
- "sha256:c65af9088ac534313e1963443d0ec360bb2b9cba6c2909478d22c2e363d98a51",
- "sha256:d0165ab2914379bd56908c02294ed8405c252250668ebcb438a55494c69f44ab",
- "sha256:d1b26e1dff225c31897696cab7d4f0a315d4c0d9e8666dbffdb28216f3b17fdc",
- "sha256:d950caa237bb1954f1b8c9227b5065ba6875ac9771bb8ec790d956a699b78676",
- "sha256:dc61505e73298a84a2f317255fcc72b710b72980f3a1f670447a21efc88f8381",
- "sha256:e173486019cc283dc9778315fa29a363579372fe67045e971e89b6365cc035ed",
- "sha256:e1f735dc43da318cad19b4173dd1ffce1d84aafd6c9b782b3abc04a0d5a6f5bb",
- "sha256:e9386266798d64eeb19dd3677051f5705bf873e98e15897ddb7d76f477131967",
- "sha256:f216dbce0e60e4d03e0c4353c7023b202d95cbaeff12e5fd2e82ea0a66905073",
- "sha256:f4e5658dbffe8843a0f12366a4c2d1c316dbe09bb4dfbdc9d2d9cd6031de8aae",
- "sha256:f5a823165e6d04ccea61a9f0576f345f8ce40ed533013580e087bd4d7442b52c",
- "sha256:f69ed81ab24d5a3bd93861c8c4436f54afdf8e8cc421562b0c7504cf3be58206",
- "sha256:f82d068a2d6ecfc6e054726080af69a6764a10015467d7d7b9f66d6ed5afa23b"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.27.1"
- },
- "pygments": {
- "hashes": [
- "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199",
- "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.18.0"
- },
- "python-dateutil": {
- "hashes": [
- "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3",
- "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
- "version": "==2.9.0.post0"
- },
- "python-dotenv": {
- "hashes": [
- "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca",
- "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a"
- ],
- "index": "pypi",
- "version": "==1.0.1"
- },
- "python-json-logger": {
- "hashes": [
- "sha256:2c11056458d3f56614480b24e9cb28f7aba69cbfbebddbb77c92f0ec0d4947ab",
- "sha256:d73522ddcfc6d0461394120feaddea9025dc64bf804d96357dd42fa878cc5fe8"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==3.2.0"
- },
- "pytz": {
- "hashes": [
- "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a",
- "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"
- ],
- "version": "==2024.2"
- },
- "pyyaml": {
- "hashes": [
- "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff",
- "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48",
- "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086",
- "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e",
- "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133",
- "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5",
- "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484",
- "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee",
- "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5",
- "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68",
- "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a",
- "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf",
- "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99",
- "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8",
- "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85",
- "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19",
- "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc",
- "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a",
- "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1",
- "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317",
- "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c",
- "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631",
- "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d",
- "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652",
- "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5",
- "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e",
- "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b",
- "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8",
- "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476",
- "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706",
- "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563",
- "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237",
- "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b",
- "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083",
- "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180",
- "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425",
- "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e",
- "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f",
- "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725",
- "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183",
- "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab",
- "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774",
- "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725",
- "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e",
- "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5",
- "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d",
- "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290",
- "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44",
- "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed",
- "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4",
- "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba",
- "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12",
- "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==6.0.2"
- },
- "pyzmq": {
- "hashes": [
- "sha256:007137c9ac9ad5ea21e6ad97d3489af654381324d5d3ba614c323f60dab8fae6",
- "sha256:034da5fc55d9f8da09015d368f519478a52675e558c989bfcb5cf6d4e16a7d2a",
- "sha256:05590cdbc6b902101d0e65d6a4780af14dc22914cc6ab995d99b85af45362cc9",
- "sha256:070672c258581c8e4f640b5159297580a9974b026043bd4ab0470be9ed324f1f",
- "sha256:0aca98bc423eb7d153214b2df397c6421ba6373d3397b26c057af3c904452e37",
- "sha256:0bed0e799e6120b9c32756203fb9dfe8ca2fb8467fed830c34c877e25638c3fc",
- "sha256:0d987a3ae5a71c6226b203cfd298720e0086c7fe7c74f35fa8edddfbd6597eed",
- "sha256:0eaa83fc4c1e271c24eaf8fb083cbccef8fde77ec8cd45f3c35a9a123e6da097",
- "sha256:160c7e0a5eb178011e72892f99f918c04a131f36056d10d9c1afb223fc952c2d",
- "sha256:17bf5a931c7f6618023cdacc7081f3f266aecb68ca692adac015c383a134ca52",
- "sha256:17c412bad2eb9468e876f556eb4ee910e62d721d2c7a53c7fa31e643d35352e6",
- "sha256:18c8dc3b7468d8b4bdf60ce9d7141897da103c7a4690157b32b60acb45e333e6",
- "sha256:1a534f43bc738181aa7cbbaf48e3eca62c76453a40a746ab95d4b27b1111a7d2",
- "sha256:1c17211bc037c7d88e85ed8b7d8f7e52db6dc8eca5590d162717c654550f7282",
- "sha256:1f3496d76b89d9429a656293744ceca4d2ac2a10ae59b84c1da9b5165f429ad3",
- "sha256:1fcc03fa4997c447dce58264e93b5aa2d57714fbe0f06c07b7785ae131512732",
- "sha256:226af7dcb51fdb0109f0016449b357e182ea0ceb6b47dfb5999d569e5db161d5",
- "sha256:23f4aad749d13698f3f7b64aad34f5fc02d6f20f05999eebc96b89b01262fb18",
- "sha256:25bf2374a2a8433633c65ccb9553350d5e17e60c8eb4de4d92cc6bd60f01d306",
- "sha256:28ad5233e9c3b52d76196c696e362508959741e1a005fb8fa03b51aea156088f",
- "sha256:28c812d9757fe8acecc910c9ac9dafd2ce968c00f9e619db09e9f8f54c3a68a3",
- "sha256:29c6a4635eef69d68a00321e12a7d2559fe2dfccfa8efae3ffb8e91cd0b36a8b",
- "sha256:29c7947c594e105cb9e6c466bace8532dc1ca02d498684128b339799f5248277",
- "sha256:2a50625acdc7801bc6f74698c5c583a491c61d73c6b7ea4dee3901bb99adb27a",
- "sha256:2ae90ff9dad33a1cfe947d2c40cb9cb5e600d759ac4f0fd22616ce6540f72797",
- "sha256:2c4a71d5d6e7b28a47a394c0471b7e77a0661e2d651e7ae91e0cab0a587859ca",
- "sha256:2ea4ad4e6a12e454de05f2949d4beddb52460f3de7c8b9d5c46fbb7d7222e02c",
- "sha256:2eb7735ee73ca1b0d71e0e67c3739c689067f055c764f73aac4cc8ecf958ee3f",
- "sha256:31507f7b47cc1ead1f6e86927f8ebb196a0bab043f6345ce070f412a59bf87b5",
- "sha256:35cffef589bcdc587d06f9149f8d5e9e8859920a071df5a2671de2213bef592a",
- "sha256:367b4f689786fca726ef7a6c5ba606958b145b9340a5e4808132cc65759abd44",
- "sha256:39887ac397ff35b7b775db7201095fc6310a35fdbae85bac4523f7eb3b840e20",
- "sha256:3a495b30fc91db2db25120df5847d9833af237546fd59170701acd816ccc01c4",
- "sha256:3b55a4229ce5da9497dd0452b914556ae58e96a4381bb6f59f1305dfd7e53fc8",
- "sha256:402b190912935d3db15b03e8f7485812db350d271b284ded2b80d2e5704be780",
- "sha256:43a47408ac52647dfabbc66a25b05b6a61700b5165807e3fbd40063fcaf46386",
- "sha256:4661c88db4a9e0f958c8abc2b97472e23061f0bc737f6f6179d7a27024e1faa5",
- "sha256:46a446c212e58456b23af260f3d9fb785054f3e3653dbf7279d8f2b5546b21c2",
- "sha256:470d4a4f6d48fb34e92d768b4e8a5cc3780db0d69107abf1cd7ff734b9766eb0",
- "sha256:49d34ab71db5a9c292a7644ce74190b1dd5a3475612eefb1f8be1d6961441971",
- "sha256:4d29ab8592b6ad12ebbf92ac2ed2bedcfd1cec192d8e559e2e099f648570e19b",
- "sha256:4d80b1dd99c1942f74ed608ddb38b181b87476c6a966a88a950c7dee118fdf50",
- "sha256:4da04c48873a6abdd71811c5e163bd656ee1b957971db7f35140a2d573f6949c",
- "sha256:4f78c88905461a9203eac9faac157a2a0dbba84a0fd09fd29315db27be40af9f",
- "sha256:4ff9dc6bc1664bb9eec25cd17506ef6672d506115095411e237d571e92a58231",
- "sha256:5506f06d7dc6ecf1efacb4a013b1f05071bb24b76350832c96449f4a2d95091c",
- "sha256:55cf66647e49d4621a7e20c8d13511ef1fe1efbbccf670811864452487007e08",
- "sha256:5a509df7d0a83a4b178d0f937ef14286659225ef4e8812e05580776c70e155d5",
- "sha256:5c2b3bfd4b9689919db068ac6c9911f3fcb231c39f7dd30e3138be94896d18e6",
- "sha256:6835dd60355593de10350394242b5757fbbd88b25287314316f266e24c61d073",
- "sha256:689c5d781014956a4a6de61d74ba97b23547e431e9e7d64f27d4922ba96e9d6e",
- "sha256:6a96179a24b14fa6428cbfc08641c779a53f8fcec43644030328f44034c7f1f4",
- "sha256:6ace4f71f1900a548f48407fc9be59c6ba9d9aaf658c2eea6cf2779e72f9f317",
- "sha256:6b274e0762c33c7471f1a7471d1a2085b1a35eba5cdc48d2ae319f28b6fc4de3",
- "sha256:706e794564bec25819d21a41c31d4df2d48e1cc4b061e8d345d7fb4dd3e94072",
- "sha256:70fc7fcf0410d16ebdda9b26cbd8bf8d803d220a7f3522e060a69a9c87bf7bad",
- "sha256:7133d0a1677aec369d67dd78520d3fa96dd7f3dcec99d66c1762870e5ea1a50a",
- "sha256:7445be39143a8aa4faec43b076e06944b8f9d0701b669df4af200531b21e40bb",
- "sha256:76589c020680778f06b7e0b193f4b6dd66d470234a16e1df90329f5e14a171cd",
- "sha256:76589f2cd6b77b5bdea4fca5992dc1c23389d68b18ccc26a53680ba2dc80ff2f",
- "sha256:77eb0968da535cba0470a5165468b2cac7772cfb569977cff92e240f57e31bef",
- "sha256:794a4562dcb374f7dbbfb3f51d28fb40123b5a2abadee7b4091f93054909add5",
- "sha256:7ad1bc8d1b7a18497dda9600b12dc193c577beb391beae5cd2349184db40f187",
- "sha256:7f98f6dfa8b8ccaf39163ce872bddacca38f6a67289116c8937a02e30bbe9711",
- "sha256:8423c1877d72c041f2c263b1ec6e34360448decfb323fa8b94e85883043ef988",
- "sha256:8685fa9c25ff00f550c1fec650430c4b71e4e48e8d852f7ddcf2e48308038640",
- "sha256:878206a45202247781472a2d99df12a176fef806ca175799e1c6ad263510d57c",
- "sha256:89289a5ee32ef6c439086184529ae060c741334b8970a6855ec0b6ad3ff28764",
- "sha256:8ab5cad923cc95c87bffee098a27856c859bd5d0af31bd346035aa816b081fe1",
- "sha256:8b435f2753621cd36e7c1762156815e21c985c72b19135dac43a7f4f31d28dd1",
- "sha256:8be4700cd8bb02cc454f630dcdf7cfa99de96788b80c51b60fe2fe1dac480289",
- "sha256:8c997098cc65e3208eca09303630e84d42718620e83b733d0fd69543a9cab9cb",
- "sha256:8ea039387c10202ce304af74def5021e9adc6297067f3441d348d2b633e8166a",
- "sha256:8f7e66c7113c684c2b3f1c83cdd3376103ee0ce4c49ff80a648643e57fb22218",
- "sha256:90412f2db8c02a3864cbfc67db0e3dcdbda336acf1c469526d3e869394fe001c",
- "sha256:92a78853d7280bffb93df0a4a6a2498cba10ee793cc8076ef797ef2f74d107cf",
- "sha256:989d842dc06dc59feea09e58c74ca3e1678c812a4a8a2a419046d711031f69c7",
- "sha256:9cb3a6460cdea8fe8194a76de8895707e61ded10ad0be97188cc8463ffa7e3a8",
- "sha256:9dd8cd1aeb00775f527ec60022004d030ddc51d783d056e3e23e74e623e33726",
- "sha256:9ed69074a610fad1c2fda66180e7b2edd4d31c53f2d1872bc2d1211563904cd9",
- "sha256:9edda2df81daa129b25a39b86cb57dfdfe16f7ec15b42b19bfac503360d27a93",
- "sha256:a2224fa4a4c2ee872886ed00a571f5e967c85e078e8e8c2530a2fb01b3309b88",
- "sha256:a4f96f0d88accc3dbe4a9025f785ba830f968e21e3e2c6321ccdfc9aef755115",
- "sha256:aedd5dd8692635813368e558a05266b995d3d020b23e49581ddd5bbe197a8ab6",
- "sha256:aee22939bb6075e7afededabad1a56a905da0b3c4e3e0c45e75810ebe3a52672",
- "sha256:b1d464cb8d72bfc1a3adc53305a63a8e0cac6bc8c5a07e8ca190ab8d3faa43c2",
- "sha256:b8f86dd868d41bea9a5f873ee13bf5551c94cf6bc51baebc6f85075971fe6eea",
- "sha256:bc6bee759a6bddea5db78d7dcd609397449cb2d2d6587f48f3ca613b19410cfc",
- "sha256:bea2acdd8ea4275e1278350ced63da0b166421928276c7c8e3f9729d7402a57b",
- "sha256:bfa832bfa540e5b5c27dcf5de5d82ebc431b82c453a43d141afb1e5d2de025fa",
- "sha256:c0e6091b157d48cbe37bd67233318dbb53e1e6327d6fc3bb284afd585d141003",
- "sha256:c3789bd5768ab5618ebf09cef6ec2b35fed88709b104351748a63045f0ff9797",
- "sha256:c530e1eecd036ecc83c3407f77bb86feb79916d4a33d11394b8234f3bd35b940",
- "sha256:c811cfcd6a9bf680236c40c6f617187515269ab2912f3d7e8c0174898e2519db",
- "sha256:c92d73464b886931308ccc45b2744e5968cbaade0b1d6aeb40d8ab537765f5bc",
- "sha256:cccba051221b916a4f5e538997c45d7d136a5646442b1231b916d0164067ea27",
- "sha256:cdeabcff45d1c219636ee2e54d852262e5c2e085d6cb476d938aee8d921356b3",
- "sha256:ced65e5a985398827cc9276b93ef6dfabe0273c23de8c7931339d7e141c2818e",
- "sha256:d049df610ac811dcffdc147153b414147428567fbbc8be43bb8885f04db39d98",
- "sha256:dacd995031a01d16eec825bf30802fceb2c3791ef24bcce48fa98ce40918c27b",
- "sha256:ddf33d97d2f52d89f6e6e7ae66ee35a4d9ca6f36eda89c24591b0c40205a3629",
- "sha256:ded0fc7d90fe93ae0b18059930086c51e640cdd3baebdc783a695c77f123dcd9",
- "sha256:e3e0210287329272539eea617830a6a28161fbbd8a3271bf4150ae3e58c5d0e6",
- "sha256:e6fa2e3e683f34aea77de8112f6483803c96a44fd726d7358b9888ae5bb394ec",
- "sha256:ea0eb6af8a17fa272f7b98d7bebfab7836a0d62738e16ba380f440fceca2d951",
- "sha256:ea7f69de383cb47522c9c208aec6dd17697db7875a4674c4af3f8cfdac0bdeae",
- "sha256:eac5174677da084abf378739dbf4ad245661635f1600edd1221f150b165343f4",
- "sha256:fc4f7a173a5609631bb0c42c23d12c49df3966f89f496a51d3eb0ec81f4519d6",
- "sha256:fdb5b3e311d4d4b0eb8b3e8b4d1b0a512713ad7e6a68791d0923d1aec433d919"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==26.2.0"
- },
- "referencing": {
- "hashes": [
- "sha256:25b42124a6c8b632a425174f24087783efb348a6f1e0008e63cd4466fedf703c",
- "sha256:eda6d3234d62814d1c64e305c1331c9a3a6132da475ab6382eaa997b21ee75de"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.35.1"
- },
- "requests": {
- "hashes": [
- "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",
- "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.32.3"
- },
- "rfc3339-validator": {
- "hashes": [
- "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b",
- "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
- "version": "==0.1.4"
- },
- "rfc3986-validator": {
- "hashes": [
- "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9",
- "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
- "version": "==0.1.1"
- },
- "rpds-py": {
- "hashes": [
- "sha256:009de23c9c9ee54bf11303a966edf4d9087cd43a6003672e6aa7def643d06518",
- "sha256:02fbb9c288ae08bcb34fb41d516d5eeb0455ac35b5512d03181d755d80810059",
- "sha256:0a0461200769ab3b9ab7e513f6013b7a97fdeee41c29b9db343f3c5a8e2b9e61",
- "sha256:0b09865a9abc0ddff4e50b5ef65467cd94176bf1e0004184eb915cbc10fc05c5",
- "sha256:0b8db6b5b2d4491ad5b6bdc2bc7c017eec108acbf4e6785f42a9eb0ba234f4c9",
- "sha256:0c150c7a61ed4a4f4955a96626574e9baf1adf772c2fb61ef6a5027e52803543",
- "sha256:0f3cec041684de9a4684b1572fe28c7267410e02450f4561700ca5a3bc6695a2",
- "sha256:1352ae4f7c717ae8cba93421a63373e582d19d55d2ee2cbb184344c82d2ae55a",
- "sha256:177c7c0fce2855833819c98e43c262007f42ce86651ffbb84f37883308cb0e7d",
- "sha256:1978d0021e943aae58b9b0b196fb4895a25cc53d3956b8e35e0b7682eefb6d56",
- "sha256:1a60bce91f81ddaac922a40bbb571a12c1070cb20ebd6d49c48e0b101d87300d",
- "sha256:1aef18820ef3e4587ebe8b3bc9ba6e55892a6d7b93bac6d29d9f631a3b4befbd",
- "sha256:1e9663daaf7a63ceccbbb8e3808fe90415b0757e2abddbfc2e06c857bf8c5e2b",
- "sha256:20070c65396f7373f5df4005862fa162db5d25d56150bddd0b3e8214e8ef45b4",
- "sha256:214b7a953d73b5e87f0ebece4a32a5bd83c60a3ecc9d4ec8f1dca968a2d91e99",
- "sha256:22bebe05a9ffc70ebfa127efbc429bc26ec9e9b4ee4d15a740033efda515cf3d",
- "sha256:24e8abb5878e250f2eb0d7859a8e561846f98910326d06c0d51381fed59357bd",
- "sha256:26fd7cac7dd51011a245f29a2cc6489c4608b5a8ce8d75661bb4a1066c52dfbe",
- "sha256:27b1d3b3915a99208fee9ab092b8184c420f2905b7d7feb4aeb5e4a9c509b8a1",
- "sha256:27e98004595899949bd7a7b34e91fa7c44d7a97c40fcaf1d874168bb652ec67e",
- "sha256:2b8f60e1b739a74bab7e01fcbe3dddd4657ec685caa04681df9d562ef15b625f",
- "sha256:2de29005e11637e7a2361fa151f780ff8eb2543a0da1413bb951e9f14b699ef3",
- "sha256:2e8b55d8517a2fda8d95cb45d62a5a8bbf9dd0ad39c5b25c8833efea07b880ca",
- "sha256:2fa4331c200c2521512595253f5bb70858b90f750d39b8cbfd67465f8d1b596d",
- "sha256:3445e07bf2e8ecfeef6ef67ac83de670358abf2996916039b16a218e3d95e97e",
- "sha256:3453e8d41fe5f17d1f8e9c383a7473cd46a63661628ec58e07777c2fff7196dc",
- "sha256:378753b4a4de2a7b34063d6f95ae81bfa7b15f2c1a04a9518e8644e81807ebea",
- "sha256:3af6e48651c4e0d2d166dc1b033b7042ea3f871504b6805ba5f4fe31581d8d38",
- "sha256:3dfcbc95bd7992b16f3f7ba05af8a64ca694331bd24f9157b49dadeeb287493b",
- "sha256:3f21f0495edea7fdbaaa87e633a8689cd285f8f4af5c869f27bc8074638ad69c",
- "sha256:4041711832360a9b75cfb11b25a6a97c8fb49c07b8bd43d0d02b45d0b499a4ff",
- "sha256:44d61b4b7d0c2c9ac019c314e52d7cbda0ae31078aabd0f22e583af3e0d79723",
- "sha256:4617e1915a539a0d9a9567795023de41a87106522ff83fbfaf1f6baf8e85437e",
- "sha256:4b232061ca880db21fa14defe219840ad9b74b6158adb52ddf0e87bead9e8493",
- "sha256:5246b14ca64a8675e0a7161f7af68fe3e910e6b90542b4bfb5439ba752191df6",
- "sha256:5725dd9cc02068996d4438d397e255dcb1df776b7ceea3b9cb972bdb11260a83",
- "sha256:583f6a1993ca3369e0f80ba99d796d8e6b1a3a2a442dd4e1a79e652116413091",
- "sha256:59259dc58e57b10e7e18ce02c311804c10c5a793e6568f8af4dead03264584d1",
- "sha256:593eba61ba0c3baae5bc9be2f5232430453fb4432048de28399ca7376de9c627",
- "sha256:59f4a79c19232a5774aee369a0c296712ad0e77f24e62cad53160312b1c1eaa1",
- "sha256:5f0e260eaf54380380ac3808aa4ebe2d8ca28b9087cf411649f96bad6900c728",
- "sha256:62d9cfcf4948683a18a9aff0ab7e1474d407b7bab2ca03116109f8464698ab16",
- "sha256:64607d4cbf1b7e3c3c8a14948b99345eda0e161b852e122c6bb71aab6d1d798c",
- "sha256:655ca44a831ecb238d124e0402d98f6212ac527a0ba6c55ca26f616604e60a45",
- "sha256:666ecce376999bf619756a24ce15bb14c5bfaf04bf00abc7e663ce17c3f34fe7",
- "sha256:68049202f67380ff9aa52f12e92b1c30115f32e6895cd7198fa2a7961621fc5a",
- "sha256:69803198097467ee7282750acb507fba35ca22cc3b85f16cf45fb01cb9097730",
- "sha256:6c7b99ca52c2c1752b544e310101b98a659b720b21db00e65edca34483259967",
- "sha256:6dd9412824c4ce1aca56c47b0991e65bebb7ac3f4edccfd3f156150c96a7bf25",
- "sha256:70eb60b3ae9245ddea20f8a4190bd79c705a22f8028aaf8bbdebe4716c3fab24",
- "sha256:70fb28128acbfd264eda9bf47015537ba3fe86e40d046eb2963d75024be4d055",
- "sha256:7b2513ba235829860b13faa931f3b6846548021846ac808455301c23a101689d",
- "sha256:7ef9d9da710be50ff6809fed8f1963fecdfecc8b86656cadfca3bc24289414b0",
- "sha256:81e69b0a0e2537f26d73b4e43ad7bc8c8efb39621639b4434b76a3de50c6966e",
- "sha256:8633e471c6207a039eff6aa116e35f69f3156b3989ea3e2d755f7bc41754a4a7",
- "sha256:8bd7c8cfc0b8247c8799080fbff54e0b9619e17cdfeb0478ba7295d43f635d7c",
- "sha256:9253fc214112405f0afa7db88739294295f0e08466987f1d70e29930262b4c8f",
- "sha256:99b37292234e61325e7a5bb9689e55e48c3f5f603af88b1642666277a81f1fbd",
- "sha256:9bd7228827ec7bb817089e2eb301d907c0d9827a9e558f22f762bb690b131652",
- "sha256:9beeb01d8c190d7581a4d59522cd3d4b6887040dcfc744af99aa59fef3e041a8",
- "sha256:a63cbdd98acef6570c62b92a1e43266f9e8b21e699c363c0fef13bd530799c11",
- "sha256:a76e42402542b1fae59798fab64432b2d015ab9d0c8c47ba7addddbaf7952333",
- "sha256:ac0a03221cdb5058ce0167ecc92a8c89e8d0decdc9e99a2ec23380793c4dcb96",
- "sha256:b0b4136a252cadfa1adb705bb81524eee47d9f6aab4f2ee4fa1e9d3cd4581f64",
- "sha256:b25bc607423935079e05619d7de556c91fb6adeae9d5f80868dde3468657994b",
- "sha256:b3d504047aba448d70cf6fa22e06cb09f7cbd761939fdd47604f5e007675c24e",
- "sha256:bb47271f60660803ad11f4c61b42242b8c1312a31c98c578f79ef9387bbde21c",
- "sha256:bbb232860e3d03d544bc03ac57855cd82ddf19c7a07651a7c0fdb95e9efea8b9",
- "sha256:bc27863442d388870c1809a87507727b799c8460573cfbb6dc0eeaef5a11b5ec",
- "sha256:bc51abd01f08117283c5ebf64844a35144a0843ff7b2983e0648e4d3d9f10dbb",
- "sha256:be2eb3f2495ba669d2a985f9b426c1797b7d48d6963899276d22f23e33d47e37",
- "sha256:bf9db5488121b596dbfc6718c76092fda77b703c1f7533a226a5a9f65248f8ad",
- "sha256:c58e2339def52ef6b71b8f36d13c3688ea23fa093353f3a4fee2556e62086ec9",
- "sha256:cfbc454a2880389dbb9b5b398e50d439e2e58669160f27b60e5eca11f68ae17c",
- "sha256:cff63a0272fcd259dcc3be1657b07c929c466b067ceb1c20060e8d10af56f5bf",
- "sha256:d115bffdd417c6d806ea9069237a4ae02f513b778e3789a359bc5856e0404cc4",
- "sha256:d20cfb4e099748ea39e6f7b16c91ab057989712d31761d3300d43134e26e165f",
- "sha256:d48424e39c2611ee1b84ad0f44fb3b2b53d473e65de061e3f460fc0be5f1939d",
- "sha256:e0fa2d4ec53dc51cf7d3bb22e0aa0143966119f42a0c3e4998293a3dd2856b09",
- "sha256:e32fee8ab45d3c2db6da19a5323bc3362237c8b653c70194414b892fd06a080d",
- "sha256:e35ba67d65d49080e8e5a1dd40101fccdd9798adb9b050ff670b7d74fa41c566",
- "sha256:e3fb866d9932a3d7d0c82da76d816996d1667c44891bd861a0f97ba27e84fc74",
- "sha256:e61b02c3f7a1e0b75e20c3978f7135fd13cb6cf551bf4a6d29b999a88830a338",
- "sha256:e67ba3c290821343c192f7eae1d8fd5999ca2dc99994114643e2f2d3e6138b15",
- "sha256:e79dd39f1e8c3504be0607e5fc6e86bb60fe3584bec8b782578c3b0fde8d932c",
- "sha256:e89391e6d60251560f0a8f4bd32137b077a80d9b7dbe6d5cab1cd80d2746f648",
- "sha256:ea7433ce7e4bfc3a85654aeb6747babe3f66eaf9a1d0c1e7a4435bbdf27fea84",
- "sha256:eaf16ae9ae519a0e237a0f528fd9f0197b9bb70f40263ee57ae53c2b8d48aeb3",
- "sha256:eb0c341fa71df5a4595f9501df4ac5abfb5a09580081dffbd1ddd4654e6e9123",
- "sha256:f276b245347e6e36526cbd4a266a417796fc531ddf391e43574cf6466c492520",
- "sha256:f47ad3d5f3258bd7058d2d506852217865afefe6153a36eb4b6928758041d831",
- "sha256:f56a6b404f74ab372da986d240e2e002769a7d7102cc73eb238a4f72eec5284e",
- "sha256:f5cf2a0c2bdadf3791b5c205d55a37a54025c6e18a71c71f82bb536cf9a454bf",
- "sha256:f5d36399a1b96e1a5fdc91e0522544580dbebeb1f77f27b2b0ab25559e103b8b",
- "sha256:f60bd8423be1d9d833f230fdbccf8f57af322d96bcad6599e5a771b151398eb2",
- "sha256:f612463ac081803f243ff13cccc648578e2279295048f2a8d5eb430af2bae6e3",
- "sha256:f73d3fef726b3243a811121de45193c0ca75f6407fe66f3f4e183c983573e130",
- "sha256:f82a116a1d03628a8ace4859556fb39fd1424c933341a08ea3ed6de1edb0283b",
- "sha256:fb0ba113b4983beac1a2eb16faffd76cb41e176bf58c4afe3e14b9c681f702de",
- "sha256:fb4f868f712b2dd4bcc538b0a0c1f63a2b1d584c925e69a224d759e7070a12d5",
- "sha256:fb6116dfb8d1925cbdb52595560584db42a7f664617a1f7d7f6e32f138cdf37d",
- "sha256:fda7cb070f442bf80b642cd56483b5548e43d366fe3f39b98e67cce780cded00",
- "sha256:feea821ee2a9273771bae61194004ee2fc33f8ec7db08117ef9147d4bbcbca8e"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==0.22.3"
- },
- "send2trash": {
- "hashes": [
- "sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9",
- "sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
- "version": "==1.9.0"
- },
- "setuptools": {
- "hashes": [
- "sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6",
- "sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==75.6.0"
- },
- "six": {
- "hashes": [
- "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274",
- "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
- "version": "==1.17.0"
- },
- "sniffio": {
- "hashes": [
- "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2",
- "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"
- ],
- "markers": "python_version >= '3.7'",
- "version": "==1.3.1"
- },
- "soupsieve": {
- "hashes": [
- "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb",
- "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.6"
- },
- "stack-data": {
- "hashes": [
- "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9",
- "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"
- ],
- "version": "==0.6.3"
- },
- "terminado": {
- "hashes": [
- "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0",
- "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==0.18.1"
- },
- "tinycss2": {
- "hashes": [
- "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7",
- "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.4.0"
- },
- "tinydb": {
- "hashes": [
- "sha256:f7dfc39b8d7fda7a1ca62a8dbb449ffd340a117c1206b68c50b1a481fb95181d",
- "sha256:f97030ee5cbc91eeadd1d7af07ab0e48ceb04aa63d4a983adbaca4cba16e86c3"
- ],
- "markers": "python_version >= '3.8' and python_version < '4.0'",
- "version": "==4.8.2"
- },
- "tornado": {
- "hashes": [
- "sha256:072ce12ada169c5b00b7d92a99ba089447ccc993ea2143c9ede887e0937aa803",
- "sha256:1a017d239bd1bb0919f72af256a970624241f070496635784d9bf0db640d3fec",
- "sha256:2876cef82e6c5978fde1e0d5b1f919d756968d5b4282418f3146b79b58556482",
- "sha256:304463bd0772442ff4d0f5149c6f1c2135a1fae045adf070821c6cdc76980634",
- "sha256:908b71bf3ff37d81073356a5fadcc660eb10c1476ee6e2725588626ce7e5ca38",
- "sha256:92bad5b4746e9879fd7bf1eb21dce4e3fc5128d71601f80005afa39237ad620b",
- "sha256:932d195ca9015956fa502c6b56af9eb06106140d844a335590c1ec7f5277d10c",
- "sha256:bca9eb02196e789c9cb5c3c7c0f04fb447dc2adffd95265b2c7223a8a615ccbf",
- "sha256:c36e62ce8f63409301537222faffcef7dfc5284f27eec227389f2ad11b09d946",
- "sha256:c82c46813ba483a385ab2a99caeaedf92585a1f90defb5693351fa7e4ea0bf73",
- "sha256:e828cce1123e9e44ae2a50a9de3055497ab1d0aeb440c5ac23064d9e44880da1"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==6.4.2"
- },
- "traitlets": {
- "hashes": [
- "sha256:9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7",
- "sha256:b74e89e397b1ed28cc831db7aea759ba6640cb3de13090ca145426688ff1ac4f"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==5.14.3"
- },
- "tuspy": {
- "hashes": [
- "sha256:156734eac5c61a046cfecd70f14119f05be92cce198eb5a1a99a664482bedb89",
- "sha256:7fc5ac8fb25de37c96c90213f83a1ffdede7f48a471cb5a15a2f57846828a79a"
- ],
- "markers": "python_full_version >= '3.5.3'",
- "version": "==1.1.0"
- },
- "types-python-dateutil": {
- "hashes": [
- "sha256:18f493414c26ffba692a72369fea7a154c502646301ebfe3d56a04b3767284cb",
- "sha256:e248a4bc70a486d3e3ec84d0dc30eec3a5f979d6e7ee4123ae043eedbb987f53"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.9.0.20241206"
- },
- "typing-extensions": {
- "hashes": [
- "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
- "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==4.12.2"
- },
- "tzdata": {
- "hashes": [
- "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc",
- "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"
- ],
- "markers": "python_version >= '2'",
- "version": "==2024.2"
- },
- "uri-template": {
- "hashes": [
- "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7",
- "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363"
- ],
- "version": "==1.3.0"
- },
- "urllib3": {
- "hashes": [
- "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
- "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==2.2.3"
- },
- "wcwidth": {
- "hashes": [
- "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859",
- "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"
- ],
- "version": "==0.2.13"
- },
- "webcolors": {
- "hashes": [
- "sha256:515291393b4cdf0eb19c155749a096f779f7d909f7cceea072791cb9095b92e9",
- "sha256:ecb3d768f32202af770477b8b65f318fa4f566c22948673a977b00d589dd80f6"
- ],
- "version": "==24.11.1"
- },
- "webencodings": {
- "hashes": [
- "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
- "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
- ],
- "version": "==0.5.1"
- },
- "websocket-client": {
- "hashes": [
- "sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526",
- "sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da"
- ],
- "markers": "python_version >= '3.8'",
- "version": "==1.8.1"
- },
- "yarl": {
- "hashes": [
- "sha256:00e5a1fea0fd4f5bfa7440a47eff01d9822a65b4488f7cff83155a0f31a2ecba",
- "sha256:02ddb6756f8f4517a2d5e99d8b2f272488e18dd0bfbc802f31c16c6c20f22193",
- "sha256:045b8482ce9483ada4f3f23b3774f4e1bf4f23a2d5c912ed5170f68efb053318",
- "sha256:09c7907c8548bcd6ab860e5f513e727c53b4a714f459b084f6580b49fa1b9cee",
- "sha256:0b0cad37311123211dc91eadcb322ef4d4a66008d3e1bdc404808992260e1a0e",
- "sha256:0b3c92fa08759dbf12b3a59579a4096ba9af8dd344d9a813fc7f5070d86bbab1",
- "sha256:0fb2171a4486bb075316ee754c6d8382ea6eb8b399d4ec62fde2b591f879778a",
- "sha256:1a74a13a4c857a84a845505fd2d68e54826a2cd01935a96efb1e9d86c728e186",
- "sha256:1d407181cfa6e70077df3377938c08012d18893f9f20e92f7d2f314a437c30b1",
- "sha256:1dd4bdd05407ced96fed3d7f25dbbf88d2ffb045a0db60dbc247f5b3c5c25d50",
- "sha256:25b411eddcfd56a2f0cd6a384e9f4f7aa3efee14b188de13048c25b5e91f1640",
- "sha256:2d06d3005e668744e11ed80812e61efd77d70bb7f03e33c1598c301eea20efbb",
- "sha256:2ec9bbba33b2d00999af4631a3397d1fd78290c48e2a3e52d8dd72db3a067ac8",
- "sha256:3236da9272872443f81fedc389bace88408f64f89f75d1bdb2256069a8730ccc",
- "sha256:35098b24e0327fc4ebdc8ffe336cee0a87a700c24ffed13161af80124b7dc8e5",
- "sha256:41f7ce59d6ee7741af71d82020346af364949314ed3d87553763a2df1829cc58",
- "sha256:436c4fc0a4d66b2badc6c5fc5ef4e47bb10e4fd9bf0c79524ac719a01f3607c2",
- "sha256:4891ed92157e5430874dad17b15eb1fda57627710756c27422200c52d8a4e393",
- "sha256:4ac515b860c36becb81bb84b667466885096b5fc85596948548b667da3bf9f24",
- "sha256:5094d9206c64181d0f6e76ebd8fb2f8fe274950a63890ee9e0ebfd58bf9d787b",
- "sha256:54d6921f07555713b9300bee9c50fb46e57e2e639027089b1d795ecd9f7fa910",
- "sha256:578e281c393af575879990861823ef19d66e2b1d0098414855dd367e234f5b3c",
- "sha256:5a3f356548e34a70b0172d8890006c37be92995f62d95a07b4a42e90fba54272",
- "sha256:602d98f2c2d929f8e697ed274fbadc09902c4025c5a9963bf4e9edfc3ab6f7ed",
- "sha256:61b1a825a13bef4a5f10b1885245377d3cd0bf87cba068e1d9a88c2ae36880e1",
- "sha256:61e5e68cb65ac8f547f6b5ef933f510134a6bf31bb178be428994b0cb46c2a04",
- "sha256:61ee62ead9b68b9123ec24bc866cbef297dd266175d53296e2db5e7f797f902d",
- "sha256:6333c5a377c8e2f5fae35e7b8f145c617b02c939d04110c76f29ee3676b5f9a5",
- "sha256:6748dbf9bfa5ba1afcc7556b71cda0d7ce5f24768043a02a58846e4a443d808d",
- "sha256:67a283dd2882ac98cc6318384f565bffc751ab564605959df4752d42483ad889",
- "sha256:75674776d96d7b851b6498f17824ba17849d790a44d282929c42dbb77d4f17ae",
- "sha256:757e81cae69244257d125ff31663249b3013b5dc0a8520d73694aed497fb195b",
- "sha256:77a6e85b90a7641d2e07184df5557132a337f136250caafc9ccaa4a2a998ca2c",
- "sha256:7c33dd1931a95e5d9a772d0ac5e44cac8957eaf58e3c8da8c1414de7dd27c576",
- "sha256:7df647e8edd71f000a5208fe6ff8c382a1de8edfbccdbbfe649d263de07d8c34",
- "sha256:7e2ee16578af3b52ac2f334c3b1f92262f47e02cc6193c598502bd46f5cd1477",
- "sha256:80316a8bd5109320d38eef8833ccf5f89608c9107d02d2a7f985f98ed6876990",
- "sha256:82123d0c954dc58db301f5021a01854a85bf1f3bb7d12ae0c01afc414a882ca2",
- "sha256:84b2deecba4a3f1a398df819151eb72d29bfeb3b69abb145a00ddc8d30094512",
- "sha256:8503ad47387b8ebd39cbbbdf0bf113e17330ffd339ba1144074da24c545f0069",
- "sha256:877d209b6aebeb5b16c42cbb377f5f94d9e556626b1bfff66d7b0d115be88d0a",
- "sha256:8874027a53e3aea659a6d62751800cf6e63314c160fd607489ba5c2edd753cf6",
- "sha256:88a19f62ff30117e706ebc9090b8ecc79aeb77d0b1f5ec10d2d27a12bc9f66d0",
- "sha256:8d39d351e7faf01483cc7ff7c0213c412e38e5a340238826be7e0e4da450fdc8",
- "sha256:90adb47ad432332d4f0bc28f83a5963f426ce9a1a8809f5e584e704b82685dcb",
- "sha256:913829534200eb0f789d45349e55203a091f45c37a2674678744ae52fae23efa",
- "sha256:93b2e109287f93db79210f86deb6b9bbb81ac32fc97236b16f7433db7fc437d8",
- "sha256:9d41beda9dc97ca9ab0b9888cb71f7539124bc05df02c0cff6e5acc5a19dcc6e",
- "sha256:a440a2a624683108a1b454705ecd7afc1c3438a08e890a1513d468671d90a04e",
- "sha256:a4bb030cf46a434ec0225bddbebd4b89e6471814ca851abb8696170adb163985",
- "sha256:a9ca04806f3be0ac6d558fffc2fdf8fcef767e0489d2684a21912cc4ed0cd1b8",
- "sha256:ac1801c45cbf77b6c99242eeff4fffb5e4e73a800b5c4ad4fc0be5def634d2e1",
- "sha256:ac36703a585e0929b032fbaab0707b75dc12703766d0b53486eabd5139ebadd5",
- "sha256:b1771de9944d875f1b98a745bc547e684b863abf8f8287da8466cf470ef52690",
- "sha256:b464c4ab4bfcb41e3bfd3f1c26600d038376c2de3297760dfe064d2cb7ea8e10",
- "sha256:b4f6450109834af88cb4cc5ecddfc5380ebb9c228695afc11915a0bf82116789",
- "sha256:b57f4f58099328dfb26c6a771d09fb20dbbae81d20cfb66141251ea063bd101b",
- "sha256:b643562c12680b01e17239be267bc306bbc6aac1f34f6444d1bded0c5ce438ca",
- "sha256:b958ddd075ddba5b09bb0be8a6d9906d2ce933aee81100db289badbeb966f54e",
- "sha256:b9d60031cf568c627d028239693fd718025719c02c9f55df0a53e587aab951b5",
- "sha256:ba23302c0c61a9999784e73809427c9dbedd79f66a13d84ad1b1943802eaaf59",
- "sha256:ba87babd629f8af77f557b61e49e7c7cac36f22f871156b91e10a6e9d4f829e9",
- "sha256:c017a3b6df3a1bd45b9fa49a0f54005e53fbcad16633870104b66fa1a30a29d8",
- "sha256:c1e1cc06da1491e6734f0ea1e6294ce00792193c463350626571c287c9a704db",
- "sha256:c654d5207c78e0bd6d749f6dae1dcbbfde3403ad3a4b11f3c5544d9906969dde",
- "sha256:c69697d3adff5aa4f874b19c0e4ed65180ceed6318ec856ebc423aa5850d84f7",
- "sha256:c7d79f7d9aabd6011004e33b22bc13056a3e3fb54794d138af57f5ee9d9032cb",
- "sha256:ccaa3a4b521b780a7e771cc336a2dba389a0861592bbce09a476190bb0c8b4b3",
- "sha256:ccd17349166b1bee6e529b4add61727d3f55edb7babbe4069b5764c9587a8cc6",
- "sha256:ce1af883b94304f493698b00d0f006d56aea98aeb49d75ec7d98cd4a777e9285",
- "sha256:d0e883008013c0e4aef84dcfe2a0b172c4d23c2669412cf5b3371003941f72bb",
- "sha256:d980e0325b6eddc81331d3f4551e2a333999fb176fd153e075c6d1c2530aa8a8",
- "sha256:e17c9361d46a4d5addf777c6dd5eab0715a7684c2f11b88c67ac37edfba6c482",
- "sha256:e2c08cc9b16f4f4bc522771d96734c7901e7ebef70c6c5c35dd0f10845270bcd",
- "sha256:e35ef8683211db69ffe129a25d5634319a677570ab6b2eba4afa860f54eeaf75",
- "sha256:e3b9fd71836999aad54084906f8663dffcd2a7fb5cdafd6c37713b2e72be1760",
- "sha256:ef9f7768395923c3039055c14334ba4d926f3baf7b776c923c93d80195624782",
- "sha256:f52a265001d830bc425f82ca9eabda94a64a4d753b07d623a9f2863fde532b53",
- "sha256:f91c4803173928a25e1a55b943c81f55b8872f0018be83e3ad4938adffb77dd2",
- "sha256:fbd6748e8ab9b41171bb95c6142faf068f5ef1511935a0aa07025438dd9a9bc1",
- "sha256:fe57328fbc1bfd0bd0514470ac692630f3901c0ee39052ae47acd1d90a436719",
- "sha256:fea09ca13323376a2fdfb353a5fa2e59f90cd18d7ca4eaa1fd31f0a8b4f91e62"
- ],
- "markers": "python_version >= '3.9'",
- "version": "==1.18.3"
- }
- },
- "develop": {}
-}
diff --git a/.jupyter/default.ipynb b/.jupyter/default.ipynb
deleted file mode 100644
index c5302ce2c002376a38f2bebb192a8be81d824025..0000000000000000000000000000000000000000
--- a/.jupyter/default.ipynb
+++ /dev/null
@@ -1,383 +0,0 @@
-{
- "cells": [
- {
- "metadata": {},
- "cell_type": "markdown",
- "source": [
- "# DBRepo Demo Notebook\n",
- "\n",
- "## Environment\n",
- "\n",
- "Set the REST API endpoint and your username + password in the `.env` file. This ensures it is not revealed in the code."
- ],
- "id": "3ca0c15a13bd6882"
- },
- {
- "metadata": {
- "ExecuteTime": {
- "end_time": "2024-12-14T07:22:43.939456Z",
- "start_time": "2024-12-14T07:22:43.577273Z"
- }
- },
- "cell_type": "code",
- "source": [
- "import dotenv\n",
- "from pandas.core.interchange.dataframe_protocol import DataFrame\n",
- "%load_ext dotenv\n",
- "%dotenv"
- ],
- "id": "4eb6c2470f464173",
- "outputs": [],
- "execution_count": 1
- },
- {
- "metadata": {},
- "cell_type": "markdown",
- "source": [
- "The code above loads the values from the `.env` file into this Jupyter Notebook. Alternatively you can set all parameters directly in the method:\n",
- " \n",
- "```python\n",
- "client = RestClient(endpoint='https://test.dbrepo.tuwien.ac.at', username='foo', password='bar')\n",
- "```\n",
- "\n",
- "## Global Variables & Imports\n",
- "\n",
- "Set the database id for convenience."
- ],
- "id": "2cbd7a83a800b879"
- },
- {
- "metadata": {
- "ExecuteTime": {
- "end_time": "2024-12-14T07:22:44.325683Z",
- "start_time": "2024-12-14T07:22:43.946474Z"
- }
- },
- "cell_type": "code",
- "source": [
- "from dbrepo.RestClient import RestClient\n",
- "\n",
- "database_id = 37\n",
- "client = RestClient()"
- ],
- "id": "319e797ebb89b17b",
- "outputs": [],
- "execution_count": 2
- },
- {
- "metadata": {},
- "cell_type": "markdown",
- "source": [
- "## Tables\n",
- "\n",
- "Load data from any table, uncomment where needed."
- ],
- "id": "dc1ee2ab9378917"
- },
- {
- "metadata": {
- "ExecuteTime": {
- "end_time": "2024-12-14T07:22:44.666058Z",
- "start_time": "2024-12-14T07:22:44.409680Z"
- }
- },
- "cell_type": "code",
- "source": [
- "# test_result_chloride_ageing = client.get_table_data(database_id, 615)\n",
- "# test_result_chloride = client.get_table_data(database_id, 614)\n",
- "# test_result_carb_nat = client.get_table_data(database_id, 613)\n",
- "# test_result_carb_acc = client.get_table_data(database_id, 612)\n",
- "# source_mat_analysis = client.get_table_data(database_id, 611)\n",
- "# source_mat = client.get_table_data(database_id, 610)\n",
- "# pruefstelle = client.get_table_data(database_id, 609)\n",
- "# mix_recipe = client.get_table_data(database_id, 607)\n",
- "# mix = client.get_table_data(database_id, 606)\n",
- "betonvariante = client.get_table_data(database_id, 604)\n",
- "betonvariante\n",
- "\n",
- "# optional: export table data as .csv\n",
- "# betonvariante.to_csv('betonvariante.csv')\n",
- "\n",
- "# optional: update table data from .csv\n",
- "# client.import_table_data(database_id, 604, 'my_data.csv')\n",
- "\n",
- "# optional: update table data from `pandas` DataFrame\n",
- "# df = DataFrame()\n",
- "# client.import_table_data(database_id, 604, df)"
- ],
- "id": "initial_id",
- "outputs": [
- {
- "data": {
- "text/plain": [
- " id name\n",
- "0 1 s\n",
- "1 2 d\n",
- "2 3 p\n",
- "3 4 c"
- ],
- "text/html": [
- "<div>\n",
- "<style scoped>\n",
- " .dataframe tbody tr th:only-of-type {\n",
- " vertical-align: middle;\n",
- " }\n",
- "\n",
- " .dataframe tbody tr th {\n",
- " vertical-align: top;\n",
- " }\n",
- "\n",
- " .dataframe thead th {\n",
- " text-align: right;\n",
- " }\n",
- "</style>\n",
- "<table border=\"1\" class=\"dataframe\">\n",
- " <thead>\n",
- " <tr style=\"text-align: right;\">\n",
- " <th></th>\n",
- " <th>id</th>\n",
- " <th>name</th>\n",
- " </tr>\n",
- " </thead>\n",
- " <tbody>\n",
- " <tr>\n",
- " <th>0</th>\n",
- " <td>1</td>\n",
- " <td>s</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>1</th>\n",
- " <td>2</td>\n",
- " <td>d</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>2</th>\n",
- " <td>3</td>\n",
- " <td>p</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>3</th>\n",
- " <td>4</td>\n",
- " <td>c</td>\n",
- " </tr>\n",
- " </tbody>\n",
- "</table>\n",
- "</div>"
- ]
- },
- "execution_count": 3,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "execution_count": 3
- },
- {
- "metadata": {},
- "cell_type": "markdown",
- "source": [
- "## Views\n",
- "\n",
- "Load data from any view, uncomment where needed."
- ],
- "id": "9098ea798a2ab598"
- },
- {
- "metadata": {
- "ExecuteTime": {
- "end_time": "2024-12-14T07:22:45.110019Z",
- "start_time": "2024-12-14T07:22:44.708283Z"
- }
- },
- "cell_type": "code",
- "source": [
- "beton_acc = client.get_view_data(database_id, 70)\n",
- "beton_acc\n",
- "\n",
- "# optional: export view data as .csv\n",
- "# beton_acc.to_csv('beton_acc.csv')"
- ],
- "id": "ddd433035e632df9",
- "outputs": [
- {
- "data": {
- "text/plain": [
- " mix date_production name k_ac_mm_root_day \\\n",
- "0 20230918-N01-XC2-D 2023-09-18 d 1.590000000000000000 \n",
- "1 20230918-N03-XC1-S 2023-09-18 s 2.070000000000000000 \n",
- "2 20230919-N03-XC1-D 2023-09-19 d 1.390000000000000000 \n",
- "3 20230920-N03-XC2-D 2023-09-20 d 1.260000000000000000 \n",
- "4 20230918-N04-XC1-S 2023-09-18 s 2.090000000000000000 \n",
- "5 20230919-N06-XC1-S 2023-09-19 s 1.070000000000000000 \n",
- "6 20230920-N06-XC2-D 2023-09-20 d 0.770000000000000000 \n",
- "\n",
- " test_procedure mean_depth_t0_mm \n",
- "0 KB-TVFA 0.750000000000000000 \n",
- "1 KB-TVFA 0.250000000000000000 \n",
- "2 KB-TVFA 0.200000000000000000 \n",
- "3 KB-TVFA 0.300000000000000000 \n",
- "4 KB-TVFA 0.300000000000000000 \n",
- "5 KB-TVFA 0E-18 \n",
- "6 KB-TVFA 0E-18 "
- ],
- "text/html": [
- "<div>\n",
- "<style scoped>\n",
- " .dataframe tbody tr th:only-of-type {\n",
- " vertical-align: middle;\n",
- " }\n",
- "\n",
- " .dataframe tbody tr th {\n",
- " vertical-align: top;\n",
- " }\n",
- "\n",
- " .dataframe thead th {\n",
- " text-align: right;\n",
- " }\n",
- "</style>\n",
- "<table border=\"1\" class=\"dataframe\">\n",
- " <thead>\n",
- " <tr style=\"text-align: right;\">\n",
- " <th></th>\n",
- " <th>mix</th>\n",
- " <th>date_production</th>\n",
- " <th>name</th>\n",
- " <th>k_ac_mm_root_day</th>\n",
- " <th>test_procedure</th>\n",
- " <th>mean_depth_t0_mm</th>\n",
- " </tr>\n",
- " </thead>\n",
- " <tbody>\n",
- " <tr>\n",
- " <th>0</th>\n",
- " <td>20230918-N01-XC2-D</td>\n",
- " <td>2023-09-18</td>\n",
- " <td>d</td>\n",
- " <td>1.590000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0.750000000000000000</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>1</th>\n",
- " <td>20230918-N03-XC1-S</td>\n",
- " <td>2023-09-18</td>\n",
- " <td>s</td>\n",
- " <td>2.070000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0.250000000000000000</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>2</th>\n",
- " <td>20230919-N03-XC1-D</td>\n",
- " <td>2023-09-19</td>\n",
- " <td>d</td>\n",
- " <td>1.390000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0.200000000000000000</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>3</th>\n",
- " <td>20230920-N03-XC2-D</td>\n",
- " <td>2023-09-20</td>\n",
- " <td>d</td>\n",
- " <td>1.260000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0.300000000000000000</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>4</th>\n",
- " <td>20230918-N04-XC1-S</td>\n",
- " <td>2023-09-18</td>\n",
- " <td>s</td>\n",
- " <td>2.090000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0.300000000000000000</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>5</th>\n",
- " <td>20230919-N06-XC1-S</td>\n",
- " <td>2023-09-19</td>\n",
- " <td>s</td>\n",
- " <td>1.070000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0E-18</td>\n",
- " </tr>\n",
- " <tr>\n",
- " <th>6</th>\n",
- " <td>20230920-N06-XC2-D</td>\n",
- " <td>2023-09-20</td>\n",
- " <td>d</td>\n",
- " <td>0.770000000000000000</td>\n",
- " <td>KB-TVFA</td>\n",
- " <td>0E-18</td>\n",
- " </tr>\n",
- " </tbody>\n",
- "</table>\n",
- "</div>"
- ]
- },
- "execution_count": 4,
- "metadata": {},
- "output_type": "execute_result"
- }
- ],
- "execution_count": 4
- },
- {
- "metadata": {},
- "cell_type": "markdown",
- "source": "## Subsets",
- "id": "54b9b1f732219331"
- },
- {
- "metadata": {
- "ExecuteTime": {
- "end_time": "2024-12-14T07:22:46.566518Z",
- "start_time": "2024-12-14T07:22:45.197517Z"
- }
- },
- "cell_type": "code",
- "source": [
- "subset = client.create_subset(database_id, \"SELECT m.mix, date_production, b.name, ta.k_ac_mm_root_day, ta.test_procedure, ta.mean_depth_t0_mm FROM mix m JOIN betonvariante b ON b.id = m.betonvariante_id JOIN test_result_carb_acc ta ON m.id = ta.mix_id\")\n",
- "subset"
- ],
- "id": "f165e5e3861a0dda",
- "outputs": [
- {
- "ename": "ResponseCodeError",
- "evalue": "Failed to create subset: response code: 200 is not 201 (CREATED): [{\"mix\":\"20230918-N01-XC2-D\",\"date_production\":\"2023-09-18\",\"name\":\"d\",\"k_ac_mm_root_day\":\"1.590000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.750000000000000000\"},{\"mix\":\"20230918-N03-XC1-S\",\"date_production\":\"2023-09-18\",\"name\":\"s\",\"k_ac_mm_root_day\":\"2.070000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.250000000000000000\"},{\"mix\":\"20230919-N03-XC1-D\",\"date_production\":\"2023-09-19\",\"name\":\"d\",\"k_ac_mm_root_day\":\"1.390000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.200000000000000000\"},{\"mix\":\"20230920-N03-XC2-D\",\"date_production\":\"2023-09-20\",\"name\":\"d\",\"k_ac_mm_root_day\":\"1.260000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.300000000000000000\"},{\"mix\":\"20230918-N04-XC1-S\",\"date_production\":\"2023-09-18\",\"name\":\"s\",\"k_ac_mm_root_day\":\"2.090000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.300000000000000000\"},{\"mix\":\"20230919-N06-XC1-S\",\"date_production\":\"2023-09-19\",\"name\":\"s\",\"k_ac_mm_root_day\":\"1.070000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0E-18\"},{\"mix\":\"20230920-N06-XC2-D\",\"date_production\":\"2023-09-20\",\"name\":\"d\",\"k_ac_mm_root_day\":\"0.770000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0E-18\"}]",
- "output_type": "error",
- "traceback": [
- "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m",
- "\u001B[0;31mResponseCodeError\u001B[0m Traceback (most recent call last)",
- "Cell \u001B[0;32mIn[5], line 1\u001B[0m\n\u001B[0;32m----> 1\u001B[0m subset \u001B[38;5;241m=\u001B[39m \u001B[43mclient\u001B[49m\u001B[38;5;241;43m.\u001B[39;49m\u001B[43mcreate_subset\u001B[49m\u001B[43m(\u001B[49m\u001B[43mdatabase_id\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[38;5;124;43m\"\u001B[39;49m\u001B[38;5;124;43mSELECT m.mix, date_production, b.name, ta.k_ac_mm_root_day, ta.test_procedure, ta.mean_depth_t0_mm FROM mix m JOIN betonvariante b ON b.id = m.betonvariante_id JOIN test_result_carb_acc ta ON m.id = ta.mix_id\u001B[39;49m\u001B[38;5;124;43m\"\u001B[39;49m\u001B[43m)\u001B[49m\n\u001B[1;32m 2\u001B[0m subset\n",
- "File \u001B[0;32m~/Projects/fda-services/.jupyter/venv/lib/python3.11/site-packages/dbrepo/RestClient.py:1590\u001B[0m, in \u001B[0;36mRestClient.create_subset\u001B[0;34m(self, database_id, query, page, size, timestamp)\u001B[0m\n\u001B[1;32m 1588\u001B[0m \u001B[38;5;28;01mif\u001B[39;00m response\u001B[38;5;241m.\u001B[39mstatus_code \u001B[38;5;241m==\u001B[39m \u001B[38;5;241m503\u001B[39m:\n\u001B[1;32m 1589\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m ServiceError(\u001B[38;5;124mf\u001B[39m\u001B[38;5;124m'\u001B[39m\u001B[38;5;124mFailed to create subset: failed to establish connection with data database\u001B[39m\u001B[38;5;124m'\u001B[39m)\n\u001B[0;32m-> 1590\u001B[0m \u001B[38;5;28;01mraise\u001B[39;00m ResponseCodeError(\u001B[38;5;124mf\u001B[39m\u001B[38;5;124m'\u001B[39m\u001B[38;5;124mFailed to create subset: response code: \u001B[39m\u001B[38;5;132;01m{\u001B[39;00mresponse\u001B[38;5;241m.\u001B[39mstatus_code\u001B[38;5;132;01m}\u001B[39;00m\u001B[38;5;124m is not \u001B[39m\u001B[38;5;124m'\u001B[39m\n\u001B[1;32m 1591\u001B[0m \u001B[38;5;124mf\u001B[39m\u001B[38;5;124m'\u001B[39m\u001B[38;5;124m201 (CREATED): \u001B[39m\u001B[38;5;132;01m{\u001B[39;00mresponse\u001B[38;5;241m.\u001B[39mtext\u001B[38;5;132;01m}\u001B[39;00m\u001B[38;5;124m'\u001B[39m)\n",
- "\u001B[0;31mResponseCodeError\u001B[0m: Failed to create subset: response code: 200 is not 201 (CREATED): [{\"mix\":\"20230918-N01-XC2-D\",\"date_production\":\"2023-09-18\",\"name\":\"d\",\"k_ac_mm_root_day\":\"1.590000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.750000000000000000\"},{\"mix\":\"20230918-N03-XC1-S\",\"date_production\":\"2023-09-18\",\"name\":\"s\",\"k_ac_mm_root_day\":\"2.070000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.250000000000000000\"},{\"mix\":\"20230919-N03-XC1-D\",\"date_production\":\"2023-09-19\",\"name\":\"d\",\"k_ac_mm_root_day\":\"1.390000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.200000000000000000\"},{\"mix\":\"20230920-N03-XC2-D\",\"date_production\":\"2023-09-20\",\"name\":\"d\",\"k_ac_mm_root_day\":\"1.260000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.300000000000000000\"},{\"mix\":\"20230918-N04-XC1-S\",\"date_production\":\"2023-09-18\",\"name\":\"s\",\"k_ac_mm_root_day\":\"2.090000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0.300000000000000000\"},{\"mix\":\"20230919-N06-XC1-S\",\"date_production\":\"2023-09-19\",\"name\":\"s\",\"k_ac_mm_root_day\":\"1.070000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0E-18\"},{\"mix\":\"20230920-N06-XC2-D\",\"date_production\":\"2023-09-20\",\"name\":\"d\",\"k_ac_mm_root_day\":\"0.770000000000000000\",\"test_procedure\":\"KB-TVFA\",\"mean_depth_t0_mm\":\"0E-18\"}]"
- ]
- }
- ],
- "execution_count": 5
- }
- ],
- "metadata": {
- "kernelspec": {
- "display_name": "Python 3",
- "language": "python",
- "name": "python3"
- },
- "language_info": {
- "codemirror_mode": {
- "name": "ipython",
- "version": 2
- },
- "file_extension": ".py",
- "mimetype": "text/x-python",
- "name": "python",
- "nbconvert_exporter": "python",
- "pygments_lexer": "ipython2",
- "version": "2.7.6"
- }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/.jupyter/environment.yml b/.jupyter/environment.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ea69098e2ae286794ea72afc77461c79d479a543
--- /dev/null
+++ b/.jupyter/environment.yml
@@ -0,0 +1,4 @@
+name: main
+dependencies:
+ - dbrepo=1.9.1
+ - python-dotenv
\ No newline at end of file
diff --git a/.jupyter/starter-notebook.ipynb b/.jupyter/starter-notebook.ipynb
new file mode 100644
index 0000000000000000000000000000000000000000..723c57ce6af5b024cb1ce7100d093b4b09251a76
--- /dev/null
+++ b/.jupyter/starter-notebook.ipynb
@@ -0,0 +1,219 @@
+{
+ "cells": [
+ {
+ "cell_type": "markdown",
+ "id": "3ca0c15a13bd6882",
+ "metadata": {},
+ "source": [
+ "# DBRepo Starter Notebook\n",
+ "\n",
+ "## Environment\n",
+ "\n",
+ "Set the REST API endpoint and your username + password in the `.env` file. This ensures it is not revealed in the code."
+ ]
+ },
+ {
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:30:52.468596Z",
+ "start_time": "2025-06-04T07:30:52.463645Z"
+ }
+ },
+ "cell_type": "code",
+ "source": "from pandas.core.interchange.dataframe_protocol import DataFrame",
+ "id": "eee6d2de5bb78c9b",
+ "outputs": [],
+ "execution_count": 10
+ },
+ {
+ "cell_type": "markdown",
+ "id": "2cbd7a83a800b879",
+ "metadata": {},
+ "source": [
+ "The code above loads the values from the `.env` file into this Jupyter Notebook. Alternatively you can set all parameters directly in the method:\n",
+ " \n",
+ "```python\n",
+ "client = RestClient(endpoint='https://test.dbrepo.tuwien.ac.at', username='foo', password='bar')\n",
+ "```\n",
+ "\n",
+ "## Global Imports"
+ ]
+ },
+ {
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:30:52.545184Z",
+ "start_time": "2025-06-04T07:30:52.540063Z"
+ }
+ },
+ "cell_type": "code",
+ "source": [
+ "from dbrepo.RestClient import RestClient\n",
+ "\n",
+ "client = RestClient(endpoint=\"https://dbrepo1.ec.tuwien.ac.at\", username=None, password=None)"
+ ],
+ "id": "f629d91b2164484f",
+ "outputs": [],
+ "execution_count": 11
+ },
+ {
+ "metadata": {},
+ "cell_type": "markdown",
+ "source": [
+ "## Tables\n",
+ "\n",
+ "Load data from any table into a `pandas` DataFrame."
+ ],
+ "id": "9b1e8c0eab380eef"
+ },
+ {
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:30:53.061283Z",
+ "start_time": "2025-06-04T07:30:52.593186Z"
+ }
+ },
+ "cell_type": "code",
+ "source": [
+ "deployments = client.get_table_data('71183815-021d-40d1-884e-3e58bd43b169', '0b533238-e73e-43ec-a773-04ed75349b7a')\n",
+ "display(deployments)"
+ ],
+ "id": "48a8d5510529d53f",
+ "outputs": [
+ {
+ "ename": "ConnectionError",
+ "evalue": "HTTPSConnectionPool(host='dbrepo.example.com', port=443): Max retries exceeded with url: /api/database/71183815-021d-40d1-884e-3e58bd43b169/table/0b533238-e73e-43ec-a773-04ed75349b7a/data?page=0&size=10 (Caused by NameResolutionError(\"<urllib3.connection.HTTPSConnection object at 0x7f6de7ceff50>: Failed to resolve 'dbrepo.example.com' ([Errno -2] Name or service not known)\"))",
+ "output_type": "error",
+ "traceback": [
+ "\u001B[31m---------------------------------------------------------------------------\u001B[39m",
+ "\u001B[31mgaierror\u001B[39m Traceback (most recent call last)",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connection.py:198\u001B[39m, in \u001B[36mHTTPConnection._new_conn\u001B[39m\u001B[34m(self)\u001B[39m\n\u001B[32m 197\u001B[39m \u001B[38;5;28;01mtry\u001B[39;00m:\n\u001B[32m--> \u001B[39m\u001B[32m198\u001B[39m sock = \u001B[43mconnection\u001B[49m\u001B[43m.\u001B[49m\u001B[43mcreate_connection\u001B[49m\u001B[43m(\u001B[49m\n\u001B[32m 199\u001B[39m \u001B[43m \u001B[49m\u001B[43m(\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43m_dns_host\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43mport\u001B[49m\u001B[43m)\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 200\u001B[39m \u001B[43m \u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43mtimeout\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 201\u001B[39m \u001B[43m \u001B[49m\u001B[43msource_address\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43msource_address\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 202\u001B[39m \u001B[43m \u001B[49m\u001B[43msocket_options\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43msocket_options\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 203\u001B[39m \u001B[43m \u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 204\u001B[39m \u001B[38;5;28;01mexcept\u001B[39;00m socket.gaierror \u001B[38;5;28;01mas\u001B[39;00m e:\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/util/connection.py:60\u001B[39m, in \u001B[36mcreate_connection\u001B[39m\u001B[34m(address, timeout, source_address, socket_options)\u001B[39m\n\u001B[32m 58\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m LocationParseError(\u001B[33mf\u001B[39m\u001B[33m\"\u001B[39m\u001B[33m'\u001B[39m\u001B[38;5;132;01m{\u001B[39;00mhost\u001B[38;5;132;01m}\u001B[39;00m\u001B[33m'\u001B[39m\u001B[33m, label empty or too long\u001B[39m\u001B[33m\"\u001B[39m) \u001B[38;5;28;01mfrom\u001B[39;00m\u001B[38;5;250m \u001B[39m\u001B[38;5;28;01mNone\u001B[39;00m\n\u001B[32m---> \u001B[39m\u001B[32m60\u001B[39m \u001B[38;5;28;01mfor\u001B[39;00m res \u001B[38;5;129;01min\u001B[39;00m \u001B[43msocket\u001B[49m\u001B[43m.\u001B[49m\u001B[43mgetaddrinfo\u001B[49m\u001B[43m(\u001B[49m\u001B[43mhost\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mport\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mfamily\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43msocket\u001B[49m\u001B[43m.\u001B[49m\u001B[43mSOCK_STREAM\u001B[49m\u001B[43m)\u001B[49m:\n\u001B[32m 61\u001B[39m af, socktype, proto, canonname, sa = res\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m/usr/lib/python3.11/socket.py:962\u001B[39m, in \u001B[36mgetaddrinfo\u001B[39m\u001B[34m(host, port, family, type, proto, flags)\u001B[39m\n\u001B[32m 961\u001B[39m addrlist = []\n\u001B[32m--> \u001B[39m\u001B[32m962\u001B[39m \u001B[38;5;28;01mfor\u001B[39;00m res \u001B[38;5;129;01min\u001B[39;00m \u001B[43m_socket\u001B[49m\u001B[43m.\u001B[49m\u001B[43mgetaddrinfo\u001B[49m\u001B[43m(\u001B[49m\u001B[43mhost\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mport\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mfamily\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[38;5;28;43mtype\u001B[39;49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mproto\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mflags\u001B[49m\u001B[43m)\u001B[49m:\n\u001B[32m 963\u001B[39m af, socktype, proto, canonname, sa = res\n",
+ "\u001B[31mgaierror\u001B[39m: [Errno -2] Name or service not known",
+ "\nThe above exception was the direct cause of the following exception:\n",
+ "\u001B[31mNameResolutionError\u001B[39m Traceback (most recent call last)",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connectionpool.py:787\u001B[39m, in \u001B[36mHTTPConnectionPool.urlopen\u001B[39m\u001B[34m(self, method, url, body, headers, retries, redirect, assert_same_host, timeout, pool_timeout, release_conn, chunked, body_pos, preload_content, decode_content, **response_kw)\u001B[39m\n\u001B[32m 786\u001B[39m \u001B[38;5;66;03m# Make the request on the HTTPConnection object\u001B[39;00m\n\u001B[32m--> \u001B[39m\u001B[32m787\u001B[39m response = \u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43m_make_request\u001B[49m\u001B[43m(\u001B[49m\n\u001B[32m 788\u001B[39m \u001B[43m \u001B[49m\u001B[43mconn\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 789\u001B[39m \u001B[43m \u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 790\u001B[39m \u001B[43m \u001B[49m\u001B[43murl\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 791\u001B[39m \u001B[43m \u001B[49m\u001B[43mtimeout\u001B[49m\u001B[43m=\u001B[49m\u001B[43mtimeout_obj\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 792\u001B[39m \u001B[43m \u001B[49m\u001B[43mbody\u001B[49m\u001B[43m=\u001B[49m\u001B[43mbody\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 793\u001B[39m \u001B[43m \u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m=\u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 794\u001B[39m \u001B[43m \u001B[49m\u001B[43mchunked\u001B[49m\u001B[43m=\u001B[49m\u001B[43mchunked\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 795\u001B[39m \u001B[43m \u001B[49m\u001B[43mretries\u001B[49m\u001B[43m=\u001B[49m\u001B[43mretries\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 796\u001B[39m \u001B[43m \u001B[49m\u001B[43mresponse_conn\u001B[49m\u001B[43m=\u001B[49m\u001B[43mresponse_conn\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 797\u001B[39m \u001B[43m \u001B[49m\u001B[43mpreload_content\u001B[49m\u001B[43m=\u001B[49m\u001B[43mpreload_content\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 798\u001B[39m \u001B[43m \u001B[49m\u001B[43mdecode_content\u001B[49m\u001B[43m=\u001B[49m\u001B[43mdecode_content\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 799\u001B[39m \u001B[43m \u001B[49m\u001B[43m*\u001B[49m\u001B[43m*\u001B[49m\u001B[43mresponse_kw\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 800\u001B[39m \u001B[43m\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 802\u001B[39m \u001B[38;5;66;03m# Everything went great!\u001B[39;00m\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connectionpool.py:488\u001B[39m, in \u001B[36mHTTPConnectionPool._make_request\u001B[39m\u001B[34m(self, conn, method, url, body, headers, retries, timeout, chunked, response_conn, preload_content, decode_content, enforce_content_length)\u001B[39m\n\u001B[32m 487\u001B[39m new_e = _wrap_proxy_error(new_e, conn.proxy.scheme)\n\u001B[32m--> \u001B[39m\u001B[32m488\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m new_e\n\u001B[32m 490\u001B[39m \u001B[38;5;66;03m# conn.request() calls http.client.*.request, not the method in\u001B[39;00m\n\u001B[32m 491\u001B[39m \u001B[38;5;66;03m# urllib3.request. It also calls makefile (recv) on the socket.\u001B[39;00m\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connectionpool.py:464\u001B[39m, in \u001B[36mHTTPConnectionPool._make_request\u001B[39m\u001B[34m(self, conn, method, url, body, headers, retries, timeout, chunked, response_conn, preload_content, decode_content, enforce_content_length)\u001B[39m\n\u001B[32m 463\u001B[39m \u001B[38;5;28;01mtry\u001B[39;00m:\n\u001B[32m--> \u001B[39m\u001B[32m464\u001B[39m \u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43m_validate_conn\u001B[49m\u001B[43m(\u001B[49m\u001B[43mconn\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 465\u001B[39m \u001B[38;5;28;01mexcept\u001B[39;00m (SocketTimeout, BaseSSLError) \u001B[38;5;28;01mas\u001B[39;00m e:\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connectionpool.py:1093\u001B[39m, in \u001B[36mHTTPSConnectionPool._validate_conn\u001B[39m\u001B[34m(self, conn)\u001B[39m\n\u001B[32m 1092\u001B[39m \u001B[38;5;28;01mif\u001B[39;00m conn.is_closed:\n\u001B[32m-> \u001B[39m\u001B[32m1093\u001B[39m \u001B[43mconn\u001B[49m\u001B[43m.\u001B[49m\u001B[43mconnect\u001B[49m\u001B[43m(\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 1095\u001B[39m \u001B[38;5;66;03m# TODO revise this, see https://github.com/urllib3/urllib3/issues/2791\u001B[39;00m\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connection.py:704\u001B[39m, in \u001B[36mHTTPSConnection.connect\u001B[39m\u001B[34m(self)\u001B[39m\n\u001B[32m 703\u001B[39m sock: socket.socket | ssl.SSLSocket\n\u001B[32m--> \u001B[39m\u001B[32m704\u001B[39m \u001B[38;5;28mself\u001B[39m.sock = sock = \u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43m_new_conn\u001B[49m\u001B[43m(\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 705\u001B[39m server_hostname: \u001B[38;5;28mstr\u001B[39m = \u001B[38;5;28mself\u001B[39m.host\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connection.py:205\u001B[39m, in \u001B[36mHTTPConnection._new_conn\u001B[39m\u001B[34m(self)\u001B[39m\n\u001B[32m 204\u001B[39m \u001B[38;5;28;01mexcept\u001B[39;00m socket.gaierror \u001B[38;5;28;01mas\u001B[39;00m e:\n\u001B[32m--> \u001B[39m\u001B[32m205\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m NameResolutionError(\u001B[38;5;28mself\u001B[39m.host, \u001B[38;5;28mself\u001B[39m, e) \u001B[38;5;28;01mfrom\u001B[39;00m\u001B[38;5;250m \u001B[39m\u001B[34;01me\u001B[39;00m\n\u001B[32m 206\u001B[39m \u001B[38;5;28;01mexcept\u001B[39;00m SocketTimeout \u001B[38;5;28;01mas\u001B[39;00m e:\n",
+ "\u001B[31mNameResolutionError\u001B[39m: <urllib3.connection.HTTPSConnection object at 0x7f6de7ceff50>: Failed to resolve 'dbrepo.example.com' ([Errno -2] Name or service not known)",
+ "\nThe above exception was the direct cause of the following exception:\n",
+ "\u001B[31mMaxRetryError\u001B[39m Traceback (most recent call last)",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/requests/adapters.py:667\u001B[39m, in \u001B[36mHTTPAdapter.send\u001B[39m\u001B[34m(self, request, stream, timeout, verify, cert, proxies)\u001B[39m\n\u001B[32m 666\u001B[39m \u001B[38;5;28;01mtry\u001B[39;00m:\n\u001B[32m--> \u001B[39m\u001B[32m667\u001B[39m resp = \u001B[43mconn\u001B[49m\u001B[43m.\u001B[49m\u001B[43murlopen\u001B[49m\u001B[43m(\u001B[49m\n\u001B[32m 668\u001B[39m \u001B[43m \u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m=\u001B[49m\u001B[43mrequest\u001B[49m\u001B[43m.\u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 669\u001B[39m \u001B[43m \u001B[49m\u001B[43murl\u001B[49m\u001B[43m=\u001B[49m\u001B[43murl\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 670\u001B[39m \u001B[43m \u001B[49m\u001B[43mbody\u001B[49m\u001B[43m=\u001B[49m\u001B[43mrequest\u001B[49m\u001B[43m.\u001B[49m\u001B[43mbody\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 671\u001B[39m \u001B[43m \u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m=\u001B[49m\u001B[43mrequest\u001B[49m\u001B[43m.\u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 672\u001B[39m \u001B[43m \u001B[49m\u001B[43mredirect\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43;01mFalse\u001B[39;49;00m\u001B[43m,\u001B[49m\n\u001B[32m 673\u001B[39m \u001B[43m \u001B[49m\u001B[43massert_same_host\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43;01mFalse\u001B[39;49;00m\u001B[43m,\u001B[49m\n\u001B[32m 674\u001B[39m \u001B[43m \u001B[49m\u001B[43mpreload_content\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43;01mFalse\u001B[39;49;00m\u001B[43m,\u001B[49m\n\u001B[32m 675\u001B[39m \u001B[43m \u001B[49m\u001B[43mdecode_content\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43;01mFalse\u001B[39;49;00m\u001B[43m,\u001B[49m\n\u001B[32m 676\u001B[39m \u001B[43m \u001B[49m\u001B[43mretries\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43mmax_retries\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 677\u001B[39m \u001B[43m \u001B[49m\u001B[43mtimeout\u001B[49m\u001B[43m=\u001B[49m\u001B[43mtimeout\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 678\u001B[39m \u001B[43m \u001B[49m\u001B[43mchunked\u001B[49m\u001B[43m=\u001B[49m\u001B[43mchunked\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 679\u001B[39m \u001B[43m \u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 681\u001B[39m \u001B[38;5;28;01mexcept\u001B[39;00m (ProtocolError, \u001B[38;5;167;01mOSError\u001B[39;00m) \u001B[38;5;28;01mas\u001B[39;00m err:\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/connectionpool.py:841\u001B[39m, in \u001B[36mHTTPConnectionPool.urlopen\u001B[39m\u001B[34m(self, method, url, body, headers, retries, redirect, assert_same_host, timeout, pool_timeout, release_conn, chunked, body_pos, preload_content, decode_content, **response_kw)\u001B[39m\n\u001B[32m 839\u001B[39m new_e = ProtocolError(\u001B[33m\"\u001B[39m\u001B[33mConnection aborted.\u001B[39m\u001B[33m\"\u001B[39m, new_e)\n\u001B[32m--> \u001B[39m\u001B[32m841\u001B[39m retries = \u001B[43mretries\u001B[49m\u001B[43m.\u001B[49m\u001B[43mincrement\u001B[49m\u001B[43m(\u001B[49m\n\u001B[32m 842\u001B[39m \u001B[43m \u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43murl\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43merror\u001B[49m\u001B[43m=\u001B[49m\u001B[43mnew_e\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m_pool\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m_stacktrace\u001B[49m\u001B[43m=\u001B[49m\u001B[43msys\u001B[49m\u001B[43m.\u001B[49m\u001B[43mexc_info\u001B[49m\u001B[43m(\u001B[49m\u001B[43m)\u001B[49m\u001B[43m[\u001B[49m\u001B[32;43m2\u001B[39;49m\u001B[43m]\u001B[49m\n\u001B[32m 843\u001B[39m \u001B[43m\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 844\u001B[39m retries.sleep()\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/urllib3/util/retry.py:519\u001B[39m, in \u001B[36mRetry.increment\u001B[39m\u001B[34m(self, method, url, response, error, _pool, _stacktrace)\u001B[39m\n\u001B[32m 518\u001B[39m reason = error \u001B[38;5;129;01mor\u001B[39;00m ResponseError(cause)\n\u001B[32m--> \u001B[39m\u001B[32m519\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m MaxRetryError(_pool, url, reason) \u001B[38;5;28;01mfrom\u001B[39;00m\u001B[38;5;250m \u001B[39m\u001B[34;01mreason\u001B[39;00m \u001B[38;5;66;03m# type: ignore[arg-type]\u001B[39;00m\n\u001B[32m 521\u001B[39m log.debug(\u001B[33m\"\u001B[39m\u001B[33mIncremented Retry for (url=\u001B[39m\u001B[33m'\u001B[39m\u001B[38;5;132;01m%s\u001B[39;00m\u001B[33m'\u001B[39m\u001B[33m): \u001B[39m\u001B[38;5;132;01m%r\u001B[39;00m\u001B[33m\"\u001B[39m, url, new_retry)\n",
+ "\u001B[31mMaxRetryError\u001B[39m: HTTPSConnectionPool(host='dbrepo.example.com', port=443): Max retries exceeded with url: /api/database/71183815-021d-40d1-884e-3e58bd43b169/table/0b533238-e73e-43ec-a773-04ed75349b7a/data?page=0&size=10 (Caused by NameResolutionError(\"<urllib3.connection.HTTPSConnection object at 0x7f6de7ceff50>: Failed to resolve 'dbrepo.example.com' ([Errno -2] Name or service not known)\"))",
+ "\nDuring handling of the above exception, another exception occurred:\n",
+ "\u001B[31mConnectionError\u001B[39m Traceback (most recent call last)",
+ "\u001B[36mCell\u001B[39m\u001B[36m \u001B[39m\u001B[32mIn[12]\u001B[39m\u001B[32m, line 1\u001B[39m\n\u001B[32m----> \u001B[39m\u001B[32m1\u001B[39m deployments = \u001B[43mclient\u001B[49m\u001B[43m.\u001B[49m\u001B[43mget_table_data\u001B[49m\u001B[43m(\u001B[49m\u001B[33;43m'\u001B[39;49m\u001B[33;43m71183815-021d-40d1-884e-3e58bd43b169\u001B[39;49m\u001B[33;43m'\u001B[39;49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[33;43m'\u001B[39;49m\u001B[33;43m0b533238-e73e-43ec-a773-04ed75349b7a\u001B[39;49m\u001B[33;43m'\u001B[39;49m\u001B[43m)\u001B[49m\n\u001B[32m 2\u001B[39m display(deployments)\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/dbrepo/RestClient.py:872\u001B[39m, in \u001B[36mRestClient.get_table_data\u001B[39m\u001B[34m(self, database_id, table_id, page, size, timestamp)\u001B[39m\n\u001B[32m 870\u001B[39m \u001B[38;5;28;01mif\u001B[39;00m timestamp \u001B[38;5;129;01mis\u001B[39;00m \u001B[38;5;129;01mnot\u001B[39;00m \u001B[38;5;28;01mNone\u001B[39;00m:\n\u001B[32m 871\u001B[39m params.append((\u001B[33m'\u001B[39m\u001B[33mtimestamp\u001B[39m\u001B[33m'\u001B[39m, timestamp.strftime(\u001B[33m\"\u001B[39m\u001B[33m%\u001B[39m\u001B[33mY-\u001B[39m\u001B[33m%\u001B[39m\u001B[33mm-\u001B[39m\u001B[38;5;132;01m%d\u001B[39;00m\u001B[33mT\u001B[39m\u001B[33m%\u001B[39m\u001B[33mH:\u001B[39m\u001B[33m%\u001B[39m\u001B[33mM:\u001B[39m\u001B[33m%\u001B[39m\u001B[33mSZ\u001B[39m\u001B[33m\"\u001B[39m)))\n\u001B[32m--> \u001B[39m\u001B[32m872\u001B[39m response = \u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43m_wrapper\u001B[49m\u001B[43m(\u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m=\u001B[49m\u001B[33;43m\"\u001B[39;49m\u001B[33;43mget\u001B[39;49m\u001B[33;43m\"\u001B[39;49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43murl\u001B[49m\u001B[43m=\u001B[49m\u001B[43murl\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mparams\u001B[49m\u001B[43m=\u001B[49m\u001B[43mparams\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m=\u001B[49m\u001B[43m{\u001B[49m\u001B[33;43m'\u001B[39;49m\u001B[33;43mAccept\u001B[39;49m\u001B[33;43m'\u001B[39;49m\u001B[43m:\u001B[49m\u001B[43m \u001B[49m\u001B[33;43m'\u001B[39;49m\u001B[33;43mapplication/json\u001B[39;49m\u001B[33;43m'\u001B[39;49m\u001B[43m}\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 873\u001B[39m \u001B[38;5;28;01mif\u001B[39;00m response.status_code == \u001B[32m200\u001B[39m:\n\u001B[32m 874\u001B[39m \u001B[38;5;28;01mreturn\u001B[39;00m DataFrame.from_records(response.json())\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/dbrepo/RestClient.py:76\u001B[39m, in \u001B[36mRestClient._wrapper\u001B[39m\u001B[34m(self, method, url, params, payload, headers, force_auth, files)\u001B[39m\n\u001B[32m 74\u001B[39m auth = (\u001B[38;5;28mself\u001B[39m.username, \u001B[38;5;28mself\u001B[39m.password)\n\u001B[32m 75\u001B[39m logging.debug(\u001B[33mf\u001B[39m\u001B[33m'\u001B[39m\u001B[33mconfigured for basic auth: username=\u001B[39m\u001B[38;5;132;01m{\u001B[39;00m\u001B[38;5;28mself\u001B[39m.username\u001B[38;5;132;01m}\u001B[39;00m\u001B[33m, password=(hidden)\u001B[39m\u001B[33m'\u001B[39m)\n\u001B[32m---> \u001B[39m\u001B[32m76\u001B[39m \u001B[38;5;28;01mreturn\u001B[39;00m \u001B[43mrequests\u001B[49m\u001B[43m.\u001B[49m\u001B[43mrequest\u001B[49m\u001B[43m(\u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m=\u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43murl\u001B[49m\u001B[43m=\u001B[49m\u001B[43murl\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mauth\u001B[49m\u001B[43m=\u001B[49m\u001B[43mauth\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mverify\u001B[49m\u001B[43m=\u001B[49m\u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43msecure\u001B[49m\u001B[43m,\u001B[49m\n\u001B[32m 77\u001B[39m \u001B[43m \u001B[49m\u001B[43mjson\u001B[49m\u001B[43m=\u001B[49m\u001B[43mpayload\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m=\u001B[49m\u001B[43mheaders\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mparams\u001B[49m\u001B[43m=\u001B[49m\u001B[43mparams\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43mfiles\u001B[49m\u001B[43m=\u001B[49m\u001B[43mfiles\u001B[49m\u001B[43m)\u001B[49m\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/requests/api.py:59\u001B[39m, in \u001B[36mrequest\u001B[39m\u001B[34m(method, url, **kwargs)\u001B[39m\n\u001B[32m 55\u001B[39m \u001B[38;5;66;03m# By using the 'with' statement we are sure the session is closed, thus we\u001B[39;00m\n\u001B[32m 56\u001B[39m \u001B[38;5;66;03m# avoid leaving sockets open which can trigger a ResourceWarning in some\u001B[39;00m\n\u001B[32m 57\u001B[39m \u001B[38;5;66;03m# cases, and look like a memory leak in others.\u001B[39;00m\n\u001B[32m 58\u001B[39m \u001B[38;5;28;01mwith\u001B[39;00m sessions.Session() \u001B[38;5;28;01mas\u001B[39;00m session:\n\u001B[32m---> \u001B[39m\u001B[32m59\u001B[39m \u001B[38;5;28;01mreturn\u001B[39;00m \u001B[43msession\u001B[49m\u001B[43m.\u001B[49m\u001B[43mrequest\u001B[49m\u001B[43m(\u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m=\u001B[49m\u001B[43mmethod\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43murl\u001B[49m\u001B[43m=\u001B[49m\u001B[43murl\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m*\u001B[49m\u001B[43m*\u001B[49m\u001B[43mkwargs\u001B[49m\u001B[43m)\u001B[49m\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/requests/sessions.py:589\u001B[39m, in \u001B[36mSession.request\u001B[39m\u001B[34m(self, method, url, params, data, headers, cookies, files, auth, timeout, allow_redirects, proxies, hooks, stream, verify, cert, json)\u001B[39m\n\u001B[32m 584\u001B[39m send_kwargs = {\n\u001B[32m 585\u001B[39m \u001B[33m\"\u001B[39m\u001B[33mtimeout\u001B[39m\u001B[33m\"\u001B[39m: timeout,\n\u001B[32m 586\u001B[39m \u001B[33m\"\u001B[39m\u001B[33mallow_redirects\u001B[39m\u001B[33m\"\u001B[39m: allow_redirects,\n\u001B[32m 587\u001B[39m }\n\u001B[32m 588\u001B[39m send_kwargs.update(settings)\n\u001B[32m--> \u001B[39m\u001B[32m589\u001B[39m resp = \u001B[38;5;28;43mself\u001B[39;49m\u001B[43m.\u001B[49m\u001B[43msend\u001B[49m\u001B[43m(\u001B[49m\u001B[43mprep\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m*\u001B[49m\u001B[43m*\u001B[49m\u001B[43msend_kwargs\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 591\u001B[39m \u001B[38;5;28;01mreturn\u001B[39;00m resp\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/requests/sessions.py:703\u001B[39m, in \u001B[36mSession.send\u001B[39m\u001B[34m(self, request, **kwargs)\u001B[39m\n\u001B[32m 700\u001B[39m start = preferred_clock()\n\u001B[32m 702\u001B[39m \u001B[38;5;66;03m# Send the request\u001B[39;00m\n\u001B[32m--> \u001B[39m\u001B[32m703\u001B[39m r = \u001B[43madapter\u001B[49m\u001B[43m.\u001B[49m\u001B[43msend\u001B[49m\u001B[43m(\u001B[49m\u001B[43mrequest\u001B[49m\u001B[43m,\u001B[49m\u001B[43m \u001B[49m\u001B[43m*\u001B[49m\u001B[43m*\u001B[49m\u001B[43mkwargs\u001B[49m\u001B[43m)\u001B[49m\n\u001B[32m 705\u001B[39m \u001B[38;5;66;03m# Total elapsed time of the request (approximately)\u001B[39;00m\n\u001B[32m 706\u001B[39m elapsed = preferred_clock() - start\n",
+ "\u001B[36mFile \u001B[39m\u001B[32m~/Projects/fda-services/dbrepo-search-service/venv/lib/python3.11/site-packages/requests/adapters.py:700\u001B[39m, in \u001B[36mHTTPAdapter.send\u001B[39m\u001B[34m(self, request, stream, timeout, verify, cert, proxies)\u001B[39m\n\u001B[32m 696\u001B[39m \u001B[38;5;28;01mif\u001B[39;00m \u001B[38;5;28misinstance\u001B[39m(e.reason, _SSLError):\n\u001B[32m 697\u001B[39m \u001B[38;5;66;03m# This branch is for urllib3 v1.22 and later.\u001B[39;00m\n\u001B[32m 698\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m SSLError(e, request=request)\n\u001B[32m--> \u001B[39m\u001B[32m700\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mConnectionError\u001B[39;00m(e, request=request)\n\u001B[32m 702\u001B[39m \u001B[38;5;28;01mexcept\u001B[39;00m ClosedPoolError \u001B[38;5;28;01mas\u001B[39;00m e:\n\u001B[32m 703\u001B[39m \u001B[38;5;28;01mraise\u001B[39;00m \u001B[38;5;167;01mConnectionError\u001B[39;00m(e, request=request)\n",
+ "\u001B[31mConnectionError\u001B[39m: HTTPSConnectionPool(host='dbrepo.example.com', port=443): Max retries exceeded with url: /api/database/71183815-021d-40d1-884e-3e58bd43b169/table/0b533238-e73e-43ec-a773-04ed75349b7a/data?page=0&size=10 (Caused by NameResolutionError(\"<urllib3.connection.HTTPSConnection object at 0x7f6de7ceff50>: Failed to resolve 'dbrepo.example.com' ([Errno -2] Name or service not known)\"))"
+ ]
+ }
+ ],
+ "execution_count": 12
+ },
+ {
+ "cell_type": "markdown",
+ "id": "39095623-65a4-4de9-bbab-419946e5c428",
+ "metadata": {},
+ "source": [
+ "Import data from a `pandas` DataFrame."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "f85f8c85-16f9-4b42-88af-e5a50b4729e4",
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "# optional: update table data from `pandas` DataFrame\n",
+ "# df = DataFrame()\n",
+ "# client.import_table_data('71183815-021d-40d1-884e-3e58bd43b169', '0b533238-e73e-43ec-a773-04ed75349b7a', df)"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "9098ea798a2ab598",
+ "metadata": {},
+ "source": [
+ "## Views\n",
+ "\n",
+ "Load data from any view into a `pandas` DataFrame."
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "ddd433035e632df9",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:30:53.066871019Z",
+ "start_time": "2024-12-14T07:22:44.708283Z"
+ }
+ },
+ "outputs": [],
+ "source": [
+ "beton_acc = client.get_view_data(database_id, 70)\n",
+ "beton_acc\n",
+ "\n",
+ "# optional: export view data as .csv\n",
+ "# beton_acc.to_csv('beton_acc.csv')"
+ ]
+ },
+ {
+ "cell_type": "markdown",
+ "id": "54b9b1f732219331",
+ "metadata": {},
+ "source": [
+ "## Subsets"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "id": "f165e5e3861a0dda",
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2025-06-04T07:30:53.067699617Z",
+ "start_time": "2024-12-14T07:22:45.197517Z"
+ }
+ },
+ "outputs": [],
+ "source": [
+ "subset = client.create_subset(database_id, \"SELECT m.mix, date_production, b.name, ta.k_ac_mm_root_day, ta.test_procedure, ta.mean_depth_t0_mm FROM mix m JOIN betonvariante b ON b.id = m.betonvariante_id JOIN test_result_carb_acc ta ON m.id = ta.mix_id\")\n",
+ "subset"
+ ]
+ }
+ ],
+ "metadata": {
+ "kernelspec": {
+ "display_name": "Python 3 (ipykernel)",
+ "language": "python",
+ "name": "python3"
+ },
+ "language_info": {
+ "codemirror_mode": {
+ "name": "ipython",
+ "version": 3
+ },
+ "file_extension": ".py",
+ "mimetype": "text/x-python",
+ "name": "python",
+ "nbconvert_exporter": "python",
+ "pygments_lexer": "ipython3",
+ "version": "3.11.2"
+ }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/Makefile b/Makefile
index ff09f43cb1bf17febbbd5764cb3549f50bd32df3..3052899b1fd71937605938303950f379c268717e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all
-APP_VERSION ?= 1.9.2
-CHART_VERSION ?= 1.9.2
+APP_VERSION ?= 1.9.3
+CHART_VERSION ?= 1.9.3
REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 2151ebe9ad563dcb7a91443050b229f18e068417..38becf1da151a16325b6f2dfea64f31f9f56d1c3 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.9.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.9.3.tar.gz"}
opensearch-py = "*"
ecs_logging = "*"
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index c5870383ba6d34725b078b96f6dee6ced25d1ba1..dd365ce141635b223f1154fcd239eab6821f46f1 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "e7cad9c3a5bea16afca5b7fa00c5d81a390fadf857606d4ee96555c1f3c8db30"
+ "sha256": "1a7e879ef35984fdbd8b7dac5b035a8a357b1381dd3924e10eec2eefa3eb0adf"
},
"pipfile-spec": 6,
"requires": {
@@ -26,11 +26,11 @@
},
"argon2-cffi": {
"hashes": [
- "sha256:879c3e79a2729ce768ebb7d36d4609e3a78a4ca2ec3a9f12286ca057e3d0db08",
- "sha256:c670642b78ba29641818ab2e68bd4e6a78ba53b7eff7b4c3815ae16abf91c7ea"
+ "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1",
+ "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741"
],
- "markers": "python_version >= '3.7'",
- "version": "==23.1.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==25.1.0"
},
"argon2-cffi-bindings": {
"hashes": [
@@ -77,19 +77,19 @@
},
"boto3": {
"hashes": [
- "sha256:94bd7fdd92d5701b362d4df100d21e28f8307a67ff56b6a8b0398119cf22f859",
- "sha256:95f5fe688795303a8a15e8b7e7f255cadab35eae459d00cc281a4fd77252ea80"
+ "sha256:491a4f1f2ae64f8e45a9d97896684dde5d8d14d8ab5083d4545ab3cb6a9b005e",
+ "sha256:809945a62d8bea5bbb4e85261530b6481c08aa21579864aa885cb8fd0768ee17"
],
"index": "pypi",
- "version": "==1.38.27"
+ "version": "==1.38.31"
},
"botocore": {
"hashes": [
- "sha256:9788f7efe974328a38cbade64cc0b1e67d27944b899f88cb786ae362973133b6",
- "sha256:a785d5e9a5eda88ad6ab9ed8b87d1f2ac409d0226bba6ff801c55359e94d91a8"
+ "sha256:50daef3457ebcab25daaa28a087986575510529bdc3cc784f86e8cb187f7a4ff",
+ "sha256:6c2767fac62a3b564c7bba7da4724b79351102a19fb491ed24ae9e2627d9f30b"
],
"markers": "python_version >= '3.9'",
- "version": "==1.38.27"
+ "version": "==1.38.31"
},
"certifi": {
"hashes": [
@@ -323,10 +323,10 @@
},
"dbrepo": {
"hashes": [
- "sha256:57796d53aabbfea68cc48bb238e1cdb00efc28df196fb80121affa589cce641f"
+ "sha256:68720d474222c00331c15824e7abc6768c01aa0c8c16e386413d7428468c0934"
],
- "path": "./lib/dbrepo-1.9.2.tar.gz",
- "version": "==1.9.2"
+ "path": "./lib/dbrepo-1.9.3.tar.gz",
+ "version": "==1.9.3"
},
"ecs-logging": {
"hashes": [
@@ -436,64 +436,63 @@
},
"greenlet": {
"hashes": [
- "sha256:00cd814b8959b95a546e47e8d589610534cfb71f19802ea8a2ad99d95d702057",
- "sha256:02a98600899ca1ca5d3a2590974c9e3ec259503b2d6ba6527605fcd74e08e207",
- "sha256:02f5972ff02c9cf615357c17ab713737cccfd0eaf69b951084a9fd43f39833d3",
- "sha256:055916fafad3e3388d27dd68517478933a97edc2fc54ae79d3bec827de2c64c4",
- "sha256:0a16fb934fcabfdfacf21d79e6fed81809d8cd97bc1be9d9c89f0e4567143d7b",
- "sha256:1592a615b598643dbfd566bac8467f06c8c8ab6e56f069e573832ed1d5d528cc",
- "sha256:1919cbdc1c53ef739c94cf2985056bcc0838c1f217b57647cbf4578576c63825",
- "sha256:1e4747712c4365ef6765708f948acc9c10350719ca0545e362c24ab973017370",
- "sha256:1e76106b6fc55fa3d6fe1c527f95ee65e324a13b62e243f77b48317346559708",
- "sha256:1f72667cc341c95184f1c68f957cb2d4fc31eef81646e8e59358a10ce6689457",
- "sha256:2593283bf81ca37d27d110956b79e8723f9aa50c4bcdc29d3c0543d4743d2763",
- "sha256:2dc5c43bb65ec3669452af0ab10729e8fdc17f87a1f2ad7ec65d4aaaefabf6bf",
- "sha256:3091bc45e6b0c73f225374fefa1536cd91b1e987377b12ef5b19129b07d93ebe",
- "sha256:354f67445f5bed6604e493a06a9a49ad65675d3d03477d38a4db4a427e9aad0e",
- "sha256:3885f85b61798f4192d544aac7b25a04ece5fe2704670b4ab73c2d2c14ab740d",
- "sha256:3ab7194ee290302ca15449f601036007873028712e92ca15fc76597a0aeb4c59",
- "sha256:3aeca9848d08ce5eb653cf16e15bb25beeab36e53eb71cc32569f5f3afb2a3aa",
- "sha256:44671c29da26539a5f142257eaba5110f71887c24d40df3ac87f1117df589e0e",
- "sha256:45f9f4853fb4cc46783085261c9ec4706628f3b57de3e68bae03e8f8b3c0de51",
- "sha256:4bd139e4943547ce3a56ef4b8b1b9479f9e40bb47e72cc906f0f66b9d0d5cab3",
- "sha256:4fefc7aa68b34b9224490dfda2e70ccf2131368493add64b4ef2d372955c207e",
- "sha256:6629311595e3fe7304039c67f00d145cd1d38cf723bb5b99cc987b23c1433d61",
- "sha256:6fadd183186db360b61cb34e81117a096bff91c072929cd1b529eb20dd46e6c5",
- "sha256:71566302219b17ca354eb274dfd29b8da3c268e41b646f330e324e3967546a74",
- "sha256:7409796591d879425997a518138889d8d17e63ada7c99edc0d7a1c22007d4907",
- "sha256:752f0e79785e11180ebd2e726c8a88109ded3e2301d40abced2543aa5d164275",
- "sha256:7791dcb496ec53d60c7f1c78eaa156c21f402dda38542a00afc3e20cae0f480f",
- "sha256:782743700ab75716650b5238a4759f840bb2dcf7bff56917e9ffdf9f1f23ec59",
- "sha256:7c9896249fbef2c615853b890ee854f22c671560226c9221cfd27c995db97e5c",
- "sha256:85f3e248507125bf4af607a26fd6cb8578776197bd4b66e35229cdf5acf1dfbf",
- "sha256:89c69e9a10670eb7a66b8cef6354c24671ba241f46152dd3eed447f79c29fb5b",
- "sha256:8cb8553ee954536500d88a1a2f58fcb867e45125e600e80f586ade399b3f8819",
- "sha256:9ae572c996ae4b5e122331e12bbb971ea49c08cc7c232d1bd43150800a2d6c65",
- "sha256:9c7b15fb9b88d9ee07e076f5a683027bc3befd5bb5d25954bb633c385d8b737e",
- "sha256:9ea5231428af34226c05f927e16fc7f6fa5e39e3ad3cd24ffa48ba53a47f4240",
- "sha256:a31ead8411a027c2c4759113cf2bd473690517494f3d6e4bf67064589afcd3c5",
- "sha256:a8fa80665b1a29faf76800173ff5325095f3e66a78e62999929809907aca5659",
- "sha256:ad053d34421a2debba45aa3cc39acf454acbcd025b3fc1a9f8a0dee237abd485",
- "sha256:b24c7844c0a0afc3ccbeb0b807adeefb7eff2b5599229ecedddcfeb0ef333bec",
- "sha256:b50a8c5c162469c3209e5ec92ee4f95c8231b11db6a04db09bbe338176723bb8",
- "sha256:ba30e88607fb6990544d84caf3c706c4b48f629e18853fc6a646f82db9629418",
- "sha256:bf3fc9145141250907730886b031681dfcc0de1c158f3cc51c092223c0f381ce",
- "sha256:c23ea227847c9dbe0b3910f5c0dd95658b607137614eb821e6cbaecd60d81cc6",
- "sha256:c3cc1a3ed00ecfea8932477f729a9f616ad7347a5e55d50929efa50a86cb7be7",
- "sha256:c49e9f7c6f625507ed83a7485366b46cbe325717c60837f7244fc99ba16ba9d6",
- "sha256:d0cb7d47199001de7658c213419358aa8937df767936506db0db7ce1a71f4a2f",
- "sha256:d8009ae46259e31bc73dc183e402f548e980c96f33a6ef58cc2e7865db012e13",
- "sha256:da956d534a6d1b9841f95ad0f18ace637668f680b1339ca4dcfb2c1837880a0b",
- "sha256:dcb9cebbf3f62cb1e5afacae90761ccce0effb3adaa32339a0670fe7805d8068",
- "sha256:decb0658ec19e5c1f519faa9a160c0fc85a41a7e6654b3ce1b44b939f8bf1325",
- "sha256:df4d1509efd4977e6a844ac96d8be0b9e5aa5d5c77aa27ca9f4d3f92d3fcf330",
- "sha256:eeb27bece45c0c2a5842ac4c5a1b5c2ceaefe5711078eed4e8043159fa05c834",
- "sha256:efcdfb9df109e8a3b475c016f60438fcd4be68cd13a365d42b35914cdab4bb2b",
- "sha256:fd9fb7c941280e2c837b603850efc93c999ae58aae2b40765ed682a6907ebbc5",
- "sha256:fe46d4f8e94e637634d54477b0cfabcf93c53f29eedcbdeecaf2af32029b4421"
+ "sha256:003c930e0e074db83559edc8705f3a2d066d4aa8c2f198aff1e454946efd0f26",
+ "sha256:024571bbce5f2c1cfff08bf3fbaa43bbc7444f580ae13b0099e95d0e6e67ed36",
+ "sha256:02b0df6f63cd15012bed5401b47829cfd2e97052dc89da3cfaf2c779124eb892",
+ "sha256:0921ac4ea42a5315d3446120ad48f90c3a6b9bb93dd9b3cf4e4d84a66e42de83",
+ "sha256:0cc73378150b8b78b0c9fe2ce56e166695e67478550769536a6742dca3651688",
+ "sha256:1afd685acd5597349ee6d7a88a8bec83ce13c106ac78c196ee9dde7c04fe87be",
+ "sha256:22eb5ba839c4b2156f18f76768233fe44b23a31decd9cc0d4cc8141c211fd1b4",
+ "sha256:25ad29caed5783d4bd7a85c9251c651696164622494c00802a139c00d639242d",
+ "sha256:29e184536ba333003540790ba29829ac14bb645514fbd7e32af331e8202a62a5",
+ "sha256:2c724620a101f8170065d7dded3f962a2aea7a7dae133a009cada42847e04a7b",
+ "sha256:2d8aa5423cd4a396792f6d4580f88bdc6efcb9205891c9d40d20f6e670992efb",
+ "sha256:3d04332dddb10b4a211b68111dabaee2e1a073663d117dc10247b5b1642bac86",
+ "sha256:419e60f80709510c343c57b4bb5a339d8767bf9aef9b8ce43f4f143240f88b7c",
+ "sha256:42efc522c0bd75ffa11a71e09cd8a399d83fafe36db250a87cf1dacfaa15dc64",
+ "sha256:4532f0d25df67f896d137431b13f4cdce89f7e3d4a96387a41290910df4d3a57",
+ "sha256:49c8cfb18fb419b3d08e011228ef8a25882397f3a859b9fe1436946140b6756b",
+ "sha256:500b8689aa9dd1ab26872a34084503aeddefcb438e2e7317b89b11eaea1901ad",
+ "sha256:5035d77a27b7c62db6cf41cf786cfe2242644a7a337a0e155c80960598baab95",
+ "sha256:5195fb1e75e592dd04ce79881c8a22becdfa3e6f500e7feb059b1e6fdd54d3e3",
+ "sha256:592c12fb1165be74592f5de0d70f82bc5ba552ac44800d632214b76089945147",
+ "sha256:68671180e3849b963649254a882cd544a3c75bfcd2c527346ad8bb53494444db",
+ "sha256:706d016a03e78df129f68c4c9b4c4f963f7d73534e48a24f5f5a7101ed13dbbb",
+ "sha256:72e77ed69312bab0434d7292316d5afd6896192ac4327d44f3d613ecb85b037c",
+ "sha256:731e154aba8e757aedd0781d4b240f1225b075b4409f1bb83b05ff410582cf00",
+ "sha256:7454d37c740bb27bdeddfc3f358f26956a07d5220818ceb467a483197d84f849",
+ "sha256:751261fc5ad7b6705f5f76726567375bb2104a059454e0226e1eef6c756748ba",
+ "sha256:761917cac215c61e9dc7324b2606107b3b292a8349bdebb31503ab4de3f559ac",
+ "sha256:784ae58bba89fa1fa5733d170d42486580cab9decda3484779f4759345b29822",
+ "sha256:7e70ea4384b81ef9e84192e8a77fb87573138aa5d4feee541d8014e452b434da",
+ "sha256:8186162dffde068a465deab08fc72c767196895c39db26ab1c17c0b77a6d8b97",
+ "sha256:8324319cbd7b35b97990090808fdc99c27fe5338f87db50514959f8059999805",
+ "sha256:83a8761c75312361aa2b5b903b79da97f13f556164a7dd2d5448655425bd4c34",
+ "sha256:86c2d68e87107c1792e2e8d5399acec2487a4e993ab76c792408e59394d52141",
+ "sha256:8704b3768d2f51150626962f4b9a9e4a17d2e37c8a8d9867bbd9fa4eb938d3b3",
+ "sha256:873abe55f134c48e1f2a6f53f7d1419192a3d1a4e873bace00499a4e45ea6af0",
+ "sha256:88cd97bf37fe24a6710ec6a3a7799f3f81d9cd33317dcf565ff9950c83f55e0b",
+ "sha256:8b0dd8ae4c0d6f5e54ee55ba935eeb3d735a9b58a8a1e5b5cbab64e01a39f365",
+ "sha256:8c37ef5b3787567d322331d5250e44e42b58c8c713859b8a04c6065f27efbf72",
+ "sha256:8c47aae8fbbfcf82cc13327ae802ba13c9c36753b67e760023fd116bc124a62a",
+ "sha256:93c0bb79844a367782ec4f429d07589417052e621aa39a5ac1fb99c5aa308edc",
+ "sha256:93d48533fade144203816783373f27a97e4193177ebaaf0fc396db19e5d61163",
+ "sha256:96c20252c2f792defe9a115d3287e14811036d51e78b3aaddbee23b69b216302",
+ "sha256:a07d3472c2a93117af3b0136f246b2833fdc0b542d4a9799ae5f41c28323faef",
+ "sha256:a433dbc54e4a37e4fff90ef34f25a8c00aed99b06856f0119dcf09fbafa16392",
+ "sha256:aaa7aae1e7f75eaa3ae400ad98f8644bb81e1dc6ba47ce8a93d3f17274e08322",
+ "sha256:baeedccca94880d2f5666b4fa16fc20ef50ba1ee353ee2d7092b383a243b0b0d",
+ "sha256:be52af4b6292baecfa0f397f3edb3c6092ce071b499dd6fe292c9ac9f2c8f264",
+ "sha256:c667c0bf9d406b77a15c924ef3285e1e05250948001220368e039b6aa5b5034b",
+ "sha256:ce539fb52fb774d0802175d37fcff5c723e2c7d249c65916257f0a940cee8904",
+ "sha256:d2971d93bb99e05f8c2c0c2f4aa9484a18d98c4c3bd3c62b65b7e6ae33dfcfaf",
+ "sha256:d760f9bdfe79bff803bad32b4d8ffb2c1d2ce906313fc10a83976ffb73d64ca7",
+ "sha256:ed6cfa9200484d234d8394c70f5492f144b20d4533f69262d530a1a082f6ee9a",
+ "sha256:efc6dc8a792243c31f2f5674b670b3a95d46fa1c6a912b8e310d6f542e7b0712",
+ "sha256:f4bfbaa6096b1b7a200024784217defedf46a07c2eee1a498e94a1b5f8ec5728"
],
"index": "pypi",
- "version": "==3.2.2"
+ "version": "==3.2.3"
},
"gunicorn": {
"hashes": [
@@ -720,51 +719,51 @@
},
"pandas": {
"hashes": [
- "sha256:062309c1b9ea12a50e8ce661145c6aab431b1e99530d3cd60640e255778bd43a",
- "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d",
- "sha256:1948ddde24197a0f7add2bdc4ca83bf2b1ef84a1bc8ccffd95eda17fd836ecb5",
- "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4",
- "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0",
- "sha256:29401dbfa9ad77319367d36940cd8a0b3a11aba16063e39632d98b0e931ddf32",
- "sha256:31d0ced62d4ea3e231a9f228366919a5ea0b07440d9d4dac345376fd8e1477ea",
- "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28",
- "sha256:37e0aced3e8f539eccf2e099f65cdb9c8aa85109b0be6e93e2baff94264bdc6f",
- "sha256:381175499d3802cde0eabbaf6324cce0c4f5d52ca6f8c377c29ad442f50f6348",
- "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18",
- "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468",
- "sha256:3fc6873a41186404dad67245896a6e440baacc92f5b716ccd1bc9ed2995ab2c5",
- "sha256:4850ba03528b6dd51d6c5d273c46f183f39a9baf3f0143e566b89450965b105e",
- "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667",
- "sha256:56534ce0746a58afaf7942ba4863e0ef81c9c50d3f0ae93e9497d6a41a057645",
- "sha256:59ef3764d0fe818125a5097d2ae867ca3fa64df032331b7e0917cf5d7bf66b13",
- "sha256:5dbca4c1acd72e8eeef4753eeca07de9b1db4f398669d5994086f788a5d7cc30",
- "sha256:5de54125a92bb4d1c051c0659e6fcb75256bf799a732a87184e5ea503965bce3",
- "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d",
- "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb",
- "sha256:63cc132e40a2e084cf01adf0775b15ac515ba905d7dcca47e9a251819c575ef3",
- "sha256:66108071e1b935240e74525006034333f98bcdb87ea116de573a6a0dccb6c039",
- "sha256:6dfcb5ee8d4d50c06a51c2fffa6cff6272098ad6540aed1a76d15fb9318194d8",
- "sha256:7c2875855b0ff77b2a64a0365e24455d9990730d6431b9e0ee18ad8acee13dbd",
- "sha256:7eee9e7cea6adf3e3d24e304ac6b8300646e2a5d1cd3a3c2abed9101b0846761",
- "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659",
- "sha256:86976a1c5b25ae3f8ccae3a5306e443569ee3c3faf444dfd0f41cda24667ad57",
- "sha256:8cd6d7cc958a3910f934ea8dbdf17b2364827bb4dafc38ce6eef6bb3d65ff09c",
- "sha256:99df71520d25fade9db7c1076ac94eb994f4d2673ef2aa2e86ee039b6746d20c",
- "sha256:a5a1595fe639f5988ba6a8e5bc9649af3baf26df3998a0abe56c02609392e0a4",
- "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a",
- "sha256:b1d432e8d08679a40e2a6d8b2f9770a5c21793a6f9f47fdd52c5ce1948a5a8a9",
- "sha256:b8661b0238a69d7aafe156b7fa86c44b881387509653fdf857bebc5e4008ad42",
- "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2",
- "sha256:bc6b93f9b966093cb0fd62ff1a7e4c09e6d546ad7c1de191767baffc57628f39",
- "sha256:c124333816c3a9b03fbeef3a9f230ba9a737e9e5bb4060aa2107a86cc0a497fc",
- "sha256:cd8d0c3be0515c12fed0bdbae072551c8b54b7192c7b1fda0ba56059a0179698",
- "sha256:d9c45366def9a3dd85a6454c0e7908f2b3b8e9c138f5dc38fed7ce720d8453ed",
- "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015",
- "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24",
- "sha256:fffb8ae78d8af97f849404f21411c95062db1496aeb3e56f146f0355c9989319"
+ "sha256:034abd6f3db8b9880aaee98f4f5d4dbec7c4829938463ec046517220b2f8574e",
+ "sha256:094e271a15b579650ebf4c5155c05dcd2a14fd4fdd72cf4854b2f7ad31ea30be",
+ "sha256:14a0cc77b0f089d2d2ffe3007db58f170dae9b9f54e569b299db871a3ab5bf46",
+ "sha256:1a881bc1309f3fce34696d07b00f13335c41f5f5a8770a33b09ebe23261cfc67",
+ "sha256:1d2b33e68d0ce64e26a4acc2e72d747292084f4e8db4c847c6f5f6cbe56ed6d8",
+ "sha256:213cd63c43263dbb522c1f8a7c9d072e25900f6975596f883f4bebd77295d4f3",
+ "sha256:23c2b2dc5213810208ca0b80b8666670eb4660bbfd9d45f58592cc4ddcfd62e1",
+ "sha256:2c7e2fc25f89a49a11599ec1e76821322439d90820108309bf42130d2f36c983",
+ "sha256:2eb4728a18dcd2908c7fccf74a982e241b467d178724545a48d0caf534b38ebf",
+ "sha256:34600ab34ebf1131a7613a260a61dbe8b62c188ec0ea4c296da7c9a06b004133",
+ "sha256:39ff73ec07be5e90330cc6ff5705c651ace83374189dcdcb46e6ff54b4a72cd6",
+ "sha256:404d681c698e3c8a40a61d0cd9412cc7364ab9a9cc6e144ae2992e11a2e77a20",
+ "sha256:40cecc4ea5abd2921682b57532baea5588cc5f80f0231c624056b146887274d2",
+ "sha256:430a63bae10b5086995db1b02694996336e5a8ac9a96b4200572b413dfdfccb9",
+ "sha256:4930255e28ff5545e2ca404637bcc56f031893142773b3468dc021c6c32a1390",
+ "sha256:6021910b086b3ca756755e86ddc64e0ddafd5e58e076c72cb1585162e5ad259b",
+ "sha256:625466edd01d43b75b1883a64d859168e4556261a5035b32f9d743b67ef44634",
+ "sha256:75651c14fde635e680496148a8526b328e09fe0572d9ae9b638648c46a544ba3",
+ "sha256:84141f722d45d0c2a89544dd29d35b3abfc13d2250ed7e68394eda7564bd6324",
+ "sha256:8adff9f138fc614347ff33812046787f7d43b3cef7c0f0171b3340cae333f6ca",
+ "sha256:951805d146922aed8357e4cc5671b8b0b9be1027f0619cea132a9f3f65f2f09c",
+ "sha256:9efc0acbbffb5236fbdf0409c04edce96bec4bdaa649d49985427bd1ec73e085",
+ "sha256:9ff730713d4c4f2f1c860e36c005c7cefc1c7c80c21c0688fd605aa43c9fcf09",
+ "sha256:a6872d695c896f00df46b71648eea332279ef4077a409e2fe94220208b6bb675",
+ "sha256:b198687ca9c8529662213538a9bb1e60fa0bf0f6af89292eb68fea28743fcd5a",
+ "sha256:b9d8c3187be7479ea5c3d30c32a5d73d62a621166675063b2edd21bc47614027",
+ "sha256:ba24af48643b12ffe49b27065d3babd52702d95ab70f50e1b34f71ca703e2c0d",
+ "sha256:bb32dc743b52467d488e7a7c8039b821da2826a9ba4f85b89ea95274f863280f",
+ "sha256:bb3be958022198531eb7ec2008cfc78c5b1eed51af8600c6c5d9160d89d8d249",
+ "sha256:bf5be867a0541a9fb47a4be0c5790a4bccd5b77b92f0a59eeec9375fafc2aa14",
+ "sha256:c06f6f144ad0a1bf84699aeea7eff6068ca5c63ceb404798198af7eb86082e33",
+ "sha256:c6da97aeb6a6d233fb6b17986234cc723b396b50a3c6804776351994f2a658fd",
+ "sha256:e0f51973ba93a9f97185049326d75b942b9aeb472bec616a129806facb129ebb",
+ "sha256:e1991bbb96f4050b09b5f811253c4f3cf05ee89a589379aa36cd623f21a31d6f",
+ "sha256:e5f08eb9a445d07720776df6e641975665c9ea12c9d8a331e0f6890f2dcd76ef",
+ "sha256:e78ad363ddb873a631e92a3c063ade1ecfb34cae71e9a2be6ad100f875ac1042",
+ "sha256:ed16339bc354a73e0a609df36d256672c7d296f3f767ac07257801aa064ff73c",
+ "sha256:f4dd97c19bd06bc557ad787a15b6489d2614ddaab5d104a0310eb314c724b2d2",
+ "sha256:f925f1ef673b4bd0271b1809b72b3270384f2b7d9d14a189b12b7fc02574d575",
+ "sha256:f95a2aef32614ed86216d3c450ab12a4e82084e8102e355707a1d96e33d51c34",
+ "sha256:fa07e138b3f6c04addfeaf56cc7fdb96c3b68a3fe5e5401251f231fce40a0d7a",
+ "sha256:fa35c266c8cd1a67d75971a1912b185b492d257092bdd2709bbdebe574ed228d"
],
"index": "pypi",
- "version": "==2.2.3"
+ "version": "==2.3.0"
},
"pika": {
"hashes": [
@@ -776,11 +775,11 @@
},
"prometheus-client": {
"hashes": [
- "sha256:18da1d2241ac2d10c8d2110f13eedcd5c7c0c8af18c926e8731f04fc10cd575c",
- "sha256:c8951bbe64e62b96cd8e8f5d917279d1b9b91ab766793f33d4dce6c228558713"
+ "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28",
+ "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"
],
"markers": "python_version >= '3.9'",
- "version": "==0.22.0"
+ "version": "==0.22.1"
},
"prometheus-flask-exporter": {
"hashes": [
@@ -1205,11 +1204,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
"markers": "python_version < '3.13'",
- "version": "==4.13.2"
+ "version": "==4.14.0"
},
"typing-inspection": {
"hashes": [
@@ -1298,11 +1297,11 @@
"develop": {
"argon2-cffi": {
"hashes": [
- "sha256:879c3e79a2729ce768ebb7d36d4609e3a78a4ca2ec3a9f12286ca057e3d0db08",
- "sha256:c670642b78ba29641818ab2e68bd4e6a78ba53b7eff7b4c3815ae16abf91c7ea"
+ "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1",
+ "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741"
],
- "markers": "python_version >= '3.7'",
- "version": "==23.1.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==25.1.0"
},
"argon2-cffi-bindings": {
"hashes": [
@@ -1700,13 +1699,21 @@
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'",
"version": "==3.23.0"
},
+ "pygments": {
+ "hashes": [
+ "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f",
+ "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.19.1"
+ },
"pytest": {
"hashes": [
- "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
- "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
+ "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6",
+ "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e"
],
"index": "pypi",
- "version": "==8.3.5"
+ "version": "==8.4.0"
},
"python-dateutil": {
"hashes": [
@@ -1763,11 +1770,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
"markers": "python_version < '3.13'",
- "version": "==4.13.2"
+ "version": "==4.14.0"
},
"urllib3": {
"hashes": [
diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py
index 9f816f7e32c872bac6bd29a921876856757cd835..1953e478353b7c542ed172d0da73eb301e32fb87 100644
--- a/dbrepo-analyse-service/app.py
+++ b/dbrepo-analyse-service/app.py
@@ -199,7 +199,7 @@ template = {
"info": {
"title": "Database Repository Analyse Service API",
"description": "Service that analyses data structures",
- "version": "1.9.2",
+ "version": "1.9.3",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.9.2.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.9.2.tar.gz
deleted file mode 100644
index cc536fecd0b417e82a49442320b056d6da14d4ed..0000000000000000000000000000000000000000
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.9.2.tar.gz and /dev/null differ
diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.9.2-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.9.3-py3-none-any.whl
similarity index 75%
rename from dbrepo-dashboard-service/lib/dbrepo-1.9.2-py3-none-any.whl
rename to dbrepo-analyse-service/lib/dbrepo-1.9.3-py3-none-any.whl
index 658217e61233bd386c2abead7a1aee64b7a14781..e727c2f2bbf3aed3187f58c34421a7aecd318614 100644
Binary files a/dbrepo-dashboard-service/lib/dbrepo-1.9.2-py3-none-any.whl and b/dbrepo-analyse-service/lib/dbrepo-1.9.3-py3-none-any.whl differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.9.3.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.9.3.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..94753e52f49aa983dca1ad4196e2df61f9adae9f
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.9.3.tar.gz differ
diff --git a/dbrepo-auth-service/init/Pipfile b/dbrepo-auth-service/init/Pipfile
index 1a91e97fcbf063210a7cb1d729566dc95f747586..beec4d5fd34e6f646d7dd2850bfaa08c8daccdaf 100644
--- a/dbrepo-auth-service/init/Pipfile
+++ b/dbrepo-auth-service/init/Pipfile
@@ -7,7 +7,7 @@ name = "pypi"
requests = "*"
mariadb = "*"
ecs_logging = "*"
-dbrepo = {path = "./lib/dbrepo-1.9.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.9.3.tar.gz"}
[dev-packages]
coverage = "*"
diff --git a/dbrepo-auth-service/init/Pipfile.lock b/dbrepo-auth-service/init/Pipfile.lock
index 60243d8ccdd96ab77adc8c81410a0a2b352cf541..48cf502649203f991c6d94e48012f18247a66ecd 100644
--- a/dbrepo-auth-service/init/Pipfile.lock
+++ b/dbrepo-auth-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "6fd3a7e6af693bf9a3ad1367d54f826a2ec47441981a2c94a19dcb104200823f"
+ "sha256": "042126fde36a1e702796d6e62499881c04a0449d7e412885ef49a2d3eb837f4d"
},
"pipfile-spec": 6,
"requires": {
@@ -132,10 +132,10 @@
},
"dbrepo": {
"hashes": [
- "sha256:b9079a9a97d7112459df40cbc8e63302848e4cd995a5bd0fe69d52b99e670be7"
+ "sha256:524724efddf43b57d20a7ce695fc6717def333a23275e4b34b0382b20502f783"
],
- "path": "./lib/dbrepo-1.9.2.tar.gz",
- "version": "==1.9.2"
+ "path": "./lib/dbrepo-1.9.3.tar.gz",
+ "version": "==1.9.3"
},
"ecs-logging": {
"hashes": [
@@ -241,51 +241,51 @@
},
"pandas": {
"hashes": [
- "sha256:062309c1b9ea12a50e8ce661145c6aab431b1e99530d3cd60640e255778bd43a",
- "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d",
- "sha256:1948ddde24197a0f7add2bdc4ca83bf2b1ef84a1bc8ccffd95eda17fd836ecb5",
- "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4",
- "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0",
- "sha256:29401dbfa9ad77319367d36940cd8a0b3a11aba16063e39632d98b0e931ddf32",
- "sha256:31d0ced62d4ea3e231a9f228366919a5ea0b07440d9d4dac345376fd8e1477ea",
- "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28",
- "sha256:37e0aced3e8f539eccf2e099f65cdb9c8aa85109b0be6e93e2baff94264bdc6f",
- "sha256:381175499d3802cde0eabbaf6324cce0c4f5d52ca6f8c377c29ad442f50f6348",
- "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18",
- "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468",
- "sha256:3fc6873a41186404dad67245896a6e440baacc92f5b716ccd1bc9ed2995ab2c5",
- "sha256:4850ba03528b6dd51d6c5d273c46f183f39a9baf3f0143e566b89450965b105e",
- "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667",
- "sha256:56534ce0746a58afaf7942ba4863e0ef81c9c50d3f0ae93e9497d6a41a057645",
- "sha256:59ef3764d0fe818125a5097d2ae867ca3fa64df032331b7e0917cf5d7bf66b13",
- "sha256:5dbca4c1acd72e8eeef4753eeca07de9b1db4f398669d5994086f788a5d7cc30",
- "sha256:5de54125a92bb4d1c051c0659e6fcb75256bf799a732a87184e5ea503965bce3",
- "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d",
- "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb",
- "sha256:63cc132e40a2e084cf01adf0775b15ac515ba905d7dcca47e9a251819c575ef3",
- "sha256:66108071e1b935240e74525006034333f98bcdb87ea116de573a6a0dccb6c039",
- "sha256:6dfcb5ee8d4d50c06a51c2fffa6cff6272098ad6540aed1a76d15fb9318194d8",
- "sha256:7c2875855b0ff77b2a64a0365e24455d9990730d6431b9e0ee18ad8acee13dbd",
- "sha256:7eee9e7cea6adf3e3d24e304ac6b8300646e2a5d1cd3a3c2abed9101b0846761",
- "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659",
- "sha256:86976a1c5b25ae3f8ccae3a5306e443569ee3c3faf444dfd0f41cda24667ad57",
- "sha256:8cd6d7cc958a3910f934ea8dbdf17b2364827bb4dafc38ce6eef6bb3d65ff09c",
- "sha256:99df71520d25fade9db7c1076ac94eb994f4d2673ef2aa2e86ee039b6746d20c",
- "sha256:a5a1595fe639f5988ba6a8e5bc9649af3baf26df3998a0abe56c02609392e0a4",
- "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a",
- "sha256:b1d432e8d08679a40e2a6d8b2f9770a5c21793a6f9f47fdd52c5ce1948a5a8a9",
- "sha256:b8661b0238a69d7aafe156b7fa86c44b881387509653fdf857bebc5e4008ad42",
- "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2",
- "sha256:bc6b93f9b966093cb0fd62ff1a7e4c09e6d546ad7c1de191767baffc57628f39",
- "sha256:c124333816c3a9b03fbeef3a9f230ba9a737e9e5bb4060aa2107a86cc0a497fc",
- "sha256:cd8d0c3be0515c12fed0bdbae072551c8b54b7192c7b1fda0ba56059a0179698",
- "sha256:d9c45366def9a3dd85a6454c0e7908f2b3b8e9c138f5dc38fed7ce720d8453ed",
- "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015",
- "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24",
- "sha256:fffb8ae78d8af97f849404f21411c95062db1496aeb3e56f146f0355c9989319"
+ "sha256:034abd6f3db8b9880aaee98f4f5d4dbec7c4829938463ec046517220b2f8574e",
+ "sha256:094e271a15b579650ebf4c5155c05dcd2a14fd4fdd72cf4854b2f7ad31ea30be",
+ "sha256:14a0cc77b0f089d2d2ffe3007db58f170dae9b9f54e569b299db871a3ab5bf46",
+ "sha256:1a881bc1309f3fce34696d07b00f13335c41f5f5a8770a33b09ebe23261cfc67",
+ "sha256:1d2b33e68d0ce64e26a4acc2e72d747292084f4e8db4c847c6f5f6cbe56ed6d8",
+ "sha256:213cd63c43263dbb522c1f8a7c9d072e25900f6975596f883f4bebd77295d4f3",
+ "sha256:23c2b2dc5213810208ca0b80b8666670eb4660bbfd9d45f58592cc4ddcfd62e1",
+ "sha256:2c7e2fc25f89a49a11599ec1e76821322439d90820108309bf42130d2f36c983",
+ "sha256:2eb4728a18dcd2908c7fccf74a982e241b467d178724545a48d0caf534b38ebf",
+ "sha256:34600ab34ebf1131a7613a260a61dbe8b62c188ec0ea4c296da7c9a06b004133",
+ "sha256:39ff73ec07be5e90330cc6ff5705c651ace83374189dcdcb46e6ff54b4a72cd6",
+ "sha256:404d681c698e3c8a40a61d0cd9412cc7364ab9a9cc6e144ae2992e11a2e77a20",
+ "sha256:40cecc4ea5abd2921682b57532baea5588cc5f80f0231c624056b146887274d2",
+ "sha256:430a63bae10b5086995db1b02694996336e5a8ac9a96b4200572b413dfdfccb9",
+ "sha256:4930255e28ff5545e2ca404637bcc56f031893142773b3468dc021c6c32a1390",
+ "sha256:6021910b086b3ca756755e86ddc64e0ddafd5e58e076c72cb1585162e5ad259b",
+ "sha256:625466edd01d43b75b1883a64d859168e4556261a5035b32f9d743b67ef44634",
+ "sha256:75651c14fde635e680496148a8526b328e09fe0572d9ae9b638648c46a544ba3",
+ "sha256:84141f722d45d0c2a89544dd29d35b3abfc13d2250ed7e68394eda7564bd6324",
+ "sha256:8adff9f138fc614347ff33812046787f7d43b3cef7c0f0171b3340cae333f6ca",
+ "sha256:951805d146922aed8357e4cc5671b8b0b9be1027f0619cea132a9f3f65f2f09c",
+ "sha256:9efc0acbbffb5236fbdf0409c04edce96bec4bdaa649d49985427bd1ec73e085",
+ "sha256:9ff730713d4c4f2f1c860e36c005c7cefc1c7c80c21c0688fd605aa43c9fcf09",
+ "sha256:a6872d695c896f00df46b71648eea332279ef4077a409e2fe94220208b6bb675",
+ "sha256:b198687ca9c8529662213538a9bb1e60fa0bf0f6af89292eb68fea28743fcd5a",
+ "sha256:b9d8c3187be7479ea5c3d30c32a5d73d62a621166675063b2edd21bc47614027",
+ "sha256:ba24af48643b12ffe49b27065d3babd52702d95ab70f50e1b34f71ca703e2c0d",
+ "sha256:bb32dc743b52467d488e7a7c8039b821da2826a9ba4f85b89ea95274f863280f",
+ "sha256:bb3be958022198531eb7ec2008cfc78c5b1eed51af8600c6c5d9160d89d8d249",
+ "sha256:bf5be867a0541a9fb47a4be0c5790a4bccd5b77b92f0a59eeec9375fafc2aa14",
+ "sha256:c06f6f144ad0a1bf84699aeea7eff6068ca5c63ceb404798198af7eb86082e33",
+ "sha256:c6da97aeb6a6d233fb6b17986234cc723b396b50a3c6804776351994f2a658fd",
+ "sha256:e0f51973ba93a9f97185049326d75b942b9aeb472bec616a129806facb129ebb",
+ "sha256:e1991bbb96f4050b09b5f811253c4f3cf05ee89a589379aa36cd623f21a31d6f",
+ "sha256:e5f08eb9a445d07720776df6e641975665c9ea12c9d8a331e0f6890f2dcd76ef",
+ "sha256:e78ad363ddb873a631e92a3c063ade1ecfb34cae71e9a2be6ad100f875ac1042",
+ "sha256:ed16339bc354a73e0a609df36d256672c7d296f3f767ac07257801aa064ff73c",
+ "sha256:f4dd97c19bd06bc557ad787a15b6489d2614ddaab5d104a0310eb314c724b2d2",
+ "sha256:f925f1ef673b4bd0271b1809b72b3270384f2b7d9d14a189b12b7fc02574d575",
+ "sha256:f95a2aef32614ed86216d3c450ab12a4e82084e8102e355707a1d96e33d51c34",
+ "sha256:fa07e138b3f6c04addfeaf56cc7fdb96c3b68a3fe5e5401251f231fce40a0d7a",
+ "sha256:fa35c266c8cd1a67d75971a1912b185b492d257092bdd2709bbdebe574ed228d"
],
"markers": "python_version >= '3.9'",
- "version": "==2.2.3"
+ "version": "==2.3.0"
},
"pika": {
"hashes": [
@@ -441,11 +441,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
- "markers": "python_version >= '3.8'",
- "version": "==4.13.2"
+ "markers": "python_version >= '3.9'",
+ "version": "==4.14.0"
},
"typing-inspection": {
"hashes": [
@@ -662,64 +662,63 @@
},
"greenlet": {
"hashes": [
- "sha256:00cd814b8959b95a546e47e8d589610534cfb71f19802ea8a2ad99d95d702057",
- "sha256:02a98600899ca1ca5d3a2590974c9e3ec259503b2d6ba6527605fcd74e08e207",
- "sha256:02f5972ff02c9cf615357c17ab713737cccfd0eaf69b951084a9fd43f39833d3",
- "sha256:055916fafad3e3388d27dd68517478933a97edc2fc54ae79d3bec827de2c64c4",
- "sha256:0a16fb934fcabfdfacf21d79e6fed81809d8cd97bc1be9d9c89f0e4567143d7b",
- "sha256:1592a615b598643dbfd566bac8467f06c8c8ab6e56f069e573832ed1d5d528cc",
- "sha256:1919cbdc1c53ef739c94cf2985056bcc0838c1f217b57647cbf4578576c63825",
- "sha256:1e4747712c4365ef6765708f948acc9c10350719ca0545e362c24ab973017370",
- "sha256:1e76106b6fc55fa3d6fe1c527f95ee65e324a13b62e243f77b48317346559708",
- "sha256:1f72667cc341c95184f1c68f957cb2d4fc31eef81646e8e59358a10ce6689457",
- "sha256:2593283bf81ca37d27d110956b79e8723f9aa50c4bcdc29d3c0543d4743d2763",
- "sha256:2dc5c43bb65ec3669452af0ab10729e8fdc17f87a1f2ad7ec65d4aaaefabf6bf",
- "sha256:3091bc45e6b0c73f225374fefa1536cd91b1e987377b12ef5b19129b07d93ebe",
- "sha256:354f67445f5bed6604e493a06a9a49ad65675d3d03477d38a4db4a427e9aad0e",
- "sha256:3885f85b61798f4192d544aac7b25a04ece5fe2704670b4ab73c2d2c14ab740d",
- "sha256:3ab7194ee290302ca15449f601036007873028712e92ca15fc76597a0aeb4c59",
- "sha256:3aeca9848d08ce5eb653cf16e15bb25beeab36e53eb71cc32569f5f3afb2a3aa",
- "sha256:44671c29da26539a5f142257eaba5110f71887c24d40df3ac87f1117df589e0e",
- "sha256:45f9f4853fb4cc46783085261c9ec4706628f3b57de3e68bae03e8f8b3c0de51",
- "sha256:4bd139e4943547ce3a56ef4b8b1b9479f9e40bb47e72cc906f0f66b9d0d5cab3",
- "sha256:4fefc7aa68b34b9224490dfda2e70ccf2131368493add64b4ef2d372955c207e",
- "sha256:6629311595e3fe7304039c67f00d145cd1d38cf723bb5b99cc987b23c1433d61",
- "sha256:6fadd183186db360b61cb34e81117a096bff91c072929cd1b529eb20dd46e6c5",
- "sha256:71566302219b17ca354eb274dfd29b8da3c268e41b646f330e324e3967546a74",
- "sha256:7409796591d879425997a518138889d8d17e63ada7c99edc0d7a1c22007d4907",
- "sha256:752f0e79785e11180ebd2e726c8a88109ded3e2301d40abced2543aa5d164275",
- "sha256:7791dcb496ec53d60c7f1c78eaa156c21f402dda38542a00afc3e20cae0f480f",
- "sha256:782743700ab75716650b5238a4759f840bb2dcf7bff56917e9ffdf9f1f23ec59",
- "sha256:7c9896249fbef2c615853b890ee854f22c671560226c9221cfd27c995db97e5c",
- "sha256:85f3e248507125bf4af607a26fd6cb8578776197bd4b66e35229cdf5acf1dfbf",
- "sha256:89c69e9a10670eb7a66b8cef6354c24671ba241f46152dd3eed447f79c29fb5b",
- "sha256:8cb8553ee954536500d88a1a2f58fcb867e45125e600e80f586ade399b3f8819",
- "sha256:9ae572c996ae4b5e122331e12bbb971ea49c08cc7c232d1bd43150800a2d6c65",
- "sha256:9c7b15fb9b88d9ee07e076f5a683027bc3befd5bb5d25954bb633c385d8b737e",
- "sha256:9ea5231428af34226c05f927e16fc7f6fa5e39e3ad3cd24ffa48ba53a47f4240",
- "sha256:a31ead8411a027c2c4759113cf2bd473690517494f3d6e4bf67064589afcd3c5",
- "sha256:a8fa80665b1a29faf76800173ff5325095f3e66a78e62999929809907aca5659",
- "sha256:ad053d34421a2debba45aa3cc39acf454acbcd025b3fc1a9f8a0dee237abd485",
- "sha256:b24c7844c0a0afc3ccbeb0b807adeefb7eff2b5599229ecedddcfeb0ef333bec",
- "sha256:b50a8c5c162469c3209e5ec92ee4f95c8231b11db6a04db09bbe338176723bb8",
- "sha256:ba30e88607fb6990544d84caf3c706c4b48f629e18853fc6a646f82db9629418",
- "sha256:bf3fc9145141250907730886b031681dfcc0de1c158f3cc51c092223c0f381ce",
- "sha256:c23ea227847c9dbe0b3910f5c0dd95658b607137614eb821e6cbaecd60d81cc6",
- "sha256:c3cc1a3ed00ecfea8932477f729a9f616ad7347a5e55d50929efa50a86cb7be7",
- "sha256:c49e9f7c6f625507ed83a7485366b46cbe325717c60837f7244fc99ba16ba9d6",
- "sha256:d0cb7d47199001de7658c213419358aa8937df767936506db0db7ce1a71f4a2f",
- "sha256:d8009ae46259e31bc73dc183e402f548e980c96f33a6ef58cc2e7865db012e13",
- "sha256:da956d534a6d1b9841f95ad0f18ace637668f680b1339ca4dcfb2c1837880a0b",
- "sha256:dcb9cebbf3f62cb1e5afacae90761ccce0effb3adaa32339a0670fe7805d8068",
- "sha256:decb0658ec19e5c1f519faa9a160c0fc85a41a7e6654b3ce1b44b939f8bf1325",
- "sha256:df4d1509efd4977e6a844ac96d8be0b9e5aa5d5c77aa27ca9f4d3f92d3fcf330",
- "sha256:eeb27bece45c0c2a5842ac4c5a1b5c2ceaefe5711078eed4e8043159fa05c834",
- "sha256:efcdfb9df109e8a3b475c016f60438fcd4be68cd13a365d42b35914cdab4bb2b",
- "sha256:fd9fb7c941280e2c837b603850efc93c999ae58aae2b40765ed682a6907ebbc5",
- "sha256:fe46d4f8e94e637634d54477b0cfabcf93c53f29eedcbdeecaf2af32029b4421"
+ "sha256:003c930e0e074db83559edc8705f3a2d066d4aa8c2f198aff1e454946efd0f26",
+ "sha256:024571bbce5f2c1cfff08bf3fbaa43bbc7444f580ae13b0099e95d0e6e67ed36",
+ "sha256:02b0df6f63cd15012bed5401b47829cfd2e97052dc89da3cfaf2c779124eb892",
+ "sha256:0921ac4ea42a5315d3446120ad48f90c3a6b9bb93dd9b3cf4e4d84a66e42de83",
+ "sha256:0cc73378150b8b78b0c9fe2ce56e166695e67478550769536a6742dca3651688",
+ "sha256:1afd685acd5597349ee6d7a88a8bec83ce13c106ac78c196ee9dde7c04fe87be",
+ "sha256:22eb5ba839c4b2156f18f76768233fe44b23a31decd9cc0d4cc8141c211fd1b4",
+ "sha256:25ad29caed5783d4bd7a85c9251c651696164622494c00802a139c00d639242d",
+ "sha256:29e184536ba333003540790ba29829ac14bb645514fbd7e32af331e8202a62a5",
+ "sha256:2c724620a101f8170065d7dded3f962a2aea7a7dae133a009cada42847e04a7b",
+ "sha256:2d8aa5423cd4a396792f6d4580f88bdc6efcb9205891c9d40d20f6e670992efb",
+ "sha256:3d04332dddb10b4a211b68111dabaee2e1a073663d117dc10247b5b1642bac86",
+ "sha256:419e60f80709510c343c57b4bb5a339d8767bf9aef9b8ce43f4f143240f88b7c",
+ "sha256:42efc522c0bd75ffa11a71e09cd8a399d83fafe36db250a87cf1dacfaa15dc64",
+ "sha256:4532f0d25df67f896d137431b13f4cdce89f7e3d4a96387a41290910df4d3a57",
+ "sha256:49c8cfb18fb419b3d08e011228ef8a25882397f3a859b9fe1436946140b6756b",
+ "sha256:500b8689aa9dd1ab26872a34084503aeddefcb438e2e7317b89b11eaea1901ad",
+ "sha256:5035d77a27b7c62db6cf41cf786cfe2242644a7a337a0e155c80960598baab95",
+ "sha256:5195fb1e75e592dd04ce79881c8a22becdfa3e6f500e7feb059b1e6fdd54d3e3",
+ "sha256:592c12fb1165be74592f5de0d70f82bc5ba552ac44800d632214b76089945147",
+ "sha256:68671180e3849b963649254a882cd544a3c75bfcd2c527346ad8bb53494444db",
+ "sha256:706d016a03e78df129f68c4c9b4c4f963f7d73534e48a24f5f5a7101ed13dbbb",
+ "sha256:72e77ed69312bab0434d7292316d5afd6896192ac4327d44f3d613ecb85b037c",
+ "sha256:731e154aba8e757aedd0781d4b240f1225b075b4409f1bb83b05ff410582cf00",
+ "sha256:7454d37c740bb27bdeddfc3f358f26956a07d5220818ceb467a483197d84f849",
+ "sha256:751261fc5ad7b6705f5f76726567375bb2104a059454e0226e1eef6c756748ba",
+ "sha256:761917cac215c61e9dc7324b2606107b3b292a8349bdebb31503ab4de3f559ac",
+ "sha256:784ae58bba89fa1fa5733d170d42486580cab9decda3484779f4759345b29822",
+ "sha256:7e70ea4384b81ef9e84192e8a77fb87573138aa5d4feee541d8014e452b434da",
+ "sha256:8186162dffde068a465deab08fc72c767196895c39db26ab1c17c0b77a6d8b97",
+ "sha256:8324319cbd7b35b97990090808fdc99c27fe5338f87db50514959f8059999805",
+ "sha256:83a8761c75312361aa2b5b903b79da97f13f556164a7dd2d5448655425bd4c34",
+ "sha256:86c2d68e87107c1792e2e8d5399acec2487a4e993ab76c792408e59394d52141",
+ "sha256:8704b3768d2f51150626962f4b9a9e4a17d2e37c8a8d9867bbd9fa4eb938d3b3",
+ "sha256:873abe55f134c48e1f2a6f53f7d1419192a3d1a4e873bace00499a4e45ea6af0",
+ "sha256:88cd97bf37fe24a6710ec6a3a7799f3f81d9cd33317dcf565ff9950c83f55e0b",
+ "sha256:8b0dd8ae4c0d6f5e54ee55ba935eeb3d735a9b58a8a1e5b5cbab64e01a39f365",
+ "sha256:8c37ef5b3787567d322331d5250e44e42b58c8c713859b8a04c6065f27efbf72",
+ "sha256:8c47aae8fbbfcf82cc13327ae802ba13c9c36753b67e760023fd116bc124a62a",
+ "sha256:93c0bb79844a367782ec4f429d07589417052e621aa39a5ac1fb99c5aa308edc",
+ "sha256:93d48533fade144203816783373f27a97e4193177ebaaf0fc396db19e5d61163",
+ "sha256:96c20252c2f792defe9a115d3287e14811036d51e78b3aaddbee23b69b216302",
+ "sha256:a07d3472c2a93117af3b0136f246b2833fdc0b542d4a9799ae5f41c28323faef",
+ "sha256:a433dbc54e4a37e4fff90ef34f25a8c00aed99b06856f0119dcf09fbafa16392",
+ "sha256:aaa7aae1e7f75eaa3ae400ad98f8644bb81e1dc6ba47ce8a93d3f17274e08322",
+ "sha256:baeedccca94880d2f5666b4fa16fc20ef50ba1ee353ee2d7092b383a243b0b0d",
+ "sha256:be52af4b6292baecfa0f397f3edb3c6092ce071b499dd6fe292c9ac9f2c8f264",
+ "sha256:c667c0bf9d406b77a15c924ef3285e1e05250948001220368e039b6aa5b5034b",
+ "sha256:ce539fb52fb774d0802175d37fcff5c723e2c7d249c65916257f0a940cee8904",
+ "sha256:d2971d93bb99e05f8c2c0c2f4aa9484a18d98c4c3bd3c62b65b7e6ae33dfcfaf",
+ "sha256:d760f9bdfe79bff803bad32b4d8ffb2c1d2ce906313fc10a83976ffb73d64ca7",
+ "sha256:ed6cfa9200484d234d8394c70f5492f144b20d4533f69262d530a1a082f6ee9a",
+ "sha256:efc6dc8a792243c31f2f5674b670b3a95d46fa1c6a912b8e310d6f542e7b0712",
+ "sha256:f4bfbaa6096b1b7a200024784217defedf46a07c2eee1a498e94a1b5f8ec5728"
],
"markers": "python_version < '3.14' and (platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32'))))))",
- "version": "==3.2.2"
+ "version": "==3.2.3"
},
"idna": {
"hashes": [
@@ -753,6 +752,14 @@
"markers": "python_version >= '3.9'",
"version": "==1.6.0"
},
+ "pygments": {
+ "hashes": [
+ "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f",
+ "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.19.1"
+ },
"pymysql": {
"hashes": [
"sha256:4de15da4c61dc132f4fb9ab763063e693d521a80fd0e87943b9a453dd4c19d6c",
@@ -763,11 +770,11 @@
},
"pytest": {
"hashes": [
- "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
- "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
+ "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6",
+ "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e"
],
"index": "pypi",
- "version": "==8.3.5"
+ "version": "==8.4.0"
},
"requests": {
"hashes": [
@@ -864,11 +871,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
- "markers": "python_version >= '3.8'",
- "version": "==4.13.2"
+ "markers": "python_version >= '3.9'",
+ "version": "==4.14.0"
},
"urllib3": {
"hashes": [
diff --git a/dbrepo-auth-service/init/lib/dbrepo-1.9.2.tar.gz b/dbrepo-auth-service/init/lib/dbrepo-1.9.2.tar.gz
deleted file mode 100644
index cc536fecd0b417e82a49442320b056d6da14d4ed..0000000000000000000000000000000000000000
Binary files a/dbrepo-auth-service/init/lib/dbrepo-1.9.2.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.9.2-py3-none-any.whl b/dbrepo-auth-service/init/lib/dbrepo-1.9.3-py3-none-any.whl
similarity index 75%
rename from dbrepo-search-service/lib/dbrepo-1.9.2-py3-none-any.whl
rename to dbrepo-auth-service/init/lib/dbrepo-1.9.3-py3-none-any.whl
index 658217e61233bd386c2abead7a1aee64b7a14781..e727c2f2bbf3aed3187f58c34421a7aecd318614 100644
Binary files a/dbrepo-search-service/lib/dbrepo-1.9.2-py3-none-any.whl and b/dbrepo-auth-service/init/lib/dbrepo-1.9.3-py3-none-any.whl differ
diff --git a/dbrepo-auth-service/init/lib/dbrepo-1.9.3.tar.gz b/dbrepo-auth-service/init/lib/dbrepo-1.9.3.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..94753e52f49aa983dca1ad4196e2df61f9adae9f
Binary files /dev/null and b/dbrepo-auth-service/init/lib/dbrepo-1.9.3.tar.gz differ
diff --git a/dbrepo-auth-service/listeners/create-event-listener.jar b/dbrepo-auth-service/listeners/create-event-listener.jar
index fb1458371a5ce51be8ca63a9421a621e0ef09ce3..5ff46c83dc8c8a09c169f39150e534053123373f 100644
Binary files a/dbrepo-auth-service/listeners/create-event-listener.jar and b/dbrepo-auth-service/listeners/create-event-listener.jar differ
diff --git a/dbrepo-dashboard-service/Pipfile b/dbrepo-dashboard-service/Pipfile
index 3bef7a534bc707e491b77217ba369792efa38bdf..43380d41c9451a9457f9f8f838c84b58357695bd 100644
--- a/dbrepo-dashboard-service/Pipfile
+++ b/dbrepo-dashboard-service/Pipfile
@@ -12,7 +12,7 @@ prometheus-flask-exporter = "*"
python-dotenv = "~=1.0"
jwt = "~=1.3"
pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.9.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.9.3.tar.gz"}
gunicorn = "*"
pydantic = "*"
flask_httpauth = "*"
diff --git a/dbrepo-dashboard-service/Pipfile.lock b/dbrepo-dashboard-service/Pipfile.lock
index e5d5310417014313ceff9beed6977437d16beefa..b5addaaafe1e391e96b733759df4b5b1aa549f9f 100644
--- a/dbrepo-dashboard-service/Pipfile.lock
+++ b/dbrepo-dashboard-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "942ef7f6536e2ec7960d3a899d236db8409c093d6fd3e4135394db4a00254937"
+ "sha256": "5796c2cb3d9eea20dfefea5e2ad623c4e0d106d0f2acb3ea8479737c6c36d33d"
},
"pipfile-spec": 6,
"requires": {
@@ -272,10 +272,10 @@
},
"dbrepo": {
"hashes": [
- "sha256:b9079a9a97d7112459df40cbc8e63302848e4cd995a5bd0fe69d52b99e670be7"
+ "sha256:f21cdfeb928daafa30b01117fd2fa62bb2f6cdeaa7b67505d4a4591480d45ca2"
],
- "path": "./lib/dbrepo-1.9.2.tar.gz",
- "version": "==1.9.2"
+ "path": "./lib/dbrepo-1.9.3.tar.gz",
+ "version": "==1.9.3"
},
"ecs-logging": {
"hashes": [
@@ -660,51 +660,51 @@
},
"pandas": {
"hashes": [
- "sha256:062309c1b9ea12a50e8ce661145c6aab431b1e99530d3cd60640e255778bd43a",
- "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d",
- "sha256:1948ddde24197a0f7add2bdc4ca83bf2b1ef84a1bc8ccffd95eda17fd836ecb5",
- "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4",
- "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0",
- "sha256:29401dbfa9ad77319367d36940cd8a0b3a11aba16063e39632d98b0e931ddf32",
- "sha256:31d0ced62d4ea3e231a9f228366919a5ea0b07440d9d4dac345376fd8e1477ea",
- "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28",
- "sha256:37e0aced3e8f539eccf2e099f65cdb9c8aa85109b0be6e93e2baff94264bdc6f",
- "sha256:381175499d3802cde0eabbaf6324cce0c4f5d52ca6f8c377c29ad442f50f6348",
- "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18",
- "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468",
- "sha256:3fc6873a41186404dad67245896a6e440baacc92f5b716ccd1bc9ed2995ab2c5",
- "sha256:4850ba03528b6dd51d6c5d273c46f183f39a9baf3f0143e566b89450965b105e",
- "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667",
- "sha256:56534ce0746a58afaf7942ba4863e0ef81c9c50d3f0ae93e9497d6a41a057645",
- "sha256:59ef3764d0fe818125a5097d2ae867ca3fa64df032331b7e0917cf5d7bf66b13",
- "sha256:5dbca4c1acd72e8eeef4753eeca07de9b1db4f398669d5994086f788a5d7cc30",
- "sha256:5de54125a92bb4d1c051c0659e6fcb75256bf799a732a87184e5ea503965bce3",
- "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d",
- "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb",
- "sha256:63cc132e40a2e084cf01adf0775b15ac515ba905d7dcca47e9a251819c575ef3",
- "sha256:66108071e1b935240e74525006034333f98bcdb87ea116de573a6a0dccb6c039",
- "sha256:6dfcb5ee8d4d50c06a51c2fffa6cff6272098ad6540aed1a76d15fb9318194d8",
- "sha256:7c2875855b0ff77b2a64a0365e24455d9990730d6431b9e0ee18ad8acee13dbd",
- "sha256:7eee9e7cea6adf3e3d24e304ac6b8300646e2a5d1cd3a3c2abed9101b0846761",
- "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659",
- "sha256:86976a1c5b25ae3f8ccae3a5306e443569ee3c3faf444dfd0f41cda24667ad57",
- "sha256:8cd6d7cc958a3910f934ea8dbdf17b2364827bb4dafc38ce6eef6bb3d65ff09c",
- "sha256:99df71520d25fade9db7c1076ac94eb994f4d2673ef2aa2e86ee039b6746d20c",
- "sha256:a5a1595fe639f5988ba6a8e5bc9649af3baf26df3998a0abe56c02609392e0a4",
- "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a",
- "sha256:b1d432e8d08679a40e2a6d8b2f9770a5c21793a6f9f47fdd52c5ce1948a5a8a9",
- "sha256:b8661b0238a69d7aafe156b7fa86c44b881387509653fdf857bebc5e4008ad42",
- "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2",
- "sha256:bc6b93f9b966093cb0fd62ff1a7e4c09e6d546ad7c1de191767baffc57628f39",
- "sha256:c124333816c3a9b03fbeef3a9f230ba9a737e9e5bb4060aa2107a86cc0a497fc",
- "sha256:cd8d0c3be0515c12fed0bdbae072551c8b54b7192c7b1fda0ba56059a0179698",
- "sha256:d9c45366def9a3dd85a6454c0e7908f2b3b8e9c138f5dc38fed7ce720d8453ed",
- "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015",
- "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24",
- "sha256:fffb8ae78d8af97f849404f21411c95062db1496aeb3e56f146f0355c9989319"
+ "sha256:034abd6f3db8b9880aaee98f4f5d4dbec7c4829938463ec046517220b2f8574e",
+ "sha256:094e271a15b579650ebf4c5155c05dcd2a14fd4fdd72cf4854b2f7ad31ea30be",
+ "sha256:14a0cc77b0f089d2d2ffe3007db58f170dae9b9f54e569b299db871a3ab5bf46",
+ "sha256:1a881bc1309f3fce34696d07b00f13335c41f5f5a8770a33b09ebe23261cfc67",
+ "sha256:1d2b33e68d0ce64e26a4acc2e72d747292084f4e8db4c847c6f5f6cbe56ed6d8",
+ "sha256:213cd63c43263dbb522c1f8a7c9d072e25900f6975596f883f4bebd77295d4f3",
+ "sha256:23c2b2dc5213810208ca0b80b8666670eb4660bbfd9d45f58592cc4ddcfd62e1",
+ "sha256:2c7e2fc25f89a49a11599ec1e76821322439d90820108309bf42130d2f36c983",
+ "sha256:2eb4728a18dcd2908c7fccf74a982e241b467d178724545a48d0caf534b38ebf",
+ "sha256:34600ab34ebf1131a7613a260a61dbe8b62c188ec0ea4c296da7c9a06b004133",
+ "sha256:39ff73ec07be5e90330cc6ff5705c651ace83374189dcdcb46e6ff54b4a72cd6",
+ "sha256:404d681c698e3c8a40a61d0cd9412cc7364ab9a9cc6e144ae2992e11a2e77a20",
+ "sha256:40cecc4ea5abd2921682b57532baea5588cc5f80f0231c624056b146887274d2",
+ "sha256:430a63bae10b5086995db1b02694996336e5a8ac9a96b4200572b413dfdfccb9",
+ "sha256:4930255e28ff5545e2ca404637bcc56f031893142773b3468dc021c6c32a1390",
+ "sha256:6021910b086b3ca756755e86ddc64e0ddafd5e58e076c72cb1585162e5ad259b",
+ "sha256:625466edd01d43b75b1883a64d859168e4556261a5035b32f9d743b67ef44634",
+ "sha256:75651c14fde635e680496148a8526b328e09fe0572d9ae9b638648c46a544ba3",
+ "sha256:84141f722d45d0c2a89544dd29d35b3abfc13d2250ed7e68394eda7564bd6324",
+ "sha256:8adff9f138fc614347ff33812046787f7d43b3cef7c0f0171b3340cae333f6ca",
+ "sha256:951805d146922aed8357e4cc5671b8b0b9be1027f0619cea132a9f3f65f2f09c",
+ "sha256:9efc0acbbffb5236fbdf0409c04edce96bec4bdaa649d49985427bd1ec73e085",
+ "sha256:9ff730713d4c4f2f1c860e36c005c7cefc1c7c80c21c0688fd605aa43c9fcf09",
+ "sha256:a6872d695c896f00df46b71648eea332279ef4077a409e2fe94220208b6bb675",
+ "sha256:b198687ca9c8529662213538a9bb1e60fa0bf0f6af89292eb68fea28743fcd5a",
+ "sha256:b9d8c3187be7479ea5c3d30c32a5d73d62a621166675063b2edd21bc47614027",
+ "sha256:ba24af48643b12ffe49b27065d3babd52702d95ab70f50e1b34f71ca703e2c0d",
+ "sha256:bb32dc743b52467d488e7a7c8039b821da2826a9ba4f85b89ea95274f863280f",
+ "sha256:bb3be958022198531eb7ec2008cfc78c5b1eed51af8600c6c5d9160d89d8d249",
+ "sha256:bf5be867a0541a9fb47a4be0c5790a4bccd5b77b92f0a59eeec9375fafc2aa14",
+ "sha256:c06f6f144ad0a1bf84699aeea7eff6068ca5c63ceb404798198af7eb86082e33",
+ "sha256:c6da97aeb6a6d233fb6b17986234cc723b396b50a3c6804776351994f2a658fd",
+ "sha256:e0f51973ba93a9f97185049326d75b942b9aeb472bec616a129806facb129ebb",
+ "sha256:e1991bbb96f4050b09b5f811253c4f3cf05ee89a589379aa36cd623f21a31d6f",
+ "sha256:e5f08eb9a445d07720776df6e641975665c9ea12c9d8a331e0f6890f2dcd76ef",
+ "sha256:e78ad363ddb873a631e92a3c063ade1ecfb34cae71e9a2be6ad100f875ac1042",
+ "sha256:ed16339bc354a73e0a609df36d256672c7d296f3f767ac07257801aa064ff73c",
+ "sha256:f4dd97c19bd06bc557ad787a15b6489d2614ddaab5d104a0310eb314c724b2d2",
+ "sha256:f925f1ef673b4bd0271b1809b72b3270384f2b7d9d14a189b12b7fc02574d575",
+ "sha256:f95a2aef32614ed86216d3c450ab12a4e82084e8102e355707a1d96e33d51c34",
+ "sha256:fa07e138b3f6c04addfeaf56cc7fdb96c3b68a3fe5e5401251f231fce40a0d7a",
+ "sha256:fa35c266c8cd1a67d75971a1912b185b492d257092bdd2709bbdebe574ed228d"
],
"markers": "python_version >= '3.9'",
- "version": "==2.2.3"
+ "version": "==2.3.0"
},
"pika": {
"hashes": [
@@ -724,11 +724,11 @@
},
"prometheus-client": {
"hashes": [
- "sha256:18da1d2241ac2d10c8d2110f13eedcd5c7c0c8af18c926e8731f04fc10cd575c",
- "sha256:c8951bbe64e62b96cd8e8f5d917279d1b9b91ab766793f33d4dce6c228558713"
+ "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28",
+ "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"
],
"markers": "python_version >= '3.9'",
- "version": "==0.22.0"
+ "version": "==0.22.1"
},
"prometheus-flask-exporter": {
"hashes": [
@@ -859,6 +859,14 @@
"markers": "python_version >= '3.9'",
"version": "==2.33.2"
},
+ "pygments": {
+ "hashes": [
+ "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f",
+ "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.19.1"
+ },
"pyjwt": {
"hashes": [
"sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953",
@@ -869,11 +877,11 @@
},
"pytest": {
"hashes": [
- "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
- "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
+ "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6",
+ "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e"
],
"index": "pypi",
- "version": "==8.3.5"
+ "version": "==8.4.0"
},
"python-dateutil": {
"hashes": [
@@ -1207,11 +1215,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
- "markers": "python_version >= '3.8'",
- "version": "==4.13.2"
+ "markers": "python_version >= '3.9'",
+ "version": "==4.14.0"
},
"typing-inspection": {
"hashes": [
@@ -1578,13 +1586,21 @@
"markers": "python_version >= '3.9'",
"version": "==1.6.0"
},
+ "pygments": {
+ "hashes": [
+ "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f",
+ "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.19.1"
+ },
"pytest": {
"hashes": [
- "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
- "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
+ "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6",
+ "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e"
],
"index": "pypi",
- "version": "==8.3.5"
+ "version": "==8.4.0"
},
"python-dotenv": {
"hashes": [
@@ -1620,11 +1636,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
- "markers": "python_version >= '3.8'",
- "version": "==4.13.2"
+ "markers": "python_version >= '3.9'",
+ "version": "==4.14.0"
},
"urllib3": {
"hashes": [
diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.9.2.tar.gz b/dbrepo-dashboard-service/lib/dbrepo-1.9.2.tar.gz
deleted file mode 100644
index cc536fecd0b417e82a49442320b056d6da14d4ed..0000000000000000000000000000000000000000
Binary files a/dbrepo-dashboard-service/lib/dbrepo-1.9.2.tar.gz and /dev/null differ
diff --git a/dbrepo-auth-service/init/lib/dbrepo-1.9.2-py3-none-any.whl b/dbrepo-dashboard-service/lib/dbrepo-1.9.3-py3-none-any.whl
similarity index 75%
rename from dbrepo-auth-service/init/lib/dbrepo-1.9.2-py3-none-any.whl
rename to dbrepo-dashboard-service/lib/dbrepo-1.9.3-py3-none-any.whl
index 658217e61233bd386c2abead7a1aee64b7a14781..e727c2f2bbf3aed3187f58c34421a7aecd318614 100644
Binary files a/dbrepo-auth-service/init/lib/dbrepo-1.9.2-py3-none-any.whl and b/dbrepo-dashboard-service/lib/dbrepo-1.9.3-py3-none-any.whl differ
diff --git a/dbrepo-dashboard-service/lib/dbrepo-1.9.3.tar.gz b/dbrepo-dashboard-service/lib/dbrepo-1.9.3.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..94753e52f49aa983dca1ad4196e2df61f9adae9f
Binary files /dev/null and b/dbrepo-dashboard-service/lib/dbrepo-1.9.3.tar.gz differ
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 8175e571ab49f8df326510662bfdad3b01789bfd..2c1ba79360a814c866218f45b935d491a6e46781 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -16,7 +16,7 @@
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>data-service</artifactId>
<name>data-service</name>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<description>Service that manages the data</description>
@@ -96,7 +96,7 @@
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>dbrepo-core</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
<!-- Spark -->
<dependency>
diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml
index c74b871c0ee0f05aef05210cdae0d08a3bd9d273..f7130ea3dd1278f1824ec588e847580c1e43e3be 100644
--- a/dbrepo-data-service/querystore/pom.xml
+++ b/dbrepo-data-service/querystore/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>data-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>querystore</name>
<artifactId>querystore</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies/>
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index e25ad8ff16b30ca5a29b6d8d383b9fef71c9f949..10b1b7a54c979edaee865eaa899d9930fb727919 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -6,23 +6,23 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>data-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>report</name>
<artifactId>report</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>rest-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>services</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index 76bb9a02ecb0634d1375c0b6e04ef66e0185d9c4..df13df8e4ed85f0a630919aa96e6c2d8b6c0bdb2 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>data-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>rest-service</name>
<artifactId>rest-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>services</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java
index fb28579cb37e49c659a1745586bf019c74e0db9b..c4954398932d47912fd853cb1018794c4a78937c 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/AccessEndpoint.java
@@ -78,13 +78,14 @@ public class AccessEndpoint extends RestEndpoint {
@PathVariable("userId") UUID userId,
@Valid @RequestBody CreateAccessDto data)
throws NotAllowedException, DatabaseUnavailableException, DatabaseNotFoundException,
- RemoteUnavailableException, UserNotFoundException, DatabaseMalformedException, MetadataServiceException {
+ RemoteUnavailableException, UserNotFoundException, DatabaseMalformedException, MetadataServiceException,
+ AccessNotFoundException {
log.debug("endpoint give access to database, databaseId={}, userId={}", databaseId, userId);
- final DatabaseDto database = cacheService.getDatabase(databaseId);
+ final DatabaseDto database = cacheService.getDatabase(databaseId, true);
final UserDto user = cacheService.getUser(userId);
if (database.getAccesses().stream().anyMatch(a -> a.getUser().getId().equals(userId))) {
log.error("Failed to create access to user with id {}: already has access", userId);
- throw new NotAllowedException("Failed to create access to user with id " + userId + ": already has access");
+ throw new AccessNotFoundException("Failed to create access to user with id " + userId + ": already has access");
}
try {
accessService.create(database, user, data.getType());
@@ -132,16 +133,16 @@ public class AccessEndpoint extends RestEndpoint {
})
public ResponseEntity<Void> update(@NotNull @PathVariable("databaseId") UUID databaseId,
@PathVariable("userId") UUID userId,
- @Valid @RequestBody CreateAccessDto access) throws NotAllowedException,
- DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
- DatabaseMalformedException, MetadataServiceException {
+ @Valid @RequestBody CreateAccessDto access) throws DatabaseUnavailableException,
+ DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException, DatabaseMalformedException,
+ MetadataServiceException, AccessNotFoundException {
log.debug("endpoint modify access to database, databaseId={}, userId={}, access.type={}", databaseId, userId,
access.getType());
- final DatabaseDto database = cacheService.getDatabase(databaseId);
+ final DatabaseDto database = cacheService.getDatabase(databaseId, true);
final UserDto user = cacheService.getUser(userId);
- if (database.getAccesses().stream().noneMatch(a -> a.getHuserid().equals(userId))) {
+ if (database.getAccesses().stream().noneMatch(a -> a.getUser().getId().equals(userId))) {
log.error("Failed to update access to user with id {}: no access", userId);
- throw new NotAllowedException("Failed to update access to user with id " + userId + ": no access");
+ throw new AccessNotFoundException("Failed to update access to user with id " + userId + ": no access");
}
try {
accessService.update(database, user, access.getType());
@@ -188,15 +189,15 @@ public class AccessEndpoint extends RestEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<Void> revoke(@NotNull @PathVariable("databaseId") UUID databaseId,
- @PathVariable("userId") UUID userId) throws NotAllowedException,
- DatabaseUnavailableException, DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
- DatabaseMalformedException, MetadataServiceException {
+ @PathVariable("userId") UUID userId) throws DatabaseUnavailableException,
+ DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException, DatabaseMalformedException,
+ MetadataServiceException, AccessNotFoundException {
log.debug("endpoint revoke access to database, databaseId={}, userId={}", databaseId, userId);
- final DatabaseDto database = cacheService.getDatabase(databaseId);
+ final DatabaseDto database = cacheService.getDatabase(databaseId, true);
final UserDto user = cacheService.getUser(userId);
if (database.getAccesses().stream().noneMatch(a -> a.getUser().getId().equals(userId))) {
log.error("Failed to delete access to user with id {}: no access", userId);
- throw new NotAllowedException("Failed to delete access to user with id " + userId + ": no access");
+ throw new AccessNotFoundException("Failed to delete access to user with id " + userId + ": no access");
}
try {
accessService.delete(database, user);
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/GrantEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/GrantEndpoint.java
index 5913a997bb05d87601b6cffce7ddd706dcce6032..8f1e82c4c867f68153513c421c0b033d37a73421 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/GrantEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/GrantEndpoint.java
@@ -63,6 +63,11 @@ public class GrantEndpoint extends RestEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "404",
+ description = "Failed to find access",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
@ApiResponse(responseCode = "409",
description = "Grants malformed",
content = {@Content(
@@ -74,7 +79,7 @@ public class GrantEndpoint extends RestEndpoint {
Principal principal,
@NotNull HttpServletRequest request) throws DatabaseNotFoundException,
RemoteUnavailableException, MetadataServiceException, DatabaseMalformedException,
- DatabaseUnavailableException, UserNotFoundException, NotAllowedException {
+ DatabaseUnavailableException, UserNotFoundException, NotAllowedException, AccessNotFoundException {
log.debug("endpoint check access to database, databaseId={}", databaseId);
final DatabaseDto database = cacheService.getDatabase(databaseId);
final UserDto user = cacheService.getUser(userId);
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/SubsetEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/SubsetEndpoint.java
index d6a045d0eb259f29bc41c364d5540c8d9c74f03b..c2346f67e1adfcc281d7c946dc76e20ba5247757 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/SubsetEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/SubsetEndpoint.java
@@ -253,7 +253,7 @@ public class SubsetEndpoint extends RestEndpoint {
QueryNotFoundException, StorageUnavailableException, QueryMalformedException, StorageNotFoundException,
QueryStoreInsertException, TableMalformedException, PaginationException, QueryNotSupportedException,
NotAllowedException, UserNotFoundException, MetadataServiceException, TableNotFoundException,
- ViewMalformedException, ViewNotFoundException, ImageNotFoundException, FormatNotAvailableException {
+ ViewMalformedException, ViewNotFoundException, ImageNotFoundException, FormatNotAvailableException, ColumnNotFoundException {
log.debug("endpoint create subset in database, databaseId={}, page={}, size={}, timestamp={}, data.datasource_id={}",
databaseId, page, size, timestamp, data.getDatasourceId());
/* check */
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
index 5d4b85668a38d75fe481b9dded655d8030567254..598a53629298e7af98449b3c29b50cec362958e5 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
@@ -154,7 +154,8 @@ public class ViewEndpoint extends RestEndpoint {
public ResponseEntity<ViewDto> create(@NotNull @PathVariable("databaseId") UUID databaseId,
@Valid @RequestBody CreateViewDto data) throws DatabaseUnavailableException,
DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException, MetadataServiceException,
- TableNotFoundException, ImageNotFoundException, QueryMalformedException, ViewNotFoundException {
+ TableNotFoundException, ImageNotFoundException, QueryMalformedException, ViewNotFoundException,
+ ColumnNotFoundException {
log.debug("endpoint create view, databaseId={}, data.name={}", databaseId, data.getName());
/* check */
endpointValidator.validateSubsetParams(data.getQuery());
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/config/MariaDbConfig.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/config/MariaDbConfig.java
index a45498c644032ba9d34eadecf77be0a8e699d40e..308ac04485d87fa4be3d576534bd23ed82daed72 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/config/MariaDbConfig.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/config/MariaDbConfig.java
@@ -110,26 +110,27 @@ public class MariaDbConfig {
log.debug("dropped database {}", database);
}
- public static List<String> getPrivileges(DatabaseDto database, String username) throws SQLException {
+ public static Set<String> getPrivileges(DatabaseDto database, String username) throws SQLException {
final String jdbc = "jdbc:mariadb://" + database.getContainer().getHost() + ":" + database.getContainer().getPort() + "/" + database.getInternalName();
log.trace("connect to database {}", jdbc);
try (Connection connection = DriverManager.getConnection(jdbc, database.getContainer().getUsername(), database.getContainer().getPassword())) {
- final String query = "SHOW GRANTS FOR `" + username + "`;";
+ final String query = "SHOW GRANTS FOR ?@`%`;";
log.trace("prepare statement '{}'", query);
final PreparedStatement statement = connection.prepareStatement(query);
- final ResultSet set = statement.executeQuery();
+ statement.setString(1, username);
+ final ResultSet resultSet = statement.executeQuery();
statement.close();
- if (set.next()) {
- final Matcher matcher = Pattern.compile("GRANT (.*) ON.*").matcher(set.getString(1));
+ final Set<String> privileges = new HashSet<>();
+ while (resultSet.next()) {
+ final Matcher matcher = Pattern.compile("GRANT (.*) ON.*").matcher(resultSet.getString(1));
if (matcher.find()) {
- final List<String> privileges = Arrays.asList(matcher.group(1).split(","));
- ;
+ privileges.addAll(Arrays.stream(matcher.group(1).split(",")).map(String::trim).toList());
log.trace("found privileges: {}", privileges);
- return privileges;
}
}
+ privileges.remove("USAGE");
+ return privileges;
}
- throw new SQLException("Failed to get privileges");
}
public static void dropTable(DatabaseDto database, String table) throws SQLException {
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/AccessEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/AccessEndpointUnitTest.java
index 7d00f2888b5b7f4b5ae8011996f0e2f35ba2f492..3c771b8ccde03d94873a6d0b9fe73f667ebba81d 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/AccessEndpointUnitTest.java
@@ -13,10 +13,10 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.sql.SQLException;
@@ -41,10 +41,11 @@ public class AccessEndpointUnitTest extends BaseTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_succeeds() throws UserNotFoundException, NotAllowedException, DatabaseUnavailableException,
- DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, MetadataServiceException {
+ DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, MetadataServiceException,
+ AccessNotFoundException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_4_ID))
.thenReturn(USER_4_DTO);
@@ -61,13 +62,13 @@ public class AccessEndpointUnitTest extends BaseTest {
RemoteUnavailableException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_1_ID))
.thenReturn(USER_1_DTO);
/* test */
- assertThrows(NotAllowedException.class, () -> {
+ assertThrows(AccessNotFoundException.class, () -> {
accessEndpoint.create(DATABASE_1_ID, USER_1_ID, UPDATE_DATABASE_ACCESS_READ_DTO);
});
}
@@ -78,7 +79,7 @@ public class AccessEndpointUnitTest extends BaseTest {
RemoteUnavailableException, MetadataServiceException, SQLException, DatabaseMalformedException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_4_ID))
.thenReturn(USER_4_DTO);
@@ -100,7 +101,7 @@ public class AccessEndpointUnitTest extends BaseTest {
/* mock */
doThrow(DatabaseNotFoundException.class)
.when(credentialService)
- .getDatabase(DATABASE_1_ID);
+ .getDatabase(DATABASE_1_ID, true);
/* test */
assertThrows(DatabaseNotFoundException.class, () -> {
@@ -114,7 +115,7 @@ public class AccessEndpointUnitTest extends BaseTest {
RemoteUnavailableException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
doThrow(UserNotFoundException.class)
.when(credentialService)
@@ -139,10 +140,11 @@ public class AccessEndpointUnitTest extends BaseTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void update_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, UserNotFoundException,
- NotAllowedException, DatabaseUnavailableException, DatabaseMalformedException, MetadataServiceException {
+ DatabaseUnavailableException, DatabaseMalformedException, MetadataServiceException,
+ AccessNotFoundException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_1_ID))
.thenReturn(USER_1_DTO);
@@ -159,7 +161,7 @@ public class AccessEndpointUnitTest extends BaseTest {
UserNotFoundException, DatabaseMalformedException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_1_ID))
.thenReturn(USER_1_DTO);
@@ -179,13 +181,13 @@ public class AccessEndpointUnitTest extends BaseTest {
UserNotFoundException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_4_ID))
.thenReturn(USER_4_DTO);
/* test */
- assertThrows(NotAllowedException.class, () -> {
+ assertThrows(AccessNotFoundException.class, () -> {
accessEndpoint.update(DATABASE_1_ID, USER_4_ID, UPDATE_DATABASE_ACCESS_READ_DTO);
});
}
@@ -208,7 +210,7 @@ public class AccessEndpointUnitTest extends BaseTest {
/* mock */
doThrow(DatabaseNotFoundException.class)
.when(credentialService)
- .getDatabase(DATABASE_1_ID);
+ .getDatabase(DATABASE_1_ID, true);
/* test */
assertThrows(DatabaseNotFoundException.class, () -> {
@@ -222,7 +224,7 @@ public class AccessEndpointUnitTest extends BaseTest {
UserNotFoundException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
doThrow(UserNotFoundException.class)
.when(credentialService)
@@ -236,12 +238,12 @@ public class AccessEndpointUnitTest extends BaseTest {
@Test
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
- public void revoke_succeeds() throws UserNotFoundException, NotAllowedException, DatabaseUnavailableException,
- DatabaseNotFoundException, RemoteUnavailableException, DatabaseMalformedException, MetadataServiceException,
- SQLException {
+ public void revoke_succeeds() throws UserNotFoundException, DatabaseUnavailableException, DatabaseNotFoundException,
+ RemoteUnavailableException, DatabaseMalformedException, MetadataServiceException, SQLException,
+ AccessNotFoundException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_1_ID))
.thenReturn(USER_1_DTO);
@@ -261,13 +263,13 @@ public class AccessEndpointUnitTest extends BaseTest {
RemoteUnavailableException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_4_ID))
.thenReturn(USER_4_DTO);
/* test */
- assertThrows(NotAllowedException.class, () -> {
+ assertThrows(AccessNotFoundException.class, () -> {
accessEndpoint.revoke(DATABASE_1_ID, USER_4_ID);
});
}
@@ -290,7 +292,7 @@ public class AccessEndpointUnitTest extends BaseTest {
/* mock */
doThrow(DatabaseNotFoundException.class)
.when(credentialService)
- .getDatabase(DATABASE_1_ID);
+ .getDatabase(DATABASE_1_ID, true);
/* test */
assertThrows(DatabaseNotFoundException.class, () -> {
@@ -304,7 +306,7 @@ public class AccessEndpointUnitTest extends BaseTest {
UserNotFoundException, MetadataServiceException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
doThrow(UserNotFoundException.class)
.when(credentialService)
@@ -322,7 +324,7 @@ public class AccessEndpointUnitTest extends BaseTest {
UserNotFoundException, MetadataServiceException, SQLException, DatabaseMalformedException {
/* mock */
- when(credentialService.getDatabase(DATABASE_1_ID))
+ when(credentialService.getDatabase(DATABASE_1_ID, true))
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(credentialService.getUser(USER_1_ID))
.thenReturn(USER_1_DTO);
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/GrantEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/GrantEndpointUnitTest.java
index f1a5258d4791772308b277be8d878f32cdf1ba02..5eb3051176264762371797092e73b80484289f2e 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/GrantEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/GrantEndpointUnitTest.java
@@ -47,7 +47,7 @@ public class GrantEndpointUnitTest extends BaseTest {
@WithMockUser(username = USER_1_USERNAME)
public void find_succeeds() throws UserNotFoundException, DatabaseUnavailableException, NotAllowedException,
DatabaseNotFoundException, RemoteUnavailableException, MetadataServiceException,
- DatabaseMalformedException, SQLException {
+ DatabaseMalformedException, SQLException, AccessNotFoundException {
/* mock */
when(cacheService.getDatabase(DATABASE_1_ID))
@@ -72,7 +72,7 @@ public class GrantEndpointUnitTest extends BaseTest {
@WithMockUser(username = USER_1_USERNAME)
public void find_own_succeeds() throws UserNotFoundException, DatabaseUnavailableException, NotAllowedException,
DatabaseNotFoundException, RemoteUnavailableException, MetadataServiceException,
- DatabaseMalformedException, SQLException {
+ DatabaseMalformedException, SQLException, AccessNotFoundException {
/* mock */
when(cacheService.getDatabase(DATABASE_2_ID))
@@ -97,7 +97,7 @@ public class GrantEndpointUnitTest extends BaseTest {
@WithMockUser(username = USER_1_USERNAME)
public void find_head_succeeds() throws UserNotFoundException, DatabaseUnavailableException, NotAllowedException,
DatabaseNotFoundException, RemoteUnavailableException, MetadataServiceException,
- DatabaseMalformedException, SQLException {
+ DatabaseMalformedException, SQLException, AccessNotFoundException {
/* mock */
when(cacheService.getDatabase(DATABASE_1_ID))
@@ -133,4 +133,23 @@ public class GrantEndpointUnitTest extends BaseTest {
});
}
+ @Test
+ @WithMockUser(username = USER_1_USERNAME)
+ public void find_foreign_fails() throws UserNotFoundException, DatabaseNotFoundException,
+ RemoteUnavailableException, MetadataServiceException {
+
+ /* mock */
+ when(cacheService.getDatabase(any(UUID.class)))
+ .thenReturn(DATABASE_1_PRIVILEGED_DTO);
+ when(cacheService.getUser(USER_4_ID))
+ .thenReturn(USER_4_DTO);
+ when(cacheService.getUser(USER_1_ID))
+ .thenReturn(USER_1_DTO);
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ grantEndpoint.find(DATABASE_1_ID, USER_4_ID, USER_2_PRINCIPAL, httpServletRequest);
+ });
+ }
+
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/SubsetEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/SubsetEndpointUnitTest.java
index 3a0db90a6d07146101a369c8e12a17aee36ef457..8cb8d464eebb7224eff9e86d7a90c20d75896850 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/SubsetEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/SubsetEndpointUnitTest.java
@@ -294,7 +294,7 @@ public class SubsetEndpointUnitTest extends BaseTest {
StorageNotFoundException, DatabaseUnavailableException, StorageUnavailableException, SQLException,
QueryMalformedException, QueryNotFoundException, DatabaseNotFoundException, RemoteUnavailableException,
MetadataServiceException, TableNotFoundException, ViewMalformedException, ViewNotFoundException,
- ImageNotFoundException, FormatNotAvailableException {
+ ImageNotFoundException, FormatNotAvailableException, ColumnNotFoundException {
final Dataset<Row> mock = sparkSession.emptyDataFrame();
/* mock */
@@ -326,7 +326,7 @@ public class SubsetEndpointUnitTest extends BaseTest {
PaginationException, StorageNotFoundException, DatabaseUnavailableException, StorageUnavailableException,
QueryMalformedException, QueryNotFoundException, DatabaseNotFoundException, RemoteUnavailableException,
SQLException, MetadataServiceException, TableNotFoundException, ViewMalformedException,
- ViewNotFoundException, ImageNotFoundException, FormatNotAvailableException {
+ ViewNotFoundException, ImageNotFoundException, FormatNotAvailableException, ColumnNotFoundException {
final Dataset<Row> mock = sparkSession.emptyDataFrame();
/* mock */
@@ -378,7 +378,7 @@ public class SubsetEndpointUnitTest extends BaseTest {
TableMalformedException, NotAllowedException, SQLException, QueryNotFoundException, PaginationException,
DatabaseUnavailableException, StorageUnavailableException, QueryMalformedException,
QueryNotSupportedException, StorageNotFoundException, TableNotFoundException, ViewMalformedException,
- ViewNotFoundException, ImageNotFoundException, FormatNotAvailableException {
+ ViewNotFoundException, ImageNotFoundException, FormatNotAvailableException, ColumnNotFoundException {
final Dataset<Row> mock = sparkSession.emptyDataFrame();
/* mock */
@@ -408,7 +408,7 @@ public class SubsetEndpointUnitTest extends BaseTest {
NotAllowedException, SQLException, QueryNotFoundException, DatabaseUnavailableException,
StorageUnavailableException, QueryMalformedException, QueryNotSupportedException, PaginationException,
StorageNotFoundException, TableNotFoundException, ViewMalformedException, ViewNotFoundException,
- ImageNotFoundException, FormatNotAvailableException {
+ ImageNotFoundException, FormatNotAvailableException, ColumnNotFoundException {
final Dataset<Row> mock = sparkSession.emptyDataFrame();
/* mock */
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/ViewEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/ViewEndpointUnitTest.java
index 9ce9d1aded8056dd53f26f644bc4195084361513..3a36dc1870939d27b6fc8e0a09b65f374ac2a1d5 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/ViewEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoint/ViewEndpointUnitTest.java
@@ -63,7 +63,7 @@ public class ViewEndpointUnitTest extends BaseTest {
@WithMockUser(username = USER_LOCAL_ADMIN_USERNAME, authorities = {"system"})
public void create_succeeds() throws DatabaseNotFoundException, RemoteUnavailableException, ViewMalformedException,
SQLException, DatabaseUnavailableException, MetadataServiceException, TableNotFoundException,
- ImageNotFoundException, QueryMalformedException, ViewNotFoundException {
+ ImageNotFoundException, QueryMalformedException, ViewNotFoundException, ColumnNotFoundException {
/* mock */
when(credentialService.getDatabase(DATABASE_1_ID, true))
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceIntegrationTest.java
index 7c7617b6aa3339b31855cbf1082e0fedaf6ee079..192eb52a18b6329ba52663d2a67c359a0539dcf1 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceIntegrationTest.java
@@ -18,8 +18,10 @@ import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.sql.SQLException;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Set;
+import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.jupiter.api.Assertions.*;
@Slf4j
@@ -51,10 +53,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.create(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO, AccessTypeDto.READ);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- for (String privilege : grantDefaultRead.split(",")) {
- assertTrue(privileges.stream().anyMatch(p -> p.trim().equals(privilege.trim())));
- }
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(Arrays.stream(grantDefaultWrite.split(",")).map(String::trim).toArray(), privileges.toArray());
}
@Test
@@ -62,10 +62,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.create(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO, AccessTypeDto.WRITE_OWN);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- for (String privilege : grantDefaultWrite.split(",")) {
- assertTrue(privileges.stream().anyMatch(p -> p.trim().equals(privilege.trim())));
- }
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(Arrays.stream(grantDefaultWrite.split(",")).map(String::trim).toArray(), privileges.toArray());
}
@Test
@@ -73,10 +71,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.create(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO, AccessTypeDto.WRITE_ALL);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- for (String privilege : grantDefaultWrite.split(",")) {
- assertTrue(privileges.stream().anyMatch(p -> p.trim().equals(privilege.trim())));
- }
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(Arrays.stream(grantDefaultWrite.split(",")).map(String::trim).toArray(), privileges.toArray());
}
@Test
@@ -84,10 +80,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.update(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO, AccessTypeDto.READ);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- for (String privilege : grantDefaultRead.split(",")) {
- assertTrue(privileges.stream().anyMatch(p -> p.trim().equals(privilege.trim())));
- }
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(Arrays.stream(grantDefaultWrite.split(",")).map(String::trim).toArray(), privileges.toArray());
}
@Test
@@ -95,10 +89,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.update(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO, AccessTypeDto.WRITE_OWN);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- for (String privilege : grantDefaultWrite.split(",")) {
- assertTrue(privileges.stream().anyMatch(p -> p.trim().equals(privilege.trim())));
- }
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(Arrays.stream(grantDefaultWrite.split(",")).map(String::trim).toArray(), privileges.toArray());
}
@Test
@@ -106,10 +98,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.update(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO, AccessTypeDto.WRITE_ALL);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- for (String privilege : grantDefaultWrite.split(",")) {
- assertTrue(privileges.stream().anyMatch(p -> p.trim().equals(privilege.trim())));
- }
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(Arrays.stream(grantDefaultWrite.split(",")).map(String::trim).toArray(), privileges.toArray());
}
@Test
@@ -126,9 +116,8 @@ public class AccessServiceIntegrationTest extends BaseTest {
/* test */
accessService.delete(DATABASE_1_PRIVILEGED_DTO, USER_1_DTO);
- final List<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
- assertEquals(1, privileges.size());
- assertEquals("USAGE", privileges.get(0));
+ final Set<String> privileges = MariaDbConfig.getPrivileges(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ containsInAnyOrder(new String[]{"USAGE"}, privileges.toArray());
}
@Test
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/GrantServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/GrantServiceIntegrationTest.java
index 31a2f3b7c8e927053fb0320fd4115a7b847aa921..868bb20402cf6627fcc3113bab210e59d8b3c7bc 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/GrantServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/GrantServiceIntegrationTest.java
@@ -4,6 +4,7 @@ import at.ac.tuwien.ifs.dbrepo.config.MariaDbConfig;
import at.ac.tuwien.ifs.dbrepo.config.MariaDbContainerConfig;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseGrantsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.GrantTypeDto;
+import at.ac.tuwien.ifs.dbrepo.core.exception.AccessNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.DatabaseMalformedException;
import at.ac.tuwien.ifs.dbrepo.core.test.BaseTest;
import lombok.extern.slf4j.Slf4j;
@@ -47,12 +48,15 @@ public class GrantServiceIntegrationTest extends BaseTest {
@BeforeEach
public void beforeEach() throws SQLException {
MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNAL_NAME);
+ MariaDbConfig.dropDatabase(CONTAINER_4_PRIVILEGED_DTO, DATABASE_4_INTERNAL_NAME);
MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
+ MariaDbConfig.createInitDatabase(DATABASE_4_PRIVILEGED_DTO);
MariaDbConfig.revokeAccess(DATABASE_1_PRIVILEGED_DTO, USER_1_USERNAME);
+ MariaDbConfig.revokeAccess(DATABASE_4_PRIVILEGED_DTO, USER_4_USERNAME);
}
@Test
- public void find_read_succeeds() throws SQLException, DatabaseMalformedException {
+ public void find_read_succeeds() throws SQLException, DatabaseMalformedException, AccessNotFoundException {
/* mock */
MariaDbConfig.grantAccess(DATABASE_1_PRIVILEGED_DTO, grantDefaultRead, USER_1_USERNAME);
@@ -65,7 +69,20 @@ public class GrantServiceIntegrationTest extends BaseTest {
}
@Test
- public void find_write_succeeds() throws SQLException, DatabaseMalformedException {
+ public void find_read2_succeeds() throws SQLException, DatabaseMalformedException, AccessNotFoundException {
+
+ /* mock */
+ MariaDbConfig.grantAccess(DATABASE_4_PRIVILEGED_DTO, grantDefaultRead, USER_4_USERNAME);
+
+ /* test */
+ final DatabaseGrantsDto response = grantService.find(DATABASE_4_PRIVILEGED_DTO, USER_4_DTO);
+ assertNotNull(response);
+ assertEquals(GrantTypeDto.READ, response.getType());
+ assertEquals(Arrays.stream(grantDefaultRead.split(",")).map(String::trim).map(String::toUpperCase).collect(Collectors.toSet()), response.getGrants());
+ }
+
+ @Test
+ public void find_write_succeeds() throws SQLException, DatabaseMalformedException, AccessNotFoundException {
/* mock */
MariaDbConfig.grantAccess(DATABASE_1_PRIVILEGED_DTO, grantDefaultWrite, USER_1_USERNAME);
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/SubsetServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/SubsetServiceIntegrationTest.java
index 58fe62bae6981fd398ab746ec5a0f014c6782007..51ba93195fae7b563f738864b6e9249841d25c99 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/SubsetServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/SubsetServiceIntegrationTest.java
@@ -1,12 +1,12 @@
package at.ac.tuwien.ifs.dbrepo.service;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.query.*;
-import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierBriefDto;
import at.ac.tuwien.ifs.dbrepo.config.MariaDbConfig;
import at.ac.tuwien.ifs.dbrepo.config.MariaDbContainerConfig;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.query.*;
+import at.ac.tuwien.ifs.dbrepo.core.api.identifier.IdentifierBriefDto;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.gateway.MetadataServiceGateway;
import at.ac.tuwien.ifs.dbrepo.core.test.BaseTest;
+import at.ac.tuwien.ifs.dbrepo.gateway.MetadataServiceGateway;
import lombok.extern.slf4j.Slf4j;
import org.apache.spark.sql.Dataset;
import org.apache.spark.sql.Row;
@@ -66,7 +66,7 @@ public class SubsetServiceIntegrationTest extends BaseTest {
}
@Test
- public void findAll_succeeds() throws SQLException, QueryNotFoundException,
+ public void findAll_succeeds() throws SQLException, QueryNotFoundException,
RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException,
UserNotFoundException {
@@ -78,7 +78,7 @@ public class SubsetServiceIntegrationTest extends BaseTest {
}
@Test
- public void findAll_onlyPersisted_succeeds() throws SQLException, QueryNotFoundException,
+ public void findAll_onlyPersisted_succeeds() throws SQLException, QueryNotFoundException,
RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException,
UserNotFoundException {
@@ -244,7 +244,8 @@ public class SubsetServiceIntegrationTest extends BaseTest {
@Test
public void create_succeeds() throws SQLException, QueryStoreInsertException, ViewMalformedException,
- TableNotFoundException, QueryMalformedException, ImageNotFoundException, ViewNotFoundException {
+ TableNotFoundException, QueryMalformedException, ImageNotFoundException, ViewNotFoundException,
+ ColumnNotFoundException {
/* test */
final UUID response = subsetService.create(DATABASE_1_PRIVILEGED_DTO, QUERY_1_SUBSET_DTO, QUERY_1_CREATED, USER_1_ID);
@@ -255,7 +256,7 @@ public class SubsetServiceIntegrationTest extends BaseTest {
@MethodSource("create_arguments")
public void create_illegalQuery_succeeds(String name, String injection) throws TableNotFoundException,
QueryStoreInsertException, ViewMalformedException, SQLException, QueryMalformedException,
- ImageNotFoundException, ViewNotFoundException {
+ ImageNotFoundException, ViewNotFoundException, ColumnNotFoundException {
final SubsetDto request = SubsetDto.builder()
.datasourceId(TABLE_1_ID)
.datasourceType(DatasourceType.TABLE)
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index 4e2d36d39c82a8aecc1f955dabaa168aba63b642..a275cc88b58c93240e6659528208cdc305e0a46a 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>data-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>services</name>
<artifactId>services</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>querystore</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MariaDbMapper.java
index dacc5537079e1973c7219869ddd7108b1adfcea6..fd5ac582f5305d9532703bde1daacf6311137277 100644
--- a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/mapper/MariaDbMapper.java
@@ -2,11 +2,9 @@ package at.ac.tuwien.ifs.dbrepo.mapper;
import at.ac.tuwien.ifs.dbrepo.core.api.container.image.OperatorDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.ViewColumnDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.ViewDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.query.FilterDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.query.FilterTypeDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.query.OrderDto;
-import at.ac.tuwien.ifs.dbrepo.core.api.database.query.SubsetDto;
+import at.ac.tuwien.ifs.dbrepo.core.api.database.query.*;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TableDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TupleDeleteDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.table.TupleDto;
@@ -91,7 +89,7 @@ public interface MariaDbMapper {
log.debug("no grants were found in the result set");
}
final Map<String, Set<String>> map = new HashMap<>();
- final Pattern databasePattern = Pattern.compile("ON `?([a-zA-Z0-9*]+)`?");
+ final Pattern databasePattern = Pattern.compile("ON `?([a-zA-Z0-9*_]+)`?");
final Matcher databaseMatcher = databasePattern.matcher(resultSet.getString(1));
if (databaseMatcher.find()) {
final String databaseName = databaseMatcher.group(1)
@@ -121,18 +119,22 @@ public interface MariaDbMapper {
return statement.toString();
}
- default String databaseGrantPrivilegesQuery(String username, String grants) {
+ default String databaseGrantPrivilegesQuery(String database, String username, String grants) {
final StringBuilder statement = new StringBuilder("GRANT ")
.append(grants)
- .append(" ON *.* TO `")
+ .append(" ON `")
+ .append(database)
+ .append("`.* TO `")
.append(username)
.append("`@`%`;");
log.trace("mapped grant privileges statement: {}", statement);
return statement.toString();
}
- default String databaseRevokePrivilegesQuery(String username) {
- final StringBuilder statement = new StringBuilder("REVOKE ALL PRIVILEGES ON *.* FROM `")
+ default String databaseRevokePrivilegesQuery(String database, String username) {
+ final StringBuilder statement = new StringBuilder("REVOKE ALL PRIVILEGES ON `")
+ .append(database)
+ .append("`.* FROM `")
.append(username)
.append("`@`%`;");
log.trace("mapped revoke privileges statement: {}", statement);
@@ -858,7 +860,7 @@ public interface MariaDbMapper {
}
default SelectConditionStep<Record> subsetDtoToSelectConditions(SelectJoinStep<Record> step, DatabaseDto database,
- SubsetDto data) throws TableNotFoundException,
+ SubsetDto data) throws ColumnNotFoundException,
ImageNotFoundException {
if (data.getFilter() == null || data.getFilter().isEmpty()) {
return step.where();
@@ -867,14 +869,14 @@ public interface MariaDbMapper {
FilterTypeDto next = null;
for (int i = 0; i < data.getFilter().size(); i++) {
final FilterDto filter = data.getFilter().get(i);
- final ColumnDto column = columnIdToColumnDto(database, filter.getColumnId());
+ final String columnName = columnIdToColumnName(database, data.getDatasourceType(), filter.getColumnId());
if (i == 0) {
- conditions = step.where(filterDtoToCondition(database, column, filter));
+ conditions = step.where(filterDtoToCondition(database, columnName, filter));
} else if (next != null) {
if (next.equals(FilterTypeDto.OR)) {
- conditions = conditions.or(filterDtoToCondition(database, column, filter));
+ conditions = conditions.or(filterDtoToCondition(database, columnName, filter));
} else if (next.equals(FilterTypeDto.AND)) {
- conditions = conditions.and(filterDtoToCondition(database, column, filter));
+ conditions = conditions.and(filterDtoToCondition(database, columnName, filter));
}
}
next = filter.getType();
@@ -882,63 +884,72 @@ public interface MariaDbMapper {
return conditions;
}
- default Condition filterDtoToCondition(DatabaseDto database, ColumnDto column, FilterDto data)
+ default String columnIdToColumnName(DatabaseDto database, DatasourceType type, UUID columnId) throws ColumnNotFoundException {
+ return switch (type) {
+ case VIEW -> columnIdToViewColumnDto(database, columnId)
+ .getInternalName();
+ case TABLE -> columnIdToColumnDto(database, columnId)
+ .getInternalName();
+ };
+ }
+
+ default Condition filterDtoToCondition(DatabaseDto database, String columnName, FilterDto data)
throws ImageNotFoundException {
final String operator = operatorIdToOperatorDto(database, data.getOperatorId()).getValue();
switch (operator) {
case "=":
case "<=>":
- return field(name(column.getInternalName())).eq(data.getValue());
+ return field(name(columnName)).eq(data.getValue());
case "<":
- return field(name(column.getInternalName())).lt(data.getValue());
+ return field(name(columnName)).lt(data.getValue());
case "<=":
- return field(name(column.getInternalName())).le(data.getValue());
+ return field(name(columnName)).le(data.getValue());
case ">":
- return field(name(column.getInternalName())).gt(data.getValue());
+ return field(name(columnName)).gt(data.getValue());
case ">=":
- return field(name(column.getInternalName())).ge(data.getValue());
+ return field(name(columnName)).ge(data.getValue());
case "!=":
- return field(name(column.getInternalName())).ne(data.getValue());
+ return field(name(columnName)).ne(data.getValue());
case "LIKE":
- return field(name(column.getInternalName())).like(data.getValue());
+ return field(name(columnName)).like(data.getValue());
case "NOT LIKE":
- return field(name(column.getInternalName())).notLike(data.getValue());
+ return field(name(columnName)).notLike(data.getValue());
case "IN":
- return field(name(column.getInternalName())).in(data.getValue());
+ return field(name(columnName)).in(data.getValue());
case "NOT IN":
- return field(name(column.getInternalName())).notIn(data.getValue());
+ return field(name(columnName)).notIn(data.getValue());
case "IS NOT NULL":
- return field(name(column.getInternalName())).isNotNull();
+ return field(name(columnName)).isNotNull();
case "IS NULL":
- return field(name(column.getInternalName())).isNull();
+ return field(name(columnName)).isNull();
case "REGEXP":
- return field(name(column.getInternalName())).likeRegex(data.getValue());
+ return field(name(columnName)).likeRegex(data.getValue());
case "NOT REGEXP":
- return field(name(column.getInternalName())).notLikeRegex(data.getValue());
+ return field(name(columnName)).notLikeRegex(data.getValue());
}
log.error("Failed to map operator: {}", operator);
throw new IllegalArgumentException("Failed to map operator: " + operator);
}
default SelectSeekStepN<Record> subsetDtoToSelectOrder(SelectConditionStep<Record> step, DatabaseDto database,
- SubsetDto data) throws TableNotFoundException {
+ SubsetDto data) throws ColumnNotFoundException {
final List<OrderField<Object>> sort = new LinkedList<>();
for (OrderDto order : data.getOrder()) {
- final ColumnDto column = columnIdToColumnDto(database, order.getColumnId());
+ final String columnName = columnIdToColumnName(database, data.getDatasourceType(), order.getColumnId());
if (order.getDirection() == null) {
- sort.add(field(name(column.getInternalName())));
+ sort.add(field(name(columnName)));
continue;
}
switch (order.getDirection()) {
- case ASC -> sort.add(field(name(column.getInternalName())).asc());
- case DESC -> sort.add(field(name(column.getInternalName())).desc());
+ case ASC -> sort.add(field(name(columnName)).asc());
+ case DESC -> sort.add(field(name(columnName)).desc());
}
}
return step.orderBy(sort);
}
default String subsetDtoToRawQuery(DSLContext context, DatabaseDto database, SubsetDto data)
- throws TableNotFoundException, ImageNotFoundException, ViewNotFoundException {
+ throws TableNotFoundException, ImageNotFoundException, ViewNotFoundException, ColumnNotFoundException {
final String datasourceName;
final List<Field<Object>> columns = switch (data.getDatasourceType()) {
case TABLE -> {
@@ -960,6 +971,7 @@ public interface MariaDbMapper {
.toList();
}
};
+ log.debug("datasource is of type {} and has name: {}", data.getDatasourceType(), datasourceName);
final SelectJoinStep<Record> query = context.select(columns)
.from(name(datasourceName));
final SelectConditionStep<Record> where = subsetDtoToSelectConditions(query, database, data);
@@ -980,13 +992,32 @@ public interface MariaDbMapper {
.filter(c -> c.getId().equals(columnId))
.findFirst();
if (optional.isEmpty()) {
- log.error("Failed to find filtered column with id: {}", columnId);
- throw new TableNotFoundException("Failed to find filtered column");
+ log.error("Failed to find filtered column: {}", columnId);
+ throw new TableNotFoundException("Failed to find filtered column: " + columnId);
}
return optional.get();
}
- default ColumnDto columnIdToColumnDto(DatabaseDto database, UUID columnId) throws TableNotFoundException {
+ default ViewColumnDto columnIdToViewColumnDto(DatabaseDto database, UUID columnId) throws ColumnNotFoundException {
+ if (columnId == null) {
+ return null;
+ }
+ final Optional<ViewColumnDto> optional = database.getViews()
+ .stream()
+ .map(ViewDto::getColumns)
+ .flatMap(List::stream)
+ .filter(column -> column.getId().equals(columnId))
+ .findFirst();
+ if (optional.isEmpty()) {
+ log.error("Failed to find column: {}", columnId);
+ throw new ColumnNotFoundException("Failed to find column: " + columnId);
+ }
+ final ViewColumnDto column = optional.get();
+ log.trace("mapped column id {} to view column: {}", columnId, column.getInternalName());
+ return column;
+ }
+
+ default ColumnDto columnIdToColumnDto(DatabaseDto database, UUID columnId) throws ColumnNotFoundException {
if (columnId == null) {
return null;
}
@@ -998,9 +1029,11 @@ public interface MariaDbMapper {
.findFirst();
if (optional.isEmpty()) {
log.error("Failed to find column: {}", columnId);
- throw new TableNotFoundException("Failed to find column");
+ throw new ColumnNotFoundException("Failed to find column: " + columnId);
}
- return optional.get();
+ final ColumnDto column = optional.get();
+ log.trace("mapped column id {} to column: {}", columnId, column.getInternalName());
+ return column;
}
default OperatorDto operatorIdToOperatorDto(DatabaseDto database, UUID operatorId) throws ImageNotFoundException {
@@ -1011,8 +1044,8 @@ public interface MariaDbMapper {
.filter(op -> op.getId().equals(operatorId))
.findFirst();
if (optional.isEmpty()) {
- log.error("Failed to find operator with id: {}", operatorId);
- throw new ImageNotFoundException("Failed to find operator");
+ log.error("Failed to find operator: {}", operatorId);
+ throw new ImageNotFoundException("Failed to find operator: " + operatorId);
}
return optional.get();
}
@@ -1023,9 +1056,9 @@ public interface MariaDbMapper {
.filter(t -> t.getId().equals(tableId))
.findFirst();
if (optional.isEmpty()) {
- log.error("Failed to find table with id: {}", tableId);
+ log.error("Failed to find table: {}", tableId);
log.trace("known table ids: {}", database.getTables().stream().map(TableDto::getId).collect(Collectors.toList()));
- throw new TableNotFoundException("Failed to find table id: " + tableId);
+ throw new TableNotFoundException("Failed to find table: " + tableId);
}
return optional.get();
}
@@ -1036,9 +1069,9 @@ public interface MariaDbMapper {
.filter(v -> v.getId().equals(viewId))
.findFirst();
if (optional.isEmpty()) {
- log.error("Failed to find view with id: {}", viewId);
+ log.error("Failed to find view: {}", viewId);
log.trace("known view ids: {}", database.getViews().stream().map(ViewDto::getId).collect(Collectors.toList()));
- throw new ViewNotFoundException("Failed to find view id: " + viewId);
+ throw new ViewNotFoundException("Failed to find view: " + viewId);
}
return optional.get();
}
diff --git a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/GrantService.java b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/GrantService.java
index 3abce1daf88b462ecd58c406b69c49d78c4aa499..a7ed48ae134c69638e6fadb7c39b59afeb542aa2 100644
--- a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/GrantService.java
+++ b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/GrantService.java
@@ -3,6 +3,7 @@ package at.ac.tuwien.ifs.dbrepo.service;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseGrantsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.core.exception.AccessNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.DatabaseMalformedException;
import java.sql.SQLException;
@@ -15,10 +16,12 @@ public interface GrantService {
* @param database The database.
* @param user The user.
* @return The database access grants.
+ * @throws AccessNotFoundException The database access was not found.
* @throws SQLException The connection to the database could not be established.
* @throws DatabaseMalformedException The database schema is malformed.
*/
- DatabaseGrantsDto find(DatabaseDto database, UserDto user) throws SQLException, DatabaseMalformedException;
+ DatabaseGrantsDto find(DatabaseDto database, UserDto user) throws SQLException, DatabaseMalformedException,
+ AccessNotFoundException;
Map<String, DatabaseGrantsDto> findAll(DatabaseDto database, UserDto user) throws SQLException, DatabaseMalformedException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/SubsetService.java b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/SubsetService.java
index a7ee9b1ca08d2c3389efad0d07f9959bfaa5fb7c..ebbfc74acc35f0fcb866f68c7728b1269a305b41 100644
--- a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/SubsetService.java
+++ b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/SubsetService.java
@@ -26,7 +26,7 @@ public interface SubsetService {
* @throws SQLException The connection to the database could not be established.
*/
UUID create(DatabaseDto database, SubsetDto subset, Instant timestamp, UUID userId)
- throws QueryStoreInsertException, SQLException, QueryMalformedException, TableNotFoundException, ImageNotFoundException, ViewMalformedException, ViewNotFoundException;
+ throws QueryStoreInsertException, SQLException, QueryMalformedException, TableNotFoundException, ImageNotFoundException, ViewMalformedException, ViewNotFoundException, ColumnNotFoundException;
/**
* Counts the subset row count of a query of a given subset in the given database.
diff --git a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceMariaDbImpl.java
index ac7caf16d4e21c4380a3f77f1b2149fa7d5d560b..fca3f2f344e5861854f146b2e5355473dd3a4c3f 100644
--- a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceMariaDbImpl.java
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.SQLException;
@Slf4j
@@ -51,7 +52,7 @@ public class AccessServiceMariaDbImpl extends DataConnector implements AccessSer
/* grant access */
final String grants = access != AccessTypeDto.READ ? grantDefaultWrite : grantDefaultRead;
start = System.currentTimeMillis();
- connection.prepareStatement(mariaDbMapper.databaseGrantPrivilegesQuery(user.getUsername(), grants))
+ connection.prepareStatement(mariaDbMapper.databaseGrantPrivilegesQuery(database.getInternalName(), user.getUsername(), grants))
.execute();
log.atDebug()
.setMessage("grant user privileges in database: " + database.getInternalName())
@@ -96,7 +97,7 @@ public class AccessServiceMariaDbImpl extends DataConnector implements AccessSer
/* grant access */
final String grants = access != AccessTypeDto.READ ? grantDefaultWrite : grantDefaultRead;
final long start = System.currentTimeMillis();
- connection.prepareStatement(mariaDbMapper.databaseGrantPrivilegesQuery(user.getUsername(), grants))
+ connection.prepareStatement(mariaDbMapper.databaseGrantPrivilegesQuery(database.getInternalName(), user.getUsername(), grants))
.execute();
log.atDebug()
.setMessage("update privileges in database: " + database.getInternalName())
@@ -124,7 +125,7 @@ public class AccessServiceMariaDbImpl extends DataConnector implements AccessSer
try {
/* revoke access */
long start = System.currentTimeMillis();
- connection.prepareStatement(mariaDbMapper.databaseRevokePrivilegesQuery(user.getUsername()))
+ connection.prepareStatement(mariaDbMapper.databaseRevokePrivilegesQuery(database.getInternalName(), user.getUsername()))
.execute();
log.atDebug()
.setMessage("revoke privileges in database: " + database.getInternalName())
diff --git a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/GrantServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/GrantServiceMariaDbImpl.java
index 476628658f6821f4950de23d7ed6a0c2c955e0a3..0e1b95e6f1a3fc826f41286ab881ad3adad6d29e 100644
--- a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/GrantServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/GrantServiceMariaDbImpl.java
@@ -3,6 +3,7 @@ package at.ac.tuwien.ifs.dbrepo.service.impl;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseDto;
import at.ac.tuwien.ifs.dbrepo.core.api.database.DatabaseGrantsDto;
import at.ac.tuwien.ifs.dbrepo.core.api.user.UserDto;
+import at.ac.tuwien.ifs.dbrepo.core.exception.AccessNotFoundException;
import at.ac.tuwien.ifs.dbrepo.core.exception.DatabaseMalformedException;
import at.ac.tuwien.ifs.dbrepo.core.i18n.Constants;
import at.ac.tuwien.ifs.dbrepo.core.mapper.MetadataMapper;
@@ -41,18 +42,23 @@ public class GrantServiceMariaDbImpl extends DataConnector implements GrantServi
}
@Override
- public DatabaseGrantsDto find(DatabaseDto database, UserDto user) throws SQLException, DatabaseMalformedException {
+ public DatabaseGrantsDto find(DatabaseDto database, UserDto user) throws SQLException, DatabaseMalformedException,
+ AccessNotFoundException {
final Map<String, DatabaseGrantsDto> grants = findAll(database, user);
- if (!grants.containsKey(database.getInternalName())) {
- log.atError()
- .setMessage("Failed to find access grant(s) for database: " + database.getInternalName())
- .addKeyValue("user_id", user.getId())
- .addKeyValue("database_id", database.getId())
- .log();
- /* there must be at least 1 grant otherwise the user does not exist in the database which indicates malformed */
- throw new DatabaseMalformedException("Failed to find access grant(s) for database: " + database.getInternalName());
+ String key = database.getInternalName();
+ if (!grants.containsKey(key)) {
+ key = "*";
+ if (!grants.containsKey(key)) {
+ log.atError()
+ .setMessage("Failed to find access grant(s) for database: " + database.getInternalName() + " or fallback key *")
+ .addKeyValue("user_id", user.getId())
+ .addKeyValue("database_id", database.getId())
+ .log();
+ /* there must be at least 1 grant otherwise the user does not exist in the database which indicates malformed */
+ throw new AccessNotFoundException("Failed to find access grant(s) for database: " + database.getInternalName() + " or fallback key *");
+ }
}
- final DatabaseGrantsDto grant = grants.get(database.getInternalName());
+ final DatabaseGrantsDto grant = grants.get(key);
log.debug("found grant: {}", grant);
return grant;
}
@@ -70,7 +76,7 @@ public class GrantServiceMariaDbImpl extends DataConnector implements GrantServi
log.trace("1={}", user.getUsername());
final ResultSet resultSet = statement.executeQuery();
log.atDebug()
- .setMessage("successfully found grants")
+ .setMessage("found user " + user.getUsername() + " grant(s) in database(s): " + grants.keySet())
.addKeyValue(Constants.DURATION, System.currentTimeMillis() - start)
.addKeyValue(Constants.ACTION, "list_grants")
.log();
diff --git a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/SubsetServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/SubsetServiceMariaDbImpl.java
index 5caad3db34b61c815a09561486ae845e22e92db6..827b73917d1dba36c41d1dcce70b60758a15006f 100644
--- a/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/SubsetServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/SubsetServiceMariaDbImpl.java
@@ -82,7 +82,7 @@ public class SubsetServiceMariaDbImpl extends DataConnector implements SubsetSer
@Override
public UUID create(DatabaseDto database, SubsetDto subset, Instant timestamp, UUID userId)
throws QueryStoreInsertException, SQLException, QueryMalformedException, TableNotFoundException,
- ImageNotFoundException, ViewMalformedException, ViewNotFoundException {
+ ImageNotFoundException, ViewMalformedException, ViewNotFoundException, ColumnNotFoundException {
final String statement = mariaDbMapper.subsetDtoToRawQuery(context, database, subset);
return storeQuery(database, statement, timestamp, userId);
}
diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index 0fcec7824a6e1f024c5e0cc6e2f0362f8312d84e..9f989dae656d0212e6028f991263ba7dff3250b7 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -14,6 +14,15 @@ server {
listen 8080 default_server;
server_name _;
+ location /admin/ {
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Host $host;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://auth-service:8080/;
+ proxy_read_timeout 90;
+ }
+
location /dashboard/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index 2e7051933bfa3bf1c4df7f2474800a0b29fa5a6f..30f4f3a5bcd7e3d2befb047d39791bc2e45524ce 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>metadata-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>oai</name>
<artifactId>oai</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index 0552aa9883fd74521b3fcb7ef2b1afd4c13e0fac..fd3a652a59027396d7d87762c1056176a28e9987 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -18,7 +18,7 @@
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>metadata-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<packaging>pom</packaging>
<modules>
@@ -69,7 +69,7 @@
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>dbrepo-core</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
<!-- Data Source -->
<dependency>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index 55f33ff3e3792685f26dc987890b39f19f4aa2c2..a2d423fde5b05480b442d89efa692b5a7153912f 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -6,23 +6,23 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>metadata-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>report</name>
<artifactId>report</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>rest-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>services</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index d7c45b2898bb84baeef2adac49daa1e6b584ad01..8a85b25c060689de1b99653aed3a530361e948c8 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>metadata-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>repositories</name>
<artifactId>repositories</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>oai</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index 992395d34ead6c2e5491bf7db4d60042e7119a3c..c9532ad05d294b58d7b0b5c3481b653fe0812869 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>metadata-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>rest-service</name>
<artifactId>rest-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>services</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java
index 485967e56814ee0b5449e1faa95c7fc2ab21eef6..430b445be7c74de38eff5795d1c28f280408c3eb 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/DatabaseEndpoint.java
@@ -455,50 +455,6 @@ public class DatabaseEndpoint extends AbstractEndpoint {
databaseService.modifyImage(database, image))));
}
- @PutMapping("/{databaseId}/dashboard")
- @Transactional
- @PreAuthorize("hasAuthority('system')")
- @Observed(name = "dbrepo_database_dashboard")
- @Operation(summary = "Update database dashboard uid",
- description = "Updates the dashboard uid for a database with given id. Only the database owner can perform this operation. Requires role `system`.",
- security = {@SecurityRequirement(name = "bearerAuth"), @SecurityRequirement(name = "basicAuth")})
- @ApiResponses(value = {
- @ApiResponse(responseCode = "202",
- description = "Modify of dashboard uid was successful",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = DatabaseBriefDto.class))}),
- @ApiResponse(responseCode = "400",
- description = "Malformed payload",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "404",
- description = "Database could not be found",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "502",
- description = "Connection to search service failed",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))}),
- @ApiResponse(responseCode = "503",
- description = "Failed to save in search service",
- content = {@Content(
- mediaType = "application/json",
- schema = @Schema(implementation = ApiErrorDto.class))})
- })
- public ResponseEntity<DatabaseBriefDto> modifyDashboard(@NotNull @PathVariable("databaseId") UUID databaseId,
- @Valid @RequestBody DatabaseModifyDashboardDto data)
- throws DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException {
- log.debug("endpoint modify database dashboard uid, databaseId={}, data.uid={}", databaseId, data.getUid());
- final Database database = databaseService.findById(databaseId);
- return ResponseEntity.accepted()
- .body(metadataMapper.databaseDtoToDatabaseBriefDto(metadataMapper.databaseToDatabaseDto(
- databaseService.modifyDashboard(database, data.getUid()))));
- }
-
@GetMapping("/{databaseId}/image")
@Transactional
@Observed(name = "dbrepo_database_image_view")
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
index 61d64b7d2088b0afb685ea0570354c6d661ebfd9..168ff9c01e11eadc2a4f7f894f970fe43cf1da00 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpoint.java
@@ -143,7 +143,7 @@ public class ViewEndpoint extends AbstractEndpoint {
Principal principal) throws NotAllowedException,
MalformedException, DataServiceException, DataServiceConnectionException, DatabaseNotFoundException,
UserNotFoundException, SearchServiceException, SearchServiceConnectionException, TableNotFoundException,
- ImageNotFoundException, ViewExistsException, DashboardServiceException, DashboardServiceConnectionException {
+ ImageNotFoundException, ViewExistsException, DashboardServiceException, DashboardServiceConnectionException, ColumnNotFoundException {
log.debug("endpoint create view, databaseId={}, data.name={}", databaseId, data.getName());
final Database database = databaseService.findById(databaseId);
if (!database.getOwner().getId().equals(getId(principal))) {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpointUnitTest.java
index 595f20d90727e5cf5126c739d01d4c2633f7621c..b5da5c6679e6822d4b7374f80580a94fb72755f3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/endpoints/ViewEndpointUnitTest.java
@@ -64,7 +64,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"list-views"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"list-views"})
public void findAll_publicHasRole_succeeds() throws UserNotFoundException, AccessNotFoundException,
DatabaseNotFoundException {
@@ -73,7 +73,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"list-views"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"list-views"})
public void findAll_publicHasRoleHasAccess_succeeds() throws UserNotFoundException, AccessNotFoundException,
DatabaseNotFoundException {
@@ -82,7 +82,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void findAll_publicNoRole_succeeds() throws UserNotFoundException, AccessNotFoundException,
DatabaseNotFoundException {
@@ -101,7 +101,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"create-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"create-database-view"})
public void create_publicHasRole_fails() {
/* test */
@@ -111,7 +111,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"create-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"create-database-view"})
public void create_publicHasRoleHasAccess_fails() {
/* test */
@@ -121,7 +121,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void create_publicNoRole_fails() {
/* test */
@@ -135,7 +135,8 @@ public class ViewEndpointUnitTest extends BaseTest {
public void create_succeeds() throws UserNotFoundException, SearchServiceException, MalformedException,
NotAllowedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException,
SearchServiceConnectionException, DataServiceConnectionException, DashboardServiceException,
- DashboardServiceConnectionException, TableNotFoundException, ViewExistsException, ImageNotFoundException {
+ DashboardServiceConnectionException, TableNotFoundException, ViewExistsException, ImageNotFoundException,
+ ColumnNotFoundException {
/* test */
create_generic(DATABASE_1_ID, DATABASE_1, "View", USER_1_PRINCIPAL, USER_1_ID, USER_1, DATABASE_1_USER_1_WRITE_ALL_ACCESS);
@@ -161,7 +162,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"find-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"find-database-view"})
public void find_publicHasRole_succeeds() throws UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, ViewNotFoundException, NotAllowedException {
@@ -170,7 +171,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void find_publicNoRole_succeeds() throws UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, ViewNotFoundException, NotAllowedException {
@@ -179,7 +180,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void find_publicHasRoleHasAccess_succeeds() throws UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, ViewNotFoundException, NotAllowedException {
@@ -198,7 +199,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"delete-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"delete-database-view"})
public void delete_publicHasRole_fails() {
/* test */
@@ -208,7 +209,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void delete_publicNoRole_fails() {
/* test */
@@ -218,7 +219,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_3_USERNAME, authorities = {"delete-database-view"})
+ @WithMockUser(username = USER_3_USERNAME, authorities = {"delete-database-view"})
public void delete_publicOwner_succeeds() throws NotAllowedException, DataServiceException, UserNotFoundException,
DataServiceConnectionException, DatabaseNotFoundException, AccessNotFoundException, ViewNotFoundException,
SearchServiceException, SearchServiceConnectionException, DashboardServiceException,
@@ -242,7 +243,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"list-views"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"list-views"})
public void findAll_privateHasRole_succeeds() throws UserNotFoundException,
AccessNotFoundException, DatabaseNotFoundException {
@@ -251,7 +252,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"list-views"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"list-views"})
public void findAll_privateHasRoleHasAccess_succeeds() throws UserNotFoundException,
AccessNotFoundException, DatabaseNotFoundException {
@@ -260,7 +261,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void findAll_privateNoRole_succeeds() throws UserNotFoundException,
AccessNotFoundException, DatabaseNotFoundException {
@@ -279,7 +280,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"create-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"create-database-view"})
public void create_privateHasRole_fails() {
/* test */
@@ -289,7 +290,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"create-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"create-database-view"})
public void create_privateHasRoleHasAccess_fails() {
/* test */
@@ -299,7 +300,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void create_privateNoRole_fails() {
/* test */
@@ -318,7 +319,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"find-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"find-database-view"})
public void find_privateHasRole_succeeds() throws UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, ViewNotFoundException, NotAllowedException {
@@ -327,7 +328,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void find_privateNoRole_succeeds() throws UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, ViewNotFoundException, NotAllowedException {
@@ -336,7 +337,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void find_privateHasRoleHasAccess_succeeds() throws UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, ViewNotFoundException, NotAllowedException {
@@ -355,7 +356,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"delete-database-view"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"delete-database-view"})
public void delete_privateHasRole_fails() {
/* test */
@@ -365,7 +366,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME)
+ @WithMockUser(username = USER_2_USERNAME)
public void delete_privateNoRole_fails() {
/* test */
@@ -406,7 +407,7 @@ public class ViewEndpointUnitTest extends BaseTest {
}
@Test
- @WithMockUser(username =USER_2_USERNAME, authorities = {"modify-view-visibility"})
+ @WithMockUser(username = USER_2_USERNAME, authorities = {"modify-view-visibility"})
public void update_notOwner_fails() {
/* test */
@@ -460,8 +461,8 @@ public class ViewEndpointUnitTest extends BaseTest {
User user, DatabaseAccess access) throws MalformedException, DataServiceException,
DataServiceConnectionException, NotAllowedException, UserNotFoundException, DatabaseNotFoundException,
AccessNotFoundException, SearchServiceException, SearchServiceConnectionException, TableNotFoundException,
- ImageNotFoundException, ViewExistsException, DashboardServiceException,
- DashboardServiceConnectionException {
+ ImageNotFoundException, ViewExistsException, DashboardServiceException, DashboardServiceConnectionException,
+ ColumnNotFoundException {
final CreateViewDto request = CreateViewDto.builder()
.name(viewName)
.query(VIEW_1_SUBSET_DTO)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGatewayUnitTest.java
index 19e7929430b4d9b15700ef06b7d246812491fb61..fd4d9d36212a91d4825dc0182ff5eadb3cc62a33 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGatewayUnitTest.java
@@ -578,7 +578,8 @@ public class DataServiceGatewayUnitTest extends BaseTest {
}
@Test
- public void createView_succeeds() throws DataServiceException, DataServiceConnectionException {
+ public void createView_succeeds() throws DataServiceException, DataServiceConnectionException,
+ ColumnNotFoundException {
/* mock */
when(dataServiceRestTemplate.exchange(anyString(), eq(HttpMethod.POST), any(HttpEntity.class), eq(ViewDto.class)))
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceUnitTest.java
index 52093cb5d52495a1cc513998d3e88b43b2755aba..22be622ea4027897a32fb59d6a617714f090df0c 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/AccessServiceUnitTest.java
@@ -6,8 +6,8 @@ import at.ac.tuwien.ifs.dbrepo.core.entity.database.AccessType;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.Database;
import at.ac.tuwien.ifs.dbrepo.core.entity.database.DatabaseAccess;
import at.ac.tuwien.ifs.dbrepo.core.exception.*;
-import at.ac.tuwien.ifs.dbrepo.repository.DatabaseRepository;
import at.ac.tuwien.ifs.dbrepo.core.test.BaseTest;
+import at.ac.tuwien.ifs.dbrepo.repository.DatabaseRepository;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -261,17 +261,22 @@ public class AccessServiceUnitTest extends BaseTest {
}
@Test
- public void update_dataService404_fails() {
+ public void update_dataService404_succeeds() throws SearchServiceException, DataServiceException,
+ AccessNotFoundException, DatabaseNotFoundException, SearchServiceConnectionException,
+ DataServiceConnectionException {
/* mock */
+ when(databaseRepository.save(any(Database.class)))
+ .thenReturn(DATABASE_1);
doThrow(HttpClientErrorException.NotFound.class)
.when(dataServiceRestTemplate)
.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class));
+ when(searchServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(DatabaseBriefDto.class)))
+ .thenReturn(ResponseEntity.accepted()
+ .build());
/* test */
- assertThrows(AccessNotFoundException.class, () -> {
- accessService.update(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
- });
+ accessService.update(DATABASE_1, USER_1, AccessTypeDto.WRITE_ALL);
}
@Test
@@ -399,17 +404,24 @@ public class AccessServiceUnitTest extends BaseTest {
}
@Test
- public void delete_dataService404_fails() {
+ public void delete_dataService404_fails() throws SearchServiceException, DataServiceException,
+ AccessNotFoundException, DatabaseNotFoundException, SearchServiceConnectionException,
+ DataServiceConnectionException {
/* mock */
+ when(databaseRepository.findById(DATABASE_1_ID))
+ .thenReturn(Optional.of(DATABASE_1));
+ when(databaseRepository.save(any(Database.class)))
+ .thenReturn(DATABASE_1);
doThrow(HttpClientErrorException.NotFound.class)
.when(dataServiceRestTemplate)
.exchange(anyString(), eq(HttpMethod.DELETE), any(HttpEntity.class), eq(Void.class));
+ when(searchServiceRestTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(DatabaseBriefDto.class)))
+ .thenReturn(ResponseEntity.accepted()
+ .build());
/* test */
- assertThrows(AccessNotFoundException.class, () -> {
- accessService.delete(DATABASE_1, USER_1);
- });
+ accessService.delete(DATABASE_1, USER_1);
}
@Test
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/ViewServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/ViewServiceUnitTest.java
index a5b25977f7d3a304e3b63d46deabd1bc6351aa6f..faae59670db8a86c0c61d4d89b20398863ffb006 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/ViewServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/ac/tuwien/ifs/dbrepo/service/ViewServiceUnitTest.java
@@ -45,7 +45,7 @@ public class ViewServiceUnitTest extends BaseTest {
@Test
public void create_succeeds() throws MalformedException, DataServiceException, DataServiceConnectionException,
DatabaseNotFoundException, SearchServiceException, SearchServiceConnectionException, TableNotFoundException,
- ImageNotFoundException {
+ ImageNotFoundException, ColumnNotFoundException {
final CreateViewDto request = CreateViewDto.builder()
.name(VIEW_1_NAME)
.query(VIEW_1_SUBSET_DTO)
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index f69e7124a530895da06484aedd3dbe8d9a090f8f..a01916c062191394d8a64c05279ac14668be58d8 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -6,23 +6,23 @@
<parent>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>metadata-service</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</parent>
<name>services</name>
<artifactId>services</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
<dependencies>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>oai</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
<dependency>
<groupId>at.ac.tuwien.ifs.dbrepo</groupId>
<artifactId>repositories</artifactId>
- <version>1.9.2</version>
+ <version>1.9.3</version>
</dependency>
</dependencies>
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGateway.java
index d7d54ca8e7e31ca982f7765da626c4895017f9d0..e57aef8194e19200ceea3bebc6d665b8b3846b36 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/DataServiceGateway.java
@@ -116,8 +116,10 @@ public interface DataServiceGateway {
* @return The created view, if successful.
* @throws DataServiceConnectionException The connection to the data service could not be established.
* @throws DataServiceException The data service responded unexpectedly.
+ * @throws ColumnNotFoundException The data service could not find a column from the filter or sorting specification of the view data.
*/
- ViewDto createView(UUID databaseId, CreateViewDto data) throws DataServiceConnectionException, DataServiceException;
+ ViewDto createView(UUID databaseId, CreateViewDto data) throws DataServiceConnectionException, DataServiceException,
+ ColumnNotFoundException;
/**
* Deletes a given view in the given database.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/DataServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/DataServiceGatewayImpl.java
index 882c6c49d7ecf15361375db4ad5ad346b833602a..f23baab3125ccc6499a58a8413b49d47cfa44b33 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/DataServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/gateway/impl/DataServiceGatewayImpl.java
@@ -238,7 +238,8 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
}
@Override
- public ViewDto createView(UUID databaseId, CreateViewDto data) throws DataServiceConnectionException, DataServiceException {
+ public ViewDto createView(UUID databaseId, CreateViewDto data) throws DataServiceConnectionException,
+ DataServiceException, ColumnNotFoundException {
final ResponseEntity<ViewDto> response;
final String path = "/api/database/" + databaseId + "/view";
log.trace("create view at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
@@ -250,6 +251,9 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
} catch (HttpClientErrorException.BadRequest | HttpClientErrorException.Unauthorized e) {
log.error("Failed to create view: {}", e.getMessage());
throw new DataServiceException("Failed to create view: " + e.getMessage(), e);
+ } catch (HttpClientErrorException.NotFound e) {
+ log.error("Failed to create view: not found: {}", e.getMessage());
+ throw new ColumnNotFoundException("Failed to create view: not found: " + e.getMessage(), e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create view: wrong http code: {}", response.getStatusCode());
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/ViewService.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/ViewService.java
index eda8cdd4430c591f64306f613c7b82209cff8aa6..3fea7527767bdd4c0a88051a2d4bc8be13950cbc 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/ViewService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/ViewService.java
@@ -51,7 +51,7 @@ public interface ViewService {
*/
View create(Database database, User user, CreateViewDto data) throws MalformedException, DataServiceException,
DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException;
+ SearchServiceConnectionException, ColumnNotFoundException;
/**
* Updates the view in the metadata database and search service.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java
index 8ab61d2767b9bcdf298b1dcdeaa203de17ee3063..f069f634756f33d9ee32f7bfdceb74aeb1f28f1d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/AccessServiceImpl.java
@@ -90,7 +90,11 @@ public class AccessServiceImpl implements AccessService {
DataServiceConnectionException, AccessNotFoundException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* update in data database */
- dataServiceGateway.updateAccess(database.getId(), user.getId(), access);
+ try {
+ dataServiceGateway.updateAccess(database.getId(), user.getId(), access);
+ } catch (AccessNotFoundException e) {
+ /* ignore */
+ }
/* update in metadata database */
final Optional<DatabaseAccess> optional = database.getAccesses()
.stream()
@@ -114,7 +118,11 @@ public class AccessServiceImpl implements AccessService {
DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* delete in data database */
- dataServiceGateway.deleteAccess(database.getId(), user.getId());
+ try {
+ dataServiceGateway.deleteAccess(database.getId(), user.getId());
+ } catch (AccessNotFoundException e) {
+ /* ignore */
+ }
/* delete in metadata database */
database.getAccesses()
.remove(find(database, user));
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java
index 4e275ea07f7b9892829fba8eee7b229f3f2d8a55..96cacb1685b48bfa724b694212bd441555a1806a 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/IdentifierServiceImpl.java
@@ -262,40 +262,60 @@ public class IdentifierServiceImpl implements IdentifierService {
.stream()
.map(metadataMapper::creatorCreateDtoToCreator)
.toList());
+ final int[] idx = new int[]{0};
identifier.getCreators()
- .forEach(c -> c.setIdentifier(identifier));
+ .forEach(c -> {
+ c.setOrdinalPosition(idx[0]++);
+ c.setIdentifier(identifier);
+ });
}
if (data.getRelatedIdentifiers() != null) {
identifier.setRelatedIdentifiers(data.getRelatedIdentifiers()
.stream()
.map(metadataMapper::relatedIdentifierCreateDtoToRelatedIdentifier)
.toList());
+ final int[] idx = new int[]{0};
identifier.getRelatedIdentifiers()
- .forEach(r -> r.setIdentifier(identifier));
+ .forEach(r -> {
+ r.setOrdinalPosition(idx[0]++);
+ r.setIdentifier(identifier);
+ });
}
if (data.getTitles() != null) {
identifier.setTitles(data.getTitles()
.stream()
.map(metadataMapper::identifierCreateTitleDtoToIdentifierTitle)
.toList());
+ final int[] idx = new int[]{0};
identifier.getTitles()
- .forEach(t -> t.setIdentifier(identifier));
+ .forEach(t -> {
+ t.setOrdinalPosition(idx[0]++);
+ t.setIdentifier(identifier);
+ });
}
if (data.getDescriptions() != null) {
identifier.setDescriptions(data.getDescriptions()
.stream()
.map(metadataMapper::identifierCreateDescriptionDtoToIdentifierDescription)
.toList());
+ final int[] idx = new int[]{0};
identifier.getDescriptions()
- .forEach(d -> d.setIdentifier(identifier));
+ .forEach(d -> {
+ d.setOrdinalPosition(idx[0]++);
+ d.setIdentifier(identifier);
+ });
}
if (data.getFunders() != null) {
identifier.setFunders(data.getFunders()
.stream()
.map(metadataMapper::identifierFunderSaveDtoToIdentifierFunder)
.toList());
+ final int[] idx = new int[]{0};
identifier.getFunders()
- .forEach(f -> f.setIdentifier(identifier));
+ .forEach(f -> {
+ f.setOrdinalPosition(idx[0]++);
+ f.setIdentifier(identifier);
+ });
}
return save(identifier);
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java
index 490f1f82089070e8500e03310ebe7e6327cd45af..ee5cce6c0671ae9b417be7561d44ca4ae41138ee 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/ac/tuwien/ifs/dbrepo/service/impl/ViewServiceImpl.java
@@ -74,7 +74,7 @@ public class ViewServiceImpl implements ViewService {
@Transactional
public View create(Database database, User creator, CreateViewDto data) throws MalformedException,
DataServiceException, DataServiceConnectionException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ SearchServiceConnectionException, ColumnNotFoundException {
/* create in metadata database */
final View view = View.builder()
.database(database)
diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile
index c05cd0a461a0fa3d47242f0624dfe87cedf9c4eb..d7d204603c97a9223c808ed7e92cd31fa8396101 100644
--- a/dbrepo-search-service/Pipfile
+++ b/dbrepo-search-service/Pipfile
@@ -17,7 +17,7 @@ flask_httpauth = "*"
jwt = "~=1.3"
rdflib = "*"
grafana-client = "*"
-dbrepo = {path = "./lib/dbrepo-1.9.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.9.3.tar.gz"}
gunicorn = "*"
ecs_logging = "*"
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index 0311f44581bb1744221436b48273638364afa081..a5ec12920deb328fcf07de3e6c9f3826f6c3285d 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "415611f31c7f873488df627f955025366a591388a32f43f163254bffd48be442"
+ "sha256": "5fc9ed8d905c373b40a02bd8c4c4fbbaebcffbf728245fe9cce13d6e3a61c9e0"
},
"pipfile-spec": 6,
"requires": {
@@ -272,10 +272,10 @@
},
"dbrepo": {
"hashes": [
- "sha256:b9079a9a97d7112459df40cbc8e63302848e4cd995a5bd0fe69d52b99e670be7"
+ "sha256:68720d474222c00331c15824e7abc6768c01aa0c8c16e386413d7428468c0934"
],
- "path": "./lib/dbrepo-1.9.2.tar.gz",
- "version": "==1.9.2"
+ "path": "./lib/dbrepo-1.9.3.tar.gz",
+ "version": "==1.9.3"
},
"ecs-logging": {
"hashes": [
@@ -348,64 +348,63 @@
},
"greenlet": {
"hashes": [
- "sha256:00cd814b8959b95a546e47e8d589610534cfb71f19802ea8a2ad99d95d702057",
- "sha256:02a98600899ca1ca5d3a2590974c9e3ec259503b2d6ba6527605fcd74e08e207",
- "sha256:02f5972ff02c9cf615357c17ab713737cccfd0eaf69b951084a9fd43f39833d3",
- "sha256:055916fafad3e3388d27dd68517478933a97edc2fc54ae79d3bec827de2c64c4",
- "sha256:0a16fb934fcabfdfacf21d79e6fed81809d8cd97bc1be9d9c89f0e4567143d7b",
- "sha256:1592a615b598643dbfd566bac8467f06c8c8ab6e56f069e573832ed1d5d528cc",
- "sha256:1919cbdc1c53ef739c94cf2985056bcc0838c1f217b57647cbf4578576c63825",
- "sha256:1e4747712c4365ef6765708f948acc9c10350719ca0545e362c24ab973017370",
- "sha256:1e76106b6fc55fa3d6fe1c527f95ee65e324a13b62e243f77b48317346559708",
- "sha256:1f72667cc341c95184f1c68f957cb2d4fc31eef81646e8e59358a10ce6689457",
- "sha256:2593283bf81ca37d27d110956b79e8723f9aa50c4bcdc29d3c0543d4743d2763",
- "sha256:2dc5c43bb65ec3669452af0ab10729e8fdc17f87a1f2ad7ec65d4aaaefabf6bf",
- "sha256:3091bc45e6b0c73f225374fefa1536cd91b1e987377b12ef5b19129b07d93ebe",
- "sha256:354f67445f5bed6604e493a06a9a49ad65675d3d03477d38a4db4a427e9aad0e",
- "sha256:3885f85b61798f4192d544aac7b25a04ece5fe2704670b4ab73c2d2c14ab740d",
- "sha256:3ab7194ee290302ca15449f601036007873028712e92ca15fc76597a0aeb4c59",
- "sha256:3aeca9848d08ce5eb653cf16e15bb25beeab36e53eb71cc32569f5f3afb2a3aa",
- "sha256:44671c29da26539a5f142257eaba5110f71887c24d40df3ac87f1117df589e0e",
- "sha256:45f9f4853fb4cc46783085261c9ec4706628f3b57de3e68bae03e8f8b3c0de51",
- "sha256:4bd139e4943547ce3a56ef4b8b1b9479f9e40bb47e72cc906f0f66b9d0d5cab3",
- "sha256:4fefc7aa68b34b9224490dfda2e70ccf2131368493add64b4ef2d372955c207e",
- "sha256:6629311595e3fe7304039c67f00d145cd1d38cf723bb5b99cc987b23c1433d61",
- "sha256:6fadd183186db360b61cb34e81117a096bff91c072929cd1b529eb20dd46e6c5",
- "sha256:71566302219b17ca354eb274dfd29b8da3c268e41b646f330e324e3967546a74",
- "sha256:7409796591d879425997a518138889d8d17e63ada7c99edc0d7a1c22007d4907",
- "sha256:752f0e79785e11180ebd2e726c8a88109ded3e2301d40abced2543aa5d164275",
- "sha256:7791dcb496ec53d60c7f1c78eaa156c21f402dda38542a00afc3e20cae0f480f",
- "sha256:782743700ab75716650b5238a4759f840bb2dcf7bff56917e9ffdf9f1f23ec59",
- "sha256:7c9896249fbef2c615853b890ee854f22c671560226c9221cfd27c995db97e5c",
- "sha256:85f3e248507125bf4af607a26fd6cb8578776197bd4b66e35229cdf5acf1dfbf",
- "sha256:89c69e9a10670eb7a66b8cef6354c24671ba241f46152dd3eed447f79c29fb5b",
- "sha256:8cb8553ee954536500d88a1a2f58fcb867e45125e600e80f586ade399b3f8819",
- "sha256:9ae572c996ae4b5e122331e12bbb971ea49c08cc7c232d1bd43150800a2d6c65",
- "sha256:9c7b15fb9b88d9ee07e076f5a683027bc3befd5bb5d25954bb633c385d8b737e",
- "sha256:9ea5231428af34226c05f927e16fc7f6fa5e39e3ad3cd24ffa48ba53a47f4240",
- "sha256:a31ead8411a027c2c4759113cf2bd473690517494f3d6e4bf67064589afcd3c5",
- "sha256:a8fa80665b1a29faf76800173ff5325095f3e66a78e62999929809907aca5659",
- "sha256:ad053d34421a2debba45aa3cc39acf454acbcd025b3fc1a9f8a0dee237abd485",
- "sha256:b24c7844c0a0afc3ccbeb0b807adeefb7eff2b5599229ecedddcfeb0ef333bec",
- "sha256:b50a8c5c162469c3209e5ec92ee4f95c8231b11db6a04db09bbe338176723bb8",
- "sha256:ba30e88607fb6990544d84caf3c706c4b48f629e18853fc6a646f82db9629418",
- "sha256:bf3fc9145141250907730886b031681dfcc0de1c158f3cc51c092223c0f381ce",
- "sha256:c23ea227847c9dbe0b3910f5c0dd95658b607137614eb821e6cbaecd60d81cc6",
- "sha256:c3cc1a3ed00ecfea8932477f729a9f616ad7347a5e55d50929efa50a86cb7be7",
- "sha256:c49e9f7c6f625507ed83a7485366b46cbe325717c60837f7244fc99ba16ba9d6",
- "sha256:d0cb7d47199001de7658c213419358aa8937df767936506db0db7ce1a71f4a2f",
- "sha256:d8009ae46259e31bc73dc183e402f548e980c96f33a6ef58cc2e7865db012e13",
- "sha256:da956d534a6d1b9841f95ad0f18ace637668f680b1339ca4dcfb2c1837880a0b",
- "sha256:dcb9cebbf3f62cb1e5afacae90761ccce0effb3adaa32339a0670fe7805d8068",
- "sha256:decb0658ec19e5c1f519faa9a160c0fc85a41a7e6654b3ce1b44b939f8bf1325",
- "sha256:df4d1509efd4977e6a844ac96d8be0b9e5aa5d5c77aa27ca9f4d3f92d3fcf330",
- "sha256:eeb27bece45c0c2a5842ac4c5a1b5c2ceaefe5711078eed4e8043159fa05c834",
- "sha256:efcdfb9df109e8a3b475c016f60438fcd4be68cd13a365d42b35914cdab4bb2b",
- "sha256:fd9fb7c941280e2c837b603850efc93c999ae58aae2b40765ed682a6907ebbc5",
- "sha256:fe46d4f8e94e637634d54477b0cfabcf93c53f29eedcbdeecaf2af32029b4421"
+ "sha256:003c930e0e074db83559edc8705f3a2d066d4aa8c2f198aff1e454946efd0f26",
+ "sha256:024571bbce5f2c1cfff08bf3fbaa43bbc7444f580ae13b0099e95d0e6e67ed36",
+ "sha256:02b0df6f63cd15012bed5401b47829cfd2e97052dc89da3cfaf2c779124eb892",
+ "sha256:0921ac4ea42a5315d3446120ad48f90c3a6b9bb93dd9b3cf4e4d84a66e42de83",
+ "sha256:0cc73378150b8b78b0c9fe2ce56e166695e67478550769536a6742dca3651688",
+ "sha256:1afd685acd5597349ee6d7a88a8bec83ce13c106ac78c196ee9dde7c04fe87be",
+ "sha256:22eb5ba839c4b2156f18f76768233fe44b23a31decd9cc0d4cc8141c211fd1b4",
+ "sha256:25ad29caed5783d4bd7a85c9251c651696164622494c00802a139c00d639242d",
+ "sha256:29e184536ba333003540790ba29829ac14bb645514fbd7e32af331e8202a62a5",
+ "sha256:2c724620a101f8170065d7dded3f962a2aea7a7dae133a009cada42847e04a7b",
+ "sha256:2d8aa5423cd4a396792f6d4580f88bdc6efcb9205891c9d40d20f6e670992efb",
+ "sha256:3d04332dddb10b4a211b68111dabaee2e1a073663d117dc10247b5b1642bac86",
+ "sha256:419e60f80709510c343c57b4bb5a339d8767bf9aef9b8ce43f4f143240f88b7c",
+ "sha256:42efc522c0bd75ffa11a71e09cd8a399d83fafe36db250a87cf1dacfaa15dc64",
+ "sha256:4532f0d25df67f896d137431b13f4cdce89f7e3d4a96387a41290910df4d3a57",
+ "sha256:49c8cfb18fb419b3d08e011228ef8a25882397f3a859b9fe1436946140b6756b",
+ "sha256:500b8689aa9dd1ab26872a34084503aeddefcb438e2e7317b89b11eaea1901ad",
+ "sha256:5035d77a27b7c62db6cf41cf786cfe2242644a7a337a0e155c80960598baab95",
+ "sha256:5195fb1e75e592dd04ce79881c8a22becdfa3e6f500e7feb059b1e6fdd54d3e3",
+ "sha256:592c12fb1165be74592f5de0d70f82bc5ba552ac44800d632214b76089945147",
+ "sha256:68671180e3849b963649254a882cd544a3c75bfcd2c527346ad8bb53494444db",
+ "sha256:706d016a03e78df129f68c4c9b4c4f963f7d73534e48a24f5f5a7101ed13dbbb",
+ "sha256:72e77ed69312bab0434d7292316d5afd6896192ac4327d44f3d613ecb85b037c",
+ "sha256:731e154aba8e757aedd0781d4b240f1225b075b4409f1bb83b05ff410582cf00",
+ "sha256:7454d37c740bb27bdeddfc3f358f26956a07d5220818ceb467a483197d84f849",
+ "sha256:751261fc5ad7b6705f5f76726567375bb2104a059454e0226e1eef6c756748ba",
+ "sha256:761917cac215c61e9dc7324b2606107b3b292a8349bdebb31503ab4de3f559ac",
+ "sha256:784ae58bba89fa1fa5733d170d42486580cab9decda3484779f4759345b29822",
+ "sha256:7e70ea4384b81ef9e84192e8a77fb87573138aa5d4feee541d8014e452b434da",
+ "sha256:8186162dffde068a465deab08fc72c767196895c39db26ab1c17c0b77a6d8b97",
+ "sha256:8324319cbd7b35b97990090808fdc99c27fe5338f87db50514959f8059999805",
+ "sha256:83a8761c75312361aa2b5b903b79da97f13f556164a7dd2d5448655425bd4c34",
+ "sha256:86c2d68e87107c1792e2e8d5399acec2487a4e993ab76c792408e59394d52141",
+ "sha256:8704b3768d2f51150626962f4b9a9e4a17d2e37c8a8d9867bbd9fa4eb938d3b3",
+ "sha256:873abe55f134c48e1f2a6f53f7d1419192a3d1a4e873bace00499a4e45ea6af0",
+ "sha256:88cd97bf37fe24a6710ec6a3a7799f3f81d9cd33317dcf565ff9950c83f55e0b",
+ "sha256:8b0dd8ae4c0d6f5e54ee55ba935eeb3d735a9b58a8a1e5b5cbab64e01a39f365",
+ "sha256:8c37ef5b3787567d322331d5250e44e42b58c8c713859b8a04c6065f27efbf72",
+ "sha256:8c47aae8fbbfcf82cc13327ae802ba13c9c36753b67e760023fd116bc124a62a",
+ "sha256:93c0bb79844a367782ec4f429d07589417052e621aa39a5ac1fb99c5aa308edc",
+ "sha256:93d48533fade144203816783373f27a97e4193177ebaaf0fc396db19e5d61163",
+ "sha256:96c20252c2f792defe9a115d3287e14811036d51e78b3aaddbee23b69b216302",
+ "sha256:a07d3472c2a93117af3b0136f246b2833fdc0b542d4a9799ae5f41c28323faef",
+ "sha256:a433dbc54e4a37e4fff90ef34f25a8c00aed99b06856f0119dcf09fbafa16392",
+ "sha256:aaa7aae1e7f75eaa3ae400ad98f8644bb81e1dc6ba47ce8a93d3f17274e08322",
+ "sha256:baeedccca94880d2f5666b4fa16fc20ef50ba1ee353ee2d7092b383a243b0b0d",
+ "sha256:be52af4b6292baecfa0f397f3edb3c6092ce071b499dd6fe292c9ac9f2c8f264",
+ "sha256:c667c0bf9d406b77a15c924ef3285e1e05250948001220368e039b6aa5b5034b",
+ "sha256:ce539fb52fb774d0802175d37fcff5c723e2c7d249c65916257f0a940cee8904",
+ "sha256:d2971d93bb99e05f8c2c0c2f4aa9484a18d98c4c3bd3c62b65b7e6ae33dfcfaf",
+ "sha256:d760f9bdfe79bff803bad32b4d8ffb2c1d2ce906313fc10a83976ffb73d64ca7",
+ "sha256:ed6cfa9200484d234d8394c70f5492f144b20d4533f69262d530a1a082f6ee9a",
+ "sha256:efc6dc8a792243c31f2f5674b670b3a95d46fa1c6a912b8e310d6f542e7b0712",
+ "sha256:f4bfbaa6096b1b7a200024784217defedf46a07c2eee1a498e94a1b5f8ec5728"
],
"markers": "python_version < '3.14' and (platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32'))))))",
- "version": "==3.2.2"
+ "version": "==3.2.3"
},
"gunicorn": {
"hashes": [
@@ -735,51 +734,51 @@
},
"pandas": {
"hashes": [
- "sha256:062309c1b9ea12a50e8ce661145c6aab431b1e99530d3cd60640e255778bd43a",
- "sha256:15c0e1e02e93116177d29ff83e8b1619c93ddc9c49083f237d4312337a61165d",
- "sha256:1948ddde24197a0f7add2bdc4ca83bf2b1ef84a1bc8ccffd95eda17fd836ecb5",
- "sha256:1db71525a1538b30142094edb9adc10be3f3e176748cd7acc2240c2f2e5aa3a4",
- "sha256:22a9d949bfc9a502d320aa04e5d02feab689d61da4e7764b62c30b991c42c5f0",
- "sha256:29401dbfa9ad77319367d36940cd8a0b3a11aba16063e39632d98b0e931ddf32",
- "sha256:31d0ced62d4ea3e231a9f228366919a5ea0b07440d9d4dac345376fd8e1477ea",
- "sha256:3508d914817e153ad359d7e069d752cdd736a247c322d932eb89e6bc84217f28",
- "sha256:37e0aced3e8f539eccf2e099f65cdb9c8aa85109b0be6e93e2baff94264bdc6f",
- "sha256:381175499d3802cde0eabbaf6324cce0c4f5d52ca6f8c377c29ad442f50f6348",
- "sha256:38cf8125c40dae9d5acc10fa66af8ea6fdf760b2714ee482ca691fc66e6fcb18",
- "sha256:3b71f27954685ee685317063bf13c7709a7ba74fc996b84fc6821c59b0f06468",
- "sha256:3fc6873a41186404dad67245896a6e440baacc92f5b716ccd1bc9ed2995ab2c5",
- "sha256:4850ba03528b6dd51d6c5d273c46f183f39a9baf3f0143e566b89450965b105e",
- "sha256:4f18ba62b61d7e192368b84517265a99b4d7ee8912f8708660fb4a366cc82667",
- "sha256:56534ce0746a58afaf7942ba4863e0ef81c9c50d3f0ae93e9497d6a41a057645",
- "sha256:59ef3764d0fe818125a5097d2ae867ca3fa64df032331b7e0917cf5d7bf66b13",
- "sha256:5dbca4c1acd72e8eeef4753eeca07de9b1db4f398669d5994086f788a5d7cc30",
- "sha256:5de54125a92bb4d1c051c0659e6fcb75256bf799a732a87184e5ea503965bce3",
- "sha256:61c5ad4043f791b61dd4752191d9f07f0ae412515d59ba8f005832a532f8736d",
- "sha256:6374c452ff3ec675a8f46fd9ab25c4ad0ba590b71cf0656f8b6daa5202bca3fb",
- "sha256:63cc132e40a2e084cf01adf0775b15ac515ba905d7dcca47e9a251819c575ef3",
- "sha256:66108071e1b935240e74525006034333f98bcdb87ea116de573a6a0dccb6c039",
- "sha256:6dfcb5ee8d4d50c06a51c2fffa6cff6272098ad6540aed1a76d15fb9318194d8",
- "sha256:7c2875855b0ff77b2a64a0365e24455d9990730d6431b9e0ee18ad8acee13dbd",
- "sha256:7eee9e7cea6adf3e3d24e304ac6b8300646e2a5d1cd3a3c2abed9101b0846761",
- "sha256:800250ecdadb6d9c78eae4990da62743b857b470883fa27f652db8bdde7f6659",
- "sha256:86976a1c5b25ae3f8ccae3a5306e443569ee3c3faf444dfd0f41cda24667ad57",
- "sha256:8cd6d7cc958a3910f934ea8dbdf17b2364827bb4dafc38ce6eef6bb3d65ff09c",
- "sha256:99df71520d25fade9db7c1076ac94eb994f4d2673ef2aa2e86ee039b6746d20c",
- "sha256:a5a1595fe639f5988ba6a8e5bc9649af3baf26df3998a0abe56c02609392e0a4",
- "sha256:ad5b65698ab28ed8d7f18790a0dc58005c7629f227be9ecc1072aa74c0c1d43a",
- "sha256:b1d432e8d08679a40e2a6d8b2f9770a5c21793a6f9f47fdd52c5ce1948a5a8a9",
- "sha256:b8661b0238a69d7aafe156b7fa86c44b881387509653fdf857bebc5e4008ad42",
- "sha256:ba96630bc17c875161df3818780af30e43be9b166ce51c9a18c1feae342906c2",
- "sha256:bc6b93f9b966093cb0fd62ff1a7e4c09e6d546ad7c1de191767baffc57628f39",
- "sha256:c124333816c3a9b03fbeef3a9f230ba9a737e9e5bb4060aa2107a86cc0a497fc",
- "sha256:cd8d0c3be0515c12fed0bdbae072551c8b54b7192c7b1fda0ba56059a0179698",
- "sha256:d9c45366def9a3dd85a6454c0e7908f2b3b8e9c138f5dc38fed7ce720d8453ed",
- "sha256:f00d1345d84d8c86a63e476bb4955e46458b304b9575dcf71102b5c705320015",
- "sha256:f3a255b2c19987fbbe62a9dfd6cff7ff2aa9ccab3fc75218fd4b7530f01efa24",
- "sha256:fffb8ae78d8af97f849404f21411c95062db1496aeb3e56f146f0355c9989319"
+ "sha256:034abd6f3db8b9880aaee98f4f5d4dbec7c4829938463ec046517220b2f8574e",
+ "sha256:094e271a15b579650ebf4c5155c05dcd2a14fd4fdd72cf4854b2f7ad31ea30be",
+ "sha256:14a0cc77b0f089d2d2ffe3007db58f170dae9b9f54e569b299db871a3ab5bf46",
+ "sha256:1a881bc1309f3fce34696d07b00f13335c41f5f5a8770a33b09ebe23261cfc67",
+ "sha256:1d2b33e68d0ce64e26a4acc2e72d747292084f4e8db4c847c6f5f6cbe56ed6d8",
+ "sha256:213cd63c43263dbb522c1f8a7c9d072e25900f6975596f883f4bebd77295d4f3",
+ "sha256:23c2b2dc5213810208ca0b80b8666670eb4660bbfd9d45f58592cc4ddcfd62e1",
+ "sha256:2c7e2fc25f89a49a11599ec1e76821322439d90820108309bf42130d2f36c983",
+ "sha256:2eb4728a18dcd2908c7fccf74a982e241b467d178724545a48d0caf534b38ebf",
+ "sha256:34600ab34ebf1131a7613a260a61dbe8b62c188ec0ea4c296da7c9a06b004133",
+ "sha256:39ff73ec07be5e90330cc6ff5705c651ace83374189dcdcb46e6ff54b4a72cd6",
+ "sha256:404d681c698e3c8a40a61d0cd9412cc7364ab9a9cc6e144ae2992e11a2e77a20",
+ "sha256:40cecc4ea5abd2921682b57532baea5588cc5f80f0231c624056b146887274d2",
+ "sha256:430a63bae10b5086995db1b02694996336e5a8ac9a96b4200572b413dfdfccb9",
+ "sha256:4930255e28ff5545e2ca404637bcc56f031893142773b3468dc021c6c32a1390",
+ "sha256:6021910b086b3ca756755e86ddc64e0ddafd5e58e076c72cb1585162e5ad259b",
+ "sha256:625466edd01d43b75b1883a64d859168e4556261a5035b32f9d743b67ef44634",
+ "sha256:75651c14fde635e680496148a8526b328e09fe0572d9ae9b638648c46a544ba3",
+ "sha256:84141f722d45d0c2a89544dd29d35b3abfc13d2250ed7e68394eda7564bd6324",
+ "sha256:8adff9f138fc614347ff33812046787f7d43b3cef7c0f0171b3340cae333f6ca",
+ "sha256:951805d146922aed8357e4cc5671b8b0b9be1027f0619cea132a9f3f65f2f09c",
+ "sha256:9efc0acbbffb5236fbdf0409c04edce96bec4bdaa649d49985427bd1ec73e085",
+ "sha256:9ff730713d4c4f2f1c860e36c005c7cefc1c7c80c21c0688fd605aa43c9fcf09",
+ "sha256:a6872d695c896f00df46b71648eea332279ef4077a409e2fe94220208b6bb675",
+ "sha256:b198687ca9c8529662213538a9bb1e60fa0bf0f6af89292eb68fea28743fcd5a",
+ "sha256:b9d8c3187be7479ea5c3d30c32a5d73d62a621166675063b2edd21bc47614027",
+ "sha256:ba24af48643b12ffe49b27065d3babd52702d95ab70f50e1b34f71ca703e2c0d",
+ "sha256:bb32dc743b52467d488e7a7c8039b821da2826a9ba4f85b89ea95274f863280f",
+ "sha256:bb3be958022198531eb7ec2008cfc78c5b1eed51af8600c6c5d9160d89d8d249",
+ "sha256:bf5be867a0541a9fb47a4be0c5790a4bccd5b77b92f0a59eeec9375fafc2aa14",
+ "sha256:c06f6f144ad0a1bf84699aeea7eff6068ca5c63ceb404798198af7eb86082e33",
+ "sha256:c6da97aeb6a6d233fb6b17986234cc723b396b50a3c6804776351994f2a658fd",
+ "sha256:e0f51973ba93a9f97185049326d75b942b9aeb472bec616a129806facb129ebb",
+ "sha256:e1991bbb96f4050b09b5f811253c4f3cf05ee89a589379aa36cd623f21a31d6f",
+ "sha256:e5f08eb9a445d07720776df6e641975665c9ea12c9d8a331e0f6890f2dcd76ef",
+ "sha256:e78ad363ddb873a631e92a3c063ade1ecfb34cae71e9a2be6ad100f875ac1042",
+ "sha256:ed16339bc354a73e0a609df36d256672c7d296f3f767ac07257801aa064ff73c",
+ "sha256:f4dd97c19bd06bc557ad787a15b6489d2614ddaab5d104a0310eb314c724b2d2",
+ "sha256:f925f1ef673b4bd0271b1809b72b3270384f2b7d9d14a189b12b7fc02574d575",
+ "sha256:f95a2aef32614ed86216d3c450ab12a4e82084e8102e355707a1d96e33d51c34",
+ "sha256:fa07e138b3f6c04addfeaf56cc7fdb96c3b68a3fe5e5401251f231fce40a0d7a",
+ "sha256:fa35c266c8cd1a67d75971a1912b185b492d257092bdd2709bbdebe574ed228d"
],
"markers": "python_version >= '3.9'",
- "version": "==2.2.3"
+ "version": "==2.3.0"
},
"pika": {
"hashes": [
@@ -791,11 +790,11 @@
},
"prometheus-client": {
"hashes": [
- "sha256:18da1d2241ac2d10c8d2110f13eedcd5c7c0c8af18c926e8731f04fc10cd575c",
- "sha256:c8951bbe64e62b96cd8e8f5d917279d1b9b91ab766793f33d4dce6c228558713"
+ "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28",
+ "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"
],
"markers": "python_version >= '3.9'",
- "version": "==0.22.0"
+ "version": "==0.22.1"
},
"prometheus-flask-exporter": {
"hashes": [
@@ -1353,11 +1352,11 @@
},
"typing-extensions": {
"hashes": [
- "sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c",
- "sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef"
+ "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
+ "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
],
- "markers": "python_version >= '3.8'",
- "version": "==4.13.2"
+ "markers": "python_version >= '3.9'",
+ "version": "==4.14.0"
},
"typing-inspection": {
"hashes": [
@@ -1869,13 +1868,21 @@
"markers": "python_version >= '3.8'",
"version": "==2.22"
},
+ "pygments": {
+ "hashes": [
+ "sha256:61c16d2a8576dc0649d9f39e089b5f02bcd27fba10d8fb4dcc28173f7a45151f",
+ "sha256:9ea1544ad55cecf4b8242fab6dd35a93bbce657034b0611ee383099054ab6d8c"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.19.1"
+ },
"pytest": {
"hashes": [
- "sha256:c69214aa47deac29fad6c2a4f590b9c4a9fdb16a403176fe154b79c0b4d4d820",
- "sha256:f4efe70cc14e511565ac476b57c279e12a855b11f48f212af1080ef2263d3845"
+ "sha256:14d920b48472ea0dbf68e45b96cd1ffda4705f33307dcc86c676c1b5104838a6",
+ "sha256:f40f825768ad76c0977cbacdf1fd37c6f7a468e460ea6a0636078f8972d4517e"
],
"index": "pypi",
- "version": "==8.3.5"
+ "version": "==8.4.0"
},
"python-dateutil": {
"hashes": [
diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py
index d8aa0a2cedb375658698f41bd05c244ff605245b..945fbfbf59d12d25e49addb61e582d32f6ba0062 100644
--- a/dbrepo-search-service/app.py
+++ b/dbrepo-search-service/app.py
@@ -183,7 +183,7 @@ template = {
"info": {
"title": "Database Repository Search Service API",
"description": "Service that searches the search database",
- "version": "1.9.2",
+ "version": "1.9.3",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
diff --git a/dbrepo-search-service/lib/dbrepo-1.9.2.tar.gz b/dbrepo-search-service/lib/dbrepo-1.9.2.tar.gz
deleted file mode 100644
index cc536fecd0b417e82a49442320b056d6da14d4ed..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.9.2.tar.gz and /dev/null differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.9.2-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.9.3-py3-none-any.whl
similarity index 75%
rename from dbrepo-analyse-service/lib/dbrepo-1.9.2-py3-none-any.whl
rename to dbrepo-search-service/lib/dbrepo-1.9.3-py3-none-any.whl
index 658217e61233bd386c2abead7a1aee64b7a14781..e727c2f2bbf3aed3187f58c34421a7aecd318614 100644
Binary files a/dbrepo-analyse-service/lib/dbrepo-1.9.2-py3-none-any.whl and b/dbrepo-search-service/lib/dbrepo-1.9.3-py3-none-any.whl differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.9.3.tar.gz b/dbrepo-search-service/lib/dbrepo-1.9.3.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..94753e52f49aa983dca1ad4196e2df61f9adae9f
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.9.3.tar.gz differ
diff --git a/dbrepo-storage-service/init/Dockerfile b/dbrepo-storage-service/init/Dockerfile
index 7ea74cddf1e5d1ca5fe686aee621c5f988756560..9d0ac6e9a3344ac16cb46f135709f0ccfe7630e4 100644
--- a/dbrepo-storage-service/init/Dockerfile
+++ b/dbrepo-storage-service/init/Dockerfile
@@ -7,6 +7,9 @@ RUN apk --no-cache add \
WORKDIR /app
+RUN mkdir -p /app/config && \
+ chown -R 1001:1001 /app/config
+
RUN mkdir -p /var/log/app/service/storage && \
chown -R 1001:1001 /var/log/app/service/storage
diff --git a/dbrepo-storage-service/init/init.sh b/dbrepo-storage-service/init/init.sh
index f40712e81be5e7030c4c3988896411e8fde7f36a..7286d4b395f7955404a67cf7e09d67767bf019b2 100644
--- a/dbrepo-storage-service/init/init.sh
+++ b/dbrepo-storage-service/init/init.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-cat << EOF > /app/.s3cfg
+cat << EOF > /app/config/.s3cfg
access_key = ${S3_ACCESS_KEY_ID}
secret_key = ${S3_SECRET_ACCESS_KEY}
# Setup endpoint
@@ -14,16 +14,18 @@ function log() {
echo "{\"@timestamp\":\"$(date --rfc-3339='seconds')\", \"log.level\": \"$1\", \"message\": \"$2\"}" >> /var/log/app/service/storage/init.log
}
+S3CMD_OPTS="--config=/app/config/.s3cfg"
+
# create bucket
-if s3cmd --config=/app/.s3cfg ls | grep -q "s3://${S3_BUCKET}"; then
+if s3cmd $S3CMD_OPTS ls | grep -q "s3://${S3_BUCKET}"; then
echo "[INFO] Bucket s3://${S3_BUCKET} already exists, skip"
log "INFO" "Bucket s3://${S3_BUCKET} already exists, skip"
else
- if ! s3cmd --config=/app/.s3cfg mb s3://${S3_BUCKET}; then
+ if ! s3cmd $S3CMD_OPTS mb s3://${S3_BUCKET}; then
echo "[ERROR] Failed to create bucket s3://${S3_BUCKET}"
log "ERROR" "Failed to create bucket s3://${S3_BUCKET}"
fi
fi
# expire daily
-s3cmd --config=/app/.s3cfg expire s3://${S3_BUCKET} --expiry-prefix "" --expiry-days 1
\ No newline at end of file
+s3cmd $S3CMD_OPTS expire s3://${S3_BUCKET} --expiry-prefix "" --expiry-days 1
\ No newline at end of file
diff --git a/dbrepo-storage-service/init/tests/test_integration_expire.sh b/dbrepo-storage-service/init/tests/test_integration_expire.sh
index b5e2c38573a159ea7a553235c8035da31c2d054d..05390ad1447223f90cc88bbdfa9fe8f4a7d05251 100755
--- a/dbrepo-storage-service/init/tests/test_integration_expire.sh
+++ b/dbrepo-storage-service/init/tests/test_integration_expire.sh
@@ -1,6 +1,6 @@
#!/bin/bash
DOCKER_OPTS="--log-level ERROR"
-S3CMD_OPTS="--config=/app/.s3cfg"
+S3CMD_OPTS="--config=/app/config/.s3cfg"
export S3_ACCESS_KEY_ID="seaweedfsadmin"
export S3_BUCKET="dbrepo"
diff --git a/dbrepo-ui/components/subset/Builder.vue b/dbrepo-ui/components/subset/Builder.vue
index 24e91eec87ae82b75a35aca9f8a9adef4df63c5c..52d443c7da4191b430b2c4ccc6c2517bea448a95 100644
--- a/dbrepo-ui/components/subset/Builder.vue
+++ b/dbrepo-ui/components/subset/Builder.vue
@@ -666,6 +666,7 @@ export default {
this.loadingQuery = false
const toast = useToastInstance()
if (typeof code !== 'string') {
+ toast.error(message)
return
}
toast.error(this.$t(code))
@@ -680,12 +681,7 @@ export default {
this.$refs.form.validate()
},
addFirstSort () {
- if (this.sorts.length === 0) {
- this.columns.filter(c => this.table.constraints.primary_key.map(pk =>
- pk.column.id).includes(c.id)).forEach(pk => this.sorts.push({ column_id: pk.id, direction: 'asc' }))
- } else {
- this.sorts.push({ column_id: null, direction: null})
- }
+ this.sorts.push({ column_id: null, direction: null})
this.$refs.form.validate()
},
addAnd () {
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index 5784905294da2842c18aa9779e191a34f3c4ab76..2de6e0438ca761ff97a833985156fdabe7b7fdaa 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -141,6 +141,14 @@
</v-form>
<v-main>
<v-container>
+ <noscript>
+ <v-alert
+ style="margin-top: 5rem;"
+ color="error"
+ type="error"
+ title="JavaScript Disabled"
+ text="No JavaScript is available. It is needed to load content dynamically, we do not track you or monitor anything, it is needed purely for your convenience." />
+ </noscript>
<JumboBox
v-if="error"
:title="$t(errorCodeKey(error).title, { resource })"
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index 9c5bf688978d7526686a5d12b4c94d0f1ad88451..2ce916220ef0738d290bbf1162f715d44aed8884 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -601,6 +601,7 @@
"title": "Database",
"image": {
"title": "Preview Image",
+ "warn": "This is a only preview of your dataset image and changes are not yet saved.",
"alt": "Database preview image representing the dataset"
},
"dashboard": {
diff --git a/dbrepo-ui/pages/database/[database_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/info.vue
index 89583c5f4f450d6462a6f4aaa5343fee3d184b82..b8d7d017b6bc609effc601163d901a71d95504a0 100644
--- a/dbrepo-ui/pages/database/[database_id]/info.vue
+++ b/dbrepo-ui/pages/database/[database_id]/info.vue
@@ -38,19 +38,21 @@
v-if="previewImage"
:title="$t('pages.database.image.title')"
density="compact">
- <v-img
- :src="previewImage"
- :alt="$t('pages.database.image.alt')"
- :title="$t('pages.database.image.alt')"
- :max-width="maxWidth"
- :max-height="maxHeight" />
+ <NuxtLink
+ :href="previewImage">
+ <v-img
+ :src="previewImage"
+ :alt="$t('pages.database.image.alt')"
+ :title="$t('pages.database.image.alt')"
+ :max-width="maxWidth"
+ :max-height="maxHeight" />
+ </NuxtLink>
</v-list-item>
<v-list-item
v-if="canViewDashboard"
:title="$t('pages.database.dashboard.title')"
density="compact">
<NuxtLink
- target="_blank"
:href="`${config.public.dashboard.url}/d/${database.dashboard_uid}`">
{{ $t('pages.database.dashboard.text') }}
</NuxtLink>
diff --git a/dbrepo-ui/pages/database/[database_id]/settings.vue b/dbrepo-ui/pages/database/[database_id]/settings.vue
index 4168c58649a23765c4f371f3c322cc9b589a2ec8..e293a1748538c97745efe7fe4d61ce5d3a421094 100644
--- a/dbrepo-ui/pages/database/[database_id]/settings.vue
+++ b/dbrepo-ui/pages/database/[database_id]/settings.vue
@@ -26,7 +26,7 @@
v-if="file"
border="start"
color="warning">
- This is a only preview of your dataset image and changes are not yet saved.
+ {{ $t('pages.database.image.warn') }}
</v-alert>
<v-img
class="mt-2"
@@ -117,7 +117,7 @@
v-if="item.loading"
type="text" />
<span
- v-else>{{ item.grants.grants.join(', ') }}</span>
+ v-else>{{ item.grants?.grants.join(', ') }}</span>
</template>
<template v-slot:item.action="{ item }">
<v-btn
@@ -495,6 +495,7 @@ export default {
}
this.modifyVisibility.is_public = this.database.is_public
this.modifyOwner.id = this.database.owner.id
+ this.findGrants()
}
},
mounted () {
@@ -508,16 +509,18 @@ export default {
this.modifyVisibility.is_schema_public = this.database.is_schema_public
this.modifyVisibility.is_dashboard_enabled = this.database.is_dashboard_enabled
this.modifyOwner.id = this.database.owner.id
- this.accesses = this.database.accesses
- this.accesses.forEach(a => this.findGrant(a.user.id))
},
methods: {
submit () {
this.$refs.form.validate()
},
+ findGrants () {
+ this.accesses = this.database.accesses
+ this.accesses.forEach(a => this.findGrant(a.user.id))
+ },
closeDialog () {
- this.cacheStore.reloadDatabase()
this.editAccessDialog = false
+ this.cacheStore.reloadDatabase()
},
updateDatabaseVisibility () {
this.loading = true
@@ -540,7 +543,6 @@ export default {
return false
}
const access = this.accesses.filter(a => a.user.id === userId)[0]
- console.debug('===>', access)
access['loading'] = true
const grantService = useGrantService()
grantService.findOne(this.database.id, userId)
@@ -593,6 +595,7 @@ export default {
toast.success(this.$t('success.database.image.update'))
this.modifyImage.key = null
this.loadingImage = false
+ this.file = null;
})
.catch(({code}) => {
this.loadingImage = false
diff --git a/docker-compose.yml b/docker-compose.yml
index aec93aa4fd17a91845b6ca0be5138ff2a090559b..389f3f7fcc2137db0e6d70bc07643cf62153fefe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -158,7 +158,8 @@ services:
KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
KEYCLOAK_HOSTNAME: "${BASE_URL:-http://localhost}"
- KEYCLOAK_HOSTNAME_ADMIN: "http://localhost:8080"
+ KEYCLOAK_HOSTNAME_ADMIN: "${BASE_URL:-http://localhost}/admin/"
+ KEYCLOAK_PROXY_HEADERS: "xforwarded"
METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}"
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
diff --git a/.docs/.gitignore b/docs/.gitignore
similarity index 100%
rename from .docs/.gitignore
rename to docs/.gitignore
diff --git a/.docs/.openapi/api-analyse-service.yaml b/docs/.openapi/api-analyse-service.yaml
similarity index 99%
rename from .docs/.openapi/api-analyse-service.yaml
rename to docs/.openapi/api-analyse-service.yaml
index b32200943151d90ba32f6b8baf8b647d5cfeeda5..eed49d4de18a968dd802af40e3de1479ec5f78ad 100644
--- a/.docs/.openapi/api-analyse-service.yaml
+++ b/docs/.openapi/api-analyse-service.yaml
@@ -124,7 +124,7 @@
"url": "https://www.apache.org/licenses/LICENSE-2.0"
},
"title": "Database Repository Analyse Service API",
- "version": "1.9.2"
+ "version": "1.9.3"
},
"openapi": "3.0.0",
"paths": {
diff --git a/.docs/.openapi/api-dashboard-service.yaml b/docs/.openapi/api-dashboard-service.yaml
similarity index 100%
rename from .docs/.openapi/api-dashboard-service.yaml
rename to docs/.openapi/api-dashboard-service.yaml
diff --git a/.docs/.openapi/api-data-service.yaml b/docs/.openapi/api-data-service.yaml
similarity index 99%
rename from .docs/.openapi/api-data-service.yaml
rename to docs/.openapi/api-data-service.yaml
index 4bb63ac60782d0a356b019b559571738a8505006..9b94973a957ecdc3c45efedaaff4838abb003b06 100644
--- a/.docs/.openapi/api-data-service.yaml
+++ b/docs/.openapi/api-data-service.yaml
@@ -11,11 +11,11 @@
"name": "Apache 2.0",
"url": "https://www.apache.org/licenses/LICENSE-2.0"
},
- "version": "1.9.2"
+ "version": "1.9.3"
},
"externalDocs": {
"description": "Sourcecode Documentation",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9.2/system-services-metadata/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9.3/system-services-metadata/"
},
"servers": [
{
@@ -1361,6 +1361,16 @@
}
}
},
+ "404": {
+ "description": "Failed to find access",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/ApiErrorDto"
+ }
+ }
+ }
+ },
"409": {
"description": "Grants malformed",
"content": {
@@ -1442,6 +1452,16 @@
}
}
},
+ "404": {
+ "description": "Failed to find access",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/ApiErrorDto"
+ }
+ }
+ }
+ },
"409": {
"description": "Grants malformed",
"content": {
diff --git a/.docs/.openapi/api-metadata-service.yaml b/docs/.openapi/api-metadata-service.yaml
similarity index 98%
rename from .docs/.openapi/api-metadata-service.yaml
rename to docs/.openapi/api-metadata-service.yaml
index 11591e0d7bd446852b52045fb046368f6e790c54..1f5c0d1f778ac9db2c84d5392f40ab0b200018c2 100644
--- a/.docs/.openapi/api-metadata-service.yaml
+++ b/docs/.openapi/api-metadata-service.yaml
@@ -11,11 +11,11 @@
"name": "Apache 2.0",
"url": "https://www.apache.org/licenses/LICENSE-2.0"
},
- "version": "1.9.2"
+ "version": "1.9.3"
},
"externalDocs": {
"description": "Sourcecode Documentation",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9.2/system-services-metadata/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9.3/system-services-metadata/"
},
"servers": [
{
@@ -2964,97 +2964,6 @@
]
}
},
- "/api/database/{databaseId}/dashboard": {
- "put": {
- "tags": [
- "database-endpoint"
- ],
- "summary": "Update database dashboard uid",
- "description": "Updates the dashboard uid for a database with given id. Only the database owner can perform this operation. Requires role `system`.",
- "operationId": "modifyDashboard",
- "parameters": [
- {
- "name": "databaseId",
- "in": "path",
- "required": true,
- "schema": {
- "type": "string",
- "format": "uuid"
- }
- }
- ],
- "requestBody": {
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/DatabaseModifyDashboardDto"
- }
- }
- },
- "required": true
- },
- "responses": {
- "202": {
- "description": "Modify of dashboard uid was successful",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/DatabaseBriefDto"
- }
- }
- }
- },
- "400": {
- "description": "Malformed payload",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/ApiErrorDto"
- }
- }
- }
- },
- "404": {
- "description": "Database could not be found",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/ApiErrorDto"
- }
- }
- }
- },
- "502": {
- "description": "Connection to search service failed",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/ApiErrorDto"
- }
- }
- }
- },
- "503": {
- "description": "Failed to save in search service",
- "content": {
- "application/json": {
- "schema": {
- "$ref": "#/components/schemas/ApiErrorDto"
- }
- }
- }
- }
- },
- "security": [
- {
- "bearerAuth": []
- },
- {
- "basicAuth": []
- }
- ]
- }
- },
"/api/ontology": {
"get": {
"tags": [
@@ -7853,17 +7762,6 @@
}
}
},
- "DatabaseModifyDashboardDto": {
- "type": "object",
- "properties": {
- "uid": {
- "type": "string"
- }
- },
- "required": [
- "uid"
- ]
- },
"CreateAccessDto": {
"type": "object",
"properties": {
@@ -8955,16 +8853,16 @@
"resumptionToken": {
"type": "string"
},
- "parametersString": {
- "type": "string"
- },
- "fromDate": {
+ "untilDate": {
"type": "string",
"format": "date-time"
},
- "untilDate": {
+ "fromDate": {
"type": "string",
"format": "date-time"
+ },
+ "parametersString": {
+ "type": "string"
}
}
},
diff --git a/.docs/.openapi/api-search-service.yaml b/docs/.openapi/api-search-service.yaml
similarity index 99%
rename from .docs/.openapi/api-search-service.yaml
rename to docs/.openapi/api-search-service.yaml
index df4123760083023cdc46fe851a286b533b8c517c..143ff3c802faaf8ce80a280bd99a9edf917f62ee 100644
--- a/.docs/.openapi/api-search-service.yaml
+++ b/docs/.openapi/api-search-service.yaml
@@ -128,7 +128,7 @@
"url": "https://www.apache.org/licenses/LICENSE-2.0"
},
"title": "Database Repository Search Service API",
- "version": "1.9.2"
+ "version": "1.9.3"
},
"openapi": "3.0.0",
"paths": {
diff --git a/.docs/.openapi/api.base.yaml b/docs/.openapi/api.base.yaml
similarity index 98%
rename from .docs/.openapi/api.base.yaml
rename to docs/.openapi/api.base.yaml
index 75f7de6d14d6d57799bf9720c47d772967f3d996..d56672b3045df3df786e586b57b71221b6b94676 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.9.2
+ version: 1.9.3
openapi: 3.1.0
servers:
- description: Test Instance
diff --git a/.docs/.openapi/api.yaml b/docs/.openapi/api.yaml
similarity index 99%
rename from .docs/.openapi/api.yaml
rename to docs/.openapi/api.yaml
index 688c3e4bc14aaff6292c1a134f16b8abe3a10642..53916d88e3b1e440461fd2554a05444d8ad49954 100644
--- a/.docs/.openapi/api.yaml
+++ b/docs/.openapi/api.yaml
@@ -16,7 +16,7 @@ info:
name: Apache 2.0
url: 'https://www.apache.org/licenses/LICENSE-2.0'
title: DBRepo REST API
- version: 1.9.2
+ version: 1.9.3
servers:
- description: Test Instance
url: 'https://test.dbrepo.tuwien.ac.at'
@@ -1023,6 +1023,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
+ '404':
+ description: Failed to find access
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'409':
description: Grants malformed
content:
@@ -1072,6 +1078,12 @@ paths:
application/json:
schema:
$ref: '#/components/schemas/ApiErrorDto'
+ '404':
+ description: Failed to find access
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/ApiErrorDto'
'409':
description: Grants malformed
content:
@@ -3391,62 +3403,6 @@ paths:
security:
- bearerAuth: []
- basicAuth: []
- '/api/database/{databaseId}/dashboard':
- put:
- tags:
- - database-endpoint
- summary: Update database dashboard uid
- description: >-
- Updates the dashboard uid for a database with given id. Only the
- database owner can perform this operation. Requires role `system`.
- operationId: modifyDashboard
- parameters:
- - name: databaseId
- in: path
- required: true
- schema:
- type: string
- format: uuid
- requestBody:
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/DatabaseModifyDashboardDto'
- required: true
- responses:
- '202':
- description: Modify of dashboard uid was successful
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/DatabaseBriefDto'
- '400':
- description: Malformed payload
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
- '404':
- description: Database could not be found
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
- '502':
- description: Connection to search service failed
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
- '503':
- description: Failed to save in search service
- content:
- application/json:
- schema:
- $ref: '#/components/schemas/ApiErrorDto'
- security:
- - bearerAuth: []
- - basicAuth: []
/api/ontology:
get:
tags:
@@ -7821,13 +7777,6 @@ components:
properties:
key:
type: string
- DatabaseModifyDashboardDto:
- type: object
- properties:
- uid:
- type: string
- required:
- - uid
CreateAccessDto:
type: object
properties:
@@ -8630,14 +8579,14 @@ components:
type: string
resumptionToken:
type: string
- parametersString:
+ untilDate:
type: string
+ format: date-time
fromDate:
type: string
format: date-time
- untilDate:
+ parametersString:
type: string
- format: date-time
BannerMessageDto:
type: object
properties:
diff --git a/.docs/.openapi/custom.css b/docs/.openapi/custom.css
similarity index 100%
rename from .docs/.openapi/custom.css
rename to docs/.openapi/custom.css
diff --git a/.docs/.openapi/openapi-generate.sh b/docs/.openapi/openapi-generate.sh
similarity index 100%
rename from .docs/.openapi/openapi-generate.sh
rename to docs/.openapi/openapi-generate.sh
diff --git a/.docs/.openapi/openapi-merge.json b/docs/.openapi/openapi-merge.json
similarity index 100%
rename from .docs/.openapi/openapi-merge.json
rename to docs/.openapi/openapi-merge.json
diff --git a/.docs/.openapi/swagger-ui.html b/docs/.openapi/swagger-ui.html
similarity index 100%
rename from .docs/.openapi/swagger-ui.html
rename to docs/.openapi/swagger-ui.html
diff --git a/.docs/.prometheus/metrics-generate.sh b/docs/.prometheus/metrics-generate.sh
similarity index 100%
rename from .docs/.prometheus/metrics-generate.sh
rename to docs/.prometheus/metrics-generate.sh
diff --git a/docs/api/broker.md b/docs/api/broker.md
new file mode 100644
index 0000000000000000000000000000000000000000..34c94028f2a354a777674f3408d1c55fadf6f177
--- /dev/null
+++ b/docs/api/broker.md
@@ -0,0 +1,5 @@
+---
+author: Martin Weise
+---
+
+tbd
diff --git a/docs/api/fair-signposting.md b/docs/api/fair-signposting.md
new file mode 100644
index 0000000000000000000000000000000000000000..6f8480f3c4ac69b648df12a8cd29dd2f5252b10b
--- /dev/null
+++ b/docs/api/fair-signposting.md
@@ -0,0 +1,22 @@
+---
+author: Martin Weise
+---
+
+Signposting specifies the use of typed web links to interlink resources of a Digital Object and it specifies which link
+relation types to use to link to which resources. All of this is done in a standards-based manner, with link types drawn
+from the IANA link relation registry. FAIR Signposting is a detailed implementation guideline that aims for uniformity
+in the provision of these typed links across systems.
+
+FAIR signposting uses a standards-based REST approach and is a concrete Implementation Guideline for Signposting aimed
+at uniformity across systems: Typed web links available via landing page, content resources, metadata resources;
+Typed links are a small subset of IANA-registered relation types defined in formal specifications.
+
+Reference:
+
+* [Web Linking (RFC 8288)](https://tools.ietf.org/html/rfc8288)
+* [IANA Link Relations](https://www.iana.org/assignments/link-relations/)
+* [FAIR Signposting](https://signposting.org/FAIR/)
+
+Related:
+
+* [User Interface](../../dev/services/ui)
\ No newline at end of file
diff --git a/docs/api/index.md b/docs/api/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..7f04e6e1b8284211dfc2a64210cdcf872da8680b
--- /dev/null
+++ b/docs/api/index.md
@@ -0,0 +1,49 @@
+---
+author: Martin Weise
+---
+
+The API guide describes entry points that can be used to interact with the repository:
+
+<div class="grid cards" markdown>
+
+- :material-language-python:{ .lg .middle } **Python API**
+
+ ---
+
+ This API is a convenience wrapper for data scientists and cover most of the REST API.
+
+ [:octicons-arrow-right-24: Getting started](../api/python)
+
+- :material-api:{ .lg .middle } **REST API**
+
+ ---
+
+ This API manages the entire system. Every component can be manged using this API.
+
+ [:octicons-arrow-right-24: Getting started](../api/rest)
+
+- :material-queue-first-in-last-out:{ .lg .middle } **AMQP / MQTT API**
+
+ ---
+
+ This API can be used to ingest data from IoT sensors.
+
+ [:octicons-arrow-right-24: Getting started](../api/broker)
+
+- :material-archive-arrow-down-outline:{ .lg .middle } **OAI-PMH API**
+
+ ---
+
+ This API lets agents of metadata aggregators index datasets.
+
+ [:octicons-arrow-right-24: Getting started](../api/oai-pmh)
+
+- :material-database-outline:{ .lg .middle } **JDBC API**
+
+ ---
+
+ This API is the main connection to the MariaDB databases.
+
+ Only available to system administrators.
+
+</div>
diff --git a/docs/api/json-ld.md b/docs/api/json-ld.md
new file mode 100644
index 0000000000000000000000000000000000000000..345e0e4ff196808804474062566246c3c0b153b9
--- /dev/null
+++ b/docs/api/json-ld.md
@@ -0,0 +1,15 @@
+---
+author: Martin Weise
+---
+
+JSON-LD is a lightweight Linked Data format. It is easy for humans to read and write. It is based on the already
+successful JSON format and provides a way to help JSON data interoperate at Web-scale. JSON-LD is an ideal data format
+for programming environments, REST Web services, and unstructured databases such as Apache CouchDB and MongoDB.
+
+Reference:
+
+* [JSON for Linking Data (JSON-LD)](https://json-ld.org/)
+
+Related:
+
+* [User Interface](../../dev/services/ui)
\ No newline at end of file
diff --git a/docs/api/oai-pmh.md b/docs/api/oai-pmh.md
new file mode 100644
index 0000000000000000000000000000000000000000..7db7cf1485401732202236f826fe94eed3824ddc
--- /dev/null
+++ b/docs/api/oai-pmh.md
@@ -0,0 +1,14 @@
+---
+author: Martin Weise
+---
+
+The Open Archives Initiative Protocol for Metadata Harvesting (OAI-PMH) standard provides and endpoint to expose the
+metadata records in DBRepo in an XML format defined by version 2.0 of the OAI-PMH protocol.
+
+Reference:
+
+ * [Open Archives Initiative Protocol for Metadata Harvesting (OAI-PMH)](https://www.openarchives.org/OAI/openarchivesprotocol.html)
+
+Related:
+
+* [Metadata Service](../../dev/services/metadata-service)
\ No newline at end of file
diff --git a/docs/api/python.md b/docs/api/python.md
new file mode 100644
index 0000000000000000000000000000000000000000..9e6dd7df6b7d2cf0baf85919e45fd90857318927
--- /dev/null
+++ b/docs/api/python.md
@@ -0,0 +1,6 @@
+---
+author: Martin Weise
+---
+
+Ensure that you use the same Python library version as the target instance. For example: if you see `1.9.2` in the
+bottom left, you need to use the `1.9.2` Python library.
diff --git a/docs/api/rest.md b/docs/api/rest.md
new file mode 100644
index 0000000000000000000000000000000000000000..34c94028f2a354a777674f3408d1c55fadf6f177
--- /dev/null
+++ b/docs/api/rest.md
@@ -0,0 +1,5 @@
+---
+author: Martin Weise
+---
+
+tbd
diff --git a/.docs/contact.md b/docs/contact.md
similarity index 100%
rename from .docs/contact.md
rename to docs/contact.md
diff --git a/.docs/customization.md b/docs/customization.md
similarity index 100%
rename from .docs/customization.md
rename to docs/customization.md
diff --git a/.docs/deployment.md b/docs/deployment.md
similarity index 100%
rename from .docs/deployment.md
rename to docs/deployment.md
diff --git a/.docs/changelog.md b/docs/dev/changelog.md
similarity index 94%
rename from .docs/changelog.md
rename to docs/dev/changelog.md
index 8ea8897f5264d2bcb2c41bfbc0dbf073a051ea35..622d7a3f51ef522629dd819fd098d75ed1eb4f00 100644
--- a/.docs/changelog.md
+++ b/docs/dev/changelog.md
@@ -7,7 +7,27 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [UNRELEASED](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.9.2) - 2025-06-??
+## [v1.9.3](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.9.3) - 2025-06-06
+
+### Features
+
+* Added a Jupyter Starter notebook for data scientists that is pre-configured to use DBRepo
+ in [#529](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/529).
+
+### Changes
+
+* Gave the documentation website a major overhaul with detailed user guide, maintainer guide, animated step-by-step
+ manuals and flowcharts for better overview
+ in [#514](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/514).
+
+### Fixes
+
+* Fixed a bug where identifiers could not be created because of missing `ordinal_position` field for creators.
+* Fixed multiple bugs where access grants were mapped wrongly.
+* Fixed a bug where subsets could not be created because the wrong data source (table) was used in the data service.
+* Fixed a bug in the UI where grants were not displayed once created/update/revoked.
+
+## [v1.9.2](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.9.2) - 2025-06-05
#### Features
diff --git a/.docs/concepts/authentication.md b/docs/dev/concepts/authentication.md
similarity index 100%
rename from .docs/concepts/authentication.md
rename to docs/dev/concepts/authentication.md
diff --git a/.docs/concepts/dashboards.md b/docs/dev/concepts/dashboards.md
similarity index 94%
rename from .docs/concepts/dashboards.md
rename to docs/dev/concepts/dashboards.md
index e6dd2bf22f5d8ccdbaa8bed9e3017b7f1d9407f8..75bdba420557bfb5b7c47570a790060810fa2650 100644
--- a/.docs/concepts/dashboards.md
+++ b/docs/dev/concepts/dashboards.md
@@ -17,7 +17,7 @@ Everytime the views of the database change (e.g. a new view is added, a view is
database is provisioned.
<figure id="fig1" markdown>
-
+
<figcaption>Figure 1: Generated dashboard containing unmanaged (yellow) and managed (green) content.</figcaption>
</figure>
diff --git a/.docs/concepts/data-versioning.md b/docs/dev/concepts/data-versioning.md
similarity index 97%
rename from .docs/concepts/data-versioning.md
rename to docs/dev/concepts/data-versioning.md
index 45a7cb6e7355c85a0008e0cbdaf57c515b1a3b33..78bfcd8d1e027faabad593d27243e99646aac46a 100644
--- a/.docs/concepts/data-versioning.md
+++ b/docs/dev/concepts/data-versioning.md
@@ -12,7 +12,7 @@ end. Tuples in system-versioned tables are not *actually* modified, they are mar
(c.f. [Fig. 1](#fig1)).
<figure id="fig1" markdown>
-
+
<figcaption>Fig. 1: Data versioning in MariaDB system-versioned tables.</figcaption>
</figure>
diff --git a/.docs/concepts/data-visibility.md b/docs/dev/concepts/data-visibility.md
similarity index 100%
rename from .docs/concepts/data-visibility.md
rename to docs/dev/concepts/data-visibility.md
diff --git a/.docs/concepts/index.md b/docs/dev/concepts/index.md
similarity index 96%
rename from .docs/concepts/index.md
rename to docs/dev/concepts/index.md
index 168758f9958f2e0c98ea8fb7ea34e63963e2e0f3..b9934263c5a483943f232eaccf77f308a6a85519 100644
--- a/.docs/concepts/index.md
+++ b/docs/dev/concepts/index.md
@@ -22,6 +22,6 @@ technologies. The conceptualized microservices (c.f. [Fig. 1](#fig1)) operate th
*findability*, *accessability*, *interoperability* and *reuseability* (FAIR).
<figure id="fig1" markdown>
-
+
<figcaption>Fig. 1: Architecture of the services</figcaption>
</figure>
\ No newline at end of file
diff --git a/.docs/concepts/logging.md b/docs/dev/concepts/logging.md
similarity index 94%
rename from .docs/concepts/logging.md
rename to docs/dev/concepts/logging.md
index e205a7fbc9f7789a924c7ea6e3dea825d4471200..c012dadf604297139fca4888e68a74156d6a79a9 100644
--- a/.docs/concepts/logging.md
+++ b/docs/dev/concepts/logging.md
@@ -36,6 +36,6 @@ The logs can be inspected in the operational dashboard in `https://<hostname>/da
insight on potential errors.
<figure markdown>
-
+
<figcaption>Figure 1: Operational Dashboard for Logging</figcaption>
</figure>
diff --git a/.docs/concepts/messaging.md b/docs/dev/concepts/messaging.md
similarity index 100%
rename from .docs/concepts/messaging.md
rename to docs/dev/concepts/messaging.md
diff --git a/.docs/concepts/monitoring.md b/docs/dev/concepts/monitoring.md
similarity index 79%
rename from .docs/concepts/monitoring.md
rename to docs/dev/concepts/monitoring.md
index be70ccac4c83f5d152e0206a31cb20e93af71702..2ac87a28b72ad5bd8f5aa3907b8ecdc7f5e5be56 100644
--- a/.docs/concepts/monitoring.md
+++ b/docs/dev/concepts/monitoring.md
@@ -14,16 +14,16 @@ a [Docker container](https://prometheus.io/docs/prometheus/latest/installation/)
## Dashboards
<figure markdown>
-
+
<figcaption>Figure 1: DBRepo Dashboard</figcaption>
</figure>
<figure markdown>
-
+
<figcaption>Figure 2: Database Dashboard (Kubernetes deployment only)</figcaption>
</figure>
<figure markdown>
-
+
<figcaption>Figure 3: Broker Service Dashboard</figcaption>
</figure>
\ No newline at end of file
diff --git a/.docs/concepts/pid.md b/docs/dev/concepts/pid.md
similarity index 100%
rename from .docs/concepts/pid.md
rename to docs/dev/concepts/pid.md
diff --git a/.docs/concepts/search.md b/docs/dev/concepts/search.md
similarity index 90%
rename from .docs/concepts/search.md
rename to docs/dev/concepts/search.md
index ee738e0bd9e99fb89c4ddf867cfb8600a13f432a..dfe449ff643bcd05474132626829487c96ed2532 100644
--- a/.docs/concepts/search.md
+++ b/docs/dev/concepts/search.md
@@ -14,7 +14,7 @@ Since the repository automatically collects statistical properties (min, max, me
columns have the same semantic concept (e.g. temperature) annotated and the units of measurements can be transformed.
<figure markdown>
-
+
<figcaption>Figure 3: Two tables with compatible semantic concepts and units of measurement</figcaption>
</figure>
@@ -26,6 +26,6 @@ search service transforms the query to the dataset on the right from °F to c
between 32 - 50 °F"* instead.
<figure markdown>
-
+
<figcaption>Figure 4: Unit independent search query transformation</figcaption>
</figure>
\ No newline at end of file
diff --git a/.docs/contributing.md b/docs/dev/contributing.md
similarity index 58%
rename from .docs/contributing.md
rename to docs/dev/contributing.md
index e6f036f291267f371f59e62446770c7d65858171..ea49804b864bb35760fa13a7bfa73bf1bb494d9a 100644
--- a/.docs/contributing.md
+++ b/docs/dev/contributing.md
@@ -28,27 +28,21 @@ mvn -f ./dbrepo-metadata-service/pom.xml clean install -DskipTests
## Testing
-We practice test-driven development and require contributors to test their code with at least 90% code coverage.
-
-```shell
-make test
-```
+We practice test-driven development and require contributors to test their code with at least 80% code coverage.
The Java-based services have the coverage reports generated by `JaCoCo` in the `report/site/` subdirectory, the
Python-based services have the coverage reports generated by `coverage` in the `.coverage` SQLite3 database
and `coverage.txt` log file respectively.
We run SonarQube quality checks on the `master` branch regularly to ensure security, maintainability and remove code
-smells. The internal instance can be found at [https://s34.datalab.tuwien.ac.at/](https://s34.datalab.tuwien.ac.at/)
-(requires internal authentication).
+smells.
## Code Versioning
### Branching Strategy
<figure markdown>
-
-<figcaption>Figure 1: Branching strategy of the source code development.</figcaption>
+
</figure>
### CI/CD
@@ -57,44 +51,10 @@ We get compute resources in-kind from [dataLAB](https://www.it.tuwien.ac.at/en/s
to run our pipeline:
<figure markdown>
-
+
<figcaption>Figure 2: Gitlab runner configuration in the cluster.</figcaption>
</figure>
-Kubernetes cluster with PVC-enabled provisioner with 8 vCPU and 32GB RAM. The CI pipeline is configured as follows in
-the `config.toml`:
-
-```toml
-concurrent = 10
-[[runners]]
- executor = "kubernetes"
- environment = [
- "FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY=false"
- ]
- [runners.cache]
- Type = "s3"
- Shared = true
- [runners.cache.s3]
- ServerAddress = "storageservice-s3:9000"
- ...
- Insecure = true
- [runners.kubernetes]
- namespace = "{{.Release.Namespace}}"
- privileged = true
- allowed_services = ["docker:24-dind"]
- [[runners.kubernetes.services]]
- name = "docker:24-dind"
- alias = "docker"
- [[runners.kubernetes.volumes.empty_dir]]
- name = "rundind"
- mount_path = "/var/run/dind"
- medium = "Memory"
- [[runners.kubernetes.volumes.empty_dir]]
- name = "tmp"
- mount_path = "/tmp"
- medium = "Memory"
-```
-
For each job in the CI/CD pipeline, a pod with three containers is started:
1. `build` the main build container, you can *freely* specify any image with `image: xyz` as base
@@ -109,11 +69,4 @@ cluster.
## Documentation
-For consistency reasons across the documentation, the resolution needs to be 1280x800 (16:10 ratio)
-
-## Roadmap
-
-- [x] Q1: Python library, versioning in every component, bumping frontend versions, i18n
-- [x] Q2: Kubernetes deployment guidelines for OpenShift
-- [ ] Q3: Frontend tests, database dashboards
-- [ ] Q4: Release of 2.0.0
+For consistency reasons across the documentation, the resolution needs to be 1280x800 (16:10 ratio)
\ No newline at end of file
diff --git a/docs/dev/index.md b/docs/dev/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..d51ed95dc79f9b79642b779c029b53ac6442eeb3
--- /dev/null
+++ b/docs/dev/index.md
@@ -0,0 +1,18 @@
+---
+author: Martin Weise
+---
+
+# Development
+
+Development of DBRepo.
+
+## Support
+
+| Branch | Initial Release | End of Life |
+|-------------------------------------------------------------|-----------------|-------------|
+| <span class="support-active">:material-circle:</span> 1.9.x | 2025-05-30 | 2025-08-30 |
+| <span class="support-active">:material-circle:</span> 1.8.x | 2025-04-04 | 2025-07-04 |
+| :material-circle: 1.7.x | 2025-03-07 | 2025-06-07 |
+| :material-circle: 1.6.x | 2025-01-07 | 2025-04-07 |
+| :material-circle: 1.5.x | 2024-11-07 | 2025-01-07 |
+| :material-circle: 1.4.x | 2024-01-19 | 2025-04-19 |
\ No newline at end of file
diff --git a/.docs/api/analyse-service.md b/docs/dev/services/analyse-service.md
similarity index 92%
rename from .docs/api/analyse-service.md
rename to docs/dev/services/analyse-service.md
index 13f9956db04a808febcdc6dd5572888a0b923644..6a5154703b53a50fef5a95966de5b4c695985257 100644
--- a/.docs/api/analyse-service.md
+++ b/docs/dev/services/analyse-service.md
@@ -6,12 +6,12 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.2`](https://hub.docker.com/r/dbrepo/analyse-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.3`](https://hub.docker.com/r/dbrepo/analyse-service)
* Ports: 5000/tcp
* Prometheus: `http://<hostname>:5000/metrics`
* Health: `http://<hostname>:5000/health`
- * Swagger UI: `http://<hostname>:5000/swagger-ui/` <a href="../../rest/" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Swagger UI: `http://<hostname>:5000/swagger-ui/`
To directly access in Kubernetes (for e.g. debugging), forward the svc port to your local machine:
diff --git a/.docs/api/auth-service.md b/docs/dev/services/auth-service.md
similarity index 100%
rename from .docs/api/auth-service.md
rename to docs/dev/services/auth-service.md
diff --git a/.docs/api/broker-service.md b/docs/dev/services/broker-service.md
similarity index 100%
rename from .docs/api/broker-service.md
rename to docs/dev/services/broker-service.md
diff --git a/.docs/api/data-db.md b/docs/dev/services/data-db.md
similarity index 100%
rename from .docs/api/data-db.md
rename to docs/dev/services/data-db.md
diff --git a/.docs/api/data-service.md b/docs/dev/services/data-service.md
similarity index 95%
rename from .docs/api/data-service.md
rename to docs/dev/services/data-service.md
index cec568c4324194a37bda5b3aba72f7b9cde74d35..9dba5e974b392f6e11e71a370bd2951e15c558ea 100644
--- a/.docs/api/data-service.md
+++ b/docs/dev/services/data-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.2`](https://hub.docker.com/r/dbrepo/data-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.3`](https://hub.docker.com/r/dbrepo/data-service)
* Ports: 9093/tcp
* Info: `http://<hostname>:9093/actuator/info`
@@ -14,7 +14,7 @@ author: Martin Weise
- Readiness: `http://<hostname>:9093/actuator/health/readiness`
- Liveness: `http://<hostname>:9093/actuator/health/liveness`
* Prometheus: `http://<hostname>:9093/actuator/prometheus`
- * Swagger UI: `http://<hostname>:9093/swagger-ui/index.html` <a href="../../rest/" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Swagger UI: `http://<hostname>:9093/swagger-ui/index.html`
To directly access in Kubernetes (for e.g. debugging), forward the svc port to your local machine:
diff --git a/.docs/api/gateway-service.md b/docs/dev/services/gateway-service.md
similarity index 100%
rename from .docs/api/gateway-service.md
rename to docs/dev/services/gateway-service.md
diff --git a/.docs/api/identity-service.md b/docs/dev/services/identity-service.md
similarity index 100%
rename from .docs/api/identity-service.md
rename to docs/dev/services/identity-service.md
diff --git a/.docs/api/index.md b/docs/dev/services/index.md
similarity index 99%
rename from .docs/api/index.md
rename to docs/dev/services/index.md
index 47d5ba14d1691972a6995d141fdd3f7c1dd40c3f..38ca31778eb0706ed96e7d0b420c8f351e736e2f 100644
--- a/.docs/api/index.md
+++ b/docs/dev/services/index.md
@@ -955,7 +955,10 @@ A user wants a public database to be private and only give specific users access
client = RestClient(endpoint="http://<hostname>", username="foo",
password="bar")
- client.update_database_visibility(database_id=1, is_public=False)
+ client.update_database_visibility(<database_id>,
+ is_public=True,
+ is_schema_public=False,
+ is_dashboard_enabled=True)
```
To give a user (with id `e9bf38a0-a254-4040-87e3-92e0f09e29c8` access to this database (e.g. read access), update
@@ -967,7 +970,7 @@ A user wants a public database to be private and only give specific users access
client = RestClient(endpoint="http://<hostname>", username="foo",
password="bar")
- client.create_database_access(database_id=1,
+ client.create_database_access(<database_id>,
type=AccessType.READ,
user_id="e9bf38a0-a254-4040-87e3-92e0f09e29c8")
```
diff --git a/.docs/api/metadata-db.md b/docs/dev/services/metadata-db.md
similarity index 100%
rename from .docs/api/metadata-db.md
rename to docs/dev/services/metadata-db.md
diff --git a/.docs/api/metadata-service.md b/docs/dev/services/metadata-service.md
similarity index 87%
rename from .docs/api/metadata-service.md
rename to docs/dev/services/metadata-service.md
index bb5504676fe85ec4bd0417e41dcc35bbca90c2d8..e98e952eb106ae7ce404951ca44e6ad7e4ca6b5e 100644
--- a/.docs/api/metadata-service.md
+++ b/docs/dev/services/metadata-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.2`](https://hub.docker.com/r/dbrepo/metadata-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.3`](https://hub.docker.com/r/dbrepo/metadata-service)
* Ports: 9099/tcp
* Info: `http://<hostname>:9099/actuator/info`
@@ -14,7 +14,7 @@ author: Martin Weise
- Readiness: `http://<hostname>:9099/actuator/health/readiness`
- Liveness: `http://<hostname>:9099/actuator/health/liveness`
* Prometheus: `http://<hostname>:9099/actuator/prometheus`
- * Swagger UI: `http://<hostname>:9099/swagger-ui/index.html` <a href="../../rest/" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Swagger UI: `http://<hostname>:9099/swagger-ui/index.html`
To directly access in Kubernetes (for e.g. debugging), forward the svc port to your local machine:
@@ -50,11 +50,6 @@ DBRepo generates metadata for managed tables automatically by querying MariaDB's
The service is responsible for creating and resolving a *persistent identifier* (PID) attached to a database, subset,
table or view to obtain the metadata attached to it and allow reproduction of the exact same result.
-This service also provides an OAI-PMH endpoint for metadata aggregators
-(e.g. [OpenAIRE Graph](https://graph.openaire.eu/)). Through the User Interface, it also exposes metadata through
-JSON-LD to metadata aggregators (e.g. [Google Datasets](https://datasetsearch.research.google.com/)). PID metadata
-is always exposed, even for private databases.
-
The service generates internal PIDs, essentially representing internal URIs in
the [DataCite Metadata Schema 4.4](https://doi.org/10.14454/3w3z-sa82). This can be enhanced with activating the
external DataCite Fabrica system to generate DOIs, this is disabled by default.
@@ -64,7 +59,7 @@ To activate DOI minting, pass your DataCite Fabrica credentials in the environme
```yaml title="docker-compose.yml"
services:
dbrepo-metadata-service:
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.5
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.3
environment:
spring_profiles_active: doi
DATACITE_URL: https://api.datacite.org
diff --git a/.docs/api/metric-db.md b/docs/dev/services/metric-db.md
similarity index 100%
rename from .docs/api/metric-db.md
rename to docs/dev/services/metric-db.md
diff --git a/.docs/api/search-db.md b/docs/dev/services/search-db.md
similarity index 100%
rename from .docs/api/search-db.md
rename to docs/dev/services/search-db.md
diff --git a/.docs/api/search-service.md b/docs/dev/services/search-service.md
similarity index 92%
rename from .docs/api/search-service.md
rename to docs/dev/services/search-service.md
index 86928387a4eabac8ca9b314fa9cb098a8dbe654a..eb689ef7ccf7181d1c5629644cbd43436f80cbdb 100644
--- a/.docs/api/search-service.md
+++ b/docs/dev/services/search-service.md
@@ -6,12 +6,12 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.2`](https://hub.docker.com/r/dbrepo/search-service)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.3`](https://hub.docker.com/r/dbrepo/search-service)
* Ports: 4000/tcp
* Health: `http://<hostname>:4000/api/search/health`
* Prometheus: `http://<hostname>:4000/metrics`
- * Swagger UI: `http://<hostname>:4000/swagger-ui/` <a href="../../rest/" target="_blank">:fontawesome-solid-square-up-right: view online</a>
+ * Swagger UI: `http://<hostname>:4000/swagger-ui/`
To directly access in Kubernetes (for e.g. debugging), forward the svc port to your local machine:
diff --git a/.docs/api/storage-service.md b/docs/dev/services/storage-service.md
similarity index 100%
rename from .docs/api/storage-service.md
rename to docs/dev/services/storage-service.md
diff --git a/.docs/api/ui.md b/docs/dev/services/ui.md
similarity index 98%
rename from .docs/api/ui.md
rename to docs/dev/services/ui.md
index 09127fe8504ffc9eb565b4e761623d55dca51cc5..97c094206b6dae1573cd3c379fd545e3acca9ac0 100644
--- a/.docs/api/ui.md
+++ b/docs/dev/services/ui.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.2`](https://hub.docker.com/r/dbrepo/ui)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.3`](https://hub.docker.com/r/dbrepo/ui)
* Ports: 3000/tcp
diff --git a/.docs/examples/air.md b/docs/examples/air.md
similarity index 87%
rename from .docs/examples/air.md
rename to docs/examples/air.md
index 7c290f047c1bc45712fd52da3c00ff16a2b54d9a..209b56b3c0505d6de6090194509dc6f49dbf0563 100644
--- a/.docs/examples/air.md
+++ b/docs/examples/air.md
@@ -4,8 +4,8 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://handle.stage.datacite.org/10.82556/gd17-aq82){ .md-button .md-button--primary target="_blank" }
-[:simple-grafana: Dashboard](https://dbrepo1.ec.tuwien.ac.at/admin/grafana/d/FLB9eAv4z/airquality){ .md-button .md-button--secondary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/gd17-aq82){ .md-button .md-button--primary target="_blank" }
+[:simple-grafana: Dashboard](https://dbrepo1.ec.tuwien.ac.at/dashboard/d/aehxhey228740f){ .md-button .md-button--secondary target="_blank" }
## Description
diff --git a/.docs/examples/covid-19.md b/docs/examples/covid-19.md
similarity index 84%
rename from .docs/examples/covid-19.md
rename to docs/examples/covid-19.md
index ba986e76e9275de13e0be646e908ad8e38256d65..868d0e25eb4ae8e87468882ef2ad34099ab7aad8 100644
--- a/.docs/examples/covid-19.md
+++ b/docs/examples/covid-19.md
@@ -4,7 +4,7 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/15){ .md-button .md-button--primary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/kvsg-a919){ .md-button .md-button--primary target="_blank" }
[:simple-github: Archive](https://github.com/CSSEGISandData/COVID-19){ .md-button .md-button--secondary target="_blank" }
## Description
diff --git a/.docs/examples/hazard.md b/docs/examples/hazard.md
similarity index 92%
rename from .docs/examples/hazard.md
rename to docs/examples/hazard.md
index 32e39c1691bf338e050bec9902e1099259276bbd..ee56c2a830cfbc22aa946e9073e648e10fc9de43 100644
--- a/.docs/examples/hazard.md
+++ b/docs/examples/hazard.md
@@ -4,7 +4,7 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/51){ .md-button .md-button--primary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/t5ay-3e73){ .md-button .md-button--primary target="_blank" }
[:material-file-document: Archive](https://doi.org/10.48436/yaecs-dgr27){ .md-button .md-button--secondary target="_blank" }
## Description
diff --git a/.docs/examples/health.md b/docs/examples/health.md
similarity index 88%
rename from .docs/examples/health.md
rename to docs/examples/health.md
index ebd2673c4423f604e0aa74d5a552e09212d00d4b..1805917b45272473822f05aa4368d0b22eeb8d88 100644
--- a/.docs/examples/health.md
+++ b/docs/examples/health.md
@@ -4,7 +4,7 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/32/info){ .md-button .md-button--primary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/0b376dda-04ac-46de-a665-2ab053b8a7f0){ .md-button .md-button--primary target="_blank" }
## Description
diff --git a/.docs/examples/lute-data.md b/docs/examples/lute-data.md
similarity index 85%
rename from .docs/examples/lute-data.md
rename to docs/examples/lute-data.md
index bceecd90529a6dc47bc0ac44895cc1847daf0121..c90a1c4cbc299eb3ee47a07dee10c938cc25e1b8 100644
--- a/.docs/examples/lute-data.md
+++ b/docs/examples/lute-data.md
@@ -2,6 +2,8 @@
author: Martin Weise
---
+[:fontawesome-solid-database: Internal Dataset](https://handle.test.datacite.org/10.82556/6ejq-jv72){ .md-button .md-button--primary target="_blank" }
+
## tl;dr
tbd
@@ -26,6 +28,7 @@ tbd
- [x] Data preservation of historic data
- [x] Subset exploration
- [x] External visualization of the database
+- [x] Data mirroring
## Acknowledgement
diff --git a/.docs/examples/music.md b/docs/examples/music.md
similarity index 90%
rename from .docs/examples/music.md
rename to docs/examples/music.md
index 02a848d59d02142a20a1ffeb403ca634eeb7fc59..f2d16cbf60bce1f072cf55bc3cbbcaddd8af77fa 100644
--- a/.docs/examples/music.md
+++ b/docs/examples/music.md
@@ -4,7 +4,7 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/34){ .md-button .md-button--primary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/zxww-q738){ .md-button .md-button--primary target="_blank" }
[:material-file-document: Archive](https://gitlab.tuwien.ac.at/martin.weise/fairnb){ .md-button .md-button--secondary target="_blank" }
## Description
diff --git a/.docs/examples/power.md b/docs/examples/power.md
similarity index 92%
rename from .docs/examples/power.md
rename to docs/examples/power.md
index e85b1b98ce32b675829a67866fb3bef4340cd965..54651bf5d928cb43e47e5771e719ad285292b747 100644
--- a/.docs/examples/power.md
+++ b/docs/examples/power.md
@@ -4,7 +4,7 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/18/info){ .md-button .md-button--primary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/14daff7e-9dae-4ba0-9887-6ded15572c4e){ .md-button .md-button--primary target="_blank" }
## Description
diff --git a/.docs/examples/survey.md b/docs/examples/survey.md
similarity index 81%
rename from .docs/examples/survey.md
rename to docs/examples/survey.md
index c30f5efb67efc827474dd7a33cba99ae73af323d..cd6219eeffccfad8250cfa2b1637dfbb620e41fb 100644
--- a/.docs/examples/survey.md
+++ b/docs/examples/survey.md
@@ -4,8 +4,8 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://handle.stage.datacite.org/10.82556/g2ac-vh88){ .md-button .md-button--primary target="_blank" }
-[:simple-jupyter: Notebook](https://binder.science.datalab.tuwien.ac.at/v2/git/https%3A%2F%2Fgitlab.tuwien.ac.at%2Fmartin.weise%2Ftres/HEAD){ .md-button .md-button--secondary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/g2ac-vh88){ .md-button .md-button--primary target="_blank" }
+[:simple-jupyter: Notebook](https://gitlab.tuwien.ac.at/martin.weise/tres/-/blob/master/analysis.ipynb){ .md-button .md-button--secondary target="_blank" }
## Description
diff --git a/.docs/examples/theater.md b/docs/examples/theater.md
similarity index 66%
rename from .docs/examples/theater.md
rename to docs/examples/theater.md
index 2ea453cfc9077f07490eada2c3d7c38f401053cf..b55acfc0a7950f21db4ab4f7c377bfd521f7705c 100644
--- a/.docs/examples/theater.md
+++ b/docs/examples/theater.md
@@ -4,11 +4,11 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/52){ .md-button .md-button--primary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/t4ws-qn29){ .md-button .md-button--primary target="_blank" }
## Description
-This section will be expanded soon.
+This dataset is a donation from Prof. Dr. Bernhard Jahn in support of DBRepo.
## Solution
diff --git a/.docs/examples/transportation.md b/docs/examples/transportation.md
similarity index 74%
rename from .docs/examples/transportation.md
rename to docs/examples/transportation.md
index a99f78941355bd9d1d19d65fb33b1c8aa01a5b20..2ab76382e56ef5fac0236f4bd259f1a8992ecbc8 100644
--- a/.docs/examples/transportation.md
+++ b/docs/examples/transportation.md
@@ -4,8 +4,8 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/14){ .md-button .md-button--primary target="_blank" }
-[:simple-grafana: Dashboard](https://dbrepo1.ec.tuwien.ac.at/admin/grafana/d/8meGcJD4k/wiener-linien){ .md-button .md-button--secondary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://handle.test.datacite.org/10.82556/g00j-se74){ .md-button .md-button--primary target="_blank" }
+[:simple-grafana: Dashboard](https://dbrepo1.ec.tuwien.ac.at/dashboard/d/cehxheycgsyyob){ .md-button .md-button--secondary target="_blank" }
## Description
@@ -28,4 +28,5 @@ agency directly and feeds it, after some cleaning, into DBRepo on a 5-minute int
- [x] Dynamic data (live data)
- [x] System versioning
- [x] Subset exploration
-- [x] External visualization of the database
\ No newline at end of file
+- [x] External visualization of the database
+- [x] Mix of managed and unmanaged content for dashboards
\ No newline at end of file
diff --git a/.docs/examples/xps-data.md b/docs/examples/xps-data.md
similarity index 88%
rename from .docs/examples/xps-data.md
rename to docs/examples/xps-data.md
index 9b237c8c6c8ec2be919751475f810605a9ee1925..65c13a3dde405a8bfb83bae84e9d919a2b8730b1 100644
--- a/.docs/examples/xps-data.md
+++ b/docs/examples/xps-data.md
@@ -4,8 +4,8 @@ author: Martin Weise
## tl;dr
-[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/27/info){ .md-button .md-button--primary target="_blank" }
-[:simple-jupyter: Notebook](https://binder.science.datalab.tuwien.ac.at/v2/git/https%3A%2F%2Fgitlab.tuwien.ac.at%2Ffairdata%2Fxps/HEAD){ .md-button .md-button--secondary target="_blank" }
+[:fontawesome-solid-database: Dataset](https://dbrepo1.ec.tuwien.ac.at/database/c0166b0b-cb1b-4a67-a2f0-0cd695ad65fc){ .md-button .md-button--primary target="_blank" }
+[:simple-jupyter: Notebook](https://gitlab.tuwien.ac.at/crdm/xps/-/blob/master/analysis.ipynb){ .md-button .md-button--secondary target="_blank" }
## Description
diff --git a/.docs/get-started.md b/docs/get-started.md
similarity index 100%
rename from .docs/get-started.md
rename to docs/get-started.md
diff --git a/docs/help.md b/docs/help.md
new file mode 100644
index 0000000000000000000000000000000000000000..0108befadbc31f2a102c22826095f5307db3bad8
--- /dev/null
+++ b/docs/help.md
@@ -0,0 +1,17 @@
+---
+author: Martin Weise
+---
+
+If you need help getting started with DBRepo or with advanced usage, the following sources may be useful.
+
+## Usage Documentation
+
+The [User Guide]() documentation is the most complete guide on how to use DBRepo.
+
+## API Documentation
+
+The [API documentation](../api/) present reference docs for all APIs.
+
+!!! info "Additional Help"
+
+ [Contact us](../contact) via e-mail.
\ No newline at end of file
diff --git a/.docs/images/TU_Signet_weiss_transparent_300dpi_RGB.png b/docs/images/TU_Signet_weiss_transparent_300dpi_RGB.png
similarity index 100%
rename from .docs/images/TU_Signet_weiss_transparent_300dpi_RGB.png
rename to docs/images/TU_Signet_weiss_transparent_300dpi_RGB.png
diff --git a/.docs/images/_mark.psd b/docs/images/_mark.psd
similarity index 100%
rename from .docs/images/_mark.psd
rename to docs/images/_mark.psd
diff --git a/.docs/images/architecture-ui.svg b/docs/images/architecture-ui.svg
similarity index 100%
rename from .docs/images/architecture-ui.svg
rename to docs/images/architecture-ui.svg
diff --git a/.docs/images/architecture-upload-service.svg b/docs/images/architecture-upload-service.svg
similarity index 100%
rename from .docs/images/architecture-upload-service.svg
rename to docs/images/architecture-upload-service.svg
diff --git a/docs/images/architecture.drawio b/docs/images/architecture.drawio
new file mode 100644
index 0000000000000000000000000000000000000000..0e55aec5d162b559852488a54a526ee23a73c849
--- /dev/null
+++ b/docs/images/architecture.drawio
@@ -0,0 +1,1278 @@
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/27.0.9 Chrome/134.0.6998.205 Electron/35.4.0 Safari/537.36" version="27.0.9" pages="9">
+ <diagram id="mvBsv1rP8O80Qe3yGnn_" name="docker-compose">
+ <mxGraphModel dx="982" dy="396" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-97" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;jumpStyle=arc;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="775" y="480" />
+ <mxPoint x="660" y="480" />
+ <mxPoint x="660" y="240" />
+ <mxPoint x="618" y="240" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-98" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-97" vertex="1" connectable="0">
+ <mxGeometry x="0.7012" y="1" relative="1" as="geometry">
+ <mxPoint x="-19" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-143" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;jumpStyle=arc;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="395" y="480" />
+ <mxPoint x="500" y="480" />
+ <mxPoint x="500" y="240" />
+ <mxPoint x="553" y="240" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-144" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-143" vertex="1" connectable="0">
+ <mxGeometry x="0.6707" relative="1" as="geometry">
+ <mxPoint x="17" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-77" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=classic;endFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-108" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="668" y="206" />
+ <mxPoint x="668" y="400" />
+ <mxPoint x="775" y="400" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-78" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-77" vertex="1" connectable="0">
+ <mxGeometry x="-0.2051" y="1" relative="1" as="geometry">
+ <mxPoint x="61" y="40" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-79" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-77" vertex="1" connectable="0">
+ <mxGeometry x="-0.3724" relative="1" as="geometry">
+ <mxPoint x="62" y="105" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-81" value="LDAP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-96" target="FWEJ_FGA9GBXbfwohBE8-104" edge="1">
+ <mxGeometry x="-0.2381" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-82" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="352.5" y="658" width="85" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-83" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=0;exitDx=0;exitDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;entryX=0.25;entryY=1;entryDx=0;entryDy=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-92" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-84" value="AMQP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-83" vertex="1" connectable="0">
+ <mxGeometry x="-0.0476" y="-1" relative="1" as="geometry">
+ <mxPoint x="-1" y="-4" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-85" value="Data Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="330" y="504" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-86" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-137" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-87" value="JDBC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-86" vertex="1" connectable="0">
+ <mxGeometry x="0.3566" relative="1" as="geometry">
+ <mxPoint y="-11" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-88" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-92" target="FWEJ_FGA9GBXbfwohBE8-96" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-89" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-88" vertex="1" connectable="0">
+ <mxGeometry x="-0.1051" y="-1" relative="1" as="geometry">
+ <mxPoint x="3" y="-1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-90" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-92" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="395" y="400" />
+ <mxPoint x="490" y="400" />
+ <mxPoint x="490" y="206" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-91" value="<div>AMQP,<br>MQTT</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-90" vertex="1" connectable="0">
+ <mxGeometry x="-0.1797" y="2" relative="1" as="geometry">
+ <mxPoint x="-18" y="23" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-92" value="<b>Broker Service</b><div><i>rabbitmq</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="330" y="422" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-96" value="<b>Identity Service</b><div><i>openldap</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="520" y="422" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-99" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=0;entryDx=0;entryDy=0;jumpStyle=arc;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-85" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="743" y="490" />
+ <mxPoint x="427" y="490" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-100" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-99" vertex="1" connectable="0">
+ <mxGeometry x="0.3494" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-101" value="Metadata Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="710" y="504" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-102" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-104" target="FWEJ_FGA9GBXbfwohBE8-101" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-103" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-102" vertex="1" connectable="0">
+ <mxGeometry x="-0.1111" relative="1" as="geometry">
+ <mxPoint x="3" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-106" value="<i>mariadb</i>" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="750" y="256" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-107" value="search-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="732.5" y="320.5" width="85" height="17" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-111" value="psql" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;fontStyle=2" parent="1" vertex="1">
+ <mxGeometry x="560" y="584" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-112" value="auth-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="542.5" y="648" width="85" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-115" value="HTTP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0;entryY=0.25;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-105" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-117" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-123" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="480" y="196" />
+ <mxPoint x="480" y="360" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-118" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-117" vertex="1" connectable="0">
+ <mxGeometry x="0.5551" y="-1" relative="1" as="geometry">
+ <mxPoint x="-9" y="-20" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="uDJ2bVtIrgoZBCZFZmDG-12" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-119" value="<b>Gateway Service</b><div><i>nginx</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="520" y="176" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-121" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-123" target="FWEJ_FGA9GBXbfwohBE8-120" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-122" value="S3" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-121" vertex="1" connectable="0">
+ <mxGeometry x="0.0536" relative="1" as="geometry">
+ <mxPoint y="1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-123" value="Analyse Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="330" y="340" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-125" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-105" target="FWEJ_FGA9GBXbfwohBE8-106" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-126" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-125" vertex="1" connectable="0">
+ <mxGeometry x="-0.0782" y="-1" relative="1" as="geometry">
+ <mxPoint x="2" y="1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-127" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-128" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="585" y="110" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-128" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="520" y="69" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-129" value="Database<div>Engineer</div>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="490" y="586" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-133" value="JDBC" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-104" target="FWEJ_FGA9GBXbfwohBE8-111" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-134" value="System<div>Engineer</div>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="650" y="586" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-135" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="339.5" y="584" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-136" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="399.5" y="584" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-137" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="369.5" y="594" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-138" value="mariadb-galera" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;fontStyle=2" parent="1" vertex="1">
+ <mxGeometry x="320" y="575" width="150" height="105" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-139" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;dashed=1;entryX=1.004;entryY=0.397;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-129" target="FWEJ_FGA9GBXbfwohBE8-138" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="460" y="616" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-140" value="User Interface" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="710" y="340" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-141" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-142" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="585" y="110" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-142" value="Machine" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="620" y="69" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-147" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-140" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="683" y="196" />
+ <mxPoint x="683" y="360" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-148" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-147" vertex="1" connectable="0">
+ <mxGeometry x="0.0179" relative="1" as="geometry">
+ <mxPoint y="8" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-149" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.25;entryDx=0;entryDy=0;jumpStyle=arc;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-105" target="FWEJ_FGA9GBXbfwohBE8-101" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="697" y="206" />
+ <mxPoint x="697" y="514" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-150" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-149" vertex="1" connectable="0">
+ <mxGeometry x="-0.5289" y="-1" relative="1" as="geometry">
+ <mxPoint x="4" y="34" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="a_cl7nsyDpLQFaXOHeFD-3" value="prom" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;fontStyle=2;fontSize=12;" parent="1" vertex="1">
+ <mxGeometry x="370" y="164" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="a_cl7nsyDpLQFaXOHeFD-4" value="metric-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="352" y="228" width="85" height="17" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-5" target="FWEJ_FGA9GBXbfwohBE8-105" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-5" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="850" y="189" width="40" height="14" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-8" target="FWEJ_FGA9GBXbfwohBE8-108" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-8" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="850" y="435.5" width="40" height="13" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-10" target="FWEJ_FGA9GBXbfwohBE8-120" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-10" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="280" y="272" width="40" height="12" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-12" value="<b>Dashboard UI</b><div><i>grafana</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="520" y="258" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endSize=4;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-14" target="FWEJ_FGA9GBXbfwohBE8-104" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-18" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endSize=0;startSize=0;jumpSize=3;" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-14" target="FWEJ_FGA9GBXbfwohBE8-104" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-14" value="init" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="470" y="517.5" width="40" height="13" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-104" value="<b>Auth Service</b><br><i>keycloak</i>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="520" y="504" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-120" value="<b>Storage Service</b><div><i>seaweedfs</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="329.5" y="258" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-105" value="Search Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="710" y="176" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-108" value="<b>Dashboard Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="710" y="422" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-21" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="732.5" y="657.61" width="85" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-23" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="719.5" y="583.61" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-24" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="779.5" y="583.61" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-25" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="750.5" y="593.61" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="1" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="774.86" y="544" as="sourcePoint" />
+ <mxPoint x="774.86" y="594" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-30" value="JDBC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="uDJ2bVtIrgoZBCZFZmDG-29" vertex="1" connectable="0">
+ <mxGeometry x="0.3566" relative="1" as="geometry">
+ <mxPoint x="1" y="-12" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="CEhTLEpK94wtDmjaM6P2-1" value="<i>psql</i>" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="560" y="328" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="CEhTLEpK94wtDmjaM6P2-2" value="dashboard-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" vertex="1" parent="1">
+ <mxGeometry x="542.5" y="392" width="85" height="17" as="geometry" />
+ </mxCell>
+ <mxCell id="CEhTLEpK94wtDmjaM6P2-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="uDJ2bVtIrgoZBCZFZmDG-12" target="CEhTLEpK94wtDmjaM6P2-1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="CEhTLEpK94wtDmjaM6P2-4" value="JDBC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="CEhTLEpK94wtDmjaM6P2-3">
+ <mxGeometry x="-0.3333" relative="1" as="geometry">
+ <mxPoint y="1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uDJ2bVtIrgoZBCZFZmDG-26" value="mariadb-galera" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;fontStyle=2" parent="1" vertex="1">
+ <mxGeometry x="700" y="574.61" width="150" height="105" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram name="ui" id="GYXS_N4ymJ7hX3zLKvDC">
+ <mxGraphModel dx="1372" dy="1098" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="ihsuRJ9dWuDPEHVUeUyY-0" />
+ <mxCell id="ihsuRJ9dWuDPEHVUeUyY-1" parent="ihsuRJ9dWuDPEHVUeUyY-0" />
+ <mxCell id="IRxpwOfG2jHF0YoYJLJK-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;fillColor=default;strokeColor=#000000;gradientColor=none;shadow=0;gradientDirection=radial;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="30" y="320" width="465" height="278" as="geometry" />
+ </mxCell>
+ <mxCell id="IRxpwOfG2jHF0YoYJLJK-0" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;fillColor=#FFFFFF;strokeColor=#000000;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="30" y="116" width="464" height="201" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-0" value="User Interface" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="197" y="259" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-1" value="Vuetify<br>(ui library)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="359" y="410" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="5if0HzVKwC5VdDnFuonI-9" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="kLNLoM7m2o6o68vp3Wb9-1" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="5if0HzVKwC5VdDnFuonI-6" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-30" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-2" target="5if0HzVKwC5VdDnFuonI-27" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-2" value="Vue.js<br>(framework)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="197" y="410" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-3" target="kLNLoM7m2o6o68vp3Wb9-4" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-3" value="Pinia Persist Plugin<br>(state)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DAE8FC;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="37" y="259" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-4" value="Local Storage" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;fillColor=#DAE8FC;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="72" y="146.6" width="60" height="80" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-10" target="kLNLoM7m2o6o68vp3Wb9-12" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-10" target="kLNLoM7m2o6o68vp3Wb9-2" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-10" value="Node<br>(runtime)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="197" y="478" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;dashed=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-13" target="kLNLoM7m2o6o68vp3Wb9-18" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-20" value="refresh_token" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="kLNLoM7m2o6o68vp3Wb9-19" vertex="1" connectable="0">
+ <mxGeometry x="0.5604" y="1" relative="1" as="geometry">
+ <mxPoint x="1" y="34" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="kLNLoM7m2o6o68vp3Wb9-12" target="kLNLoM7m2o6o68vp3Wb9-13" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-12" value="Axios" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="197" y="548" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-13" value="Storage Service<br style="border-color: var(--border-color);">(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="530" y="548" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="kLNLoM7m2o6o68vp3Wb9-18" value="Authentication Service<br style="border-color: var(--border-color);">(Keycloak)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="530" y="410" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="4DtipyiVSSVc0IyAwunU-1" value="client-side" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="33" y="120" width="60" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="4DtipyiVSSVc0IyAwunU-2" value="server-side" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="34" y="324" width="64" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="4DtipyiVSSVc0IyAwunU-4" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/e/e1/Google_Chrome_icon_%28February_2022%29.svg/2048px-Google_Chrome_icon_%28February_2022%29.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="98" y="120" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="4DtipyiVSSVc0IyAwunU-6" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Firefox_logo%2C_2019.svg/1200px-Firefox_logo%2C_2019.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="123" y="119.59999999999997" width="20" height="20.8" as="geometry" />
+ </mxCell>
+ <mxCell id="GqgzYKxcxpW_CC4_t2HJ-0" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="508" y="606" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="GqgzYKxcxpW_CC4_t2HJ-1" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="545.5" y="606" width="114.5" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="GqgzYKxcxpW_CC4_t2HJ-2" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="508" y="626" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="GqgzYKxcxpW_CC4_t2HJ-3" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="545.5" y="626" width="114.5" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="GqgzYKxcxpW_CC4_t2HJ-4" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="523" y="606" width="15" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="wEgBe73B2rnMap29lm9I-0" target="kLNLoM7m2o6o68vp3Wb9-0" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="wEgBe73B2rnMap29lm9I-0" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="46" y="20" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="5if0HzVKwC5VdDnFuonI-6" target="kLNLoM7m2o6o68vp3Wb9-0" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-6" value="Vite<br>(builder)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="197" y="339" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="5if0HzVKwC5VdDnFuonI-9" target="kLNLoM7m2o6o68vp3Wb9-3" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-9" value="Pinia<br>(state)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#DAE8FC;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="37" y="410" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-10" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/1/1c/Pinialogo.svg/1200px-Pinialogo.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="49" y="418.41999999999996" width="15.5" height="23.17" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-11" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/9/95/Vue.js_Logo_2.svg/640px-Vue.js_Logo_2.svg.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="209.87" y="420.57" width="21.75" height="18.86" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-26" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://seeklogo.com/images/V/vite-logo-BFD4283991-seeklogo.com.png;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="210.75" y="348" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" source="5if0HzVKwC5VdDnFuonI-27" target="5if0HzVKwC5VdDnFuonI-6" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-27" value="Nuxt<br>(framework)" style="rounded=1;whiteSpace=wrap;html=1;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="359" y="339" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-33" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://cdn.vuetifyjs.com/images/logos/logo.svg;" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="370.62" y="419.78" width="23" height="20.44" as="geometry" />
+ </mxCell>
+ <mxCell id="5if0HzVKwC5VdDnFuonI-34" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://nuxt.com/assets/design-kit/icon-green.svg;clipPath=inset(21.33% 8.33% 22% 7.67%);" parent="ihsuRJ9dWuDPEHVUeUyY-1" vertex="1">
+ <mxGeometry x="371.72" y="350.98" width="20.8" height="14.03" as="geometry" />
+ </mxCell>
+ <mxCell id="wjwh4gSCingDzarWVrMb-1" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/d/d9/Node.js_logo.svg/590px-Node.js_logo.svg.png;" vertex="1" parent="ihsuRJ9dWuDPEHVUeUyY-1">
+ <mxGeometry x="201" y="487" width="35.86" height="22" as="geometry" />
+ </mxCell>
+ <mxCell id="wjwh4gSCingDzarWVrMb-2" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://user-images.githubusercontent.com/43313420/105893220-1bae8780-6013-11eb-87be-eeac845ecc6f.png;" vertex="1" parent="ihsuRJ9dWuDPEHVUeUyY-1">
+ <mxGeometry x="211.8" y="553.22" width="17.9" height="29.55" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram name="upload-service" id="Intd5LFI1o1DnwmU276U">
+ <mxGraphModel dx="1372" dy="1098" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="583" pageHeight="413" math="0" shadow="0">
+ <root>
+ <mxCell id="t3MVFbP-u93KWKySnz03-0" />
+ <mxCell id="t3MVFbP-u93KWKySnz03-1" parent="t3MVFbP-u93KWKySnz03-0" />
+ <mxCell id="t3MVFbP-u93KWKySnz03-21" value="Storage Service<br style="border-color: var(--border-color);">(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="388" y="254" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="XXOSSsn7GNvguvu12Izz-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;dashed=1;" parent="t3MVFbP-u93KWKySnz03-1" source="t3MVFbP-u93KWKySnz03-22" target="t3MVFbP-u93KWKySnz03-21" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="XXOSSsn7GNvguvu12Izz-2" value="S3" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="XXOSSsn7GNvguvu12Izz-1" vertex="1" connectable="0">
+ <mxGeometry x="-0.214" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="t3MVFbP-u93KWKySnz03-22" value="Upload Service<br>(TUSd)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="388" y="170" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="t3MVFbP-u93KWKySnz03-28" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="368" y="326" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="t3MVFbP-u93KWKySnz03-29" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="405.5" y="326" width="114.5" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="t3MVFbP-u93KWKySnz03-30" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="368" y="346" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="t3MVFbP-u93KWKySnz03-31" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="405.5" y="346" width="114.5" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="t3MVFbP-u93KWKySnz03-32" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="383" y="326" width="15" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-0" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=9;fillColor=#FFFFFF;strokeColor=#000000;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="17" y="250" width="320" height="48" as="geometry" />
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=6;fillColor=#FFFFFF;strokeColor=#000000;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="17" y="160" width="320" height="80" as="geometry" />
+ </mxCell>
+ <mxCell id="XXOSSsn7GNvguvu12Izz-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="t3MVFbP-u93KWKySnz03-1" source="lcH7hTO0wd4oNimF5SfX-2" target="t3MVFbP-u93KWKySnz03-22" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="XXOSSsn7GNvguvu12Izz-3" value="TUSd" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="XXOSSsn7GNvguvu12Izz-0" vertex="1" connectable="0">
+ <mxGeometry x="0.2482" relative="1" as="geometry">
+ <mxPoint x="-4" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-2" value="User Interface" style="rounded=1;whiteSpace=wrap;html=1;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="190" y="170" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-16" value="client-side" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="23" y="167" width="60" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-17" value="server-side<br>(Nuxt)" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="24" y="261" width="64" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-18" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/e/e1/Google_Chrome_icon_%28February_2022%29.svg/2048px-Google_Chrome_icon_%28February_2022%29.svg.png;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="88" y="167" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="lcH7hTO0wd4oNimF5SfX-19" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/a/a0/Firefox_logo%2C_2019.svg/1200px-Firefox_logo%2C_2019.svg.png;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="113" y="166.59999999999997" width="20" height="20.8" as="geometry" />
+ </mxCell>
+ <mxCell id="l6EjH4y-yBJY-nxj2eUf-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="t3MVFbP-u93KWKySnz03-1" source="l6EjH4y-yBJY-nxj2eUf-1" target="lcH7hTO0wd4oNimF5SfX-2" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="255" y="170" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="xlAJL46O4fjLn4VFTtzb-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="t3MVFbP-u93KWKySnz03-1" source="l6EjH4y-yBJY-nxj2eUf-1" target="t3MVFbP-u93KWKySnz03-22" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="xlAJL46O4fjLn4VFTtzb-2" value="TUSd" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="xlAJL46O4fjLn4VFTtzb-1" vertex="1" connectable="0">
+ <mxGeometry x="-0.4123" y="2" relative="1" as="geometry">
+ <mxPoint x="-4" y="2" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="l6EjH4y-yBJY-nxj2eUf-1" value="Researcher" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="t3MVFbP-u93KWKySnz03-1" vertex="1">
+ <mxGeometry x="340" y="50" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="L91YYZmKAeZpfxyys9hG-0" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://nuxt.com/assets/design-kit/icon-green.svg;clipPath=inset(21.33% 8.33% 22% 7.67%);" vertex="1" parent="t3MVFbP-u93KWKySnz03-1">
+ <mxGeometry x="92.20000000000005" y="266.98" width="20.8" height="14.03" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram id="n3Gsc6DDUkQ8nNTTz0wk" name="data-db">
+ <mxGraphModel dx="1434" dy="172" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1019" pageHeight="650" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="S8wz9ZtwZs3Sd4maCRdY-9" value="shared filesystem<br>/tmp" style="rounded=1;whiteSpace=wrap;html=1;arcSize=3;verticalAlign=bottom;fontStyle=2" parent="1" vertex="1">
+ <mxGeometry x="425" y="840" width="248" height="130" as="geometry" />
+ </mxCell>
+ <mxCell id="S8wz9ZtwZs3Sd4maCRdY-11" value="jdbc" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;exitPerimeter=0;endArrow=none;endFill=0;startArrow=classic;startFill=1;" parent="1" source="S8wz9ZtwZs3Sd4maCRdY-1" edge="1">
+ <mxGeometry x="0.3769" relative="1" as="geometry">
+ <mxPoint x="472.71428571428555" y="810" as="targetPoint" />
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="S8wz9ZtwZs3Sd4maCRdY-1" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="447.5" y="857" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="S8wz9ZtwZs3Sd4maCRdY-2" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="431.5" y="919" width="85" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="S8wz9ZtwZs3Sd4maCRdY-12" value="http" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="1" source="S8wz9ZtwZs3Sd4maCRdY-7" edge="1">
+ <mxGeometry x="0.4743" relative="1" as="geometry">
+ <mxPoint x="585.0952380952381" y="810" as="targetPoint" />
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="m0IQrUpga-DAo2afT193-3" value="S3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="S8wz9ZtwZs3Sd4maCRdY-7" target="m0IQrUpga-DAo2afT193-1" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="S8wz9ZtwZs3Sd4maCRdY-7" value="Data DB Sidecar" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="520" y="869" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="m0IQrUpga-DAo2afT193-1" value="Storage Service<br style="border-color: var(--border-color);">(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="720" y="869" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="WQwfQuj7Yb_D7RAfNHcl-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="667.5" y="980" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="WQwfQuj7Yb_D7RAfNHcl-2" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="705" y="980" width="140" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="WQwfQuj7Yb_D7RAfNHcl-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="667.5" y="1000" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="WQwfQuj7Yb_D7RAfNHcl-4" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="705" y="1000" width="140" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="WQwfQuj7Yb_D7RAfNHcl-5" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="682.5" y="980" width="15" height="16" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram id="Uhf8Gh-EQdBRKzm7U-8d" name="auth-service">
+ <mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-3" target="Gou0UibUgwIY_gQY8MW6-4" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-2" value="include" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="Gou0UibUgwIY_gQY8MW6-1" vertex="1" connectable="0">
+ <mxGeometry x="-0.2248" y="1" relative="1" as="geometry">
+ <mxPoint x="-9" y="-1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-3" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=7;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="223.5" y="156" width="141" height="424" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-4" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=7;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="2" y="156" width="141" height="424" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-6" target="Gou0UibUgwIY_gQY8MW6-12" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-6" value="Researchers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="12" y="4" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-7" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-8" target="Gou0UibUgwIY_gQY8MW6-14" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-8" value="Developers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="234" y="4" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gou0UibUgwIY_gQY8MW6-10" target="Gou0UibUgwIY_gQY8MW6-16" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-10" value="Data Steward" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="452" y="4" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-12" target="Gou0UibUgwIY_gQY8MW6-4" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-12" value="default-researcher-roles" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12" y="74" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-14" target="Gou0UibUgwIY_gQY8MW6-3" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="294.17499999999995" y="155.27999999999997" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-14" value="default-developer-roles" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="234" y="74" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="Gou0UibUgwIY_gQY8MW6-16" target="Gou0UibUgwIY_gQY8MW6-27" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-16" value="default-data-steward-roles" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="452" y="74" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-17" value="default-user-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12.5" y="466" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-18" value="default-identifier-handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12.5" y="406" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-19" value="default-database-handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12.5" y="226" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-20" value="default-container-handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12.5" y="166" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-21" value="default-table-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12.5" y="286" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-22" value="default-query-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12.5" y="346" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-23" value="escalated-container-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="234" y="226" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-24" value="escalated-database-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="234" y="286" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-25" value="escalated-query-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="234" y="406" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-26" value="escalated-table-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="234" y="346" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-27" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=7;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="441.5" y="156" width="141" height="424" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-28" value="escalated-identifier-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="452" y="286" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-29" value="default-semantics-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="12" y="530" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-30" value="default-maintenance-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="234" y="166" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-31" value="default-user-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="452" y="166" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-32" value="default-semantics-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="452" y="226" width="120" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="Gou0UibUgwIY_gQY8MW6-33" value="escalated-semantics-<br>handling" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="452" y="346" width="120" height="40" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram id="e2fuorb2m_XjboQ7R7_y" name="data-ingest">
+ <mxGraphModel dx="1434" dy="822" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-1" value="5672/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;startArrow=none;startFill=0;dashed=1;" parent="1" target="0VJCIkSjTVNNat6pGbHc-3" edge="1">
+ <mxGeometry x="-0.028" relative="1" as="geometry">
+ <mxPoint x="448" y="220" as="sourcePoint" />
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-2" value="<b>AMQP</b>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="432.5" y="137" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-30" value="5672/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-3" target="0VJCIkSjTVNNat6pGbHc-29" edge="1">
+ <mxGeometry x="-0.1905" y="-1" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-3" target="0VJCIkSjTVNNat6pGbHc-33" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="395" y="318" as="sourcePoint" />
+ <Array as="points">
+ <mxPoint x="415" y="340" />
+ <mxPoint x="364" y="340" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-42" value="80/tcp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="0VJCIkSjTVNNat6pGbHc-41" vertex="1" connectable="0">
+ <mxGeometry x="0.1277" y="-1" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="8uG5b6AFywpmQrgs9zUp-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-3" target="JkB3rZmVi6YrdEwAjtGV-5" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="415" y="340" />
+ <mxPoint x="285" y="340" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="8uG5b6AFywpmQrgs9zUp-2" value="9000/tcp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="8uG5b6AFywpmQrgs9zUp-1" vertex="1" connectable="0">
+ <mxGeometry x="0.6408" y="-2" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-3" value="Gateway Service<br style="border-color: var(--border-color);">(NGINX)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="382.5" y="278" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-7" value="<b>JDBC</b>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="584" y="170" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-8" value="3307/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#000000;startArrow=classic;startFill=1;dashed=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="yvNGLmbJRMNvVS071MuP-1" edge="1">
+ <mxGeometry x="-0.0158" relative="1" as="geometry">
+ <mxPoint x="513" y="300" as="sourcePoint" />
+ <mxPoint as="offset" />
+ <mxPoint x="600" y="250" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-9" value="<b>API</b>" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="280" y="170" width="30" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-10" value="80/tcp" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#000000;startArrow=classic;startFill=1;dashed=1;" parent="1" edge="1">
+ <mxGeometry x="0.2319" relative="1" as="geometry">
+ <mxPoint x="295" y="250" as="sourcePoint" />
+ <mxPoint as="offset" />
+ <mxPoint x="383" y="300" as="targetPoint" />
+ <Array as="points">
+ <mxPoint x="295" y="300" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-26" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="575" y="440" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-38" value="3306/tcp" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="0VJCIkSjTVNNat6pGbHc-37" vertex="1" connectable="0">
+ <mxGeometry x="-0.1716" y="1" relative="1" as="geometry">
+ <mxPoint x="3" y="-8" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-26" value="Data Service<br>(Spring AMQP)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="399.5" y="420" width="96" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-29" target="0VJCIkSjTVNNat6pGbHc-26" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-29" value="Broker Service<br style="border-color: var(--border-color);">(RabbitMQ)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="399.5" y="360" width="96" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="0VJCIkSjTVNNat6pGbHc-33" target="yvNGLmbJRMNvVS071MuP-1" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="530" y="500" />
+ <mxPoint x="530" y="440" />
+ </Array>
+ <mxPoint x="570" y="440" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="0VJCIkSjTVNNat6pGbHc-33" value="Metadata Service<br>(Spring AMQP)" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="316" y="480" width="96" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="SPLHNWc1rHttcZ-O3PPf-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="JkB3rZmVi6YrdEwAjtGV-5" target="0VJCIkSjTVNNat6pGbHc-33" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="JkB3rZmVi6YrdEwAjtGV-5" value="Storage Service<br>(SeaweedFS)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="237" y="394" width="96" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="yvNGLmbJRMNvVS071MuP-1" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="575" y="408" width="50" height="64" as="geometry" />
+ </mxCell>
+ <mxCell id="yvNGLmbJRMNvVS071MuP-2" value="data-db" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
+ <mxGeometry x="559" y="470" width="85" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="jJosZR_OhRTGx9p3jnjP-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#E6E6E6;" parent="1" vertex="1">
+ <mxGeometry x="447.5" y="540" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="jJosZR_OhRTGx9p3jnjP-2" value="External images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="485" y="540" width="140" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="jJosZR_OhRTGx9p3jnjP-3" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="447.5" y="560" width="30" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="jJosZR_OhRTGx9p3jnjP-4" value="Maintained images" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="485" y="560" width="140" height="16" as="geometry" />
+ </mxCell>
+ <mxCell id="jJosZR_OhRTGx9p3jnjP-5" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="462.5" y="540" width="15" height="16" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram id="0gRvLy_AUZ0Xau8SBKI8" name="Gitlab Runner">
+ <mxGraphModel dx="925" dy="530" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-1" value="" style="rounded=1;whiteSpace=wrap;html=1;arcSize=2;" parent="1" vertex="1">
+ <mxGeometry x="250" y="40" width="760" height="260" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-3" value="Kubernetes" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="292" y="50" width="110" height="10" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-4" value="<font style="font-weight: normal; font-size: 10px;">azimuth.datalab.tuwien.ac.at</font>" style="text;html=1;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;whiteSpace=wrap;rounded=0;fontSize=16;fontStyle=1" parent="1" vertex="1">
+ <mxGeometry x="292" y="65" width="110" height="10" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-6" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-7" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-8" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <Array as="points">
+ <mxPoint x="625" y="124" />
+ <mxPoint x="625" y="124" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-22" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="r9iJ3a_E54lvpWGN0BaG-5" target="r9iJ3a_E54lvpWGN0BaG-29" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-5" value="<b>agentpool</b><br>8 vCPU, 32GB RAM" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="567.5" y="75" width="115" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-6" value="<b>gitlab-runner</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
+ <mxGeometry x="270" y="140" width="100" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-7" value="<b>seaweedfs-s3</b><br>kubernetes" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
+ <mxGeometry x="390" y="140" width="100" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-20" value="" style="group" parent="1" vertex="1" connectable="0">
+ <mxGeometry x="540" y="140" width="170" height="140" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-8" value="<b>runner-xyz-001</b>" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;arcSize=5;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
+ <mxGeometry width="170" height="140" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="r9iJ3a_E54lvpWGN0BaG-20" target="r9iJ3a_E54lvpWGN0BaG-14" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="45" y="70" as="sourcePoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="3q8h414pSOnjdSIywmwI-4" value="<div style="text-align: left; font-size: 10px;"><font style="font-size: 10px;">/var/run/dind/docker.sock</font></div><div style="text-align: left; font-size: 10px;"><font style="font-size: 10px;">/tmp</font></div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=10;labelBackgroundColor=none;" parent="r9iJ3a_E54lvpWGN0BaG-18" vertex="1" connectable="0">
+ <mxGeometry x="-0.1361" relative="1" as="geometry">
+ <mxPoint x="58" y="-1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-13" value="<b>svc-0</b><br>docker:24-dind-rootless" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
+ <mxGeometry x="10" y="30" width="150" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-14" value="<b>build<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
+ <mxGeometry x="10" y="110" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-16" value="<b>helper<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
+ <mxGeometry x="90" y="110" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-37" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/Docker_%28container_engine%29_logo.svg/2560px-Docker_%28container_engine%29_logo.svg.png;clipPath=inset(0% 58% 0% 0.33%);" parent="r9iJ3a_E54lvpWGN0BaG-20" vertex="1">
+ <mxGeometry x="33.25" y="37" width="23.5" height="13.35" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-21" value="" style="group" parent="1" vertex="1" connectable="0">
+ <mxGeometry x="820" y="140" width="170" height="140" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-22" value="<b>runner-xyz-010</b>" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;arcSize=5;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
+ <mxGeometry width="170" height="140" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="r9iJ3a_E54lvpWGN0BaG-21" target="r9iJ3a_E54lvpWGN0BaG-26" edge="1">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="45" y="70" as="sourcePoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-24" value="/var/run/dind/docker.sock<br style="font-size: 10px;">/tmp" style="edgeLabel;html=1;align=left;verticalAlign=middle;resizable=0;points=[];fontSize=10;labelBackgroundColor=none;" parent="r9iJ3a_E54lvpWGN0BaG-23" vertex="1" connectable="0">
+ <mxGeometry x="0.049" relative="1" as="geometry">
+ <mxPoint x="1" y="-5" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-25" value="<b>svc-0</b><br>docker:24-dind-rootless" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
+ <mxGeometry x="10" y="30" width="150" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-39" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://upload.wikimedia.org/wikipedia/commons/thumb/4/4e/Docker_%28container_engine%29_logo.svg/2560px-Docker_%28container_engine%29_logo.svg.png;clipPath=inset(0% 58% 0% 0.33%);" parent="r9iJ3a_E54lvpWGN0BaG-25" vertex="1">
+ <mxGeometry x="23.25" y="7" width="23.5" height="13.35" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-26" value="<b>build<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
+ <mxGeometry x="10" y="110" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-27" value="<b>helper<br></b>" style="rounded=1;whiteSpace=wrap;html=1;dashed=1;" parent="r9iJ3a_E54lvpWGN0BaG-21" vertex="1">
+ <mxGeometry x="90" y="110" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="r9iJ3a_E54lvpWGN0BaG-29" value="•&nbsp;&nbsp;•&nbsp;&nbsp;•&nbsp; •&nbsp;&nbsp;•" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" parent="1" vertex="1">
+ <mxGeometry x="734" y="193" width="60" height="30" as="geometry" />
+ </mxCell>
+ <mxCell id="EFzMD_oVcaiTEb37ajv_-6" value="" style="shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;imageAspect=0;image=https://cdn4.iconfinder.com/data/icons/logos-and-brands/512/144_Gitlab_logo_logos-512.png;" vertex="1" parent="1">
+ <mxGeometry x="259" y="47" width="30" height="30" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram id="DNBJDzVGt1bZ_wE9aRrb" name="Authentication (TU)">
+ <mxGraphModel dx="1426" dy="827" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-2" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-4" value="Force" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-3" vertex="1" connectable="0">
+ <mxGeometry x="0.0781" y="-2" relative="1" as="geometry">
+ <mxPoint x="7" y="2" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.75;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-5" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-20" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-9" vertex="1" connectable="0">
+ <mxGeometry x="-0.0962" y="-1" relative="1" as="geometry">
+ <mxPoint x="6" y="-1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-7" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-19" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-10" vertex="1" connectable="0">
+ <mxGeometry x="-0.1281" y="2" relative="1" as="geometry">
+ <mxPoint x="-2" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="H5geC8BQpTcnQeXLB8gK-1" target="H5geC8BQpTcnQeXLB8gK-6" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-18" value="OIDC" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-11" vertex="1" connectable="0">
+ <mxGeometry x="0.1536" relative="1" as="geometry">
+ <mxPoint x="9" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-1" value="<b>Auth Service</b><br>Keycloak" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="455" y="335" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" parent="1" source="H5geC8BQpTcnQeXLB8gK-2" target="H5geC8BQpTcnQeXLB8gK-8" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-16" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-12" vertex="1" connectable="0">
+ <mxGeometry x="-0.0986" y="-1" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="H5geC8BQpTcnQeXLB8gK-2" target="H5geC8BQpTcnQeXLB8gK-13" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-17" value="LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-15" vertex="1" connectable="0">
+ <mxGeometry x="0.0932" y="-2" relative="1" as="geometry">
+ <mxPoint x="6" y="1" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-2" value="<b>Identity Service</b><br>OpenLDAP" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="224" y="335" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-5" value="<b>UI</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="530" y="470" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-6" value="<b>Metadata Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="380" y="470" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-7" value="<b>Data Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="455" y="530" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-8" value="<b>Broker Service</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="224" y="530" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-13" value="<b>Dashboard UI</b>" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
+ <mxGeometry x="150" y="470" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="H5geC8BQpTcnQeXLB8gK-21" target="H5geC8BQpTcnQeXLB8gK-1" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-23" value="SAML 2.0" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="H5geC8BQpTcnQeXLB8gK-22" vertex="1" connectable="0">
+ <mxGeometry x="0.0113" y="1" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-21" value="<b>IdP</b>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" parent="1" vertex="1">
+ <mxGeometry x="455" y="190" width="130" height="40" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="H5geC8BQpTcnQeXLB8gK-24" target="H5geC8BQpTcnQeXLB8gK-1" edge="1">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="H5geC8BQpTcnQeXLB8gK-24" value="Browser / REST API" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;" parent="1" vertex="1">
+ <mxGeometry x="730" y="325" width="30" height="60" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+ <diagram id="pwqYDTw-FnwPuz1HA22u" name="branching-strategy">
+ <mxGraphModel dx="983" dy="570" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-47" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;startFill=0;dashed=1;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-2" target="uS4YP6bzlMmCPTCjYYu_-9">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-2" value="master" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="120" y="260" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;startFill=0;dashed=1;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-3" target="uS4YP6bzlMmCPTCjYYu_-12">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-3" value="hotfix/abc" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f8cecc;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="120" y="320" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;startFill=0;dashed=1;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-5" target="uS4YP6bzlMmCPTCjYYu_-44">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-5" value="release-1.9" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="120" y="200" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;startFill=0;dashed=1;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-6" target="uS4YP6bzlMmCPTCjYYu_-13">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-6" value="dev" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="120" y="380" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-50" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;startFill=0;dashed=1;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-7" target="uS4YP6bzlMmCPTCjYYu_-26">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-7" value="feature/abc" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="120" y="440" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-51" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;endArrow=none;startFill=0;dashed=1;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-8" target="uS4YP6bzlMmCPTCjYYu_-29">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-8" value="feature/xyz" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f5f5f5;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="120" y="500" width="70" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-43" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-9" target="uS4YP6bzlMmCPTCjYYu_-12">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-54" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-9" target="uS4YP6bzlMmCPTCjYYu_-10">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-62" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-9" target="uS4YP6bzlMmCPTCjYYu_-24">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-63" value="MR" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="uS4YP6bzlMmCPTCjYYu_-62">
+ <mxGeometry x="0.0222" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-9" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="230" y="260" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-53" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-10" target="uS4YP6bzlMmCPTCjYYu_-11">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-64" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-10" target="uS4YP6bzlMmCPTCjYYu_-22">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-65" value="MR" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="uS4YP6bzlMmCPTCjYYu_-64">
+ <mxGeometry x="-0.0084" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-10" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="320" y="260" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-11" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="560" y="260" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-52" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-12" target="uS4YP6bzlMmCPTCjYYu_-10">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-55" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-12" target="uS4YP6bzlMmCPTCjYYu_-14">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-12" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="270" y="320" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-34" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-13" target="uS4YP6bzlMmCPTCjYYu_-29">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-35" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-13" target="uS4YP6bzlMmCPTCjYYu_-14">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-36" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-13" target="uS4YP6bzlMmCPTCjYYu_-26">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-13" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="270" y="380" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-14" target="uS4YP6bzlMmCPTCjYYu_-16">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-14" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="330" y="380" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-40" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-16" target="uS4YP6bzlMmCPTCjYYu_-17">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-16" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="450" y="380" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-41" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-17" target="uS4YP6bzlMmCPTCjYYu_-18">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-59" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-17" target="uS4YP6bzlMmCPTCjYYu_-11">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-61" value="MR" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="uS4YP6bzlMmCPTCjYYu_-59">
+ <mxGeometry x="-0.1223" y="1" relative="1" as="geometry">
+ <mxPoint x="4" y="-6" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-17" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="500" y="380" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-42" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-18" target="uS4YP6bzlMmCPTCjYYu_-19">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-18" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="560" y="380" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-19" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="620" y="380" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-22" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="500" y="200" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-57" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;startFill=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-23" target="uS4YP6bzlMmCPTCjYYu_-22">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-23" value="v1.9.1" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="490" y="160" width="40" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-58" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-24" target="uS4YP6bzlMmCPTCjYYu_-22">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-24" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="270" y="200" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-56" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endArrow=none;startFill=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-25" target="uS4YP6bzlMmCPTCjYYu_-24">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-25" value="v1.9.0" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="260" y="160" width="40" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-26" target="uS4YP6bzlMmCPTCjYYu_-27">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-26" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="330" y="440" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-38" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-27" target="uS4YP6bzlMmCPTCjYYu_-16">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-66" value="MR" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="uS4YP6bzlMmCPTCjYYu_-38">
+ <mxGeometry x="-0.1351" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-27" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="390" y="440" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-32" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-29" target="uS4YP6bzlMmCPTCjYYu_-30">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-29" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="330" y="500" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-30" target="uS4YP6bzlMmCPTCjYYu_-31">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-30" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="390" y="500" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-31" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="450" y="500" width="20" height="20" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="uS4YP6bzlMmCPTCjYYu_-44" target="uS4YP6bzlMmCPTCjYYu_-24">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="uS4YP6bzlMmCPTCjYYu_-44" value="" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="230" y="200" width="20" height="20" as="geometry" />
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+</mxfile>
diff --git a/.docs/images/architecture.svg b/docs/images/architecture.svg
similarity index 100%
rename from .docs/images/architecture.svg
rename to docs/images/architecture.svg
diff --git a/docs/images/branching-strategy.svg b/docs/images/branching-strategy.svg
new file mode 100644
index 0000000000000000000000000000000000000000..abb2b23c58af337a613b21e45f323ddafa93cda5
--- /dev/null
+++ b/docs/images/branching-strategy.svg
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" style="background: #ffffff; background-color: #ffffff; color-scheme: light;" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="541px" height="381px" viewBox="-0.5 -0.5 541 381"><defs/><rect fill="#ffffff" width="100%" height="100%" x="0" y="0" style="fill: rgb(255, 255, 255);"/><g><g data-cell-id="0"><g data-cell-id="1"><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-47"><g><path d="M 80 120 L 120 120" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-2"><g><rect x="10" y="110" width="70" height="20" rx="3" ry="3" fill="#dae8fc" stroke="#000000" pointer-events="all" style="fill: rgb(218, 232, 252); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 120px; margin-left: 11px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">master</div></div></div></foreignObject><text x="45" y="124" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="12px" text-anchor="middle">master</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-48"><g><path d="M 80 180 L 160 180" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-3"><g><rect x="10" y="170" width="70" height="20" rx="3" ry="3" fill="#f8cecc" stroke="#000000" pointer-events="all" style="fill: rgb(248, 206, 204); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 180px; margin-left: 11px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">hotfix/abc</div></div></div></foreignObject><text x="45" y="184" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="12px" text-anchor="middle">hotfix/abc</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-46"><g><path d="M 80 60 L 120 60" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-5"><g><rect x="10" y="50" width="70" height="20" rx="3" ry="3" fill="#d5e8d4" stroke="#000000" pointer-events="all" style="fill: rgb(213, 232, 212); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 60px; margin-left: 11px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">release-1.9</div></div></div></foreignObject><text x="45" y="64" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="12px" text-anchor="middle">release-1.9</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-49"><g><path d="M 80 240 L 160 240" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-6"><g><rect x="10" y="230" width="70" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#000000" pointer-events="all" style="fill: rgb(245, 245, 245); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 240px; margin-left: 11px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">dev</div></div></div></foreignObject><text x="45" y="244" fill="#000000" font-family=""Helvetica"" font-size="12px" text-anchor="middle">dev</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-50"><g><path d="M 80 300 L 220 300" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-7"><g><rect x="10" y="290" width="70" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#000000" pointer-events="all" style="fill: rgb(245, 245, 245); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 300px; margin-left: 11px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">feature/abc</div></div></div></foreignObject><text x="45" y="304" fill="#000000" font-family=""Helvetica"" font-size="12px" text-anchor="middle">feature/abc</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-51"><g><path d="M 80 360 L 220 360" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-8"><g><rect x="10" y="350" width="70" height="20" rx="3" ry="3" fill="#f5f5f5" stroke="#000000" pointer-events="all" style="fill: rgb(245, 245, 245); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 68px; height: 1px; padding-top: 360px; margin-left: 11px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">feature/xyz</div></div></div></foreignObject><text x="45" y="364" fill="#000000" font-family=""Helvetica"" font-size="12px" text-anchor="middle">feature/xyz</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-43"><g><path d="M 137.07 127.07 L 159.8 167.38" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 162.38 171.96 L 155.89 167.58 L 159.8 167.38 L 161.99 164.14 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-54"><g><path d="M 140 120 L 203.63 120" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 208.88 120 L 201.88 123.5 L 203.63 120 L 201.88 116.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-62"><g><path d="M 137.07 112.93 L 159.8 72.62" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 162.38 68.04 L 161.99 75.86 L 159.8 72.62 L 155.89 72.42 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-63"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 90px; margin-left: 151px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; background-color: #ffffff; "><div style="display: inline-block; font-size: 11px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">MR</div></div></div></foreignObject><text x="151" y="93" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="11px" text-anchor="middle">MR</text></switch></g></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-9"><g><ellipse cx="130" cy="120" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-53"><g><path d="M 230 120 L 443.63 120" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 448.88 120 L 441.88 123.5 L 443.63 120 L 441.88 116.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-64"><g><path d="M 227.07 112.93 L 386.79 68.77" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 391.85 67.37 L 386.04 72.61 L 386.79 68.77 L 384.17 65.86 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-65"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 91px; margin-left: 309px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; background-color: #ffffff; "><div style="display: inline-block; font-size: 11px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">MR</div></div></div></foreignObject><text x="309" y="94" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="11px" text-anchor="middle">MR</text></switch></g></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-10"><g><ellipse cx="220" cy="120" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-11"><g><ellipse cx="460" cy="120" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-52"><g><path d="M 177.07 172.93 L 209.01 132.09" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 212.24 127.95 L 210.69 135.62 L 209.01 132.09 L 205.17 131.31 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-55"><g><path d="M 177.07 187.07 L 218.43 228.43" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 222.14 232.14 L 214.71 229.66 L 218.43 228.43 L 219.66 224.71 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-12"><g><ellipse cx="170" cy="180" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-34"><g><path d="M 177.07 247.07 L 220.4 347.09" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 222.48 351.9 L 216.49 346.87 L 220.4 347.09 L 222.91 344.09 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-35"><g><path d="M 180 240 L 213.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 218.88 240 L 211.88 243.5 L 213.63 240 L 211.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-36"><g><path d="M 177.07 247.07 L 215.99 295.05" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 219.3 299.13 L 212.17 295.9 L 215.99 295.05 L 217.6 291.49 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-13"><g><ellipse cx="170" cy="240" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-39"><g><path d="M 240 240 L 333.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 338.88 240 L 331.88 243.5 L 333.63 240 L 331.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-14"><g><ellipse cx="230" cy="240" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-40"><g><path d="M 360 240 L 383.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 388.88 240 L 381.88 243.5 L 383.63 240 L 381.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-16"><g><ellipse cx="350" cy="240" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-41"><g><path d="M 410 240 L 443.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 448.88 240 L 441.88 243.5 L 443.63 240 L 441.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-59"><g><path d="M 407.07 232.93 L 450.4 132.91" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 452.48 128.1 L 452.91 135.91 L 450.4 132.91 L 446.49 133.13 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-61"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 180px; margin-left: 431px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; background-color: #ffffff; "><div style="display: inline-block; font-size: 11px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">MR</div></div></div></foreignObject><text x="431" y="184" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="11px" text-anchor="middle">MR</text></switch></g></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-17"><g><ellipse cx="400" cy="240" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-42"><g><path d="M 470 240 L 503.63 240" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 508.88 240 L 501.88 243.5 L 503.63 240 L 501.88 236.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-18"><g><ellipse cx="460" cy="240" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-19"><g><ellipse cx="520" cy="240" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-22"><g><ellipse cx="400" cy="60" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-57"><g><path d="M 400 30 L 400 50" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-23"><g><rect x="380" y="10" width="40" height="20" rx="3" ry="3" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 20px; margin-left: 381px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">v1.9.1</div></div></div></foreignObject><text x="400" y="24" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="12px" text-anchor="middle">v1.9.1</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-58"><g><path d="M 180 60 L 383.63 60" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 388.88 60 L 381.88 63.5 L 383.63 60 L 381.88 56.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-24"><g><ellipse cx="170" cy="60" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-56"><g><path d="M 170 30 L 170 50" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-25"><g><rect x="150" y="10" width="40" height="20" rx="3" ry="3" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 38px; height: 1px; padding-top: 20px; margin-left: 151px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; "><div style="display: inline-block; font-size: 12px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">v1.9.0</div></div></div></foreignObject><text x="170" y="24" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="12px" text-anchor="middle">v1.9.0</text></switch></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-37"><g><path d="M 240 300 L 273.63 300" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 278.88 300 L 271.88 303.5 L 273.63 300 L 271.88 296.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-26"><g><ellipse cx="230" cy="300" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-38"><g><path d="M 300 300 L 338.92 252.02" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 342.22 247.94 L 340.53 255.58 L 338.92 252.02 L 335.1 251.17 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-66"><g><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 278px; margin-left: 319px;"><div style="box-sizing: border-box; font-size: 0; text-align: center; color: #000000; background-color: #ffffff; "><div style="display: inline-block; font-size: 11px; font-family: "Helvetica"; color: #000000; line-height: 1.2; pointer-events: all; background-color: #ffffff; white-space: nowrap; ">MR</div></div></div></foreignObject><text x="319" y="281" fill="light-dark(#000000, #ffffff)" font-family=""Helvetica"" font-size="11px" text-anchor="middle">MR</text></switch></g></g></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-27"><g><ellipse cx="290" cy="300" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-32"><g><path d="M 240 360 L 273.63 360" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 278.88 360 L 271.88 363.5 L 273.63 360 L 271.88 356.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-29"><g><ellipse cx="230" cy="360" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-33"><g><path d="M 300 360 L 333.63 360" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 338.88 360 L 331.88 363.5 L 333.63 360 L 331.88 356.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-30"><g><ellipse cx="290" cy="360" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-31"><g><ellipse cx="350" cy="360" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-45"><g><path d="M 140 60 L 160 60 L 140 60 L 153.63 60" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="stroke" style="stroke: rgb(0, 0, 0);"/><path d="M 158.88 60 L 151.88 63.5 L 153.63 60 L 151.88 56.5 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" style="fill: rgb(0, 0, 0); stroke: rgb(0, 0, 0);"/></g></g><g data-cell-id="uS4YP6bzlMmCPTCjYYu_-44"><g><ellipse cx="130" cy="60" rx="10" ry="10" fill="#ffffff" stroke="#000000" pointer-events="all" style="fill: rgb(255, 255, 255); stroke: rgb(0, 0, 0);"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/.docs/images/coverage.svg b/docs/images/coverage.svg
similarity index 100%
rename from .docs/images/coverage.svg
rename to docs/images/coverage.svg
diff --git a/.docs/images/data-ingest.svg b/docs/images/data-ingest.svg
similarity index 100%
rename from .docs/images/data-ingest.svg
rename to docs/images/data-ingest.svg
diff --git a/.docs/images/data-versioning.png b/docs/images/data-versioning.png
similarity index 100%
rename from .docs/images/data-versioning.png
rename to docs/images/data-versioning.png
diff --git a/.docs/images/exchange-binding.png b/docs/images/exchange-binding.png
similarity index 100%
rename from .docs/images/exchange-binding.png
rename to docs/images/exchange-binding.png
diff --git a/.docs/images/favicon.ico b/docs/images/favicon.ico
similarity index 100%
rename from .docs/images/favicon.ico
rename to docs/images/favicon.ico
diff --git a/.docs/images/gitlab-runner.png b/docs/images/gitlab-runner.png
similarity index 100%
rename from .docs/images/gitlab-runner.png
rename to docs/images/gitlab-runner.png
diff --git a/.docs/images/groups-roles.png b/docs/images/groups-roles.png
similarity index 100%
rename from .docs/images/groups-roles.png
rename to docs/images/groups-roles.png
diff --git a/.docs/images/logos.png b/docs/images/logos.png
similarity index 100%
rename from .docs/images/logos.png
rename to docs/images/logos.png
diff --git a/.docs/images/logos.psd b/docs/images/logos.psd
similarity index 100%
rename from .docs/images/logos.psd
rename to docs/images/logos.psd
diff --git a/.docs/images/logos/ds-ifs.png b/docs/images/logos/ds-ifs.png
similarity index 100%
rename from .docs/images/logos/ds-ifs.png
rename to docs/images/logos/ds-ifs.png
diff --git a/.docs/images/logos/favicon.png b/docs/images/logos/favicon.png
similarity index 100%
rename from .docs/images/logos/favicon.png
rename to docs/images/logos/favicon.png
diff --git a/.docs/images/logos/favicon.svg b/docs/images/logos/favicon.svg
similarity index 100%
rename from .docs/images/logos/favicon.svg
rename to docs/images/logos/favicon.svg
diff --git a/.docs/images/logos/iap.jpeg b/docs/images/logos/iap.jpeg
similarity index 100%
rename from .docs/images/logos/iap.jpeg
rename to docs/images/logos/iap.jpeg
diff --git a/.docs/images/logos/iap.png b/docs/images/logos/iap.png
similarity index 100%
rename from .docs/images/logos/iap.png
rename to docs/images/logos/iap.png
diff --git a/.docs/images/logos/ift.jpeg b/docs/images/logos/ift.jpeg
similarity index 100%
rename from .docs/images/logos/ift.jpeg
rename to docs/images/logos/ift.jpeg
diff --git a/.docs/images/logos/iwr.png b/docs/images/logos/iwr.png
similarity index 100%
rename from .docs/images/logos/iwr.png
rename to docs/images/logos/iwr.png
diff --git a/.docs/images/logos/logo.png b/docs/images/logos/logo.png
similarity index 100%
rename from .docs/images/logos/logo.png
rename to docs/images/logos/logo.png
diff --git a/.docs/images/logos/logo.svg b/docs/images/logos/logo.svg
similarity index 100%
rename from .docs/images/logos/logo.svg
rename to docs/images/logos/logo.svg
diff --git a/.docs/images/logos/uhh.png b/docs/images/logos/uhh.png
similarity index 100%
rename from .docs/images/logos/uhh.png
rename to docs/images/logos/uhh.png
diff --git a/.docs/images/logos/umweltbundesamt.png b/docs/images/logos/umweltbundesamt.png
similarity index 100%
rename from .docs/images/logos/umweltbundesamt.png
rename to docs/images/logos/umweltbundesamt.png
diff --git a/.docs/images/logos/univie_small.png b/docs/images/logos/univie_small.png
similarity index 100%
rename from .docs/images/logos/univie_small.png
rename to docs/images/logos/univie_small.png
diff --git a/.docs/images/maintainability.svg b/docs/images/maintainability.svg
similarity index 100%
rename from .docs/images/maintainability.svg
rename to docs/images/maintainability.svg
diff --git a/.docs/images/opensearch-dashboards-reset-pw.png b/docs/images/opensearch-dashboards-reset-pw.png
similarity index 100%
rename from .docs/images/opensearch-dashboards-reset-pw.png
rename to docs/images/opensearch-dashboards-reset-pw.png
diff --git a/.docs/images/opensearch-dashboards.png b/docs/images/opensearch-dashboards.png
similarity index 100%
rename from .docs/images/opensearch-dashboards.png
rename to docs/images/opensearch-dashboards.png
diff --git a/.docs/images/optionalfeatures.png b/docs/images/optionalfeatures.png
similarity index 100%
rename from .docs/images/optionalfeatures.png
rename to docs/images/optionalfeatures.png
diff --git a/.docs/images/pipeline.svg b/docs/images/pipeline.svg
similarity index 100%
rename from .docs/images/pipeline.svg
rename to docs/images/pipeline.svg
diff --git a/.docs/images/private-embargo.svg b/docs/images/private-embargo.svg
similarity index 100%
rename from .docs/images/private-embargo.svg
rename to docs/images/private-embargo.svg
diff --git a/.docs/images/queue-quorum.png b/docs/images/queue-quorum.png
similarity index 100%
rename from .docs/images/queue-quorum.png
rename to docs/images/queue-quorum.png
diff --git a/.docs/images/screenshots/air-dashboard.png b/docs/images/screenshots/air-dashboard.png
similarity index 100%
rename from .docs/images/screenshots/air-dashboard.png
rename to docs/images/screenshots/air-dashboard.png
diff --git a/.docs/images/screenshots/air-notebook.png b/docs/images/screenshots/air-notebook.png
similarity index 100%
rename from .docs/images/screenshots/air-notebook.png
rename to docs/images/screenshots/air-notebook.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-1.png b/docs/images/screenshots/assign-database-pid-step-1.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-1.png
rename to docs/images/screenshots/assign-database-pid-step-1.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-2.png b/docs/images/screenshots/assign-database-pid-step-2.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-2.png
rename to docs/images/screenshots/assign-database-pid-step-2.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-3.png b/docs/images/screenshots/assign-database-pid-step-3.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-3.png
rename to docs/images/screenshots/assign-database-pid-step-3.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-4.png b/docs/images/screenshots/assign-database-pid-step-4.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-4.png
rename to docs/images/screenshots/assign-database-pid-step-4.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-5.png b/docs/images/screenshots/assign-database-pid-step-5.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-5.png
rename to docs/images/screenshots/assign-database-pid-step-5.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-6.png b/docs/images/screenshots/assign-database-pid-step-6.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-6.png
rename to docs/images/screenshots/assign-database-pid-step-6.png
diff --git a/.docs/images/screenshots/assign-database-pid-step-7.png b/docs/images/screenshots/assign-database-pid-step-7.png
similarity index 100%
rename from .docs/images/screenshots/assign-database-pid-step-7.png
rename to docs/images/screenshots/assign-database-pid-step-7.png
diff --git a/.docs/images/screenshots/auth-service-ldap-1.png b/docs/images/screenshots/auth-service-ldap-1.png
similarity index 100%
rename from .docs/images/screenshots/auth-service-ldap-1.png
rename to docs/images/screenshots/auth-service-ldap-1.png
diff --git a/.docs/images/screenshots/auth-service-ldap-2.png b/docs/images/screenshots/auth-service-ldap-2.png
similarity index 100%
rename from .docs/images/screenshots/auth-service-ldap-2.png
rename to docs/images/screenshots/auth-service-ldap-2.png
diff --git a/.docs/images/screenshots/create-account-step-1.png b/docs/images/screenshots/create-account-step-1.png
similarity index 100%
rename from .docs/images/screenshots/create-account-step-1.png
rename to docs/images/screenshots/create-account-step-1.png
diff --git a/.docs/images/screenshots/create-account-step-2.png b/docs/images/screenshots/create-account-step-2.png
similarity index 100%
rename from .docs/images/screenshots/create-account-step-2.png
rename to docs/images/screenshots/create-account-step-2.png
diff --git a/.docs/images/screenshots/create-account-step-3.png b/docs/images/screenshots/create-account-step-3.png
similarity index 100%
rename from .docs/images/screenshots/create-account-step-3.png
rename to docs/images/screenshots/create-account-step-3.png
diff --git a/.docs/images/screenshots/create-database-step-1.png b/docs/images/screenshots/create-database-step-1.png
similarity index 100%
rename from .docs/images/screenshots/create-database-step-1.png
rename to docs/images/screenshots/create-database-step-1.png
diff --git a/.docs/images/screenshots/create-database-step-2.png b/docs/images/screenshots/create-database-step-2.png
similarity index 100%
rename from .docs/images/screenshots/create-database-step-2.png
rename to docs/images/screenshots/create-database-step-2.png
diff --git a/.docs/images/screenshots/create-database-step-3.png b/docs/images/screenshots/create-database-step-3.png
similarity index 100%
rename from .docs/images/screenshots/create-database-step-3.png
rename to docs/images/screenshots/create-database-step-3.png
diff --git a/.docs/images/screenshots/dashboard-managed.png b/docs/images/screenshots/dashboard-managed.png
similarity index 100%
rename from .docs/images/screenshots/dashboard-managed.png
rename to docs/images/screenshots/dashboard-managed.png
diff --git a/.docs/images/screenshots/dashboard_airquality_1.png b/docs/images/screenshots/dashboard_airquality_1.png
similarity index 100%
rename from .docs/images/screenshots/dashboard_airquality_1.png
rename to docs/images/screenshots/dashboard_airquality_1.png
diff --git a/.docs/images/screenshots/dashboard_airquality_2.png b/docs/images/screenshots/dashboard_airquality_2.png
similarity index 100%
rename from .docs/images/screenshots/dashboard_airquality_2.png
rename to docs/images/screenshots/dashboard_airquality_2.png
diff --git a/.docs/images/screenshots/dashboard_airquality_3.png b/docs/images/screenshots/dashboard_airquality_3.png
similarity index 100%
rename from .docs/images/screenshots/dashboard_airquality_3.png
rename to docs/images/screenshots/dashboard_airquality_3.png
diff --git a/.docs/images/screenshots/dashboard_airquality_4.png b/docs/images/screenshots/dashboard_airquality_4.png
similarity index 100%
rename from .docs/images/screenshots/dashboard_airquality_4.png
rename to docs/images/screenshots/dashboard_airquality_4.png
diff --git a/.docs/images/screenshots/dashboard_ops-logs.png b/docs/images/screenshots/dashboard_ops-logs.png
similarity index 100%
rename from .docs/images/screenshots/dashboard_ops-logs.png
rename to docs/images/screenshots/dashboard_ops-logs.png
diff --git a/.docs/images/screenshots/database-create-import-done.png b/docs/images/screenshots/database-create-import-done.png
similarity index 100%
rename from .docs/images/screenshots/database-create-import-done.png
rename to docs/images/screenshots/database-create-import-done.png
diff --git a/.docs/images/screenshots/database-create-import-select.png b/docs/images/screenshots/database-create-import-select.png
similarity index 100%
rename from .docs/images/screenshots/database-create-import-select.png
rename to docs/images/screenshots/database-create-import-select.png
diff --git a/.docs/images/screenshots/database-create-import.png b/docs/images/screenshots/database-create-import.png
similarity index 100%
rename from .docs/images/screenshots/database-create-import.png
rename to docs/images/screenshots/database-create-import.png
diff --git a/.docs/images/screenshots/database-info.PNG b/docs/images/screenshots/database-info.PNG
similarity index 100%
rename from .docs/images/screenshots/database-info.PNG
rename to docs/images/screenshots/database-info.PNG
diff --git a/.docs/images/screenshots/database-jdbc.png b/docs/images/screenshots/database-jdbc.png
similarity index 100%
rename from .docs/images/screenshots/database-jdbc.png
rename to docs/images/screenshots/database-jdbc.png
diff --git a/.docs/images/screenshots/database-versioning-active.png b/docs/images/screenshots/database-versioning-active.png
similarity index 100%
rename from .docs/images/screenshots/database-versioning-active.png
rename to docs/images/screenshots/database-versioning-active.png
diff --git a/.docs/images/screenshots/database-versioning.png b/docs/images/screenshots/database-versioning.png
similarity index 100%
rename from .docs/images/screenshots/database-versioning.png
rename to docs/images/screenshots/database-versioning.png
diff --git a/.docs/images/screenshots/database.png b/docs/images/screenshots/database.png
similarity index 100%
rename from .docs/images/screenshots/database.png
rename to docs/images/screenshots/database.png
diff --git a/.docs/images/screenshots/export-subset-step-1.png b/docs/images/screenshots/export-subset-step-1.png
similarity index 100%
rename from .docs/images/screenshots/export-subset-step-1.png
rename to docs/images/screenshots/export-subset-step-1.png
diff --git a/.docs/images/screenshots/export-subset-step-2.png b/docs/images/screenshots/export-subset-step-2.png
similarity index 100%
rename from .docs/images/screenshots/export-subset-step-2.png
rename to docs/images/screenshots/export-subset-step-2.png
diff --git a/.docs/images/screenshots/export-subset-step-3.png b/docs/images/screenshots/export-subset-step-3.png
similarity index 100%
rename from .docs/images/screenshots/export-subset-step-3.png
rename to docs/images/screenshots/export-subset-step-3.png
diff --git a/.docs/images/screenshots/export-subset-step-4.png b/docs/images/screenshots/export-subset-step-4.png
similarity index 100%
rename from .docs/images/screenshots/export-subset-step-4.png
rename to docs/images/screenshots/export-subset-step-4.png
diff --git a/.docs/images/screenshots/feature-cloud.png b/docs/images/screenshots/feature-cloud.png
similarity index 100%
rename from .docs/images/screenshots/feature-cloud.png
rename to docs/images/screenshots/feature-cloud.png
diff --git a/.docs/images/screenshots/feature-identifiers.png b/docs/images/screenshots/feature-identifiers.png
similarity index 100%
rename from .docs/images/screenshots/feature-identifiers.png
rename to docs/images/screenshots/feature-identifiers.png
diff --git a/.docs/images/screenshots/feature-jupyter.png b/docs/images/screenshots/feature-jupyter.png
similarity index 100%
rename from .docs/images/screenshots/feature-jupyter.png
rename to docs/images/screenshots/feature-jupyter.png
diff --git a/.docs/images/screenshots/feature-search.png b/docs/images/screenshots/feature-search.png
similarity index 100%
rename from .docs/images/screenshots/feature-search.png
rename to docs/images/screenshots/feature-search.png
diff --git a/.docs/images/screenshots/grafana1.png b/docs/images/screenshots/grafana1.png
similarity index 100%
rename from .docs/images/screenshots/grafana1.png
rename to docs/images/screenshots/grafana1.png
diff --git a/.docs/images/screenshots/grafana2.png b/docs/images/screenshots/grafana2.png
similarity index 100%
rename from .docs/images/screenshots/grafana2.png
rename to docs/images/screenshots/grafana2.png
diff --git a/.docs/images/screenshots/grafana3.png b/docs/images/screenshots/grafana3.png
similarity index 100%
rename from .docs/images/screenshots/grafana3.png
rename to docs/images/screenshots/grafana3.png
diff --git a/.docs/images/screenshots/grafana4.png b/docs/images/screenshots/grafana4.png
similarity index 100%
rename from .docs/images/screenshots/grafana4.png
rename to docs/images/screenshots/grafana4.png
diff --git a/.docs/images/screenshots/grafana5.png b/docs/images/screenshots/grafana5.png
similarity index 100%
rename from .docs/images/screenshots/grafana5.png
rename to docs/images/screenshots/grafana5.png
diff --git a/.docs/images/screenshots/import-database-dump-step-1.png b/docs/images/screenshots/import-database-dump-step-1.png
similarity index 100%
rename from .docs/images/screenshots/import-database-dump-step-1.png
rename to docs/images/screenshots/import-database-dump-step-1.png
diff --git a/.docs/images/screenshots/import-database-dump-step-2.png b/docs/images/screenshots/import-database-dump-step-2.png
similarity index 100%
rename from .docs/images/screenshots/import-database-dump-step-2.png
rename to docs/images/screenshots/import-database-dump-step-2.png
diff --git a/.docs/images/screenshots/import-database-dump-step-3.png b/docs/images/screenshots/import-database-dump-step-3.png
similarity index 100%
rename from .docs/images/screenshots/import-database-dump-step-3.png
rename to docs/images/screenshots/import-database-dump-step-3.png
diff --git a/.docs/images/screenshots/import-dataset-step-1.png b/docs/images/screenshots/import-dataset-step-1.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-1.png
rename to docs/images/screenshots/import-dataset-step-1.png
diff --git a/.docs/images/screenshots/import-dataset-step-2.png b/docs/images/screenshots/import-dataset-step-2.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-2.png
rename to docs/images/screenshots/import-dataset-step-2.png
diff --git a/.docs/images/screenshots/import-dataset-step-3.png b/docs/images/screenshots/import-dataset-step-3.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-3.png
rename to docs/images/screenshots/import-dataset-step-3.png
diff --git a/.docs/images/screenshots/import-dataset-step-4.png b/docs/images/screenshots/import-dataset-step-4.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-4.png
rename to docs/images/screenshots/import-dataset-step-4.png
diff --git a/.docs/images/screenshots/import-dataset-step-5.png b/docs/images/screenshots/import-dataset-step-5.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-5.png
rename to docs/images/screenshots/import-dataset-step-5.png
diff --git a/.docs/images/screenshots/import-dataset-step-6.png b/docs/images/screenshots/import-dataset-step-6.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-6.png
rename to docs/images/screenshots/import-dataset-step-6.png
diff --git a/.docs/images/screenshots/import-dataset-step-7.png b/docs/images/screenshots/import-dataset-step-7.png
similarity index 100%
rename from .docs/images/screenshots/import-dataset-step-7.png
rename to docs/images/screenshots/import-dataset-step-7.png
diff --git a/docs/images/screenshots/import-live-data.png b/docs/images/screenshots/import-live-data.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c8adb9b5aeb24484ffe3467d7bed081f81d118
Binary files /dev/null and b/docs/images/screenshots/import-live-data.png differ
diff --git a/.docs/images/screenshots/jupyterhub1.png b/docs/images/screenshots/jupyterhub1.png
similarity index 100%
rename from .docs/images/screenshots/jupyterhub1.png
rename to docs/images/screenshots/jupyterhub1.png
diff --git a/.docs/images/screenshots/jupyterhub2.png b/docs/images/screenshots/jupyterhub2.png
similarity index 100%
rename from .docs/images/screenshots/jupyterhub2.png
rename to docs/images/screenshots/jupyterhub2.png
diff --git a/.docs/images/screenshots/jupyterhub3.png b/docs/images/screenshots/jupyterhub3.png
similarity index 100%
rename from .docs/images/screenshots/jupyterhub3.png
rename to docs/images/screenshots/jupyterhub3.png
diff --git a/.docs/images/screenshots/jupyterhub4.png b/docs/images/screenshots/jupyterhub4.png
similarity index 100%
rename from .docs/images/screenshots/jupyterhub4.png
rename to docs/images/screenshots/jupyterhub4.png
diff --git a/.docs/images/screenshots/mfcc-jupyter.png b/docs/images/screenshots/mfcc-jupyter.png
similarity index 100%
rename from .docs/images/screenshots/mfcc-jupyter.png
rename to docs/images/screenshots/mfcc-jupyter.png
diff --git a/.docs/images/screenshots/minikube-dashboard.png b/docs/images/screenshots/minikube-dashboard.png
similarity index 100%
rename from .docs/images/screenshots/minikube-dashboard.png
rename to docs/images/screenshots/minikube-dashboard.png
diff --git a/.docs/images/screenshots/power.png b/docs/images/screenshots/power.png
similarity index 100%
rename from .docs/images/screenshots/power.png
rename to docs/images/screenshots/power.png
diff --git a/.docs/images/screenshots/private-database-access-step-1.png b/docs/images/screenshots/private-database-access-step-1.png
similarity index 100%
rename from .docs/images/screenshots/private-database-access-step-1.png
rename to docs/images/screenshots/private-database-access-step-1.png
diff --git a/.docs/images/screenshots/private-database-access-step-2.png b/docs/images/screenshots/private-database-access-step-2.png
similarity index 100%
rename from .docs/images/screenshots/private-database-access-step-2.png
rename to docs/images/screenshots/private-database-access-step-2.png
diff --git a/.docs/images/screenshots/queries-overview.png b/docs/images/screenshots/queries-overview.png
similarity index 100%
rename from .docs/images/screenshots/queries-overview.png
rename to docs/images/screenshots/queries-overview.png
diff --git a/.docs/images/screenshots/query-builder.png b/docs/images/screenshots/query-builder.png
similarity index 100%
rename from .docs/images/screenshots/query-builder.png
rename to docs/images/screenshots/query-builder.png
diff --git a/.docs/images/screenshots/query-execute.png b/docs/images/screenshots/query-execute.png
similarity index 100%
rename from .docs/images/screenshots/query-execute.png
rename to docs/images/screenshots/query-execute.png
diff --git a/.docs/images/screenshots/query-filter.png b/docs/images/screenshots/query-filter.png
similarity index 100%
rename from .docs/images/screenshots/query-filter.png
rename to docs/images/screenshots/query-filter.png
diff --git a/.docs/images/screenshots/query-list.png b/docs/images/screenshots/query-list.png
similarity index 100%
rename from .docs/images/screenshots/query-list.png
rename to docs/images/screenshots/query-list.png
diff --git a/.docs/images/screenshots/query-persist-dialog.png b/docs/images/screenshots/query-persist-dialog.png
similarity index 100%
rename from .docs/images/screenshots/query-persist-dialog.png
rename to docs/images/screenshots/query-persist-dialog.png
diff --git a/.docs/images/screenshots/query-persisted.png b/docs/images/screenshots/query-persisted.png
similarity index 100%
rename from .docs/images/screenshots/query-persisted.png
rename to docs/images/screenshots/query-persisted.png
diff --git a/.docs/images/screenshots/query-store.png b/docs/images/screenshots/query-store.png
similarity index 100%
rename from .docs/images/screenshots/query-store.png
rename to docs/images/screenshots/query-store.png
diff --git a/.docs/images/screenshots/query_history.png b/docs/images/screenshots/query_history.png
similarity index 100%
rename from .docs/images/screenshots/query_history.png
rename to docs/images/screenshots/query_history.png
diff --git a/.docs/images/screenshots/search-faceted.png b/docs/images/screenshots/search-faceted.png
similarity index 100%
rename from .docs/images/screenshots/search-faceted.png
rename to docs/images/screenshots/search-faceted.png
diff --git a/.docs/images/screenshots/start.png b/docs/images/screenshots/start.png
similarity index 100%
rename from .docs/images/screenshots/start.png
rename to docs/images/screenshots/start.png
diff --git a/.docs/images/screenshots/storage-service-filer.png b/docs/images/screenshots/storage-service-filer.png
similarity index 100%
rename from .docs/images/screenshots/storage-service-filer.png
rename to docs/images/screenshots/storage-service-filer.png
diff --git a/.docs/images/screenshots/table-amqp.png b/docs/images/screenshots/table-amqp.png
similarity index 100%
rename from .docs/images/screenshots/table-amqp.png
rename to docs/images/screenshots/table-amqp.png
diff --git a/.docs/images/screenshots/table-overview.png b/docs/images/screenshots/table-overview.png
similarity index 100%
rename from .docs/images/screenshots/table-overview.png
rename to docs/images/screenshots/table-overview.png
diff --git a/.docs/images/screenshots/table-update-tuple.png b/docs/images/screenshots/table-update-tuple.png
similarity index 100%
rename from .docs/images/screenshots/table-update-tuple.png
rename to docs/images/screenshots/table-update-tuple.png
diff --git a/.docs/images/screenshots/table-update-tuple2.png b/docs/images/screenshots/table-update-tuple2.png
similarity index 100%
rename from .docs/images/screenshots/table-update-tuple2.png
rename to docs/images/screenshots/table-update-tuple2.png
diff --git a/.docs/images/screenshots/transportation-dashboard.png b/docs/images/screenshots/transportation-dashboard.png
similarity index 100%
rename from .docs/images/screenshots/transportation-dashboard.png
rename to docs/images/screenshots/transportation-dashboard.png
diff --git a/.docs/images/screenshots/tre-notebook.png b/docs/images/screenshots/tre-notebook.png
similarity index 100%
rename from .docs/images/screenshots/tre-notebook.png
rename to docs/images/screenshots/tre-notebook.png
diff --git a/.docs/images/screenshots/ui-config-step-1.png b/docs/images/screenshots/ui-config-step-1.png
similarity index 100%
rename from .docs/images/screenshots/ui-config-step-1.png
rename to docs/images/screenshots/ui-config-step-1.png
diff --git a/.docs/images/screenshots/ui.png b/docs/images/screenshots/ui.png
similarity index 100%
rename from .docs/images/screenshots/ui.png
rename to docs/images/screenshots/ui.png
diff --git a/.docs/images/screenshots/xps-chart.png b/docs/images/screenshots/xps-chart.png
similarity index 100%
rename from .docs/images/screenshots/xps-chart.png
rename to docs/images/screenshots/xps-chart.png
diff --git a/.docs/images/screenshots/xps-jupyter.png b/docs/images/screenshots/xps-jupyter.png
similarity index 100%
rename from .docs/images/screenshots/xps-jupyter.png
rename to docs/images/screenshots/xps-jupyter.png
diff --git a/.docs/images/screenshots/xps-notebook.png b/docs/images/screenshots/xps-notebook.png
similarity index 100%
rename from .docs/images/screenshots/xps-notebook.png
rename to docs/images/screenshots/xps-notebook.png
diff --git a/.docs/images/security.svg b/docs/images/security.svg
similarity index 100%
rename from .docs/images/security.svg
rename to docs/images/security.svg
diff --git a/.docs/images/signet.png b/docs/images/signet.png
similarity index 100%
rename from .docs/images/signet.png
rename to docs/images/signet.png
diff --git a/.docs/images/signet_black.png b/docs/images/signet_black.png
similarity index 100%
rename from .docs/images/signet_black.png
rename to docs/images/signet_black.png
diff --git a/.docs/images/signet_white.png b/docs/images/signet_white.png
similarity index 100%
rename from .docs/images/signet_white.png
rename to docs/images/signet_white.png
diff --git a/.docs/images/statistics-example-unit-independent-search.png b/docs/images/statistics-example-unit-independent-search.png
similarity index 100%
rename from .docs/images/statistics-example-unit-independent-search.png
rename to docs/images/statistics-example-unit-independent-search.png
diff --git a/.docs/images/statistics-example.png b/docs/images/statistics-example.png
similarity index 100%
rename from .docs/images/statistics-example.png
rename to docs/images/statistics-example.png
diff --git a/.docs/images/statistics-mirror.png b/docs/images/statistics-mirror.png
similarity index 100%
rename from .docs/images/statistics-mirror.png
rename to docs/images/statistics-mirror.png
diff --git a/.docs/index.html.tpl b/docs/index.html.tpl
similarity index 100%
rename from .docs/index.html.tpl
rename to docs/index.html.tpl
diff --git a/.docs/index.md b/docs/index.md
similarity index 93%
rename from .docs/index.md
rename to docs/index.md
index 711906f2e0138d6846b90633a2479a4e6176cd5e..4bddef375c53652a1a7548cbc82a1b3724c7db8d 100644
--- a/.docs/index.md
+++ b/docs/index.md
@@ -14,7 +14,7 @@ author: Martin Weise
-Documentation for version: [v1.9.2](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.9.3](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is an open-source database repository that cover the data life cycle supporting data evolution,
-citation and -versioning. It implements the query store of the [RDA WGDC](https://doi.org/10.1162/99608f92.be565013) on
@@ -37,12 +37,13 @@ Installing DBRepo is very easy or
## Who is using DBRepo?
- [TU Wien](https://dbrepo1.ec.tuwien.ac.at)
-- [TU Graz](https://dbrepo.cyverse.at)
-- [TU Darmstadt](https://tudatabases.ulb.tu-darmstadt.de)
+- TU Graz
+- TU Darmstadt
- [Universität Hamburg](https://dbrepo.fdm.uni-hamburg.de/)
- [Universiti Teknikal Malaysia Melaka](https://dbrepo.utem.edu.my/)
- University of the Philippines
-- [Universiti Sains Malaysia](https://atmosfera.usm.my/dbrepo/)
+- Universiti Sains Malaysia
+- Institut Teknologi Bandung
## How can I try DBRepo?
diff --git a/.docs/installation.md b/docs/installation.md
similarity index 100%
rename from .docs/installation.md
rename to docs/installation.md
diff --git a/.docs/kubernetes.md b/docs/kubernetes.md
similarity index 98%
rename from .docs/kubernetes.md
rename to docs/kubernetes.md
index 53243bff89012d1629427c694dcb4f6fef098142..794aced862132b6b4316489f089fe4d936154da1 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.9.2" \
+ --version "1.9.3" \
--create-namespace \
--cleanup-on-fail
```
diff --git a/docs/maintainer-guide/build.md b/docs/maintainer-guide/build.md
new file mode 100644
index 0000000000000000000000000000000000000000..1b0dc823264b2bf9ff319b7316f56413df1c95a6
--- /dev/null
+++ b/docs/maintainer-guide/build.md
@@ -0,0 +1,79 @@
+---
+author: Martin Weise
+---
+
+!!! danger "Security Disclaimer"
+
+ This quick default installation should **not be considered secure**. It is intended for local testing and
+ demonstration and should not be used in public deployments or in production. It is a quick installation method and
+ is intended for a quick look at DBRepo.
+
+## TL;DR
+
+Clone the source code repository and build the container images:
+
+```shell
+git clone git@gitlab.phaidra.org:fair-data-austria-db-repository/fda-services.git && \
+git checkout release-1.9 && \
+make build-java-lib build-auth-event-listener build-images
+```
+
+Then start DBRepo and visit [`http://localhost`](http://localhost) in the VM browser:
+
+```shell
+docker compose up -d
+```
+
+## Prerequisites
+
+### Buildtime
+
+!!! info
+
+ * Docker 28.x
+
+Utility tools to run the build commands:
+
+=== "Debian"
+
+ ```shell
+ apt install git make bash
+ ```
+
+### Runtime
+
+!!! info
+
+ * min. 8 vCPU cores
+ * min. 20GB free RAM memory
+
+## Build
+
+Clone the source code repository:
+
+```shell
+git clone git@gitlab.phaidra.org:fair-data-austria-db-repository/fda-services.git && \
+git checkout release-1.9
+```
+
+Build the Docker container images and auxiliary files needed for the Auth Service:
+
+```shell
+make build-java-lib build-auth-event-listener build-images
+```
+
+## Run
+
+Then start DBRepo and visit [`http://localhost`](http://localhost) in the VM browser:
+
+```shell
+docker compose up -d
+```
+
+!!! debug "Shorthand Dev Build"
+
+ You can build everything and (re-)start the necessary services between each build conveniently:
+
+ ```shell
+ make start-dev
+ ```
\ No newline at end of file
diff --git a/docs/maintainer-guide/docker.md b/docs/maintainer-guide/docker.md
new file mode 100644
index 0000000000000000000000000000000000000000..f72bd9276bb54520f18b8892f397afaafdaf4774
--- /dev/null
+++ b/docs/maintainer-guide/docker.md
@@ -0,0 +1,141 @@
+---
+author: Martin Weise
+---
+
+!!! danger "Security Disclaimer"
+
+ This quick default installation should **not be considered secure**. It is intended for local testing and
+ demonstration and should not be used in public deployments or in production. It is a quick installation method and
+ is intended for a quick look at DBRepo.
+
+## TL;DR
+
+Install DBRepo in one line:
+
+```shell
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/install.sh | bash
+```
+
+Then start DBRepo and visit [`http://localhost`](http://localhost) in your browser:
+
+```shell
+docker compose up -d
+```
+
+## Prerequisites
+
+!!! info
+
+ * min. 8 vCPU cores
+ * min. 20GB free RAM memory
+
+Since DBRepo is intended to be a publicly available repository, an optional fixed/static IP-address with optional
+SSL/TLS certificate is recommended. Follow the [secure installation](#secure-installation) guide.
+
+## Secure Installation
+
+Execute the installation script to download only the environment and save it to `dist`.
+
+```shell
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/install.sh | DOWNLOAD_ONLY=1 bash
+```
+
+### Static Configuration
+
+Call the helper script to regenerate the client secret of the `dbrepo-client` and set it as value of the
+`AUTH_SERVICE_CLIENT_SECRET` variable in the `.env` file.
+
+Update the rest of the default secrets in the `.env` file to secure passwords. You can use `openssl` for that, e.g.
+`openssl rand -hex 16`. Set `auth_ldap.dn_lookup_bind.password` in `dist/rabbitmq.conf` to the value of
+`SYSTEM_PASSWORD`.
+
+Only set the `BASE_URL` environment variable in `.env` when your hostname is **not** `localhost`.
+
+### Runtime Configuration
+
+The [Auth Service](../api/auth-service) can be configured easily when DBRepo is running. Start DBRepo temporarily:
+
+```shell
+docker compose up -d
+```
+
+Log into the Auth Service with the default credentials `admin` and the value of `AUTH_SERVICE_ADMIN_PASSWORD`
+(c.f. Figure 1) and select the "dbrepo" realm :material-numeric-1-circle-outline:. In the sidebar, select the
+"User federation" :material-numeric-2-circle-outline: and from the provider list, select the "Identity Service" provider
+:material-numeric-3-circle-outline:.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 1: Select the Identity Service provider.</figcaption>
+</figure>
+
+If you plan to change the default admin username (c.f. Figure 2), modify the Bind DN :material-numeric-1-circle-outline:
+but this is optional. Change the Bind credentials to the desired password :material-numeric-2-circle-outline: from
+the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
+
+<figure markdown>
+{ .img-border }
+<figcaption>Figure 2: Update the Identity Service admin user credentials.</figcaption>
+</figure>
+
+Update the client secret of the `dbrepo-client`:
+
+```bash
+curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/.scripts/reg-client-secret.sh" | bash
+```
+
+Also, update the JWT key according to the
+[Keycloak documentation](https://www.keycloak.org/docs/24.0.1/server_admin/index.html#rotating-keys). To secure your
+deployment traffic with SSL/TLS, tell the Gateway Service to use your certificate secret (e.g. from Let's Encrypt):
+
+```yaml title="docker-compose.yml"
+services:
+ ...
+ dbrepo-gateway-service:
+ ...
+ volumes:
+ - /path/to/cert.crt:/app/cert.crt
+ - /path/to/cert.key:/app/cert.key
+ ...
+```
+
+Now redirect all non-HTTPS routes to HTTPS in the Gateway Service:
+
+```config title="dist/dbrepo.conf"
+server {
+ listen 80 default_server;
+ server_name _;
+ return 301 https://$host$request_uri;
+}
+
+server {
+ listen 443 ssl default_server;
+ server_name my_hostname;
+ ssl_certificate /app/cert.crt;
+ ssl_certificate_key /app/cert.key;
+ ...
+}
+```
+
+### Apply the Configuration
+
+Restart the configured DBRepo system to apply the static and runtime configuration:
+
+```shell
+docker compose down
+docker compose up -d
+```
+
+The secure installation is now finished!
+
+## Next Steps
+
+You should now be able to view the front end at [http://localhost](http://localhost).
+
+Please be warned that the default configuration is not intended for public deployments. It is only intended to have a
+running system within minutes to play around within the system and explore features. It is strongly advised to change
+the default `.env` environment variables.
+
+Next, create a [user account](../api/#create-user-account) and
+then [create a database](../api/#create-database) to [import a dataset](../api/#import-dataset).
+
diff --git a/docs/maintainer-guide/import-dump.md b/docs/maintainer-guide/import-dump.md
new file mode 100644
index 0000000000000000000000000000000000000000..26848c6d2a0be26cbd095205e2e6d1cfae4f51d8
--- /dev/null
+++ b/docs/maintainer-guide/import-dump.md
@@ -0,0 +1,65 @@
+---
+author: Martin Weise
+---
+
+<center>
+```mermaid
+graph LR
+ A[MySQL Workbench] --> |:3307| C[(Data Database)];
+```
+</center>
+
+A user wants to import a database dump in `.sql` (or in `.sql.gz`) format into DBRepo.
+
+### UI
+
+Import the database dump `dump.sql` via the [MySQL Workbench](https://www.mysql.com/products/workbench/) client which is
+semi-compatible with MariaDB databases, i.e. core features work some status/performance features do not.
+
+Setup a new connection in the MySQL Workbench (c.f. Figure 14) by clicking the small
+":material-plus-circle-outline:" button :material-numeric-1-circle-outline: to open the dialog. In the opened dialog
+fill out the connection parameters (for local deployments the hostname is `127.0.0.1` and port `3307` for the
+Data Database :material-numeric-2-circle-outline:.
+
+The default credentials are username `root` and password `dbrepo`, type the password in
+:material-numeric-3-circle-outline: and click the "OK" button. Then finish the setup of the new connection by
+clicking the "OK" button :material-numeric-4-circle-outline:.
+
+<figure markdown>
+
+<figcaption>Figure 14: Setup New Connection in MySQL Workbench.</figcaption>
+</figure>
+
+Now you should be able to see some statistics for the Data Database (c.f. Figure 15), especially that it is running
+:material-numeric-1-circle-outline: and basic connection and version information :material-numeric-2-circle-outline:.
+
+<figure markdown>
+
+<figcaption>Figure 15: Server status of the Data Database in MySQL Workbench.</figcaption>
+</figure>
+
+Then proceed to import the database dump `dump.sql` by clicking "Data Import/Restore"
+:material-numeric-1-circle-outline: and select "Import from Self-Contained File" in the Import Options. Then
+select the `dump.sql` file in the file path selection. Last, select the database you want to import this `dump.sql`
+into :material-numeric-4-circle-outline: (you can also create a new database for the import by clicking "New...").
+The import starts after clicking "Start Import" :material-numeric-5-circle-outline:.
+
+<figure markdown>
+
+<figcaption>Figure 16: Data Import/Restore in MySQL Workbench.</figcaption>
+</figure>
+
+### Terminal
+
+First, create a new database as descriped in the [Create Database](#create-database) use-case above. Then, import
+the database dump `dump.sql` via the `mariadb` client.
+
+```bash
+mariadb -H127.0.0.1 -p3307 -uUSERNAME -pYOURPASSWORD db_name < dump.sql
+```
+
+Alternatively, if your database dump is compressed, import the `dump.sql.gz` by piping it through `gunzip`.
+
+```bash
+gunzip < dump.sql.gz | mysql -H127.0.0.1 -p3307 -uUSERNAME -pYOURPASSWORD db_name
+```
diff --git a/docs/maintainer-guide/index.md b/docs/maintainer-guide/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..bf491311b10af1ddf379f754a23a6d0966a98842
--- /dev/null
+++ b/docs/maintainer-guide/index.md
@@ -0,0 +1,43 @@
+---
+author: Martin Weise
+---
+
+# Installation
+
+Before you can use GeoNetwork on your own computer, you need to install it:
+
+<div class="grid cards" markdown>
+
+- :material-docker:{ .lg .middle } **Install on Docker**
+
+ ---
+
+ Quick and simple Docker Compose deployment for local testing purposes.
+
+ [:octicons-arrow-right-24: Getting started](../maintainer-guide/docker)
+
+- :material-kubernetes:{ .lg .middle } **Install on Kubernetes**
+
+ ---
+
+ Production-ready deployment on Kubernetes (recommended).
+
+ [:octicons-arrow-right-24: Getting started](../maintainer-guide/kubernetes)
+
+- :material-remote-desktop:{ .lg .middle } **Install on VM**
+
+ ---
+
+ Use our pre-configured VM image for local testing purposes.
+
+ [:octicons-arrow-right-24: Getting started](../maintainer-guide/vm)
+
+- :material-wrench:{ .lg .middle } **Build from Sourcecode**
+
+ ---
+
+ Use our pre-configured VM image for local testing purposes.
+
+ [:octicons-arrow-right-24: Getting started](../maintainer-guide/build)
+
+</div>
diff --git a/docs/maintainer-guide/kubernetes.md b/docs/maintainer-guide/kubernetes.md
new file mode 100644
index 0000000000000000000000000000000000000000..eae56e4e6de0a14100796a8ea3f1a00e13e29ccf
--- /dev/null
+++ b/docs/maintainer-guide/kubernetes.md
@@ -0,0 +1,47 @@
+---
+author: Martin Weise
+---
+
+## TL;DR
+
+To install DBRepo in your existing cluster, download the
+sample [
+`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.9/helm/dbrepo/values.yaml)
+for your deployment and update the variables, especially `hostname`.
+
+```shell
+helm upgrade --install dbrepo \
+ -n dbrepo \
+ "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
+ --values ./values.yaml \
+ --version "1.9.3" \
+ --create-namespace \
+ --cleanup-on-fail
+```
+
+## Prerequisites
+
+!!! info
+
+ * Kubernetes 1.30+ (tested on 1.31.5)
+ * PV provisioner support in the underlying infrastructure
+
+### Resource Quota
+
+By default, any service requests a minimum quota of cpu and memory by default. These values are based on the absolute
+minimum needed to start the service. From our experience your cluster needs to meet the following `ResourceQuota`:
+
+```yaml
+requests.cpu: 12000m
+requests.ephemeral-storage: 3072Mi
+secrets: '50'
+<storageClass>.storageclass.storage.k8s.io/persistentvolumeclaims: '20'
+<storageClass>.storageclass.storage.k8s.io/requests.storage: 150Gi
+persistentvolumeclaims: '20'
+requests.memory: 14336Mi
+pods: '40'
+requests.storage: 150Gi
+limits.memory: 20480Mi
+configmaps: '20'
+services: '40'
+```
diff --git a/docs/maintainer-guide/troubleshooting.md b/docs/maintainer-guide/troubleshooting.md
new file mode 100644
index 0000000000000000000000000000000000000000..bfa4dddf92680aed5a040f79d73428f45ae7a160
--- /dev/null
+++ b/docs/maintainer-guide/troubleshooting.md
@@ -0,0 +1,38 @@
+---
+author: Martin Weise
+---
+
+In case the deployment is unsuccessful, we have explanations on their origin and solutions to the most common errors:
+
+**Are you trying to mount a directory onto a file (or vice-versa)?**
+
+: *Origin*: Docker Compose does not find all files referenced in the `volumes` section of your `docker-compose.yml`
+ file.
+: *Solution*: Ensure all mounted files in the `volumes` section of your `docker-compose.yml` exist and have correct
+ file permissions (`0644`) to be found in the filesystem. Note that paths containing directories may not
+ work when using Windows instead of the supported Linux.
+
+**The Docker images have been updated but my deployment is not receiving the updates**
+
+: *Origin*: Your local Docker image cache is not up-to-date and needs to fetch the remote changes.
+: *Solution*: Update your local Docker image cache by executing `docker compose pull`, it automatically downloads
+ all Docker images that have updates. Then apply the new images with `docker compose up -d`.
+
+**Error response from daemon: Error starting userland proxy: listen tcp4 0.0.0.0:xyz: bind: address already in use**
+
+: *Origin*: Your deployment machine (e.g. laptop, virtual machine) has the port `xyz` already assigned. Some service
+ or application is already listening to this port.
+: *Solution*: This service or application needs to be stopped. You can find out the service or application via
+ `sudo netstat -tulpn` (sudo is necessary for the process id) and then stop the service or application
+ gracefully or force a stop via `kill -15 PID` (not recommended).
+
+**IllegalArgumentException values less than -1 bytes are not supported**
+
+: *Origin*: Your deployment machine (e.g. laptop, virtual machine) appears to not have enough RAM assigned.
+: *Solution*: Assign more RAM to the deployment machine (e.g. add vRAM to the virtual machine).
+
+**HTTP access denied: user 'admin' - invalid credentials**
+
+: *Origin*: The broker service cannot bind to the identity service due to wrong configuration.
+: *Solution*: This is very likely due to a wrong `auth_ldap.dn_lookup_bind.password` in `rabbitmq.conf`. The error
+ indicates that LDAP check is not even attempted.
diff --git a/docs/maintainer-guide/updating.md b/docs/maintainer-guide/updating.md
new file mode 100644
index 0000000000000000000000000000000000000000..373153a8cd46081a4f69ef332fc3cd1a6cb47907
--- /dev/null
+++ b/docs/maintainer-guide/updating.md
@@ -0,0 +1,5 @@
+---
+author: Martin Weise
+---
+
+This section will be expanded in the future.
diff --git a/docs/maintainer-guide/vm.md b/docs/maintainer-guide/vm.md
new file mode 100644
index 0000000000000000000000000000000000000000..74319966b3c4cd2e67ad216273f6c14802bb4f69
--- /dev/null
+++ b/docs/maintainer-guide/vm.md
@@ -0,0 +1,46 @@
+---
+author: Martin Weise
+---
+
+!!! danger "Security Disclaimer"
+
+ This quick default installation should **not be considered secure**. It is intended for local testing and
+ demonstration and should not be used in public deployments or in production. It is a quick installation method and
+ is intended for a quick look at DBRepo.
+
+## TL;DR
+
+Download the KVM configuration and virtual disk:
+
+```shell
+curl -sSL -o kvm.xml https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9.3/kvm.xml && \
+curl -sSL https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9.3/dbrepo.qcow2.tar.gz | tar xzf -
+```
+
+Then start DBRepo and visit [`http://localhost`](http://localhost) in the VM browser:
+
+```shell
+docker compose up -d
+```
+
+## Prerequisites
+
+!!! info
+
+ * min. 8 vCPU cores
+ * min. 20GB free RAM memory
+
+## Configuration
+
+The image is based on Debian 12 and has the following user credentials pre-configured:
+
+* `root:changeme`
+* `dbrepo:dbrepo`
+
+The installation is located in the default home directory of the `dbrepo` user:
+
+```shell
+/home/dbrepo/
+ |- config/ # config directory
+ |- docker-compose.yaml # services definition
+```
\ No newline at end of file
diff --git a/.docs/overrides/.icons/wikimedia/open-access.svg b/docs/overrides/.icons/wikimedia/open-access.svg
similarity index 100%
rename from .docs/overrides/.icons/wikimedia/open-access.svg
rename to docs/overrides/.icons/wikimedia/open-access.svg
diff --git a/.docs/overrides/main.html b/docs/overrides/main.html
similarity index 100%
rename from .docs/overrides/main.html
rename to docs/overrides/main.html
diff --git a/.docs/papers/weise2022dbrepo.bib b/docs/papers/weise2022dbrepo.bib
similarity index 100%
rename from .docs/papers/weise2022dbrepo.bib
rename to docs/papers/weise2022dbrepo.bib
diff --git a/.docs/papers/weise2022dbrepo.rdf b/docs/papers/weise2022dbrepo.rdf
similarity index 100%
rename from .docs/papers/weise2022dbrepo.rdf
rename to docs/papers/weise2022dbrepo.rdf
diff --git a/.docs/papers/weise2022dbrepo.ris b/docs/papers/weise2022dbrepo.ris
similarity index 100%
rename from .docs/papers/weise2022dbrepo.ris
rename to docs/papers/weise2022dbrepo.ris
diff --git a/.docs/papers/weise2022dbrepo.xml b/docs/papers/weise2022dbrepo.xml
similarity index 100%
rename from .docs/papers/weise2022dbrepo.xml
rename to docs/papers/weise2022dbrepo.xml
diff --git a/.docs/presentations/.gitkeep b/docs/presentations/.gitkeep
similarity index 100%
rename from .docs/presentations/.gitkeep
rename to docs/presentations/.gitkeep
diff --git "a/.docs/presentations/220304_FAIRData_Folgeworkshop_Pr\303\244sentation_DE_GitLab.pptx" "b/docs/presentations/220304_FAIRData_Folgeworkshop_Pr\303\244sentation_DE_GitLab.pptx"
similarity index 100%
rename from ".docs/presentations/220304_FAIRData_Folgeworkshop_Pr\303\244sentation_DE_GitLab.pptx"
rename to "docs/presentations/220304_FAIRData_Folgeworkshop_Pr\303\244sentation_DE_GitLab.pptx"
diff --git a/.docs/presentations/220330_FAIRData_Slidedeck_DE.pptx b/docs/presentations/220330_FAIRData_Slidedeck_DE.pptx
similarity index 100%
rename from .docs/presentations/220330_FAIRData_Slidedeck_DE.pptx
rename to docs/presentations/220330_FAIRData_Slidedeck_DE.pptx
diff --git a/.docs/presentations/220414_FAIRData_Slidedeck_DE.pptx b/docs/presentations/220414_FAIRData_Slidedeck_DE.pptx
similarity index 100%
rename from .docs/presentations/220414_FAIRData_Slidedeck_DE.pptx
rename to docs/presentations/220414_FAIRData_Slidedeck_DE.pptx
diff --git a/.docs/presentations/220414_FAIRData_Slidedeck_EN.pptx b/docs/presentations/220414_FAIRData_Slidedeck_EN.pptx
similarity index 100%
rename from .docs/presentations/220414_FAIRData_Slidedeck_EN.pptx
rename to docs/presentations/220414_FAIRData_Slidedeck_EN.pptx
diff --git a/.docs/presentations/220613_FAIRData_DUH_MakerSpace_DE_GitLab.pptx b/docs/presentations/220613_FAIRData_DUH_MakerSpace_DE_GitLab.pptx
similarity index 100%
rename from .docs/presentations/220613_FAIRData_DUH_MakerSpace_DE_GitLab.pptx
rename to docs/presentations/220613_FAIRData_DUH_MakerSpace_DE_GitLab.pptx
diff --git a/.docs/publications.md b/docs/publications.md
similarity index 81%
rename from .docs/publications.md
rename to docs/publications.md
index b62114dc0f18530a2c19643c5b43aa0fd3c75047..d44a899f7f695f6de8a24e7b533224f5f85f89a6 100644
--- a/.docs/publications.md
+++ b/docs/publications.md
@@ -26,13 +26,24 @@ DBRepo logo in various formats:
## Refereed
+##### 2024
+
+* Weise, M., & Rauber, A. (2024). DBRepo: A Data Repository System for Research Data in Databases, in *Proceedings of
+ the 2024 IEEE International Conference on Big Data*, pp. 322–331, December 15-18th (Washington DC, USA).
+ DOI: [10.1109/bigdata62323.2024.10825401](https://doi.org/10.1109/bigdata62323.2024.10825401)<br />
+ \[[PDF](https://ec.tuwien.ac.at/~weise/pdf/weise2024dbrepo.pdf)\] \[[Slides](https://ec.tuwien.ac.at/~weise/pdf/weise2024dbrepo_presentation.pdf)\]
+
+* Altug, B., Weise, M., & Rauber, A. (2024). Generating Semantic Context for Data Interoperability in Relational
+ Databases using BGE M3-Embeddings, at *ML in PL Conference*. [Poster]. DOI: [10.34726/7280](https://doi.org/10.34726/7280)
+ :wikimedia-open-access:<br />
+
##### 2023
* Weise, M., Miksa, T., Grantner, T., Taha, J., Moser, M., Tsepelakis, S., Sanchez-Solis, B. & Rauber, A. (2023).
Repository Infrastructure Supporting Virtual Research Environments. [Poster]. *International Data Week*,
October 23-26th (Salzburg, Austria).
DOI: [10.34726/5143](https://doi.org/10.34726/5143) :wikimedia-open-access:<br />
- \[[PDF](/~weise/pdf/weise2023_scidatacon_abstract.pdf)\] \[[Poster](https://repositum.tuwien.at/bitstream/20.500.12708/189319/2/Weise-2023-Repository%20Infrastructure%20Supporting%20Virtual%20Research%20Environm...-vor.pdf)\]
+ \[[PDF](https://ec.tuwien.ac.at/~weise/pdf/weise2023_scidatacon_abstract.pdf)\] \[[Poster](https://repositum.tuwien.at/bitstream/20.500.12708/189319/2/Weise-2023-Repository%20Infrastructure%20Supporting%20Virtual%20Research%20Environm...-vor.pdf)\]
* Weise, M., Miksa, T., Grantner, T., Taha, J., Moser, M., Tsepelakis, S., Sanchez-Solis, B. & Rauber, A. (2023).
Research Data Infrastructure Landscape at TU Wien. [Poster]. *Austrian-Slowenian High Performance Computing
diff --git a/.docs/stylesheets/extra.css b/docs/stylesheets/extra.css
similarity index 83%
rename from .docs/stylesheets/extra.css
rename to docs/stylesheets/extra.css
index 31429800ab9d179411553e3537debc1dc6e1c538..400294f45857f40ef8da5d84f45240448b3efb76 100644
--- a/.docs/stylesheets/extra.css
+++ b/docs/stylesheets/extra.css
@@ -10,12 +10,22 @@
--md-hue: 230;
--md-default-bg-color: hsla(230, 15%, 21%, 1); }
+.md-header__button.md-logo {
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 0;
+ padding-bottom: 0; }
+
img.img-border {
border: 1px solid #b3b3b3; }
.md-typeset .md-button.md-button--primary {
color: white !important; }
+.md-typeset .admonition,
+.md-typeset details {
+ font-size: inherit !important; }
+
.md-typeset .md-button.md-button--secondary:focus, .md-typeset .md-button.md-button--secondary:hover {
color: var(--md-primary-fg-color--dark);
background: #e5e5e5; }
@@ -29,3 +39,5 @@ img.img-border {
.md-main .md-content a:not(.action-button):not([tabindex]):hover {
color: var(--md-primary-fg-color--dark);
border-bottom: 2px solid var(--md-primary-fg-color--dark); }
+
+/*# sourceMappingURL=extra.css.map */
diff --git a/docs/stylesheets/extra.css.map b/docs/stylesheets/extra.css.map
new file mode 100644
index 0000000000000000000000000000000000000000..71f842402cdca72b44b616322a8dcf46c74e12be
--- /dev/null
+++ b/docs/stylesheets/extra.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "AAAA;6BAC8B;EAC5B,qBAAqB,CAAC,QAAQ;EAC9B,oBAAoB,CAAC,QAAQ;EAAE,gBAAgB;EAC/C,2BAA2B,CAAC,QAAQ;EAAE,gBAAgB;;AAGxD,8BAA+B;EAC7B,QAAQ,CAAC,IAAI;EACb,qBAAqB,CAAC,uBAAuB;;AAG/C,0BAA2B;EACzB,UAAU,EAAE,CAAC;EACb,aAAa,EAAE,CAAC;EAChB,WAAW,EAAE,CAAC;EACd,cAAc,EAAE,CAAC;;AAGnB,cAAe;EACb,MAAM,EAAE,iBAAiB;;AAG3B,yCAA0C;EACxC,KAAK,EAAE,gBAAgB;;AAGzB;mBACoB;EAClB,SAAS,EAAE,kBAAkB;;AAI7B,oGACQ;EACN,KAAK,EAAE,gCAAgC;EACvC,UAAU,EAAE,OAAO;;AAIvB;0DAC2D;EACzD,KAAK,EAAE,0BAA0B;EACjC,aAAa,EAAE,oCAAoC;EAEnD;;kEACQ;IACN,KAAK,EAAE,gCAAgC;IACvC,aAAa,EAAE,0CAA0C",
+"sources": ["extra.scss"],
+"names": [],
+"file": "extra.css"
+}
diff --git a/.docs/stylesheets/extra.scss b/docs/stylesheets/extra.scss
similarity index 83%
rename from .docs/stylesheets/extra.scss
rename to docs/stylesheets/extra.scss
index 13615172ff42a2f6337b2f54548ea183fe769fda..94fef9c229b68c8ccb35e8fff0cb8b197142d3bc 100644
--- a/.docs/stylesheets/extra.scss
+++ b/docs/stylesheets/extra.scss
@@ -10,6 +10,13 @@
--md-default-bg-color: hsla(230, 15%, 21%, 1);
}
+.md-header__button.md-logo {
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
img.img-border {
border: 1px solid #b3b3b3;
}
@@ -18,6 +25,11 @@ img.img-border {
color: white !important;
}
+.md-typeset .admonition,
+.md-typeset details {
+ font-size: inherit !important;
+}
+
.md-typeset .md-button.md-button--secondary {
&:focus,
&:hover {
diff --git a/.docs/usage-authentication.md b/docs/usage-authentication.md
similarity index 100%
rename from .docs/usage-authentication.md
rename to docs/usage-authentication.md
diff --git a/.docs/usage-storage.md b/docs/usage-storage.md
similarity index 100%
rename from .docs/usage-storage.md
rename to docs/usage-storage.md
diff --git a/.docs/usage-upload.md b/docs/usage-upload.md
similarity index 100%
rename from .docs/usage-upload.md
rename to docs/usage-upload.md
diff --git a/docs/user-guide/create-account.md b/docs/user-guide/create-account.md
new file mode 100644
index 0000000000000000000000000000000000000000..ede0b64ee236549f1a9571d595e368f740b912a5
--- /dev/null
+++ b/docs/user-guide/create-account.md
@@ -0,0 +1,20 @@
+---
+author: Martin Weise
+---
+
+!!! abstract "Note"
+
+ The contents in this section do not apply to the instances that have affilation login mechanism (see
+ [Quickstart](../quickstart/#how-to-login)).
+
+A user wants to create an account in DBRepo.
+
+### UI
+
+To create a new account in DBRepo with the UI, provide your details in the Auth Service.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-account.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-account.mp4" type="video/mp4" />
+</video>
+
diff --git a/docs/user-guide/create-database.md b/docs/user-guide/create-database.md
new file mode 100644
index 0000000000000000000000000000000000000000..d015c289d33493e2790ef277af15f0439d7baa7b
--- /dev/null
+++ b/docs/user-guide/create-database.md
@@ -0,0 +1,46 @@
+---
+author: Martin Weise
+---
+
+A user wants to create a database in DBRepo.
+
+### UI
+
+A database can be created by choosing a name (e.g. My Database), selecting an engine (e.g. MariaDB) and defining the
+visibility, this can be [changed later](../update-visibility).
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-database.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-database.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+!!! info "Python Compatibility"
+
+ Ensure that you use the same Python library version as the target instance. For example: if you see `1.9.2` in the
+ bottom left, you need to use the `1.9.2` Python library.
+
+List all available containers with their database engine descriptions and obtain a container id.
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+containers = client.get_containers()
+print(containers)
+```
+
+Create a public database with the container id from the previous step.
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+database = client.create_database("My Database",
+ "6cfb3b8e-1792-4e46-871a-f3d103527203",
+ is_public=False,
+ is_schema_public=False)
+print(f"database id: {database.id}")
+```
\ No newline at end of file
diff --git a/docs/user-guide/create-pid.md b/docs/user-guide/create-pid.md
new file mode 100644
index 0000000000000000000000000000000000000000..974eed8e22fcbfd1370cfd1abcbab4a574e3cce0
--- /dev/null
+++ b/docs/user-guide/create-pid.md
@@ -0,0 +1,121 @@
+---
+author: Martin Weise
+---
+
+<center>
+```mermaid
+graph LR
+ A[Database] --> C(Metadata Service);
+ B[Subset] --> C;
+ D[Table] --> C;
+ E[View] --> C;
+ subgraph DataCite
+ F(Fabrica)
+ end
+ C <-.-> |DOI| F;
+```
+</center>
+
+A persistent identifier (PID) stores metadata redundant in an external system that issues them (i.e. DataCite for DOIs).
+DBRepo supports PIDs in the form of URIs and can be optionally configured to use DOIs from DataCite.
+
+A user wants to assign a PID to a data source, e.g. subset, owned or created by them.
+
+### UI
+
+The subset can be persistently identified by creating a PID via the "Get PID" button in the toolbar of each data source.
+If you do not have a PID already from another system, you can create one. This is the default action.
+
+First, provide information on the dataset creator(s), if possible, provide a PID on the person or organization. In some
+cases these will automatically be resolved (i.e. ORCID, ROR, DOI) and an attempt to load external metadata will be made.
+Using PIDs improves the accuracy of the PID record.
+
+In case no PID is available, start by selecting the creator type (natural person or organization).
+
+Fill out the given name, i.e. firstname(s) and family name, i.e. lastname(s). Both form the mandatory field name and
+should have the form `family name, given name`.
+
+If available, provide the PID of your affiliation (e.g. [`https://ror.org/04d836q62`](https://ror.org/04d836q62)), which
+increases accuracy of the PID record. If not, optionally provide an affiliation name.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-pid-1.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-pid-1.mp4" type="video/mp4" />
+</video>
+
+The PID needs at least one title in the title field and optionally a title type from the selection and optionally a
+title language from the available list of languages.
+
+Add additional title(s) where needed, a PID can have multiple titles.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-pid-2.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-pid-2.mp4" type="video/mp4" />
+</video>
+
+The PID needs at least one description in the description field and optionally a description type from the selection and
+a description language.
+
+Optionally provide a text description on the collection method and description of the dataset. This information greatly
+enhances (re-)usability of your data. You can remove those sections by clicking "Remove".
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-pid-3.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-pid-3.mp4" type="video/mp4" />
+</video>
+
+The dataset publisher in most cases is the organization that operates the DBRepo service.
+
+Provide a publication year and optionally a publication month and publication day. In case of imported data, this date
+corresponds to the *original* publishing date.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-pid-4.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-pid-4.mp4" type="video/mp4" />
+</video>
+
+Optionally reference other PIDs, and add a license from the list.
+
+Optionally provide the main language for the PID record. This helps machines to understand the context of
+your data.
+
+Optionally add funding information. When you are finished
+
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-pid-5.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-pid-5.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+```python
+from dbrepo.RestClient import RestClient
+from python.dbrepo.api.dto import IdentifierType, CreateIdentifierFunder, CreateIdentifierDescription, \
+ CreateIdentifierTitle, Identifier, CreateIdentifierCreator, CreateRelatedIdentifier, RelatedIdentifierType, \
+ RelatedIdentifierRelation
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+identifier = client.create_identifier(<database_id>,
+ type=IdentifierType.DATABASE,
+ creators=[CreateIdentifierCreator(
+ creator_name="Weise, Martin",
+ name_identifier="https://orcid.org/0000-0003-4216-302X")],
+ titles=[CreateIdentifierTitle(
+ title="Danube river water measurements")],
+ descriptions=[CreateIdentifierDescription(
+ description="This dataset contains hourly measurements of the water \
+ level in Vienna from 1983 to 2015")],
+ funders=[CreateIdentifierFunder(
+ funder_name="Austrian Science Fund",
+ funder_identifier="https://doi.org/10.13039/100000001")],
+ licenses=[Identifier(identifier="CC-BY-4.0")],
+ publisher="TU Wien",
+ publication_year=2024,
+ related_identifiers=[CreateRelatedIdentifier(
+ value="https://doi.org/10.5334/dsj-2022-004",
+ type=RelatedIdentifierType.DOI,
+ relation=RelatedIdentifierRelation.CITES)])
+print(f"identifier id: {identifier.id}")
+```
\ No newline at end of file
diff --git a/docs/user-guide/create-subset.md b/docs/user-guide/create-subset.md
new file mode 100644
index 0000000000000000000000000000000000000000..bb5b47c60893cf621004f45e4989c915e351472b
--- /dev/null
+++ b/docs/user-guide/create-subset.md
@@ -0,0 +1,29 @@
+---
+author: Martin Weise
+---
+
+### UI
+
+A subset can be created by specifying a source view (e.g. My View), select the columns that are included in the subset
+and optionally filter by values (e.g. `lot_shape` = `Reg`).
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-subset.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-subset.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+```python
+from dbrepo.RestClient import RestClient
+from dbrepo.api.dto import QueryDefinition, FilterDefinition, FilterType
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+subset = client.create_subset(<database_id>,
+ QueryDefinition("my_view",
+ ["order", ...],
+ filter=FilterDefinition(FilterType.WHERE, "lot_shape", "=", "Reg"),
+ page=0,
+ size=1000000))
+printf(f"subset id: {subset.id}")
+```
\ No newline at end of file
diff --git a/docs/user-guide/database-access.md b/docs/user-guide/database-access.md
new file mode 100644
index 0000000000000000000000000000000000000000..b9acb138f8680c9822e9fe114103c3d4f8f3265f
--- /dev/null
+++ b/docs/user-guide/database-access.md
@@ -0,0 +1,61 @@
+---
+author: Martin Weise
+---
+
+This short guide shows the decision flow when accessing data ("read") or importing data ("write").
+
+* When accessing data to read it:
+
+<center>
+```mermaid
+graph LR
+ A[Reader] --> B{Access?};
+ B --> |No| C[\Error\];
+ B --> |Yes| D(((Allow)));
+```
+</center>
+
+* When importing data to write it to the database, e.g. importing a dataset as table:
+
+ <center>
+ ```mermaid
+ graph LR
+ A[Writer] --> B{Access?};
+ B --> |No| C[\Error\];
+ B --> |read| C;
+ B --> |write_own| D{Owner?}
+ D --> |No| C;
+ D --> |Yes| E(((Allow)));
+ B --> |write_all| E;
+ ```
+ </center>
+
+A user wants to give specific users read access to a private database.
+
+### UI
+
+As a database owner, you can give specific users access to your database, only you can do this. Create access for
+another user, you can use the box to search and specify the level of access.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/database-access.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/database-access.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+To give a user (with id `e9bf38a0-a254-4040-87e3-92e0f09e29c8` access to this database (e.g. read access), update
+their access using the HTTP API:
+
+```python
+from dbrepo.RestClient import RestClient
+from python.dbrepo.api.dto import AccessType
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+client.create_database_access(<database_id>,
+ type=AccessType.READ,
+ user_id="e9bf38a0-a254-4040-87e3-92e0f09e29c8")
+```
+
+In case the user already has access, use the method `update_database_access` or revoke `delete_database_access`.
\ No newline at end of file
diff --git a/docs/user-guide/database-dashboard.md b/docs/user-guide/database-dashboard.md
new file mode 100644
index 0000000000000000000000000000000000000000..640262079e40247a05276f3a836597aae32401ab
--- /dev/null
+++ b/docs/user-guide/database-dashboard.md
@@ -0,0 +1,53 @@
+---
+author: Martin Weise
+---
+
+A database dashboard is a managed collection of available data sources automatically provisioned by DBRepo. Every
+database dashboard always consists of exactly two areas:
+
+* **Unmanaged**
+
+ This area can be modified by the database owner and is not affected by provisioning. It is the area above the
+ **Generated Dashboard** row.
+
+* **Managed**
+
+ This area is affected by provisioning, any changes to this area will be overridden and deleted without notice.
+ Note that the dashboard links are also affected by provisioning.
+
+Everytime the views of the database change (e.g. a new view is added, a view is deleted) then the database dashboard for
+this database is provisioned.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/database-dashboard.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/database-dashboard.mp4" type="video/mp4" />
+</video>
+
+!!! abstract "Note"
+
+ Database dashboards are only available for non-hidden databases, see [Update Visibility](../update-visibility).
+
+A user wants to create a dashboard of available data sources and add personal customization.
+
+### UI
+
+As a database owner, you can disable database dashboards. They are enabled by default.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/disable-dashboard.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/disable-dashboard.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+```python
+from dbrepo.RestClient import RestClient
+from python.dbrepo.api.dto import AccessType
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+client.update_database_visibility(<database_id>,
+ is_public=True,
+ is_schema_public=False,
+ is_dashboard_enabled=True)
+```
diff --git a/docs/user-guide/delete-database.md b/docs/user-guide/delete-database.md
new file mode 100644
index 0000000000000000000000000000000000000000..373153a8cd46081a4f69ef332fc3cd1a6cb47907
--- /dev/null
+++ b/docs/user-guide/delete-database.md
@@ -0,0 +1,5 @@
+---
+author: Martin Weise
+---
+
+This section will be expanded in the future.
diff --git a/docs/user-guide/get-data.md b/docs/user-guide/get-data.md
new file mode 100644
index 0000000000000000000000000000000000000000..4bd32217b03fb53b36c9bcffcb3221485dced627
--- /dev/null
+++ b/docs/user-guide/get-data.md
@@ -0,0 +1,86 @@
+---
+author: Martin Weise
+---
+
+<center>
+```mermaid
+graph LR
+ B[Subset] --> C(Data Service);
+ D[Table] --> C;
+ E[View] --> C;
+ B --> |PID| G(Metadata Service);
+ D --> |PID| G;
+ E --> |PID| G;
+ subgraph Python
+ F[DataFrame];
+ end
+ C --> |get_subset_data| F;
+ C --> |get_table_data| F;
+ C --> |get_view_data| F;
+ C --> |REST API| F;
+ G --> |get_identifier_data| F;
+ G --> |REST API| F;
+ C --> |REST API| H[Application];
+ C --> |OAI-PMH API| H;
+ C --> |FAIR Signposting API| H;
+ C --> |JSON-LD API| H;
+ F <--> H;
+```
+</center>
+
+A user wants to access and download data from a data source, e.g. a view.
+
+### UI
+
+The UI can be used to fetch data. The data preview can be used to explore data by navigating through the fetched data
+with the arrows and selecting a bigger page size.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/fetch-data.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/fetch-data.mp4" type="video/mp4" />
+</video>
+
+Export the complete data of the data source by clicking the "Download" button.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/export-data.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/export-data.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+* Subset
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+df = client.get_subset_data(<database_id>,
+ subset_id='5cdd08b7-4c6d-483e-b857-0eeaa86c59b4',
+ size=1000000)
+```
+
+* Table
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+df = client.get_table_data(<database_id>,
+ table_id='c0e9dd95-f43a-4e2f-a5e8-755e058cf118',
+ size=1000000)
+```
+
+* View
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+df = client.get_view_data(<database_id>,
+ view_id='32567e6c-f9ce-4b08-b350-88a7e2a7e291',
+ size=1000000)
+```
diff --git a/docs/user-guide/import-dataset.md b/docs/user-guide/import-dataset.md
new file mode 100644
index 0000000000000000000000000000000000000000..26862f1f00751f7265945ec1b5d41d356e3e1541
--- /dev/null
+++ b/docs/user-guide/import-dataset.md
@@ -0,0 +1,108 @@
+---
+author: Martin Weise
+---
+
+<center>
+```mermaid
+graph LR
+ A(UI) --> |HTTP| D;
+ B(Python) --> |HTTP| D(Data Service);
+ D --> |JDBC| E[(Data Database)];
+```
+</center>
+
+A user wants to import a static dataset (e.g. from a .csv file). In this action, a table will be created in the
+database.
+
+Importing a dataset required at least `write-own` access, see [Database Access](../database-access). If you are the
+owner of the database, you are good to go by default.
+
+### UI
+
+Click on "Create Table" in the database toolbar at the top. Then give the table a name, optional description (this
+can be added at a later point as well) and set the visibility settings for transparency and insights. In this example
+the dataset will be fully visible to the world.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/import-dataset-1.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/import-dataset-1.mp4" type="video/mp4" />
+</video>
+
+In the next step, provide the dataset structure, the default will be sufficient for most cases.
+
+Select the column separator according to your CSV file (open it in a text editor to make sure, this prevents most
+errors).
+
+The first line of a CSV usually contains the column names, if that is not the case, select "Data only" to indicate that
+your CSV does not have a first-line with headers.
+
+Values in a CSV usually are in double quotes when they contain the separator, if your CSV uses a different quote
+encoding, select the correct one.
+
+Many CSV have a newline character `\n` at the end of the line. If you are using a special newline encoding, select the
+correct one from the box.
+
+Finally, select the CSV dataset, it will upload the dataset automatically and analyse the contents to recommend the
+table structure.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/import-dataset-2.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/import-dataset-2.mp4" type="video/mp4" />
+</video>
+
+Next, confirm or correct the dataset schema that has been automatically recommended. For example, change the data type
+if it was incorrectly analysed. You need to select one or more columns to be the primary key that must contain a unique
+(combination of) values. Typically, this will be a column named `id` or similar.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/import-dataset-3.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/import-dataset-3.mp4" type="video/mp4" />
+</video>
+
+The import settings in the import page already takes over the settings from the previous page. You need to click
+"Import Data". The table now contains the dataset.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/import-dataset-4.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/import-dataset-4.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+!!! info "Python Compatibility"
+
+ Ensure that you use the same Python library version as the target instance. For example: if you see `1.9.2` in the
+ bottom left, you need to use the `1.9.2` Python library.
+
+You can import a dataset from a `pandas` DataFrame via our Python library.
+
+* Table from Dataset
+
+```python
+from dbrepo.RestClient import RestClient
+from pandas import DataFrame
+
+df = DataFrame({'some_col': 123})
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+table = client.create_table(<database_id>,
+ "Cool Table",
+ is_public=True,
+ is_schema_public=True,
+ dataframe=df)
+print(f"table id: {table.id}")
+```
+
+* Import Data into existing Table
+
+```python
+from dbrepo.RestClient import RestClient
+from pandas import DataFrame
+
+df = DataFrame({'some_col': 123})
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+client.import_table_data(<database_id>,
+ table_id='4ce60952-13d3-430f-a2ad-93e4759542a0',
+ dataframe=df)
+```
\ No newline at end of file
diff --git a/docs/user-guide/import-live-data.md b/docs/user-guide/import-live-data.md
new file mode 100644
index 0000000000000000000000000000000000000000..c78f7129e82a023b3ac708d26ca7ae37ff440870
--- /dev/null
+++ b/docs/user-guide/import-live-data.md
@@ -0,0 +1,47 @@
+---
+author: Martin Weise
+---
+
+<center>
+```mermaid
+graph LR
+ A[Sensor] --> |AMQP| C(Broker Service);
+ B[Sensor] --> |MQTT| C;
+ C --> |HTTP| D(Data Service);
+ D --> |JDBC| E[(Data Database)];
+```
+</center>
+
+DBRepo supports advanced data import through asynchronous data mechanisms. The Broker Service offers two protocols
+commonly used by Internet of Things (IoT) infrastructures: AMQP and the lightweight MQTT.
+
+Find the advanced data import details for importing live data on the data source info page.
+
+<figure markdown>
+
+</figure>
+
+A user wants to import live data from e.g. sensor measurements into a table in DBRepo. The user needs to have at least
+`write-own` access to write data into a table owned by them.
+
+### Python
+
+* AMQP
+
+```python
+from dbrepo.AmqpClient import AmqpClient
+
+client = AmqpClient(broker_host="<hostname>", broker_port=5672, username="foo",
+ password="bar")
+client.publish("dbrepo.<database_id>.<table_id>", {'precipitation': 2.4})
+```
+
+* MQTTv5
+
+```python
+from dbrepo.MqttClient import MqttClient
+
+client = MqttClient(broker_host="<hostname>", broker_port=1883, username="foo",
+ password="bar")
+client.publish("dbrepo.<database_id>.<table_id>", {'precipitation': 2.4})
+```
diff --git a/docs/user-guide/index.md b/docs/user-guide/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..5406f89ce6a69950906ebebc1198d432ad7974e6
--- /dev/null
+++ b/docs/user-guide/index.md
@@ -0,0 +1,14 @@
+---
+author: Martin Weise
+---
+
+Operational user-guide describing the graphical deposit, review and management of records.
+
+- [Quick start](../user-guide/quickstart)
+
+Jump right into and use our pre-configured starter resources:
+
+- Download the [Jupyter Notebook](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.9/.jupyter/starter-notebook.ipynb?ref_type=heads&inline=false)
+ for local development, or
+- Use the Jupyter image `registry.datalab.tuwien.ac.at/dbrepo/starter-notebook:1.9.3` for your Jupyterhub infrastructure
+
diff --git a/docs/user-guide/quickstart.md b/docs/user-guide/quickstart.md
new file mode 100644
index 0000000000000000000000000000000000000000..1450d04748f05d17378f13609056bee597dbc905
--- /dev/null
+++ b/docs/user-guide/quickstart.md
@@ -0,0 +1,139 @@
+---
+author: Martin Weise
+---
+
+Need to start using DBRepo ASAP? This page contains only a brief introduction. You can find in-depth information about
+these topics in the corresponding documentation pages on the left.
+
+## How to Login
+
+The following instances have different login mechanisms:
+
+* Open for anyone:
+
+ !!! warning "Ephemeral Data"
+
+ This instance is intended for testing-purposes only and data may be deleted at any time.
+
+ [test.dbrepo.tuwien.ac.at](https://test.dbrepo.tuwien.ac.at) - Create an account and login via username and
+ password.
+
+* By affiliation:
+
+ * [dbrepo1.ec.tuwien.ac.at](https://dbrepo1.ec.tuwien.ac.at) - Login via TU SSO
+
+## Create Database
+
+### UI
+
+A database can be created by choosing a name (e.g. My Database), selecting an engine (e.g. MariaDB) and defining the
+visibility, this can be changed later.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-database.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-database.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+!!! info "Python Compatibility"
+
+ Ensure that you use the same Python library version as the target instance. For example: if you see `1.9.2` in the
+ bottom left, you need to use the `1.9.2` Python library.
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+database = client.create_database("My Database",
+ "6cfb3b8e-1792-4e46-871a-f3d103527203",
+ is_public=False,
+ is_schema_public=False)
+print(f"database id: {database.id}")
+```
+
+## Import Data
+
+### UI
+
+Create a table from a dataset by choosing a name (e.g. My Table), giving info on the CSV structure, uploading the CSV,
+selecting a primary key column and then importing the dataset.
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/import-data.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/import-data.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+```python
+from dbrepo.RestClient import RestClient
+from pandas import DataFrame
+
+df = DataFrame({'some_col': 123})
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+table = client.create_table(<database_id>,
+ "My Table",
+ is_public=False,
+ is_schema_public=False,
+ dataframe=df)
+print(f"table id: {table.id}")
+```
+
+## Create View
+
+### UI
+
+A view can be created by specifying a source table (e.g. My Table), select the columns that are included in the view
+and optionally filter by values (e.g. `street` = `Pave`).
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-view.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-view.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+```python
+from dbrepo.RestClient import RestClient
+from dbrepo.api.dto import QueryDefinition, FilterDefinition, FilterType
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+view = client.create_view(<database_id>,
+ "My View",
+ QueryDefinition("my_table",
+ ["order", ...],
+ filter=FilterDefinition(FilterType.WHERE, "street", "=", "Pave"),
+ is_public=False,
+ is_schema_public=False))
+printf(f"view id: {view.id}")
+```
+
+## Create Subset
+
+### UI
+
+A subset can be created by specifying a source view (e.g. My View), select the columns that are included in the subset
+and optionally filter by values (e.g. `lot_shape` = `Reg`).
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/create-subset.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/create-subset.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+```python
+from dbrepo.RestClient import RestClient
+from dbrepo.api.dto import QueryDefinition, FilterDefinition, FilterType
+
+client = RestClient("http://<hostname>", username="foo", password="bar")
+subset = client.create_subset(<database_id>,
+ QueryDefinition("my_view",
+ ["order", ...],
+ filter=FilterDefinition(FilterType.WHERE, "lot_shape", "=", "Reg"),
+ page=0,
+ size=1000000))
+printf(f"subset id: {subset.id}")
+```
\ No newline at end of file
diff --git a/docs/user-guide/update-visibility.md b/docs/user-guide/update-visibility.md
new file mode 100644
index 0000000000000000000000000000000000000000..c49362b271e31744c863a88bf4be7ad86291fc0c
--- /dev/null
+++ b/docs/user-guide/update-visibility.md
@@ -0,0 +1,71 @@
+---
+author: Martin Weise
+---
+
+A user wants a datasource, e.g. a database, to be private and only give specific users access.
+
+This can be applied to any datasource in DBRepo: tables, views, subsets and whole databases
+There are two attributes that define a datasource's visibility:
+
+* **Transparency**
+
+ Can hide the datasource in listings and search results or make it visible.
+
+* **Insights**
+
+ Can hide additional info of the datasource associated with schema and structure, e.g. can hide the SQL query used to
+ create a view to not expose the database schema; or make that info visible.
+
+A datasource therefore can have four possible visibility states:
+
+* **Visible**
+
+ When set to visible Transparency and visible Insights, everything is visible to the world.
+
+ !!! abstract "Note"
+
+ Visible data and a PID with license to reuse (e.g. CC-BY 4.0) is equivalent to Open Data.
+
+* **Data-only**
+
+ When set to visible Transparency and hidden Insights, this affects data sources. Associated schema metadata is
+ hidden.
+
+ * Database: removes the list of tables, views and subsets.
+ * Table: removes the list of columns.
+ * View: removes the SQL query.
+ * Subset: removes the SQL query.
+
+* **Schema-only**
+
+ When set to hidden Transparency and visible Insights, this affects data sources. Associated data information is
+ hidden and the data preview is disabled for anyone without at least `read` access.
+
+* **Hidden**
+
+ When set to hidden Transparency and hidden Insights, this affects data sources, everything is hidden to anyone (even
+ the existence). Only the owner and selected user accounts that have at least `read` access can see the datasource.
+ No [database dashboard](../database-dashboard) is visible to anyone.
+
+### UI
+
+<video autoplay loop>
+ <source src="/infrastructures/dbrepo/videos/update-visibility.webm" type="video/webm" />
+ <source src="/infrastructures/dbrepo/videos/update-visibility.mp4" type="video/mp4" />
+</video>
+
+### Python
+
+To change the visibility of a database where you are the owner (this is the case for self-created databases), send
+a request to the HTTP API:
+
+```python
+from dbrepo.RestClient import RestClient
+
+client = RestClient(endpoint="http://<hostname>", username="foo",
+ password="bar")
+client.update_database_visibility(<database_id>,
+ is_public=True,
+ is_schema_public=False,
+ is_dashboard_enabled=True)
+```
\ No newline at end of file
diff --git a/docs/videos/create-account.mp4 b/docs/videos/create-account.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..1e84bde443db86c1acadbcb6fc210e2dd56c5905
Binary files /dev/null and b/docs/videos/create-account.mp4 differ
diff --git a/docs/videos/create-account.webm b/docs/videos/create-account.webm
new file mode 100644
index 0000000000000000000000000000000000000000..e611f463947104ecf3f27919754340ec368a52c2
Binary files /dev/null and b/docs/videos/create-account.webm differ
diff --git a/docs/videos/create-database.mp4 b/docs/videos/create-database.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..67501ef091c5704d46e24cab9e988fe3352eb418
Binary files /dev/null and b/docs/videos/create-database.mp4 differ
diff --git a/docs/videos/create-database.webm b/docs/videos/create-database.webm
new file mode 100644
index 0000000000000000000000000000000000000000..848be26802611e9696d12729330b17cbbfa77d08
Binary files /dev/null and b/docs/videos/create-database.webm differ
diff --git a/docs/videos/create-pid-1.webm b/docs/videos/create-pid-1.webm
new file mode 100644
index 0000000000000000000000000000000000000000..a69f0574fc539b1fe3e5234c5466d4bf447e70c5
Binary files /dev/null and b/docs/videos/create-pid-1.webm differ
diff --git a/docs/videos/create-pid-2.webm b/docs/videos/create-pid-2.webm
new file mode 100644
index 0000000000000000000000000000000000000000..b08265c3a440fe0df681801ac17d2890d3c5684b
Binary files /dev/null and b/docs/videos/create-pid-2.webm differ
diff --git a/docs/videos/create-pid-3.webm b/docs/videos/create-pid-3.webm
new file mode 100644
index 0000000000000000000000000000000000000000..886a5c85be30c169e93eccfec3f40c8e8897d2bb
Binary files /dev/null and b/docs/videos/create-pid-3.webm differ
diff --git a/docs/videos/create-pid-4.webm b/docs/videos/create-pid-4.webm
new file mode 100644
index 0000000000000000000000000000000000000000..6eb1da72a563de74347d5b35553b75ccbd684423
Binary files /dev/null and b/docs/videos/create-pid-4.webm differ
diff --git a/docs/videos/create-pid-5.webm b/docs/videos/create-pid-5.webm
new file mode 100644
index 0000000000000000000000000000000000000000..654bd9f420a99da944e7e4cbc5e0d5f6eeb34685
Binary files /dev/null and b/docs/videos/create-pid-5.webm differ
diff --git a/docs/videos/create-subset.mp4 b/docs/videos/create-subset.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..b86587b5af30e907c4a68137ca8801b15d5c3746
Binary files /dev/null and b/docs/videos/create-subset.mp4 differ
diff --git a/docs/videos/create-subset.webm b/docs/videos/create-subset.webm
new file mode 100644
index 0000000000000000000000000000000000000000..bf29fe5e09696ceb7d1ad3e425b60763bb79ae5d
Binary files /dev/null and b/docs/videos/create-subset.webm differ
diff --git a/docs/videos/create-view.mp4 b/docs/videos/create-view.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..1543555557b337ab1f25bbb1fc1821c1054f3c3e
Binary files /dev/null and b/docs/videos/create-view.mp4 differ
diff --git a/docs/videos/create-view.webm b/docs/videos/create-view.webm
new file mode 100644
index 0000000000000000000000000000000000000000..7a2c19a482afdb3aff31cb7b423329113e75d0aa
Binary files /dev/null and b/docs/videos/create-view.webm differ
diff --git a/docs/videos/database-access.webm b/docs/videos/database-access.webm
new file mode 100644
index 0000000000000000000000000000000000000000..207cfdababf682fe78a15978e33121b95ab185d9
Binary files /dev/null and b/docs/videos/database-access.webm differ
diff --git a/docs/videos/database-dashboard.webm b/docs/videos/database-dashboard.webm
new file mode 100644
index 0000000000000000000000000000000000000000..9e06945ec9beb79d7f0cdae96ce74dfb7c9f64c6
Binary files /dev/null and b/docs/videos/database-dashboard.webm differ
diff --git a/docs/videos/disable-dashboard.webm b/docs/videos/disable-dashboard.webm
new file mode 100644
index 0000000000000000000000000000000000000000..6615e98ba51b7def7bbad5d0c918fdb2e4bb1fa9
Binary files /dev/null and b/docs/videos/disable-dashboard.webm differ
diff --git a/docs/videos/export-data.webm b/docs/videos/export-data.webm
new file mode 100644
index 0000000000000000000000000000000000000000..c97600fa6cc280f60dca5bc887deadb3d3fc9e44
Binary files /dev/null and b/docs/videos/export-data.webm differ
diff --git a/docs/videos/fetch-data.webm b/docs/videos/fetch-data.webm
new file mode 100644
index 0000000000000000000000000000000000000000..b7bf6b93507f1fedff37dcc0213ae50bdf00458b
Binary files /dev/null and b/docs/videos/fetch-data.webm differ
diff --git a/docs/videos/imort-dataset-3.mp4 b/docs/videos/imort-dataset-3.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..f0e0089fe8218494788a12765ffaefa62d584585
Binary files /dev/null and b/docs/videos/imort-dataset-3.mp4 differ
diff --git a/docs/videos/import-data.mp4 b/docs/videos/import-data.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..907a28766ab1df517ddec018525b6a5ac5005579
Binary files /dev/null and b/docs/videos/import-data.mp4 differ
diff --git a/docs/videos/import-data.webm b/docs/videos/import-data.webm
new file mode 100644
index 0000000000000000000000000000000000000000..3ff287ba30a555f4173dab9d26b7aad7f132a2ab
Binary files /dev/null and b/docs/videos/import-data.webm differ
diff --git a/docs/videos/import-dataset-1.mp4 b/docs/videos/import-dataset-1.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..1957230dbb78d8c7634b9575892f040071733f6a
Binary files /dev/null and b/docs/videos/import-dataset-1.mp4 differ
diff --git a/docs/videos/import-dataset-1.webm b/docs/videos/import-dataset-1.webm
new file mode 100644
index 0000000000000000000000000000000000000000..e71a1f680ea22dc62e9e8d2538b135d0260dde54
Binary files /dev/null and b/docs/videos/import-dataset-1.webm differ
diff --git a/docs/videos/import-dataset-2.mp4 b/docs/videos/import-dataset-2.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..51ad4425918a08a9c4e30a6485a7af6cb9c975a0
Binary files /dev/null and b/docs/videos/import-dataset-2.mp4 differ
diff --git a/docs/videos/import-dataset-2.webm b/docs/videos/import-dataset-2.webm
new file mode 100644
index 0000000000000000000000000000000000000000..c85ec9376bdc9481daba0e60002f1899324ea931
Binary files /dev/null and b/docs/videos/import-dataset-2.webm differ
diff --git a/docs/videos/import-dataset-3.webm b/docs/videos/import-dataset-3.webm
new file mode 100644
index 0000000000000000000000000000000000000000..e8ea1b70e5440abae2e301446c321b1ab04ff212
Binary files /dev/null and b/docs/videos/import-dataset-3.webm differ
diff --git a/docs/videos/import-dataset-4.mp4 b/docs/videos/import-dataset-4.mp4
new file mode 100644
index 0000000000000000000000000000000000000000..7e8a2d030988809db02d9455c3375ff011f639e3
Binary files /dev/null and b/docs/videos/import-dataset-4.mp4 differ
diff --git a/docs/videos/import-dataset-4.webm b/docs/videos/import-dataset-4.webm
new file mode 100644
index 0000000000000000000000000000000000000000..e1d8c31fad5cb561f7f84fafe0b356de2b9ada96
Binary files /dev/null and b/docs/videos/import-dataset-4.webm differ
diff --git a/docs/videos/update-visibility.webm b/docs/videos/update-visibility.webm
new file mode 100644
index 0000000000000000000000000000000000000000..77be59a62541fd6bdfaed6c7b830cde98388d7e1
Binary files /dev/null and b/docs/videos/update-visibility.webm differ
diff --git a/.docs/why.md b/docs/why.md
similarity index 100%
rename from .docs/why.md
rename to docs/why.md
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index d3e3dd4a0b363e0c967e76b9f81f2820eb53330e..08fe477c28e4548bb6bf38ca03a81b8d62461246 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.9.2"
-appVersion: "1.9.2"
+version: "1.9.3"
+appVersion: "1.9.3"
keywords:
- dbrepo
maintainers:
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 627ab8627f800c2bd75a809e51d857c570646132..25bcdee55bc9b869e733925499d02f72e6e7d467 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -87,7 +87,7 @@ The command removes all the Kubernetes components associated with the chart and
| `metadatadb.extraInitDbScripts` | Additional init.db scripts that are executed on the first start. | `{}` |
| `metadatadb.resourcesPreset` | The container resource preset | `xlarge` |
| `metadatadb.persistence.enabled` | Enable persistent storage. | `true` |
-| `metadatadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `1` |
+| `metadatadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `3` |
### Dashboard Database Enable the Dashboard Database.
@@ -130,27 +130,19 @@ The command removes all the Kubernetes components associated with the chart and
| `datadb.galera.mariabackup.user` | The database backup username. | `backup` |
| `datadb.galera.mariabackup.password` | The database backup user password | `backup` |
| `datadb.jdbcExtraArgs` | The extra arguments for JDBC connections in the microservices. | `""` |
-| `datadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `1` |
+| `datadb.replicaCount` | The number of cluster nodes, should be uneven i.e. 2n+1 | `3` |
| `datadb.resourcesPreset` | The container resource preset | `xlarge` |
| `datadb.initdbScriptsConfigMap` | The setup data to load into the database on first start. | `data-db-setup` |
| `datadb.persistence.enabled` | Enable persistent storage. | `true` |
### Search Database
-| Name | Description | Value |
-| --------------------------------------- | ----------------------------------- | ----------- |
-| `searchdb.enabled` | Enable the Data datadb. | `true` |
-| `searchdb.host` | The hostname for the microservices. | `search-db` |
-| `searchdb.port` | The port for the microservices. | `9200` |
-| `searchdb.coordinating.resourcesPreset` | The container resource preset | `small` |
-| `searchdb.coordinating.replicaCount` | The number of pod replicas. | `1` |
-| `searchdb.ingest.resourcesPreset` | The container resource preset | `micro` |
-| `searchdb.ingest.replicaCount` | The number of pod replicas. | `1` |
-| `searchdb.master.resourcesPreset` | The container resource preset | `small` |
-| `searchdb.master.replicaCount` | The number of pod replicas. | `1` |
-| `searchdb.data.resourcesPreset` | The container resource preset | `medium` |
-| `searchdb.data.replicaCount` | The number of pod replicas. | `1` |
-| `searchdb.clusterName` | The cluster name. | `search-db` |
+| Name | Description | Value |
+| ---------------------- | ----------------------------------- | ----------- |
+| `searchdb.enabled` | Enable the Data datadb. | `true` |
+| `searchdb.host` | The hostname for the microservices. | `search-db` |
+| `searchdb.port` | The port for the microservices. | `9200` |
+| `searchdb.clusterName` | The cluster name. | `search-db` |
### Broker Service
@@ -188,7 +180,7 @@ mqtt.vhost = dbrepo
mqtt.exchange = dbrepo
mqtt.prefetch = 10
` |
-| `brokerservice.replicaCount` | The number of replicas. | `1` |
+| `brokerservice.replicaCount` | The number of replicas. | `3` |
### Analyse Service
diff --git a/helm/dbrepo/charts/seaweedfs-4.8.7.tgz b/helm/dbrepo/charts/seaweedfs-4.8.7.tgz
index c5d992f3d188e603612b37cf3afac2efa935571b..8e612ab3e34de2fba56b1f4eccf6b00d90e541d2 100644
Binary files a/helm/dbrepo/charts/seaweedfs-4.8.7.tgz and b/helm/dbrepo/charts/seaweedfs-4.8.7.tgz differ
diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar
index fb1458371a5ce51be8ca63a9421a621e0ef09ce3..5ff46c83dc8c8a09c169f39150e534053123373f 100644
Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ
diff --git a/helm/dbrepo/files/dbrepo.conf b/helm/dbrepo/files/dbrepo.conf
index e1ed114d1e47da472849481df4314988167a3097..935ce4b9b5b26cd7569178c7d15a8c46c4f987f6 100644
--- a/helm/dbrepo/files/dbrepo.conf
+++ b/helm/dbrepo/files/dbrepo.conf
@@ -27,6 +27,15 @@ server {
autoindex_localtime on;
}
+ location /admin/ {
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Host $host;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://auth-service:8080/;
+ proxy_read_timeout 90;
+ }
+
location /dashboard/ {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/helm/dbrepo/templates/auth-secret.yaml b/helm/dbrepo/templates/auth-secret.yaml
index da47194ddfd93d225242ed84df35802d42501ecf..fd10d3b259ff00e5e0e4e0e0dee5f9ebd815b339 100644
--- a/helm/dbrepo/templates/auth-secret.yaml
+++ b/helm/dbrepo/templates/auth-secret.yaml
@@ -14,6 +14,8 @@ stringData:
KC_LOG_FILE_LEVEL: "debug"
KC_LOG_FILE_OUTPUT: "json"
KEYCLOAK_HOSTNAME: "{{ .Values.gateway }}"
+ KEYCLOAK_HOSTNAME_ADMIN: "{{ .Values.gateway }}/admin/"
+ KEYCLOAK_PROXY_HEADERS: "xforwarded"
LDAP_ROOT: "{{ .Values.identityservice.global.ldapDomain }}"
LDAP_ADMIN_DN: "cn={{ .Values.identityservice.global.adminUser }},{{ .Values.identityservice.global.ldapDomain }}"
LDAP_ADMIN_PASSWORD: "{{ .Values.identityservice.global.adminPassword }}"
diff --git a/helm/dbrepo/templates/auth-setup-job.yaml b/helm/dbrepo/templates/auth-setup-job.yaml
index 9b83684bf501402d5387b295eeab7b83869b2293..d12994aab9eb5b027e323d1d14ea31f2cb0b1e6f 100644
--- a/helm/dbrepo/templates/auth-setup-job.yaml
+++ b/helm/dbrepo/templates/auth-setup-job.yaml
@@ -35,9 +35,15 @@ spec:
envFrom:
- secretRef:
name: auth-service-secret
+ volumeMounts:
+ - name: empty-dir
+ mountPath: /var/log/app/service/auth
{{- if .Values.authservice.setupJob.resources }}
resources: {{- toYaml .Values.authservice.setupJob.resources | nindent 12 }}
{{- else if ne .Values.authservice.setupJob.resourcesPreset "none" }}
resources: {{- include "common.resources.preset" (dict "type" .Values.authservice.setupJob.resourcesPreset) | nindent 12 }}
{{- end }}
+ volumes:
+ - name: empty-dir
+ emptyDir: { }
{{- end }}
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index 4bf18c24d095ae5b55f4c4657dd0740d466798e6..b721bb4360896b2c8b9bb775330d7ee0a0960bcf 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -1,23 +1,26 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
+ "type": "object",
"properties": {
"analyseservice": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -35,19 +38,17 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -56,18 +57,18 @@
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -84,20 +85,19 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
},
"s3": {
+ "type": "object",
"properties": {
"endpoint": {
"type": "string"
@@ -105,15 +105,15 @@
"proto": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"authservice": {
+ "type": "object",
"properties": {
"client": {
+ "type": "object",
"properties": {
"id": {
"type": "string"
@@ -121,8 +121,7 @@
"secret": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -134,7 +133,9 @@
"type": "string"
},
"extraVolumeMounts": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"mountPath": {
"type": "string"
@@ -145,74 +146,73 @@
"subPath": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"extraVolumes": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"configMap": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"name": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"fullnameOverride": {
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"debug": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"initdbScripts": {
+ "type": "object",
"properties": {
"import-realms.sh": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"jwt": {
+ "type": "object",
"properties": {
"pubkey": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"postgresql": {
+ "type": "object",
"properties": {
"auth": {
+ "type": "object",
"properties": {
"postgresPassword": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -220,8 +220,7 @@
"fullnameOverride": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"proxyHeaders": {
"type": "string"
@@ -233,36 +232,37 @@
"type": "string"
},
"setupJob": {
+ "type": "object",
"properties": {
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"brokerservice": {
+ "type": "object",
"properties": {
"advancedConfigurationExistingSecret": {
"type": "string"
},
"auth": {
+ "type": "object",
"properties": {
"tls": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -273,11 +273,9 @@
"existingSecretFullChain": {
"type": "boolean"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"connectionTimeout": {
"type": "integer"
@@ -298,7 +296,9 @@
"type": "string"
},
"extraVolumeMounts": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"mountPath": {
"type": "string"
@@ -306,29 +306,27 @@
"name": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"extraVolumes": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"configMap": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"name": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"fullnameOverride": {
"type": "string"
@@ -337,14 +335,15 @@
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"debug": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"ldap": {
+ "type": "object",
"properties": {
"authorisationEnabled": {
"type": "boolean"
@@ -365,10 +364,10 @@
"type": "integer"
},
"servers": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
},
"uidField": {
"type": "string"
@@ -376,10 +375,10 @@
"userDnPattern": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"loadDefinition": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -387,19 +386,18 @@
"existingSecret": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"logs": {
"type": "string"
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"port": {
"type": "integer"
@@ -408,12 +406,12 @@
"type": "string"
},
"rbac": {
+ "type": "object",
"properties": {
"create": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
@@ -422,9 +420,12 @@
"type": "string"
},
"service": {
+ "type": "object",
"properties": {
"extraPorts": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
@@ -435,16 +436,15 @@
"targetPort": {
"type": "integer"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
}
- },
- "type": "object"
+ }
},
"sidecars": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"image": {
"type": "string"
@@ -453,14 +453,15 @@
"type": "string"
},
"livenessProbe": {
+ "type": "object",
"properties": {
"httpGet": {
+ "type": "object",
"properties": {
"port": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"initialDelaySeconds": {
"type": "integer"
@@ -468,21 +469,21 @@
"periodSeconds": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"name": {
"type": "string"
},
"readinessProbe": {
+ "type": "object",
"properties": {
"httpGet": {
+ "type": "object",
"properties": {
"port": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"initialDelaySeconds": {
"type": "integer"
@@ -490,12 +491,13 @@
"periodSeconds": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"resources": {
+ "type": "object",
"properties": {
"limits": {
+ "type": "object",
"properties": {
"cpu": {
"type": "string"
@@ -506,10 +508,10 @@
"memory": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"requests": {
+ "type": "object",
"properties": {
"cpu": {
"type": "string"
@@ -520,27 +522,26 @@
"memory": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"securityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"readOnlyRootFilesystem": {
"type": "boolean"
@@ -555,22 +556,22 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"volumeMounts": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"mountPath": {
"type": "string"
@@ -581,36 +582,33 @@
"subPath": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"virtualHost": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"clusterDomain": {
"type": "string"
},
"computeservice": {
+ "type": "object",
"properties": {
"endpoint": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"dashboarddb": {
+ "type": "object",
"properties": {
"auth": {
+ "type": "object",
"properties": {
"database": {
"type": "string"
@@ -621,8 +619,7 @@
"username": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -634,33 +631,34 @@
"type": "string"
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"dashboardservice": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -678,19 +676,17 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -699,18 +695,18 @@
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -727,62 +723,59 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
},
"setupJob": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"dashboardui": {
+ "type": "object",
"properties": {
"dashboardsProvider": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"datasources": {
+ "type": "object",
"properties": {
"secretName": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -794,9 +787,12 @@
"type": "string"
},
"grafana": {
+ "type": "object",
"properties": {
"extraConfigmaps": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"mountPath": {
"type": "string"
@@ -804,10 +800,8 @@
"name": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"extraEnvVarsSecret": {
"type": "string"
@@ -816,17 +810,17 @@
"type": "integer"
},
"updateStrategy": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"ldap": {
+ "type": "object",
"properties": {
"allowSignUp": {
"type": "boolean"
@@ -837,31 +831,31 @@
"secretName": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"persistence": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"datadb": {
+ "type": "object",
"properties": {
"db": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
@@ -872,8 +866,7 @@
"user": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -885,8 +878,10 @@
"type": "string"
},
"galera": {
+ "type": "object",
"properties": {
"mariabackup": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -894,11 +889,9 @@
"user": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"host": {
"type": "string"
@@ -910,22 +903,23 @@
"type": "string"
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"persistence": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"readonlyUser": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -933,8 +927,7 @@
"user": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
@@ -943,6 +936,7 @@
"type": "string"
},
"rootUser": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -950,29 +944,29 @@
"user": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"dataservice": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -990,19 +984,17 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -1011,6 +1003,7 @@
"type": "string"
},
"grant": {
+ "type": "object",
"properties": {
"read": {
"type": "string"
@@ -1018,22 +1011,21 @@
"write": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -1050,12 +1042,13 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"rabbitmq": {
+ "type": "object",
"properties": {
"consumer": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -1063,8 +1056,7 @@
"username": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"consumerConcurrentMax": {
"type": "integer"
@@ -1075,22 +1067,22 @@
"requeueRejected": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
},
"s3": {
+ "type": "object",
"properties": {
"auth": {
+ "type": "object",
"properties": {
"accessKeyId": {
"type": "string"
@@ -1098,8 +1090,7 @@
"secretAccessKey": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"bucket": {
"type": "string"
@@ -1110,16 +1101,15 @@
"filePath": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"gateway": {
"type": "string"
},
"gatewayservice": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -1128,7 +1118,9 @@
"type": "string"
},
"extraVolumeMounts": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"mountPath": {
"type": "string"
@@ -1136,54 +1128,54 @@
"name": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"extraVolumes": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"configMap": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"name": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"fullnameOverride": {
"type": "string"
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
},
"service": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"sidecars": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"image": {
"type": "string"
@@ -1192,14 +1184,15 @@
"type": "string"
},
"livenessProbe": {
+ "type": "object",
"properties": {
"httpGet": {
+ "type": "object",
"properties": {
"port": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"initialDelaySeconds": {
"type": "integer"
@@ -1207,21 +1200,21 @@
"periodSeconds": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"name": {
"type": "string"
},
"readinessProbe": {
+ "type": "object",
"properties": {
"httpGet": {
+ "type": "object",
"properties": {
"port": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"initialDelaySeconds": {
"type": "integer"
@@ -1229,12 +1222,13 @@
"periodSeconds": {
"type": "integer"
}
- },
- "type": "object"
+ }
},
"resources": {
+ "type": "object",
"properties": {
"limits": {
+ "type": "object",
"properties": {
"cpu": {
"type": "string"
@@ -1245,10 +1239,10 @@
"memory": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"requests": {
+ "type": "object",
"properties": {
"cpu": {
"type": "string"
@@ -1259,27 +1253,26 @@
"memory": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"securityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"readOnlyRootFilesystem": {
"type": "boolean"
@@ -1294,22 +1287,22 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"volumeMounts": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"mountPath": {
"type": "string"
@@ -1320,85 +1313,82 @@
"subPath": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
}
- },
- "type": "object"
+ }
},
"global": {
+ "type": "object",
"properties": {
"compatibility": {
+ "type": "object",
"properties": {
"openshift": {
+ "type": "object",
"properties": {
"adaptSecurityContext": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"loggingSidecar": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"resourcesPreset": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"storageClass": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"hostname": {
"type": "string"
},
"identityservice": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"add": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
},
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -1416,32 +1406,31 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"customSchemaFiles": {
+ "type": "object",
"properties": {
"00-memberof.ldif": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
},
"global": {
+ "type": "object",
"properties": {
"adminPassword": {
"type": "string"
@@ -1455,33 +1444,32 @@
"ldapDomain": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"group": {
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"persistence": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -1498,11 +1486,9 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
@@ -1514,13 +1500,12 @@
"users": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"ingress": {
+ "type": "object",
"properties": {
"annotations": {
- "properties": {},
"type": "object"
},
"className": {
@@ -1530,6 +1515,7 @@
"type": "boolean"
},
"tls": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -1537,21 +1523,20 @@
"secretName": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"metadatadb": {
+ "type": "object",
"properties": {
"db": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -1560,15 +1545,16 @@
"type": "string"
},
"extraInitDbScripts": {
- "properties": {},
"type": "object"
},
"fullnameOverride": {
"type": "string"
},
"galera": {
+ "type": "object",
"properties": {
"mariabackup": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -1576,11 +1562,9 @@
"user": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"host": {
"type": "string"
@@ -1592,20 +1576,20 @@
"type": "string"
},
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"persistence": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
@@ -1614,6 +1598,7 @@
"type": "string"
},
"rootUser": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -1621,37 +1606,37 @@
"user": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"metadataservice": {
+ "type": "object",
"properties": {
"admin": {
+ "type": "object",
"properties": {
"email": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -1669,29 +1654,28 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"crossref": {
+ "type": "object",
"properties": {
"endpoint": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"datacite": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -1708,8 +1692,7 @@
"username": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"deletedRecord": {
"type": "string"
@@ -1724,18 +1707,18 @@
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -1752,8 +1735,7 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
@@ -1762,23 +1744,24 @@
"type": "string"
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
},
"ror": {
+ "type": "object",
"properties": {
"endpoint": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"s3": {
+ "type": "object",
"properties": {
"auth": {
+ "type": "object",
"properties": {
"password": {
"type": "string"
@@ -1786,8 +1769,7 @@
"username": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"bucket": {
"type": "string"
@@ -1795,29 +1777,28 @@
"endpoint": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"sparql": {
+ "type": "object",
"properties": {
"connectionTimeout": {
"type": "integer"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"metricdb": {
+ "type": "object",
"properties": {
"alertmanager": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -1829,9 +1810,12 @@
"type": "string"
},
"server": {
+ "type": "object",
"properties": {
"extraScrapeConfigs": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"job_name": {
"type": "string"
@@ -1840,89 +1824,64 @@
"type": "string"
},
"static_configs": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"targets": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"persistence": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"rbac": {
+ "type": "object",
"properties": {
"create": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"service": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"updateStrategy": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"searchdb": {
+ "type": "object",
"properties": {
"clusterName": {
"type": "string"
},
- "coordinating": {
- "properties": {
- "replicaCount": {
- "type": "integer"
- },
- "resourcesPreset": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "data": {
- "properties": {
- "replicaCount": {
- "type": "integer"
- },
- "resourcesPreset": {
- "type": "string"
- }
- },
- "type": "object"
- },
"enabled": {
"type": "boolean"
},
@@ -1933,64 +1892,48 @@
"type": "string"
},
"ingest": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
- },
- "replicaCount": {
- "type": "integer"
- },
- "resourcesPreset": {
- "type": "string"
}
- },
- "type": "object"
- },
- "master": {
- "properties": {
- "replicaCount": {
- "type": "integer"
- },
- "resourcesPreset": {
- "type": "string"
- }
- },
- "type": "object"
+ }
},
"port": {
"type": "integer"
},
"security": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"servicenameOverride": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"searchservice": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -2008,19 +1951,17 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -2029,18 +1970,18 @@
"type": "string"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -2057,70 +1998,68 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
},
"setupJob": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"storageservice": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"filer": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"fullnameOverride": {
"type": "string"
},
"mariadb": {
+ "type": "object",
"properties": {
"auth": {
+ "type": "object",
"properties": {
"rootPassword": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -2128,33 +2067,34 @@
"fullnameOverride": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"master": {
+ "type": "object",
"properties": {
"metrics": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"postgresql": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"s3": {
+ "type": "object",
"properties": {
"auth": {
+ "type": "object",
"properties": {
"adminAccessKeyId": {
"type": "string"
@@ -2171,8 +2111,7 @@
"readSecretAccessKey": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"bucket": {
"type": "string"
@@ -2180,32 +2119,33 @@
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
},
"setupJob": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"add": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
},
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -2223,80 +2163,77 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
},
"s3": {
+ "type": "object",
"properties": {
"endpoint": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"volume": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"strategyType": {
"type": "string"
},
"ui": {
+ "type": "object",
"properties": {
"containerSecurityContext": {
+ "type": "object",
"properties": {
"allowPrivilegeEscalation": {
"type": "boolean"
},
"capabilities": {
+ "type": "object",
"properties": {
"drop": {
+ "type": "array",
"items": {
"type": "string"
- },
- "type": "array"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -2314,19 +2251,17 @@
"type": "integer"
},
"seLinuxOptions": {
- "properties": {},
"type": "object"
},
"seccompProfile": {
+ "type": "object",
"properties": {
"type": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"enabled": {
"type": "boolean"
@@ -2338,14 +2273,15 @@
"type": "array"
},
"image": {
+ "type": "object",
"properties": {
"name": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"oidc": {
+ "type": "object",
"properties": {
"authSessionSecret": {
"type": "string"
@@ -2356,14 +2292,13 @@
"tokenKey": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"podAnnotations": {
- "properties": {},
"type": "object"
},
"podSecurityContext": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -2380,12 +2315,13 @@
"sysctls": {
"type": "array"
}
- },
- "type": "object"
+ }
},
"public": {
+ "type": "object",
"properties": {
"api": {
+ "type": "object",
"properties": {
"client": {
"type": "string"
@@ -2393,13 +2329,15 @@
"server": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"broker": {
+ "type": "object",
"properties": {
"connections": {
+ "type": "array",
"items": {
+ "type": "object",
"properties": {
"encrypted": {
"type": "boolean"
@@ -2410,10 +2348,8 @@
"protocol": {
"type": "string"
}
- },
- "type": "object"
- },
- "type": "array"
+ }
+ }
},
"extra": {
"type": "string"
@@ -2421,26 +2357,26 @@
"host": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"dashboard": {
+ "type": "object",
"properties": {
"url": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"database": {
+ "type": "object",
"properties": {
"extra": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"doi": {
+ "type": "object",
"properties": {
"enabled": {
"type": "boolean"
@@ -2448,8 +2384,7 @@
"endpoint": {
"type": "string"
}
- },
- "type": "object"
+ }
},
"icon": {
"type": "string"
@@ -2458,17 +2393,17 @@
"type": "string"
},
"pid": {
+ "type": "object",
"properties": {
"default": {
+ "type": "object",
"properties": {
"publisher": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"title": {
"type": "string"
@@ -2477,29 +2412,25 @@
"type": "string"
},
"upload": {
+ "type": "object",
"properties": {
"client": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
},
"replicaCount": {
"type": "integer"
},
"resources": {
- "properties": {},
"type": "object"
},
"resourcesPreset": {
"type": "string"
}
- },
- "type": "object"
+ }
}
- },
- "type": "object"
+ }
}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 4f0bf2968551411f2787a680b89f346011de41c8..f34efb7fff2635a99bf941d5ba545eefca97ce35 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -77,7 +77,7 @@ metadatadb:
## @param metadatadb.persistence.enabled Enable persistent storage.
enabled: true
## @param metadatadb.replicaCount The number of cluster nodes, should be uneven i.e. 2n+1
- replicaCount: 1
+ replicaCount: 3
## @section Dashboard Database Enable the Dashboard Database.
@@ -141,7 +141,7 @@ authservice:
setupJob:
image:
## @skip authservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.9.3
## @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)
@@ -213,7 +213,7 @@ datadb:
## @skip datadb.metrics.enabled The Prometheus settings.
enabled: true
## @param datadb.replicaCount The number of cluster nodes, should be uneven i.e. 2n+1
- replicaCount: 1
+ replicaCount: 3
## @param datadb.resourcesPreset The container resource preset
resourcesPreset: "xlarge"
## @param datadb.initdbScriptsConfigMap The setup data to load into the database on first start.
@@ -235,28 +235,9 @@ searchdb:
host: search-db
## @param searchdb.port The port for the microservices.
port: 9200
- coordinating:
- ## @param searchdb.coordinating.resourcesPreset The container resource preset
- resourcesPreset: "small"
- ## @param searchdb.coordinating.replicaCount The number of pod replicas.
- replicaCount: 1
ingest:
## @skip searchdb.ingest.enabled The limited default payload does not require this node type.
enabled: false
- ## @param searchdb.ingest.resourcesPreset The container resource preset
- resourcesPreset: "micro"
- ## @param searchdb.ingest.replicaCount The number of pod replicas.
- replicaCount: 1
- master:
- ## @param searchdb.master.resourcesPreset The container resource preset
- resourcesPreset: "small"
- ## @param searchdb.master.replicaCount The number of pod replicas.
- replicaCount: 1
- data:
- ## @param searchdb.data.resourcesPreset The container resource preset
- resourcesPreset: "medium"
- ## @param searchdb.data.replicaCount The number of pod replicas.
- replicaCount: 1
security:
## @skip searchdb.security.enabled
enabled: false
@@ -410,7 +391,7 @@ brokerservice:
- name: logging-config
mountPath: /tmp/rabbitmq # irrelevant but needed from bitnami chart
## @param brokerservice.replicaCount The number of replicas.
- replicaCount: 1
+ replicaCount: 3
## @section Analyse Service
@@ -419,7 +400,7 @@ analyseservice:
enabled: true
image:
## @skip analyseservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.9.3
## @param analyseservice.podAnnotations the pod annotations. Evaluated as a template
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
podAnnotations: { }
@@ -483,7 +464,7 @@ metadataservice:
enabled: true
image:
## @skip metadataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.9.3
## @param metadataservice.podAnnotations the pod annotations. Evaluated as a template
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
podAnnotations: { }
@@ -583,7 +564,7 @@ dataservice:
endpoint: http://data-service
image:
## @skip dataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.9.3
## @param dataservice.podAnnotations the pod annotations. Evaluated as a template
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
podAnnotations: { }
@@ -672,7 +653,7 @@ searchservice:
endpoint: http://search-service
image:
## @skip searchservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.9.3
## @param searchservice.podAnnotations the pod annotations. Evaluated as a template
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
podAnnotations: { }
@@ -724,7 +705,7 @@ searchservice:
enabled: true
image:
## @skip searchservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.9.3
## @param searchservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param searchservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -787,7 +768,7 @@ storageservice:
enabled: true
image:
## @skip storageservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.9.3
s3:
## @param storageservice.setupJob.s3.endpoint The S3-capable endpoint the microservice connects to.
endpoint: http://storage-service-s3:8333
@@ -922,7 +903,7 @@ ui:
enabled: true
image:
## @skip ui.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.9.3
## https://stackblitz.com/edit/nuxt-oidc-auth-keygen?file=index.js
oidc:
## @param ui.oidc.authSessionSecret This should be a at least 48 characters random string. It is used to encrypt the user session.
@@ -1043,7 +1024,7 @@ dashboardservice:
enabled: true
image:
## @skip dashboardservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.9.3
## @param dashboardservice.endpoint The endpoint for the microservices.
endpoint: http://dashboard-service
## @param dashboardservice.podAnnotations the pod annotations. Evaluated as a template
@@ -1098,7 +1079,7 @@ dashboardservice:
enabled: true
image:
## @skip dashboardservice.setupJob.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:1.9.2
+ name: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service-init:1.9.3
## @param dashboardservice.setupJob.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param dashboardservice.setupJob.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -1272,8 +1253,6 @@ gatewayservice:
extraVolumeMounts:
- name: empty-dir
mountPath: /var/log/nginx
- - name: logging-config
- mountPath: /tmp
## @param gatewayservice.replicaCount The number of replicas.
replicaCount: 3
diff --git a/install.sh b/install.sh
index 8550259eb7547ebaf562a844548fb53207fc0713..1571e3cebdd186f9192aaec64ee0d2c5a34ad876 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# preset
-APP_VERSION="1.9.2"
+APP_VERSION="1.9.3"
MIN_CPU=8
MIN_RAM=10
SKIP_CHECKS=${SKIP_CHECKS:-0}
diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/exception/ColumnNotFoundException.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/exception/ColumnNotFoundException.java
new file mode 100644
index 0000000000000000000000000000000000000000..67c24e6bf67460aff764db0b62262d297cc2c0c9
--- /dev/null
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/exception/ColumnNotFoundException.java
@@ -0,0 +1,21 @@
+package at.ac.tuwien.ifs.dbrepo.core.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.NOT_FOUND, reason = "error.column.missing")
+public class ColumnNotFoundException extends Exception {
+
+ public ColumnNotFoundException(String msg) {
+ super(msg);
+ }
+
+ public ColumnNotFoundException(String msg, Throwable thr) {
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
+ }
+
+ public ColumnNotFoundException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
index 9fe2e55ceb012a55ff2742e5616fd287c084175d..e012638ad37489aeb20368f6b6eefe73142f6859 100644
--- a/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
+++ b/lib/java/dbrepo-core/src/main/java/at/ac/tuwien/ifs/dbrepo/core/test/BaseTest.java
@@ -1068,7 +1068,7 @@ public class BaseTest {
public final static String CONTAINER_2_NAME = "u02";
public final static String CONTAINER_2_INTERNAL_NAME = "dbrepo-userdb-u02";
public final static String CONTAINER_2_HOST = "localhost";
- public final static Integer CONTAINER_2_PORT = 3309;
+ public final static Integer CONTAINER_2_PORT = 3308;
public final static Integer CONTAINER_2_QUOTA = 3;
public final static Integer CONTAINER_2_COUNT = 3;
public final static String CONTAINER_2_PRIVILEGED_USERNAME = "root";
@@ -1122,7 +1122,7 @@ public class BaseTest {
public final static String CONTAINER_3_NAME = "u03";
public final static String CONTAINER_3_INTERNAL_NAME = "dbrepo-userdb-u03";
public final static String CONTAINER_3_HOST = "localhost";
- public final static Integer CONTAINER_3_PORT = 3310;
+ public final static Integer CONTAINER_3_PORT = 3308;
public final static Integer CONTAINER_3_QUOTA = 20;
public final static String CONTAINER_3_PRIVILEGED_USERNAME = "root";
@SuppressWarnings("java:S2068")
@@ -1147,7 +1147,7 @@ public class BaseTest {
public final static String CONTAINER_4_NAME = "u04";
public final static String CONTAINER_4_INTERNAL_NAME = "dbrepo-userdb-u04";
public final static String CONTAINER_4_HOST = "localhost";
- public final static Integer CONTAINER_4_PORT = 3311;
+ public final static Integer CONTAINER_4_PORT = 3308;
public final static Integer CONTAINER_4_QUOTA = 0;
public final static String CONTAINER_4_PRIVILEGED_USERNAME = "root";
@SuppressWarnings("java:S2068")
@@ -1168,6 +1168,28 @@ public class BaseTest {
.databases(null) /* DATABASE_4 */
.build();
+ public final ContainerDto CONTAINER_4_DTO = ContainerDto.builder()
+ .id(CONTAINER_4_ID)
+ .name(CONTAINER_4_NAME)
+ .internalName(CONTAINER_4_INTERNAL_NAME)
+ .image(IMAGE_1_DTO)
+ .host(CONTAINER_4_HOST)
+ .port(CONTAINER_4_PORT)
+ .lastRetrieved(Instant.now())
+ .build();
+
+ public final ContainerDto CONTAINER_4_PRIVILEGED_DTO = ContainerDto.builder()
+ .id(CONTAINER_4_ID)
+ .name(CONTAINER_4_NAME)
+ .internalName(CONTAINER_4_INTERNAL_NAME)
+ .image(IMAGE_1_DTO)
+ .host(CONTAINER_4_HOST)
+ .port(CONTAINER_4_PORT)
+ .lastRetrieved(Instant.now())
+ .username(CONTAINER_4_PRIVILEGED_USERNAME)
+ .password(CONTAINER_4_PRIVILEGED_PASSWORD)
+ .build();
+
public final static String EXCHANGE_DBREPO_NAME = "dbrepo";
public final static Boolean EXCHANGE_DBREPO_AUTO_DELETE = true;
public final static Boolean EXCHANGE_DBREPO_DURABLE = true;
diff --git a/lib/python/dbrepo/RestClient.py b/lib/python/dbrepo/RestClient.py
index 18c951bce97a6a096cf7442893bb5bf137c73454..7dee2e10e6902f545ad91e210106d1e0bb7ad2c0 100644
--- a/lib/python/dbrepo/RestClient.py
+++ b/lib/python/dbrepo/RestClient.py
@@ -273,8 +273,8 @@ class RestClient:
:param name: The name of the database.
:param container_id: The container id.
- :param is_public: The visibility of the data. If set to true the data will be publicly visible. Optional. Default: `True`.
- :param is_schema_public: The visibility of the schema metadata. If set to true the schema metadata will be publicly visible. Optional. Default: `True`.
+ :param is_public: The visibility of the data. If set to `True` the data will be publicly visible. Optional. Default: `True`.
+ :param is_schema_public: The visibility of the schema metadata. If set to `True` the schema metadata will be publicly visible. Optional. Default: `True`.
:returns: The database, if successful.
@@ -352,13 +352,15 @@ class RestClient:
raise ResponseCodeError(f'Failed to create container: response code: {response.status_code} is not '
f'201 (CREATED): {response.text}')
- def update_database_visibility(self, database_id: str, is_public: bool, is_schema_public: bool) -> Database:
+ def update_database_visibility(self, database_id: str, is_public: bool, is_schema_public: bool,
+ is_dashboard_enabled: bool) -> Database:
"""
Updates the database visibility of a database with given database id.
:param database_id: The database id.
- :param is_public: The visibility of the data. If set to true the data will be publicly visible.
- :param is_schema_public: The visibility of the schema metadata. If set to true the schema metadata will be publicly visible.
+ :param is_public: The visibility of the data. If set to `True` the data will be publicly visible.
+ :param is_schema_public: The visibility of the schema metadata. If set to `True` the schema metadata will be publicly visible.
+ :param is_dashboard_enabled: If set to `True`, the provisioned dashboard for this database is enabled.
:returns: The database, if successful.
@@ -371,7 +373,8 @@ class RestClient:
"""
url = f'/api/database/{database_id}/visibility'
response = self._wrapper(method="put", url=url, force_auth=True,
- payload=ModifyVisibility(is_public=is_public, is_schema_public=is_schema_public))
+ payload=ModifyVisibility(is_public=is_public, is_schema_public=is_schema_public,
+ is_dashboard_enabled=is_dashboard_enabled))
if response.status_code == 202:
body = response.json()
return Database.model_validate(body)
@@ -470,8 +473,8 @@ class RestClient:
:param database_id: The database id.
:param name: The name of the created table.
- :param is_public: The visibility of the data. If set to true the data will be publicly visible.
- :param is_schema_public: The visibility of the schema metadata. If set to true the schema metadata will be publicly visible.
+ :param is_public: The visibility of the data. If set to `True` the data will be publicly visible.
+ :param is_schema_public: The visibility of the schema metadata. If set to `True` the schema metadata will be publicly visible.
:param dataframe: The `pandas` dataframe.
:param description: The description of the created table. Optional.
:param with_data: If set to `True`, the data will be included in the new table. Optional. Default: `True`.
@@ -732,8 +735,8 @@ class RestClient:
:param database_id: The database id.
:param name: The name of the created view.
:param query: The query definition of the view.
- :param is_public: The visibility of the data. If set to true the data will be publicly visible. Optional. Default: `True`.
- :param is_schema_public: The visibility of the schema metadata. If set to true the schema metadata will be publicly visible. Optional. Default: `True`.
+ :param is_public: The visibility of the data. If set to `True` the data will be publicly visible. Optional. Default: `True`.
+ :param is_schema_public: The visibility of the schema metadata. If set to `True` the schema metadata will be publicly visible. Optional. Default: `True`.
:returns: The created view, if successful.
@@ -921,7 +924,7 @@ class RestClient:
:param dataframe: The dataframe to be uploaded.
:returns: The S3 key if successful.
-
+
:raises ResponseCodeError: If something went wrong with the insert.
"""
buffer = BytesIO()
@@ -975,7 +978,7 @@ class RestClient:
Import a csv dataset from a file and analyse it for the possible enums, line encoding and column data types.
:param dataframe: The dataframe.
- :param enum: If set to true, enumerations should be guessed, otherwise no guessing. Optional.
+ :param enum: If set to `True`, enumerations should be guessed, otherwise no guessing. Optional.
:param enum_tol: The tolerance for guessing enumerations (ignored if enum=False). Optional.
:returns: The determined data types, if successful.
@@ -1504,7 +1507,7 @@ class RestClient:
:param database_id: The database id.
:param subset_id: The subset id.
- :param persist: If set to true, the query will be saved and visible in the user interface, otherwise the query \
+ :param persist: If set to `True`, the query will be saved and visible in the user interface, otherwise the query \
is marked for deletion in the future and not visible in the user interface.
:returns: The query, if successful.
@@ -1925,34 +1928,3 @@ class RestClient:
if response.status_code == 503:
raise ServiceError(f'Failed to update column: failed to save in search service')
raise ResponseCodeError(f'Failed to update column: response code: {response.status_code} is not 202 (ACCEPTED)')
-
- def update_database_dashboard(self, database_id: str, uid: str) -> None:
- """
- Update semantic information of a table column by given database id and table id and column id.
-
- :param database_id: The database id.
- :param uid: The database uid.
-
- :raises MalformedError: If the payload is rejected by the service.
- :raises ForbiddenError: If something went wrong with the authorization.
- :raises NotExistsError: If the accept header is neither application/json nor application/ld+json.
- :raises ServiceConnectionError: If something went wrong with connection to the search service.
- :raises ServiceError: If something went wrong with obtaining the information in the search service.
- :raises ResponseCodeError: If something went wrong with the retrieval of the identifiers.
- """
- url = f'/api/database/{database_id}/dashboard'
- response = self._wrapper(method="put", url=url, force_auth=True,
- payload=DatabaseModifyDashboard(uid=uid))
- if response.status_code == 202:
- return
- if response.status_code == 400:
- raise MalformedError(f'Failed to update database dashboard: {response.text}')
- if response.status_code == 404:
- raise NotExistsError(f'Failed to update database dashboard: not found')
- if response.status_code == 502:
- raise ServiceConnectionError(
- f'Failed to update database dashboard: failed to establish connection to search service')
- if response.status_code == 503:
- raise ServiceError(f'Failed to update database dashboard: failed to save in search service')
- raise ResponseCodeError(
- f'Failed to update database dashboard: response code: {response.status_code} is not 202 (ACCEPTED)')
diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py
index 3c80f1174d4cee48c7c9608c6cac9eb7de8b8418..c263bde60c9a1e6af31703eab7d453b3c0be838a 100644
--- a/lib/python/dbrepo/api/dto.py
+++ b/lib/python/dbrepo/api/dto.py
@@ -509,6 +509,7 @@ class DatabaseModifyDashboard(BaseModel):
class ModifyVisibility(BaseModel):
is_public: bool
is_schema_public: bool
+ is_dashboard_enabled: bool
class ModifyOwner(BaseModel):
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index 9ab7afffb88996efaa6cbc0cbe2d0d0db1bdf18a..e1c931b5dcaa46892f01f74b44f9b49f6e3f0a1f 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.9.2"
+version = "1.9.3"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
diff --git a/lib/python/setup.py b/lib/python/setup.py
index a8beb0574cedadb98db62f110259ed09e38391ab..c3c729d90b47603c7be95ea73dc80d9fa550bbef 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.9.2",
+ version="1.9.3",
description="A library for communicating with DBRepo",
url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9/",
author="Martin Weise",
diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py
index ee4d0aeae40e6880f3ef3999c398023d76cbc4aa..8b9a71add5f398e3be5c8e1f69e6ab64db45b02a 100644
--- a/lib/python/tests/test_unit_database.py
+++ b/lib/python/tests/test_unit_database.py
@@ -283,7 +283,8 @@ class DatabaseUnitTest(unittest.TestCase):
response = RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
self.assertEqual(response.is_public, True)
def test_update_database_visibility_400_fails(self):
@@ -295,7 +296,8 @@ class DatabaseUnitTest(unittest.TestCase):
RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except MalformedError:
pass
@@ -308,7 +310,8 @@ class DatabaseUnitTest(unittest.TestCase):
response = RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except ForbiddenError:
pass
@@ -321,7 +324,8 @@ class DatabaseUnitTest(unittest.TestCase):
response = RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except NotExistsError:
pass
@@ -334,7 +338,8 @@ class DatabaseUnitTest(unittest.TestCase):
RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except ServiceConnectionError:
pass
@@ -347,7 +352,8 @@ class DatabaseUnitTest(unittest.TestCase):
RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except ServiceError:
pass
@@ -360,7 +366,8 @@ class DatabaseUnitTest(unittest.TestCase):
RestClient(username="a", password="b").update_database_visibility(
database_id="6bd39359-b154-456d-b9c2-caa516a45732",
is_public=True,
- is_schema_public=True)
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except ResponseCodeError:
pass
@@ -368,7 +375,9 @@ class DatabaseUnitTest(unittest.TestCase):
# test
try:
RestClient().update_database_visibility(database_id="6bd39359-b154-456d-b9c2-caa516a45732",
- is_public=True, is_schema_public=True)
+ is_public=True,
+ is_schema_public=True,
+ is_dashboard_enabled=True)
except AuthenticationError:
pass
diff --git a/make/build.mk b/make/build.mk
index 152cecf0e0136015e9a75bfb60a61002bdbdcddb..bfe9298cedd6cad9ac998e28fa04a175a96be773 100644
--- a/make/build.mk
+++ b/make/build.mk
@@ -4,6 +4,10 @@
build-images: build-java-lib ## Build Docker images.
docker compose build
+.PHONY: build-jupyter-image
+build-jupyter-image:
+ docker build -t starter-notebook ./.jupyter
+
.PHONY: build-java-lib
build-java-lib: ## Build the Java Library.
APP_VERSION=$(APP_VERSION) mvn -f ./lib/java/dbrepo-core/pom.xml -q clean package install -DskipTests
diff --git a/make/rel.mk b/make/rel.mk
index dfc114233e486ea85bdd756f9cd45a722fca74e3..f3147625a436b62ae1029c4d73b8e9c017b77091 100644
--- a/make/rel.mk
+++ b/make/rel.mk
@@ -13,6 +13,10 @@ tag-images: build-images ## Tag the docker images.
docker tag dbrepo-storage-service-init:latest "${REPOSITORY_URL}/storage-service-init:${APP_VERSION}${BUILD_VERSION}"
docker tag dbrepo-ui:latest "${REPOSITORY_URL}/ui:${APP_VERSION}${BUILD_VERSION}"
+.PHONY: tag-jupyter-image
+tag-jupyter-image: build-jupyter-image
+ docker tag starter-notebook:latest "${REPOSITORY_URL}/starter-notebook:${APP_VERSION}${BUILD_VERSION}"
+
.PHONY: release-images
release-images: tag-images ## Release the docker images.
docker push "${REPOSITORY_URL}/analyse-service:${APP_VERSION}${BUILD_VERSION}"
@@ -26,6 +30,10 @@ release-images: tag-images ## Release the docker images.
docker push "${REPOSITORY_URL}/storage-service-init:${APP_VERSION}${BUILD_VERSION}"
docker push "${REPOSITORY_URL}/ui:${APP_VERSION}${BUILD_VERSION}"
+.PHONY: release-juypter-image
+release-jupyter-image: tag-jupyter-image
+ docker push "${REPOSITORY_URL}/starter-notebook:${APP_VERSION}${BUILD_VERSION}"
+
.PHONY: release-helm
release-helm: gen-helm-doc ## Release the DBRepo and DBRepo MariaDB Galera Helm charts.
helm push ./build/dbrepo-${CHART_VERSION}.tgz oci://registry.datalab.tuwien.ac.at/dbrepo/dbrepo/helm
diff --git a/mkdocs.yml b/mkdocs.yml
index 204f83473447bee20e8563d9896f5491dde5e5e7..088d325daaf7052f5373440515c3f508e86fe97a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -4,50 +4,48 @@ repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-service
repo_name: fda-services
site_author: Research Unit Data Science, Technische Universität Wien
copyright: CC-BY 4.0 Technische Universität Wien & Universität Wien
-docs_dir: .docs
nav:
- Get Started:
- Welcome to DBRepo: index.md
- Why use DBRepo: why.md
- Help with DBRepo: help.md
- - Installation: installation.md
- - Kubernetes: kubernetes.md
- - changelog.md
- - contributing.md
- - Concepts:
- - Overview: concepts/index.md
- - Authentication: concepts/authentication.md
- - Data Versioning: concepts/data-versioning.md
- - Dashboards: concepts/dashboards.md
- - Data Visibility: concepts/data-visibility.md
- - Logging: concepts/logging.md
- - Messaging: concepts/messaging.md
- - Monitoring: concepts/monitoring.md
- - Persistent Identifier: concepts/pid.md
- - Search: concepts/search.md
+ - User Guide:
+ - Overview: user-guide/index.md
+ - user-guide/quickstart.md
+ - Account Management:
+ - Create Account: user-guide/create-account.md
+ - Database Management:
+ - Create Database: user-guide/create-database.md
+ - Database Access: user-guide/database-access.md
+ - Database Dashboard: user-guide/database-dashboard.md
+ - Database Visibility: user-guide/update-visibility.md
+ - Delete Database: user-guide/delete-database.md
+ - Data Management:
+ - Create Persistent Identifier: user-guide/create-pid.md
+ - Create Subset: user-guide/create-subset.md
+ - Fetch Data: user-guide/get-data.md
+ - Import Dataset: user-guide/import-dataset.md
+ - Import Live Data: user-guide/import-live-data.md
+ - Maintainer Guide:
+ - maintainer-guide/index.md
+ - Deployments:
+ - Install on Docker: maintainer-guide/docker.md
+ - Install on Kubernetes: maintainer-guide/kubernetes.md
+ - Install on VM: maintainer-guide/vm.md
+ - Build from Sourcecode: maintainer-guide/build.md
+ - Management:
+ - Import Dump: maintainer-guide/import-dump.md
+ - maintainer-guide/troubleshooting.md
+ - Updating the Application: maintainer-guide/updating.md
- API:
- Overview: api/index.md
- - Databases:
- - Data Database: api/data-db.md
- - Metadata Database: api/metadata-db.md
- - Metric Database: api/metric-db.md
- - Search Database: api/search-db.md
- - SDK:
- - Python Library: api/python.md
- - Swagger / OpenAPI: api/open-api.md
- - Services:
- - Analyse Service: api/analyse-service.md
- - Auth Service: api/auth-service.md
- - Broker Service: api/broker-service.md
- - Data Service: api/data-service.md
- - Gateway Service: api/gateway-service.md
- - Identity Service: api/identity-service.md
- - Metadata Service: api/metadata-service.md
- - Search Service: api/search-service.md
- - Storage Service: api/storage-service.md
- - UI:
- - Repository: api/ui.md
- - Examples:
+ - Python API: api/python.md
+ - REST API: api/rest.md
+ - AMQP / MQTT API: api/broker.md
+ - OAI-PMH API: api/oai-pmh.md
+ - JSON-LD API: api/json-ld.md
+ - FAIR Signposting API: api/fair-signposting.md
+ - Use Cases:
- Air Quality Data: examples/air.md
- COVID-19 Data: examples/covid-19.md
- Hazard Data: examples/hazard.md
@@ -59,16 +57,37 @@ nav:
- Theater Data: examples/theater.md
- Transportation Data: examples/transportation.md
- XPS Data: examples/xps-data.md
+ - Development:
+ - dev/index.md
+ - Databases:
+ - Data Database: dev/services/data-db.md
+ - Metadata Database: dev/services/metadata-db.md
+ - Metric Database: dev/services/metric-db.md
+ - Search Database: dev/services/search-db.md
+ - Services:
+ - Analyse Service: dev/services/analyse-service.md
+ - Auth Service: dev/services/auth-service.md
+ - Broker Service: dev/services/broker-service.md
+ - Data Service: dev/services/data-service.md
+ - Gateway Service: dev/services/gateway-service.md
+ - Identity Service: dev/services/identity-service.md
+ - Metadata Service: dev/services/metadata-service.md
+ - Search Service: dev/services/search-service.md
+ - Storage Service: dev/services/storage-service.md
+ - UI:
+ - Repository: dev/services/ui.md
+ - Changelog: dev/changelog.md
+ - Contributing: dev/contributing.md
- publications.md
- contact.md
extra_css:
- stylesheets/extra.css
theme:
favicon: images/favicon.ico
- custom_dir: .docs/overrides
+ custom_dir: docs/overrides
font:
- text: IBM Plex Serif
- code: IBM Plex Mono
+ text: Roboto
+ code: Roboto Mono
features:
- navigation.tabs
- navigation.tabs.sticky
@@ -118,7 +137,12 @@ markdown_extensions:
emoji_generator: !!python/name:materialx.emoji.to_svg
options:
custom_icons:
- - .docs/overrides/.icons
+ - docs/overrides/.icons
+ - pymdownx.superfences:
+ custom_fences:
+ - name: mermaid
+ class: mermaid
+ format: !!python/name:pymdownx.superfences.fence_code_format
extra:
homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.9/
version:
@@ -127,8 +151,6 @@ extra:
social:
- icon: simple/artifacthub
link: https://artifacthub.io/packages/helm/dbrepo/dbrepo
- - icon: fontawesome/brands/docker
- link: https://hub.docker.com/search?q=dbrepo
- icon: fontawesome/brands/python
link: https://pypi.org/project/dbrepo/
- icon: fontawesome/brands/gitlab