diff --git a/.docker/.env b/.docker/.env
deleted file mode 100644
index 6e598a8d0adf7f76559845e3d88b1bc80f314aff..0000000000000000000000000000000000000000
--- a/.docker/.env
+++ /dev/null
@@ -1,12 +0,0 @@
-# UNCOMMENT THE LINES BELOW TO OVERRIDE
-#BASE_URL=http://example.com
-#ADMIN_EMAIL=noreply@example.com
-#LOG_LEVEL=debug
-#IDENTITY_SERVICE_ADMIN_PASSWORD=admin
-#AUTH_SERVICE_ADMIN_PASSWORD=admin
-#METADATA_DB_PASSWORD=dbrepo
-#DATA_DB_PASSWORD=dbrepo
-#AUTH_DB_PASSWORD=dbrepo
-#S3_ACCESS_KEY_ID=seaweedfsadmin
-#S3_SECRET_ACCESS_KEY=seaweedfsadmin
-#SYSTEM_PASSWORD=admin
diff --git a/.docker/config/1_setup-schema.sql b/.docker/config/1_setup-schema.sql
deleted file mode 100644
index 47ee3a95e2b88a62d4a2405f9c0f4d088167d748..0000000000000000000000000000000000000000
--- a/.docker/config/1_setup-schema.sql
+++ /dev/null
@@ -1,564 +0,0 @@
-BEGIN;
-
-CREATE TABLE IF NOT EXISTS `mdb_users`
-(
- id character varying(36) NOT NULL,
- username character varying(255) NOT NULL,
- firstname character varying(255),
- lastname character varying(255),
- email character varying(255) NOT NULL,
- orcid character varying(255),
- affiliation character varying(255),
- mariadb_password character varying(255) NOT NULL,
- theme character varying(255) NOT NULL default ('light'),
- language character varying(3) NOT NULL default ('en'),
- PRIMARY KEY (id),
- UNIQUE (username),
- UNIQUE (email)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_images`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- registry character varying(255) NOT NULL DEFAULT 'docker.io',
- name character varying(255) NOT NULL,
- version character varying(255) NOT NULL,
- default_port integer NOT NULL,
- dialect character varying(255) NOT NULL,
- driver_class character varying(255) NOT NULL,
- jdbc_method character varying(255) NOT NULL,
- is_default BOOLEAN NOT NULL DEFAULT FALSE,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- PRIMARY KEY (id),
- UNIQUE (name, version),
- UNIQUE (is_default)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_images_date`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- iid bigint NOT NULL,
- database_format character varying(255) NOT NULL,
- unix_format character varying(255) NOT NULL,
- example character varying(255) NOT NULL,
- has_time boolean NOT NULL,
- created_at timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- FOREIGN KEY (iid) REFERENCES mdb_images (id),
- UNIQUE (database_format, unix_format, example)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_containers`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- internal_name character varying(255) NOT NULL,
- name character varying(255) NOT NULL,
- host character varying(255) NOT NULL,
- port integer NOT NULL default 3306,
- ui_host character varying(255) NOT NULL default host,
- ui_port integer NOT NULL default port,
- ui_additional_flags text,
- sidecar_host character varying(255),
- sidecar_port integer,
- image_id bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- privileged_username character varying(255) NOT NULL,
- privileged_password character varying(255) NOT NULL,
- quota integer NOT NULL DEFAULT 50,
- PRIMARY KEY (id),
- FOREIGN KEY (image_id) REFERENCES mdb_images (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_data`
-(
- ID bigint NOT NULL AUTO_INCREMENT,
- PROVENANCE text,
- FileEncoding text,
- FileType character varying(100),
- Version text,
- Seperator text,
- PRIMARY KEY (ID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_licenses`
-(
- identifier character varying(255) NOT NULL,
- uri text NOT NULL,
- description text NOT NULL,
- PRIMARY KEY (identifier),
- UNIQUE (uri(200))
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_databases`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- cid bigint NOT NULL,
- name character varying(255) NOT NULL,
- internal_name character varying(255) NOT NULL,
- exchange_name character varying(255) NOT NULL,
- description text,
- engine character varying(20),
- is_public boolean NOT NULL DEFAULT TRUE,
- image longblob,
- created_by character varying(36),
- owned_by character varying(36),
- contact_person character varying(36),
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- PRIMARY KEY (id),
- FOREIGN KEY (cid) REFERENCES mdb_containers (id) /* currently we only support one-to-one */,
- FOREIGN KEY (created_by) REFERENCES mdb_users (id),
- FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
- FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_databases_subjects`
-(
- dbid BIGINT NOT NULL,
- subjects character varying(255) NOT NULL,
- PRIMARY KEY (dbid, subjects)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_tables`
-(
- ID bigint NOT NULL AUTO_INCREMENT,
- tDBID bigint NOT NULL,
- tName VARCHAR(64) NOT NULL,
- internal_name VARCHAR(64) NOT NULL,
- queue_name VARCHAR(255) NOT NULL,
- routing_key VARCHAR(255),
- tDescription VARCHAR(2048),
- num_rows BIGINT,
- data_length BIGINT,
- max_data_length BIGINT,
- avg_row_length BIGINT,
- `separator` CHAR(1),
- quote CHAR(1),
- element_null VARCHAR(50),
- skip_lines BIGINT,
- element_true VARCHAR(50),
- element_false VARCHAR(50),
- Version TEXT,
- created timestamp NOT NULL DEFAULT NOW(),
- versioned boolean not null default true,
- created_by character varying(36) NOT NULL,
- owned_by character varying(36) NOT NULL,
- last_modified timestamp,
- PRIMARY KEY (ID),
- UNIQUE (tDBID, internal_name),
- FOREIGN KEY (tDBID) REFERENCES mdb_databases (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id),
- FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns`
-(
- ID BIGINT NOT NULL AUTO_INCREMENT,
- tID BIGINT NOT NULL,
- dfID BIGINT,
- cName VARCHAR(64),
- internal_name VARCHAR(64) NOT NULL,
- Datatype ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- length BIGINT NULL,
- ordinal_position INTEGER NOT NULL,
- index_length BIGINT NULL,
- description VARCHAR(2048),
- size BIGINT,
- d BIGINT,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL DEFAULT true,
- val_min NUMERIC NULL,
- val_max NUMERIC NULL,
- mean NUMERIC NULL,
- median NUMERIC NULL,
- std_dev Numeric NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- FOREIGN KEY (tID) REFERENCES mdb_tables (ID) ON DELETE CASCADE,
- PRIMARY KEY (ID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_enums`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- column_id bigint NOT NULL,
- value CHARACTER VARYING(255) NOT NULL,
- FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
- PRIMARY KEY (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_sets`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- column_id bigint NOT NULL,
- value CHARACTER VARYING(255) NOT NULL,
- FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
- PRIMARY KEY (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_nom`
-(
- tID bigint,
- cID bigint,
- maxlength INTEGER,
- last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- FOREIGN KEY (tID, cID) REFERENCES mdb_columns (tID, ID),
- PRIMARY KEY (tID, cID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_cat`
-(
- tID bigint,
- cID bigint,
- num_cat INTEGER,
- -- cat_array TEXT[],
- last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- FOREIGN KEY (tID, cID) REFERENCES mdb_columns (tID, ID),
- PRIMARY KEY (tID, cID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
-(
- fkid BIGINT NOT NULL AUTO_INCREMENT,
- tid BIGINT NOT NULL,
- rtid BIGINT NOT NULL,
- name VARCHAR(255) NOT NULL,
- on_update VARCHAR(50) NULL,
- on_delete VARCHAR(50) NULL,
- position INT NULL,
- PRIMARY KEY (fkid),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
- FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key`
-(
- pkid BIGINT NOT NULL AUTO_INCREMENT,
- tID BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- PRIMARY KEY (pkid),
- FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE,
- FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference`
-(
- id BIGINT NOT NULL AUTO_INCREMENT,
- fkid BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- rcid BIGINT NOT NULL,
- PRIMARY KEY (id),
- UNIQUE (fkid, cid, rcid),
- FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
- FOREIGN KEY (cid) REFERENCES mdb_columns (id),
- FOREIGN KEY (rcid) REFERENCES mdb_columns (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
-(
- uid BIGINT NOT NULL AUTO_INCREMENT,
- name VARCHAR(255) NOT NULL,
- tid BIGINT NOT NULL,
- position INT NULL,
- PRIMARY KEY (uid),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
-);
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
-(
- id BIGINT NOT NULL AUTO_INCREMENT,
- uid BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid),
- FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
-(
- id BIGINT NOT NULL AUTO_INCREMENT,
- tid BIGINT NOT NULL,
- checks VARCHAR(255) NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
-) WITH SYSTEM VERSIONING;
-
-
-CREATE TABLE IF NOT EXISTS `mdb_concepts`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- uri text not null,
- name VARCHAR(255) null,
- description TEXT null,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- UNIQUE (uri(200))
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_units`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- uri text not null,
- name VARCHAR(255) null,
- description TEXT null,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- UNIQUE (uri(200))
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_concepts`
-(
- id bigint NOT NULL,
- cID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id, cid),
- FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_columns_units`
-(
- id bigint NOT NULL,
- cID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id, cID),
- FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_view`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- vdbid bigint NOT NULL,
- vName VARCHAR(64) NOT NULL,
- internal_name VARCHAR(64) NOT NULL,
- Query TEXT NOT NULL,
- query_hash VARCHAR(255) NOT NULL,
- Public BOOLEAN NOT NULL,
- InitialView BOOLEAN NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- created_by character varying(36) NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (vdbid) REFERENCES mdb_databases (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_banner_messages`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- type ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL default 'INFO',
- message TEXT NOT NULL,
- link TEXT NULL,
- link_text VARCHAR(255) NULL,
- display_start timestamp NULL,
- display_end timestamp NULL,
- PRIMARY KEY (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_ontologies`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- prefix VARCHAR(8) NOT NULL,
- uri TEXT NOT NULL,
- uri_pattern TEXT,
- sparql_endpoint TEXT NULL,
- rdf_path TEXT NULL,
- last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- UNIQUE (prefix),
- UNIQUE (uri(200)),
- PRIMARY KEY (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_view_columns`
-(
- id BIGINT NOT NULL AUTO_INCREMENT,
- view_id BIGINT NOT NULL,
- dfID BIGINT,
- name VARCHAR(64),
- internal_name VARCHAR(64) NOT NULL,
- column_type ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- ordinal_position INTEGER NOT NULL,
- size BIGINT,
- d BIGINT,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL DEFAULT true,
- PRIMARY KEY (id),
- FOREIGN KEY (view_id) REFERENCES mdb_view (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_identifiers`
-(
- id BIGINT NOT NULL AUTO_INCREMENT,
- dbid BIGINT NOT NULL,
- qid BIGINT,
- vid BIGINT,
- tid BIGINT,
- publisher VARCHAR(255) NOT NULL,
- language VARCHAR(2),
- publication_year INTEGER NOT NULL,
- publication_month INTEGER,
- publication_day INTEGER,
- identifier_type ENUM ('DATABASE', 'SUBSET', 'VIEW', 'TABLE') NOT NULL,
- status ENUM ('DRAFT', 'PUBLISHED') NOT NULL DEFAULT ('PUBLISHED'),
- query TEXT,
- query_normalized TEXT,
- query_hash VARCHAR(255),
- execution TIMESTAMP,
- result_hash VARCHAR(255),
- result_number BIGINT,
- doi VARCHAR(255),
- created TIMESTAMP NOT NULL DEFAULT NOW(),
- created_by VARCHAR(36) NOT NULL,
- last_modified TIMESTAMP,
- PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
- FOREIGN KEY (dbid) REFERENCES mdb_databases (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
-(
- pid bigint NOT NULL,
- license_id VARCHAR(255) NOT NULL,
- PRIMARY KEY (pid, license_id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
- FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_identifier_titles`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- title text NOT NULL,
- title_type ENUM ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
- language VARCHAR(2),
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_identifier_funders`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- funder_name VARCHAR(255) NOT NULL,
- funder_identifier TEXT,
- funder_identifier_type ENUM ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
- scheme_uri text,
- award_number VARCHAR(255),
- award_title text,
- language VARCHAR(255),
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- description text NOT NULL,
- description_type ENUM ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
- language VARCHAR(2),
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_related_identifiers`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- value varchar(255) NOT NULL,
- type varchar(255) NOT NULL,
- relation varchar(255) NOT NULL,
- PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
- UNIQUE (pid, value)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_identifier_creators`
-(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- given_names text,
- family_name text,
- creator_name VARCHAR(255) NOT NULL,
- name_type ENUM ('PERSONAL', 'ORGANIZATIONAL') default 'PERSONAL',
- name_identifier text,
- name_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI', 'ORCID'),
- name_identifier_scheme_uri text,
- affiliation VARCHAR(255),
- affiliation_identifier text,
- affiliation_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI'),
- affiliation_identifier_scheme_uri text,
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_update`
-(
- uUserID character varying(255) NOT NULL,
- uDBID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (uUserID, uDBID),
- FOREIGN KEY (uDBID) REFERENCES mdb_databases (id)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_access`
-(
- aUserID character varying(255) NOT NULL,
- aDBID bigint REFERENCES mdb_databases (id),
- attime TIMESTAMP,
- download BOOLEAN,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (aUserID, aDBID)
-) WITH SYSTEM VERSIONING;
-
-CREATE TABLE IF NOT EXISTS `mdb_have_access`
-(
- user_id character varying(36) NOT NULL,
- database_id bigint REFERENCES mdb_databases (id),
- access_type ENUM ('READ', 'WRITE_OWN', 'WRITE_ALL') NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (user_id, database_id),
- FOREIGN KEY (user_id) REFERENCES mdb_users (id)
-) WITH SYSTEM VERSIONING;
-
-COMMIT;
-BEGIN;
-
-INSERT INTO `mdb_licenses` (identifier, uri, description)
-VALUES ('CC0-1.0', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode',
- 'CC0 waives copyright interest in a work you''ve created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach.'),
- ('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode',
- 'The Creative Commons Attribution license allows re-distribution and re-use of a licensed work on the condition that the creator is appropriately credited.');
-
-INSERT INTO `mdb_images` (name, registry, version, default_port, dialect, driver_class, jdbc_method)
-VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver',
- 'mariadb');
-
-INSERT INTO `mdb_images_date` (iid, database_format, unix_format, example, has_time)
-VALUES (1, '%Y-%c-%d %H:%i:%S.%f', 'yyyy-MM-dd HH:mm:ss.SSSSSS', '2022-01-30 13:44:25.499', true),
- (1, '%Y-%c-%d %H:%i:%S', 'yyyy-MM-dd HH:mm:ss', '2022-01-30 13:44:25', true),
- (1, '%Y-%c-%d', 'yyyy-MM-dd', '2022-01-30', false),
- (1, '%H:%i:%S', 'HH:mm:ss', '13:44:25', true),
- (1, '%d.%c.%Y', 'dd.MM.yyyy', '30.01.2022', false);
-
-INSERT INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
-VALUES ('om', 'http://www.ontology-of-units-of-measure.org/resource/om-2/',
- 'http://www.ontology-of-units-of-measure.org/resource/om-2/.*', null, 'rdf/om-2.0.rdf'),
- ('wd', 'http://www.wikidata.org/', 'http://www.wikidata.org/entity/.*', 'https://query.wikidata.org/sparql',
- null),
- ('mo', 'http://purl.org/ontology/mo/', 'http://purl.org/ontology/mo/.*', null, null),
- ('dc', 'http://purl.org/dc/elements/1.1/', null, null, null),
- ('xsd', 'http://www.w3.org/2001/XMLSchema#', null, null, null),
- ('tl', 'http://purl.org/NET/c4dm/timeline.owl#', null, null, null),
- ('foaf', 'http://xmlns.com/foaf/0.1/', null, null, null),
- ('schema', 'http://schema.org/', null, null, null),
- ('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', null, null, null),
- ('rdfs', 'http://www.w3.org/2000/01/rdf-schema#', null, null, null),
- ('owl', 'http://www.w3.org/2002/07/owl#', null, null, null),
- ('prov', 'http://www.w3.org/ns/prov#', null, null, null),
- ('db', 'http://dbpedia.org', 'http://dbpedia.org/ontology/.*', 'http://dbpedia.org/sparql', null);
-COMMIT;
diff --git a/.docker/config/2_setup-data.sql b/.docker/config/2_setup-data.sql
deleted file mode 100644
index e806e1e181dbdcc3f0e4e29f837bffac7123317c..0000000000000000000000000000000000000000
--- a/.docker/config/2_setup-data.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-BEGIN;
-
-INSERT INTO `mdb_containers` (name, internal_name, image_id, host, port, ui_host, ui_port, sidecar_host, sidecar_port,
- privileged_username, privileged_password)
-VALUES ('mariadb:11.1.3-debian-11-r6', 'mariadb_11_1_3', 1, 'data-db', 3306, 'localhost', 3306, 'data-db-sidecar', 8080,
- 'root', 'dbrepo');
-
-COMMIT;
diff --git a/.docker/config/advanced.config b/.docker/config/advanced.config
deleted file mode 100644
index 4445ea601954e5c93c32edeba1638135c5af5e59..0000000000000000000000000000000000000000
--- a/.docker/config/advanced.config
+++ /dev/null
@@ -1,17 +0,0 @@
-[
- {
- rabbitmq_auth_backend_ldap,
- [
- {
- tag_queries, [
- {
- administrator, {in_group_nested, "cn=system,ou=users,dc=dbrepo,dc=at", "member"}
- },
- {
- management, {constant, true}
- }
- ]
- }
- ]
- }
-].
\ No newline at end of file
diff --git a/.docker/config/dbrepo.conf b/.docker/config/dbrepo.conf
deleted file mode 100644
index 8ac239d464398ec381b98d71c91192ea6ba061ab..0000000000000000000000000000000000000000
--- a/.docker/config/dbrepo.conf
+++ /dev/null
@@ -1,167 +0,0 @@
-client_max_body_size 20G;
-
-resolver 127.0.0.11 valid=30s; # docker dns
-
-upstream auth {
- server auth-service:8080;
-}
-
-upstream broker {
- server broker-service:15672;
-}
-
-upstream analyse {
- server analyse-service:8080;
-}
-
-upstream data {
- server data-service:8080;
-}
-
-upstream metadata {
- server metadata-service:8080;
-}
-
-upstream search {
- server search-service:8080;
-}
-
-upstream ui {
- server ui:3000;
-}
-
-upstream upload {
- server upload-service:8080;
-}
-
-server {
- listen 80 default_server;
- server_name _;
-
- location /admin/broker {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://broker;
- proxy_read_timeout 90;
- }
-
- location /api/search {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://search;
- proxy_read_timeout 90;
- }
-
- location /api/broker {
- rewrite /api/broker/(.*) /admin/broker/api/$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://broker;
- proxy_read_timeout 90;
- }
-
- location /api/upload {
-# allow 128.130.0.0/16;
-# deny all;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Forwarded-Host $host;
- proxy_pass http://upload;
- proxy_read_timeout 90;
- # Disable request and response buffering
- proxy_request_buffering off;
- proxy_buffering off;
- proxy_http_version 1.1;
- }
-
- location /api/analyse {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://analyse;
- proxy_read_timeout 90;
- }
-
- location /api/auth {
- rewrite /api/auth/(.*) /$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://auth;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export|statistic) {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://data;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/view/([0-9]+)/data {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://data;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/view {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
- proxy_read_timeout 90;
- }
-
- location ~ /api/database/([0-9]+)/subset {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://data;
- proxy_read_timeout 600;
- }
-
- location ~ /api/(database|concept|container|identifier|image|message|license|oai|ontology|unit|user) {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
- proxy_read_timeout 90;
- }
-
- location ~ /pid/([0-9]+) {
- rewrite /pid/(.*) /api/identifier/$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
- proxy_read_timeout 90;
- }
-
- location / {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://ui;
- proxy_read_timeout 90;
- }
-}
diff --git a/.docker/config/definitions.json b/.docker/config/definitions.json
deleted file mode 100644
index a3b70c989de5cb287e37588860e664afb6b7d6ec..0000000000000000000000000000000000000000
--- a/.docker/config/definitions.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "bindings": [
- {
- "arguments": {},
- "destination": "dbrepo",
- "destination_type": "queue",
- "routing_key": "dbrepo.#",
- "source": "dbrepo",
- "vhost": "dbrepo"
- }
- ],
- "exchanges": [
- {
- "arguments": {},
- "auto_delete": false,
- "durable": true,
- "name": "dbrepo",
- "type": "topic",
- "vhost": "dbrepo"
- }
- ],
- "global_parameters": [],
- "parameters": [],
- "permissions": [],
- "policies": [],
- "queues": [
- {
- "arguments": {
- "x-queue-type": "quorum"
- },
- "auto_delete": false,
- "durable": true,
- "name": "dbrepo",
- "type": "quorum",
- "vhost": "dbrepo"
- }
- ],
- "rabbit_version": "3.10.25",
- "rabbitmq_version": "3.10.25",
- "topic_permissions": [],
- "users": [],
- "vhosts": [
- {
- "limits": [],
- "metadata": {
- "description": "Default virtual host",
- "tags": []
- },
- "name": "dbrepo"
- }
- ]
-}
\ No newline at end of file
diff --git a/.docker/config/enabled_plugins b/.docker/config/enabled_plugins
deleted file mode 100644
index 95f1c0014dd4ee232580adea29176756a25274ed..0000000000000000000000000000000000000000
--- a/.docker/config/enabled_plugins
+++ /dev/null
@@ -1 +0,0 @@
-[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management].
\ No newline at end of file
diff --git a/.docker/config/rabbitmq.conf b/.docker/config/rabbitmq.conf
deleted file mode 100644
index ff592bb3ecd4b003d180dbb44d8bd9acc5a70394..0000000000000000000000000000000000000000
--- a/.docker/config/rabbitmq.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# user
-default_vhost = dbrepo
-default_user_tags.administrator = false
-
-# enable http outside localhost
-listeners.tcp.1 = 0.0.0.0:5672
-
-# management prefix (https://www.rabbitmq.com/management.html#path-prefix)
-management.path_prefix = /admin/broker
-management.load_definitions = /app/definitions.json
-
-# logging
-log.console = true
-log.console.level = warning
-auth_ldap.log = true
-
-# Obviously your authentication server cannot vouch for itself, so you'll need another backend with at least one user in
-# it. You should probably use the internal database
-auth_backends.1.authn = ldap
-auth_backends.1.authz = ldap
-auth_backends.2 = internal
-
-# LDAP
-auth_ldap.servers.1 = identity-service
-auth_ldap.port = 1389
-auth_ldap.user_dn_pattern = ${username}
-auth_ldap.dn_lookup_base = dc=dbrepo,dc=at
-auth_ldap.dn_lookup_attribute = uid
-auth_ldap.dn_lookup_bind.user_dn = cn=admin,dc=dbrepo,dc=at
-auth_ldap.dn_lookup_bind.password = admin
diff --git a/.docker/config/s3_config.json b/.docker/config/s3_config.json
deleted file mode 100644
index f270753cdc96278a039e483966ea864a16781cfe..0000000000000000000000000000000000000000
--- a/.docker/config/s3_config.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "identities": [
- {
- "name": "admin",
- "credentials": [
- {
- "accessKey": "seaweedfsadmin",
- "secretKey": "seaweedfsadmin"
- }
- ],
- "actions": [
- "Read",
- "Write",
- "List",
- "Tagging",
- "Admin"
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index c0c8cf091311910c28fba797fefa4ba31b83d52d..1b826fedfdaa47fe087d255dff50723d1dc9e25d 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -7,13 +7,15 @@ volumes:
search-db-data:
storage-service-data:
identity-service-data:
+ metric-db-data:
+ dashboard-service-data:
services:
dbrepo-metadata-db:
restart: "no"
container_name: dbrepo-metadata-db
hostname: metadata-db
- image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
+ image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8
volumes:
- metadata-db-data:/bitnami/mariadb
- ./config/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
@@ -23,6 +25,7 @@ services:
environment:
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
+ MARIADB_GALERA_MARIABACKUP_PASSWORD: "${METADATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck:
test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
@@ -35,7 +38,7 @@ services:
restart: "no"
container_name: dbrepo-data-db
hostname: data-db
- image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
+ image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8
volumes:
- data-db-data:/bitnami/mariadb
- "${SHARED_VOLUME:-/tmp}:/tmp"
@@ -43,6 +46,7 @@ services:
- "3307:3306"
environment:
MARIADB_ROOT_PASSWORD: "${DATA_DB_PASSWORD:-dbrepo}"
+ MARIADB_GALERA_MARIABACKUP_PASSWORD: "${DATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck:
test: mysqladmin ping --user=root --password="${DATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
@@ -55,16 +59,16 @@ services:
restart: "no"
container_name: dbrepo-auth-db
hostname: auth-db
- image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
+ image: docker.io/bitnami/postgresql:17.0.0-debian-12-r1
volumes:
- - auth-db-data:/bitnami/mariadb
- ports:
- - "3308:3306"
+ - auth-db-data:/bitnami/postgresql
environment:
- MARIADB_DATABASE: "${AUTH_DB_NAME:-keycloak}"
- MARIADB_ROOT_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+ POSTGRESQL_DATABASE: "${AUTH_DB_NAME:-keycloak}"
+ POSTGRESQL_USERNAME: "${AUTH_DB_USERNAME:-keycloak}"
+ POSTGRESQL_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+ PGPASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user=root --password="${AUTH_DB_PASSWORD:-dbrepo}" --silent
+ test: "psql -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak} -c 'select version();'"
interval: 15s
timeout: 5s
retries: 12
@@ -75,18 +79,24 @@ services:
restart: "no"
container_name: dbrepo-auth-service
hostname: auth-service
- image: registry.datalab.tuwien.ac.at/dbrepo/auth-service:1.4.6
+ image: bitnami/keycloak:26.0.0-debian-12-r1
+ volumes:
+ - ./config/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh
+ - ./config/master-realm.json:/opt/keycloak/data/import/master-realm.json
+ - ./config/dbrepo-realm.json:/opt/keycloak/data/import/dbrepo-realm.json
+ environment:
+ KEYCLOAK_ENABLE_HTTPS: "false"
+ KEYCLOAK_ENABLE_STATISTICS: "true"
+ KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: "true"
+ KEYCLOAK_DATABASE_HOST: "auth-db"
+ KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}"
+ KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
+ KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
- interval: 15s
+ test: curl --head -fsS http://localhost:9000/health/ready
+ interval: 10s
timeout: 5s
retries: 12
- environment:
- AUTH_DB: "${AUTH_DB:-keycloak}"
- KC_DB_USERNAME: root
- KC_DB_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
- KEYCLOAK_ADMIN: "${AUTH_SERVICE_ADMIN_USERNAME:-admin}"
- KEYCLOAK_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}"
depends_on:
dbrepo-identity-service:
condition: service_healthy
@@ -99,7 +109,7 @@ services:
restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
- image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
@@ -162,7 +172,7 @@ services:
restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
- image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -188,15 +198,18 @@ services:
restart: "no"
container_name: dbrepo-broker-service
hostname: broker-service
- image: docker.io/bitnami/rabbitmq:3.12-debian-12
+ image: docker.io/bitnami/rabbitmq:3.13.7-debian-12-r4
ports:
- 5672:5672
+ - 1883:1883
volumes:
- ./config/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
- ./config/advanced.config:/etc/rabbitmq/advanced.config
- ./config/enabled_plugins:/etc/rabbitmq/enabled_plugins
- ./config/definitions.json:/app/definitions.json
- broker-service-data:/bitnami/rabbitmq/mnesia
+ environment:
+ RABBITMQ_FEATURE_FLAGS: mqtt_v5
depends_on:
dbrepo-identity-service:
condition: service_healthy
@@ -212,7 +225,7 @@ services:
restart: "no"
container_name: dbrepo-search-db
hostname: search-db
- image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-db:1.4.7
healthcheck:
test: curl -sSL localhost:9200/_plugins/_security/health | jq .status | grep UP
interval: 10s
@@ -236,7 +249,7 @@ services:
restart: "no"
container_name: dbrepo-search-service
hostname: search-service
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7
environment:
AUTH_SERVICE_CLIENT: ${AUTH_SERVICE_CLIENT:-dbrepo-client}
AUTH_SERVICE_CLIENT_SECRET: ${AUTH_SERVICE_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}
@@ -248,12 +261,17 @@ services:
OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-info}
+ healthcheck:
+ test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
+ interval: 10s
+ timeout: 5s
+ retries: 12
dbrepo-data-db-sidecar:
restart: "no"
container_name: dbrepo-data-db-sidecar
hostname: data-db-sidecar
- image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-db-sidecar:1.4.7
environment:
S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-seaweedfsadmin}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -274,18 +292,18 @@ services:
restart: "no"
container_name: dbrepo-ui
hostname: ui
- image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7
environment:
NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_API_SERVER: "${BASE_URL:-http://localhost}"
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
depends_on:
dbrepo-search-service:
- condition: service_started
- dbrepo-storage-service:
+ condition: service_healthy
+ dbrepo-upload-service:
condition: service_healthy
healthcheck:
- test: wget -qO- localhost:3000 | grep "Database Repository" || exit 1
+ test: curl -fsSL http://127.0.0.1:3000 && curl -fsSL http://127.0.0.1:3000/health
interval: 10s
timeout: 5s
retries: 12
@@ -305,12 +323,8 @@ services:
depends_on:
dbrepo-analyse-service:
condition: service_healthy
- dbrepo-auth-service:
- condition: service_healthy
dbrepo-broker-service:
condition: service_healthy
- dbrepo-dashboard-service:
- condition: service_healthy
dbrepo-metadata-service:
condition: service_healthy
dbrepo-search-db:
@@ -343,9 +357,10 @@ services:
dbrepo-search-service-init:
restart: "no"
+ init: true
container_name: dbrepo-search-service-init
hostname: search-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.7
environment:
METADATA_SERVICE_ENDPOINT: ${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}
OPENSEARCH_HOST: ${OPENSEARCH_HOST:-search-db}
@@ -386,6 +401,7 @@ services:
image: bitnami/prometheus:2.54.1-debian-12-r4
volumes:
- ./config/prometheus.yml:/etc/prometheus/prometheus.yml
+ - metric-db-data:/opt/bitnami/prometheus/data
healthcheck:
test: promtool check healthy
interval: 10s
@@ -398,16 +414,8 @@ services:
restart: "no"
container_name: dbrepo-dashboard-service
hostname: dashboard-service
- image: docker.io/bitnami/grafana:11.2.0-debian-12-r4
- volumes:
- - ./config/dashboards:/app/dashboards
- - ./config/provisioning:/etc/grafana/provisioning
- - ./config/grafana.ini:/etc/grafana/grafana.ini
- - ./config/ldap.toml:/etc/grafana/ldap.toml
+ image: registry.datalab.tuwien.ac.at/dbrepo/dashboard-service:1.4.7
environment:
- GF_SERVER_DOMAIN: "dashboard-service"
- GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}/dashboard/"
- GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true"
LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
LDAP_ROOT: "${IDENTITY_SERVICE_ROOT:-dc=dbrepo,dc=at}"
@@ -424,9 +432,10 @@ services:
dbrepo-storage-service-init:
restart: "no"
+ init: true
container_name: dbrepo-storage-service-init
hostname: storage-service-init
- image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.7
environment:
WEED_CLUSTER_SW_MASTER: "${STORAGE_SERVICE_MASTER_ENDPOINT:-storage-service:9333}"
S3_BUCKET: "${S3_BUCKET:-dbrepo}"
@@ -466,7 +475,7 @@ services:
restart: "no"
container_name: dbrepo-data-service
hostname: data-service
- image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7
volumes:
- "${SHARED_VOLUME:-/tmp}:/tmp"
environment:
@@ -480,7 +489,7 @@ services:
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
BROKER_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
BROKER_PORT: ${BROKER_PORT:-5672}
- BROKER_SERVICE_ENDPOINT: "${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}"
+ BROKER_SERVICE_ENDPOINT: "${BROKER_SERVICE_ENDPOINT:-http://broker-service:15672}"
BROKER_USERNAME: "${SYSTEM_USERNAME:-admin}"
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
diff --git a/.docs/.swagger/api.base.yaml b/.docs/.swagger/api.base.yaml
index c7b01fab0ebd3aebaa2f61dd68afdec362ccf236..b7bd0570eea5eeee9cb656bd55d88b25edd361a9 100644
--- a/.docs/.swagger/api.base.yaml
+++ b/.docs/.swagger/api.base.yaml
@@ -11,7 +11,7 @@ components:
type: http
externalDocs:
description: Project Website
- url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
+ url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/
info:
contact:
email: andreas.rauber@tuwien.ac.at
@@ -24,7 +24,7 @@ info:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0
title: DBRepo REST API
- version: 1.4.4
+ version: 1.4.7
openapi: 3.1.0
servers:
- description: Test Instance
diff --git a/.docs/.swagger/api.yaml b/.docs/.swagger/api.yaml
index 1495e398e358d0a78bc7306b71726bd2e092efe4..a3f7eea7f2d4a34a3108ed41e5be9c0500615565 100644
--- a/.docs/.swagger/api.yaml
+++ b/.docs/.swagger/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.4.4
+ version: 1.4.7
servers:
- description: Test Instance
url: 'https://test.dbrepo.tuwien.ac.at'
@@ -929,7 +929,7 @@ paths:
content:
application/json:
schema:
- $ref: '#/components/schemas/ImportCsvDto'
+ $ref: '#/components/schemas/ImportDto'
required: true
responses:
'202':
@@ -5605,7 +5605,7 @@ components:
type: object
additionalProperties:
type: object
- ImportCsvDto:
+ ImportDto:
required:
- location
- separator
@@ -5624,13 +5624,6 @@ components:
minimum: 0
type: integer
format: int64
- false_element:
- type: string
- true_element:
- type: string
- null_element:
- type: string
- example: NA
line_termination:
type: string
example: \r\n
@@ -5760,6 +5753,7 @@ components:
- longblob
- enum
- set
+ - serial
- bit
- tinyint
- bool
@@ -5777,7 +5771,6 @@ components:
- year
ColumnDto:
required:
- - auto_generated
- column_type
- database_id
- id
@@ -5845,11 +5838,6 @@ components:
minLength: 0
type: string
example: mdb_date
- date_format:
- $ref: '#/components/schemas/ImageDateDto'
- auto_generated:
- type: boolean
- example: false
index_length:
type: integer
format: int64
@@ -5874,6 +5862,7 @@ components:
- longblob
- enum
- set
+ - serial
- bit
- tinyint
- bool
@@ -6014,6 +6003,64 @@ components:
ui_port:
type: integer
format: int32
+ DataTypeDto:
+ required:
+ - display_name
+ - documentation
+ - is_buildable
+ - is_quoted
+ - value
+ type: object
+ properties:
+ value:
+ type: string
+ example: time
+ documentation:
+ type: string
+ example: 'https://mariadb.com/kb/en/time/'
+ display_name:
+ type: string
+ example: TIME(fsp)
+ size_min:
+ type: integer
+ format: int32
+ example: 0
+ size_max:
+ type: integer
+ format: int32
+ example: 6
+ size_default:
+ type: integer
+ format: int32
+ example: 0
+ size_required:
+ type: boolean
+ example: false
+ d_min:
+ type: integer
+ format: int32
+ d_max:
+ type: integer
+ format: int32
+ d_default:
+ type: integer
+ format: int32
+ d_required:
+ type: boolean
+ data_hint:
+ type: string
+ example: 'e.g. HH:MM:SS, HH:MM, HHMMSS, H:M:S'
+ type_hint:
+ type: string
+ example: 'fsp=microsecond precision, min. 0, max. 6'
+ is_quoted:
+ type: boolean
+ description: frontend needs to quote this data type
+ example: false
+ is_buildable:
+ type: boolean
+ description: frontend can build this data type
+ example: true
DatabaseAccessDto:
required:
- created
@@ -6164,33 +6211,9 @@ components:
$ref: '#/components/schemas/ForeignKeyBriefDto'
referenced_column:
$ref: '#/components/schemas/ColumnBriefDto'
- ImageDateDto:
- required:
- - created_at
- - database_format
- - has_time
- - id
- - unix_format
- type: object
- properties:
- id:
- type: integer
- format: int64
- database_format:
- type: string
- example: '%d.%c.%Y'
- unix_format:
- type: string
- example: dd.MM.YYYY
- has_time:
- type: boolean
- example: false
- created_at:
- type: string
- format: date-time
- example: '2021-03-12T15:26:21.000Z'
ImageDto:
required:
+ - data_types
- default
- default_port
- dialect
@@ -6220,10 +6243,6 @@ components:
driver_class:
type: string
example: org.mariadb.jdbc.Driver
- date_formats:
- type: array
- items:
- $ref: '#/components/schemas/ImageDateDto'
jdbc_method:
type: string
example: mariadb
@@ -6234,6 +6253,10 @@ components:
type: integer
format: int32
example: 3306
+ data_types:
+ type: array
+ items:
+ $ref: '#/components/schemas/DataTypeDto'
PrimaryKeyDto:
required:
- column
@@ -6494,8 +6517,6 @@ components:
minLength: 0
type: string
example: mdb_date
- date_format:
- $ref: '#/components/schemas/ImageDateDto'
auto_generated:
type: boolean
example: false
@@ -6523,6 +6544,7 @@ components:
- longblob
- enum
- set
+ - serial
- bit
- tinyint
- bool
@@ -8169,6 +8191,7 @@ components:
- longblob
- enum
- set
+ - serial
- bit
- tinyint
- bool
@@ -8197,10 +8220,6 @@ components:
minLength: 0
type: string
example: Formatted as YYYY-MM-dd
- dfid:
- type: integer
- description: date format id
- format: int64
enums:
type: array
description: 'enum values, only considered when type = ENUM'
@@ -8409,14 +8428,14 @@ components:
type: string
resumptionToken:
type: string
+ parametersString:
+ type: string
fromDate:
type: string
format: date-time
untilDate:
type: string
format: date-time
- parametersString:
- type: string
BannerMessageDto:
required:
- id
@@ -8692,10 +8711,6 @@ components:
format: int32
isDefault:
type: boolean
- dateFormats:
- type: array
- items:
- $ref: '#/components/schemas/ContainerImageDate'
containers:
type: array
items:
@@ -8706,28 +8721,10 @@ components:
lastModified:
type: string
format: date-time
- ContainerImageDate:
- type: object
- properties:
- id:
- type: integer
- format: int64
- iid:
- type: integer
- format: int64
- image:
- $ref: '#/components/schemas/ContainerImage'
- example:
- type: string
- hasTime:
- type: boolean
- databaseFormat:
- type: string
- unixFormat:
- type: string
- createdAt:
- type: string
- format: date-time
+ dataTypes:
+ type: array
+ items:
+ $ref: '#/components/schemas/DataType'
Creator:
type: object
properties:
@@ -8776,6 +8773,50 @@ components:
type: string
ieeeName:
type: string
+ DataType:
+ type: object
+ properties:
+ id:
+ type: integer
+ format: int64
+ displayName:
+ type: string
+ value:
+ type: string
+ sizeMin:
+ type: integer
+ format: int32
+ sizeMax:
+ type: integer
+ format: int32
+ sizeDefault:
+ type: integer
+ format: int32
+ sizeRequired:
+ type: boolean
+ documentation:
+ type: string
+ typeHint:
+ type: string
+ dataHint:
+ type: string
+ quoted:
+ type: boolean
+ buildable:
+ type: boolean
+ image:
+ $ref: '#/components/schemas/ContainerImage'
+ dmin:
+ type: integer
+ format: int32
+ dmax:
+ type: integer
+ format: int32
+ ddefault:
+ type: integer
+ format: int32
+ drequired:
+ type: boolean
Database:
type: object
properties:
@@ -9775,14 +9816,10 @@ components:
id:
type: integer
format: int64
- dateFormat:
- $ref: '#/components/schemas/ContainerImageDate'
table:
$ref: '#/components/schemas/Table'
name:
type: string
- autoGenerated:
- type: boolean
internalName:
type: string
description:
@@ -9809,6 +9846,7 @@ components:
- TableColumnType.LONGBLOB
- TableColumnType.ENUM
- TableColumnType.SET
+ - TableColumnType.SERIAL
- TableColumnType.BIT
- TableColumnType.TINYINT
- TableColumnType.BOOL
@@ -9994,8 +10032,6 @@ components:
id:
type: integer
format: int64
- dateFormat:
- $ref: '#/components/schemas/ContainerImageDate'
view:
$ref: '#/components/schemas/View'
name:
@@ -10021,6 +10057,7 @@ components:
- TableColumnType.LONGBLOB
- TableColumnType.ENUM
- TableColumnType.SET
+ - TableColumnType.SERIAL
- TableColumnType.BIT
- TableColumnType.TINYINT
- TableColumnType.BOOL
diff --git a/.docs/.swagger/swagger-generate.sh b/.docs/.swagger/swagger-generate.sh
index c293e6c5cf19a3b78b75de21e06faadbadeefdd4..8ea2981243601c51fa17f75570f38656cb301ff5 100644
--- a/.docs/.swagger/swagger-generate.sh
+++ b/.docs/.swagger/swagger-generate.sh
@@ -6,6 +6,8 @@ services[9093]=data
services[9099]=metadata
services[3305]=sidecar
+# requires https://github.com/mikefarah/yq/ -> v4.44.3
+
function retrieve () {
if [[ "$2" == analyse ]] || [[ "$2" == search ]] || [[ "$2" == sidecar ]]; then
echo "... retrieve json api from localhost:$1"
diff --git a/.docs/api/auth-service.md b/.docs/api/auth-service.md
index 40ad6d8fd54825245574e578bff4c9fd7de1b463..7b59ca1567e31b5e997baca36c4e3bbcce9f7650 100644
--- a/.docs/api/auth-service.md
+++ b/.docs/api/auth-service.md
@@ -6,10 +6,10 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`quay.io/keycloak/keycloak:24.0`](quay.io/keycloak/keycloak)
+ Image: [`docker.io/bitnami/keycloak:26.0.0-debian-12-r1`](https://hub.docker.com/r/bitnami/keycloak)
* Ports: 8080/tcp
- * UI: `http://<hostname>/api/auth/`
+ * UI: `http://<hostname>:8080/`
## Overview
diff --git a/.docs/api/broker-service.md b/.docs/api/broker-service.md
index f2f684c4a944f4e726a53f4d050bb19b2f368a8d..41e2dc10b15ccd137a934cd9c162c85b32dffc22 100644
--- a/.docs/api/broker-service.md
+++ b/.docs/api/broker-service.md
@@ -11,7 +11,7 @@ author: Martin Weise
* Ports: 5672/tcp, 15672/tcp, 15692/tcp
* AMQP: `amqp://<hostname>:5672`
* Prometheus: `http://<hostname>:15692/metrics`
- * Management: `http://<hostname>/admin/broker`
+ * Management: `http://<hostname>:15672`
## Overview
@@ -19,6 +19,13 @@ It holds exchanges and topics responsible for holding AMQP messages for later co
use [RabbitMQ](https://www.rabbitmq.com/) in the implementation. By default, the endpoint listens to the insecure port `5672` for incoming
AMQP tuples and insecure port `15672` for the management UI.
+## Supported Protocols
+
+* AMQP (v0.9.1, v1.0), see [RabbitMQ docs](https://www.rabbitmq.com/docs/next/amqp).
+* MQTT (v3.1, v3.1.1, v5), see [RabbitMQ docs](https://www.rabbitmq.com/docs/mqtt).
+
+## Authentication
+
The default configuration allows any user in the `cn=system,ou=users,dc=dbrepo,dc=at` from the
[Identity Service](../identity-service) to access the Broker Service as user with `administrator` role, i.e. the
`cn=admin,dc=dbrepo,dc=at` user that is created by default.
@@ -28,6 +35,8 @@ The Broker Service allows two ways of authentication for AMQP tuples:
1. LDAP
2. Plain (RabbitMQ's internal authentication)
+## Architecture
+
The queue architecture of the Broker Service is very simple. There is only one durable, topic exchange `dbrepo` and one
quorum queue `dbrepo`, connected with a binding of `dbrepo.#` which routes all tuples with routing key prefix `dbrepo.`
to this queue.
diff --git a/.docs/api/dashboard-service.md b/.docs/api/dashboard-service.md
index 2f4529e2adfbd2185c271ccacda7f6fa20887e6e..96db8260212b1b95081732f1fa386a0b92e2e4bf 100644
--- a/.docs/api/dashboard-service.md
+++ b/.docs/api/dashboard-service.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`docker.io/bitnami/grafana:11.2.0-debian-12-r4`](https://hub.docker.com/r/bitnami/grafana)
+ Image: [`docker.io/bitnami/grafana:10.4.9-debian-12-r0`](https://hub.docker.com/r/bitnami/grafana)
* Ports: `http://<hostname>/dashboard`
* Prometheus: `http://<hostname>/dashboard/prometheus`
@@ -17,21 +17,6 @@ The Dashboard Service is visualizing the status of DBRepo with charts. The defau
`/etc/grafana/provisioning/dashboards/provider.yaml` checks for new `JSON` dashboard files in `/app/dashboards` every 10
seconds and makes the available in the Dashboard Service.
-<figure markdown>
-
-<figcaption>Figure 1: DBRepo Dashboard</figcaption>
-</figure>
-
-<figure markdown>
-
-<figcaption>Figure 2: Database Dashboard</figcaption>
-</figure>
-
-<figure markdown>
-
-<figcaption>Figure 3: Broker Service Dashboard</figcaption>
-</figure>
-
## Limitations
!!! question "Do you miss functionality? Do these limitations affect you?"
diff --git a/.docs/api/data-db.md b/.docs/api/data-db.md
index 648640bb4c85413a7f5afbf65d1649a6e1706c3c..d5ba8d8361351ec7c52d2428f5e1304a64c6791e 100644
--- a/.docs/api/data-db.md
+++ b/.docs/api/data-db.md
@@ -4,7 +4,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`docker.io/bitnami/mariadb:11.1.3-debian-11-r6`](https://hub.docker.com/r/bitnami/mariadb)
+ Image: [`docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8`](https://hub.docker.com/r/bitnami/mariadb-galera)
* Ports: 3306/tcp
* JDBC: `jdbc://mariadb:<hostname>:3306`
diff --git a/.docs/api/gateway-service.md b/.docs/api/gateway-service.md
index 26ad76f092c599fbb865648577eba7b1a283ba72..9a44f9635b32ecc0d238ed1c1a0e918157ecd046 100644
--- a/.docs/api/gateway-service.md
+++ b/.docs/api/gateway-service.md
@@ -60,6 +60,40 @@ services:
...
```
+## Monitoring (Optional)
+
+By default the Gateway Service is not monitored. You need to add the following to the `docker-compose.yml` file.
+
+```yaml title="docker-compose.yml"
+services:
+ ...
+ dbrepo-gateway-service-sidecar:
+ restart: "no"
+ container_name: dbrepo-gateway-service-sidecar
+ hostname: dbrepo-gateway-service-sidecar
+ image: docker.io/nginx/nginx-prometheus-exporter:1.3.0
+ command:
+ - "-nginx.scrape-uri=http://gateway-service/basic_status"
+ ports:
+ - "9113:9113"
+ depends_on:
+ dbrepo-gateway-service:
+ condition: service_started
+ logging:
+ driver: json-file
+```
+
+Then, uncomment the scrape config from the `prometheus.yml` file.
+
+```yaml title="prometheus.yml"
+scrape_configs:
+ ...
+ - job_name: 'gateway scrape'
+ metrics_path: '/metrics'
+ static_configs:
+ - targets: ['dbrepo-gateway-service-sidecar:9113']
+```
+
## Limitations
(none relevant to DBRepo)
diff --git a/.docs/api/metadata-db.md b/.docs/api/metadata-db.md
index 4336c7666c012caf5b7f2b8f6979a77d049c9643..61a56ed1ac4f50ae2dcfd4b66e35f317f5bb9ded 100644
--- a/.docs/api/metadata-db.md
+++ b/.docs/api/metadata-db.md
@@ -4,7 +4,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`docker.io/bitnami/mariadb:11.1.3-debian-11-r6`](https://hub.docker.com/r/bitnami/mariadb)
+ Image: [`docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8`](https://hub.docker.com/r/bitnami/mariadb-galera)
* Ports: 3306/tcp
* JDBC: `jdbc://mariadb:<hostname>:3306`
diff --git a/.docs/api/metric-db.md b/.docs/api/metric-db.md
index 1601e89397fd1ede29026dc88ec670f0b9efee09..8ac9b611d99544eba5ee6738c416b12f8c2a1d47 100644
--- a/.docs/api/metric-db.md
+++ b/.docs/api/metric-db.md
@@ -10,7 +10,137 @@ author: Martin Weise
## Overview
-The Metric Database is responsible for saving time-series data for the [Dashboard Service](../../api/dashboard-service)
+The Metric Database is responsible for saving time-series data for the [Dashboard Service](../../api/dashboard-service).
+
+## Metrics
+
+## Analyse Service
+
+| **Metric** | **Description** |
+|-----------------------------|---------------------------------------------|
+| `dbrepo_analyse_datatypes` | Time needed to analyse datatypes of dataset |
+| `dbrepo_analyse_keys` | Time needed to analyse keys of dataset |
+| `dbrepo_analyse_table_stat` | Time needed to analyse table statistics |
+| `dbrepo_analyse_table_stat` | Time needed to analyse table statistics |
+
+## Auth Service
+
+See [Keycloak documentation](https://www.keycloak.org/server/configuration-metrics).
+
+## Broker Service
+
+See [RabbitMQ documentation](https://www.rabbitmq.com/docs/prometheus).
+
+## Databases
+
+See [MariaDB Galera documentation](https://galeracluster.com/documentation/html_docs_20210213-1355-master/documentation/galera-manager-monitoring-clusters.html).
+
+The [Data Database Sidecar](#) metrics are:
+
+| **Metric** | **Description** |
+|---------------------------------|---------------------------------------|
+| `dbrepo_sidecar_import_dataset` | Time needed to import dataset from S3 |
+| `dbrepo_sidecar_export_dataset` | Time needed to export dataset to S3 |
+
+## Data Service
+
+| **Metric** | **Description** |
+|-----------------------------|-------------------------------------------|
+| `dbrepo_message_receive` | Received AMQP message from Broker Service |
+| `dbrepo_subset_create` | Create subset |
+| `dbrepo_subset_data` | Retrieved subset data |
+| `dbrepo_subset_find` | Find subset |
+| `dbrepo_subset_list` | Find subsets |
+| `dbrepo_subset_persist` | Persist subset |
+| `dbrepo_table_data_create` | Create table data |
+| `dbrepo_table_data_delete` | Delete table data |
+| `dbrepo_table_data_export` | Export table data |
+| `dbrepo_table_data_history` | Find table history |
+| `dbrepo_table_data_import` | Import dataset |
+| `dbrepo_table_data_list` | Retrieve table data |
+| `dbrepo_table_data_update` | Update table data |
+| `dbrepo_view_data` | Retrieve view data |
+| `dbrepo_view_schema_list` | Find view schemas |
+
+## Metadata Service
+
+| **Metric** | **Description** |
+|------------------------------------|---------------------------------------------------|
+| `dbrepo_database_count` | The total number of managed research databases |
+| `dbrepo_view_count` | The total number of available view data sources |
+| `dbrepo_subset_count` | The total number of available subset data sources |
+| `dbrepo_table_count` | The total number of available table data sources |
+| `dbrepo_volume_sum` | The total volume of available research data |
+| `dbrepo_user_refresh_token` | Refresh user token |
+| `dbrepo_identifier_save` | Save identifier |
+| `dbrepo_oai_record_get` | Get the record |
+| `dbrepo_access_give` | Give access to some database |
+| `dbrepo_ontologies_find` | Find one ontology |
+| `dbrepo_database_findall` | List databases |
+| `dbrepo_tables_refresh` | Refresh database tables metadata |
+| `dbrepo_license_findall` | Get all licenses |
+| `dbrepo_user_modify` | Modify user information |
+| `dbrepo_container_findall` | Find all containers |
+| `dbrepo_maintenance_delete` | Delete maintenance message |
+| `dbrepo_maintenance_update` | Update maintenance message |
+| `dbrepo_ontologies_create` | Register a new ontology |
+| `dbrepo_identifier_delete` | Delete some identifier |
+| `dbrepo_oai_identify` | Identify the repository |
+| `dbrepo_database_create` | Create database |
+| `dbrepo_oai_metadataformats_list` | List the metadata formats |
+| `dbrepo_user_password_modify` | Modify user password |
+| `dbrepo_semantic_concepts_findall` | List semantic concepts |
+| `dbrepo_identifier_retrieve` | Retrieve metadata from identifier |
+| `dbrepo_identifier_list` | Find all identifiers |
+| `dbrepo_views_findall` | Find all views |
+| `dbrepo_identifier_create` | Draft identifier |
+| `dbrepo_oai_identifiers_list` | List the identifiers |
+| `dbrepo_image_findall` | Find all images |
+| `dbrepo_database_visibility` | Update database visibility |
+| `dbrepo_container_create` | Create container |
+| `dbrepo_views_refresh` | Refresh database views metadata |
+| `dbrepo_database_find` | Find some database |
+| `dbrepo_access_get` | Check access to some database |
+| `dbrepo_identifier_find` | Find some identifier |
+| `dbrepo_maintenance_create` | Create maintenance message |
+| `dbrepo_container_delete` | Delete some container |
+| `dbrepo_ontologies_delete` | Delete an ontology |
+| `dbrepo_ontologies_findall` | List all ontologies |
+| `dbrepo_user_token` | Obtain user token |
+| `dbrepo_view_find` | Find one view |
+| `dbrepo_user_create` | Create user |
+| `dbrepo_ontologies_update` | Update an ontology |
+| `dbrepo_maintenance_findall` | Find maintenance messages |
+| `dbrepo_users_list` | Find all users |
+| `dbrepo_image_find` | Find some image |
+| `dbrepo_user_find` | Get a user info |
+| `dbrepo_image_delete` | Delete some image |
+| `dbrepo_identifier_publish` | Publish identifier |
+| `dbrepo_image_update` | Update some image |
+| `dbrepo_view_create` | Create a view |
+| `dbrepo_semantic_units_findall` | List semantic units |
+| `dbrepo_image_create` | Create image |
+| `dbrepo_database_image` | Update database image |
+| `dbrepo_view_delete` | Delete one view |
+| `dbrepo_database_transfer` | Update database owner |
+| `dbrepo_maintenance_find` | Find one maintenance message |
+| `dbrepo_access_modify` | Modify access to some database |
+| `dbrepo_ontologies_entities_find` | Find entities |
+| `dbrepo_access_delete` | Revoke access to some database |
+| `dbrepo_container_find` | Find some container |
+
+## Search Service
+
+| **Metric** | **Description** |
+|---------------------------------|---------------------------------------------------------|
+| `dbrepo_search_index_list` | Time needed to list search index |
+| `dbrepo_search_type_list` | Time needed to list search types |
+| `dbrepo_search_fuzzy` | Time needed to search fuzzy |
+| `dbrepo_search_type` | Time needed to search by type |
+| `dbrepo_search_update_database` | Time needed to update a database in the search database |
+| `dbrepo_search_delete_database` | Time needed to delete a database in the search database |
+
+
## Limitations
diff --git a/.docs/api/ui.md b/.docs/api/ui.md
index 3e53ab2c376d6cde6c582e352171ad0836882864..d14303aa2cd7b33d48a743353bc6a82c53b0f55c 100644
--- a/.docs/api/ui.md
+++ b/.docs/api/ui.md
@@ -6,7 +6,7 @@ author: Martin Weise
!!! debug "Debug Information"
- Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6`](https://hub.docker.com/r/dbrepo/ui)
+ Image: [`registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7`](https://hub.docker.com/r/dbrepo/ui)
* Ports: 3000/tcp
@@ -37,7 +37,7 @@ image as well, in this example we want to mount a custom logo `my_logo.png` into
```yaml title="docker-compose.yml"
services:
dbrepo-ui:
- image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7
volumes:
- ./my_logo.png:/app/.output/public/my_logo.png
- ./favicon.ico:/app/.output/public/favicon.ico
diff --git a/.docs/changelog.md b/.docs/changelog.md
new file mode 100644
index 0000000000000000000000000000000000000000..256e245d5d6aac818396dae86aed655e5e4613d6
--- /dev/null
+++ b/.docs/changelog.md
@@ -0,0 +1,56 @@
+---
+author: Martin Weise
+---
+
+## v1.4.7 (???)
+
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.4.7)
+
+!!! warning "Contains Breaking Changes"
+
+ This release updates the Metadata Database schema which is incompatible to v1.4.6!
+
+### What's Changed
+
+#### Features
+
+* Added `SERIAL` data type to create incrementing key
+ in [#454](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/454)
+
+#### Changes
+
+* Change the Docker image of the Auth Service to Bitnami-maintained similar to Kubernetes deployment with accompanying
+ Auth Database change to PostgreSQL
+ in [#455](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/455)
+
+#### Fixes
+
+* No hardcoded data type metadata in UI but instead added it hardcoded (associated with `image_id`) Metadata Database.
+
+## v1.4.6 (2024-10-11)
+
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.4.6)
+
+!!! warning "Contains Breaking Changes"
+
+ This release updates the Metadata Database schema which is incompatible to v1.4.5!
+
+### What's Changed
+
+#### Features
+
+* Added [Dashboard Service](../api/dashboard-service/) and monitoring in default setup.
+
+#### Changes
+
+* Show the progress of dataset uploads in the UI
+ in [#448](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/448)
+* Anonymous users are allowed to create (non-persistent) subsets
+ in [#449](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/449)
+* Removed logic that maps `True`, `False` and `null`
+
+#### Fixes
+
+* Import of datasets stabilized in the UI
+ in [#442](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/442)
+* Install script in [#444](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues/444)
\ No newline at end of file
diff --git a/.docs/concepts/database.md b/.docs/concepts/database.md
deleted file mode 100644
index ecf1025b1d8074698df0b7ec673d19beb516de7a..0000000000000000000000000000000000000000
--- a/.docs/concepts/database.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-author: Martin Weise
----
-
-## Relational Database
-
-DBRepo manages relational databases that store information relations in tables.
-
-## Query
-
-A query is the method to interact with a relational database and is used to read/write data or to create/change/delete
-schema information e.g. tables. DBRepo uses a query store to store certain (important) queries that generate subsets
-to restore the exact same subset at a later point.
-
-## System Versioning
-
-DBRepo uses a mechanism offered by SQL:2013 to version tables with the system (=server) time. When inserting a tuple
-into a system-versioned table, the database engine maintains invisible `ROW_START` and `ROW_END` timestamp columns to
-denote a tuple validity. When deleting a tuple, the database engine actually just marks the tuple as `ROW_END = NOW()`
-and does not delete the tuple.
-
-At a later point in time, the (historic) tuple can still be queried using system versioning.
-
-## Data Ingest
-
-<figure markdown>
-
-<figcaption>Figure 1: Modes of data ingest</figcaption>
-</figure>
-
-More [usage examples](../usage-overview/) include how to ingest datasets, data dumps, live data, etc.
-
-### Generation of Metadata in DBRepo
-
-You can generate metadata e.g. UI tbd
-
-!!! warning "Limitation"
-
- Only system-versioned tables are considered when generating metadata to tables. If your table is not system-versioned
- e.g. a base table, it will not be visible in the UI.
\ No newline at end of file
diff --git a/.docs/concepts/monitoring.md b/.docs/concepts/monitoring.md
index a00c99179b3cb702f66df729eabf49880c805184..be70ccac4c83f5d152e0206a31cb20e93af71702 100644
--- a/.docs/concepts/monitoring.md
+++ b/.docs/concepts/monitoring.md
@@ -11,131 +11,19 @@ instance is started.
You need can setup Prometheus in a few minutes using
a [Docker container](https://prometheus.io/docs/prometheus/latest/installation/).
-## Example
-
-## Analyse Service
-
-| **Metric** | **Description** |
-|-----------------------------|---------------------------------------------|
-| `dbrepo_analyse_datatypes` | Time needed to analyse datatypes of dataset |
-| `dbrepo_analyse_keys` | Time needed to analyse keys of dataset |
-| `dbrepo_analyse_table_stat` | Time needed to analyse table statistics |
-| `dbrepo_analyse_table_stat` | Time needed to analyse table statistics |
-
-## Auth Service
-
-See [Keycloak documentation](https://www.keycloak.org/server/configuration-metrics).
-
-## Broker Service
-
-See [RabbitMQ documentation](https://www.rabbitmq.com/docs/prometheus).
-
-## Databases
-
-See [MariaDB Galera documentation](https://galeracluster.com/documentation/html_docs_20210213-1355-master/documentation/galera-manager-monitoring-clusters.html).
-
-The [Data Database Sidecar](#) metrics are:
-
-| **Metric** | **Description** |
-|---------------------------------|---------------------------------------|
-| `dbrepo_sidecar_import_dataset` | Time needed to import dataset from S3 |
-| `dbrepo_sidecar_export_dataset` | Time needed to export dataset to S3 |
-
-## Data Service
-
-| **Metric** | **Description** |
-|-----------------------------|-------------------------------------------|
-| `dbrepo_message_receive` | Received AMQP message from Broker Service |
-| `dbrepo_subset_create` | Create subset |
-| `dbrepo_subset_data` | Retrieved subset data |
-| `dbrepo_subset_find` | Find subset |
-| `dbrepo_subset_list` | Find subsets |
-| `dbrepo_subset_persist` | Persist subset |
-| `dbrepo_table_data_create` | Create table data |
-| `dbrepo_table_data_delete` | Delete table data |
-| `dbrepo_table_data_export` | Export table data |
-| `dbrepo_table_data_history` | Find table history |
-| `dbrepo_table_data_import` | Import dataset |
-| `dbrepo_table_data_list` | Retrieve table data |
-| `dbrepo_table_data_update` | Update table data |
-| `dbrepo_view_data` | Retrieve view data |
-| `dbrepo_view_schema_list` | Find view schemas |
-
-## Metadata Service
-
-| **Metric** | **Description** |
-|------------------------------------|---------------------------------------------------|
-| `dbrepo_database_count` | The total number of managed research databases |
-| `dbrepo_view_count` | The total number of available view data sources |
-| `dbrepo_subset_count` | The total number of available subset data sources |
-| `dbrepo_table_count` | The total number of available table data sources |
-| `dbrepo_volume_sum` | The total volume of available research data |
-| `dbrepo_user_refresh_token` | Refresh user token |
-| `dbrepo_identifier_save` | Save identifier |
-| `dbrepo_oai_record_get` | Get the record |
-| `dbrepo_access_give` | Give access to some database |
-| `dbrepo_ontologies_find` | Find one ontology |
-| `dbrepo_database_findall` | List databases |
-| `dbrepo_tables_refresh` | Refresh database tables metadata |
-| `dbrepo_license_findall` | Get all licenses |
-| `dbrepo_user_modify` | Modify user information |
-| `dbrepo_container_findall` | Find all containers |
-| `dbrepo_maintenance_delete` | Delete maintenance message |
-| `dbrepo_maintenance_update` | Update maintenance message |
-| `dbrepo_ontologies_create` | Register a new ontology |
-| `dbrepo_identifier_delete` | Delete some identifier |
-| `dbrepo_oai_identify` | Identify the repository |
-| `dbrepo_database_create` | Create database |
-| `dbrepo_oai_metadataformats_list` | List the metadata formats |
-| `dbrepo_user_password_modify` | Modify user password |
-| `dbrepo_semantic_concepts_findall` | List semantic concepts |
-| `dbrepo_identifier_retrieve` | Retrieve metadata from identifier |
-| `dbrepo_identifier_list` | Find all identifiers |
-| `dbrepo_views_findall` | Find all views |
-| `dbrepo_identifier_create` | Draft identifier |
-| `dbrepo_oai_identifiers_list` | List the identifiers |
-| `dbrepo_image_findall` | Find all images |
-| `dbrepo_database_visibility` | Update database visibility |
-| `dbrepo_container_create` | Create container |
-| `dbrepo_views_refresh` | Refresh database views metadata |
-| `dbrepo_database_find` | Find some database |
-| `dbrepo_access_get` | Check access to some database |
-| `dbrepo_identifier_find` | Find some identifier |
-| `dbrepo_maintenance_create` | Create maintenance message |
-| `dbrepo_container_delete` | Delete some container |
-| `dbrepo_ontologies_delete` | Delete an ontology |
-| `dbrepo_ontologies_findall` | List all ontologies |
-| `dbrepo_user_token` | Obtain user token |
-| `dbrepo_view_find` | Find one view |
-| `dbrepo_user_create` | Create user |
-| `dbrepo_ontologies_update` | Update an ontology |
-| `dbrepo_maintenance_findall` | Find maintenance messages |
-| `dbrepo_users_list` | Find all users |
-| `dbrepo_image_find` | Find some image |
-| `dbrepo_user_find` | Get a user info |
-| `dbrepo_image_delete` | Delete some image |
-| `dbrepo_identifier_publish` | Publish identifier |
-| `dbrepo_image_update` | Update some image |
-| `dbrepo_view_create` | Create a view |
-| `dbrepo_semantic_units_findall` | List semantic units |
-| `dbrepo_image_create` | Create image |
-| `dbrepo_database_image` | Update database image |
-| `dbrepo_view_delete` | Delete one view |
-| `dbrepo_database_transfer` | Update database owner |
-| `dbrepo_maintenance_find` | Find one maintenance message |
-| `dbrepo_access_modify` | Modify access to some database |
-| `dbrepo_ontologies_entities_find` | Find entities |
-| `dbrepo_access_delete` | Revoke access to some database |
-| `dbrepo_container_find` | Find some container |
-
-## Search Service
-
-| **Metric** | **Description** |
-|---------------------------------|---------------------------------------------------------|
-| `dbrepo_search_index_list` | Time needed to list search index |
-| `dbrepo_search_type_list` | Time needed to list search types |
-| `dbrepo_search_fuzzy` | Time needed to search fuzzy |
-| `dbrepo_search_type` | Time needed to search by type |
-| `dbrepo_search_update_database` | Time needed to update a database in the search database |
-| `dbrepo_search_delete_database` | Time needed to delete a database in the search database |
-
+## 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/help.md b/.docs/help.md
index eaecbe6b0461a18320f9572bb408728e110281d2..63ede84f973867d044c8438a7dd774fb60b5a39c 100644
--- a/.docs/help.md
+++ b/.docs/help.md
@@ -9,3 +9,7 @@ The [concepts documentation](../concepts/) is the most complete guide on how to
## 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
index a6512707b1b695126832f16c8fa1f271ad81cead..8e44f6c84bbcc9c0d0e1197f512d6748fb128d68 100644
--- a/.docs/images/architecture.drawio
+++ b/.docs/images/architecture.drawio
@@ -1,13 +1,13 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.8 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.8" pages="8">
+<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.17" pages="8">
<diagram id="mvBsv1rP8O80Qe3yGnn_" name="docker-compose">
- <mxGraphModel dx="2390" dy="1370" 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">
+ <mxGraphModel dx="683" dy="391" 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-76" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=2;" vertex="1" parent="1">
- <mxGeometry x="320" y="160" width="530" height="397" as="geometry" />
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-76" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=2;" parent="1" vertex="1">
+ <mxGeometry x="320" y="160" width="640" height="397" as="geometry" />
</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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-108">
+ <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" />
@@ -16,55 +16,55 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-78" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-77">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-77">
+ <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="-2" y="11" as="offset" />
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-80" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;" vertex="1" parent="1">
- <mxGeometry x="540" y="557" width="310" height="123" as="geometry" />
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-80" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;" parent="1" vertex="1">
+ <mxGeometry x="540" y="557" width="420" height="123" as="geometry" />
</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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-96" target="FWEJ_FGA9GBXbfwohBE8-104">
+ <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;" vertex="1" parent="1">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-92">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-83">
+ <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" vertex="1" parent="1">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-137">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-86">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-92" target="FWEJ_FGA9GBXbfwohBE8-96">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-88">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-92" target="FWEJ_FGA9GBXbfwohBE8-119">
+ <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" />
@@ -73,31 +73,31 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-91" value="HTTP,<div>AMQP</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-90">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-91" value="HTTP,<div>AMQP</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="2" y="-77" 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;" vertex="1" parent="1">
+ <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-93" value="LDAP" 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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-96" target="FWEJ_FGA9GBXbfwohBE8-108">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-93" value="LDAP" 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-96" target="FWEJ_FGA9GBXbfwohBE8-108" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint as="offset" />
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-94" 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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-96" target="FWEJ_FGA9GBXbfwohBE8-119">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-94" 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-96" target="FWEJ_FGA9GBXbfwohBE8-119" edge="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-95" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-94">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-95" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-94" vertex="1" connectable="0">
<mxGeometry x="0.125" relative="1" as="geometry">
<mxPoint as="offset" />
</mxGeometry>
</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;" vertex="1" parent="1">
+ <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-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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-119">
+ <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" />
@@ -107,12 +107,12 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-98" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-97">
+ <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="1" y="2" as="offset" />
</mxGeometry>
</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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-85">
+ <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" />
@@ -120,63 +120,63 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-100" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-99">
+ <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" vertex="1" parent="1">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-104" target="FWEJ_FGA9GBXbfwohBE8-101">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-102">
+ <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-104" value="<b>Auth Service</b><br><i>keycloak</i>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <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-105" value="Search Service" style="rounded=1;whiteSpace=wrap;html=1;fontStyle=1" vertex="1" parent="1">
+ <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-106" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-106" 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" 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;" vertex="1" parent="1">
+ <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-108" value="<b>Dashboard Service</b><div><i>grafana</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-108" value="<b>Dashboard Service</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="710" y="422" width="130" height="40" as="geometry" />
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-109" 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="FWEJ_FGA9GBXbfwohBE8-124" target="FWEJ_FGA9GBXbfwohBE8-120">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-109" 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-124" target="FWEJ_FGA9GBXbfwohBE8-120" edge="1">
<mxGeometry relative="1" as="geometry" />
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-110" value="S3" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-109">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-110" value="S3" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-109" vertex="1" connectable="0">
<mxGeometry x="0.2961" y="-3" relative="1" as="geometry">
<mxPoint x="3" y="-9" as="offset" />
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-111" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-111" 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="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;" vertex="1" parent="1">
+ <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-113" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-113" 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" y="584" width="50" height="64" as="geometry" />
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-114" value="metadata-db" style="text;html=1;strokeColor=none;fillColor=default;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-114" value="metadata-db" style="text;html=1;strokeColor=none;fillColor=default;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;spacing=-1;" parent="1" vertex="1">
<mxGeometry x="732.5" y="649" width="85" height="17" 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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-105">
+ <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-116" value="HTTP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.25;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-124">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-116" value="HTTP" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.25;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-124" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="490" y="186" />
@@ -185,7 +185,7 @@
<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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-123">
+ <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" />
@@ -193,102 +193,102 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-118" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-117">
+ <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="1" y="-64" as="offset" />
</mxGeometry>
</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;" vertex="1" parent="1">
+ <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-120" value="<b>Storage Service</b><div><i>seaweedfs</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <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-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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-123" target="FWEJ_FGA9GBXbfwohBE8-120">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-121">
+ <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" vertex="1" parent="1">
+ <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-124" value="<b>Upload Service</b><div><i>tusd</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-124" value="<b>Upload Service</b><div><i>tusd</i></div>" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#E6E6E6;fontColor=#000000;strokeColor=#000000;" parent="1" vertex="1">
<mxGeometry x="330" y="176" 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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-105" target="FWEJ_FGA9GBXbfwohBE8-106">
+ <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=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-125">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-128" target="FWEJ_FGA9GBXbfwohBE8-119">
+ <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;" vertex="1" parent="1">
+ <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;" vertex="1" parent="1">
+ <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-130" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=none;" vertex="1" parent="1">
- <mxGeometry x="540" y="550" width="310" height="14" as="geometry" />
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-130" value="" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=none;" parent="1" vertex="1">
+ <mxGeometry x="540" y="550" width="420" height="14" as="geometry" />
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-131" 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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-101" target="FWEJ_FGA9GBXbfwohBE8-113">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-131" 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-101" target="FWEJ_FGA9GBXbfwohBE8-113" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="840" y="524" as="sourcePoint" />
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-132" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-131">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-132" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="FWEJ_FGA9GBXbfwohBE8-131" vertex="1" connectable="0">
<mxGeometry x="-0.0169" y="-1" relative="1" as="geometry">
<mxPoint x="1" as="offset" />
</mxGeometry>
</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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-104" target="FWEJ_FGA9GBXbfwohBE8-111">
+ <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;" vertex="1" parent="1">
+ <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="662" y="571" 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;" vertex="1" parent="1">
+ <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;" vertex="1" parent="1">
+ <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;" vertex="1" parent="1">
+ <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="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;" vertex="1" parent="1">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-138" value="" style="rounded=1;whiteSpace=wrap;html=1;fillColor=none;dashed=1;arcSize=6;" 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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-129" target="FWEJ_FGA9GBXbfwohBE8-138">
+ <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" vertex="1" parent="1">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-142" target="FWEJ_FGA9GBXbfwohBE8-119">
+ <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;" vertex="1" parent="1">
+ <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-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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-85" target="FWEJ_FGA9GBXbfwohBE8-119">
+ <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" />
@@ -298,24 +298,24 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-144" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-143">
+ <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="-1" as="offset" />
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-145" value="" style="endArrow=none;dashed=1;html=1;rounded=0;entryX=1;entryY=0.976;entryDx=0;entryDy=0;entryPerimeter=0;exitX=1;exitY=0.076;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-80" target="FWEJ_FGA9GBXbfwohBE8-76">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-145" value="" style="endArrow=none;dashed=1;html=1;rounded=0;entryX=1;entryY=0.976;entryDx=0;entryDy=0;entryPerimeter=0;exitX=1;exitY=0.076;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-80" target="FWEJ_FGA9GBXbfwohBE8-76" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="810" y="570" as="sourcePoint" />
<mxPoint x="860" y="520" as="targetPoint" />
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-146" value="" style="endArrow=none;dashed=1;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.121;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-80" target="FWEJ_FGA9GBXbfwohBE8-130">
+ <mxCell id="FWEJ_FGA9GBXbfwohBE8-146" value="" style="endArrow=none;dashed=1;html=1;rounded=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.121;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="FWEJ_FGA9GBXbfwohBE8-80" target="FWEJ_FGA9GBXbfwohBE8-130" edge="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="540" y="590" as="sourcePoint" />
<mxPoint x="590" y="540" as="targetPoint" />
</mxGeometry>
</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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-119" target="FWEJ_FGA9GBXbfwohBE8-140">
+ <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" />
@@ -323,12 +323,12 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-148" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-147">
+ <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;" edge="1" parent="1" source="FWEJ_FGA9GBXbfwohBE8-105" target="FWEJ_FGA9GBXbfwohBE8-101">
+ <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" />
@@ -336,11 +336,28 @@
</Array>
</mxGeometry>
</mxCell>
- <mxCell id="FWEJ_FGA9GBXbfwohBE8-150" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="FWEJ_FGA9GBXbfwohBE8-149">
+ <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-5" 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="a_cl7nsyDpLQFaXOHeFD-3" target="FWEJ_FGA9GBXbfwohBE8-108">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="a_cl7nsyDpLQFaXOHeFD-6" value="HTTP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="a_cl7nsyDpLQFaXOHeFD-5">
+ <mxGeometry x="-0.1222" relative="1" as="geometry">
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="a_cl7nsyDpLQFaXOHeFD-3" value="" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=8.600000000000023;fillColor=#E6E6E6;strokeColor=#000000;" vertex="1" parent="1">
+ <mxGeometry x="900" y="410" 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;" vertex="1" parent="1">
+ <mxGeometry x="882.5" y="474" width="85" height="17" as="geometry" />
+ </mxCell>
+ <mxCell id="a_cl7nsyDpLQFaXOHeFD-7" value="* omitted edges for all services to metric-db" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="1">
+ <mxGeometry x="727" y="683" width="233" height="11" as="geometry" />
+ </mxCell>
</root>
</mxGraphModel>
</diagram>
diff --git a/.docs/images/coverage.svg b/.docs/images/coverage.svg
new file mode 100644
index 0000000000000000000000000000000000000000..8d22334eb1c46b39dbdbeb37ff93c218c188173d
--- /dev/null
+++ b/.docs/images/coverage.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="124" height="20">
+ <linearGradient id="b" x2="0" y2="100%">
+ <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+ <stop offset="1" stop-opacity=".1"/>
+ </linearGradient>
+ <mask id="anybadge_1">
+ <rect width="124" height="20" rx="3" fill="#fff"/>
+ </mask>
+ <g mask="url(#anybadge_1)">
+ <path fill="#555" d="M0 0h65v20H0z"/>
+ <path fill="#A9A9A9" d="M65 0h59v20H65z"/>
+ <path fill="url(#b)" d="M0 0h124v20H0z"/>
+ </g>
+ <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+ <text x="33.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
+ <text x="32.5" y="14">coverage</text>
+ </g>
+ <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+ <text x="95.5" y="15" fill="#010101" fill-opacity=".3">unknown</text>
+ <text x="94.5" y="14">unknown</text>
+ </g>
+</svg>
+
diff --git a/.docs/images/pipeline.svg b/.docs/images/pipeline.svg
new file mode 100644
index 0000000000000000000000000000000000000000..17f94998918fcb601111626a5436107abeaaa18f
--- /dev/null
+++ b/.docs/images/pipeline.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="116" height="20">
+ <linearGradient id="b" x2="0" y2="100%">
+ <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
+ <stop offset="1" stop-opacity=".1"/>
+ </linearGradient>
+ <mask id="anybadge_1">
+ <rect width="116" height="20" rx="3" fill="#fff"/>
+ </mask>
+ <g mask="url(#anybadge_1)">
+ <path fill="#555" d="M0 0h57v20H0z"/>
+ <path fill="#A9A9A9" d="M57 0h59v20H57z"/>
+ <path fill="url(#b)" d="M0 0h116v20H0z"/>
+ </g>
+ <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+ <text x="29.5" y="15" fill="#010101" fill-opacity=".3">pipeline</text>
+ <text x="28.5" y="14">pipeline</text>
+ </g>
+ <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
+ <text x="87.5" y="15" fill="#010101" fill-opacity=".3">unknown</text>
+ <text x="86.5" y="14">unknown</text>
+ </g>
+</svg>
+
diff --git a/.docs/images/screenshots/grafana4.png b/.docs/images/screenshots/grafana4.png
index 94cdf5f9ed79356cade533add69aafa426df3e45..30eee0259c2adb4e627ba9caa567f3cd55de411f 100644
Binary files a/.docs/images/screenshots/grafana4.png and b/.docs/images/screenshots/grafana4.png differ
diff --git a/.docs/index.md b/.docs/index.md
index aea045c43c69da1013fc7884ccaa967ea743a95a..f24d5c598e99e9a969b251cb0ba0854eb389f7a0 100644
--- a/.docs/index.md
+++ b/.docs/index.md
@@ -2,13 +2,13 @@
author: Martin Weise
---
-[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
-[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
+[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
+[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[](https://hub.docker.com/u/dbrepo){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
-Documentation for version: [v1.4.6](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.4.7](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
@@ -32,11 +32,11 @@ Installing DBRepo is very easy or
- [TU Wien](https://dbrepo1.ec.tuwien.ac.at)
- TU Darmstadt
-- [Universität Hamburg](https://dbrepo.fdm.uni-hamburg.de/)
+- [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://dbrepo.wrfexpress.com/)
-## How can I try DBRepo
+## How can I try DBRepo?
[:fontawesome-solid-flask: Demonstration Instance](https://test.dbrepo.tuwien.ac.at){ .md-button .md-button--primary target="_blank" }
\ No newline at end of file
diff --git a/.docs/installation.md b/.docs/installation.md
index 5f9a45199a50b579c1255b8362bf0e40ca0b995d..024d39bcd49cf68013c280552be3677bd8480e0a 100644
--- a/.docs/installation.md
+++ b/.docs/installation.md
@@ -11,7 +11,7 @@ author: Martin Weise
If you have [Docker](https://docs.docker.com/engine/install/) already installed on your system, you can install DBRepo with:
```shell
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.6/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | bash
```
!!! bug "Default installation security disclaimer"
@@ -39,7 +39,7 @@ SSL/TLS certificate is recommended. Follow the [secure install](#secure-install)
Execute the install 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.4.6/install.sh | DOWNLOAD_ONLY=1 bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | DOWNLOAD_ONLY=1 bash
```
### Static Configuration
@@ -81,7 +81,7 @@ the variable `IDENTITY_SERVICE_ADMIN_PASSWORD` in `.env`.
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.4.6/.scripts/reg-client-secret.sh" | bash
+curl -sSL "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/.scripts/reg-client-secret.sh" | bash
```
Also, update the JWT key according to the
diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md
index d6689058d6896b2e8449ff482a60a35a7d99b9cf..2384f61d0451435b0515e09b128f71d942039bee 100644
--- a/.docs/kubernetes.md
+++ b/.docs/kubernetes.md
@@ -7,7 +7,7 @@ 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.4.6/helm/dbrepo/values.yaml)
+sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.7/helm/dbrepo/values.yaml)
for your deployment and update the variables, especially `hostname`.
```shell
@@ -15,41 +15,11 @@ helm upgrade --install dbrepo \
-n dbrepo \
"oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
--values ./values.yaml \
- --version "1.4.6" \
+ --version "1.4.7" \
--create-namespace \
--cleanup-on-fail
```
-This chart is also on [Artifact Hub](https://artifacthub.io/packages/helm/dbrepo/dbrepo) with a full documentation
-about values, etc. Before installing, you need to change credentials, e.g. the Broker Service administrator user
-password:
-
-```yaml title="values.yaml"
-brokerservice:
- ...
- auth:
- ...
- username: broker
- password: broker
- passwordHash: 1gwjNNTBPKLgyzbsUykfR0JIFC6nNqbNJaxzZ14uPT8JGcTZ
-```
-
-The `brokerservice.auth.passwordHash` field is the RabbitMQ SHA512-hash of the `brokerservice.auth.password` field and
-can be obtained with
-the [`generate-rabbitmq-pw.sh`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/blob/release-1.4.6/helm/dbrepo/hack/generate-rabbitmq-pw.sh)
-script:
-
-```console
-$ ./generate-rabbitmq-pw.sh my_password
-klPdmv4dgnRH64czHolIHAfXvc0G9hc24FQmPlI6eeI1NOf9
-```
-
-The script needs the package `xxd` for generation of the random salt. If you don't have `xxd` installed, install it:
-
-* Debian/Ubuntu: `apt install xxd`
-* Windows: `choco install xxd`
-* MacOS: `brew install coreutils`
-
## Prerequisites
* Kubernetes 1.24+
@@ -58,9 +28,7 @@ The script needs the package `xxd` for generation of the random salt. If you don
## Limitations
-1. MariaDB Galera does not (yet) support XA-transactions required by the authentication service (=Keycloak). Therefore
- only a single MariaDB pod can be deployed at once for the Auth database.
-2. The entire Helm deployment is rootless (=`runAsNonRoot=true`) except for
+1. The entire Helm deployment is rootless (=`runAsNonRoot=true`) except for
the [Storage Service](../api/storage-service) which still requires a root user.
!!! question "Do you miss functionality? Do these limitations affect you?"
diff --git a/.docs/redirect.html b/.docs/redirect.html
index 035de3cbfe860773c99ac3f7ebd072f4cca66c40..3f3b8027ad9b8493c62219288b8142c4e73aaea8 100644
--- a/.docs/redirect.html
+++ b/.docs/redirect.html
@@ -5,16 +5,16 @@
<head>
<meta charset="UTF-8">
<title>Redirect Notice</title>
- <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.6/'" />
+ <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/1.4.7/'" />
</head>
<body>
<h1>Redirect Notice</h1>
<p>
- This page should automatically open the documentation for version <code>1.4.6</code>. In case this page does not load the site is
+ This page should automatically open the documentation for version <code>1.4.7</code>. In case this page does not load the site is
available at:
</p>
<p>
- <a href="/infrastructures/dbrepo/1.4.6/">/infrastructures/dbrepo/1.4.6/</a>
+ <a href="/infrastructures/dbrepo/1.4.7/">/infrastructures/dbrepo/1.4.7/</a>
</p>
</body>
</html>
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4d7b82f6e6aac7adad8b9865fc2482f7c065e8f2..ed77b2683eba14e2fdcc88b5e4e1851a87807b4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ build/
tmp.yaml
.docs/.swagger/api-*
.scannerwork/
+.docker/config/
+.docker/dist.tar.gz
# docs
.docs/.swagger/dist/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fe2c739a640b791a8d11019144a6db9df598048..f571fba1d16722ed56e3152dbe634272ebcbd284 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ variables:
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
PYTHON_VERSION: "3.11"
- APP_VERSION: "1.4.6"
- CHART_VERSION: "1.4.6"
+ APP_VERSION: "1.4.7"
+ CHART_VERSION: "1.4.7"
CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH}
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
@@ -35,9 +35,6 @@ stages:
build-metadata-service:
image: maven:3-openjdk-17
stage: build
- except:
- refs:
- - /^release-.*/
script:
- "mvn -f ./dbrepo-metadata-service/pom.xml clean install $MAVEN_OPTS -DskipTests"
# Compiled classes are needed for SonarQube in later stages
@@ -56,9 +53,6 @@ build-metadata-service:
build-analyse-service:
image: docker.io/python:3.11-alpine
stage: build
- except:
- refs:
- - /^release-.*/
variables:
PIPENV_PIPFILE: "./dbrepo-analyse-service/Pipfile"
script:
@@ -68,9 +62,6 @@ build-analyse-service:
build-data-db-sidecar:
image: docker.io/python:3.11-alpine
stage: build
- except:
- refs:
- - /^release-.*/
variables:
PIPENV_PIPFILE: "./dbrepo-data-db/sidecar/Pipfile"
script:
@@ -80,9 +71,6 @@ build-data-db-sidecar:
build-lib:
image: docker.io/python:3.11-alpine
stage: build
- except:
- refs:
- - /^release-.*/
variables:
PIPENV_PIPFILE: "./lib/python/Pipfile"
script:
@@ -92,9 +80,6 @@ build-lib:
build-data-service:
image: maven:3-openjdk-17
stage: build
- except:
- refs:
- - /^release-.*/
needs:
- build-metadata-service
dependencies:
@@ -112,20 +97,14 @@ build-data-service:
expire_in: 1 days
build-ui:
- image: oven/bun:1.0.26-alpine
+ image: oven/bun:1.1.20-alpine
stage: build
- except:
- refs:
- - /^release-.*/
script:
- "cd ./dbrepo-ui && bun install && bun run build"
build-search-service:
image: docker.io/python:3.11-alpine
stage: build
- except:
- refs:
- - /^release-.*/
script:
- "pip install pipenv"
- "cd dbrepo-search-service && pipenv install --system --deploy"
@@ -133,9 +112,6 @@ build-search-service:
build-docker:
image: docker.io/docker:24-dind
stage: build
- except:
- refs:
- - /^release-.*/
before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
script:
@@ -146,9 +122,6 @@ build-docker:
build-helm:
image: docker.io/docker:24-dind
stage: build
- except:
- refs:
- - /^release-.*/
before_script:
- echo "$CI_GPG_KEYRING" | base64 -d > ./secring.gpg
- echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL
@@ -172,7 +145,7 @@ lint-docker-compose:
- "bash .scripts/check-service.sh 'dbrepo-auth-db'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-auth-service'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-broker-service'"
- - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-dashboard-service'"
+ - "IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-dashboard-service'"
- "bash .scripts/check-service.sh 'dbrepo-data-db'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-data-db-sidecar'"
- "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-data-service'"
@@ -205,9 +178,6 @@ verify-install-script:
lint-helm-chart:
image: docker.io/alpine:3.20
stage: lint
- except:
- refs:
- - /^release-.*/
needs:
- build-metadata-service
dependencies:
@@ -220,9 +190,6 @@ lint-helm-chart:
test-metadata-service:
image: maven:3-openjdk-17
stage: test
- except:
- refs:
- - /^release-.*/
needs:
- build-metadata-service
dependencies:
@@ -243,9 +210,6 @@ test-metadata-service:
test-data-service:
image: maven:3-openjdk-17
stage: test
- except:
- refs:
- - /^release-.*/
needs:
- build-data-service
dependencies:
@@ -266,9 +230,6 @@ test-data-service:
test-analyse-service:
image: docker.io/python:3.11-alpine
stage: test
- except:
- refs:
- - /^release-.*/
variables:
PIPENV_PIPFILE: "./dbrepo-analyse-service/Pipfile"
needs:
@@ -293,19 +254,43 @@ test-analyse-service:
test-search-service:
image: docker.io/python:3.11-alpine
stage: test
- except:
- refs:
- - /^release-.*/
variables:
PIPENV_PIPFILE: "./dbrepo-search-service/Pipfile"
needs:
- build-search-service
dependencies:
- build-search-service
+ before_script:
+ - "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service/clients"
+ - "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service/omlib"
+ script:
+ - "pip install pipenv"
+ - "pipenv install gunicorn && pipenv install --dev --system --deploy"
+ - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_app.py test/test_jwt.py test/test_opensearch_client.py test/test_keycloak_client.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
+ - "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
+ artifacts:
+ when: always
+ paths:
+ - ./dbrepo-search-service/report.xml
+ - ./dbrepo-search-service/coverage.txt
+ expire_in: 1 days
+ reports:
+ junit: ./dbrepo-search-service/report.xml
+ coverage: '/TOTAL.*?([0-9]{1,3})%/'
+
+test-search-service-init:
+ image: docker.io/python:3.11-alpine
+ stage: test
+ variables:
+ PIPENV_PIPFILE: "./dbrepo-search-service/init/Pipfile"
+ needs:
+ - build-search-service
+ dependencies:
+ - build-search-service
script:
- "pip install pipenv"
- "pipenv install gunicorn && pipenv install --dev --system --deploy"
- - cd ./dbrepo-search-service/ && coverage run -m pytest test/test_opensearch_client.py --junitxml=report.xml && coverage html --omit="test/*,omlib/*" && coverage report --omit="test/*,omlib/*" > ./coverage.txt
+ - cd ./dbrepo-search-service/init/ && coverage run -m pytest test/test_app.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
- "cat ./coverage.txt | grep -o 'TOTAL[^%]*%'"
artifacts:
when: always
@@ -320,9 +305,6 @@ test-search-service:
test-lib:
image: docker.io/python:3.11-alpine
stage: test
- except:
- refs:
- - /^release-.*/
variables:
PIPENV_PIPFILE: "./lib/python/Pipfile"
needs:
@@ -344,6 +326,21 @@ test-lib:
junit: ./lib/python/report.xml
coverage: '/TOTAL.*?([0-9]{1,3})%/'
+test-ui:
+ stage: test
+ image: docker.io/docker:24-dind
+ needs:
+ - build-ui
+ dependencies:
+ - build-ui
+ before_script:
+ - "apk add bash apache2-utils"
+ - "docker compose build dbrepo-ui"
+ - "docker run --name dbrepo-ui -e NODE_OPTIONS='--max_old_space_size=256' -p 3000:3000 -d dbrepo-ui:latest"
+ script:
+ - "sleep 30"
+ - "ENDPOINT=http://localhost:3000 bash ./dbrepo-ui/test/test_heap.sh"
+
scan-sonarqube:
image: sonarsource/sonar-scanner-cli:10.0
stage: scan
@@ -404,9 +401,6 @@ release-helm:
refs:
- /^release-.*/
when: manual
- except:
- refs:
- - release-latest
before_script:
- "docker logout ${CI_REGISTRY_URL}"
- "echo ${CI_REGISTRY_PASSWORD} | docker login --username ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY_URL}"
@@ -429,7 +423,7 @@ release-docs:
refs:
- /^release-.*/
before_script:
- - "apk add --update alpine-sdk bash sed wget openssh"
+ - "apk add --update alpine-sdk bash sed wget openssh jq curl"
- "pip install pipenv"
- "pip install -r ./requirements.txt"
- "mkdir -p ./final/${APP_VERSION}/rest"
@@ -441,6 +435,7 @@ release-docs:
- "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger
- "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs
- "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist
+ - "bash ./.gitlab/gen-badge.sh"
- eval $(ssh-agent -s)
- "mkdir -p /root/.ssh"
- echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa
diff --git a/.gitlab/gen-badge.sh b/.gitlab/gen-badge.sh
new file mode 100644
index 0000000000000000000000000000000000000000..5ef15a3b6cafb7cf5324a8cbfed3383dd80aa4cf
--- /dev/null
+++ b/.gitlab/gen-badge.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+GITLAB_URL="https://gitlab.phaidra.org"
+# if we reached this script, all the tests have passed
+anybadge --label pipeline --value "passed" failed=red passed=green canceled=darkgray > "./final/${APP_VERSION}/images/pipeline.svg"
+PIPELINE_COVERAGE=$(curl -fsSL -H "PRIVATE-TOKEN: ${CI_TOKEN}" "${GITLAB_URL}/api/v4/projects/450/pipelines/latest?ref=${CI_COMMIT_BRANCH}" | jq --raw-output .coverage)
+echo "[INFO] pipeline coverage: ${PIPELINE_COVERAGE}"
+if [ "${PIPELINE_COVERAGE}" != "null" ]; then
+ anybadge --label coverage --value "${PIPELINE_COVERAGE}" coverage > "./final/${APP_VERSION}/images/coverage.svg"
+else
+ echo "[WARNING] Skipping badge generation, displaying default badge text: unknown"
+fi
diff --git a/Makefile b/Makefile
index 8c85acc01e6ab33dcd88b13e9229ae85e9b48b75..3300a5061d5b98e914c97dd0fc864a44970fd5de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: all
-APP_VERSION ?= 1.4.6
-CHART_VERSION ?= 1.4.6
+APP_VERSION ?= 1.4.7
+CHART_VERSION ?= 1.4.7
REPOSITORY_URL ?= registry.datalab.tuwien.ac.at/dbrepo
.PHONY: all
diff --git a/README.md b/README.md
index 1c51793eb99fd9eae99ad98f4ba8686e9ad506a5..06f03b60102d1e66c3a270807b3d23fee9c866c4 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ If you have [Docker](https://docs.docker.com/engine/install/) already installed
with:
```bash
-curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.6/install.sh | bash
+curl -sSL https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/install.sh | bash
```
## Documentation
diff --git a/dbrepo-analyse-service/.gitignore b/dbrepo-analyse-service/.gitignore
index 87d11b3c3ba1917c6a68966b821852cdbb56419d..d339f8575ccfbafdb8eef6431cce6c1add7aa92e 100644
--- a/dbrepo-analyse-service/.gitignore
+++ b/dbrepo-analyse-service/.gitignore
@@ -5,6 +5,9 @@ __pycache__
# OS
.DS_Store
+# model
+bge-m3/pytorch_model.bin
+
# Environment
.flaskenv
*.pyc
@@ -14,6 +17,12 @@ venv/
.venv/
env*
+# Libraries
+./lib/dbrepo-1.4.4*
+./lib/dbrepo-1.4.5*
+./lib/dbrepo-1.4.6*
+./lib/dbrepo-1.4.7rc*
+
# LLM
*.bin
diff --git a/dbrepo-analyse-service/Pipfile b/dbrepo-analyse-service/Pipfile
index 158a03e2d175cc9d8a421adb0441b4c832f20622..20769992f7b88bdce341f3eb99efe10eca72e3dc 100644
--- a/dbrepo-analyse-service/Pipfile
+++ b/dbrepo-analyse-service/Pipfile
@@ -21,7 +21,7 @@ numpy = "*"
pandas = "*"
minio = "*"
pydantic = "*"
-dbrepo = {path = "./lib/dbrepo-1.4.6.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"}
opensearch-py = "*"
[dev-packages]
diff --git a/dbrepo-analyse-service/Pipfile.lock b/dbrepo-analyse-service/Pipfile.lock
index 8dd1014dd04aa0ce09ec9cec6d6cd0cceb3c4e7a..bcff34a23efb2e4a660fb11c850aba569369e918 100644
--- a/dbrepo-analyse-service/Pipfile.lock
+++ b/dbrepo-analyse-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "77d9a73a8fbe7ffd566a4207e762dfacf0c4d8c474c937d481811567482fb708"
+ "sha256": "9e1fb16b1632a76b8a2fb6ac372b92556c573a7246bd37dd32813559bb27c8d9"
},
"pipfile-spec": 6,
"requires": {
@@ -18,108 +18,108 @@
"default": {
"aiohappyeyeballs": {
"hashes": [
- "sha256:55a1714f084e63d49639800f95716da97a1f173d46a16dfcfda0016abb93b6b2",
- "sha256:7ce92076e249169a13c2f49320d1967425eaf1f407522d707d59cac7628d62bd"
+ "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586",
+ "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572"
],
"markers": "python_version >= '3.8'",
- "version": "==2.4.0"
+ "version": "==2.4.3"
},
"aiohttp": {
"hashes": [
- "sha256:02594361128f780eecc2a29939d9dfc870e17b45178a867bf61a11b2a4367277",
- "sha256:03f2645adbe17f274444953bdea69f8327e9d278d961d85657cb0d06864814c1",
- "sha256:074d1bff0163e107e97bd48cad9f928fa5a3eb4b9d33366137ffce08a63e37fe",
- "sha256:0912b8a8fadeb32ff67a3ed44249448c20148397c1ed905d5dac185b4ca547bb",
- "sha256:0d277cfb304118079e7044aad0b76685d30ecb86f83a0711fc5fb257ffe832ca",
- "sha256:0d93400c18596b7dc4794d48a63fb361b01a0d8eb39f28800dc900c8fbdaca91",
- "sha256:123dd5b16b75b2962d0fff566effb7a065e33cd4538c1692fb31c3bda2bfb972",
- "sha256:17e997105bd1a260850272bfb50e2a328e029c941c2708170d9d978d5a30ad9a",
- "sha256:18a01eba2574fb9edd5f6e5fb25f66e6ce061da5dab5db75e13fe1558142e0a3",
- "sha256:1923a5c44061bffd5eebeef58cecf68096e35003907d8201a4d0d6f6e387ccaa",
- "sha256:1942244f00baaacaa8155eca94dbd9e8cc7017deb69b75ef67c78e89fdad3c77",
- "sha256:1b2c16a919d936ca87a3c5f0e43af12a89a3ce7ccbce59a2d6784caba945b68b",
- "sha256:1c19de68896747a2aa6257ae4cf6ef59d73917a36a35ee9d0a6f48cff0f94db8",
- "sha256:1e72589da4c90337837fdfe2026ae1952c0f4a6e793adbbfbdd40efed7c63599",
- "sha256:22c0a23a3b3138a6bf76fc553789cb1a703836da86b0f306b6f0dc1617398abc",
- "sha256:2c634a3207a5445be65536d38c13791904fda0748b9eabf908d3fe86a52941cf",
- "sha256:2d21ac12dc943c68135ff858c3a989f2194a709e6e10b4c8977d7fcd67dfd511",
- "sha256:2f1f1c75c395991ce9c94d3e4aa96e5c59c8356a15b1c9231e783865e2772699",
- "sha256:305be5ff2081fa1d283a76113b8df7a14c10d75602a38d9f012935df20731487",
- "sha256:33e6bc4bab477c772a541f76cd91e11ccb6d2efa2b8d7d7883591dfb523e5987",
- "sha256:349ef8a73a7c5665cca65c88ab24abe75447e28aa3bc4c93ea5093474dfdf0ff",
- "sha256:380f926b51b92d02a34119d072f178d80bbda334d1a7e10fa22d467a66e494db",
- "sha256:38172a70005252b6893088c0f5e8a47d173df7cc2b2bd88650957eb84fcf5022",
- "sha256:391cc3a9c1527e424c6865e087897e766a917f15dddb360174a70467572ac6ce",
- "sha256:3a1c32a19ee6bbde02f1cb189e13a71b321256cc1d431196a9f824050b160d5a",
- "sha256:4120d7fefa1e2d8fb6f650b11489710091788de554e2b6f8347c7a20ceb003f5",
- "sha256:424ae21498790e12eb759040bbb504e5e280cab64693d14775c54269fd1d2bb7",
- "sha256:44b324a6b8376a23e6ba25d368726ee3bc281e6ab306db80b5819999c737d820",
- "sha256:4790f0e15f00058f7599dab2b206d3049d7ac464dc2e5eae0e93fa18aee9e7bf",
- "sha256:4aff049b5e629ef9b3e9e617fa6e2dfeda1bf87e01bcfecaf3949af9e210105e",
- "sha256:4b38b1570242fbab8d86a84128fb5b5234a2f70c2e32f3070143a6d94bc854cf",
- "sha256:4d46c7b4173415d8e583045fbc4daa48b40e31b19ce595b8d92cf639396c15d5",
- "sha256:4f1c9866ccf48a6df2b06823e6ae80573529f2af3a0992ec4fe75b1a510df8a6",
- "sha256:4f7acae3cf1a2a2361ec4c8e787eaaa86a94171d2417aae53c0cca6ca3118ff6",
- "sha256:54d9ddea424cd19d3ff6128601a4a4d23d54a421f9b4c0fff740505813739a91",
- "sha256:58718e181c56a3c02d25b09d4115eb02aafe1a732ce5714ab70326d9776457c3",
- "sha256:5ede29d91a40ba22ac1b922ef510aab871652f6c88ef60b9dcdf773c6d32ad7a",
- "sha256:61645818edd40cc6f455b851277a21bf420ce347baa0b86eaa41d51ef58ba23d",
- "sha256:66bf9234e08fe561dccd62083bf67400bdbf1c67ba9efdc3dac03650e97c6088",
- "sha256:673f988370f5954df96cc31fd99c7312a3af0a97f09e407399f61583f30da9bc",
- "sha256:676f94c5480d8eefd97c0c7e3953315e4d8c2b71f3b49539beb2aa676c58272f",
- "sha256:6c225286f2b13bab5987425558baa5cbdb2bc925b2998038fa028245ef421e75",
- "sha256:7384d0b87d4635ec38db9263e6a3f1eb609e2e06087f0aa7f63b76833737b471",
- "sha256:7e2fe37ac654032db1f3499fe56e77190282534810e2a8e833141a021faaab0e",
- "sha256:7f2bfc0032a00405d4af2ba27f3c429e851d04fad1e5ceee4080a1c570476697",
- "sha256:7f6b639c36734eaa80a6c152a238242bedcee9b953f23bb887e9102976343092",
- "sha256:814375093edae5f1cb31e3407997cf3eacefb9010f96df10d64829362ae2df69",
- "sha256:8224f98be68a84b19f48e0bdc14224b5a71339aff3a27df69989fa47d01296f3",
- "sha256:898715cf566ec2869d5cb4d5fb4be408964704c46c96b4be267442d265390f32",
- "sha256:8989f46f3d7ef79585e98fa991e6ded55d2f48ae56d2c9fa5e491a6e4effb589",
- "sha256:8ba01ebc6175e1e6b7275c907a3a36be48a2d487549b656aa90c8a910d9f3178",
- "sha256:8c5c6fa16412b35999320f5c9690c0f554392dc222c04e559217e0f9ae244b92",
- "sha256:8c6a4e5e40156d72a40241a25cc226051c0a8d816610097a8e8f517aeacd59a2",
- "sha256:8eaf44ccbc4e35762683078b72bf293f476561d8b68ec8a64f98cf32811c323e",
- "sha256:8fb4fc029e135859f533025bc82047334e24b0d489e75513144f25408ecaf058",
- "sha256:9093a81e18c45227eebe4c16124ebf3e0d893830c6aca7cc310bfca8fe59d857",
- "sha256:94c4381ffba9cc508b37d2e536b418d5ea9cfdc2848b9a7fea6aebad4ec6aac1",
- "sha256:94fac7c6e77ccb1ca91e9eb4cb0ac0270b9fb9b289738654120ba8cebb1189c6",
- "sha256:95c4dc6f61d610bc0ee1edc6f29d993f10febfe5b76bb470b486d90bbece6b22",
- "sha256:975218eee0e6d24eb336d0328c768ebc5d617609affaca5dbbd6dd1984f16ed0",
- "sha256:ad146dae5977c4dd435eb31373b3fe9b0b1bf26858c6fc452bf6af394067e10b",
- "sha256:afe16a84498441d05e9189a15900640a2d2b5e76cf4efe8cbb088ab4f112ee57",
- "sha256:b1c43eb1ab7cbf411b8e387dc169acb31f0ca0d8c09ba63f9eac67829585b44f",
- "sha256:b90078989ef3fc45cf9221d3859acd1108af7560c52397ff4ace8ad7052a132e",
- "sha256:b98e698dc34966e5976e10bbca6d26d6724e6bdea853c7c10162a3235aba6e16",
- "sha256:ba5a8b74c2a8af7d862399cdedce1533642fa727def0b8c3e3e02fcb52dca1b1",
- "sha256:c31ad0c0c507894e3eaa843415841995bf8de4d6b2d24c6e33099f4bc9fc0d4f",
- "sha256:c3b9162bab7e42f21243effc822652dc5bb5e8ff42a4eb62fe7782bcbcdfacf6",
- "sha256:c58c6837a2c2a7cf3133983e64173aec11f9c2cd8e87ec2fdc16ce727bcf1a04",
- "sha256:c83f7a107abb89a227d6c454c613e7606c12a42b9a4ca9c5d7dad25d47c776ae",
- "sha256:cde98f323d6bf161041e7627a5fd763f9fd829bcfcd089804a5fdce7bb6e1b7d",
- "sha256:ce91db90dbf37bb6fa0997f26574107e1b9d5ff939315247b7e615baa8ec313b",
- "sha256:d00f3c5e0d764a5c9aa5a62d99728c56d455310bcc288a79cab10157b3af426f",
- "sha256:d17920f18e6ee090bdd3d0bfffd769d9f2cb4c8ffde3eb203777a3895c128862",
- "sha256:d55f011da0a843c3d3df2c2cf4e537b8070a419f891c930245f05d329c4b0689",
- "sha256:d742c36ed44f2798c8d3f4bc511f479b9ceef2b93f348671184139e7d708042c",
- "sha256:d9a487ef090aea982d748b1b0d74fe7c3950b109df967630a20584f9a99c0683",
- "sha256:d9ef084e3dc690ad50137cc05831c52b6ca428096e6deb3c43e95827f531d5ef",
- "sha256:da452c2c322e9ce0cfef392e469a26d63d42860f829026a63374fde6b5c5876f",
- "sha256:dc4826823121783dccc0871e3f405417ac116055bf184ac04c36f98b75aacd12",
- "sha256:de7a5299827253023c55ea549444e058c0eb496931fa05d693b95140a947cb73",
- "sha256:e04a1f2a65ad2f93aa20f9ff9f1b672bf912413e5547f60749fa2ef8a644e061",
- "sha256:e1ca1ef5ba129718a8fc827b0867f6aa4e893c56eb00003b7367f8a733a9b072",
- "sha256:ee40b40aa753d844162dcc80d0fe256b87cba48ca0054f64e68000453caead11",
- "sha256:f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691",
- "sha256:f29930bc2921cef955ba39a3ff87d2c4398a0394ae217f41cb02d5c26c8b1b77",
- "sha256:f489a2c9e6455d87eabf907ac0b7d230a9786be43fbe884ad184ddf9e9c1e385",
- "sha256:f5bf3ead3cb66ab990ee2561373b009db5bc0e857549b6c9ba84b20bc462e172",
- "sha256:f6f18898ace4bcd2d41a122916475344a87f1dfdec626ecde9ee802a711bc569",
- "sha256:f8112fb501b1e0567a1251a2fd0747baae60a4ab325a871e975b7bb67e59221f",
- "sha256:fd31f176429cecbc1ba499d4aba31aaccfea488f418d60376b911269d3b883c5"
+ "sha256:007ec22fbc573e5eb2fb7dec4198ef8f6bf2fe4ce20020798b2eb5d0abda6138",
+ "sha256:00819de9e45d42584bed046314c40ea7e9aea95411b38971082cad449392b08c",
+ "sha256:01948b1d570f83ee7bbf5a60ea2375a89dfb09fd419170e7f5af029510033d24",
+ "sha256:038f514fe39e235e9fef6717fbf944057bfa24f9b3db9ee551a7ecf584b5b480",
+ "sha256:03a42ac7895406220124c88911ebee31ba8b2d24c98507f4a8bf826b2937c7f2",
+ "sha256:05646ebe6b94cc93407b3bf34b9eb26c20722384d068eb7339de802154d61bc5",
+ "sha256:0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a",
+ "sha256:0b00807e2605f16e1e198f33a53ce3c4523114059b0c09c337209ae55e3823a8",
+ "sha256:0e1b370d8007c4ae31ee6db7f9a2fe801a42b146cec80a86766e7ad5c4a259cf",
+ "sha256:15ecd889a709b0080f02721255b3f80bb261c2293d3c748151274dfea93ac871",
+ "sha256:1b66ccafef7336a1e1f0e389901f60c1d920102315a56df85e49552308fc0486",
+ "sha256:1bbb122c557a16fafc10354b9d99ebf2f2808a660d78202f10ba9d50786384b9",
+ "sha256:1eb89d3d29adaf533588f209768a9c02e44e4baf832b08118749c5fad191781d",
+ "sha256:258c5dd01afc10015866114e210fb7365f0d02d9d059c3c3415382ab633fcbcb",
+ "sha256:2609e9ab08474702cc67b7702dbb8a80e392c54613ebe80db7e8dbdb79837c68",
+ "sha256:274cfa632350225ce3fdeb318c23b4a10ec25c0e2c880eff951a3842cf358ac1",
+ "sha256:28529e08fde6f12eba8677f5a8608500ed33c086f974de68cc65ab218713a59d",
+ "sha256:2b606353da03edcc71130b52388d25f9a30a126e04caef1fd637e31683033abd",
+ "sha256:30ca7c3b94708a9d7ae76ff281b2f47d8eaf2579cd05971b5dc681db8caac6e1",
+ "sha256:333cf6cf8e65f6a1e06e9eb3e643a0c515bb850d470902274239fea02033e9a8",
+ "sha256:3455522392fb15ff549d92fbf4b73b559d5e43dc522588f7eb3e54c3f38beee7",
+ "sha256:362f641f9071e5f3ee6f8e7d37d5ed0d95aae656adf4ef578313ee585b585959",
+ "sha256:3bcd391d083f636c06a68715e69467963d1f9600f85ef556ea82e9ef25f043f7",
+ "sha256:3dffb610a30d643983aeb185ce134f97f290f8935f0abccdd32c77bed9388b42",
+ "sha256:3fe407bf93533a6fa82dece0e74dbcaaf5d684e5a51862887f9eaebe6372cd79",
+ "sha256:413251f6fcf552a33c981c4709a6bba37b12710982fec8e558ae944bfb2abd38",
+ "sha256:438cd072f75bb6612f2aca29f8bd7cdf6e35e8f160bc312e49fbecab77c99e3a",
+ "sha256:4470c73c12cd9109db8277287d11f9dd98f77fc54155fc71a7738a83ffcc8ea8",
+ "sha256:45c3b868724137f713a38376fef8120c166d1eadd50da1855c112fe97954aed8",
+ "sha256:486f7aabfa292719a2753c016cc3a8f8172965cabb3ea2e7f7436c7f5a22a151",
+ "sha256:4f05e9727ce409358baa615dbeb9b969db94324a79b5a5cea45d39bdb01d82e6",
+ "sha256:50aed5155f819873d23520919e16703fc8925e509abbb1a1491b0087d1cd969e",
+ "sha256:50edbcad60d8f0e3eccc68da67f37268b5144ecc34d59f27a02f9611c1d4eec7",
+ "sha256:54ca74df1be3c7ca1cf7f4c971c79c2daf48d9aa65dea1a662ae18926f5bc8ce",
+ "sha256:578a4b875af3e0daaf1ac6fa983d93e0bbfec3ead753b6d6f33d467100cdc67b",
+ "sha256:597a079284b7ee65ee102bc3a6ea226a37d2b96d0418cc9047490f231dc09fe8",
+ "sha256:59bb3c54aa420521dc4ce3cc2c3fe2ad82adf7b09403fa1f48ae45c0cbde6628",
+ "sha256:5c6a5b8c7926ba5d8545c7dd22961a107526562da31a7a32fa2456baf040939f",
+ "sha256:64f6c17757251e2b8d885d728b6433d9d970573586a78b78ba8929b0f41d045a",
+ "sha256:679abe5d3858b33c2cf74faec299fda60ea9de62916e8b67e625d65bf069a3b7",
+ "sha256:741a46d58677d8c733175d7e5aa618d277cd9d880301a380fd296975a9cdd7bc",
+ "sha256:7789050d9e5d0c309c706953e5e8876e38662d57d45f936902e176d19f1c58ab",
+ "sha256:77abf6665ae54000b98b3c742bc6ea1d1fb31c394bcabf8b5d2c1ac3ebfe7f3b",
+ "sha256:79019094f87c9fb44f8d769e41dbb664d6e8fcfd62f665ccce36762deaa0e911",
+ "sha256:7b06b7843929e41a94ea09eb1ce3927865387e3e23ebe108e0d0d09b08d25be9",
+ "sha256:7e338c0523d024fad378b376a79faff37fafb3c001872a618cde1d322400a572",
+ "sha256:7ea7ffc6d6d6f8a11e6f40091a1040995cdff02cfc9ba4c2f30a516cb2633554",
+ "sha256:8105fd8a890df77b76dd3054cddf01a879fc13e8af576805d667e0fa0224c35d",
+ "sha256:84afcdea18eda514c25bc68b9af2a2b1adea7c08899175a51fe7c4fb6d551257",
+ "sha256:9294bbb581f92770e6ed5c19559e1e99255e4ca604a22c5c6397b2f9dd3ee42c",
+ "sha256:93429602396f3383a797a2a70e5f1de5df8e35535d7806c9f91df06f297e109b",
+ "sha256:9627cc1a10c8c409b5822a92d57a77f383b554463d1884008e051c32ab1b3742",
+ "sha256:998f3bd3cfc95e9424a6acd7840cbdd39e45bc09ef87533c006f94ac47296090",
+ "sha256:9c72109213eb9d3874f7ac8c0c5fa90e072d678e117d9061c06e30c85b4cf0e6",
+ "sha256:9fc1500fd2a952c5c8e3b29aaf7e3cc6e27e9cfc0a8819b3bce48cc1b849e4cc",
+ "sha256:a3f00003de6eba42d6e94fabb4125600d6e484846dbf90ea8e48a800430cc142",
+ "sha256:a45d85cf20b5e0d0aa5a8dca27cce8eddef3292bc29d72dcad1641f4ed50aa16",
+ "sha256:a7d8d14fe962153fc681f6366bdec33d4356f98a3e3567782aac1b6e0e40109a",
+ "sha256:a8fa23fe62c436ccf23ff930149c047f060c7126eae3ccea005f0483f27b2e28",
+ "sha256:aa6658732517ddabe22c9036479eabce6036655ba87a0224c612e1ae6af2087e",
+ "sha256:aafc8ee9b742ce75044ae9a4d3e60e3d918d15a4c2e08a6c3c3e38fa59b92d94",
+ "sha256:ab5a5a0c7a7991d90446a198689c0535be89bbd6b410a1f9a66688f0880ec026",
+ "sha256:acd48d5b80ee80f9432a165c0ac8cbf9253eaddb6113269a5e18699b33958dbb",
+ "sha256:ad7593bb24b2ab09e65e8a1d385606f0f47c65b5a2ae6c551db67d6653e78c28",
+ "sha256:baa42524a82f75303f714108fea528ccacf0386af429b69fff141ffef1c534f9",
+ "sha256:bdfcf6443637c148c4e1a20c48c566aa694fa5e288d34b20fcdc58507882fed3",
+ "sha256:be7443669ae9c016b71f402e43208e13ddf00912f47f623ee5994e12fc7d4b3f",
+ "sha256:c02a30b904282777d872266b87b20ed8cc0d1501855e27f831320f471d54d983",
+ "sha256:c1277cd707c465cd09572a774559a3cc7c7a28802eb3a2a9472588f062097205",
+ "sha256:c30a0eafc89d28e7f959281b58198a9fa5e99405f716c0289b7892ca345fe45f",
+ "sha256:c5ce2ce7c997e1971b7184ee37deb6ea9922ef5163c6ee5aa3c274b05f9e12fa",
+ "sha256:c823bc3971c44ab93e611ab1a46b1eafeae474c0c844aff4b7474287b75fe49c",
+ "sha256:ce0cdc074d540265bfeb31336e678b4e37316849d13b308607efa527e981f5c2",
+ "sha256:d1720b4f14c78a3089562b8875b53e36b51c97c51adc53325a69b79b4b48ebcb",
+ "sha256:d183cf9c797a5291e8301790ed6d053480ed94070637bfaad914dd38b0981f67",
+ "sha256:d9010c31cd6fa59438da4e58a7f19e4753f7f264300cd152e7f90d4602449762",
+ "sha256:d9e5e4a85bdb56d224f412d9c98ae4cbd032cc4f3161818f692cd81766eee65a",
+ "sha256:da1dee8948d2137bb51fbb8a53cce6b1bcc86003c6b42565f008438b806cccd8",
+ "sha256:df9270660711670e68803107d55c2b5949c2e0f2e4896da176e1ecfc068b974a",
+ "sha256:e00e3505cd80440f6c98c6d69269dcc2a119f86ad0a9fd70bccc59504bebd68a",
+ "sha256:e48d5021a84d341bcaf95c8460b152cfbad770d28e5fe14a768988c461b821bc",
+ "sha256:e7f8b04d83483577fd9200461b057c9f14ced334dcb053090cea1da9c8321a91",
+ "sha256:edfe3341033a6b53a5c522c802deb2079eee5cbfbb0af032a55064bd65c73a23",
+ "sha256:ef9c33cc5cbca35808f6c74be11eb7f5f6b14d2311be84a15b594bd3e58b5527",
+ "sha256:f2d4324a98062be0525d16f768a03e0bbb3b9fe301ceee99611dc9a7953124e6",
+ "sha256:f3935f82f6f4a3820270842e90456ebad3af15810cf65932bd24da4463bc0a4c",
+ "sha256:f614ab0c76397661b90b6851a030004dac502e48260ea10f2441abd2207fbcc7",
+ "sha256:f7db54c7914cc99d901d93a34704833568d86c20925b2762f9fa779f9cd2e70f",
+ "sha256:fbc6264158392bad9df19537e872d476f7c57adf718944cc1e4495cbabf38e2a",
+ "sha256:fe2fb38c2ed905a2582948e2de560675e9dfbee94c6d5ccdb1301c6d0a5bf092",
+ "sha256:ffe595f10566f8276b76dc3a11ae4bb7eba1aac8ddd75811736a15b0d5311414"
],
"markers": "python_version >= '3.8'",
- "version": "==3.10.5"
+ "version": "==3.10.10"
},
"aiosignal": {
"hashes": [
@@ -190,20 +190,20 @@
},
"boto3": {
"hashes": [
- "sha256:71e237d3997cf93425947854d7b121c577944f391ba633afb0659e1015364704",
- "sha256:fd130308f1f49d748a5fc63de92de79a995b51c79af3947ddde8815fcf0684fe"
+ "sha256:5970b62c1ec8177501e02520f0d41839ca5fc549b30bac4e8c0c0882ae776217",
+ "sha256:670f811c65e3c5fe4ed8c8d69be0b44b1d649e992c0fc16de43816d1188f88f1"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==1.35.18"
+ "version": "==1.35.39"
},
"botocore": {
"hashes": [
- "sha256:1027083aeb1fe74057273410fd768e018e22f85adfbd717b5a69f578f7812b80",
- "sha256:e59da8b91ab06683d2725b6cbbb0383b30c68a241c3c63363f4c5bff59b3c0c0"
+ "sha256:781c547eb6a79c0e4b0bedd87b81fbfed957816b4841d33e20c8f1989c7c19ce",
+ "sha256:cb7f851933b5ccc2fba4f0a8b846252410aa0efac5bfbe93b82d10801f5f8e90"
],
"markers": "python_version >= '3.8'",
- "version": "==1.35.18"
+ "version": "==1.35.39"
},
"certifi": {
"hashes": [
@@ -288,99 +288,114 @@
},
"charset-normalizer": {
"hashes": [
- "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
- "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
- "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
- "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
- "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
- "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
- "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
- "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
- "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
- "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
- "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
- "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
- "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
- "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
- "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
- "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
- "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
- "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
- "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
- "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
- "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
- "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
- "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
- "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
- "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
- "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
- "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
- "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
- "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
- "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
- "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
- "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
- "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
- "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
- "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
- "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
- "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
- "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
- "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
- "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
- "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
- "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
- "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
- "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
- "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
- "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
- "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
- "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
- "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
- "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
- "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
- "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
- "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
- "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
- "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
- "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
- "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
- "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
- "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
- "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
- "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
- "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
- "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
- "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
- "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
- "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
- "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
- "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
- "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
- "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
- "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
- "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
- "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
- "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
- "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
- "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
- "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
- "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
- "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
- "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
- "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
- "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
- "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
- "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
- "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
- "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
- "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
- "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
- "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
- "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
+ "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.3.2"
+ "version": "==3.4.0"
},
"click": {
"hashes": [
@@ -425,10 +440,10 @@
},
"dbrepo": {
"hashes": [
- "sha256:d5e248e25fb3787d085e3d27c81108408f963ca662d7778bc98288ca0d747940"
+ "sha256:84607677b0826bb9b2fa120aacdf56d16c8d9ae423f435b2bd2c22b1c965a33c"
],
"markers": "python_version >= '3.11'",
- "path": "./lib/dbrepo-1.4.6.tar.gz"
+ "path": "./lib/dbrepo-1.4.7.tar.gz"
},
"events": {
"hashes": [
@@ -571,124 +586,128 @@
},
"gevent": {
"hashes": [
- "sha256:03aa5879acd6b7076f6a2a307410fb1e0d288b84b03cdfd8c74db8b4bc882fc5",
- "sha256:117e5837bc74a1673605fb53f8bfe22feb6e5afa411f524c835b2ddf768db0de",
- "sha256:141a2b24ad14f7b9576965c0c84927fc85f824a9bb19f6ec1e61e845d87c9cd8",
- "sha256:14532a67f7cb29fb055a0e9b39f16b88ed22c66b96641df8c04bdc38c26b9ea5",
- "sha256:1dffb395e500613e0452b9503153f8f7ba587c67dd4a85fc7cd7aa7430cb02cc",
- "sha256:2955eea9c44c842c626feebf4459c42ce168685aa99594e049d03bedf53c2800",
- "sha256:2ae3a25ecce0a5b0cd0808ab716bfca180230112bb4bc89b46ae0061d62d4afe",
- "sha256:2e9ac06f225b696cdedbb22f9e805e2dd87bf82e8fa5e17756f94e88a9d37cf7",
- "sha256:368a277bd9278ddb0fde308e6a43f544222d76ed0c4166e0d9f6b036586819d9",
- "sha256:3adfb96637f44010be8abd1b5e73b5070f851b817a0b182e601202f20fa06533",
- "sha256:3d5325ccfadfd3dcf72ff88a92fb8fc0b56cacc7225f0f4b6dcf186c1a6eeabc",
- "sha256:432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056",
- "sha256:44098038d5e2749b0784aabb27f1fcbb3f43edebedf64d0af0d26955611be8d6",
- "sha256:5a1df555431f5cd5cc189a6ee3544d24f8c52f2529134685f1e878c4972ab026",
- "sha256:6c47ae7d1174617b3509f5d884935e788f325eb8f1a7efc95d295c68d83cce40",
- "sha256:6f947a9abc1a129858391b3d9334c45041c08a0f23d14333d5b844b6e5c17a07",
- "sha256:782a771424fe74bc7e75c228a1da671578c2ba4ddb2ca09b8f959abdf787331e",
- "sha256:7899a38d0ae7e817e99adb217f586d0a4620e315e4de577444ebeeed2c5729be",
- "sha256:7b00f8c9065de3ad226f7979154a7b27f3b9151c8055c162332369262fc025d8",
- "sha256:8f4b8e777d39013595a7740b4463e61b1cfe5f462f1b609b28fbc1e4c4ff01e5",
- "sha256:90cbac1ec05b305a1b90ede61ef73126afdeb5a804ae04480d6da12c56378df1",
- "sha256:918cdf8751b24986f915d743225ad6b702f83e1106e08a63b736e3a4c6ead789",
- "sha256:9202f22ef811053077d01f43cc02b4aaf4472792f9fd0f5081b0b05c926cca19",
- "sha256:94138682e68ec197db42ad7442d3cf9b328069c3ad8e4e5022e6b5cd3e7ffae5",
- "sha256:968581d1717bbcf170758580f5f97a2925854943c45a19be4d47299507db2eb7",
- "sha256:9d8d0642c63d453179058abc4143e30718b19a85cbf58c2744c9a63f06a1d388",
- "sha256:a7ceb59986456ce851160867ce4929edaffbd2f069ae25717150199f8e1548b8",
- "sha256:b9913c45d1be52d7a5db0c63977eebb51f68a2d5e6fd922d1d9b5e5fd758cc98",
- "sha256:bde283313daf0b34a8d1bab30325f5cb0f4e11b5869dbe5bc61f8fe09a8f66f3",
- "sha256:bf5b9c72b884c6f0c4ed26ef204ee1f768b9437330422492c319470954bc4cc7",
- "sha256:ca80b121bbec76d7794fcb45e65a7eca660a76cc1a104ed439cdbd7df5f0b060",
- "sha256:cdf66977a976d6a3cfb006afdf825d1482f84f7b81179db33941f2fc9673bb1d",
- "sha256:d4faf846ed132fd7ebfbbf4fde588a62d21faa0faa06e6f468b7faa6f436b661",
- "sha256:d7f87c2c02e03d99b95cfa6f7a776409083a9e4d468912e18c7680437b29222c",
- "sha256:dd23df885318391856415e20acfd51a985cba6919f0be78ed89f5db9ff3a31cb",
- "sha256:f5de3c676e57177b38857f6e3cdfbe8f38d1cd754b63200c0615eaa31f514b4f",
- "sha256:f5e8e8d60e18d5f7fd49983f0c4696deeddaf6e608fbab33397671e2fcc6cc91",
- "sha256:f7cac622e11b4253ac4536a654fe221249065d9a69feb6cdcd4d9af3503602e0",
- "sha256:f8a04cf0c5b7139bc6368b461257d4a757ea2fe89b3773e494d235b7dd51119f",
- "sha256:f8bb35ce57a63c9a6896c71a285818a3922d8ca05d150fd1fe49a7f57287b836",
- "sha256:fbfdce91239fe306772faab57597186710d5699213f4df099d1612da7320d682"
+ "sha256:013150cc0f00f0a06dd898463ad9ebc43bd9c70c7fe35555c77d83fe6f758225",
+ "sha256:0814a5a7084e0bd357392e44e2a8bd72fc56fbdc3da0ff492ebb310c10fc95e6",
+ "sha256:103097b39764a0a02f1a051225ea6b4c64a53dd37603424ca8a1e09be63a460b",
+ "sha256:16bf432b274795b360d88b38cbffe0a6410450c94bfa172548bf1f512cf448c2",
+ "sha256:1a5012b7d047b16470063f0b8d003530e77362809f38cd7e601efb625c7ca71e",
+ "sha256:22bc6efb0f9fbb1c2e005ef1b94374568945c711bfb92f85916f66a819a5e6d0",
+ "sha256:377c02d0ddae3ebf843d6f453943602102bb186b09f1c78a2247e5dbf0e07b1c",
+ "sha256:421cfeacae2555b11318c6ee11f34bc0a9517657068d8911c916d55a85362ce2",
+ "sha256:44174aa4dae4db158e6f11a4ea696f1991d43ccc1634aa0c189daf03a9ced5d7",
+ "sha256:44dd79cfefea24f9bb630844a25047c3807e02722436e826ef2aed3d646190c1",
+ "sha256:4e3fbaf484ee68437f0ec589bdb1dd6f1dccc01fd6b72eac707e858b407521fa",
+ "sha256:4f0e6c49aac1c182be15a43d94e3b58c253d830c5b54dc93d6130e6987278611",
+ "sha256:539af6b66c6b9faca2cdd903f0a7564c85053f1faf95e9a37702df578ac37085",
+ "sha256:562b66d8b061b9cfae1bc704b0cd5d2b255628d86c3639ddc16e4ffa3ebf6e7a",
+ "sha256:5bb80c88f572a11156f258333c0e7b1f80d0746a03784600017901a2f1aa584a",
+ "sha256:5d1db7bc758455e6f6406d66e8b276b80dda5645877392a100d1ed7dda6aa7ad",
+ "sha256:618c4869e8140fd955b4620b10bc5a92ef1d62ae20aef38c1af7d892ee1bd996",
+ "sha256:6a93f249a40bda8c42cbeefff9582b22bb1dd769da56b4cbb824038366c4202c",
+ "sha256:6b9da562d7d7707d5561ecf4a27a361fd9f4856f39b8491a0753c89d8f39674c",
+ "sha256:73b65ee9a73a35fb68d96899895162beef19d86c1bcbe6f8f92eb0bd18c1d891",
+ "sha256:7b5f10ac866d3432a829a3a4446489be1fa3648f3140f9373fe99440a2e05682",
+ "sha256:81b4915081d148a31b64ad0314d2f609920b8ae6a24d9a7e4ddaab7c1fe998e7",
+ "sha256:90f9bc542f76efc56e5e76b420abaff42baf585db48a9fc0ac8edd6a16d9e60f",
+ "sha256:96e7bab9de56e0aca3858b8bc9c71f4eb0c0e12b7cf3cbfd170b62ce68cf71d7",
+ "sha256:975699ac5701d7ec1c633f2067deecea8711dc2a8683530aed260dd641274791",
+ "sha256:9f74faefea1acb398f057ed31ee9333e100bdae978b1e4c3b6a27d05df66e588",
+ "sha256:a11db551555c58606ed3dfe359a9a502e44350ed3ecbd59cbe7b0093bd020418",
+ "sha256:a6a04df4732bb7fdf9969ddee9a16a829e7971692fefdcb5baca760976d23e04",
+ "sha256:a72a7cb67764adafbac7ddeeffe539a738309068e2b2ac89cbd2f498383ce537",
+ "sha256:aabffb8b86fb95cb1ee5dffa315c9bd68fe20a7fe7260c0328679723b0257b7c",
+ "sha256:bc181db59d53e407650ebf44e63ff429c7bc25f9c346edddce1bdff1af436617",
+ "sha256:dd9c966e5fd8d7b0a54a130c5ad38ef581fd93ff4c44b6e73767519860da6ebe",
+ "sha256:ec800c25f09a7e031f2fbc3b17b4a4a0b54085c7532ac51b4c7ecef6d3ff8fc3",
+ "sha256:f0d6cfff74be4efcafecd374e094a8fed9e0d68efe90109d374ef5d8f18aa21a",
+ "sha256:f57b7a02e83d6e4a205cace6dd63e16b61a641a1da9366d9ec4f2b849430700f",
+ "sha256:fa190663f964583c8dbbab06bc863966e6f7eceaac8aa67c3ac0fae0a0a73b80",
+ "sha256:fa4cba4a8acbb71dd4215be8517879e4217c0746f7af2637330e7269694f53f2",
+ "sha256:fd9b670da1b7160e660cbba7f52e206892b97f61d8ff1872ce99dfaa9b475420"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
- "version": "==24.2.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==24.10.2"
},
"greenlet": {
"hashes": [
- "sha256:01059afb9b178606b4b6e92c3e710ea1635597c3537e44da69f4531e111dd5e9",
- "sha256:037d9ac99540ace9424cb9ea89f0accfaff4316f149520b4ae293eebc5bded17",
- "sha256:0e49a65d25d7350cca2da15aac31b6f67a43d867448babf997fe83c7505f57bc",
- "sha256:13ff8c8e54a10472ce3b2a2da007f915175192f18e6495bad50486e87c7f6637",
- "sha256:1544b8dd090b494c55e60c4ff46e238be44fdc472d2589e943c241e0169bcea2",
- "sha256:184258372ae9e1e9bddce6f187967f2e08ecd16906557c4320e3ba88a93438c3",
- "sha256:1ddc7bcedeb47187be74208bc652d63d6b20cb24f4e596bd356092d8000da6d6",
- "sha256:221169d31cada333a0c7fd087b957c8f431c1dba202c3a58cf5a3583ed973e9b",
- "sha256:243a223c96a4246f8a30ea470c440fe9db1f5e444941ee3c3cd79df119b8eebf",
- "sha256:24fc216ec7c8be9becba8b64a98a78f9cd057fd2dc75ae952ca94ed8a893bf27",
- "sha256:2651dfb006f391bcb240635079a68a261b227a10a08af6349cba834a2141efa1",
- "sha256:26811df4dc81271033a7836bc20d12cd30938e6bd2e9437f56fa03da81b0f8fc",
- "sha256:26d9c1c4f1748ccac0bae1dbb465fb1a795a75aba8af8ca871503019f4285e2a",
- "sha256:28fe80a3eb673b2d5cc3b12eea468a5e5f4603c26aa34d88bf61bba82ceb2f9b",
- "sha256:2cd8518eade968bc52262d8c46727cfc0826ff4d552cf0430b8d65aaf50bb91d",
- "sha256:2d004db911ed7b6218ec5c5bfe4cf70ae8aa2223dffbb5b3c69e342bb253cb28",
- "sha256:3d07c28b85b350564bdff9f51c1c5007dfb2f389385d1bc23288de51134ca303",
- "sha256:3e7e6ef1737a819819b1163116ad4b48d06cfdd40352d813bb14436024fcda99",
- "sha256:44151d7b81b9391ed759a2f2865bbe623ef00d648fed59363be2bbbd5154656f",
- "sha256:44cd313629ded43bb3b98737bba2f3e2c2c8679b55ea29ed73daea6b755fe8e7",
- "sha256:4a3dae7492d16e85ea6045fd11cb8e782b63eac8c8d520c3a92c02ac4573b0a6",
- "sha256:4b5ea3664eed571779403858d7cd0a9b0ebf50d57d2cdeafc7748e09ef8cd81a",
- "sha256:4c3446937be153718250fe421da548f973124189f18fe4575a0510b5c928f0cc",
- "sha256:5415b9494ff6240b09af06b91a375731febe0090218e2898d2b85f9b92abcda0",
- "sha256:5fd6e94593f6f9714dbad1aaba734b5ec04593374fa6638df61592055868f8b8",
- "sha256:619935a44f414274a2c08c9e74611965650b730eb4efe4b2270f91df5e4adf9a",
- "sha256:655b21ffd37a96b1e78cc48bf254f5ea4b5b85efaf9e9e2a526b3c9309d660ca",
- "sha256:665b21e95bc0fce5cab03b2e1d90ba9c66c510f1bb5fdc864f3a377d0f553f6b",
- "sha256:6a4bf607f690f7987ab3291406e012cd8591a4f77aa54f29b890f9c331e84989",
- "sha256:6cea1cca3be76c9483282dc7760ea1cc08a6ecec1f0b6ca0a94ea0d17432da19",
- "sha256:713d450cf8e61854de9420fb7eea8ad228df4e27e7d4ed465de98c955d2b3fa6",
- "sha256:726377bd60081172685c0ff46afbc600d064f01053190e4450857483c4d44484",
- "sha256:76b3e3976d2a452cba7aa9e453498ac72240d43030fdc6d538a72b87eaff52fd",
- "sha256:76dc19e660baea5c38e949455c1181bc018893f25372d10ffe24b3ed7341fb25",
- "sha256:76e5064fd8e94c3f74d9fd69b02d99e3cdb8fc286ed49a1f10b256e59d0d3a0b",
- "sha256:7f346d24d74c00b6730440f5eb8ec3fe5774ca8d1c9574e8e57c8671bb51b910",
- "sha256:81eeec4403a7d7684b5812a8aaa626fa23b7d0848edb3a28d2eb3220daddcbd0",
- "sha256:90b5bbf05fe3d3ef697103850c2ce3374558f6fe40fd57c9fac1bf14903f50a5",
- "sha256:9730929375021ec90f6447bff4f7f5508faef1c02f399a1953870cdb78e0c345",
- "sha256:9eb4a1d7399b9f3c7ac68ae6baa6be5f9195d1d08c9ddc45ad559aa6b556bce6",
- "sha256:a0409bc18a9f85321399c29baf93545152d74a49d92f2f55302f122007cfda00",
- "sha256:a22f4e26400f7f48faef2d69c20dc055a1f3043d330923f9abe08ea0aecc44df",
- "sha256:a53dfe8f82b715319e9953330fa5c8708b610d48b5c59f1316337302af5c0811",
- "sha256:a771dc64fa44ebe58d65768d869fcfb9060169d203446c1d446e844b62bdfdca",
- "sha256:a814dc3100e8a046ff48faeaa909e80cdb358411a3d6dd5293158425c684eda8",
- "sha256:a8870983af660798dc1b529e1fd6f1cefd94e45135a32e58bd70edd694540f33",
- "sha256:ac0adfdb3a21dc2a24ed728b61e72440d297d0fd3a577389df566651fcd08f97",
- "sha256:b395121e9bbe8d02a750886f108d540abe66075e61e22f7353d9acb0b81be0f0",
- "sha256:b9505a0c8579899057cbefd4ec34d865ab99852baf1ff33a9481eb3924e2da0b",
- "sha256:c0a5b1c22c82831f56f2f7ad9bbe4948879762fe0d59833a4a71f16e5fa0f682",
- "sha256:c3967dcc1cd2ea61b08b0b276659242cbce5caca39e7cbc02408222fb9e6ff39",
- "sha256:c6f4c2027689093775fd58ca2388d58789009116844432d920e9147f91acbe64",
- "sha256:c9d86401550b09a55410f32ceb5fe7efcd998bd2dad9e82521713cb148a4a15f",
- "sha256:cd468ec62257bb4544989402b19d795d2305eccb06cde5da0eb739b63dc04665",
- "sha256:cfcfb73aed40f550a57ea904629bdaf2e562c68fa1164fa4588e752af6efdc3f",
- "sha256:d0dd943282231480aad5f50f89bdf26690c995e8ff555f26d8a5b9887b559bcc",
- "sha256:d3c59a06c2c28a81a026ff11fbf012081ea34fb9b7052f2ed0366e14896f0a1d",
- "sha256:d45b75b0f3fd8d99f62eb7908cfa6d727b7ed190737dec7fe46d993da550b81a",
- "sha256:d46d5069e2eeda111d6f71970e341f4bd9aeeee92074e649ae263b834286ecc0",
- "sha256:d58ec349e0c2c0bc6669bf2cd4982d2f93bf067860d23a0ea1fe677b0f0b1e09",
- "sha256:db1b3ccb93488328c74e97ff888604a8b95ae4f35f4f56677ca57a4fc3a4220b",
- "sha256:dd65695a8df1233309b701dec2539cc4b11e97d4fcc0f4185b4a12ce54db0491",
- "sha256:f9482c2ed414781c0af0b35d9d575226da6b728bd1a720668fa05837184965b7",
- "sha256:f9671e7282d8c6fcabc32c0fb8d7c0ea8894ae85cee89c9aadc2d7129e1a9954",
- "sha256:fad7a051e07f64e297e6e8399b4d6a3bdcad3d7297409e9a06ef8cbccff4f501",
- "sha256:ffb08f2a1e59d38c7b8b9ac8083c9c8b9875f0955b1e9b9b9a965607a51f8e54"
+ "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e",
+ "sha256:03a088b9de532cbfe2ba2034b2b85e82df37874681e8c470d6fb2f8c04d7e4b7",
+ "sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01",
+ "sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1",
+ "sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159",
+ "sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563",
+ "sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83",
+ "sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9",
+ "sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395",
+ "sha256:1d3755bcb2e02de341c55b4fca7a745a24a9e7212ac953f6b3a48d117d7257aa",
+ "sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942",
+ "sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1",
+ "sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441",
+ "sha256:3319aa75e0e0639bc15ff54ca327e8dc7a6fe404003496e3c6925cd3142e0e22",
+ "sha256:346bed03fe47414091be4ad44786d1bd8bef0c3fcad6ed3dee074a032ab408a9",
+ "sha256:36b89d13c49216cadb828db8dfa6ce86bbbc476a82d3a6c397f0efae0525bdd0",
+ "sha256:37b9de5a96111fc15418819ab4c4432e4f3c2ede61e660b1e33971eba26ef9ba",
+ "sha256:396979749bd95f018296af156201d6211240e7a23090f50a8d5d18c370084dc3",
+ "sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1",
+ "sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6",
+ "sha256:47da355d8687fd65240c364c90a31569a133b7b60de111c255ef5b606f2ae291",
+ "sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39",
+ "sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d",
+ "sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467",
+ "sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475",
+ "sha256:54558ea205654b50c438029505def3834e80f0869a70fb15b871c29b4575ddef",
+ "sha256:5e06afd14cbaf9e00899fae69b24a32f2196c19de08fcb9f4779dd4f004e5e7c",
+ "sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511",
+ "sha256:63e4844797b975b9af3a3fb8f7866ff08775f5426925e1e0bbcfe7932059a12c",
+ "sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822",
+ "sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a",
+ "sha256:6ef9ea3f137e5711f0dbe5f9263e8c009b7069d8a1acea822bd5e9dae0ae49c8",
+ "sha256:7017b2be767b9d43cc31416aba48aab0d2309ee31b4dbf10a1d38fb7972bdf9d",
+ "sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01",
+ "sha256:73aaad12ac0ff500f62cebed98d8789198ea0e6f233421059fa68a5aa7220145",
+ "sha256:77c386de38a60d1dfb8e55b8c1101d68c79dfdd25c7095d51fec2dd800892b80",
+ "sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13",
+ "sha256:7939aa3ca7d2a1593596e7ac6d59391ff30281ef280d8632fa03d81f7c5f955e",
+ "sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b",
+ "sha256:85f3ff71e2e60bd4b4932a043fbbe0f499e263c628390b285cb599154a3b03b1",
+ "sha256:8b8b36671f10ba80e159378df9c4f15c14098c4fd73a36b9ad715f057272fbef",
+ "sha256:93147c513fac16385d1036b7e5b102c7fbbdb163d556b791f0f11eada7ba65dc",
+ "sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff",
+ "sha256:94b6150a85e1b33b40b1464a3f9988dcc5251d6ed06842abff82e42632fac120",
+ "sha256:94ebba31df2aa506d7b14866fed00ac141a867e63143fe5bca82a8e503b36437",
+ "sha256:95ffcf719966dd7c453f908e208e14cde192e09fde6c7186c8f1896ef778d8cd",
+ "sha256:98884ecf2ffb7d7fe6bd517e8eb99d31ff7855a840fa6d0d63cd07c037f6a981",
+ "sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36",
+ "sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a",
+ "sha256:a0dfc6c143b519113354e780a50381508139b07d2177cb6ad6a08278ec655798",
+ "sha256:b2795058c23988728eec1f36a4e5e4ebad22f8320c85f3587b539b9ac84128d7",
+ "sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761",
+ "sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0",
+ "sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e",
+ "sha256:b8da394b34370874b4572676f36acabac172602abf054cbc4ac910219f3340af",
+ "sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa",
+ "sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c",
+ "sha256:ca9d0ff5ad43e785350894d97e13633a66e2b50000e8a183a50a88d834752d42",
+ "sha256:d0028e725ee18175c6e422797c407874da24381ce0690d6b9396c204c7f7276e",
+ "sha256:d21e10da6ec19b457b82636209cbe2331ff4306b54d06fa04b7c138ba18c8a81",
+ "sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e",
+ "sha256:da7a9bff22ce038e19bf62c4dd1ec8391062878710ded0a845bcf47cc0200617",
+ "sha256:db32b5348615a04b82240cc67983cb315309e88d444a288934ee6ceaebcad6cc",
+ "sha256:dcc62f31eae24de7f8dce72134c8651c58000d3b1868e01392baea7c32c247de",
+ "sha256:dfc59d69fc48664bc693842bd57acfdd490acafda1ab52c7836e3fc75c90a111",
+ "sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383",
+ "sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70",
+ "sha256:ed10eac5830befbdd0c32f83e8aa6288361597550ba669b04c48f0f9a2c843c6",
+ "sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4",
+ "sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011",
+ "sha256:f1d4aeb8891338e60d1ab6127af1fe45def5259def8094b9c7e34690c8858803",
+ "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79",
+ "sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f"
],
"index": "pypi",
"markers": "python_version >= '3.7'",
- "version": "==3.1.0"
+ "version": "==3.1.1"
},
"gunicorn": {
"hashes": [
@@ -701,11 +720,11 @@
},
"idna": {
"hashes": [
- "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
- "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
],
"markers": "python_version >= '3.6'",
- "version": "==3.8"
+ "version": "==3.10"
},
"itsdangerous": {
"hashes": [
@@ -741,11 +760,11 @@
},
"jsonschema-specifications": {
"hashes": [
- "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc",
- "sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c"
+ "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272",
+ "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf"
],
- "markers": "python_version >= '3.8'",
- "version": "==2023.12.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==2024.10.1"
},
"jwt": {
"hashes": [
@@ -757,78 +776,79 @@
},
"markupsafe": {
"hashes": [
- "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf",
- "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff",
- "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f",
- "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3",
- "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532",
- "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f",
- "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617",
- "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df",
- "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4",
- "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906",
- "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f",
- "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4",
- "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8",
- "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371",
- "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2",
- "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465",
- "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52",
- "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6",
- "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169",
- "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad",
- "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2",
- "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0",
- "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029",
- "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f",
- "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a",
- "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced",
- "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5",
- "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c",
- "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf",
- "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9",
- "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb",
- "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad",
- "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3",
- "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1",
- "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46",
- "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc",
- "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a",
- "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee",
- "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900",
- "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5",
- "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea",
- "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f",
- "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5",
- "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e",
- "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a",
- "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f",
- "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50",
- "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a",
- "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b",
- "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4",
- "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff",
- "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2",
- "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46",
- "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b",
- "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf",
- "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5",
- "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5",
- "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab",
- "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd",
- "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68"
+ "sha256:0778de17cff1acaeccc3ff30cd99a3fd5c50fc58ad3d6c0e0c4c58092b859396",
+ "sha256:0f84af7e813784feb4d5e4ff7db633aba6c8ca64a833f61d8e4eade234ef0c38",
+ "sha256:17b2aea42a7280db02ac644db1d634ad47dcc96faf38ab304fe26ba2680d359a",
+ "sha256:242d6860f1fd9191aef5fae22b51c5c19767f93fb9ead4d21924e0bcb17619d8",
+ "sha256:244dbe463d5fb6d7ce161301a03a6fe744dac9072328ba9fc82289238582697b",
+ "sha256:26627785a54a947f6d7336ce5963569b5d75614619e75193bdb4e06e21d447ad",
+ "sha256:2a4b34a8d14649315c4bc26bbfa352663eb51d146e35eef231dd739d54a5430a",
+ "sha256:2ae99f31f47d849758a687102afdd05bd3d3ff7dbab0a8f1587981b58a76152a",
+ "sha256:312387403cd40699ab91d50735ea7a507b788091c416dd007eac54434aee51da",
+ "sha256:3341c043c37d78cc5ae6e3e305e988532b072329639007fd408a476642a89fd6",
+ "sha256:33d1c36b90e570ba7785dacd1faaf091203d9942bc036118fab8110a401eb1a8",
+ "sha256:3e683ee4f5d0fa2dde4db77ed8dd8a876686e3fc417655c2ece9a90576905344",
+ "sha256:3ffb4a8e7d46ed96ae48805746755fadd0909fea2306f93d5d8233ba23dda12a",
+ "sha256:40621d60d0e58aa573b68ac5e2d6b20d44392878e0bfc159012a5787c4e35bc8",
+ "sha256:40f1e10d51c92859765522cbd79c5c8989f40f0419614bcdc5015e7b6bf97fc5",
+ "sha256:45d42d132cff577c92bfba536aefcfea7e26efb975bd455db4e6602f5c9f45e7",
+ "sha256:48488d999ed50ba8d38c581d67e496f955821dc183883550a6fbc7f1aefdc170",
+ "sha256:4935dd7883f1d50e2ffecca0aa33dc1946a94c8f3fdafb8df5c330e48f71b132",
+ "sha256:4c2d64fdba74ad16138300815cfdc6ab2f4647e23ced81f59e940d7d4a1469d9",
+ "sha256:4c8817557d0de9349109acb38b9dd570b03cc5014e8aabf1cbddc6e81005becd",
+ "sha256:4ffaaac913c3f7345579db4f33b0020db693f302ca5137f106060316761beea9",
+ "sha256:5a4cb365cb49b750bdb60b846b0c0bc49ed62e59a76635095a179d440540c346",
+ "sha256:62fada2c942702ef8952754abfc1a9f7658a4d5460fabe95ac7ec2cbe0d02abc",
+ "sha256:67c519635a4f64e495c50e3107d9b4075aec33634272b5db1cde839e07367589",
+ "sha256:6a54c43d3ec4cf2a39f4387ad044221c66a376e58c0d0e971d47c475ba79c6b5",
+ "sha256:7044312a928a66a4c2a22644147bc61a199c1709712069a344a3fb5cfcf16915",
+ "sha256:730d86af59e0e43ce277bb83970530dd223bf7f2a838e086b50affa6ec5f9295",
+ "sha256:800100d45176652ded796134277ecb13640c1a537cad3b8b53da45aa96330453",
+ "sha256:80fcbf3add8790caddfab6764bde258b5d09aefbe9169c183f88a7410f0f6dea",
+ "sha256:82b5dba6eb1bcc29cc305a18a3c5365d2af06ee71b123216416f7e20d2a84e5b",
+ "sha256:852dc840f6d7c985603e60b5deaae1d89c56cb038b577f6b5b8c808c97580f1d",
+ "sha256:8ad4ad1429cd4f315f32ef263c1342166695fad76c100c5d979c45d5570ed58b",
+ "sha256:8ae369e84466aa70f3154ee23c1451fda10a8ee1b63923ce76667e3077f2b0c4",
+ "sha256:93e8248d650e7e9d49e8251f883eed60ecbc0e8ffd6349e18550925e31bd029b",
+ "sha256:973a371a55ce9ed333a3a0f8e0bcfae9e0d637711534bcb11e130af2ab9334e7",
+ "sha256:9ba25a71ebf05b9bb0e2ae99f8bc08a07ee8e98c612175087112656ca0f5c8bf",
+ "sha256:a10860e00ded1dd0a65b83e717af28845bb7bd16d8ace40fe5531491de76b79f",
+ "sha256:a4792d3b3a6dfafefdf8e937f14906a51bd27025a36f4b188728a73382231d91",
+ "sha256:a7420ceda262dbb4b8d839a4ec63d61c261e4e77677ed7c66c99f4e7cb5030dd",
+ "sha256:ad91738f14eb8da0ff82f2acd0098b6257621410dcbd4df20aaa5b4233d75a50",
+ "sha256:b6a387d61fe41cdf7ea95b38e9af11cfb1a63499af2759444b99185c4ab33f5b",
+ "sha256:b954093679d5750495725ea6f88409946d69cfb25ea7b4c846eef5044194f583",
+ "sha256:bbde71a705f8e9e4c3e9e33db69341d040c827c7afa6789b14c6e16776074f5a",
+ "sha256:beeebf760a9c1f4c07ef6a53465e8cfa776ea6a2021eda0d0417ec41043fe984",
+ "sha256:c91b394f7601438ff79a4b93d16be92f216adb57d813a78be4446fe0f6bc2d8c",
+ "sha256:c97ff7fedf56d86bae92fa0a646ce1a0ec7509a7578e1ed238731ba13aabcd1c",
+ "sha256:cb53e2a99df28eee3b5f4fea166020d3ef9116fdc5764bc5117486e6d1211b25",
+ "sha256:cbf445eb5628981a80f54087f9acdbf84f9b7d862756110d172993b9a5ae81aa",
+ "sha256:d06b24c686a34c86c8c1fba923181eae6b10565e4d80bdd7bc1c8e2f11247aa4",
+ "sha256:d98e66a24497637dd31ccab090b34392dddb1f2f811c4b4cd80c230205c074a3",
+ "sha256:db15ce28e1e127a0013dfb8ac243a8e392db8c61eae113337536edb28bdc1f97",
+ "sha256:db842712984e91707437461930e6011e60b39136c7331e971952bb30465bc1a1",
+ "sha256:e24bfe89c6ac4c31792793ad9f861b8f6dc4546ac6dc8f1c9083c7c4f2b335cd",
+ "sha256:e81c52638315ff4ac1b533d427f50bc0afc746deb949210bc85f05d4f15fd772",
+ "sha256:e9393357f19954248b00bed7c56f29a25c930593a77630c719653d51e7669c2a",
+ "sha256:ee3941769bd2522fe39222206f6dd97ae83c442a94c90f2b7a25d847d40f4729",
+ "sha256:f31ae06f1328595d762c9a2bf29dafd8621c7d3adc130cbb46278079758779ca",
+ "sha256:f94190df587738280d544971500b9cafc9b950d32efcb1fba9ac10d84e6aa4e6",
+ "sha256:fa7d686ed9883f3d664d39d5a8e74d3c5f63e603c2e3ff0abcba23eac6542635",
+ "sha256:fb532dd9900381d2e8f48172ddc5a59db4c445a11b9fab40b3b786da40d3b56b",
+ "sha256:fe32482b37b4b00c7a52a07211b479653b7fe4f22b2e481b9a9b099d8a430f2f"
],
- "markers": "python_version >= '3.7'",
- "version": "==2.1.5"
+ "markers": "python_version >= '3.9'",
+ "version": "==3.0.1"
},
"minio": {
"hashes": [
- "sha256:aa3b485788b63b12406a5798465d12a57e4be2ac2a58a8380959b6b748e64ddd",
- "sha256:f8af2dafc22ebe1aef3ac181b8e217037011c430aa6da276ed627e55aaf7c815"
+ "sha256:a83c2fcd981944602a8dc11e8e07543ed9cda0a9462264e3f46a13171c56bccb",
+ "sha256:fe5523d9c4a4d6cfc07e96905852841bccdb22b22770e1efca4bf5ae8b65774b"
],
"index": "pypi",
"markers": "python_version >= '3.9'",
- "version": "==7.2.8"
+ "version": "==7.2.9"
},
"mistune": {
"hashes": [
@@ -938,63 +958,63 @@
},
"numpy": {
"hashes": [
- "sha256:046356b19d7ad1890c751b99acad5e82dc4a02232013bd9a9a712fddf8eb60f5",
- "sha256:0b8cc2715a84b7c3b161f9ebbd942740aaed913584cae9cdc7f8ad5ad41943d0",
- "sha256:0d07841fd284718feffe7dd17a63a2e6c78679b2d386d3e82f44f0108c905550",
- "sha256:13cc11c00000848702322af4de0147ced365c81d66053a67c2e962a485b3717c",
- "sha256:13ce49a34c44b6de5241f0b38b07e44c1b2dcacd9e36c30f9c2fcb1bb5135db7",
- "sha256:24c2ad697bd8593887b019817ddd9974a7f429c14a5469d7fad413f28340a6d2",
- "sha256:251105b7c42abe40e3a689881e1793370cc9724ad50d64b30b358bbb3a97553b",
- "sha256:2ca4b53e1e0b279142113b8c5eb7d7a877e967c306edc34f3b58e9be12fda8df",
- "sha256:3269c9eb8745e8d975980b3a7411a98976824e1fdef11f0aacf76147f662b15f",
- "sha256:397bc5ce62d3fb73f304bec332171535c187e0643e176a6e9421a6e3eacef06d",
- "sha256:3fc5eabfc720db95d68e6646e88f8b399bfedd235994016351b1d9e062c4b270",
- "sha256:50a95ca3560a6058d6ea91d4629a83a897ee27c00630aed9d933dff191f170cd",
- "sha256:52ac2e48f5ad847cd43c4755520a2317f3380213493b9d8a4c5e37f3b87df504",
- "sha256:53e27293b3a2b661c03f79aa51c3987492bd4641ef933e366e0f9f6c9bf257ec",
- "sha256:57eb525e7c2a8fdee02d731f647146ff54ea8c973364f3b850069ffb42799647",
- "sha256:5889dd24f03ca5a5b1e8a90a33b5a0846d8977565e4ae003a63d22ecddf6782f",
- "sha256:59ca673ad11d4b84ceb385290ed0ebe60266e356641428c845b39cd9df6713ab",
- "sha256:6435c48250c12f001920f0751fe50c0348f5f240852cfddc5e2f97e007544cbe",
- "sha256:6e5a9cb2be39350ae6c8f79410744e80154df658d5bea06e06e0ac5bb75480d5",
- "sha256:7be6a07520b88214ea85d8ac8b7d6d8a1839b0b5cb87412ac9f49fa934eb15d5",
- "sha256:7c803b7934a7f59563db459292e6aa078bb38b7ab1446ca38dd138646a38203e",
- "sha256:7dd86dfaf7c900c0bbdcb8b16e2f6ddf1eb1fe39c6c8cca6e94844ed3152a8fd",
- "sha256:8661c94e3aad18e1ea17a11f60f843a4933ccaf1a25a7c6a9182af70610b2313",
- "sha256:8ae0fd135e0b157365ac7cc31fff27f07a5572bdfc38f9c2d43b2aff416cc8b0",
- "sha256:910b47a6d0635ec1bd53b88f86120a52bf56dcc27b51f18c7b4a2e2224c29f0f",
- "sha256:913cc1d311060b1d409e609947fa1b9753701dac96e6581b58afc36b7ee35af6",
- "sha256:920b0911bb2e4414c50e55bd658baeb78281a47feeb064ab40c2b66ecba85553",
- "sha256:950802d17a33c07cba7fd7c3dcfa7d64705509206be1606f196d179e539111ed",
- "sha256:981707f6b31b59c0c24bcda52e5605f9701cb46da4b86c2e8023656ad3e833cb",
- "sha256:98ce7fb5b8063cfdd86596b9c762bf2b5e35a2cdd7e967494ab78a1fa7f8b86e",
- "sha256:99f4a9ee60eed1385a86e82288971a51e71df052ed0b2900ed30bc840c0f2e39",
- "sha256:9a8e06c7a980869ea67bbf551283bbed2856915f0a792dc32dd0f9dd2fb56728",
- "sha256:ae8ce252404cdd4de56dcfce8b11eac3c594a9c16c231d081fb705cf23bd4d9e",
- "sha256:afd9c680df4de71cd58582b51e88a61feed4abcc7530bcd3d48483f20fc76f2a",
- "sha256:b49742cdb85f1f81e4dc1b39dcf328244f4d8d1ded95dea725b316bd2cf18c95",
- "sha256:b5613cfeb1adfe791e8e681128f5f49f22f3fcaa942255a6124d58ca59d9528f",
- "sha256:bab7c09454460a487e631ffc0c42057e3d8f2a9ddccd1e60c7bb8ed774992480",
- "sha256:c8a0e34993b510fc19b9a2ce7f31cb8e94ecf6e924a40c0c9dd4f62d0aac47d9",
- "sha256:caf5d284ddea7462c32b8d4a6b8af030b6c9fd5332afb70e7414d7fdded4bfd0",
- "sha256:cea427d1350f3fd0d2818ce7350095c1a2ee33e30961d2f0fef48576ddbbe90f",
- "sha256:d0cf7d55b1051387807405b3898efafa862997b4cba8aa5dbe657be794afeafd",
- "sha256:d10c39947a2d351d6d466b4ae83dad4c37cd6c3cdd6d5d0fa797da56f710a6ae",
- "sha256:d2b9cd92c8f8e7b313b80e93cedc12c0112088541dcedd9197b5dee3738c1201",
- "sha256:d4c57b68c8ef5e1ebf47238e99bf27657511ec3f071c465f6b1bccbef12d4136",
- "sha256:d51fc141ddbe3f919e91a096ec739f49d686df8af254b2053ba21a910ae518bf",
- "sha256:e097507396c0be4e547ff15b13dc3866f45f3680f789c1a1301b07dadd3fbc78",
- "sha256:e30356d530528a42eeba51420ae8bf6c6c09559051887196599d96ee5f536468",
- "sha256:e8d5f8a8e3bc87334f025194c6193e408903d21ebaeb10952264943a985066ca",
- "sha256:e8dfa9e94fc127c40979c3eacbae1e61fda4fe71d84869cc129e2721973231ef",
- "sha256:f212d4f46b67ff604d11fff7cc62d36b3e8714edf68e44e9760e19be38c03eb0",
- "sha256:f7506387e191fe8cdb267f912469a3cccc538ab108471291636a96a54e599556",
- "sha256:fac6e277a41163d27dfab5f4ec1f7a83fac94e170665a4a50191b545721c6521",
- "sha256:fcd8f556cdc8cfe35e70efb92463082b7f43dd7e547eb071ffc36abc0ca4699b"
+ "sha256:05b2d4e667895cc55e3ff2b56077e4c8a5604361fc21a042845ea3ad67465aa8",
+ "sha256:12edb90831ff481f7ef5f6bc6431a9d74dc0e5ff401559a71e5e4611d4f2d466",
+ "sha256:13311c2db4c5f7609b462bc0f43d3c465424d25c626d95040f073e30f7570e35",
+ "sha256:13532a088217fa624c99b843eeb54640de23b3414b14aa66d023805eb731066c",
+ "sha256:13602b3174432a35b16c4cfb5de9a12d229727c3dd47a6ce35111f2ebdf66ff4",
+ "sha256:1600068c262af1ca9580a527d43dc9d959b0b1d8e56f8a05d830eea39b7c8af6",
+ "sha256:1b8cde4f11f0a975d1fd59373b32e2f5a562ade7cde4f85b7137f3de8fbb29a0",
+ "sha256:1c193d0b0238638e6fc5f10f1b074a6993cb13b0b431f64079a509d63d3aa8b7",
+ "sha256:1ebec5fd716c5a5b3d8dfcc439be82a8407b7b24b230d0ad28a81b61c2f4659a",
+ "sha256:242b39d00e4944431a3cd2db2f5377e15b5785920421993770cddb89992c3f3a",
+ "sha256:259ec80d54999cc34cd1eb8ded513cb053c3bf4829152a2e00de2371bd406f5e",
+ "sha256:2abbf905a0b568706391ec6fa15161fad0fb5d8b68d73c461b3c1bab6064dd62",
+ "sha256:2cbba4b30bf31ddbe97f1c7205ef976909a93a66bb1583e983adbd155ba72ac2",
+ "sha256:2ffef621c14ebb0188a8633348504a35c13680d6da93ab5cb86f4e54b7e922b5",
+ "sha256:30d53720b726ec36a7f88dc873f0eec8447fbc93d93a8f079dfac2629598d6ee",
+ "sha256:32e16a03138cabe0cb28e1007ee82264296ac0983714094380b408097a418cfe",
+ "sha256:43cca367bf94a14aca50b89e9bc2061683116cfe864e56740e083392f533ce7a",
+ "sha256:456e3b11cb79ac9946c822a56346ec80275eaf2950314b249b512896c0d2505e",
+ "sha256:4d6ec0d4222e8ffdab1744da2560f07856421b367928026fb540e1945f2eeeaf",
+ "sha256:5006b13a06e0b38d561fab5ccc37581f23c9511879be7693bd33c7cd15ca227c",
+ "sha256:675c741d4739af2dc20cd6c6a5c4b7355c728167845e3c6b0e824e4e5d36a6c3",
+ "sha256:6cdb606a7478f9ad91c6283e238544451e3a95f30fb5467fbf715964341a8a86",
+ "sha256:6d95f286b8244b3649b477ac066c6906fbb2905f8ac19b170e2175d3d799f4df",
+ "sha256:76322dcdb16fccf2ac56f99048af32259dcc488d9b7e25b51e5eca5147a3fb98",
+ "sha256:7c1c60328bd964b53f8b835df69ae8198659e2b9302ff9ebb7de4e5a5994db3d",
+ "sha256:860ec6e63e2c5c2ee5e9121808145c7bf86c96cca9ad396c0bd3e0f2798ccbe2",
+ "sha256:8e00ea6fc82e8a804433d3e9cedaa1051a1422cb6e443011590c14d2dea59146",
+ "sha256:9c6c754df29ce6a89ed23afb25550d1c2d5fdb9901d9c67a16e0b16eaf7e2550",
+ "sha256:a26ae94658d3ba3781d5e103ac07a876b3e9b29db53f68ed7df432fd033358a8",
+ "sha256:a65acfdb9c6ebb8368490dbafe83c03c7e277b37e6857f0caeadbbc56e12f4fb",
+ "sha256:a7d80b2e904faa63068ead63107189164ca443b42dd1930299e0d1cb041cec2e",
+ "sha256:a84498e0d0a1174f2b3ed769b67b656aa5460c92c9554039e11f20a05650f00d",
+ "sha256:ab4754d432e3ac42d33a269c8567413bdb541689b02d93788af4131018cbf366",
+ "sha256:ad369ed238b1959dfbade9018a740fb9392c5ac4f9b5173f420bd4f37ba1f7a0",
+ "sha256:b1d0fcae4f0949f215d4632be684a539859b295e2d0cb14f78ec231915d644db",
+ "sha256:b42a1a511c81cc78cbc4539675713bbcf9d9c3913386243ceff0e9429ca892fe",
+ "sha256:bd33f82e95ba7ad632bc57837ee99dba3d7e006536200c4e9124089e1bf42426",
+ "sha256:bdd407c40483463898b84490770199d5714dcc9dd9b792f6c6caccc523c00952",
+ "sha256:c6eef7a2dbd0abfb0d9eaf78b73017dbfd0b54051102ff4e6a7b2980d5ac1a03",
+ "sha256:c82af4b2ddd2ee72d1fc0c6695048d457e00b3582ccde72d8a1c991b808bb20f",
+ "sha256:d666cb72687559689e9906197e3bec7b736764df6a2e58ee265e360663e9baf7",
+ "sha256:d7bf0a4f9f15b32b5ba53147369e94296f5fffb783db5aacc1be15b4bf72f43b",
+ "sha256:d82075752f40c0ddf57e6e02673a17f6cb0f8eb3f587f63ca1eaab5594da5b17",
+ "sha256:da65fb46d4cbb75cb417cddf6ba5e7582eb7bb0b47db4b99c9fe5787ce5d91f5",
+ "sha256:e2b49c3c0804e8ecb05d59af8386ec2f74877f7ca8fd9c1e00be2672e4d399b1",
+ "sha256:e585c8ae871fd38ac50598f4763d73ec5497b0de9a0ab4ef5b69f01c6a046142",
+ "sha256:e8d3ca0a72dd8846eb6f7dfe8f19088060fcb76931ed592d29128e0219652884",
+ "sha256:ef444c57d664d35cac4e18c298c47d7b504c66b17c2ea91312e979fcfbdfb08a",
+ "sha256:f1eb068ead09f4994dec71c24b2844f1e4e4e013b9629f812f292f04bd1510d9",
+ "sha256:f2ded8d9b6f68cc26f8425eda5d3877b47343e68ca23d0d0846f4d312ecaa445",
+ "sha256:f751ed0a2f250541e19dfca9f1eafa31a392c71c832b6bb9e113b10d050cb0f1",
+ "sha256:faa88bc527d0f097abdc2c663cddf37c05a1c2f113716601555249805cf573f1",
+ "sha256:fc44e3c68ff00fd991b59092a54350e6e4911152682b4782f68070985aa9e648"
],
"index": "pypi",
"markers": "python_version >= '3.10'",
- "version": "==2.1.1"
+ "version": "==2.1.2"
},
"opensearch-py": {
"hashes": [
@@ -1015,39 +1035,52 @@
},
"pandas": {
"hashes": [
- "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863",
- "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2",
- "sha256:0cace394b6ea70c01ca1595f839cf193df35d1575986e484ad35c4aeae7266c1",
- "sha256:1cb51fe389360f3b5a4d57dbd2848a5f033350336ca3b340d1c53a1fad33bcad",
- "sha256:2925720037f06e89af896c70bca73459d7e6a4be96f9de79e2d440bd499fe0db",
- "sha256:3e374f59e440d4ab45ca2fffde54b81ac3834cf5ae2cdfa69c90bc03bde04d76",
- "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51",
- "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32",
- "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08",
- "sha256:58b84b91b0b9f4bafac2a0ac55002280c094dfc6402402332c0913a59654ab2b",
- "sha256:640cef9aa381b60e296db324337a554aeeb883ead99dc8f6c18e81a93942f5f4",
- "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921",
- "sha256:696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288",
- "sha256:6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee",
- "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0",
- "sha256:873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24",
- "sha256:8e5a0b00e1e56a842f922e7fae8ae4077aee4af0acb5ae3622bd4b4c30aedf99",
- "sha256:8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151",
- "sha256:9057e6aa78a584bc93a13f0a9bf7e753a5e9770a30b4d758b8d5f2a62a9433cd",
- "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce",
- "sha256:92fd6b027924a7e178ac202cfbe25e53368db90d56872d20ffae94b96c7acc57",
- "sha256:9dfde2a0ddef507a631dc9dc4af6a9489d5e2e740e226ad426a05cabfbd7c8ef",
- "sha256:9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54",
- "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a",
- "sha256:c7adfc142dac335d8c1e0dcbd37eb8617eac386596eb9e1a1b77791cf2498238",
- "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23",
- "sha256:ddf818e4e6c7c6f4f7c8a12709696d193976b591cc7dc50588d3d1a6b5dc8772",
- "sha256:e9b79011ff7a0f4b1d6da6a61aa1aa604fb312d6647de5bad20013682d1429ce",
- "sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad"
+ "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"
],
"index": "pypi",
"markers": "python_version >= '3.9'",
- "version": "==2.2.2"
+ "version": "==2.2.3"
},
"pika": {
"hashes": [
@@ -1059,11 +1092,11 @@
},
"prometheus-client": {
"hashes": [
- "sha256:287629d00b147a32dcb2be0b9df905da599b2d82f80377083ec8463309a4bb89",
- "sha256:cde524a85bce83ca359cc837f28b8c0db5cac7aa653a588fd7e84ba061c329e7"
+ "sha256:4fa6b4dd0ac16d58bb587c04b1caae65b8c5043e85f778f42f5f632f6af2e166",
+ "sha256:96c83c606b71ff2b0a433c98889d275f51ffec6c5e267de37c7a2b5c9aa9233e"
],
"markers": "python_version >= '3.8'",
- "version": "==0.20.0"
+ "version": "==0.21.0"
},
"prometheus-flask-exporter": {
"hashes": [
@@ -1073,6 +1106,110 @@
"index": "pypi",
"version": "==0.23.1"
},
+ "propcache": {
+ "hashes": [
+ "sha256:00181262b17e517df2cd85656fcd6b4e70946fe62cd625b9d74ac9977b64d8d9",
+ "sha256:0e53cb83fdd61cbd67202735e6a6687a7b491c8742dfc39c9e01e80354956763",
+ "sha256:1235c01ddaa80da8235741e80815ce381c5267f96cc49b1477fdcf8c047ef325",
+ "sha256:140fbf08ab3588b3468932974a9331aff43c0ab8a2ec2c608b6d7d1756dbb6cb",
+ "sha256:191db28dc6dcd29d1a3e063c3be0b40688ed76434622c53a284e5427565bbd9b",
+ "sha256:1e41d67757ff4fbc8ef2af99b338bfb955010444b92929e9e55a6d4dcc3c4f09",
+ "sha256:1ec43d76b9677637a89d6ab86e1fef70d739217fefa208c65352ecf0282be957",
+ "sha256:20a617c776f520c3875cf4511e0d1db847a076d720714ae35ffe0df3e440be68",
+ "sha256:218db2a3c297a3768c11a34812e63b3ac1c3234c3a086def9c0fee50d35add1f",
+ "sha256:22aa8f2272d81d9317ff5756bb108021a056805ce63dd3630e27d042c8092798",
+ "sha256:25a1f88b471b3bc911d18b935ecb7115dff3a192b6fef46f0bfaf71ff4f12418",
+ "sha256:25c8d773a62ce0451b020c7b29a35cfbc05de8b291163a7a0f3b7904f27253e6",
+ "sha256:2a60ad3e2553a74168d275a0ef35e8c0a965448ffbc3b300ab3a5bb9956c2162",
+ "sha256:2a66df3d4992bc1d725b9aa803e8c5a66c010c65c741ad901e260ece77f58d2f",
+ "sha256:2ccc28197af5313706511fab3a8b66dcd6da067a1331372c82ea1cb74285e036",
+ "sha256:2e900bad2a8456d00a113cad8c13343f3b1f327534e3589acc2219729237a2e8",
+ "sha256:2ee7606193fb267be4b2e3b32714f2d58cad27217638db98a60f9efb5efeccc2",
+ "sha256:33ac8f098df0585c0b53009f039dfd913b38c1d2edafed0cedcc0c32a05aa110",
+ "sha256:3444cdba6628accf384e349014084b1cacd866fbb88433cd9d279d90a54e0b23",
+ "sha256:363ea8cd3c5cb6679f1c2f5f1f9669587361c062e4899fce56758efa928728f8",
+ "sha256:375a12d7556d462dc64d70475a9ee5982465fbb3d2b364f16b86ba9135793638",
+ "sha256:388f3217649d6d59292b722d940d4d2e1e6a7003259eb835724092a1cca0203a",
+ "sha256:3947483a381259c06921612550867b37d22e1df6d6d7e8361264b6d037595f44",
+ "sha256:39e104da444a34830751715f45ef9fc537475ba21b7f1f5b0f4d71a3b60d7fe2",
+ "sha256:3c997f8c44ec9b9b0bcbf2d422cc00a1d9b9c681f56efa6ca149a941e5560da2",
+ "sha256:3dfafb44f7bb35c0c06eda6b2ab4bfd58f02729e7c4045e179f9a861b07c9850",
+ "sha256:3ebbcf2a07621f29638799828b8d8668c421bfb94c6cb04269130d8de4fb7136",
+ "sha256:3f88a4095e913f98988f5b338c1d4d5d07dbb0b6bad19892fd447484e483ba6b",
+ "sha256:439e76255daa0f8151d3cb325f6dd4a3e93043e6403e6491813bcaaaa8733887",
+ "sha256:4569158070180c3855e9c0791c56be3ceeb192defa2cdf6a3f39e54319e56b89",
+ "sha256:466c219deee4536fbc83c08d09115249db301550625c7fef1c5563a584c9bc87",
+ "sha256:4a9d9b4d0a9b38d1c391bb4ad24aa65f306c6f01b512e10a8a34a2dc5675d348",
+ "sha256:4c7dde9e533c0a49d802b4f3f218fa9ad0a1ce21f2c2eb80d5216565202acab4",
+ "sha256:53d1bd3f979ed529f0805dd35ddaca330f80a9a6d90bc0121d2ff398f8ed8861",
+ "sha256:55346705687dbd7ef0d77883ab4f6fabc48232f587925bdaf95219bae072491e",
+ "sha256:56295eb1e5f3aecd516d91b00cfd8bf3a13991de5a479df9e27dd569ea23959c",
+ "sha256:56bb5c98f058a41bb58eead194b4db8c05b088c93d94d5161728515bd52b052b",
+ "sha256:5a5b3bb545ead161be780ee85a2b54fdf7092815995661947812dde94a40f6fb",
+ "sha256:5f2564ec89058ee7c7989a7b719115bdfe2a2fb8e7a4543b8d1c0cc4cf6478c1",
+ "sha256:608cce1da6f2672a56b24a015b42db4ac612ee709f3d29f27a00c943d9e851de",
+ "sha256:63f13bf09cc3336eb04a837490b8f332e0db41da66995c9fd1ba04552e516354",
+ "sha256:662dd62358bdeaca0aee5761de8727cfd6861432e3bb828dc2a693aa0471a563",
+ "sha256:676135dcf3262c9c5081cc8f19ad55c8a64e3f7282a21266d05544450bffc3a5",
+ "sha256:67aeb72e0f482709991aa91345a831d0b707d16b0257e8ef88a2ad246a7280bf",
+ "sha256:67b69535c870670c9f9b14a75d28baa32221d06f6b6fa6f77a0a13c5a7b0a5b9",
+ "sha256:682a7c79a2fbf40f5dbb1eb6bfe2cd865376deeac65acf9beb607505dced9e12",
+ "sha256:6994984550eaf25dd7fc7bd1b700ff45c894149341725bb4edc67f0ffa94efa4",
+ "sha256:69d3a98eebae99a420d4b28756c8ce6ea5a29291baf2dc9ff9414b42676f61d5",
+ "sha256:6e2e54267980349b723cff366d1e29b138b9a60fa376664a157a342689553f71",
+ "sha256:73e4b40ea0eda421b115248d7e79b59214411109a5bc47d0d48e4c73e3b8fcf9",
+ "sha256:74acd6e291f885678631b7ebc85d2d4aec458dd849b8c841b57ef04047833bed",
+ "sha256:7665f04d0c7f26ff8bb534e1c65068409bf4687aa2534faf7104d7182debb336",
+ "sha256:7735e82e3498c27bcb2d17cb65d62c14f1100b71723b68362872bca7d0913d90",
+ "sha256:77a86c261679ea5f3896ec060be9dc8e365788248cc1e049632a1be682442063",
+ "sha256:7cf18abf9764746b9c8704774d8b06714bcb0a63641518a3a89c7f85cc02c2ad",
+ "sha256:83928404adf8fb3d26793665633ea79b7361efa0287dfbd372a7e74311d51ee6",
+ "sha256:8e40876731f99b6f3c897b66b803c9e1c07a989b366c6b5b475fafd1f7ba3fb8",
+ "sha256:8f188cfcc64fb1266f4684206c9de0e80f54622c3f22a910cbd200478aeae61e",
+ "sha256:91997d9cb4a325b60d4e3f20967f8eb08dfcb32b22554d5ef78e6fd1dda743a2",
+ "sha256:91ee8fc02ca52e24bcb77b234f22afc03288e1dafbb1f88fe24db308910c4ac7",
+ "sha256:92fe151145a990c22cbccf9ae15cae8ae9eddabfc949a219c9f667877e40853d",
+ "sha256:945db8ee295d3af9dbdbb698cce9bbc5c59b5c3fe328bbc4387f59a8a35f998d",
+ "sha256:9517d5e9e0731957468c29dbfd0f976736a0e55afaea843726e887f36fe017df",
+ "sha256:952e0d9d07609d9c5be361f33b0d6d650cd2bae393aabb11d9b719364521984b",
+ "sha256:97a58a28bcf63284e8b4d7b460cbee1edaab24634e82059c7b8c09e65284f178",
+ "sha256:97e48e8875e6c13909c800fa344cd54cc4b2b0db1d5f911f840458a500fde2c2",
+ "sha256:9e0f07b42d2a50c7dd2d8675d50f7343d998c64008f1da5fef888396b7f84630",
+ "sha256:a3dc1a4b165283bd865e8f8cb5f0c64c05001e0718ed06250d8cac9bec115b48",
+ "sha256:a3ebe9a75be7ab0b7da2464a77bb27febcb4fab46a34f9288f39d74833db7f61",
+ "sha256:a64e32f8bd94c105cc27f42d3b658902b5bcc947ece3c8fe7bc1b05982f60e89",
+ "sha256:a6ed8db0a556343d566a5c124ee483ae113acc9a557a807d439bcecc44e7dfbb",
+ "sha256:ad9c9b99b05f163109466638bd30ada1722abb01bbb85c739c50b6dc11f92dc3",
+ "sha256:b33d7a286c0dc1a15f5fc864cc48ae92a846df287ceac2dd499926c3801054a6",
+ "sha256:bc092ba439d91df90aea38168e11f75c655880c12782facf5cf9c00f3d42b562",
+ "sha256:c436130cc779806bdf5d5fae0d848713105472b8566b75ff70048c47d3961c5b",
+ "sha256:c5869b8fd70b81835a6f187c5fdbe67917a04d7e52b6e7cc4e5fe39d55c39d58",
+ "sha256:c5ecca8f9bab618340c8e848d340baf68bcd8ad90a8ecd7a4524a81c1764b3db",
+ "sha256:cfac69017ef97db2438efb854edf24f5a29fd09a536ff3a992b75990720cdc99",
+ "sha256:d2f0d0f976985f85dfb5f3d685697ef769faa6b71993b46b295cdbbd6be8cc37",
+ "sha256:d5bed7f9805cc29c780f3aee05de3262ee7ce1f47083cfe9f77471e9d6777e83",
+ "sha256:d6a21ef516d36909931a2967621eecb256018aeb11fc48656e3257e73e2e247a",
+ "sha256:d9b6ddac6408194e934002a69bcaadbc88c10b5f38fb9307779d1c629181815d",
+ "sha256:db47514ffdbd91ccdc7e6f8407aac4ee94cc871b15b577c1c324236b013ddd04",
+ "sha256:df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70",
+ "sha256:e4a91d44379f45f5e540971d41e4626dacd7f01004826a18cb048e7da7e96544",
+ "sha256:e63e3e1e0271f374ed489ff5ee73d4b6e7c60710e1f76af5f0e1a6117cd26394",
+ "sha256:e70fac33e8b4ac63dfc4c956fd7d85a0b1139adcfc0d964ce288b7c527537fea",
+ "sha256:ecddc221a077a8132cf7c747d5352a15ed763b674c0448d811f408bf803d9ad7",
+ "sha256:f45eec587dafd4b2d41ac189c2156461ebd0c1082d2fe7013571598abb8505d1",
+ "sha256:f52a68c21363c45297aca15561812d542f8fc683c85201df0bebe209e349f793",
+ "sha256:f571aea50ba5623c308aa146eb650eebf7dbe0fd8c5d946e28343cb3b5aad577",
+ "sha256:f60f0ac7005b9f5a6091009b09a419ace1610e163fa5deaba5ce3484341840e7",
+ "sha256:f6475a1b2ecb310c98c28d271a30df74f9dd436ee46d09236a6b750a7599ce57",
+ "sha256:f6d5749fdd33d90e34c2efb174c7e236829147a2713334d708746e94c4bde40d",
+ "sha256:f902804113e032e2cdf8c71015651c97af6418363bea8d78dc0911d56c335032",
+ "sha256:fa1076244f54bb76e65e22cb6910365779d5c3d71d1f18b275f1dfc7b0d71b4d",
+ "sha256:fc2db02409338bf36590aa985a461b2c96fce91f8e7e0f14c50c5fcc4f229016",
+ "sha256:ffcad6c564fe6b9b8916c1aefbb37a362deebf9394bd2974e9d84232e3e08504"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==0.2.0"
+ },
"pycparser": {
"hashes": [
"sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6",
@@ -1083,145 +1220,145 @@
},
"pycryptodome": {
"hashes": [
- "sha256:06d6de87c19f967f03b4cf9b34e538ef46e99a337e9a61a77dbe44b2cbcf0690",
- "sha256:09609209ed7de61c2b560cc5c8c4fbf892f8b15b1faf7e4cbffac97db1fffda7",
- "sha256:210ba1b647837bfc42dd5a813cdecb5b86193ae11a3f5d972b9a0ae2c7e9e4b4",
- "sha256:2a1250b7ea809f752b68e3e6f3fd946b5939a52eaeea18c73bdab53e9ba3c2dd",
- "sha256:2ab6ab0cb755154ad14e507d1df72de9897e99fd2d4922851a276ccc14f4f1a5",
- "sha256:3427d9e5310af6680678f4cce149f54e0bb4af60101c7f2c16fdf878b39ccccc",
- "sha256:3cd3ef3aee1079ae44afaeee13393cf68b1058f70576b11439483e34f93cf818",
- "sha256:405002eafad114a2f9a930f5db65feef7b53c4784495dd8758069b89baf68eab",
- "sha256:417a276aaa9cb3be91f9014e9d18d10e840a7a9b9a9be64a42f553c5b50b4d1d",
- "sha256:4401564ebf37dfde45d096974c7a159b52eeabd9969135f0426907db367a652a",
- "sha256:49a4c4dc60b78ec41d2afa392491d788c2e06edf48580fbfb0dd0f828af49d25",
- "sha256:5601c934c498cd267640b57569e73793cb9a83506f7c73a8ec57a516f5b0b091",
- "sha256:6e0e4a987d38cfc2e71b4a1b591bae4891eeabe5fa0f56154f576e26287bfdea",
- "sha256:76658f0d942051d12a9bd08ca1b6b34fd762a8ee4240984f7c06ddfb55eaf15a",
- "sha256:76cb39afede7055127e35a444c1c041d2e8d2f1f9c121ecef573757ba4cd2c3c",
- "sha256:8d6b98d0d83d21fb757a182d52940d028564efe8147baa9ce0f38d057104ae72",
- "sha256:9b3ae153c89a480a0ec402e23db8d8d84a3833b65fa4b15b81b83be9d637aab9",
- "sha256:a60fedd2b37b4cb11ccb5d0399efe26db9e0dd149016c1cc6c8161974ceac2d6",
- "sha256:ac1c7c0624a862f2e53438a15c9259d1655325fc2ec4392e66dc46cdae24d044",
- "sha256:acae12b9ede49f38eb0ef76fdec2df2e94aad85ae46ec85be3648a57f0a7db04",
- "sha256:acc2614e2e5346a4a4eab6e199203034924313626f9620b7b4b38e9ad74b7e0c",
- "sha256:acf6e43fa75aca2d33e93409f2dafe386fe051818ee79ee8a3e21de9caa2ac9e",
- "sha256:baee115a9ba6c5d2709a1e88ffe62b73ecc044852a925dcb67713a288c4ec70f",
- "sha256:c18b381553638414b38705f07d1ef0a7cf301bc78a5f9bc17a957eb19446834b",
- "sha256:d29daa681517f4bc318cd8a23af87e1f2a7bad2fe361e8aa29c77d652a065de4",
- "sha256:d5954acfe9e00bc83ed9f5cb082ed22c592fbbef86dc48b907238be64ead5c33",
- "sha256:ec0bb1188c1d13426039af8ffcb4dbe3aad1d7680c35a62d8eaf2a529b5d3d4f",
- "sha256:ec1f93feb3bb93380ab0ebf8b859e8e5678c0f010d2d78367cf6bc30bfeb148e",
- "sha256:f0e6d631bae3f231d3634f91ae4da7a960f7ff87f2865b2d2b831af1dfb04e9a",
- "sha256:f35d6cee81fa145333137009d9c8ba90951d7d77b67c79cbe5f03c7eb74d8fe2",
- "sha256:f47888542a0633baff535a04726948e876bf1ed880fddb7c10a736fa99146ab3",
- "sha256:fb3b87461fa35afa19c971b0a2b7456a7b1db7b4eba9a8424666104925b78128"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
- "version": "==3.20.0"
+ "sha256:0714206d467fc911042d01ea3a1847c847bc10884cf674c82e12915cfe1649f8",
+ "sha256:0fa0a05a6a697ccbf2a12cec3d6d2650b50881899b845fac6e87416f8cb7e87d",
+ "sha256:0fd54003ec3ce4e0f16c484a10bc5d8b9bd77fa662a12b85779a2d2d85d67ee0",
+ "sha256:18caa8cfbc676eaaf28613637a89980ad2fd96e00c564135bf90bc3f0b34dd93",
+ "sha256:2480ec2c72438430da9f601ebc12c518c093c13111a5c1644c82cdfc2e50b1e4",
+ "sha256:26412b21df30b2861424a6c6d5b1d8ca8107612a4cfa4d0183e71c5d200fb34a",
+ "sha256:280b67d20e33bb63171d55b1067f61fbd932e0b1ad976b3a184303a3dad22764",
+ "sha256:2cb635b67011bc147c257e61ce864879ffe6d03342dc74b6045059dfbdedafca",
+ "sha256:2de4b7263a33947ff440412339cb72b28a5a4c769b5c1ca19e33dd6cd1dcec6e",
+ "sha256:3ba4cc304eac4d4d458f508d4955a88ba25026890e8abff9b60404f76a62c55e",
+ "sha256:4c26a2f0dc15f81ea3afa3b0c87b87e501f235d332b7f27e2225ecb80c0b1cdd",
+ "sha256:590ef0898a4b0a15485b05210b4a1c9de8806d3ad3d47f74ab1dc07c67a6827f",
+ "sha256:5dfafca172933506773482b0e18f0cd766fd3920bd03ec85a283df90d8a17bc6",
+ "sha256:6cce52e196a5f1d6797ff7946cdff2038d3b5f0aba4a43cb6bf46b575fd1b5bb",
+ "sha256:7cb087b8612c8a1a14cf37dd754685be9a8d9869bed2ffaaceb04850a8aeef7e",
+ "sha256:7d85c1b613121ed3dbaa5a97369b3b757909531a959d229406a75b912dd51dd1",
+ "sha256:7ee86cbde706be13f2dec5a42b52b1c1d1cbb90c8e405c68d0755134735c8dc6",
+ "sha256:8898a66425a57bcf15e25fc19c12490b87bd939800f39a03ea2de2aea5e3611a",
+ "sha256:8acd7d34af70ee63f9a849f957558e49a98f8f1634f86a59d2be62bb8e93f71c",
+ "sha256:932c905b71a56474bff8a9c014030bc3c882cee696b448af920399f730a650c2",
+ "sha256:a1752eca64c60852f38bb29e2c86fca30d7672c024128ef5d70cc15868fa10f4",
+ "sha256:a3804675283f4764a02db05f5191eb8fec2bb6ca34d466167fc78a5f05bbe6b3",
+ "sha256:a4e74c522d630766b03a836c15bff77cb657c5fdf098abf8b1ada2aebc7d0819",
+ "sha256:a915597ffccabe902e7090e199a7bf7a381c5506a747d5e9d27ba55197a2c568",
+ "sha256:b7aa25fc0baa5b1d95b7633af4f5f1838467f1815442b22487426f94e0d66c53",
+ "sha256:cc2269ab4bce40b027b49663d61d816903a4bd90ad88cb99ed561aadb3888dd3",
+ "sha256:d5ebe0763c982f069d3877832254f64974139f4f9655058452603ff559c482e8",
+ "sha256:dad9bf36eda068e89059d1f07408e397856be9511d7113ea4b586642a429a4fd",
+ "sha256:de18954104667f565e2fbb4783b56667f30fb49c4d79b346f52a29cb198d5b6b",
+ "sha256:f35e442630bc4bc2e1878482d6f59ea22e280d7121d7adeaedba58c23ab6386b",
+ "sha256:f7787e0d469bdae763b876174cf2e6c0f7be79808af26b1da96f1a64bcf47297",
+ "sha256:ff99f952db3db2fbe98a0b355175f93ec334ba3d01bbde25ad3a5a33abc02b58"
+ ],
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+ "version": "==3.21.0"
},
"pydantic": {
"hashes": [
- "sha256:1363c7d975c7036df0db2b4a61f2e062fbc0aa5ab5f2772e0ffc7191a4f4bce2",
- "sha256:7aff4db5fdf3cf573d4b3c30926a510a10e19a0774d38fc4967f78beb6deb612"
+ "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f",
+ "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==2.9.1"
+ "version": "==2.9.2"
},
"pydantic-core": {
"hashes": [
- "sha256:01491d8b4d8db9f3391d93b0df60701e644ff0894352947f31fff3e52bd5c801",
- "sha256:03667cec5daf43ac4995cefa8aaf58f99de036204a37b889c24a80927b629cec",
- "sha256:03795b9e8a5d7fda05f3873efc3f59105e2dcff14231680296b87b80bb327295",
- "sha256:047531242f8e9c2db733599f1c612925de095e93c9cc0e599e96cf536aaf56ba",
- "sha256:04b07490bc2f6f2717b10c3969e1b830f5720b632f8ae2f3b8b1542394c47a8e",
- "sha256:09e926397f392059ce0afdcac920df29d9c833256354d0c55f1584b0b70cf07e",
- "sha256:0a0137ddf462575d9bce863c4c95bac3493ba8e22f8c28ca94634b4a1d3e2bb4",
- "sha256:0dda0290a6f608504882d9f7650975b4651ff91c85673341789a476b1159f211",
- "sha256:13dd45ba2561603681a2676ca56006d6dee94493f03d5cadc055d2055615c3ea",
- "sha256:1c3980f2843de5184656aab58698011b42763ccba11c4a8c35936c8dd6c7068c",
- "sha256:1eba2f7ce3e30ee2170410e2171867ea73dbd692433b81a93758ab2de6c64835",
- "sha256:203171e48946c3164fe7691fc349c79241ff8f28306abd4cad5f4f75ed80bc8d",
- "sha256:255ec6dcb899c115f1e2a64bc9ebc24cc0e3ab097775755244f77360d1f3c06c",
- "sha256:2718443bc671c7ac331de4eef9b673063b10af32a0bb385019ad61dcf2cc8f6c",
- "sha256:2b2b55b0448e9da68f56b696f313949cda1039e8ec7b5d294285335b53104b61",
- "sha256:2b603cde285322758a0279995b5796d64b63060bfbe214b50a3ca23b5cee3e83",
- "sha256:2b676583fc459c64146debea14ba3af54e540b61762dfc0613dc4e98c3f66eeb",
- "sha256:37ba321ac2a46100c578a92e9a6aa33afe9ec99ffa084424291d84e456f490c1",
- "sha256:3c09a7885dd33ee8c65266e5aa7fb7e2f23d49d8043f089989726391dd7350c5",
- "sha256:3cb0f65d8b4121c1b015c60104a685feb929a29d7cf204387c7f2688c7974690",
- "sha256:40b8441be16c1e940abebed83cd006ddb9e3737a279e339dbd6d31578b802f7b",
- "sha256:40d9bd259538dba2f40963286009bf7caf18b5112b19d2b55b09c14dde6db6a7",
- "sha256:4b259fd8409ab84b4041b7b3f24dcc41e4696f180b775961ca8142b5b21d0e70",
- "sha256:4f62c1c953d7ee375df5eb2e44ad50ce2f5aff931723b398b8bc6f0ac159791a",
- "sha256:50e4661f3337977740fdbfbae084ae5693e505ca2b3130a6d4eb0f2281dc43b8",
- "sha256:510b7fb0a86dc8f10a8bb43bd2f97beb63cffad1203071dc434dac26453955cd",
- "sha256:5499798317fff7f25dbef9347f4451b91ac2a4330c6669821c8202fd354c7bee",
- "sha256:560e32f0df04ac69b3dd818f71339983f6d1f70eb99d4d1f8e9705fb6c34a5c1",
- "sha256:59d52cf01854cb26c46958552a21acb10dd78a52aa34c86f284e66b209db8cab",
- "sha256:5a8cd3074a98ee70173a8633ad3c10e00dcb991ecec57263aacb4095c5efb958",
- "sha256:5b01a078dd4f9a52494370af21aa52964e0a96d4862ac64ff7cea06e0f12d2c5",
- "sha256:6470b5a1ec4d1c2e9afe928c6cb37eb33381cab99292a708b8cb9aa89e62429b",
- "sha256:65b6e5da855e9c55a0c67f4db8a492bf13d8d3316a59999cfbaf98cc6e401961",
- "sha256:67a5def279309f2e23014b608c4150b0c2d323bd7bccd27ff07b001c12c2415c",
- "sha256:68f4cf373f0de6abfe599a38307f4417c1c867ca381c03df27c873a9069cda25",
- "sha256:6b5547d098c76e1694ba85f05b595720d7c60d342f24d5aad32c3049131fa5c4",
- "sha256:6cb968da9a0746a0cf521b2b5ef25fc5a0bee9b9a1a8214e0a1cfaea5be7e8a4",
- "sha256:6daaf5b1ba1369a22c8b050b643250e3e5efc6a78366d323294aee54953a4d5f",
- "sha256:7200fd561fb3be06827340da066df4311d0b6b8eb0c2116a110be5245dceb326",
- "sha256:748bdf985014c6dd3e1e4cc3db90f1c3ecc7246ff5a3cd4ddab20c768b2f1dab",
- "sha256:76bdab0de4acb3f119c2a4bff740e0c7dc2e6de7692774620f7452ce11ca76c8",
- "sha256:7e6f33503c5495059148cc486867e1d24ca35df5fc064686e631e314d959ad5b",
- "sha256:7f10a5d1b9281392f1bf507d16ac720e78285dfd635b05737c3911637601bae6",
- "sha256:82da2f4703894134a9f000e24965df73cc103e31e8c31906cc1ee89fde72cbd8",
- "sha256:86fc6c762ca7ac8fbbdff80d61b2c59fb6b7d144aa46e2d54d9e1b7b0e780e01",
- "sha256:87cfa0ed6b8c5bd6ae8b66de941cece179281239d482f363814d2b986b79cedc",
- "sha256:89b731f25c80830c76fdb13705c68fef6a2b6dc494402987c7ea9584fe189f5d",
- "sha256:8b2682038e255e94baf2c473dca914a7460069171ff5cdd4080be18ab8a7fd6e",
- "sha256:8b5b3ed73abb147704a6e9f556d8c5cb078f8c095be4588e669d315e0d11893b",
- "sha256:8e22b477bf90db71c156f89a55bfe4d25177b81fce4aa09294d9e805eec13855",
- "sha256:9172d2088e27d9a185ea0a6c8cebe227a9139fd90295221d7d495944d2367700",
- "sha256:94f85614f2cba13f62c3c6481716e4adeae48e1eaa7e8bac379b9d177d93947a",
- "sha256:98ccd69edcf49f0875d86942f4418a4e83eb3047f20eb897bffa62a5d419c8fa",
- "sha256:a0d90e08b2727c5d01af1b5ef4121d2f0c99fbee692c762f4d9d0409c9da6541",
- "sha256:a3fc572d9b5b5cfe13f8e8a6e26271d5d13f80173724b738557a8c7f3a8a3791",
- "sha256:a678c1ac5c5ec5685af0133262103defb427114e62eafeda12f1357a12140162",
- "sha256:a7f7f72f721223f33d3dc98a791666ebc6a91fa023ce63733709f4894a7dc611",
- "sha256:bb68b41c3fa64587412b104294b9cbb027509dc2f6958446c502638d481525ef",
- "sha256:bbb5e45eab7624440516ee3722a3044b83fff4c0372efe183fd6ba678ff681fe",
- "sha256:c24574c7e92e2c56379706b9a3f07c1e0c7f2f87a41b6ee86653100c4ce343e5",
- "sha256:c483dab0f14b8d3f0df0c6c18d70b21b086f74c87ab03c59250dbf6d3c89baba",
- "sha256:c6de1ec30c4bb94f3a69c9f5f2182baeda5b809f806676675e9ef6b8dc936f28",
- "sha256:c744fa100fdea0d000d8bcddee95213d2de2e95b9c12be083370b2072333a0fa",
- "sha256:c889fd87e1f1bbeb877c2ee56b63bb297de4636661cc9bbfcf4b34e5e925bc27",
- "sha256:cbaaf2ef20d282659093913da9d402108203f7cb5955020bd8d1ae5a2325d1c4",
- "sha256:ce3317d155628301d649fe5e16a99528d5680af4ec7aa70b90b8dacd2d725c9b",
- "sha256:d015e63b985a78a3d4ccffd3bdf22b7c20b3bbd4b8227809b3e8e75bc37f9cb2",
- "sha256:d063c6b9fed7d992bcbebfc9133f4c24b7a7f215d6b102f3e082b1117cddb72c",
- "sha256:d965e8b325f443ed3196db890d85dfebbb09f7384486a77461347f4adb1fa7f8",
- "sha256:db6e6afcb95edbe6b357786684b71008499836e91f2a4a1e55b840955b341dbb",
- "sha256:dc1636770a809dee2bd44dd74b89cc80eb41172bcad8af75dd0bc182c2666d4c",
- "sha256:dd9be0a42de08f4b58a3cc73a123f124f65c24698b95a54c1543065baca8cf0e",
- "sha256:e0ec50663feedf64d21bad0809f5857bac1ce91deded203efc4a84b31b2e4305",
- "sha256:e2c409ce1c219c091e47cb03feb3c4ed8c2b8e004efc940da0166aaee8f9d6c8",
- "sha256:e61328920154b6a44d98cabcb709f10e8b74276bc709c9a513a8c37a18786cc4",
- "sha256:e89513f014c6be0d17b00a9a7c81b1c426f4eb9224b15433f3d98c1a071f8433",
- "sha256:ea85bda3189fb27503af4c45273735bcde3dd31c1ab17d11f37b04877859ef45",
- "sha256:edbefe079a520c5984e30e1f1f29325054b59534729c25b874a16a5048028d16",
- "sha256:f0cb80fd5c2df4898693aa841425ea1727b1b6d2167448253077d2a49003e0ed",
- "sha256:f2b05e6ccbee333a8f4b8f4d7c244fdb7a979e90977ad9c51ea31261e2085ce0",
- "sha256:f399e8657c67313476a121a6944311fab377085ca7f490648c9af97fc732732d",
- "sha256:f4a57db8966b3a1d1a350012839c6a0099f0898c56512dfade8a1fe5fb278710",
- "sha256:f56af3a420fb1ffaf43ece3ea09c2d27c444e7c40dcb7c6e7cf57aae764f2b48",
- "sha256:f6bd91345b5163ee7448bee201ed7dd601ca24f43f439109b0212e296eb5b423",
- "sha256:fb539d7e5dc4aac345846f290cf504d2fd3c1be26ac4e8b5e4c2b688069ff4cf",
- "sha256:fbdce4b47592f9e296e19ac31667daed8753c8367ebb34b9a9bd89dacaa299c9",
- "sha256:fc379c73fd66606628b866f661e8785088afe2adaba78e6bbe80796baf708a63",
- "sha256:fc3cf31edf405a161a0adad83246568647c54404739b614b1ff43dad2b02e6d5",
- "sha256:fcf31facf2796a2d3b7fe338fe8640aa0166e4e55b4cb108dbfd1058049bf4cb"
+ "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36",
+ "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05",
+ "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071",
+ "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327",
+ "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c",
+ "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36",
+ "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29",
+ "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744",
+ "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d",
+ "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec",
+ "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e",
+ "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e",
+ "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577",
+ "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232",
+ "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863",
+ "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6",
+ "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368",
+ "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480",
+ "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2",
+ "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2",
+ "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6",
+ "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769",
+ "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d",
+ "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2",
+ "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84",
+ "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166",
+ "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271",
+ "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5",
+ "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb",
+ "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13",
+ "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323",
+ "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556",
+ "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665",
+ "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef",
+ "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb",
+ "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119",
+ "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126",
+ "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510",
+ "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b",
+ "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87",
+ "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f",
+ "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc",
+ "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8",
+ "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21",
+ "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f",
+ "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6",
+ "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658",
+ "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b",
+ "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3",
+ "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb",
+ "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59",
+ "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24",
+ "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9",
+ "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3",
+ "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd",
+ "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753",
+ "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55",
+ "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad",
+ "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a",
+ "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605",
+ "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e",
+ "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b",
+ "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433",
+ "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8",
+ "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07",
+ "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728",
+ "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0",
+ "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327",
+ "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555",
+ "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64",
+ "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6",
+ "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea",
+ "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b",
+ "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df",
+ "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e",
+ "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd",
+ "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068",
+ "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3",
+ "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040",
+ "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12",
+ "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916",
+ "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f",
+ "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f",
+ "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801",
+ "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231",
+ "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5",
+ "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8",
+ "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee",
+ "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"
],
"markers": "python_version >= '3.8'",
- "version": "==2.23.3"
+ "version": "==2.23.4"
},
"pyjwt": {
"hashes": [
@@ -1433,19 +1570,19 @@
},
"s3transfer": {
"hashes": [
- "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6",
- "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"
+ "sha256:263ed587a5803c6c708d3ce44dc4dfedaab4c1a32e8329bab818933d79ddcf5d",
+ "sha256:4f50ed74ab84d474ce614475e0b8d5047ff080810aac5d01ea25231cfc944b0c"
],
"markers": "python_version >= '3.8'",
- "version": "==0.10.2"
+ "version": "==0.10.3"
},
"setuptools": {
"hashes": [
- "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308",
- "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6"
+ "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2",
+ "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"
],
"markers": "python_version >= '3.8'",
- "version": "==74.1.2"
+ "version": "==75.1.0"
},
"six": {
"hashes": [
@@ -1457,11 +1594,11 @@
},
"tinydb": {
"hashes": [
- "sha256:30c06d12383d7c332e404ca6a6103fb2b32cbf25712689648c39d9a6bd34bd3d",
- "sha256:6dd686a9c5a75dfa9280088fd79a419aefe19cd7f4bd85eba203540ef856d564"
+ "sha256:f7dfc39b8d7fda7a1ca62a8dbb449ffd340a117c1206b68c50b1a481fb95181d",
+ "sha256:f97030ee5cbc91eeadd1d7af07ab0e48ceb04aa63d4a983adbaca4cba16e86c3"
],
- "markers": "python_version >= '3.7' and python_version < '4.0'",
- "version": "==4.8.0"
+ "markers": "python_version >= '3.8' and python_version < '4.0'",
+ "version": "==4.8.2"
},
"tuspy": {
"hashes": [
@@ -1476,23 +1613,23 @@
"sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
"sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
],
- "markers": "python_version < '3.13'",
+ "markers": "python_version >= '3.8'",
"version": "==4.12.2"
},
"tzdata": {
"hashes": [
- "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd",
- "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"
+ "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc",
+ "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"
],
"markers": "python_version >= '2'",
- "version": "==2024.1"
+ "version": "==2024.2"
},
"urllib3": {
"hashes": [
"sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
"sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.8'",
"version": "==2.2.3"
},
"werkzeug": {
@@ -1505,101 +1642,107 @@
},
"yarl": {
"hashes": [
- "sha256:01a8697ec24f17c349c4f655763c4db70eebc56a5f82995e5e26e837c6eb0e49",
- "sha256:02da8759b47d964f9173c8675710720b468aa1c1693be0c9c64abb9d8d9a4867",
- "sha256:04293941646647b3bfb1719d1d11ff1028e9c30199509a844da3c0f5919dc520",
- "sha256:067b961853c8e62725ff2893226fef3d0da060656a9827f3f520fb1d19b2b68a",
- "sha256:077da604852be488c9a05a524068cdae1e972b7dc02438161c32420fb4ec5e14",
- "sha256:09696438cb43ea6f9492ef237761b043f9179f455f405279e609f2bc9100212a",
- "sha256:0b8486f322d8f6a38539136a22c55f94d269addb24db5cb6f61adc61eabc9d93",
- "sha256:0ea9682124fc062e3d931c6911934a678cb28453f957ddccf51f568c2f2b5e05",
- "sha256:0f351fa31234699d6084ff98283cb1e852270fe9e250a3b3bf7804eb493bd937",
- "sha256:14438dfc5015661f75f85bc5adad0743678eefee266ff0c9a8e32969d5d69f74",
- "sha256:15061ce6584ece023457fb8b7a7a69ec40bf7114d781a8c4f5dcd68e28b5c53b",
- "sha256:15439f3c5c72686b6c3ff235279630d08936ace67d0fe5c8d5bbc3ef06f5a420",
- "sha256:17b5a386d0d36fb828e2fb3ef08c8829c1ebf977eef88e5367d1c8c94b454639",
- "sha256:18ac56c9dd70941ecad42b5a906820824ca72ff84ad6fa18db33c2537ae2e089",
- "sha256:1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53",
- "sha256:1e969fa4c1e0b1a391f3fcbcb9ec31e84440253325b534519be0d28f4b6b533e",
- "sha256:1fa2e7a406fbd45b61b4433e3aa254a2c3e14c4b3186f6e952d08a730807fa0c",
- "sha256:2164cd9725092761fed26f299e3f276bb4b537ca58e6ff6b252eae9631b5c96e",
- "sha256:21a7c12321436b066c11ec19c7e3cb9aec18884fe0d5b25d03d756a9e654edfe",
- "sha256:238a21849dd7554cb4d25a14ffbfa0ef380bb7ba201f45b144a14454a72ffa5a",
- "sha256:250e888fa62d73e721f3041e3a9abf427788a1934b426b45e1b92f62c1f68366",
- "sha256:25861303e0be76b60fddc1250ec5986c42f0a5c0c50ff57cc30b1be199c00e63",
- "sha256:267b24f891e74eccbdff42241c5fb4f974de2d6271dcc7d7e0c9ae1079a560d9",
- "sha256:27fcb271a41b746bd0e2a92182df507e1c204759f460ff784ca614e12dd85145",
- "sha256:2909fa3a7d249ef64eeb2faa04b7957e34fefb6ec9966506312349ed8a7e77bf",
- "sha256:3257978c870728a52dcce8c2902bf01f6c53b65094b457bf87b2644ee6238ddc",
- "sha256:327c724b01b8641a1bf1ab3b232fb638706e50f76c0b5bf16051ab65c868fac5",
- "sha256:3de5292f9f0ee285e6bd168b2a77b2a00d74cbcfa420ed078456d3023d2f6dff",
- "sha256:3fce4da3703ee6048ad4138fe74619c50874afe98b1ad87b2698ef95bf92c96d",
- "sha256:3ff6b1617aa39279fe18a76c8d165469c48b159931d9b48239065767ee455b2b",
- "sha256:400cd42185f92de559d29eeb529e71d80dfbd2f45c36844914a4a34297ca6f00",
- "sha256:4179522dc0305c3fc9782549175c8e8849252fefeb077c92a73889ccbcd508ad",
- "sha256:4307d9a3417eea87715c9736d050c83e8c1904e9b7aada6ce61b46361b733d92",
- "sha256:476e20c433b356e16e9a141449f25161e6b69984fb4cdbd7cd4bd54c17844998",
- "sha256:489fa8bde4f1244ad6c5f6d11bb33e09cf0d1d0367edb197619c3e3fc06f3d91",
- "sha256:48a28bed68ab8fb7e380775f0029a079f08a17799cb3387a65d14ace16c12e2b",
- "sha256:48dfd117ab93f0129084577a07287376cc69c08138694396f305636e229caa1a",
- "sha256:4973eac1e2ff63cf187073cd4e1f1148dcd119314ab79b88e1b3fad74a18c9d5",
- "sha256:498442e3af2a860a663baa14fbf23fb04b0dd758039c0e7c8f91cb9279799bff",
- "sha256:501c503eed2bb306638ccb60c174f856cc3246c861829ff40eaa80e2f0330367",
- "sha256:504cf0d4c5e4579a51261d6091267f9fd997ef58558c4ffa7a3e1460bd2336fa",
- "sha256:61a5f2c14d0a1adfdd82258f756b23a550c13ba4c86c84106be4c111a3a4e413",
- "sha256:637c7ddb585a62d4469f843dac221f23eec3cbad31693b23abbc2c366ad41ff4",
- "sha256:66b63c504d2ca43bf7221a1f72fbe981ff56ecb39004c70a94485d13e37ebf45",
- "sha256:67459cf8cf31da0e2cbdb4b040507e535d25cfbb1604ca76396a3a66b8ba37a6",
- "sha256:688654f8507464745ab563b041d1fb7dab5d9912ca6b06e61d1c4708366832f5",
- "sha256:6907daa4b9d7a688063ed098c472f96e8181733c525e03e866fb5db480a424df",
- "sha256:69721b8effdb588cb055cc22f7c5105ca6fdaa5aeb3ea09021d517882c4a904c",
- "sha256:6d23754b9939cbab02c63434776df1170e43b09c6a517585c7ce2b3d449b7318",
- "sha256:7175a87ab8f7fbde37160a15e58e138ba3b2b0e05492d7351314a250d61b1591",
- "sha256:72bf26f66456baa0584eff63e44545c9f0eaed9b73cb6601b647c91f14c11f38",
- "sha256:74db2ef03b442276d25951749a803ddb6e270d02dda1d1c556f6ae595a0d76a8",
- "sha256:750f656832d7d3cb0c76be137ee79405cc17e792f31e0a01eee390e383b2936e",
- "sha256:75e0ae31fb5ccab6eda09ba1494e87eb226dcbd2372dae96b87800e1dcc98804",
- "sha256:768ecc550096b028754ea28bf90fde071c379c62c43afa574edc6f33ee5daaec",
- "sha256:7d51324a04fc4b0e097ff8a153e9276c2593106a811704025bbc1d6916f45ca6",
- "sha256:7e975a2211952a8a083d1b9d9ba26472981ae338e720b419eb50535de3c02870",
- "sha256:8215f6f21394d1f46e222abeb06316e77ef328d628f593502d8fc2a9117bde83",
- "sha256:8258c86f47e080a258993eed877d579c71da7bda26af86ce6c2d2d072c11320d",
- "sha256:8418c053aeb236b20b0ab8fa6bacfc2feaaf7d4683dd96528610989c99723d5f",
- "sha256:87f020d010ba80a247c4abc335fc13421037800ca20b42af5ae40e5fd75e7909",
- "sha256:884eab2ce97cbaf89f264372eae58388862c33c4f551c15680dd80f53c89a269",
- "sha256:8a336eaa7ee7e87cdece3cedb395c9657d227bfceb6781295cf56abcd3386a26",
- "sha256:8aef1b64da41d18026632d99a06b3fefe1d08e85dd81d849fa7c96301ed22f1b",
- "sha256:8aef97ba1dd2138112890ef848e17d8526fe80b21f743b4ee65947ea184f07a2",
- "sha256:8ed653638ef669e0efc6fe2acb792275cb419bf9cb5c5049399f3556995f23c7",
- "sha256:9361628f28f48dcf8b2f528420d4d68102f593f9c2e592bfc842f5fb337e44fd",
- "sha256:946eedc12895873891aaceb39bceb484b4977f70373e0122da483f6c38faaa68",
- "sha256:94d0caaa912bfcdc702a4204cd5e2bb01eb917fc4f5ea2315aa23962549561b0",
- "sha256:964a428132227edff96d6f3cf261573cb0f1a60c9a764ce28cda9525f18f7786",
- "sha256:999bfee0a5b7385a0af5ffb606393509cfde70ecca4f01c36985be6d33e336da",
- "sha256:a08ea567c16f140af8ddc7cb58e27e9138a1386e3e6e53982abaa6f2377b38cc",
- "sha256:a28b70c9e2213de425d9cba5ab2e7f7a1c8ca23a99c4b5159bf77b9c31251447",
- "sha256:a34e1e30f1774fa35d37202bbeae62423e9a79d78d0874e5556a593479fdf239",
- "sha256:a4264515f9117be204935cd230fb2a052dd3792789cc94c101c535d349b3dab0",
- "sha256:a7915ea49b0c113641dc4d9338efa9bd66b6a9a485ffe75b9907e8573ca94b84",
- "sha256:aac44097d838dda26526cffb63bdd8737a2dbdf5f2c68efb72ad83aec6673c7e",
- "sha256:b91044952da03b6f95fdba398d7993dd983b64d3c31c358a4c89e3c19b6f7aef",
- "sha256:ba444bdd4caa2a94456ef67a2f383710928820dd0117aae6650a4d17029fa25e",
- "sha256:c2dc4250fe94d8cd864d66018f8344d4af50e3758e9d725e94fecfa27588ff82",
- "sha256:c35f493b867912f6fda721a59cc7c4766d382040bdf1ddaeeaa7fa4d072f4675",
- "sha256:c92261eb2ad367629dc437536463dc934030c9e7caca861cc51990fe6c565f26",
- "sha256:ce928c9c6409c79e10f39604a7e214b3cb69552952fbda8d836c052832e6a979",
- "sha256:d95b52fbef190ca87d8c42f49e314eace4fc52070f3dfa5f87a6594b0c1c6e46",
- "sha256:dae7bd0daeb33aa3e79e72877d3d51052e8b19c9025ecf0374f542ea8ec120e4",
- "sha256:e286580b6511aac7c3268a78cdb861ec739d3e5a2a53b4809faef6b49778eaff",
- "sha256:e4b53f73077e839b3f89c992223f15b1d2ab314bdbdf502afdc7bb18e95eae27",
- "sha256:e8f63904df26d1a66aabc141bfd258bf738b9bc7bc6bdef22713b4f5ef789a4c",
- "sha256:f3a6d90cab0bdf07df8f176eae3a07127daafcf7457b997b2bf46776da2c7eb7",
- "sha256:f41fa79114a1d2eddb5eea7b912d6160508f57440bd302ce96eaa384914cd265",
- "sha256:f46f81501160c28d0c0b7333b4f7be8983dbbc161983b6fb814024d1b4952f79",
- "sha256:f61db3b7e870914dbd9434b560075e0366771eecbe6d2b5561f5bc7485f39efd"
+ "sha256:0545de8c688fbbf3088f9e8b801157923be4bf8e7b03e97c2ecd4dfa39e48e0e",
+ "sha256:076b1ed2ac819933895b1a000904f62d615fe4533a5cf3e052ff9a1da560575c",
+ "sha256:0afad2cd484908f472c8fe2e8ef499facee54a0a6978be0e0cff67b1254fd747",
+ "sha256:0ccaa1bc98751fbfcf53dc8dfdb90d96e98838010fc254180dd6707a6e8bb179",
+ "sha256:0d3105efab7c5c091609abacad33afff33bdff0035bece164c98bcf5a85ef90a",
+ "sha256:0e1af74a9529a1137c67c887ed9cde62cff53aa4d84a3adbec329f9ec47a3936",
+ "sha256:136f9db0f53c0206db38b8cd0c985c78ded5fd596c9a86ce5c0b92afb91c3a19",
+ "sha256:156ececdf636143f508770bf8a3a0498de64da5abd890c7dbb42ca9e3b6c05b8",
+ "sha256:15c87339490100c63472a76d87fe7097a0835c705eb5ae79fd96e343473629ed",
+ "sha256:1695497bb2a02a6de60064c9f077a4ae9c25c73624e0d43e3aa9d16d983073c2",
+ "sha256:173563f3696124372831007e3d4b9821746964a95968628f7075d9231ac6bb33",
+ "sha256:173866d9f7409c0fb514cf6e78952e65816600cb888c68b37b41147349fe0057",
+ "sha256:23ec1d3c31882b2a8a69c801ef58ebf7bae2553211ebbddf04235be275a38548",
+ "sha256:243fbbbf003754fe41b5bdf10ce1e7f80bcc70732b5b54222c124d6b4c2ab31c",
+ "sha256:28c6cf1d92edf936ceedc7afa61b07e9d78a27b15244aa46bbcd534c7458ee1b",
+ "sha256:2aa738e0282be54eede1e3f36b81f1e46aee7ec7602aa563e81e0e8d7b67963f",
+ "sha256:2cf441c4b6e538ba0d2591574f95d3fdd33f1efafa864faa077d9636ecc0c4e9",
+ "sha256:30c3ff305f6e06650a761c4393666f77384f1cc6c5c0251965d6bfa5fbc88f7f",
+ "sha256:31561a5b4d8dbef1559b3600b045607cf804bae040f64b5f5bca77da38084a8a",
+ "sha256:32b66be100ac5739065496c74c4b7f3015cef792c3174982809274d7e51b3e04",
+ "sha256:3433da95b51a75692dcf6cc8117a31410447c75a9a8187888f02ad45c0a86c50",
+ "sha256:34a2d76a1984cac04ff8b1bfc939ec9dc0914821264d4a9c8fd0ed6aa8d4cfd2",
+ "sha256:353665775be69bbfc6d54c8d134bfc533e332149faeddd631b0bc79df0897f46",
+ "sha256:38d0124fa992dbacd0c48b1b755d3ee0a9f924f427f95b0ef376556a24debf01",
+ "sha256:3c56ec1eacd0a5d35b8a29f468659c47f4fe61b2cab948ca756c39b7617f0aa5",
+ "sha256:3db817b4e95eb05c362e3b45dafe7144b18603e1211f4a5b36eb9522ecc62bcf",
+ "sha256:3e52474256a7db9dcf3c5f4ca0b300fdea6c21cca0148c8891d03a025649d935",
+ "sha256:416f2e3beaeae81e2f7a45dc711258be5bdc79c940a9a270b266c0bec038fb84",
+ "sha256:435aca062444a7f0c884861d2e3ea79883bd1cd19d0a381928b69ae1b85bc51d",
+ "sha256:4388c72174868884f76affcdd3656544c426407e0043c89b684d22fb265e04a5",
+ "sha256:43ebdcc120e2ca679dba01a779333a8ea76b50547b55e812b8b92818d604662c",
+ "sha256:458c0c65802d816a6b955cf3603186de79e8fdb46d4f19abaec4ef0a906f50a7",
+ "sha256:533a28754e7f7439f217550a497bb026c54072dbe16402b183fdbca2431935a9",
+ "sha256:553dad9af802a9ad1a6525e7528152a015b85fb8dbf764ebfc755c695f488367",
+ "sha256:5838f2b79dc8f96fdc44077c9e4e2e33d7089b10788464609df788eb97d03aad",
+ "sha256:5b48388ded01f6f2429a8c55012bdbd1c2a0c3735b3e73e221649e524c34a58d",
+ "sha256:5bc0df728e4def5e15a754521e8882ba5a5121bd6b5a3a0ff7efda5d6558ab3d",
+ "sha256:63eab904f8630aed5a68f2d0aeab565dcfc595dc1bf0b91b71d9ddd43dea3aea",
+ "sha256:66f629632220a4e7858b58e4857927dd01a850a4cef2fb4044c8662787165cf7",
+ "sha256:670eb11325ed3a6209339974b276811867defe52f4188fe18dc49855774fa9cf",
+ "sha256:69d5856d526802cbda768d3e6246cd0d77450fa2a4bc2ea0ea14f0d972c2894b",
+ "sha256:6e840553c9c494a35e449a987ca2c4f8372668ee954a03a9a9685075228e5036",
+ "sha256:711bdfae4e699a6d4f371137cbe9e740dc958530cb920eb6f43ff9551e17cfbc",
+ "sha256:74abb8709ea54cc483c4fb57fb17bb66f8e0f04438cff6ded322074dbd17c7ec",
+ "sha256:75119badf45f7183e10e348edff5a76a94dc19ba9287d94001ff05e81475967b",
+ "sha256:766dcc00b943c089349d4060b935c76281f6be225e39994c2ccec3a2a36ad627",
+ "sha256:78e6fdc976ec966b99e4daa3812fac0274cc28cd2b24b0d92462e2e5ef90d368",
+ "sha256:81dadafb3aa124f86dc267a2168f71bbd2bfb163663661ab0038f6e4b8edb810",
+ "sha256:82d5161e8cb8f36ec778fd7ac4d740415d84030f5b9ef8fe4da54784a1f46c94",
+ "sha256:833547179c31f9bec39b49601d282d6f0ea1633620701288934c5f66d88c3e50",
+ "sha256:856b7f1a7b98a8c31823285786bd566cf06226ac4f38b3ef462f593c608a9bd6",
+ "sha256:8657d3f37f781d987037f9cc20bbc8b40425fa14380c87da0cb8dfce7c92d0fb",
+ "sha256:93bed8a8084544c6efe8856c362af08a23e959340c87a95687fdbe9c9f280c8b",
+ "sha256:954dde77c404084c2544e572f342aef384240b3e434e06cecc71597e95fd1ce7",
+ "sha256:98f68df80ec6ca3015186b2677c208c096d646ef37bbf8b49764ab4a38183931",
+ "sha256:99e12d2bf587b44deb74e0d6170fec37adb489964dbca656ec41a7cd8f2ff178",
+ "sha256:9a13a07532e8e1c4a5a3afff0ca4553da23409fad65def1b71186fb867eeae8d",
+ "sha256:9c1e3ff4b89cdd2e1a24c214f141e848b9e0451f08d7d4963cb4108d4d798f1f",
+ "sha256:9ce2e0f6123a60bd1a7f5ae3b2c49b240c12c132847f17aa990b841a417598a2",
+ "sha256:9fcda20b2de7042cc35cf911702fa3d8311bd40055a14446c1e62403684afdc5",
+ "sha256:a32d58f4b521bb98b2c0aa9da407f8bd57ca81f34362bcb090e4a79e9924fefc",
+ "sha256:a39c36f4218a5bb668b4f06874d676d35a035ee668e6e7e3538835c703634b84",
+ "sha256:a5cafb02cf097a82d74403f7e0b6b9df3ffbfe8edf9415ea816314711764a27b",
+ "sha256:a7cf963a357c5f00cb55b1955df8bbe68d2f2f65de065160a1c26b85a1e44172",
+ "sha256:a880372e2e5dbb9258a4e8ff43f13888039abb9dd6d515f28611c54361bc5644",
+ "sha256:ace4cad790f3bf872c082366c9edd7f8f8f77afe3992b134cfc810332206884f",
+ "sha256:af8ff8d7dc07ce873f643de6dfbcd45dc3db2c87462e5c387267197f59e6d776",
+ "sha256:b47a6000a7e833ebfe5886b56a31cb2ff12120b1efd4578a6fcc38df16cc77bd",
+ "sha256:b71862a652f50babab4a43a487f157d26b464b1dedbcc0afda02fd64f3809d04",
+ "sha256:b7f227ca6db5a9fda0a2b935a2ea34a7267589ffc63c8045f0e4edb8d8dcf956",
+ "sha256:bc8936d06cd53fddd4892677d65e98af514c8d78c79864f418bbf78a4a2edde4",
+ "sha256:bed1b5dbf90bad3bfc19439258c97873eab453c71d8b6869c136346acfe497e7",
+ "sha256:c45817e3e6972109d1a2c65091504a537e257bc3c885b4e78a95baa96df6a3f8",
+ "sha256:c68e820879ff39992c7f148113b46efcd6ec765a4865581f2902b3c43a5f4bbb",
+ "sha256:c77494a2f2282d9bbbbcab7c227a4d1b4bb829875c96251f66fb5f3bae4fb053",
+ "sha256:c998d0558805860503bc3a595994895ca0f7835e00668dadc673bbf7f5fbfcbe",
+ "sha256:ccad2800dfdff34392448c4bf834be124f10a5bc102f254521d931c1c53c455a",
+ "sha256:cd126498171f752dd85737ab1544329a4520c53eed3997f9b08aefbafb1cc53b",
+ "sha256:ce44217ad99ffad8027d2fde0269ae368c86db66ea0571c62a000798d69401fb",
+ "sha256:d1ac2bc069f4a458634c26b101c2341b18da85cb96afe0015990507efec2e417",
+ "sha256:d417a4f6943112fae3924bae2af7112562285848d9bcee737fc4ff7cbd450e6c",
+ "sha256:d538df442c0d9665664ab6dd5fccd0110fa3b364914f9c85b3ef9b7b2e157980",
+ "sha256:ded1b1803151dd0f20a8945508786d57c2f97a50289b16f2629f85433e546d47",
+ "sha256:e2e93b88ecc8f74074012e18d679fb2e9c746f2a56f79cd5e2b1afcf2a8a786b",
+ "sha256:e4ca3b9f370f218cc2a0309542cab8d0acdfd66667e7c37d04d617012485f904",
+ "sha256:e4ee8b8639070ff246ad3649294336b06db37a94bdea0d09ea491603e0be73b8",
+ "sha256:e52f77a0cd246086afde8815039f3e16f8d2be51786c0a39b57104c563c5cbb0",
+ "sha256:eaea112aed589131f73d50d570a6864728bd7c0c66ef6c9154ed7b59f24da611",
+ "sha256:ed20a4bdc635f36cb19e630bfc644181dd075839b6fc84cac51c0f381ac472e2",
+ "sha256:eedc3f247ee7b3808ea07205f3e7d7879bc19ad3e6222195cd5fbf9988853e4d",
+ "sha256:f0e1844ad47c7bd5d6fa784f1d4accc5f4168b48999303a868fe0f8597bde715",
+ "sha256:f4fe99ce44128c71233d0d72152db31ca119711dfc5f2c82385ad611d8d7f897",
+ "sha256:f8cfd847e6b9ecf9f2f2531c8427035f291ec286c0a4944b0a9fce58c6446046",
+ "sha256:f9ca0e6ce7774dc7830dc0cc4bb6b3eec769db667f230e7c770a628c1aa5681b",
+ "sha256:fa2bea05ff0a8fb4d8124498e00e02398f06d23cdadd0fe027d84a3f7afde31e",
+ "sha256:fbbb63bed5fcd70cd3dd23a087cd78e4675fb5a2963b8af53f945cbbca79ae16",
+ "sha256:fbda058a9a68bec347962595f50546a8a4a34fd7b0654a7b9697917dc2bf810d",
+ "sha256:ffd591e22b22f9cb48e472529db6a47203c41c2c5911ff0a52e85723196c0d75"
],
"markers": "python_version >= '3.8'",
- "version": "==1.11.1"
+ "version": "==1.15.2"
},
"zope.event": {
"hashes": [
@@ -1611,43 +1754,46 @@
},
"zope.interface": {
"hashes": [
- "sha256:01e6e58078ad2799130c14a1d34ec89044ada0e1495329d72ee0407b9ae5100d",
- "sha256:064ade95cb54c840647205987c7b557f75d2b2f7d1a84bfab4cf81822ef6e7d1",
- "sha256:11fa1382c3efb34abf16becff8cb214b0b2e3144057c90611621f2d186b7e1b7",
- "sha256:1bee1b722077d08721005e8da493ef3adf0b7908e0cd85cc7dc836ac117d6f32",
- "sha256:1eeeb92cb7d95c45e726e3c1afe7707919370addae7ed14f614e22217a536958",
- "sha256:21a207c6b2c58def5011768140861a73f5240f4f39800625072ba84e76c9da0b",
- "sha256:2545d6d7aac425d528cd9bf0d9e55fcd47ab7fd15f41a64b1c4bf4c6b24946dc",
- "sha256:2c4316a30e216f51acbd9fb318aa5af2e362b716596d82cbb92f9101c8f8d2e7",
- "sha256:35062d93bc49bd9b191331c897a96155ffdad10744ab812485b6bad5b588d7e4",
- "sha256:382d31d1e68877061daaa6499468e9eb38eb7625d4369b1615ac08d3860fe896",
- "sha256:3aa8fcbb0d3c2be1bfd013a0f0acd636f6ed570c287743ae2bbd467ee967154d",
- "sha256:3d4b91821305c8d8f6e6207639abcbdaf186db682e521af7855d0bea3047c8ca",
- "sha256:3de1d553ce72868b77a7e9d598c9bff6d3816ad2b4cc81c04f9d8914603814f3",
- "sha256:3fcdc76d0cde1c09c37b7c6b0f8beba2d857d8417b055d4f47df9c34ec518bdd",
- "sha256:5112c530fa8aa2108a3196b9c2f078f5738c1c37cfc716970edc0df0414acda8",
- "sha256:53d678bb1c3b784edbfb0adeebfeea6bf479f54da082854406a8f295d36f8386",
- "sha256:6195c3c03fef9f87c0dbee0b3b6451df6e056322463cf35bca9a088e564a3c58",
- "sha256:6d04b11ea47c9c369d66340dbe51e9031df2a0de97d68f442305ed7625ad6493",
- "sha256:6dd647fcd765030638577fe6984284e0ebba1a1008244c8a38824be096e37fe3",
- "sha256:799ef7a444aebbad5a145c3b34bff012b54453cddbde3332d47ca07225792ea4",
- "sha256:7d92920416f31786bc1b2f34cc4fc4263a35a407425319572cbf96b51e835cd3",
- "sha256:7e0c151a6c204f3830237c59ee4770cc346868a7a1af6925e5e38650141a7f05",
- "sha256:84f8794bd59ca7d09d8fce43ae1b571be22f52748169d01a13d3ece8394d8b5b",
- "sha256:95e5913ec718010dc0e7c215d79a9683b4990e7026828eedfda5268e74e73e11",
- "sha256:9b9369671a20b8d039b8e5a1a33abd12e089e319a3383b4cc0bf5c67bd05fe7b",
- "sha256:ab985c566a99cc5f73bc2741d93f1ed24a2cc9da3890144d37b9582965aff996",
- "sha256:af94e429f9d57b36e71ef4e6865182090648aada0cb2d397ae2b3f7fc478493a",
- "sha256:c96b3e6b0d4f6ddfec4e947130ec30bd2c7b19db6aa633777e46c8eecf1d6afd",
- "sha256:cd2690d4b08ec9eaf47a85914fe513062b20da78d10d6d789a792c0b20307fb1",
- "sha256:d3b7ce6d46fb0e60897d62d1ff370790ce50a57d40a651db91a3dde74f73b738",
- "sha256:d976fa7b5faf5396eb18ce6c132c98e05504b52b60784e3401f4ef0b2e66709b",
- "sha256:db6237e8fa91ea4f34d7e2d16d74741187e9105a63bbb5686c61fea04cdbacca",
- "sha256:ecd32f30f40bfd8511b17666895831a51b532e93fc106bfa97f366589d3e4e0e",
- "sha256:f418c88f09c3ba159b95a9d1cfcdbe58f208443abb1f3109f4b9b12fd60b187c"
+ "sha256:07add15de0cc7e69917f7d286b64d54125c950aeb43efed7a5ea7172f000fbc1",
+ "sha256:0ac20581fc6cd7c754f6dff0ae06fedb060fa0e9ea6309d8be8b2701d9ea51c4",
+ "sha256:124149e2d42067b9c6597f4dafdc7a0983d0163868f897b7bb5dc850b14f9a87",
+ "sha256:27cfb5205d68b12682b6e55ab8424662d96e8ead19550aad0796b08dd2c9a45e",
+ "sha256:2a29ac607e970b5576547f0e3589ec156e04de17af42839eedcf478450687317",
+ "sha256:2b6a4924f5bad9fe21d99f66a07da60d75696a136162427951ec3cb223a5570d",
+ "sha256:2bd9e9f366a5df08ebbdc159f8224904c1c5ce63893984abb76954e6fbe4381a",
+ "sha256:3bcff5c09d0215f42ba64b49205a278e44413d9bf9fa688fd9e42bfe472b5f4f",
+ "sha256:3f005869a1a05e368965adb2075f97f8ee9a26c61898a9e52a9764d93774f237",
+ "sha256:4a00ead2e24c76436e1b457a5132d87f83858330f6c923640b7ef82d668525d1",
+ "sha256:4af4a12b459a273b0b34679a5c3dc5e34c1847c3dd14a628aa0668e19e638ea2",
+ "sha256:5501e772aff595e3c54266bc1bfc5858e8f38974ce413a8f1044aae0f32a83a3",
+ "sha256:5e28ea0bc4b084fc93a483877653a033062435317082cdc6388dec3438309faf",
+ "sha256:5e956b1fd7f3448dd5e00f273072e73e50dfafcb35e4227e6d5af208075593c9",
+ "sha256:5fcf379b875c610b5a41bc8a891841533f98de0520287d7f85e25386cd10d3e9",
+ "sha256:6159e767d224d8f18deff634a1d3722e68d27488c357f62ebeb5f3e2f5288b1f",
+ "sha256:661d5df403cd3c5b8699ac480fa7f58047a3253b029db690efa0c3cf209993ef",
+ "sha256:711eebc77f2092c6a8b304bad0b81a6ce3cf5490b25574e7309fbc07d881e3af",
+ "sha256:80a3c00b35f6170be5454b45abe2719ea65919a2f09e8a6e7b1362312a872cd3",
+ "sha256:848b6fa92d7c8143646e64124ed46818a0049a24ecc517958c520081fd147685",
+ "sha256:91b6c30689cfd87c8f264acb2fc16ad6b3c72caba2aec1bf189314cf1a84ca33",
+ "sha256:9733a9a0f94ef53d7aa64661811b20875b5bc6039034c6e42fb9732170130573",
+ "sha256:9940d5bc441f887c5f375ec62bcf7e7e495a2d5b1da97de1184a88fb567f06af",
+ "sha256:9e3e48f3dea21c147e1b10c132016cb79af1159facca9736d231694ef5a740a8",
+ "sha256:a14c9decf0eb61e0892631271d500c1e306c7b6901c998c7035e194d9150fdd1",
+ "sha256:a735f82d2e3ed47ca01a20dfc4c779b966b16352650a8036ab3955aad151ed8a",
+ "sha256:a99240b1d02dc469f6afbe7da1bf617645e60290c272968f4e53feec18d7dce8",
+ "sha256:b7b25db127db3e6b597c5f74af60309c4ad65acd826f89609662f0dc33a54728",
+ "sha256:b936d61dbe29572fd2cfe13e30b925e5383bed1aba867692670f5a2a2eb7b4e9",
+ "sha256:bec001798ab62c3fc5447162bf48496ae9fba02edc295a9e10a0b0c639a6452e",
+ "sha256:cc8a318162123eddbdf22fcc7b751288ce52e4ad096d3766ff1799244352449d",
+ "sha256:d0a45b5af9f72c805ee668d1479480ca85169312211bed6ed18c343e39307d5f",
+ "sha256:e53c291debef523b09e1fe3dffe5f35dde164f1c603d77f770b88a1da34b7ed6",
+ "sha256:ec1ef1fdb6f014d5886b97e52b16d0f852364f447d2ab0f0c6027765777b6667",
+ "sha256:ec59fe53db7d32abb96c6d4efeed84aab4a7c38c62d7a901a9b20c09dd936e7a",
+ "sha256:f245d039f72e6f802902375755846f5de1ee1e14c3e8736c078565599bcab621",
+ "sha256:ff115ef91c0eeac69cd92daeba36a9d8e14daee445b504eeea2b1c0b55821984"
],
"markers": "python_version >= '3.8'",
- "version": "==7.0.3"
+ "version": "==7.1.0"
}
},
"develop": {
@@ -1769,178 +1915,183 @@
},
"charset-normalizer": {
"hashes": [
- "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
- "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
- "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
- "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
- "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
- "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
- "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
- "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
- "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
- "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
- "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
- "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
- "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
- "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
- "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
- "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
- "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
- "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
- "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
- "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
- "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
- "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
- "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
- "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
- "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
- "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
- "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
- "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
- "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
- "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
- "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
- "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
- "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
- "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
- "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
- "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
- "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
- "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
- "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
- "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
- "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
- "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
- "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
- "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
- "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
- "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
- "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
- "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
- "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
- "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
- "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
- "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
- "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
- "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
- "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
- "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
- "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
- "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
- "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
- "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
- "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
- "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
- "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
- "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
- "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
- "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
- "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
- "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
- "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
- "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
- "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
- "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
- "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
- "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
- "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
- "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
- "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
- "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
- "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
- "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
- "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
- "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
- "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
- "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
- "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
- "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
- "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
- "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
- "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
- "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
+ "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.3.2"
+ "version": "==3.4.0"
},
"coverage": {
"hashes": [
- "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca",
- "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d",
- "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6",
- "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989",
- "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c",
- "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b",
- "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223",
- "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f",
- "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56",
- "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3",
- "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8",
- "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb",
- "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388",
- "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0",
- "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a",
- "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8",
- "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f",
- "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a",
- "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962",
- "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8",
- "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391",
- "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc",
- "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2",
- "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155",
- "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb",
- "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0",
- "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c",
- "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a",
- "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004",
- "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060",
- "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232",
- "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93",
- "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129",
- "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163",
- "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de",
- "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6",
- "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23",
- "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569",
- "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d",
- "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778",
- "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d",
- "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36",
- "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a",
- "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6",
- "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34",
- "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704",
- "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106",
- "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9",
- "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862",
- "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b",
- "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255",
- "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16",
- "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3",
- "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133",
- "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb",
- "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657",
- "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d",
- "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca",
- "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36",
- "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c",
- "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e",
- "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff",
- "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7",
- "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5",
- "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02",
- "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c",
- "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df",
- "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3",
- "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a",
- "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959",
- "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234",
- "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc"
+ "sha256:04f2189716e85ec9192df307f7c255f90e78b6e9863a03223c3b998d24a3c6c6",
+ "sha256:0c6c0f4d53ef603397fc894a895b960ecd7d44c727df42a8d500031716d4e8d2",
+ "sha256:0ca37993206402c6c35dc717f90d4c8f53568a8b80f0bf1a1b2b334f4d488fba",
+ "sha256:12f9515d875859faedb4144fd38694a761cd2a61ef9603bf887b13956d0bbfbb",
+ "sha256:1990b1f4e2c402beb317840030bb9f1b6a363f86e14e21b4212e618acdfce7f6",
+ "sha256:2341a78ae3a5ed454d524206a3fcb3cec408c2a0c7c2752cd78b606a2ff15af4",
+ "sha256:23bb63ae3f4c645d2d82fa22697364b0046fbafb6261b258a58587441c5f7bd0",
+ "sha256:27bd5f18d8f2879e45724b0ce74f61811639a846ff0e5c0395b7818fae87aec6",
+ "sha256:2dc7d6b380ca76f5e817ac9eef0c3686e7834c8346bef30b041a4ad286449990",
+ "sha256:331b200ad03dbaa44151d74daeb7da2cf382db424ab923574f6ecca7d3b30de3",
+ "sha256:365defc257c687ce3e7d275f39738dcd230777424117a6c76043459db131dd43",
+ "sha256:37be7b5ea3ff5b7c4a9db16074dc94523b5f10dd1f3b362a827af66a55198175",
+ "sha256:3c2e6fa98032fec8282f6b27e3f3986c6e05702828380618776ad794e938f53a",
+ "sha256:40e8b1983080439d4802d80b951f4a93d991ef3261f69e81095a66f86cf3c3c6",
+ "sha256:43517e1f6b19f610a93d8227e47790722c8bf7422e46b365e0469fc3d3563d97",
+ "sha256:43b32a06c47539fe275106b376658638b418c7cfdfff0e0259fbf877e845f14b",
+ "sha256:43d6a66e33b1455b98fc7312b124296dad97a2e191c80320587234a77b1b736e",
+ "sha256:4c59d6a4a4633fad297f943c03d0d2569867bd5372eb5684befdff8df8522e39",
+ "sha256:52ac29cc72ee7e25ace7807249638f94c9b6a862c56b1df015d2b2e388e51dbd",
+ "sha256:54356a76b67cf8a3085818026bb556545ebb8353951923b88292556dfa9f812d",
+ "sha256:583049c63106c0555e3ae3931edab5669668bbef84c15861421b94e121878d3f",
+ "sha256:6d99198203f0b9cb0b5d1c0393859555bc26b548223a769baf7e321a627ed4fc",
+ "sha256:6da42bbcec130b188169107ecb6ee7bd7b4c849d24c9370a0c884cf728d8e976",
+ "sha256:6e484e479860e00da1f005cd19d1c5d4a813324e5951319ac3f3eefb497cc549",
+ "sha256:70a6756ce66cd6fe8486c775b30889f0dc4cb20c157aa8c35b45fd7868255c5c",
+ "sha256:70d24936ca6c15a3bbc91ee9c7fc661132c6f4c9d42a23b31b6686c05073bde5",
+ "sha256:71967c35828c9ff94e8c7d405469a1fb68257f686bca7c1ed85ed34e7c2529c4",
+ "sha256:79644f68a6ff23b251cae1c82b01a0b51bc40c8468ca9585c6c4b1aeee570e0b",
+ "sha256:87cd2e29067ea397a47e352efb13f976eb1b03e18c999270bb50589323294c6e",
+ "sha256:8d4c6ea0f498c7c79111033a290d060c517853a7bcb2f46516f591dab628ddd3",
+ "sha256:9134032f5aa445ae591c2ba6991d10136a1f533b1d2fa8f8c21126468c5025c6",
+ "sha256:921fbe13492caf6a69528f09d5d7c7d518c8d0e7b9f6701b7719715f29a71e6e",
+ "sha256:99670790f21a96665a35849990b1df447993880bb6463a0a1d757897f30da929",
+ "sha256:9975442f2e7a5cfcf87299c26b5a45266ab0696348420049b9b94b2ad3d40234",
+ "sha256:99ded130555c021d99729fabd4ddb91a6f4cc0707df4b1daf912c7850c373b13",
+ "sha256:a3328c3e64ea4ab12b85999eb0779e6139295bbf5485f69d42cf794309e3d007",
+ "sha256:a4fb91d5f72b7e06a14ff4ae5be625a81cd7e5f869d7a54578fc271d08d58ae3",
+ "sha256:aa23ce39661a3e90eea5f99ec59b763b7d655c2cada10729ed920a38bfc2b167",
+ "sha256:aac7501ae73d4a02f4b7ac8fcb9dc55342ca98ffb9ed9f2dfb8a25d53eda0e4d",
+ "sha256:ab84a8b698ad5a6c365b08061920138e7a7dd9a04b6feb09ba1bfae68346ce6d",
+ "sha256:b4adeb878a374126f1e5cf03b87f66279f479e01af0e9a654cf6d1509af46c40",
+ "sha256:b9853509b4bf57ba7b1f99b9d866c422c9c5248799ab20e652bbb8a184a38181",
+ "sha256:bb7d5fe92bd0dc235f63ebe9f8c6e0884f7360f88f3411bfed1350c872ef2054",
+ "sha256:bca4c8abc50d38f9773c1ec80d43f3768df2e8576807d1656016b9d3eeaa96fd",
+ "sha256:c222958f59b0ae091f4535851cbb24eb57fc0baea07ba675af718fb5302dddb2",
+ "sha256:c30e42ea11badb147f0d2e387115b15e2bd8205a5ad70d6ad79cf37f6ac08c91",
+ "sha256:c3a79f56dee9136084cf84a6c7c4341427ef36e05ae6415bf7d787c96ff5eaa3",
+ "sha256:c51ef82302386d686feea1c44dbeef744585da16fcf97deea2a8d6c1556f519b",
+ "sha256:c77326300b839c44c3e5a8fe26c15b7e87b2f32dfd2fc9fee1d13604347c9b38",
+ "sha256:d33a785ea8354c480515e781554d3be582a86297e41ccbea627a5c632647f2cd",
+ "sha256:d546cfa78844b8b9c1c0533de1851569a13f87449897bbc95d698d1d3cb2a30f",
+ "sha256:da29ceabe3025a1e5a5aeeb331c5b1af686daab4ff0fb4f83df18b1180ea83e2",
+ "sha256:df8c05a0f574d480947cba11b947dc41b1265d721c3777881da2fb8d3a1ddfba",
+ "sha256:e266af4da2c1a4cbc6135a570c64577fd3e6eb204607eaff99d8e9b710003c6f",
+ "sha256:e279f3db904e3b55f520f11f983cc8dc8a4ce9b65f11692d4718ed021ec58b83",
+ "sha256:ea52bd218d4ba260399a8ae4bb6b577d82adfc4518b93566ce1fddd4a49d1dce",
+ "sha256:ebec65f5068e7df2d49466aab9128510c4867e532e07cb6960075b27658dca38",
+ "sha256:ec1e3b40b82236d100d259854840555469fad4db64f669ab817279eb95cd535c",
+ "sha256:ee77c7bef0724165e795b6b7bf9c4c22a9b8468a6bdb9c6b4281293c6b22a90f",
+ "sha256:f263b18692f8ed52c8de7f40a0751e79015983dbd77b16906e5b310a39d3ca21",
+ "sha256:f7b26757b22faf88fcf232f5f0e62f6e0fd9e22a8a5d0d5016888cdfe1f6c1c4",
+ "sha256:f7ddb920106bbbbcaf2a274d56f46956bf56ecbde210d88061824a95bdd94e92"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
- "version": "==7.6.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==7.6.3"
},
"docker": {
"hashes": [
@@ -1958,11 +2109,11 @@
},
"idna": {
"hashes": [
- "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
- "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
],
"markers": "python_version >= '3.6'",
- "version": "==3.8"
+ "version": "==3.10"
},
"iniconfig": {
"hashes": [
@@ -1974,12 +2125,12 @@
},
"minio": {
"hashes": [
- "sha256:aa3b485788b63b12406a5798465d12a57e4be2ac2a58a8380959b6b748e64ddd",
- "sha256:f8af2dafc22ebe1aef3ac181b8e217037011c430aa6da276ed627e55aaf7c815"
+ "sha256:a83c2fcd981944602a8dc11e8e07543ed9cda0a9462264e3f46a13171c56bccb",
+ "sha256:fe5523d9c4a4d6cfc07e96905852841bccdb22b22770e1efca4bf5ae8b65774b"
],
"index": "pypi",
"markers": "python_version >= '3.9'",
- "version": "==7.2.8"
+ "version": "==7.2.9"
},
"opensearch-py": {
"hashes": [
@@ -2016,41 +2167,41 @@
},
"pycryptodome": {
"hashes": [
- "sha256:06d6de87c19f967f03b4cf9b34e538ef46e99a337e9a61a77dbe44b2cbcf0690",
- "sha256:09609209ed7de61c2b560cc5c8c4fbf892f8b15b1faf7e4cbffac97db1fffda7",
- "sha256:210ba1b647837bfc42dd5a813cdecb5b86193ae11a3f5d972b9a0ae2c7e9e4b4",
- "sha256:2a1250b7ea809f752b68e3e6f3fd946b5939a52eaeea18c73bdab53e9ba3c2dd",
- "sha256:2ab6ab0cb755154ad14e507d1df72de9897e99fd2d4922851a276ccc14f4f1a5",
- "sha256:3427d9e5310af6680678f4cce149f54e0bb4af60101c7f2c16fdf878b39ccccc",
- "sha256:3cd3ef3aee1079ae44afaeee13393cf68b1058f70576b11439483e34f93cf818",
- "sha256:405002eafad114a2f9a930f5db65feef7b53c4784495dd8758069b89baf68eab",
- "sha256:417a276aaa9cb3be91f9014e9d18d10e840a7a9b9a9be64a42f553c5b50b4d1d",
- "sha256:4401564ebf37dfde45d096974c7a159b52eeabd9969135f0426907db367a652a",
- "sha256:49a4c4dc60b78ec41d2afa392491d788c2e06edf48580fbfb0dd0f828af49d25",
- "sha256:5601c934c498cd267640b57569e73793cb9a83506f7c73a8ec57a516f5b0b091",
- "sha256:6e0e4a987d38cfc2e71b4a1b591bae4891eeabe5fa0f56154f576e26287bfdea",
- "sha256:76658f0d942051d12a9bd08ca1b6b34fd762a8ee4240984f7c06ddfb55eaf15a",
- "sha256:76cb39afede7055127e35a444c1c041d2e8d2f1f9c121ecef573757ba4cd2c3c",
- "sha256:8d6b98d0d83d21fb757a182d52940d028564efe8147baa9ce0f38d057104ae72",
- "sha256:9b3ae153c89a480a0ec402e23db8d8d84a3833b65fa4b15b81b83be9d637aab9",
- "sha256:a60fedd2b37b4cb11ccb5d0399efe26db9e0dd149016c1cc6c8161974ceac2d6",
- "sha256:ac1c7c0624a862f2e53438a15c9259d1655325fc2ec4392e66dc46cdae24d044",
- "sha256:acae12b9ede49f38eb0ef76fdec2df2e94aad85ae46ec85be3648a57f0a7db04",
- "sha256:acc2614e2e5346a4a4eab6e199203034924313626f9620b7b4b38e9ad74b7e0c",
- "sha256:acf6e43fa75aca2d33e93409f2dafe386fe051818ee79ee8a3e21de9caa2ac9e",
- "sha256:baee115a9ba6c5d2709a1e88ffe62b73ecc044852a925dcb67713a288c4ec70f",
- "sha256:c18b381553638414b38705f07d1ef0a7cf301bc78a5f9bc17a957eb19446834b",
- "sha256:d29daa681517f4bc318cd8a23af87e1f2a7bad2fe361e8aa29c77d652a065de4",
- "sha256:d5954acfe9e00bc83ed9f5cb082ed22c592fbbef86dc48b907238be64ead5c33",
- "sha256:ec0bb1188c1d13426039af8ffcb4dbe3aad1d7680c35a62d8eaf2a529b5d3d4f",
- "sha256:ec1f93feb3bb93380ab0ebf8b859e8e5678c0f010d2d78367cf6bc30bfeb148e",
- "sha256:f0e6d631bae3f231d3634f91ae4da7a960f7ff87f2865b2d2b831af1dfb04e9a",
- "sha256:f35d6cee81fa145333137009d9c8ba90951d7d77b67c79cbe5f03c7eb74d8fe2",
- "sha256:f47888542a0633baff535a04726948e876bf1ed880fddb7c10a736fa99146ab3",
- "sha256:fb3b87461fa35afa19c971b0a2b7456a7b1db7b4eba9a8424666104925b78128"
- ],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
- "version": "==3.20.0"
+ "sha256:0714206d467fc911042d01ea3a1847c847bc10884cf674c82e12915cfe1649f8",
+ "sha256:0fa0a05a6a697ccbf2a12cec3d6d2650b50881899b845fac6e87416f8cb7e87d",
+ "sha256:0fd54003ec3ce4e0f16c484a10bc5d8b9bd77fa662a12b85779a2d2d85d67ee0",
+ "sha256:18caa8cfbc676eaaf28613637a89980ad2fd96e00c564135bf90bc3f0b34dd93",
+ "sha256:2480ec2c72438430da9f601ebc12c518c093c13111a5c1644c82cdfc2e50b1e4",
+ "sha256:26412b21df30b2861424a6c6d5b1d8ca8107612a4cfa4d0183e71c5d200fb34a",
+ "sha256:280b67d20e33bb63171d55b1067f61fbd932e0b1ad976b3a184303a3dad22764",
+ "sha256:2cb635b67011bc147c257e61ce864879ffe6d03342dc74b6045059dfbdedafca",
+ "sha256:2de4b7263a33947ff440412339cb72b28a5a4c769b5c1ca19e33dd6cd1dcec6e",
+ "sha256:3ba4cc304eac4d4d458f508d4955a88ba25026890e8abff9b60404f76a62c55e",
+ "sha256:4c26a2f0dc15f81ea3afa3b0c87b87e501f235d332b7f27e2225ecb80c0b1cdd",
+ "sha256:590ef0898a4b0a15485b05210b4a1c9de8806d3ad3d47f74ab1dc07c67a6827f",
+ "sha256:5dfafca172933506773482b0e18f0cd766fd3920bd03ec85a283df90d8a17bc6",
+ "sha256:6cce52e196a5f1d6797ff7946cdff2038d3b5f0aba4a43cb6bf46b575fd1b5bb",
+ "sha256:7cb087b8612c8a1a14cf37dd754685be9a8d9869bed2ffaaceb04850a8aeef7e",
+ "sha256:7d85c1b613121ed3dbaa5a97369b3b757909531a959d229406a75b912dd51dd1",
+ "sha256:7ee86cbde706be13f2dec5a42b52b1c1d1cbb90c8e405c68d0755134735c8dc6",
+ "sha256:8898a66425a57bcf15e25fc19c12490b87bd939800f39a03ea2de2aea5e3611a",
+ "sha256:8acd7d34af70ee63f9a849f957558e49a98f8f1634f86a59d2be62bb8e93f71c",
+ "sha256:932c905b71a56474bff8a9c014030bc3c882cee696b448af920399f730a650c2",
+ "sha256:a1752eca64c60852f38bb29e2c86fca30d7672c024128ef5d70cc15868fa10f4",
+ "sha256:a3804675283f4764a02db05f5191eb8fec2bb6ca34d466167fc78a5f05bbe6b3",
+ "sha256:a4e74c522d630766b03a836c15bff77cb657c5fdf098abf8b1ada2aebc7d0819",
+ "sha256:a915597ffccabe902e7090e199a7bf7a381c5506a747d5e9d27ba55197a2c568",
+ "sha256:b7aa25fc0baa5b1d95b7633af4f5f1838467f1815442b22487426f94e0d66c53",
+ "sha256:cc2269ab4bce40b027b49663d61d816903a4bd90ad88cb99ed561aadb3888dd3",
+ "sha256:d5ebe0763c982f069d3877832254f64974139f4f9655058452603ff559c482e8",
+ "sha256:dad9bf36eda068e89059d1f07408e397856be9511d7113ea4b586642a429a4fd",
+ "sha256:de18954104667f565e2fbb4783b56667f30fb49c4d79b346f52a29cb198d5b6b",
+ "sha256:f35e442630bc4bc2e1878482d6f59ea22e280d7121d7adeaedba58c23ab6386b",
+ "sha256:f7787e0d469bdae763b876174cf2e6c0f7be79808af26b1da96f1a64bcf47297",
+ "sha256:ff99f952db3db2fbe98a0b355175f93ec334ba3d01bbde25ad3a5a33abc02b58"
+ ],
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
+ "version": "==3.21.0"
},
"pytest": {
"hashes": [
@@ -2123,7 +2274,7 @@
"sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
"sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
],
- "markers": "python_version < '3.13'",
+ "markers": "python_version >= '3.8'",
"version": "==4.12.2"
},
"urllib3": {
@@ -2131,7 +2282,7 @@
"sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
"sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.8'",
"version": "==2.2.3"
},
"wrapt": {
diff --git a/dbrepo-analyse-service/app.py b/dbrepo-analyse-service/app.py
index 651826558103cf1f9f0829663c24935995c4a6d1..aa9a42096c43c87954f1e45c0db950e607a6bc31 100644
--- a/dbrepo-analyse-service/app.py
+++ b/dbrepo-analyse-service/app.py
@@ -188,7 +188,7 @@ template = {
"info": {
"title": "Database Repository Analyse Service API",
"description": "Service that analyses data structures",
- "version": "1.4.6",
+ "version": "1.4.7",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
@@ -200,7 +200,7 @@ template = {
},
"externalDocs": {
"description": "Sourcecode Documentation",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/"
},
"servers": [
{
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.7.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.7.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c652dbae4a60aae708eb6fe4e751977b97b72344
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.4.7.tar.gz differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0-py3-none-any.whl b/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0-py3-none-any.whl
new file mode 100644
index 0000000000000000000000000000000000000000..84353af6a26fdb3e281e10ab90d21130a0701258
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0-py3-none-any.whl differ
diff --git a/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0.tar.gz b/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..735c2e9d3699303d119033e184e0cfb9a571317f
Binary files /dev/null and b/dbrepo-analyse-service/lib/dbrepo-1.4.7rc0.tar.gz differ
diff --git a/dbrepo-auth-service/Dockerfile b/dbrepo-auth-service/Dockerfile
deleted file mode 100644
index 47fabff4ed802e5ccf1f066250b174a04f041847..0000000000000000000000000000000000000000
--- a/dbrepo-auth-service/Dockerfile
+++ /dev/null
@@ -1,56 +0,0 @@
-###### FIRST STAGE ######
-FROM keycloak/keycloak:24.0 AS config
-LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
-
-# Enable health and metrics support
-ENV KC_HEALTH_ENABLED=true
-ENV KC_METRICS_ENABLED=true
-ENV KC_HTTP_RELATIVE_PATH=/api/auth
-
-# Configure a database vendor
-ENV KC_DB=mariadb
-
-WORKDIR /opt/keycloak
-
-COPY ./server.keystore ./conf/server.keystore
-
-RUN /opt/keycloak/bin/kc.sh build
-
-###### SECOND STAGE ######
-FROM redhat/ubi9-minimal AS binary
-
-RUN microdnf update -y && microdnf install -y curl-minimal libcurl-minimal
-
-###### THIRD STAGE ######
-FROM keycloak/keycloak:21.0 AS runtime
-
-COPY --from=config /opt/keycloak/ /opt/keycloak/
-COPY --from=binary /usr/lib64 /usr/lib64
-COPY --from=binary /usr/bin/curl /usr/bin/curl
-
-USER root
-
-COPY ./dbrepo-realm.json /opt/keycloak/data/import/dbrepo-realm.json
-
-WORKDIR /app
-
-COPY ./docker-entrypoint.sh ./docker-entrypoint.sh
-COPY ./disable-tls.sh ./disable-tls.sh
-
-ENV AUTH_DB=keycloak
-ENV AUTH_USERNAME=root
-ENV AUTH_PASSWORD=dbrepo
-
-ENV KC_DB=mariadb
-ENV KC_DB_URL=jdbc:mariadb://auth-db/${AUTH_DB}
-ENV KC_DB_USERNAME=${AUTH_USERNAME}
-ENV KC_DB_PASSWORD=${AUTH_PASSWORD}
-ENV KC_HOSTNAME_STRICT_HTTPS=false
-ENV KC_HOSTNAME_PATH=/api/auth
-ENV KC_HOSTNAME_ADMIN_URL=http://localhost/api/auth
-
-ENV KEYCLOAK_IMPORT=/opt/keycloak/data/import/dbrepo-realm.json
-ENV KEYCLOAK_ADMIN=fda
-ENV KEYCLOAK_ADMIN_PASSWORD=fda
-
-ENTRYPOINT [ "bash", "/app/docker-entrypoint.sh" ]
diff --git a/dbrepo-auth-service/disable-tls.sh b/dbrepo-auth-service/disable-tls.sh
deleted file mode 100644
index 10586260ba2442fe7a68537bdd121a99b0f0cda1..0000000000000000000000000000000000000000
--- a/dbrepo-auth-service/disable-tls.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-while [ ! -f /opt/keycloak/tls_disabled ]; do
- cd /opt/keycloak/bin || exit 1
- ./kcadm.sh config credentials --server http://localhost:8080 --realm master --user "${KEYCLOAK_ADMIN}" --password "${KEYCLOAK_ADMIN_PASSWORD}"
- if [ "$?" -ne 0 ]; then
- echo "Keycloak not yet ready ..."
- echo "Wait 5s ..."
- sleep 5
- else
- ./kcadm.sh update realms/master -s sslRequired=NONE
- touch /opt/keycloak/tls_disabled
- fi
-done
\ No newline at end of file
diff --git a/dbrepo-auth-service/docker-entrypoint.sh b/dbrepo-auth-service/docker-entrypoint.sh
deleted file mode 100644
index 9ebd2bd240c1f44303f06d7cb00dfbdf7c2a1540..0000000000000000000000000000000000000000
--- a/dbrepo-auth-service/docker-entrypoint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-bash /app/disable-tls.sh &
-/opt/keycloak/bin/kc.sh start-dev --import-realm --metrics-enabled=true
diff --git a/dbrepo-auth-service/export-realms.sh b/dbrepo-auth-service/export-realms.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ed9245b96980946de3aeb495c11e1f8a28b2270d
--- /dev/null
+++ b/dbrepo-auth-service/export-realms.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+docker exec -it dbrepo-auth-service kc.sh export --dir /opt/bitnami/keycloak/export
+docker exec -it dbrepo-auth-service cat /opt/bitnami/keycloak/export/master-realm.json > ./dbrepo-auth-service/master-realm.json
+docker exec -it dbrepo-auth-service cat /opt/bitnami/keycloak/export/dbrepo-realm.json > ./dbrepo-auth-service/dbrepo-realm.json
\ No newline at end of file
diff --git a/dbrepo-auth-service/generate-keystore.sh b/dbrepo-auth-service/generate-keystore.sh
deleted file mode 100755
index 8b68c44a1febcac8c308a8c443a4a41f5ea21d2f..0000000000000000000000000000000000000000
--- a/dbrepo-auth-service/generate-keystore.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-keytool -genkey -alias server -keyalg RSA -keypass password -storepass password -keystore server.keystore
\ No newline at end of file
diff --git a/dbrepo-auth-service/import-realms.sh b/dbrepo-auth-service/import-realms.sh
new file mode 100644
index 0000000000000000000000000000000000000000..662fbcf5a359bebb28f389bbb5ab3114c07ee015
--- /dev/null
+++ b/dbrepo-auth-service/import-realms.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+kc.sh import --file /opt/keycloak/data/import/master-realm.json
+kc.sh import --file /opt/keycloak/data/import/dbrepo-realm.json
\ No newline at end of file
diff --git a/dbrepo-auth-service/master-realm.json b/dbrepo-auth-service/master-realm.json
new file mode 100644
index 0000000000000000000000000000000000000000..d6c46ccd15a4c1cfead9c6c76e72d10408100758
--- /dev/null
+++ b/dbrepo-auth-service/master-realm.json
@@ -0,0 +1,2853 @@
+{
+ "id": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "realm": "master",
+ "displayName": "Keycloak",
+ "displayNameHtml": "",
+ "notBefore": 0,
+ "defaultSignatureAlgorithm": "RS256",
+ "revokeRefreshToken": false,
+ "refreshTokenMaxReuse": 0,
+ "accessTokenLifespan": 60,
+ "accessTokenLifespanForImplicitFlow": 900,
+ "ssoSessionIdleTimeout": 1800,
+ "ssoSessionMaxLifespan": 36000,
+ "ssoSessionIdleTimeoutRememberMe": 0,
+ "ssoSessionMaxLifespanRememberMe": 0,
+ "offlineSessionIdleTimeout": 2592000,
+ "offlineSessionMaxLifespanEnabled": false,
+ "offlineSessionMaxLifespan": 5184000,
+ "clientSessionIdleTimeout": 0,
+ "clientSessionMaxLifespan": 0,
+ "clientOfflineSessionIdleTimeout": 0,
+ "clientOfflineSessionMaxLifespan": 0,
+ "accessCodeLifespan": 60,
+ "accessCodeLifespanUserAction": 300,
+ "accessCodeLifespanLogin": 1800,
+ "actionTokenGeneratedByAdminLifespan": 43200,
+ "actionTokenGeneratedByUserLifespan": 300,
+ "oauth2DeviceCodeLifespan": 600,
+ "oauth2DevicePollingInterval": 5,
+ "enabled": true,
+ "sslRequired": "external",
+ "registrationAllowed": false,
+ "registrationEmailAsUsername": false,
+ "rememberMe": false,
+ "verifyEmail": false,
+ "loginWithEmailAllowed": true,
+ "duplicateEmailsAllowed": false,
+ "resetPasswordAllowed": false,
+ "editUsernameAllowed": false,
+ "bruteForceProtected": false,
+ "permanentLockout": false,
+ "maxTemporaryLockouts": 0,
+ "maxFailureWaitSeconds": 900,
+ "minimumQuickLoginWaitSeconds": 60,
+ "waitIncrementSeconds": 60,
+ "quickLoginCheckMilliSeconds": 1000,
+ "maxDeltaTimeSeconds": 43200,
+ "failureFactor": 30,
+ "roles": {
+ "realm": [
+ {
+ "id": "01178d3c-65eb-406b-87a1-e7144f488028",
+ "name": "default-roles-master",
+ "description": "${role_default-roles}",
+ "composite": true,
+ "composites": {
+ "realm": [
+ "offline_access",
+ "uma_authorization"
+ ],
+ "client": {
+ "account": [
+ "view-profile",
+ "manage-account"
+ ]
+ }
+ },
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "attributes": {}
+ },
+ {
+ "id": "646cda2d-911d-459e-8522-b28ba3126341",
+ "name": "uma_authorization",
+ "description": "${role_uma_authorization}",
+ "composite": false,
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "attributes": {}
+ },
+ {
+ "id": "344b3b83-99f7-43f7-8533-76f64195eab6",
+ "name": "offline_access",
+ "description": "${role_offline-access}",
+ "composite": false,
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "attributes": {}
+ },
+ {
+ "id": "9ca176f3-c0c8-4ba1-8364-c38f3ce4f88b",
+ "name": "admin",
+ "description": "${role_admin}",
+ "composite": true,
+ "composites": {
+ "realm": [
+ "create-realm"
+ ],
+ "client": {
+ "master-realm": [
+ "manage-realm",
+ "view-events",
+ "view-authorization",
+ "manage-authorization",
+ "query-realms",
+ "query-clients",
+ "manage-clients",
+ "view-clients",
+ "create-client",
+ "impersonation",
+ "query-users",
+ "view-identity-providers",
+ "manage-users",
+ "manage-events",
+ "view-realm",
+ "query-groups",
+ "manage-identity-providers",
+ "view-users"
+ ],
+ "dbrepo-realm": [
+ "manage-users",
+ "query-realms",
+ "query-groups",
+ "manage-identity-providers",
+ "manage-events",
+ "manage-authorization",
+ "query-users",
+ "manage-clients",
+ "view-users",
+ "view-events",
+ "view-authorization",
+ "query-clients",
+ "view-identity-providers",
+ "view-realm",
+ "view-clients",
+ "create-client",
+ "manage-realm",
+ "impersonation"
+ ]
+ }
+ },
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "attributes": {}
+ },
+ {
+ "id": "6e765f03-5dee-4061-b027-c3ec41114329",
+ "name": "default-system-roles",
+ "description": "${default-system-roles}",
+ "composite": true,
+ "composites": {
+ "realm": [
+ "create-realm",
+ "default-roles-master",
+ "default-system-roles",
+ "offline_access",
+ "admin",
+ "uma_authorization"
+ ]
+ },
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "attributes": {}
+ },
+ {
+ "id": "3da4e842-c3cc-4bcd-a2f0-dec1ec36f3c5",
+ "name": "create-realm",
+ "description": "${role_create-realm}",
+ "composite": false,
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd",
+ "attributes": {}
+ }
+ ],
+ "client": {
+ "security-admin-console": [],
+ "admin-cli": [],
+ "account-console": [],
+ "broker": [
+ {
+ "id": "07de46e9-cc5c-4b50-8904-14443ed4d1f1",
+ "name": "read-token",
+ "description": "${role_read-token}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "217563ea-11c7-4c96-969b-af076d740f7c",
+ "attributes": {}
+ }
+ ],
+ "master-realm": [
+ {
+ "id": "5c8f38f8-0a16-4f92-8fa2-81a6301f6215",
+ "name": "create-client",
+ "description": "${role_create-client}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "d0ab2e61-c7e4-49f3-9af2-965f20ec725a",
+ "name": "manage-realm",
+ "description": "${role_manage-realm}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "89d438ee-957d-435c-b201-5be06aee01fd",
+ "name": "view-events",
+ "description": "${role_view-events}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "664a9190-f73f-4f83-83bc-a2185cea334c",
+ "name": "view-authorization",
+ "description": "${role_view-authorization}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "b3c0e4db-5a09-4d1e-9ced-96a34efb6398",
+ "name": "manage-authorization",
+ "description": "${role_manage-authorization}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "5cd61b20-da2b-4fed-b0c3-2fb5819ab06b",
+ "name": "query-realms",
+ "description": "${role_query-realms}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "94ceae4b-2cb8-4d10-bf11-8ce5c1ec9c55",
+ "name": "impersonation",
+ "description": "${role_impersonation}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "77072e30-3941-4b32-a8c8-76993fc507bb",
+ "name": "query-users",
+ "description": "${role_query-users}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "ea00baa8-f64d-409d-936d-ecf0adec5a57",
+ "name": "view-identity-providers",
+ "description": "${role_view-identity-providers}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "fb2c167e-fb6b-4db5-b0bf-d2c8454ceee5",
+ "name": "manage-users",
+ "description": "${role_manage-users}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "f0370bc0-15d6-43f1-82bc-7d31f37b19e4",
+ "name": "manage-events",
+ "description": "${role_manage-events}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "f0448680-b803-471e-8d0a-ec3e34a24228",
+ "name": "view-realm",
+ "description": "${role_view-realm}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "dfdf768b-ac34-4491-b5d2-0938242e7e48",
+ "name": "query-groups",
+ "description": "${role_query-groups}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "d5ff044b-c4e0-4197-8f51-833e8a956396",
+ "name": "query-clients",
+ "description": "${role_query-clients}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "aaf73aa0-52a3-4833-8521-1eb1312b9f33",
+ "name": "manage-identity-providers",
+ "description": "${role_manage-identity-providers}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "fa08c54a-1f0c-4392-bf6a-a698bf3d164b",
+ "name": "view-users",
+ "description": "${role_view-users}",
+ "composite": true,
+ "composites": {
+ "client": {
+ "master-realm": [
+ "query-groups",
+ "query-users"
+ ]
+ }
+ },
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "fd317e90-0b34-4263-8906-caa9d6000b28",
+ "name": "manage-clients",
+ "description": "${role_manage-clients}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ },
+ {
+ "id": "162f12db-6d7f-4c53-905c-3f4bbd80fd58",
+ "name": "view-clients",
+ "description": "${role_view-clients}",
+ "composite": true,
+ "composites": {
+ "client": {
+ "master-realm": [
+ "query-clients"
+ ]
+ }
+ },
+ "clientRole": true,
+ "containerId": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "attributes": {}
+ }
+ ],
+ "account": [
+ {
+ "id": "50c2778e-15fa-4c14-9414-5937649eb89f",
+ "name": "delete-account",
+ "description": "${role_delete-account}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "083c3506-866a-4b85-ae57-bab1c29ac33e",
+ "name": "view-groups",
+ "description": "${role_view-groups}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "a1942880-1a32-402c-b9bb-e8f5edf2ba1a",
+ "name": "view-profile",
+ "description": "${role_view-profile}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "a69f73d6-ce42-41e6-b341-30a2d99caba8",
+ "name": "manage-account-links",
+ "description": "${role_manage-account-links}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "ac22aeec-062a-4fc0-ac79-aa849ee55d84",
+ "name": "manage-consent",
+ "description": "${role_manage-consent}",
+ "composite": true,
+ "composites": {
+ "client": {
+ "account": [
+ "view-consent"
+ ]
+ }
+ },
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "ad45329d-0efa-4505-906a-5a69b6c8414a",
+ "name": "view-applications",
+ "description": "${role_view-applications}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "8c0bfbdf-1914-4522-9024-ef0e6e91be9d",
+ "name": "view-consent",
+ "description": "${role_view-consent}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ },
+ {
+ "id": "f34de6ff-a5aa-41a7-a8d2-87bdfa850c50",
+ "name": "manage-account",
+ "description": "${role_manage-account}",
+ "composite": true,
+ "composites": {
+ "client": {
+ "account": [
+ "manage-account-links"
+ ]
+ }
+ },
+ "clientRole": true,
+ "containerId": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "attributes": {}
+ }
+ ],
+ "dbrepo-realm": [
+ {
+ "id": "89292ccf-3b12-4c8b-a615-966ddcf14556",
+ "name": "manage-users",
+ "description": "${role_manage-users}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "784f2fdf-a090-4452-8a02-d9cc8227df8f",
+ "name": "view-authorization",
+ "description": "${role_view-authorization}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "57a70a96-bc56-4629-8d2b-86c68ac1c6f6",
+ "name": "query-realms",
+ "description": "${role_query-realms}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "60349d70-ba29-426d-9c05-df0b11e1a73b",
+ "name": "query-clients",
+ "description": "${role_query-clients}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "c07819ae-8951-4dc4-af4d-bca93c60eb5a",
+ "name": "view-identity-providers",
+ "description": "${role_view-identity-providers}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "86842bf0-7f63-4053-8389-2ec5401cb2a9",
+ "name": "query-groups",
+ "description": "${role_query-groups}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "0a1579a0-76c5-4ee3-90cc-c924827b7492",
+ "name": "view-realm",
+ "description": "${role_view-realm}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "4eb0d05c-38c7-4d45-b858-ad7011df0ac0",
+ "name": "manage-identity-providers",
+ "description": "${role_manage-identity-providers}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "d4ff5a03-21e8-440c-9ccb-690ecbb89684",
+ "name": "manage-events",
+ "description": "${role_manage-events}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "00d523c3-e9c7-45c3-8221-0b6d6c82cd5d",
+ "name": "manage-authorization",
+ "description": "${role_manage-authorization}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "c441f018-7113-4fcb-8208-10ab4bd4bb27",
+ "name": "view-clients",
+ "description": "${role_view-clients}",
+ "composite": true,
+ "composites": {
+ "client": {
+ "dbrepo-realm": [
+ "query-clients"
+ ]
+ }
+ },
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "a146533f-fbf3-4513-8505-cf44473f5459",
+ "name": "create-client",
+ "description": "${role_create-client}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "d3d0ed01-05a5-4812-8fa7-9231f71e61fa",
+ "name": "query-users",
+ "description": "${role_query-users}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "fcaed53d-022a-416d-b207-a6ae694a9384",
+ "name": "manage-clients",
+ "description": "${role_manage-clients}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "cefdb023-0eec-4c05-93d7-8b557bb28a81",
+ "name": "view-users",
+ "description": "${role_view-users}",
+ "composite": true,
+ "composites": {
+ "client": {
+ "dbrepo-realm": [
+ "query-users",
+ "query-groups"
+ ]
+ }
+ },
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "44d13b2a-a2b5-4f3b-bea1-4ab550205e12",
+ "name": "manage-realm",
+ "description": "${role_manage-realm}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "17378e7a-9a78-4e92-ae0b-6bdfadede2d5",
+ "name": "impersonation",
+ "description": "${role_impersonation}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ },
+ {
+ "id": "7810ab39-c546-456c-81eb-7ee09492da92",
+ "name": "view-events",
+ "description": "${role_view-events}",
+ "composite": false,
+ "clientRole": true,
+ "containerId": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "attributes": {}
+ }
+ ]
+ }
+ },
+ "groups": [
+ {
+ "id": "1fcdbec1-9c86-4a14-a859-425b43cf73cb",
+ "name": "system",
+ "path": "/system",
+ "subGroups": [],
+ "attributes": {},
+ "realmRoles": [
+ "default-roles-master",
+ "default-system-roles",
+ "admin",
+ "create-realm"
+ ],
+ "clientRoles": {}
+ }
+ ],
+ "defaultRole": {
+ "id": "01178d3c-65eb-406b-87a1-e7144f488028",
+ "name": "default-roles-master",
+ "description": "${role_default-roles}",
+ "composite": true,
+ "clientRole": false,
+ "containerId": "afe47bd0-61f8-40c3-95cb-04930407ebdd"
+ },
+ "requiredCredentials": [
+ "password"
+ ],
+ "otpPolicyType": "totp",
+ "otpPolicyAlgorithm": "HmacSHA1",
+ "otpPolicyInitialCounter": 0,
+ "otpPolicyDigits": 6,
+ "otpPolicyLookAheadWindow": 1,
+ "otpPolicyPeriod": 30,
+ "otpPolicyCodeReusable": false,
+ "otpSupportedApplications": [
+ "totpAppFreeOTPName",
+ "totpAppGoogleName",
+ "totpAppMicrosoftAuthenticatorName"
+ ],
+ "localizationTexts": {},
+ "webAuthnPolicyRpEntityName": "keycloak",
+ "webAuthnPolicySignatureAlgorithms": [
+ "ES256",
+ "RS256"
+ ],
+ "webAuthnPolicyRpId": "",
+ "webAuthnPolicyAttestationConveyancePreference": "not specified",
+ "webAuthnPolicyAuthenticatorAttachment": "not specified",
+ "webAuthnPolicyRequireResidentKey": "not specified",
+ "webAuthnPolicyUserVerificationRequirement": "not specified",
+ "webAuthnPolicyCreateTimeout": 0,
+ "webAuthnPolicyAvoidSameAuthenticatorRegister": false,
+ "webAuthnPolicyAcceptableAaguids": [],
+ "webAuthnPolicyExtraOrigins": [],
+ "webAuthnPolicyPasswordlessRpEntityName": "keycloak",
+ "webAuthnPolicyPasswordlessSignatureAlgorithms": [
+ "ES256",
+ "RS256"
+ ],
+ "webAuthnPolicyPasswordlessRpId": "",
+ "webAuthnPolicyPasswordlessAttestationConveyancePreference": "not specified",
+ "webAuthnPolicyPasswordlessAuthenticatorAttachment": "not specified",
+ "webAuthnPolicyPasswordlessRequireResidentKey": "not specified",
+ "webAuthnPolicyPasswordlessUserVerificationRequirement": "not specified",
+ "webAuthnPolicyPasswordlessCreateTimeout": 0,
+ "webAuthnPolicyPasswordlessAvoidSameAuthenticatorRegister": false,
+ "webAuthnPolicyPasswordlessAcceptableAaguids": [],
+ "webAuthnPolicyPasswordlessExtraOrigins": [],
+ "scopeMappings": [
+ {
+ "clientScope": "offline_access",
+ "roles": [
+ "offline_access"
+ ]
+ }
+ ],
+ "clientScopeMappings": {
+ "account": [
+ {
+ "client": "account-console",
+ "roles": [
+ "manage-account",
+ "view-groups"
+ ]
+ }
+ ]
+ },
+ "clients": [
+ {
+ "id": "b63c04db-23a8-432b-a6a7-1a4c9a5d1cad",
+ "clientId": "account",
+ "name": "${client_account}",
+ "rootUrl": "${authBaseUrl}",
+ "baseUrl": "/realms/master/account/",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [
+ "/realms/master/account/*"
+ ],
+ "webOrigins": [],
+ "notBefore": 0,
+ "bearerOnly": false,
+ "consentRequired": false,
+ "standardFlowEnabled": true,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": false,
+ "serviceAccountsEnabled": false,
+ "publicClient": true,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "false",
+ "post.logout.redirect.uris": "+"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": false,
+ "nodeReRegistrationTimeout": 0,
+ "defaultClientScopes": [
+ "web-origins",
+ "acr",
+ "roles",
+ "profile",
+ "basic",
+ "email"
+ ],
+ "optionalClientScopes": [
+ "address",
+ "phone",
+ "organization",
+ "offline_access",
+ "microprofile-jwt"
+ ]
+ },
+ {
+ "id": "1af255f9-7eee-415c-9096-3a717d2c5150",
+ "clientId": "account-console",
+ "name": "${client_account-console}",
+ "rootUrl": "${authBaseUrl}",
+ "baseUrl": "/realms/master/account/",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [
+ "/realms/master/account/*"
+ ],
+ "webOrigins": [],
+ "notBefore": 0,
+ "bearerOnly": false,
+ "consentRequired": false,
+ "standardFlowEnabled": true,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": false,
+ "serviceAccountsEnabled": false,
+ "publicClient": true,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "false",
+ "post.logout.redirect.uris": "+",
+ "pkce.code.challenge.method": "S256"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": false,
+ "nodeReRegistrationTimeout": 0,
+ "protocolMappers": [
+ {
+ "id": "63d1e47d-6e61-4f36-8a5b-98384a782d60",
+ "name": "audience resolve",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-audience-resolve-mapper",
+ "consentRequired": false,
+ "config": {}
+ }
+ ],
+ "defaultClientScopes": [
+ "web-origins",
+ "acr",
+ "roles",
+ "profile",
+ "basic",
+ "email"
+ ],
+ "optionalClientScopes": [
+ "address",
+ "phone",
+ "organization",
+ "offline_access",
+ "microprofile-jwt"
+ ]
+ },
+ {
+ "id": "65ce3e14-5e30-424a-a6bd-0b194da203ef",
+ "clientId": "admin-cli",
+ "name": "${client_admin-cli}",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [],
+ "webOrigins": [],
+ "notBefore": 0,
+ "bearerOnly": false,
+ "consentRequired": false,
+ "standardFlowEnabled": false,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": true,
+ "serviceAccountsEnabled": false,
+ "publicClient": true,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "false",
+ "client.use.lightweight.access.token.enabled": "true",
+ "post.logout.redirect.uris": "+"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": true,
+ "nodeReRegistrationTimeout": 0,
+ "defaultClientScopes": [
+ "web-origins",
+ "acr",
+ "roles",
+ "profile",
+ "basic",
+ "email"
+ ],
+ "optionalClientScopes": [
+ "address",
+ "phone",
+ "organization",
+ "offline_access",
+ "microprofile-jwt"
+ ]
+ },
+ {
+ "id": "217563ea-11c7-4c96-969b-af076d740f7c",
+ "clientId": "broker",
+ "name": "${client_broker}",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [],
+ "webOrigins": [],
+ "notBefore": 0,
+ "bearerOnly": true,
+ "consentRequired": false,
+ "standardFlowEnabled": true,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": false,
+ "serviceAccountsEnabled": false,
+ "publicClient": false,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "true",
+ "post.logout.redirect.uris": "+"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": false,
+ "nodeReRegistrationTimeout": 0,
+ "defaultClientScopes": [
+ "web-origins",
+ "acr",
+ "roles",
+ "profile",
+ "basic",
+ "email"
+ ],
+ "optionalClientScopes": [
+ "address",
+ "phone",
+ "organization",
+ "offline_access",
+ "microprofile-jwt"
+ ]
+ },
+ {
+ "id": "c10597a2-3888-43c4-9d60-1a90a6a4d490",
+ "clientId": "dbrepo-realm",
+ "name": "dbrepo Realm",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [],
+ "webOrigins": [],
+ "notBefore": 0,
+ "bearerOnly": true,
+ "consentRequired": false,
+ "standardFlowEnabled": true,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": false,
+ "serviceAccountsEnabled": false,
+ "publicClient": false,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "true",
+ "post.logout.redirect.uris": "+"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": false,
+ "nodeReRegistrationTimeout": 0,
+ "defaultClientScopes": [],
+ "optionalClientScopes": []
+ },
+ {
+ "id": "9a451e5c-a55a-4872-bee1-58af763101a1",
+ "clientId": "master-realm",
+ "name": "master Realm",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [],
+ "webOrigins": [],
+ "notBefore": 0,
+ "bearerOnly": true,
+ "consentRequired": false,
+ "standardFlowEnabled": true,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": false,
+ "serviceAccountsEnabled": false,
+ "publicClient": false,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "true",
+ "post.logout.redirect.uris": "+"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": false,
+ "nodeReRegistrationTimeout": 0,
+ "defaultClientScopes": [
+ "web-origins",
+ "acr",
+ "roles",
+ "profile",
+ "basic",
+ "email"
+ ],
+ "optionalClientScopes": [
+ "address",
+ "phone",
+ "organization",
+ "offline_access",
+ "microprofile-jwt"
+ ]
+ },
+ {
+ "id": "b2a24dc7-01d2-4a5a-8385-8b06d2b8a3fb",
+ "clientId": "security-admin-console",
+ "name": "${client_security-admin-console}",
+ "rootUrl": "${authAdminUrl}",
+ "baseUrl": "/admin/master/console/",
+ "surrogateAuthRequired": false,
+ "enabled": true,
+ "alwaysDisplayInConsole": false,
+ "clientAuthenticatorType": "client-secret",
+ "redirectUris": [
+ "/admin/master/console/*"
+ ],
+ "webOrigins": [
+ "+"
+ ],
+ "notBefore": 0,
+ "bearerOnly": false,
+ "consentRequired": false,
+ "standardFlowEnabled": true,
+ "implicitFlowEnabled": false,
+ "directAccessGrantsEnabled": false,
+ "serviceAccountsEnabled": false,
+ "publicClient": true,
+ "frontchannelLogout": false,
+ "protocol": "openid-connect",
+ "attributes": {
+ "realm_client": "false",
+ "client.use.lightweight.access.token.enabled": "true",
+ "post.logout.redirect.uris": "+",
+ "pkce.code.challenge.method": "S256"
+ },
+ "authenticationFlowBindingOverrides": {},
+ "fullScopeAllowed": true,
+ "nodeReRegistrationTimeout": 0,
+ "protocolMappers": [
+ {
+ "id": "54d1c74b-4eb6-483b-88b5-261964dd182a",
+ "name": "locale",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "locale",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "locale",
+ "jsonType.label": "String"
+ }
+ }
+ ],
+ "defaultClientScopes": [
+ "web-origins",
+ "acr",
+ "roles",
+ "profile",
+ "basic",
+ "email"
+ ],
+ "optionalClientScopes": [
+ "address",
+ "phone",
+ "organization",
+ "offline_access",
+ "microprofile-jwt"
+ ]
+ }
+ ],
+ "clientScopes": [
+ {
+ "id": "12ce4fa5-b53e-47dc-b70f-caf2110e31cd",
+ "name": "address",
+ "description": "OpenID Connect built-in scope: address",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "true",
+ "consent.screen.text": "${addressScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "4aed5e41-0d8d-4c24-80a0-cd9822072756",
+ "name": "address",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-address-mapper",
+ "consentRequired": false,
+ "config": {
+ "user.attribute.formatted": "formatted",
+ "user.attribute.country": "country",
+ "introspection.token.claim": "true",
+ "user.attribute.postal_code": "postal_code",
+ "userinfo.token.claim": "true",
+ "user.attribute.street": "street",
+ "id.token.claim": "true",
+ "user.attribute.region": "region",
+ "access.token.claim": "true",
+ "user.attribute.locality": "locality"
+ }
+ }
+ ]
+ },
+ {
+ "id": "a7683fe7-1c8b-44f8-9be7-a28acdffa61e",
+ "name": "organization",
+ "description": "Additional claims about the organization a subject belongs to",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "true",
+ "consent.screen.text": "${organizationScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "5e80a7d2-c9d0-48e1-aadc-d8848ff90f92",
+ "name": "organization",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-organization-membership-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "multivalued": "true",
+ "userinfo.token.claim": "true",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "organization",
+ "jsonType.label": "String"
+ }
+ }
+ ]
+ },
+ {
+ "id": "0411ea86-a074-4781-850d-ea3ca94590a2",
+ "name": "offline_access",
+ "description": "OpenID Connect built-in scope: offline_access",
+ "protocol": "openid-connect",
+ "attributes": {
+ "consent.screen.text": "${offlineAccessScopeConsentText}",
+ "display.on.consent.screen": "true"
+ }
+ },
+ {
+ "id": "4363ea0f-c7e9-43f3-8611-146514c37b47",
+ "name": "basic",
+ "description": "OpenID Connect scope for add all basic claims to the token",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "false",
+ "display.on.consent.screen": "false"
+ },
+ "protocolMappers": [
+ {
+ "id": "0b691845-92b7-47b8-82d3-6fea760d885a",
+ "name": "sub",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-sub-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "access.token.claim": "true"
+ }
+ },
+ {
+ "id": "15db8f91-12c9-444c-8661-5a795856e884",
+ "name": "auth_time",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usersessionmodel-note-mapper",
+ "consentRequired": false,
+ "config": {
+ "user.session.note": "AUTH_TIME",
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "auth_time",
+ "jsonType.label": "long"
+ }
+ }
+ ]
+ },
+ {
+ "id": "5f9da2a4-b8d2-48cd-9343-5c8ff42ef637",
+ "name": "profile",
+ "description": "OpenID Connect built-in scope: profile",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "true",
+ "consent.screen.text": "${profileScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "2d1400be-4053-4393-ba87-91b64f699054",
+ "name": "full name",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-full-name-mapper",
+ "consentRequired": false,
+ "config": {
+ "id.token.claim": "true",
+ "introspection.token.claim": "true",
+ "access.token.claim": "true",
+ "userinfo.token.claim": "true"
+ }
+ },
+ {
+ "id": "6b12336d-589e-4023-9c51-1da3a4114a62",
+ "name": "website",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "website",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "website",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "13a7a453-3862-40b4-8a81-550172a06dc0",
+ "name": "zoneinfo",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "zoneinfo",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "zoneinfo",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "43c149fc-aaf4-486a-a279-df624d2eb47e",
+ "name": "given name",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "firstName",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "given_name",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "8bba390c-543b-4fe3-98db-e020184e5014",
+ "name": "birthdate",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "birthdate",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "birthdate",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "dc5a7474-c62a-42d6-ba98-f2b2a7a7328c",
+ "name": "nickname",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "nickname",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "nickname",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "9e02395e-5c37-46fb-8d30-0ebe6da3b7f0",
+ "name": "gender",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "gender",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "gender",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "d2f3d16d-21a8-4128-b60b-55e55046fa29",
+ "name": "profile",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "profile",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "profile",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "825cafb6-3392-491a-bb34-e607330f5170",
+ "name": "family name",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "lastName",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "family_name",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "c44ac799-cac2-4200-b71b-badab4b48d92",
+ "name": "updated at",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "updatedAt",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "updated_at",
+ "jsonType.label": "long"
+ }
+ },
+ {
+ "id": "402b2c5f-0a7b-4520-9015-03fa9a1e2e4a",
+ "name": "picture",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "picture",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "picture",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "f34812b0-28b3-486c-8911-9394890be4f6",
+ "name": "locale",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "locale",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "locale",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "3fe6f4f2-c881-4b84-87db-8e9b9243a7f0",
+ "name": "middle name",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "middleName",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "middle_name",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "4d1465b2-c408-4a62-9821-afce35a55f12",
+ "name": "username",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "username",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "preferred_username",
+ "jsonType.label": "String"
+ }
+ }
+ ]
+ },
+ {
+ "id": "9b03908f-dac3-4bbd-8e93-ef29e64a59ad",
+ "name": "role_list",
+ "description": "SAML role list",
+ "protocol": "saml",
+ "attributes": {
+ "consent.screen.text": "${samlRoleListScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "d6678801-a0f1-4385-ae11-5dee90a9e3b4",
+ "name": "role list",
+ "protocol": "saml",
+ "protocolMapper": "saml-role-list-mapper",
+ "consentRequired": false,
+ "config": {
+ "single": "false",
+ "attribute.nameformat": "Basic",
+ "attribute.name": "Role"
+ }
+ }
+ ]
+ },
+ {
+ "id": "fa13fc44-16f6-4f82-965d-b86dfad2a984",
+ "name": "microprofile-jwt",
+ "description": "Microprofile - JWT built-in scope",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "true",
+ "display.on.consent.screen": "false"
+ },
+ "protocolMappers": [
+ {
+ "id": "f70938d7-e91f-4c45-bfed-3b974d0e4697",
+ "name": "groups",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-realm-role-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "multivalued": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "foo",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "groups",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "1636d5e3-2af1-4d54-a60f-9db1f562b009",
+ "name": "upn",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "username",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "upn",
+ "jsonType.label": "String"
+ }
+ }
+ ]
+ },
+ {
+ "id": "1124b695-1319-45aa-bc1b-ec0b2cf99b9e",
+ "name": "acr",
+ "description": "OpenID Connect scope for add acr (authentication context class reference) to the token",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "false",
+ "display.on.consent.screen": "false"
+ },
+ "protocolMappers": [
+ {
+ "id": "0e17d8d7-fb11-4b31-8023-d29611f7d492",
+ "name": "acr loa level",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-acr-mapper",
+ "consentRequired": false,
+ "config": {
+ "id.token.claim": "true",
+ "introspection.token.claim": "true",
+ "access.token.claim": "true",
+ "userinfo.token.claim": "true"
+ }
+ }
+ ]
+ },
+ {
+ "id": "cc53d998-1eac-4574-9bec-58110d92d282",
+ "name": "web-origins",
+ "description": "OpenID Connect scope for add allowed web origins to the access token",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "false",
+ "consent.screen.text": "",
+ "display.on.consent.screen": "false"
+ },
+ "protocolMappers": [
+ {
+ "id": "635cbac1-7cab-43bd-99fc-f7084aca2fa2",
+ "name": "allowed web origins",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-allowed-origins-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "access.token.claim": "true"
+ }
+ }
+ ]
+ },
+ {
+ "id": "2c901d49-bb6d-44a7-8835-1229b655ccfa",
+ "name": "saml_organization",
+ "description": "Organization Membership",
+ "protocol": "saml",
+ "attributes": {
+ "display.on.consent.screen": "false"
+ },
+ "protocolMappers": [
+ {
+ "id": "60ad6a87-646d-4c9e-932e-34ab1ac51fcb",
+ "name": "organization",
+ "protocol": "saml",
+ "protocolMapper": "saml-organization-membership-mapper",
+ "consentRequired": false,
+ "config": {}
+ }
+ ]
+ },
+ {
+ "id": "943d1441-ee61-4ab5-b5bd-de3c5f8ff25f",
+ "name": "roles",
+ "description": "OpenID Connect scope for add user roles to the access token",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "false",
+ "consent.screen.text": "${rolesScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "2b5a3df4-1adb-402d-bc28-2bd43224e682",
+ "name": "realm roles",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-realm-role-mapper",
+ "consentRequired": false,
+ "config": {
+ "user.attribute": "foo",
+ "introspection.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "realm_access.roles",
+ "jsonType.label": "String",
+ "multivalued": "true"
+ }
+ },
+ {
+ "id": "f3b60071-ef26-48a7-9554-67f62f84d543",
+ "name": "client roles",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-client-role-mapper",
+ "consentRequired": false,
+ "config": {
+ "user.attribute": "foo",
+ "introspection.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "resource_access.${client_id}.roles",
+ "jsonType.label": "String",
+ "multivalued": "true"
+ }
+ },
+ {
+ "id": "b757200e-494a-4585-857e-e4c18aef7a0c",
+ "name": "audience resolve",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-audience-resolve-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "access.token.claim": "true"
+ }
+ }
+ ]
+ },
+ {
+ "id": "4509fb3c-a899-49ad-b690-b031f9568888",
+ "name": "email",
+ "description": "OpenID Connect built-in scope: email",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "true",
+ "consent.screen.text": "${emailScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "e18769b3-778b-47d8-be52-dd2769deebd1",
+ "name": "email",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "email",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "email",
+ "jsonType.label": "String"
+ }
+ },
+ {
+ "id": "d98c5037-5178-4cc5-8e22-ca6cf0cb169e",
+ "name": "email verified",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-property-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "emailVerified",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "email_verified",
+ "jsonType.label": "boolean"
+ }
+ }
+ ]
+ },
+ {
+ "id": "6e14db34-285a-47ae-8b43-b3dcf10ae7f8",
+ "name": "phone",
+ "description": "OpenID Connect built-in scope: phone",
+ "protocol": "openid-connect",
+ "attributes": {
+ "include.in.token.scope": "true",
+ "consent.screen.text": "${phoneScopeConsentText}",
+ "display.on.consent.screen": "true"
+ },
+ "protocolMappers": [
+ {
+ "id": "98cc724c-3f53-47f7-bf9f-baf2f7e08026",
+ "name": "phone number verified",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "phoneNumberVerified",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "phone_number_verified",
+ "jsonType.label": "boolean"
+ }
+ },
+ {
+ "id": "716a7b58-dcf4-4557-9f84-d21ca19630fb",
+ "name": "phone number",
+ "protocol": "openid-connect",
+ "protocolMapper": "oidc-usermodel-attribute-mapper",
+ "consentRequired": false,
+ "config": {
+ "introspection.token.claim": "true",
+ "userinfo.token.claim": "true",
+ "user.attribute": "phoneNumber",
+ "id.token.claim": "true",
+ "access.token.claim": "true",
+ "claim.name": "phone_number",
+ "jsonType.label": "String"
+ }
+ }
+ ]
+ }
+ ],
+ "defaultDefaultClientScopes": [
+ "role_list",
+ "saml_organization",
+ "profile",
+ "email",
+ "roles",
+ "web-origins",
+ "acr",
+ "basic"
+ ],
+ "defaultOptionalClientScopes": [
+ "offline_access",
+ "address",
+ "phone",
+ "microprofile-jwt",
+ "organization"
+ ],
+ "browserSecurityHeaders": {
+ "contentSecurityPolicyReportOnly": "",
+ "xContentTypeOptions": "nosniff",
+ "referrerPolicy": "no-referrer",
+ "xRobotsTag": "none",
+ "xFrameOptions": "SAMEORIGIN",
+ "contentSecurityPolicy": "frame-src 'self'; frame-ancestors 'self'; object-src 'none';",
+ "xXSSProtection": "1; mode=block",
+ "strictTransportSecurity": "max-age=31536000; includeSubDomains"
+ },
+ "smtpServer": {},
+ "eventsEnabled": false,
+ "eventsListeners": [
+ "jboss-logging"
+ ],
+ "enabledEventTypes": [],
+ "adminEventsEnabled": false,
+ "adminEventsDetailsEnabled": false,
+ "identityProviders": [],
+ "identityProviderMappers": [],
+ "components": {
+ "org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy": [
+ {
+ "id": "f2a52e27-5582-4ca4-b20c-1864b8339b16",
+ "name": "Trusted Hosts",
+ "providerId": "trusted-hosts",
+ "subType": "anonymous",
+ "subComponents": {},
+ "config": {
+ "host-sending-registration-request-must-match": [
+ "true"
+ ],
+ "client-uris-must-match": [
+ "true"
+ ]
+ }
+ },
+ {
+ "id": "95b33704-ec30-4988-b018-f73d8bcf71b5",
+ "name": "Full Scope Disabled",
+ "providerId": "scope",
+ "subType": "anonymous",
+ "subComponents": {},
+ "config": {}
+ },
+ {
+ "id": "d1114c75-d0b0-4584-a89f-a4e70eab2cd7",
+ "name": "Consent Required",
+ "providerId": "consent-required",
+ "subType": "anonymous",
+ "subComponents": {},
+ "config": {}
+ },
+ {
+ "id": "6b0202cc-e70e-46da-869b-36ad59907239",
+ "name": "Allowed Protocol Mapper Types",
+ "providerId": "allowed-protocol-mappers",
+ "subType": "anonymous",
+ "subComponents": {},
+ "config": {
+ "allowed-protocol-mapper-types": [
+ "oidc-usermodel-attribute-mapper",
+ "saml-role-list-mapper",
+ "oidc-sha256-pairwise-sub-mapper",
+ "oidc-usermodel-property-mapper",
+ "saml-user-attribute-mapper",
+ "oidc-full-name-mapper",
+ "oidc-address-mapper",
+ "saml-user-property-mapper"
+ ]
+ }
+ },
+ {
+ "id": "4b976576-c880-48a0-9b4d-2956cfd19b4a",
+ "name": "Allowed Protocol Mapper Types",
+ "providerId": "allowed-protocol-mappers",
+ "subType": "authenticated",
+ "subComponents": {},
+ "config": {
+ "allowed-protocol-mapper-types": [
+ "saml-role-list-mapper",
+ "oidc-usermodel-property-mapper",
+ "oidc-full-name-mapper",
+ "saml-user-attribute-mapper",
+ "saml-user-property-mapper",
+ "oidc-address-mapper",
+ "oidc-sha256-pairwise-sub-mapper",
+ "oidc-usermodel-attribute-mapper"
+ ]
+ }
+ },
+ {
+ "id": "e1861ec9-2761-46fb-8048-149492269ff0",
+ "name": "Allowed Client Scopes",
+ "providerId": "allowed-client-templates",
+ "subType": "anonymous",
+ "subComponents": {},
+ "config": {
+ "allow-default-scopes": [
+ "true"
+ ]
+ }
+ },
+ {
+ "id": "51b3aa61-e453-4e0b-bfe1-aefd8353ea06",
+ "name": "Max Clients Limit",
+ "providerId": "max-clients",
+ "subType": "anonymous",
+ "subComponents": {},
+ "config": {
+ "max-clients": [
+ "200"
+ ]
+ }
+ },
+ {
+ "id": "851cf8c2-ffe8-4a37-8a12-df04f724c90b",
+ "name": "Allowed Client Scopes",
+ "providerId": "allowed-client-templates",
+ "subType": "authenticated",
+ "subComponents": {},
+ "config": {
+ "allow-default-scopes": [
+ "true"
+ ]
+ }
+ }
+ ],
+ "org.keycloak.userprofile.UserProfileProvider": [
+ {
+ "id": "34049725-5a66-456c-b895-87ca7c11bb6b",
+ "providerId": "declarative-user-profile",
+ "subComponents": {},
+ "config": {
+ "kc.user.profile.config": [
+ "{\"attributes\":[{\"name\":\"username\",\"displayName\":\"${username}\",\"validations\":{\"length\":{\"min\":3,\"max\":255},\"username-prohibited-characters\":{},\"up-username-not-idn-homograph\":{}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"email\",\"displayName\":\"${email}\",\"validations\":{\"email\":{},\"length\":{\"max\":255}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"firstName\",\"displayName\":\"${firstName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false},{\"name\":\"lastName\",\"displayName\":\"${lastName}\",\"validations\":{\"length\":{\"max\":255},\"person-name-prohibited-characters\":{}},\"permissions\":{\"view\":[\"admin\",\"user\"],\"edit\":[\"admin\",\"user\"]},\"multivalued\":false}],\"groups\":[{\"name\":\"user-metadata\",\"displayHeader\":\"User metadata\",\"displayDescription\":\"Attributes, which refer to user metadata\"}]}"
+ ]
+ }
+ }
+ ],
+ "org.keycloak.storage.UserStorageProvider": [
+ {
+ "id": "3a6f24e8-128b-4ac1-b3ab-694836db82fd",
+ "name": "Identity Service",
+ "providerId": "ldap",
+ "subComponents": {
+ "org.keycloak.storage.ldap.mappers.LDAPStorageMapper": [
+ {
+ "id": "bf97cfab-4d53-4994-b3a8-0c771a70467b",
+ "name": "email",
+ "providerId": "user-attribute-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "ldap.attribute": [
+ "mail"
+ ],
+ "is.mandatory.in.ldap": [
+ "false"
+ ],
+ "always.read.value.from.ldap": [
+ "false"
+ ],
+ "read.only": [
+ "false"
+ ],
+ "user.model.attribute": [
+ "email"
+ ]
+ }
+ },
+ {
+ "id": "cddffa16-0aff-4e0c-99a2-021f0495de03",
+ "name": "last name",
+ "providerId": "user-attribute-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "ldap.attribute": [
+ "sn"
+ ],
+ "is.mandatory.in.ldap": [
+ "true"
+ ],
+ "always.read.value.from.ldap": [
+ "true"
+ ],
+ "read.only": [
+ "false"
+ ],
+ "user.model.attribute": [
+ "lastName"
+ ]
+ }
+ },
+ {
+ "id": "4eaae3fa-d280-4605-b09d-1caeb881322c",
+ "name": "modify date",
+ "providerId": "user-attribute-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "ldap.attribute": [
+ "modifyTimestamp"
+ ],
+ "is.mandatory.in.ldap": [
+ "false"
+ ],
+ "always.read.value.from.ldap": [
+ "true"
+ ],
+ "read.only": [
+ "true"
+ ],
+ "user.model.attribute": [
+ "modifyTimestamp"
+ ]
+ }
+ },
+ {
+ "id": "98c4a2c1-d509-443b-8475-fc971c193324",
+ "name": "first name",
+ "providerId": "user-attribute-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "ldap.attribute": [
+ "cn"
+ ],
+ "is.mandatory.in.ldap": [
+ "true"
+ ],
+ "read.only": [
+ "false"
+ ],
+ "always.read.value.from.ldap": [
+ "true"
+ ],
+ "user.model.attribute": [
+ "firstName"
+ ]
+ }
+ },
+ {
+ "id": "74dbebb4-9881-4be1-8b30-6b0f2a718c86",
+ "name": "username",
+ "providerId": "user-attribute-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "ldap.attribute": [
+ "uid"
+ ],
+ "is.mandatory.in.ldap": [
+ "true"
+ ],
+ "always.read.value.from.ldap": [
+ "false"
+ ],
+ "read.only": [
+ "false"
+ ],
+ "user.model.attribute": [
+ "username"
+ ]
+ }
+ },
+ {
+ "id": "5692d060-55b8-4cb1-b68f-0ae123cd9d03",
+ "name": "system",
+ "providerId": "group-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "mode": [
+ "LDAP_ONLY"
+ ],
+ "membership.attribute.type": [
+ "DN"
+ ],
+ "user.roles.retrieve.strategy": [
+ "LOAD_GROUPS_BY_MEMBER_ATTRIBUTE"
+ ],
+ "group.name.ldap.attribute": [
+ "cn"
+ ],
+ "membership.ldap.attribute": [
+ "member"
+ ],
+ "membership.user.ldap.attribute": [
+ "uid"
+ ],
+ "ignore.missing.groups": [
+ "false"
+ ],
+ "preserve.group.inheritance": [
+ "false"
+ ],
+ "groups.dn": [
+ "ou=users,dc=dbrepo,dc=at"
+ ],
+ "memberof.ldap.attribute": [
+ "memberOf"
+ ],
+ "group.object.classes": [
+ "groupOfNames"
+ ],
+ "drop.non.existing.groups.during.sync": [
+ "false"
+ ],
+ "groups.path": [
+ "/"
+ ]
+ }
+ },
+ {
+ "id": "0453ae29-3cdc-4e09-800e-0117e7a2fb68",
+ "name": "creation date",
+ "providerId": "user-attribute-ldap-mapper",
+ "subComponents": {},
+ "config": {
+ "ldap.attribute": [
+ "createTimestamp"
+ ],
+ "is.mandatory.in.ldap": [
+ "false"
+ ],
+ "always.read.value.from.ldap": [
+ "true"
+ ],
+ "read.only": [
+ "true"
+ ],
+ "user.model.attribute": [
+ "createTimestamp"
+ ]
+ }
+ }
+ ]
+ },
+ "config": {
+ "pagination": [
+ "false"
+ ],
+ "fullSyncPeriod": [
+ "-1"
+ ],
+ "startTls": [
+ "false"
+ ],
+ "connectionPooling": [
+ "false"
+ ],
+ "usersDn": [
+ "ou=users,dc=dbrepo,dc=at"
+ ],
+ "cachePolicy": [
+ "DEFAULT"
+ ],
+ "useKerberosForPasswordAuthentication": [
+ "false"
+ ],
+ "importEnabled": [
+ "true"
+ ],
+ "enabled": [
+ "true"
+ ],
+ "changedSyncPeriod": [
+ "-1"
+ ],
+ "usernameLDAPAttribute": [
+ "uid"
+ ],
+ "bindCredential": [
+ "admin"
+ ],
+ "bindDn": [
+ "cn=admin,dc=dbrepo,dc=at"
+ ],
+ "vendor": [
+ "other"
+ ],
+ "uuidLDAPAttribute": [
+ "entryUUID"
+ ],
+ "allowKerberosAuthentication": [
+ "false"
+ ],
+ "connectionUrl": [
+ "ldap://identity-service:1389"
+ ],
+ "syncRegistrations": [
+ "true"
+ ],
+ "authType": [
+ "simple"
+ ],
+ "krbPrincipalAttribute": [
+ "krb5PrincipalName"
+ ],
+ "searchScope": [
+ "1"
+ ],
+ "useTruststoreSpi": [
+ "always"
+ ],
+ "usePasswordModifyExtendedOp": [
+ "false"
+ ],
+ "trustEmail": [
+ "false"
+ ],
+ "userObjectClasses": [
+ "inetOrgPerson, organizationalPerson, person"
+ ],
+ "rdnLDAPAttribute": [
+ "uid"
+ ],
+ "editMode": [
+ "READ_ONLY"
+ ],
+ "validatePasswordPolicy": [
+ "false"
+ ]
+ }
+ }
+ ],
+ "org.keycloak.keys.KeyProvider": [
+ {
+ "id": "5b1052d2-fb71-47d2-86f9-908c869c8d1b",
+ "name": "hmac-generated-hs512",
+ "providerId": "hmac-generated",
+ "subComponents": {},
+ "config": {
+ "priority": [
+ "100"
+ ],
+ "algorithm": [
+ "HS512"
+ ]
+ }
+ },
+ {
+ "id": "fd48cdb1-8be8-4ac9-9347-dc3e91db95d7",
+ "name": "rsa-enc-generated",
+ "providerId": "rsa-enc-generated",
+ "subComponents": {},
+ "config": {
+ "priority": [
+ "100"
+ ],
+ "algorithm": [
+ "RSA-OAEP"
+ ]
+ }
+ },
+ {
+ "id": "0ff03eb6-b43b-4065-b583-9e310f53a573",
+ "name": "rsa-generated",
+ "providerId": "rsa-generated",
+ "subComponents": {},
+ "config": {
+ "priority": [
+ "100"
+ ]
+ }
+ },
+ {
+ "id": "df28b561-7463-4927-974d-615618056b41",
+ "name": "aes-generated",
+ "providerId": "aes-generated",
+ "subComponents": {},
+ "config": {
+ "priority": [
+ "100"
+ ]
+ }
+ }
+ ]
+ },
+ "internationalizationEnabled": false,
+ "supportedLocales": [],
+ "authenticationFlows": [
+ {
+ "id": "2e13d5a8-b0fb-475b-8991-66d1cc8e99f1",
+ "alias": "Account verification options",
+ "description": "Method with which to verity the existing account",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "idp-email-verification",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "ALTERNATIVE",
+ "priority": 20,
+ "autheticatorFlow": true,
+ "flowAlias": "Verify Existing Account by Re-authentication",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "0bf3a099-5ef5-4ea9-b325-5bc9699180a6",
+ "alias": "Browser - Conditional OTP",
+ "description": "Flow to determine if the OTP is required for the authentication",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "conditional-user-configured",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "auth-otp-form",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "88ca29ab-cbe0-4e3f-938a-e6c5327748ab",
+ "alias": "Direct Grant - Conditional OTP",
+ "description": "Flow to determine if the OTP is required for the authentication",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "conditional-user-configured",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "direct-grant-validate-otp",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "789e7d43-bc05-44d2-8c09-de7fee9d56de",
+ "alias": "First broker login - Conditional OTP",
+ "description": "Flow to determine if the OTP is required for the authentication",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "conditional-user-configured",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "auth-otp-form",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "ee145b84-2b30-438e-9cee-6fe90909af1a",
+ "alias": "Handle Existing Account",
+ "description": "Handle what to do if there is existing account with same email/username like authenticated identity provider",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "idp-confirm-link",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": true,
+ "flowAlias": "Account verification options",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "853d891a-0009-443c-91c3-a7f1ad1dd0dc",
+ "alias": "Reset - Conditional OTP",
+ "description": "Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "conditional-user-configured",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "reset-otp",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "d7f13a9b-a13c-4236-ae41-df8da7e5fa8d",
+ "alias": "User creation or linking",
+ "description": "Flow for the existing/non-existing user alternatives",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticatorConfig": "create unique user config",
+ "authenticator": "idp-create-user-if-unique",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "ALTERNATIVE",
+ "priority": 20,
+ "autheticatorFlow": true,
+ "flowAlias": "Handle Existing Account",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "3cb699ee-11d4-44be-878b-a183b9e96b59",
+ "alias": "Verify Existing Account by Re-authentication",
+ "description": "Reauthentication of existing account",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "idp-username-password-form",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "CONDITIONAL",
+ "priority": 20,
+ "autheticatorFlow": true,
+ "flowAlias": "First broker login - Conditional OTP",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "61d5a1e2-7074-41ad-97bf-e5c41c70989e",
+ "alias": "browser",
+ "description": "Browser based authentication",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "auth-cookie",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "auth-spnego",
+ "authenticatorFlow": false,
+ "requirement": "DISABLED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "identity-provider-redirector",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 25,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "ALTERNATIVE",
+ "priority": 30,
+ "autheticatorFlow": true,
+ "flowAlias": "forms",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "21dabcf1-8817-4f2d-981a-13239e160b56",
+ "alias": "clients",
+ "description": "Base authentication for clients",
+ "providerId": "client-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "client-secret",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "client-jwt",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "client-secret-jwt",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 30,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "client-x509",
+ "authenticatorFlow": false,
+ "requirement": "ALTERNATIVE",
+ "priority": 40,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "a349aeb2-9373-47ec-9381-0c379df56c71",
+ "alias": "direct grant",
+ "description": "OpenID Connect Resource Owner Grant",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "direct-grant-validate-username",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "direct-grant-validate-password",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "CONDITIONAL",
+ "priority": 30,
+ "autheticatorFlow": true,
+ "flowAlias": "Direct Grant - Conditional OTP",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "39b3aa37-4ece-4e31-acbc-79889994713e",
+ "alias": "docker auth",
+ "description": "Used by Docker clients to authenticate against the IDP",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "docker-http-basic-authenticator",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "18561349-cc5e-4e5b-bcb2-979645118f96",
+ "alias": "first broker login",
+ "description": "Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticatorConfig": "review profile config",
+ "authenticator": "idp-review-profile",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": true,
+ "flowAlias": "User creation or linking",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "9933f082-3d53-4575-b011-90e6933fb2a1",
+ "alias": "forms",
+ "description": "Username, password, otp and other auth forms.",
+ "providerId": "basic-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "auth-username-password-form",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "CONDITIONAL",
+ "priority": 20,
+ "autheticatorFlow": true,
+ "flowAlias": "Browser - Conditional OTP",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "00285357-456a-4fd4-b449-ed25253e6364",
+ "alias": "registration",
+ "description": "Registration flow",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "registration-page-form",
+ "authenticatorFlow": true,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": true,
+ "flowAlias": "registration form",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "b9131fa9-5614-42b4-8353-c6c15e66c2ce",
+ "alias": "registration form",
+ "description": "Registration form",
+ "providerId": "form-flow",
+ "topLevel": false,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "registration-user-creation",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "registration-password-action",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 50,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "registration-recaptcha-action",
+ "authenticatorFlow": false,
+ "requirement": "DISABLED",
+ "priority": 60,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "registration-terms-and-conditions",
+ "authenticatorFlow": false,
+ "requirement": "DISABLED",
+ "priority": 70,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "424642cc-3a71-4732-ba38-b737179ce37f",
+ "alias": "reset credentials",
+ "description": "Reset credentials for a user if they forgot their password or something",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "reset-credentials-choose-user",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "reset-credential-email",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 20,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticator": "reset-password",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 30,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ },
+ {
+ "authenticatorFlow": true,
+ "requirement": "CONDITIONAL",
+ "priority": 40,
+ "autheticatorFlow": true,
+ "flowAlias": "Reset - Conditional OTP",
+ "userSetupAllowed": false
+ }
+ ]
+ },
+ {
+ "id": "c8c9c4dc-a39d-4ba6-ad4b-9447a8125349",
+ "alias": "saml ecp",
+ "description": "SAML ECP Profile Authentication Flow",
+ "providerId": "basic-flow",
+ "topLevel": true,
+ "builtIn": true,
+ "authenticationExecutions": [
+ {
+ "authenticator": "http-basic-authenticator",
+ "authenticatorFlow": false,
+ "requirement": "REQUIRED",
+ "priority": 10,
+ "autheticatorFlow": false,
+ "userSetupAllowed": false
+ }
+ ]
+ }
+ ],
+ "authenticatorConfig": [
+ {
+ "id": "49d63952-ca6e-450c-a65f-70388169cb90",
+ "alias": "create unique user config",
+ "config": {
+ "require.password.update.after.registration": "false"
+ }
+ },
+ {
+ "id": "5b4f58fc-aff7-4e12-8c48-40aeb3db1432",
+ "alias": "review profile config",
+ "config": {
+ "update.profile.on.first.login": "missing"
+ }
+ }
+ ],
+ "requiredActions": [
+ {
+ "alias": "CONFIGURE_TOTP",
+ "name": "Configure OTP",
+ "providerId": "CONFIGURE_TOTP",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 10,
+ "config": {}
+ },
+ {
+ "alias": "TERMS_AND_CONDITIONS",
+ "name": "Terms and Conditions",
+ "providerId": "TERMS_AND_CONDITIONS",
+ "enabled": false,
+ "defaultAction": false,
+ "priority": 20,
+ "config": {}
+ },
+ {
+ "alias": "UPDATE_PASSWORD",
+ "name": "Update Password",
+ "providerId": "UPDATE_PASSWORD",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 30,
+ "config": {}
+ },
+ {
+ "alias": "UPDATE_PROFILE",
+ "name": "Update Profile",
+ "providerId": "UPDATE_PROFILE",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 40,
+ "config": {}
+ },
+ {
+ "alias": "VERIFY_EMAIL",
+ "name": "Verify Email",
+ "providerId": "VERIFY_EMAIL",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 50,
+ "config": {}
+ },
+ {
+ "alias": "delete_account",
+ "name": "Delete Account",
+ "providerId": "delete_account",
+ "enabled": false,
+ "defaultAction": false,
+ "priority": 60,
+ "config": {}
+ },
+ {
+ "alias": "webauthn-register",
+ "name": "Webauthn Register",
+ "providerId": "webauthn-register",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 70,
+ "config": {}
+ },
+ {
+ "alias": "webauthn-register-passwordless",
+ "name": "Webauthn Register Passwordless",
+ "providerId": "webauthn-register-passwordless",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 80,
+ "config": {}
+ },
+ {
+ "alias": "VERIFY_PROFILE",
+ "name": "Verify Profile",
+ "providerId": "VERIFY_PROFILE",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 90,
+ "config": {}
+ },
+ {
+ "alias": "delete_credential",
+ "name": "Delete Credential",
+ "providerId": "delete_credential",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 100,
+ "config": {}
+ },
+ {
+ "alias": "update_user_locale",
+ "name": "Update User Locale",
+ "providerId": "update_user_locale",
+ "enabled": true,
+ "defaultAction": false,
+ "priority": 1000,
+ "config": {}
+ }
+ ],
+ "browserFlow": "browser",
+ "registrationFlow": "registration",
+ "directGrantFlow": "direct grant",
+ "resetCredentialsFlow": "reset credentials",
+ "clientAuthenticationFlow": "clients",
+ "dockerAuthenticationFlow": "docker auth",
+ "firstBrokerLoginFlow": "first broker login",
+ "attributes": {
+ "cibaBackchannelTokenDeliveryMode": "poll",
+ "cibaAuthRequestedUserHint": "login_hint",
+ "clientOfflineSessionMaxLifespan": "0",
+ "oauth2DevicePollingInterval": "5",
+ "clientSessionIdleTimeout": "0",
+ "clientOfflineSessionIdleTimeout": "0",
+ "cibaInterval": "5",
+ "realmReusableOtpCode": "false",
+ "cibaExpiresIn": "120",
+ "oauth2DeviceCodeLifespan": "600",
+ "parRequestUriLifespan": "60",
+ "clientSessionMaxLifespan": "0",
+ "frontendUrl": "",
+ "organizationsEnabled": "false",
+ "acr.loa.map": "{}"
+ },
+ "keycloakVersion": "26.0.0",
+ "userManagedAccessAllowed": false,
+ "organizationsEnabled": false,
+ "clientProfiles": {
+ "profiles": []
+ },
+ "clientPolicies": {
+ "policies": []
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-auth-service/server.keystore b/dbrepo-auth-service/server.keystore
deleted file mode 100644
index 9dcd5051210b5bd2f945a8325610684c8e0029a8..0000000000000000000000000000000000000000
Binary files a/dbrepo-auth-service/server.keystore and /dev/null differ
diff --git a/dbrepo-broker-service/README.md b/dbrepo-broker-service/README.md
index 95e5afaefdfc73751db6856526ca8c5e3a8f4c7c..6cff53bb912b21c916f30b2a07f6a7c90a76dc5a 100644
--- a/dbrepo-broker-service/README.md
+++ b/dbrepo-broker-service/README.md
@@ -1,5 +1,7 @@
# Broker Service
+Supports MQTT v3, v4 and v5 (https://www.rabbitmq.com/blog/2023/07/21/mqtt5)
+
## Advanced Config
https://www.rabbitmq.com/docs/ldap
\ No newline at end of file
diff --git a/dbrepo-broker-service/advanced.config b/dbrepo-broker-service/advanced.config
index 4445ea601954e5c93c32edeba1638135c5af5e59..584bcc52325e61a8d6019d2f092590bb7f989530 100644
--- a/dbrepo-broker-service/advanced.config
+++ b/dbrepo-broker-service/advanced.config
@@ -1,4 +1,9 @@
[
+ {
+ rabbit, [
+ {forced_feature_flags_on_init, [quorum_queue, mqtt_v5]}
+ ]
+ },
{
rabbitmq_auth_backend_ldap,
[
diff --git a/dbrepo-broker-service/enabled_plugins b/dbrepo-broker-service/enabled_plugins
index 95f1c0014dd4ee232580adea29176756a25274ed..db0ae888499ea44c2dd7d40f5ac9c8fcc0ca0567 100644
--- a/dbrepo-broker-service/enabled_plugins
+++ b/dbrepo-broker-service/enabled_plugins
@@ -1 +1 @@
-[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management].
\ No newline at end of file
+[rabbitmq_prometheus,rabbitmq_auth_backend_ldap,rabbitmq_auth_mechanism_ssl,rabbitmq_management,rabbitmq_mqtt].
\ No newline at end of file
diff --git a/dbrepo-broker-service/rabbitmq.conf b/dbrepo-broker-service/rabbitmq.conf
index ff592bb3ecd4b003d180dbb44d8bd9acc5a70394..8503942950feb8c701ac8765872d005249ee612b 100644
--- a/dbrepo-broker-service/rabbitmq.conf
+++ b/dbrepo-broker-service/rabbitmq.conf
@@ -6,7 +6,6 @@ default_user_tags.administrator = false
listeners.tcp.1 = 0.0.0.0:5672
# management prefix (https://www.rabbitmq.com/management.html#path-prefix)
-management.path_prefix = /admin/broker
management.load_definitions = /app/definitions.json
# logging
@@ -14,6 +13,11 @@ log.console = true
log.console.level = warning
auth_ldap.log = true
+# MQTT
+mqtt.vhost = dbrepo
+mqtt.exchange = dbrepo
+mqtt.prefetch = 10
+
# Obviously your authentication server cannot vouch for itself, so you'll need another backend with at least one user in
# it. You should probably use the internal database
auth_backends.1.authn = ldap
diff --git a/dbrepo-dashboard-service/Dockerfile b/dbrepo-dashboard-service/Dockerfile
index 374e72e41d31f17e6df2ace7dd57eed925fd14ab..00fc60339b15b2e1ebeda9dbbf7849c96bd7a401 100644
--- a/dbrepo-dashboard-service/Dockerfile
+++ b/dbrepo-dashboard-service/Dockerfile
@@ -1,9 +1,9 @@
-FROM docker.io/bitnami/grafana:11.2.0-debian-12-r4 AS runtime
+FROM docker.io/bitnami/grafana:10.4.9-debian-12-r0 AS runtime
LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
WORKDIR /app
-COPY ./grafana.ini /etc/grafana/grafana.ini
-COPY ldap.toml /etc/grafana/ldap.toml
-COPY provisioning/datasources/prometheus.yaml /etc/grafana/provisioning/datasources/datasource.yaml
-#COPY --chown=999:999 ./system.yaml /var/lib/grafana/dashboards/system.yaml
+COPY --chown=grafana:grafana ./dashboards /app/dashboards
+COPY --chown=grafana:grafana ./provisioning /etc/grafana/provisioning
+COPY --chown=grafana:grafana ./grafana.ini /etc/grafana/grafana.ini
+COPY --chown=grafana:grafana ./ldap.toml /etc/grafana/ldap.toml
diff --git a/dbrepo-dashboard-service/dashboards/system.json b/dbrepo-dashboard-service/dashboards/system.json
index 75287d5a0353df5aa77f82ee361888fe00274ef8..d0234fe47706400ed5e75b72906b8a61461a09bf 100644
--- a/dbrepo-dashboard-service/dashboards/system.json
+++ b/dbrepo-dashboard-service/dashboards/system.json
@@ -29,7 +29,7 @@
"title": "Docs",
"tooltip": "",
"type": "link",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/"
}
],
"panels": [
@@ -41,102 +41,6 @@
"x": 0,
"y": 0
},
- "id": 3,
- "panels": [],
- "title": "Overview",
- "type": "row"
- },
- {
- "datasource": {
- "default": true,
- "type": "prometheus",
- "uid": "P18F45E9DC7E75912"
- },
- "fieldConfig": {
- "defaults": {
- "mappings": [],
- "thresholds": {
- "mode": "percentage",
- "steps": [
- {
- "color": "purple",
- "value": null
- },
- {
- "color": "red",
- "value": 0
- },
- {
- "color": "orange",
- "value": 60
- },
- {
- "color": "#EAB839",
- "value": 80
- },
- {
- "color": "green",
- "value": 100
- }
- ]
- },
- "unit": "percentunit"
- },
- "overrides": []
- },
- "gridPos": {
- "h": 3,
- "w": 3,
- "x": 0,
- "y": 1
- },
- "id": 9,
- "options": {
- "colorMode": "background",
- "graphMode": "none",
- "justifyMode": "auto",
- "orientation": "auto",
- "percentChangeColorMode": "standard",
- "reduceOptions": {
- "calcs": [
- "lastNotNull"
- ],
- "fields": "",
- "values": false
- },
- "showPercentChange": false,
- "textMode": "auto",
- "wideLayout": true
- },
- "pluginVersion": "11.2.0",
- "targets": [
- {
- "datasource": {
- "type": "prometheus",
- "uid": "P18F45E9DC7E75912"
- },
- "disableTextWrap": false,
- "editorMode": "code",
- "expr": "sum(up)/count(up)",
- "fullMetaSearch": false,
- "includeNullMetadata": true,
- "instant": false,
- "legendFormat": "Services Running",
- "range": true,
- "refId": "A",
- "useBackend": false
- }
- ],
- "type": "stat"
- },
- {
- "collapsed": false,
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 4
- },
"id": 15,
"panels": [],
"title": "Data",
@@ -150,7 +54,6 @@
},
"fieldConfig": {
"defaults": {
- "displayName": "Databases",
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -167,9 +70,9 @@
},
"gridPos": {
"h": 3,
- "w": 5,
+ "w": 4,
"x": 0,
- "y": 5
+ "y": 1
},
"id": 4,
"options": {
@@ -189,7 +92,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -208,6 +111,7 @@
"useBackend": false
}
],
+ "title": "Databases",
"type": "stat"
},
{
@@ -218,7 +122,6 @@
},
"fieldConfig": {
"defaults": {
- "displayName": "Datasources",
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -235,9 +138,9 @@
},
"gridPos": {
"h": 3,
- "w": 5,
- "x": 5,
- "y": 5
+ "w": 4,
+ "x": 4,
+ "y": 1
},
"id": 5,
"options": {
@@ -257,7 +160,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -310,6 +213,7 @@
"useBackend": false
}
],
+ "title": "Datasources",
"transformations": [
{
"id": "calculateField",
@@ -331,9 +235,9 @@
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "",
"fieldConfig": {
"defaults": {
- "displayName": "Volume",
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -350,9 +254,9 @@
},
"gridPos": {
"h": 3,
- "w": 5,
- "x": 10,
- "y": 5
+ "w": 4,
+ "x": 8,
+ "y": 1
},
"id": 8,
"options": {
@@ -372,7 +276,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -391,6 +295,7 @@
"useBackend": false
}
],
+ "title": "Data Volume",
"type": "stat"
},
{
@@ -399,58 +304,24 @@
"h": 1,
"w": 24,
"x": 0,
- "y": 8
+ "y": 4
},
- "id": 2,
+ "id": 22,
"panels": [],
- "title": "Services",
+ "title": "UI",
"type": "row"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "",
"fieldConfig": {
"defaults": {
- "color": {
- "mode": "palette-classic"
- },
- "custom": {
- "axisBorderShow": false,
- "axisCenteredZero": false,
- "axisColorMode": "text",
- "axisLabel": "",
- "axisPlacement": "auto",
- "barAlignment": 0,
- "barWidthFactor": 0.6,
- "drawStyle": "line",
- "fillOpacity": 25,
- "gradientMode": "none",
- "hideFrom": {
- "legend": false,
- "tooltip": false,
- "viz": false
- },
- "insertNulls": false,
- "lineInterpolation": "linear",
- "lineWidth": 1,
- "pointSize": 5,
- "scaleDistribution": {
- "type": "linear"
- },
- "showPoints": "auto",
- "spanNulls": false,
- "stacking": {
- "group": "A",
- "mode": "normal"
- },
- "thresholdsStyle": {
- "mode": "off"
- }
- },
"mappings": [],
+ "max": 100,
+ "min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
@@ -458,99 +329,976 @@
"color": "green",
"value": null
},
+ {
+ "color": "#EAB839",
+ "value": 300
+ },
+ {
+ "color": "orange",
+ "value": 600
+ },
{
"color": "red",
- "value": 80
+ "value": 900
}
]
- }
+ },
+ "unit": "ms"
},
- "overrides": [
- {
- "matcher": {
- "id": "byName",
- "options": "auth-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "yellow",
- "mode": "fixed"
- }
- }
- ]
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 0,
+ "y": 5
+ },
+ "id": 17,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
},
- {
- "matcher": {
- "id": "byName",
- "options": "broker-service:15692"
- },
- "properties": [
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "avg(page_render_time)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Response Time (avg)",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
{
- "id": "color",
- "value": {
- "fixedColor": "light-blue",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "metadata-service:8080"
- },
- "properties": [
+ "color": "green",
+ "value": null
+ },
{
- "id": "color",
- "value": {
- "fixedColor": "purple",
- "mode": "fixed"
- }
+ "color": "#EAB839",
+ "value": 0.02
+ },
+ {
+ "color": "orange",
+ "value": 0.05
+ },
+ {
+ "color": "red",
+ "value": 0.1
}
]
},
- {
- "matcher": {
- "id": "byName",
- "options": "analyse-service:80"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "super-light-red",
- "mode": "fixed"
- }
+ "unit": "s"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 4,
+ "y": 5
+ },
+ "id": 24,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_eventloop_lag_mean_seconds",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Event Lag (avg)",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 8,
+ "y": 5
+ },
+ "id": 25,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_handles{type=\"Server\"}",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Servers",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 12,
+ "y": 5
+ },
+ "id": 26,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_handles{type=\"Socket\"}",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Sockets",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "fixedColor": "blue",
+ "mode": "fixed"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 16,
+ "y": 5
+ },
+ "id": 27,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_requests_total",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Active Requests",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 300
+ },
+ {
+ "color": "orange",
+ "value": 600
+ },
+ {
+ "color": "red",
+ "value": 900
+ }
+ ]
+ },
+ "unit": "ms"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 0,
+ "y": 8
+ },
+ "id": 20,
+ "options": {
+ "displayMode": "basic",
+ "maxVizHeight": 300,
+ "minVizHeight": 16,
+ "minVizWidth": 8,
+ "namePlacement": "auto",
+ "orientation": "horizontal",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true,
+ "sizing": "auto",
+ "valueMode": "color"
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "page_render_time",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{path}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Response Time per Path (avg)",
+ "type": "bargauge"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "dashed"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 256000000
+ }
+ ]
+ },
+ "unit": "decbytes"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 8
+ },
+ "id": 21,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "nodejs_heap_space_size_total_bytes",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{space}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "NodeJS Heap Bytes",
+ "type": "timeseries"
+ },
+ {
+ "collapsed": false,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 15
+ },
+ "id": 2,
+ "panels": [],
+ "title": "Services",
+ "type": "row"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "Quality of Service",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "purple",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 0
+ },
+ {
+ "color": "orange",
+ "value": 60
+ },
+ {
+ "color": "#EAB839",
+ "value": 80
+ },
+ {
+ "color": "green",
+ "value": 100
+ }
+ ]
+ },
+ "unit": "percent"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 0,
+ "y": 16
+ },
+ "id": 9,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "sum(up)*100/count(up)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "Services Running",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "QoS",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "s"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 4,
+ "y": 16
+ },
+ "id": 28,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "min(process_uptime_seconds)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Uptime",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "custom": {
+ "fillOpacity": 70,
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineWidth": 1
+ },
+ "mappings": [
+ {
+ "options": {
+ "0": {
+ "index": 0,
+ "text": "DOWN"
+ },
+ "1": {
+ "index": 1,
+ "text": "UP"
+ }
+ },
+ "type": "value"
+ }
+ ],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "red",
+ "value": null
+ },
+ {
+ "color": "green",
+ "value": 1
}
]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 16
+ },
+ "id": 16,
+ "options": {
+ "colWidth": 0.9,
+ "legend": {
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": false
+ },
+ "rowHeight": 0.9,
+ "showValue": "auto",
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
},
- {
- "matcher": {
- "id": "byName",
- "options": "auth-service-metrics:8080"
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "up",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{instance}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Service QoS",
+ "type": "status-history"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
},
- "properties": [
+ "insertNulls": false,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
{
- "id": "color",
- "value": {
- "fixedColor": "green",
- "mode": "fixed"
- }
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 0,
+ "y": 19
+ },
+ "id": 23,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
+ }
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "process_open_fds\n",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{instance}}",
+ "range": true,
+ "refId": "process_open_fds",
+ "useBackend": false
+ }
+ ],
+ "title": "File Descriptors",
+ "type": "timeseries"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "Heap and non-heap memory summed",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 25,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "normal"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
}
]
},
+ "unit": "decbytes"
+ },
+ "overrides": [
{
"matcher": {
"id": "byName",
- "options": "metadata-service:80"
+ "options": "auth-service:9000"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "blue",
+ "fixedColor": "yellow",
"mode": "fixed"
}
}
@@ -559,13 +1307,13 @@
{
"matcher": {
"id": "byName",
- "options": "data-service:80"
+ "options": "data-service:8080"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "purple",
+ "fixedColor": "blue",
"mode": "fixed"
}
}
@@ -574,13 +1322,13 @@
{
"matcher": {
"id": "byName",
- "options": "search-service:80"
+ "options": "metadata-service:8080"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "semi-dark-purple",
+ "fixedColor": "purple",
"mode": "fixed"
}
}
@@ -589,13 +1337,13 @@
{
"matcher": {
"id": "byName",
- "options": "ui:80"
+ "options": "metadata-service:80"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "super-light-purple",
+ "fixedColor": "blue",
"mode": "fixed"
}
}
@@ -604,12 +1352,12 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
- "x": 0,
- "y": 9
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 23
},
- "id": 1,
+ "id": 7,
"options": {
"legend": {
"calcs": [],
@@ -618,7 +1366,7 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
@@ -631,10 +1379,10 @@
},
"disableTextWrap": false,
"editorMode": "builder",
- "expr": "up",
+ "expr": "sum by(instance) (jvm_memory_used_bytes)",
"fullMetaSearch": false,
"hide": false,
- "includeNullMetadata": true,
+ "includeNullMetadata": false,
"instant": false,
"legendFormat": "{{instance}}",
"range": true,
@@ -642,12 +1390,11 @@
"useBackend": false
}
],
- "title": "Service Instances Running",
+ "title": "JVM Memory Usage",
"type": "timeseries"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
@@ -663,7 +1410,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -674,7 +1420,7 @@
},
"insertNulls": false,
"lineInterpolation": "smooth",
- "lineWidth": 1,
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
@@ -696,19 +1442,16 @@
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
- }
+ },
+ "unit": "none"
},
"overrides": [
{
"matcher": {
"id": "byName",
- "options": "auth-service:8080"
+ "options": "auth-service:9000"
},
"properties": [
{
@@ -768,10 +1511,10 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
+ "h": 7,
+ "w": 12,
"x": 0,
- "y": 15
+ "y": 26
},
"id": 6,
"options": {
@@ -802,7 +1545,7 @@
"instant": false,
"legendFormat": "{{instance}}",
"range": true,
- "refId": "Java",
+ "refId": "process_cpu_usage",
"useBackend": false
}
],
@@ -811,11 +1554,9 @@
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "description": "Heap and non-heap memory summed",
"fieldConfig": {
"defaults": {
"color": {
@@ -828,7 +1569,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -838,8 +1578,8 @@
"viz": false
},
"insertNulls": false,
- "lineInterpolation": "linear",
- "lineWidth": 1,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
@@ -848,7 +1588,7 @@
"spanNulls": false,
"stacking": {
"group": "A",
- "mode": "normal"
+ "mode": "none"
},
"thresholdsStyle": {
"mode": "off"
@@ -864,49 +1604,19 @@
}
]
},
- "unit": "decbytes"
+ "unit": "reqps"
},
"overrides": [
{
"matcher": {
- "id": "byName",
- "options": "auth-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "data-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "blue",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "metadata-service:8080"
+ "id": "byRegexp",
+ "options": "/.*search-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "purple",
+ "fixedColor": "orange",
"mode": "fixed"
}
}
@@ -914,14 +1624,14 @@
},
{
"matcher": {
- "id": "byName",
- "options": "metadata-service:80"
+ "id": "byRegexp",
+ "options": "/.*analyse-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "blue",
+ "fixedColor": "super-light-orange",
"mode": "fixed"
}
}
@@ -930,12 +1640,12 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
- "x": 0,
- "y": 21
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 30
},
- "id": 7,
+ "id": 19,
"options": {
"legend": {
"calcs": [],
@@ -944,36 +1654,29 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
- "pluginVersion": "11.2.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "disableTextWrap": false,
- "editorMode": "builder",
- "expr": "sum by(instance) (jvm_memory_used_bytes)",
- "fullMetaSearch": false,
- "hide": false,
- "includeNullMetadata": false,
+ "editorMode": "code",
+ "expr": "rate(flask_http_request_duration_seconds_count{status!~\"200|201|202\"}[$__rate_interval])",
"instant": false,
- "legendFormat": "{{instance}}",
+ "legendFormat": "{{method}} {{instance}} ({{status}})",
"range": true,
- "refId": "A",
- "useBackend": false
+ "refId": "A"
}
],
- "title": "JVM Memory Usage",
+ "title": "Failed API Requests",
"type": "timeseries"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
@@ -989,9 +1692,8 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
- "fillOpacity": 10,
+ "fillOpacity": 25,
"gradientMode": "none",
"hideFrom": {
"legend": false,
@@ -1000,12 +1702,12 @@
},
"insertNulls": false,
"lineInterpolation": "smooth",
- "lineWidth": 1,
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
- "showPoints": "never",
+ "showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
@@ -1015,7 +1717,6 @@
"mode": "off"
}
},
- "links": [],
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -1023,20 +1724,16 @@
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
- "unit": "short"
+ "unit": "reqps"
},
"overrides": [
{
"matcher": {
- "id": "byName",
- "options": "400"
+ "id": "byRegexp",
+ "options": "/.*search-service.*/"
},
"properties": [
{
@@ -1050,104 +1747,14 @@
},
{
"matcher": {
- "id": "byName",
- "options": "500"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "#BF1B00",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "-1"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "purple",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "200"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "green",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "302"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "light-yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "304"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "super-light-yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "401"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "light-orange",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "499"
+ "id": "byRegexp",
+ "options": "/.*analyse-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "red",
+ "fixedColor": "super-light-orange",
"mode": "fixed"
}
}
@@ -1156,12 +1763,12 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
+ "h": 7,
+ "w": 12,
"x": 0,
- "y": 27
+ "y": 33
},
- "id": 13,
+ "id": 18,
"options": {
"legend": {
"calcs": [],
@@ -1170,11 +1777,10 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
- "pluginVersion": "8.1.0-pre",
"targets": [
{
"datasource": {
@@ -1182,28 +1788,390 @@
"uid": "P18F45E9DC7E75912"
},
"editorMode": "code",
- "expr": "sum by (status_code) (irate(grafana_http_request_duration_seconds_count[5m]))",
- "format": "time_series",
- "intervalFactor": 3,
- "legendFormat": "{{status_code}}",
+ "expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])",
+ "instant": false,
+ "legendFormat": "{{method}} {{instance}} {{path}} ({{status}})",
"range": true,
- "refId": "B",
- "step": 15,
- "target": "dev.grafana.cb-office.alerting.active_alerts"
+ "refId": "A"
}
],
- "title": "Dashboard Service HTTP Status Codes",
+ "title": "Successful API Requests",
"type": "timeseries"
+ },
+ {
+ "collapsed": true,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 40
+ },
+ "id": 31,
+ "panels": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 0,
+ "y": 41
+ },
+ "id": 29,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nginx_connections_active",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Connections (Active)",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 1
+ },
+ {
+ "color": "orange",
+ "value": 3
+ },
+ {
+ "color": "red",
+ "value": 5
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 4,
+ "y": 41
+ },
+ "id": 30,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nginx_connections_waiting",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Connections (Waiting)",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 0.0001
+ },
+ {
+ "color": "orange",
+ "value": 0.001
+ },
+ {
+ "color": "red",
+ "value": 0.01
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 8,
+ "y": 41
+ },
+ "id": 33,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "max(rate(promhttp_metric_handler_requests_total{job=\"gateway scrape\", code!=\"200\"}[24h]))",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Failed Requests (24h)",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "#EAB839",
+ "value": 0.0001
+ },
+ {
+ "color": "orange",
+ "value": 0.001
+ },
+ {
+ "color": "red",
+ "value": 0.01
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 41
+ },
+ "id": 32,
+ "options": {
+ "displayMode": "basic",
+ "maxVizHeight": 300,
+ "minVizHeight": 16,
+ "minVizWidth": 8,
+ "namePlacement": "auto",
+ "orientation": "horizontal",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true,
+ "sizing": "auto",
+ "valueMode": "color"
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "rate(promhttp_metric_handler_requests_total{job=\"gateway scrape\", code!=\"200\"}[24h])",
+ "fullMetaSearch": false,
+ "includeNullMetadata": false,
+ "instant": false,
+ "legendFormat": "Code {{code}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Failed Requests (24h)",
+ "type": "bargauge"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 12,
+ "x": 0,
+ "y": 44
+ },
+ "id": 34,
+ "links": [
+ {
+ "targetBlank": true,
+ "title": "Documentation",
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/api/gateway-service/#monitoring-optional"
+ }
+ ],
+ "options": {
+ "code": {
+ "language": "plaintext",
+ "showLineNumbers": false,
+ "showMiniMap": false
+ },
+ "content": "## Optional Panel\n\nActivate this panel by setting-up the Gateway Service Monitoring by clicking the link above.",
+ "mode": "markdown"
+ },
+ "pluginVersion": "10.4.9",
+ "transparent": true,
+ "type": "text"
+ }
+ ],
+ "title": "Gateway",
+ "type": "row"
}
],
- "refresh": "10s",
+ "refresh": "1m",
"schemaVersion": 39,
- "tags": ["provisioned", "dbrepo"],
+ "tags": [
+ "provisioned",
+ "dbrepo"
+ ],
"templating": {
"list": []
},
"time": {
- "from": "now-15m",
+ "from": "now-30m",
"to": "now"
},
"timepicker": {},
diff --git a/dbrepo-data-service/pom.xml b/dbrepo-data-service/pom.xml
index 9aefac5d757bd6e71c164b3f3fdcb8780ba56708..6517de47460bdf48ad1f31397a1e67416e3dbc31 100644
--- a/dbrepo-data-service/pom.xml
+++ b/dbrepo-data-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
<name>dbrepo-data-service</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<description>Service that manages the data</description>
diff --git a/dbrepo-data-service/querystore/pom.xml b/dbrepo-data-service/querystore/pom.xml
index 3d301be50f460d547e635cf27d9bbd64e17c3261..c9e016e488737aa458f9c609b0fbd77947fac304 100644
--- a/dbrepo-data-service/querystore/pom.xml
+++ b/dbrepo-data-service/querystore/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-data-service-querystore</artifactId>
<name>dbrepo-data-service-querystore</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies/>
diff --git a/dbrepo-data-service/report/pom.xml b/dbrepo-data-service/report/pom.xml
index 76bce1e9290ecf4a74283c0f1f95d9575617f67e..e218cad33215dd52f5171d897704bf74dd7b43a6 100644
--- a/dbrepo-data-service/report/pom.xml
+++ b/dbrepo-data-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>report</artifactId>
<name>dbrepo-data-service-report</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<description>
This module is only intended for the pipeline coverage report. See the detailed report in the
respective modules
diff --git a/dbrepo-data-service/rest-service/pom.xml b/dbrepo-data-service/rest-service/pom.xml
index 214912d816594f01618f0d631b224e1246be29bf..eb2ee53fd463b8910faf24b0547f0032598f8c71 100644
--- a/dbrepo-data-service/rest-service/pom.xml
+++ b/dbrepo-data-service/rest-service/pom.xml
@@ -6,18 +6,18 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>rest-service</artifactId>
<name>dbrepo-data-service-rest-service</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>services</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
index 133bee769c792602ae89114a218381dd913f5c93..4059a37a92ba138ef39a6f53365fd70558951e56 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
@@ -18,6 +18,7 @@ import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -88,7 +89,7 @@ public class AccessEndpoint {
}
try {
accessService.create(database, user, data.getType());
- return ResponseEntity.accepted()
+ return ResponseEntity.status(HttpStatus.CREATED)
.build();
} catch (SQLException e) {
log.error("Failed to establish connection to database: {}", e.getMessage());
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
index 87471c74c2e21d45dc86a28e76409e3cb9564906..1637878a6785f595a35643471aa2b2b71f027399 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/SubsetEndpoint.java
@@ -250,12 +250,7 @@ public class SubsetEndpoint {
endpointValidator.validateDataParams(page, size);
endpointValidator.validateForbiddenStatements(data.getStatement());
/* parameters */
- final UUID userId;
- if (principal == null) {
- userId = metadataServiceGateway.getSystemUserId();
- } else {
- userId = UserUtil.getId(principal);
- }
+ final UUID userId = principal != null ? UserUtil.getId(principal) : null;
if (page == null) {
page = 0L;
log.debug("page not set: default to {}", page);
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index 4af577bed5771e66502ab48e78509c096666d151..06afef015df02c8077ce312691e140916ea4e2f0 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -4,8 +4,7 @@ import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.DatabaseAccessDto;
import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
-import at.tuwien.api.database.query.ImportCsvDto;
-import at.tuwien.api.database.query.QueryDto;
+import at.tuwien.api.database.query.ImportDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
@@ -13,6 +12,7 @@ import at.tuwien.api.database.table.internal.TableCreateDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
+import at.tuwien.service.SchemaService;
import at.tuwien.service.TableService;
import at.tuwien.utils.UserUtil;
import at.tuwien.validation.EndpointValidator;
@@ -33,7 +33,6 @@ import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -51,13 +50,15 @@ import java.util.List;
public class TableEndpoint {
private final TableService tableService;
+ private final SchemaService schemaService;
private final EndpointValidator endpointValidator;
private final MetadataServiceGateway metadataServiceGateway;
@Autowired
- public TableEndpoint(TableService tableService, EndpointValidator endpointValidator,
+ public TableEndpoint(TableService tableService, SchemaService schemaService, EndpointValidator endpointValidator,
MetadataServiceGateway metadataServiceGateway) {
this.tableService = tableService;
+ this.schemaService = schemaService;
this.endpointValidator = endpointValidator;
this.metadataServiceGateway = metadataServiceGateway;
}
@@ -107,8 +108,9 @@ public class TableEndpoint {
/* create */
final PrivilegedDatabaseDto database = metadataServiceGateway.getDatabaseById(databaseId);
try {
+ final TableDto table = tableService.createTable(database, data);
return ResponseEntity.status(HttpStatus.CREATED)
- .body(tableService.createTable(database, data));
+ .body(schemaService.inspectTable(database, table.getInternalName()));
} catch (SQLException e) {
log.error("Failed to establish connection to database: {}", e.getMessage());
throw new DatabaseUnavailableException("Failed to establish connection to database: " + e.getMessage(), e);
@@ -553,7 +555,7 @@ public class TableEndpoint {
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
NotAllowedException, StorageUnavailableException, QueryMalformedException, SidecarExportException,
StorageNotFoundException, MetadataServiceException {
- log.debug("endpoint find table history, databaseId={}, tableId={}, timestamp={}", databaseId, tableId, timestamp);
+ log.debug("endpoint export table data, databaseId={}, tableId={}, timestamp={}", databaseId, tableId, timestamp);
/* parameters */
if (timestamp == null) {
timestamp = Instant.now();
@@ -614,7 +616,7 @@ public class TableEndpoint {
})
public ResponseEntity<Void> importDataset(@NotBlank @PathVariable("databaseId") Long databaseId,
@NotBlank @PathVariable("tableId") Long tableId,
- @Valid @RequestBody ImportCsvDto data,
+ @Valid @RequestBody ImportDto data,
@NotNull Principal principal)
throws DatabaseUnavailableException, RemoteUnavailableException, TableNotFoundException,
QueryMalformedException, StorageNotFoundException, SidecarImportException, NotAllowedException,
@@ -623,10 +625,6 @@ public class TableEndpoint {
final PrivilegedTableDto table = metadataServiceGateway.getTableById(databaseId, tableId);
final DatabaseAccessDto access = metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
endpointValidator.validateOnlyWriteOwnOrWriteAllAccess(access.getType(), table.getOwner().getId(), UserUtil.getId(principal));
- if (data.getNullElement() == null) {
- data.setNullElement("");
- log.debug("null element not present, default to empty string");
- }
if (data.getLineTermination() == null) {
data.setLineTermination("\\r\\n");
log.debug("line termination not present, default to {}", data.getLineTermination());
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index a4c07c3f55ff5ea2fab84b6293c7cc6a424c278c..9d0bd3b6adec78c34690073a46f35ab220386504 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -1,9 +1,12 @@
package at.tuwien.endpoints;
-import at.tuwien.api.database.*;
+import at.tuwien.ExportResourceDto;
+import at.tuwien.api.database.ViewCreateDto;
+import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
import at.tuwien.api.database.internal.PrivilegedViewDto;
import at.tuwien.api.database.query.QueryResultDto;
+import at.tuwien.api.database.table.internal.PrivilegedTableDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
@@ -24,6 +27,7 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.InputStreamResource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -282,4 +286,67 @@ public class ViewEndpoint {
}
}
+ @GetMapping("/{viewId}/export")
+ @Observed(name = "dbrepo_view_data_export")
+ @Operation(summary = "Get view data",
+ description = "Gets data from view with id as downloadable file. For tables in private databases, the user needs to have at least *READ* access to the associated database.",
+ security = {@SecurityRequirement(name = "basicAuth"), @SecurityRequirement(name = "bearerAuth")})
+ @ApiResponses(value = {
+ @ApiResponse(responseCode = "200",
+ description = "Exported view data",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = InputStreamResource.class))}),
+ @ApiResponse(responseCode = "400",
+ description = "Request pagination or view data select query is malformed",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "403",
+ description = "Export view data not allowed",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "404",
+ description = "Failed to find view in metadata database or export dataset",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
+ @ApiResponse(responseCode = "503",
+ description = "Failed to establish connection with the metadata service",
+ content = {@Content(
+ mediaType = "application/json",
+ schema = @Schema(implementation = ApiErrorDto.class))}),
+ })
+ public ResponseEntity<InputStreamResource> exportDataset(@NotBlank @PathVariable("databaseId") Long databaseId,
+ @NotBlank @PathVariable("viewId") Long viewId,
+ Principal principal)
+ throws DatabaseUnavailableException, RemoteUnavailableException, ViewNotFoundException,
+ NotAllowedException, MetadataServiceException, StorageUnavailableException, QueryMalformedException,
+ SidecarExportException, StorageNotFoundException {
+ log.debug("endpoint export view data, databaseId={}, viewId={}", databaseId, viewId);
+ /* parameters */
+ final PrivilegedViewDto view = metadataServiceGateway.getViewById(databaseId, viewId);
+ if (!view.getIsPublic()) {
+ if (principal == null) {
+ log.error("Failed to export private view: principal is null");
+ throw new NotAllowedException("Failed to export private view: principal is null");
+ }
+ metadataServiceGateway.getAccess(databaseId, UserUtil.getId(principal));
+ }
+ try {
+ final HttpHeaders headers = new HttpHeaders();
+ final ExportResourceDto resource = viewService.exportDataset(view);
+ headers.add("Content-Disposition", "attachment; filename=\"" + resource.getFilename() + "\"");
+ log.trace("export table resulted in resource {}", resource);
+ return ResponseEntity.ok()
+ .headers(headers)
+ .body(resource.getResource());
+
+ } catch (SQLException e) {
+ log.error("Failed to establish connection to database: {}", e.getMessage());
+ throw new DatabaseUnavailableException("Failed to establish connection to database", e);
+ }
+ }
+
}
diff --git a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
index 3cbb865293553e91a6730cfd731c62bbfc79c915..1c6adfd6a5b87355e76f9b40147fe91f5de4d4e2 100644
--- a/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
+++ b/dbrepo-data-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
@@ -1,8 +1,6 @@
package at.tuwien.validation;
import at.tuwien.api.database.AccessTypeDto;
-import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.DatabaseDto;
import at.tuwien.config.QueryConfig;
import at.tuwien.exception.NotAllowedException;
import at.tuwien.exception.PaginationException;
diff --git a/dbrepo-data-service/rest-service/src/main/resources/init/querystore.sql b/dbrepo-data-service/rest-service/src/main/resources/init/querystore.sql
index c1df44d1b0766fb04d081f3b5b3679039d8ba72f..3e7471df3e1eb3a1bb79db7246ecb805a06f495c 100644
--- a/dbrepo-data-service/rest-service/src/main/resources/init/querystore.sql
+++ b/dbrepo-data-service/rest-service/src/main/resources/init/querystore.sql
@@ -1,5 +1,5 @@
CREATE SEQUENCE `qs_queries_seq` NOCACHE;
-CREATE TABLE `qs_queries` ( `id` bigint not null primary key default nextval(`qs_queries_seq`), `created` datetime not null default now(), `executed` datetime not null default now(), `created_by` varchar(36) not null, `query` text not null, `query_normalized` text not null, `is_persisted` boolean not null, `query_hash` varchar(255) not null, `result_hash` varchar(255), `result_number` bigint ) WITH SYSTEM VERSIONING;
+CREATE TABLE `qs_queries` ( `id` bigint not null primary key default nextval(`qs_queries_seq`), `created` datetime not null default now(), `executed` datetime not null default now(), `created_by` varchar(36), `query` text not null, `query_normalized` text not null, `is_persisted` boolean not null, `query_hash` varchar(255) not null, `result_hash` varchar(255), `result_number` bigint ) WITH SYSTEM VERSIONING;
CREATE PROCEDURE hash_table(IN name VARCHAR(255), OUT hash VARCHAR(255), OUT count BIGINT) BEGIN DECLARE _sql TEXT; SELECT CONCAT('SELECT SHA2(GROUP_CONCAT(CONCAT_WS(\'\',', GROUP_CONCAT(CONCAT('`', column_name, '`') ORDER BY column_name), ') SEPARATOR \',\'), 256) AS hash, COUNT(*) AS count FROM `', name, '` INTO @hash, @count;') FROM `information_schema`.`columns` WHERE `table_schema` = DATABASE() AND `table_name` = name INTO _sql; PREPARE stmt FROM _sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; SET hash = @hash; SET count = @count; END;
CREATE PROCEDURE store_query(IN query TEXT, IN executed DATETIME, OUT queryId BIGINT) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _username varchar(255) DEFAULT REGEXP_REPLACE(current_user(), '@.*', ''); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
CREATE DEFINER = 'root' PROCEDURE _store_query(IN _username VARCHAR(255), IN query TEXT, IN executed DATETIME, OUT queryId BIGINT) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
\ No newline at end of file
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
index b0c332a63b5b87e786ca928daa7bc8bfa8a7ed3c..691d96006bb273bc257e6439b0f828cae70b9d58 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/config/MariaDbConfig.java
@@ -6,13 +6,11 @@ import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
import at.tuwien.api.database.query.QueryDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
-import at.tuwien.querystore.Query;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
-import java.io.IOException;
import java.sql.*;
import java.time.Instant;
import java.util.*;
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
index 3beb5626b3b8a2a001ac365a376cffea68b7b3ee..a2cbae3ea89ef15be88121a5ced8c47374601319 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java
@@ -15,12 +15,14 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.sql.SQLException;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@Log4j2
@@ -54,7 +56,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
.thenReturn(USER_4_PRIVILEGED_DTO);
/* test */
- accessEndpoint.create(DATABASE_1_ID, USER_4_ID, UPDATE_DATABASE_ACCESS_READ_DTO);
+ final ResponseEntity<Void> response = accessEndpoint.create(DATABASE_1_ID, USER_4_ID, UPDATE_DATABASE_ACCESS_READ_DTO);
+ assertEquals(HttpStatus.CREATED, response.getStatusCode());
+ assertNull(response.getBody());
}
@Test
@@ -150,7 +154,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
.thenReturn(USER_1_DTO);
/* test */
- accessEndpoint.update(DATABASE_1_ID, USER_1_ID, UPDATE_DATABASE_ACCESS_READ_DTO);
+ final ResponseEntity<Void> response = accessEndpoint.update(DATABASE_1_ID, USER_1_ID, UPDATE_DATABASE_ACCESS_READ_DTO);
+ assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+ assertNull(response.getBody());
}
@Test
@@ -250,7 +256,9 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
.delete(any(PrivilegedDatabaseDto.class), any(UserDto.class));
/* test */
- accessEndpoint.revoke(DATABASE_1_ID, USER_1_ID);
+ final ResponseEntity<Void> response = accessEndpoint.revoke(DATABASE_1_ID, USER_1_ID);
+ assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+ assertNull(response.getBody());
}
@Test
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
index 358a04008f9faeca8daf5b898df238fa5142a14f..9ab7082d0eb40da175947314c13b669de9f02476 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/SubsetEndpointUnitTest.java
@@ -368,9 +368,7 @@ public class SubsetEndpointUnitTest extends AbstractUnitTest {
/* mock */
when(metadataServiceGateway.getDatabaseById(DATABASE_3_ID))
.thenReturn(DATABASE_3_PRIVILEGED_DTO);
- when(metadataServiceGateway.getSystemUserId())
- .thenReturn(USER_LOCAL_ADMIN_ID);
- when(subsetService.execute(eq(DATABASE_3_PRIVILEGED_DTO), anyString(), any(Instant.class), eq(USER_LOCAL_ADMIN_ID), eq(0L), eq(10L), eq(null), eq(null)))
+ when(subsetService.execute(eq(DATABASE_3_PRIVILEGED_DTO), anyString(), any(Instant.class), eq(null), eq(0L), eq(10L), eq(null), eq(null)))
.thenReturn(QUERY_5_RESULT_DTO);
/* test */
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
index f03f4c3f189c98013e6fa5d4bb01a5cfd4fe211f..cc4b957226a77fbe4f39aef09193b29def575959 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/endpoint/TableEndpointUnitTest.java
@@ -2,13 +2,14 @@ package at.tuwien.endpoint;
import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.DatabaseAccessDto;
-import at.tuwien.api.database.query.ImportCsvDto;
+import at.tuwien.api.database.query.ImportDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
import at.tuwien.endpoints.TableEndpoint;
import at.tuwien.exception.*;
import at.tuwien.gateway.MetadataServiceGateway;
+import at.tuwien.service.SchemaService;
import at.tuwien.service.TableService;
import at.tuwien.test.AbstractUnitTest;
import jakarta.servlet.http.HttpServletRequest;
@@ -54,6 +55,9 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@MockBean
private TableService tableService;
+ @MockBean
+ private SchemaService schemaService;
+
@MockBean
private MetadataServiceGateway metadataServiceGateway;
@@ -89,6 +93,8 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
.thenReturn(DATABASE_1_PRIVILEGED_DTO);
when(tableService.createTable(DATABASE_1_PRIVILEGED_DTO, TABLE_4_CREATE_INTERNAL_DTO))
.thenReturn(TABLE_4_DTO);
+ when(schemaService.inspectTable(DATABASE_1_PRIVILEGED_DTO, TABLE_4_INTERNALNAME))
+ .thenReturn(TABLE_4_DTO);
/* test */
final ResponseEntity<TableDto> response = tableEndpoint.create(DATABASE_1_ID, TABLE_4_CREATE_INTERNAL_DTO);
@@ -1261,7 +1267,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_succeeds() throws DatabaseUnavailableException, TableNotFoundException,
SidecarImportException, NotAllowedException, QueryMalformedException, RemoteUnavailableException,
StorageNotFoundException, SQLException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination(null)
.location("deadbeef")
@@ -1287,7 +1293,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_4_USERNAME)
public void importDataset_noRole_fails() {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1303,7 +1309,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importDataset_tableNotFound_fails() throws TableNotFoundException, RemoteUnavailableException,
MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1325,7 +1331,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_unavailable_fails() throws RemoteUnavailableException, SidecarImportException,
SQLException, QueryMalformedException, StorageNotFoundException, TableNotFoundException,
MetadataServiceException, NotAllowedException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1351,7 +1357,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_writeOwnAccess_fails() throws RemoteUnavailableException, SidecarImportException,
SQLException, QueryMalformedException, StorageNotFoundException, TableNotFoundException,
MetadataServiceException, NotAllowedException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1376,7 +1382,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importDataset_readAccess_fails() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1399,7 +1405,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_writeOwnAccess_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, SidecarImportException, QueryMalformedException,
StorageNotFoundException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1419,7 +1425,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_3_USERNAME, authorities = {"insert-table-data"})
public void importDataset_writeOwnAccessForeign_fails() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1442,7 +1448,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_writeAllAccessForeign_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, SidecarImportException, QueryMalformedException,
StorageNotFoundException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1463,7 +1469,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_privateForeign_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, SidecarImportException, QueryMalformedException,
StorageNotFoundException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1484,7 +1490,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
public void importDataset_private_succeeds() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, DatabaseUnavailableException, SidecarImportException, QueryMalformedException,
StorageNotFoundException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1504,7 +1510,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_2_USERNAME, authorities = {"insert-table-data"})
public void importDataset_privateForeign_fails() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
@@ -1526,7 +1532,7 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@WithMockUser(username = USER_2_USERNAME, authorities = {"insert-table-data"})
public void importDataset_privateReadAccess_fails() throws TableNotFoundException, RemoteUnavailableException,
NotAllowedException, MetadataServiceException {
- final ImportCsvDto request = ImportCsvDto.builder()
+ final ImportDto request = ImportDto.builder()
.skipLines(1L)
.lineTermination("\\n")
.location("deadbeef")
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
index c224af4cb28604c2554da1942a782932db8d7390..44b01b1e9e2919721e446d7e183fbbcb739ea813 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java
@@ -175,8 +175,12 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
MetadataServiceException {
/* mock */
+ final HttpHeaders headers = new HttpHeaders();
+ headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
+ headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
when(restTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(PrivilegedDatabaseDto[].class)))
.thenReturn(ResponseEntity.status(HttpStatus.OK)
+ .headers(headers)
.body(new PrivilegedDatabaseDto[]{DATABASE_1_PRIVILEGED_DTO}));
/* test */
@@ -221,7 +225,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
.build());
/* test */
- assertThrows(MetadataServiceException.class, () -> {
+ assertThrows(DatabaseNotFoundException.class, () -> {
metadataServiceGateway.getDatabaseByInternalName(DATABASE_1_INTERNALNAME);
});
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
index b331a03fa60915290380b5ff233fd51a0996ee36..f4bd429a9039ab2f2fb36c4fc2fce653ceda8054 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java
@@ -1,7 +1,7 @@
package at.tuwien.mvc;
import at.tuwien.api.database.query.ExecuteStatementDto;
-import at.tuwien.api.database.query.ImportCsvDto;
+import at.tuwien.api.database.query.ImportDto;
import at.tuwien.api.database.query.QueryPersistDto;
import at.tuwien.api.database.table.TupleDeleteDto;
import at.tuwien.api.database.table.TupleDto;
@@ -201,7 +201,7 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
/* ignore */
}
try {
- tableEndpoint.importDataset(DATABASE_1_ID, TABLE_1_ID, ImportCsvDto.builder().build(), USER_1_PRINCIPAL);
+ tableEndpoint.importDataset(DATABASE_1_ID, TABLE_1_ID, ImportDto.builder().build(), USER_1_PRINCIPAL);
} catch (Exception e) {
/* ignore */
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java
index 540e17850a535b8776daf4a6a7bf53a5499f1838..23503384b617ec7e066d9a0aeebe6c04c5f22a13 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SchemaServiceIntegrationTest.java
@@ -1,6 +1,5 @@
package at.tuwien.service;
-import at.tuwien.api.container.image.ImageDateDto;
import at.tuwien.api.database.ViewColumnDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.table.TableBriefDto;
@@ -16,7 +15,8 @@ import at.tuwien.api.database.table.constraints.unique.UniqueDto;
import at.tuwien.api.identifier.IdentifierDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.*;
+import at.tuwien.exception.TableNotFoundException;
+import at.tuwien.exception.ViewNotFoundException;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -74,11 +74,11 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns = response.getColumns();
assertNotNull(columns);
assertEquals(5, columns.size());
- assertColumn(columns.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns.get(1), null, null, DATABASE_1_ID, "given_name", "given_name", ColumnTypeDto.VARCHAR, 255L, null, false, null, null);
- assertColumn(columns.get(2), null, null, DATABASE_1_ID, "middle_name", "middle_name", ColumnTypeDto.VARCHAR, 255L, null, true, null, null);
- assertColumn(columns.get(3), null, null, DATABASE_1_ID, "family_name", "family_name", ColumnTypeDto.VARCHAR, 255L, null, false, null, null);
- assertColumn(columns.get(4), null, null, DATABASE_1_ID, "age", "age", ColumnTypeDto.INT, 10L, 0L, false, null, null);
+ assertColumn(columns.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
+ assertColumn(columns.get(1), null, null, DATABASE_1_ID, "given_name", "given_name", ColumnTypeDto.VARCHAR, 255L, null, false, null);
+ assertColumn(columns.get(2), null, null, DATABASE_1_ID, "middle_name", "middle_name", ColumnTypeDto.VARCHAR, 255L, null, true, null);
+ assertColumn(columns.get(3), null, null, DATABASE_1_ID, "family_name", "family_name", ColumnTypeDto.VARCHAR, 255L, null, false, null);
+ assertColumn(columns.get(4), null, null, DATABASE_1_ID, "age", "age", ColumnTypeDto.INT, 10L, 0L, false, null);
final ConstraintsDto constraints = response.getConstraints();
assertNotNull(constraints);
final Set<PrimaryKeyDto> primaryKey = constraints.getPrimaryKey();
@@ -127,11 +127,11 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns = response.getColumns();
assertNotNull(columns);
assertEquals(3, columns.size());
- assertColumn(columns.get(0), null, null, DATABASE_2_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns.get(1), null, null, DATABASE_2_ID, "mode", "mode", ColumnTypeDto.ENUM, 3L, null, false, null, null);
+ assertColumn(columns.get(0), null, null, DATABASE_2_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
+ assertColumn(columns.get(1), null, null, DATABASE_2_ID, "mode", "mode", ColumnTypeDto.ENUM, 3L, null, false, null);
assertEquals(2, columns.get(1).getEnums().size());
assertEquals(List.of("ABC", "DEF"), columns.get(1).getEnums());
- assertColumn(columns.get(2), null, null, DATABASE_2_ID, "seq", "seq", ColumnTypeDto.SET, 5L, null, true, null, null);
+ assertColumn(columns.get(2), null, null, DATABASE_2_ID, "seq", "seq", ColumnTypeDto.SET, 5L, null, true, null);
assertEquals(3, columns.get(2).getSets().size());
assertEquals(List.of("1", "2", "3"), columns.get(2).getSets());
/* ignore rest (constraints) */
@@ -167,11 +167,11 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns = response.getColumns();
assertNotNull(columns);
assertEquals(5, columns.size());
- assertColumn(columns.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns.get(1), null, null, DATABASE_1_ID, "date", "date", ColumnTypeDto.DATE, null, null, false, IMAGE_DATE_1_ID, null);
- assertColumn(columns.get(2), null, null, DATABASE_1_ID, "location", "location", ColumnTypeDto.VARCHAR, 255L, null, true, null, "Closest city");
- assertColumn(columns.get(3), null, null, DATABASE_1_ID, "mintemp", "mintemp", ColumnTypeDto.DOUBLE, 22L, null, true, null, null);
- assertColumn(columns.get(4), null, null, DATABASE_1_ID, "rainfall", "rainfall", ColumnTypeDto.DOUBLE, 22L, null, true, null, null);
+ assertColumn(columns.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 20L, 0L, false, null);
+ assertColumn(columns.get(1), null, null, DATABASE_1_ID, "date", "date", ColumnTypeDto.DATE, null, null, false, null);
+ assertColumn(columns.get(2), null, null, DATABASE_1_ID, "location", "location", ColumnTypeDto.VARCHAR, 255L, null, true, "Closest city");
+ assertColumn(columns.get(3), null, null, DATABASE_1_ID, "mintemp", "mintemp", ColumnTypeDto.DOUBLE, 22L, null, true, null);
+ assertColumn(columns.get(4), null, null, DATABASE_1_ID, "rainfall", "rainfall", ColumnTypeDto.DOUBLE, 22L, null, true, null);
final ConstraintsDto constraints = response.getConstraints();
final List<PrimaryKeyDto> primaryKey = new LinkedList<>(constraints.getPrimaryKey());
assertEquals(1, primaryKey.size());
@@ -194,6 +194,7 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
assertEquals(1, uniques.size());
final UniqueDto unique0 = uniques.get(0);
assertNotNull(unique0.getTable());
+ assertEquals("some_constraint", unique0.getName());
assertNull(unique0.getTable().getId());
assertEquals(TABLE_1_INTERNALNAME, unique0.getTable().getName());
assertEquals(TABLE_1_INTERNALNAME, unique0.getTable().getInternalName());
@@ -358,9 +359,9 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
assertEquals(ColumnTypeDto.BOOL, pk0.getColumn().getColumnType());
final List<ColumnDto> columns = response.getColumns();
assertEquals(3, columns.size());
- assertColumn(columns.get(0), null, null, DATABASE_1_ID, "bool_default", "bool_default", ColumnTypeDto.BOOL, null, 0L, false, null, null);
- assertColumn(columns.get(1), null, null, DATABASE_1_ID, "bool_tinyint", "bool_tinyint", ColumnTypeDto.BOOL, null, 0L, false, null, null);
- assertColumn(columns.get(2), null, null, DATABASE_1_ID, "bool_tinyint_unsigned", "bool_tinyint_unsigned", ColumnTypeDto.BOOL, null, 0L, false, null, null);
+ assertColumn(columns.get(0), null, null, DATABASE_1_ID, "bool_default", "bool_default", ColumnTypeDto.BOOL, null, 0L, false, null);
+ assertColumn(columns.get(1), null, null, DATABASE_1_ID, "bool_tinyint", "bool_tinyint", ColumnTypeDto.BOOL, null, 0L, false, null);
+ assertColumn(columns.get(2), null, null, DATABASE_1_ID, "bool_tinyint_unsigned", "bool_tinyint_unsigned", ColumnTypeDto.BOOL, null, 0L, false, null);
}
@Test
@@ -397,9 +398,9 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
assertEquals(DATABASE_1_ID, column3.getDatabaseId());
}
- protected static void assertViewColumn(ViewColumnDto column, Long id, Long databaseId, String name, String internalName,
- ColumnTypeDto type, Long size, Long d, Boolean nullAllowed,
- ImageDateDto dateFormat, String description) {
+ protected static void assertViewColumn(ViewColumnDto column, Long id, Long databaseId, String name,
+ String internalName, ColumnTypeDto type, Long size, Long d,
+ Boolean nullAllowed, String description) {
log.trace("assert column: {}", internalName);
assertNotNull(column);
assertEquals(id, column.getId());
@@ -411,17 +412,11 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
assertEquals(d, column.getD());
assertEquals(nullAllowed, column.getIsNullAllowed());
assertEquals(description, column.getDescription());
- if (dateFormat != null) {
- assertNotNull(column.getDateFormat());
- assertEquals(dateFormat.getId(), column.getDateFormat().getId());
- } else {
- assertNull(column.getDateFormat());
- }
}
protected static void assertColumn(ColumnDto column, Long id, Long tableId, Long databaseId, String name,
String internalName, ColumnTypeDto type, Long size, Long d, Boolean nullAllowed,
- Long dfid, String description) {
+ String description) {
log.trace("assert column: {}", internalName);
assertNotNull(column);
assertEquals(id, column.getId());
@@ -436,12 +431,6 @@ public class SchemaServiceIntegrationTest extends AbstractUnitTest {
assertEquals(d, column.getD());
assertEquals(nullAllowed, column.getIsNullAllowed());
assertEquals(description, column.getDescription());
- if (dfid != null) {
- assertNotNull(column.getDateFormat());
- assertEquals(dfid, column.getDateFormat().getId());
- } else {
- assertNull(column.getDateFormat());
- }
}
}
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
index 4ebaba4931327a80ba319ae6407e3dc3547e1dc7..d18a3f3e4275124d8428d99d9cee37a467828b69 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java
@@ -1,7 +1,6 @@
package at.tuwien.service;
import at.tuwien.ExportResourceDto;
-import at.tuwien.api.database.query.ImportCsvDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.columns.ColumnCreateDto;
@@ -18,14 +17,11 @@ import at.tuwien.api.database.table.constraints.unique.UniqueDto;
import at.tuwien.api.database.table.internal.TableCreateDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.config.QueryConfig;
-import at.tuwien.config.S3Config;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataDatabaseSidecarGateway;
import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
-import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -40,20 +36,14 @@ import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
-import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.nio.charset.Charset;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.attribute.PosixFilePermissions;
import java.sql.SQLException;
import java.time.Instant;
import java.util.*;
import static at.tuwien.service.SchemaServiceIntegrationTest.assertColumn;
-import static at.tuwien.service.SchemaServiceIntegrationTest.assertViewColumn;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.doNothing;
@@ -68,9 +58,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
@Autowired
private TableService tableService;
- @Autowired
- private QueryConfig queryConfig;
-
@MockBean
private MetadataServiceGateway metadataServiceGateway;
@@ -383,9 +370,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns0 = table0.getColumns();
assertNotNull(columns0);
Assertions.assertEquals(3, columns0.size());
- assertColumn(columns0.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns0.get(1), null, null, DATABASE_1_ID, "weather_id", "weather_id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns0.get(2), null, null, DATABASE_1_ID, "other_id", "other_id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
+ assertColumn(columns0.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
+ assertColumn(columns0.get(1), null, null, DATABASE_1_ID, "weather_id", "weather_id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
+ assertColumn(columns0.get(2), null, null, DATABASE_1_ID, "other_id", "other_id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
final ConstraintsDto constraints0 = table0.getConstraints();
assertNotNull(constraints0);
assertEquals(1, constraints0.getPrimaryKey().size());
@@ -430,8 +417,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns1 = table1.getColumns();
assertNotNull(columns1);
Assertions.assertEquals(2, columns1.size());
- assertColumn(columns1.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns1.get(1), null, null, DATABASE_1_ID, "other_id", "other_id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
+ assertColumn(columns1.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
+ assertColumn(columns1.get(1), null, null, DATABASE_1_ID, "other_id", "other_id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
final ConstraintsDto constraints1 = table1.getConstraints();
assertNotNull(constraints1);
assertEquals(2, constraints1.getPrimaryKey().size());
@@ -458,9 +445,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns2 = table2.getColumns();
assertNotNull(columns2);
Assertions.assertEquals(3, columns2.size());
- assertColumn(columns2.get(0), null, null, DATABASE_1_ID, "bool_default", "bool_default", ColumnTypeDto.BOOL, null, 0L, false, null, null);
- assertColumn(columns2.get(1), null, null, DATABASE_1_ID, "bool_tinyint", "bool_tinyint", ColumnTypeDto.BOOL, null, 0L, false, null, null);
- assertColumn(columns2.get(2), null, null, DATABASE_1_ID, "bool_tinyint_unsigned", "bool_tinyint_unsigned", ColumnTypeDto.BOOL, null, 0L, false, null, null);
+ assertColumn(columns2.get(0), null, null, DATABASE_1_ID, "bool_default", "bool_default", ColumnTypeDto.BOOL, null, 0L, false, null);
+ assertColumn(columns2.get(1), null, null, DATABASE_1_ID, "bool_tinyint", "bool_tinyint", ColumnTypeDto.BOOL, null, 0L, false, null);
+ assertColumn(columns2.get(2), null, null, DATABASE_1_ID, "bool_tinyint_unsigned", "bool_tinyint_unsigned", ColumnTypeDto.BOOL, null, 0L, false, null);
final ConstraintsDto constraints2 = table2.getConstraints();
assertNotNull(constraints2);
final Set<PrimaryKeyDto> primaryKey2 = constraints2.getPrimaryKey();
@@ -479,11 +466,11 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
final List<ColumnDto> columns3 = table3.getColumns();
assertNotNull(columns3);
Assertions.assertEquals(5, columns3.size());
- assertColumn(columns3.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null, null);
- assertColumn(columns3.get(1), null, null, DATABASE_1_ID, "given_name", "given_name", ColumnTypeDto.VARCHAR, 255L, null, false, null, null);
- assertColumn(columns3.get(2), null, null, DATABASE_1_ID, "middle_name", "middle_name", ColumnTypeDto.VARCHAR, 255L, null, true, null, null);
- assertColumn(columns3.get(3), null, null, DATABASE_1_ID, "family_name", "family_name", ColumnTypeDto.VARCHAR, 255L, null, false, null, null);
- assertColumn(columns3.get(4), null, null, DATABASE_1_ID, "age", "age", ColumnTypeDto.INT, 10L, 0L, false, null, null);
+ assertColumn(columns3.get(0), null, null, DATABASE_1_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
+ assertColumn(columns3.get(1), null, null, DATABASE_1_ID, "given_name", "given_name", ColumnTypeDto.VARCHAR, 255L, null, false, null);
+ assertColumn(columns3.get(2), null, null, DATABASE_1_ID, "middle_name", "middle_name", ColumnTypeDto.VARCHAR, 255L, null, true, null);
+ assertColumn(columns3.get(3), null, null, DATABASE_1_ID, "family_name", "family_name", ColumnTypeDto.VARCHAR, 255L, null, false, null);
+ assertColumn(columns3.get(4), null, null, DATABASE_1_ID, "age", "age", ColumnTypeDto.INT, 10L, 0L, false, null);
final ConstraintsDto constraints3 = table3.getConstraints();
assertNotNull(constraints3);
final Set<PrimaryKeyDto> primaryKey3 = constraints3.getPrimaryKey();
@@ -509,8 +496,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
assertEquals(TABLE_4_INTERNALNAME, response.getInternalName());
final List<ColumnDto> columns = response.getColumns();
assertEquals(TABLE_4_COLUMNS.size(), columns.size());
- assertColumn(columns.get(0), null, null, DATABASE_1_ID, "timestamp", "timestamp", ColumnTypeDto.TIMESTAMP, null, null, false, queryConfig.getDefaultTimestampFormatId(), null);
- assertColumn(columns.get(1), null, null, DATABASE_1_ID, "value", "value", ColumnTypeDto.DECIMAL, 10L, 10L, true, null, null);
+ assertColumn(columns.get(0), null, null, DATABASE_1_ID, "timestamp", "timestamp", ColumnTypeDto.TIMESTAMP, null, null, false, null);
+ assertColumn(columns.get(1), null, null, DATABASE_1_ID, "value", "value", ColumnTypeDto.DECIMAL, 10L, 10L, true, null);
final ConstraintsDto constraints = response.getConstraints();
assertNotNull(constraints);
final Set<PrimaryKeyDto> primaryKey = constraints.getPrimaryKey();
@@ -523,38 +510,26 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
public void getStatistics_succeeds() throws TableMalformedException, SQLException, TableNotFoundException {
/* test */
- final TableStatisticDto response = tableService.getStatistics(TABLE_1_PRIVILEGED_DTO);
- assertEquals(TABLE_1_COLUMNS.size(), response.getColumns().size());
+ final TableStatisticDto response = tableService.getStatistics(TABLE_2_PRIVILEGED_DTO);
+ assertEquals(TABLE_2_COLUMNS.size(), response.getColumns().size());
log.trace("response rows: {}", response.getRows());
assertEquals(3L, response.getRows());
- assertEquals(Set.of("id", "date", "location", "mintemp", "rainfall"), response.getColumns().keySet());
- final ColumnStatisticDto column0 = response.getColumns().get("id");
- assertEquals(BigDecimal.valueOf(1L), column0.getMin());
- assertEquals(BigDecimal.valueOf(3L), column0.getMax());
- assertNotNull(column0.getMean());
- assertNotNull(column0.getMedian());
- assertNotNull(column0.getStdDev());
- final ColumnStatisticDto column1 = response.getColumns().get("date");
- assertNull(column1.getMin());
- assertNull(column1.getMax());
- assertNull(column1.getMean());
- assertNull(column1.getMedian());
- assertNull(column1.getStdDev());
- final ColumnStatisticDto column2 = response.getColumns().get("location");
- assertNull(column2.getMin());
- assertNull(column2.getMax());
- assertNull(column2.getMean());
- assertNull(column2.getMedian());
- assertNull(column2.getStdDev());
- final ColumnStatisticDto column3 = response.getColumns().get("mintemp");
- assertEquals(BigDecimal.valueOf(7.4), column3.getMin());
- assertEquals(BigDecimal.valueOf(13.4), column3.getMax());
+ assertEquals(Set.of("location", "lat", "lng"), response.getColumns().keySet());
+ final ColumnStatisticDto column0 = response.getColumns().get("location");
+ assertNull(column0.getMin());
+ assertNull(column0.getMax());
+ assertNull(column0.getMean());
+ assertNull(column0.getMedian());
+ assertNull(column0.getStdDev());
+ final ColumnStatisticDto column3 = response.getColumns().get("lat");
+ assertEquals(BigDecimal.valueOf(-36.0653583), column3.getMin());
+ assertEquals(BigDecimal.valueOf(-33.847927), column3.getMax());
assertNotNull(column3.getMean());
assertNotNull(column3.getMedian());
assertNotNull(column3.getStdDev());
- final ColumnStatisticDto column4 = response.getColumns().get("rainfall");
- assertEquals(BigDecimal.valueOf(0L), column4.getMin());
- assertEquals(BigDecimal.valueOf(0.6), column4.getMax());
+ final ColumnStatisticDto column4 = response.getColumns().get("lng");
+ assertEquals(BigDecimal.valueOf(146.9112214), column4.getMin());
+ assertEquals(BigDecimal.valueOf(150.6517942), column4.getMax());
assertNotNull(column4.getMean());
assertNotNull(column4.getMedian());
assertNotNull(column4.getStdDev());
@@ -619,9 +594,9 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
assertEquals("composite_primary_key", response.getInternalName());
final List<ColumnDto> columns = response.getColumns();
assertEquals(3, columns.size());
- assertColumn(columns.get(0), null, null, DATABASE_1_ID, "name", "name", ColumnTypeDto.VARCHAR, 255L, null, false, null, null);
- assertColumn(columns.get(1), null, null, DATABASE_1_ID, "lat", "lat", ColumnTypeDto.DECIMAL, 10L, 10L, false, null, null);
- assertColumn(columns.get(2), null, null, DATABASE_1_ID, "lng", "lng", ColumnTypeDto.DECIMAL, 10L, 10L, false, null, null);
+ assertColumn(columns.get(0), null, null, DATABASE_1_ID, "name", "name", ColumnTypeDto.VARCHAR, 255L, null, false, null);
+ assertColumn(columns.get(1), null, null, DATABASE_1_ID, "lat", "lat", ColumnTypeDto.DECIMAL, 10L, 10L, false, null);
+ assertColumn(columns.get(2), null, null, DATABASE_1_ID, "lng", "lng", ColumnTypeDto.DECIMAL, 10L, 10L, false, null);
final ConstraintsDto constraints = response.getConstraints();
assertNotNull(constraints);
final Set<String> checks = constraints.getChecks();
@@ -768,53 +743,6 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
});
}
- @Test
- public void importDataset_withSeparatorAndQuoteAndNullElement_succeeds() throws SidecarImportException,
- SQLException, QueryMalformedException, RemoteUnavailableException, StorageNotFoundException, IOException {
- final ImportCsvDto request = ImportCsvDto.builder()
- .location("weather_aus.csv")
- .separator(';')
- .quote('"')
- .nullElement("NA")
- .build();
-
- /* mock */
- final File source = new File("src/test/resources/csv/weather_aus.csv");
- final File target = new File("/tmp/weather_aus.csv") /* must be /tmp */;
- log.trace("copy dataset from {} to {}", source.toPath().toAbsolutePath(), target.toPath().toAbsolutePath());
- FileUtils.copyFile(source, target);
- doNothing()
- .when(dataDatabaseSidecarGateway)
- .importFile(anyString(), anyInt(), eq("weather_aus.csv"));
-
- /* test */
- tableService.importDataset(TABLE_1_PRIVILEGED_DTO, request);
- }
-
- @Test
- public void importDataset_malformedData_fails() throws RemoteUnavailableException, StorageNotFoundException,
- IOException, SidecarImportException {
- final ImportCsvDto request = ImportCsvDto.builder()
- .location("weather_aus.csv")
- .separator(';')
- .quote('"')
- .build();
-
- /* mock */
- final File source = new File("src/test/resources/csv/weather_aus.csv");
- final File target = new File("/tmp/weather_aus.csv");
- log.trace("copy dataset from {} to {}", source.toPath().toAbsolutePath(), target.toPath().toAbsolutePath());
- FileUtils.copyFile(source, target);
- doNothing()
- .when(dataDatabaseSidecarGateway)
- .importFile(anyString(), anyInt(), eq("weather_aus.csv"));
-
- /* test */
- assertThrows(QueryMalformedException.class, () -> {
- tableService.importDataset(TABLE_1_PRIVILEGED_DTO, request);
- });
- }
-
@Test
public void exportDataset_succeeds() throws SQLException, QueryMalformedException, RemoteUnavailableException,
StorageNotFoundException, StorageUnavailableException, SidecarExportException {
diff --git a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index 20a769f8ce8e8b8a5f4cdf1f4e42610e0e3f561d..5f20464eb9f252164c037a2155cd661d24d9019a 100644
--- a/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -3,7 +3,6 @@ package at.tuwien.service;
import at.tuwien.api.database.ViewColumnDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.query.QueryResultDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
import at.tuwien.exception.*;
@@ -24,7 +23,6 @@ import java.time.Instant;
import java.util.List;
import java.util.Map;
-import static at.tuwien.service.SchemaServiceIntegrationTest.assertViewColumn;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -68,11 +66,11 @@ public class ViewServiceIntegrationTest extends AbstractUnitTest {
final List<ViewColumnDto> columns = response.getColumns();
assertEquals(VIEW_1_COLUMNS.size(), columns.size());
ViewColumnDto ref = VIEW_1_COLUMNS_DTO.get(0);
- SchemaServiceIntegrationTest.assertViewColumn(columns.get(0), null, ref.getDatabaseId(), ref.getName(), ref.getInternalName(), ref.getColumnType(), ref.getSize(), ref.getD(), ref.getIsNullAllowed(), ref.getDateFormat(), ref.getDescription());
+ SchemaServiceIntegrationTest.assertViewColumn(columns.get(0), null, ref.getDatabaseId(), ref.getName(), ref.getInternalName(), ref.getColumnType(), ref.getSize(), ref.getD(), ref.getIsNullAllowed(), ref.getDescription());
ref = VIEW_1_COLUMNS_DTO.get(1);
- SchemaServiceIntegrationTest.assertViewColumn(columns.get(1), null, ref.getDatabaseId(), ref.getName(), ref.getInternalName(), ref.getColumnType(), ref.getSize(), ref.getD(), ref.getIsNullAllowed(), ref.getDateFormat(), ref.getDescription());
+ SchemaServiceIntegrationTest.assertViewColumn(columns.get(1), null, ref.getDatabaseId(), ref.getName(), ref.getInternalName(), ref.getColumnType(), ref.getSize(), ref.getD(), ref.getIsNullAllowed(), ref.getDescription());
ref = VIEW_1_COLUMNS_DTO.get(2);
- SchemaServiceIntegrationTest.assertViewColumn(columns.get(2), null, ref.getDatabaseId(), ref.getName(), ref.getInternalName(), ref.getColumnType(), ref.getSize(), ref.getD(), ref.getIsNullAllowed(), ref.getDateFormat(), ref.getDescription());
+ SchemaServiceIntegrationTest.assertViewColumn(columns.get(2), null, ref.getDatabaseId(), ref.getName(), ref.getInternalName(), ref.getColumnType(), ref.getSize(), ref.getD(), ref.getIsNullAllowed(), ref.getDescription());
}
diff --git a/dbrepo-data-service/rest-service/src/test/resources/init/querystore.sql b/dbrepo-data-service/rest-service/src/test/resources/init/querystore.sql
index c1df44d1b0766fb04d081f3b5b3679039d8ba72f..3e7471df3e1eb3a1bb79db7246ecb805a06f495c 100644
--- a/dbrepo-data-service/rest-service/src/test/resources/init/querystore.sql
+++ b/dbrepo-data-service/rest-service/src/test/resources/init/querystore.sql
@@ -1,5 +1,5 @@
CREATE SEQUENCE `qs_queries_seq` NOCACHE;
-CREATE TABLE `qs_queries` ( `id` bigint not null primary key default nextval(`qs_queries_seq`), `created` datetime not null default now(), `executed` datetime not null default now(), `created_by` varchar(36) not null, `query` text not null, `query_normalized` text not null, `is_persisted` boolean not null, `query_hash` varchar(255) not null, `result_hash` varchar(255), `result_number` bigint ) WITH SYSTEM VERSIONING;
+CREATE TABLE `qs_queries` ( `id` bigint not null primary key default nextval(`qs_queries_seq`), `created` datetime not null default now(), `executed` datetime not null default now(), `created_by` varchar(36), `query` text not null, `query_normalized` text not null, `is_persisted` boolean not null, `query_hash` varchar(255) not null, `result_hash` varchar(255), `result_number` bigint ) WITH SYSTEM VERSIONING;
CREATE PROCEDURE hash_table(IN name VARCHAR(255), OUT hash VARCHAR(255), OUT count BIGINT) BEGIN DECLARE _sql TEXT; SELECT CONCAT('SELECT SHA2(GROUP_CONCAT(CONCAT_WS(\'\',', GROUP_CONCAT(CONCAT('`', column_name, '`') ORDER BY column_name), ') SEPARATOR \',\'), 256) AS hash, COUNT(*) AS count FROM `', name, '` INTO @hash, @count;') FROM `information_schema`.`columns` WHERE `table_schema` = DATABASE() AND `table_name` = name INTO _sql; PREPARE stmt FROM _sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; SET hash = @hash; SET count = @count; END;
CREATE PROCEDURE store_query(IN query TEXT, IN executed DATETIME, OUT queryId BIGINT) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _username varchar(255) DEFAULT REGEXP_REPLACE(current_user(), '@.*', ''); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
CREATE DEFINER = 'root' PROCEDURE _store_query(IN _username VARCHAR(255), IN query TEXT, IN executed DATETIME, OUT queryId BIGINT) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
\ No newline at end of file
diff --git a/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql b/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql
index 7c3ca99ce39f61755752d2ecbb607ad6ed86e386..322e67cc07397105bb7c763efe4d37c905cc1b18 100644
--- a/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql
+++ b/dbrepo-data-service/rest-service/src/test/resources/init/weather.sql
@@ -11,13 +11,13 @@ CREATE TABLE weather_location
CREATE TABLE weather_aus
(
- id BIGINT NOT NULL PRIMARY KEY,
+ id SERIAL PRIMARY KEY,
`date` DATE NOT NULL,
location VARCHAR(255) NULL COMMENT 'Closest city',
mintemp DOUBLE PRECISION NULL,
rainfall DOUBLE PRECISION NULL,
FOREIGN KEY (location) REFERENCES weather_location (location) ON DELETE SET NULL,
- UNIQUE (`date`),
+ CONSTRAINT some_constraint UNIQUE (`date`),
CHECK (`mintemp` > 0)
) WITH SYSTEM VERSIONING COMMENT 'Weather in Australia';
diff --git a/dbrepo-data-service/services/pom.xml b/dbrepo-data-service/services/pom.xml
index ccb8ca4360458a9db0797a7f833703dc1d7dc4ca..ab57ee97af68a230a6ffb39673b8b9b6eb3a2ace 100644
--- a/dbrepo-data-service/services/pom.xml
+++ b/dbrepo-data-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>services</artifactId>
<name>dbrepo-data-service-services</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
@@ -22,7 +22,7 @@
<dependency>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-data-service-querystore</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</dependency>
</dependencies>
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/config/MetricsConfig.java b/dbrepo-data-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
index 450be2f7df8b52fe493dd498dc0422350bb3ff39..9ff09ab42b2c2e62536e1d46fa986057ff664d53 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
@@ -1,5 +1,7 @@
package at.tuwien.config;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Metrics;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.aop.ObservedAspect;
import org.springframework.context.annotation.Bean;
@@ -12,4 +14,20 @@ public class MetricsConfig {
public ObservedAspect observedAspect(ObservationRegistry observationRegistry) {
return new ObservedAspect(observationRegistry);
}
+
+ @Bean
+ public Counter httpDataAccessCounter() {
+ return Counter.builder("dbrepo.data.access")
+ .tag("protocol", "http")
+ .description("The total number of accessed data sources")
+ .register(Metrics.globalRegistry);
+ }
+
+ @Bean
+ public Counter amqpDataAccessCounter() {
+ return Counter.builder("dbrepo.data.access")
+ .tag("protocol", "amqp")
+ .description("The total number of accessed data sources")
+ .register(Metrics.globalRegistry);
+ }
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
index 640ef7172ac2b750815e17a0bdf11b02b5ed997b..11a90afde703a353e9f5b539394806d6356fe73c 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/gateway/impl/MetadataServiceGatewayImpl.java
@@ -66,8 +66,11 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
log.error("Failed to find container with id {}: service responded unsuccessful: {}", containerId, response.getStatusCode());
throw new MetadataServiceException("Failed to find container: service responded unsuccessful: " + response.getStatusCode());
}
- if (!response.getHeaders().keySet().containsAll(List.of("X-Username", "X-Password"))) {
+ final List<String> expectedHeaders = List.of("X-Username", "X-Password");
+ if (!response.getHeaders().keySet().containsAll(expectedHeaders)) {
log.error("Failed to find all privileged container headers");
+ log.debug("expected headers: {}", expectedHeaders);
+ log.debug("found headers: {}", response.getHeaders().keySet());
throw new MetadataServiceException("Failed to find all privileged container headers");
}
if (response.getBody() == null) {
@@ -98,8 +101,11 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
log.error("Failed to find database with id {}: service responded unsuccessful: {}", id, response.getStatusCode());
throw new MetadataServiceException("Failed to find database: service responded unsuccessful: " + response.getStatusCode());
}
- if (!response.getHeaders().keySet().containsAll(List.of("X-Username", "X-Password"))) {
+ final List<String> expectedHeaders = List.of("X-Username", "X-Password");
+ if (!response.getHeaders().keySet().containsAll(expectedHeaders)) {
log.error("Failed to find all privileged database headers");
+ log.debug("expected headers: {}", expectedHeaders);
+ log.debug("found headers: {}", response.getHeaders().keySet());
throw new MetadataServiceException("Failed to find all privileged database headers");
}
if (response.getBody() == null) {
@@ -123,14 +129,22 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
log.error("Failed to find database with internal name {}: {}", internalName, e.getMessage());
throw new RemoteUnavailableException("Failed to find database: " + e.getMessage(), e);
}
- if (!response.getStatusCode().equals(HttpStatus.OK) || response.getBody() == null) {
+ if (!response.getStatusCode().equals(HttpStatus.OK)) {
log.error("Failed to find database with internal name {}: service responded unsuccessful: {}", internalName, response.getStatusCode());
throw new MetadataServiceException("Failed to find database: service responded unsuccessful: " + response.getStatusCode());
}
- if (response.getBody().length != 1) {
+ /* body first, then headers next */
+ if (response.getBody() == null || response.getBody().length != 1) {
log.error("Failed to find database with internal name {}: body is empty", internalName);
throw new DatabaseNotFoundException("Failed to find database: body is empty");
}
+ final List<String> expectedHeaders = List.of("X-Username", "X-Password");
+ if (!response.getHeaders().keySet().containsAll(expectedHeaders)) {
+ log.error("Failed to find all privileged database headers");
+ log.debug("expected headers: {}", expectedHeaders);
+ log.debug("found headers: {}", response.getHeaders().keySet());
+ throw new MetadataServiceException("Failed to find all privileged database headers");
+ }
return response.getBody()[0];
}
@@ -151,8 +165,11 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
log.error("Failed to find table with id {}: service responded unsuccessful: {}", id, response.getStatusCode());
throw new MetadataServiceException("Failed to find table: service responded unsuccessful: " + response.getStatusCode());
}
- if (!response.getHeaders().keySet().containsAll(List.of("X-Type", "X-Host", "X-Port", "X-Username", "X-Password", "X-Database", "X-Sidecar-Host", "X-Sidecar-Port"))) {
+ final List<String> expectedHeaders = List.of("X-Type", "X-Host", "X-Port", "X-Username", "X-Password", "X-Database", "X-Sidecar-Host", "X-Sidecar-Port");
+ if (!response.getHeaders().keySet().containsAll(expectedHeaders)) {
log.error("Failed to find all privileged table headers");
+ log.debug("expected headers: {}", expectedHeaders);
+ log.debug("found headers: {}", response.getHeaders().keySet());
throw new MetadataServiceException("Failed to find all privileged table headers");
}
if (response.getBody() == null) {
@@ -189,8 +206,11 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
log.error("Failed to find view with id {}: service responded unsuccessful: {}", id, response.getStatusCode());
throw new MetadataServiceException("Failed to find view: service responded unsuccessful: " + response.getStatusCode());
}
- if (!response.getHeaders().keySet().containsAll(List.of("X-Type", "X-Host", "X-Port", "X-Username", "X-Password", "X-Database"))) {
+ final List<String> expectedHeaders = List.of("X-Type", "X-Host", "X-Port", "X-Username", "X-Password", "X-Database");
+ if (!response.getHeaders().keySet().containsAll(expectedHeaders)) {
log.error("Failed to find all privileged view headers");
+ log.debug("expected headers: {}", expectedHeaders);
+ log.debug("found headers: {}", response.getHeaders().keySet());
throw new MetadataServiceException("Failed to find all privileged view headers");
}
if (response.getBody() == null) {
@@ -276,8 +296,11 @@ public class MetadataServiceGatewayImpl implements MetadataServiceGateway {
log.error("Failed to find user with id {}: service responded unsuccessful: {}", userId, response.getStatusCode());
throw new MetadataServiceException("Failed to find user: service responded unsuccessful: " + response.getStatusCode());
}
- if (!response.getHeaders().keySet().containsAll(List.of("X-Username", "X-Password"))) {
+ final List<String> expectedHeaders = List.of("X-Username", "X-Password");
+ if (!response.getHeaders().keySet().containsAll(expectedHeaders)) {
log.error("Failed to find all privileged user headers");
+ log.debug("expected headers: {}", expectedHeaders);
+ log.debug("found headers: {}", response.getHeaders().keySet());
throw new MetadataServiceException("Failed to find all privileged user headers");
}
if (response.getBody() == null) {
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
index b69d06b0aabd9bd76b686e9526a3cad52298c752..62b529976d029c0612e3849f032e0a1093270562 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/DataMapper.java
@@ -1,6 +1,5 @@
package at.tuwien.mapper;
-import at.tuwien.api.container.image.ImageDateDto;
import at.tuwien.api.database.DatabaseDto;
import at.tuwien.api.database.ViewColumnDto;
import at.tuwien.api.database.ViewDto;
@@ -45,7 +44,6 @@ import java.io.StringReader;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.sql.*;
-import java.sql.Date;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
@@ -53,7 +51,6 @@ import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
@Mapper(componentModel = "spring")
public interface DataMapper {
@@ -143,7 +140,6 @@ public interface DataMapper {
default TableDto resultSetToTable(ResultSet resultSet, TableDto table, QueryConfig queryConfig) throws SQLException {
final ColumnDto column = ColumnDto.builder()
.ordinalPosition(resultSet.getInt(1) - 1) /* start at zero */
- .autoGenerated(resultSet.getString(2) != null && resultSet.getString(2).startsWith("nextval"))
.isNullAllowed(resultSet.getString(3).equals("YES"))
.columnType(ColumnTypeDto.valueOf(resultSet.getString(4).toUpperCase()))
.d(resultSet.getString(7) != null ? resultSet.getLong(7) : null)
@@ -177,19 +173,6 @@ public interface DataMapper {
} else if (resultSet.getString(6) != null) {
column.setSize(resultSet.getLong(6));
}
- if (column.getColumnType().equals(ColumnTypeDto.TIMESTAMP) || column.getColumnType().equals(ColumnTypeDto.DATETIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimestampFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.DATE)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultDateFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.TIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimeFormatId())
- .build());
- }
/* constraints */
if (resultSet.getString(9) != null && resultSet.getString(9).equals("PRI")) {
table.getConstraints().getPrimaryKey().add(PrimaryKeyDto.builder()
@@ -221,19 +204,6 @@ public interface DataMapper {
} else if (resultSet.getString(6) != null) {
column.setSize(resultSet.getLong(6));
}
- if (column.getColumnType().equals(ColumnTypeDto.TIMESTAMP) || column.getColumnType().equals(ColumnTypeDto.DATETIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimestampFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.DATE)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultDateFormatId())
- .build());
- } else if (column.getColumnType().equals(ColumnTypeDto.TIME)) {
- column.setDateFormat(ImageDateDto.builder()
- .id(queryConfig.getDefaultTimeFormatId())
- .build());
- }
view.getColumns()
.add(column);
log.trace("parsed view {}.{} column: {}", view.getDatabase().getInternalName(), view.getInternalName(), column.getInternalName());
@@ -562,10 +532,6 @@ public interface DataMapper {
}
switch (column.getColumnType()) {
case DATE -> {
- if (column.getDateFormat() == null) {
- log.error("Missing date format for column {}", column.getId());
- throw new IllegalArgumentException("Missing date format");
- }
final DateTimeFormatter formatter = new DateTimeFormatterBuilder()
.parseCaseInsensitive() /* case insensitive to parse JAN and FEB */
.appendPattern("yyyy-MM-dd")
@@ -575,10 +541,6 @@ public interface DataMapper {
.toInstant();
}
case TIMESTAMP, DATETIME -> {
- if (column.getDateFormat() == null) {
- log.error("Missing date format for column {}", column.getId());
- throw new IllegalArgumentException("Missing date format");
- }
return Timestamp.valueOf(data.toString())
.toInstant();
}
@@ -588,7 +550,7 @@ public interface DataMapper {
case TEXT, CHAR, VARCHAR, TINYTEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET -> {
return String.valueOf(data);
}
- case BIGINT -> {
+ case BIGINT, SERIAL -> {
return new BigInteger(String.valueOf(data));
}
case INT, SMALLINT, MEDIUMINT, TINYINT -> {
@@ -678,9 +640,9 @@ public interface DataMapper {
ps.setNull(idx, Types.DATE);
break;
}
- ps.setDate(idx, Date.valueOf(String.valueOf(value)));
+ ps.setString(idx, String.valueOf(value));
break;
- case BIGINT:
+ case BIGINT, SERIAL:
if (value == null) {
ps.setNull(idx, Types.BIGINT);
break;
@@ -743,28 +705,7 @@ public interface DataMapper {
}
ps.setBoolean(idx, Boolean.parseBoolean(String.valueOf(value)));
break;
- case TIMESTAMP:
- if (value == null) {
- ps.setNull(idx, Types.TIMESTAMP);
- break;
- }
- ps.setTimestamp(idx, Timestamp.valueOf(String.valueOf(value)));
- break;
- case DATETIME:
- if (value == null) {
- ps.setNull(idx, Types.TIMESTAMP);
- break;
- }
- ps.setTimestamp(idx, Timestamp.valueOf(String.valueOf(value)));
- break;
- case TIME:
- if (value == null) {
- ps.setNull(idx, Types.TIME);
- break;
- }
- ps.setTime(idx, Time.valueOf(String.valueOf(value)));
- break;
- case YEAR:
+ case TIME, DATETIME, TIMESTAMP, YEAR:
if (value == null) {
ps.setNull(idx, Types.TIME);
break;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
index d870215771628283ddb9e115a755c176d7f69240..bfca2d923fc550a6420f1140a9a9fe6d3aae7e59 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
@@ -1,22 +1,27 @@
package at.tuwien.mapper;
-import at.tuwien.api.database.query.ImportCsvDto;
-import at.tuwien.api.database.table.*;
-import at.tuwien.api.database.table.columns.*;
+import at.tuwien.api.database.query.ImportDto;
+import at.tuwien.api.database.table.TupleDeleteDto;
+import at.tuwien.api.database.table.TupleDto;
+import at.tuwien.api.database.table.TupleUpdateDto;
+import at.tuwien.api.database.table.columns.ColumnCreateDto;
+import at.tuwien.api.database.table.columns.ColumnDto;
+import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
-import at.tuwien.exception.*;
+import at.tuwien.exception.QueryMalformedException;
+import at.tuwien.exception.TableMalformedException;
import at.tuwien.utils.MariaDbUtil;
import org.mapstruct.Mapper;
import org.mapstruct.Named;
-import java.io.*;
-import java.math.BigInteger;
-import java.sql.*;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.sql.Date;
+import java.sql.*;
import java.text.Normalizer;
-import java.time.*;
+import java.time.Instant;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -548,7 +553,7 @@ public interface MariaDbMapper {
return statement.toString();
}
- default String datasetToRawInsertQuery(String databaseName, PrivilegedTableDto table, ImportCsvDto data) {
+ default String datasetToRawInsertQuery(String databaseName, PrivilegedTableDto table, ImportDto data) {
final StringBuilder statement = new StringBuilder("LOAD DATA INFILE '")
.append(data.getLocation())
.append("' REPLACE INTO TABLE `")
@@ -563,38 +568,17 @@ public interface MariaDbMapper {
.append(data.getQuote())
.append("'");
}
- statement.append(" LINES TERMINATED BY '")
- .append(data.getLineTermination())
- .append("'")
- .append(data.getSkipLines() != null ? (" IGNORE " + data.getSkipLines() + " LINES") : "")
- .append(" (");
- final StringBuilder set = new StringBuilder();
- int[] idx = new int[]{0};
- table.getColumns()
- .forEach(column -> {
- if (column.getAutoGenerated()) {
- log.trace("import column is auto generated, skip");
- return;
- }
- statement.append(idx[0] != 0 ? "," : "");
- /* format as variable */
- statement.append("@")
- .append(column.getInternalName());
- if (column.getDateFormat() != null) {
- /* reformat dates */
- columnToDateSet(data, column, set);
- } else if (column.getColumnType().equals(ColumnTypeDto.BOOL)) {
- /* reformat booleans */
- columnToBoolSet(data, column, set);
- } else {
- /* reformat others */
- columnToTextSet(data, column, set);
- }
- idx[0]++;
- });
- statement.append(")")
- .append(set.length() != 0 ? (" SET " + set) : "")
- .append(";");
+ if (data.getLineTermination() != null) {
+ statement.append(" LINES TERMINATED BY '")
+ .append(data.getLineTermination())
+ .append("'");
+ }
+ if (data.getSkipLines() != null) {
+ statement.append(" IGNORE ")
+ .append(data.getSkipLines())
+ .append(" LINES");
+ }
+ statement.append(";");
log.trace("mapped insert statement: {}", statement);
return statement.toString();
}
@@ -680,9 +664,6 @@ public interface MariaDbMapper {
log.error("Failed to find table column {}", key);
throw new IllegalArgumentException("Failed to find table column");
}
- if (optional.get().getAutoGenerated()) {
- return;
- }
statement.append(idx[0]++ == 0 ? "" : ", ")
.append("`")
.append(key)
@@ -699,9 +680,6 @@ public interface MariaDbMapper {
log.error("Failed to find table column {}", key);
throw new IllegalArgumentException("Failed to find table column");
}
- if (optional.get().getAutoGenerated()) {
- return;
- }
statement.append(jdx[0]++ == 0 ? "" : ", ")
.append("?");
});
@@ -710,125 +688,6 @@ public interface MariaDbMapper {
return statement.toString();
}
- default void columnToDateSet(ImportCsvDto data, ColumnDto column, StringBuilder set) {
- log.trace("import column has date format, need to format it: {}", column.getDateFormat().getUnixFormat());
- set.append(!set.isEmpty() ? ", " : "")
- .append("`")
- .append(column.getInternalName())
- .append("` = STR_TO_DATE(");
- if (data.getNullElement() != null) {
- set.append("IF(STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getNullElement())
- .append("'), @")
- .append(column.getInternalName())
- .append(", NULL), '")
- .append(column.getDateFormat()
- .getDatabaseFormat()
- .replace('\'', '\\'))
- .append("')");
- return;
- }
- set.append("@")
- .append(column.getInternalName())
- .append(", '")
- .append(column.getDateFormat()
- .getDatabaseFormat()
- .replace('\'', '\\'))
- .append("')");
- }
-
- default void columnToBoolSet(ImportCsvDto data, ColumnDto column, StringBuilder set) {
- set.append(!set.isEmpty() ? ", " : "")
- .append("`")
- .append(column.getInternalName())
- .append("` = ");
- if (data.getNullElement() != null) {
- set.append("IF(!STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getNullElement())
- .append("'),NULL,");
- columnToBoolSet2(data, column, set);
- set.append(")");
- return;
- }
- columnToBoolSet2(data, column, set);
- }
-
- default void columnToBoolSet2(ImportCsvDto data, ColumnDto column, StringBuilder set) {
- if (data.getTrueElement() != null) {
- set.append("IF(!STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getTrueElement())
- .append("'),TRUE,");
- if (data.getFalseElement() != null) {
- log.trace("import has false element present (both true and false)");
- /* can map both true/false */
- set.append("IF(!STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getFalseElement())
- .append("'),FALSE,@")
- .append(column.getInternalName())
- .append("))");
- } else {
- /* can only map true */
- set.append("@")
- .append(column.getInternalName())
- .append(")");
- }
- return;
- }
- if (data.getFalseElement() != null) {
- set.append("IF(!STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getFalseElement())
- .append("'),FALSE,");
- if (data.getTrueElement() != null) {
- log.trace("import has true element present (both true and false)");
- /* can map both true/false */
- set.append("IF(!STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getTrueElement())
- .append("'),TRUE,@")
- .append(column.getInternalName())
- .append("))");
- } else {
- /* can only map true */
- set.append("@")
- .append(column.getInternalName())
- .append(")");
- }
- return;
- }
- set.append("@")
- .append(column.getInternalName());
- }
-
- default void columnToTextSet(ImportCsvDto data, ColumnDto column, StringBuilder set) {
- set.append(!set.isEmpty() ? ", " : "")
- .append("`")
- .append(column.getInternalName())
- .append("` = ");
- if (data.getNullElement() != null) {
- set.append("IF(STRCMP(@")
- .append(column.getInternalName())
- .append(",'")
- .append(data.getNullElement())
- .append("'), @")
- .append(column.getInternalName())
- .append(", NULL)");
- return;
- }
- set.append("@")
- .append(column.getInternalName());
- }
-
default void prepareStatementWithColumnTypeObject(PreparedStatement statement, ColumnTypeDto columnType, int idx,
String columnName, Object value) throws SQLException {
switch (columnType) {
@@ -852,9 +711,9 @@ public interface MariaDbMapper {
statement.setNull(idx, Types.DATE);
break;
}
- statement.setDate(idx, Date.valueOf(String.valueOf(value)));
+ statement.setString(idx, String.valueOf(value));
break;
- case BIGINT:
+ case BIGINT, SERIAL:
if (value == null) {
statement.setNull(idx, Types.BIGINT);
break;
@@ -866,21 +725,21 @@ public interface MariaDbMapper {
statement.setNull(idx, Types.INTEGER);
break;
}
- statement.setLong(idx, Long.parseLong(String.valueOf(value)));
+ statement.setLong(idx, Integer.parseInt(String.valueOf(value)));
break;
case TINYINT:
if (value == null) {
statement.setNull(idx, Types.TINYINT);
break;
}
- statement.setLong(idx, Long.parseLong(String.valueOf(value)));
+ statement.setLong(idx, Integer.parseInt(String.valueOf(value)));
break;
case SMALLINT:
if (value == null) {
statement.setNull(idx, Types.SMALLINT);
break;
}
- statement.setLong(idx, Long.parseLong(String.valueOf(value)));
+ statement.setInt(idx, Integer.parseInt(String.valueOf(value)));
break;
case DECIMAL:
if (value == null) {
@@ -922,16 +781,9 @@ public interface MariaDbMapper {
statement.setNull(idx, Types.TIMESTAMP);
break;
}
- statement.setTimestamp(idx, Timestamp.valueOf(String.valueOf(value)));
- break;
- case TIME:
- if (value == null) {
- statement.setNull(idx, Types.TIME);
- break;
- }
- statement.setTime(idx, Time.valueOf(String.valueOf(value)));
+ statement.setString(idx, String.valueOf(value));
break;
- case YEAR:
+ case TIME, YEAR:
if (value == null) {
statement.setNull(idx, Types.TIME);
break;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java
index 3a94045c9d209d57dc8bc9f5417a41980852fe6a..79a23932b5aee74da800c0b41023a7257fa4d32b 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/QueueService.java
@@ -12,6 +12,7 @@ public interface QueueService {
*
* @param table The table.
* @param data The data.
+ * @throws SQLException The connection to the database could not be established.
*/
void insert(PrivilegedTableDto table, Map<String, Object> data) throws SQLException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
index 765a3b7e2e630b70b4e52d99aaddecd8559754a3..c93186f451c5b41d2c55924ce685d578b40bfbde 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -2,7 +2,7 @@ package at.tuwien.service;
import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
-import at.tuwien.api.database.query.ImportCsvDto;
+import at.tuwien.api.database.query.ImportDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.internal.PrivilegedTableDto;
@@ -104,18 +104,66 @@ public interface TableService {
Long getCount(PrivilegedTableDto table, Instant timestamp) throws SQLException,
QueryMalformedException;
- void importDataset(PrivilegedTableDto table, ImportCsvDto data) throws SidecarImportException,
+ /**
+ * Imports a dataset by metadata into the sidecar of the target database by given table.
+ * @param table The table.
+ * @param data The dataset metadata.
+ * @throws SidecarImportException The sidecar of the target database failed to import the dataset.
+ * @throws StorageNotFoundException The storage service was not able to find the dataset for import.
+ * @throws SQLException Failed to parse SQL query, contains invalid syntax.
+ * @throws QueryMalformedException The import query is malformed, likely due to a bug in the application.
+ * @throws RemoteUnavailableException Failed to establish connection to the sidecar.
+ */
+ void importDataset(PrivilegedTableDto table, ImportDto data) throws SidecarImportException,
StorageNotFoundException, SQLException, QueryMalformedException, RemoteUnavailableException;
+ /**
+ * Imports a dataset by metadata into the sidecar of the target database by given table.
+ * @param table The table.
+ * @param data The dataset metadata.
+ * @throws SQLException Failed to parse SQL query, contains invalid syntax.
+ * @throws TableMalformedException The tuple is malformed and does not fit the table schema.
+ * @throws QueryMalformedException The delete query is malformed, likely due to a bug in the application.
+ */
void deleteTuple(PrivilegedTableDto table, TupleDeleteDto data) throws SQLException,
TableMalformedException, QueryMalformedException;
+ /**
+ * Creates a tuple in a table.
+ * @param table The table.
+ * @param data The tuple.
+ * @throws SQLException Failed to parse SQL query, contains invalid syntax.
+ * @throws QueryMalformedException The create query is malformed, likely due to a bug in the application.
+ * @throws TableMalformedException The tuple is malformed and does not fit the table schema.
+ * @throws StorageUnavailableException Failed to establish a connection with the Storage Service.
+ * @throws StorageNotFoundException The storage service was not able to find the dataset for import.
+ */
void createTuple(PrivilegedTableDto table, TupleDto data) throws SQLException,
QueryMalformedException, TableMalformedException, StorageUnavailableException, StorageNotFoundException;
+ /**
+ * Updates a tuple in a table.
+ * @param table The table.
+ * @param data The tuple.
+ * @throws SQLException Failed to parse SQL query, contains invalid syntax.
+ * @throws QueryMalformedException The update query is malformed, likely due to a bug in the application.
+ * @throws TableMalformedException The tuple is malformed and does not fit the table schema.
+ */
void updateTuple(PrivilegedTableDto table, TupleUpdateDto data) throws SQLException,
QueryMalformedException, TableMalformedException;
+ /**
+ * Exports a table at given system-versioning time.
+ * @param table The table.
+ * @param timestamp The system-versioning time.
+ * @return The exported resource.
+ * @throws SQLException Failed to parse SQL query, contains invalid syntax.
+ * @throws SidecarExportException The sidecar of the target database failed to export the dataset.
+ * @throws StorageNotFoundException The storage service was not able to find the dataset for export.
+ * @throws StorageUnavailableException Failed to establish a connection with the Storage Service.
+ * @throws QueryMalformedException The export query is malformed, likely due to a bug in the application.
+ * @throws RemoteUnavailableException Failed to establish connection to the sidecar.
+ */
ExportResourceDto exportDataset(PrivilegedTableDto table, Instant timestamp)
throws SQLException, SidecarExportException, StorageNotFoundException, StorageUnavailableException,
QueryMalformedException, RemoteUnavailableException;
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
index f4bef4f067706688dc30234a3a375678214cdb8f..9151f868de9f271f9c73cc8f7da4fccf168b668d 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/ViewService.java
@@ -15,12 +15,12 @@ import java.util.List;
public interface ViewService {
/**
- *
- * @param database
+ * Gets the metadata schema for a given database.
+ * @param database The database.
* @return The list of view metadata.
- * @throws SQLException
- * @throws DatabaseMalformedException
- * @throws ViewNotFoundException
+ * @throws SQLException The connection to the data database was unsuccessful.
+ * @throws DatabaseMalformedException The columns that are referenced in the views are unknown to the Metadata Database. Call {@link TableService#getSchemas(PrivilegedDatabaseDto)} beforehand.
+ * @throws ViewNotFoundException The view with given name was not found.
*/
List<ViewDto> getSchemas(PrivilegedDatabaseDto database) throws SQLException, DatabaseMalformedException,
ViewNotFoundException;
@@ -50,11 +50,35 @@ public interface ViewService {
QueryResultDto data(PrivilegedViewDto view, Instant timestamp, Long page, Long size) throws SQLException,
ViewMalformedException;
+ /**
+ * Deletes a view.
+ * @param view The view.
+ * @throws SQLException The connection to the data database was unsuccessful.
+ * @throws ViewMalformedException The query is malformed and was rejected by the data database.
+ */
void delete(PrivilegedViewDto view) throws SQLException, ViewMalformedException;
+ /**
+ * Counts tuples in a view at system-versioned timestamp.
+ * @param view The view.
+ * @param timestamp The system-versioned timestamp.
+ * @return The number of tuples.
+ * @throws SQLException The connection to the data database was unsuccessful.
+ * @throws QueryMalformedException The query is malformed and was rejected by the data database.
+ */
Long count(PrivilegedViewDto view, Instant timestamp) throws SQLException, QueryMalformedException;
- ExportResourceDto exportDataset(PrivilegedDatabaseDto database, ViewDto view, Instant timestamp)
- throws SQLException, QueryMalformedException, SidecarExportException, StorageNotFoundException,
- StorageUnavailableException, RemoteUnavailableException;
+ /**
+ * Exports view data into a dataset.
+ * @param view The view.
+ * @return The dataset.
+ * @throws SQLException The connection to the data database was unsuccessful.
+ * @throws QueryMalformedException The query is malformed and was rejected by the data database.
+ * @throws SidecarExportException The sidecar of the target database failed to export the dataset.
+ * @throws RemoteUnavailableException Failed to establish connection to the sidecar.
+ * @throws StorageNotFoundException The storage service was not able to find the dataset for export.
+ * @throws StorageUnavailableException Failed to establish a connection with the Storage Service.
+ */
+ ExportResourceDto exportDataset(PrivilegedViewDto view) throws SQLException, QueryMalformedException,
+ SidecarExportException, RemoteUnavailableException, StorageNotFoundException, StorageUnavailableException;
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
index 0b1dc7caa1cd7f530d6d8590ffb09225e8048ff4..797de6567445ea6acdc45c656d8910f68084ac8b 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/QueueServiceRabbitMqImpl.java
@@ -6,6 +6,7 @@ import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.service.QueueService;
import com.mchange.v2.c3p0.ComboPooledDataSource;
+import io.micrometer.core.instrument.Counter;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,11 +21,14 @@ import java.util.Optional;
@Service
public class QueueServiceRabbitMqImpl extends HibernateConnector implements QueueService {
+ private final Counter amqpDataAccessCounter;
private final DataMapper dataMapper;
private final MetadataMapper metadataMapper;
@Autowired
- public QueueServiceRabbitMqImpl(DataMapper dataMapper, MetadataMapper metadataMapper) {
+ public QueueServiceRabbitMqImpl(Counter amqpDataAccessCounter, DataMapper dataMapper,
+ MetadataMapper metadataMapper) {
+ this.amqpDataAccessCounter = amqpDataAccessCounter;
this.dataMapper = dataMapper;
this.metadataMapper = metadataMapper;
}
@@ -50,6 +54,7 @@ public class QueueServiceRabbitMqImpl extends HibernateConnector implements Queu
preparedStatement.executeUpdate();
log.debug("executed statement in {} ms", System.currentTimeMillis() - start);
log.trace("successfully inserted tuple");
+ amqpDataAccessCounter.increment();
} finally {
dataSource.close();
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
index e839800fe577f951bf868b44c5d595d96258f7b0..8bfdc0089a9d31ce9faa8af40be151eb1044532f 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/SubsetServiceMariaDbImpl.java
@@ -17,9 +17,10 @@ import at.tuwien.gateway.MetadataServiceGateway;
import at.tuwien.mapper.DataMapper;
import at.tuwien.mapper.MariaDbMapper;
import at.tuwien.mapper.MetadataMapper;
-import at.tuwien.service.SubsetService;
import at.tuwien.service.StorageService;
+import at.tuwien.service.SubsetService;
import com.mchange.v2.c3p0.ComboPooledDataSource;
+import io.micrometer.core.instrument.Counter;
import lombok.extern.log4j.Log4j2;
import net.sf.jsqlparser.JSQLParserException;
import org.apache.commons.lang3.RandomUtils;
@@ -38,6 +39,7 @@ import java.util.UUID;
@Service
public class SubsetServiceMariaDbImpl extends HibernateConnector implements SubsetService {
+ private final Counter httpDataAccessCounter;
private final S3Config s3Config;
private final DataMapper dataMapper;
private final MariaDbMapper mariaDbMapper;
@@ -47,10 +49,11 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
private final DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
@Autowired
- public SubsetServiceMariaDbImpl(S3Config s3Config, DataMapper dataMapper, MariaDbMapper mariaDbMapper,
- MetadataMapper metadataMapper, StorageService storageService,
- MetadataServiceGateway metadataServiceGateway,
+ public SubsetServiceMariaDbImpl(Counter httpDataAccessCounter, S3Config s3Config, DataMapper dataMapper,
+ MariaDbMapper mariaDbMapper, MetadataMapper metadataMapper,
+ StorageService storageService, MetadataServiceGateway metadataServiceGateway,
DataDatabaseSidecarGateway dataDatabaseSidecarGateway) {
+ this.httpDataAccessCounter = httpDataAccessCounter;
this.s3Config = s3Config;
this.dataMapper = dataMapper;
this.mariaDbMapper = mariaDbMapper;
@@ -106,6 +109,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
MetadataServiceException {
final Long queryId = storeQuery(database, statement, timestamp, userId);
final QueryDto query = findById(database, queryId);
+ httpDataAccessCounter.increment();
return reExecute(database, query, page, size, sortDirection, sortColumn);
}
@@ -200,6 +204,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
dataSource.close();
}
dataDatabaseSidecarGateway.exportFile(database.getContainer().getSidecarHost(), database.getContainer().getSidecarPort(), filename);
+ httpDataAccessCounter.increment();
return storageService.getResource(filename);
}
@@ -212,6 +217,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
final PreparedStatement preparedStatement = connection.prepareStatement(statement);
final ResultSet resultSet = preparedStatement.executeQuery();
log.debug("executed statement in {} ms", System.currentTimeMillis() - start);
+ httpDataAccessCounter.increment();
return dataMapper.resultListToQueryResultDto(columns, resultSet);
} catch (SQLException e) {
log.error("Failed to execute and map time-versioned query: {}", e.getMessage());
@@ -231,6 +237,7 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
final ResultSet resultSet = connection.prepareStatement(mariaDbMapper.countRawSelectQuery(statement, timestamp))
.executeQuery();
log.debug("executed statement in {} ms", System.currentTimeMillis() - start);
+ httpDataAccessCounter.increment();
return mariaDbMapper.resultSetToNumber(resultSet);
} catch (SQLException e) {
log.error("Failed to map object: {}", e.getMessage());
@@ -280,7 +287,11 @@ public class SubsetServiceMariaDbImpl extends HibernateConnector implements Subs
/* insert query into query store */
final long start = System.currentTimeMillis();
final CallableStatement callableStatement = connection.prepareCall(mariaDbMapper.queryStoreStoreQueryRawQuery());
- callableStatement.setString(1, String.valueOf(userId));
+ if (userId != null) {
+ callableStatement.setString(1, String.valueOf(userId));
+ } else {
+ callableStatement.setNull(1, Types.VARCHAR);
+ }
callableStatement.setString(2, query);
callableStatement.setTimestamp(3, Timestamp.from(timestamp));
callableStatement.registerOutParameter(4, Types.BIGINT);
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
index 15ed27f4414a02680511f914453b8bda9ce98da3..3ab02bbb016ff28469301a699f2ebd65bfd76f6c 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/TableServiceMariaDbImpl.java
@@ -2,7 +2,7 @@ package at.tuwien.service.impl;
import at.tuwien.ExportResourceDto;
import at.tuwien.api.database.internal.PrivilegedDatabaseDto;
-import at.tuwien.api.database.query.ImportCsvDto;
+import at.tuwien.api.database.query.ImportDto;
import at.tuwien.api.database.query.QueryResultDto;
import at.tuwien.api.database.table.*;
import at.tuwien.api.database.table.columns.ColumnDto;
@@ -20,6 +20,7 @@ import at.tuwien.service.StorageService;
import at.tuwien.service.TableService;
import at.tuwien.utils.MariaDbUtil;
import com.mchange.v2.c3p0.ComboPooledDataSource;
+import io.micrometer.core.instrument.Counter;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@ import java.util.*;
@Service
public class TableServiceMariaDbImpl extends HibernateConnector implements TableService {
+ private final Counter httpDataAccessCounter;
private final S3Config s3Config;
private final DataMapper dataMapper;
private final MariaDbMapper mariaDbMapper;
@@ -42,9 +44,11 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
private final DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
@Autowired
- public TableServiceMariaDbImpl(S3Config s3Config, DataMapper dataMapper, MariaDbMapper mariaDbMapper,
- SchemaService schemaService, StorageService storageService,
+ public TableServiceMariaDbImpl(Counter httpDataAccessCounter, S3Config s3Config, DataMapper dataMapper,
+ MariaDbMapper mariaDbMapper, SchemaService schemaService,
+ StorageService storageService,
DataDatabaseSidecarGateway dataDatabaseSidecarGateway) {
+ this.httpDataAccessCounter = httpDataAccessCounter;
this.s3Config = s3Config;
this.dataMapper = dataMapper;
this.mariaDbMapper = mariaDbMapper;
@@ -203,6 +207,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
connection.commit();
queryResult = dataMapper.resultListToQueryResultDto(table.getColumns(), resultSet);
log.debug("mapped result in {} ms", System.currentTimeMillis() - start);
+ httpDataAccessCounter.increment();
} catch (SQLException e) {
connection.rollback();
log.error("Failed to find data from table {}.{}: {}", table.getDatabase().getInternalName(), table.getInternalName(), e.getMessage());
@@ -268,7 +273,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
}
@Override
- public void importDataset(PrivilegedTableDto table, ImportCsvDto data) throws StorageNotFoundException,
+ public void importDataset(PrivilegedTableDto table, ImportDto data) throws StorageNotFoundException,
SQLException, QueryMalformedException, RemoteUnavailableException, SidecarImportException {
/* import .csv from blob storage to sidecar */
dataDatabaseSidecarGateway.importFile(table.getDatabase().getContainer().getSidecarHost(), table.getDatabase().getContainer().getSidecarPort(), data.getLocation());
@@ -438,6 +443,7 @@ public class TableServiceMariaDbImpl extends HibernateConnector implements Table
dataSource.close();
}
dataDatabaseSidecarGateway.exportFile(table.getDatabase().getContainer().getSidecarHost(), table.getDatabase().getContainer().getSidecarPort(), fileName);
+ httpDataAccessCounter.increment();
return storageService.getResource(fileName);
}
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
index 06cf42ae6ed0b49f56f63648cd3286b4226f727a..366cfa5faf5fabe34210b880d3fdca3659267a3a 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/service/impl/ViewServiceMariaDbImpl.java
@@ -19,6 +19,7 @@ import at.tuwien.service.StorageService;
import at.tuwien.service.ViewService;
import com.google.common.hash.Hashing;
import com.mchange.v2.c3p0.ComboPooledDataSource;
+import io.micrometer.core.instrument.Counter;
import lombok.extern.log4j.Log4j2;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,7 @@ import java.util.List;
@Service
public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewService {
+ private final Counter httpDataAccessCounter;
private final S3Config s3Config;
private final DataMapper dataMapper;
private final QueryConfig queryConfig;
@@ -48,10 +50,11 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
private final DataDatabaseSidecarGateway dataDatabaseSidecarGateway;
@Autowired
- public ViewServiceMariaDbImpl(S3Config s3Config, DataMapper dataMapper, QueryConfig queryConfig,
- MariaDbMapper mariaDbMapper, SchemaService schemaService,
+ public ViewServiceMariaDbImpl(Counter httpDataAccessCounter, S3Config s3Config, DataMapper dataMapper,
+ QueryConfig queryConfig, MariaDbMapper mariaDbMapper, SchemaService schemaService,
StorageService storageService, MetadataMapper metadataMapper,
DataDatabaseSidecarGateway dataDatabaseSidecarGateway) {
+ this.httpDataAccessCounter = httpDataAccessCounter;
this.s3Config = s3Config;
this.dataMapper = dataMapper;
this.queryConfig = queryConfig;
@@ -165,6 +168,7 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
queryResult = dataMapper.resultListToQueryResultDto(mappedColumns, resultSet);
queryResult.setId(view.getId());
connection.commit();
+ httpDataAccessCounter.increment();
} catch (SQLException e) {
log.error("Failed to map object: {}", e.getMessage());
throw new ViewMalformedException("Failed to map object: " + e.getMessage(), e);
@@ -224,12 +228,11 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
}
@Override
- public ExportResourceDto exportDataset(PrivilegedDatabaseDto database, ViewDto view, Instant timestamp)
- throws SQLException, QueryMalformedException, StorageNotFoundException, StorageUnavailableException,
- RemoteUnavailableException, SidecarExportException {
+ public ExportResourceDto exportDataset(PrivilegedViewDto view) throws SQLException, QueryMalformedException,
+ SidecarExportException, RemoteUnavailableException, StorageNotFoundException, StorageUnavailableException {
final String fileName = RandomStringUtils.randomAlphabetic(40) + ".csv";
final String filePath = s3Config.getS3FilePath() + File.separator + fileName;
- final ComboPooledDataSource dataSource = getPrivilegedDataSource(database);
+ final ComboPooledDataSource dataSource = getPrivilegedDataSource(view.getDatabase());
final Connection connection = dataSource.getConnection();
try {
/* export to data database sidecar */
@@ -238,8 +241,8 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
.map(metadataMapper::viewColumnDtoToColumnDto)
.toList();
final long start = System.currentTimeMillis();
- connection.prepareStatement(mariaDbMapper.tableOrViewToRawExportQuery(database.getInternalName(),
- view.getInternalName(), columns, timestamp, filePath))
+ connection.prepareStatement(mariaDbMapper.tableOrViewToRawExportQuery(view.getDatabase().getInternalName(),
+ view.getInternalName(), columns, null, filePath))
.executeUpdate();
log.debug("executed statement in {} ms", System.currentTimeMillis() - start);
connection.commit();
@@ -250,8 +253,9 @@ public class ViewServiceMariaDbImpl extends HibernateConnector implements ViewSe
} finally {
dataSource.close();
}
- dataDatabaseSidecarGateway.exportFile(database.getContainer().getSidecarHost(),
- database.getContainer().getSidecarPort(), fileName);
+ dataDatabaseSidecarGateway.exportFile(view.getDatabase().getContainer().getSidecarHost(),
+ view.getDatabase().getContainer().getSidecarPort(), fileName);
+ httpDataAccessCounter.increment();
return storageService.getResource(fileName);
}
diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index 49e5ce649631baf8ffb1945f3cbc1037de099d28..6d3dce2b9e38b52d607cf3af1246c27e6b2e09bf 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -8,10 +8,6 @@ client_max_body_size 20G;
resolver 127.0.0.11 valid=30s; # docker dns
-upstream auth {
- server auth-service:8080;
-}
-
upstream broker {
server broker-service:15672;
}
@@ -40,41 +36,12 @@ upstream upload {
server upload-service:8080;
}
-upstream dashboard-service {
- server dashboard-service:3000;
-}
-
server {
listen 80 default_server;
server_name _;
- location /admin/broker {
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://broker;
- proxy_read_timeout 90;
- }
-
- location /dashboard {
- rewrite ^/dashboard/(.*) /$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://dashboard-service;
- proxy_read_timeout 90;
- }
-
- # Proxy Grafana Live WebSocket connections.
- location /dashboard/api/live {
- rewrite ^/dashboard/(.*) /$1 break;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
- proxy_set_header Host $host;
- proxy_pass http://dashboard-service;
+ location = /basic_status {
+ stub_status;
}
location /api/search {
@@ -87,7 +54,7 @@ server {
}
location /api/broker {
- rewrite /api/broker/(.*) /admin/broker/api/$1 break;
+ rewrite /api/broker/(.*) /api/$1 break;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -121,16 +88,6 @@ server {
proxy_read_timeout 90;
}
- location /api/auth {
- rewrite /api/auth/(.*) /$1 break;
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://auth;
- proxy_read_timeout 90;
- }
-
location ~ /api/database/([0-9]+)/table/([0-9]+)/(data|history|export|statistic) {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
@@ -140,7 +97,7 @@ server {
proxy_read_timeout 90;
}
- location ~ /api/database/([0-9]+)/view/([0-9]+)/data {
+ location ~ /api/database/([0-9]+)/view/([0-9]+)/(data|export) {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/dbrepo-metadata-db/1_setup-schema.sql b/dbrepo-metadata-db/1_setup-schema.sql
index 272836d4c279f5b5f3bfecec3b8188a8266c5237..b6b3b7bf89a8140950f1bf11768911bcc9fb6977 100644
--- a/dbrepo-metadata-db/1_setup-schema.sql
+++ b/dbrepo-metadata-db/1_setup-schema.sql
@@ -1,564 +1,639 @@
- BEGIN;
-
- CREATE TABLE IF NOT EXISTS `mdb_users`
- (
- id character varying(36) NOT NULL,
- username character varying(255) NOT NULL,
- firstname character varying(255),
- lastname character varying(255),
- email character varying(255) NOT NULL,
- orcid character varying(255),
- affiliation character varying(255),
- mariadb_password character varying(255) NOT NULL,
- theme character varying(255) NOT NULL default ('light'),
- language character varying(3) NOT NULL default ('en'),
- PRIMARY KEY (id),
- UNIQUE (username),
- UNIQUE (email)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_images`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- registry character varying(255) NOT NULL DEFAULT 'docker.io',
- name character varying(255) NOT NULL,
- version character varying(255) NOT NULL,
- default_port integer NOT NULL,
- dialect character varying(255) NOT NULL,
- driver_class character varying(255) NOT NULL,
- jdbc_method character varying(255) NOT NULL,
- is_default BOOLEAN NOT NULL DEFAULT FALSE,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- PRIMARY KEY (id),
- UNIQUE (name, version),
- UNIQUE (is_default)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_images_date`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- iid bigint NOT NULL,
- database_format character varying(255) NOT NULL,
- unix_format character varying(255) NOT NULL,
- example character varying(255) NOT NULL,
- has_time boolean NOT NULL,
- created_at timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- FOREIGN KEY (iid) REFERENCES mdb_images (id),
- UNIQUE (database_format, unix_format, example)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_containers`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- internal_name character varying(255) NOT NULL,
- name character varying(255) NOT NULL,
- host character varying(255) NOT NULL,
- port integer NOT NULL default 3306,
- ui_host character varying(255) NOT NULL default host,
- ui_port integer NOT NULL default port,
- ui_additional_flags text,
- sidecar_host character varying(255),
- sidecar_port integer,
- image_id bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- privileged_username character varying(255) NOT NULL,
- privileged_password character varying(255) NOT NULL,
- quota integer NOT NULL DEFAULT 50,
- PRIMARY KEY (id),
- FOREIGN KEY (image_id) REFERENCES mdb_images (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_data`
- (
- ID bigint NOT NULL AUTO_INCREMENT,
- PROVENANCE text,
- FileEncoding text,
- FileType character varying(100),
- Version text,
- Seperator text,
- PRIMARY KEY (ID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_licenses`
- (
- identifier character varying(255) NOT NULL,
- uri text NOT NULL,
- description text NOT NULL,
- PRIMARY KEY (identifier),
- UNIQUE (uri(200))
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_databases`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- cid bigint NOT NULL,
- name character varying(255) NOT NULL,
- internal_name character varying(255) NOT NULL,
- exchange_name character varying(255) NOT NULL,
- description text,
- engine character varying(20),
- is_public boolean NOT NULL DEFAULT TRUE,
- image longblob,
- created_by character varying(36),
- owned_by character varying(36),
- contact_person character varying(36),
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- PRIMARY KEY (id),
- FOREIGN KEY (cid) REFERENCES mdb_containers (id) /* currently we only support one-to-one */,
- FOREIGN KEY (created_by) REFERENCES mdb_users (id),
- FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
- FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_databases_subjects`
- (
- dbid BIGINT NOT NULL,
- subjects character varying(255) NOT NULL,
- PRIMARY KEY (dbid, subjects)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_tables`
- (
- ID bigint NOT NULL AUTO_INCREMENT,
- tDBID bigint NOT NULL,
- tName VARCHAR(64) NOT NULL,
- internal_name VARCHAR(64) NOT NULL,
- queue_name VARCHAR(255) NOT NULL,
- routing_key VARCHAR(255),
- tDescription VARCHAR(2048),
- num_rows BIGINT,
- data_length BIGINT,
- max_data_length BIGINT,
- avg_row_length BIGINT,
- `separator` CHAR(1),
- quote CHAR(1),
- element_null VARCHAR(50),
- skip_lines BIGINT,
- element_true VARCHAR(50),
- element_false VARCHAR(50),
- Version TEXT,
- created timestamp NOT NULL DEFAULT NOW(),
- versioned boolean not null default true,
- created_by character varying(36) NOT NULL,
- owned_by character varying(36) NOT NULL,
- last_modified timestamp,
- PRIMARY KEY (ID),
- UNIQUE (tDBID, internal_name),
- FOREIGN KEY (tDBID) REFERENCES mdb_databases (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id),
- FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns`
- (
- ID BIGINT NOT NULL AUTO_INCREMENT,
- tID BIGINT NOT NULL,
- dfID BIGINT,
- cName VARCHAR(64),
- internal_name VARCHAR(64) NOT NULL,
- Datatype ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- length BIGINT NULL,
- ordinal_position INTEGER NOT NULL,
- index_length BIGINT NULL,
- description VARCHAR(2048),
- size BIGINT,
- d BIGINT,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL DEFAULT true,
- val_min NUMERIC NULL,
- val_max NUMERIC NULL,
- mean NUMERIC NULL,
- median NUMERIC NULL,
- std_dev Numeric NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- FOREIGN KEY (tID) REFERENCES mdb_tables (ID) ON DELETE CASCADE,
- PRIMARY KEY (ID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns_enums`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- column_id bigint NOT NULL,
- value CHARACTER VARYING(255) NOT NULL,
- FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
- PRIMARY KEY (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns_sets`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- column_id bigint NOT NULL,
- value CHARACTER VARYING(255) NOT NULL,
- FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
- PRIMARY KEY (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns_nom`
- (
- tID bigint,
- cID bigint,
- maxlength INTEGER,
- last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- FOREIGN KEY (tID, cID) REFERENCES mdb_columns (tID, ID),
- PRIMARY KEY (tID, cID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns_cat`
- (
- tID bigint,
- cID bigint,
- num_cat INTEGER,
- -- cat_array TEXT[],
- last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- FOREIGN KEY (tID, cID) REFERENCES mdb_columns (tID, ID),
- PRIMARY KEY (tID, cID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
- (
- fkid BIGINT NOT NULL AUTO_INCREMENT,
- tid BIGINT NOT NULL,
- rtid BIGINT NOT NULL,
- name VARCHAR(255) NOT NULL,
- on_update VARCHAR(50) NULL,
- on_delete VARCHAR(50) NULL,
- position INT NULL,
- PRIMARY KEY (fkid),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
- FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key`
- (
- pkid BIGINT NOT NULL AUTO_INCREMENT,
- tID BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- PRIMARY KEY (pkid),
- FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE,
- FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference`
- (
- id BIGINT NOT NULL AUTO_INCREMENT,
- fkid BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- rcid BIGINT NOT NULL,
- PRIMARY KEY (id),
- UNIQUE (fkid, cid, rcid),
- FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
- FOREIGN KEY (cid) REFERENCES mdb_columns (id),
- FOREIGN KEY (rcid) REFERENCES mdb_columns (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
- (
- uid BIGINT NOT NULL AUTO_INCREMENT,
- name VARCHAR(255) NOT NULL,
- tid BIGINT NOT NULL,
- position INT NULL,
- PRIMARY KEY (uid),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
- );
-
- CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
- (
- id BIGINT NOT NULL AUTO_INCREMENT,
- uid BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid),
- FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
- (
- id BIGINT NOT NULL AUTO_INCREMENT,
- tid BIGINT NOT NULL,
- checks VARCHAR(255) NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
- ) WITH SYSTEM VERSIONING;
-
-
- CREATE TABLE IF NOT EXISTS `mdb_concepts`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- uri text not null,
- name VARCHAR(255) null,
- description TEXT null,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- UNIQUE (uri(200))
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_units`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- uri text not null,
- name VARCHAR(255) null,
- description TEXT null,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- UNIQUE (uri(200))
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns_concepts`
- (
- id bigint NOT NULL,
- cID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id, cid),
- FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_columns_units`
- (
- id bigint NOT NULL,
- cID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id, cID),
- FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_view`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- vdbid bigint NOT NULL,
- vName VARCHAR(64) NOT NULL,
- internal_name VARCHAR(64) NOT NULL,
- Query TEXT NOT NULL,
- query_hash VARCHAR(255) NOT NULL,
- Public BOOLEAN NOT NULL,
- InitialView BOOLEAN NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- last_modified timestamp,
- created_by character varying(36) NOT NULL,
- PRIMARY KEY (id),
- FOREIGN KEY (vdbid) REFERENCES mdb_databases (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_banner_messages`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- type ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL default 'INFO',
- message TEXT NOT NULL,
- link TEXT NULL,
- link_text VARCHAR(255) NULL,
- display_start timestamp NULL,
- display_end timestamp NULL,
- PRIMARY KEY (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_ontologies`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- prefix VARCHAR(8) NOT NULL,
- uri TEXT NOT NULL,
- uri_pattern TEXT,
- sparql_endpoint TEXT NULL,
- rdf_path TEXT NULL,
- last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- UNIQUE (prefix),
- UNIQUE (uri(200)),
- PRIMARY KEY (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_view_columns`
- (
- id BIGINT NOT NULL AUTO_INCREMENT,
- view_id BIGINT NOT NULL,
- dfID BIGINT,
- name VARCHAR(64),
- internal_name VARCHAR(64) NOT NULL,
- column_type ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- ordinal_position INTEGER NOT NULL,
- size BIGINT,
- d BIGINT,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL DEFAULT true,
- PRIMARY KEY (id),
- FOREIGN KEY (view_id) REFERENCES mdb_view (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_identifiers`
- (
- id BIGINT NOT NULL AUTO_INCREMENT,
- dbid BIGINT NOT NULL,
- qid BIGINT,
- vid BIGINT,
- tid BIGINT,
- publisher VARCHAR(255) NOT NULL,
- language VARCHAR(2),
- publication_year INTEGER NOT NULL,
- publication_month INTEGER,
- publication_day INTEGER,
- identifier_type ENUM ('DATABASE', 'SUBSET', 'VIEW', 'TABLE') NOT NULL,
- status ENUM ('DRAFT', 'PUBLISHED') NOT NULL DEFAULT ('PUBLISHED'),
- query TEXT,
- query_normalized TEXT,
- query_hash VARCHAR(255),
- execution TIMESTAMP,
- result_hash VARCHAR(255),
- result_number BIGINT,
- doi VARCHAR(255),
- created TIMESTAMP NOT NULL DEFAULT NOW(),
- created_by VARCHAR(36) NOT NULL,
- last_modified TIMESTAMP,
- PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
- FOREIGN KEY (dbid) REFERENCES mdb_databases (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
- (
- pid bigint NOT NULL,
- license_id VARCHAR(255) NOT NULL,
- PRIMARY KEY (pid, license_id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
- FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_identifier_titles`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- title text NOT NULL,
- title_type ENUM ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
- language VARCHAR(2),
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_identifier_funders`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- funder_name VARCHAR(255) NOT NULL,
- funder_identifier TEXT,
- funder_identifier_type ENUM ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
- scheme_uri text,
- award_number VARCHAR(255),
- award_title text,
- language VARCHAR(255),
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- description text NOT NULL,
- description_type ENUM ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
- language VARCHAR(2),
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_related_identifiers`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- value varchar(255) NOT NULL,
- type varchar(255) NOT NULL,
- relation varchar(255) NOT NULL,
- PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
- UNIQUE (pid, value)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_identifier_creators`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- given_names text,
- family_name text,
- creator_name VARCHAR(255) NOT NULL,
- name_type ENUM ('PERSONAL', 'ORGANIZATIONAL') default 'PERSONAL',
- name_identifier text,
- name_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI', 'ORCID'),
- name_identifier_scheme_uri text,
- affiliation VARCHAR(255),
- affiliation_identifier text,
- affiliation_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI'),
- affiliation_identifier_scheme_uri text,
- PRIMARY KEY (id),
- FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_update`
- (
- uUserID character varying(255) NOT NULL,
- uDBID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (uUserID, uDBID),
- FOREIGN KEY (uDBID) REFERENCES mdb_databases (id)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_access`
- (
- aUserID character varying(255) NOT NULL,
- aDBID bigint REFERENCES mdb_databases (id),
- attime TIMESTAMP,
- download BOOLEAN,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (aUserID, aDBID)
- ) WITH SYSTEM VERSIONING;
-
- CREATE TABLE IF NOT EXISTS `mdb_have_access`
- (
- user_id character varying(36) NOT NULL,
- database_id bigint REFERENCES mdb_databases (id),
- access_type ENUM ('READ', 'WRITE_OWN', 'WRITE_ALL') NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (user_id, database_id),
- FOREIGN KEY (user_id) REFERENCES mdb_users (id)
- ) WITH SYSTEM VERSIONING;
-
- COMMIT;
- BEGIN;
-
- INSERT INTO `mdb_licenses` (identifier, uri, description)
- VALUES ('CC0-1.0', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode',
- 'CC0 waives copyright interest in a work you''ve created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach.'),
- ('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode',
- 'The Creative Commons Attribution license allows re-distribution and re-use of a licensed work on the condition that the creator is appropriately credited.');
-
- INSERT INTO `mdb_images` (name, registry, version, default_port, dialect, driver_class, jdbc_method)
- VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver',
- 'mariadb');
-
- INSERT INTO `mdb_images_date` (iid, database_format, unix_format, example, has_time)
- VALUES (1, '%Y-%c-%d %H:%i:%S.%f', 'yyyy-MM-dd HH:mm:ss.SSSSSS', '2022-01-30 13:44:25.499', true),
- (1, '%Y-%c-%d %H:%i:%S', 'yyyy-MM-dd HH:mm:ss', '2022-01-30 13:44:25', true),
- (1, '%Y-%c-%d', 'yyyy-MM-dd', '2022-01-30', false),
- (1, '%H:%i:%S', 'HH:mm:ss', '13:44:25', true),
- (1, '%d.%c.%Y', 'dd.MM.yyyy', '30.01.2022', false);
-
- INSERT INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
- VALUES ('om', 'http://www.ontology-of-units-of-measure.org/resource/om-2/',
- 'http://www.ontology-of-units-of-measure.org/resource/om-2/.*', null, 'rdf/om-2.0.rdf'),
- ('wd', 'http://www.wikidata.org/', 'http://www.wikidata.org/entity/.*', 'https://query.wikidata.org/sparql',
- null),
- ('mo', 'http://purl.org/ontology/mo/', 'http://purl.org/ontology/mo/.*', null, null),
- ('dc', 'http://purl.org/dc/elements/1.1/', null, null, null),
- ('xsd', 'http://www.w3.org/2001/XMLSchema#', null, null, null),
- ('tl', 'http://purl.org/NET/c4dm/timeline.owl#', null, null, null),
- ('foaf', 'http://xmlns.com/foaf/0.1/', null, null, null),
- ('schema', 'http://schema.org/', null, null, null),
- ('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', null, null, null),
- ('rdfs', 'http://www.w3.org/2000/01/rdf-schema#', null, null, null),
- ('owl', 'http://www.w3.org/2002/07/owl#', null, null, null),
- ('prov', 'http://www.w3.org/ns/prov#', null, null, null),
- ('db', 'http://dbpedia.org', 'http://dbpedia.org/ontology/.*', 'http://dbpedia.org/sparql', null);
- COMMIT;
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS `mdb_users`
+(
+ id character varying(36) NOT NULL,
+ username character varying(255) NOT NULL,
+ firstname character varying(255),
+ lastname character varying(255),
+ email character varying(255) NOT NULL,
+ orcid character varying(255),
+ affiliation character varying(255),
+ mariadb_password character varying(255) NOT NULL,
+ theme character varying(255) NOT NULL default ('light'),
+ language character varying(3) NOT NULL default ('en'),
+ PRIMARY KEY (id),
+ UNIQUE (username),
+ UNIQUE (email)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_images`
+(
+ id SERIAL,
+ registry character varying(255) NOT NULL DEFAULT 'docker.io',
+ name character varying(255) NOT NULL,
+ version character varying(255) NOT NULL,
+ default_port integer NOT NULL,
+ dialect character varying(255) NOT NULL,
+ driver_class character varying(255) NOT NULL,
+ jdbc_method character varying(255) NOT NULL,
+ is_default BOOLEAN NOT NULL DEFAULT FALSE,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ PRIMARY KEY (id),
+ UNIQUE (name, version),
+ UNIQUE (is_default)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_containers`
+(
+ id SERIAL,
+ internal_name character varying(255) NOT NULL,
+ name character varying(255) NOT NULL,
+ host character varying(255) NOT NULL,
+ port integer NOT NULL default 3306,
+ ui_host character varying(255) NOT NULL default host,
+ ui_port integer NOT NULL default port,
+ ui_additional_flags text,
+ sidecar_host character varying(255),
+ sidecar_port integer,
+ image_id bigint NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ privileged_username character varying(255) NOT NULL,
+ privileged_password character varying(255) NOT NULL,
+ quota integer NOT NULL DEFAULT 50,
+ PRIMARY KEY (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_data`
+(
+ ID SERIAL,
+ PROVENANCE text,
+ FileEncoding text,
+ FileType character varying(100),
+ Version text,
+ Seperator text,
+ PRIMARY KEY (ID)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_licenses`
+(
+ identifier character varying(255) NOT NULL,
+ uri text NOT NULL,
+ description text NOT NULL,
+ PRIMARY KEY (identifier),
+ UNIQUE (uri(200))
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_databases`
+(
+ id SERIAL,
+ cid BIGINT UNSIGNED NOT NULL,
+ name character varying(255) NOT NULL,
+ internal_name character varying(255) NOT NULL,
+ exchange_name character varying(255) NOT NULL,
+ description text,
+ engine character varying(20),
+ is_public boolean NOT NULL DEFAULT TRUE,
+ image longblob,
+ created_by character varying(36),
+ owned_by character varying(36),
+ contact_person character varying(36),
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ PRIMARY KEY (id),
+ FOREIGN KEY (cid) REFERENCES mdb_containers (id),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (id),
+ FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
+ FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_databases_subjects`
+(
+ dbid BIGINT NOT NULL,
+ subjects character varying(255) NOT NULL,
+ PRIMARY KEY (dbid, subjects)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_tables`
+(
+ ID SERIAL,
+ tDBID BIGINT UNSIGNED NOT NULL,
+ tName VARCHAR(64) NOT NULL,
+ internal_name VARCHAR(64) NOT NULL,
+ queue_name VARCHAR(255) NOT NULL,
+ routing_key VARCHAR(255),
+ tDescription VARCHAR(2048),
+ num_rows BIGINT,
+ data_length BIGINT,
+ max_data_length BIGINT,
+ avg_row_length BIGINT,
+ `separator` CHAR(1),
+ quote CHAR(1),
+ element_null VARCHAR(50),
+ skip_lines BIGINT,
+ element_true VARCHAR(50),
+ element_false VARCHAR(50),
+ Version TEXT,
+ created timestamp NOT NULL DEFAULT NOW(),
+ versioned boolean not null default true,
+ created_by character varying(36) NOT NULL,
+ owned_by character varying(36) NOT NULL,
+ last_modified timestamp,
+ PRIMARY KEY (ID),
+ UNIQUE (tDBID, internal_name),
+ FOREIGN KEY (tDBID) REFERENCES mdb_databases (id),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (id),
+ FOREIGN KEY (owned_by) REFERENCES mdb_users (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns`
+(
+ ID SERIAL,
+ tID BIGINT UNSIGNED NOT NULL,
+ cName VARCHAR(64),
+ internal_name VARCHAR(64) NOT NULL,
+ Datatype ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','SERIAL','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
+ length BIGINT UNSIGNED NULL,
+ ordinal_position INTEGER NOT NULL,
+ index_length BIGINT UNSIGNED NULL,
+ description VARCHAR(2048),
+ size BIGINT UNSIGNED,
+ d BIGINT UNSIGNED,
+ is_null_allowed BOOLEAN NOT NULL DEFAULT true,
+ val_min NUMERIC NULL,
+ val_max NUMERIC NULL,
+ mean NUMERIC NULL,
+ median NUMERIC NULL,
+ std_dev Numeric NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ FOREIGN KEY (tID) REFERENCES mdb_tables (ID) ON DELETE CASCADE,
+ PRIMARY KEY (ID),
+ UNIQUE (tID, internal_name)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns_enums`
+(
+ id SERIAL,
+ column_id BIGINT UNSIGNED NOT NULL,
+ value CHARACTER VARYING(255) NOT NULL,
+ FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
+ PRIMARY KEY (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns_sets`
+(
+ id SERIAL,
+ column_id BIGINT UNSIGNED NOT NULL,
+ value CHARACTER VARYING(255) NOT NULL,
+ FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
+ PRIMARY KEY (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns_nom`
+(
+ cID BIGINT UNSIGNED,
+ tID BIGINT UNSIGNED,
+ maxlength INTEGER,
+ last_modified timestamp,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (cID),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns_cat`
+(
+ cID BIGINT UNSIGNED,
+ tID BIGINT UNSIGNED,
+ num_cat INTEGER,
+ -- cat_array TEXT[],
+ last_modified timestamp,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (cID),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
+(
+ fkid SERIAL,
+ tid BIGINT UNSIGNED NOT NULL,
+ rtid BIGINT UNSIGNED NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ on_update VARCHAR(50) NULL,
+ on_delete VARCHAR(50) NULL,
+ position INT NULL,
+ PRIMARY KEY (fkid),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
+ FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key`
+(
+ pkid SERIAL,
+ tID BIGINT UNSIGNED NOT NULL,
+ cid BIGINT UNSIGNED NOT NULL,
+ PRIMARY KEY (pkid),
+ FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE,
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference`
+(
+ id SERIAL,
+ fkid BIGINT UNSIGNED NOT NULL,
+ cid BIGINT UNSIGNED NOT NULL,
+ rcid BIGINT UNSIGNED NOT NULL,
+ PRIMARY KEY (id),
+ UNIQUE (fkid, cid, rcid),
+ FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id),
+ FOREIGN KEY (rcid) REFERENCES mdb_columns (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
+(
+ uid SERIAL,
+ name VARCHAR(255) NOT NULL,
+ tid BIGINT UNSIGNED NOT NULL,
+ position INT NULL,
+ PRIMARY KEY (uid),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
+(
+ id SERIAL,
+ uid BIGINT UNSIGNED NOT NULL,
+ cid BIGINT UNSIGNED NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid),
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
+(
+ id SERIAL,
+ tid BIGINT UNSIGNED NOT NULL,
+ checks VARCHAR(255) NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
+) WITH SYSTEM VERSIONING;
+
+
+CREATE TABLE IF NOT EXISTS `mdb_concepts`
+(
+ id SERIAL,
+ uri text not null,
+ name VARCHAR(255) null,
+ description TEXT null,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id),
+ UNIQUE (uri(200))
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_units`
+(
+ id SERIAL,
+ uri text not null,
+ name VARCHAR(255) null,
+ description TEXT null,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id),
+ UNIQUE (uri(200))
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns_concepts`
+(
+ id BIGINT UNSIGNED NOT NULL,
+ cID BIGINT UNSIGNED NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id, cid),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_columns_units`
+(
+ id BIGINT UNSIGNED NOT NULL,
+ cID BIGINT UNSIGNED NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (id, cID),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_view`
+(
+ id SERIAL,
+ vdbid BIGINT UNSIGNED NOT NULL,
+ vName VARCHAR(64) NOT NULL,
+ internal_name VARCHAR(64) NOT NULL,
+ Query TEXT NOT NULL,
+ query_hash VARCHAR(255) NOT NULL,
+ Public BOOLEAN NOT NULL,
+ InitialView BOOLEAN NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ created_by character varying(36) NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (vdbid) REFERENCES mdb_databases (id),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_banner_messages`
+(
+ id SERIAL,
+ type ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL default 'INFO',
+ message TEXT NOT NULL,
+ link TEXT NULL,
+ link_text VARCHAR(255) NULL,
+ display_start timestamp NULL,
+ display_end timestamp NULL,
+ PRIMARY KEY (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_ontologies`
+(
+ id SERIAL,
+ prefix VARCHAR(8) NOT NULL,
+ uri TEXT NOT NULL,
+ uri_pattern TEXT,
+ sparql_endpoint TEXT NULL,
+ rdf_path TEXT NULL,
+ last_modified timestamp,
+ created timestamp NOT NULL DEFAULT NOW(),
+ UNIQUE (prefix),
+ UNIQUE (uri(200)),
+ PRIMARY KEY (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_view_columns`
+(
+ id SERIAL,
+ view_id BIGINT UNSIGNED NOT NULL,
+ name VARCHAR(64),
+ internal_name VARCHAR(64) NOT NULL,
+ column_type ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
+ ordinal_position INTEGER NOT NULL,
+ size BIGINT UNSIGNED,
+ d BIGINT UNSIGNED,
+ is_null_allowed BOOLEAN NOT NULL DEFAULT true,
+ PRIMARY KEY (id),
+ FOREIGN KEY (view_id) REFERENCES mdb_view (id) ON DELETE CASCADE,
+ UNIQUE (view_id, internal_name)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_identifiers`
+(
+ id SERIAL,
+ dbid BIGINT UNSIGNED NOT NULL,
+ qid BIGINT UNSIGNED,
+ vid BIGINT UNSIGNED,
+ tid BIGINT UNSIGNED,
+ publisher VARCHAR(255) NOT NULL,
+ language VARCHAR(2),
+ publication_year INTEGER NOT NULL,
+ publication_month INTEGER,
+ publication_day INTEGER,
+ identifier_type ENUM ('DATABASE', 'SUBSET', 'VIEW', 'TABLE') NOT NULL,
+ status ENUM ('DRAFT', 'PUBLISHED') NOT NULL DEFAULT ('PUBLISHED'),
+ query TEXT,
+ query_normalized TEXT,
+ query_hash VARCHAR(255),
+ execution TIMESTAMP,
+ result_hash VARCHAR(255),
+ result_number BIGINT,
+ doi VARCHAR(255),
+ created TIMESTAMP NOT NULL DEFAULT NOW(),
+ created_by VARCHAR(36) NOT NULL,
+ last_modified TIMESTAMP,
+ PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
+ FOREIGN KEY (dbid) REFERENCES mdb_databases (id),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
+(
+ pid BIGINT UNSIGNED NOT NULL,
+ license_id VARCHAR(255) NOT NULL,
+ PRIMARY KEY (pid, license_id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
+ FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_identifier_titles`
+(
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ title text NOT NULL,
+ title_type ENUM ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
+ language VARCHAR(2),
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_identifier_funders`
+(
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ funder_name VARCHAR(255) NOT NULL,
+ funder_identifier TEXT,
+ funder_identifier_type ENUM ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
+ scheme_uri text,
+ award_number VARCHAR(255),
+ award_title text,
+ language VARCHAR(255),
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions`
+(
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ description text NOT NULL,
+ description_type ENUM ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
+ language VARCHAR(2),
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_related_identifiers`
+(
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ value varchar(255) NOT NULL,
+ type varchar(255) NOT NULL,
+ relation varchar(255) NOT NULL,
+ PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
+ UNIQUE (pid, value)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_identifier_creators`
+(
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ given_names text,
+ family_name text,
+ creator_name VARCHAR(255) NOT NULL,
+ name_type ENUM ('PERSONAL', 'ORGANIZATIONAL') default 'PERSONAL',
+ name_identifier text,
+ name_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI', 'ORCID'),
+ name_identifier_scheme_uri text,
+ affiliation VARCHAR(255),
+ affiliation_identifier text,
+ affiliation_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI'),
+ affiliation_identifier_scheme_uri text,
+ PRIMARY KEY (id),
+ FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_update`
+(
+ uUserID character varying(255) NOT NULL,
+ uDBID BIGINT UNSIGNED NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (uUserID, uDBID),
+ FOREIGN KEY (uDBID) REFERENCES mdb_databases (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_access`
+(
+ aUserID character varying(255) NOT NULL,
+ aDBID BIGINT UNSIGNED REFERENCES mdb_databases (id),
+ attime TIMESTAMP,
+ download BOOLEAN,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (aUserID, aDBID)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_have_access`
+(
+ user_id character varying(36) NOT NULL,
+ database_id BIGINT UNSIGNED REFERENCES mdb_databases (id),
+ access_type ENUM ('READ', 'WRITE_OWN', 'WRITE_ALL') NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ PRIMARY KEY (user_id, database_id),
+ FOREIGN KEY (user_id) REFERENCES mdb_users (id)
+) WITH SYSTEM VERSIONING;
+
+CREATE TABLE IF NOT EXISTS `mdb_image_types`
+(
+ id SERIAL,
+ image_id BIGINT UNSIGNED NOT NULL,
+ display_name varchar(255) NOT NULL,
+ value varchar(255) NOT NULL,
+ size_min INT UNSIGNED,
+ size_max INT UNSIGNED,
+ size_default INT UNSIGNED,
+ size_required BOOLEAN COMMENT 'When setting NULL, the service assumes the data type has no size',
+ size_step INT UNSIGNED,
+ d_min INT UNSIGNED,
+ d_max INT UNSIGNED,
+ d_default INT UNSIGNED,
+ d_required BOOLEAN COMMENT 'When setting NULL, the service assumes the data type has no d',
+ d_step INT UNSIGNED,
+ type_hint TEXT,
+ data_hint TEXT,
+ documentation TEXT NOT NULL,
+ is_generated BOOLEAN NOT NULL,
+ is_quoted BOOLEAN NOT NULL,
+ is_buildable BOOLEAN NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`),
+ UNIQUE (value)
+) WITH SYSTEM VERSIONING;
+
+COMMIT;
+
+BEGIN;
+
+INSERT INTO `mdb_licenses` (identifier, uri, description)
+VALUES ('CC0-1.0', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode',
+ 'CC0 waives copyright interest in a work you''ve created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach.'),
+ ('CC-BY-4.0', 'https://creativecommons.org/licenses/by/4.0/legalcode',
+ 'The Creative Commons Attribution license allows re-distribution and re-use of a licensed work on the condition that the creator is appropriately credited.');
+
+INSERT INTO `mdb_images` (name, registry, version, default_port, dialect, driver_class, jdbc_method)
+VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver',
+ 'mariadb');
+
+INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_default, size_required,
+ size_step, d_min, d_max, d_default, d_required, d_step, type_hint, data_hint,
+ documentation, is_quoted, is_buildable, is_generated)
+VALUES (1, 'BIGINT(size)', 'bigint', 0, null, null, false, 1, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/bigint/', false, true, false),
+ (1, 'BINARY(size)', 'binary', 0, 255, 255, true, 1, null, null, null, null, null, 'size in Bytes', null,
+ 'https://mariadb.com/kb/en/binary/', false, true, false),
+ (1, 'BIT(size)', 'bit', 0, 64, null, false, 1, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/bit/', false, true, false),
+ (1, 'BLOB(size)', 'blob', 0, 65535, null, false, 1, null, null, null, null, null, 'size in Bytes', null,
+ 'https://mariadb.com/kb/en/blob/', false, false, false),
+ (1, 'BOOL', 'bool', null, null, null, null, null, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/bool/', false, true, false),
+ (1, 'CHAR(size)', 'char', 0, 255, 255, false, 1, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/char/', false, true, false),
+ (1, 'DATE', 'date', null, null, null, null, null, null, null, null, null, null,
+ 'min. 1000-01-01, max. 9999-12-31', 'e.g. YYYY-MM-DD, YY-MM-DD, YYMMDD, YYYY/MM/DD',
+ 'https://mariadb.com/kb/en/date/', true, true, false),
+ (1, 'DATETIME(fsp)', 'datetime', 0, 6, null, null, 1, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 1000-01-01 00:00:00.0, max. 9999-12-31 23:59:59.9',
+ 'e.g. YYYY-MM-DD HH:MM:SS, YY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS, YYMMDDHHMMSS, YYYYMMDD, YYMMDD',
+ 'https://mariadb.com/kb/en/datetime/', true, true, false),
+ (1, 'DECIMAL(size, d)', 'decimal', 0, 65, null, false, 1, 0, 38, null, false, null, null, null,
+ 'https://mariadb.com/kb/en/decimal/', false, true, false),
+ (1, 'DOUBLE(size, d)', 'double', null, null, null, false, null, null, null, null, false, null, null, null,
+ 'https://mariadb.com/kb/en/double/', false, true, false),
+ (1, 'ENUM(v1,v2,...)', 'enum', null, null, null, null, null, null, null, null, null, null, null,
+ 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/enum/', true, true, false),
+ (1, 'FLOAT(size)', 'float', null, null, null, false, null, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/float/', false, true, false),
+ (1, 'INT(size)', 'int', null, null, null, false, null, null, null, null, null, null, 'size in Bytes', null,
+ 'https://mariadb.com/kb/en/int/', false, true, false),
+ (1, 'LONGBLOB', 'longblob', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB', null,
+ 'https://mariadb.com/kb/en/longblob/', false, true, false),
+ (1, 'LONGTEXT', 'longtext', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB', null,
+ 'https://mariadb.com/kb/en/longtext/', true, true, false),
+ (1, 'MEDIUMBLOB', 'mediumblob', null, null, null, null, null, null, null, null, null, null, 'max. 15.999 MiB',
+ null, 'https://mariadb.com/kb/en/mediumblob/', false, true, false),
+ (1, 'MEDIUMINT', 'mediumint', null, null, null, null, null, null, null, null, null, null, 'size in Bytes', null,
+ 'https://mariadb.com/kb/en/mediumint/', false, true, false),
+ (1, 'MEDIUMTEXT', 'mediumtext', null, null, null, null, null, null, null, null, null, null, 'size in Bytes',
+ null, 'https://mariadb.com/kb/en/mediumtext/', true, true, false),
+ (1, 'SERIAL', 'serial', null, null, null, null, null, null, null, null, null, null, null,
+ null, 'https://mariadb.com/kb/en/bigint/', true, true, true),
+ (1, 'SET(v1,v2,...)', 'set', null, null, null, null, null, null, null, null, null, null, null,
+ 'e.g. value1, value2, ...', 'https://mariadb.com/kb/en/set/', true, true, false),
+ (1, 'SMALLINT(size)', 'smallint', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes',
+ null, 'https://mariadb.com/kb/en/smallint/', false, true, false),
+ (1, 'TEXT(size)', 'text', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes', null,
+ 'https://mariadb.com/kb/en/text/', true, true, false),
+ (1, 'TIME(fsp)', 'time', 0, 6, 0, false, null, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 0, max. 6', 'e.g. HH:MM:SS, HH:MM, HHMMSS, H:M:S',
+ 'https://mariadb.com/kb/en/time/', true, true, false),
+ (1, 'TIMESTAMP(fsp)', 'timestamp', 0, 6, 0, false, null, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 0, max. 6',
+ 'e.g. YYYY-MM-DD HH:MM:SS, YY-MM-DD HH:MM:SS, YYYYMMDDHHMMSS, YYMMDDHHMMSS, YYYYMMDD, YYMMDD',
+ 'https://mariadb.com/kb/en/timestamp/', true, true, false),
+ (1, 'TINYBLOB', 'tinyblob', null, null, null, null, null, null, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', false, true, false),
+ (1, 'TINYINT(size)', 'tinyint', 0, null, null, false, null, null, null, null, null, null, null,
+ 'size in Bytes', 'https://mariadb.com/kb/en/tinyint/', false, true, false),
+ (1, 'TINYTEXT', 'tinytext', null, null, null, null, null, null, null, null, null, null, null,
+ 'max. 255 characters', 'https://mariadb.com/kb/en/tinytext/', true, true, false),
+ (1, 'YEAR', 'year', 2, 4, null, false, 2, null, null, null, null, null, 'min. 1901, max. 2155', 'e.g. YYYY, YY',
+ 'https://mariadb.com/kb/en/year/', false, true, false),
+ (1, 'VARBINARY(size)', 'varbinary', 0, null, null, true, null, null, null, null, null, null, null,
+ null, 'https://mariadb.com/kb/en/varbinary/', false, true, false),
+ (1, 'VARCHAR(size)', 'varchar', 0, 65532, 255, true, null, null, null, null, null, null, null,
+ null, 'https://mariadb.com/kb/en/varchar/', false, true, false);
+
+INSERT
+INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
+VALUES ('om', 'http://www.ontology-of-units-of-measure.org/resource/om-2/',
+ 'http://www.ontology-of-units-of-measure.org/resource/om-2/.*', null, 'rdf/om-2.0.rdf'),
+ ('wd', 'http://www.wikidata.org/', 'http://www.wikidata.org/entity/.*', 'https://query.wikidata.org/sparql',
+ null),
+ ('mo', 'http://purl.org/ontology/mo/', 'http://purl.org/ontology/mo/.*', null, null),
+ ('dc', 'http://purl.org/dc/elements/1.1/', null, null, null),
+ ('xsd', 'http://www.w3.org/2001/XMLSchema#', null, null, null),
+ ('tl', 'http://purl.org/NET/c4dm/timeline.owl#', null, null, null),
+ ('foaf', 'http://xmlns.com/foaf/0.1/', null, null, null),
+ ('schema', 'http://schema.org/', null, null, null),
+ ('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#', null, null, null),
+ ('rdfs', 'http://www.w3.org/2000/01/rdf-schema#', null, null, null),
+ ('owl', 'http://www.w3.org/2002/07/owl#', null, null, null),
+ ('prov', 'http://www.w3.org/ns/prov#', null, null, null),
+ ('db', 'http://dbpedia.org', 'http://dbpedia.org/ontology/.*', 'http://dbpedia.org/sparql', null);
+COMMIT;
\ No newline at end of file
diff --git a/dbrepo-metadata-service/api/pom.xml b/dbrepo-metadata-service/api/pom.xml
index 4722e9c3c91fbc07e86af58622d2e3d0cc53de0b..c5dadcdfd9ff4aebd0ce83c59b55a2d2d45c237b 100644
--- a/dbrepo-metadata-service/api/pom.xml
+++ b/dbrepo-metadata-service/api/pom.xml
@@ -6,14 +6,21 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-api</artifactId>
<name>dbrepo-metadata-service-api</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
- <dependencies/>
+ <dependencies>
+ <dependency>
+ <groupId>at.tuwien</groupId>
+ <artifactId>dbrepo-metadata-service-entities</artifactId>
+ <version>1.4.7</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/DataTypeDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/DataTypeDto.java
new file mode 100644
index 0000000000000000000000000000000000000000..312dcf998417f13c6d552dcb25d843516f799f1e
--- /dev/null
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/DataTypeDto.java
@@ -0,0 +1,78 @@
+package at.tuwien.api.container.image;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.*;
+import lombok.extern.jackson.Jacksonized;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Jacksonized
+@ToString
+public class DataTypeDto {
+
+ @NotBlank
+ @JsonProperty("display_name")
+ @Schema(example = "TIME(fsp)")
+ private String displayName;
+
+ @NotBlank
+ @Schema(example = "time")
+ private String value;
+
+ @JsonProperty("size_min")
+ @Schema(example = "0")
+ private Integer sizeMin;
+
+ @JsonProperty("size_max")
+ @Schema(example = "6")
+ private Integer sizeMax;
+
+ @JsonProperty("size_default")
+ @Schema(example = "0")
+ private Integer sizeDefault;
+
+ @JsonProperty("size_required")
+ @Schema(example = "false")
+ private Boolean sizeRequired;
+
+ @JsonProperty("d_min")
+ private Integer dMin;
+
+ @JsonProperty("d_max")
+ private Integer dMax;
+
+ @JsonProperty("d_default")
+ private Integer dDefault;
+
+ @JsonProperty("d_required")
+ private Boolean dRequired;
+
+ @NotNull
+ @Schema(example = "https://mariadb.com/kb/en/time/")
+ private String documentation;
+
+ @JsonProperty("data_hint")
+ @Schema(example = "e.g. HH:MM:SS, HH:MM, HHMMSS, H:M:S")
+ private String dataHint;
+
+ @JsonProperty("type_hint")
+ @Schema(example = "fsp=microsecond precision, min. 0, max. 6")
+ private String typeHint;
+
+ @NotNull
+ @JsonProperty("is_quoted")
+ @Schema(example = "false", description = "frontend needs to quote this data type")
+ private Boolean quoted;
+
+ @NotNull
+ @JsonProperty("is_buildable")
+ @Schema(example = "true", description = "frontend can build this data type")
+ private Boolean buildable;
+
+}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java
deleted file mode 100644
index 6fc25ad3cb3ddf860d11e9b4a5ac4ae75b98c277..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDateDto.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package at.tuwien.api.container.image;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.extern.jackson.Jacksonized;
-
-import java.time.Instant;
-
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Jacksonized
-@ToString
-public class ImageDateDto {
-
- @NotNull
- private Long id;
-
- @NotBlank
- @JsonProperty("database_format")
- @Schema(example = "%d.%c.%Y")
- private String databaseFormat;
-
- @NotBlank
- @JsonProperty("unix_format")
- @Schema(example = "dd.MM.YYYY")
- private String unixFormat;
-
- @NotNull
- @JsonProperty("has_time")
- @Schema(example = "false")
- private Boolean hasTime;
-
-
- @NotNull
- @Schema(example = "2021-03-12T15:26:21Z")
- @JsonProperty("created_at")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
- private Instant createdAt;
-
-}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java
index c0cf7f3bceebc8aefa73c267e422d0cb7e9fa3d0..743f1f2b0a8ab67795a58b060d6ef30597d36837 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageDto.java
@@ -38,9 +38,6 @@ public class ImageDto {
@Schema(example = "org.mariadb.jdbc.Driver")
private String driverClass;
- @JsonProperty("date_formats")
- private List<ImageDateDto> dateFormats;
-
@NotBlank
@Schema(example = "org.hibernate.dialect.MariaDBDialect")
private String dialect;
@@ -60,4 +57,8 @@ public class ImageDto {
@Schema(example = "3306")
private Integer defaultPort;
+ @NotNull
+ @JsonProperty("data_types")
+ private List<DataTypeDto> dataTypes;
+
}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/internal/PrivilegedContainerDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/internal/PrivilegedContainerDto.java
index 8de17a48f3221ed4ace1d837ec67183186731381..8bda16bf41630376ad105399ca1aca048d1514e6 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/internal/PrivilegedContainerDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/internal/PrivilegedContainerDto.java
@@ -1,6 +1,5 @@
package at.tuwien.api.container.internal;
-import at.tuwien.api.container.image.ImageDateDto;
import at.tuwien.api.container.image.ImageDto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java
index 337a61a637ea03437f74462c3b1c245e6943999d..613f9c5e71e54bdc09a8c78752d7a40f0eb0eb88 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/ViewColumnDto.java
@@ -1,6 +1,5 @@
package at.tuwien.api.database;
-import at.tuwien.api.container.image.ImageDateDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.columns.concepts.ConceptDto;
import at.tuwien.api.database.table.columns.concepts.UnitDto;
@@ -44,12 +43,6 @@ public class ViewColumnDto {
@Schema(example = "mdb_date")
private String internalName;
- @Schema
- private String alias;
-
- @JsonProperty("date_format")
- private ImageDateDto dateFormat;
-
@NotNull
@JsonProperty("auto_generated")
@Schema(example = "false")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportCsvDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportCsvDto.java
deleted file mode 100644
index eac536143e1b59efce8617f740334acc74b77f5a..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportCsvDto.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package at.tuwien.api.database.query;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.extern.jackson.Jacksonized;
-
-@Getter
-@Setter
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Jacksonized
-@ToString
-public class ImportCsvDto {
-
- @NotBlank
- @Schema(example = "file.csv")
- private String location;
-
- @Min(value = 0L)
- @JsonProperty("skip_lines")
- private Long skipLines;
-
- @JsonProperty("false_element")
- private String falseElement;
-
- @JsonProperty("true_element")
- private String trueElement;
-
- @JsonProperty("null_element")
- @Schema(example = "NA")
- private String nullElement;
-
- @NotNull
- @Schema(example = ",")
- private Character separator;
-
- @Schema(example = "\"")
- private Character quote;
-
- @JsonProperty("line_termination")
- @Schema(example = "\\r\\n")
- private String lineTermination;
-}
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java
index b865f7892cf74fcf1ae4a0feeec3075c87fa5817..043e3bc3eea9c0c438fb34f2e1b9427c0607bb18 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/ImportDto.java
@@ -27,16 +27,6 @@ public class ImportDto {
@JsonProperty("skip_lines")
private Long skipLines;
- @JsonProperty("false_element")
- private String falseElement;
-
- @JsonProperty("true_element")
- private String trueElement;
-
- @JsonProperty("null_element")
- @Schema(example = "NA")
- private String nullElement;
-
@NotNull
@Schema(example = ",")
private Character separator;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
index 37aa493020845255694d4d0fb0ac5cc7900803f2..2d0696abc044db7dbffe8ace7444df0b9f7127c4 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnCreateDto.java
@@ -52,9 +52,6 @@ public class ColumnCreateDto {
@JsonProperty("unit_uri")
private String unitUri;
- @Schema(description = "date format id")
- private Long dfid;
-
@Schema(description = "enum values, only considered when type = ENUM")
private List<String> enums;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
index a506dbca82e9e64d4a0cec4fec12640452f56456..92092fca33d726616ccba63f08a4b4fefbdba1a2 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
@@ -1,6 +1,5 @@
package at.tuwien.api.database.table.columns;
-import at.tuwien.api.container.image.ImageDateDto;
import at.tuwien.api.database.ViewDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.columns.concepts.ConceptDto;
@@ -59,14 +58,6 @@ public class ColumnDto {
@Schema
private String alias;
- @JsonProperty("date_format")
- private ImageDateDto dateFormat;
-
- @NotNull
- @JsonProperty("auto_generated")
- @Schema(example = "false")
- private Boolean autoGenerated;
-
@JsonProperty("index_length")
private Long indexLength;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java
index 676600c6ff77fb79fd2c19b89d21f826a9cd7d38..d44b25b84ed4c51075ab4c075433750c4aafca42 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnTypeDto.java
@@ -49,6 +49,9 @@ public enum ColumnTypeDto {
@JsonProperty("set")
SET("set"),
+ @JsonProperty("serial")
+ SERIAL("serial"),
+
@JsonProperty("bit")
BIT("bit"),
diff --git a/dbrepo-metadata-service/entities/pom.xml b/dbrepo-metadata-service/entities/pom.xml
index 5fc5626e5fb2b3edf42a1c17f1811454a2fc0fdf..95923c1262a3f9940dbdd7fbd42cbf6e53de7de3 100644
--- a/dbrepo-metadata-service/entities/pom.xml
+++ b/dbrepo-metadata-service/entities/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-entities</artifactId>
<name>dbrepo-metadata-service-entity</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index 8250b6ae4350c48eca7c5dc1d0ec0a08935e9196..080a843aada9982608cb534c0e24027439e9d9c0 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -57,9 +57,6 @@ public class ContainerImage {
@Column(nullable = false, unique = true, columnDefinition = "BOOLEAN DEFAULT FALSE")
private Boolean isDefault = false;
- @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "image")
- private List<ContainerImageDate> dateFormats;
-
@ToString.Exclude
@OneToMany(fetch = FetchType.LAZY, mappedBy = "image")
private List<Container> containers;
@@ -73,4 +70,8 @@ public class ContainerImage {
@Column(columnDefinition = "TIMESTAMP")
private Instant lastModified;
+ @ToString.Exclude
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "image")
+ private List<DataType> dataTypes;
+
}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java
deleted file mode 100644
index 5b370ecc0664fa438e34511d606c75d0219ceb9f..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package at.tuwien.entities.container.image;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.*;
-import org.hibernate.annotations.GenericGenerator;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import jakarta.persistence.*;
-
-import java.time.Instant;
-
-@Data
-@Entity
-@Builder
-@ToString
-@AllArgsConstructor
-@NoArgsConstructor
-@EntityListeners(AuditingEntityListener.class)
-@EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@Table(name = "mdb_images_date", uniqueConstraints = @UniqueConstraint(columnNames = {"database_format"}))
-public class ContainerImageDate {
-
- @Id
- @EqualsAndHashCode.Include
- @GeneratedValue(generator = "dates-sequence")
- @GenericGenerator(name = "dates-sequence", strategy = "increment")
- @Column(updatable = false, nullable = false)
- private Long id;
-
- @EqualsAndHashCode.Include
- @Column(name = "iid")
- private Long iid;
-
- @ToString.Exclude
- @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
- @JoinColumns({
- @JoinColumn(name = "iid", insertable = false, updatable = false)
- })
- private ContainerImage image;
-
- @Column(name = "example", nullable = false)
- private String example;
-
- @Column(name = "has_time", nullable = false)
- private Boolean hasTime;
-
- @Column(name = "database_format", nullable = false)
- private String databaseFormat;
-
- @Column(name = "unix_format", nullable = false)
- private String unixFormat;
-
- @CreatedDate
- @Column(name = "created_at", nullable = false, updatable = false, columnDefinition = "TIMESTAMP")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
- private Instant createdAt;
-
-}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDateKey.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDateKey.java
deleted file mode 100644
index c5ae9598f7baf4de7df1487561dacca93d4c52f5..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDateKey.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package at.tuwien.entities.container.image;
-
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-@EqualsAndHashCode
-public class ContainerImageDateKey implements Serializable {
-
- private Long id;
-
- private Long iid;
-
-}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
new file mode 100644
index 0000000000000000000000000000000000000000..a98da8d530e550cd12546d3bdfed8ad383461964
--- /dev/null
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/DataType.java
@@ -0,0 +1,77 @@
+package at.tuwien.entities.container.image;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.hibernate.annotations.GenericGenerator;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Data
+@Entity
+@Builder
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+@EntityListeners(AuditingEntityListener.class)
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
+@Table(name = "mdb_image_types")
+public class DataType {
+
+ @Id
+ @EqualsAndHashCode.Include
+ @GeneratedValue(generator = "image-type-sequence")
+ @GenericGenerator(name = "image-type-sequence", strategy = "increment")
+ @Column(updatable = false, nullable = false)
+ public Long id;
+
+ @Column(name = "display_name", nullable = false)
+ private String displayName;
+
+ @Column(name = "value", nullable = false, unique = true)
+ private String value;
+
+ @Column(name = "size_min", nullable = false)
+ private Integer sizeMin;
+
+ @Column(name = "size_max")
+ private Integer sizeMax;
+
+ @Column(name = "size_default")
+ private Integer sizeDefault;
+
+ @Column(name = "size_required", nullable = false)
+ private Boolean sizeRequired;
+
+ @Column(name = "d_min")
+ private Integer dMin;
+
+ @Column(name = "d_max")
+ private Integer dMax;
+
+ @Column(name = "d_default")
+ private Integer dDefault;
+
+ @Column(name = "d_required", nullable = false)
+ private Boolean dRequired;
+
+ @Column(nullable = false)
+ private String documentation;
+
+ @Column(name = "type_hint")
+ private String typeHint;
+
+ @Column(name = "data_hint")
+ private String dataHint;
+
+ @Column(name = "is_quoted", nullable = false)
+ private Boolean quoted;
+
+ @Column(name = "is_buildable", nullable = false)
+ private Boolean buildable;
+
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST})
+ @JoinColumns({
+ @JoinColumn(name = "image_id", referencedColumnName = "id")
+ })
+ private ContainerImage image;
+
+}
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
index 2e154b86973601af8560c6055fe388fd614858a6..17b8308bbaac7e202557208875e566240d928d32 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -122,11 +122,12 @@ public class Database implements Serializable {
private List<Table> tables;
@ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
+ @OrderBy("id DESC")
+ @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
private List<View> views;
@ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
+ @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
private List<DatabaseAccess> accesses;
@Column(nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
index 44ffab29592243bc605083aa993e0215ac95475a..28f2ec69c28e84dffcb7c08f9f28941c4dcced54 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/View.java
@@ -97,7 +97,7 @@ public class View {
@ToString.Exclude
@OnDelete(action = OnDeleteAction.CASCADE)
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "view")
- @OrderColumn(name = "ordinalPosition")
+ @OrderBy("ordinalPosition")
private List<ViewColumn> columns;
@CreatedDate
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
index ff18c0137d06964bcc49c02367f95eb49a3b4033..10ac29d8e65eaa15ba592919ac014e452a87a06a 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
@@ -1,21 +1,22 @@
package at.tuwien.entities.database;
-import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.table.columns.TableColumnType;
+import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import jakarta.persistence.*;
-
@Data
@Entity
@Builder(toBuilder = true)
@ToString
@AllArgsConstructor
@NoArgsConstructor
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@EntityListeners(AuditingEntityListener.class)
-@jakarta.persistence.Table(name = "mdb_view_columns")
+@jakarta.persistence.Table(name = "mdb_view_columns", uniqueConstraints = {
+ @UniqueConstraint(columnNames = {"view_id", "internal_name"})
+})
public class ViewColumn implements Comparable<ViewColumn> {
@Id
@@ -25,11 +26,6 @@ public class ViewColumn implements Comparable<ViewColumn> {
@Column(updatable = false, nullable = false)
private Long id;
- @ToString.Exclude
- @OneToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "dfid", referencedColumnName = "id")
- private ContainerImageDate dateFormat;
-
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@@ -40,10 +36,7 @@ public class ViewColumn implements Comparable<ViewColumn> {
@Column(nullable = false, columnDefinition = "VARCHAR(64)")
private String name;
- @Column(name = "auto_generated", columnDefinition = "BOOLEAN default false")
- private Boolean autoGenerated;
-
- @Column(nullable = false, columnDefinition = "VARCHAR(64)")
+ @Column(name = "internal_name", nullable = false, columnDefinition = "VARCHAR(64)")
private String internalName;
@Column(nullable = false, columnDefinition = "ENUM('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR')")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index 9a402201eaf38191213abb609544709d28b516c4..08f6bd9426a8906d4edc4863ecc6f3540cb39448 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -88,12 +88,6 @@ public class Table {
})
private Database database;
- @ToString.Exclude
- @OnDelete(action = OnDeleteAction.CASCADE)
- @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "table")
- @OrderBy("ordinalPosition")
- private List<TableColumn> columns;
-
@ToString.Exclude
@org.springframework.data.annotation.Transient
@OneToMany(fetch = FetchType.LAZY)
@@ -124,6 +118,12 @@ public class Table {
@Column(name = "avg_row_length")
private Long avgRowLength;
+ @ToString.Exclude
+ @OnDelete(action = OnDeleteAction.CASCADE)
+ @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "table")
+ @OrderBy("ordinalPosition")
+ private List<TableColumn> columns;
+
@CreatedDate
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "UTC")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index c869e41637659675e317281fd55092e3b331fc6b..841dbde754a09a5fdd51cec7872ae4c8a4e5e946 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -1,16 +1,14 @@
package at.tuwien.entities.database.table.columns;
-import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.table.Table;
import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.persistence.*;
import lombok.*;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import jakarta.persistence.*;
-
import java.math.BigDecimal;
import java.time.Instant;
import java.util.List;
@@ -24,7 +22,7 @@ import java.util.List;
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@EntityListeners(AuditingEntityListener.class)
@jakarta.persistence.Table(name = "mdb_columns", uniqueConstraints = {
- @UniqueConstraint(columnNames = {"tid", "internalName"})
+ @UniqueConstraint(columnNames = {"tID", "internal_name"})
})
@NamedQueries({
@NamedQuery(name = "TableColumn.findAllByDatabaseId", query = "select c from TableColumn c where c.table.database.id = ?1"),
@@ -38,11 +36,6 @@ public class TableColumn implements Comparable<TableColumn> {
@Column(updatable = false, nullable = false)
private Long id;
- @ToString.Exclude
- @OneToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "dfid", referencedColumnName = "id")
- private ContainerImageDate dateFormat;
-
@ToString.Exclude
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@@ -53,10 +46,7 @@ public class TableColumn implements Comparable<TableColumn> {
@Column(name = "cname", nullable = false, columnDefinition = "VARCHAR(64)")
private String name;
- @Column(name = "auto_generated", columnDefinition = "BOOLEAN default false")
- private Boolean autoGenerated;
-
- @Column(nullable = false, columnDefinition = "VARCHAR(64)")
+ @Column(name = "internal_name", nullable = false, columnDefinition = "VARCHAR(64)")
private String internalName;
@Column(columnDefinition = "VARCHAR(2048)")
@@ -68,7 +58,7 @@ public class TableColumn implements Comparable<TableColumn> {
@Transient
private String alias;
- @Column(name = "datatype", nullable = false, columnDefinition = "ENUM('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR')")
+ @Column(name = "Datatype", nullable = false, columnDefinition = "ENUM('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','SERIAL','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR')")
@Enumerated(EnumType.STRING)
private TableColumnType columnType;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
index 080abf87cd022f98f3414087d7b24fe94c0cebd7..e53e69f49808946cff5907f8057bde8923afd9b7 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnConcept.java
@@ -50,7 +50,8 @@ public class TableColumnConcept {
private Instant created;
@ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY)
+ @org.springframework.data.annotation.Transient
+ @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinTable(name = "mdb_columns_concepts",
inverseJoinColumns = {
@JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java
index 074620a349fff43977ad585a7e4abe4ad770f39e..7f95c476ddf2d80aa78f773ff5db67aee751b86c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnType.java
@@ -20,6 +20,7 @@ public enum TableColumnType {
LONGBLOB,
ENUM,
SET,
+ SERIAL,
BIT,
TINYINT,
BOOL,
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
index 21822c5da764886ef9c675d410cd6d74bbaaf4d2..df3950785e4d8a35ef4f8021bfe3a4c34540fbb2 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumnUnit.java
@@ -49,7 +49,8 @@ public class TableColumnUnit {
private Instant created;
@ToString.Exclude
- @OneToMany(fetch = FetchType.LAZY)
+ @org.springframework.data.annotation.Transient
+ @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinTable(name = "mdb_columns_units",
inverseJoinColumns = {
@JoinColumn(name = "cid", referencedColumnName = "id", insertable = false, updatable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
index c63cdd22e6e4ade249ffc41c1305e1d8e7e0c44d..c5f3570099dd5bd12ec641f07e6d2a9f8963b1ce 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/foreignKey/ForeignKeyReference.java
@@ -32,12 +32,14 @@ public class ForeignKeyReference {
@JoinColumn(name = "fkid", referencedColumnName = "fkid", nullable = false)
private ForeignKey foreignKey;
+ @org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@JoinColumn(name = "cid", referencedColumnName = "id", nullable = false)
})
private TableColumn column;
+ @org.springframework.data.annotation.Transient
@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@JoinColumn(name = "rcid", referencedColumnName = "id", nullable = false)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
index c4ccc379c58d88df8bc2ccc0429bd969d0e5c031..aaa1e5fc8f9102c97294d1f9e53624c5fa3b8e45 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/primaryKey/PrimaryKey.java
@@ -27,7 +27,7 @@ public class PrimaryKey {
@ToString.Exclude
@org.springframework.data.annotation.Transient
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@JoinColumn(name = "tid", referencedColumnName = "id", nullable = false)
})
@@ -35,7 +35,7 @@ public class PrimaryKey {
@ToString.Exclude
@org.springframework.data.annotation.Transient
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@JoinColumn(name = "cid", referencedColumnName = "id", nullable = false)
})
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
index 25ed2eae5d551896b6836cb6bd5c8bdd36724748..c49fc48eb67b6d5ed3689086a1fba4c75e7a1b6c 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/constraints/unique/Unique.java
@@ -33,13 +33,14 @@ public class Unique {
@ToString.Exclude
@org.springframework.data.annotation.Transient
- @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+ @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinColumns({
@JoinColumn(name = "tid", referencedColumnName = "id")
})
private Table table;
- @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+ @org.springframework.data.annotation.Transient
+ @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
@JoinTable(
name = "mdb_constraints_unique_columns",
joinColumns = {
diff --git a/dbrepo-metadata-service/oai/pom.xml b/dbrepo-metadata-service/oai/pom.xml
index c49ff844e9cb921e6eb861e6bfd10f4a25ed822b..3239bbc573401cafe3006852109baaa2d04b7ff3 100644
--- a/dbrepo-metadata-service/oai/pom.xml
+++ b/dbrepo-metadata-service/oai/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-oai</artifactId>
<name>dbrepo-metadata-service-oai</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies/>
diff --git a/dbrepo-metadata-service/pom.xml b/dbrepo-metadata-service/pom.xml
index fd44e71dd94659ac965b5819202e7844ffb02291..a2de622dcacd12a615c2d8dc0f536df88ebc87dd 100644
--- a/dbrepo-metadata-service/pom.xml
+++ b/dbrepo-metadata-service/pom.xml
@@ -11,7 +11,7 @@
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
<name>dbrepo-metadata-service</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<description>Service that manages the metadata</description>
@@ -27,7 +27,7 @@
<module>report</module>
</modules>
- <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/</url>
+ <url>https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/</url>
<developers>
<developer>
<name>Martin Weise</name>
diff --git a/dbrepo-metadata-service/report/pom.xml b/dbrepo-metadata-service/report/pom.xml
index b1f3d406e814127927acf3ad675467d615bb453b..bfeca5ecff2081adb63d8a1dd9a841665efa67de 100644
--- a/dbrepo-metadata-service/report/pom.xml
+++ b/dbrepo-metadata-service/report/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-report</artifactId>
<name>dbrepo-metadata-service-report</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/pom.xml b/dbrepo-metadata-service/repositories/pom.xml
index e80d722a109155e6e78cf4a9e222b11522cf1627..9fa9d2b6ab0c073485819dd46f03dbe915eefdee 100644
--- a/dbrepo-metadata-service/repositories/pom.xml
+++ b/dbrepo-metadata-service/repositories/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-repositories</artifactId>
<name>dbrepo-metadata-service-repositories</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index a9b04058e2373f6cb98f8f9cbedb11ba980fdcfc..bc20219105e23371712fe61ff822e5628383f67b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -4,6 +4,7 @@ import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.container.ContainerBriefDto;
import at.tuwien.api.container.ContainerCreateDto;
import at.tuwien.api.container.ContainerDto;
+import at.tuwien.api.container.image.DataTypeDto;
import at.tuwien.api.container.image.ImageBriefDto;
import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.api.container.image.ImageDto;
@@ -55,6 +56,7 @@ import at.tuwien.api.user.external.ExternalResultType;
import at.tuwien.api.user.external.affiliation.ExternalAffiliationDto;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.container.image.ContainerImage;
+import at.tuwien.entities.container.image.DataType;
import at.tuwien.entities.database.*;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
@@ -86,6 +88,14 @@ public interface MetadataMapper {
org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(MetadataMapper.class);
+ @Mappings({
+ @Mapping(target = "dMin", source = "DMin"),
+ @Mapping(target = "dMax", source = "DMax"),
+ @Mapping(target = "dDefault", source = "DDefault"),
+ @Mapping(target = "dRequired", source = "DRequired")
+ })
+ DataTypeDto dataTypeToDataTypeDto(DataType data);
+
BannerMessageDto bannerMessageToBannerMessageDto(BannerMessage data);
BannerMessageBriefDto bannerMessageToBannerMessageBriefDto(BannerMessage data);
@@ -555,7 +565,6 @@ public interface MetadataMapper {
ref.getColumn().setDatabaseId(table.getTdbid());
ref.getReferencedColumn().setTableId(fk.getReferencedTable().getId());
ref.getReferencedColumn().setDatabaseId(table.getTdbid());
- log.trace("mapped foreign key part ({}) reference ({})", ref.getColumn().getInternalName(), ref.getReferencedColumn().getInternalName());
});
});
table.getConstraints()
@@ -716,7 +725,6 @@ public interface MetadataMapper {
@Mapping(target = "columnType", source = "data.type"),
@Mapping(target = "isNullAllowed", source = "data.nullAllowed"),
@Mapping(target = "name", source = "data.name"),
- @Mapping(target = "autoGenerated", expression = "java(false)"),
@Mapping(target = "internalName", expression = "java(nameToInternalName(data.getName()))"),
})
TableColumn columnCreateDtoToTableColumn(ColumnCreateDto data, ContainerImage image);
diff --git a/dbrepo-metadata-service/rest-service/pom.xml b/dbrepo-metadata-service/rest-service/pom.xml
index c06be275269fbedd04aeea33fe9926abaae09edb..1e7c35cbf93b0249c07822b66dcf65b8da26b06e 100644
--- a/dbrepo-metadata-service/rest-service/pom.xml
+++ b/dbrepo-metadata-service/rest-service/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-rest-service</artifactId>
<name>dbrepo-metadata-service-rest</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
index 9cdcfdedf9e88fd0138e236db6f15afb959ff2dc..f50f916ac4e2a900127244d619814d345c84b809 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/AccessEndpoint.java
@@ -101,18 +101,19 @@ public class AccessEndpoint {
data.getType());
final Database database = databaseService.findById(databaseId);
final User user = userService.findByUsername(principal.getName());
- if (database.getOwner().equals(user)) {
- log.error("Failed to give access to user with id {}: not owner", userId);
- throw new NotAllowedException("Failed to give access to user with id " + userId + ": not owner");
+ if (!database.getOwner().equals(user)) {
+ log.error("Failed to create access: not owner");
+ throw new NotAllowedException("Failed to create access: not owner");
}
+ final User otherUser = userService.findById(userId);
try {
- accessService.find(database, user);
- log.error("Failed to give access to user with id {}: already has access", userId);
- throw new NotAllowedException("Failed to give access to user with id " + userId + ": already has access");
+ accessService.find(database, otherUser);
+ 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");
} catch (AccessNotFoundException e) {
/* ignore */
}
- accessService.create(database, user, data.getType());
+ accessService.create(database, otherUser, data.getType());
return ResponseEntity.accepted()
.build();
}
@@ -163,12 +164,13 @@ public class AccessEndpoint {
data.getType());
final Database database = databaseService.findById(databaseId);
final User user = userService.findByUsername(principal.getName());
- if (database.getOwner().equals(user)) {
- log.error("Failed to give access to user with id {}: not owner", userId);
- throw new NotAllowedException("Failed to give access to user with id " + userId + ": not owner");
+ if (!database.getOwner().equals(user)) {
+ log.error("Failed to update access: not owner");
+ throw new NotAllowedException("Failed to update access: not owner");
}
- accessService.find(database, user);
- accessService.update(database, user, data.getType());
+ final User otherUser = userService.findById(userId);
+ accessService.find(database, otherUser);
+ accessService.update(database, otherUser, data.getType());
return ResponseEntity.accepted()
.build();
}
@@ -211,8 +213,8 @@ public class AccessEndpoint {
log.trace("principal is allowed to check foreign user access");
}
final Database database = databaseService.findById(databaseId);
- final User user = userService.findById(userId);
- final DatabaseAccess access = accessService.find(database, user);
+ final User otherUser = userService.findById(userId);
+ final DatabaseAccess access = accessService.find(database, otherUser);
final DatabaseAccessDto dto = databaseMapper.databaseAccessToDatabaseAccessDto(access);
log.trace("check access resulted in dto {}", dto);
return ResponseEntity.ok(dto);
@@ -263,11 +265,12 @@ public class AccessEndpoint {
final Database database = databaseService.findById(databaseId);
final User user = userService.findByUsername(principal.getName());
if (!database.getOwner().equals(user)) {
- log.error("Failed to revoke access to user with id {}: not owner", user.getId());
- throw new NotAllowedException("Failed to revoke access to user with id " + user.getId() + ": not owner");
+ log.error("Failed to revoke access: not owner");
+ throw new NotAllowedException("Failed to revoke access: not owner");
}
- accessService.find(database, user);
- accessService.delete(database, user);
+ final User otherUser = userService.findById(userId);
+ accessService.find(database, otherUser);
+ accessService.delete(database, otherUser);
return ResponseEntity.accepted()
.build();
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index e89a38b6f6fbc9a021bc62b5a31be44fa0d86040..d5c316fed960a8600352df7201871a370654c021 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -3,6 +3,7 @@ package at.tuwien.endpoints;
import at.tuwien.api.database.*;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.entities.container.Container;
+import at.tuwien.entities.container.image.DataType;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
index 4fb8240b1d00f00f39a233cd3492e0b06940314a..738e30d4e48aba2dc52703d0ca2bd3cb53b2b63a 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/TableEndpoint.java
@@ -3,9 +3,7 @@ package at.tuwien.endpoints;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnCreateDto;
import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.api.semantics.EntityDto;
@@ -16,7 +14,10 @@ import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.mapper.MetadataMapper;
-import at.tuwien.service.*;
+import at.tuwien.service.DatabaseService;
+import at.tuwien.service.EntityService;
+import at.tuwien.service.TableService;
+import at.tuwien.service.UserService;
import at.tuwien.utils.UserUtil;
import at.tuwien.validation.EndpointValidator;
import io.micrometer.observation.annotation.Observed;
@@ -39,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
-import java.util.*;
+import java.util.List;
import java.util.stream.Collectors;
@Log4j2
@@ -349,15 +350,6 @@ public class TableEndpoint {
final Database database = databaseService.findById(databaseId);
endpointValidator.validateOnlyAccess(database, principal, true);
endpointValidator.validateColumnCreateConstraints(data);
- final List<ColumnCreateDto> failedDateColumns = data.getColumns()
- .stream()
- .filter(column -> List.of(ColumnTypeDto.DATE, ColumnTypeDto.DATETIME, ColumnTypeDto.TIME, ColumnTypeDto.TIMESTAMP).contains(column.getType()))
- .filter(column -> Objects.isNull(column.getDfid()))
- .toList();
- if (!failedDateColumns.isEmpty()) {
- log.error("Failed to create table: date column(s) {} do not contain date format id", failedDateColumns.stream().map(ColumnCreateDto::getName).toList());
- throw new MalformedException("Failed to create table: date column(s) " + failedDateColumns.stream().map(ColumnCreateDto::getName).toList() + " do not contain date format id");
- }
final Table table = tableService.createTable(database, data, principal);
final TableDto dto = metadataMapper.customTableToTableDto(table);
log.info("Created table with id {}", dto.getId());
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
index b81a8142f727972c95ce0ea5573b99e3d1e59be9..34082d18c14b4c6c92b9d353bedbb8892b571fe8 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
@@ -5,7 +5,10 @@ import at.tuwien.api.auth.RefreshTokenRequestDto;
import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.error.ApiErrorDto;
import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.api.user.*;
+import at.tuwien.api.user.UserBriefDto;
+import at.tuwien.api.user.UserDto;
+import at.tuwien.api.user.UserPasswordDto;
+import at.tuwien.api.user.UserUpdateDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
@@ -26,6 +29,7 @@ import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -284,7 +288,13 @@ public class UserEndpoint {
}
}
final UserDto dto = userMapper.userToUserDto(user);
- return ResponseEntity.ok()
+ final HttpHeaders headers = new HttpHeaders();
+ if (UserUtil.isSystem(principal)) {
+ headers.set("X-Username", user.getUsername());
+ headers.set("X-Password", user.getMariadbPassword());
+ }
+ return ResponseEntity.status(HttpStatus.OK)
+ .headers(headers)
.body(dto);
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
index 7f05bf84a58ad90788476850fed0765394f80ae2..75f76d440a4d059dfe9c918952519976aa5cbdb3 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/validation/EndpointValidator.java
@@ -21,12 +21,19 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.security.Principal;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
@Log4j2
@Component
public class EndpointValidator {
+ public static final List<ColumnTypeDto> NEED_NOTHING = List.of(ColumnTypeDto.BOOL, ColumnTypeDto.SERIAL);
+ public static final List<ColumnTypeDto> NEED_SIZE = List.of(ColumnTypeDto.VARCHAR, ColumnTypeDto.BINARY, ColumnTypeDto.VARBINARY);
+ public static final List<ColumnTypeDto> CAN_HAVE_SIZE = List.of(ColumnTypeDto.CHAR, ColumnTypeDto.VARCHAR, ColumnTypeDto.BINARY, ColumnTypeDto.VARBINARY, ColumnTypeDto.BIT, ColumnTypeDto.TINYINT, ColumnTypeDto.SMALLINT, ColumnTypeDto.MEDIUMINT, ColumnTypeDto.INT);
+ public static final List<ColumnTypeDto> CAN_HAVE_SIZE_AND_D = List.of(ColumnTypeDto.DOUBLE, ColumnTypeDto.DECIMAL);
+
private final UserService userService;
private final AccessService accessService;
@@ -68,46 +75,45 @@ public class EndpointValidator {
if (data == null) {
throw new MalformedException("Validation failed: table data is null");
}
- final List<ColumnTypeDto> needSize = List.of(ColumnTypeDto.CHAR, ColumnTypeDto.VARCHAR, ColumnTypeDto.BINARY, ColumnTypeDto.VARBINARY, ColumnTypeDto.BIT, ColumnTypeDto.TINYINT, ColumnTypeDto.SMALLINT, ColumnTypeDto.MEDIUMINT, ColumnTypeDto.INT);
- final List<ColumnTypeDto> needSizeAndD = List.of(ColumnTypeDto.DOUBLE, ColumnTypeDto.DECIMAL);
- final List<ColumnTypeDto> needDateFormat = List.of(ColumnTypeDto.DATETIME, ColumnTypeDto.TIMESTAMP, ColumnTypeDto.TIME);
/* check size */
final Optional<ColumnCreateDto> optional0 = data.getColumns()
.stream()
.filter(c -> Objects.isNull(c.getSize()))
- .filter(c -> needSize.contains(c.getType()))
+ .filter(c -> NEED_SIZE.contains(c.getType()))
.findFirst();
if (optional0.isPresent()) {
- log.error("Validation failed: column {} needs size parameter", optional0.get().getName());
- throw new MalformedException("Validation failed: column " + optional0.get().getName() + " needs size parameter");
+ log.error("Validation failed: column {} need size parameter", optional0.get().getName());
+ throw new MalformedException("Validation failed: column " + optional0.get().getName() + " need size parameter");
}
- /* check size and d */
- final Optional<ColumnCreateDto> optional1 = data.getColumns()
+ final Optional<ColumnCreateDto> optional0a = data.getColumns()
.stream()
- .filter(c -> needSizeAndD.contains(c.getType()))
- .filter(c -> Objects.isNull(c.getSize()) || Objects.isNull(c.getD()))
+ .filter(c -> !Objects.isNull(c.getSize()))
+ .filter(c -> CAN_HAVE_SIZE.contains(c.getType()) || CAN_HAVE_SIZE_AND_D.contains(c.getType()))
+ .filter(c -> c.getSize() < 0)
.findFirst();
- if (optional1.isPresent()) {
- log.error("Validation failed: column {} needs size and d parameter", optional1.get().getName());
- throw new MalformedException("Validation failed: column " + optional1.get().getName() + " needs size and d parameter");
+ if (optional0a.isPresent()) {
+ log.error("Validation failed: column {} needs positive size parameter", optional0a.get().getName());
+ throw new MalformedException("Validation failed: column " + optional0a.get().getName() + " needs positive size parameter");
}
- final Optional<ColumnCreateDto> optional1a = data.getColumns()
+ final Optional<ColumnCreateDto> optional0b = data.getColumns()
.stream()
- .filter(c -> needSizeAndD.contains(c.getType()))
- .filter(c -> c.getSize() > 65 || c.getD() > 38)
+ .filter(c -> !Objects.isNull(c.getD()))
+ .filter(c -> CAN_HAVE_SIZE_AND_D.contains(c.getType()))
+ .filter(c -> c.getD() < 0)
.findFirst();
- if (optional1a.isPresent()) {
- log.error("Validation failed: column {} needs size (max 65) and d (max 30)", optional1a.get().getName());
- throw new MalformedException("Validation failed: column " + optional1a.get().getName() + " needs size (max 65) and d (max 30)");
+ if (optional0b.isPresent()) {
+ log.error("Validation failed: column {} needs positive d parameter", optional0b.get().getName());
+ throw new MalformedException("Validation failed: column " + optional0b.get().getName() + " needs positive d parameter");
}
- final Optional<ColumnCreateDto> optional1b = data.getColumns()
+ /* check size and d */
+ final Optional<ColumnCreateDto> optional1 = data.getColumns()
.stream()
- .filter(c -> needSizeAndD.contains(c.getType()))
- .filter(c -> c.getSize() < c.getD())
+ .filter(c -> Objects.isNull(c.getSize()) ^ Objects.isNull(c.getD()))
+ .filter(c -> CAN_HAVE_SIZE_AND_D.contains(c.getType()))
.findFirst();
- if (optional1b.isPresent()) {
- log.error("Validation failed: column {} needs size >= d", optional1b.get().getName());
- throw new MalformedException("Validation failed: column " + optional1b.get().getName() + " needs size >= d");
+ if (optional1.isPresent()) {
+ log.error("Validation failed: column {} either needs both size and d parameter or none (use default)", optional1.get().getName());
+ throw new MalformedException("Validation failed: column " + optional1.get().getName() + " either needs both size and d parameter or none (use default)");
}
/* check enum */
final Optional<ColumnCreateDto> optional2 = data.getColumns()
@@ -129,15 +135,34 @@ public class EndpointValidator {
log.error("Validation failed: column {} needs at least 1 allowed set value", optional3.get().getName());
throw new MalformedException("Validation failed: column " + optional3.get().getName() + " needs at least 1 allowed set value");
}
- /* check date */
- final Optional<ColumnCreateDto> optional4 = data.getColumns()
+ /* check serial */
+ final List<ColumnCreateDto> list4a = data.getColumns()
+ .stream()
+ .filter(c -> c.getType().equals(ColumnTypeDto.SERIAL))
+ .toList();
+ if (list4a.size() > 1) {
+ log.error("Validation failed: only one column of type serial allowed");
+ throw new MalformedException("Validation failed: only one column of type serial allowed");
+ }
+ final Optional<ColumnCreateDto> optional4a = data.getColumns()
+ .stream()
+ .filter(c -> c.getType().equals(ColumnTypeDto.SERIAL))
+ .filter(ColumnCreateDto::getNullAllowed)
+ .findFirst();
+ if (optional4a.isPresent()) {
+ log.error("Validation failed: column {} type serial demands non-null", optional4a.get().getName());
+ throw new MalformedException("Validation failed: column " + optional4a.get().getName() + " type serial demands non-null");
+ }
+ final Optional<ColumnCreateDto> optional4b = data.getColumns()
.stream()
- .filter(c -> needDateFormat.contains(c.getType()))
- .filter(c -> Objects.isNull(c.getDfid()))
+ .filter(c -> c.getType().equals(ColumnTypeDto.SERIAL) && data.getConstraints()
+ .getUniques()
+ .stream()
+ .noneMatch(uk -> uk.size() == 1 && uk.contains(c.getName())))
.findFirst();
- if (optional4.isPresent()) {
- log.error("Validation failed: column {} needs a format", optional4.get().getName());
- throw new MalformedException("Validation failed: column " + optional4.get().getName() + " needs a format");
+ if (optional4b.isPresent()) {
+ log.error("Validation failed: column {} type serial demands a unique constraint", optional4b.get().getName());
+ throw new MalformedException("Validation failed: column " + optional4b.get().getName() + " type serial demands a unique constraint");
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
index e2c9df6a59d8454661ca42b72617f2b67d6c1492..793a2b6021a270dfd6b23971e40675889b3e4980 100644
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
@@ -66,7 +66,7 @@ dbrepo:
searchService: http://localhost
analyseService: http://localhost
dataService: http://localhost:9093
- brokerService: http://localhost/admin/broker
+ brokerService: http://localhost:15672
authService: http://localhost/api/auth
storageService: http://localhost/api/storage
rorService: https://api.ror.org
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/datatypes.json b/dbrepo-metadata-service/rest-service/src/main/resources/datatypes.json
new file mode 100644
index 0000000000000000000000000000000000000000..3779d12cbe32b67fa163cf6b0285b9e01f7dc681
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/main/resources/datatypes.json
@@ -0,0 +1,15 @@
+[
+ {
+ "name": "",
+ "size": {
+ "min": 0,
+ "required": true
+ },
+ "d": {
+ "required": false
+ },
+ "documentation": "https://mariadb.com/kb/en/bigint/",
+ "quoted": false,
+ "buildable": true
+ }
+]
\ No newline at end of file
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
index 69d817afb763fa47b878b71fb315bb8dbb02f750..7c6061ed1e663c27d9f2a72bc64e309eaee0ffc1 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/AccessEndpointUnitTest.java
@@ -1,17 +1,18 @@
package at.tuwien.endpoints;
-import at.tuwien.mapper.MetadataMapper;
-import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.AccessTypeDto;
import at.tuwien.api.database.DatabaseAccessDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
+import at.tuwien.mapper.MetadataMapper;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.UserRepository;
import at.tuwien.service.AccessService;
+import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,13 +52,18 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
@Autowired
private MetadataMapper metadataMapper;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void create_anonymous_fails() {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- generic_create(null, USER_2_ID, null, null);
+ generic_create(null, null, null, null);
});
}
@@ -67,7 +73,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- generic_create(USER_2_PRINCIPAL, USER_4_ID, USER_4_USERNAME, USER_4);
+ generic_create(USER_2_PRINCIPAL, USER_2, USER_4_ID, USER_4);
});
}
@@ -82,7 +88,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
.thenReturn(DATABASE_1_USER_1_READ_ACCESS);
/* test */
- generic_create(USER_2_PRINCIPAL, USER_2_ID, USER_2_USERNAME, USER_2);
+ generic_create(USER_1_PRINCIPAL, USER_1, USER_2_ID, USER_2);
}
@Test
@@ -129,7 +135,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- generic_update(null, USER_4_USERNAME, USER_4, null, null);
+ generic_update(null, null, null, null, null);
});
}
@@ -138,8 +144,8 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
public void update_hasRoleNoAccess_fails() {
/* test */
- assertThrows(NotAllowedException.class, () -> {
- generic_update(null, USER_4_USERNAME, USER_4, USER_1_PRINCIPAL, USER_1);
+ assertThrows(AccessNotFoundException.class, () -> {
+ generic_update(USER_1_PRINCIPAL, USER_1, USER_4_ID, USER_4, null);
});
}
@@ -149,7 +155,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- generic_update(null, USER_4_USERNAME, USER_4, USER_4_PRINCIPAL, USER_4);
+ generic_update(USER_4_PRINCIPAL, USER_4, USER_1_ID, USER_1, null);
});
}
@@ -165,7 +171,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
.update(eq(DATABASE_1), eq(USER_2), any(AccessTypeDto.class));
/* test */
- generic_update(DATABASE_1_USER_2_WRITE_OWN_ACCESS, USER_2_USERNAME, USER_2, USER_2_PRINCIPAL, USER_2);
+ generic_update(USER_1_PRINCIPAL, USER_1, USER_2_ID, USER_2, DATABASE_1_USER_2_WRITE_OWN_ACCESS);
}
@Test
@@ -174,7 +180,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- generic_revoke(USER_1_PRINCIPAL, USER_1);
+ generic_revoke(null, null, USER_1_ID, USER_1);
});
}
@@ -184,7 +190,7 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- generic_revoke(USER_4_PRINCIPAL, USER_4);
+ generic_revoke(USER_4_PRINCIPAL, USER_4, USER_1_ID, USER_1);
});
}
@@ -200,14 +206,14 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
.delete(DATABASE_1, USER_2);
/* test */
- generic_revoke(USER_1_PRINCIPAL, USER_1);
+ generic_revoke(USER_1_PRINCIPAL, USER_1, USER_2_ID, USER_2);
}
/* ################################################################################################### */
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- protected void generic_create(Principal principal, UUID userId, String username, User user)
+ protected void generic_create(Principal principal, User principalUser, UUID userId, User user)
throws NotAllowedException, DataServiceException, DataServiceConnectionException, UserNotFoundException,
DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
SearchServiceConnectionException {
@@ -218,11 +224,18 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
doThrow(AccessNotFoundException.class)
.when(accessService)
.find(DATABASE_1, user);
+ if (principalUser != null) {
+ when(userRepository.findByUsername(principal.getName()))
+ .thenReturn(Optional.of(principalUser));
+ } else {
+ when(userRepository.findByUsername(anyString()))
+ .thenReturn(Optional.empty());
+ }
if (user != null) {
- when(userRepository.findByUsername(username))
+ when(userRepository.findById(userId))
.thenReturn(Optional.of(user));
} else {
- when(userRepository.findByUsername(anyString()))
+ when(userRepository.findById(any(UUID.class)))
.thenReturn(Optional.empty());
}
@@ -268,61 +281,62 @@ public class AccessEndpointUnitTest extends AbstractUnitTest {
}
}
- protected void generic_update(DatabaseAccess access, String otherUsername, User otherUser, Principal principal,
- User user) throws NotAllowedException, DataServiceException, DataServiceConnectionException,
- AccessNotFoundException, UserNotFoundException, DatabaseNotFoundException, SearchServiceException,
- SearchServiceConnectionException {
+ protected void generic_update(Principal principal, User principalUser, UUID userId, User user,
+ DatabaseAccess access) throws NotAllowedException, DataServiceException,
+ DataServiceConnectionException, AccessNotFoundException, UserNotFoundException, DatabaseNotFoundException,
+ SearchServiceException, SearchServiceConnectionException {
/* mock */
when(databaseRepository.findById(DATABASE_1_ID))
.thenReturn(Optional.of(DATABASE_1));
if (access != null) {
- log.trace("mock access {} for user with id {} for database with id {}", access.getType(), USER_1_ID, DATABASE_1_ID);
- when(accessService.find(DATABASE_1, USER_1))
+ log.trace("mock access {} for user with id {} for database with id {}", access.getType(), userId, DATABASE_1_ID);
+ when(accessService.find(DATABASE_1, user))
.thenReturn(access);
} else {
- log.trace("mock no access for user with id {} for database with id {}", USER_1_ID, DATABASE_1_ID);
+ log.trace("mock no access for user with id {} for database with id {}", userId, DATABASE_1_ID);
doThrow(AccessNotFoundException.class)
.when(accessService)
- .find(DATABASE_1, USER_1);
+ .find(DATABASE_1, user);
}
- if (otherUsername != null) {
- when(userRepository.findByUsername(otherUsername))
- .thenReturn(Optional.of(otherUser));
+ if (userId != null) {
+ when(userRepository.findById(userId))
+ .thenReturn(Optional.of(user));
} else {
- when(userRepository.findByUsername(anyString()))
+ when(userRepository.findById(any(UUID.class)))
.thenReturn(Optional.empty());
}
if (principal != null) {
when(userRepository.findByUsername(principal.getName()))
- .thenReturn(Optional.of(user));
+ .thenReturn(Optional.of(principalUser));
} else {
when(userRepository.findByUsername(anyString()))
.thenReturn(Optional.empty());
}
/* test */
- final ResponseEntity<?> response = accessEndpoint.update(DATABASE_1_ID, USER_1_ID, UPDATE_DATABASE_ACCESS_READ_DTO, principal);
+ final ResponseEntity<?> response = accessEndpoint.update(DATABASE_1_ID, userId, UPDATE_DATABASE_ACCESS_READ_DTO, principal);
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
assertNull(response.getBody());
}
- protected void generic_revoke(Principal principal, User user) throws DataServiceConnectionException,
- NotAllowedException, DataServiceException, UserNotFoundException, DatabaseNotFoundException,
- AccessNotFoundException, SearchServiceException, SearchServiceConnectionException {
+ protected void generic_revoke(Principal principal, User principalUser, UUID userId, User user)
+ throws DataServiceConnectionException, NotAllowedException, DataServiceException, UserNotFoundException,
+ DatabaseNotFoundException, AccessNotFoundException, SearchServiceException,
+ SearchServiceConnectionException {
/* mock */
- when(accessService.find(any(Database.class), eq(user)))
- .thenReturn(DATABASE_1_USER_1_READ_ACCESS);
when(databaseRepository.findById(DATABASE_1_ID))
.thenReturn(Optional.of(DATABASE_1));
if (principal != null) {
when(userRepository.findByUsername(principal.getName()))
- .thenReturn(Optional.of(user));
+ .thenReturn(Optional.of(principalUser));
}
+ when(userRepository.findById(userId))
+ .thenReturn(Optional.of(user));
/* test */
- final ResponseEntity<?> response = accessEndpoint.revoke(DATABASE_1_ID, USER_1_ID, principal);
+ final ResponseEntity<?> response = accessEndpoint.revoke(DATABASE_1_ID, userId, principal);
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
assertNull(response.getBody());
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
index 238dec0db1736eccca0976a0d0c89badabd58dcd..78b7f086c300b546c808ed161abef2e3712e64c3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ActuatorComponentTest.java
@@ -2,6 +2,7 @@ package at.tuwien.endpoints;
import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,11 @@ public class ActuatorComponentTest extends AbstractUnitTest {
@Autowired
private MockMvc mockMvc;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
public void actuatorInfo_succeeds() throws Exception {
this.mockMvc.perform(get("/actuator/info"))
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java
index 6698be6995ac00573e348274e5cb411f08755023..d48317f119cbbdf51087b16fc4c8df999bd519bb 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ConceptEndpointUnitTest.java
@@ -4,6 +4,7 @@ import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.table.columns.concepts.ConceptDto;
import at.tuwien.service.ConceptService;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,11 @@ public class ConceptEndpointUnitTest extends AbstractUnitTest {
@Autowired
private ConceptEndpoint conceptEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void findAllConcepts_anonymous_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java
index 3d1c37d36348cd90e5239129957506758cc63f1e..c5c3c24cfd37ea0986079132cf67a4e527669892 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ImageEndpointUnitTest.java
@@ -9,6 +9,7 @@ import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.*;
import at.tuwien.service.impl.ImageServiceImpl;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,11 @@ public class ImageEndpointUnitTest extends AbstractUnitTest {
@Autowired
private ImageEndpoint imageEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void findAll_anonymous_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java
index 5be4624021400c25bd130fab4ef150bffb9e328b..f45dd85fb4d13423451599e8ffc3cd046a8ebdca 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/LicenseEndpointUnitTest.java
@@ -4,6 +4,7 @@ import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.LicenseDto;
import at.tuwien.repository.LicenseRepository;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,11 @@ public class LicenseEndpointUnitTest extends AbstractUnitTest {
@Autowired
private LicenseEndpoint licenseEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
public void list_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
index cea67bc5103de5eeac619f24d0f15c7042d9b115..59166b720076f1541774f6ed8ac3dcc816da9e9a 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MessageEndpointUnitTest.java
@@ -8,6 +8,7 @@ import at.tuwien.api.maintenance.BannerMessageUpdateDto;
import at.tuwien.entities.maintenance.BannerMessage;
import at.tuwien.service.BannerMessageService;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,11 @@ public class MessageEndpointUnitTest extends AbstractUnitTest {
@Autowired
private MessageEndpoint messageEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void list_anonymous_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
index d024978449f6269615839a13067e42c3a02ab784..7ed994534287e13f0f3b33e0c19abcfb360e3f50 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/MetadataEndpointUnitTest.java
@@ -6,6 +6,7 @@ import at.tuwien.oaipmh.OaiRecordParameters;
import at.tuwien.repository.IdentifierRepository;
import at.tuwien.utils.XmlUtils;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,11 @@ public class MetadataEndpointUnitTest extends AbstractUnitTest {
@Autowired
private MetadataEndpoint metadataEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void identify_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java
index fc20a0b9e308774f0e8ef1c3558b63454f2be088..b7af494253ebc97fa51f3b5da86f72a9515a4703 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/OntologyEndpointUnitTest.java
@@ -12,6 +12,7 @@ import lombok.extern.log4j.Log4j2;
import org.apache.jena.sys.JenaSystem;
import org.hibernate.HibernateException;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +52,11 @@ public class OntologyEndpointUnitTest extends AbstractUnitTest {
JenaSystem.init();
}
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void findAll_anonymous_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
index 154ebda86c3a32554c2c83a3330846ebdee8f939..1ceb6fd75ff22547f630c85bb7a1cbbb27bd86ab 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
@@ -1,6 +1,5 @@
package at.tuwien.endpoints;
-import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.table.TableBriefDto;
import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableDto;
@@ -8,6 +7,7 @@ import at.tuwien.api.database.table.columns.ColumnCreateDto;
import at.tuwien.api.database.table.columns.ColumnDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
+import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
import at.tuwien.api.semantics.EntityDto;
import at.tuwien.api.semantics.TableColumnEntityDto;
import at.tuwien.entities.database.Database;
@@ -17,12 +17,17 @@ import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.service.*;
+import at.tuwien.test.AbstractUnitTest;
+import at.tuwien.validation.EndpointValidator;
import lombok.extern.log4j.Log4j2;
import org.apache.jena.sys.JenaSystem;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
@@ -36,6 +41,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.security.Principal;
import java.util.List;
+import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -61,12 +67,29 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@MockBean
private EntityService entityService;
- @MockBean
- private BrokerService messageQueueService;
-
@Autowired
private TableEndpoint tableEndpoint;
+ public static Stream<Arguments> needNothing_parameters() {
+ return EndpointValidator.NEED_NOTHING.stream()
+ .map(Arguments::arguments);
+ }
+
+ public static Stream<Arguments> needSize_parameters() {
+ return EndpointValidator.NEED_SIZE.stream()
+ .map(Arguments::arguments);
+ }
+
+ public static Stream<Arguments> canHaveSize_parameters() {
+ return EndpointValidator.CAN_HAVE_SIZE.stream()
+ .map(Arguments::arguments);
+ }
+
+ public static Stream<Arguments> canHaveSizeAndD_parameters() {
+ return EndpointValidator.CAN_HAVE_SIZE_AND_D.stream()
+ .map(Arguments::arguments);
+ }
+
@BeforeAll
public static void beforeAll() {
/* init Apache Jena */
@@ -169,13 +192,15 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDecimalColumnSizeMissing_fails() {
+ public void create_publicDecimalColumnSizeTooSmall_fails() {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
.name("ID")
.type(ColumnTypeDto.DECIMAL)
+ .size(-1L) // <<<
+ .d(0L)
.build()))
.constraints(null)
.build();
@@ -188,13 +213,15 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
@Test
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDateFormatMissing_fails() {
+ public void create_publicDecimalColumnDTooSmall_fails() {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
- .name("timestamp")
- .type(ColumnTypeDto.DATE)
+ .name("ID")
+ .type(ColumnTypeDto.DECIMAL)
+ .size(0L)
+ .d(-1L) // <<<
.build()))
.constraints(null)
.build();
@@ -205,74 +232,125 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
});
}
- @Test
+ @ParameterizedTest
+ @MethodSource("canHaveSize_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDateTimeFormatMissing_fails() {
+ public void create_publicOptionalSizeNone_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
+ NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
- .name("timestamp")
- .type(ColumnTypeDto.DATETIME)
+ .name("ID")
+ .type(columnType)
+ .size(null) // <<<
+ .d(null) // <<<
.build()))
.constraints(null)
.build();
+ /* mock */
+ when(tableService.createTable(DATABASE_3, request, USER_1_PRINCIPAL))
+ .thenReturn(TABLE_1) /* some table */;
+
/* test */
- assertThrows(MalformedException.class, () -> {
+ if (EndpointValidator.NEED_SIZE.contains(columnType)) {
+ assertThrows(MalformedException.class, () -> {
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
+ });
+ } else {
generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
- });
+ }
}
- @Test
+ @ParameterizedTest
+ @MethodSource("canHaveSize_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicTimeFormatMissing_fails() {
+ public void create_publicOptionalSize_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
+ NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
- .name("timestamp")
- .type(ColumnTypeDto.TIME)
+ .name("ID")
+ .type(columnType)
+ .size(40L)
+ .d(10L)
.build()))
.constraints(null)
.build();
+ /* mock */
+ when(tableService.createTable(DATABASE_3, request, USER_1_PRINCIPAL))
+ .thenReturn(TABLE_1) /* some table */;
+
/* test */
- assertThrows(MalformedException.class, () -> {
- generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
- });
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
}
- @Test
+ @ParameterizedTest
+ @MethodSource("needNothing_parameters")
+ @WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
+ public void create_publicNeedNothing_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
+ NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Some Table")
+ .description("Some Description")
+ .columns(List.of(ColumnCreateDto.builder()
+ .name("ID")
+ .type(columnType)
+ .nullAllowed(false)
+ .build()))
+ .constraints(ConstraintsCreateDto.builder()
+ .uniques(List.of(List.of("ID")))
+ .build())
+ .build();
+
+ /* mock */
+ when(tableService.createTable(DATABASE_3, request, USER_1_PRINCIPAL))
+ .thenReturn(TABLE_1) /* some table */;
+
+ /* test */
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
+ }
+
+ @ParameterizedTest
+ @MethodSource("needSize_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicTimestampFormatMissing_fails() {
+ public void create_publicNeedSize_succeeds(ColumnTypeDto columnType) throws UserNotFoundException, SearchServiceException,
+ NotAllowedException, SemanticEntityNotFoundException, DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException, DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException, SearchServiceConnectionException {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
- .name("timestamp")
- .type(ColumnTypeDto.TIMESTAMP)
+ .name("ID")
+ .type(columnType)
+ .size(40L)
+ .d(10L)
.build()))
.constraints(null)
.build();
+ /* mock */
+ when(tableService.createTable(DATABASE_3, request, USER_1_PRINCIPAL))
+ .thenReturn(TABLE_1) /* some table */;
+
/* test */
- assertThrows(MalformedException.class, () -> {
- generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
- });
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
}
- @Test
+ @ParameterizedTest
+ @MethodSource("needSize_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDecimalColumnSizeTooSmall_fails() {
+ public void create_publicNeedSizeNone_fails(ColumnTypeDto columnType) {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
.name("ID")
- .type(ColumnTypeDto.DECIMAL)
- .size(-1L)
- .d(0L)
+ .type(columnType)
+ .size(null) // <<<
+ .d(10L)
.build()))
.constraints(null)
.build();
@@ -283,16 +361,17 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
});
}
- @Test
+ @ParameterizedTest
+ @MethodSource("canHaveSizeAndD_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDecimalColumnSizeTooBig_fails() {
+ public void create_publicCanHaveSizeAndDSizeNone_fails(ColumnTypeDto columnType) {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
.name("ID")
- .type(ColumnTypeDto.DECIMAL)
- .size(66L)
+ .type(columnType)
+ .size(null) // <<<
.d(0L)
.build()))
.constraints(null)
@@ -304,17 +383,18 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
});
}
- @Test
+ @ParameterizedTest
+ @MethodSource("canHaveSizeAndD_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDecimalColumnDTooBig_fails() {
+ public void create_publicCanHaveSizeAndDDNone_fails(ColumnTypeDto columnType) {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
.name("ID")
- .type(ColumnTypeDto.DECIMAL)
+ .type(columnType)
.size(0L)
- .d(39L)
+ .d(null) // <<<
.build()))
.constraints(null)
.build();
@@ -325,27 +405,112 @@ public class TableEndpointUnitTest extends AbstractUnitTest {
});
}
- @Test
+ @ParameterizedTest
+ @MethodSource("canHaveSizeAndD_parameters")
@WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
- public void create_publicDecimalColumnDBiggerSize_fails() {
+ public void create_publicCanHaveSizeAndDBothNone_succeeds(ColumnTypeDto columnType) throws UserNotFoundException,
+ SearchServiceException, NotAllowedException, SemanticEntityNotFoundException,
+ DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException,
+ DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException,
+ SearchServiceConnectionException {
final TableCreateDto request = TableCreateDto.builder()
.name("Some Table")
.description("Some Description")
.columns(List.of(ColumnCreateDto.builder()
.name("ID")
- .type(ColumnTypeDto.DECIMAL)
- .size(9L)
- .d(10L)
+ .type(columnType)
+ .size(null) // <<<
+ .d(null) // <<<
.build()))
.constraints(null)
.build();
+ /* mock */
+ when(tableService.createTable(DATABASE_3, request, USER_1_PRINCIPAL))
+ .thenReturn(TABLE_1) /* some table */;
+
+ /* test */
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
+ }
+
+ @Test
+ @WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
+ public void create_publicHasMultipleSerial_fails() {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Some Table")
+ .description("Some Description")
+ .columns(List.of(ColumnCreateDto.builder()
+ .name("ID")
+ .type(ColumnTypeDto.SERIAL)
+ .nullAllowed(false)
+ .build(),
+ ColumnCreateDto.builder()
+ .name("Counter")
+ .type(ColumnTypeDto.SERIAL)
+ .nullAllowed(false)
+ .build()))
+ .constraints(ConstraintsCreateDto.builder()
+ .uniques(List.of(List.of("ID"),
+ List.of("Counter")))
+ .build())
+ .build();
+
/* test */
assertThrows(MalformedException.class, () -> {
generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
});
}
+ @Test
+ @WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
+ public void create_publicSerialNullAllowed_fails() {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Some Table")
+ .description("Some Description")
+ .columns(List.of(ColumnCreateDto.builder()
+ .name("ID")
+ .type(ColumnTypeDto.SERIAL)
+ .nullAllowed(true) // <<<
+ .build()))
+ .constraints(ConstraintsCreateDto.builder()
+ .uniques(List.of(List.of("ID")))
+ .build())
+ .build();
+
+ /* test */
+ assertThrows(MalformedException.class, () -> {
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
+ });
+ }
+
+ @ParameterizedTest
+ @MethodSource("canHaveSizeAndD_parameters")
+ @WithMockUser(username = USER_3_USERNAME, authorities = {"create-table"})
+ public void create_publicCanHaveSizeAndDBothNotNone_succeeds(ColumnTypeDto columnType) throws UserNotFoundException,
+ SearchServiceException, NotAllowedException, SemanticEntityNotFoundException,
+ DataServiceConnectionException, TableNotFoundException, MalformedException, DataServiceException,
+ DatabaseNotFoundException, AccessNotFoundException, OntologyNotFoundException, TableExistsException,
+ SearchServiceConnectionException {
+ final TableCreateDto request = TableCreateDto.builder()
+ .name("Some Table")
+ .description("Some Description")
+ .columns(List.of(ColumnCreateDto.builder()
+ .name("ID")
+ .type(columnType)
+ .size(0L) // <<<
+ .d(0L) // <<<
+ .build()))
+ .constraints(null)
+ .build();
+
+ /* mock */
+ when(tableService.createTable(DATABASE_3, request, USER_1_PRINCIPAL))
+ .thenReturn(TABLE_1) /* some table */;
+
+ /* test */
+ generic_create(DATABASE_3_ID, DATABASE_3, request, USER_1_PRINCIPAL, USER_1, DATABASE_3_USER_1_WRITE_OWN_ACCESS);
+ }
+
@Test
@WithAnonymousUser
public void findById_publicAnonymous_succeeds() throws DataServiceException, DataServiceConnectionException,
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java
index b5fc19681ccb34f41fce526c12a0de7238a1bfa7..7d74e615be3a24dfd16af29c825774361f1a7ffc 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UnitEndpointUnitTest.java
@@ -4,6 +4,7 @@ import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.table.columns.concepts.UnitDto;
import at.tuwien.service.UnitService;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,11 @@ public class UnitEndpointUnitTest extends AbstractUnitTest {
@Autowired
private UnitEndpoint unitEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void findAllUnits_anonymous_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
index ad4cef5bbea6cb262607ebbad44f6ec8148b6f9b..da86dd9344606e59c55a9037111877fc55fcb1c4 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
@@ -8,6 +8,7 @@ import at.tuwien.exception.*;
import at.tuwien.service.AuthenticationService;
import at.tuwien.service.UserService;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,11 @@ public class UserEndpointUnitTest extends AbstractUnitTest {
@Autowired
private UserEndpoint userEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void findAll_anonymous_succeeds() throws UserNotFoundException {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
index 74e418f42b1ca4fc4cbceec451f645ec05c1223d..b4291ce902652eeeea7aa7e12f6aac26d444bbe1 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/ViewEndpointUnitTest.java
@@ -14,6 +14,7 @@ import at.tuwien.service.DatabaseService;
import at.tuwien.service.UserService;
import at.tuwien.service.ViewService;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,11 @@ public class ViewEndpointUnitTest extends AbstractUnitTest {
@Autowired
private ViewEndpoint viewEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void findAll_publicAnonymous_succeeds() throws ViewNotFoundException, UserNotFoundException,
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
index a812bd5de49af37c5eca041a2fb36653d243dafc..fc2a9c2c220c4fa601138ee9ee8333d3cd67f493 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayUnitTest.java
@@ -1,5 +1,6 @@
package at.tuwien.gateway;
+import at.tuwien.api.amqp.GrantExchangePermissionsDto;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.exception.*;
import lombok.extern.log4j.Log4j2;
@@ -33,6 +34,12 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
@Autowired
private BrokerServiceGateway brokerServiceGateway;
+ private final GrantExchangePermissionsDto WRITE_ALL_PERMISSIONS = GrantExchangePermissionsDto.builder()
+ .exchange("dbrepo")
+ .read("^(dbrepo\\.1\\..*)$") /* WRITE_ALL */
+ .write("^(dbrepo\\.1\\..*)$")
+ .build();
+
@Test
public void grantTopicPermission_exchangeNoRightsBefore_succeeds() throws BrokerServiceException,
BrokerServiceConnectionException {
@@ -178,43 +185,40 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
@Test
public void grantExchangePermission_succeeds() throws BrokerServiceException,
BrokerServiceConnectionException {
- final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
- .build();
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
- .thenReturn(mock);
+ .thenReturn(ResponseEntity.status(HttpStatus.CREATED)
+ .build());
/* test */
- brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
+ brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, WRITE_ALL_PERMISSIONS);
}
@Test
public void grantExchangePermission_exists_succeeds() throws BrokerServiceException,
BrokerServiceConnectionException {
- final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
- .build();
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
- .thenReturn(mock);
+ .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
+ .build());
/* test */
- brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
+ brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, WRITE_ALL_PERMISSIONS);
}
@Test
public void grantExchangePermission_unexpected2_fails() {
- final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.BAD_GATEWAY)
- .build();
/* mock */
when(restTemplate.exchange(anyString(), eq(HttpMethod.PUT), any(HttpEntity.class), eq(Void.class)))
- .thenReturn(mock);
+ .thenReturn(ResponseEntity.status(HttpStatus.BAD_GATEWAY)
+ .build());
/* test */
assertThrows(BrokerServiceException.class, () -> {
- brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
+ brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, WRITE_ALL_PERMISSIONS);
});
}
@@ -228,7 +232,7 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
/* test */
assertThrows(BrokerServiceConnectionException.class, () -> {
- brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
+ brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, WRITE_ALL_PERMISSIONS);
});
}
@@ -242,7 +246,7 @@ public class BrokerServiceGatewayUnitTest extends AbstractUnitTest {
/* test */
assertThrows(BrokerServiceException.class, () -> {
- brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, USER_1_RABBITMQ_GRANT_TOPIC_DTO);
+ brokerServiceGateway.grantExchangePermission(USER_1_USERNAME, WRITE_ALL_PERMISSIONS);
});
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
index 8a72f2cabbe0f4eda33ff77ef125eed2c842e12d..c84990098596b159be2aa65459638ba0b498c7ee 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/MetadataMapperUnitTest.java
@@ -182,8 +182,6 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
@Test
public void customDatabaseToDatabaseDto_succeeds() {
- final Database debug = DATABASE_1;
-
/* test */
final DatabaseDto response = metadataMapper.customDatabaseToDatabaseDto(DATABASE_1);
assertEquals(DATABASE_1_ID, response.getId());
@@ -241,11 +239,10 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_1_COLUMNS.get(i).getTable().getId(), table0.getColumns().get(i).getTableId());
assertEquals(TABLE_1_COLUMNS.get(i).getName(), table0.getColumns().get(i).getName());
assertEquals(TABLE_1_COLUMNS.get(i).getInternalName(), table0.getColumns().get(i).getInternalName());
- assertEquals(List.of(ColumnTypeDto.BIGINT, ColumnTypeDto.DATE, ColumnTypeDto.VARCHAR, ColumnTypeDto.DECIMAL, ColumnTypeDto.DECIMAL).get(i), table0.getColumns().get(i).getColumnType());
+ assertEquals(List.of(ColumnTypeDto.SERIAL, ColumnTypeDto.DATE, ColumnTypeDto.VARCHAR, ColumnTypeDto.DECIMAL, ColumnTypeDto.DECIMAL).get(i), table0.getColumns().get(i).getColumnType());
assertEquals(TABLE_1_COLUMNS.get(i).getSize(), table0.getColumns().get(i).getSize());
assertEquals(TABLE_1_COLUMNS.get(i).getD(), table0.getColumns().get(i).getD());
assertEquals(TABLE_1_COLUMNS.get(i).getIsNullAllowed(), table0.getColumns().get(i).getIsNullAllowed());
- assertEquals(TABLE_1_COLUMNS.get(i).getAutoGenerated(), table0.getColumns().get(i).getAutoGenerated());
assertEquals(TABLE_1_COLUMNS.get(i).getEnums(), table0.getColumns().get(i).getEnums());
assertEquals(TABLE_1_COLUMNS.get(i).getSets(), table0.getColumns().get(i).getSets());
}
@@ -264,7 +261,7 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_1_COLUMNS_BRIEF_0_DTO.getInternalName(), table0pk.getColumn().getInternalName());
assertEquals(TABLE_1_ID, table0pk.getTable().getId());
assertEquals(DATABASE_1_ID, table0pk.getTable().getDatabaseId());
- assertEquals(ColumnTypeDto.BIGINT, table0pk.getColumn().getColumnType());
+ assertEquals(ColumnTypeDto.SERIAL, table0pk.getColumn().getColumnType());
assertNull(table0pk.getColumn().getAlias());
assertEquals(TABLE_1_ID, table0pk.getColumn().getTableId());
assertEquals(DATABASE_1_ID, table0pk.getColumn().getDatabaseId());
@@ -298,7 +295,6 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_2_COLUMNS.get(i).getSize(), table1.getColumns().get(i).getSize());
assertEquals(TABLE_2_COLUMNS.get(i).getD(), table1.getColumns().get(i).getD());
assertEquals(TABLE_2_COLUMNS.get(i).getIsNullAllowed(), table1.getColumns().get(i).getIsNullAllowed());
- assertEquals(TABLE_2_COLUMNS.get(i).getAutoGenerated(), table1.getColumns().get(i).getAutoGenerated());
assertEquals(TABLE_2_COLUMNS.get(i).getEnums(), table1.getColumns().get(i).getEnums());
assertEquals(TABLE_2_COLUMNS.get(i).getSets(), table1.getColumns().get(i).getSets());
}
@@ -372,7 +368,6 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_3_COLUMNS.get(i).getSize(), table2.getColumns().get(i).getSize());
assertEquals(TABLE_3_COLUMNS.get(i).getD(), table2.getColumns().get(i).getD());
assertEquals(TABLE_3_COLUMNS.get(i).getIsNullAllowed(), table2.getColumns().get(i).getIsNullAllowed());
- assertEquals(TABLE_3_COLUMNS.get(i).getAutoGenerated(), table2.getColumns().get(i).getAutoGenerated());
assertEquals(TABLE_3_COLUMNS.get(i).getEnums(), table2.getColumns().get(i).getEnums());
assertEquals(TABLE_3_COLUMNS.get(i).getSets(), table2.getColumns().get(i).getSets());
}
@@ -417,7 +412,6 @@ public class MetadataMapperUnitTest extends AbstractUnitTest {
assertEquals(TABLE_4_COLUMNS.get(i).getSize(), table3.getColumns().get(i).getSize());
assertEquals(TABLE_4_COLUMNS.get(i).getD(), table3.getColumns().get(i).getD());
assertEquals(TABLE_4_COLUMNS.get(i).getIsNullAllowed(), table3.getColumns().get(i).getIsNullAllowed());
- assertEquals(TABLE_4_COLUMNS.get(i).getAutoGenerated(), table3.getColumns().get(i).getAutoGenerated());
assertEquals(TABLE_4_COLUMNS.get(i).getEnums(), table3.getColumns().get(i).getEnums());
assertEquals(TABLE_4_COLUMNS.get(i).getSets(), table3.getColumns().get(i).getSets());
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
index 4125529155b135dae929fa7192db073e20dc9f55..fa1cd5d4beeb1fe8fb40d8f59fa974b5d2501dba 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
@@ -6,6 +6,7 @@ import at.tuwien.exception.*;
import at.tuwien.gateway.KeycloakGateway;
import dasniko.testcontainers.keycloak.KeycloakContainer;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,11 @@ public class AuthenticationServiceIntegrationTest extends AbstractUnitTest {
@Autowired
private KeycloakGateway keycloakGateway;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Container
private static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:24.0")
.withImagePullPolicy(PullPolicy.alwaysPull())
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
index c9a2ad62b61d324934236c885bf6be2aca586e9e..d04409c87b095cfcdc41a478df87a733cdf1bb82 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/BrokerServiceIntegrationTest.java
@@ -1,13 +1,15 @@
package at.tuwien.service;
-import at.tuwien.config.RabbitConfig;
-import at.tuwien.exception.*;
-import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.amqp.GrantExchangePermissionsDto;
+import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
import at.tuwien.api.amqp.TopicPermissionDto;
import at.tuwien.api.amqp.VirtualHostPermissionDto;
+import at.tuwien.config.RabbitConfig;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
+import at.tuwien.exception.BrokerServiceConnectionException;
+import at.tuwien.exception.BrokerServiceException;
+import at.tuwien.test.AbstractUnitTest;
import at.tuwien.utils.AmqpUtils;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
@@ -27,7 +29,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.List;
import java.util.Set;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
@Log4j2
@Testcontainers
@@ -167,10 +169,15 @@ public class BrokerServiceIntegrationTest extends AbstractUnitTest {
protected VirtualHostPermissionDto setVirtualHostPermissions_generic() throws BrokerServiceException,
BrokerServiceConnectionException {
+ final GrantVirtualHostPermissionsDto permissions = GrantVirtualHostPermissionsDto.builder()
+ .configure("")
+ .read("")
+ .write("")
+ .build();
final AmqpUtils amqpUtils = new AmqpUtils(rabbitContainer.getHttpUrl());
/* mock */
- amqpUtils.setVirtualHostPermissions(REALM_DBREPO_NAME, USER_1_USERNAME, USER_1_RABBITMQ_GRANT_DTO);
+ amqpUtils.setVirtualHostPermissions(REALM_DBREPO_NAME, USER_1_USERNAME, permissions);
/* test */
brokerService.setVirtualHostPermissions(USER_1);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
index b4bd67f88d225a5cfc5398fac6c485b48c674ac2..51b6df4d27b7af3332e5cb592c627e1e2ae03995 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
@@ -82,8 +82,6 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest {
assertEquals(IMAGE_1_DRIVER, response.getContainer().getImage().getDriverClass());
assertEquals(IMAGE_1_REGISTRY, response.getContainer().getImage().getRegistry());
assertEquals(IMAGE_1_PORT, response.getContainer().getImage().getDefaultPort());
- assertNotNull(response.getContainer().getImage().getDateFormats());
- assertEquals(4, response.getContainer().getImage().getDateFormats().size());
/* creator */
assertNotNull(response.getCreator());
assertEquals(USER_1_ID, response.getCreator().getId());
@@ -124,8 +122,6 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest {
assertEquals(IMAGE_1_DRIVER, response.getContainer().getImage().getDriverClass());
assertEquals(IMAGE_1_REGISTRY, response.getContainer().getImage().getRegistry());
assertEquals(IMAGE_1_PORT, response.getContainer().getImage().getDefaultPort());
- assertNotNull(response.getContainer().getImage().getDateFormats());
- assertEquals(4, response.getContainer().getImage().getDateFormats().size());
/* creator */
assertNotNull(response.getCreator());
assertEquals(USER_1_ID, response.getCreator().getId());
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index 68d6e1a93d5fe594d207df5ae0edc9da1b5c80b3..1e7633b851f9c052fd8fe60d14193698565421f3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -1,6 +1,5 @@
package at.tuwien.service;
-import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.database.DatabaseModifyVisibilityDto;
import at.tuwien.api.database.internal.CreateDatabaseDto;
import at.tuwien.entities.database.Database;
@@ -8,8 +7,8 @@ import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
-import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -23,10 +22,10 @@ import java.util.List;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
@Log4j2
@SpringBootTest
@@ -212,7 +211,11 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
SearchServiceConnectionException {
/* test */
- generic_modifyOwner(DATABASE_1, USER_1);
+ final Database response = generic_modifyOwner(DATABASE_1, USER_2);
+ assertEquals(USER_2, response.getOwner());
+ assertEquals(USER_2_ID, response.getOwnedBy());
+ assertEquals(USER_2, response.getContact());
+ assertEquals(USER_2_ID, response.getContactPerson());
}
@Test
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java
index 524c5715b4fd59e24c3f972a3acf2bd08453d99b..725d956f570e7ed6678047b4bb9d7baf85cbe33b 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServiceUnitTest.java
@@ -10,6 +10,7 @@ import at.tuwien.exception.ImageAlreadyExistsException;
import at.tuwien.repository.ImageRepository;
import at.tuwien.service.impl.ImageServiceImpl;
import jakarta.validation.ConstraintViolationException;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,11 @@ public class ImageServiceUnitTest extends AbstractUnitTest {
@Autowired
private ImageService imageService;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
public void getAll_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java
index 24ed0f686e8c9885fb4e4b637b6e02a5fc664a48..fa10d09a877c5a967086f855efd091eee1f5efe2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceUnitTest.java
@@ -16,6 +16,7 @@ import at.tuwien.gateway.RorGateway;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,11 @@ public class MetadataServiceUnitTest extends AbstractUnitTest {
@Autowired
private ObjectMapper objectMapper;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
public void identify_succeeds() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
index e2d7d33896f6c1b13d0ce9ab5af3262c8668f0bc..7aa22159c395046548324a714d7d8274fc8114af 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
@@ -92,7 +92,6 @@ public class TableServicePersistenceTest extends AbstractUnitTest {
.name("date")
.nullAllowed(true)
.type(ColumnTypeDto.DATE)
- .dfid(3L)
.build()))
.constraints(ConstraintsCreateDto.builder()
.checks(Set.of())
@@ -124,8 +123,6 @@ public class TableServicePersistenceTest extends AbstractUnitTest {
assertEquals("date", date.getName());
assertEquals("date", date.getInternalName());
assertEquals(TableColumnType.DATE, date.getColumnType());
- assertNotNull(date.getDateFormat());
- assertEquals(3L, date.getDateFormat().getId());
assertTrue(date.getIsNullAllowed());
assertNotNull(response.getConstraints());
final List<Unique> uniques = response.getConstraints().getUniques();
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index 59419f9bad37d26687342c51da6155463d674e87..551a6c350a95e1c9a22fb55d72e04530386cb522 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -5,16 +5,16 @@ import at.tuwien.api.database.table.columns.ColumnCreateDto;
import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
import at.tuwien.api.database.table.constraints.foreign.ForeignKeyCreateDto;
-import at.tuwien.entities.database.table.columns.TableColumnType;
-import at.tuwien.entities.database.table.constraints.Constraints;
-import at.tuwien.test.AbstractUnitTest;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
+import at.tuwien.entities.database.table.columns.TableColumnType;
+import at.tuwien.entities.database.table.constraints.Constraints;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
import at.tuwien.repository.DatabaseRepository;
+import at.tuwien.test.AbstractUnitTest;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -49,9 +49,6 @@ public class TableServiceUnitTest extends AbstractUnitTest {
@MockBean
private DataServiceGateway dataServiceGateway;
- @MockBean
- private OntologyService ontologyService;
-
@Autowired
private TableService tableService;
@@ -179,7 +176,6 @@ public class TableServiceUnitTest extends AbstractUnitTest {
assertEquals("i_am_spa_shu_l", column0.getInternalName());
assertEquals(TableColumnType.TEXT, column0.getColumnType());
assertTrue(column0.getIsNullAllowed());
- assertFalse(column0.getAutoGenerated());
/* constraints */
final Constraints constraints = response.getConstraints();
assertEquals(0, constraints.getPrimaryKey().size());
@@ -202,7 +198,6 @@ public class TableServiceUnitTest extends AbstractUnitTest {
.name("date")
.nullAllowed(true)
.type(ColumnTypeDto.DATE)
- .dfid(9999L)
.build()))
.constraints(ConstraintsCreateDto.builder()
.checks(Set.of())
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index 5becb9225a42db3ab451dc054663e811e7c71629..a9fe4694cc69d8eb347e9fefd12498704b8797fd 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -5,6 +5,7 @@ import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.KeycloakGateway;
import at.tuwien.repository.UserRepository;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,11 @@ public class UserServiceUnitTest extends AbstractUnitTest {
@Autowired
private UserService userService;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
public void findByUsername_succeeds() throws UserNotFoundException {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
index 3ed06bfd7c8ba6222bcbfbf45cfeb9a602e8fa91..8ca002472a085a58ea5ee58fff8a2a0614c94fd9 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
@@ -2,6 +2,7 @@ package at.tuwien.service;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.View;
+import at.tuwien.entities.database.ViewColumn;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
import at.tuwien.gateway.SearchServiceGateway;
@@ -24,6 +25,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
@@ -63,7 +65,7 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
licenseRepository.save(LICENSE_1);
userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
containerRepository.save(CONTAINER_1);
- databaseRepository.save(DATABASE_1);
+ databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3));
}
@Test
@@ -91,6 +93,9 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
/* test */
viewService.delete(VIEW_1);
+ assertThrows(ViewNotFoundException.class, () -> {
+ viewService.findById(DATABASE_1, VIEW_1_ID);
+ });
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
index f6cf4e887d4d25f2dfc201ae6d4d014f3b8c1547..8528d29f07d267bd4dcbe94de5379e47e13f1cef 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/validator/EndpointValidatorUnitTest.java
@@ -53,30 +53,9 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
public static Stream<Arguments> needSize_parameters() {
return Stream.of(
- Arguments.arguments(ColumnTypeDto.CHAR),
Arguments.arguments(ColumnTypeDto.VARCHAR),
Arguments.arguments(ColumnTypeDto.BINARY),
- Arguments.arguments(ColumnTypeDto.VARBINARY),
- Arguments.arguments(ColumnTypeDto.BIT),
- Arguments.arguments(ColumnTypeDto.TINYINT),
- Arguments.arguments(ColumnTypeDto.SMALLINT),
- Arguments.arguments(ColumnTypeDto.MEDIUMINT),
- Arguments.arguments(ColumnTypeDto.INT)
- );
- }
-
- public static Stream<Arguments> needSizeAndD_parameters() {
- return Stream.of(
- Arguments.arguments(ColumnTypeDto.DOUBLE),
- Arguments.arguments(ColumnTypeDto.DECIMAL)
- );
- }
-
- public static Stream<Arguments> needDateFormat_parameters() {
- return Stream.of(
- Arguments.arguments(ColumnTypeDto.DATETIME),
- Arguments.arguments(ColumnTypeDto.TIMESTAMP),
- Arguments.arguments(ColumnTypeDto.TIME)
+ Arguments.arguments(ColumnTypeDto.VARBINARY)
);
}
@@ -308,23 +287,6 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
});
}
- @ParameterizedTest
- @MethodSource("needSizeAndD_parameters")
- public void validateColumnCreateConstraints_needSizeAndD_fails(ColumnTypeDto type) {
- final TableCreateDto request = TableCreateDto.builder()
- .columns(List.of(ColumnCreateDto.builder()
- .type(type)
- .size(10L)
- .d(null) // <<<<<<<
- .build()))
- .build();
-
- /* test */
- assertThrows(MalformedException.class, () -> {
- endpointValidator.validateColumnCreateConstraints(request);
- });
- }
-
@Test
public void validateColumnCreateConstraints_needEnum_fails() {
final TableCreateDto request = TableCreateDto.builder()
@@ -355,35 +317,6 @@ public class EndpointValidatorUnitTest extends AbstractUnitTest {
});
}
- @ParameterizedTest
- @MethodSource("needDateFormat_parameters")
- public void validateColumnCreateConstraints_needDateFormat_fails(ColumnTypeDto type) {
- final TableCreateDto request = TableCreateDto.builder()
- .columns(List.of(ColumnCreateDto.builder()
- .type(type)
- .dfid(null) // <<<<<<<
- .build()))
- .build();
-
- /* test */
- assertThrows(MalformedException.class, () -> {
- endpointValidator.validateColumnCreateConstraints(request);
- });
- }
-
- @Test
- public void validateColumnCreateConstraints_dateFormatEmpty_succeeds() throws MalformedException {
- final TableCreateDto request = TableCreateDto.builder()
- .columns(List.of(ColumnCreateDto.builder()
- .type(ColumnTypeDto.DATE)
- .dfid(null) // <<<<<<<
- .build()))
- .build();
-
- /* test */
- endpointValidator.validateColumnCreateConstraints(request);
- }
-
@Test
public void validateOnlyOwnerOrWriteAll_onlyReadAccess_fails() throws DatabaseNotFoundException,
TableNotFoundException, AccessNotFoundException {
diff --git a/dbrepo-metadata-service/services/pom.xml b/dbrepo-metadata-service/services/pom.xml
index 5f0bc0960c21eee8b171addb2bdd240a55b3faf7..744a4e6def94c9ff67a24bea56375c0c7fb076d1 100644
--- a/dbrepo-metadata-service/services/pom.xml
+++ b/dbrepo-metadata-service/services/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>dbrepo-metadata-service</artifactId>
<groupId>at.tuwien</groupId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-services</artifactId>
<name>dbrepo-metadata-service-services</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
index e366666244515dca7965663ef5ce5016a734dd4a..1b7578b4bcdb547eae2cc26690ef028c38367787 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/config/MetricsConfig.java
@@ -1,12 +1,10 @@
package at.tuwien.config;
-import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.repository.DatabaseRepository;
import at.tuwien.repository.IdentifierRepository;
import at.tuwien.repository.TableRepository;
import at.tuwien.repository.ViewRepository;
-import at.tuwien.service.DatabaseService;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.observation.ObservationRegistry;
@@ -16,8 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import java.util.List;
-
@Log4j2
@Configuration
public class MetricsConfig {
@@ -70,7 +66,12 @@ public class MetricsConfig {
@Bean
public Gauge volumeSumGauge() {
- return Gauge.builder("dbrepo.volume.sum", () -> tableRepository.findAll().stream().map(Table::getDataLength).mapToLong(d -> d).sum())
+ return Gauge.builder("dbrepo.volume.sum", () -> {
+ if (tableRepository.findAll().isEmpty()) {
+ return 0;
+ }
+ return tableRepository.findAll().stream().map(Table::getDataLength).mapToLong(d -> d).sum();
+ })
.description("The total volume of available research data")
.strongReference(true)
.register(Metrics.globalRegistry);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
index 0c11de442957cbc6deee1d20d7f51b865017a90b..709537862a77b5bb6bccb5be4cae5d26f5622121 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/DataServiceGatewayImpl.java
@@ -214,7 +214,7 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
public ViewDto createView(Long databaseId, ViewCreateDto data) throws DataServiceConnectionException, DataServiceException {
final ResponseEntity<ViewDto> response;
final String path = "/api/database/" + databaseId + "/view";
- log.trace("delete table at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
+ log.trace("create view at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
response = restTemplate.exchange(path, HttpMethod.POST, new HttpEntity<>(data), ViewDto.class);
} catch (HttpServerErrorException e) {
@@ -264,6 +264,7 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
QueryNotFoundException {
final ResponseEntity<QueryDto> response;
final String path = "/api/database/" + databaseId + "/subset/" + queryId;
+ log.trace("find subset at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, QueryDto.class);
} catch (HttpServerErrorException e) {
@@ -291,6 +292,7 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
DataServiceException, QueryNotFoundException {
final ResponseEntity<ExportResourceDto> response;
final String path = "/api/database/" + databaseId + "/subset/" + queryId;
+ log.trace("export subset at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, ExportResourceDto.class);
} catch (HttpServerErrorException e) {
@@ -315,6 +317,7 @@ public class DataServiceGatewayImpl implements DataServiceGateway {
TableNotFoundException {
final ResponseEntity<TableDto[]> response;
final String path = "/api/database/" + databaseId + "/table";
+ log.trace("get table schemas at endpoint {} with path {}", gatewayConfig.getDataEndpoint(), path);
try {
response = restTemplate.exchange(path, HttpMethod.GET, HttpEntity.EMPTY, TableDto[].class);
} catch (HttpServerErrorException e) {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
index aaa50251c3dc0dd79e51af1c983bfda07affffaa..b6af9018118f0e502feb1452b8a4838e9baadb34 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AccessServiceImpl.java
@@ -73,6 +73,7 @@ public class AccessServiceImpl implements AccessService {
.database(database)
.huserid(user.getId())
.type(metadataMapper.accessTypeDtoToAccessType(type))
+ .user(user)
.build();
database.getAccesses()
.add(access);
@@ -95,8 +96,8 @@ public class AccessServiceImpl implements AccessService {
.hdbid(database.getId())
.database(database)
.huserid(user.getId())
- .user(user)
.type(metadataMapper.accessTypeDtoToAccessType(access))
+ .user(user)
.build();
final int idx = database.getAccesses().indexOf(entity);
if (idx == -1) {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
index 1c91de7be10e544cfe9b9e5ce71c3af5c3f89e88..330d4518dedba7e1e5e78f25a7433c18762fd579 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
@@ -11,9 +11,11 @@ import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.*;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
+import at.tuwien.entities.database.table.constraints.Constraints;
import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKey;
import at.tuwien.entities.database.table.constraints.foreignKey.ForeignKeyReference;
import at.tuwien.entities.database.table.constraints.primaryKey.PrimaryKey;
+import at.tuwien.entities.database.table.constraints.unique.Unique;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.DataServiceGateway;
@@ -165,7 +167,10 @@ public class DatabaseServiceImpl implements DatabaseService {
public Database modifyOwner(Database database, User user) throws DatabaseNotFoundException, SearchServiceException,
SearchServiceConnectionException {
/* update in metadata database */
+ database.setOwner(user);
database.setOwnedBy(user.getId());
+ database.setContact(user);
+ database.setContactPerson(user.getId());
database = databaseRepository.save(database);
/* save in search service */
searchServiceGateway.update(database);
@@ -212,12 +217,14 @@ public class DatabaseServiceImpl implements DatabaseService {
.forEach(column -> {
column.setTable(tableEntity);
});
+ log.trace("mapped unique constraint: {} ({})", tableEntity.getName(), uk.getColumns().stream().map(TableColumn::getInternalName).toList());
});
/* map foreign key constraint(s) */
tableEntity.getConstraints()
.getForeignKeys()
.forEach(fk -> {
fk.setTable(tableEntity);
+ log.trace("mapped foreign key constraint: {} ({}) -> {} ({})", fk.getTable().getInternalName(), fk.getReferences().stream().map(r -> r.getColumn().getInternalName()).toList(), fk.getReferencedTable().getInternalName(), fk.getReferences().stream().map(r -> r.getReferencedColumn().getInternalName()).toList());
});
/* map primary key constraint */
for (PrimaryKey key : tableEntity.getConstraints().getPrimaryKey()) {
@@ -237,7 +244,6 @@ public class DatabaseServiceImpl implements DatabaseService {
}
/* update referenced tables after they are known to the service */
for (ForeignKey foreignKey : database.getTables().stream().map(t -> t.getConstraints().getForeignKeys()).flatMap(List::stream).toList()) {
- log.trace("lookup table {} in tables: {}", foreignKey.getReferencedTable().getInternalName(), database.getTables().stream().map(Table::getInternalName).toList());
final Optional<Table> optional = database.getTables()
.stream()
.filter(t -> t.getInternalName().equals(foreignKey.getReferencedTable().getInternalName()))
@@ -275,15 +281,25 @@ public class DatabaseServiceImpl implements DatabaseService {
reference.setReferencedColumn(optional2.get());
}
}
- database.getTables()
- .stream()
- .filter(t -> t.getConstraints().getForeignKeys().size() > 0)
- .map(t -> t.getConstraints().getForeignKeys())
- .flatMap(List::stream)
- .filter(fk -> fk.getReferences().size() > 1)
- .forEach(fk -> {
- log.debug("");
- });
+ /* correct the unique constraint columns */
+ for (Table table : database.getTables()) {
+ for (Unique uniqueConstraint : table.getConstraints().getUniques()) {
+ uniqueConstraint.setColumns(new LinkedList<>(uniqueConstraint.getColumns()
+ .stream()
+ .map(column -> {
+ final Optional<TableColumn> optional = table.getColumns()
+ .stream()
+ .filter(c -> c.getInternalName().equals(column.getInternalName()))
+ .findFirst();
+ if (optional.isEmpty()) {
+ log.error("Failed to find unique constraint column: {}", column.getInternalName());
+ throw new IllegalArgumentException("Failed to find unique constraint column: " + column.getInternalName());
+ }
+ return optional.get();
+ })
+ .toList()));
+ }
+ }
/* update in metadata database */
database = databaseRepository.save(database);
/* save in search service */
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
index f88ba5c28f4d928757a501d8ed1a3f4effb018d8..4866fea2c10b8afa3bb4f93f2eedb3d2aa8f1ad7 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/TableServiceImpl.java
@@ -4,15 +4,12 @@ import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.columns.ColumnCreateDto;
import at.tuwien.api.database.table.columns.ColumnStatisticDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
import at.tuwien.api.database.table.columns.concepts.ColumnSemanticsUpdateDto;
import at.tuwien.config.RabbitConfig;
-import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.database.table.columns.TableColumnConcept;
-import at.tuwien.entities.database.table.columns.TableColumnType;
import at.tuwien.entities.database.table.columns.TableColumnUnit;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
@@ -27,7 +24,10 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.security.Principal;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
@Log4j2
@Service
@@ -146,20 +146,6 @@ public class TableServiceImpl implements TableService {
}
column.setConcept(concept);
}
- if (List.of(TableColumnType.TIME, TableColumnType.TIMESTAMP, TableColumnType.DATE, TableColumnType.DATETIME).contains(column.getColumnType())) {
- final Optional<ContainerImageDate> optional = database.getContainer()
- .getImage()
- .getDateFormats()
- .stream()
- .filter(df -> df.getId().equals(c.getDfid()))
- .findFirst();
- if (optional.isEmpty()) {
- log.error("Failed to find date format with id {} in metadata database", c.getDfid());
- throw new IllegalArgumentException("Failed to find date format in metadata database");
- }
- column.setDateFormat(optional.get());
- log.debug("column is of temporal type: added date format with id {}", column.getDateFormat().getId());
- }
table.getColumns()
.add(column);
}
@@ -172,6 +158,8 @@ public class TableServiceImpl implements TableService {
for (int i = 0; i < data.getConstraints().getUniques().size(); i++) {
if (data.getConstraints().getUniques().get(i).size() != table.getConstraints().getUniques().get(i).getColumns().size()) {
log.error("Failed to create table: some unique constraint(s) reference non-existing table columns: {}", data.getConstraints().getUniques().get(i));
+ log.debug("payload uniques: {}", data.getConstraints().getUniques());
+ log.debug("mapped table uniques: {}", table.getConstraints().getUniques().stream().map(u -> List.of(u.getColumns().stream().map(TableColumn::getInternalName).toList())).toList());
throw new MalformedException("Failed to create table: some unique constraint(s) reference non-existing table columns");
}
}
@@ -203,7 +191,9 @@ public class TableServiceImpl implements TableService {
/* delete at data service */
dataServiceGateway.deleteTable(table.getDatabase().getId(), table.getId());
/* update in metadata database */
- table.getDatabase().getTables().remove(table);
+ table.getDatabase()
+ .getTables()
+ .remove(table);
final Database database = databaseRepository.save(table.getDatabase());
/* update in search service */
searchServiceGateway.update(database);
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
index 0826d9dcc88e344227f56550b2aebd6f42e3494e..17a2c26d8929e6e89d220427100e1124c75b92b8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ViewServiceImpl.java
@@ -75,7 +75,9 @@ public class ViewServiceImpl implements ViewService {
/* delete in data service */
dataServiceGateway.deleteView(view.getDatabase().getId(), view.getId());
/* delete in metadata database */
- view.getDatabase().getViews().remove(view);
+ view.getDatabase()
+ .getViews()
+ .remove(view);
final Database database = databaseRepository.save(view.getDatabase());
/* update in search service */
searchServiceGateway.update(database);
diff --git a/dbrepo-metadata-service/test/pom.xml b/dbrepo-metadata-service/test/pom.xml
index b7bed994e55bae1797efdd69602e415c275a5062..a03ae0b3a6d6316c1537a7acff40aa8694db309e 100644
--- a/dbrepo-metadata-service/test/pom.xml
+++ b/dbrepo-metadata-service/test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>at.tuwien</groupId>
<artifactId>dbrepo-metadata-service</artifactId>
- <version>1.4.6</version>
+ <version>1.4.7</version>
</parent>
<artifactId>dbrepo-metadata-service-test</artifactId>
<name>dbrepo-metadata-service-test</name>
- <version>1.4.6</version>
+ <version>1.4.7</version>
<dependencies>
<dependency>
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
index 996dbb9a7d71b00c7988d9da4dc1ddeb3876245e..3ab89a39051326901f9b4029689bf4be82bd177f 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
@@ -22,6 +22,7 @@ public abstract class AbstractUnitTest extends BaseTest {
/* USER_4 */
USER_5.setAccesses(new LinkedList<>());
/* DATABASE 1 */
+ DATABASE_1.setOwner(USER_1);
DATABASE_1.setSubsets(new LinkedList<>());
DATABASE_1.setAccesses(new LinkedList<>(List.of(DATABASE_1_USER_1_READ_ACCESS, DATABASE_1_USER_2_WRITE_OWN_ACCESS, DATABASE_1_USER_3_WRITE_ALL_ACCESS)));
DATABASE_1_PRIVILEGED_DTO.setAccesses(new LinkedList<>(List.of(DATABASE_1_USER_1_READ_ACCESS_DTO, DATABASE_1_USER_2_WRITE_OWN_ACCESS_DTO, DATABASE_1_USER_3_WRITE_ALL_ACCESS_DTO)));
@@ -37,7 +38,7 @@ public abstract class AbstractUnitTest extends BaseTest {
DATABASE_1_PRIVILEGED_DTO.setIdentifiers(new LinkedList<>(List.of(IDENTIFIER_1_DTO, IDENTIFIER_2_DTO, IDENTIFIER_3_DTO, IDENTIFIER_4_DTO)));
DATABASE_1_PRIVILEGED_DTO.setTables(new LinkedList<>(List.of(TABLE_1_DTO, TABLE_2_DTO, TABLE_3_DTO, TABLE_4_DTO)));
DATABASE_1_PRIVILEGED_DTO.setViews(new LinkedList<>(List.of(VIEW_1_DTO, VIEW_2_DTO, VIEW_3_DTO)));
- TABLE_1_DTO.setColumns(TABLE_1_COLUMNS_DTO);
+ TABLE_1_DTO.setColumns(new LinkedList<>(TABLE_1_COLUMNS_DTO));
TABLE_1_DTO.setConstraints(TABLE_1_CONSTRAINTS_DTO);
TABLE_2.setDatabase(DATABASE_1);
TABLE_2.setColumns(new LinkedList<>(TABLE_2_COLUMNS));
@@ -45,12 +46,12 @@ public abstract class AbstractUnitTest extends BaseTest {
TABLE_2.setConstraints(TABLE_2_CONSTRAINTS);
TABLE_2_PRIVILEGED_DTO.setColumns(new LinkedList<>(TABLE_2_COLUMNS_DTO));
TABLE_2_PRIVILEGED_DTO.setDatabase(DATABASE_1_PRIVILEGED_DTO);
- TABLE_2_DTO.setColumns(TABLE_2_COLUMNS_DTO);
+ TABLE_2_DTO.setColumns(new LinkedList<>(TABLE_2_COLUMNS_DTO));
TABLE_2_DTO.setConstraints(TABLE_2_CONSTRAINTS_DTO);
TABLE_3.setDatabase(DATABASE_1);
TABLE_3.setColumns(new LinkedList<>(TABLE_3_COLUMNS));
TABLE_3.setConstraints(TABLE_3_CONSTRAINTS);
- TABLE_3_DTO.setColumns(TABLE_3_COLUMNS_DTO);
+ TABLE_3_DTO.setColumns(new LinkedList<>(TABLE_3_COLUMNS_DTO));
TABLE_3_DTO.setConstraints(TABLE_3_CONSTRAINTS_DTO);
TABLE_4.setDatabase(DATABASE_1);
TABLE_4.setColumns(new LinkedList<>(TABLE_4_COLUMNS));
@@ -58,14 +59,14 @@ public abstract class AbstractUnitTest extends BaseTest {
TABLE_4_DTO.setColumns(TABLE_4_COLUMNS_DTO);
TABLE_4_DTO.setConstraints(TABLE_4_CONSTRAINTS_DTO);
VIEW_1.setDatabase(DATABASE_1);
- VIEW_1.setColumns(VIEW_1_COLUMNS);
+ VIEW_1.setColumns(new LinkedList<>(VIEW_1_COLUMNS));
VIEW_1.setIdentifiers(new LinkedList<>(List.of(IDENTIFIER_3)));
VIEW_1_PRIVILEGED_DTO.setDatabase(DATABASE_1_PRIVILEGED_DTO);
VIEW_2.setDatabase(DATABASE_1);
- VIEW_2.setColumns(VIEW_2_COLUMNS);
+ VIEW_2.setColumns(new LinkedList<>(VIEW_2_COLUMNS));
VIEW_2_PRIVILEGED_DTO.setDatabase(DATABASE_1_PRIVILEGED_DTO);
VIEW_3.setDatabase(DATABASE_1);
- VIEW_3.setColumns(VIEW_3_COLUMNS);
+ VIEW_3.setColumns(new LinkedList<>(VIEW_3_COLUMNS));
VIEW_3_PRIVILEGED_DTO.setDatabase(DATABASE_1_PRIVILEGED_DTO);
IDENTIFIER_1.setDatabase(DATABASE_1);
IDENTIFIER_2.setDatabase(DATABASE_1);
@@ -76,6 +77,7 @@ public abstract class AbstractUnitTest extends BaseTest {
DATABASE_2.setAccesses(new LinkedList<>(List.of(DATABASE_2_USER_2_WRITE_ALL_ACCESS, DATABASE_2_USER_3_READ_ACCESS)));
DATABASE_2_PRIVILEGED_DTO.setAccesses(new LinkedList<>(List.of(DATABASE_2_USER_2_WRITE_ALL_ACCESS_DTO, DATABASE_2_USER_3_READ_ACCESS_DTO)));
DATABASE_2.setTables(new LinkedList<>(List.of(TABLE_5, TABLE_6, TABLE_7)));
+ VIEW_4.setColumns(new LinkedList<>(VIEW_4_COLUMNS));
DATABASE_2.setViews(new LinkedList<>(List.of(VIEW_4)));
DATABASE_2.setIdentifiers(new LinkedList<>(List.of(IDENTIFIER_5)));
DATABASE_2_PRIVILEGED_DTO.setTables(new LinkedList<>(List.of(TABLE_5_DTO, TABLE_6_DTO, TABLE_7_DTO)));
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index 6ade19c1ec0f6c742a97731d3a97482fea97923d..c6c0e4ec10150224ee4c21c6a1bf582649ba941e 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -1,12 +1,18 @@
package at.tuwien.test;
import at.tuwien.ExportResourceDto;
-import at.tuwien.api.amqp.*;
+import at.tuwien.api.amqp.CreateVirtualHostDto;
+import at.tuwien.api.amqp.ExchangeDto;
+import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
+import at.tuwien.api.amqp.QueueDto;
import at.tuwien.api.auth.LoginRequestDto;
import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.container.ContainerBriefDto;
import at.tuwien.api.container.ContainerDto;
-import at.tuwien.api.container.image.*;
+import at.tuwien.api.container.image.ImageBriefDto;
+import at.tuwien.api.container.image.ImageChangeDto;
+import at.tuwien.api.container.image.ImageCreateDto;
+import at.tuwien.api.container.image.ImageDto;
import at.tuwien.api.container.internal.PrivilegedContainerDto;
import at.tuwien.api.database.*;
import at.tuwien.api.database.internal.CreateDatabaseDto;
@@ -20,7 +26,10 @@ import at.tuwien.api.database.table.TableCreateDto;
import at.tuwien.api.database.table.TableDto;
import at.tuwien.api.database.table.TableStatisticDto;
import at.tuwien.api.database.table.columns.*;
-import at.tuwien.api.database.table.columns.concepts.*;
+import at.tuwien.api.database.table.columns.concepts.ConceptDto;
+import at.tuwien.api.database.table.columns.concepts.ConceptSaveDto;
+import at.tuwien.api.database.table.columns.concepts.UnitDto;
+import at.tuwien.api.database.table.columns.concepts.UnitSaveDto;
import at.tuwien.api.database.table.constraints.ConstraintsCreateDto;
import at.tuwien.api.database.table.constraints.ConstraintsDto;
import at.tuwien.api.database.table.constraints.foreign.*;
@@ -51,11 +60,9 @@ import at.tuwien.api.orcid.person.name.OrcidValueDto;
import at.tuwien.api.semantics.OntologyCreateDto;
import at.tuwien.api.semantics.OntologyModifyDto;
import at.tuwien.api.user.*;
-import at.tuwien.api.user.UserDetailsDto;
import at.tuwien.api.user.internal.UpdateUserPasswordDto;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.container.image.ContainerImage;
-import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.*;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.database.table.columns.TableColumn;
@@ -422,17 +429,6 @@ public abstract class BaseTest {
public final static Instant USER_1_LAST_MODIFIED = USER_1_CREATED;
public final static UUID USER_1_REALM_ID = REALM_DBREPO_ID;
- public final static CreateUserDto USER_1_RABBITMQ_CREATE_DTO = CreateUserDto.builder()
- .password("")
- .tags("")
- .build();
-
- public final static GrantVirtualHostPermissionsDto USER_1_RABBITMQ_GRANT_DTO = GrantVirtualHostPermissionsDto.builder()
- .configure("")
- .read("")
- .write("")
- .build();
-
public final static UpdateUserPasswordDto USER_1_UPDATE_PASSWORD_DTO = UpdateUserPasswordDto.builder()
.username(USER_1_USERNAME)
.password(USER_1_PASSWORD)
@@ -908,29 +904,6 @@ public abstract class BaseTest {
public final static Integer IMAGE_1_PORT = 3306;
public final static Boolean IMAGE_1_IS_DEFAULT = true;
- public final static Long IMAGE_DATE_1_ID = 1L;
- public final static Long IMAGE_DATE_1_IMAGE_ID = IMAGE_1_ID;
- public final static String IMAGE_DATE_1_UNIX_FORMAT = "yyyy-MM-dd";
- public final static String IMAGE_DATE_1_DATABASE_FORMAT = "%Y-%c-%d";
- public final static String IMAGE_DATE_1_EXAMPLE = "2022-01-30";
- public final static Boolean IMAGE_DATE_1_HAS_TIME = false;
-
- public final static ContainerImageDate IMAGE_DATE_1 = ContainerImageDate.builder()
- .id(IMAGE_DATE_1_ID)
- .iid(IMAGE_DATE_1_IMAGE_ID)
- .unixFormat(IMAGE_DATE_1_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_1_DATABASE_FORMAT)
- .example(IMAGE_DATE_1_EXAMPLE)
- .hasTime(IMAGE_DATE_1_HAS_TIME)
- .build();
-
- public final static ImageDateDto IMAGE_DATE_1_DTO = ImageDateDto.builder()
- .id(IMAGE_DATE_1_ID)
- .unixFormat(IMAGE_DATE_1_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_1_DATABASE_FORMAT)
- .hasTime(IMAGE_DATE_1_HAS_TIME)
- .build();
-
public final static ImageCreateDto IMAGE_1_CREATE_DTO = ImageCreateDto.builder()
.registry(IMAGE_1_REGISTRY)
.name(IMAGE_1_NAME)
@@ -949,75 +922,6 @@ public abstract class BaseTest {
.defaultPort(IMAGE_1_PORT)
.build();
- public final static Long IMAGE_DATE_2_ID = 2L;
- public final static Long IMAGE_DATE_2_IMAGE_ID = IMAGE_1_ID;
- public final static String IMAGE_DATE_2_UNIX_FORMAT = "dd.MM.yy";
- public final static String IMAGE_DATE_2_DATABASE_FORMAT = "%d.%c.%y";
- public final static String IMAGE_DATE_2_EXAMPLE = "30.01.2022";
- public final static Boolean IMAGE_DATE_2_HAS_TIME = false;
-
- public final static ContainerImageDate IMAGE_DATE_2 = ContainerImageDate.builder()
- .id(IMAGE_DATE_2_ID)
- .iid(IMAGE_DATE_2_IMAGE_ID)
- .unixFormat(IMAGE_DATE_2_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_2_DATABASE_FORMAT)
- .example(IMAGE_DATE_2_EXAMPLE)
- .hasTime(IMAGE_DATE_2_HAS_TIME)
- .build();
-
- public final static ImageDateDto IMAGE_DATE_2_DTO = ImageDateDto.builder()
- .id(IMAGE_DATE_2_ID)
- .unixFormat(IMAGE_DATE_2_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_2_DATABASE_FORMAT)
- .hasTime(IMAGE_DATE_2_HAS_TIME)
- .build();
-
- public final static Long IMAGE_DATE_3_ID = 3L;
- public final static Long IMAGE_DATE_3_IMAGE_ID = IMAGE_1_ID;
- public final static String IMAGE_DATE_3_UNIX_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS";
- public final static String IMAGE_DATE_3_DATABASE_FORMAT = "%Y-%c-%dT%H:%i:%S.%f";
- public final static String IMAGE_DATE_3_EXAMPLE = "2022-01-30T13:44:25.499";
- public final static Boolean IMAGE_DATE_3_HAS_TIME = true;
-
- public final static ContainerImageDate IMAGE_DATE_3 = ContainerImageDate.builder()
- .id(IMAGE_DATE_3_ID)
- .iid(IMAGE_DATE_3_IMAGE_ID)
- .unixFormat(IMAGE_DATE_3_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_3_DATABASE_FORMAT)
- .example(IMAGE_DATE_3_EXAMPLE)
- .hasTime(IMAGE_DATE_3_HAS_TIME)
- .build();
-
- public final static ImageDateDto IMAGE_DATE_3_DTO = ImageDateDto.builder()
- .id(IMAGE_DATE_3_ID)
- .unixFormat(IMAGE_DATE_3_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_3_DATABASE_FORMAT)
- .hasTime(IMAGE_DATE_3_HAS_TIME)
- .build();
-
- public final static Long IMAGE_DATE_4_ID = 4L;
- public final static Long IMAGE_DATE_4_IMAGE_ID = IMAGE_1_ID;
- public final static String IMAGE_DATE_4_UNIX_FORMAT = "HH:mm:ss";
- public final static String IMAGE_DATE_4_DATABASE_FORMAT = "%H:%i:%S";
- public final static String IMAGE_DATE_4_EXAMPLE = "14:44:25";
- public final static Boolean IMAGE_DATE_4_HAS_TIME = true;
-
- public final static ContainerImageDate IMAGE_DATE_4 = ContainerImageDate.builder()
- .id(IMAGE_DATE_4_ID)
- .iid(IMAGE_DATE_4_IMAGE_ID)
- .unixFormat(IMAGE_DATE_4_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_4_DATABASE_FORMAT)
- .example(IMAGE_DATE_4_EXAMPLE)
- .hasTime(IMAGE_DATE_4_HAS_TIME)
- .build();
-
- public final static ImageDateDto IMAGE_DATE_4_DTO = ImageDateDto.builder()
- .id(IMAGE_DATE_4_ID)
- .unixFormat(IMAGE_DATE_4_UNIX_FORMAT)
- .databaseFormat(IMAGE_DATE_4_DATABASE_FORMAT)
- .hasTime(IMAGE_DATE_4_HAS_TIME)
- .build();
-
public final static ContainerImage IMAGE_1 = ContainerImage.builder()
.id(IMAGE_1_ID)
.name(IMAGE_1_NAME)
@@ -1028,7 +932,6 @@ public abstract class BaseTest {
.driverClass(IMAGE_1_DRIVER)
.defaultPort(IMAGE_1_PORT)
.isDefault(IMAGE_1_IS_DEFAULT)
- .dateFormats(new LinkedList<>(List.of(IMAGE_DATE_1, IMAGE_DATE_2, IMAGE_DATE_3, IMAGE_DATE_4)))
.build();
public final static ImageDto IMAGE_1_DTO = ImageDto.builder()
@@ -1041,7 +944,6 @@ public abstract class BaseTest {
.driverClass(IMAGE_1_DRIVER)
.defaultPort(IMAGE_1_PORT)
.isDefault(IMAGE_1_IS_DEFAULT)
- .dateFormats(List.of(IMAGE_DATE_1_DTO, IMAGE_DATE_2_DTO, IMAGE_DATE_3_DTO))
.build();
public final static ImageBriefDto IMAGE_1_BRIEF_DTO = ImageBriefDto.builder()
@@ -1253,12 +1155,6 @@ public abstract class BaseTest {
public final static UserDto DATABASE_1_CREATOR_DTO = USER_1_DTO;
public final static UserDto DATABASE_1_OWNER_DTO = USER_1_DTO;
- public final static GrantExchangePermissionsDto USER_1_RABBITMQ_GRANT_TOPIC_DTO = GrantExchangePermissionsDto.builder()
- .exchange("dbrepo")
- .read("^(dbrepo\\." + DATABASE_1_INTERNALNAME + "\\..)$")
- .write("^(dbrepo\\." + DATABASE_1_INTERNALNAME + "\\..)$")
- .build();
-
public final static DatabaseCreateDto DATABASE_1_CREATE = DatabaseCreateDto.builder()
.name(DATABASE_1_NAME)
.isPublic(DATABASE_1_PUBLIC)
@@ -1498,25 +1394,21 @@ public abstract class BaseTest {
.name("col25")
.type(ColumnTypeDto.DATE)
.nullAllowed(true)
- .dfid(IMAGE_DATE_1_ID)
.build(),
ColumnCreateDto.builder()
.name("col26")
.type(ColumnTypeDto.DATETIME)
.nullAllowed(true)
- .dfid(IMAGE_DATE_3_ID)
.build(),
ColumnCreateDto.builder()
.name("col27")
.type(ColumnTypeDto.TIMESTAMP)
.nullAllowed(true)
- .dfid(IMAGE_DATE_3_ID)
.build(),
ColumnCreateDto.builder()
.name("col28")
.type(ColumnTypeDto.TIME)
.nullAllowed(true)
- .dfid(IMAGE_DATE_4_ID)
.build(),
ColumnCreateDto.builder()
.name("col29")
@@ -1617,9 +1509,8 @@ public abstract class BaseTest {
.name("id")
.internalName("id")
.ordinalPosition(0)
- .columnType(ColumnTypeDto.BIGINT)
+ .columnType(ColumnTypeDto.SERIAL)
.isNullAllowed(false)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -1632,9 +1523,7 @@ public abstract class BaseTest {
.internalName("date")
.ordinalPosition(1)
.columnType(ColumnTypeDto.DATE)
- .dateFormat(IMAGE_DATE_1_DTO)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -1649,7 +1538,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.VARCHAR)
.size(255L)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -1665,7 +1553,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -1683,7 +1570,6 @@ public abstract class BaseTest {
.concept(CONCEPT_1_DTO)
.unit(UNIT_1_DTO)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build());
@@ -2198,7 +2084,6 @@ public abstract class BaseTest {
.internalName("timestamp")
.columnType(TableColumnType.TIMESTAMP)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_4_2_ID)
@@ -2208,13 +2093,11 @@ public abstract class BaseTest {
.internalName("value")
.columnType(TableColumnType.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static List<ColumnCreateDto> TABLE_4_COLUMNS_CREATE_DTO = List.of(ColumnCreateDto.builder()
.name("Timestamp")
.type(ColumnTypeDto.TIMESTAMP)
- .dfid(IMAGE_DATE_4_ID)
.nullAllowed(false)
.build(),
ColumnCreateDto.builder()
@@ -2253,9 +2136,7 @@ public abstract class BaseTest {
.name("Timestamp")
.internalName("timestamp")
.columnType(ColumnTypeDto.TIMESTAMP)
- .dateFormat(IMAGE_DATE_3_DTO)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_4_2_ID)
@@ -2264,9 +2145,7 @@ public abstract class BaseTest {
.name("Value")
.internalName("value")
.columnType(ColumnTypeDto.DECIMAL)
- .dateFormat(null)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static Long TABLE_8_ID = 8L;
@@ -2504,7 +2383,6 @@ public abstract class BaseTest {
.internalName(COLUMN_8_1_INTERNAL_NAME)
.columnType(COLUMN_8_1_TYPE)
.isNullAllowed(COLUMN_8_1_NULL)
- .autoGenerated(COLUMN_8_1_AUTO_GENERATED)
.build(),
TableColumn.builder()
.id(COLUMN_8_2_ID)
@@ -2514,7 +2392,6 @@ public abstract class BaseTest {
.internalName(COLUMN_8_2_INTERNAL_NAME)
.columnType(COLUMN_8_2_TYPE)
.isNullAllowed(COLUMN_8_2_NULL)
- .autoGenerated(COLUMN_8_2_AUTO_GENERATED)
.size(COLUMN_8_2_SIZE)
.d(COLUMN_8_2_D)
.build(),
@@ -2526,7 +2403,6 @@ public abstract class BaseTest {
.internalName(COLUMN_8_3_INTERNAL_NAME)
.columnType(COLUMN_8_3_TYPE)
.isNullAllowed(COLUMN_8_3_NULL)
- .autoGenerated(COLUMN_8_3_AUTO_GENERATED)
.build());
public final static List<ColumnDto> TABLE_8_COLUMNS_DTO = List.of(ColumnDto.builder()
@@ -2537,7 +2413,6 @@ public abstract class BaseTest {
.internalName(COLUMN_8_1_INTERNAL_NAME)
.columnType(COLUMN_8_1_TYPE_DTO)
.isNullAllowed(COLUMN_8_1_NULL)
- .autoGenerated(COLUMN_8_1_AUTO_GENERATED)
.build(),
ColumnDto.builder()
.id(COLUMN_8_2_ID)
@@ -2547,7 +2422,6 @@ public abstract class BaseTest {
.internalName(COLUMN_8_2_INTERNAL_NAME)
.columnType(COLUMN_8_2_TYPE_DTO)
.isNullAllowed(COLUMN_8_2_NULL)
- .autoGenerated(COLUMN_8_2_AUTO_GENERATED)
.build(),
ColumnDto.builder()
.id(COLUMN_8_3_ID)
@@ -2557,7 +2431,6 @@ public abstract class BaseTest {
.internalName(COLUMN_8_3_INTERNAL_NAME)
.columnType(COLUMN_8_3_TYPE_DTO)
.isNullAllowed(COLUMN_8_3_NULL)
- .autoGenerated(COLUMN_8_3_AUTO_GENERATED)
.build());
public final static Long TABLE_8_DATA_COUNT = 6L;
@@ -2882,9 +2755,8 @@ public abstract class BaseTest {
.table(TABLE_1)
.name("id")
.internalName("id")
- .columnType(TableColumnType.BIGINT)
+ .columnType(TableColumnType.SERIAL)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_1_2_ID)
@@ -2893,9 +2765,7 @@ public abstract class BaseTest {
.name("Date")
.internalName("date")
.columnType(TableColumnType.DATE)
- .dateFormat(IMAGE_DATE_1)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_1_3_ID)
@@ -2906,7 +2776,6 @@ public abstract class BaseTest {
.columnType(TableColumnType.VARCHAR)
.size(255L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_1_4_ID)
@@ -2918,7 +2787,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_1_5_ID)
@@ -2932,7 +2800,6 @@ public abstract class BaseTest {
.concept(CONCEPT_1)
.unit(UNIT_1)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static List<ColumnCreateDto> TABLE_1_COLUMNS_CREATE_DTO = List.of(ColumnCreateDto.builder()
@@ -2946,14 +2813,12 @@ public abstract class BaseTest {
.name("Date")
.type(ColumnTypeDto.DATE)
.nullAllowed(true)
- .dfid(IMAGE_DATE_1_ID)
.build(),
ColumnCreateDto.builder()
.name("Location")
.type(ColumnTypeDto.VARCHAR)
.size(255L)
.nullAllowed(true)
- .dfid(IMAGE_DATE_1_ID)
.build(),
ColumnCreateDto.builder()
.name("MinTemp")
@@ -2961,7 +2826,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.nullAllowed(true)
- .dfid(IMAGE_DATE_1_ID)
.build(),
ColumnCreateDto.builder()
.name("Rainfall")
@@ -2969,7 +2833,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.nullAllowed(true)
- .dfid(IMAGE_DATE_1_ID)
.conceptUri(CONCEPT_1_URI)
.unitUri(UNIT_1_URI)
.build());
@@ -3025,7 +2888,6 @@ public abstract class BaseTest {
.columnType(TableColumnType.VARCHAR)
.size(255L)
.isNullAllowed(false)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -3040,7 +2902,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -3055,7 +2916,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build());
@@ -3085,7 +2945,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.VARCHAR)
.size(255L)
.isNullAllowed(false)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -3100,7 +2959,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.DOUBLE)
.size(22L)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build(),
@@ -3115,7 +2973,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.DOUBLE)
.size(22L)
.isNullAllowed(true)
- .autoGenerated(false)
.enums(null)
.sets(null)
.build());
@@ -3201,12 +3058,10 @@ public abstract class BaseTest {
.id(COLUMN_3_1_ID)
.table(TABLE_3)
.ordinalPosition(0)
- .autoGenerated(true)
.columnType(TableColumnType.BIGINT)
.name("id")
.internalName("id")
.isNullAllowed(false)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3214,12 +3069,10 @@ public abstract class BaseTest {
.id(COLUMN_3_2_ID)
.table(TABLE_3)
.ordinalPosition(1)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("linie")
.internalName("linie")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3227,12 +3080,10 @@ public abstract class BaseTest {
.id(COLUMN_3_3_ID)
.table(TABLE_3)
.ordinalPosition(2)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("richtung")
.internalName("richtung")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3240,7 +3091,6 @@ public abstract class BaseTest {
.id(COLUMN_3_4_ID)
.table(TABLE_3)
.ordinalPosition(3)
- .autoGenerated(false)
.columnType(TableColumnType.DATE)
.name("betriebsdatum")
.internalName("betriebsdatum")
@@ -3252,12 +3102,10 @@ public abstract class BaseTest {
.id(COLUMN_3_5_ID)
.table(TABLE_3)
.ordinalPosition(4)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fahrzeug")
.internalName("fahrzeug")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3265,12 +3113,10 @@ public abstract class BaseTest {
.id(COLUMN_3_6_ID)
.table(TABLE_3)
.ordinalPosition(5)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("kurs")
.internalName("kurs")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3278,12 +3124,10 @@ public abstract class BaseTest {
.id(COLUMN_3_7_ID)
.table(TABLE_3)
.ordinalPosition(6)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("seq_von")
.internalName("seq_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3291,12 +3135,10 @@ public abstract class BaseTest {
.id(COLUMN_3_8_ID)
.table(TABLE_3)
.ordinalPosition(7)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_diva_von")
.internalName("halt_diva_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3304,12 +3146,10 @@ public abstract class BaseTest {
.id(COLUMN_3_9_ID)
.table(TABLE_3)
.ordinalPosition(8)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_punkt_diva_von")
.internalName("halt_punkt_diva_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3317,12 +3157,10 @@ public abstract class BaseTest {
.id(COLUMN_3_10_ID)
.table(TABLE_3)
.ordinalPosition(9)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_kurz_von1")
.internalName("halt_kurz_von1")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3330,7 +3168,6 @@ public abstract class BaseTest {
.id(COLUMN_3_11_ID)
.table(TABLE_3)
.ordinalPosition(10)
- .autoGenerated(false)
.columnType(TableColumnType.DATE)
.name("datum_von")
.internalName("datum_von")
@@ -3342,12 +3179,10 @@ public abstract class BaseTest {
.id(COLUMN_3_12_ID)
.table(TABLE_3)
.ordinalPosition(11)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("soll_an_von")
.internalName("soll_an_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3355,12 +3190,10 @@ public abstract class BaseTest {
.id(COLUMN_3_13_ID)
.table(TABLE_3)
.ordinalPosition(12)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("ist_an_von")
.internalName("ist_an_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3368,12 +3201,10 @@ public abstract class BaseTest {
.id(COLUMN_3_14_ID)
.table(TABLE_3)
.ordinalPosition(13)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("soll_ab_von")
.internalName("soll_ab_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3381,12 +3212,10 @@ public abstract class BaseTest {
.id(COLUMN_3_15_ID)
.table(TABLE_3)
.ordinalPosition(14)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("ist_ab_von")
.internalName("ist_ab_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3394,12 +3223,10 @@ public abstract class BaseTest {
.id(COLUMN_3_16_ID)
.table(TABLE_3)
.ordinalPosition(15)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("seq_nach")
.internalName("seq_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3407,12 +3234,10 @@ public abstract class BaseTest {
.id(COLUMN_3_17_ID)
.table(TABLE_3)
.ordinalPosition(16)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_diva_nach")
.internalName("halt_diva_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3420,12 +3245,10 @@ public abstract class BaseTest {
.id(COLUMN_3_18_ID)
.table(TABLE_3)
.ordinalPosition(17)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_punkt_diva_nach")
.internalName("halt_punkt_diva_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3433,12 +3256,10 @@ public abstract class BaseTest {
.id(COLUMN_3_19_ID)
.table(TABLE_3)
.ordinalPosition(18)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_kurz_nach1")
.internalName("halt_kurz_nach1")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3446,7 +3267,6 @@ public abstract class BaseTest {
.id(COLUMN_3_20_ID)
.table(TABLE_3)
.ordinalPosition(19)
- .autoGenerated(false)
.columnType(TableColumnType.DATE)
.name("datum_nach")
.internalName("datum_nach")
@@ -3458,12 +3278,10 @@ public abstract class BaseTest {
.id(COLUMN_3_21_ID)
.table(TABLE_3)
.ordinalPosition(20)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("soll_an_nach")
.internalName("soll_an_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3471,12 +3289,10 @@ public abstract class BaseTest {
.id(COLUMN_3_22_ID)
.table(TABLE_3)
.ordinalPosition(21)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("ist_an_nach1")
.internalName("ist_an_nach1")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3484,12 +3300,10 @@ public abstract class BaseTest {
.id(COLUMN_3_23_ID)
.table(TABLE_3)
.ordinalPosition(22)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("soll_ab_nach")
.internalName("soll_ab_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3497,12 +3311,10 @@ public abstract class BaseTest {
.id(COLUMN_3_24_ID)
.table(TABLE_3)
.ordinalPosition(23)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("ist_ab_nach")
.internalName("ist_ab_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3510,12 +3322,10 @@ public abstract class BaseTest {
.id(COLUMN_3_25_ID)
.table(TABLE_3)
.ordinalPosition(24)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fahrt_id")
.internalName("fahrt_id")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3523,12 +3333,10 @@ public abstract class BaseTest {
.id(COLUMN_3_26_ID)
.table(TABLE_3)
.ordinalPosition(25)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fahrweg_id")
.internalName("fahrweg_id")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3536,12 +3344,10 @@ public abstract class BaseTest {
.id(COLUMN_3_27_ID)
.table(TABLE_3)
.ordinalPosition(26)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fw_no")
.internalName("fw_no")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3549,12 +3355,10 @@ public abstract class BaseTest {
.id(COLUMN_3_28_ID)
.table(TABLE_3)
.ordinalPosition(27)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fw_typ")
.internalName("fw_typ")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3562,12 +3366,10 @@ public abstract class BaseTest {
.id(COLUMN_3_29_ID)
.table(TABLE_3)
.ordinalPosition(28)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fw_kurz")
.internalName("fw_kurz")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3575,12 +3377,10 @@ public abstract class BaseTest {
.id(COLUMN_3_30_ID)
.table(TABLE_3)
.ordinalPosition(29)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("fw_lang")
.internalName("fw_lang")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3588,12 +3388,10 @@ public abstract class BaseTest {
.id(COLUMN_3_31_ID)
.table(TABLE_3)
.ordinalPosition(30)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("umlauf_von")
.internalName("umlauf_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3601,12 +3399,10 @@ public abstract class BaseTest {
.id(COLUMN_3_32_ID)
.table(TABLE_3)
.ordinalPosition(31)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_id_von")
.internalName("halt_id_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3614,12 +3410,10 @@ public abstract class BaseTest {
.id(COLUMN_3_33_ID)
.table(TABLE_3)
.ordinalPosition(32)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_id_nach")
.internalName("halt_id_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3627,12 +3421,10 @@ public abstract class BaseTest {
.id(COLUMN_3_34_ID)
.table(TABLE_3)
.ordinalPosition(33)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_punkt_id_von")
.internalName("halt_punkt_id_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3640,12 +3432,10 @@ public abstract class BaseTest {
.id(COLUMN_3_35_ID)
.table(TABLE_3)
.ordinalPosition(34)
- .autoGenerated(false)
.columnType(TableColumnType.INT)
.name("halt_punkt_id_nach")
.internalName("halt_punkt_id_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build());
@@ -3655,12 +3445,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(true)
.columnType(ColumnTypeDto.BIGINT)
.name("id")
.internalName("id")
.isNullAllowed(false)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3669,12 +3457,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("linie")
.internalName("linie")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3683,12 +3469,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("richtung")
.internalName("richtung")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3697,12 +3481,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.DATE)
.name("betriebsdatum")
.internalName("betriebsdatum")
.isNullAllowed(true)
- .dateFormat(IMAGE_DATE_2_DTO)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3711,12 +3493,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fahrzeug")
.internalName("fahrzeug")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3725,12 +3505,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("kurs")
.internalName("kurs")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3739,12 +3517,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("seq_von")
.internalName("seq_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3753,12 +3529,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_diva_von")
.internalName("halt_diva_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3767,12 +3541,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_punkt_diva_von")
.internalName("halt_punkt_diva_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3781,12 +3553,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_kurz_von1")
.internalName("halt_kurz_von1")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3795,12 +3565,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.DATE)
.name("datum_von")
.internalName("datum_von")
.isNullAllowed(true)
- .dateFormat(IMAGE_DATE_2_DTO)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3809,12 +3577,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("soll_an_von")
.internalName("soll_an_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3823,12 +3589,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("ist_an_von")
.internalName("ist_an_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3837,12 +3601,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("soll_ab_von")
.internalName("soll_ab_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3851,12 +3613,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("ist_ab_von")
.internalName("ist_ab_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3865,12 +3625,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("seq_nach")
.internalName("seq_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3879,12 +3637,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_diva_nach")
.internalName("halt_diva_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3893,12 +3649,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_punkt_diva_nach")
.internalName("halt_punkt_diva_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3907,12 +3661,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_kurz_nach1")
.internalName("halt_kurz_nach1")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3921,12 +3673,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.DATE)
.name("datum_nach")
.internalName("datum_nach")
.isNullAllowed(true)
- .dateFormat(IMAGE_DATE_2_DTO)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3935,12 +3685,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("soll_an_nach")
.internalName("soll_an_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3949,12 +3697,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("ist_an_nach1")
.internalName("ist_an_nach1")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3963,12 +3709,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("soll_ab_nach")
.internalName("soll_ab_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3977,12 +3721,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("ist_ab_nach")
.internalName("ist_ab_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -3991,12 +3733,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fahrt_id")
.internalName("fahrt_id")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4005,12 +3745,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fahrweg_id")
.internalName("fahrweg_id")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4019,12 +3757,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fw_no")
.internalName("fw_no")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4033,12 +3769,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fw_typ")
.internalName("fw_typ")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4047,12 +3781,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fw_kurz")
.internalName("fw_kurz")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4061,12 +3793,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("fw_lang")
.internalName("fw_lang")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4075,12 +3805,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("umlauf_von")
.internalName("umlauf_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4089,12 +3817,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_id_von")
.internalName("halt_id_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4103,12 +3829,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_id_nach")
.internalName("halt_id_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4117,12 +3841,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_punkt_id_von")
.internalName("halt_punkt_id_von")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build(),
@@ -4131,12 +3853,10 @@ public abstract class BaseTest {
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
- .autoGenerated(false)
.columnType(ColumnTypeDto.INT)
.name("halt_punkt_id_nach")
.internalName("halt_punkt_id_nach")
.isNullAllowed(true)
- .dateFormat(null)
.enums(new LinkedList<>())
.sets(new LinkedList<>())
.build());
@@ -4198,7 +3918,6 @@ public abstract class BaseTest {
.internalName("id")
.columnType(TableColumnType.BIGINT)
.isNullAllowed(false)
- .autoGenerated(true)
.build(),
TableColumn.builder()
.id(COLUMN_5_2_ID)
@@ -4208,7 +3927,6 @@ public abstract class BaseTest {
.internalName("animal_name")
.columnType(TableColumnType.VARCHAR)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_3_ID)
@@ -4218,7 +3936,6 @@ public abstract class BaseTest {
.internalName("hair")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_4_ID)
@@ -4228,7 +3945,6 @@ public abstract class BaseTest {
.internalName("feathers")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_5_ID)
@@ -4238,7 +3954,6 @@ public abstract class BaseTest {
.internalName("bread")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_6_ID)
@@ -4248,7 +3963,6 @@ public abstract class BaseTest {
.internalName("eggs")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_7_ID)
@@ -4258,7 +3972,6 @@ public abstract class BaseTest {
.internalName("milk")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_8_ID)
@@ -4268,7 +3981,6 @@ public abstract class BaseTest {
.internalName("water")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_9_ID)
@@ -4278,7 +3990,6 @@ public abstract class BaseTest {
.internalName("airborne")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_10_ID)
@@ -4288,7 +3999,6 @@ public abstract class BaseTest {
.internalName("waterborne")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_11_ID)
@@ -4298,7 +4008,6 @@ public abstract class BaseTest {
.internalName("aquantic")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_12_ID)
@@ -4308,7 +4017,6 @@ public abstract class BaseTest {
.internalName("predator")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_13_ID)
@@ -4318,7 +4026,6 @@ public abstract class BaseTest {
.internalName("backbone")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_14_ID)
@@ -4328,7 +4035,6 @@ public abstract class BaseTest {
.internalName("breathes")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_15_ID)
@@ -4338,7 +4044,6 @@ public abstract class BaseTest {
.internalName("venomous")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_16_ID)
@@ -4348,7 +4053,6 @@ public abstract class BaseTest {
.internalName("fin")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_17_ID)
@@ -4358,7 +4062,6 @@ public abstract class BaseTest {
.internalName("legs")
.columnType(TableColumnType.INT)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_18_ID)
@@ -4368,7 +4071,6 @@ public abstract class BaseTest {
.internalName("tail")
.columnType(TableColumnType.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_19_ID)
@@ -4378,7 +4080,6 @@ public abstract class BaseTest {
.internalName("domestic")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_20_ID)
@@ -4388,7 +4089,6 @@ public abstract class BaseTest {
.internalName("catsize")
.columnType(TableColumnType.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_5_21_ID)
@@ -4398,7 +4098,6 @@ public abstract class BaseTest {
.internalName("class_type")
.columnType(TableColumnType.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static List<ColumnDto> TABLE_5_COLUMNS_DTO = List.of(ColumnDto.builder()
@@ -4410,7 +4109,6 @@ public abstract class BaseTest {
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
.isNullAllowed(false)
- .autoGenerated(true)
.build(),
ColumnDto.builder()
.id(COLUMN_5_2_ID)
@@ -4421,7 +4119,6 @@ public abstract class BaseTest {
.internalName("animal_name")
.columnType(ColumnTypeDto.VARCHAR)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_3_ID)
@@ -4432,7 +4129,6 @@ public abstract class BaseTest {
.internalName("hair")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_4_ID)
@@ -4443,7 +4139,6 @@ public abstract class BaseTest {
.internalName("feathers")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_5_ID)
@@ -4454,7 +4149,6 @@ public abstract class BaseTest {
.internalName("bread")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_6_ID)
@@ -4465,7 +4159,6 @@ public abstract class BaseTest {
.internalName("eggs")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_7_ID)
@@ -4476,7 +4169,6 @@ public abstract class BaseTest {
.internalName("milk")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_8_ID)
@@ -4487,7 +4179,6 @@ public abstract class BaseTest {
.internalName("water")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_9_ID)
@@ -4498,7 +4189,6 @@ public abstract class BaseTest {
.internalName("airborne")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_10_ID)
@@ -4509,7 +4199,6 @@ public abstract class BaseTest {
.internalName("waterborne")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_11_ID)
@@ -4520,7 +4209,6 @@ public abstract class BaseTest {
.internalName("aquantic")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_12_ID)
@@ -4531,7 +4219,6 @@ public abstract class BaseTest {
.internalName("predator")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_13_ID)
@@ -4542,7 +4229,6 @@ public abstract class BaseTest {
.internalName("backbone")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_14_ID)
@@ -4553,7 +4239,6 @@ public abstract class BaseTest {
.internalName("breathes")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_15_ID)
@@ -4564,7 +4249,6 @@ public abstract class BaseTest {
.internalName("venomous")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_16_ID)
@@ -4575,7 +4259,6 @@ public abstract class BaseTest {
.internalName("fin")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_17_ID)
@@ -4586,7 +4269,6 @@ public abstract class BaseTest {
.internalName("legs")
.columnType(ColumnTypeDto.INT)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_18_ID)
@@ -4597,7 +4279,6 @@ public abstract class BaseTest {
.internalName("tail")
.columnType(ColumnTypeDto.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_19_ID)
@@ -4608,7 +4289,6 @@ public abstract class BaseTest {
.internalName("domestic")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_20_ID)
@@ -4619,7 +4299,6 @@ public abstract class BaseTest {
.internalName("catsize")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_5_21_ID)
@@ -4630,7 +4309,6 @@ public abstract class BaseTest {
.internalName("class_type")
.columnType(ColumnTypeDto.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static List<ForeignKeyCreateDto> TABLE_5_FOREIGN_KEYS_INVALID_CREATE = List.of(ForeignKeyCreateDto.builder()
@@ -4778,7 +4456,6 @@ public abstract class BaseTest {
.internalName("id")
.columnType(TableColumnType.BIGINT)
.isNullAllowed(false)
- .autoGenerated(true)
.build(),
TableColumn.builder()
.id(68L)
@@ -4788,7 +4465,6 @@ public abstract class BaseTest {
.internalName("firstname")
.columnType(TableColumnType.VARCHAR)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(69L)
@@ -4798,7 +4474,6 @@ public abstract class BaseTest {
.internalName("lastname")
.columnType(TableColumnType.VARCHAR)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(70L)
@@ -4808,7 +4483,6 @@ public abstract class BaseTest {
.internalName("birth")
.columnType(TableColumnType.YEAR)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(71L)
@@ -4817,9 +4491,7 @@ public abstract class BaseTest {
.name("reminder")
.internalName("reminder")
.columnType(TableColumnType.TIME)
- .dateFormat(IMAGE_DATE_4)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(72L)
@@ -4829,7 +4501,6 @@ public abstract class BaseTest {
.internalName("ref_id")
.columnType(TableColumnType.BIGINT)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static ColumnBriefDto TABLE_6_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
@@ -4848,7 +4519,6 @@ public abstract class BaseTest {
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
.isNullAllowed(false)
- .autoGenerated(true)
.build(),
ColumnDto.builder()
.id(68L)
@@ -4859,7 +4529,6 @@ public abstract class BaseTest {
.internalName("firstname")
.columnType(ColumnTypeDto.VARCHAR)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(69L)
@@ -4870,7 +4539,6 @@ public abstract class BaseTest {
.internalName("lastname")
.columnType(ColumnTypeDto.VARCHAR)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(70L)
@@ -4881,7 +4549,6 @@ public abstract class BaseTest {
.internalName("birth")
.columnType(ColumnTypeDto.YEAR)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(71L)
@@ -4891,9 +4558,7 @@ public abstract class BaseTest {
.name("reminder")
.internalName("reminder")
.columnType(ColumnTypeDto.TIME)
- .dateFormat(IMAGE_DATE_4_DTO)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(72L)
@@ -4904,7 +4569,6 @@ public abstract class BaseTest {
.internalName("ref_id")
.columnType(ColumnTypeDto.BIGINT)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static List<List<String>> TABLE_6_UNIQUES_CREATE = List.of(
@@ -4971,7 +4635,6 @@ public abstract class BaseTest {
.internalName("name_id")
.columnType(TableColumnType.BIGINT)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
TableColumn.builder()
.id(COLUMN_7_2_ID)
@@ -4981,7 +4644,6 @@ public abstract class BaseTest {
.internalName("zoo_id")
.columnType(TableColumnType.BIGINT)
.isNullAllowed(false)
- .autoGenerated(false)
.build());
public final static List<ColumnDto> TABLE_7_COLUMNS_DTO = List.of(ColumnDto.builder()
@@ -4993,7 +4655,6 @@ public abstract class BaseTest {
.internalName("name_id")
.columnType(ColumnTypeDto.BIGINT)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ColumnDto.builder()
.id(COLUMN_7_2_ID)
@@ -5004,7 +4665,6 @@ public abstract class BaseTest {
.internalName("zoo_id")
.columnType(ColumnTypeDto.BIGINT)
.isNullAllowed(false)
- .autoGenerated(false)
.build());
public final static Long VIEW_1_ID = 1L;
@@ -5027,7 +4687,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.VARCHAR)
.size(255L)
.isNullAllowed(false)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(2L)
@@ -5038,7 +4697,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.DOUBLE)
.size(22L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(3L)
@@ -5049,8 +4707,7 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.DOUBLE)
.size(22L)
.isNullAllowed(true)
- .autoGenerated(false)
- .build() );
+ .build());
public final static View VIEW_1 = View.builder()
.id(VIEW_1_ID)
@@ -5101,7 +4758,6 @@ public abstract class BaseTest {
.columnType(TableColumnType.VARCHAR)
.size(255L)
.isNullAllowed(false)
- .autoGenerated(false)
.view(VIEW_1)
.build(),
ViewColumn.builder()
@@ -5114,7 +4770,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_1)
.build(),
ViewColumn.builder()
@@ -5127,7 +4782,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_1)
.build()
);
@@ -5195,20 +4849,16 @@ public abstract class BaseTest {
.internalName("date")
.ordinalPosition(1)
.columnType(ColumnTypeDto.DATE)
- .dateFormat(IMAGE_DATE_1_DTO)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(5L)
.name("loc")
.internalName("loc")
- .alias("loc")
.ordinalPosition(2)
.columnType(ColumnTypeDto.VARCHAR)
.size(255L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(6L)
@@ -5219,7 +4869,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(7L)
@@ -5230,7 +4879,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.build()
);
@@ -5254,20 +4902,17 @@ public abstract class BaseTest {
.name("Date")
.internalName("date")
.columnType(TableColumnType.DATE)
- .dateFormat(IMAGE_DATE_1)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_2)
.build(),
ViewColumn.builder()
.id(5L)
.ordinalPosition(1)
- .name("Location")
- .internalName("location")
+ .name("loc")
+ .internalName("loc")
.columnType(TableColumnType.VARCHAR)
.size(255L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_2)
.build(),
ViewColumn.builder()
@@ -5279,7 +4924,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_2)
.build(),
ViewColumn.builder()
@@ -5291,7 +4935,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_2)
.build()
);
@@ -5357,7 +5000,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(9L)
@@ -5370,7 +5012,6 @@ public abstract class BaseTest {
.concept(CONCEPT_1_DTO)
.unit(UNIT_1_DTO)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(10L)
@@ -5380,7 +5021,6 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.VARCHAR)
.size(255L)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(11L)
@@ -5388,9 +5028,7 @@ public abstract class BaseTest {
.internalName("date")
.ordinalPosition(3)
.columnType(ColumnTypeDto.DATE)
- .dateFormat(IMAGE_DATE_1_DTO)
.isNullAllowed(true)
- .autoGenerated(false)
.build()
);
@@ -5431,7 +5069,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_3)
.build(),
ViewColumn.builder()
@@ -5443,7 +5080,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_3)
.build(),
ViewColumn.builder()
@@ -5454,7 +5090,6 @@ public abstract class BaseTest {
.columnType(TableColumnType.VARCHAR)
.size(255L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_3)
.build(),
ViewColumn.builder()
@@ -5463,9 +5098,7 @@ public abstract class BaseTest {
.name("Date")
.internalName("date")
.columnType(TableColumnType.DATE)
- .dateFormat(IMAGE_DATE_1)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_3)
.build()
);
@@ -5515,7 +5148,6 @@ public abstract class BaseTest {
.internalName("animal_name")
.columnType(ColumnTypeDto.VARCHAR)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(13L)
@@ -5524,7 +5156,6 @@ public abstract class BaseTest {
.internalName("hair")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(14L)
@@ -5533,7 +5164,6 @@ public abstract class BaseTest {
.internalName("feathers")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(15L)
@@ -5542,7 +5172,6 @@ public abstract class BaseTest {
.internalName("eggs")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(16L)
@@ -5551,7 +5180,6 @@ public abstract class BaseTest {
.internalName("milk")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(17L)
@@ -5560,7 +5188,6 @@ public abstract class BaseTest {
.internalName("airborne")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(18L)
@@ -5569,7 +5196,6 @@ public abstract class BaseTest {
.internalName("aquantic")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(19L)
@@ -5578,7 +5204,6 @@ public abstract class BaseTest {
.internalName("predator")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(20L)
@@ -5587,7 +5212,6 @@ public abstract class BaseTest {
.internalName("backbone")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(21L)
@@ -5596,7 +5220,6 @@ public abstract class BaseTest {
.internalName("breathes")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(22L)
@@ -5605,7 +5228,6 @@ public abstract class BaseTest {
.internalName("venomous")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(23L)
@@ -5614,7 +5236,6 @@ public abstract class BaseTest {
.internalName("fin")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(24L)
@@ -5623,7 +5244,6 @@ public abstract class BaseTest {
.internalName("legs")
.columnType(ColumnTypeDto.INT)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(25L)
@@ -5632,7 +5252,6 @@ public abstract class BaseTest {
.internalName("tail")
.columnType(ColumnTypeDto.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(26L)
@@ -5641,7 +5260,6 @@ public abstract class BaseTest {
.internalName("domestic")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(27L)
@@ -5650,7 +5268,6 @@ public abstract class BaseTest {
.internalName("catsize")
.columnType(ColumnTypeDto.BOOL)
.isNullAllowed(true)
- .autoGenerated(false)
.build(),
ViewColumnDto.builder()
.id(28L)
@@ -5659,7 +5276,6 @@ public abstract class BaseTest {
.internalName("class_type")
.columnType(ColumnTypeDto.DECIMAL)
.isNullAllowed(true)
- .autoGenerated(false)
.build());
public final static View VIEW_4 = View.builder()
@@ -5688,6 +5304,161 @@ public abstract class BaseTest {
.columns(VIEW_4_COLUMNS_DTO)
.build();
+ public final static List<ViewColumn> VIEW_4_COLUMNS = List.of(
+ ViewColumn.builder()
+ .id(12L)
+ .ordinalPosition(0)
+ .name("Animal Name")
+ .internalName("animal_name")
+ .columnType(TableColumnType.VARCHAR)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(13L)
+ .ordinalPosition(1)
+ .name("Hair")
+ .internalName("hair")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(14L)
+ .ordinalPosition(2)
+ .name("Feathers")
+ .internalName("feathers")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(15L)
+ .ordinalPosition(3)
+ .name("Eggs")
+ .internalName("eggs")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(16L)
+ .ordinalPosition(4)
+ .name("Milk")
+ .internalName("milk")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(17L)
+ .ordinalPosition(5)
+ .name("Airborne")
+ .internalName("airborne")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(18L)
+ .ordinalPosition(6)
+ .name("Aquantic")
+ .internalName("aquantic")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(19L)
+ .ordinalPosition(7)
+ .name("Predator")
+ .internalName("predator")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(20L)
+ .ordinalPosition(8)
+ .name("Backbone")
+ .internalName("backbone")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(21L)
+ .ordinalPosition(9)
+ .name("Breathes")
+ .internalName("breathes")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(22L)
+ .ordinalPosition(10)
+ .name("Venomous")
+ .internalName("venomous")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(23L)
+ .ordinalPosition(11)
+ .name("Fin")
+ .internalName("fin")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(24L)
+ .ordinalPosition(12)
+ .name("Legs")
+ .internalName("legs")
+ .columnType(TableColumnType.INT)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(25L)
+ .ordinalPosition(13)
+ .name("Tail")
+ .internalName("tail")
+ .columnType(TableColumnType.DECIMAL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(26L)
+ .ordinalPosition(14)
+ .name("Domestic")
+ .internalName("domestic")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(27L)
+ .ordinalPosition(15)
+ .name("Catsize")
+ .internalName("catsize")
+ .columnType(TableColumnType.BOOL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build(),
+ ViewColumn.builder()
+ .id(28L)
+ .ordinalPosition(16)
+ .name("Class Type")
+ .internalName("class_type")
+ .columnType(TableColumnType.DECIMAL)
+ .isNullAllowed(true)
+ .view(VIEW_4)
+ .build());
+
public final static Long VIEW_5_ID = 5L;
public final static Boolean VIEW_5_INITIAL_VIEW = false;
public final static String VIEW_5_NAME = "Mock View";
@@ -5734,7 +5505,6 @@ public abstract class BaseTest {
.columnType(TableColumnType.VARCHAR)
.size(255L)
.isNullAllowed(false)
- .autoGenerated(false)
.view(VIEW_5)
.build(),
ViewColumn.builder()
@@ -5747,7 +5517,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_5)
.build(),
ViewColumn.builder()
@@ -5760,7 +5529,6 @@ public abstract class BaseTest {
.size(10L)
.d(0L)
.isNullAllowed(true)
- .autoGenerated(false)
.view(VIEW_5)
.build());
diff --git a/dbrepo-metric-db/prometheus.yml b/dbrepo-metric-db/prometheus.yml
index 447396d167785e7973855314431230fb1193bd0d..10df4f18959a0630be82ec22e44adbf13818f7bf 100644
--- a/dbrepo-metric-db/prometheus.yml
+++ b/dbrepo-metric-db/prometheus.yml
@@ -9,11 +9,15 @@ alerting:
- targets: []
scrape_configs:
- - job_name: 'spring boot scrape'
+ - job_name: 'java actuator scrape'
metrics_path: '/actuator/prometheus'
static_configs:
- targets: ['data-service:8080', 'metadata-service:8080']
- job_name: 'metrics scrape'
metrics_path: '/metrics'
static_configs:
- - targets: ['auth-service:8080', 'analyse-service:8080', 'search-service:8080', 'data-db-sidecar:8080', 'broker-service:15692', 'ui:3000', 'dashboard-service:3000', 'storage-service:9090', 'upload-service:8080']
+ - targets: ['ui:3000', 'auth-service:9000', 'analyse-service:8080', 'search-service:8080', 'data-db-sidecar:8080', 'broker-service:15692', 'storage-service:9090', 'upload-service:8080', 'dashboard-service:3000']
+# - job_name: 'gateway scrape'
+# metrics_path: '/metrics'
+# static_configs:
+# - targets: ['dbrepo-gateway-service-sidecar:9113']
diff --git a/dbrepo-search-service/.coveragerc b/dbrepo-search-service/.coveragerc
new file mode 100644
index 0000000000000000000000000000000000000000..4683a93d3748d16ab20a61f318e3016d3f4a8e09
--- /dev/null
+++ b/dbrepo-search-service/.coveragerc
@@ -0,0 +1,5 @@
+[report]
+omit =
+ */test/*
+ */omlib/*
+ */init/*
\ No newline at end of file
diff --git a/dbrepo-search-service/.gitignore b/dbrepo-search-service/.gitignore
index 4acceedc9aee48621f76f34ea6dc297dae6065f4..78c8fdf6e56a9e006504b1f2345abdacbf6e7bb4 100644
--- a/dbrepo-search-service/.gitignore
+++ b/dbrepo-search-service/.gitignore
@@ -9,6 +9,14 @@ __pycache__/
# Generated
coverage.txt
report.xml
+clients/
+omlib/
+
+# Libraries
+./lib/dbrepo-1.4.4*
+./lib/dbrepo-1.4.5*
+./lib/dbrepo-1.4.6*
+./lib/dbrepo-1.4.7rc*
# Distribution / packaging
.Python
diff --git a/dbrepo-search-service/Dockerfile b/dbrepo-search-service/Dockerfile
index 35427f81a429f8a61bd724f7bb8141b734d5013f..9586d0be307c57572de9ece9667903fa92a8a7a8 100644
--- a/dbrepo-search-service/Dockerfile
+++ b/dbrepo-search-service/Dockerfile
@@ -17,8 +17,8 @@ USER 1001
WORKDIR /app
-COPY --chown=1001 ./clients ./clients
-COPY --chown=1001 ./omlib ./omlib
+COPY --chown=1001 ./init/clients ./clients
+COPY --chown=1001 ./init/omlib ./omlib
COPY --chown=1001 ./os-yml ./os-yml
COPY --chown=1001 ./app.py ./app.py
COPY --chown=1001 ./friendly_names_overrides.json ./friendly_names_overrides.json
diff --git a/dbrepo-search-service/Pipfile b/dbrepo-search-service/Pipfile
index 260236a6ec0d2f08ba3929a45f875dd9cd449e5f..e74391ce665a39201bd480819e31a712fe82a6c7 100644
--- a/dbrepo-search-service/Pipfile
+++ b/dbrepo-search-service/Pipfile
@@ -18,12 +18,13 @@ jwt = "~=1.3"
testcontainers-opensearch = "*"
pytest = "*"
rdflib = "*"
-dbrepo = {path = "./lib/dbrepo-1.4.6.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"}
gunicorn = "*"
[dev-packages]
coverage = "*"
pytest = "*"
+requests-mock = "*"
[requires]
python_version = "3.11"
diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index c8e647e9d94833b85f72bb2dbdf0c6ab2f84db00..123e864f6dd050a838ae2c7e9137a4d7b3f1e27f 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "8f7de86e8c15ccfa38b73d7deeec2c48afa5dd59f14a2d61432f5e79989b53cd"
+ "sha256": "491e5f6ada48e8af417dfa7d6a0b4d98ccf9b9072df53b44d8de014b687fc80c"
},
"pipfile-spec": 6,
"requires": {
@@ -18,108 +18,108 @@
"default": {
"aiohappyeyeballs": {
"hashes": [
- "sha256:55a1714f084e63d49639800f95716da97a1f173d46a16dfcfda0016abb93b6b2",
- "sha256:7ce92076e249169a13c2f49320d1967425eaf1f407522d707d59cac7628d62bd"
+ "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586",
+ "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572"
],
"markers": "python_version >= '3.8'",
- "version": "==2.4.0"
+ "version": "==2.4.3"
},
"aiohttp": {
"hashes": [
- "sha256:02594361128f780eecc2a29939d9dfc870e17b45178a867bf61a11b2a4367277",
- "sha256:03f2645adbe17f274444953bdea69f8327e9d278d961d85657cb0d06864814c1",
- "sha256:074d1bff0163e107e97bd48cad9f928fa5a3eb4b9d33366137ffce08a63e37fe",
- "sha256:0912b8a8fadeb32ff67a3ed44249448c20148397c1ed905d5dac185b4ca547bb",
- "sha256:0d277cfb304118079e7044aad0b76685d30ecb86f83a0711fc5fb257ffe832ca",
- "sha256:0d93400c18596b7dc4794d48a63fb361b01a0d8eb39f28800dc900c8fbdaca91",
- "sha256:123dd5b16b75b2962d0fff566effb7a065e33cd4538c1692fb31c3bda2bfb972",
- "sha256:17e997105bd1a260850272bfb50e2a328e029c941c2708170d9d978d5a30ad9a",
- "sha256:18a01eba2574fb9edd5f6e5fb25f66e6ce061da5dab5db75e13fe1558142e0a3",
- "sha256:1923a5c44061bffd5eebeef58cecf68096e35003907d8201a4d0d6f6e387ccaa",
- "sha256:1942244f00baaacaa8155eca94dbd9e8cc7017deb69b75ef67c78e89fdad3c77",
- "sha256:1b2c16a919d936ca87a3c5f0e43af12a89a3ce7ccbce59a2d6784caba945b68b",
- "sha256:1c19de68896747a2aa6257ae4cf6ef59d73917a36a35ee9d0a6f48cff0f94db8",
- "sha256:1e72589da4c90337837fdfe2026ae1952c0f4a6e793adbbfbdd40efed7c63599",
- "sha256:22c0a23a3b3138a6bf76fc553789cb1a703836da86b0f306b6f0dc1617398abc",
- "sha256:2c634a3207a5445be65536d38c13791904fda0748b9eabf908d3fe86a52941cf",
- "sha256:2d21ac12dc943c68135ff858c3a989f2194a709e6e10b4c8977d7fcd67dfd511",
- "sha256:2f1f1c75c395991ce9c94d3e4aa96e5c59c8356a15b1c9231e783865e2772699",
- "sha256:305be5ff2081fa1d283a76113b8df7a14c10d75602a38d9f012935df20731487",
- "sha256:33e6bc4bab477c772a541f76cd91e11ccb6d2efa2b8d7d7883591dfb523e5987",
- "sha256:349ef8a73a7c5665cca65c88ab24abe75447e28aa3bc4c93ea5093474dfdf0ff",
- "sha256:380f926b51b92d02a34119d072f178d80bbda334d1a7e10fa22d467a66e494db",
- "sha256:38172a70005252b6893088c0f5e8a47d173df7cc2b2bd88650957eb84fcf5022",
- "sha256:391cc3a9c1527e424c6865e087897e766a917f15dddb360174a70467572ac6ce",
- "sha256:3a1c32a19ee6bbde02f1cb189e13a71b321256cc1d431196a9f824050b160d5a",
- "sha256:4120d7fefa1e2d8fb6f650b11489710091788de554e2b6f8347c7a20ceb003f5",
- "sha256:424ae21498790e12eb759040bbb504e5e280cab64693d14775c54269fd1d2bb7",
- "sha256:44b324a6b8376a23e6ba25d368726ee3bc281e6ab306db80b5819999c737d820",
- "sha256:4790f0e15f00058f7599dab2b206d3049d7ac464dc2e5eae0e93fa18aee9e7bf",
- "sha256:4aff049b5e629ef9b3e9e617fa6e2dfeda1bf87e01bcfecaf3949af9e210105e",
- "sha256:4b38b1570242fbab8d86a84128fb5b5234a2f70c2e32f3070143a6d94bc854cf",
- "sha256:4d46c7b4173415d8e583045fbc4daa48b40e31b19ce595b8d92cf639396c15d5",
- "sha256:4f1c9866ccf48a6df2b06823e6ae80573529f2af3a0992ec4fe75b1a510df8a6",
- "sha256:4f7acae3cf1a2a2361ec4c8e787eaaa86a94171d2417aae53c0cca6ca3118ff6",
- "sha256:54d9ddea424cd19d3ff6128601a4a4d23d54a421f9b4c0fff740505813739a91",
- "sha256:58718e181c56a3c02d25b09d4115eb02aafe1a732ce5714ab70326d9776457c3",
- "sha256:5ede29d91a40ba22ac1b922ef510aab871652f6c88ef60b9dcdf773c6d32ad7a",
- "sha256:61645818edd40cc6f455b851277a21bf420ce347baa0b86eaa41d51ef58ba23d",
- "sha256:66bf9234e08fe561dccd62083bf67400bdbf1c67ba9efdc3dac03650e97c6088",
- "sha256:673f988370f5954df96cc31fd99c7312a3af0a97f09e407399f61583f30da9bc",
- "sha256:676f94c5480d8eefd97c0c7e3953315e4d8c2b71f3b49539beb2aa676c58272f",
- "sha256:6c225286f2b13bab5987425558baa5cbdb2bc925b2998038fa028245ef421e75",
- "sha256:7384d0b87d4635ec38db9263e6a3f1eb609e2e06087f0aa7f63b76833737b471",
- "sha256:7e2fe37ac654032db1f3499fe56e77190282534810e2a8e833141a021faaab0e",
- "sha256:7f2bfc0032a00405d4af2ba27f3c429e851d04fad1e5ceee4080a1c570476697",
- "sha256:7f6b639c36734eaa80a6c152a238242bedcee9b953f23bb887e9102976343092",
- "sha256:814375093edae5f1cb31e3407997cf3eacefb9010f96df10d64829362ae2df69",
- "sha256:8224f98be68a84b19f48e0bdc14224b5a71339aff3a27df69989fa47d01296f3",
- "sha256:898715cf566ec2869d5cb4d5fb4be408964704c46c96b4be267442d265390f32",
- "sha256:8989f46f3d7ef79585e98fa991e6ded55d2f48ae56d2c9fa5e491a6e4effb589",
- "sha256:8ba01ebc6175e1e6b7275c907a3a36be48a2d487549b656aa90c8a910d9f3178",
- "sha256:8c5c6fa16412b35999320f5c9690c0f554392dc222c04e559217e0f9ae244b92",
- "sha256:8c6a4e5e40156d72a40241a25cc226051c0a8d816610097a8e8f517aeacd59a2",
- "sha256:8eaf44ccbc4e35762683078b72bf293f476561d8b68ec8a64f98cf32811c323e",
- "sha256:8fb4fc029e135859f533025bc82047334e24b0d489e75513144f25408ecaf058",
- "sha256:9093a81e18c45227eebe4c16124ebf3e0d893830c6aca7cc310bfca8fe59d857",
- "sha256:94c4381ffba9cc508b37d2e536b418d5ea9cfdc2848b9a7fea6aebad4ec6aac1",
- "sha256:94fac7c6e77ccb1ca91e9eb4cb0ac0270b9fb9b289738654120ba8cebb1189c6",
- "sha256:95c4dc6f61d610bc0ee1edc6f29d993f10febfe5b76bb470b486d90bbece6b22",
- "sha256:975218eee0e6d24eb336d0328c768ebc5d617609affaca5dbbd6dd1984f16ed0",
- "sha256:ad146dae5977c4dd435eb31373b3fe9b0b1bf26858c6fc452bf6af394067e10b",
- "sha256:afe16a84498441d05e9189a15900640a2d2b5e76cf4efe8cbb088ab4f112ee57",
- "sha256:b1c43eb1ab7cbf411b8e387dc169acb31f0ca0d8c09ba63f9eac67829585b44f",
- "sha256:b90078989ef3fc45cf9221d3859acd1108af7560c52397ff4ace8ad7052a132e",
- "sha256:b98e698dc34966e5976e10bbca6d26d6724e6bdea853c7c10162a3235aba6e16",
- "sha256:ba5a8b74c2a8af7d862399cdedce1533642fa727def0b8c3e3e02fcb52dca1b1",
- "sha256:c31ad0c0c507894e3eaa843415841995bf8de4d6b2d24c6e33099f4bc9fc0d4f",
- "sha256:c3b9162bab7e42f21243effc822652dc5bb5e8ff42a4eb62fe7782bcbcdfacf6",
- "sha256:c58c6837a2c2a7cf3133983e64173aec11f9c2cd8e87ec2fdc16ce727bcf1a04",
- "sha256:c83f7a107abb89a227d6c454c613e7606c12a42b9a4ca9c5d7dad25d47c776ae",
- "sha256:cde98f323d6bf161041e7627a5fd763f9fd829bcfcd089804a5fdce7bb6e1b7d",
- "sha256:ce91db90dbf37bb6fa0997f26574107e1b9d5ff939315247b7e615baa8ec313b",
- "sha256:d00f3c5e0d764a5c9aa5a62d99728c56d455310bcc288a79cab10157b3af426f",
- "sha256:d17920f18e6ee090bdd3d0bfffd769d9f2cb4c8ffde3eb203777a3895c128862",
- "sha256:d55f011da0a843c3d3df2c2cf4e537b8070a419f891c930245f05d329c4b0689",
- "sha256:d742c36ed44f2798c8d3f4bc511f479b9ceef2b93f348671184139e7d708042c",
- "sha256:d9a487ef090aea982d748b1b0d74fe7c3950b109df967630a20584f9a99c0683",
- "sha256:d9ef084e3dc690ad50137cc05831c52b6ca428096e6deb3c43e95827f531d5ef",
- "sha256:da452c2c322e9ce0cfef392e469a26d63d42860f829026a63374fde6b5c5876f",
- "sha256:dc4826823121783dccc0871e3f405417ac116055bf184ac04c36f98b75aacd12",
- "sha256:de7a5299827253023c55ea549444e058c0eb496931fa05d693b95140a947cb73",
- "sha256:e04a1f2a65ad2f93aa20f9ff9f1b672bf912413e5547f60749fa2ef8a644e061",
- "sha256:e1ca1ef5ba129718a8fc827b0867f6aa4e893c56eb00003b7367f8a733a9b072",
- "sha256:ee40b40aa753d844162dcc80d0fe256b87cba48ca0054f64e68000453caead11",
- "sha256:f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691",
- "sha256:f29930bc2921cef955ba39a3ff87d2c4398a0394ae217f41cb02d5c26c8b1b77",
- "sha256:f489a2c9e6455d87eabf907ac0b7d230a9786be43fbe884ad184ddf9e9c1e385",
- "sha256:f5bf3ead3cb66ab990ee2561373b009db5bc0e857549b6c9ba84b20bc462e172",
- "sha256:f6f18898ace4bcd2d41a122916475344a87f1dfdec626ecde9ee802a711bc569",
- "sha256:f8112fb501b1e0567a1251a2fd0747baae60a4ab325a871e975b7bb67e59221f",
- "sha256:fd31f176429cecbc1ba499d4aba31aaccfea488f418d60376b911269d3b883c5"
+ "sha256:007ec22fbc573e5eb2fb7dec4198ef8f6bf2fe4ce20020798b2eb5d0abda6138",
+ "sha256:00819de9e45d42584bed046314c40ea7e9aea95411b38971082cad449392b08c",
+ "sha256:01948b1d570f83ee7bbf5a60ea2375a89dfb09fd419170e7f5af029510033d24",
+ "sha256:038f514fe39e235e9fef6717fbf944057bfa24f9b3db9ee551a7ecf584b5b480",
+ "sha256:03a42ac7895406220124c88911ebee31ba8b2d24c98507f4a8bf826b2937c7f2",
+ "sha256:05646ebe6b94cc93407b3bf34b9eb26c20722384d068eb7339de802154d61bc5",
+ "sha256:0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a",
+ "sha256:0b00807e2605f16e1e198f33a53ce3c4523114059b0c09c337209ae55e3823a8",
+ "sha256:0e1b370d8007c4ae31ee6db7f9a2fe801a42b146cec80a86766e7ad5c4a259cf",
+ "sha256:15ecd889a709b0080f02721255b3f80bb261c2293d3c748151274dfea93ac871",
+ "sha256:1b66ccafef7336a1e1f0e389901f60c1d920102315a56df85e49552308fc0486",
+ "sha256:1bbb122c557a16fafc10354b9d99ebf2f2808a660d78202f10ba9d50786384b9",
+ "sha256:1eb89d3d29adaf533588f209768a9c02e44e4baf832b08118749c5fad191781d",
+ "sha256:258c5dd01afc10015866114e210fb7365f0d02d9d059c3c3415382ab633fcbcb",
+ "sha256:2609e9ab08474702cc67b7702dbb8a80e392c54613ebe80db7e8dbdb79837c68",
+ "sha256:274cfa632350225ce3fdeb318c23b4a10ec25c0e2c880eff951a3842cf358ac1",
+ "sha256:28529e08fde6f12eba8677f5a8608500ed33c086f974de68cc65ab218713a59d",
+ "sha256:2b606353da03edcc71130b52388d25f9a30a126e04caef1fd637e31683033abd",
+ "sha256:30ca7c3b94708a9d7ae76ff281b2f47d8eaf2579cd05971b5dc681db8caac6e1",
+ "sha256:333cf6cf8e65f6a1e06e9eb3e643a0c515bb850d470902274239fea02033e9a8",
+ "sha256:3455522392fb15ff549d92fbf4b73b559d5e43dc522588f7eb3e54c3f38beee7",
+ "sha256:362f641f9071e5f3ee6f8e7d37d5ed0d95aae656adf4ef578313ee585b585959",
+ "sha256:3bcd391d083f636c06a68715e69467963d1f9600f85ef556ea82e9ef25f043f7",
+ "sha256:3dffb610a30d643983aeb185ce134f97f290f8935f0abccdd32c77bed9388b42",
+ "sha256:3fe407bf93533a6fa82dece0e74dbcaaf5d684e5a51862887f9eaebe6372cd79",
+ "sha256:413251f6fcf552a33c981c4709a6bba37b12710982fec8e558ae944bfb2abd38",
+ "sha256:438cd072f75bb6612f2aca29f8bd7cdf6e35e8f160bc312e49fbecab77c99e3a",
+ "sha256:4470c73c12cd9109db8277287d11f9dd98f77fc54155fc71a7738a83ffcc8ea8",
+ "sha256:45c3b868724137f713a38376fef8120c166d1eadd50da1855c112fe97954aed8",
+ "sha256:486f7aabfa292719a2753c016cc3a8f8172965cabb3ea2e7f7436c7f5a22a151",
+ "sha256:4f05e9727ce409358baa615dbeb9b969db94324a79b5a5cea45d39bdb01d82e6",
+ "sha256:50aed5155f819873d23520919e16703fc8925e509abbb1a1491b0087d1cd969e",
+ "sha256:50edbcad60d8f0e3eccc68da67f37268b5144ecc34d59f27a02f9611c1d4eec7",
+ "sha256:54ca74df1be3c7ca1cf7f4c971c79c2daf48d9aa65dea1a662ae18926f5bc8ce",
+ "sha256:578a4b875af3e0daaf1ac6fa983d93e0bbfec3ead753b6d6f33d467100cdc67b",
+ "sha256:597a079284b7ee65ee102bc3a6ea226a37d2b96d0418cc9047490f231dc09fe8",
+ "sha256:59bb3c54aa420521dc4ce3cc2c3fe2ad82adf7b09403fa1f48ae45c0cbde6628",
+ "sha256:5c6a5b8c7926ba5d8545c7dd22961a107526562da31a7a32fa2456baf040939f",
+ "sha256:64f6c17757251e2b8d885d728b6433d9d970573586a78b78ba8929b0f41d045a",
+ "sha256:679abe5d3858b33c2cf74faec299fda60ea9de62916e8b67e625d65bf069a3b7",
+ "sha256:741a46d58677d8c733175d7e5aa618d277cd9d880301a380fd296975a9cdd7bc",
+ "sha256:7789050d9e5d0c309c706953e5e8876e38662d57d45f936902e176d19f1c58ab",
+ "sha256:77abf6665ae54000b98b3c742bc6ea1d1fb31c394bcabf8b5d2c1ac3ebfe7f3b",
+ "sha256:79019094f87c9fb44f8d769e41dbb664d6e8fcfd62f665ccce36762deaa0e911",
+ "sha256:7b06b7843929e41a94ea09eb1ce3927865387e3e23ebe108e0d0d09b08d25be9",
+ "sha256:7e338c0523d024fad378b376a79faff37fafb3c001872a618cde1d322400a572",
+ "sha256:7ea7ffc6d6d6f8a11e6f40091a1040995cdff02cfc9ba4c2f30a516cb2633554",
+ "sha256:8105fd8a890df77b76dd3054cddf01a879fc13e8af576805d667e0fa0224c35d",
+ "sha256:84afcdea18eda514c25bc68b9af2a2b1adea7c08899175a51fe7c4fb6d551257",
+ "sha256:9294bbb581f92770e6ed5c19559e1e99255e4ca604a22c5c6397b2f9dd3ee42c",
+ "sha256:93429602396f3383a797a2a70e5f1de5df8e35535d7806c9f91df06f297e109b",
+ "sha256:9627cc1a10c8c409b5822a92d57a77f383b554463d1884008e051c32ab1b3742",
+ "sha256:998f3bd3cfc95e9424a6acd7840cbdd39e45bc09ef87533c006f94ac47296090",
+ "sha256:9c72109213eb9d3874f7ac8c0c5fa90e072d678e117d9061c06e30c85b4cf0e6",
+ "sha256:9fc1500fd2a952c5c8e3b29aaf7e3cc6e27e9cfc0a8819b3bce48cc1b849e4cc",
+ "sha256:a3f00003de6eba42d6e94fabb4125600d6e484846dbf90ea8e48a800430cc142",
+ "sha256:a45d85cf20b5e0d0aa5a8dca27cce8eddef3292bc29d72dcad1641f4ed50aa16",
+ "sha256:a7d8d14fe962153fc681f6366bdec33d4356f98a3e3567782aac1b6e0e40109a",
+ "sha256:a8fa23fe62c436ccf23ff930149c047f060c7126eae3ccea005f0483f27b2e28",
+ "sha256:aa6658732517ddabe22c9036479eabce6036655ba87a0224c612e1ae6af2087e",
+ "sha256:aafc8ee9b742ce75044ae9a4d3e60e3d918d15a4c2e08a6c3c3e38fa59b92d94",
+ "sha256:ab5a5a0c7a7991d90446a198689c0535be89bbd6b410a1f9a66688f0880ec026",
+ "sha256:acd48d5b80ee80f9432a165c0ac8cbf9253eaddb6113269a5e18699b33958dbb",
+ "sha256:ad7593bb24b2ab09e65e8a1d385606f0f47c65b5a2ae6c551db67d6653e78c28",
+ "sha256:baa42524a82f75303f714108fea528ccacf0386af429b69fff141ffef1c534f9",
+ "sha256:bdfcf6443637c148c4e1a20c48c566aa694fa5e288d34b20fcdc58507882fed3",
+ "sha256:be7443669ae9c016b71f402e43208e13ddf00912f47f623ee5994e12fc7d4b3f",
+ "sha256:c02a30b904282777d872266b87b20ed8cc0d1501855e27f831320f471d54d983",
+ "sha256:c1277cd707c465cd09572a774559a3cc7c7a28802eb3a2a9472588f062097205",
+ "sha256:c30a0eafc89d28e7f959281b58198a9fa5e99405f716c0289b7892ca345fe45f",
+ "sha256:c5ce2ce7c997e1971b7184ee37deb6ea9922ef5163c6ee5aa3c274b05f9e12fa",
+ "sha256:c823bc3971c44ab93e611ab1a46b1eafeae474c0c844aff4b7474287b75fe49c",
+ "sha256:ce0cdc074d540265bfeb31336e678b4e37316849d13b308607efa527e981f5c2",
+ "sha256:d1720b4f14c78a3089562b8875b53e36b51c97c51adc53325a69b79b4b48ebcb",
+ "sha256:d183cf9c797a5291e8301790ed6d053480ed94070637bfaad914dd38b0981f67",
+ "sha256:d9010c31cd6fa59438da4e58a7f19e4753f7f264300cd152e7f90d4602449762",
+ "sha256:d9e5e4a85bdb56d224f412d9c98ae4cbd032cc4f3161818f692cd81766eee65a",
+ "sha256:da1dee8948d2137bb51fbb8a53cce6b1bcc86003c6b42565f008438b806cccd8",
+ "sha256:df9270660711670e68803107d55c2b5949c2e0f2e4896da176e1ecfc068b974a",
+ "sha256:e00e3505cd80440f6c98c6d69269dcc2a119f86ad0a9fd70bccc59504bebd68a",
+ "sha256:e48d5021a84d341bcaf95c8460b152cfbad770d28e5fe14a768988c461b821bc",
+ "sha256:e7f8b04d83483577fd9200461b057c9f14ced334dcb053090cea1da9c8321a91",
+ "sha256:edfe3341033a6b53a5c522c802deb2079eee5cbfbb0af032a55064bd65c73a23",
+ "sha256:ef9c33cc5cbca35808f6c74be11eb7f5f6b14d2311be84a15b594bd3e58b5527",
+ "sha256:f2d4324a98062be0525d16f768a03e0bbb3b9fe301ceee99611dc9a7953124e6",
+ "sha256:f3935f82f6f4a3820270842e90456ebad3af15810cf65932bd24da4463bc0a4c",
+ "sha256:f614ab0c76397661b90b6851a030004dac502e48260ea10f2441abd2207fbcc7",
+ "sha256:f7db54c7914cc99d901d93a34704833568d86c20925b2762f9fa779f9cd2e70f",
+ "sha256:fbc6264158392bad9df19537e872d476f7c57adf718944cc1e4495cbabf38e2a",
+ "sha256:fe2fb38c2ed905a2582948e2de560675e9dfbee94c6d5ccdb1301c6d0a5bf092",
+ "sha256:ffe595f10566f8276b76dc3a11ae4bb7eba1aac8ddd75811736a15b0d5311414"
],
"markers": "python_version >= '3.8'",
- "version": "==3.10.5"
+ "version": "==3.10.10"
},
"aiosignal": {
"hashes": [
@@ -236,99 +236,114 @@
},
"charset-normalizer": {
"hashes": [
- "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
- "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
- "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
- "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
- "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
- "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
- "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
- "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
- "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
- "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
- "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
- "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
- "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
- "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
- "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
- "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
- "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
- "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
- "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
- "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
- "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
- "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
- "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
- "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
- "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
- "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
- "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
- "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
- "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
- "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
- "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
- "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
- "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
- "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
- "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
- "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
- "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
- "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
- "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
- "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
- "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
- "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
- "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
- "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
- "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
- "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
- "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
- "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
- "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
- "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
- "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
- "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
- "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
- "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
- "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
- "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
- "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
- "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
- "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
- "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
- "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
- "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
- "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
- "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
- "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
- "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
- "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
- "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
- "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
- "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
- "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
- "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
- "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
- "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
- "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
- "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
- "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
- "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
- "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
- "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
- "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
- "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
- "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
- "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
- "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
- "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
- "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
- "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
- "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
- "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
+ "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.3.2"
+ "version": "==3.4.0"
},
"click": {
"hashes": [
@@ -373,10 +388,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:b0e92f1a6130cd00924b3011c0e9029b292ee7c8faea3eca20f8af5ea9531c1b"
+ "sha256:84607677b0826bb9b2fa120aacdf56d16c8d9ae423f435b2bd2c22b1c965a33c"
],
- "markers": "python_version >= '3.11'",
- "path": "./lib/dbrepo-1.4.6.tar.gz"
+ "path": "./lib/dbrepo-1.4.7.tar.gz"
},
"docker": {
"hashes": [
@@ -527,75 +541,82 @@
},
"greenlet": {
"hashes": [
- "sha256:01059afb9b178606b4b6e92c3e710ea1635597c3537e44da69f4531e111dd5e9",
- "sha256:037d9ac99540ace9424cb9ea89f0accfaff4316f149520b4ae293eebc5bded17",
- "sha256:0e49a65d25d7350cca2da15aac31b6f67a43d867448babf997fe83c7505f57bc",
- "sha256:13ff8c8e54a10472ce3b2a2da007f915175192f18e6495bad50486e87c7f6637",
- "sha256:1544b8dd090b494c55e60c4ff46e238be44fdc472d2589e943c241e0169bcea2",
- "sha256:184258372ae9e1e9bddce6f187967f2e08ecd16906557c4320e3ba88a93438c3",
- "sha256:1ddc7bcedeb47187be74208bc652d63d6b20cb24f4e596bd356092d8000da6d6",
- "sha256:221169d31cada333a0c7fd087b957c8f431c1dba202c3a58cf5a3583ed973e9b",
- "sha256:243a223c96a4246f8a30ea470c440fe9db1f5e444941ee3c3cd79df119b8eebf",
- "sha256:24fc216ec7c8be9becba8b64a98a78f9cd057fd2dc75ae952ca94ed8a893bf27",
- "sha256:2651dfb006f391bcb240635079a68a261b227a10a08af6349cba834a2141efa1",
- "sha256:26811df4dc81271033a7836bc20d12cd30938e6bd2e9437f56fa03da81b0f8fc",
- "sha256:26d9c1c4f1748ccac0bae1dbb465fb1a795a75aba8af8ca871503019f4285e2a",
- "sha256:28fe80a3eb673b2d5cc3b12eea468a5e5f4603c26aa34d88bf61bba82ceb2f9b",
- "sha256:2cd8518eade968bc52262d8c46727cfc0826ff4d552cf0430b8d65aaf50bb91d",
- "sha256:2d004db911ed7b6218ec5c5bfe4cf70ae8aa2223dffbb5b3c69e342bb253cb28",
- "sha256:3d07c28b85b350564bdff9f51c1c5007dfb2f389385d1bc23288de51134ca303",
- "sha256:3e7e6ef1737a819819b1163116ad4b48d06cfdd40352d813bb14436024fcda99",
- "sha256:44151d7b81b9391ed759a2f2865bbe623ef00d648fed59363be2bbbd5154656f",
- "sha256:44cd313629ded43bb3b98737bba2f3e2c2c8679b55ea29ed73daea6b755fe8e7",
- "sha256:4a3dae7492d16e85ea6045fd11cb8e782b63eac8c8d520c3a92c02ac4573b0a6",
- "sha256:4b5ea3664eed571779403858d7cd0a9b0ebf50d57d2cdeafc7748e09ef8cd81a",
- "sha256:4c3446937be153718250fe421da548f973124189f18fe4575a0510b5c928f0cc",
- "sha256:5415b9494ff6240b09af06b91a375731febe0090218e2898d2b85f9b92abcda0",
- "sha256:5fd6e94593f6f9714dbad1aaba734b5ec04593374fa6638df61592055868f8b8",
- "sha256:619935a44f414274a2c08c9e74611965650b730eb4efe4b2270f91df5e4adf9a",
- "sha256:655b21ffd37a96b1e78cc48bf254f5ea4b5b85efaf9e9e2a526b3c9309d660ca",
- "sha256:665b21e95bc0fce5cab03b2e1d90ba9c66c510f1bb5fdc864f3a377d0f553f6b",
- "sha256:6a4bf607f690f7987ab3291406e012cd8591a4f77aa54f29b890f9c331e84989",
- "sha256:6cea1cca3be76c9483282dc7760ea1cc08a6ecec1f0b6ca0a94ea0d17432da19",
- "sha256:713d450cf8e61854de9420fb7eea8ad228df4e27e7d4ed465de98c955d2b3fa6",
- "sha256:726377bd60081172685c0ff46afbc600d064f01053190e4450857483c4d44484",
- "sha256:76b3e3976d2a452cba7aa9e453498ac72240d43030fdc6d538a72b87eaff52fd",
- "sha256:76dc19e660baea5c38e949455c1181bc018893f25372d10ffe24b3ed7341fb25",
- "sha256:76e5064fd8e94c3f74d9fd69b02d99e3cdb8fc286ed49a1f10b256e59d0d3a0b",
- "sha256:7f346d24d74c00b6730440f5eb8ec3fe5774ca8d1c9574e8e57c8671bb51b910",
- "sha256:81eeec4403a7d7684b5812a8aaa626fa23b7d0848edb3a28d2eb3220daddcbd0",
- "sha256:90b5bbf05fe3d3ef697103850c2ce3374558f6fe40fd57c9fac1bf14903f50a5",
- "sha256:9730929375021ec90f6447bff4f7f5508faef1c02f399a1953870cdb78e0c345",
- "sha256:9eb4a1d7399b9f3c7ac68ae6baa6be5f9195d1d08c9ddc45ad559aa6b556bce6",
- "sha256:a0409bc18a9f85321399c29baf93545152d74a49d92f2f55302f122007cfda00",
- "sha256:a22f4e26400f7f48faef2d69c20dc055a1f3043d330923f9abe08ea0aecc44df",
- "sha256:a53dfe8f82b715319e9953330fa5c8708b610d48b5c59f1316337302af5c0811",
- "sha256:a771dc64fa44ebe58d65768d869fcfb9060169d203446c1d446e844b62bdfdca",
- "sha256:a814dc3100e8a046ff48faeaa909e80cdb358411a3d6dd5293158425c684eda8",
- "sha256:a8870983af660798dc1b529e1fd6f1cefd94e45135a32e58bd70edd694540f33",
- "sha256:ac0adfdb3a21dc2a24ed728b61e72440d297d0fd3a577389df566651fcd08f97",
- "sha256:b395121e9bbe8d02a750886f108d540abe66075e61e22f7353d9acb0b81be0f0",
- "sha256:b9505a0c8579899057cbefd4ec34d865ab99852baf1ff33a9481eb3924e2da0b",
- "sha256:c0a5b1c22c82831f56f2f7ad9bbe4948879762fe0d59833a4a71f16e5fa0f682",
- "sha256:c3967dcc1cd2ea61b08b0b276659242cbce5caca39e7cbc02408222fb9e6ff39",
- "sha256:c6f4c2027689093775fd58ca2388d58789009116844432d920e9147f91acbe64",
- "sha256:c9d86401550b09a55410f32ceb5fe7efcd998bd2dad9e82521713cb148a4a15f",
- "sha256:cd468ec62257bb4544989402b19d795d2305eccb06cde5da0eb739b63dc04665",
- "sha256:cfcfb73aed40f550a57ea904629bdaf2e562c68fa1164fa4588e752af6efdc3f",
- "sha256:d0dd943282231480aad5f50f89bdf26690c995e8ff555f26d8a5b9887b559bcc",
- "sha256:d3c59a06c2c28a81a026ff11fbf012081ea34fb9b7052f2ed0366e14896f0a1d",
- "sha256:d45b75b0f3fd8d99f62eb7908cfa6d727b7ed190737dec7fe46d993da550b81a",
- "sha256:d46d5069e2eeda111d6f71970e341f4bd9aeeee92074e649ae263b834286ecc0",
- "sha256:d58ec349e0c2c0bc6669bf2cd4982d2f93bf067860d23a0ea1fe677b0f0b1e09",
- "sha256:db1b3ccb93488328c74e97ff888604a8b95ae4f35f4f56677ca57a4fc3a4220b",
- "sha256:dd65695a8df1233309b701dec2539cc4b11e97d4fcc0f4185b4a12ce54db0491",
- "sha256:f9482c2ed414781c0af0b35d9d575226da6b728bd1a720668fa05837184965b7",
- "sha256:f9671e7282d8c6fcabc32c0fb8d7c0ea8894ae85cee89c9aadc2d7129e1a9954",
- "sha256:fad7a051e07f64e297e6e8399b4d6a3bdcad3d7297409e9a06ef8cbccff4f501",
- "sha256:ffb08f2a1e59d38c7b8b9ac8083c9c8b9875f0955b1e9b9b9a965607a51f8e54"
- ],
- "markers": "python_version < '3.13' 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.1.0"
+ "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e",
+ "sha256:03a088b9de532cbfe2ba2034b2b85e82df37874681e8c470d6fb2f8c04d7e4b7",
+ "sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01",
+ "sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1",
+ "sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159",
+ "sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563",
+ "sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83",
+ "sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9",
+ "sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395",
+ "sha256:1d3755bcb2e02de341c55b4fca7a745a24a9e7212ac953f6b3a48d117d7257aa",
+ "sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942",
+ "sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1",
+ "sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441",
+ "sha256:3319aa75e0e0639bc15ff54ca327e8dc7a6fe404003496e3c6925cd3142e0e22",
+ "sha256:346bed03fe47414091be4ad44786d1bd8bef0c3fcad6ed3dee074a032ab408a9",
+ "sha256:36b89d13c49216cadb828db8dfa6ce86bbbc476a82d3a6c397f0efae0525bdd0",
+ "sha256:37b9de5a96111fc15418819ab4c4432e4f3c2ede61e660b1e33971eba26ef9ba",
+ "sha256:396979749bd95f018296af156201d6211240e7a23090f50a8d5d18c370084dc3",
+ "sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1",
+ "sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6",
+ "sha256:47da355d8687fd65240c364c90a31569a133b7b60de111c255ef5b606f2ae291",
+ "sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39",
+ "sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d",
+ "sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467",
+ "sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475",
+ "sha256:54558ea205654b50c438029505def3834e80f0869a70fb15b871c29b4575ddef",
+ "sha256:5e06afd14cbaf9e00899fae69b24a32f2196c19de08fcb9f4779dd4f004e5e7c",
+ "sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511",
+ "sha256:63e4844797b975b9af3a3fb8f7866ff08775f5426925e1e0bbcfe7932059a12c",
+ "sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822",
+ "sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a",
+ "sha256:6ef9ea3f137e5711f0dbe5f9263e8c009b7069d8a1acea822bd5e9dae0ae49c8",
+ "sha256:7017b2be767b9d43cc31416aba48aab0d2309ee31b4dbf10a1d38fb7972bdf9d",
+ "sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01",
+ "sha256:73aaad12ac0ff500f62cebed98d8789198ea0e6f233421059fa68a5aa7220145",
+ "sha256:77c386de38a60d1dfb8e55b8c1101d68c79dfdd25c7095d51fec2dd800892b80",
+ "sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13",
+ "sha256:7939aa3ca7d2a1593596e7ac6d59391ff30281ef280d8632fa03d81f7c5f955e",
+ "sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b",
+ "sha256:85f3ff71e2e60bd4b4932a043fbbe0f499e263c628390b285cb599154a3b03b1",
+ "sha256:8b8b36671f10ba80e159378df9c4f15c14098c4fd73a36b9ad715f057272fbef",
+ "sha256:93147c513fac16385d1036b7e5b102c7fbbdb163d556b791f0f11eada7ba65dc",
+ "sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff",
+ "sha256:94b6150a85e1b33b40b1464a3f9988dcc5251d6ed06842abff82e42632fac120",
+ "sha256:94ebba31df2aa506d7b14866fed00ac141a867e63143fe5bca82a8e503b36437",
+ "sha256:95ffcf719966dd7c453f908e208e14cde192e09fde6c7186c8f1896ef778d8cd",
+ "sha256:98884ecf2ffb7d7fe6bd517e8eb99d31ff7855a840fa6d0d63cd07c037f6a981",
+ "sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36",
+ "sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a",
+ "sha256:a0dfc6c143b519113354e780a50381508139b07d2177cb6ad6a08278ec655798",
+ "sha256:b2795058c23988728eec1f36a4e5e4ebad22f8320c85f3587b539b9ac84128d7",
+ "sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761",
+ "sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0",
+ "sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e",
+ "sha256:b8da394b34370874b4572676f36acabac172602abf054cbc4ac910219f3340af",
+ "sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa",
+ "sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c",
+ "sha256:ca9d0ff5ad43e785350894d97e13633a66e2b50000e8a183a50a88d834752d42",
+ "sha256:d0028e725ee18175c6e422797c407874da24381ce0690d6b9396c204c7f7276e",
+ "sha256:d21e10da6ec19b457b82636209cbe2331ff4306b54d06fa04b7c138ba18c8a81",
+ "sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e",
+ "sha256:da7a9bff22ce038e19bf62c4dd1ec8391062878710ded0a845bcf47cc0200617",
+ "sha256:db32b5348615a04b82240cc67983cb315309e88d444a288934ee6ceaebcad6cc",
+ "sha256:dcc62f31eae24de7f8dce72134c8651c58000d3b1868e01392baea7c32c247de",
+ "sha256:dfc59d69fc48664bc693842bd57acfdd490acafda1ab52c7836e3fc75c90a111",
+ "sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383",
+ "sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70",
+ "sha256:ed10eac5830befbdd0c32f83e8aa6288361597550ba669b04c48f0f9a2c843c6",
+ "sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4",
+ "sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011",
+ "sha256:f1d4aeb8891338e60d1ab6127af1fe45def5259def8094b9c7e34690c8858803",
+ "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79",
+ "sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f"
+ ],
+ "markers": "python_version < '3.13' 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.1.1"
},
"gunicorn": {
"hashes": [
@@ -608,11 +629,11 @@
},
"idna": {
"hashes": [
- "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
- "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
],
"markers": "python_version >= '3.6'",
- "version": "==3.8"
+ "version": "==3.10"
},
"iniconfig": {
"hashes": [
@@ -655,11 +676,11 @@
},
"jsonschema-specifications": {
"hashes": [
- "sha256:48a76787b3e70f5ed53f1160d2b81f586e4ca6d1548c5de7085d1682674764cc",
- "sha256:87e4fdf3a94858b8a2ba2778d9ba57d8a9cafca7c7489c46ba0d30a8bc6a9c3c"
+ "sha256:0f38b83639958ce1152d02a7f062902c41c8fd20d558b0c34344292d417ae272",
+ "sha256:a09a0680616357d9a0ecf05c12ad234479f549239d0f5b55f3deea67475da9bf"
],
- "markers": "python_version >= '3.8'",
- "version": "==2023.12.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==2024.10.1"
},
"jwt": {
"hashes": [
@@ -671,69 +692,70 @@
},
"markupsafe": {
"hashes": [
- "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf",
- "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff",
- "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f",
- "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3",
- "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532",
- "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f",
- "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617",
- "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df",
- "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4",
- "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906",
- "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f",
- "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4",
- "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8",
- "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371",
- "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2",
- "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465",
- "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52",
- "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6",
- "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169",
- "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad",
- "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2",
- "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0",
- "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029",
- "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f",
- "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a",
- "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced",
- "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5",
- "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c",
- "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf",
- "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9",
- "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb",
- "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad",
- "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3",
- "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1",
- "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46",
- "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc",
- "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a",
- "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee",
- "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900",
- "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5",
- "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea",
- "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f",
- "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5",
- "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e",
- "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a",
- "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f",
- "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50",
- "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a",
- "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b",
- "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4",
- "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff",
- "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2",
- "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46",
- "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b",
- "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf",
- "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5",
- "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5",
- "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab",
- "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd",
- "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68"
+ "sha256:0778de17cff1acaeccc3ff30cd99a3fd5c50fc58ad3d6c0e0c4c58092b859396",
+ "sha256:0f84af7e813784feb4d5e4ff7db633aba6c8ca64a833f61d8e4eade234ef0c38",
+ "sha256:17b2aea42a7280db02ac644db1d634ad47dcc96faf38ab304fe26ba2680d359a",
+ "sha256:242d6860f1fd9191aef5fae22b51c5c19767f93fb9ead4d21924e0bcb17619d8",
+ "sha256:244dbe463d5fb6d7ce161301a03a6fe744dac9072328ba9fc82289238582697b",
+ "sha256:26627785a54a947f6d7336ce5963569b5d75614619e75193bdb4e06e21d447ad",
+ "sha256:2a4b34a8d14649315c4bc26bbfa352663eb51d146e35eef231dd739d54a5430a",
+ "sha256:2ae99f31f47d849758a687102afdd05bd3d3ff7dbab0a8f1587981b58a76152a",
+ "sha256:312387403cd40699ab91d50735ea7a507b788091c416dd007eac54434aee51da",
+ "sha256:3341c043c37d78cc5ae6e3e305e988532b072329639007fd408a476642a89fd6",
+ "sha256:33d1c36b90e570ba7785dacd1faaf091203d9942bc036118fab8110a401eb1a8",
+ "sha256:3e683ee4f5d0fa2dde4db77ed8dd8a876686e3fc417655c2ece9a90576905344",
+ "sha256:3ffb4a8e7d46ed96ae48805746755fadd0909fea2306f93d5d8233ba23dda12a",
+ "sha256:40621d60d0e58aa573b68ac5e2d6b20d44392878e0bfc159012a5787c4e35bc8",
+ "sha256:40f1e10d51c92859765522cbd79c5c8989f40f0419614bcdc5015e7b6bf97fc5",
+ "sha256:45d42d132cff577c92bfba536aefcfea7e26efb975bd455db4e6602f5c9f45e7",
+ "sha256:48488d999ed50ba8d38c581d67e496f955821dc183883550a6fbc7f1aefdc170",
+ "sha256:4935dd7883f1d50e2ffecca0aa33dc1946a94c8f3fdafb8df5c330e48f71b132",
+ "sha256:4c2d64fdba74ad16138300815cfdc6ab2f4647e23ced81f59e940d7d4a1469d9",
+ "sha256:4c8817557d0de9349109acb38b9dd570b03cc5014e8aabf1cbddc6e81005becd",
+ "sha256:4ffaaac913c3f7345579db4f33b0020db693f302ca5137f106060316761beea9",
+ "sha256:5a4cb365cb49b750bdb60b846b0c0bc49ed62e59a76635095a179d440540c346",
+ "sha256:62fada2c942702ef8952754abfc1a9f7658a4d5460fabe95ac7ec2cbe0d02abc",
+ "sha256:67c519635a4f64e495c50e3107d9b4075aec33634272b5db1cde839e07367589",
+ "sha256:6a54c43d3ec4cf2a39f4387ad044221c66a376e58c0d0e971d47c475ba79c6b5",
+ "sha256:7044312a928a66a4c2a22644147bc61a199c1709712069a344a3fb5cfcf16915",
+ "sha256:730d86af59e0e43ce277bb83970530dd223bf7f2a838e086b50affa6ec5f9295",
+ "sha256:800100d45176652ded796134277ecb13640c1a537cad3b8b53da45aa96330453",
+ "sha256:80fcbf3add8790caddfab6764bde258b5d09aefbe9169c183f88a7410f0f6dea",
+ "sha256:82b5dba6eb1bcc29cc305a18a3c5365d2af06ee71b123216416f7e20d2a84e5b",
+ "sha256:852dc840f6d7c985603e60b5deaae1d89c56cb038b577f6b5b8c808c97580f1d",
+ "sha256:8ad4ad1429cd4f315f32ef263c1342166695fad76c100c5d979c45d5570ed58b",
+ "sha256:8ae369e84466aa70f3154ee23c1451fda10a8ee1b63923ce76667e3077f2b0c4",
+ "sha256:93e8248d650e7e9d49e8251f883eed60ecbc0e8ffd6349e18550925e31bd029b",
+ "sha256:973a371a55ce9ed333a3a0f8e0bcfae9e0d637711534bcb11e130af2ab9334e7",
+ "sha256:9ba25a71ebf05b9bb0e2ae99f8bc08a07ee8e98c612175087112656ca0f5c8bf",
+ "sha256:a10860e00ded1dd0a65b83e717af28845bb7bd16d8ace40fe5531491de76b79f",
+ "sha256:a4792d3b3a6dfafefdf8e937f14906a51bd27025a36f4b188728a73382231d91",
+ "sha256:a7420ceda262dbb4b8d839a4ec63d61c261e4e77677ed7c66c99f4e7cb5030dd",
+ "sha256:ad91738f14eb8da0ff82f2acd0098b6257621410dcbd4df20aaa5b4233d75a50",
+ "sha256:b6a387d61fe41cdf7ea95b38e9af11cfb1a63499af2759444b99185c4ab33f5b",
+ "sha256:b954093679d5750495725ea6f88409946d69cfb25ea7b4c846eef5044194f583",
+ "sha256:bbde71a705f8e9e4c3e9e33db69341d040c827c7afa6789b14c6e16776074f5a",
+ "sha256:beeebf760a9c1f4c07ef6a53465e8cfa776ea6a2021eda0d0417ec41043fe984",
+ "sha256:c91b394f7601438ff79a4b93d16be92f216adb57d813a78be4446fe0f6bc2d8c",
+ "sha256:c97ff7fedf56d86bae92fa0a646ce1a0ec7509a7578e1ed238731ba13aabcd1c",
+ "sha256:cb53e2a99df28eee3b5f4fea166020d3ef9116fdc5764bc5117486e6d1211b25",
+ "sha256:cbf445eb5628981a80f54087f9acdbf84f9b7d862756110d172993b9a5ae81aa",
+ "sha256:d06b24c686a34c86c8c1fba923181eae6b10565e4d80bdd7bc1c8e2f11247aa4",
+ "sha256:d98e66a24497637dd31ccab090b34392dddb1f2f811c4b4cd80c230205c074a3",
+ "sha256:db15ce28e1e127a0013dfb8ac243a8e392db8c61eae113337536edb28bdc1f97",
+ "sha256:db842712984e91707437461930e6011e60b39136c7331e971952bb30465bc1a1",
+ "sha256:e24bfe89c6ac4c31792793ad9f861b8f6dc4546ac6dc8f1c9083c7c4f2b335cd",
+ "sha256:e81c52638315ff4ac1b533d427f50bc0afc746deb949210bc85f05d4f15fd772",
+ "sha256:e9393357f19954248b00bed7c56f29a25c930593a77630c719653d51e7669c2a",
+ "sha256:ee3941769bd2522fe39222206f6dd97ae83c442a94c90f2b7a25d847d40f4729",
+ "sha256:f31ae06f1328595d762c9a2bf29dafd8621c7d3adc130cbb46278079758779ca",
+ "sha256:f94190df587738280d544971500b9cafc9b950d32efcb1fba9ac10d84e6aa4e6",
+ "sha256:fa7d686ed9883f3d664d39d5a8e74d3c5f63e603c2e3ff0abcba23eac6542635",
+ "sha256:fb532dd9900381d2e8f48172ddc5a59db4c445a11b9fab40b3b786da40d3b56b",
+ "sha256:fe32482b37b4b00c7a52a07211b479653b7fe4f22b2e481b9a9b099d8a430f2f"
],
- "markers": "python_version >= '3.7'",
- "version": "==2.1.5"
+ "markers": "python_version >= '3.9'",
+ "version": "==3.0.1"
},
"mistune": {
"hashes": [
@@ -843,62 +865,62 @@
},
"numpy": {
"hashes": [
- "sha256:046356b19d7ad1890c751b99acad5e82dc4a02232013bd9a9a712fddf8eb60f5",
- "sha256:0b8cc2715a84b7c3b161f9ebbd942740aaed913584cae9cdc7f8ad5ad41943d0",
- "sha256:0d07841fd284718feffe7dd17a63a2e6c78679b2d386d3e82f44f0108c905550",
- "sha256:13cc11c00000848702322af4de0147ced365c81d66053a67c2e962a485b3717c",
- "sha256:13ce49a34c44b6de5241f0b38b07e44c1b2dcacd9e36c30f9c2fcb1bb5135db7",
- "sha256:24c2ad697bd8593887b019817ddd9974a7f429c14a5469d7fad413f28340a6d2",
- "sha256:251105b7c42abe40e3a689881e1793370cc9724ad50d64b30b358bbb3a97553b",
- "sha256:2ca4b53e1e0b279142113b8c5eb7d7a877e967c306edc34f3b58e9be12fda8df",
- "sha256:3269c9eb8745e8d975980b3a7411a98976824e1fdef11f0aacf76147f662b15f",
- "sha256:397bc5ce62d3fb73f304bec332171535c187e0643e176a6e9421a6e3eacef06d",
- "sha256:3fc5eabfc720db95d68e6646e88f8b399bfedd235994016351b1d9e062c4b270",
- "sha256:50a95ca3560a6058d6ea91d4629a83a897ee27c00630aed9d933dff191f170cd",
- "sha256:52ac2e48f5ad847cd43c4755520a2317f3380213493b9d8a4c5e37f3b87df504",
- "sha256:53e27293b3a2b661c03f79aa51c3987492bd4641ef933e366e0f9f6c9bf257ec",
- "sha256:57eb525e7c2a8fdee02d731f647146ff54ea8c973364f3b850069ffb42799647",
- "sha256:5889dd24f03ca5a5b1e8a90a33b5a0846d8977565e4ae003a63d22ecddf6782f",
- "sha256:59ca673ad11d4b84ceb385290ed0ebe60266e356641428c845b39cd9df6713ab",
- "sha256:6435c48250c12f001920f0751fe50c0348f5f240852cfddc5e2f97e007544cbe",
- "sha256:6e5a9cb2be39350ae6c8f79410744e80154df658d5bea06e06e0ac5bb75480d5",
- "sha256:7be6a07520b88214ea85d8ac8b7d6d8a1839b0b5cb87412ac9f49fa934eb15d5",
- "sha256:7c803b7934a7f59563db459292e6aa078bb38b7ab1446ca38dd138646a38203e",
- "sha256:7dd86dfaf7c900c0bbdcb8b16e2f6ddf1eb1fe39c6c8cca6e94844ed3152a8fd",
- "sha256:8661c94e3aad18e1ea17a11f60f843a4933ccaf1a25a7c6a9182af70610b2313",
- "sha256:8ae0fd135e0b157365ac7cc31fff27f07a5572bdfc38f9c2d43b2aff416cc8b0",
- "sha256:910b47a6d0635ec1bd53b88f86120a52bf56dcc27b51f18c7b4a2e2224c29f0f",
- "sha256:913cc1d311060b1d409e609947fa1b9753701dac96e6581b58afc36b7ee35af6",
- "sha256:920b0911bb2e4414c50e55bd658baeb78281a47feeb064ab40c2b66ecba85553",
- "sha256:950802d17a33c07cba7fd7c3dcfa7d64705509206be1606f196d179e539111ed",
- "sha256:981707f6b31b59c0c24bcda52e5605f9701cb46da4b86c2e8023656ad3e833cb",
- "sha256:98ce7fb5b8063cfdd86596b9c762bf2b5e35a2cdd7e967494ab78a1fa7f8b86e",
- "sha256:99f4a9ee60eed1385a86e82288971a51e71df052ed0b2900ed30bc840c0f2e39",
- "sha256:9a8e06c7a980869ea67bbf551283bbed2856915f0a792dc32dd0f9dd2fb56728",
- "sha256:ae8ce252404cdd4de56dcfce8b11eac3c594a9c16c231d081fb705cf23bd4d9e",
- "sha256:afd9c680df4de71cd58582b51e88a61feed4abcc7530bcd3d48483f20fc76f2a",
- "sha256:b49742cdb85f1f81e4dc1b39dcf328244f4d8d1ded95dea725b316bd2cf18c95",
- "sha256:b5613cfeb1adfe791e8e681128f5f49f22f3fcaa942255a6124d58ca59d9528f",
- "sha256:bab7c09454460a487e631ffc0c42057e3d8f2a9ddccd1e60c7bb8ed774992480",
- "sha256:c8a0e34993b510fc19b9a2ce7f31cb8e94ecf6e924a40c0c9dd4f62d0aac47d9",
- "sha256:caf5d284ddea7462c32b8d4a6b8af030b6c9fd5332afb70e7414d7fdded4bfd0",
- "sha256:cea427d1350f3fd0d2818ce7350095c1a2ee33e30961d2f0fef48576ddbbe90f",
- "sha256:d0cf7d55b1051387807405b3898efafa862997b4cba8aa5dbe657be794afeafd",
- "sha256:d10c39947a2d351d6d466b4ae83dad4c37cd6c3cdd6d5d0fa797da56f710a6ae",
- "sha256:d2b9cd92c8f8e7b313b80e93cedc12c0112088541dcedd9197b5dee3738c1201",
- "sha256:d4c57b68c8ef5e1ebf47238e99bf27657511ec3f071c465f6b1bccbef12d4136",
- "sha256:d51fc141ddbe3f919e91a096ec739f49d686df8af254b2053ba21a910ae518bf",
- "sha256:e097507396c0be4e547ff15b13dc3866f45f3680f789c1a1301b07dadd3fbc78",
- "sha256:e30356d530528a42eeba51420ae8bf6c6c09559051887196599d96ee5f536468",
- "sha256:e8d5f8a8e3bc87334f025194c6193e408903d21ebaeb10952264943a985066ca",
- "sha256:e8dfa9e94fc127c40979c3eacbae1e61fda4fe71d84869cc129e2721973231ef",
- "sha256:f212d4f46b67ff604d11fff7cc62d36b3e8714edf68e44e9760e19be38c03eb0",
- "sha256:f7506387e191fe8cdb267f912469a3cccc538ab108471291636a96a54e599556",
- "sha256:fac6e277a41163d27dfab5f4ec1f7a83fac94e170665a4a50191b545721c6521",
- "sha256:fcd8f556cdc8cfe35e70efb92463082b7f43dd7e547eb071ffc36abc0ca4699b"
+ "sha256:05b2d4e667895cc55e3ff2b56077e4c8a5604361fc21a042845ea3ad67465aa8",
+ "sha256:12edb90831ff481f7ef5f6bc6431a9d74dc0e5ff401559a71e5e4611d4f2d466",
+ "sha256:13311c2db4c5f7609b462bc0f43d3c465424d25c626d95040f073e30f7570e35",
+ "sha256:13532a088217fa624c99b843eeb54640de23b3414b14aa66d023805eb731066c",
+ "sha256:13602b3174432a35b16c4cfb5de9a12d229727c3dd47a6ce35111f2ebdf66ff4",
+ "sha256:1600068c262af1ca9580a527d43dc9d959b0b1d8e56f8a05d830eea39b7c8af6",
+ "sha256:1b8cde4f11f0a975d1fd59373b32e2f5a562ade7cde4f85b7137f3de8fbb29a0",
+ "sha256:1c193d0b0238638e6fc5f10f1b074a6993cb13b0b431f64079a509d63d3aa8b7",
+ "sha256:1ebec5fd716c5a5b3d8dfcc439be82a8407b7b24b230d0ad28a81b61c2f4659a",
+ "sha256:242b39d00e4944431a3cd2db2f5377e15b5785920421993770cddb89992c3f3a",
+ "sha256:259ec80d54999cc34cd1eb8ded513cb053c3bf4829152a2e00de2371bd406f5e",
+ "sha256:2abbf905a0b568706391ec6fa15161fad0fb5d8b68d73c461b3c1bab6064dd62",
+ "sha256:2cbba4b30bf31ddbe97f1c7205ef976909a93a66bb1583e983adbd155ba72ac2",
+ "sha256:2ffef621c14ebb0188a8633348504a35c13680d6da93ab5cb86f4e54b7e922b5",
+ "sha256:30d53720b726ec36a7f88dc873f0eec8447fbc93d93a8f079dfac2629598d6ee",
+ "sha256:32e16a03138cabe0cb28e1007ee82264296ac0983714094380b408097a418cfe",
+ "sha256:43cca367bf94a14aca50b89e9bc2061683116cfe864e56740e083392f533ce7a",
+ "sha256:456e3b11cb79ac9946c822a56346ec80275eaf2950314b249b512896c0d2505e",
+ "sha256:4d6ec0d4222e8ffdab1744da2560f07856421b367928026fb540e1945f2eeeaf",
+ "sha256:5006b13a06e0b38d561fab5ccc37581f23c9511879be7693bd33c7cd15ca227c",
+ "sha256:675c741d4739af2dc20cd6c6a5c4b7355c728167845e3c6b0e824e4e5d36a6c3",
+ "sha256:6cdb606a7478f9ad91c6283e238544451e3a95f30fb5467fbf715964341a8a86",
+ "sha256:6d95f286b8244b3649b477ac066c6906fbb2905f8ac19b170e2175d3d799f4df",
+ "sha256:76322dcdb16fccf2ac56f99048af32259dcc488d9b7e25b51e5eca5147a3fb98",
+ "sha256:7c1c60328bd964b53f8b835df69ae8198659e2b9302ff9ebb7de4e5a5994db3d",
+ "sha256:860ec6e63e2c5c2ee5e9121808145c7bf86c96cca9ad396c0bd3e0f2798ccbe2",
+ "sha256:8e00ea6fc82e8a804433d3e9cedaa1051a1422cb6e443011590c14d2dea59146",
+ "sha256:9c6c754df29ce6a89ed23afb25550d1c2d5fdb9901d9c67a16e0b16eaf7e2550",
+ "sha256:a26ae94658d3ba3781d5e103ac07a876b3e9b29db53f68ed7df432fd033358a8",
+ "sha256:a65acfdb9c6ebb8368490dbafe83c03c7e277b37e6857f0caeadbbc56e12f4fb",
+ "sha256:a7d80b2e904faa63068ead63107189164ca443b42dd1930299e0d1cb041cec2e",
+ "sha256:a84498e0d0a1174f2b3ed769b67b656aa5460c92c9554039e11f20a05650f00d",
+ "sha256:ab4754d432e3ac42d33a269c8567413bdb541689b02d93788af4131018cbf366",
+ "sha256:ad369ed238b1959dfbade9018a740fb9392c5ac4f9b5173f420bd4f37ba1f7a0",
+ "sha256:b1d0fcae4f0949f215d4632be684a539859b295e2d0cb14f78ec231915d644db",
+ "sha256:b42a1a511c81cc78cbc4539675713bbcf9d9c3913386243ceff0e9429ca892fe",
+ "sha256:bd33f82e95ba7ad632bc57837ee99dba3d7e006536200c4e9124089e1bf42426",
+ "sha256:bdd407c40483463898b84490770199d5714dcc9dd9b792f6c6caccc523c00952",
+ "sha256:c6eef7a2dbd0abfb0d9eaf78b73017dbfd0b54051102ff4e6a7b2980d5ac1a03",
+ "sha256:c82af4b2ddd2ee72d1fc0c6695048d457e00b3582ccde72d8a1c991b808bb20f",
+ "sha256:d666cb72687559689e9906197e3bec7b736764df6a2e58ee265e360663e9baf7",
+ "sha256:d7bf0a4f9f15b32b5ba53147369e94296f5fffb783db5aacc1be15b4bf72f43b",
+ "sha256:d82075752f40c0ddf57e6e02673a17f6cb0f8eb3f587f63ca1eaab5594da5b17",
+ "sha256:da65fb46d4cbb75cb417cddf6ba5e7582eb7bb0b47db4b99c9fe5787ce5d91f5",
+ "sha256:e2b49c3c0804e8ecb05d59af8386ec2f74877f7ca8fd9c1e00be2672e4d399b1",
+ "sha256:e585c8ae871fd38ac50598f4763d73ec5497b0de9a0ab4ef5b69f01c6a046142",
+ "sha256:e8d3ca0a72dd8846eb6f7dfe8f19088060fcb76931ed592d29128e0219652884",
+ "sha256:ef444c57d664d35cac4e18c298c47d7b504c66b17c2ea91312e979fcfbdfb08a",
+ "sha256:f1eb068ead09f4994dec71c24b2844f1e4e4e013b9629f812f292f04bd1510d9",
+ "sha256:f2ded8d9b6f68cc26f8425eda5d3877b47343e68ca23d0d0846f4d312ecaa445",
+ "sha256:f751ed0a2f250541e19dfca9f1eafa31a392c71c832b6bb9e113b10d050cb0f1",
+ "sha256:faa88bc527d0f097abdc2c663cddf37c05a1c2f113716601555249805cf573f1",
+ "sha256:fc44e3c68ff00fd991b59092a54350e6e4911152682b4782f68070985aa9e648"
],
"markers": "python_version == '3.11'",
- "version": "==2.1.1"
+ "version": "==2.1.2"
},
"opensearch-py": {
"hashes": [
@@ -919,38 +941,51 @@
},
"pandas": {
"hashes": [
- "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863",
- "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2",
- "sha256:0cace394b6ea70c01ca1595f839cf193df35d1575986e484ad35c4aeae7266c1",
- "sha256:1cb51fe389360f3b5a4d57dbd2848a5f033350336ca3b340d1c53a1fad33bcad",
- "sha256:2925720037f06e89af896c70bca73459d7e6a4be96f9de79e2d440bd499fe0db",
- "sha256:3e374f59e440d4ab45ca2fffde54b81ac3834cf5ae2cdfa69c90bc03bde04d76",
- "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51",
- "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32",
- "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08",
- "sha256:58b84b91b0b9f4bafac2a0ac55002280c094dfc6402402332c0913a59654ab2b",
- "sha256:640cef9aa381b60e296db324337a554aeeb883ead99dc8f6c18e81a93942f5f4",
- "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921",
- "sha256:696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288",
- "sha256:6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee",
- "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0",
- "sha256:873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24",
- "sha256:8e5a0b00e1e56a842f922e7fae8ae4077aee4af0acb5ae3622bd4b4c30aedf99",
- "sha256:8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151",
- "sha256:9057e6aa78a584bc93a13f0a9bf7e753a5e9770a30b4d758b8d5f2a62a9433cd",
- "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce",
- "sha256:92fd6b027924a7e178ac202cfbe25e53368db90d56872d20ffae94b96c7acc57",
- "sha256:9dfde2a0ddef507a631dc9dc4af6a9489d5e2e740e226ad426a05cabfbd7c8ef",
- "sha256:9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54",
- "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a",
- "sha256:c7adfc142dac335d8c1e0dcbd37eb8617eac386596eb9e1a1b77791cf2498238",
- "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23",
- "sha256:ddf818e4e6c7c6f4f7c8a12709696d193976b591cc7dc50588d3d1a6b5dc8772",
- "sha256:e9b79011ff7a0f4b1d6da6a61aa1aa604fb312d6647de5bad20013682d1429ce",
- "sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad"
+ "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.2"
+ "version": "==2.2.3"
},
"pika": {
"hashes": [
@@ -970,11 +1005,11 @@
},
"prometheus-client": {
"hashes": [
- "sha256:287629d00b147a32dcb2be0b9df905da599b2d82f80377083ec8463309a4bb89",
- "sha256:cde524a85bce83ca359cc837f28b8c0db5cac7aa653a588fd7e84ba061c329e7"
+ "sha256:4fa6b4dd0ac16d58bb587c04b1caae65b8c5043e85f778f42f5f632f6af2e166",
+ "sha256:96c83c606b71ff2b0a433c98889d275f51ffec6c5e267de37c7a2b5c9aa9233e"
],
"markers": "python_version >= '3.8'",
- "version": "==0.20.0"
+ "version": "==0.21.0"
},
"prometheus-flask-exporter": {
"hashes": [
@@ -984,6 +1019,110 @@
"index": "pypi",
"version": "==0.23.1"
},
+ "propcache": {
+ "hashes": [
+ "sha256:00181262b17e517df2cd85656fcd6b4e70946fe62cd625b9d74ac9977b64d8d9",
+ "sha256:0e53cb83fdd61cbd67202735e6a6687a7b491c8742dfc39c9e01e80354956763",
+ "sha256:1235c01ddaa80da8235741e80815ce381c5267f96cc49b1477fdcf8c047ef325",
+ "sha256:140fbf08ab3588b3468932974a9331aff43c0ab8a2ec2c608b6d7d1756dbb6cb",
+ "sha256:191db28dc6dcd29d1a3e063c3be0b40688ed76434622c53a284e5427565bbd9b",
+ "sha256:1e41d67757ff4fbc8ef2af99b338bfb955010444b92929e9e55a6d4dcc3c4f09",
+ "sha256:1ec43d76b9677637a89d6ab86e1fef70d739217fefa208c65352ecf0282be957",
+ "sha256:20a617c776f520c3875cf4511e0d1db847a076d720714ae35ffe0df3e440be68",
+ "sha256:218db2a3c297a3768c11a34812e63b3ac1c3234c3a086def9c0fee50d35add1f",
+ "sha256:22aa8f2272d81d9317ff5756bb108021a056805ce63dd3630e27d042c8092798",
+ "sha256:25a1f88b471b3bc911d18b935ecb7115dff3a192b6fef46f0bfaf71ff4f12418",
+ "sha256:25c8d773a62ce0451b020c7b29a35cfbc05de8b291163a7a0f3b7904f27253e6",
+ "sha256:2a60ad3e2553a74168d275a0ef35e8c0a965448ffbc3b300ab3a5bb9956c2162",
+ "sha256:2a66df3d4992bc1d725b9aa803e8c5a66c010c65c741ad901e260ece77f58d2f",
+ "sha256:2ccc28197af5313706511fab3a8b66dcd6da067a1331372c82ea1cb74285e036",
+ "sha256:2e900bad2a8456d00a113cad8c13343f3b1f327534e3589acc2219729237a2e8",
+ "sha256:2ee7606193fb267be4b2e3b32714f2d58cad27217638db98a60f9efb5efeccc2",
+ "sha256:33ac8f098df0585c0b53009f039dfd913b38c1d2edafed0cedcc0c32a05aa110",
+ "sha256:3444cdba6628accf384e349014084b1cacd866fbb88433cd9d279d90a54e0b23",
+ "sha256:363ea8cd3c5cb6679f1c2f5f1f9669587361c062e4899fce56758efa928728f8",
+ "sha256:375a12d7556d462dc64d70475a9ee5982465fbb3d2b364f16b86ba9135793638",
+ "sha256:388f3217649d6d59292b722d940d4d2e1e6a7003259eb835724092a1cca0203a",
+ "sha256:3947483a381259c06921612550867b37d22e1df6d6d7e8361264b6d037595f44",
+ "sha256:39e104da444a34830751715f45ef9fc537475ba21b7f1f5b0f4d71a3b60d7fe2",
+ "sha256:3c997f8c44ec9b9b0bcbf2d422cc00a1d9b9c681f56efa6ca149a941e5560da2",
+ "sha256:3dfafb44f7bb35c0c06eda6b2ab4bfd58f02729e7c4045e179f9a861b07c9850",
+ "sha256:3ebbcf2a07621f29638799828b8d8668c421bfb94c6cb04269130d8de4fb7136",
+ "sha256:3f88a4095e913f98988f5b338c1d4d5d07dbb0b6bad19892fd447484e483ba6b",
+ "sha256:439e76255daa0f8151d3cb325f6dd4a3e93043e6403e6491813bcaaaa8733887",
+ "sha256:4569158070180c3855e9c0791c56be3ceeb192defa2cdf6a3f39e54319e56b89",
+ "sha256:466c219deee4536fbc83c08d09115249db301550625c7fef1c5563a584c9bc87",
+ "sha256:4a9d9b4d0a9b38d1c391bb4ad24aa65f306c6f01b512e10a8a34a2dc5675d348",
+ "sha256:4c7dde9e533c0a49d802b4f3f218fa9ad0a1ce21f2c2eb80d5216565202acab4",
+ "sha256:53d1bd3f979ed529f0805dd35ddaca330f80a9a6d90bc0121d2ff398f8ed8861",
+ "sha256:55346705687dbd7ef0d77883ab4f6fabc48232f587925bdaf95219bae072491e",
+ "sha256:56295eb1e5f3aecd516d91b00cfd8bf3a13991de5a479df9e27dd569ea23959c",
+ "sha256:56bb5c98f058a41bb58eead194b4db8c05b088c93d94d5161728515bd52b052b",
+ "sha256:5a5b3bb545ead161be780ee85a2b54fdf7092815995661947812dde94a40f6fb",
+ "sha256:5f2564ec89058ee7c7989a7b719115bdfe2a2fb8e7a4543b8d1c0cc4cf6478c1",
+ "sha256:608cce1da6f2672a56b24a015b42db4ac612ee709f3d29f27a00c943d9e851de",
+ "sha256:63f13bf09cc3336eb04a837490b8f332e0db41da66995c9fd1ba04552e516354",
+ "sha256:662dd62358bdeaca0aee5761de8727cfd6861432e3bb828dc2a693aa0471a563",
+ "sha256:676135dcf3262c9c5081cc8f19ad55c8a64e3f7282a21266d05544450bffc3a5",
+ "sha256:67aeb72e0f482709991aa91345a831d0b707d16b0257e8ef88a2ad246a7280bf",
+ "sha256:67b69535c870670c9f9b14a75d28baa32221d06f6b6fa6f77a0a13c5a7b0a5b9",
+ "sha256:682a7c79a2fbf40f5dbb1eb6bfe2cd865376deeac65acf9beb607505dced9e12",
+ "sha256:6994984550eaf25dd7fc7bd1b700ff45c894149341725bb4edc67f0ffa94efa4",
+ "sha256:69d3a98eebae99a420d4b28756c8ce6ea5a29291baf2dc9ff9414b42676f61d5",
+ "sha256:6e2e54267980349b723cff366d1e29b138b9a60fa376664a157a342689553f71",
+ "sha256:73e4b40ea0eda421b115248d7e79b59214411109a5bc47d0d48e4c73e3b8fcf9",
+ "sha256:74acd6e291f885678631b7ebc85d2d4aec458dd849b8c841b57ef04047833bed",
+ "sha256:7665f04d0c7f26ff8bb534e1c65068409bf4687aa2534faf7104d7182debb336",
+ "sha256:7735e82e3498c27bcb2d17cb65d62c14f1100b71723b68362872bca7d0913d90",
+ "sha256:77a86c261679ea5f3896ec060be9dc8e365788248cc1e049632a1be682442063",
+ "sha256:7cf18abf9764746b9c8704774d8b06714bcb0a63641518a3a89c7f85cc02c2ad",
+ "sha256:83928404adf8fb3d26793665633ea79b7361efa0287dfbd372a7e74311d51ee6",
+ "sha256:8e40876731f99b6f3c897b66b803c9e1c07a989b366c6b5b475fafd1f7ba3fb8",
+ "sha256:8f188cfcc64fb1266f4684206c9de0e80f54622c3f22a910cbd200478aeae61e",
+ "sha256:91997d9cb4a325b60d4e3f20967f8eb08dfcb32b22554d5ef78e6fd1dda743a2",
+ "sha256:91ee8fc02ca52e24bcb77b234f22afc03288e1dafbb1f88fe24db308910c4ac7",
+ "sha256:92fe151145a990c22cbccf9ae15cae8ae9eddabfc949a219c9f667877e40853d",
+ "sha256:945db8ee295d3af9dbdbb698cce9bbc5c59b5c3fe328bbc4387f59a8a35f998d",
+ "sha256:9517d5e9e0731957468c29dbfd0f976736a0e55afaea843726e887f36fe017df",
+ "sha256:952e0d9d07609d9c5be361f33b0d6d650cd2bae393aabb11d9b719364521984b",
+ "sha256:97a58a28bcf63284e8b4d7b460cbee1edaab24634e82059c7b8c09e65284f178",
+ "sha256:97e48e8875e6c13909c800fa344cd54cc4b2b0db1d5f911f840458a500fde2c2",
+ "sha256:9e0f07b42d2a50c7dd2d8675d50f7343d998c64008f1da5fef888396b7f84630",
+ "sha256:a3dc1a4b165283bd865e8f8cb5f0c64c05001e0718ed06250d8cac9bec115b48",
+ "sha256:a3ebe9a75be7ab0b7da2464a77bb27febcb4fab46a34f9288f39d74833db7f61",
+ "sha256:a64e32f8bd94c105cc27f42d3b658902b5bcc947ece3c8fe7bc1b05982f60e89",
+ "sha256:a6ed8db0a556343d566a5c124ee483ae113acc9a557a807d439bcecc44e7dfbb",
+ "sha256:ad9c9b99b05f163109466638bd30ada1722abb01bbb85c739c50b6dc11f92dc3",
+ "sha256:b33d7a286c0dc1a15f5fc864cc48ae92a846df287ceac2dd499926c3801054a6",
+ "sha256:bc092ba439d91df90aea38168e11f75c655880c12782facf5cf9c00f3d42b562",
+ "sha256:c436130cc779806bdf5d5fae0d848713105472b8566b75ff70048c47d3961c5b",
+ "sha256:c5869b8fd70b81835a6f187c5fdbe67917a04d7e52b6e7cc4e5fe39d55c39d58",
+ "sha256:c5ecca8f9bab618340c8e848d340baf68bcd8ad90a8ecd7a4524a81c1764b3db",
+ "sha256:cfac69017ef97db2438efb854edf24f5a29fd09a536ff3a992b75990720cdc99",
+ "sha256:d2f0d0f976985f85dfb5f3d685697ef769faa6b71993b46b295cdbbd6be8cc37",
+ "sha256:d5bed7f9805cc29c780f3aee05de3262ee7ce1f47083cfe9f77471e9d6777e83",
+ "sha256:d6a21ef516d36909931a2967621eecb256018aeb11fc48656e3257e73e2e247a",
+ "sha256:d9b6ddac6408194e934002a69bcaadbc88c10b5f38fb9307779d1c629181815d",
+ "sha256:db47514ffdbd91ccdc7e6f8407aac4ee94cc871b15b577c1c324236b013ddd04",
+ "sha256:df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70",
+ "sha256:e4a91d44379f45f5e540971d41e4626dacd7f01004826a18cb048e7da7e96544",
+ "sha256:e63e3e1e0271f374ed489ff5ee73d4b6e7c60710e1f76af5f0e1a6117cd26394",
+ "sha256:e70fac33e8b4ac63dfc4c956fd7d85a0b1139adcfc0d964ce288b7c527537fea",
+ "sha256:ecddc221a077a8132cf7c747d5352a15ed763b674c0448d811f408bf803d9ad7",
+ "sha256:f45eec587dafd4b2d41ac189c2156461ebd0c1082d2fe7013571598abb8505d1",
+ "sha256:f52a68c21363c45297aca15561812d542f8fc683c85201df0bebe209e349f793",
+ "sha256:f571aea50ba5623c308aa146eb650eebf7dbe0fd8c5d946e28343cb3b5aad577",
+ "sha256:f60f0ac7005b9f5a6091009b09a419ace1610e163fa5deaba5ce3484341840e7",
+ "sha256:f6475a1b2ecb310c98c28d271a30df74f9dd436ee46d09236a6b750a7599ce57",
+ "sha256:f6d5749fdd33d90e34c2efb174c7e236829147a2713334d708746e94c4bde40d",
+ "sha256:f902804113e032e2cdf8c71015651c97af6418363bea8d78dc0911d56c335032",
+ "sha256:fa1076244f54bb76e65e22cb6910365779d5c3d71d1f18b275f1dfc7b0d71b4d",
+ "sha256:fc2db02409338bf36590aa985a461b2c96fce91f8e7e0f14c50c5fcc4f229016",
+ "sha256:ffcad6c564fe6b9b8916c1aefbb37a362deebf9394bd2974e9d84232e3e08504"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==0.2.0"
+ },
"pycparser": {
"hashes": [
"sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6",
@@ -994,106 +1133,106 @@
},
"pydantic": {
"hashes": [
- "sha256:1363c7d975c7036df0db2b4a61f2e062fbc0aa5ab5f2772e0ffc7191a4f4bce2",
- "sha256:7aff4db5fdf3cf573d4b3c30926a510a10e19a0774d38fc4967f78beb6deb612"
+ "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f",
+ "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"
],
"markers": "python_version >= '3.8'",
- "version": "==2.9.1"
+ "version": "==2.9.2"
},
"pydantic-core": {
"hashes": [
- "sha256:01491d8b4d8db9f3391d93b0df60701e644ff0894352947f31fff3e52bd5c801",
- "sha256:03667cec5daf43ac4995cefa8aaf58f99de036204a37b889c24a80927b629cec",
- "sha256:03795b9e8a5d7fda05f3873efc3f59105e2dcff14231680296b87b80bb327295",
- "sha256:047531242f8e9c2db733599f1c612925de095e93c9cc0e599e96cf536aaf56ba",
- "sha256:04b07490bc2f6f2717b10c3969e1b830f5720b632f8ae2f3b8b1542394c47a8e",
- "sha256:09e926397f392059ce0afdcac920df29d9c833256354d0c55f1584b0b70cf07e",
- "sha256:0a0137ddf462575d9bce863c4c95bac3493ba8e22f8c28ca94634b4a1d3e2bb4",
- "sha256:0dda0290a6f608504882d9f7650975b4651ff91c85673341789a476b1159f211",
- "sha256:13dd45ba2561603681a2676ca56006d6dee94493f03d5cadc055d2055615c3ea",
- "sha256:1c3980f2843de5184656aab58698011b42763ccba11c4a8c35936c8dd6c7068c",
- "sha256:1eba2f7ce3e30ee2170410e2171867ea73dbd692433b81a93758ab2de6c64835",
- "sha256:203171e48946c3164fe7691fc349c79241ff8f28306abd4cad5f4f75ed80bc8d",
- "sha256:255ec6dcb899c115f1e2a64bc9ebc24cc0e3ab097775755244f77360d1f3c06c",
- "sha256:2718443bc671c7ac331de4eef9b673063b10af32a0bb385019ad61dcf2cc8f6c",
- "sha256:2b2b55b0448e9da68f56b696f313949cda1039e8ec7b5d294285335b53104b61",
- "sha256:2b603cde285322758a0279995b5796d64b63060bfbe214b50a3ca23b5cee3e83",
- "sha256:2b676583fc459c64146debea14ba3af54e540b61762dfc0613dc4e98c3f66eeb",
- "sha256:37ba321ac2a46100c578a92e9a6aa33afe9ec99ffa084424291d84e456f490c1",
- "sha256:3c09a7885dd33ee8c65266e5aa7fb7e2f23d49d8043f089989726391dd7350c5",
- "sha256:3cb0f65d8b4121c1b015c60104a685feb929a29d7cf204387c7f2688c7974690",
- "sha256:40b8441be16c1e940abebed83cd006ddb9e3737a279e339dbd6d31578b802f7b",
- "sha256:40d9bd259538dba2f40963286009bf7caf18b5112b19d2b55b09c14dde6db6a7",
- "sha256:4b259fd8409ab84b4041b7b3f24dcc41e4696f180b775961ca8142b5b21d0e70",
- "sha256:4f62c1c953d7ee375df5eb2e44ad50ce2f5aff931723b398b8bc6f0ac159791a",
- "sha256:50e4661f3337977740fdbfbae084ae5693e505ca2b3130a6d4eb0f2281dc43b8",
- "sha256:510b7fb0a86dc8f10a8bb43bd2f97beb63cffad1203071dc434dac26453955cd",
- "sha256:5499798317fff7f25dbef9347f4451b91ac2a4330c6669821c8202fd354c7bee",
- "sha256:560e32f0df04ac69b3dd818f71339983f6d1f70eb99d4d1f8e9705fb6c34a5c1",
- "sha256:59d52cf01854cb26c46958552a21acb10dd78a52aa34c86f284e66b209db8cab",
- "sha256:5a8cd3074a98ee70173a8633ad3c10e00dcb991ecec57263aacb4095c5efb958",
- "sha256:5b01a078dd4f9a52494370af21aa52964e0a96d4862ac64ff7cea06e0f12d2c5",
- "sha256:6470b5a1ec4d1c2e9afe928c6cb37eb33381cab99292a708b8cb9aa89e62429b",
- "sha256:65b6e5da855e9c55a0c67f4db8a492bf13d8d3316a59999cfbaf98cc6e401961",
- "sha256:67a5def279309f2e23014b608c4150b0c2d323bd7bccd27ff07b001c12c2415c",
- "sha256:68f4cf373f0de6abfe599a38307f4417c1c867ca381c03df27c873a9069cda25",
- "sha256:6b5547d098c76e1694ba85f05b595720d7c60d342f24d5aad32c3049131fa5c4",
- "sha256:6cb968da9a0746a0cf521b2b5ef25fc5a0bee9b9a1a8214e0a1cfaea5be7e8a4",
- "sha256:6daaf5b1ba1369a22c8b050b643250e3e5efc6a78366d323294aee54953a4d5f",
- "sha256:7200fd561fb3be06827340da066df4311d0b6b8eb0c2116a110be5245dceb326",
- "sha256:748bdf985014c6dd3e1e4cc3db90f1c3ecc7246ff5a3cd4ddab20c768b2f1dab",
- "sha256:76bdab0de4acb3f119c2a4bff740e0c7dc2e6de7692774620f7452ce11ca76c8",
- "sha256:7e6f33503c5495059148cc486867e1d24ca35df5fc064686e631e314d959ad5b",
- "sha256:7f10a5d1b9281392f1bf507d16ac720e78285dfd635b05737c3911637601bae6",
- "sha256:82da2f4703894134a9f000e24965df73cc103e31e8c31906cc1ee89fde72cbd8",
- "sha256:86fc6c762ca7ac8fbbdff80d61b2c59fb6b7d144aa46e2d54d9e1b7b0e780e01",
- "sha256:87cfa0ed6b8c5bd6ae8b66de941cece179281239d482f363814d2b986b79cedc",
- "sha256:89b731f25c80830c76fdb13705c68fef6a2b6dc494402987c7ea9584fe189f5d",
- "sha256:8b2682038e255e94baf2c473dca914a7460069171ff5cdd4080be18ab8a7fd6e",
- "sha256:8b5b3ed73abb147704a6e9f556d8c5cb078f8c095be4588e669d315e0d11893b",
- "sha256:8e22b477bf90db71c156f89a55bfe4d25177b81fce4aa09294d9e805eec13855",
- "sha256:9172d2088e27d9a185ea0a6c8cebe227a9139fd90295221d7d495944d2367700",
- "sha256:94f85614f2cba13f62c3c6481716e4adeae48e1eaa7e8bac379b9d177d93947a",
- "sha256:98ccd69edcf49f0875d86942f4418a4e83eb3047f20eb897bffa62a5d419c8fa",
- "sha256:a0d90e08b2727c5d01af1b5ef4121d2f0c99fbee692c762f4d9d0409c9da6541",
- "sha256:a3fc572d9b5b5cfe13f8e8a6e26271d5d13f80173724b738557a8c7f3a8a3791",
- "sha256:a678c1ac5c5ec5685af0133262103defb427114e62eafeda12f1357a12140162",
- "sha256:a7f7f72f721223f33d3dc98a791666ebc6a91fa023ce63733709f4894a7dc611",
- "sha256:bb68b41c3fa64587412b104294b9cbb027509dc2f6958446c502638d481525ef",
- "sha256:bbb5e45eab7624440516ee3722a3044b83fff4c0372efe183fd6ba678ff681fe",
- "sha256:c24574c7e92e2c56379706b9a3f07c1e0c7f2f87a41b6ee86653100c4ce343e5",
- "sha256:c483dab0f14b8d3f0df0c6c18d70b21b086f74c87ab03c59250dbf6d3c89baba",
- "sha256:c6de1ec30c4bb94f3a69c9f5f2182baeda5b809f806676675e9ef6b8dc936f28",
- "sha256:c744fa100fdea0d000d8bcddee95213d2de2e95b9c12be083370b2072333a0fa",
- "sha256:c889fd87e1f1bbeb877c2ee56b63bb297de4636661cc9bbfcf4b34e5e925bc27",
- "sha256:cbaaf2ef20d282659093913da9d402108203f7cb5955020bd8d1ae5a2325d1c4",
- "sha256:ce3317d155628301d649fe5e16a99528d5680af4ec7aa70b90b8dacd2d725c9b",
- "sha256:d015e63b985a78a3d4ccffd3bdf22b7c20b3bbd4b8227809b3e8e75bc37f9cb2",
- "sha256:d063c6b9fed7d992bcbebfc9133f4c24b7a7f215d6b102f3e082b1117cddb72c",
- "sha256:d965e8b325f443ed3196db890d85dfebbb09f7384486a77461347f4adb1fa7f8",
- "sha256:db6e6afcb95edbe6b357786684b71008499836e91f2a4a1e55b840955b341dbb",
- "sha256:dc1636770a809dee2bd44dd74b89cc80eb41172bcad8af75dd0bc182c2666d4c",
- "sha256:dd9be0a42de08f4b58a3cc73a123f124f65c24698b95a54c1543065baca8cf0e",
- "sha256:e0ec50663feedf64d21bad0809f5857bac1ce91deded203efc4a84b31b2e4305",
- "sha256:e2c409ce1c219c091e47cb03feb3c4ed8c2b8e004efc940da0166aaee8f9d6c8",
- "sha256:e61328920154b6a44d98cabcb709f10e8b74276bc709c9a513a8c37a18786cc4",
- "sha256:e89513f014c6be0d17b00a9a7c81b1c426f4eb9224b15433f3d98c1a071f8433",
- "sha256:ea85bda3189fb27503af4c45273735bcde3dd31c1ab17d11f37b04877859ef45",
- "sha256:edbefe079a520c5984e30e1f1f29325054b59534729c25b874a16a5048028d16",
- "sha256:f0cb80fd5c2df4898693aa841425ea1727b1b6d2167448253077d2a49003e0ed",
- "sha256:f2b05e6ccbee333a8f4b8f4d7c244fdb7a979e90977ad9c51ea31261e2085ce0",
- "sha256:f399e8657c67313476a121a6944311fab377085ca7f490648c9af97fc732732d",
- "sha256:f4a57db8966b3a1d1a350012839c6a0099f0898c56512dfade8a1fe5fb278710",
- "sha256:f56af3a420fb1ffaf43ece3ea09c2d27c444e7c40dcb7c6e7cf57aae764f2b48",
- "sha256:f6bd91345b5163ee7448bee201ed7dd601ca24f43f439109b0212e296eb5b423",
- "sha256:fb539d7e5dc4aac345846f290cf504d2fd3c1be26ac4e8b5e4c2b688069ff4cf",
- "sha256:fbdce4b47592f9e296e19ac31667daed8753c8367ebb34b9a9bd89dacaa299c9",
- "sha256:fc379c73fd66606628b866f661e8785088afe2adaba78e6bbe80796baf708a63",
- "sha256:fc3cf31edf405a161a0adad83246568647c54404739b614b1ff43dad2b02e6d5",
- "sha256:fcf31facf2796a2d3b7fe338fe8640aa0166e4e55b4cb108dbfd1058049bf4cb"
+ "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36",
+ "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05",
+ "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071",
+ "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327",
+ "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c",
+ "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36",
+ "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29",
+ "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744",
+ "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d",
+ "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec",
+ "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e",
+ "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e",
+ "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577",
+ "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232",
+ "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863",
+ "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6",
+ "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368",
+ "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480",
+ "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2",
+ "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2",
+ "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6",
+ "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769",
+ "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d",
+ "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2",
+ "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84",
+ "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166",
+ "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271",
+ "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5",
+ "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb",
+ "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13",
+ "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323",
+ "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556",
+ "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665",
+ "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef",
+ "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb",
+ "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119",
+ "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126",
+ "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510",
+ "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b",
+ "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87",
+ "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f",
+ "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc",
+ "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8",
+ "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21",
+ "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f",
+ "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6",
+ "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658",
+ "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b",
+ "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3",
+ "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb",
+ "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59",
+ "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24",
+ "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9",
+ "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3",
+ "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd",
+ "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753",
+ "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55",
+ "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad",
+ "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a",
+ "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605",
+ "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e",
+ "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b",
+ "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433",
+ "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8",
+ "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07",
+ "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728",
+ "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0",
+ "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327",
+ "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555",
+ "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64",
+ "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6",
+ "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea",
+ "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b",
+ "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df",
+ "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e",
+ "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd",
+ "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068",
+ "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3",
+ "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040",
+ "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12",
+ "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916",
+ "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f",
+ "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f",
+ "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801",
+ "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231",
+ "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5",
+ "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8",
+ "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee",
+ "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"
],
"markers": "python_version >= '3.8'",
- "version": "==2.23.3"
+ "version": "==2.23.4"
},
"pyjwt": {
"hashes": [
@@ -1105,11 +1244,11 @@
},
"pyparsing": {
"hashes": [
- "sha256:a6a7ee4235a3f944aa1fa2249307708f893fe5717dc603503c6c7969c070fb7c",
- "sha256:f86ec8d1a83f11977c9a6ea7598e8c27fc5cddfa5b07ea2241edbbde1d7bc032"
+ "sha256:93d9577b88da0bbea8cc8334ee8b918ed014968fd2ec383e868fb8afb1ccef84",
+ "sha256:cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c"
],
- "markers": "python_full_version >= '3.6.8'",
- "version": "==3.1.4"
+ "markers": "python_version >= '3.9'",
+ "version": "==3.2.0"
},
"pytest": {
"hashes": [
@@ -1125,7 +1264,7 @@
"sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3",
"sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"version": "==2.9.0.post0"
},
"python-dotenv": {
@@ -1342,63 +1481,63 @@
"sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
"sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"version": "==1.16.0"
},
"sqlalchemy": {
"hashes": [
- "sha256:10d8f36990dd929690666679b0f42235c159a7051534adb135728ee52828dd22",
- "sha256:13be2cc683b76977a700948411a94c67ad8faf542fa7da2a4b167f2244781cf3",
- "sha256:165bbe0b376541092bf49542bd9827b048357f4623486096fc9aaa6d4e7c59a2",
- "sha256:173f5f122d2e1bff8fbd9f7811b7942bead1f5e9f371cdf9e670b327e6703ebd",
- "sha256:196958cde924a00488e3e83ff917be3b73cd4ed8352bbc0f2989333176d1c54d",
- "sha256:203d46bddeaa7982f9c3cc693e5bc93db476ab5de9d4b4640d5c99ff219bee8c",
- "sha256:220574e78ad986aea8e81ac68821e47ea9202b7e44f251b7ed8c66d9ae3f4278",
- "sha256:243f92596f4fd4c8bd30ab8e8dd5965afe226363d75cab2468f2c707f64cd83b",
- "sha256:24af3dc43568f3780b7e1e57c49b41d98b2d940c1fd2e62d65d3928b6f95f021",
- "sha256:25691f4adfb9d5e796fd48bf1432272f95f4bbe5f89c475a788f31232ea6afba",
- "sha256:2e6965346fc1491a566e019a4a1d3dfc081ce7ac1a736536367ca305da6472a8",
- "sha256:3166dfff2d16fe9be3241ee60ece6fcb01cf8e74dd7c5e0b64f8e19fab44911b",
- "sha256:413c85cd0177c23e32dee6898c67a5f49296640041d98fddb2c40888fe4daa2e",
- "sha256:430093fce0efc7941d911d34f75a70084f12f6ca5c15d19595c18753edb7c33b",
- "sha256:43f28005141165edd11fbbf1541c920bd29e167b8bbc1fb410d4fe2269c1667a",
- "sha256:526ce723265643dbc4c7efb54f56648cc30e7abe20f387d763364b3ce7506c82",
- "sha256:53e68b091492c8ed2bd0141e00ad3089bcc6bf0e6ec4142ad6505b4afe64163e",
- "sha256:5bc08e75ed11693ecb648b7a0a4ed80da6d10845e44be0c98c03f2f880b68ff4",
- "sha256:6831a78bbd3c40f909b3e5233f87341f12d0b34a58f14115c9e94b4cdaf726d3",
- "sha256:6a1e03db964e9d32f112bae36f0cc1dcd1988d096cfd75d6a588a3c3def9ab2b",
- "sha256:6daeb8382d0df526372abd9cb795c992e18eed25ef2c43afe518c73f8cccb721",
- "sha256:6e7cde3a2221aa89247944cafb1b26616380e30c63e37ed19ff0bba5e968688d",
- "sha256:707c8f44931a4facd4149b52b75b80544a8d824162602b8cd2fe788207307f9a",
- "sha256:7286c353ee6475613d8beff83167374006c6b3e3f0e6491bfe8ca610eb1dec0f",
- "sha256:79cb400c360c7c210097b147c16a9e4c14688a6402445ac848f296ade6283bbc",
- "sha256:7cee4c6917857fd6121ed84f56d1dc78eb1d0e87f845ab5a568aba73e78adf83",
- "sha256:80bd73ea335203b125cf1d8e50fef06be709619eb6ab9e7b891ea34b5baa2287",
- "sha256:895184dfef8708e15f7516bd930bda7e50ead069280d2ce09ba11781b630a434",
- "sha256:8fddde2368e777ea2a4891a3fb4341e910a056be0bb15303bf1b92f073b80c02",
- "sha256:95d0b2cf8791ab5fb9e3aa3d9a79a0d5d51f55b6357eecf532a120ba3b5524db",
- "sha256:9661268415f450c95f72f0ac1217cc6f10256f860eed85c2ae32e75b60278ad8",
- "sha256:97b850f73f8abbffb66ccbab6e55a195a0eb655e5dc74624d15cff4bfb35bd74",
- "sha256:9ea54f7300553af0a2a7235e9b85f4204e1fc21848f917a3213b0e0818de9a24",
- "sha256:9ebc11c54c6ecdd07bb4efbfa1554538982f5432dfb8456958b6d46b9f834bb7",
- "sha256:a17d8fac6df9835d8e2b4c5523666e7051d0897a93756518a1fe101c7f47f2f0",
- "sha256:ae92bebca3b1e6bd203494e5ef919a60fb6dfe4d9a47ed2453211d3bd451b9f5",
- "sha256:b68094b165a9e930aedef90725a8fcfafe9ef95370cbb54abc0464062dbf808f",
- "sha256:b75b00083e7fe6621ce13cfce9d4469c4774e55e8e9d38c305b37f13cf1e874c",
- "sha256:bcd18441a49499bf5528deaa9dee1f5c01ca491fc2791b13604e8f972877f812",
- "sha256:bd90c221ed4e60ac9d476db967f436cfcecbd4ef744537c0f2d5291439848768",
- "sha256:c29d03e0adf3cc1a8c3ec62d176824972ae29b67a66cbb18daff3062acc6faa8",
- "sha256:c3330415cd387d2b88600e8e26b510d0370db9b7eaf984354a43e19c40df2e2b",
- "sha256:c7db3db284a0edaebe87f8f6642c2b2c27ed85c3e70064b84d1c9e4ec06d5d84",
- "sha256:ce119fc4ce0d64124d37f66a6f2a584fddc3c5001755f8a49f1ca0a177ef9796",
- "sha256:dbcdf987f3aceef9763b6d7b1fd3e4ee210ddd26cac421d78b3c206d07b2700b",
- "sha256:e54ef33ea80d464c3dcfe881eb00ad5921b60f8115ea1a30d781653edc2fd6a2",
- "sha256:e60ed6ef0a35c6b76b7640fe452d0e47acc832ccbb8475de549a5cc5f90c2c06",
- "sha256:fb1b30f31a36c7f3fee848391ff77eebdd3af5750bf95fbf9b8b5323edfdb4ec",
- "sha256:fbb034f565ecbe6c530dff948239377ba859420d146d5f62f0271407ffb8c580"
+ "sha256:016b2e665f778f13d3c438651dd4de244214b527a275e0acf1d44c05bc6026a9",
+ "sha256:032d979ce77a6c2432653322ba4cbeabf5a6837f704d16fa38b5a05d8e21fa00",
+ "sha256:0375a141e1c0878103eb3d719eb6d5aa444b490c96f3fedab8471c7f6ffe70ee",
+ "sha256:042622a5306c23b972192283f4e22372da3b8ddf5f7aac1cc5d9c9b222ab3ff6",
+ "sha256:05c3f58cf91683102f2f0265c0db3bd3892e9eedabe059720492dbaa4f922da1",
+ "sha256:0630774b0977804fba4b6bbea6852ab56c14965a2b0c7fc7282c5f7d90a1ae72",
+ "sha256:0f9f3f9a3763b9c4deb8c5d09c4cc52ffe49f9876af41cc1b2ad0138878453cf",
+ "sha256:1b56961e2d31389aaadf4906d453859f35302b4eb818d34a26fab72596076bb8",
+ "sha256:22b83aed390e3099584b839b93f80a0f4a95ee7f48270c97c90acd40ee646f0b",
+ "sha256:25b0f63e7fcc2a6290cb5f7f5b4fc4047843504983a28856ce9b35d8f7de03cc",
+ "sha256:2a275a806f73e849e1c309ac11108ea1a14cd7058577aba962cd7190e27c9e3c",
+ "sha256:2ab3f0336c0387662ce6221ad30ab3a5e6499aab01b9790879b6578fd9b8faa1",
+ "sha256:2e795c2f7d7249b75bb5f479b432a51b59041580d20599d4e112b5f2046437a3",
+ "sha256:3655af10ebcc0f1e4e06c5900bb33e080d6a1fa4228f502121f28a3b1753cde5",
+ "sha256:4668bd8faf7e5b71c0319407b608f278f279668f358857dbfd10ef1954ac9f90",
+ "sha256:4c31943b61ed8fdd63dfd12ccc919f2bf95eefca133767db6fbbd15da62078ec",
+ "sha256:4fdcd72a789c1c31ed242fd8c1bcd9ea186a98ee8e5408a50e610edfef980d71",
+ "sha256:627dee0c280eea91aed87b20a1f849e9ae2fe719d52cbf847c0e0ea34464b3f7",
+ "sha256:67219632be22f14750f0d1c70e62f204ba69d28f62fd6432ba05ab295853de9b",
+ "sha256:6921ee01caf375363be5e9ae70d08ce7ca9d7e0e8983183080211a062d299468",
+ "sha256:69683e02e8a9de37f17985905a5eca18ad651bf592314b4d3d799029797d0eb3",
+ "sha256:6a93c5a0dfe8d34951e8a6f499a9479ffb9258123551fa007fc708ae2ac2bc5e",
+ "sha256:732e026240cdd1c1b2e3ac515c7a23820430ed94292ce33806a95869c46bd139",
+ "sha256:7befc148de64b6060937231cbff8d01ccf0bfd75aa26383ffdf8d82b12ec04ff",
+ "sha256:890da8cd1941fa3dab28c5bac3b9da8502e7e366f895b3b8e500896f12f94d11",
+ "sha256:89b64cd8898a3a6f642db4eb7b26d1b28a497d4022eccd7717ca066823e9fb01",
+ "sha256:8a6219108a15fc6d24de499d0d515c7235c617b2540d97116b663dade1a54d62",
+ "sha256:8cdf1a0dbe5ced887a9b127da4ffd7354e9c1a3b9bb330dce84df6b70ccb3a8d",
+ "sha256:8d625eddf7efeba2abfd9c014a22c0f6b3796e0ffb48f5d5ab106568ef01ff5a",
+ "sha256:93a71c8601e823236ac0e5d087e4f397874a421017b3318fd92c0b14acf2b6db",
+ "sha256:9509c4123491d0e63fb5e16199e09f8e262066e58903e84615c301dde8fa2e87",
+ "sha256:a29762cd3d116585278ffb2e5b8cc311fb095ea278b96feef28d0b423154858e",
+ "sha256:a62dd5d7cc8626a3634208df458c5fe4f21200d96a74d122c83bc2015b333bc1",
+ "sha256:ada603db10bb865bbe591939de854faf2c60f43c9b763e90f653224138f910d9",
+ "sha256:aee110e4ef3c528f3abbc3c2018c121e708938adeeff9006428dd7c8555e9b3f",
+ "sha256:b76d63495b0508ab9fc23f8152bac63205d2a704cd009a2b0722f4c8e0cba8e0",
+ "sha256:c0d8326269dbf944b9201911b0d9f3dc524d64779a07518199a58384c3d37a44",
+ "sha256:c41411e192f8d3ea39ea70e0fae48762cd11a2244e03751a98bd3c0ca9a4e936",
+ "sha256:c68fe3fcde03920c46697585620135b4ecfdfc1ed23e75cc2c2ae9f8502c10b8",
+ "sha256:cb8bea573863762bbf45d1e13f87c2d2fd32cee2dbd50d050f83f87429c9e1ea",
+ "sha256:cc32b2990fc34380ec2f6195f33a76b6cdaa9eecf09f0c9404b74fc120aef36f",
+ "sha256:ccae5de2a0140d8be6838c331604f91d6fafd0735dbdcee1ac78fc8fbaba76b4",
+ "sha256:d299797d75cd747e7797b1b41817111406b8b10a4f88b6e8fe5b5e59598b43b0",
+ "sha256:e04b622bb8a88f10e439084486f2f6349bf4d50605ac3e445869c7ea5cf0fa8c",
+ "sha256:e11d7ea4d24f0a262bccf9a7cd6284c976c5369dac21db237cff59586045ab9f",
+ "sha256:e21f66748ab725ade40fa7af8ec8b5019c68ab00b929f6643e1b1af461eddb60",
+ "sha256:eb60b026d8ad0c97917cb81d3662d0b39b8ff1335e3fabb24984c6acd0c900a2",
+ "sha256:f021d334f2ca692523aaf7bbf7592ceff70c8594fad853416a81d66b35e3abf9",
+ "sha256:f552023710d4b93d8fb29a91fadf97de89c5926c6bd758897875435f2a939f33"
],
"markers": "python_version >= '3.7'",
- "version": "==2.0.34"
+ "version": "==2.0.35"
},
"sqlalchemy-utils": {
"hashes": [
@@ -1426,11 +1565,11 @@
},
"tinydb": {
"hashes": [
- "sha256:30c06d12383d7c332e404ca6a6103fb2b32cbf25712689648c39d9a6bd34bd3d",
- "sha256:6dd686a9c5a75dfa9280088fd79a419aefe19cd7f4bd85eba203540ef856d564"
+ "sha256:f7dfc39b8d7fda7a1ca62a8dbb449ffd340a117c1206b68c50b1a481fb95181d",
+ "sha256:f97030ee5cbc91eeadd1d7af07ab0e48ceb04aa63d4a983adbaca4cba16e86c3"
],
- "markers": "python_version >= '3.7' and python_version < '4.0'",
- "version": "==4.8.0"
+ "markers": "python_version >= '3.8' and python_version < '4.0'",
+ "version": "==4.8.2"
},
"tuspy": {
"hashes": [
@@ -1450,11 +1589,11 @@
},
"tzdata": {
"hashes": [
- "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd",
- "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"
+ "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc",
+ "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"
],
"markers": "python_version >= '2'",
- "version": "==2024.1"
+ "version": "==2024.2"
},
"urllib3": {
"hashes": [
@@ -1550,182 +1689,305 @@
},
"yarl": {
"hashes": [
- "sha256:01a8697ec24f17c349c4f655763c4db70eebc56a5f82995e5e26e837c6eb0e49",
- "sha256:02da8759b47d964f9173c8675710720b468aa1c1693be0c9c64abb9d8d9a4867",
- "sha256:04293941646647b3bfb1719d1d11ff1028e9c30199509a844da3c0f5919dc520",
- "sha256:067b961853c8e62725ff2893226fef3d0da060656a9827f3f520fb1d19b2b68a",
- "sha256:077da604852be488c9a05a524068cdae1e972b7dc02438161c32420fb4ec5e14",
- "sha256:09696438cb43ea6f9492ef237761b043f9179f455f405279e609f2bc9100212a",
- "sha256:0b8486f322d8f6a38539136a22c55f94d269addb24db5cb6f61adc61eabc9d93",
- "sha256:0ea9682124fc062e3d931c6911934a678cb28453f957ddccf51f568c2f2b5e05",
- "sha256:0f351fa31234699d6084ff98283cb1e852270fe9e250a3b3bf7804eb493bd937",
- "sha256:14438dfc5015661f75f85bc5adad0743678eefee266ff0c9a8e32969d5d69f74",
- "sha256:15061ce6584ece023457fb8b7a7a69ec40bf7114d781a8c4f5dcd68e28b5c53b",
- "sha256:15439f3c5c72686b6c3ff235279630d08936ace67d0fe5c8d5bbc3ef06f5a420",
- "sha256:17b5a386d0d36fb828e2fb3ef08c8829c1ebf977eef88e5367d1c8c94b454639",
- "sha256:18ac56c9dd70941ecad42b5a906820824ca72ff84ad6fa18db33c2537ae2e089",
- "sha256:1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53",
- "sha256:1e969fa4c1e0b1a391f3fcbcb9ec31e84440253325b534519be0d28f4b6b533e",
- "sha256:1fa2e7a406fbd45b61b4433e3aa254a2c3e14c4b3186f6e952d08a730807fa0c",
- "sha256:2164cd9725092761fed26f299e3f276bb4b537ca58e6ff6b252eae9631b5c96e",
- "sha256:21a7c12321436b066c11ec19c7e3cb9aec18884fe0d5b25d03d756a9e654edfe",
- "sha256:238a21849dd7554cb4d25a14ffbfa0ef380bb7ba201f45b144a14454a72ffa5a",
- "sha256:250e888fa62d73e721f3041e3a9abf427788a1934b426b45e1b92f62c1f68366",
- "sha256:25861303e0be76b60fddc1250ec5986c42f0a5c0c50ff57cc30b1be199c00e63",
- "sha256:267b24f891e74eccbdff42241c5fb4f974de2d6271dcc7d7e0c9ae1079a560d9",
- "sha256:27fcb271a41b746bd0e2a92182df507e1c204759f460ff784ca614e12dd85145",
- "sha256:2909fa3a7d249ef64eeb2faa04b7957e34fefb6ec9966506312349ed8a7e77bf",
- "sha256:3257978c870728a52dcce8c2902bf01f6c53b65094b457bf87b2644ee6238ddc",
- "sha256:327c724b01b8641a1bf1ab3b232fb638706e50f76c0b5bf16051ab65c868fac5",
- "sha256:3de5292f9f0ee285e6bd168b2a77b2a00d74cbcfa420ed078456d3023d2f6dff",
- "sha256:3fce4da3703ee6048ad4138fe74619c50874afe98b1ad87b2698ef95bf92c96d",
- "sha256:3ff6b1617aa39279fe18a76c8d165469c48b159931d9b48239065767ee455b2b",
- "sha256:400cd42185f92de559d29eeb529e71d80dfbd2f45c36844914a4a34297ca6f00",
- "sha256:4179522dc0305c3fc9782549175c8e8849252fefeb077c92a73889ccbcd508ad",
- "sha256:4307d9a3417eea87715c9736d050c83e8c1904e9b7aada6ce61b46361b733d92",
- "sha256:476e20c433b356e16e9a141449f25161e6b69984fb4cdbd7cd4bd54c17844998",
- "sha256:489fa8bde4f1244ad6c5f6d11bb33e09cf0d1d0367edb197619c3e3fc06f3d91",
- "sha256:48a28bed68ab8fb7e380775f0029a079f08a17799cb3387a65d14ace16c12e2b",
- "sha256:48dfd117ab93f0129084577a07287376cc69c08138694396f305636e229caa1a",
- "sha256:4973eac1e2ff63cf187073cd4e1f1148dcd119314ab79b88e1b3fad74a18c9d5",
- "sha256:498442e3af2a860a663baa14fbf23fb04b0dd758039c0e7c8f91cb9279799bff",
- "sha256:501c503eed2bb306638ccb60c174f856cc3246c861829ff40eaa80e2f0330367",
- "sha256:504cf0d4c5e4579a51261d6091267f9fd997ef58558c4ffa7a3e1460bd2336fa",
- "sha256:61a5f2c14d0a1adfdd82258f756b23a550c13ba4c86c84106be4c111a3a4e413",
- "sha256:637c7ddb585a62d4469f843dac221f23eec3cbad31693b23abbc2c366ad41ff4",
- "sha256:66b63c504d2ca43bf7221a1f72fbe981ff56ecb39004c70a94485d13e37ebf45",
- "sha256:67459cf8cf31da0e2cbdb4b040507e535d25cfbb1604ca76396a3a66b8ba37a6",
- "sha256:688654f8507464745ab563b041d1fb7dab5d9912ca6b06e61d1c4708366832f5",
- "sha256:6907daa4b9d7a688063ed098c472f96e8181733c525e03e866fb5db480a424df",
- "sha256:69721b8effdb588cb055cc22f7c5105ca6fdaa5aeb3ea09021d517882c4a904c",
- "sha256:6d23754b9939cbab02c63434776df1170e43b09c6a517585c7ce2b3d449b7318",
- "sha256:7175a87ab8f7fbde37160a15e58e138ba3b2b0e05492d7351314a250d61b1591",
- "sha256:72bf26f66456baa0584eff63e44545c9f0eaed9b73cb6601b647c91f14c11f38",
- "sha256:74db2ef03b442276d25951749a803ddb6e270d02dda1d1c556f6ae595a0d76a8",
- "sha256:750f656832d7d3cb0c76be137ee79405cc17e792f31e0a01eee390e383b2936e",
- "sha256:75e0ae31fb5ccab6eda09ba1494e87eb226dcbd2372dae96b87800e1dcc98804",
- "sha256:768ecc550096b028754ea28bf90fde071c379c62c43afa574edc6f33ee5daaec",
- "sha256:7d51324a04fc4b0e097ff8a153e9276c2593106a811704025bbc1d6916f45ca6",
- "sha256:7e975a2211952a8a083d1b9d9ba26472981ae338e720b419eb50535de3c02870",
- "sha256:8215f6f21394d1f46e222abeb06316e77ef328d628f593502d8fc2a9117bde83",
- "sha256:8258c86f47e080a258993eed877d579c71da7bda26af86ce6c2d2d072c11320d",
- "sha256:8418c053aeb236b20b0ab8fa6bacfc2feaaf7d4683dd96528610989c99723d5f",
- "sha256:87f020d010ba80a247c4abc335fc13421037800ca20b42af5ae40e5fd75e7909",
- "sha256:884eab2ce97cbaf89f264372eae58388862c33c4f551c15680dd80f53c89a269",
- "sha256:8a336eaa7ee7e87cdece3cedb395c9657d227bfceb6781295cf56abcd3386a26",
- "sha256:8aef1b64da41d18026632d99a06b3fefe1d08e85dd81d849fa7c96301ed22f1b",
- "sha256:8aef97ba1dd2138112890ef848e17d8526fe80b21f743b4ee65947ea184f07a2",
- "sha256:8ed653638ef669e0efc6fe2acb792275cb419bf9cb5c5049399f3556995f23c7",
- "sha256:9361628f28f48dcf8b2f528420d4d68102f593f9c2e592bfc842f5fb337e44fd",
- "sha256:946eedc12895873891aaceb39bceb484b4977f70373e0122da483f6c38faaa68",
- "sha256:94d0caaa912bfcdc702a4204cd5e2bb01eb917fc4f5ea2315aa23962549561b0",
- "sha256:964a428132227edff96d6f3cf261573cb0f1a60c9a764ce28cda9525f18f7786",
- "sha256:999bfee0a5b7385a0af5ffb606393509cfde70ecca4f01c36985be6d33e336da",
- "sha256:a08ea567c16f140af8ddc7cb58e27e9138a1386e3e6e53982abaa6f2377b38cc",
- "sha256:a28b70c9e2213de425d9cba5ab2e7f7a1c8ca23a99c4b5159bf77b9c31251447",
- "sha256:a34e1e30f1774fa35d37202bbeae62423e9a79d78d0874e5556a593479fdf239",
- "sha256:a4264515f9117be204935cd230fb2a052dd3792789cc94c101c535d349b3dab0",
- "sha256:a7915ea49b0c113641dc4d9338efa9bd66b6a9a485ffe75b9907e8573ca94b84",
- "sha256:aac44097d838dda26526cffb63bdd8737a2dbdf5f2c68efb72ad83aec6673c7e",
- "sha256:b91044952da03b6f95fdba398d7993dd983b64d3c31c358a4c89e3c19b6f7aef",
- "sha256:ba444bdd4caa2a94456ef67a2f383710928820dd0117aae6650a4d17029fa25e",
- "sha256:c2dc4250fe94d8cd864d66018f8344d4af50e3758e9d725e94fecfa27588ff82",
- "sha256:c35f493b867912f6fda721a59cc7c4766d382040bdf1ddaeeaa7fa4d072f4675",
- "sha256:c92261eb2ad367629dc437536463dc934030c9e7caca861cc51990fe6c565f26",
- "sha256:ce928c9c6409c79e10f39604a7e214b3cb69552952fbda8d836c052832e6a979",
- "sha256:d95b52fbef190ca87d8c42f49e314eace4fc52070f3dfa5f87a6594b0c1c6e46",
- "sha256:dae7bd0daeb33aa3e79e72877d3d51052e8b19c9025ecf0374f542ea8ec120e4",
- "sha256:e286580b6511aac7c3268a78cdb861ec739d3e5a2a53b4809faef6b49778eaff",
- "sha256:e4b53f73077e839b3f89c992223f15b1d2ab314bdbdf502afdc7bb18e95eae27",
- "sha256:e8f63904df26d1a66aabc141bfd258bf738b9bc7bc6bdef22713b4f5ef789a4c",
- "sha256:f3a6d90cab0bdf07df8f176eae3a07127daafcf7457b997b2bf46776da2c7eb7",
- "sha256:f41fa79114a1d2eddb5eea7b912d6160508f57440bd302ce96eaa384914cd265",
- "sha256:f46f81501160c28d0c0b7333b4f7be8983dbbc161983b6fb814024d1b4952f79",
- "sha256:f61db3b7e870914dbd9434b560075e0366771eecbe6d2b5561f5bc7485f39efd"
+ "sha256:0545de8c688fbbf3088f9e8b801157923be4bf8e7b03e97c2ecd4dfa39e48e0e",
+ "sha256:076b1ed2ac819933895b1a000904f62d615fe4533a5cf3e052ff9a1da560575c",
+ "sha256:0afad2cd484908f472c8fe2e8ef499facee54a0a6978be0e0cff67b1254fd747",
+ "sha256:0ccaa1bc98751fbfcf53dc8dfdb90d96e98838010fc254180dd6707a6e8bb179",
+ "sha256:0d3105efab7c5c091609abacad33afff33bdff0035bece164c98bcf5a85ef90a",
+ "sha256:0e1af74a9529a1137c67c887ed9cde62cff53aa4d84a3adbec329f9ec47a3936",
+ "sha256:136f9db0f53c0206db38b8cd0c985c78ded5fd596c9a86ce5c0b92afb91c3a19",
+ "sha256:156ececdf636143f508770bf8a3a0498de64da5abd890c7dbb42ca9e3b6c05b8",
+ "sha256:15c87339490100c63472a76d87fe7097a0835c705eb5ae79fd96e343473629ed",
+ "sha256:1695497bb2a02a6de60064c9f077a4ae9c25c73624e0d43e3aa9d16d983073c2",
+ "sha256:173563f3696124372831007e3d4b9821746964a95968628f7075d9231ac6bb33",
+ "sha256:173866d9f7409c0fb514cf6e78952e65816600cb888c68b37b41147349fe0057",
+ "sha256:23ec1d3c31882b2a8a69c801ef58ebf7bae2553211ebbddf04235be275a38548",
+ "sha256:243fbbbf003754fe41b5bdf10ce1e7f80bcc70732b5b54222c124d6b4c2ab31c",
+ "sha256:28c6cf1d92edf936ceedc7afa61b07e9d78a27b15244aa46bbcd534c7458ee1b",
+ "sha256:2aa738e0282be54eede1e3f36b81f1e46aee7ec7602aa563e81e0e8d7b67963f",
+ "sha256:2cf441c4b6e538ba0d2591574f95d3fdd33f1efafa864faa077d9636ecc0c4e9",
+ "sha256:30c3ff305f6e06650a761c4393666f77384f1cc6c5c0251965d6bfa5fbc88f7f",
+ "sha256:31561a5b4d8dbef1559b3600b045607cf804bae040f64b5f5bca77da38084a8a",
+ "sha256:32b66be100ac5739065496c74c4b7f3015cef792c3174982809274d7e51b3e04",
+ "sha256:3433da95b51a75692dcf6cc8117a31410447c75a9a8187888f02ad45c0a86c50",
+ "sha256:34a2d76a1984cac04ff8b1bfc939ec9dc0914821264d4a9c8fd0ed6aa8d4cfd2",
+ "sha256:353665775be69bbfc6d54c8d134bfc533e332149faeddd631b0bc79df0897f46",
+ "sha256:38d0124fa992dbacd0c48b1b755d3ee0a9f924f427f95b0ef376556a24debf01",
+ "sha256:3c56ec1eacd0a5d35b8a29f468659c47f4fe61b2cab948ca756c39b7617f0aa5",
+ "sha256:3db817b4e95eb05c362e3b45dafe7144b18603e1211f4a5b36eb9522ecc62bcf",
+ "sha256:3e52474256a7db9dcf3c5f4ca0b300fdea6c21cca0148c8891d03a025649d935",
+ "sha256:416f2e3beaeae81e2f7a45dc711258be5bdc79c940a9a270b266c0bec038fb84",
+ "sha256:435aca062444a7f0c884861d2e3ea79883bd1cd19d0a381928b69ae1b85bc51d",
+ "sha256:4388c72174868884f76affcdd3656544c426407e0043c89b684d22fb265e04a5",
+ "sha256:43ebdcc120e2ca679dba01a779333a8ea76b50547b55e812b8b92818d604662c",
+ "sha256:458c0c65802d816a6b955cf3603186de79e8fdb46d4f19abaec4ef0a906f50a7",
+ "sha256:533a28754e7f7439f217550a497bb026c54072dbe16402b183fdbca2431935a9",
+ "sha256:553dad9af802a9ad1a6525e7528152a015b85fb8dbf764ebfc755c695f488367",
+ "sha256:5838f2b79dc8f96fdc44077c9e4e2e33d7089b10788464609df788eb97d03aad",
+ "sha256:5b48388ded01f6f2429a8c55012bdbd1c2a0c3735b3e73e221649e524c34a58d",
+ "sha256:5bc0df728e4def5e15a754521e8882ba5a5121bd6b5a3a0ff7efda5d6558ab3d",
+ "sha256:63eab904f8630aed5a68f2d0aeab565dcfc595dc1bf0b91b71d9ddd43dea3aea",
+ "sha256:66f629632220a4e7858b58e4857927dd01a850a4cef2fb4044c8662787165cf7",
+ "sha256:670eb11325ed3a6209339974b276811867defe52f4188fe18dc49855774fa9cf",
+ "sha256:69d5856d526802cbda768d3e6246cd0d77450fa2a4bc2ea0ea14f0d972c2894b",
+ "sha256:6e840553c9c494a35e449a987ca2c4f8372668ee954a03a9a9685075228e5036",
+ "sha256:711bdfae4e699a6d4f371137cbe9e740dc958530cb920eb6f43ff9551e17cfbc",
+ "sha256:74abb8709ea54cc483c4fb57fb17bb66f8e0f04438cff6ded322074dbd17c7ec",
+ "sha256:75119badf45f7183e10e348edff5a76a94dc19ba9287d94001ff05e81475967b",
+ "sha256:766dcc00b943c089349d4060b935c76281f6be225e39994c2ccec3a2a36ad627",
+ "sha256:78e6fdc976ec966b99e4daa3812fac0274cc28cd2b24b0d92462e2e5ef90d368",
+ "sha256:81dadafb3aa124f86dc267a2168f71bbd2bfb163663661ab0038f6e4b8edb810",
+ "sha256:82d5161e8cb8f36ec778fd7ac4d740415d84030f5b9ef8fe4da54784a1f46c94",
+ "sha256:833547179c31f9bec39b49601d282d6f0ea1633620701288934c5f66d88c3e50",
+ "sha256:856b7f1a7b98a8c31823285786bd566cf06226ac4f38b3ef462f593c608a9bd6",
+ "sha256:8657d3f37f781d987037f9cc20bbc8b40425fa14380c87da0cb8dfce7c92d0fb",
+ "sha256:93bed8a8084544c6efe8856c362af08a23e959340c87a95687fdbe9c9f280c8b",
+ "sha256:954dde77c404084c2544e572f342aef384240b3e434e06cecc71597e95fd1ce7",
+ "sha256:98f68df80ec6ca3015186b2677c208c096d646ef37bbf8b49764ab4a38183931",
+ "sha256:99e12d2bf587b44deb74e0d6170fec37adb489964dbca656ec41a7cd8f2ff178",
+ "sha256:9a13a07532e8e1c4a5a3afff0ca4553da23409fad65def1b71186fb867eeae8d",
+ "sha256:9c1e3ff4b89cdd2e1a24c214f141e848b9e0451f08d7d4963cb4108d4d798f1f",
+ "sha256:9ce2e0f6123a60bd1a7f5ae3b2c49b240c12c132847f17aa990b841a417598a2",
+ "sha256:9fcda20b2de7042cc35cf911702fa3d8311bd40055a14446c1e62403684afdc5",
+ "sha256:a32d58f4b521bb98b2c0aa9da407f8bd57ca81f34362bcb090e4a79e9924fefc",
+ "sha256:a39c36f4218a5bb668b4f06874d676d35a035ee668e6e7e3538835c703634b84",
+ "sha256:a5cafb02cf097a82d74403f7e0b6b9df3ffbfe8edf9415ea816314711764a27b",
+ "sha256:a7cf963a357c5f00cb55b1955df8bbe68d2f2f65de065160a1c26b85a1e44172",
+ "sha256:a880372e2e5dbb9258a4e8ff43f13888039abb9dd6d515f28611c54361bc5644",
+ "sha256:ace4cad790f3bf872c082366c9edd7f8f8f77afe3992b134cfc810332206884f",
+ "sha256:af8ff8d7dc07ce873f643de6dfbcd45dc3db2c87462e5c387267197f59e6d776",
+ "sha256:b47a6000a7e833ebfe5886b56a31cb2ff12120b1efd4578a6fcc38df16cc77bd",
+ "sha256:b71862a652f50babab4a43a487f157d26b464b1dedbcc0afda02fd64f3809d04",
+ "sha256:b7f227ca6db5a9fda0a2b935a2ea34a7267589ffc63c8045f0e4edb8d8dcf956",
+ "sha256:bc8936d06cd53fddd4892677d65e98af514c8d78c79864f418bbf78a4a2edde4",
+ "sha256:bed1b5dbf90bad3bfc19439258c97873eab453c71d8b6869c136346acfe497e7",
+ "sha256:c45817e3e6972109d1a2c65091504a537e257bc3c885b4e78a95baa96df6a3f8",
+ "sha256:c68e820879ff39992c7f148113b46efcd6ec765a4865581f2902b3c43a5f4bbb",
+ "sha256:c77494a2f2282d9bbbbcab7c227a4d1b4bb829875c96251f66fb5f3bae4fb053",
+ "sha256:c998d0558805860503bc3a595994895ca0f7835e00668dadc673bbf7f5fbfcbe",
+ "sha256:ccad2800dfdff34392448c4bf834be124f10a5bc102f254521d931c1c53c455a",
+ "sha256:cd126498171f752dd85737ab1544329a4520c53eed3997f9b08aefbafb1cc53b",
+ "sha256:ce44217ad99ffad8027d2fde0269ae368c86db66ea0571c62a000798d69401fb",
+ "sha256:d1ac2bc069f4a458634c26b101c2341b18da85cb96afe0015990507efec2e417",
+ "sha256:d417a4f6943112fae3924bae2af7112562285848d9bcee737fc4ff7cbd450e6c",
+ "sha256:d538df442c0d9665664ab6dd5fccd0110fa3b364914f9c85b3ef9b7b2e157980",
+ "sha256:ded1b1803151dd0f20a8945508786d57c2f97a50289b16f2629f85433e546d47",
+ "sha256:e2e93b88ecc8f74074012e18d679fb2e9c746f2a56f79cd5e2b1afcf2a8a786b",
+ "sha256:e4ca3b9f370f218cc2a0309542cab8d0acdfd66667e7c37d04d617012485f904",
+ "sha256:e4ee8b8639070ff246ad3649294336b06db37a94bdea0d09ea491603e0be73b8",
+ "sha256:e52f77a0cd246086afde8815039f3e16f8d2be51786c0a39b57104c563c5cbb0",
+ "sha256:eaea112aed589131f73d50d570a6864728bd7c0c66ef6c9154ed7b59f24da611",
+ "sha256:ed20a4bdc635f36cb19e630bfc644181dd075839b6fc84cac51c0f381ac472e2",
+ "sha256:eedc3f247ee7b3808ea07205f3e7d7879bc19ad3e6222195cd5fbf9988853e4d",
+ "sha256:f0e1844ad47c7bd5d6fa784f1d4accc5f4168b48999303a868fe0f8597bde715",
+ "sha256:f4fe99ce44128c71233d0d72152db31ca119711dfc5f2c82385ad611d8d7f897",
+ "sha256:f8cfd847e6b9ecf9f2f2531c8427035f291ec286c0a4944b0a9fce58c6446046",
+ "sha256:f9ca0e6ce7774dc7830dc0cc4bb6b3eec769db667f230e7c770a628c1aa5681b",
+ "sha256:fa2bea05ff0a8fb4d8124498e00e02398f06d23cdadd0fe027d84a3f7afde31e",
+ "sha256:fbbb63bed5fcd70cd3dd23a087cd78e4675fb5a2963b8af53f945cbbca79ae16",
+ "sha256:fbda058a9a68bec347962595f50546a8a4a34fd7b0654a7b9697917dc2bf810d",
+ "sha256:ffd591e22b22f9cb48e472529db6a47203c41c2c5911ff0a52e85723196c0d75"
],
"markers": "python_version >= '3.8'",
- "version": "==1.11.1"
+ "version": "==1.15.2"
}
},
"develop": {
+ "certifi": {
+ "hashes": [
+ "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+ "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
+ ],
+ "markers": "python_version >= '3.6'",
+ "version": "==2024.8.30"
+ },
+ "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"
+ },
"coverage": {
"hashes": [
- "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca",
- "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d",
- "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6",
- "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989",
- "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c",
- "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b",
- "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223",
- "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f",
- "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56",
- "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3",
- "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8",
- "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb",
- "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388",
- "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0",
- "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a",
- "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8",
- "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f",
- "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a",
- "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962",
- "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8",
- "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391",
- "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc",
- "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2",
- "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155",
- "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb",
- "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0",
- "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c",
- "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a",
- "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004",
- "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060",
- "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232",
- "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93",
- "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129",
- "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163",
- "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de",
- "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6",
- "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23",
- "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569",
- "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d",
- "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778",
- "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d",
- "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36",
- "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a",
- "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6",
- "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34",
- "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704",
- "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106",
- "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9",
- "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862",
- "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b",
- "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255",
- "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16",
- "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3",
- "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133",
- "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb",
- "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657",
- "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d",
- "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca",
- "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36",
- "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c",
- "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e",
- "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff",
- "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7",
- "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5",
- "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02",
- "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c",
- "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df",
- "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3",
- "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a",
- "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959",
- "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234",
- "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc"
+ "sha256:04f2189716e85ec9192df307f7c255f90e78b6e9863a03223c3b998d24a3c6c6",
+ "sha256:0c6c0f4d53ef603397fc894a895b960ecd7d44c727df42a8d500031716d4e8d2",
+ "sha256:0ca37993206402c6c35dc717f90d4c8f53568a8b80f0bf1a1b2b334f4d488fba",
+ "sha256:12f9515d875859faedb4144fd38694a761cd2a61ef9603bf887b13956d0bbfbb",
+ "sha256:1990b1f4e2c402beb317840030bb9f1b6a363f86e14e21b4212e618acdfce7f6",
+ "sha256:2341a78ae3a5ed454d524206a3fcb3cec408c2a0c7c2752cd78b606a2ff15af4",
+ "sha256:23bb63ae3f4c645d2d82fa22697364b0046fbafb6261b258a58587441c5f7bd0",
+ "sha256:27bd5f18d8f2879e45724b0ce74f61811639a846ff0e5c0395b7818fae87aec6",
+ "sha256:2dc7d6b380ca76f5e817ac9eef0c3686e7834c8346bef30b041a4ad286449990",
+ "sha256:331b200ad03dbaa44151d74daeb7da2cf382db424ab923574f6ecca7d3b30de3",
+ "sha256:365defc257c687ce3e7d275f39738dcd230777424117a6c76043459db131dd43",
+ "sha256:37be7b5ea3ff5b7c4a9db16074dc94523b5f10dd1f3b362a827af66a55198175",
+ "sha256:3c2e6fa98032fec8282f6b27e3f3986c6e05702828380618776ad794e938f53a",
+ "sha256:40e8b1983080439d4802d80b951f4a93d991ef3261f69e81095a66f86cf3c3c6",
+ "sha256:43517e1f6b19f610a93d8227e47790722c8bf7422e46b365e0469fc3d3563d97",
+ "sha256:43b32a06c47539fe275106b376658638b418c7cfdfff0e0259fbf877e845f14b",
+ "sha256:43d6a66e33b1455b98fc7312b124296dad97a2e191c80320587234a77b1b736e",
+ "sha256:4c59d6a4a4633fad297f943c03d0d2569867bd5372eb5684befdff8df8522e39",
+ "sha256:52ac29cc72ee7e25ace7807249638f94c9b6a862c56b1df015d2b2e388e51dbd",
+ "sha256:54356a76b67cf8a3085818026bb556545ebb8353951923b88292556dfa9f812d",
+ "sha256:583049c63106c0555e3ae3931edab5669668bbef84c15861421b94e121878d3f",
+ "sha256:6d99198203f0b9cb0b5d1c0393859555bc26b548223a769baf7e321a627ed4fc",
+ "sha256:6da42bbcec130b188169107ecb6ee7bd7b4c849d24c9370a0c884cf728d8e976",
+ "sha256:6e484e479860e00da1f005cd19d1c5d4a813324e5951319ac3f3eefb497cc549",
+ "sha256:70a6756ce66cd6fe8486c775b30889f0dc4cb20c157aa8c35b45fd7868255c5c",
+ "sha256:70d24936ca6c15a3bbc91ee9c7fc661132c6f4c9d42a23b31b6686c05073bde5",
+ "sha256:71967c35828c9ff94e8c7d405469a1fb68257f686bca7c1ed85ed34e7c2529c4",
+ "sha256:79644f68a6ff23b251cae1c82b01a0b51bc40c8468ca9585c6c4b1aeee570e0b",
+ "sha256:87cd2e29067ea397a47e352efb13f976eb1b03e18c999270bb50589323294c6e",
+ "sha256:8d4c6ea0f498c7c79111033a290d060c517853a7bcb2f46516f591dab628ddd3",
+ "sha256:9134032f5aa445ae591c2ba6991d10136a1f533b1d2fa8f8c21126468c5025c6",
+ "sha256:921fbe13492caf6a69528f09d5d7c7d518c8d0e7b9f6701b7719715f29a71e6e",
+ "sha256:99670790f21a96665a35849990b1df447993880bb6463a0a1d757897f30da929",
+ "sha256:9975442f2e7a5cfcf87299c26b5a45266ab0696348420049b9b94b2ad3d40234",
+ "sha256:99ded130555c021d99729fabd4ddb91a6f4cc0707df4b1daf912c7850c373b13",
+ "sha256:a3328c3e64ea4ab12b85999eb0779e6139295bbf5485f69d42cf794309e3d007",
+ "sha256:a4fb91d5f72b7e06a14ff4ae5be625a81cd7e5f869d7a54578fc271d08d58ae3",
+ "sha256:aa23ce39661a3e90eea5f99ec59b763b7d655c2cada10729ed920a38bfc2b167",
+ "sha256:aac7501ae73d4a02f4b7ac8fcb9dc55342ca98ffb9ed9f2dfb8a25d53eda0e4d",
+ "sha256:ab84a8b698ad5a6c365b08061920138e7a7dd9a04b6feb09ba1bfae68346ce6d",
+ "sha256:b4adeb878a374126f1e5cf03b87f66279f479e01af0e9a654cf6d1509af46c40",
+ "sha256:b9853509b4bf57ba7b1f99b9d866c422c9c5248799ab20e652bbb8a184a38181",
+ "sha256:bb7d5fe92bd0dc235f63ebe9f8c6e0884f7360f88f3411bfed1350c872ef2054",
+ "sha256:bca4c8abc50d38f9773c1ec80d43f3768df2e8576807d1656016b9d3eeaa96fd",
+ "sha256:c222958f59b0ae091f4535851cbb24eb57fc0baea07ba675af718fb5302dddb2",
+ "sha256:c30e42ea11badb147f0d2e387115b15e2bd8205a5ad70d6ad79cf37f6ac08c91",
+ "sha256:c3a79f56dee9136084cf84a6c7c4341427ef36e05ae6415bf7d787c96ff5eaa3",
+ "sha256:c51ef82302386d686feea1c44dbeef744585da16fcf97deea2a8d6c1556f519b",
+ "sha256:c77326300b839c44c3e5a8fe26c15b7e87b2f32dfd2fc9fee1d13604347c9b38",
+ "sha256:d33a785ea8354c480515e781554d3be582a86297e41ccbea627a5c632647f2cd",
+ "sha256:d546cfa78844b8b9c1c0533de1851569a13f87449897bbc95d698d1d3cb2a30f",
+ "sha256:da29ceabe3025a1e5a5aeeb331c5b1af686daab4ff0fb4f83df18b1180ea83e2",
+ "sha256:df8c05a0f574d480947cba11b947dc41b1265d721c3777881da2fb8d3a1ddfba",
+ "sha256:e266af4da2c1a4cbc6135a570c64577fd3e6eb204607eaff99d8e9b710003c6f",
+ "sha256:e279f3db904e3b55f520f11f983cc8dc8a4ce9b65f11692d4718ed021ec58b83",
+ "sha256:ea52bd218d4ba260399a8ae4bb6b577d82adfc4518b93566ce1fddd4a49d1dce",
+ "sha256:ebec65f5068e7df2d49466aab9128510c4867e532e07cb6960075b27658dca38",
+ "sha256:ec1e3b40b82236d100d259854840555469fad4db64f669ab817279eb95cd535c",
+ "sha256:ee77c7bef0724165e795b6b7bf9c4c22a9b8468a6bdb9c6b4281293c6b22a90f",
+ "sha256:f263b18692f8ed52c8de7f40a0751e79015983dbd77b16906e5b310a39d3ca21",
+ "sha256:f7b26757b22faf88fcf232f5f0e62f6e0fd9e22a8a5d0d5016888cdfe1f6c1c4",
+ "sha256:f7ddb920106bbbbcaf2a274d56f46956bf56ecbde210d88061824a95bdd94e92"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
- "version": "==7.6.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==7.6.3"
+ },
+ "idna": {
+ "hashes": [
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
+ ],
+ "markers": "python_version >= '3.6'",
+ "version": "==3.10"
},
"iniconfig": {
"hashes": [
@@ -1759,6 +2021,31 @@
"index": "pypi",
"markers": "python_version >= '3.8'",
"version": "==8.3.3"
+ },
+ "requests": {
+ "hashes": [
+ "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",
+ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.32.3"
+ },
+ "requests-mock": {
+ "hashes": [
+ "sha256:b1e37054004cdd5e56c84454cc7df12b25f90f382159087f4b6915aaeef39563",
+ "sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401"
+ ],
+ "index": "pypi",
+ "markers": "python_version >= '3.5'",
+ "version": "==1.12.1"
+ },
+ "urllib3": {
+ "hashes": [
+ "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+ "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
+ ],
+ "markers": "python_version >= '3.10'",
+ "version": "==2.2.3"
}
}
}
diff --git a/dbrepo-search-service/app.py b/dbrepo-search-service/app.py
index d668bfae419cfd43ea13a14987e116d99d54b592..7566178526d97cd7e21a288edd1d9881e49ad9cc 100644
--- a/dbrepo-search-service/app.py
+++ b/dbrepo-search-service/app.py
@@ -2,6 +2,7 @@ import math
import os
import logging
from ast import literal_eval
+from json import dumps
from typing import List, Any
import requests
@@ -10,6 +11,7 @@ from flasgger import LazyJSONEncoder, Swagger, swag_from
from flask import Flask, request
from flask_cors import CORS
from flask_httpauth import HTTPTokenAuth, HTTPBasicAuth, MultiAuth
+from jwt.exceptions import JWTDecodeError
from opensearchpy import TransportError, NotFoundError
from prometheus_flask_exporter import PrometheusMetrics
from pydantic import ValidationError
@@ -165,7 +167,7 @@ template = {
"info": {
"title": "Database Repository Search Service API",
"description": "Service that searches the search database",
- "version": "1.4.6",
+ "version": "1.4.7",
"contact": {
"name": "Prof. Andreas Rauber",
"email": "andreas.rauber@tuwien.ac.at"
@@ -177,7 +179,7 @@ template = {
},
"externalDocs": {
"description": "Sourcecode Documentation",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/"
},
"servers": [
{
@@ -206,9 +208,6 @@ app.config["OPENSEARCH_PASSWORD"] = os.getenv('OPENSEARCH_PASSWORD', 'admin')
app.json_encoder = LazyJSONEncoder
-available_types = literal_eval(
- os.getenv("COLLECTION", "['database','table','column','identifier','unit','concept','user','view']"))
-
@token_auth.verify_token
def verify_token(token: str):
@@ -217,7 +216,7 @@ def verify_token(token: str):
try:
client = KeycloakClient()
return client.verify_jwt(access_token=token)
- except AssertionError:
+ except JWTDecodeError as error:
return False
@@ -268,8 +267,7 @@ def general_filter(index, results):
"view": ["id", "name", "creator", " created"],
}
if index not in important_keys.keys():
- error_msg = "the keys to be returned to the user for your index aren't specified in the important Keys dict"
- raise KeyError(error_msg)
+ raise KeyError(f"Failed to find index {index} in: {important_keys.keys()}")
for result in results:
result_keys_copy = tuple(result.keys())
for key in result_keys_copy:
@@ -294,35 +292,37 @@ def get_index(index: str):
:return: list of the results
"""
logging.info(f'Searching for index: {index}')
- if index not in available_types:
- return ApiError(status='NOT_FOUND', message='Failed to find index',
- code='search.index.missing').model_dump(), 404
results = OpenSearchClient().query_index_by_term_opensearch("*", "contains")
- results = general_filter(index, results)
-
- results_per_page = min(request.args.get("results_per_page", 50, type=int), 500)
- max_pages = math.ceil(len(results) / results_per_page)
- page = min(request.args.get("page", 1, type=int), max_pages)
- results = results[(results_per_page * (page - 1)): (results_per_page * page)]
- return dict({"results": results}), 200
+ try:
+ results = general_filter(index, results)
+
+ results_per_page = min(request.args.get("results_per_page", 50, type=int), 500)
+ max_pages = math.ceil(len(results) / results_per_page)
+ page = min(request.args.get("page", 1, type=int), max_pages)
+ results = results[(results_per_page * (page - 1)): (results_per_page * page)]
+ return dict({"results": results}), 200
+ except KeyError:
+ return ApiError(status='NOT_FOUND', message=f'Failed to find get index: {index}',
+ code='search.index.missing').model_dump(), 404
-@app.route("/api/search/<string:type>/fields", methods=["GET"], endpoint="search_get_index_fields")
+@app.route("/api/search/<string:field_type>/fields", methods=["GET"], endpoint="search_get_index_fields")
@metrics.gauge(name='dbrepo_search_type_list', description='Time needed to list search types')
@swag_from("os-yml/get_fields.yml")
-def get_fields(type: str):
+def get_fields(field_type: str):
"""
returns a list of attributes of the data for a specific index.
- :param type: The search type
+ :param field_type: The search type
:return:
"""
- logging.info(f'Searching in index database for type: {type}')
- if type not in available_types:
- return ApiError(status='NOT_FOUND', message='Failed to find type',
+ logging.info(f'Searching in index database for type: {field_type}')
+ try:
+ fields = OpenSearchClient().get_fields_for_index(field_type)
+ logging.debug(f'get fields for field_type {field_type} resulted in {len(fields)} field(s)')
+ return fields, 200
+ except NotFoundError:
+ return ApiError(status='NOT_FOUND', message=f'Failed to find fields for search type {field_type}',
code='search.type.missing').model_dump(), 404
- fields = OpenSearchClient().get_fields_for_index(type)
- logging.debug(f'get fields for type {type} resulted in {len(fields)} field(s)')
- return fields, 200
@app.route("/api/search", methods=["GET"], endpoint="search_fuzzy_search")
@@ -344,10 +344,10 @@ def get_fuzzy_search():
return dict({"results": results}), 200
-@app.route("/api/search/<string:type>", methods=["POST"], endpoint="search_post_general_search")
+@app.route("/api/search/<string:field_type>", methods=["POST"], endpoint="search_post_general_search")
@metrics.gauge(name='dbrepo_search_type', description='Time needed to search by type')
@swag_from("os-yml/post_general_search.yml")
-def post_general_search(type):
+def post_general_search(field_type):
"""
Main endpoint for fuzzy searching.
:return:
@@ -356,11 +356,7 @@ def post_general_search(type):
return ApiError(status='UNSUPPORTED_MEDIA_TYPE', message='Content type needs to be application/json',
code='search.general.media').model_dump(), 415
req_body = request.json
- logging.info(f'Searching in index database for type: {type}')
- logging.debug(f"search request body: {req_body}")
- if type is not None and type not in available_types:
- return ApiError(status='NOT_FOUND', message=f'Type {type} is not in collection: {available_types}',
- code='search.general.missing').model_dump(), 404
+ logging.info(f'Searching in index database for type: {field_type}')
t1 = request.args.get("t1")
if not str(t1).isdigit():
t1 = None
@@ -370,9 +366,9 @@ def post_general_search(type):
if t1 is not None and t2 is not None and "unit.uri" in req_body and "concept.uri" in req_body:
response = OpenSearchClient().unit_independent_search(t1, t2, req_body)
else:
- response = OpenSearchClient().general_search(type, req_body)
+ response = OpenSearchClient().general_search(field_type, req_body)
# filter by type
- if type == 'table':
+ if field_type == 'table':
tmp = []
for database in response:
if database["tables"] is not None:
@@ -380,7 +376,7 @@ def post_general_search(type):
table["is_public"] = database["is_public"]
tmp.append(table)
response = tmp
- if type == 'identifier':
+ if field_type == 'identifier':
tmp = []
for database in response:
if database["identifiers"] is not None:
@@ -398,30 +394,30 @@ def post_general_search(type):
if 'identifier' in view:
tmp.append(view['identifier'])
response = tmp
- elif type == 'column':
+ elif field_type == 'column':
response = [x for xs in response for x in xs["tables"]]
for table in response:
for column in table["columns"]:
column["table_id"] = table["id"]
column["database_id"] = table["database_id"]
response = [x for xs in response for x in xs["columns"]]
- elif type == 'concept':
+ elif field_type == 'concept':
tmp = []
tables = [x for xs in response for x in xs["tables"]]
for column in [x for xs in tables for x in xs["columns"]]:
if 'concept' in column and column["concept"] is not None:
tmp.append(column["concept"])
response = tmp
- elif type == 'unit':
+ elif field_type == 'unit':
tmp = []
tables = [x for xs in response for x in xs["tables"]]
for column in [x for xs in tables for x in xs["columns"]]:
if 'unit' in column and column["unit"] is not None:
tmp.append(column["unit"])
response = tmp
- elif type == 'view':
+ elif field_type == 'view':
response = [x for xs in response for x in xs["views"]]
- return dict({'results': response, 'type': type}), 200
+ return dict({'results': response, 'type': field_type}), 200
@app.route("/api/search/database/<int:database_id>", methods=["PUT"], endpoint="search_put_database")
@@ -436,16 +432,9 @@ def update_database(database_id: int) -> Database | ApiError:
logging.error(f"Failed to validate: {e}")
return ApiError(status='BAD_REQUEST', message=f'Malformed payload: {e}',
code='search.general.missing').model_dump(), 400
- try:
- database = OpenSearchClient().update_database(database_id, payload)
- logging.info(f"Updated database with id : {database_id}")
- return database.model_dump(), 202
- except NotFoundError:
- return ApiError(status='NOT_FOUND', message='Failed to find database',
- code='search.database.missing').model_dump(), 404
- except TransportError:
- return ApiError(status='BAD_REQUEST', message='Failed to update database',
- code='search.database.invalid').model_dump(), 400
+ database = OpenSearchClient().update_database(database_id, payload)
+ logging.info(f"Updated database with id : {database_id}")
+ return database.model_dump(), 202
@app.route("/api/search/database/<int:database_id>", methods=["DELETE"], endpoint="database_delete_database")
@@ -455,7 +444,7 @@ def update_database(database_id: int) -> Database | ApiError:
def delete_database(database_id: int):
try:
OpenSearchClient().delete_database(database_id)
- return None, 202
+ return dumps({}), 202
except NotFoundError:
return ApiError(status='NOT_FOUND', message='Failed to find database',
code='search.database.missing').model_dump(), 404
diff --git a/dbrepo-search-service/init/.gitignore b/dbrepo-search-service/init/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..588a8e94456726edc68db7182457ab0118ab69bf
--- /dev/null
+++ b/dbrepo-search-service/init/.gitignore
@@ -0,0 +1,5 @@
+# Libraries
+./lib/dbrepo-1.4.4*
+./lib/dbrepo-1.4.5*
+./lib/dbrepo-1.4.6*
+./lib/dbrepo-1.4.7rc*
\ No newline at end of file
diff --git a/dbrepo-search-service/init/Dockerfile b/dbrepo-search-service/init/Dockerfile
index ebde913dbd9e013e9591fa4135e919a78fbbbd26..b0704a50470e02dde96effc7cf5e9fc6298cf428 100644
--- a/dbrepo-search-service/init/Dockerfile
+++ b/dbrepo-search-service/init/Dockerfile
@@ -1,6 +1,7 @@
FROM python:3.11-alpine
+LABEL org.opencontainers.image.authors="martin.weise@tuwien.ac.at"
-RUN apk add bash curl
+RUN apk add --no-cache curl bash jq
WORKDIR /home/alpine
@@ -16,6 +17,8 @@ USER 1001
WORKDIR /app
+COPY --chown=1001 ./clients ./clients
+COPY --chown=1001 ./omlib ./omlib
COPY --chown=1001 ./app.py ./app.py
COPY --chown=1001 ./database.json ./database.json
diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile
index 517796af748f40cf55f52bac420a000c04c11b23..a6a48b1cfb4d5f8d10e398ca42e636abf6191eff 100644
--- a/dbrepo-search-service/init/Pipfile
+++ b/dbrepo-search-service/init/Pipfile
@@ -9,7 +9,8 @@ opensearch-py = "~=2.2"
python-dotenv = "~=1.0"
testcontainers-opensearch = "*"
pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.4.4.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.4.7.tar.gz"}
+rdflib = "*"
[dev-packages]
coverage = "*"
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index 4a66b436f87c23063efdb7e386eda07a9a7c83f9..75bdbc29f92ce91ebd3bca121e904cd2bc05174b 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "b12551e0f7592ebabd1eb3ad3efe9e7304c4dcee4fcb065afa88308bff71855d"
+ "sha256": "17c83557efb9ffbe3c93e34a0df4e794f27b0fb6658915e2c68f4a9a3ef1e09b"
},
"pipfile-spec": 6,
"requires": {
@@ -18,108 +18,108 @@
"default": {
"aiohappyeyeballs": {
"hashes": [
- "sha256:55a1714f084e63d49639800f95716da97a1f173d46a16dfcfda0016abb93b6b2",
- "sha256:7ce92076e249169a13c2f49320d1967425eaf1f407522d707d59cac7628d62bd"
+ "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586",
+ "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572"
],
"markers": "python_version >= '3.8'",
- "version": "==2.4.0"
+ "version": "==2.4.3"
},
"aiohttp": {
"hashes": [
- "sha256:02594361128f780eecc2a29939d9dfc870e17b45178a867bf61a11b2a4367277",
- "sha256:03f2645adbe17f274444953bdea69f8327e9d278d961d85657cb0d06864814c1",
- "sha256:074d1bff0163e107e97bd48cad9f928fa5a3eb4b9d33366137ffce08a63e37fe",
- "sha256:0912b8a8fadeb32ff67a3ed44249448c20148397c1ed905d5dac185b4ca547bb",
- "sha256:0d277cfb304118079e7044aad0b76685d30ecb86f83a0711fc5fb257ffe832ca",
- "sha256:0d93400c18596b7dc4794d48a63fb361b01a0d8eb39f28800dc900c8fbdaca91",
- "sha256:123dd5b16b75b2962d0fff566effb7a065e33cd4538c1692fb31c3bda2bfb972",
- "sha256:17e997105bd1a260850272bfb50e2a328e029c941c2708170d9d978d5a30ad9a",
- "sha256:18a01eba2574fb9edd5f6e5fb25f66e6ce061da5dab5db75e13fe1558142e0a3",
- "sha256:1923a5c44061bffd5eebeef58cecf68096e35003907d8201a4d0d6f6e387ccaa",
- "sha256:1942244f00baaacaa8155eca94dbd9e8cc7017deb69b75ef67c78e89fdad3c77",
- "sha256:1b2c16a919d936ca87a3c5f0e43af12a89a3ce7ccbce59a2d6784caba945b68b",
- "sha256:1c19de68896747a2aa6257ae4cf6ef59d73917a36a35ee9d0a6f48cff0f94db8",
- "sha256:1e72589da4c90337837fdfe2026ae1952c0f4a6e793adbbfbdd40efed7c63599",
- "sha256:22c0a23a3b3138a6bf76fc553789cb1a703836da86b0f306b6f0dc1617398abc",
- "sha256:2c634a3207a5445be65536d38c13791904fda0748b9eabf908d3fe86a52941cf",
- "sha256:2d21ac12dc943c68135ff858c3a989f2194a709e6e10b4c8977d7fcd67dfd511",
- "sha256:2f1f1c75c395991ce9c94d3e4aa96e5c59c8356a15b1c9231e783865e2772699",
- "sha256:305be5ff2081fa1d283a76113b8df7a14c10d75602a38d9f012935df20731487",
- "sha256:33e6bc4bab477c772a541f76cd91e11ccb6d2efa2b8d7d7883591dfb523e5987",
- "sha256:349ef8a73a7c5665cca65c88ab24abe75447e28aa3bc4c93ea5093474dfdf0ff",
- "sha256:380f926b51b92d02a34119d072f178d80bbda334d1a7e10fa22d467a66e494db",
- "sha256:38172a70005252b6893088c0f5e8a47d173df7cc2b2bd88650957eb84fcf5022",
- "sha256:391cc3a9c1527e424c6865e087897e766a917f15dddb360174a70467572ac6ce",
- "sha256:3a1c32a19ee6bbde02f1cb189e13a71b321256cc1d431196a9f824050b160d5a",
- "sha256:4120d7fefa1e2d8fb6f650b11489710091788de554e2b6f8347c7a20ceb003f5",
- "sha256:424ae21498790e12eb759040bbb504e5e280cab64693d14775c54269fd1d2bb7",
- "sha256:44b324a6b8376a23e6ba25d368726ee3bc281e6ab306db80b5819999c737d820",
- "sha256:4790f0e15f00058f7599dab2b206d3049d7ac464dc2e5eae0e93fa18aee9e7bf",
- "sha256:4aff049b5e629ef9b3e9e617fa6e2dfeda1bf87e01bcfecaf3949af9e210105e",
- "sha256:4b38b1570242fbab8d86a84128fb5b5234a2f70c2e32f3070143a6d94bc854cf",
- "sha256:4d46c7b4173415d8e583045fbc4daa48b40e31b19ce595b8d92cf639396c15d5",
- "sha256:4f1c9866ccf48a6df2b06823e6ae80573529f2af3a0992ec4fe75b1a510df8a6",
- "sha256:4f7acae3cf1a2a2361ec4c8e787eaaa86a94171d2417aae53c0cca6ca3118ff6",
- "sha256:54d9ddea424cd19d3ff6128601a4a4d23d54a421f9b4c0fff740505813739a91",
- "sha256:58718e181c56a3c02d25b09d4115eb02aafe1a732ce5714ab70326d9776457c3",
- "sha256:5ede29d91a40ba22ac1b922ef510aab871652f6c88ef60b9dcdf773c6d32ad7a",
- "sha256:61645818edd40cc6f455b851277a21bf420ce347baa0b86eaa41d51ef58ba23d",
- "sha256:66bf9234e08fe561dccd62083bf67400bdbf1c67ba9efdc3dac03650e97c6088",
- "sha256:673f988370f5954df96cc31fd99c7312a3af0a97f09e407399f61583f30da9bc",
- "sha256:676f94c5480d8eefd97c0c7e3953315e4d8c2b71f3b49539beb2aa676c58272f",
- "sha256:6c225286f2b13bab5987425558baa5cbdb2bc925b2998038fa028245ef421e75",
- "sha256:7384d0b87d4635ec38db9263e6a3f1eb609e2e06087f0aa7f63b76833737b471",
- "sha256:7e2fe37ac654032db1f3499fe56e77190282534810e2a8e833141a021faaab0e",
- "sha256:7f2bfc0032a00405d4af2ba27f3c429e851d04fad1e5ceee4080a1c570476697",
- "sha256:7f6b639c36734eaa80a6c152a238242bedcee9b953f23bb887e9102976343092",
- "sha256:814375093edae5f1cb31e3407997cf3eacefb9010f96df10d64829362ae2df69",
- "sha256:8224f98be68a84b19f48e0bdc14224b5a71339aff3a27df69989fa47d01296f3",
- "sha256:898715cf566ec2869d5cb4d5fb4be408964704c46c96b4be267442d265390f32",
- "sha256:8989f46f3d7ef79585e98fa991e6ded55d2f48ae56d2c9fa5e491a6e4effb589",
- "sha256:8ba01ebc6175e1e6b7275c907a3a36be48a2d487549b656aa90c8a910d9f3178",
- "sha256:8c5c6fa16412b35999320f5c9690c0f554392dc222c04e559217e0f9ae244b92",
- "sha256:8c6a4e5e40156d72a40241a25cc226051c0a8d816610097a8e8f517aeacd59a2",
- "sha256:8eaf44ccbc4e35762683078b72bf293f476561d8b68ec8a64f98cf32811c323e",
- "sha256:8fb4fc029e135859f533025bc82047334e24b0d489e75513144f25408ecaf058",
- "sha256:9093a81e18c45227eebe4c16124ebf3e0d893830c6aca7cc310bfca8fe59d857",
- "sha256:94c4381ffba9cc508b37d2e536b418d5ea9cfdc2848b9a7fea6aebad4ec6aac1",
- "sha256:94fac7c6e77ccb1ca91e9eb4cb0ac0270b9fb9b289738654120ba8cebb1189c6",
- "sha256:95c4dc6f61d610bc0ee1edc6f29d993f10febfe5b76bb470b486d90bbece6b22",
- "sha256:975218eee0e6d24eb336d0328c768ebc5d617609affaca5dbbd6dd1984f16ed0",
- "sha256:ad146dae5977c4dd435eb31373b3fe9b0b1bf26858c6fc452bf6af394067e10b",
- "sha256:afe16a84498441d05e9189a15900640a2d2b5e76cf4efe8cbb088ab4f112ee57",
- "sha256:b1c43eb1ab7cbf411b8e387dc169acb31f0ca0d8c09ba63f9eac67829585b44f",
- "sha256:b90078989ef3fc45cf9221d3859acd1108af7560c52397ff4ace8ad7052a132e",
- "sha256:b98e698dc34966e5976e10bbca6d26d6724e6bdea853c7c10162a3235aba6e16",
- "sha256:ba5a8b74c2a8af7d862399cdedce1533642fa727def0b8c3e3e02fcb52dca1b1",
- "sha256:c31ad0c0c507894e3eaa843415841995bf8de4d6b2d24c6e33099f4bc9fc0d4f",
- "sha256:c3b9162bab7e42f21243effc822652dc5bb5e8ff42a4eb62fe7782bcbcdfacf6",
- "sha256:c58c6837a2c2a7cf3133983e64173aec11f9c2cd8e87ec2fdc16ce727bcf1a04",
- "sha256:c83f7a107abb89a227d6c454c613e7606c12a42b9a4ca9c5d7dad25d47c776ae",
- "sha256:cde98f323d6bf161041e7627a5fd763f9fd829bcfcd089804a5fdce7bb6e1b7d",
- "sha256:ce91db90dbf37bb6fa0997f26574107e1b9d5ff939315247b7e615baa8ec313b",
- "sha256:d00f3c5e0d764a5c9aa5a62d99728c56d455310bcc288a79cab10157b3af426f",
- "sha256:d17920f18e6ee090bdd3d0bfffd769d9f2cb4c8ffde3eb203777a3895c128862",
- "sha256:d55f011da0a843c3d3df2c2cf4e537b8070a419f891c930245f05d329c4b0689",
- "sha256:d742c36ed44f2798c8d3f4bc511f479b9ceef2b93f348671184139e7d708042c",
- "sha256:d9a487ef090aea982d748b1b0d74fe7c3950b109df967630a20584f9a99c0683",
- "sha256:d9ef084e3dc690ad50137cc05831c52b6ca428096e6deb3c43e95827f531d5ef",
- "sha256:da452c2c322e9ce0cfef392e469a26d63d42860f829026a63374fde6b5c5876f",
- "sha256:dc4826823121783dccc0871e3f405417ac116055bf184ac04c36f98b75aacd12",
- "sha256:de7a5299827253023c55ea549444e058c0eb496931fa05d693b95140a947cb73",
- "sha256:e04a1f2a65ad2f93aa20f9ff9f1b672bf912413e5547f60749fa2ef8a644e061",
- "sha256:e1ca1ef5ba129718a8fc827b0867f6aa4e893c56eb00003b7367f8a733a9b072",
- "sha256:ee40b40aa753d844162dcc80d0fe256b87cba48ca0054f64e68000453caead11",
- "sha256:f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691",
- "sha256:f29930bc2921cef955ba39a3ff87d2c4398a0394ae217f41cb02d5c26c8b1b77",
- "sha256:f489a2c9e6455d87eabf907ac0b7d230a9786be43fbe884ad184ddf9e9c1e385",
- "sha256:f5bf3ead3cb66ab990ee2561373b009db5bc0e857549b6c9ba84b20bc462e172",
- "sha256:f6f18898ace4bcd2d41a122916475344a87f1dfdec626ecde9ee802a711bc569",
- "sha256:f8112fb501b1e0567a1251a2fd0747baae60a4ab325a871e975b7bb67e59221f",
- "sha256:fd31f176429cecbc1ba499d4aba31aaccfea488f418d60376b911269d3b883c5"
+ "sha256:007ec22fbc573e5eb2fb7dec4198ef8f6bf2fe4ce20020798b2eb5d0abda6138",
+ "sha256:00819de9e45d42584bed046314c40ea7e9aea95411b38971082cad449392b08c",
+ "sha256:01948b1d570f83ee7bbf5a60ea2375a89dfb09fd419170e7f5af029510033d24",
+ "sha256:038f514fe39e235e9fef6717fbf944057bfa24f9b3db9ee551a7ecf584b5b480",
+ "sha256:03a42ac7895406220124c88911ebee31ba8b2d24c98507f4a8bf826b2937c7f2",
+ "sha256:05646ebe6b94cc93407b3bf34b9eb26c20722384d068eb7339de802154d61bc5",
+ "sha256:0631dd7c9f0822cc61c88586ca76d5b5ada26538097d0f1df510b082bad3411a",
+ "sha256:0b00807e2605f16e1e198f33a53ce3c4523114059b0c09c337209ae55e3823a8",
+ "sha256:0e1b370d8007c4ae31ee6db7f9a2fe801a42b146cec80a86766e7ad5c4a259cf",
+ "sha256:15ecd889a709b0080f02721255b3f80bb261c2293d3c748151274dfea93ac871",
+ "sha256:1b66ccafef7336a1e1f0e389901f60c1d920102315a56df85e49552308fc0486",
+ "sha256:1bbb122c557a16fafc10354b9d99ebf2f2808a660d78202f10ba9d50786384b9",
+ "sha256:1eb89d3d29adaf533588f209768a9c02e44e4baf832b08118749c5fad191781d",
+ "sha256:258c5dd01afc10015866114e210fb7365f0d02d9d059c3c3415382ab633fcbcb",
+ "sha256:2609e9ab08474702cc67b7702dbb8a80e392c54613ebe80db7e8dbdb79837c68",
+ "sha256:274cfa632350225ce3fdeb318c23b4a10ec25c0e2c880eff951a3842cf358ac1",
+ "sha256:28529e08fde6f12eba8677f5a8608500ed33c086f974de68cc65ab218713a59d",
+ "sha256:2b606353da03edcc71130b52388d25f9a30a126e04caef1fd637e31683033abd",
+ "sha256:30ca7c3b94708a9d7ae76ff281b2f47d8eaf2579cd05971b5dc681db8caac6e1",
+ "sha256:333cf6cf8e65f6a1e06e9eb3e643a0c515bb850d470902274239fea02033e9a8",
+ "sha256:3455522392fb15ff549d92fbf4b73b559d5e43dc522588f7eb3e54c3f38beee7",
+ "sha256:362f641f9071e5f3ee6f8e7d37d5ed0d95aae656adf4ef578313ee585b585959",
+ "sha256:3bcd391d083f636c06a68715e69467963d1f9600f85ef556ea82e9ef25f043f7",
+ "sha256:3dffb610a30d643983aeb185ce134f97f290f8935f0abccdd32c77bed9388b42",
+ "sha256:3fe407bf93533a6fa82dece0e74dbcaaf5d684e5a51862887f9eaebe6372cd79",
+ "sha256:413251f6fcf552a33c981c4709a6bba37b12710982fec8e558ae944bfb2abd38",
+ "sha256:438cd072f75bb6612f2aca29f8bd7cdf6e35e8f160bc312e49fbecab77c99e3a",
+ "sha256:4470c73c12cd9109db8277287d11f9dd98f77fc54155fc71a7738a83ffcc8ea8",
+ "sha256:45c3b868724137f713a38376fef8120c166d1eadd50da1855c112fe97954aed8",
+ "sha256:486f7aabfa292719a2753c016cc3a8f8172965cabb3ea2e7f7436c7f5a22a151",
+ "sha256:4f05e9727ce409358baa615dbeb9b969db94324a79b5a5cea45d39bdb01d82e6",
+ "sha256:50aed5155f819873d23520919e16703fc8925e509abbb1a1491b0087d1cd969e",
+ "sha256:50edbcad60d8f0e3eccc68da67f37268b5144ecc34d59f27a02f9611c1d4eec7",
+ "sha256:54ca74df1be3c7ca1cf7f4c971c79c2daf48d9aa65dea1a662ae18926f5bc8ce",
+ "sha256:578a4b875af3e0daaf1ac6fa983d93e0bbfec3ead753b6d6f33d467100cdc67b",
+ "sha256:597a079284b7ee65ee102bc3a6ea226a37d2b96d0418cc9047490f231dc09fe8",
+ "sha256:59bb3c54aa420521dc4ce3cc2c3fe2ad82adf7b09403fa1f48ae45c0cbde6628",
+ "sha256:5c6a5b8c7926ba5d8545c7dd22961a107526562da31a7a32fa2456baf040939f",
+ "sha256:64f6c17757251e2b8d885d728b6433d9d970573586a78b78ba8929b0f41d045a",
+ "sha256:679abe5d3858b33c2cf74faec299fda60ea9de62916e8b67e625d65bf069a3b7",
+ "sha256:741a46d58677d8c733175d7e5aa618d277cd9d880301a380fd296975a9cdd7bc",
+ "sha256:7789050d9e5d0c309c706953e5e8876e38662d57d45f936902e176d19f1c58ab",
+ "sha256:77abf6665ae54000b98b3c742bc6ea1d1fb31c394bcabf8b5d2c1ac3ebfe7f3b",
+ "sha256:79019094f87c9fb44f8d769e41dbb664d6e8fcfd62f665ccce36762deaa0e911",
+ "sha256:7b06b7843929e41a94ea09eb1ce3927865387e3e23ebe108e0d0d09b08d25be9",
+ "sha256:7e338c0523d024fad378b376a79faff37fafb3c001872a618cde1d322400a572",
+ "sha256:7ea7ffc6d6d6f8a11e6f40091a1040995cdff02cfc9ba4c2f30a516cb2633554",
+ "sha256:8105fd8a890df77b76dd3054cddf01a879fc13e8af576805d667e0fa0224c35d",
+ "sha256:84afcdea18eda514c25bc68b9af2a2b1adea7c08899175a51fe7c4fb6d551257",
+ "sha256:9294bbb581f92770e6ed5c19559e1e99255e4ca604a22c5c6397b2f9dd3ee42c",
+ "sha256:93429602396f3383a797a2a70e5f1de5df8e35535d7806c9f91df06f297e109b",
+ "sha256:9627cc1a10c8c409b5822a92d57a77f383b554463d1884008e051c32ab1b3742",
+ "sha256:998f3bd3cfc95e9424a6acd7840cbdd39e45bc09ef87533c006f94ac47296090",
+ "sha256:9c72109213eb9d3874f7ac8c0c5fa90e072d678e117d9061c06e30c85b4cf0e6",
+ "sha256:9fc1500fd2a952c5c8e3b29aaf7e3cc6e27e9cfc0a8819b3bce48cc1b849e4cc",
+ "sha256:a3f00003de6eba42d6e94fabb4125600d6e484846dbf90ea8e48a800430cc142",
+ "sha256:a45d85cf20b5e0d0aa5a8dca27cce8eddef3292bc29d72dcad1641f4ed50aa16",
+ "sha256:a7d8d14fe962153fc681f6366bdec33d4356f98a3e3567782aac1b6e0e40109a",
+ "sha256:a8fa23fe62c436ccf23ff930149c047f060c7126eae3ccea005f0483f27b2e28",
+ "sha256:aa6658732517ddabe22c9036479eabce6036655ba87a0224c612e1ae6af2087e",
+ "sha256:aafc8ee9b742ce75044ae9a4d3e60e3d918d15a4c2e08a6c3c3e38fa59b92d94",
+ "sha256:ab5a5a0c7a7991d90446a198689c0535be89bbd6b410a1f9a66688f0880ec026",
+ "sha256:acd48d5b80ee80f9432a165c0ac8cbf9253eaddb6113269a5e18699b33958dbb",
+ "sha256:ad7593bb24b2ab09e65e8a1d385606f0f47c65b5a2ae6c551db67d6653e78c28",
+ "sha256:baa42524a82f75303f714108fea528ccacf0386af429b69fff141ffef1c534f9",
+ "sha256:bdfcf6443637c148c4e1a20c48c566aa694fa5e288d34b20fcdc58507882fed3",
+ "sha256:be7443669ae9c016b71f402e43208e13ddf00912f47f623ee5994e12fc7d4b3f",
+ "sha256:c02a30b904282777d872266b87b20ed8cc0d1501855e27f831320f471d54d983",
+ "sha256:c1277cd707c465cd09572a774559a3cc7c7a28802eb3a2a9472588f062097205",
+ "sha256:c30a0eafc89d28e7f959281b58198a9fa5e99405f716c0289b7892ca345fe45f",
+ "sha256:c5ce2ce7c997e1971b7184ee37deb6ea9922ef5163c6ee5aa3c274b05f9e12fa",
+ "sha256:c823bc3971c44ab93e611ab1a46b1eafeae474c0c844aff4b7474287b75fe49c",
+ "sha256:ce0cdc074d540265bfeb31336e678b4e37316849d13b308607efa527e981f5c2",
+ "sha256:d1720b4f14c78a3089562b8875b53e36b51c97c51adc53325a69b79b4b48ebcb",
+ "sha256:d183cf9c797a5291e8301790ed6d053480ed94070637bfaad914dd38b0981f67",
+ "sha256:d9010c31cd6fa59438da4e58a7f19e4753f7f264300cd152e7f90d4602449762",
+ "sha256:d9e5e4a85bdb56d224f412d9c98ae4cbd032cc4f3161818f692cd81766eee65a",
+ "sha256:da1dee8948d2137bb51fbb8a53cce6b1bcc86003c6b42565f008438b806cccd8",
+ "sha256:df9270660711670e68803107d55c2b5949c2e0f2e4896da176e1ecfc068b974a",
+ "sha256:e00e3505cd80440f6c98c6d69269dcc2a119f86ad0a9fd70bccc59504bebd68a",
+ "sha256:e48d5021a84d341bcaf95c8460b152cfbad770d28e5fe14a768988c461b821bc",
+ "sha256:e7f8b04d83483577fd9200461b057c9f14ced334dcb053090cea1da9c8321a91",
+ "sha256:edfe3341033a6b53a5c522c802deb2079eee5cbfbb0af032a55064bd65c73a23",
+ "sha256:ef9c33cc5cbca35808f6c74be11eb7f5f6b14d2311be84a15b594bd3e58b5527",
+ "sha256:f2d4324a98062be0525d16f768a03e0bbb3b9fe301ceee99611dc9a7953124e6",
+ "sha256:f3935f82f6f4a3820270842e90456ebad3af15810cf65932bd24da4463bc0a4c",
+ "sha256:f614ab0c76397661b90b6851a030004dac502e48260ea10f2441abd2207fbcc7",
+ "sha256:f7db54c7914cc99d901d93a34704833568d86c20925b2762f9fa779f9cd2e70f",
+ "sha256:fbc6264158392bad9df19537e872d476f7c57adf718944cc1e4495cbabf38e2a",
+ "sha256:fe2fb38c2ed905a2582948e2de560675e9dfbee94c6d5ccdb1301c6d0a5bf092",
+ "sha256:ffe595f10566f8276b76dc3a11ae4bb7eba1aac8ddd75811736a15b0d5311414"
],
"markers": "python_version >= '3.8'",
- "version": "==3.10.5"
+ "version": "==3.10.10"
},
"aiosignal": {
"hashes": [
@@ -163,99 +163,114 @@
},
"charset-normalizer": {
"hashes": [
- "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027",
- "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087",
- "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786",
- "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8",
- "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09",
- "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185",
- "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574",
- "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e",
- "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519",
- "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898",
- "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269",
- "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3",
- "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f",
- "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6",
- "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8",
- "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a",
- "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73",
- "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc",
- "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714",
- "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2",
- "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc",
- "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce",
- "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d",
- "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e",
- "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6",
- "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269",
- "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96",
- "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d",
- "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a",
- "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4",
- "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77",
- "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d",
- "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0",
- "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed",
- "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068",
- "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac",
- "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25",
- "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8",
- "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab",
- "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26",
- "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2",
- "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db",
- "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f",
- "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5",
- "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99",
- "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c",
- "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d",
- "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811",
- "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa",
- "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a",
- "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03",
- "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b",
- "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04",
- "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c",
- "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001",
- "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458",
- "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389",
- "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99",
- "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985",
- "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537",
- "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238",
- "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f",
- "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d",
- "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796",
- "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a",
- "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143",
- "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8",
- "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c",
- "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5",
- "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5",
- "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711",
- "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4",
- "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6",
- "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c",
- "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7",
- "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4",
- "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b",
- "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae",
- "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12",
- "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c",
- "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae",
- "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8",
- "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887",
- "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b",
- "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4",
- "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f",
- "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5",
- "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33",
- "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519",
- "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"
+ "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.3.2"
+ "version": "==3.4.0"
},
"click": {
"hashes": [
@@ -267,11 +282,9 @@
},
"dbrepo": {
"hashes": [
- "sha256:79923866808a359ff9baa38c3370544b384eff1ff75fe0b245177be3ea3a48d5",
- "sha256:d7c3b1b3d6e8ca5d094a98ad716420f1c7d09ac6e197c93a0acce18f77cbda3e"
+ "sha256:84607677b0826bb9b2fa120aacdf56d16c8d9ae423f435b2bd2c22b1c965a33c"
],
- "markers": "python_version >= '3.11'",
- "path": "./lib/dbrepo-1.4.4.tar.gz"
+ "path": "./lib/dbrepo-1.4.7.tar.gz"
},
"docker": {
"hashes": [
@@ -381,11 +394,11 @@
},
"idna": {
"hashes": [
- "sha256:050b4e5baadcd44d760cedbd2b8e639f2ff89bbc7a5730fcc662954303377aac",
- "sha256:d838c2c0ed6fced7693d5e8ab8e734d5f8fda53a039c0164afb0b82e771e3603"
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
],
"markers": "python_version >= '3.6'",
- "version": "==3.8"
+ "version": "==3.10"
},
"iniconfig": {
"hashes": [
@@ -395,6 +408,13 @@
"markers": "python_version >= '3.7'",
"version": "==2.0.0"
},
+ "isodate": {
+ "hashes": [
+ "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96",
+ "sha256:48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9"
+ ],
+ "version": "==0.6.1"
+ },
"itsdangerous": {
"hashes": [
"sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef",
@@ -413,224 +433,227 @@
},
"markupsafe": {
"hashes": [
- "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf",
- "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff",
- "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f",
- "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3",
- "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532",
- "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f",
- "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617",
- "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df",
- "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4",
- "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906",
- "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f",
- "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4",
- "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8",
- "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371",
- "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2",
- "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465",
- "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52",
- "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6",
- "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169",
- "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad",
- "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2",
- "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0",
- "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029",
- "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f",
- "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a",
- "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced",
- "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5",
- "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c",
- "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf",
- "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9",
- "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb",
- "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad",
- "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3",
- "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1",
- "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46",
- "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc",
- "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a",
- "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee",
- "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900",
- "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5",
- "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea",
- "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f",
- "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5",
- "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e",
- "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a",
- "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f",
- "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50",
- "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a",
- "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b",
- "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4",
- "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff",
- "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2",
- "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46",
- "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b",
- "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf",
- "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5",
- "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5",
- "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab",
- "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd",
- "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68"
+ "sha256:0778de17cff1acaeccc3ff30cd99a3fd5c50fc58ad3d6c0e0c4c58092b859396",
+ "sha256:0f84af7e813784feb4d5e4ff7db633aba6c8ca64a833f61d8e4eade234ef0c38",
+ "sha256:17b2aea42a7280db02ac644db1d634ad47dcc96faf38ab304fe26ba2680d359a",
+ "sha256:242d6860f1fd9191aef5fae22b51c5c19767f93fb9ead4d21924e0bcb17619d8",
+ "sha256:244dbe463d5fb6d7ce161301a03a6fe744dac9072328ba9fc82289238582697b",
+ "sha256:26627785a54a947f6d7336ce5963569b5d75614619e75193bdb4e06e21d447ad",
+ "sha256:2a4b34a8d14649315c4bc26bbfa352663eb51d146e35eef231dd739d54a5430a",
+ "sha256:2ae99f31f47d849758a687102afdd05bd3d3ff7dbab0a8f1587981b58a76152a",
+ "sha256:312387403cd40699ab91d50735ea7a507b788091c416dd007eac54434aee51da",
+ "sha256:3341c043c37d78cc5ae6e3e305e988532b072329639007fd408a476642a89fd6",
+ "sha256:33d1c36b90e570ba7785dacd1faaf091203d9942bc036118fab8110a401eb1a8",
+ "sha256:3e683ee4f5d0fa2dde4db77ed8dd8a876686e3fc417655c2ece9a90576905344",
+ "sha256:3ffb4a8e7d46ed96ae48805746755fadd0909fea2306f93d5d8233ba23dda12a",
+ "sha256:40621d60d0e58aa573b68ac5e2d6b20d44392878e0bfc159012a5787c4e35bc8",
+ "sha256:40f1e10d51c92859765522cbd79c5c8989f40f0419614bcdc5015e7b6bf97fc5",
+ "sha256:45d42d132cff577c92bfba536aefcfea7e26efb975bd455db4e6602f5c9f45e7",
+ "sha256:48488d999ed50ba8d38c581d67e496f955821dc183883550a6fbc7f1aefdc170",
+ "sha256:4935dd7883f1d50e2ffecca0aa33dc1946a94c8f3fdafb8df5c330e48f71b132",
+ "sha256:4c2d64fdba74ad16138300815cfdc6ab2f4647e23ced81f59e940d7d4a1469d9",
+ "sha256:4c8817557d0de9349109acb38b9dd570b03cc5014e8aabf1cbddc6e81005becd",
+ "sha256:4ffaaac913c3f7345579db4f33b0020db693f302ca5137f106060316761beea9",
+ "sha256:5a4cb365cb49b750bdb60b846b0c0bc49ed62e59a76635095a179d440540c346",
+ "sha256:62fada2c942702ef8952754abfc1a9f7658a4d5460fabe95ac7ec2cbe0d02abc",
+ "sha256:67c519635a4f64e495c50e3107d9b4075aec33634272b5db1cde839e07367589",
+ "sha256:6a54c43d3ec4cf2a39f4387ad044221c66a376e58c0d0e971d47c475ba79c6b5",
+ "sha256:7044312a928a66a4c2a22644147bc61a199c1709712069a344a3fb5cfcf16915",
+ "sha256:730d86af59e0e43ce277bb83970530dd223bf7f2a838e086b50affa6ec5f9295",
+ "sha256:800100d45176652ded796134277ecb13640c1a537cad3b8b53da45aa96330453",
+ "sha256:80fcbf3add8790caddfab6764bde258b5d09aefbe9169c183f88a7410f0f6dea",
+ "sha256:82b5dba6eb1bcc29cc305a18a3c5365d2af06ee71b123216416f7e20d2a84e5b",
+ "sha256:852dc840f6d7c985603e60b5deaae1d89c56cb038b577f6b5b8c808c97580f1d",
+ "sha256:8ad4ad1429cd4f315f32ef263c1342166695fad76c100c5d979c45d5570ed58b",
+ "sha256:8ae369e84466aa70f3154ee23c1451fda10a8ee1b63923ce76667e3077f2b0c4",
+ "sha256:93e8248d650e7e9d49e8251f883eed60ecbc0e8ffd6349e18550925e31bd029b",
+ "sha256:973a371a55ce9ed333a3a0f8e0bcfae9e0d637711534bcb11e130af2ab9334e7",
+ "sha256:9ba25a71ebf05b9bb0e2ae99f8bc08a07ee8e98c612175087112656ca0f5c8bf",
+ "sha256:a10860e00ded1dd0a65b83e717af28845bb7bd16d8ace40fe5531491de76b79f",
+ "sha256:a4792d3b3a6dfafefdf8e937f14906a51bd27025a36f4b188728a73382231d91",
+ "sha256:a7420ceda262dbb4b8d839a4ec63d61c261e4e77677ed7c66c99f4e7cb5030dd",
+ "sha256:ad91738f14eb8da0ff82f2acd0098b6257621410dcbd4df20aaa5b4233d75a50",
+ "sha256:b6a387d61fe41cdf7ea95b38e9af11cfb1a63499af2759444b99185c4ab33f5b",
+ "sha256:b954093679d5750495725ea6f88409946d69cfb25ea7b4c846eef5044194f583",
+ "sha256:bbde71a705f8e9e4c3e9e33db69341d040c827c7afa6789b14c6e16776074f5a",
+ "sha256:beeebf760a9c1f4c07ef6a53465e8cfa776ea6a2021eda0d0417ec41043fe984",
+ "sha256:c91b394f7601438ff79a4b93d16be92f216adb57d813a78be4446fe0f6bc2d8c",
+ "sha256:c97ff7fedf56d86bae92fa0a646ce1a0ec7509a7578e1ed238731ba13aabcd1c",
+ "sha256:cb53e2a99df28eee3b5f4fea166020d3ef9116fdc5764bc5117486e6d1211b25",
+ "sha256:cbf445eb5628981a80f54087f9acdbf84f9b7d862756110d172993b9a5ae81aa",
+ "sha256:d06b24c686a34c86c8c1fba923181eae6b10565e4d80bdd7bc1c8e2f11247aa4",
+ "sha256:d98e66a24497637dd31ccab090b34392dddb1f2f811c4b4cd80c230205c074a3",
+ "sha256:db15ce28e1e127a0013dfb8ac243a8e392db8c61eae113337536edb28bdc1f97",
+ "sha256:db842712984e91707437461930e6011e60b39136c7331e971952bb30465bc1a1",
+ "sha256:e24bfe89c6ac4c31792793ad9f861b8f6dc4546ac6dc8f1c9083c7c4f2b335cd",
+ "sha256:e81c52638315ff4ac1b533d427f50bc0afc746deb949210bc85f05d4f15fd772",
+ "sha256:e9393357f19954248b00bed7c56f29a25c930593a77630c719653d51e7669c2a",
+ "sha256:ee3941769bd2522fe39222206f6dd97ae83c442a94c90f2b7a25d847d40f4729",
+ "sha256:f31ae06f1328595d762c9a2bf29dafd8621c7d3adc130cbb46278079758779ca",
+ "sha256:f94190df587738280d544971500b9cafc9b950d32efcb1fba9ac10d84e6aa4e6",
+ "sha256:fa7d686ed9883f3d664d39d5a8e74d3c5f63e603c2e3ff0abcba23eac6542635",
+ "sha256:fb532dd9900381d2e8f48172ddc5a59db4c445a11b9fab40b3b786da40d3b56b",
+ "sha256:fe32482b37b4b00c7a52a07211b479653b7fe4f22b2e481b9a9b099d8a430f2f"
],
- "markers": "python_version >= '3.7'",
- "version": "==2.1.5"
+ "markers": "python_version >= '3.9'",
+ "version": "==3.0.1"
},
"multidict": {
"hashes": [
- "sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556",
- "sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c",
- "sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29",
- "sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b",
- "sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8",
- "sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7",
- "sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd",
- "sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40",
- "sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6",
- "sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3",
- "sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c",
- "sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9",
- "sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5",
- "sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae",
- "sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442",
- "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9",
- "sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc",
- "sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c",
- "sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea",
- "sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5",
- "sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50",
- "sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182",
- "sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453",
- "sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e",
- "sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600",
- "sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733",
- "sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda",
- "sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241",
- "sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461",
- "sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e",
- "sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e",
- "sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b",
- "sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e",
- "sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7",
- "sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386",
- "sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd",
- "sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9",
- "sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf",
- "sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee",
- "sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5",
- "sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a",
- "sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271",
- "sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54",
- "sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4",
- "sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496",
- "sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb",
- "sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319",
- "sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3",
- "sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f",
- "sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527",
- "sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed",
- "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604",
- "sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef",
- "sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8",
- "sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5",
- "sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5",
- "sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626",
- "sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c",
- "sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d",
- "sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c",
- "sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc",
- "sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc",
- "sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b",
- "sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38",
- "sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450",
- "sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1",
- "sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f",
- "sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3",
- "sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755",
- "sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226",
- "sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a",
- "sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046",
- "sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf",
- "sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479",
- "sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e",
- "sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1",
- "sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a",
- "sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83",
- "sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929",
- "sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93",
- "sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a",
- "sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c",
- "sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44",
- "sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89",
- "sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba",
- "sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e",
- "sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da",
- "sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24",
- "sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423",
- "sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef"
+ "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.7'",
- "version": "==6.0.5"
+ "markers": "python_version >= '3.8'",
+ "version": "==6.1.0"
},
"numpy": {
"hashes": [
- "sha256:046356b19d7ad1890c751b99acad5e82dc4a02232013bd9a9a712fddf8eb60f5",
- "sha256:0b8cc2715a84b7c3b161f9ebbd942740aaed913584cae9cdc7f8ad5ad41943d0",
- "sha256:0d07841fd284718feffe7dd17a63a2e6c78679b2d386d3e82f44f0108c905550",
- "sha256:13cc11c00000848702322af4de0147ced365c81d66053a67c2e962a485b3717c",
- "sha256:13ce49a34c44b6de5241f0b38b07e44c1b2dcacd9e36c30f9c2fcb1bb5135db7",
- "sha256:24c2ad697bd8593887b019817ddd9974a7f429c14a5469d7fad413f28340a6d2",
- "sha256:251105b7c42abe40e3a689881e1793370cc9724ad50d64b30b358bbb3a97553b",
- "sha256:2ca4b53e1e0b279142113b8c5eb7d7a877e967c306edc34f3b58e9be12fda8df",
- "sha256:3269c9eb8745e8d975980b3a7411a98976824e1fdef11f0aacf76147f662b15f",
- "sha256:397bc5ce62d3fb73f304bec332171535c187e0643e176a6e9421a6e3eacef06d",
- "sha256:3fc5eabfc720db95d68e6646e88f8b399bfedd235994016351b1d9e062c4b270",
- "sha256:50a95ca3560a6058d6ea91d4629a83a897ee27c00630aed9d933dff191f170cd",
- "sha256:52ac2e48f5ad847cd43c4755520a2317f3380213493b9d8a4c5e37f3b87df504",
- "sha256:53e27293b3a2b661c03f79aa51c3987492bd4641ef933e366e0f9f6c9bf257ec",
- "sha256:57eb525e7c2a8fdee02d731f647146ff54ea8c973364f3b850069ffb42799647",
- "sha256:5889dd24f03ca5a5b1e8a90a33b5a0846d8977565e4ae003a63d22ecddf6782f",
- "sha256:59ca673ad11d4b84ceb385290ed0ebe60266e356641428c845b39cd9df6713ab",
- "sha256:6435c48250c12f001920f0751fe50c0348f5f240852cfddc5e2f97e007544cbe",
- "sha256:6e5a9cb2be39350ae6c8f79410744e80154df658d5bea06e06e0ac5bb75480d5",
- "sha256:7be6a07520b88214ea85d8ac8b7d6d8a1839b0b5cb87412ac9f49fa934eb15d5",
- "sha256:7c803b7934a7f59563db459292e6aa078bb38b7ab1446ca38dd138646a38203e",
- "sha256:7dd86dfaf7c900c0bbdcb8b16e2f6ddf1eb1fe39c6c8cca6e94844ed3152a8fd",
- "sha256:8661c94e3aad18e1ea17a11f60f843a4933ccaf1a25a7c6a9182af70610b2313",
- "sha256:8ae0fd135e0b157365ac7cc31fff27f07a5572bdfc38f9c2d43b2aff416cc8b0",
- "sha256:910b47a6d0635ec1bd53b88f86120a52bf56dcc27b51f18c7b4a2e2224c29f0f",
- "sha256:913cc1d311060b1d409e609947fa1b9753701dac96e6581b58afc36b7ee35af6",
- "sha256:920b0911bb2e4414c50e55bd658baeb78281a47feeb064ab40c2b66ecba85553",
- "sha256:950802d17a33c07cba7fd7c3dcfa7d64705509206be1606f196d179e539111ed",
- "sha256:981707f6b31b59c0c24bcda52e5605f9701cb46da4b86c2e8023656ad3e833cb",
- "sha256:98ce7fb5b8063cfdd86596b9c762bf2b5e35a2cdd7e967494ab78a1fa7f8b86e",
- "sha256:99f4a9ee60eed1385a86e82288971a51e71df052ed0b2900ed30bc840c0f2e39",
- "sha256:9a8e06c7a980869ea67bbf551283bbed2856915f0a792dc32dd0f9dd2fb56728",
- "sha256:ae8ce252404cdd4de56dcfce8b11eac3c594a9c16c231d081fb705cf23bd4d9e",
- "sha256:afd9c680df4de71cd58582b51e88a61feed4abcc7530bcd3d48483f20fc76f2a",
- "sha256:b49742cdb85f1f81e4dc1b39dcf328244f4d8d1ded95dea725b316bd2cf18c95",
- "sha256:b5613cfeb1adfe791e8e681128f5f49f22f3fcaa942255a6124d58ca59d9528f",
- "sha256:bab7c09454460a487e631ffc0c42057e3d8f2a9ddccd1e60c7bb8ed774992480",
- "sha256:c8a0e34993b510fc19b9a2ce7f31cb8e94ecf6e924a40c0c9dd4f62d0aac47d9",
- "sha256:caf5d284ddea7462c32b8d4a6b8af030b6c9fd5332afb70e7414d7fdded4bfd0",
- "sha256:cea427d1350f3fd0d2818ce7350095c1a2ee33e30961d2f0fef48576ddbbe90f",
- "sha256:d0cf7d55b1051387807405b3898efafa862997b4cba8aa5dbe657be794afeafd",
- "sha256:d10c39947a2d351d6d466b4ae83dad4c37cd6c3cdd6d5d0fa797da56f710a6ae",
- "sha256:d2b9cd92c8f8e7b313b80e93cedc12c0112088541dcedd9197b5dee3738c1201",
- "sha256:d4c57b68c8ef5e1ebf47238e99bf27657511ec3f071c465f6b1bccbef12d4136",
- "sha256:d51fc141ddbe3f919e91a096ec739f49d686df8af254b2053ba21a910ae518bf",
- "sha256:e097507396c0be4e547ff15b13dc3866f45f3680f789c1a1301b07dadd3fbc78",
- "sha256:e30356d530528a42eeba51420ae8bf6c6c09559051887196599d96ee5f536468",
- "sha256:e8d5f8a8e3bc87334f025194c6193e408903d21ebaeb10952264943a985066ca",
- "sha256:e8dfa9e94fc127c40979c3eacbae1e61fda4fe71d84869cc129e2721973231ef",
- "sha256:f212d4f46b67ff604d11fff7cc62d36b3e8714edf68e44e9760e19be38c03eb0",
- "sha256:f7506387e191fe8cdb267f912469a3cccc538ab108471291636a96a54e599556",
- "sha256:fac6e277a41163d27dfab5f4ec1f7a83fac94e170665a4a50191b545721c6521",
- "sha256:fcd8f556cdc8cfe35e70efb92463082b7f43dd7e547eb071ffc36abc0ca4699b"
+ "sha256:05b2d4e667895cc55e3ff2b56077e4c8a5604361fc21a042845ea3ad67465aa8",
+ "sha256:12edb90831ff481f7ef5f6bc6431a9d74dc0e5ff401559a71e5e4611d4f2d466",
+ "sha256:13311c2db4c5f7609b462bc0f43d3c465424d25c626d95040f073e30f7570e35",
+ "sha256:13532a088217fa624c99b843eeb54640de23b3414b14aa66d023805eb731066c",
+ "sha256:13602b3174432a35b16c4cfb5de9a12d229727c3dd47a6ce35111f2ebdf66ff4",
+ "sha256:1600068c262af1ca9580a527d43dc9d959b0b1d8e56f8a05d830eea39b7c8af6",
+ "sha256:1b8cde4f11f0a975d1fd59373b32e2f5a562ade7cde4f85b7137f3de8fbb29a0",
+ "sha256:1c193d0b0238638e6fc5f10f1b074a6993cb13b0b431f64079a509d63d3aa8b7",
+ "sha256:1ebec5fd716c5a5b3d8dfcc439be82a8407b7b24b230d0ad28a81b61c2f4659a",
+ "sha256:242b39d00e4944431a3cd2db2f5377e15b5785920421993770cddb89992c3f3a",
+ "sha256:259ec80d54999cc34cd1eb8ded513cb053c3bf4829152a2e00de2371bd406f5e",
+ "sha256:2abbf905a0b568706391ec6fa15161fad0fb5d8b68d73c461b3c1bab6064dd62",
+ "sha256:2cbba4b30bf31ddbe97f1c7205ef976909a93a66bb1583e983adbd155ba72ac2",
+ "sha256:2ffef621c14ebb0188a8633348504a35c13680d6da93ab5cb86f4e54b7e922b5",
+ "sha256:30d53720b726ec36a7f88dc873f0eec8447fbc93d93a8f079dfac2629598d6ee",
+ "sha256:32e16a03138cabe0cb28e1007ee82264296ac0983714094380b408097a418cfe",
+ "sha256:43cca367bf94a14aca50b89e9bc2061683116cfe864e56740e083392f533ce7a",
+ "sha256:456e3b11cb79ac9946c822a56346ec80275eaf2950314b249b512896c0d2505e",
+ "sha256:4d6ec0d4222e8ffdab1744da2560f07856421b367928026fb540e1945f2eeeaf",
+ "sha256:5006b13a06e0b38d561fab5ccc37581f23c9511879be7693bd33c7cd15ca227c",
+ "sha256:675c741d4739af2dc20cd6c6a5c4b7355c728167845e3c6b0e824e4e5d36a6c3",
+ "sha256:6cdb606a7478f9ad91c6283e238544451e3a95f30fb5467fbf715964341a8a86",
+ "sha256:6d95f286b8244b3649b477ac066c6906fbb2905f8ac19b170e2175d3d799f4df",
+ "sha256:76322dcdb16fccf2ac56f99048af32259dcc488d9b7e25b51e5eca5147a3fb98",
+ "sha256:7c1c60328bd964b53f8b835df69ae8198659e2b9302ff9ebb7de4e5a5994db3d",
+ "sha256:860ec6e63e2c5c2ee5e9121808145c7bf86c96cca9ad396c0bd3e0f2798ccbe2",
+ "sha256:8e00ea6fc82e8a804433d3e9cedaa1051a1422cb6e443011590c14d2dea59146",
+ "sha256:9c6c754df29ce6a89ed23afb25550d1c2d5fdb9901d9c67a16e0b16eaf7e2550",
+ "sha256:a26ae94658d3ba3781d5e103ac07a876b3e9b29db53f68ed7df432fd033358a8",
+ "sha256:a65acfdb9c6ebb8368490dbafe83c03c7e277b37e6857f0caeadbbc56e12f4fb",
+ "sha256:a7d80b2e904faa63068ead63107189164ca443b42dd1930299e0d1cb041cec2e",
+ "sha256:a84498e0d0a1174f2b3ed769b67b656aa5460c92c9554039e11f20a05650f00d",
+ "sha256:ab4754d432e3ac42d33a269c8567413bdb541689b02d93788af4131018cbf366",
+ "sha256:ad369ed238b1959dfbade9018a740fb9392c5ac4f9b5173f420bd4f37ba1f7a0",
+ "sha256:b1d0fcae4f0949f215d4632be684a539859b295e2d0cb14f78ec231915d644db",
+ "sha256:b42a1a511c81cc78cbc4539675713bbcf9d9c3913386243ceff0e9429ca892fe",
+ "sha256:bd33f82e95ba7ad632bc57837ee99dba3d7e006536200c4e9124089e1bf42426",
+ "sha256:bdd407c40483463898b84490770199d5714dcc9dd9b792f6c6caccc523c00952",
+ "sha256:c6eef7a2dbd0abfb0d9eaf78b73017dbfd0b54051102ff4e6a7b2980d5ac1a03",
+ "sha256:c82af4b2ddd2ee72d1fc0c6695048d457e00b3582ccde72d8a1c991b808bb20f",
+ "sha256:d666cb72687559689e9906197e3bec7b736764df6a2e58ee265e360663e9baf7",
+ "sha256:d7bf0a4f9f15b32b5ba53147369e94296f5fffb783db5aacc1be15b4bf72f43b",
+ "sha256:d82075752f40c0ddf57e6e02673a17f6cb0f8eb3f587f63ca1eaab5594da5b17",
+ "sha256:da65fb46d4cbb75cb417cddf6ba5e7582eb7bb0b47db4b99c9fe5787ce5d91f5",
+ "sha256:e2b49c3c0804e8ecb05d59af8386ec2f74877f7ca8fd9c1e00be2672e4d399b1",
+ "sha256:e585c8ae871fd38ac50598f4763d73ec5497b0de9a0ab4ef5b69f01c6a046142",
+ "sha256:e8d3ca0a72dd8846eb6f7dfe8f19088060fcb76931ed592d29128e0219652884",
+ "sha256:ef444c57d664d35cac4e18c298c47d7b504c66b17c2ea91312e979fcfbdfb08a",
+ "sha256:f1eb068ead09f4994dec71c24b2844f1e4e4e013b9629f812f292f04bd1510d9",
+ "sha256:f2ded8d9b6f68cc26f8425eda5d3877b47343e68ca23d0d0846f4d312ecaa445",
+ "sha256:f751ed0a2f250541e19dfca9f1eafa31a392c71c832b6bb9e113b10d050cb0f1",
+ "sha256:faa88bc527d0f097abdc2c663cddf37c05a1c2f113716601555249805cf573f1",
+ "sha256:fc44e3c68ff00fd991b59092a54350e6e4911152682b4782f68070985aa9e648"
],
"markers": "python_version == '3.11'",
- "version": "==2.1.1"
+ "version": "==2.1.2"
},
"opensearch-py": {
"hashes": [
@@ -651,38 +674,51 @@
},
"pandas": {
"hashes": [
- "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863",
- "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2",
- "sha256:0cace394b6ea70c01ca1595f839cf193df35d1575986e484ad35c4aeae7266c1",
- "sha256:1cb51fe389360f3b5a4d57dbd2848a5f033350336ca3b340d1c53a1fad33bcad",
- "sha256:2925720037f06e89af896c70bca73459d7e6a4be96f9de79e2d440bd499fe0db",
- "sha256:3e374f59e440d4ab45ca2fffde54b81ac3834cf5ae2cdfa69c90bc03bde04d76",
- "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51",
- "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32",
- "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08",
- "sha256:58b84b91b0b9f4bafac2a0ac55002280c094dfc6402402332c0913a59654ab2b",
- "sha256:640cef9aa381b60e296db324337a554aeeb883ead99dc8f6c18e81a93942f5f4",
- "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921",
- "sha256:696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288",
- "sha256:6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee",
- "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0",
- "sha256:873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24",
- "sha256:8e5a0b00e1e56a842f922e7fae8ae4077aee4af0acb5ae3622bd4b4c30aedf99",
- "sha256:8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151",
- "sha256:9057e6aa78a584bc93a13f0a9bf7e753a5e9770a30b4d758b8d5f2a62a9433cd",
- "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce",
- "sha256:92fd6b027924a7e178ac202cfbe25e53368db90d56872d20ffae94b96c7acc57",
- "sha256:9dfde2a0ddef507a631dc9dc4af6a9489d5e2e740e226ad426a05cabfbd7c8ef",
- "sha256:9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54",
- "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a",
- "sha256:c7adfc142dac335d8c1e0dcbd37eb8617eac386596eb9e1a1b77791cf2498238",
- "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23",
- "sha256:ddf818e4e6c7c6f4f7c8a12709696d193976b591cc7dc50588d3d1a6b5dc8772",
- "sha256:e9b79011ff7a0f4b1d6da6a61aa1aa604fb312d6647de5bad20013682d1429ce",
- "sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad"
+ "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.2"
+ "version": "==2.2.3"
},
"pika": {
"hashes": [
@@ -700,124 +736,236 @@
"markers": "python_version >= '3.8'",
"version": "==1.5.0"
},
+ "propcache": {
+ "hashes": [
+ "sha256:00181262b17e517df2cd85656fcd6b4e70946fe62cd625b9d74ac9977b64d8d9",
+ "sha256:0e53cb83fdd61cbd67202735e6a6687a7b491c8742dfc39c9e01e80354956763",
+ "sha256:1235c01ddaa80da8235741e80815ce381c5267f96cc49b1477fdcf8c047ef325",
+ "sha256:140fbf08ab3588b3468932974a9331aff43c0ab8a2ec2c608b6d7d1756dbb6cb",
+ "sha256:191db28dc6dcd29d1a3e063c3be0b40688ed76434622c53a284e5427565bbd9b",
+ "sha256:1e41d67757ff4fbc8ef2af99b338bfb955010444b92929e9e55a6d4dcc3c4f09",
+ "sha256:1ec43d76b9677637a89d6ab86e1fef70d739217fefa208c65352ecf0282be957",
+ "sha256:20a617c776f520c3875cf4511e0d1db847a076d720714ae35ffe0df3e440be68",
+ "sha256:218db2a3c297a3768c11a34812e63b3ac1c3234c3a086def9c0fee50d35add1f",
+ "sha256:22aa8f2272d81d9317ff5756bb108021a056805ce63dd3630e27d042c8092798",
+ "sha256:25a1f88b471b3bc911d18b935ecb7115dff3a192b6fef46f0bfaf71ff4f12418",
+ "sha256:25c8d773a62ce0451b020c7b29a35cfbc05de8b291163a7a0f3b7904f27253e6",
+ "sha256:2a60ad3e2553a74168d275a0ef35e8c0a965448ffbc3b300ab3a5bb9956c2162",
+ "sha256:2a66df3d4992bc1d725b9aa803e8c5a66c010c65c741ad901e260ece77f58d2f",
+ "sha256:2ccc28197af5313706511fab3a8b66dcd6da067a1331372c82ea1cb74285e036",
+ "sha256:2e900bad2a8456d00a113cad8c13343f3b1f327534e3589acc2219729237a2e8",
+ "sha256:2ee7606193fb267be4b2e3b32714f2d58cad27217638db98a60f9efb5efeccc2",
+ "sha256:33ac8f098df0585c0b53009f039dfd913b38c1d2edafed0cedcc0c32a05aa110",
+ "sha256:3444cdba6628accf384e349014084b1cacd866fbb88433cd9d279d90a54e0b23",
+ "sha256:363ea8cd3c5cb6679f1c2f5f1f9669587361c062e4899fce56758efa928728f8",
+ "sha256:375a12d7556d462dc64d70475a9ee5982465fbb3d2b364f16b86ba9135793638",
+ "sha256:388f3217649d6d59292b722d940d4d2e1e6a7003259eb835724092a1cca0203a",
+ "sha256:3947483a381259c06921612550867b37d22e1df6d6d7e8361264b6d037595f44",
+ "sha256:39e104da444a34830751715f45ef9fc537475ba21b7f1f5b0f4d71a3b60d7fe2",
+ "sha256:3c997f8c44ec9b9b0bcbf2d422cc00a1d9b9c681f56efa6ca149a941e5560da2",
+ "sha256:3dfafb44f7bb35c0c06eda6b2ab4bfd58f02729e7c4045e179f9a861b07c9850",
+ "sha256:3ebbcf2a07621f29638799828b8d8668c421bfb94c6cb04269130d8de4fb7136",
+ "sha256:3f88a4095e913f98988f5b338c1d4d5d07dbb0b6bad19892fd447484e483ba6b",
+ "sha256:439e76255daa0f8151d3cb325f6dd4a3e93043e6403e6491813bcaaaa8733887",
+ "sha256:4569158070180c3855e9c0791c56be3ceeb192defa2cdf6a3f39e54319e56b89",
+ "sha256:466c219deee4536fbc83c08d09115249db301550625c7fef1c5563a584c9bc87",
+ "sha256:4a9d9b4d0a9b38d1c391bb4ad24aa65f306c6f01b512e10a8a34a2dc5675d348",
+ "sha256:4c7dde9e533c0a49d802b4f3f218fa9ad0a1ce21f2c2eb80d5216565202acab4",
+ "sha256:53d1bd3f979ed529f0805dd35ddaca330f80a9a6d90bc0121d2ff398f8ed8861",
+ "sha256:55346705687dbd7ef0d77883ab4f6fabc48232f587925bdaf95219bae072491e",
+ "sha256:56295eb1e5f3aecd516d91b00cfd8bf3a13991de5a479df9e27dd569ea23959c",
+ "sha256:56bb5c98f058a41bb58eead194b4db8c05b088c93d94d5161728515bd52b052b",
+ "sha256:5a5b3bb545ead161be780ee85a2b54fdf7092815995661947812dde94a40f6fb",
+ "sha256:5f2564ec89058ee7c7989a7b719115bdfe2a2fb8e7a4543b8d1c0cc4cf6478c1",
+ "sha256:608cce1da6f2672a56b24a015b42db4ac612ee709f3d29f27a00c943d9e851de",
+ "sha256:63f13bf09cc3336eb04a837490b8f332e0db41da66995c9fd1ba04552e516354",
+ "sha256:662dd62358bdeaca0aee5761de8727cfd6861432e3bb828dc2a693aa0471a563",
+ "sha256:676135dcf3262c9c5081cc8f19ad55c8a64e3f7282a21266d05544450bffc3a5",
+ "sha256:67aeb72e0f482709991aa91345a831d0b707d16b0257e8ef88a2ad246a7280bf",
+ "sha256:67b69535c870670c9f9b14a75d28baa32221d06f6b6fa6f77a0a13c5a7b0a5b9",
+ "sha256:682a7c79a2fbf40f5dbb1eb6bfe2cd865376deeac65acf9beb607505dced9e12",
+ "sha256:6994984550eaf25dd7fc7bd1b700ff45c894149341725bb4edc67f0ffa94efa4",
+ "sha256:69d3a98eebae99a420d4b28756c8ce6ea5a29291baf2dc9ff9414b42676f61d5",
+ "sha256:6e2e54267980349b723cff366d1e29b138b9a60fa376664a157a342689553f71",
+ "sha256:73e4b40ea0eda421b115248d7e79b59214411109a5bc47d0d48e4c73e3b8fcf9",
+ "sha256:74acd6e291f885678631b7ebc85d2d4aec458dd849b8c841b57ef04047833bed",
+ "sha256:7665f04d0c7f26ff8bb534e1c65068409bf4687aa2534faf7104d7182debb336",
+ "sha256:7735e82e3498c27bcb2d17cb65d62c14f1100b71723b68362872bca7d0913d90",
+ "sha256:77a86c261679ea5f3896ec060be9dc8e365788248cc1e049632a1be682442063",
+ "sha256:7cf18abf9764746b9c8704774d8b06714bcb0a63641518a3a89c7f85cc02c2ad",
+ "sha256:83928404adf8fb3d26793665633ea79b7361efa0287dfbd372a7e74311d51ee6",
+ "sha256:8e40876731f99b6f3c897b66b803c9e1c07a989b366c6b5b475fafd1f7ba3fb8",
+ "sha256:8f188cfcc64fb1266f4684206c9de0e80f54622c3f22a910cbd200478aeae61e",
+ "sha256:91997d9cb4a325b60d4e3f20967f8eb08dfcb32b22554d5ef78e6fd1dda743a2",
+ "sha256:91ee8fc02ca52e24bcb77b234f22afc03288e1dafbb1f88fe24db308910c4ac7",
+ "sha256:92fe151145a990c22cbccf9ae15cae8ae9eddabfc949a219c9f667877e40853d",
+ "sha256:945db8ee295d3af9dbdbb698cce9bbc5c59b5c3fe328bbc4387f59a8a35f998d",
+ "sha256:9517d5e9e0731957468c29dbfd0f976736a0e55afaea843726e887f36fe017df",
+ "sha256:952e0d9d07609d9c5be361f33b0d6d650cd2bae393aabb11d9b719364521984b",
+ "sha256:97a58a28bcf63284e8b4d7b460cbee1edaab24634e82059c7b8c09e65284f178",
+ "sha256:97e48e8875e6c13909c800fa344cd54cc4b2b0db1d5f911f840458a500fde2c2",
+ "sha256:9e0f07b42d2a50c7dd2d8675d50f7343d998c64008f1da5fef888396b7f84630",
+ "sha256:a3dc1a4b165283bd865e8f8cb5f0c64c05001e0718ed06250d8cac9bec115b48",
+ "sha256:a3ebe9a75be7ab0b7da2464a77bb27febcb4fab46a34f9288f39d74833db7f61",
+ "sha256:a64e32f8bd94c105cc27f42d3b658902b5bcc947ece3c8fe7bc1b05982f60e89",
+ "sha256:a6ed8db0a556343d566a5c124ee483ae113acc9a557a807d439bcecc44e7dfbb",
+ "sha256:ad9c9b99b05f163109466638bd30ada1722abb01bbb85c739c50b6dc11f92dc3",
+ "sha256:b33d7a286c0dc1a15f5fc864cc48ae92a846df287ceac2dd499926c3801054a6",
+ "sha256:bc092ba439d91df90aea38168e11f75c655880c12782facf5cf9c00f3d42b562",
+ "sha256:c436130cc779806bdf5d5fae0d848713105472b8566b75ff70048c47d3961c5b",
+ "sha256:c5869b8fd70b81835a6f187c5fdbe67917a04d7e52b6e7cc4e5fe39d55c39d58",
+ "sha256:c5ecca8f9bab618340c8e848d340baf68bcd8ad90a8ecd7a4524a81c1764b3db",
+ "sha256:cfac69017ef97db2438efb854edf24f5a29fd09a536ff3a992b75990720cdc99",
+ "sha256:d2f0d0f976985f85dfb5f3d685697ef769faa6b71993b46b295cdbbd6be8cc37",
+ "sha256:d5bed7f9805cc29c780f3aee05de3262ee7ce1f47083cfe9f77471e9d6777e83",
+ "sha256:d6a21ef516d36909931a2967621eecb256018aeb11fc48656e3257e73e2e247a",
+ "sha256:d9b6ddac6408194e934002a69bcaadbc88c10b5f38fb9307779d1c629181815d",
+ "sha256:db47514ffdbd91ccdc7e6f8407aac4ee94cc871b15b577c1c324236b013ddd04",
+ "sha256:df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70",
+ "sha256:e4a91d44379f45f5e540971d41e4626dacd7f01004826a18cb048e7da7e96544",
+ "sha256:e63e3e1e0271f374ed489ff5ee73d4b6e7c60710e1f76af5f0e1a6117cd26394",
+ "sha256:e70fac33e8b4ac63dfc4c956fd7d85a0b1139adcfc0d964ce288b7c527537fea",
+ "sha256:ecddc221a077a8132cf7c747d5352a15ed763b674c0448d811f408bf803d9ad7",
+ "sha256:f45eec587dafd4b2d41ac189c2156461ebd0c1082d2fe7013571598abb8505d1",
+ "sha256:f52a68c21363c45297aca15561812d542f8fc683c85201df0bebe209e349f793",
+ "sha256:f571aea50ba5623c308aa146eb650eebf7dbe0fd8c5d946e28343cb3b5aad577",
+ "sha256:f60f0ac7005b9f5a6091009b09a419ace1610e163fa5deaba5ce3484341840e7",
+ "sha256:f6475a1b2ecb310c98c28d271a30df74f9dd436ee46d09236a6b750a7599ce57",
+ "sha256:f6d5749fdd33d90e34c2efb174c7e236829147a2713334d708746e94c4bde40d",
+ "sha256:f902804113e032e2cdf8c71015651c97af6418363bea8d78dc0911d56c335032",
+ "sha256:fa1076244f54bb76e65e22cb6910365779d5c3d71d1f18b275f1dfc7b0d71b4d",
+ "sha256:fc2db02409338bf36590aa985a461b2c96fce91f8e7e0f14c50c5fcc4f229016",
+ "sha256:ffcad6c564fe6b9b8916c1aefbb37a362deebf9394bd2974e9d84232e3e08504"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==0.2.0"
+ },
"pydantic": {
"hashes": [
- "sha256:c7a8a9fdf7d100afa49647eae340e2d23efa382466a8d177efcd1381e9be5598",
- "sha256:f66a7073abd93214a20c5f7b32d56843137a7a2e70d02111f3be287035c45370"
+ "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f",
+ "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"
],
"markers": "python_version >= '3.8'",
- "version": "==2.9.0"
+ "version": "==2.9.2"
},
"pydantic-core": {
"hashes": [
- "sha256:0102e49ac7d2df3379ef8d658d3bc59d3d769b0bdb17da189b75efa861fc07b4",
- "sha256:0123655fedacf035ab10c23450163c2f65a4174f2bb034b188240a6cf06bb123",
- "sha256:043ef8469f72609c4c3a5e06a07a1f713d53df4d53112c6d49207c0bd3c3bd9b",
- "sha256:0448b81c3dfcde439551bb04a9f41d7627f676b12701865c8a2574bcea034437",
- "sha256:05b366fb8fe3d8683b11ac35fa08947d7b92be78ec64e3277d03bd7f9b7cda79",
- "sha256:07049ec9306ec64e955b2e7c40c8d77dd78ea89adb97a2013d0b6e055c5ee4c5",
- "sha256:084414ffe9a85a52940b49631321d636dadf3576c30259607b75516d131fecd0",
- "sha256:086c5db95157dc84c63ff9d96ebb8856f47ce113c86b61065a066f8efbe80acf",
- "sha256:12625e69b1199e94b0ae1c9a95d000484ce9f0182f9965a26572f054b1537e44",
- "sha256:16b25a4a120a2bb7dab51b81e3d9f3cde4f9a4456566c403ed29ac81bf49744f",
- "sha256:19f1352fe4b248cae22a89268720fc74e83f008057a652894f08fa931e77dced",
- "sha256:1a2ab4f410f4b886de53b6bddf5dd6f337915a29dd9f22f20f3099659536b2f6",
- "sha256:1c7b81beaf7c7ebde978377dc53679c6cba0e946426fc7ade54251dfe24a7604",
- "sha256:1cf842265a3a820ebc6388b963ead065f5ce8f2068ac4e1c713ef77a67b71f7c",
- "sha256:1eb37f7d6a8001c0f86dc8ff2ee8d08291a536d76e49e78cda8587bb54d8b329",
- "sha256:23af245b8f2f4ee9e2c99cb3f93d0e22fb5c16df3f2f643f5a8da5caff12a653",
- "sha256:257d6a410a0d8aeb50b4283dea39bb79b14303e0fab0f2b9d617701331ed1515",
- "sha256:276ae78153a94b664e700ac362587c73b84399bd1145e135287513442e7dfbc7",
- "sha256:2b1a195efd347ede8bcf723e932300292eb13a9d2a3c1f84eb8f37cbbc905b7f",
- "sha256:329a721253c7e4cbd7aad4a377745fbcc0607f9d72a3cc2102dd40519be75ed2",
- "sha256:358331e21a897151e54d58e08d0219acf98ebb14c567267a87e971f3d2a3be59",
- "sha256:3649bd3ae6a8ebea7dc381afb7f3c6db237fc7cebd05c8ac36ca8a4187b03b30",
- "sha256:3713dc093d5048bfaedbba7a8dbc53e74c44a140d45ede020dc347dda18daf3f",
- "sha256:3ef71ec876fcc4d3bbf2ae81961959e8d62f8d74a83d116668409c224012e3af",
- "sha256:41ae8537ad371ec018e3c5da0eb3f3e40ee1011eb9be1da7f965357c4623c501",
- "sha256:4a801c5e1e13272e0909c520708122496647d1279d252c9e6e07dac216accc41",
- "sha256:4c83c64d05ffbbe12d4e8498ab72bdb05bcc1026340a4a597dc647a13c1605ec",
- "sha256:4cebb9794f67266d65e7e4cbe5dcf063e29fc7b81c79dc9475bd476d9534150e",
- "sha256:5668b3173bb0b2e65020b60d83f5910a7224027232c9f5dc05a71a1deac9f960",
- "sha256:56e6a12ec8d7679f41b3750ffa426d22b44ef97be226a9bab00a03365f217b2b",
- "sha256:582871902e1902b3c8e9b2c347f32a792a07094110c1bca6c2ea89b90150caac",
- "sha256:5c8aa40f6ca803f95b1c1c5aeaee6237b9e879e4dfb46ad713229a63651a95fb",
- "sha256:5d813fd871b3d5c3005157622ee102e8908ad6011ec915a18bd8fde673c4360e",
- "sha256:5dd0ec5f514ed40e49bf961d49cf1bc2c72e9b50f29a163b2cc9030c6742aa73",
- "sha256:5f3cf3721eaf8741cffaf092487f1ca80831202ce91672776b02b875580e174a",
- "sha256:6294907eaaccf71c076abdd1c7954e272efa39bb043161b4b8aa1cd76a16ce43",
- "sha256:64d094ea1aa97c6ded4748d40886076a931a8bf6f61b6e43e4a1041769c39dd2",
- "sha256:6650a7bbe17a2717167e3e23c186849bae5cef35d38949549f1c116031b2b3aa",
- "sha256:67b6655311b00581914aba481729971b88bb8bc7996206590700a3ac85e457b8",
- "sha256:6b06c5d4e8701ac2ba99a2ef835e4e1b187d41095a9c619c5b185c9068ed2a49",
- "sha256:6ce883906810b4c3bd90e0ada1f9e808d9ecf1c5f0b60c6b8831d6100bcc7dd6",
- "sha256:6db09153d8438425e98cdc9a289c5fade04a5d2128faff8f227c459da21b9703",
- "sha256:6f80fba4af0cb1d2344869d56430e304a51396b70d46b91a55ed4959993c0589",
- "sha256:743e5811b0c377eb830150d675b0847a74a44d4ad5ab8845923d5b3a756d8100",
- "sha256:753294d42fb072aa1775bfe1a2ba1012427376718fa4c72de52005a3d2a22178",
- "sha256:7568f682c06f10f30ef643a1e8eec4afeecdafde5c4af1b574c6df079e96f96c",
- "sha256:7706e15cdbf42f8fab1e6425247dfa98f4a6f8c63746c995d6a2017f78e619ae",
- "sha256:785e7f517ebb9890813d31cb5d328fa5eda825bb205065cde760b3150e4de1f7",
- "sha256:7a05c0240f6c711eb381ac392de987ee974fa9336071fb697768dfdb151345ce",
- "sha256:7ce7eaf9a98680b4312b7cebcdd9352531c43db00fca586115845df388f3c465",
- "sha256:7ce8e26b86a91e305858e018afc7a6e932f17428b1eaa60154bd1f7ee888b5f8",
- "sha256:7d0324a35ab436c9d768753cbc3c47a865a2cbc0757066cb864747baa61f6ece",
- "sha256:7e9b24cca4037a561422bf5dc52b38d390fb61f7bfff64053ce1b72f6938e6b2",
- "sha256:810ca06cca91de9107718dc83d9ac4d2e86efd6c02cba49a190abcaf33fb0472",
- "sha256:820f6ee5c06bc868335e3b6e42d7ef41f50dfb3ea32fbd523ab679d10d8741c0",
- "sha256:82764c0bd697159fe9947ad59b6db6d7329e88505c8f98990eb07e84cc0a5d81",
- "sha256:8ae65fdfb8a841556b52935dfd4c3f79132dc5253b12c0061b96415208f4d622",
- "sha256:8d5b0ff3218858859910295df6953d7bafac3a48d5cd18f4e3ed9999efd2245f",
- "sha256:95d6bf449a1ac81de562d65d180af5d8c19672793c81877a2eda8fde5d08f2fd",
- "sha256:964c7aa318da542cdcc60d4a648377ffe1a2ef0eb1e996026c7f74507b720a78",
- "sha256:96ef39add33ff58cd4c112cbac076726b96b98bb8f1e7f7595288dcfb2f10b57",
- "sha256:a6612c2a844043e4d10a8324c54cdff0042c558eef30bd705770793d70b224aa",
- "sha256:a8031074a397a5925d06b590121f8339d34a5a74cfe6970f8a1124eb8b83f4ac",
- "sha256:aab9e522efff3993a9e98ab14263d4e20211e62da088298089a03056980a3e69",
- "sha256:ae579143826c6f05a361d9546446c432a165ecf1c0b720bbfd81152645cb897d",
- "sha256:ae90b9e50fe1bd115b24785e962b51130340408156d34d67b5f8f3fa6540938e",
- "sha256:b18cf68255a476b927910c6873d9ed00da692bb293c5b10b282bd48a0afe3ae2",
- "sha256:b7efb12e5071ad8d5b547487bdad489fbd4a5a35a0fc36a1941517a6ad7f23e0",
- "sha256:c4d9f15ffe68bcd3898b0ad7233af01b15c57d91cd1667f8d868e0eacbfe3f87",
- "sha256:c53100c8ee5a1e102766abde2158077d8c374bee0639201f11d3032e3555dfbc",
- "sha256:c57e493a0faea1e4c38f860d6862ba6832723396c884fbf938ff5e9b224200e2",
- "sha256:c8319e0bd6a7b45ad76166cc3d5d6a36c97d0c82a196f478c3ee5346566eebfd",
- "sha256:caffda619099cfd4f63d48462f6aadbecee3ad9603b4b88b60cb821c1b258576",
- "sha256:cc0c316fba3ce72ac3ab7902a888b9dc4979162d320823679da270c2d9ad0cad",
- "sha256:cdd02a08205dc90238669f082747612cb3c82bd2c717adc60f9b9ecadb540f80",
- "sha256:d50ac34835c6a4a0d456b5db559b82047403c4317b3bc73b3455fefdbdc54b0a",
- "sha256:d6b9dd6aa03c812017411734e496c44fef29b43dba1e3dd1fa7361bbacfc1354",
- "sha256:da3131ef2b940b99106f29dfbc30d9505643f766704e14c5d5e504e6a480c35e",
- "sha256:da43cbe593e3c87d07108d0ebd73771dc414488f1f91ed2e204b0370b94b37ac",
- "sha256:dd59638025160056687d598b054b64a79183f8065eae0d3f5ca523cde9943940",
- "sha256:e1895e949f8849bc2757c0dbac28422a04be031204df46a56ab34bcf98507342",
- "sha256:e1a79ad49f346aa1a2921f31e8dbbab4d64484823e813a002679eaa46cba39e1",
- "sha256:e460475719721d59cd54a350c1f71c797c763212c836bf48585478c5514d2854",
- "sha256:e64ffaf8f6e17ca15eb48344d86a7a741454526f3a3fa56bc493ad9d7ec63936",
- "sha256:e6e3ccebdbd6e53474b0bb7ab8b88e83c0cfe91484b25e058e581348ee5a01a5",
- "sha256:e758d271ed0286d146cf7c04c539a5169a888dd0b57026be621547e756af55bc",
- "sha256:f087879f1ffde024dd2788a30d55acd67959dcf6c431e9d3682d1c491a0eb474",
- "sha256:f477d26183e94eaafc60b983ab25af2a809a1b48ce4debb57b343f671b7a90b6",
- "sha256:fc535cb898ef88333cf317777ecdfe0faac1c2a3187ef7eb061b6f7ecf7e6bae"
+ "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36",
+ "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05",
+ "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071",
+ "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327",
+ "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c",
+ "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36",
+ "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29",
+ "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744",
+ "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d",
+ "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec",
+ "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e",
+ "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e",
+ "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577",
+ "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232",
+ "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863",
+ "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6",
+ "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368",
+ "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480",
+ "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2",
+ "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2",
+ "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6",
+ "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769",
+ "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d",
+ "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2",
+ "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84",
+ "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166",
+ "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271",
+ "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5",
+ "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb",
+ "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13",
+ "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323",
+ "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556",
+ "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665",
+ "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef",
+ "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb",
+ "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119",
+ "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126",
+ "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510",
+ "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b",
+ "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87",
+ "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f",
+ "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc",
+ "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8",
+ "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21",
+ "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f",
+ "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6",
+ "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658",
+ "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b",
+ "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3",
+ "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb",
+ "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59",
+ "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24",
+ "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9",
+ "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3",
+ "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd",
+ "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753",
+ "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55",
+ "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad",
+ "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a",
+ "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605",
+ "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e",
+ "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b",
+ "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433",
+ "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8",
+ "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07",
+ "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728",
+ "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0",
+ "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327",
+ "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555",
+ "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64",
+ "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6",
+ "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea",
+ "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b",
+ "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df",
+ "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e",
+ "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd",
+ "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068",
+ "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3",
+ "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040",
+ "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12",
+ "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916",
+ "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f",
+ "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f",
+ "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801",
+ "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231",
+ "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5",
+ "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8",
+ "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee",
+ "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"
],
"markers": "python_version >= '3.8'",
- "version": "==2.23.2"
+ "version": "==2.23.4"
+ },
+ "pyparsing": {
+ "hashes": [
+ "sha256:93d9577b88da0bbea8cc8334ee8b918ed014968fd2ec383e868fb8afb1ccef84",
+ "sha256:cbf74e27246d595d9a74b186b810f6fbb86726dbf3b9532efb343f6d7294fe9c"
+ ],
+ "markers": "python_version >= '3.9'",
+ "version": "==3.2.0"
},
"pytest": {
"hashes": [
- "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5",
- "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"
+ "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181",
+ "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==8.3.2"
+ "version": "==8.3.3"
},
"python-dateutil": {
"hashes": [
"sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3",
"sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"version": "==2.9.0.post0"
},
"python-dotenv": {
@@ -831,10 +979,19 @@
},
"pytz": {
"hashes": [
- "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812",
- "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"
+ "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a",
+ "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"
+ ],
+ "version": "==2024.2"
+ },
+ "rdflib": {
+ "hashes": [
+ "sha256:0438920912a642c866a513de6fe8a0001bd86ef975057d6962c79ce4771687cd",
+ "sha256:9995eb8569428059b8c1affd26b25eac510d64f5043d9ce8c84e0d0036e995ae"
],
- "version": "==2024.1"
+ "index": "pypi",
+ "markers": "python_full_version >= '3.8.1' and python_full_version < '4.0.0'",
+ "version": "==7.0.0"
},
"requests": {
"hashes": [
@@ -849,7 +1006,7 @@
"sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
"sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
],
- "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"version": "==1.16.0"
},
"testcontainers-core": {
@@ -869,11 +1026,11 @@
},
"tinydb": {
"hashes": [
- "sha256:30c06d12383d7c332e404ca6a6103fb2b32cbf25712689648c39d9a6bd34bd3d",
- "sha256:6dd686a9c5a75dfa9280088fd79a419aefe19cd7f4bd85eba203540ef856d564"
+ "sha256:f7dfc39b8d7fda7a1ca62a8dbb449ffd340a117c1206b68c50b1a481fb95181d",
+ "sha256:f97030ee5cbc91eeadd1d7af07ab0e48ceb04aa63d4a983adbaca4cba16e86c3"
],
- "markers": "python_version >= '3.7' and python_version < '4.0'",
- "version": "==4.8.0"
+ "markers": "python_version >= '3.8' and python_version < '4.0'",
+ "version": "==4.8.2"
},
"tuspy": {
"hashes": [
@@ -893,19 +1050,19 @@
},
"tzdata": {
"hashes": [
- "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd",
- "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"
+ "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc",
+ "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"
],
"markers": "python_version >= '2'",
- "version": "==2024.1"
+ "version": "==2024.2"
},
"urllib3": {
"hashes": [
- "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472",
- "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"
+ "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+ "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
"markers": "python_version >= '3.10'",
- "version": "==2.2.2"
+ "version": "==2.2.3"
},
"werkzeug": {
"hashes": [
@@ -993,182 +1150,178 @@
},
"yarl": {
"hashes": [
- "sha256:012c506b2c23be4500fb97509aa7e6a575996fb317b80667fa26899d456e2aaf",
- "sha256:030d41d48217b180c5a176e59c49d212d54d89f6f53640fa4c1a1766492aec27",
- "sha256:044b76d069e69c6b0246f071ebac0576f89c772f806d66ef51e662bd015d03c7",
- "sha256:05b07e6e0f715eaae9d927a302d9220724392f3c0b4e7f8dfa174bf2e1b8433e",
- "sha256:0b3bf343b4ef9ec600d75363eb9b48ab3bd53b53d4e1c5a9fbf0cfe7ba73a47f",
- "sha256:0e0aea8319fdc1ac340236e58b0b7dc763621bce6ce98124a9d58104cafd0aaa",
- "sha256:11f7f8a72b3e26c533fa7ffa7a8068f4e3aad7b67c5cf7b17ea8c79fc81d9830",
- "sha256:1718c0bca5a61edac7a57dcc11856cb01bde13a9360a3cb6baf384b89cfc0b40",
- "sha256:179b1df5e9cd99234ea65e63d5bfc6dd524b2c3b6cf68a14b94ccbe01ab37ddd",
- "sha256:1824bfb932d8100e5c94f4f98c078f23ebc6f6fa93acc3d95408762089c54a06",
- "sha256:183136dc5d5411872e7529c924189a2e26fac5a7f9769cf13ef854d1d653ad36",
- "sha256:183dd37bb5471e8017ab8a998c1ea070b4a0b08a97a7c4e20e0c7ccbe8ebb999",
- "sha256:18b7ce6d8c35da8e16dcc8de124a80e250fc8c73f8c02663acf2485c874f1972",
- "sha256:18bc4600eed1907762c1816bb16ac63bc52912e53b5e9a353eb0935a78e95496",
- "sha256:190e70d2f9f16f1c9d666c103d635c9ed4bf8de7803e9fa0495eec405a3e96a8",
- "sha256:1ea30675fbf0ad6795c100da677ef6a8960a7db05ac5293f02a23c2230203c89",
- "sha256:1eafa7317063de4bc310716cdd9026c13f00b1629e649079a6908c3aafdf5046",
- "sha256:23057a004bc9735008eb2a04b6ce94c6c06219cdf2b193997fd3ae6039eb3196",
- "sha256:273baee8a8af5989d5aab51c740e65bc2b1fc6619b9dd192cd16a3fae51100be",
- "sha256:293f7c2b30d015de3f1441c4ee764963b86636fde881b4d6093498d1e8711f69",
- "sha256:2b922c32a1cff62bc43d408d1a8745abeed0a705793f2253c622bf3521922198",
- "sha256:308d1cce071b5b500e3d95636bbf15dfdb8e87ed081b893555658a7f9869a156",
- "sha256:30dde3a8b88c80a4f049eb4dd240d2a02e89174da6be2525541f949bf9fa38ab",
- "sha256:315e8853d0ea46aabdce01f1f248fff7b9743de89b555c5f0487f54ac84beae8",
- "sha256:32d2e46848dea122484317485129f080220aa84aeb6a9572ad9015107cebeb07",
- "sha256:32e79d5ae975f7c2cc29f7104691fc9be5ee3724f24e1a7254d72f6219672108",
- "sha256:3352c69dc235850d6bf8ddad915931f00dcab208ac4248b9af46175204c2f5f9",
- "sha256:347011ad09a8f9be3d41fe2d7d611c3a4de4d49aa77bcb9a8c03c7a82fc45248",
- "sha256:348ad53acd41caa489df7db352d620c982ab069855d9635dda73d685bbbc3636",
- "sha256:3576ed2c51f8525d4ff5c3279247aacff9540bb43b292c4a37a8e6c6e1691adb",
- "sha256:36d12d78b8b0d46099d413c8689b5510ad9ce5e443363d1c37b6ac5b3d7cbdfb",
- "sha256:3bf10a395adac62177ba8ea738617e8de6cbb1cea6aa5d5dd2accde704fc8195",
- "sha256:48a48261f8d610b0e15fed033e74798763bc2f8f2c0d769a2a0732511af71f1e",
- "sha256:493ad061ee025c5ed3a60893cd70204eead1b3f60ccc90682e752f95b845bd46",
- "sha256:4c46454fafa31f7241083a0dd21814f63e0fcb4ae49662dc7e286fd6a5160ea1",
- "sha256:4cca9ba00be4bb8a051c4007b60fc91d6c9728c8b70c86cee4c24be9d641002f",
- "sha256:4f6ac063a4e9bbd4f6cc88cc621516a44d6aec66862ea8399ba063374e4b12c7",
- "sha256:52d1ae09b0764017e330bb5bf9af760c0168c564225085bb806f687bccffda8a",
- "sha256:534b8bc181dca1691cf491c263e084af678a8fb6b6181687c788027d8c317026",
- "sha256:54a4b5e6a060d46cad6a3cf340f4cb268e6fbc89c589d82a2da58f7db47c47c8",
- "sha256:5b46c603bee1f2dd407b8358c2afc9b0472a22ccca528f114e1f4cd30dfecd22",
- "sha256:5cece693380c1c4a606cdcaa0c54eda8f72cfe1ba83f5149b9023bb955e8fa8e",
- "sha256:5d0c9e1dcc92d46ca89608fe4763fc2362f1e81c19a922c67dbc0f20951466e4",
- "sha256:5f3372f9ae1d1f001826b77d0b29d4220e84f6c5f53915e71a825cdd02600065",
- "sha256:5f769c2708c31227c5349c3e4c668c8b4b2e25af3e7263723f2ef33e8e3906a0",
- "sha256:6026a6ef14d038a38ca9d81422db4b6bb7d5da94f9d08f21e0ad9ebd9c4bc3bb",
- "sha256:637dd0f55d1781d4634c23994101c509e455b5ab61af9086b5763b7eca9359aa",
- "sha256:687131ee4d045f3d58128ca28f5047ec902f7760545c39bbe003cc737c5a02b5",
- "sha256:6bc602c7413e1b5223bc988947125998cb54d6184de45a871985daacc23e6c8c",
- "sha256:6e91ed5f6818e1e3806eaeb7b14d9e17b90340f23089451ea59a89a29499d760",
- "sha256:6eec21d8c3aa932c5a89480b58fa877e9c48092ab838ccc76788cbc917ceec0d",
- "sha256:6f4f43ba30d604ba391bc7fe2dd104d6b87b62b0de4bbde79e362524b8a1eb75",
- "sha256:6f64f8681671624f539eea5564518bc924524c25eb90ab24a7eddc2d872e668e",
- "sha256:762a196612c2aba4197cd271da65fe08308f7ddf130dc63842c7a76d774b6a2c",
- "sha256:88173836a25b7e5dce989eeee3b92d8ef5cdf512830d4155c6212de98e616f70",
- "sha256:8c6214071f653d21bb7b43f7ee519afcbf7084263bb43408f4939d14558290db",
- "sha256:8d7bd531d7eec4aa7ef8a99fef91962eeea5158a53af0ec507c476ddf8ebc29c",
- "sha256:8e69b55965a47dd6c79e578abd7d85637b1bb4a7565436630826bdb28aa9b7ad",
- "sha256:90fd64ce00f594db02f603efa502521c440fa1afcf6266be82eb31f19d2d9561",
- "sha256:96422a3322b4d954f4c52403a2fc129ad118c151ee60a717847fb46a8480d1e1",
- "sha256:99e7459ee86a3b81e57777afd3825b8b1acaac8a99f9c0bd02415d80eb3c371b",
- "sha256:99eaa7d53f509ba1c2fea8fdfec15ba3cd36caca31d57ec6665073b148b5f260",
- "sha256:9a8d6a0e2b5617b5c15c59db25f20ba429f1fea810f2c09fbf93067cb21ab085",
- "sha256:9b6d0d7522b514f054b359409817af4c5ed76fa4fe42d8bd1ed12956804cf595",
- "sha256:9ef7ce61958b3c7b2e2e0927c52d35cf367c5ee410e06e1337ecc83a90c23b95",
- "sha256:a162cf04fd1e8d81025ec651d14cac4f6e0ca73a3c0a9482de8691b944e3098a",
- "sha256:a80cdb3c15c15b33ecdb080546dcb022789b0084ca66ad41ffa0fe09857fca11",
- "sha256:a9d8c4be5658834dc688072239d220631ad4b71ff79a5f3d17fb653f16d10759",
- "sha256:aa1aeb99408be0ca774c5126977eb085fedda6dd7d9198ce4ceb2d06a44325c7",
- "sha256:af5b52bfbbd5eb208cf1afe23c5ada443929e9b9d79e9fbc66cacc07e4e39748",
- "sha256:b453b3dbc1ed4c2907632d05b378123f3fb411cad05d8d96de7d95104ef11c70",
- "sha256:b80246bdee036381636e73ef0f19b032912064622b0e5ee44f6960fd11df12aa",
- "sha256:bc544248b5263e1c0f61332ccf35e37404b54213f77ed17457f857f40af51452",
- "sha256:bc66927f6362ed613a483c22618f88f014994ccbd0b7a25ec1ebc8c472d4b40a",
- "sha256:be199fed28861d72df917e355287ad6835555d8210e7f8203060561f24d7d842",
- "sha256:beda87b63c08fb4df8cc5353eeefe68efe12aa4f5284958bd1466b14c85e508e",
- "sha256:bf733c835ebbd52bd78a52b919205e0f06d8571f71976a0259e5bcc20d0a2f44",
- "sha256:c1bf63ba496cd4f12d30e916d9a52daa6c91433fedd9cd0d99fef3e13232836f",
- "sha256:c382e189af10070bcb39caa9406b9cc47b26c1d2257979f11fe03a38be09fea9",
- "sha256:c4d13071c5b99974cfe2f94c749ecc4baf882f7c4b6e4c40ca3d15d1b7e81f24",
- "sha256:c5527d32506c11150ca87f33820057dc284e2a01a87f0238555cada247a8b278",
- "sha256:c77a3c10af4aaf8891578fe492ef0990c65cf7005dd371f5ea8007b420958bf6",
- "sha256:ca42a9281807fdf8fba86e671d8fdd76f92e9302a6d332957f2bae51c774f8a7",
- "sha256:cd65588273d19f8483bc8f32a6fcf602e94a9a7ba287a1725977bd9527cd6c0c",
- "sha256:d2366e2f987f69752f0588d2035321aaf24272693d75f7f6bb7e8a0f48f7ccdd",
- "sha256:dff84623e7098cf9bfbb5187f9883051af652b0ce08b9f7084cc8630b87b6457",
- "sha256:e4657fd290d556a5f3018d07c7b7deadcb622760c0125277d10a11471c340054",
- "sha256:e8da33665ecc64cd3e593098adb449f9c65b4e3bc6338e75ad592da15453d898",
- "sha256:eeb6a40c5ae2616fd38c1e039c6dd50031bbfbc2acacfd7b70a5d64fafc70901",
- "sha256:f8e24b9a4afdffab399191a9f0b0e80eabc7b7fdb9f2dbccdeb8e4d28e5c57bb",
- "sha256:ff45a655ca51e1cb778abbb586083fddb7d896332f47bb3b03bc75e30c25649f",
- "sha256:ff8e803d8ca170e632fb3b4df1bfd29ba29be8edc3e9306c5ffa5fadea234a4f"
+ "sha256:0545de8c688fbbf3088f9e8b801157923be4bf8e7b03e97c2ecd4dfa39e48e0e",
+ "sha256:076b1ed2ac819933895b1a000904f62d615fe4533a5cf3e052ff9a1da560575c",
+ "sha256:0afad2cd484908f472c8fe2e8ef499facee54a0a6978be0e0cff67b1254fd747",
+ "sha256:0ccaa1bc98751fbfcf53dc8dfdb90d96e98838010fc254180dd6707a6e8bb179",
+ "sha256:0d3105efab7c5c091609abacad33afff33bdff0035bece164c98bcf5a85ef90a",
+ "sha256:0e1af74a9529a1137c67c887ed9cde62cff53aa4d84a3adbec329f9ec47a3936",
+ "sha256:136f9db0f53c0206db38b8cd0c985c78ded5fd596c9a86ce5c0b92afb91c3a19",
+ "sha256:156ececdf636143f508770bf8a3a0498de64da5abd890c7dbb42ca9e3b6c05b8",
+ "sha256:15c87339490100c63472a76d87fe7097a0835c705eb5ae79fd96e343473629ed",
+ "sha256:1695497bb2a02a6de60064c9f077a4ae9c25c73624e0d43e3aa9d16d983073c2",
+ "sha256:173563f3696124372831007e3d4b9821746964a95968628f7075d9231ac6bb33",
+ "sha256:173866d9f7409c0fb514cf6e78952e65816600cb888c68b37b41147349fe0057",
+ "sha256:23ec1d3c31882b2a8a69c801ef58ebf7bae2553211ebbddf04235be275a38548",
+ "sha256:243fbbbf003754fe41b5bdf10ce1e7f80bcc70732b5b54222c124d6b4c2ab31c",
+ "sha256:28c6cf1d92edf936ceedc7afa61b07e9d78a27b15244aa46bbcd534c7458ee1b",
+ "sha256:2aa738e0282be54eede1e3f36b81f1e46aee7ec7602aa563e81e0e8d7b67963f",
+ "sha256:2cf441c4b6e538ba0d2591574f95d3fdd33f1efafa864faa077d9636ecc0c4e9",
+ "sha256:30c3ff305f6e06650a761c4393666f77384f1cc6c5c0251965d6bfa5fbc88f7f",
+ "sha256:31561a5b4d8dbef1559b3600b045607cf804bae040f64b5f5bca77da38084a8a",
+ "sha256:32b66be100ac5739065496c74c4b7f3015cef792c3174982809274d7e51b3e04",
+ "sha256:3433da95b51a75692dcf6cc8117a31410447c75a9a8187888f02ad45c0a86c50",
+ "sha256:34a2d76a1984cac04ff8b1bfc939ec9dc0914821264d4a9c8fd0ed6aa8d4cfd2",
+ "sha256:353665775be69bbfc6d54c8d134bfc533e332149faeddd631b0bc79df0897f46",
+ "sha256:38d0124fa992dbacd0c48b1b755d3ee0a9f924f427f95b0ef376556a24debf01",
+ "sha256:3c56ec1eacd0a5d35b8a29f468659c47f4fe61b2cab948ca756c39b7617f0aa5",
+ "sha256:3db817b4e95eb05c362e3b45dafe7144b18603e1211f4a5b36eb9522ecc62bcf",
+ "sha256:3e52474256a7db9dcf3c5f4ca0b300fdea6c21cca0148c8891d03a025649d935",
+ "sha256:416f2e3beaeae81e2f7a45dc711258be5bdc79c940a9a270b266c0bec038fb84",
+ "sha256:435aca062444a7f0c884861d2e3ea79883bd1cd19d0a381928b69ae1b85bc51d",
+ "sha256:4388c72174868884f76affcdd3656544c426407e0043c89b684d22fb265e04a5",
+ "sha256:43ebdcc120e2ca679dba01a779333a8ea76b50547b55e812b8b92818d604662c",
+ "sha256:458c0c65802d816a6b955cf3603186de79e8fdb46d4f19abaec4ef0a906f50a7",
+ "sha256:533a28754e7f7439f217550a497bb026c54072dbe16402b183fdbca2431935a9",
+ "sha256:553dad9af802a9ad1a6525e7528152a015b85fb8dbf764ebfc755c695f488367",
+ "sha256:5838f2b79dc8f96fdc44077c9e4e2e33d7089b10788464609df788eb97d03aad",
+ "sha256:5b48388ded01f6f2429a8c55012bdbd1c2a0c3735b3e73e221649e524c34a58d",
+ "sha256:5bc0df728e4def5e15a754521e8882ba5a5121bd6b5a3a0ff7efda5d6558ab3d",
+ "sha256:63eab904f8630aed5a68f2d0aeab565dcfc595dc1bf0b91b71d9ddd43dea3aea",
+ "sha256:66f629632220a4e7858b58e4857927dd01a850a4cef2fb4044c8662787165cf7",
+ "sha256:670eb11325ed3a6209339974b276811867defe52f4188fe18dc49855774fa9cf",
+ "sha256:69d5856d526802cbda768d3e6246cd0d77450fa2a4bc2ea0ea14f0d972c2894b",
+ "sha256:6e840553c9c494a35e449a987ca2c4f8372668ee954a03a9a9685075228e5036",
+ "sha256:711bdfae4e699a6d4f371137cbe9e740dc958530cb920eb6f43ff9551e17cfbc",
+ "sha256:74abb8709ea54cc483c4fb57fb17bb66f8e0f04438cff6ded322074dbd17c7ec",
+ "sha256:75119badf45f7183e10e348edff5a76a94dc19ba9287d94001ff05e81475967b",
+ "sha256:766dcc00b943c089349d4060b935c76281f6be225e39994c2ccec3a2a36ad627",
+ "sha256:78e6fdc976ec966b99e4daa3812fac0274cc28cd2b24b0d92462e2e5ef90d368",
+ "sha256:81dadafb3aa124f86dc267a2168f71bbd2bfb163663661ab0038f6e4b8edb810",
+ "sha256:82d5161e8cb8f36ec778fd7ac4d740415d84030f5b9ef8fe4da54784a1f46c94",
+ "sha256:833547179c31f9bec39b49601d282d6f0ea1633620701288934c5f66d88c3e50",
+ "sha256:856b7f1a7b98a8c31823285786bd566cf06226ac4f38b3ef462f593c608a9bd6",
+ "sha256:8657d3f37f781d987037f9cc20bbc8b40425fa14380c87da0cb8dfce7c92d0fb",
+ "sha256:93bed8a8084544c6efe8856c362af08a23e959340c87a95687fdbe9c9f280c8b",
+ "sha256:954dde77c404084c2544e572f342aef384240b3e434e06cecc71597e95fd1ce7",
+ "sha256:98f68df80ec6ca3015186b2677c208c096d646ef37bbf8b49764ab4a38183931",
+ "sha256:99e12d2bf587b44deb74e0d6170fec37adb489964dbca656ec41a7cd8f2ff178",
+ "sha256:9a13a07532e8e1c4a5a3afff0ca4553da23409fad65def1b71186fb867eeae8d",
+ "sha256:9c1e3ff4b89cdd2e1a24c214f141e848b9e0451f08d7d4963cb4108d4d798f1f",
+ "sha256:9ce2e0f6123a60bd1a7f5ae3b2c49b240c12c132847f17aa990b841a417598a2",
+ "sha256:9fcda20b2de7042cc35cf911702fa3d8311bd40055a14446c1e62403684afdc5",
+ "sha256:a32d58f4b521bb98b2c0aa9da407f8bd57ca81f34362bcb090e4a79e9924fefc",
+ "sha256:a39c36f4218a5bb668b4f06874d676d35a035ee668e6e7e3538835c703634b84",
+ "sha256:a5cafb02cf097a82d74403f7e0b6b9df3ffbfe8edf9415ea816314711764a27b",
+ "sha256:a7cf963a357c5f00cb55b1955df8bbe68d2f2f65de065160a1c26b85a1e44172",
+ "sha256:a880372e2e5dbb9258a4e8ff43f13888039abb9dd6d515f28611c54361bc5644",
+ "sha256:ace4cad790f3bf872c082366c9edd7f8f8f77afe3992b134cfc810332206884f",
+ "sha256:af8ff8d7dc07ce873f643de6dfbcd45dc3db2c87462e5c387267197f59e6d776",
+ "sha256:b47a6000a7e833ebfe5886b56a31cb2ff12120b1efd4578a6fcc38df16cc77bd",
+ "sha256:b71862a652f50babab4a43a487f157d26b464b1dedbcc0afda02fd64f3809d04",
+ "sha256:b7f227ca6db5a9fda0a2b935a2ea34a7267589ffc63c8045f0e4edb8d8dcf956",
+ "sha256:bc8936d06cd53fddd4892677d65e98af514c8d78c79864f418bbf78a4a2edde4",
+ "sha256:bed1b5dbf90bad3bfc19439258c97873eab453c71d8b6869c136346acfe497e7",
+ "sha256:c45817e3e6972109d1a2c65091504a537e257bc3c885b4e78a95baa96df6a3f8",
+ "sha256:c68e820879ff39992c7f148113b46efcd6ec765a4865581f2902b3c43a5f4bbb",
+ "sha256:c77494a2f2282d9bbbbcab7c227a4d1b4bb829875c96251f66fb5f3bae4fb053",
+ "sha256:c998d0558805860503bc3a595994895ca0f7835e00668dadc673bbf7f5fbfcbe",
+ "sha256:ccad2800dfdff34392448c4bf834be124f10a5bc102f254521d931c1c53c455a",
+ "sha256:cd126498171f752dd85737ab1544329a4520c53eed3997f9b08aefbafb1cc53b",
+ "sha256:ce44217ad99ffad8027d2fde0269ae368c86db66ea0571c62a000798d69401fb",
+ "sha256:d1ac2bc069f4a458634c26b101c2341b18da85cb96afe0015990507efec2e417",
+ "sha256:d417a4f6943112fae3924bae2af7112562285848d9bcee737fc4ff7cbd450e6c",
+ "sha256:d538df442c0d9665664ab6dd5fccd0110fa3b364914f9c85b3ef9b7b2e157980",
+ "sha256:ded1b1803151dd0f20a8945508786d57c2f97a50289b16f2629f85433e546d47",
+ "sha256:e2e93b88ecc8f74074012e18d679fb2e9c746f2a56f79cd5e2b1afcf2a8a786b",
+ "sha256:e4ca3b9f370f218cc2a0309542cab8d0acdfd66667e7c37d04d617012485f904",
+ "sha256:e4ee8b8639070ff246ad3649294336b06db37a94bdea0d09ea491603e0be73b8",
+ "sha256:e52f77a0cd246086afde8815039f3e16f8d2be51786c0a39b57104c563c5cbb0",
+ "sha256:eaea112aed589131f73d50d570a6864728bd7c0c66ef6c9154ed7b59f24da611",
+ "sha256:ed20a4bdc635f36cb19e630bfc644181dd075839b6fc84cac51c0f381ac472e2",
+ "sha256:eedc3f247ee7b3808ea07205f3e7d7879bc19ad3e6222195cd5fbf9988853e4d",
+ "sha256:f0e1844ad47c7bd5d6fa784f1d4accc5f4168b48999303a868fe0f8597bde715",
+ "sha256:f4fe99ce44128c71233d0d72152db31ca119711dfc5f2c82385ad611d8d7f897",
+ "sha256:f8cfd847e6b9ecf9f2f2531c8427035f291ec286c0a4944b0a9fce58c6446046",
+ "sha256:f9ca0e6ce7774dc7830dc0cc4bb6b3eec769db667f230e7c770a628c1aa5681b",
+ "sha256:fa2bea05ff0a8fb4d8124498e00e02398f06d23cdadd0fe027d84a3f7afde31e",
+ "sha256:fbbb63bed5fcd70cd3dd23a087cd78e4675fb5a2963b8af53f945cbbca79ae16",
+ "sha256:fbda058a9a68bec347962595f50546a8a4a34fd7b0654a7b9697917dc2bf810d",
+ "sha256:ffd591e22b22f9cb48e472529db6a47203c41c2c5911ff0a52e85723196c0d75"
],
"markers": "python_version >= '3.8'",
- "version": "==1.10.0"
+ "version": "==1.15.2"
}
},
"develop": {
"coverage": {
"hashes": [
- "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca",
- "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d",
- "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6",
- "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989",
- "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c",
- "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b",
- "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223",
- "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f",
- "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56",
- "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3",
- "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8",
- "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb",
- "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388",
- "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0",
- "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a",
- "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8",
- "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f",
- "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a",
- "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962",
- "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8",
- "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391",
- "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc",
- "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2",
- "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155",
- "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb",
- "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0",
- "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c",
- "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a",
- "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004",
- "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060",
- "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232",
- "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93",
- "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129",
- "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163",
- "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de",
- "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6",
- "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23",
- "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569",
- "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d",
- "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778",
- "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d",
- "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36",
- "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a",
- "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6",
- "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34",
- "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704",
- "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106",
- "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9",
- "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862",
- "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b",
- "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255",
- "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16",
- "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3",
- "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133",
- "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb",
- "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657",
- "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d",
- "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca",
- "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36",
- "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c",
- "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e",
- "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff",
- "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7",
- "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5",
- "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02",
- "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c",
- "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df",
- "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3",
- "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a",
- "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959",
- "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234",
- "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc"
+ "sha256:04f2189716e85ec9192df307f7c255f90e78b6e9863a03223c3b998d24a3c6c6",
+ "sha256:0c6c0f4d53ef603397fc894a895b960ecd7d44c727df42a8d500031716d4e8d2",
+ "sha256:0ca37993206402c6c35dc717f90d4c8f53568a8b80f0bf1a1b2b334f4d488fba",
+ "sha256:12f9515d875859faedb4144fd38694a761cd2a61ef9603bf887b13956d0bbfbb",
+ "sha256:1990b1f4e2c402beb317840030bb9f1b6a363f86e14e21b4212e618acdfce7f6",
+ "sha256:2341a78ae3a5ed454d524206a3fcb3cec408c2a0c7c2752cd78b606a2ff15af4",
+ "sha256:23bb63ae3f4c645d2d82fa22697364b0046fbafb6261b258a58587441c5f7bd0",
+ "sha256:27bd5f18d8f2879e45724b0ce74f61811639a846ff0e5c0395b7818fae87aec6",
+ "sha256:2dc7d6b380ca76f5e817ac9eef0c3686e7834c8346bef30b041a4ad286449990",
+ "sha256:331b200ad03dbaa44151d74daeb7da2cf382db424ab923574f6ecca7d3b30de3",
+ "sha256:365defc257c687ce3e7d275f39738dcd230777424117a6c76043459db131dd43",
+ "sha256:37be7b5ea3ff5b7c4a9db16074dc94523b5f10dd1f3b362a827af66a55198175",
+ "sha256:3c2e6fa98032fec8282f6b27e3f3986c6e05702828380618776ad794e938f53a",
+ "sha256:40e8b1983080439d4802d80b951f4a93d991ef3261f69e81095a66f86cf3c3c6",
+ "sha256:43517e1f6b19f610a93d8227e47790722c8bf7422e46b365e0469fc3d3563d97",
+ "sha256:43b32a06c47539fe275106b376658638b418c7cfdfff0e0259fbf877e845f14b",
+ "sha256:43d6a66e33b1455b98fc7312b124296dad97a2e191c80320587234a77b1b736e",
+ "sha256:4c59d6a4a4633fad297f943c03d0d2569867bd5372eb5684befdff8df8522e39",
+ "sha256:52ac29cc72ee7e25ace7807249638f94c9b6a862c56b1df015d2b2e388e51dbd",
+ "sha256:54356a76b67cf8a3085818026bb556545ebb8353951923b88292556dfa9f812d",
+ "sha256:583049c63106c0555e3ae3931edab5669668bbef84c15861421b94e121878d3f",
+ "sha256:6d99198203f0b9cb0b5d1c0393859555bc26b548223a769baf7e321a627ed4fc",
+ "sha256:6da42bbcec130b188169107ecb6ee7bd7b4c849d24c9370a0c884cf728d8e976",
+ "sha256:6e484e479860e00da1f005cd19d1c5d4a813324e5951319ac3f3eefb497cc549",
+ "sha256:70a6756ce66cd6fe8486c775b30889f0dc4cb20c157aa8c35b45fd7868255c5c",
+ "sha256:70d24936ca6c15a3bbc91ee9c7fc661132c6f4c9d42a23b31b6686c05073bde5",
+ "sha256:71967c35828c9ff94e8c7d405469a1fb68257f686bca7c1ed85ed34e7c2529c4",
+ "sha256:79644f68a6ff23b251cae1c82b01a0b51bc40c8468ca9585c6c4b1aeee570e0b",
+ "sha256:87cd2e29067ea397a47e352efb13f976eb1b03e18c999270bb50589323294c6e",
+ "sha256:8d4c6ea0f498c7c79111033a290d060c517853a7bcb2f46516f591dab628ddd3",
+ "sha256:9134032f5aa445ae591c2ba6991d10136a1f533b1d2fa8f8c21126468c5025c6",
+ "sha256:921fbe13492caf6a69528f09d5d7c7d518c8d0e7b9f6701b7719715f29a71e6e",
+ "sha256:99670790f21a96665a35849990b1df447993880bb6463a0a1d757897f30da929",
+ "sha256:9975442f2e7a5cfcf87299c26b5a45266ab0696348420049b9b94b2ad3d40234",
+ "sha256:99ded130555c021d99729fabd4ddb91a6f4cc0707df4b1daf912c7850c373b13",
+ "sha256:a3328c3e64ea4ab12b85999eb0779e6139295bbf5485f69d42cf794309e3d007",
+ "sha256:a4fb91d5f72b7e06a14ff4ae5be625a81cd7e5f869d7a54578fc271d08d58ae3",
+ "sha256:aa23ce39661a3e90eea5f99ec59b763b7d655c2cada10729ed920a38bfc2b167",
+ "sha256:aac7501ae73d4a02f4b7ac8fcb9dc55342ca98ffb9ed9f2dfb8a25d53eda0e4d",
+ "sha256:ab84a8b698ad5a6c365b08061920138e7a7dd9a04b6feb09ba1bfae68346ce6d",
+ "sha256:b4adeb878a374126f1e5cf03b87f66279f479e01af0e9a654cf6d1509af46c40",
+ "sha256:b9853509b4bf57ba7b1f99b9d866c422c9c5248799ab20e652bbb8a184a38181",
+ "sha256:bb7d5fe92bd0dc235f63ebe9f8c6e0884f7360f88f3411bfed1350c872ef2054",
+ "sha256:bca4c8abc50d38f9773c1ec80d43f3768df2e8576807d1656016b9d3eeaa96fd",
+ "sha256:c222958f59b0ae091f4535851cbb24eb57fc0baea07ba675af718fb5302dddb2",
+ "sha256:c30e42ea11badb147f0d2e387115b15e2bd8205a5ad70d6ad79cf37f6ac08c91",
+ "sha256:c3a79f56dee9136084cf84a6c7c4341427ef36e05ae6415bf7d787c96ff5eaa3",
+ "sha256:c51ef82302386d686feea1c44dbeef744585da16fcf97deea2a8d6c1556f519b",
+ "sha256:c77326300b839c44c3e5a8fe26c15b7e87b2f32dfd2fc9fee1d13604347c9b38",
+ "sha256:d33a785ea8354c480515e781554d3be582a86297e41ccbea627a5c632647f2cd",
+ "sha256:d546cfa78844b8b9c1c0533de1851569a13f87449897bbc95d698d1d3cb2a30f",
+ "sha256:da29ceabe3025a1e5a5aeeb331c5b1af686daab4ff0fb4f83df18b1180ea83e2",
+ "sha256:df8c05a0f574d480947cba11b947dc41b1265d721c3777881da2fb8d3a1ddfba",
+ "sha256:e266af4da2c1a4cbc6135a570c64577fd3e6eb204607eaff99d8e9b710003c6f",
+ "sha256:e279f3db904e3b55f520f11f983cc8dc8a4ce9b65f11692d4718ed021ec58b83",
+ "sha256:ea52bd218d4ba260399a8ae4bb6b577d82adfc4518b93566ce1fddd4a49d1dce",
+ "sha256:ebec65f5068e7df2d49466aab9128510c4867e532e07cb6960075b27658dca38",
+ "sha256:ec1e3b40b82236d100d259854840555469fad4db64f669ab817279eb95cd535c",
+ "sha256:ee77c7bef0724165e795b6b7bf9c4c22a9b8468a6bdb9c6b4281293c6b22a90f",
+ "sha256:f263b18692f8ed52c8de7f40a0751e79015983dbd77b16906e5b310a39d3ca21",
+ "sha256:f7b26757b22faf88fcf232f5f0e62f6e0fd9e22a8a5d0d5016888cdfe1f6c1c4",
+ "sha256:f7ddb920106bbbbcaf2a274d56f46956bf56ecbde210d88061824a95bdd94e92"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
- "version": "==7.6.1"
+ "markers": "python_version >= '3.9'",
+ "version": "==7.6.3"
},
"iniconfig": {
"hashes": [
@@ -1196,12 +1349,12 @@
},
"pytest": {
"hashes": [
- "sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5",
- "sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce"
+ "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181",
+ "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"
],
"index": "pypi",
"markers": "python_version >= '3.8'",
- "version": "==8.3.2"
+ "version": "==8.3.3"
}
}
}
diff --git a/dbrepo-search-service/init/README.md b/dbrepo-search-service/init/README.md
index 74767ea02ada906b7f7feab0e13a7c4b1fe9a7d1..a188e561c737ddcc9bb772099dcfe51e5d8e9323 100644
--- a/dbrepo-search-service/init/README.md
+++ b/dbrepo-search-service/init/README.md
@@ -4,4 +4,8 @@ Responsible for:
* Creating `database` index if not existing
* Importing database(s) from the Metadata Database
-* Exit
\ No newline at end of file
+* Exit
+
+## Development
+
+Open in `./dbrepo-search-service` directory (depends on `clients` package).
\ No newline at end of file
diff --git a/dbrepo-search-service/init/app.py b/dbrepo-search-service/init/app.py
index 450575ba090c445e030c60464a68f820f79b173b..9fe915f92c50d2b712058783d4eecf1b087cc8f7 100644
--- a/dbrepo-search-service/init/app.py
+++ b/dbrepo-search-service/init/app.py
@@ -6,7 +6,6 @@ from typing import List
import opensearchpy.exceptions
from dbrepo.RestClient import RestClient
from logging.config import dictConfig
-from pathlib import Path
from dbrepo.api.dto import Database
from opensearchpy import OpenSearch
@@ -68,9 +67,6 @@ class App:
logging.debug(f"create instance {self.search_host}:{self.search_port}")
return self.search_instance
- def index_exists(self):
- return self._instance().indices.exists(index="database")
-
def database_exists(self, database_id: int):
try:
self._instance().get(index="database", id=database_id)
@@ -78,34 +74,19 @@ class App:
except opensearchpy.exceptions.NotFoundError:
return False
- def index_update(self, is_created: bool) -> bool:
- """
-
- :param is_created:
- :return: True if the index was updated
- """
- if is_created:
- logging.debug(f"index 'database' does not exist, creating...")
- with open('./database.json', 'r') as f:
- self._instance().indices.create(index="database", body=json.load(f))
- logging.info(f"Created index 'database'")
- return True
- mapping = dict(self._instance().indices.get_mapping(index="database"))
- identifier_props = mapping["database"]["mappings"]["properties"]["identifiers"]["properties"]
- if "status" in identifier_props:
- logging.debug(f"found mapping database.identifiers.status: detected current mapping")
- return False
- logging.debug(f"index 'database' exists, updating mapping...")
+ def index_update(self) -> None:
+ if self._instance().indices.exists(index="database"):
+ logging.debug(f"index 'database' exists, removing...")
+ self._instance().indices.delete(index="database")
with open('./database.json', 'r') as f:
- self._instance().indices.put_mapping(index="database", body=json.load(f))
- logging.info(f"Updated index 'database'")
- return True
+ self._instance().indices.create(index="database", body=json.load(f))
+ logging.info(f"Created index 'database'")
def fetch_databases(self) -> List[Database]:
logging.debug(f"fetching database from endpoint: {self.metadata_service_endpoint}")
client = RestClient(endpoint=self.metadata_service_endpoint)
databases = []
- for database, index in client.get_databases():
+ for index, database in enumerate(client.get_databases()):
logging.debug(f"fetching database {index}/{len(databases)} details for database id: {database.id}")
databases.append(client.get_database(database_id=database.id))
logging.debug(f"fetched {len(databases)} database(s)")
@@ -126,7 +107,6 @@ class App:
if __name__ == "__main__":
app = App()
- create = not app.index_exists()
- update = app.index_update(is_created=create)
+ update = app.index_update()
app.save_databases(databases=app.fetch_databases())
logging.info("Finished. Exiting.")
diff --git a/dbrepo-search-service/clients/keycloak_client.py b/dbrepo-search-service/init/clients/keycloak_client.py
similarity index 100%
rename from dbrepo-search-service/clients/keycloak_client.py
rename to dbrepo-search-service/init/clients/keycloak_client.py
diff --git a/dbrepo-search-service/clients/opensearch_client.py b/dbrepo-search-service/init/clients/opensearch_client.py
similarity index 89%
rename from dbrepo-search-service/clients/opensearch_client.py
rename to dbrepo-search-service/init/clients/opensearch_client.py
index 3f198ac443784286c4c16912d1e2d946f1fd9080..7d25fcded5a29e87524523785133d7aaa56f314d 100644
--- a/dbrepo-search-service/clients/opensearch_client.py
+++ b/dbrepo-search-service/init/clients/opensearch_client.py
@@ -1,14 +1,14 @@
"""
The opensearch_client.py is used by the different API endpoints in routes.py to handle requests to the opensearch db
"""
+import os
from json import dumps, load
import logging
from dbrepo.api.dto import Database
-from flask import current_app
from collections.abc import MutableMapping
-from opensearchpy import OpenSearch, TransportError, RequestError
+from opensearchpy import OpenSearch, TransportError, RequestError, NotFoundError
from omlib.measure import om
from omlib.constants import OM_IDS
@@ -26,11 +26,11 @@ class OpenSearchClient:
password: str = None
instance: OpenSearch = None
- def __init__(self):
- self.host = current_app.config["OPENSEARCH_HOST"]
- self.port = int(current_app.config["OPENSEARCH_PORT"])
- self.username = current_app.config["OPENSEARCH_USERNAME"]
- self.password = current_app.config["OPENSEARCH_PASSWORD"]
+ def __init__(self, host: str = None, port: int = None, username: str = None, password: str = None):
+ self.host = os.getenv('OPENSEARCH_HOST', host)
+ self.port = int(os.getenv('OPENSEARCH_PORT', port))
+ self.username = os.getenv('OPENSEARCH_USERNAME', username)
+ self.password = os.getenv('OPENSEARCH_PASSWORD', password)
def _instance(self) -> OpenSearch:
"""
@@ -42,7 +42,6 @@ class OpenSearchClient:
self.instance = OpenSearch(hosts=[{"host": self.host, "port": self.port}],
http_compress=True,
http_auth=(self.username, self.password))
- logging.debug(f"create instance {self.host}:{self.port}")
return self.instance
def get_database(self, database_id: int) -> Database:
@@ -68,16 +67,8 @@ class OpenSearchClient:
@throws: opensearchpy.exceptions.NotFoundError If the database was not found in the Search Database.
"""
logging.debug(f"updating database with id: {database_id} in search database")
- try:
- self._instance().index(index="database", id=database_id, body=dumps(data.model_dump()))
- except RequestError as e:
- logging.error(f"Failed to update in search database: {e.info}")
- raise e
- try:
- response: dict = self._instance().get(index="database", id=database_id)
- except TransportError as e:
- logging.error(f"Failed to get updated database in search database: {e.status_code}")
- raise e
+ self._instance().index(index="database", id=database_id, body=dumps(data.model_dump()))
+ response: dict = self._instance().get(index="database", id=database_id)
database = Database.parse_obj(response["_source"])
logging.info(f"Updated database with id {database_id} in index 'database'")
return database
@@ -119,10 +110,10 @@ class OpenSearchClient:
results = [hit["_source"] for hit in response["hits"]["hits"]]
return results
- def get_fields_for_index(self, type: str):
+ def get_fields_for_index(self, field_type: str):
"""
returns a list of attributes of the data for a specific index.
- :param type: The search type
+ :param field_type: The search type
:return: list of fields
"""
fields = {
@@ -135,8 +126,10 @@ class OpenSearchClient:
"view": "views.*",
"user": "creator.*",
}
- logging.debug(f'requesting field(s) {fields[type]} for filter: {type}')
- fields = self._instance().indices.get_field_mapping(fields[type])
+ if field_type not in fields.keys():
+ raise NotFoundError(f"Failed to find field type: {field_type}")
+ logging.debug(f'requesting field(s) {fields[field_type]} for filter: {field_type}')
+ fields = self._instance().indices.get_field_mapping(fields[field_type])
fields_list = []
fd = flatten_dict(fields)
for key in fd.keys():
@@ -170,13 +163,13 @@ class OpenSearchClient:
logging.info(f"Found {len(response['hits']['hits'])} result(s)")
return response
- def general_search(self, type: str = None, field_value_pairs: dict = None):
+ def general_search(self, field_type: str = None, field_value_pairs: dict = None):
"""
Main method for searching stuff in the opensearch db
all parameters are optional
- :param type: The index to be searched. Optional.
+ :param field_type: The index to be searched. Optional.
:param field_value_pairs: The key-value pair of properties that need to match. Optional.
:return: The object of results and HTTP status code. e.g. { "hits": { "hits": [] } }, 200
"""
@@ -205,7 +198,7 @@ class OpenSearchClient:
body = {
"query": {"bool": {"must": musts}}
}
- logging.debug(f'search in index database for type: {type}')
+ logging.debug(f'search in index database for type: {field_type}')
logging.debug(f'search body: {dumps(body)}')
response = self._instance().search(
index="database",
@@ -214,12 +207,10 @@ class OpenSearchClient:
results = [hit["_source"] for hit in response["hits"]["hits"]]
return results
- def unit_independent_search(self, t1=None, t2=None, field_value_pairs=None):
+ def unit_independent_search(self, t1: float, t2: float, field_value_pairs):
"""
Main method for searching stuff in the opensearch db
- all parameters are optional
-
:param t1: start value
:param t2: end value
:param field_value_pairs: the key-value pairs
@@ -241,6 +232,8 @@ class OpenSearchClient:
)
unit_uris = [hit["key"] for hit in response["aggregations"]["units"]["buckets"]]
logging.debug(f"found {len(unit_uris)} unit(s) in column index")
+ if len(unit_uris) == 0:
+ raise NotFoundError("Failed to search: no unit assigned")
base_unit = unit_uri_to_unit(field_value_pairs["unit.uri"])
for unit_uri in unit_uris:
gte = t1
diff --git a/dbrepo-search-service/init/database.json b/dbrepo-search-service/init/database.json
index d87d33b5e29abae3ffbb9beab8bad45a00d0ff56..1e6bdd0c4c4d3f2302bafc4c7a79bed2ec84224d 100644
--- a/dbrepo-search-service/init/database.json
+++ b/dbrepo-search-service/init/database.json
@@ -125,40 +125,6 @@
},
"image": {
"properties": {
- "date_formats": {
- "properties": {
- "created_at": {
- "type": "date"
- },
- "database_format": {
- "type": "text",
- "fields": {
- "keyword": {
- "type": "keyword",
- "ignore_above": 256
- }
- }
- },
- "has_time": {
- "type": "boolean"
- },
- "id": {
- "type": "long"
- },
- "unix_format": {
- "type": "text",
- "fields": {
- "keyword": {
- "type": "keyword",
- "ignore_above": 256
- }
- }
- }
- }
- },
- "default_port": {
- "type": "long"
- },
"dialect": {
"type": "text",
"fields": {
@@ -639,37 +605,6 @@
"database_id": {
"type": "long"
},
- "date_format": {
- "properties": {
- "created_at": {
- "type": "date"
- },
- "database_format": {
- "type": "text",
- "fields": {
- "keyword": {
- "type": "keyword",
- "ignore_above": 256
- }
- }
- },
- "has_time": {
- "type": "boolean"
- },
- "id": {
- "type": "long"
- },
- "unix_format": {
- "type": "text",
- "fields": {
- "keyword": {
- "type": "keyword",
- "ignore_above": 256
- }
- }
- }
- }
- },
"id": {
"type": "long"
},
@@ -959,37 +894,6 @@
"database_id": {
"type": "long"
},
- "date_format": {
- "properties": {
- "created_at": {
- "type": "date"
- },
- "database_format": {
- "type": "text",
- "fields": {
- "keyword": {
- "type": "keyword",
- "ignore_above": 256
- }
- }
- },
- "has_time": {
- "type": "boolean"
- },
- "id": {
- "type": "long"
- },
- "unix_format": {
- "type": "text",
- "fields": {
- "keyword": {
- "type": "keyword",
- "ignore_above": 256
- }
- }
- }
- }
- },
"id": {
"type": "long"
},
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.4-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.4.4-py3-none-any.whl
deleted file mode 100644
index 617969c3eb15926d932b7c0180bed51b9ef7052d..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.4-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.4.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.4.tar.gz
deleted file mode 100644
index 9d1d5ae238baba6bc51db4d219a0d09b5aca1c51..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.4.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.5-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.4.5-py3-none-any.whl
deleted file mode 100644
index 249fd5dc181271a3069745f5a6ef8a26de398037..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.5-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.5.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.5.tar.gz
deleted file mode 100644
index 2f21496bd2280550f4242bbc0fff4a47116d6ad5..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.5.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.6.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.6.tar.gz
deleted file mode 100644
index 958287917e7f2b38a0286c3e91c2d471462bceee..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.6.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.6rc1-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.4.6rc1-py3-none-any.whl
deleted file mode 100644
index 83944ce88d8aec5a3b767aa09caf9a8700323104..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.6rc1-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.6rc1.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.6rc1.tar.gz
deleted file mode 100644
index a0c8432134f3c21359cd7fb8ee1a341812a6c034..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.4.6rc1.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.4.7.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.4.7.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c652dbae4a60aae708eb6fe4e751977b97b72344
Binary files /dev/null and b/dbrepo-search-service/init/lib/dbrepo-1.4.7.tar.gz differ
diff --git a/dbrepo-search-service/omlib/__init__.py b/dbrepo-search-service/init/omlib/__init__.py
similarity index 100%
rename from dbrepo-search-service/omlib/__init__.py
rename to dbrepo-search-service/init/omlib/__init__.py
diff --git a/dbrepo-search-service/omlib/constants.py b/dbrepo-search-service/init/omlib/constants.py
similarity index 100%
rename from dbrepo-search-service/omlib/constants.py
rename to dbrepo-search-service/init/omlib/constants.py
diff --git a/dbrepo-search-service/omlib/dimension.py b/dbrepo-search-service/init/omlib/dimension.py
similarity index 100%
rename from dbrepo-search-service/omlib/dimension.py
rename to dbrepo-search-service/init/omlib/dimension.py
diff --git a/dbrepo-search-service/omlib/exceptions/__init__.py b/dbrepo-search-service/init/omlib/exceptions/__init__.py
similarity index 100%
rename from dbrepo-search-service/omlib/exceptions/__init__.py
rename to dbrepo-search-service/init/omlib/exceptions/__init__.py
diff --git a/dbrepo-search-service/omlib/exceptions/dimensionexception.py b/dbrepo-search-service/init/omlib/exceptions/dimensionexception.py
similarity index 100%
rename from dbrepo-search-service/omlib/exceptions/dimensionexception.py
rename to dbrepo-search-service/init/omlib/exceptions/dimensionexception.py
diff --git a/dbrepo-search-service/omlib/exceptions/unitconversionexception.py b/dbrepo-search-service/init/omlib/exceptions/unitconversionexception.py
similarity index 100%
rename from dbrepo-search-service/omlib/exceptions/unitconversionexception.py
rename to dbrepo-search-service/init/omlib/exceptions/unitconversionexception.py
diff --git a/dbrepo-search-service/omlib/exceptions/unitidentityexception.py b/dbrepo-search-service/init/omlib/exceptions/unitidentityexception.py
similarity index 100%
rename from dbrepo-search-service/omlib/exceptions/unitidentityexception.py
rename to dbrepo-search-service/init/omlib/exceptions/unitidentityexception.py
diff --git a/dbrepo-search-service/omlib/measure.py b/dbrepo-search-service/init/omlib/measure.py
similarity index 100%
rename from dbrepo-search-service/omlib/measure.py
rename to dbrepo-search-service/init/omlib/measure.py
diff --git a/dbrepo-search-service/omlib/omconstants.py b/dbrepo-search-service/init/omlib/omconstants.py
similarity index 100%
rename from dbrepo-search-service/omlib/omconstants.py
rename to dbrepo-search-service/init/omlib/omconstants.py
diff --git a/dbrepo-search-service/omlib/rdf/__init__.py b/dbrepo-search-service/init/omlib/rdf/__init__.py
similarity index 100%
rename from dbrepo-search-service/omlib/rdf/__init__.py
rename to dbrepo-search-service/init/omlib/rdf/__init__.py
diff --git a/dbrepo-search-service/omlib/rdf/om-2.0.rdf b/dbrepo-search-service/init/omlib/rdf/om-2.0.rdf
similarity index 100%
rename from dbrepo-search-service/omlib/rdf/om-2.0.rdf
rename to dbrepo-search-service/init/omlib/rdf/om-2.0.rdf
diff --git a/dbrepo-search-service/omlib/scale.py b/dbrepo-search-service/init/omlib/scale.py
similarity index 100%
rename from dbrepo-search-service/omlib/scale.py
rename to dbrepo-search-service/init/omlib/scale.py
diff --git a/dbrepo-search-service/omlib/thing.py b/dbrepo-search-service/init/omlib/thing.py
similarity index 100%
rename from dbrepo-search-service/omlib/thing.py
rename to dbrepo-search-service/init/omlib/thing.py
diff --git a/dbrepo-search-service/omlib/unit.py b/dbrepo-search-service/init/omlib/unit.py
similarity index 100%
rename from dbrepo-search-service/omlib/unit.py
rename to dbrepo-search-service/init/omlib/unit.py
diff --git a/dbrepo-search-service/init/test/conftest.py b/dbrepo-search-service/init/test/conftest.py
new file mode 100644
index 0000000000000000000000000000000000000000..e2a00b1d86a7129935c7dbd42acb4a51254d3dbc
--- /dev/null
+++ b/dbrepo-search-service/init/test/conftest.py
@@ -0,0 +1,47 @@
+import logging
+import os
+
+import pytest
+import json
+
+from testcontainers.opensearch import OpenSearchContainer
+
+
+@pytest.fixture(scope="session", autouse=True)
+def session(request):
+ """
+ Create one OpenSearch container per test run only (admin:admin)
+ :param request: /
+ :return: The OpenSearch container
+ """
+ logging.debug("[fixture] creating opensearch container")
+ container = OpenSearchContainer()
+ logging.debug("[fixture] starting opensearch container")
+ container.start()
+
+ os.environ['OPENSEARCH_HOST'] = container.get_container_host_ip()
+ os.environ['OPENSEARCH_PORT'] = container.get_exposed_port(9200)
+ os.environ['OPENSEARCH_USERNAME'] = 'admin'
+ os.environ['OPENSEARCH_PASSWORD'] = 'admin'
+
+ # destructor
+ def stop_opensearch():
+ container.stop()
+
+ request.addfinalizer(stop_opensearch)
+ return container
+
+
+@pytest.fixture(scope="function", autouse=True)
+def cleanup(request, session):
+ """
+ Clean up after each test by removing the index and re-adding it (=so it's empty again)
+ :param request: /
+ :param session: /
+ :return:
+ """
+ logging.info("[fixture] clean schema")
+ with open('./database.json', 'r') as f:
+ if session.get_client().indices.exists(index="database"):
+ session.get_client().indices.delete(index="database")
+ session.get_client().indices.create(index="database", body=json.load(f))
diff --git a/dbrepo-search-service/init/test/test_app.py b/dbrepo-search-service/init/test/test_app.py
new file mode 100644
index 0000000000000000000000000000000000000000..118ccf99c16586e4305967ab22a12e6317fb8ae2
--- /dev/null
+++ b/dbrepo-search-service/init/test/test_app.py
@@ -0,0 +1,21 @@
+import unittest
+
+from app import App
+from clients.opensearch_client import OpenSearchClient
+
+
+class AppTest(unittest.TestCase):
+
+ def test_index_update_succeeds(self):
+ # test
+ app = App()
+ app.index_update()
+
+ def test_index_update_not_exists_succeeds(self):
+ # mock
+ client = OpenSearchClient()
+ client._instance().indices.delete(index="database")
+
+ # test
+ app = App()
+ app.index_update()
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl
deleted file mode 100644
index 617969c3eb15926d932b7c0180bed51b9ef7052d..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.4-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz
deleted file mode 100644
index 9d1d5ae238baba6bc51db4d219a0d09b5aca1c51..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.4.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.5-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.4.5-py3-none-any.whl
deleted file mode 100644
index 249fd5dc181271a3069745f5a6ef8a26de398037..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.5-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.5.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.5.tar.gz
deleted file mode 100644
index 2f21496bd2280550f4242bbc0fff4a47116d6ad5..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.5.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.6.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.6.tar.gz
deleted file mode 100644
index 958287917e7f2b38a0286c3e91c2d471462bceee..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.6.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.6rc1-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.4.6rc1-py3-none-any.whl
deleted file mode 100644
index 83944ce88d8aec5a3b767aa09caf9a8700323104..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.6rc1-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.6rc1.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.6rc1.tar.gz
deleted file mode 100644
index a0c8432134f3c21359cd7fb8ee1a341812a6c034..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.4.6rc1.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.4.7.tar.gz b/dbrepo-search-service/lib/dbrepo-1.4.7.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c652dbae4a60aae708eb6fe4e751977b97b72344
Binary files /dev/null and b/dbrepo-search-service/lib/dbrepo-1.4.7.tar.gz differ
diff --git a/dbrepo-search-service/test/conftest.py b/dbrepo-search-service/test/conftest.py
index 2a21f689702d7f78e14e73b6170715753e32b49c..1d603685d63e464a4ffe2f4aac005c2af319fc5a 100644
--- a/dbrepo-search-service/test/conftest.py
+++ b/dbrepo-search-service/test/conftest.py
@@ -1,8 +1,8 @@
import logging
+import os
import pytest
-from app import app
-from flask import current_app
+import json
from testcontainers.opensearch import OpenSearchContainer
@@ -19,9 +19,10 @@ def session(request):
logging.debug("[fixture] starting opensearch container")
container.start()
- with app.app_context():
- current_app.config['OPENSEARCH_HOST'] = container.get_container_host_ip()
- current_app.config['OPENSEARCH_PORT'] = container.get_exposed_port(9200)
+ os.environ['OPENSEARCH_HOST'] = container.get_container_host_ip()
+ os.environ['OPENSEARCH_PORT'] = container.get_exposed_port(9200)
+ os.environ['OPENSEARCH_USERNAME'] = 'admin'
+ os.environ['OPENSEARCH_PASSWORD'] = 'admin'
# destructor
def stop_opensearch():
@@ -30,20 +31,17 @@ def session(request):
request.addfinalizer(stop_opensearch)
return container
-# @pytest.fixture(scope="function", autouse=True)
-# def cleanup(request, session):
-# """
-# Clean up after each test by removing the buckets and re-adding them (=so they are empty again)
-# :param request: /
-# :param session: /
-# :return:
-# """
-# logging.info("[fixture] truncate buckets")
-# for bucket in ["dbrepo-upload", "dbrepo-download"]:
-# objects = []
-# for obj in session.get_client().list_objects(bucket):
-# objects.append(DeleteObject(obj.object_name))
-# logging.info(f'request to remove objects {objects}')
-# errors = session.get_client().remove_objects(bucket, objects)
-# for error in errors:
-# raise ConnectionError(f'Failed to delete object with key {error.object_name} of bucket {bucket}')
+
+@pytest.fixture(scope="function", autouse=True)
+def cleanup(request, session):
+ """
+ Clean up after each test by removing the index and re-adding it (=so it's empty again)
+ :param request: /
+ :param session: /
+ :return:
+ """
+ logging.info("[fixture] clean schema")
+ with open('./init/database.json', 'r') as f:
+ if session.get_client().indices.exists(index="database"):
+ session.get_client().indices.delete(index="database")
+ session.get_client().indices.create(index="database", body=json.load(f))
diff --git a/dbrepo-search-service/test/rsa/rs256.key b/dbrepo-search-service/test/rsa/rs256.key
new file mode 100644
index 0000000000000000000000000000000000000000..86b3eaf5c6c4c6b83071b6d1e9d69cb22bcd4085
--- /dev/null
+++ b/dbrepo-search-service/test/rsa/rs256.key
@@ -0,0 +1,3 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQABAoIBADNcMt6hAHub4JTAYS6Mra0EPRBO2XhWmACBrv3+8ETClXd5475KPLDewgRVtlmtbwU8G8awUXESQgPS9lfiqvQhPreA3cHlm6oP2WMKOEtakr2s8I+frsTBLCo0Ini9RaSzjoVVgS0zofyhASKi+T970MafSj5P3XNb8YBFdXgoYDiA7FXLH6a/+m7LScL+wGcFMAAeYESxZbMQLfH3v8L+4EcTraiwjLG17ZdlF3dpybMyUSse6ZQ/PdlyvBuzzLXhN6Ce2gd9ATfS+YWTzo7Yf+GU+ex5bIpVOfHqtuM/hyq7YGKENClsXwNZIAoFnvGCbvECAfgyapVrD30IfykCgYEA0rgsSZ82pxT40NxwgBD1g9lbNVBKXphRB/3S078qusUzJjT7AldEj4imGPhAbI7bI8gAeWJsp1XJWkjM8ktaVrh+NQl7p8e9OPh0pQF/5Bdg8ajbjXESpjnaU66pVYRQy/d+jNli/YRAHX5RUfsBl+6W4+WSVMGmKBiqJsur+ecCgYEAz1YVXClcmUnyZem5B+2E9noIzjF6ROE+jIb6rawM85P3Xd0lXtECQavtxw+Qk7I32qOwrxl1UpK2foVel3pazi+4OpMfmqtYGenRP1Zk1cZwrDo0cIemTDGjj3kJ8tYn12CGolFQpJZgK6OHzvG0tOxI5VZgjIViWNPe1PGWXtUCgYEAxXGNDe8BZs1f11S2lUlOw5yGug3hoYFXbAWJ5p7Ziuf8ZXB/QlJDC7se54a11wKEk6Jzz0lKRgE8CjzszJuOqnN0zn10QGIIC7nCklo1W6QMUmPGVWH994N976tZP6gbjQL6sT+AYcvpx7j0ubxYYeRNvnz+ACzzY964kGGHY0ECgYEAumlwPPNnMN7+VEjGNm2D7UMdJZ3wi3tkjF5ThdA5uMohTsAk+FG80KSu3RmOaGyEsUwY7+VYyYvlDm4E9PZqLBVVczyR3rMNPAcwPd0EPfvzk7WlLkOX7ct3fehaXH3VRlyfz9KCSeh1wOZ/lT1VtpD2nVOC7PSDzs92+kfXZZ0CgYAnrD1y4skgXkdwolZ3unn3EFyGm2d+X5aMTHwQPdWxqoNIAl/9wdghlzihwnPhhsxq1WzlxuC3V2IMrNPtRx70Mi+FbSmR5m4Xx5RptgMtMlwno+L40PzNJgMjHGjt0wcx3Vel8wuohDtnqMyS7P5nG1/TQx0Cyzwn7QOXlNpgbQ==
+-----END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/dbrepo-search-service/test/rsa/rsa256.pkey b/dbrepo-search-service/test/rsa/rsa256.pkey
new file mode 100644
index 0000000000000000000000000000000000000000..857dfb22beeac202c2955d7cc4f782b787492beb
--- /dev/null
+++ b/dbrepo-search-service/test/rsa/rsa256.pkey
@@ -0,0 +1,3 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/dbrepo-search-service/test/run_testindicies.py b/dbrepo-search-service/test/run_testindicies.py
deleted file mode 100644
index b547573dd65369cd88be1750f1224f05c333a883..0000000000000000000000000000000000000000
--- a/dbrepo-search-service/test/run_testindicies.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""
-This script spins up docker containers running an opensearch db with predefined entries.
-This is useful e.g. if you want to run tests on the functionality of the opensearch_client.
-
-note: The port of the test container should be 9200, but it's somehow kinda random,
-and using environmet variables also doesn't really work,
-so the correct port number is just saved in the .testpickle
-"""
-
-from testcontainers.opensearch import OpenSearchContainer
-import pprint
-import time
-import os
-import pickle
-
-
-doc1 = {
- "author": "aaa",
- "name": "Hi! My name is",
- "description":"here's some description text",
- "created": "2023-07-27",
- "docID":1,
- "public":True,
- "details": {
- "nestedObject1": "something",
- "nestedObject2": "something else",
- "evenMoreNested": {
- "bla":"blib",
- "blob":"blub"
- }
- }
-}
-
-doc2 = {
- "author": "max",
- "name": "Bla Bla",
- "public": False,
- "description": "here's another description text, about a fictional entry with some random measurement data",
- "created": "2023-07-27",
- "docID":2,
- "details": {
- "nestedObject1": "something",
- "nestedObject2": "something else"
- }
-}
-
-doc3 = {
- "author": "mweise",
- "name": "databaseName",
- "public": True,
- "description": "here is a really old entry",
- "created":"2022-07-27",
- "docID":3,
- "details": {
- "nestedObject1": "something",
- "nestedObject2": "something else"
- }
-}
-placeholderDoc = {
- "blib":"blub",
- "public": False
-}
-
-with OpenSearchContainer(port_to_expose=9200) as opensearch:
- client = opensearch.get_client()
- creation_result = client.index(index="database", body=doc1)
- creation_result = client.index(index="database", body=doc2)
- creation_result = client.index(index="database", body=doc3)
- creation_result = client.index(index="user", body=placeholderDoc)
- creation_result = client.index(index="table", body=placeholderDoc)
- creation_result = client.index(index="column", body=placeholderDoc)
- creation_result = client.index(index="identifier", body=placeholderDoc)
- refresh_result = client.indices.refresh(index="database")
- search_result = client.search(index="database", body={"query": {"match_all": {}}})
- pp = pprint.PrettyPrinter(indent=1)
- config = opensearch.get_config()
- os.environ["TEST_OPENSEARCH_HOST"] = config["host"]
- os.putenv("TEST_OPENSEARCH_HOST", config["host"])
- os.environ["TEST_OPENSEARCH_PORT"] = config["port"]
- os.environ["TEST_OPENSEARCH_USERNAME"] = config["user"]
- os.environ["TEST_OPENSEARCH_PASSWORD"] = config["password"]
-
- pickle_info = {}
- pickle_info["port"] = config["port"]
- pickle_info["host"] = config["host"]
- with open(".testpickle", "ab") as outfile:
- pickle.dump(pickle_info, outfile)
- print(f"serving on port: {config['port']}")
- while True:
- time.sleep(1)
-
diff --git a/dbrepo-search-service/test/test_app.py b/dbrepo-search-service/test/test_app.py
new file mode 100644
index 0000000000000000000000000000000000000000..1b1af020987175fcd8894e61fd2e85519f42c998
--- /dev/null
+++ b/dbrepo-search-service/test/test_app.py
@@ -0,0 +1,300 @@
+import json
+import time
+import unittest
+import datetime
+
+import jwt
+from dbrepo.api.dto import Database, User, UserAttributes, Container, Image, Table, Constraints, Column, ColumnType, \
+ Concept, Unit
+
+from app import app
+
+req = Database(id=1,
+ name="Test",
+ internal_name="test_tuw1",
+ creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ contact=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ created=datetime.datetime(2024, 3, 25, 16, tzinfo=datetime.timezone.utc),
+ exchange_name="dbrepo",
+ is_public=True,
+ container=Container(id=1,
+ name="MariaDB",
+ internal_name="mariadb",
+ host="data-db",
+ port="3306",
+ created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
+ sidecar_host="data-db-sidecar",
+ sidecar_port=3305,
+ image=Image(id=1,
+ registry="docker.io",
+ name="mariadb",
+ version="11.1.3",
+ dialect="org.hibernate.dialect.MariaDBDialect",
+ driver_class="org.mariadb.jdbc.Driver",
+ jdbc_method="mariadb",
+ default_port=3306)),
+ tables=[Table(id=1, database_id=1, name="Data", internal_name="data",
+ creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ owner=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ username="foo",
+ attributes=UserAttributes(theme="dark")),
+ created=datetime.datetime(2024, 3, 1, 10, tzinfo=datetime.timezone.utc),
+ constraints=Constraints(uniques=[], foreign_keys=[], checks=[], primary_key=[]),
+ is_versioned=False,
+ created_by="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
+ queue_name="dbrepo",
+ routing_key="dbrepo.1.1",
+ is_public=True,
+ columns=[Column(id=1, database_id=1, table_id=1, name="ID", internal_name="id",
+ column_type=ColumnType.BIGINT, is_public=True, is_null_allowed=False,
+ size=20, d=0,
+ concept=Concept(id=1, uri="http://www.wikidata.org/entity/Q2221906",
+ created=datetime.datetime(2024, 3, 1, 10,
+ tzinfo=datetime.timezone.utc)),
+ unit=Unit(id=1,
+ uri="http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius",
+ created=datetime.datetime(2024, 3, 1, 10,
+ tzinfo=datetime.timezone.utc)),
+ val_min=0,
+ val_max=10)]
+ )])
+
+
+class JwtTest(unittest.TestCase):
+
+ def token(self, roles: [str], iat: int = int(time.time())):
+ claims = {
+ 'iat': iat,
+ 'realm_access': {
+ 'roles': roles
+ }
+ }
+ with open('test/rsa/rs256.key', 'rb') as fh:
+ return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
+
+ def test_update_database_media_type_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}'})
+ self.assertEqual(415, response.status_code)
+
+ def test_health_succeeds(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/health')
+ self.assertEqual(200, response.status_code)
+
+ def test_update_database_no_auth_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.put('/api/search/database/1')
+ self.assertEqual(401, response.status_code)
+
+ def test_update_database_no_body_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'})
+ self.assertEqual(400, response.status_code)
+
+ def test_update_database_empty_body_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data={})
+ self.assertEqual(400, response.status_code)
+
+ def test_update_database_malformed_body_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=dict({"id": 1}))
+ self.assertEqual(400, response.status_code)
+
+ def test_update_database_succeeds(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ self.assertEqual(202, response.status_code)
+
+ def test_get_fields_succeeds(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/api/search/database/fields', headers={'Content-Type': 'application/json'})
+ self.assertEqual(200, response.status_code)
+
+ def test_get_fields_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/api/search/unknown/fields', headers={'Content-Type': 'application/json'})
+ self.assertEqual(404, response.status_code)
+
+ def test_delete_database_no_auth_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.delete('/api/search/database/1')
+ self.assertEqual(401, response.status_code)
+
+ def test_delete_database_no_role_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.delete('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token([])}'})
+ self.assertEqual(403, response.status_code)
+
+ def test_delete_database_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.delete('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["admin"])}'})
+ self.assertEqual(202, response.status_code)
+
+ def test_delete_database_not_found_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.delete('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["admin"])}'})
+ self.assertEqual(404, response.status_code)
+
+ def test_get_fuzzy_search_succeeds(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/api/search?q=test')
+ self.assertEqual(200, response.status_code)
+
+ def test_get_fuzzy_search_no_query_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/api/search')
+ self.assertEqual(400, response.status_code)
+
+ def test_get_index_succeeds(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/api/search/table')
+ self.assertEqual(200, response.status_code)
+
+ def test_get_index_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.get('/api/search/unknown')
+ self.assertEqual(404, response.status_code)
+
+ def test_post_general_search_media_type_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.post('/api/search/database')
+ self.assertEqual(415, response.status_code)
+
+ def test_post_general_search_no_body_fails(self):
+ with app.test_client() as test_client:
+ # test
+ response = test_client.post('/api/search/database', headers={'Content-Type': 'application/json'})
+ self.assertEqual(400, response.status_code)
+
+ def test_post_general_search_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/database', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
+
+ def test_post_general_search_table_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/table', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
+
+ def test_post_general_search_column_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/column', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
+
+ def test_post_general_search_identifier_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/identifier', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
+
+ def test_post_general_search_concept_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/concept', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
+
+ def test_post_general_search_unit_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/unit', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
+
+ def test_post_general_search_view_succeeds(self):
+ with app.test_client() as test_client:
+ # mock
+ test_client.put('/api/search/database/1',
+ headers={'Authorization': f'Bearer {self.token(["update-search-index"])}',
+ 'Content-Type': 'application/json'},
+ data=req.model_dump_json())
+ # test
+ response = test_client.post('/api/search/view', headers={'Content-Type': 'application/json'},
+ data=json.dumps({'id': 1}))
+ self.assertEqual(200, response.status_code)
diff --git a/dbrepo-search-service/test/test_jwt.py b/dbrepo-search-service/test/test_jwt.py
new file mode 100644
index 0000000000000000000000000000000000000000..59cd4ee1168117d0aeb6bf3549fe5088edc379b9
--- /dev/null
+++ b/dbrepo-search-service/test/test_jwt.py
@@ -0,0 +1,97 @@
+import time
+import unittest
+
+import jwt
+import requests_mock
+
+from app import verify_token, app, verify_password, get_user_roles
+from clients.keycloak_client import User
+
+
+class JwtTest(unittest.TestCase):
+
+ def response(self, roles: [str]) -> dict:
+ return dict({
+ "client_id": "username",
+ "realm_access": {
+ "roles": roles
+ }
+ })
+
+ def token(self, roles: [str], iat: int = int(time.time())) -> str:
+ claims = {
+ 'iat': iat,
+ 'realm_access': {
+ 'roles': roles
+ }
+ }
+ with open('test/rsa/rs256.key', 'rb') as fh:
+ return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
+
+ def test_verify_token_no_token_fails(self):
+ with app.app_context():
+ # test
+ user = verify_token(None)
+ self.assertFalse(user)
+
+ def test_verify_token_empty_token_fails(self):
+ with app.app_context():
+ # test
+ user = verify_token("")
+ self.assertFalse(user)
+
+ def test_verify_token_malformed_token_fails(self):
+ with app.app_context():
+ # test
+ user = verify_token("eyEYEY12345")
+ self.assertFalse(user)
+
+ def test_verify_token_succeeds(self):
+ with app.app_context():
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
+ json=self.response([]))
+ # test
+ user = verify_token(self.token([]))
+ self.assertEqual([], user.roles)
+
+ def test_verify_password_no_username_fails(self):
+ with app.app_context():
+ # test
+ user = verify_password(None, "pass")
+ self.assertFalse(user)
+
+ def test_verify_password_empty_username_fails(self):
+ with app.app_context():
+ # test
+ user = verify_password("", "pass")
+ self.assertFalse(user)
+
+ def test_verify_password_no_password_fails(self):
+ with app.app_context():
+ # test
+ user = verify_password("username", None)
+ self.assertFalse(user)
+
+ def test_verify_password_empty_password_fails(self):
+ with app.app_context():
+ # test
+ user = verify_password("username", "")
+ self.assertFalse(user)
+
+ def test_verify_password_succeeds(self):
+ with app.app_context():
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
+ json=self.response([]))
+ # test
+ user = verify_password("username", "password")
+ self.assertIsNotNone(user)
+
+ def test_get_user_roles_succeeds(self):
+ with app.app_context():
+ # test
+ roles: [str] = get_user_roles(User(username="username", roles=[]))
+ self.assertEqual([], roles)
diff --git a/dbrepo-search-service/test/test_keycloak_client.py b/dbrepo-search-service/test/test_keycloak_client.py
new file mode 100644
index 0000000000000000000000000000000000000000..453a9b802be9885daa8e87afe265c272ee1ca211
--- /dev/null
+++ b/dbrepo-search-service/test/test_keycloak_client.py
@@ -0,0 +1,57 @@
+import time
+import unittest
+
+import jwt
+import requests_mock
+
+from app import app
+from clients.keycloak_client import KeycloakClient
+
+
+class JwtTest(unittest.TestCase):
+
+ def response(self, username) -> dict:
+ return dict({
+ "client_id": username,
+ "access_token": "eyEY1234"
+ })
+
+ def token(self, username: str, roles: [str], iat: int = int(time.time())) -> str:
+ claims = {
+ 'iat': iat,
+ 'client_id': username,
+ 'realm_access': {
+ 'roles': roles
+ }
+ }
+ with open('test/rsa/rs256.key', 'rb') as fh:
+ return jwt.JWT().encode(claims, jwt.jwk_from_pem(fh.read()), alg='RS256')
+
+ def test_obtain_user_token_succeeds(self):
+ with app.app_context():
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
+ json=self.response("username"))
+ # test
+ token = KeycloakClient().obtain_user_token("username", "password")
+ self.assertEqual("eyEY1234", token)
+
+ def test_obtain_user_token_malformed_fails(self):
+ with app.app_context():
+ with requests_mock.Mocker() as mock:
+ # mock
+ mock.post('http://auth-service:8080/api/auth/realms/dbrepo/protocol/openid-connect/token',
+ json={"client_id": "username"})
+ # test
+ try:
+ KeycloakClient().obtain_user_token("username", "password")
+ self.fail()
+ except AssertionError:
+ pass
+
+ def test_verify_jwt_succeeds(self):
+ with app.app_context():
+ # test
+ user = KeycloakClient().verify_jwt(self.token("username", []))
+ self.assertEqual("username", user.username)
diff --git a/dbrepo-search-service/test/test_opensearch_client.py b/dbrepo-search-service/test/test_opensearch_client.py
index 2bab038128fa7dd201dfcca81240f906358e37eb..581e5f8c5d94435c4344b4e8478ec09b116fd735 100644
--- a/dbrepo-search-service/test/test_opensearch_client.py
+++ b/dbrepo-search-service/test/test_opensearch_client.py
@@ -4,10 +4,11 @@ import unittest
import opensearchpy
from dbrepo.api.dto import Database, User, UserAttributes, Container, Image, Table, Column, ColumnType, Constraints, \
PrimaryKey, TableMinimal, ColumnMinimal, Concept, Unit
+from opensearchpy import NotFoundError
from app import app
-from clients.opensearch_client import OpenSearchClient
+from init.clients.opensearch_client import OpenSearchClient
req = Database(id=1,
name="Test",
@@ -55,8 +56,8 @@ req = Database(id=1,
routing_key="dbrepo.1.1",
is_public=True,
columns=[Column(id=1, database_id=1, table_id=1, name="ID", internal_name="id",
- auto_generated=True, column_type=ColumnType.BIGINT, is_public=True,
- is_null_allowed=False, size=20, d=0,
+ column_type=ColumnType.BIGINT, is_public=True, is_null_allowed=False,
+ size=20, d=0,
concept=Concept(id=1, uri="http://www.wikidata.org/entity/Q2221906",
created=datetime.datetime(2024, 3, 1, 10,
tzinfo=datetime.timezone.utc)),
@@ -73,9 +74,8 @@ class OpenSearchClientTest(unittest.TestCase):
def test_update_database_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
# mock
- client.update_database(database_id=1, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
req.tables = [Table(id=1,
@@ -87,9 +87,10 @@ class OpenSearchClientTest(unittest.TestCase):
database_id=req.id,
constraints=Constraints(uniques=[], foreign_keys=[], checks=[],
primary_key=[PrimaryKey(id=1,
- table=TableMinimal(id=1, database_id=1),
+ table=TableMinimal(id=1,
+ database_id=req.id),
column=ColumnMinimal(id=1, table_id=1,
- database_id=1))]),
+ database_id=req.id))]),
is_versioned=True,
created_by="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
creator=User(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502",
@@ -104,11 +105,10 @@ class OpenSearchClientTest(unittest.TestCase):
internal_name="id",
database_id=req.id,
table_id=1,
- auto_generated=True,
column_type=ColumnType.BIGINT,
is_public=True,
is_null_allowed=False)])]
- database = client.update_database(database_id=1, data=req)
+ database = OpenSearchClient().update_database(database_id=req.id, data=req)
self.assertEqual(1, database.id)
self.assertEqual("Test", database.name)
self.assertEqual("test_tuw1", database.internal_name)
@@ -153,16 +153,13 @@ class OpenSearchClientTest(unittest.TestCase):
self.assertEqual(ColumnType.BIGINT, database.tables[0].columns[0].column_type)
self.assertEqual(1, database.tables[0].columns[0].database_id)
self.assertEqual(1, database.tables[0].columns[0].table_id)
- self.assertEqual(True, database.tables[0].columns[0].auto_generated)
self.assertEqual(True, database.tables[0].columns[0].is_public)
self.assertEqual(False, database.tables[0].columns[0].is_null_allowed)
def test_update_database_create_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
-
# test
- database = client.update_database(database_id=1, data=req)
+ database = OpenSearchClient().update_database(database_id=req.id, data=req)
self.assertEqual(1, database.id)
self.assertEqual("Test", database.name)
self.assertEqual("test_tuw1", database.internal_name)
@@ -187,125 +184,87 @@ class OpenSearchClientTest(unittest.TestCase):
def test_update_database_malformed_fails(self):
with app.app_context():
app.config['OPENSEARCH_USERNAME'] = 'i_do_not_exist'
- client = OpenSearchClient()
# test
try:
- database = client.update_database(database_id=1, data=req)
+ database = OpenSearchClient().update_database(database_id=req.id, data=req)
except opensearchpy.exceptions.TransportError:
pass
def test_delete_database_fails(self):
with app.app_context():
- client = OpenSearchClient()
# test
try:
- client.delete_database(database_id=9999)
+ OpenSearchClient().delete_database(database_id=9999)
except opensearchpy.exceptions.NotFoundError:
pass
def test_delete_database_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
-
# mock
- client.update_database(database_id=req.id, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
- client.delete_database(database_id=req.id)
+ OpenSearchClient().delete_database(database_id=req.id)
- def test_find_database_succeeds(self):
+ def test_get_database_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
-
# mock
- client.update_database(database_id=req.id, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
- client.get_database(database_id=req.id)
+ database = OpenSearchClient().get_database(database_id=req.id)
+ self.assertEqual(req.id, database.id)
- def test_find_database_fails(self):
+ def test_get_database_fails(self):
with app.app_context():
- client = OpenSearchClient()
# mock
- client.update_database(database_id=1, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
try:
- client.get_database(database_id=1)
+ OpenSearchClient().get_database(database_id=req.id)
except opensearchpy.exceptions.NotFoundError:
pass
- # def test_query_index_by_term_opensearch_contains_succeeds(self):
- # with app.app_context():
- # client = OpenSearchClient()
- #
- # # mock
- # client.update_database(database_id=1, data=req)
- #
- # # test
- # response = client.query_index_by_term_opensearch(term="test", mode="contains")
- # self.assertEqual(1, len(response))
- # self.assertEqual(1, response[0]['id'])
- # self.assertEqual('Test', response[0]['name'])
-
- # def test_query_index_by_term_opensearch_exact_succeeds(self):
- # with app.app_context():
- # client = OpenSearchClient()
- #
- # # mock
- # client.update_database(database_id=1, data=req)
- #
- # # test
- # response = client.query_index_by_term_opensearch(term="test", mode="exact")
- # self.assertEqual(1, len(response))
- # self.assertEqual(1, response[0]['id'])
- # self.assertEqual('Test', response[0]['name'])
-
def test_get_fields_for_index_database_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
-
# mock
- client.update_database(database_id=1, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
- response = client.get_fields_for_index(type="database")
+ response = OpenSearchClient().get_fields_for_index(field_type="database")
self.assertTrue(len(response) > 0)
def test_get_fields_for_index_user_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
-
# mock
- client.update_database(database_id=1, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
- response = client.get_fields_for_index(type="user")
+ response = OpenSearchClient().get_fields_for_index(field_type="user")
self.assertTrue(len(response) > 0)
def test_fuzzy_search_succeeds(self):
with app.app_context():
- client = OpenSearchClient()
-
# mock
- client.update_database(database_id=1, data=req)
+ OpenSearchClient().update_database(database_id=req.id, data=req)
# test
- response = client.fuzzy_search(search_term="test")
+ response = OpenSearchClient().fuzzy_search(search_term="test")
self.assertTrue(len(response) > 0)
- # def test_general_search_succeeds(self):
- # with app.app_context():
- # client = OpenSearchClient()
- #
- # # mock
- # client.update_database(database_id=1, data=req)
- #
- # # test
- # response = client.general_search(type="database", field_value_pairs={"name": "Test",
- # "id": None})
- # self.assertTrue(len(response) > 0)
+ def test_unit_independent_search_fails(self):
+ with app.app_context():
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+ # test
+ try:
+ OpenSearchClient().unit_independent_search(0, 100, {
+ "unit.uri": "http://www.ontology-of-units-of-measure.org/resource/om-2/degreeCelsius"})
+ self.fail()
+ except NotFoundError:
+ pass
diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile
index 130ce0082d3a5a2c68300a6ce0ece873d81e162c..a73e31674fd8b7b755779bc5aa479855c3e6ffd8 100644
--- a/dbrepo-ui/Dockerfile
+++ b/dbrepo-ui/Dockerfile
@@ -1,10 +1,11 @@
-FROM node:18.20.4-alpine3.20 AS build
+FROM oven/bun:1.1.20-alpine AS build
WORKDIR /app
+COPY ./bun.lockb ./bun.lockb
COPY ./package.json ./package.json
-RUN npm install
+RUN bun install
ENV NODE_ENV="production"
@@ -22,13 +23,15 @@ COPY ./stores ./stores
COPY ./utils ./utils
COPY ./nuxt.config.ts ./nuxt.config.ts
-RUN npm run build
+RUN bun run build
-FROM node:18.20.4-alpine3.20 AS runtime
+FROM node:22.9.0-alpine3.20 AS runtime
ARG APP_VERSION="latest"
ARG COMMIT=""
+RUN apk add --no-cache curl bash
+
USER 1000
WORKDIR /app
diff --git a/dbrepo-ui/assets/globals.css b/dbrepo-ui/assets/globals.css
index 8f791a9edd2b82244332b41587708c3197f1d1b3..52da2e48c8c2e7589ddcbce27fe67520acd74763 100644
--- a/dbrepo-ui/assets/globals.css
+++ b/dbrepo-ui/assets/globals.css
@@ -1,4 +1,13 @@
a {
color: var(--v-theme-primary); }
+label.native,
+select.native {
+ display: block; }
+
+select.native {
+ -webkit-appearance: listbox;
+ border-style: solid;
+ width: 100%; }
+
/*# sourceMappingURL=globals.css.map */
diff --git a/dbrepo-ui/assets/globals.css.map b/dbrepo-ui/assets/globals.css.map
index b9c0623a76d6530341406b9f715d4dea45c77046..6f271c8f99f4295e8438524dea16b6a48b253635 100644
--- a/dbrepo-ui/assets/globals.css.map
+++ b/dbrepo-ui/assets/globals.css.map
@@ -1,6 +1,6 @@
{
"version": 3,
-"mappings": "AAAA,CAAE;EACA,KAAK,EAAE,sBAAsB",
+"mappings": "AAAA,CAAE;EACA,KAAK,EAAE,sBAAsB;;AAG/B;aACc;EACZ,OAAO,EAAE,KAAK;;AAGhB,aAAc;EACZ,kBAAkB,EAAE,OAAO;EAC3B,YAAY,EAAE,KAAK;EACnB,KAAK,EAAE,IAAI",
"sources": ["globals.scss"],
"names": [],
"file": "globals.css"
diff --git a/dbrepo-ui/assets/globals.scss b/dbrepo-ui/assets/globals.scss
index 6b6b26ac202cdfae8c6783d7a8f5c31116e98697..5d4d4e06a7cdcde8e801cccd14c0eb2f07c0824d 100644
--- a/dbrepo-ui/assets/globals.scss
+++ b/dbrepo-ui/assets/globals.scss
@@ -1,3 +1,14 @@
a {
color: var(--v-theme-primary);
}
+
+label.native,
+select.native {
+ display: block;
+}
+
+select.native {
+ -webkit-appearance: listbox;
+ border-style: solid;
+ width: 100%;
+}
diff --git a/dbrepo-ui/bun.lockb b/dbrepo-ui/bun.lockb
index 08343a9606e23719aa606a7bb102499777d9e001..3f85eb8de9c7a334e2a6a89d3cbcf75254751610 100755
Binary files a/dbrepo-ui/bun.lockb and b/dbrepo-ui/bun.lockb differ
diff --git a/dbrepo-ui/components/OntologiesList.vue b/dbrepo-ui/components/OntologiesList.vue
index c3ffd3994541bf29dfa7c3f091d6089760624f86..44f0eddc3f4c8b3542cd1b7f237cac05603c6375 100644
--- a/dbrepo-ui/components/OntologiesList.vue
+++ b/dbrepo-ui/components/OntologiesList.vue
@@ -8,10 +8,12 @@
rounded="0">
<v-divider
class="mx-4" />
- <v-card-title
- v-text="ontology.prefix" />
- <v-card-subtitle
- v-text="ontology.uri" />
+ <v-card-title>
+ {{ ontology.prefix }}
+ </v-card-title>
+ <v-card-subtitle>
+ {{ ontology.uri }}
+ </v-card-subtitle>
<v-card-text>
<div
class="db-tags">
diff --git a/dbrepo-ui/components/container/ContainerCard.vue b/dbrepo-ui/components/container/ContainerCard.vue
index b2937cf6b4fb7f1a243056ea52ccd4649e205772..ed1479f64d3ad8043968e03edbfcd940190e3fb6 100644
--- a/dbrepo-ui/components/container/ContainerCard.vue
+++ b/dbrepo-ui/components/container/ContainerCard.vue
@@ -4,9 +4,12 @@
variant="flat"
rounded="0">
<v-divider class="mx-4" />
- <v-card-title
- v-text="container.name" />
- <v-card-subtitle v-text="$t('pages.container.subtitle.text')" />
+ <v-card-title>
+ {{ container.name }}
+ </v-card-title>
+ <v-card-subtitle>
+ {{ $t('pages.container.subtitle.text') }}
+ </v-card-subtitle>
<v-card-text>
<v-progress-linear
v-model="utilization"
diff --git a/dbrepo-ui/components/database/DatabaseCard.vue b/dbrepo-ui/components/database/DatabaseCard.vue
index 48aefa7493ce5beb52d8ec62cf794d64368b8489..fba3853a31cf25649f915d4c0a3e422f5ec879bf 100644
--- a/dbrepo-ui/components/database/DatabaseCard.vue
+++ b/dbrepo-ui/components/database/DatabaseCard.vue
@@ -9,8 +9,9 @@
<v-divider class="mx-4" />
<v-card-title>
<span
- class="text-primary text-decoration-underline"
- v-text="formatTitle(database)" />
+ class="text-primary text-decoration-underline">
+ {{ formatTitle(database) }}
+ </span>
<v-progress-circular
v-if="loading"
color="primary"
@@ -18,56 +19,66 @@
class="ml-1"
indeterminate />
</v-card-title>
- <v-card-subtitle
- v-text="formatCreators(database)" />
+ <v-card-subtitle>
+ {{ formatCreators(database) }}
+ </v-card-subtitle>
<v-card-text>
- <div v-text="identifierDescription(database)" />
+ <div>
+ {{ identifierDescription(database) }}
+ </div>
<div class="mt-2 db-tags">
<v-chip
v-if="database.is_public"
size="small"
color="success"
- :text="$t('toolbars.database.public')"
- variant="outlined" />
+ variant="outlined">
+ {{ $t('toolbars.database.public') }}
+ </v-chip>
<v-chip
v-if="!database.is_public"
size="small"
:color="colorVariant"
variant="outlined"
- :text="$t('toolbars.database.private')"
- flat />
+ flat>
+ {{ $t('toolbars.database.private') }}
+ </v-chip>
<v-chip
v-if="identifierYear(database)"
size="small"
:color="colorVariant"
- variant="outlined"
- v-text="identifierYear(database)" />
+ variant="outlined">
+ {{ identifierYear(database) }}
+ </v-chip>
<v-chip
v-if="identifier(database)"
size="small"
:color="colorVariant"
- variant="outlined"
- v-text="identifierPublisher(database)" />
+ variant="outlined">
+ {{ identifierPublisher(database) }}
+ </v-chip>
<v-chip
v-for="(license, i) in identifierLicenses(database)"
:key="`l-${i}`"
size="small"
color="success"
- variant="outlined"
- v-text="license.identifier" />
+ variant="outlined">
+ {{ license.identifier }}
+ </v-chip>
<v-chip
v-for="(funder, i) in identifierFunders(database)"
:key="`f-${i}`"
size="small"
:color="colorVariant"
- variant="outlined"
- v-text="funder.funder_name" />
+ variant="outlined">
+ {{ funder.funder_name }}
+ </v-chip>
<v-chip
v-if="identifierLanguage(database)"
size="small"
:color="colorVariant"
- variant="outlined"
- v-text="identifierLanguage(database)" />
+ variant="outlined">
+ {{ identifierLanguage(database) }}
+ </v-chip>
</div>
</v-card-text>
</v-card>
diff --git a/dbrepo-ui/components/database/DatabaseCreate.vue b/dbrepo-ui/components/database/DatabaseCreate.vue
index 8d909b4da350c1cbc10dfad7d595799aa3adee4e..5da87cebbda9731ae842636654a40ce6fdea14a8 100644
--- a/dbrepo-ui/components/database/DatabaseCreate.vue
+++ b/dbrepo-ui/components/database/DatabaseCreate.vue
@@ -6,9 +6,13 @@
autocomplete="off"
@submit.prevent="submit">
<v-card
- variant="elevated"
- :title="$t('pages.database.subpages.create.title')"
- :subtitle="$t('pages.database.subpages.create.subtitle')">
+ variant="elevated">
+ <v-card-title>
+ {{ $t('pages.database.subpages.create.title') }}
+ </v-card-title>
+ <v-card-subtitle>
+ {{ $t('pages.database.subpages.create.subtitle') }}
+ </v-card-subtitle>
<v-card-text>
<v-row dense>
<v-col>
@@ -58,16 +62,18 @@
<v-spacer />
<v-btn
:variant="buttonVariant"
- :text="$t('navigation.cancel')"
- @click="cancel" />
+ @click="cancel">
+ {{ $t('navigation.cancel') }}
+ </v-btn>
<v-btn
:disabled="!valid || loading"
color="primary"
type="submit"
variant="flat"
- :text="$t('pages.database.subpages.create.submit.text')"
:loading="loading"
- @click="create" />
+ @click="create">
+ {{ $t('pages.database.subpages.create.submit.text') }}
+ </v-btn>
</v-card-actions>
</v-card>
</v-form>
diff --git a/dbrepo-ui/components/database/DatabaseToolbar.vue b/dbrepo-ui/components/database/DatabaseToolbar.vue
index 741252475c31ef841260266d3d4fcb459b35cd64..5f3c8c83989bd20fa67f6f327fdc9676767acbb4 100644
--- a/dbrepo-ui/components/database/DatabaseToolbar.vue
+++ b/dbrepo-ui/components/database/DatabaseToolbar.vue
@@ -8,8 +8,9 @@
type="subtitle"
width="200" />
<span
- v-if="database && $vuetify.display.lgAndUp"
- v-text="database.name" />
+ v-if="database && $vuetify.display.lgAndUp">
+ {{ database.name }}
+ </span>
<v-chip
v-if="database && database.is_public"
size="small"
diff --git a/dbrepo-ui/components/dialogs/DropTable.vue b/dbrepo-ui/components/dialogs/DropTable.vue
index 1f62735de5e6ce549386894f525074f53d5cdd5a..d465c882d0529a817be21f836ea82739fc30155b 100644
--- a/dbrepo-ui/components/dialogs/DropTable.vue
+++ b/dbrepo-ui/components/dialogs/DropTable.vue
@@ -7,9 +7,13 @@
<v-card-text>
<v-row dense>
<v-col>
- <span v-text="$t('pages.table.subpages.drop.warning.prefix')" />
+ <span>
+ {{ $t('pages.table.subpages.drop.warning.prefix') }}
+ </span>
<code class="code-key">{{ table.internal_name }}</code>
- <span v-text="$t('pages.table.subpages.drop.warning.suffix')" />
+ <span>
+ {{ $t('pages.table.subpages.drop.warning.suffix') }}
+ </span>
</v-col>
</v-row>
<v-row>
diff --git a/dbrepo-ui/components/dialogs/EditAccess.vue b/dbrepo-ui/components/dialogs/EditAccess.vue
index 8132adddf5935ae357893f8f91a2c4c597e6cf94..039b1c40e8e5d241b1d52f6145affad898581702 100644
--- a/dbrepo-ui/components/dialogs/EditAccess.vue
+++ b/dbrepo-ui/components/dialogs/EditAccess.vue
@@ -12,14 +12,13 @@
<v-col>
<v-autocomplete
v-if="!isModification"
- v-model="modify.userId"
+ v-model="localUserId"
:items="eligibleUsers"
:disabled="loadingUsers"
:loading="loadingUsers"
:rules="[v => !!v || $t('validation.required')]"
required
:variant="inputVariant"
- hide-no-data
hide-selected
hide-details
item-value="id"
@@ -56,7 +55,7 @@
:disabled="!valid || loading || accessType === modify.type"
:color="buttonColor"
type="submit"
- :text="$t('pages.database.subpages.access.submit.text')"
+ :text="$t('navigation.modify')"
:loading="loading"
@click="updateAccess" />
</v-card-actions>
@@ -90,6 +89,7 @@ export default {
loadingUsers: false,
users: [],
error: false,
+ localUserId: null,
types: [
{ title: this.$t('pages.database.subpages.access.read'), value: 'read' },
{ title: this.$t('pages.database.subpages.access.write-own'), value: 'write_own' },
@@ -169,36 +169,48 @@ export default {
},
revokeAccess () {
const accessService = useAccessService()
- accessService.remove(this.$route.params.database_id, this.userId)
+ accessService.remove(this.$route.params.database_id, this.localUserId)
.then(() => {
const toast = useToastInstance()
- toast.success(this.$t('notifications.access.revoked'))
+ toast.success(this.$t('success.access.revoked'))
this.$emit('close-dialog', { success: true })
})
+ .catch(({code, message}) => {
+ const toast = useToastInstance()
+ toast.error(message)
+ })
.finally(() => {
this.loading = false
})
},
modifyAccess () {
const accessService = useAccessService()
- accessService.modify(this.$route.params.database_id, this.userId, this.modify)
+ accessService.modify(this.$route.params.database_id, this.localUserId, this.modify)
.then(() => {
const toast = useToastInstance()
- toast.success(this.$t('notifications.access.modified'))
+ toast.success(this.$t('success.access.modified'))
this.$emit('close-dialog', { success: true })
})
+ .catch(({code, message}) => {
+ const toast = useToastInstance()
+ toast.error(message)
+ })
.finally(() => {
this.loading = false
})
},
giveAccess () {
const accessService = useAccessService()
- accessService.create(this.$route.params.database_id, this.userId, this.modify)
+ accessService.create(this.$route.params.database_id, this.localUserId, this.modify)
.then(() => {
const toast = useToastInstance()
- toast.success(this.$t('notifications.access.created'))
+ toast.success(this.$t('success.access.created'))
this.$emit('close-dialog', { success: true })
})
+ .catch(({code, message}) => {
+ const toast = useToastInstance()
+ toast.error(message)
+ })
.finally(() => {
this.loading = false
})
@@ -210,6 +222,10 @@ export default {
.then((users) => {
this.users = users.filter(u => u.username !== this.database.creator.username)
})
+ .catch(({code}) => {
+ const toast = useToastInstance()
+ toast.error(this.$t(code))
+ })
.finally(() => {
this.loadingUsers = false
})
@@ -217,6 +233,8 @@ export default {
init () {
if (!this.userId) {
this.loadUsers()
+ } else {
+ this.localUserId = this.userId
}
if (!this.accessType) {
this.modify.type = null
diff --git a/dbrepo-ui/components/dialogs/EditTuple.vue b/dbrepo-ui/components/dialogs/EditTuple.vue
index 589c82b9b7aee5d2678e9ceab8249618878ced3f..ea0bfb3c5b9161a907c2ca61544daafb737dd128 100644
--- a/dbrepo-ui/components/dialogs/EditTuple.vue
+++ b/dbrepo-ui/components/dialogs/EditTuple.vue
@@ -17,14 +17,35 @@
<v-text-field
v-if="isNumber(column)"
v-model.number="tuple[column.internal_name]"
- :disabled="(!edit && column.auto_generated)"
+ :disabled="!edit"
persistent-hint
:variant="inputVariant"
:label="column.internal_name"
:hint="hint(column)"
:rules="rules(column)"
:required="required(column)"
- type="number" /><v-text-field
+ type="number">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-text-field>
+ <v-text-field
v-if="isTextField(column)"
v-model="tuple[column.internal_name]"
:disabled="disabled(column)"
@@ -37,7 +58,27 @@
:variant="inputVariant"
:label="column.internal_name"
:hint="hint(column)"
- type="text" />
+ type="text">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-text-field>
<v-text-field
v-if="isFloatingPoint(column)"
v-model="tuple[column.internal_name]"
@@ -50,7 +91,27 @@
:variant="inputVariant"
:label="column.internal_name"
:hint="hint(column)"
- type="number" />
+ type="number">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-text-field>
<v-textarea
v-if="isTextArea(column)"
v-model="tuple[column.internal_name]"
@@ -62,7 +123,27 @@
persistent-hint
:variant="inputVariant"
:label="column.internal_name"
- :hint="hint(column)" />
+ :hint="hint(column)">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-textarea>
<BlobUpload
v-if="isFileField(column)"
:column="column"
@@ -77,7 +158,27 @@
:rules="rules(column)"
:required="required(column)"
:clearable="!required(column)"
- :items="isSet(column) ? column.sets : column.enums" />
+ :items="isSet(column) ? column.sets : column.enums">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-select>
<v-select
v-if="isBoolean(column)"
v-model="tuple[column.internal_name]"
@@ -88,7 +189,27 @@
:rules="rules(column)"
:required="required(column)"
:items="bools"
- :clearable="!required(column)" />
+ :clearable="!required(column)">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-select>
<v-text-field
v-if="isTimeField(column)"
v-model="tuple[column.internal_name]"
@@ -97,7 +218,27 @@
persistent-hint
:variant="inputVariant"
:label="column.internal_name"
- :hint="hint(column)" />
+ :hint="hint(column)">
+ <template
+ v-slot:append>
+ {{ column.column_type.toUpperCase() }}
+ <NuxtLink
+ target="_blank"
+ class="ml-2"
+ :href="documentationLink(column)">
+ <v-tooltip
+ location="bottom">
+ <template
+ v-slot:activator="{ props }">
+ <v-icon
+ v-bind="props"
+ icon="mdi-help-circle-outline" />
+ </template>
+ {{ $t('navigation.help') }}
+ </v-tooltip>
+ </NuxtLink>
+ </template>
+ </v-text-field>
</v-col>
</v-row>
</v-card-text>
@@ -175,13 +316,24 @@ export default {
bools: [
{ title: 'true', value: true },
{ title: 'false', value: false }
- ]
+ ],
+ cacheStore: useCacheStore()
}
},
mounted() {
+ this.$refs.form.validate()
this.oldTuple = Object.assign({}, this.tuple)
},
computed: {
+ database () {
+ return this.cacheStore.getDatabase
+ },
+ columnTypes () {
+ if (!this.database) {
+ return []
+ }
+ return this.database.container.image.data_types
+ },
title () {
return (this.edit ? this.$t('toolbars.table.data.edit') : this.$t('toolbars.table.data.add')) + ' ' + this.$t('toolbars.table.data.tuple')
},
@@ -203,24 +355,35 @@ export default {
this.$emit('close', { success: false })
},
hint (column) {
- const { is_null_allowed, auto_generated, is_primary_key, column_type, date_format, size, d } = column
- let hint = is_null_allowed ? '' : this.$t('pages.table.subpages.data.required.hint')
- if (auto_generated) {
+ const { is_null_allowed, is_primary_key } = column
+ let hint = ''
+ if (!is_null_allowed) {
+ hint += this.$t('pages.table.subpages.data.required.hint')
+ }
+ if (column.column_type === 'sequence') {
hint += ' ' + this.$t('pages.table.subpages.data.auto.hint')
}
if (is_primary_key) {
hint += ' ' + this.$t('pages.table.subpages.data.primary-key.hint')
}
- if (['double', 'decimal'].includes(column_type)) {
- hint += ' ' + this.$t('pages.table.subpages.data.format.hint') + ` ${'d'.repeat(size)}.${'f'.repeat(d)}`
+ if (this.formatHint(column)) {
+ hint += this.$t('pages.table.subpages.data.format.hint') + ' ' + this.formatHint(column)
}
- if (['date', 'datetime', 'timestamp', 'time'].includes(column_type) && date_format) {
- hint += ' ' + this.$t('pages.table.subpages.data.format.hint') + ' ' + date_format.unix_format
+ return hint
+ },
+ documentationLink ({column_type}) {
+ const filter = this.columnTypes.filter(t => t.value === column_type)
+ if (filter.length !== 1) {
+ return null
}
- if (['year'].includes(column_type)) {
- hint += ' ' + this.$t('pages.table.subpages.data.format.hint') + ' YYYY'
+ return filter[0].documentation
+ },
+ formatHint ({column_type}) {
+ const filter = this.columnTypes.filter(t => t.value === column_type)
+ if (filter.length !== 1) {
+ return null
}
- return hint
+ return filter[0].data_hint
},
isTextField (column) {
const { column_type } = column
@@ -251,14 +414,14 @@ export default {
return ['date', 'datetime', 'timestamp', 'time', 'year'].includes(column.column_type)
},
rules (column) {
- if (column.auto_generated || column.is_null_allowed) {
+ if (column.is_null_allowed) {
return []
}
const rules = []
rules.push(v => v !== null || this.$t('validation.required'))
if (column.column_type === 'decimal' || column.column_type === 'double') {
rules.push(v => !(!v || v.split('.')[0].length > column.size) || `${this.$t('pages.table.subpages.data.float.max')} ${column.size} ${this.$t('pages.table.subpages.data.float.before')}`)
- rules.push(v => !(!v || v.split('.')[1].length > column.d) || `${this.$t('pages.table.subpages.data.float.max')} ${column.d} ${this.$t('pages.table.subpages.data.float.after')}`)
+ rules.push(v => !(!v || (column.d && v.split('.')[1].length > column.d)) || `${this.$t('pages.table.subpages.data.float.max')} ${column.d} ${this.$t('pages.table.subpages.data.float.after')}`)
}
return rules
},
@@ -272,7 +435,7 @@ export default {
return column.is_null_allowed === false
},
disabled (column) {
- return (this.edit && column.is_primary_key) || (!this.edit && column.auto_generated)
+ return (this.edit && column.is_primary_key) || !this.edit
},
updateTuple () {
const constraints = {}
diff --git a/dbrepo-ui/components/dialogs/Semantics.vue b/dbrepo-ui/components/dialogs/Semantics.vue
index a4a7104788ce1e12460ad693ac543058b60cdf6c..8d3c573f7b205368fd354372a9e166f2ee81a14f 100644
--- a/dbrepo-ui/components/dialogs/Semantics.vue
+++ b/dbrepo-ui/components/dialogs/Semantics.vue
@@ -12,14 +12,21 @@
<v-alert
border="start"
color="info">
- <p
- v-text="$t('pages.table.subpages.semantics.info')" />
+ <p>
+ {{ $t('pages.table.subpages.semantics.info') }}
+ </p>
<p
class="mt-1"
v-for="(ontology, idx) in ontologies"
:key="`o-${idx}`">
- <v-badge inline :content="badge(ontology).text" :color="badge(ontology).color">
- <a :href="ontology.uri" v-text="ontology.uri_pattern" />
+ <v-badge
+ inline
+ :content="badge(ontology).text"
+ :color="badge(ontology).color">
+ <a
+ :href="ontology.uri">
+ {{ ontology.uri_pattern }}
+ </a>
</v-badge>
</p>
</v-alert>
@@ -34,11 +41,13 @@
color="info">
<p>
<a
- :href="entity.uri"
- v-text="entity.name ? entity.name : entity.uri" />
+ :href="entity.uri">
+ {{ entity.name ? entity.name : entity.uri }}
+ </a>
+ </p>
+ <p>
+ {{ entity.description }}
</p>
- <p
- v-text="entity.description" />
</v-alert>
</v-col>
</v-row>
@@ -65,8 +74,9 @@
lines="one"
v-model="recommendation"
select-strategy="single-independent">
- <v-list-subheader
- v-text="$t('pages.table.subpages.semantics.recommended')" />
+ <v-list-subheader>
+ {{ $t('pages.table.subpages.semantics.recommended') }}
+ </v-list-subheader>
<v-list-item
v-for="(item, idx) in recommendations"
:key="`r-${idx}`"
@@ -77,8 +87,12 @@
<v-checkbox-btn :model-value="isActive"></v-checkbox-btn>
</v-list-item-action>
</template>
- <v-list-item-title v-text="item.label" />
- <v-list-item-subtitle v-text="subtitle(item)" />
+ <v-list-item-title>
+ {{ item.label }}
+ </v-list-item-title>
+ <v-list-item-subtitle>
+ {{ subtitle(item) }}
+ </v-list-item-subtitle>
</v-list-item>
</v-list>
</v-col>
diff --git a/dbrepo-ui/components/dialogs/ViewSemanticEntity.vue b/dbrepo-ui/components/dialogs/ViewSemanticEntity.vue
index ede7fe25bcd421c0304f41d224be7615598a9251..41b69f89892e3068a781e5cac0ffafee767c473a 100644
--- a/dbrepo-ui/components/dialogs/ViewSemanticEntity.vue
+++ b/dbrepo-ui/components/dialogs/ViewSemanticEntity.vue
@@ -1,17 +1,32 @@
<template>
<div>
<v-card>
- <v-card-title v-text="entity.name" />
+ <v-card-title>
+ {{ entity.name }}
+ </v-card-title>
<v-card-subtitle>
- <a :href="entity.uri" target="_blank" v-text="entity.uri" />
+ <a
+ :href="entity.uri"
+ target="_blank">
+ {{ entity.uri }}
+ </a>
</v-card-subtitle>
<v-card-text>
- <p v-text="description" />
+ <p>
+ {{ description }}
+ </p>
</v-card-text>
- <div v-for="(item,idx) in entity.columns" :key="idx">
+ <div
+ v-for="(item,idx) in entity.columns"
+ :key="idx">
<v-list-item two-line :to="link(item)">
- <v-list-item-title v-text="item.name" />
- <v-list-item-subtitle class="mt-2" v-text="link(item)" />
+ <v-list-item-title>
+ {{ item.name }}
+ </v-list-item-title>
+ <v-list-item-subtitle
+ class="mt-2">
+ {{ link(item) }}
+ </v-list-item-subtitle>
</v-list-item>
</div>
<v-card-actions>
diff --git a/dbrepo-ui/components/identifier/Citation.vue b/dbrepo-ui/components/identifier/Citation.vue
index 6f35ac915e255610965015ccd16adcf1dad03597..7cd99194b099987f3853fde4afd7bf92f463dd38 100644
--- a/dbrepo-ui/components/identifier/Citation.vue
+++ b/dbrepo-ui/components/identifier/Citation.vue
@@ -1,7 +1,10 @@
<template>
- <v-row no-gutters>
- <v-col v-if="!loading" md="10">
- <pre v-text="citation" />
+ <v-row
+ no-gutters>
+ <v-col
+ v-if="!loading"
+ md="10">
+ <pre>{{ citation }}</pre>
</v-col>
<v-col
v-if="!$vuetify.display.mdAndDown"
diff --git a/dbrepo-ui/components/identifier/Creators.vue b/dbrepo-ui/components/identifier/Creators.vue
index 706736b21b155f5dc0265b0993f23b435bd5c345..8aa5fac7aa7f06ca809179a3903a5e23830504e4 100644
--- a/dbrepo-ui/components/identifier/Creators.vue
+++ b/dbrepo-ui/components/identifier/Creators.vue
@@ -16,12 +16,14 @@
v-if="hasRor(personOrOrg)"
class="mr-1"
:ror="personOrOrg.name_identifier" />
- <span
- v-text="personOrOrg.creator_name" />
+ <span>
+ {{ personOrOrg.creator_name }}
+ </span>
<sup
v-if="hasAffiliation(personOrOrg)"
- v-text="personOrOrg.affiliation_index"
- class="ml-1" />
+ class="ml-1">
+ {{ personOrOrg.affiliation_index }}
+ </sup>
<span
v-if="!isLast(creators, i)">; </span>
</span>
@@ -30,7 +32,9 @@
<span
v-for="(affiliation, i) in affiliations"
:key="`c-${i}`">
- <sup v-text="i+1" />
+ <sup>
+ {{ i+1 }}
+ </sup>
{{ affiliation.name }}
<RorIcon
v-if="hasRor(affiliation)"
diff --git a/dbrepo-ui/components/identifier/Persist.vue b/dbrepo-ui/components/identifier/Persist.vue
index 0de61931265d5359c07637d935aa9101a1ebca6a..1795d058660ff08288b9054435e44362d84cf0e7 100644
--- a/dbrepo-ui/components/identifier/Persist.vue
+++ b/dbrepo-ui/components/identifier/Persist.vue
@@ -589,14 +589,20 @@
v-if="identifier.licenses.length > 0"
color="tertiary">
<p>
- <a :href="identifier.licenses[0].uri" target="_blank">
- <strong v-text="identifier.licenses[0].identifier" /> <sup><v-icon x-small>mdi-open-in-new</v-icon></sup>
+ <a
+ :href="identifier.licenses[0].uri"
+ target="_blank">
+ <strong>
+ {{ identifier.licenses[0].identifier }}
+ </strong>
+ <sup><v-icon x-small>mdi-open-in-new</v-icon></sup>
</a>
</p>
<p
v-if="identifier.licenses[0].description"
- class="mt-2"
- v-text="identifier.licenses[0].description" />
+ class="mt-2">
+ {{ identifier.licenses[0].description }}
+ </p>
</v-alert>
</v-card-text>
<v-card-text>
@@ -755,7 +761,7 @@
<v-list-item>
<v-list-item-title>
{{ $t('pages.identifier.subpages.create.summary.record') }} {{ resourceHumanDescription.prefix }}
- "<strong v-text="resourceHumanDescription.info" />"
+ "<strong>{{ resourceHumanDescription.info }}</strong>"
</v-list-item-title>
<template v-slot:prepend>
<v-icon
@@ -775,7 +781,7 @@
<v-list-item-title
v-if="identifier.licenses.length > 0">
{{ $t('pages.identifier.subpages.create.summary.license') }}
- "<strong v-text="identifier.licenses[0].identifier" />"
+ "<strong>{{ identifier.licenses[0].identifier }}</strong>"
</v-list-item-title>
<v-list-item-title
v-else>
@@ -791,7 +797,7 @@
v-if="identifier.publisher">
<v-list-item-title>
{{ $t('pages.identifier.subpages.create.summary.publisher') }}
- "<strong v-text="identifier.publisher" />"
+ "<strong>{{ identifier.publisher }}</strong>"
</v-list-item-title>
<template v-slot:prepend>
<v-icon
diff --git a/dbrepo-ui/components/identifier/Summary.vue b/dbrepo-ui/components/identifier/Summary.vue
index f4a5f7c880fc9618093ca82726159e598c16d998..267693276c18cde26769f387ddc2f3f34ec97689 100644
--- a/dbrepo-ui/components/identifier/Summary.vue
+++ b/dbrepo-ui/components/identifier/Summary.vue
@@ -18,7 +18,9 @@
<p
v-for="(title, i) in identifier.titles"
:key="`t-${i}`">
- <span v-text="title.title" />
+ <span>
+ {{ title.title }}
+ </span>
</p>
</v-list-item>
<v-list-item
@@ -28,32 +30,42 @@
v-for="(description, i) in identifier.descriptions"
:key="`d-${i}`">
<div
- v-text="description?.type"
- class="text-subtitle-2" />
- <span v-text="description.description" />
+ class="text-subtitle-2">
+ {{ description?.type }}
+ </div>
+ <span>
+ {{ description.description }}
+ </span>
</p>
</v-list-item>
<v-list-item
:title="$t('pages.identifier.publisher.title')"
density="compact">
- <div v-text="identifier.publisher" />
+ <div>
+ {{ identifier.publisher }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.identifier.creators.title')"
density="compact">
- <Creators :person-or-orgs="identifier.creators" />
+ <Creators
+ :person-or-orgs="identifier.creators" />
</v-list-item>
<v-list-item
v-if="identifierLang"
:title="$t('pages.identifier.language.title')"
density="compact">
- <div v-text="identifierLang" />
+ <div>
+ {{ identifierLang }}
+ </div>
</v-list-item>
<v-list-item
v-if="publication"
:title="$t('pages.identifier.publication-date.title')"
density="compact">
- <div v-text="publication" />
+ <div>
+ {{ publication }}
+ </div>
</v-list-item>
<v-list-item
v-if="identifier.related_identifiers && identifier.related_identifiers.length > 0"
@@ -75,16 +87,19 @@
:key="`f-${i}`">
<a
v-if="funder.funder_identifier"
- v-text="funder.funder_name"
- :href="funder.funder_identifier" />
+ :href="funder.funder_identifier">
+ {{ funder.funder_name }}
+ </a>
<span
v-if="funder.award_title"
- class="ml-1"
- v-text="funder.award_title" />
+ class="ml-1">
+ {{ funder.award_title }}
+ </span>
<span
v-if="funder.award_number"
- class="ml-1"
- v-text="`(${funder.award_number})`" />
+ class="ml-1">
+ ({{ funder.award_number }})
+ </span>
</p>
</v-list-item>
<v-list-item
@@ -95,11 +110,14 @@
v-for="(license, i) in identifier.licenses"
:key="`l-${i}`">
<span>
- <span v-text="i > 0 ? ', ' : ''" />
+ <span>
+ {{ i > 0 ? ', ' : '' }}
+ </span>
<a
v-if="license"
- v-text="license.identifier"
- :href="license.uri" />
+ :href="license.uri">
+ {{ license.identifier }}
+ </a>
</span>
</p>
</v-list-item>
diff --git a/dbrepo-ui/components/search/AdvancedSearch.vue b/dbrepo-ui/components/search/AdvancedSearch.vue
index 17a2839c64ce4b7584591c64e1be8f00715d7f28..13de402e019f2a791f0233c4fc611164e46e20d8 100644
--- a/dbrepo-ui/components/search/AdvancedSearch.vue
+++ b/dbrepo-ui/components/search/AdvancedSearch.vue
@@ -110,7 +110,9 @@
v-if="isEligibleYearRangeSearch"
dense>
<v-col>
- <p v-text="$t('pages.search.publication-range.hint')" />
+ <p>
+ {{ $t('pages.search.publication-range.hint') }}
+ </p>
</v-col>
</v-row>
<v-row
@@ -125,7 +127,9 @@
:hint="$t('pages.search.start-year.hint')"
:variant="inputVariant"
required
- :rules="[v => !!v || $t('validation.required')]"
+ :rules="[
+ v => !!v || $t('validation.required')
+ ]"
clearable />
</v-col>
<v-col cols="3">
@@ -144,12 +148,17 @@
<v-col>
<p
v-if="isEligibleUnitIndependentSearch"
- v-text="$t('pages.search.concept-unit.hint')"
- class="mt-4" />
+ class="mt-4">
+ {{ $t('pages.search.concept-unit.hint') }}
+ </p>
</v-col>
</v-row>
- <v-row v-if="isEligibleConceptOrUnitSearch || isEligibleUnitIndependentSearch" dense>
- <v-col v-if="isEligibleConceptOrUnitSearch || isEligibleUnitIndependentSearch" cols="3">
+ <v-row
+ v-if="isEligibleConceptOrUnitSearch || isEligibleUnitIndependentSearch"
+ dense>
+ <v-col
+ v-if="isEligibleConceptOrUnitSearch || isEligibleUnitIndependentSearch"
+ cols="3">
<v-select
v-model="advancedSearchData['tables.columns.concept.uri']"
clearable
@@ -162,7 +171,9 @@
:label="$t('pages.search.concept.label')"
:hint="$t('pages.search.concept.hint')" />
</v-col>
- <v-col v-if="isEligibleConceptOrUnitSearch || isEligibleUnitIndependentSearch" cols="3">
+ <v-col
+ v-if="isEligibleConceptOrUnitSearch || isEligibleUnitIndependentSearch"
+ cols="3">
<v-select
v-model="advancedSearchData['tables.columns.unit.uri']"
clearable
@@ -175,7 +186,9 @@
:label="$t('pages.search.unit.label')"
:hint="$t('pages.search.unit.hint')" />
</v-col>
- <v-col v-if="isEligibleUnitIndependentSearch" cols="3">
+ <v-col
+ v-if="isEligibleUnitIndependentSearch"
+ cols="3">
<v-text-field
v-model="advancedSearchData['t1']"
clearable
@@ -185,7 +198,9 @@
:label="$t('pages.search.start.label')"
:hint="$t('pages.search.start.hint')" />
</v-col>
- <v-col v-if="isEligibleUnitIndependentSearch" cols="3">
+ <v-col
+ v-if="isEligibleUnitIndependentSearch"
+ cols="3">
<v-text-field
v-model="advancedSearchData['t2']"
clearable
@@ -196,7 +211,8 @@
:hint="$t('pages.search.end.hint')" />
</v-col>
</v-row>
- <v-row dense>
+ <v-row
+ dense>
<v-col>
<v-btn
type="submit"
@@ -205,8 +221,9 @@
:loading="loading"
:disabled="!valid || loading || loadingFields"
size="small"
- :text="$t('navigation.search')"
- @click="advancedSearch" />
+ @click="advancedSearch">
+ {{ $t('navigation.search') }}
+ </v-btn>
</v-col>
</v-row>
</v-form>
diff --git a/dbrepo-ui/components/subset/Builder.vue b/dbrepo-ui/components/subset/Builder.vue
index 7c30fd8f5a488cee4173f710e50e50e0154e9210..a6f53c6e4f0dba0ef1f8935c9112dc1e2d1d0df2 100644
--- a/dbrepo-ui/components/subset/Builder.vue
+++ b/dbrepo-ui/components/subset/Builder.vue
@@ -123,7 +123,23 @@
:rules="[v => !!v || $t('validation.required')]"
return-object
multiple
- @update:model-value="buildQuery" />
+ @update:model-value="buildQuery">
+ <template
+ v-slot:prepend-item>
+ <v-list-item
+ title="Select All"
+ :active="select.length === columns.length"
+ @click="toggleColumns">
+ <template
+ v-slot:prepend>
+ <v-checkbox-btn
+ :model-value="select.length === columns.length" />
+ </template>
+ </v-list-item>
+ <v-divider
+ class="mt-2" />
+ </template>
+ </v-select>
</v-col>
</v-row>
<v-row v-if="select.length > 0">
@@ -194,7 +210,7 @@
<v-col
md="8"
class="text-center">
- <pre v-text="clause.type.toUpperCase()" />
+ <pre>{{ clause.type.toUpperCase() }}</pre>
</v-col>
</v-row>
<div
@@ -233,13 +249,17 @@
<v-alert
border="start"
color="warning">
- <span v-text="$t('pages.subset.subpages.create.expert.warn')" />
- <pre style="white-space:inherit;" v-text="unsupported.join(', ')" />
+ <span>
+ {{ $t('pages.subset.subpages.create.expert.warn') }}
+ </span>
+ <pre style="white-space:inherit;">{{ unsupported.join(', ') }}</pre>
</v-alert>
</v-col>
</v-row>
<v-row dense>
- <v-col v-text="$t('pages.subset.subpages.create.subtitle')" />
+ <v-col>
+ {{ $t('pages.subset.subpages.create.subtitle') }}
+ </v-col>
</v-row>
<v-row dense>
<v-col>
@@ -370,6 +390,12 @@ export default {
database () {
return this.cacheStore.getDatabase
},
+ columnTypes () {
+ if (!this.database) {
+ return []
+ }
+ return this.database.container.image.data_types
+ },
user () {
return this.userStore.getUser
},
@@ -533,7 +559,7 @@ export default {
return
}
const queryService = useQueryService()
- const { error, reason, column, raw, formatted } = queryService.build(this.table.internal_name, this.select, this.clauses)
+ const { error, reason, column, raw, formatted } = queryService.build(this.table.internal_name, this.select, this.columnTypes, this.clauses)
if (error) {
const toast = useToastInstance()
toast.error(this.$t('error.query.' + reason) + ' ' + column)
@@ -584,6 +610,14 @@ export default {
keywordCase: 'upper'
})
}
+ },
+ toggleColumns () {
+ if (this.select.length !== this.columns.length) {
+ this.select = this.columns
+ this.buildQuery()
+ } else {
+ this.select = []
+ }
}
}
}
diff --git a/dbrepo-ui/components/subset/Results.vue b/dbrepo-ui/components/subset/Results.vue
index 95becef12c4f0e5116345f1ade444fb36f350fb3..4ba414309c5009bdf88914150b6c1afe11e9a65e 100644
--- a/dbrepo-ui/components/subset/Results.vue
+++ b/dbrepo-ui/components/subset/Results.vue
@@ -8,6 +8,7 @@
:items="result.rows"
:items-length="total"
:footer-props="footerProps"
+ :items-per-page-options="footerProps.itemsPerPageOptions"
@update:options="updateOptions" />
</div>
</template>
diff --git a/dbrepo-ui/components/subset/SubsetToolbar.vue b/dbrepo-ui/components/subset/SubsetToolbar.vue
index 5c5081a2f8f5c3944928bbd59cd76dddc2c79d89..db9452feaac3c78e879e3ca157034ea8c87da6dc 100644
--- a/dbrepo-ui/components/subset/SubsetToolbar.vue
+++ b/dbrepo-ui/components/subset/SubsetToolbar.vue
@@ -166,11 +166,17 @@ export default {
}
return this.subset.creator.username === this.username
},
+ hasReadAccess () {
+ if (!this.access) {
+ return false
+ }
+ return this.access.type === 'read' || this.access.type === 'write_all' || this.access.type === 'write_own'
+ },
canGetPid () {
if (!this.user || !this.subset || !this.database) {
return false
}
- return this.database.owner.id === this.user.id || (this.subset.creator.id === this.user.id && UserUtils.hasReadAccess(this.access))
+ return this.database.owner.id === this.user.id || (this.subset.creator.id === this.user.id && this.hasReadAccess)
},
title () {
if (!this.identifier) {
diff --git a/dbrepo-ui/components/table/BlobDownload.vue b/dbrepo-ui/components/table/BlobDownload.vue
index 6ae215e95bf782447f0b0261b470af531a378083..7a96b5e27ba1c738da29770c0b667c3f558d3d9d 100644
--- a/dbrepo-ui/components/table/BlobDownload.vue
+++ b/dbrepo-ui/components/table/BlobDownload.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <pre v-text="description" />
+ <pre>{{ description }}</pre>
</div>
</template>
diff --git a/dbrepo-ui/components/table/TableHistory.vue b/dbrepo-ui/components/table/TableHistory.vue
index dd3dad66e2961b59f5591a586150e88fa2c00ff6..34d45248e7341b9a5b8b3af1c2d799e4408e6ecb 100644
--- a/dbrepo-ui/components/table/TableHistory.vue
+++ b/dbrepo-ui/components/table/TableHistory.vue
@@ -28,6 +28,10 @@
:options="chartOptions"
:height="200"
:width="400" />
+ <pre>{{ history }}</pre>
+ <p>
+ {{ $t('pages.table.subpages.versioning.chart.legend') }}
+ </p>
</v-card-text>
<v-card-actions>
<v-spacer />
@@ -52,9 +56,9 @@
</template>
<script>
+import { UTCDate } from '@date-fns/utc'
import { Bar } from 'vue-chartjs'
import { format } from 'date-fns'
-import { useCacheStore } from '~/stores/cache.js'
import { Chart as ChartJS, Title, Tooltip, BarElement, CategoryScale, LinearScale, LogarithmicScale } from 'chart.js'
ChartJS.register(Title, Tooltip, BarElement, CategoryScale, LinearScale, LogarithmicScale)
@@ -69,6 +73,7 @@ export default {
loading: true,
datetime: null,
history: null,
+ chartData: null,
chartOptions: {
responsive: true,
onClick: this.handle,
@@ -92,7 +97,7 @@ export default {
},
},
x: {
- display: true,
+ display: false,
ticks: {
min: 0,
stepSize: 1
@@ -118,15 +123,6 @@ export default {
buttonVariant () {
const runtimeConfig = useRuntimeConfig()
return this.$vuetify.theme.global.name.toLowerCase().endsWith('contrast') ? runtimeConfig.public.variant.button.contrast : runtimeConfig.public.variant.button.normal
- },
- chartData () {
- return {
- labels: this.history ? this.history.map(d => format(new Date(d.timestamp), 'yyyy-MM-dd HH:mm:ss')) : [],
- datasets: [
- this.history ? { backgroundColor: this.$vuetify.theme.current.colors.success, data: this.history.filter(d => d.event === 'INSERT').map(d => d.total) } : { data: [] },
- this.history ? { backgroundColor: this.$vuetify.theme.current.colors.error, data: this.history.filter(d => d.event === 'DELETE').map(d => d.total) } : { data: [] },
- ]
- }
}
},
mounted() {
@@ -153,13 +149,28 @@ export default {
this.datetime = this.chartData.labels[idx]
console.debug('date time', this.datetime, 'idx', idx)
},
+ filterHistoryEventType (history, type) {
+ return history.map(d => {
+ if (d.event === type) {
+ return d.total
+ }
+ return null
+ })
+ },
loadHistory () {
this.loading = true
const tableService = useTableService()
tableService.history(this.table.database_id, this.table.id)
.then((history) => {
this.loading = false
- this.history = history
+ this.chartData = {
+ // labels: history ? history.map(d => format(new UTCDate(d.timestamp), 'yyyy-MM-dd HH:mm:ss.SSS')) : [],
+ labels: history ? history.map(d => format(new UTCDate(d.timestamp), 'yyyy-MM-dd HH:mm:ss')) : [],
+ datasets: [
+ { backgroundColor: this.$vuetify.theme.current.colors.success, data: this.filterHistoryEventType(history, 'INSERT') },
+ { backgroundColor: this.$vuetify.theme.current.colors.error, data: this.filterHistoryEventType(history, 'DELETE') }
+ ]
+ }
})
.catch(({message}) => {
const toast = useToastInstance()
diff --git a/dbrepo-ui/components/table/TableImport.vue b/dbrepo-ui/components/table/TableImport.vue
index e55db4130e893810d22bf93ea4308c6e97a2b060..84c1011c9b24842c7bb1ed563919af61f6211833 100644
--- a/dbrepo-ui/components/table/TableImport.vue
+++ b/dbrepo-ui/components/table/TableImport.vue
@@ -83,39 +83,6 @@
</v-select>
</v-col>
</v-row>
- <v-row dense>
- <v-col md="8">
- <v-text-field
- v-model="tableImport.null_element"
- clearable
- persistent-hint
- :variant="inputVariant"
- :hint="$t('pages.table.subpages.import.null.hint')"
- :label="$t('pages.table.subpages.import.null.label')"/>
- </v-col>
- </v-row>
- <v-row dense>
- <v-col md="8">
- <v-text-field
- v-model="tableImport.true_element"
- clearable
- persistent-hint
- :variant="inputVariant"
- :hint="$t('pages.table.subpages.import.true.hint')"
- :label="$t('pages.table.subpages.import.true.label')"/>
- </v-col>
- </v-row>
- <v-row dense>
- <v-col md="8">
- <v-text-field
- v-model="tableImport.false_element"
- clearable
- persistent-hint
- :variant="inputVariant"
- :hint="$t('pages.table.subpages.import.false.hint')"
- :label="$t('pages.table.subpages.import.false.label')"/>
- </v-col>
- </v-row>
</v-container>
</v-form>
</v-stepper-window>
@@ -132,8 +99,9 @@
v-if="$route.query.location"
dense>
<v-col>
- <p
- v-text="$t('pages.table.subpages.import.storage.text')" />
+ <p>
+ {{ $t('pages.table.subpages.import.storage.text') }}
+ </p>
<v-chip
prepend-icon="mdi-cloud-upload"
label>
@@ -155,9 +123,13 @@
border="start"
color="warning">
{{ $t('pages.table.subpages.import.separator.warn.prefix') }}
- <strong v-text="tableImport.separator"/>
+ <strong>
+ {{ tableImport.separator }}
+ </strong>
{{ $t('pages.table.subpages.import.separator.warn.middle') }}
- <strong v-text="suggestedAnalyseSeparator"/>
+ <strong>
+ {{ suggestedAnalyseSeparator }}
+ </strong>
{{ $t('pages.table.subpages.import.separator.warn.suffix') }}
</v-alert>
</v-col>
@@ -269,7 +241,9 @@
<v-alert
border="start"
color="success">
- <span v-text="$t(`pages.table.subpages.import.summary.text`)"/>
+ <span>
+ {{ $t(`pages.table.subpages.import.summary.text`)}}
+ </span>
</v-alert>
</v-col>
</v-row>
@@ -328,9 +302,6 @@ export default {
tableImport: {
location: null,
quote: '"',
- false_element: null,
- true_element: null,
- null_element: '',
separator: ',',
line_termination: '\\n',
skip_lines: 1
@@ -356,9 +327,6 @@ export default {
this.cacheStore.setUploadProgress(null)
this.setQueryParamSafely('location')
this.setQueryParamSafely('quote')
- this.setQueryParamSafely('false_element')
- this.setQueryParamSafely('true_element')
- this.setQueryParamSafely('null_element')
this.setQueryParamSafely('separator')
this.setQueryParamSafely('line_termination')
this.setQueryParamSafely('skip_lines')
@@ -541,9 +509,6 @@ export default {
separator: this.tableImport.separator,
skip_lines: this.tableImport.skip_lines,
quote: this.tableImport.quote,
- null_element: this.tableImport.null_element,
- true_element: this.tableImport.true_element,
- false_element: this.tableImport.false_element
})
this.loading = false
})
diff --git a/dbrepo-ui/components/table/TableList.vue b/dbrepo-ui/components/table/TableList.vue
index 362f4a93665161b36a432d147fb862890c389f1a..2fc2c7d791b5ce5f84614bc9e2266d99c4c49e9b 100644
--- a/dbrepo-ui/components/table/TableList.vue
+++ b/dbrepo-ui/components/table/TableList.vue
@@ -60,7 +60,6 @@ export default {
{ value: 'is_primary_key', title: 'Primary Key' },
{ value: 'unique', title: 'Unique' },
{ value: 'is_null_allowed', title: 'Nullable' },
- { value: 'auto_generated', title: 'Sequence' }
],
columnTypes: [
// { value: 'ENUM', text: 'Enumeration' }, // Disabled for now, not implemented, #145
diff --git a/dbrepo-ui/components/table/TableSchema.vue b/dbrepo-ui/components/table/TableSchema.vue
index da30905fa30a9327ca90266bd2ee4088fab46c70..57169a95fa1af760389723064b098d079547d9f4 100644
--- a/dbrepo-ui/components/table/TableSchema.vue
+++ b/dbrepo-ui/components/table/TableSchema.vue
@@ -14,7 +14,10 @@
<v-text-field
v-model="c.name"
required
- :rules="[v => !!v || $t('validation.required')]"
+ :rules="[
+ v => !!v || $t('validation.required'),
+ v => this.columns.filter(column => column.name === v).length === 1 || $t('validation.column.exists')
+ ]"
persistent-hint
:variant="inputVariant"
:label="$t('pages.table.subpages.schema.name.label')"
@@ -25,7 +28,7 @@
<v-select
v-model="c.type"
:items="columnTypes"
- item-title="text"
+ item-title="display_name"
item-value="value"
required
:rules="[v => !!v || $t('validation.required')]"
@@ -68,43 +71,44 @@
@focusout="formatValues(c)" />
</v-col>
<v-col
- v-if="defaultSize(c) !== false"
+ v-if="columnType(c) && columnType(c).size_required !== null"
cols="1">
<v-text-field
v-model.number="c.size"
type="number"
- required
+ :min="columnType(c).size_min"
+ :max="columnType(c).size_max"
+ :step="columnType(c).size_step"
+ :value="columnType(c).size_required === true ? columnType(c).size_default : null"
+ :hint="sizeHint(c)"
+ :clearable="!columnType(c).size_required"
+ persistent-hint
:variant="inputVariant"
- :rules="[v => (v !== null && v !== '') || $t('validation.required')]"
+ :rules="[
+ v => !(columnType(c).size_required && (v === null || v === '')) || $t('validation.required')
+ ]"
:error-messages="sizeErrorMessages(c)"
:label="$t('pages.table.subpages.schema.size.label')" />
</v-col>
<v-col
- v-if="defaultD(c) !== false"
+ v-if="columnType(c) && columnType(c).d_required !== null"
cols="1">
<v-text-field
v-model.number="c.d"
type="number"
- required
+ :min="columnType(c).d_min !== null ? columnType(c).d_min : null"
+ :max="columnType(c).d_max !== null ? columnType(c).d_max : null"
+ :step="columnType(c).d_step"
+ :hint="dHint(c)"
+ :clearable="!columnType(c).d_required"
+ persistent-hint
:variant="inputVariant"
- :rules="[v => (v !== null && v !== '') || $t('validation.required')]"
+ :rules="[
+ v => !(columnType(c).d_required && (v === null || v === '')) || $t('validation.required')
+ ]"
:error-messages="dErrorMessages(c)"
:label="$t('pages.table.subpages.schema.d.label')" />
</v-col>
- <v-col
- cols="2"
- v-if="hasDate(c)">
- <v-select
- v-model="c.dfid"
- required
- :variant="inputVariant"
- :disabled="disabled"
- :rules="[v => !!v || $t('validation.required')]"
- :items="filterDateFormats(c)"
- item-title="unix_format"
- item-value="id"
- :label="$t('pages.table.subpages.schema.fsp.label')" />
- </v-col>
<v-col
v-if="shift(c)"
:cols="shift(c)" />
@@ -122,7 +126,7 @@
class="pl-10">
<v-checkbox
v-model="c.null_allowed"
- :disabled="c.primary_key || disabled"
+ :disabled="c.primary_key || c.type === 'serial' || disabled"
:label="$t('pages.table.subpages.schema.null.label')" />
</v-col>
<v-col
@@ -130,7 +134,7 @@
class="pl-10">
<v-checkbox
v-model="c.unique"
- :disabled="disabled"
+ :disabled="disabled || c.type === 'serial'"
:hidden="c.primary_key"
:label="$t('pages.table.subpages.schema.unique.label')" />
</v-col>
@@ -219,7 +223,6 @@ export default {
return {
valid: false,
tableColumns: [],
- columnTypes: useQueryService().mySql8DataTypes(),
cacheStore: useCacheStore()
}
},
@@ -227,6 +230,16 @@ export default {
database () {
return this.cacheStore.getDatabase
},
+ columnTypes () {
+ if (!this.database) {
+ return []
+ }
+ const types = this.database.container.image.data_types
+ if (this.columns.filter(c => c.type === 'serial').length > 0) {
+ return types.filter(t => t.value !== 'serial')
+ }
+ return types
+ },
dateFormats () {
if (!this.database || !('container' in this.database) || !('image' in this.database.container) || !('date_formats' in this.database.container.image)) {
return []
@@ -258,16 +271,10 @@ export default {
return false
}
let shift = 0
- if (this.hasDate(column) === false && this.columns.filter(c => this.hasDate(c) !== false).length > 0) {
+ if (!this.hasEnumOrSet(column) && (this.columnType(column).size_required === null || this.columnType(column).size_required === undefined) && this.columns.filter(c => (this.columnType(c).size_required !== null || this.columnType(c).size_required !== undefined)).length > 0) {
shift++
}
- if (this.defaultSize(column) === false && this.columns.filter(c => this.defaultSize(c) !== false).length > 0) {
- shift++
- }
- if (this.defaultD(column) === false && this.columns.filter(c => this.defaultD(c) !== false).length > 0) {
- shift++
- }
- if (this.hasEnumOrSet(column) === false && this.columns.filter(c => this.hasEnumOrSet(c) !== false).length > 0) {
+ if (!this.hasEnumOrSet(column) && (this.columnType(column).d_required === null || this.columnType(column).d_required === undefined) && this.columns.filter(c => (this.columnType(c).d_required !== null || this.columnType(c).d_required !== undefined)).length > 0) {
shift++
}
return shift
@@ -298,7 +305,6 @@ export default {
type,
null_allowed,
primary_key,
- dfid: null,
sets: [],
sets_values: null,
enums: [],
@@ -321,46 +327,64 @@ export default {
column.enums = column.enums_values.split(',').map(v => v.trim())
}
},
- defaultSize (column) {
+ columnType (column) {
const filter = this.columnTypes.filter(t => t.value === column.type)
if (!filter || filter.length === 0) {
return false
}
- if (filter[0].defaultSize === undefined || filter[0].defaultSize === null) {
- return false
+ return filter[0]
+ },
+ sizeHint (column) {
+ let hint = ''
+ if (this.columnType(column).size_min !== null) {
+ hint += `min. ${this.columnType(column).size_min}`
}
- return filter[0].defaultSize
+ if (this.columnType(column).size_max) {
+ if (hint.length > 0) {
+ hint += ', '
+ }
+ hint += `max. ${this.columnType(column).size_max}`
+ }
+ if (!this.columnType(column).size_required) {
+ hint += ' (optional)'
+ }
+ return hint
},
- defaultD (column) {
- const filter = this.columnTypes.filter(t => t.value === column.type)
- if (!filter || filter.length === 0) {
- return false
+ dHint (column) {
+ let hint = ''
+ if (this.columnType(column).d_min !== null) {
+ hint += `min. ${this.columnType(column).d_min}`
}
- if (filter[0].defaultD === undefined || filter[0].defaultD === null) {
- return false
+ if (this.columnType(column).d_max) {
+ if (hint.length > 0) {
+ hint += ', '
+ }
+ hint += `max. ${this.columnType(column).d_max}`
}
- return filter[0].defaultD
+ if (!this.columnType(column).d_required) {
+ hint += ' (optional)'
+ }
+ return hint
},
setDefaultSizeAndD (column) {
- column.size = this.defaultSize(column)
- column.d = this.defaultD(column)
- column.dfid = null
- console.debug('for column type', column.type, 'set default size', column.size, '& d', column.d, '& dfid', column.dfid)
- },
- hasDate (column) {
- return column.type === 'date' || column.type === 'datetime' || column.type === 'timestamp' || column.type === 'time'
+ if (this.columnType(column).size_default !== null) {
+ column.size = this.columnType(column).size_default
+ } else {
+ column.size = null
+ }
+ if (this.columnType(column).d_default !== null) {
+ column.d = this.columnType(column).d_default
+ } else {
+ column.d = null
+ }
+ console.debug('for column type', column.type, 'set default size', column.size, '& d', column.d)
+ if (column.type === 'serial') {
+ this.setOthers(column)
+ }
},
hasEnumOrSet (column) {
return column.type === 'enum' || column.type === 'set'
},
- filterDateFormats (column) {
- return this.dateFormats.filter((df) => {
- if (column.type === 'date') {
- return !df.has_time
- }
- return df.has_time
- })
- },
sizeErrorMessages (column) {
if (column.size < column.d) {
return ['Size needs to be bigger or equal to d']
diff --git a/dbrepo-ui/components/table/TableToolbar.vue b/dbrepo-ui/components/table/TableToolbar.vue
index ef95ad1bd2eee6406925a956a3dda14950070a7d..1c222cc7c61bd4229c3a8b8e3dd7560a1228eea5 100644
--- a/dbrepo-ui/components/table/TableToolbar.vue
+++ b/dbrepo-ui/components/table/TableToolbar.vue
@@ -12,8 +12,9 @@
type="subtitle"
width="200" />
<span
- v-if="table && $vuetify.display.lgAndUp"
- v-text="table.name" />
+ v-if="table && $vuetify.display.lgAndUp">
+ {{ table.name }}
+ </span>
</v-toolbar-title>
<v-spacer />
<v-btn
diff --git a/dbrepo-ui/components/user/UserBadge.vue b/dbrepo-ui/components/user/UserBadge.vue
index 65945725e4954a99cda99696626d0a6d947edfd7..71da03d9290ba16928411adda02f3f9eb99aec16 100644
--- a/dbrepo-ui/components/user/UserBadge.vue
+++ b/dbrepo-ui/components/user/UserBadge.vue
@@ -8,9 +8,14 @@
<v-badge
inline
content="you"
- color="code">{{ creatorName }}</v-badge>
+ color="code">
+ {{ creatorName }}
+ </v-badge>
+ </span>
+ <span
+ v-else>
+ {{ creatorName }}
</span>
- <span v-else v-text="creatorName" />
</p>
</template>
diff --git a/dbrepo-ui/composables/access-service.ts b/dbrepo-ui/composables/access-service.ts
index c08e5d0b9f6bac53b8d7eaeba993e06234435b31..056efec1171933d7dcf0921c7eff34717d574333 100644
--- a/dbrepo-ui/composables/access-service.ts
+++ b/dbrepo-ui/composables/access-service.ts
@@ -21,7 +21,7 @@ export const useAccessService = (): any => {
const axios = useAxiosInstance()
console.debug('create access for user with id', userId, 'of database with id', databaseId)
return new Promise<DatabaseAccessDto>((resolve, reject) => {
- axios.post<DatabaseAccessDto>(`/api/database/${databaseId}/access`, payload)
+ axios.post<DatabaseAccessDto>(`/api/database/${databaseId}/access/${userId}`, payload)
.then((response) => {
console.info('Created access for user with id', userId, 'of database with id', databaseId)
resolve(response.data)
diff --git a/dbrepo-ui/composables/query-service.ts b/dbrepo-ui/composables/query-service.ts
index f5d805b958f27676f7f1031bfe56af16721b4378..b3c21c605344db722259df375d7eba98404c65de 100644
--- a/dbrepo-ui/composables/query-service.ts
+++ b/dbrepo-ui/composables/query-service.ts
@@ -126,7 +126,7 @@ export const useQueryService = (): any => {
})
}
- function build(table: TableDto, columns: ColumnDto[], clauses: any[]): QueryBuildResultDto {
+ function build(table: TableDto, columns: ColumnDto[], types: DataTypeDto[], clauses: any[]): QueryBuildResultDto {
var sql = 'SELECT'
for (let i = 0; i < columns.length; i++) {
sql += `${i > 0 ? ',' : ''} \`${columns[i].internal_name}\``
@@ -140,8 +140,8 @@ export const useQueryService = (): any => {
sql += ` ${clause.type.toUpperCase()} `
continue
}
- const fCol = columns.filter(c => c.internal_name === clause.params[0])
- if (fCol.length === 0) {
+ const filteredColumn = columns.filter(c => c.internal_name === clause.params[0])
+ if (filteredColumn.length === 0) {
return {
error: true,
reason: 'column.exists',
@@ -151,26 +151,26 @@ export const useQueryService = (): any => {
}
}
sql += ` \`${clause.params[0]}\` ${clause.params[1]} `
- const fCon = mySql8DataTypes().filter(t => t.value === fCol[0].column_type)
- if (fCol.length === 0) {
+ const filteredType = types.filter(t => t.value === filteredColumn[0].column_type)
+ if (filteredType.length === 0) {
return {
error: true,
- reason: 'type.exists',
- column: fCol[0].column_type,
+ reason: 'exists',
+ column: filteredColumn[0].column_type,
raw: null,
formatted: null
}
}
- if (!fCon[0].isBuildable) {
+ if (!filteredType[0].is_buildable) {
return {
error: true,
- reason: 'type.build',
- column: fCol[0].column_type,
+ reason: 'build',
+ column: filteredColumn[0].column_type,
raw: null,
formatted: null
}
}
- if (fCon[0].quoted) {
+ if (filteredType[0].is_quoted) {
sql += `'${clause.params[2]}'`
} else {
sql += `${clause.params[2]}`
@@ -196,39 +196,5 @@ export const useQueryService = (): any => {
return {timestamp, page, size}
}
- function mySql8DataTypes(): MySql8DataType[] {
- return [
- {value: 'bigint', text: 'BIGINT(size)', defaultSize: 255, defaultD: null, quoted: false, isBuildable: true},
- {value: 'binary', text: 'BINARY(size)', defaultSize: 1, defaultD: null, quoted: false, isBuildable: false},
- {value: 'bit', text: 'BIT(size)', defaultSize: 1, defaultD: null, quoted: false, isBuildable: true},
- {value: 'blob', text: 'BLOB', defaultSize: null, defaultD: null, quoted: false, isBuildable: false},
- {value: 'bool', text: 'BOOL', defaultSize: null, defaultD: null, quoted: false, isBuildable: true},
- {value: 'char', text: 'CHAR(size)', defaultSize: 1, defaultD: null, quoted: true, isBuildable: true},
- {value: 'date', text: 'DATE', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'datetime', text: 'DATETIME(fsp)', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'decimal', text: 'DECIMAL(size, d)', defaultSize: 40, defaultD: 10, quoted: false, isBuildable: true},
- {value: 'double', text: 'DOUBLE(size, d)', defaultSize: 40, defaultD: 10, quoted: false, isBuildable: true},
- {value: 'enum', text: 'ENUM(val1,val2,...)', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'float', text: 'FLOAT(p)', defaultSize: 24, defaultD: null, quoted: false, isBuildable: true},
- {value: 'int', text: 'INT(size)', defaultSize: 255, defaultD: null, quoted: false, isBuildable: true},
- {value: 'longblob', text: 'LONGBLOB', defaultSize: null, defaultD: null, quoted: false, isBuildable: false},
- {value: 'longtext', text: 'LONGTEXT', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'mediumblob', text: 'MEDIUMBLOB', defaultSize: null, defaultD: null, quoted: false, isBuildable: false},
- {value: 'mediumint', text: 'MEDIUMINT(size)', defaultSize: 40, defaultD: null, quoted: false, isBuildable: true},
- {value: 'mediumtext', text: 'MEDIUMTEXT', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'set', text: 'SET(val1,val2,...)', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'smallint', text: 'SMALLINT(size)', defaultSize: 10, defaultD: null, quoted: false, isBuildable: true},
- {value: 'text', text: 'TEXT', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'time', text: 'TIME(fsp)', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'timestamp', text: 'TIMESTAMP(fsp)', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'tinyblob', text: 'TINYBLOB', defaultSize: null, defaultD: null, quoted: false, isBuildable: false},
- {value: 'tinyint', text: 'TINYINT(size)', defaultSize: 10, defaultD: null, quoted: false, isBuildable: true},
- {value: 'tinytext', text: 'TINYTEXT', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'year', text: 'YEAR', defaultSize: null, defaultD: null, quoted: true, isBuildable: true},
- {value: 'varbinary', text: 'VARBINARY(size)', defaultSize: 1, defaultD: null, quoted: false, isBuildable: false},
- {value: 'varchar', text: 'VARCHAR(size)', defaultSize: 255, defaultD: null, quoted: true, isBuildable: true}
- ]
- }
-
- return {findAll, findOne, update, exportCsv, execute, reExecuteData, reExecuteCount, build, mySql8DataTypes}
+ return {findAll, findOne, update, exportCsv, execute, reExecuteData, reExecuteCount, build}
}
diff --git a/dbrepo-ui/composables/table-service.ts b/dbrepo-ui/composables/table-service.ts
index ffd7ebcd6074cc23d9bfa9412e19e48ef87f8f37..3d87e68d4febed8b825a56b1aada946bd6b0f4d5 100644
--- a/dbrepo-ui/composables/table-service.ts
+++ b/dbrepo-ui/composables/table-service.ts
@@ -210,7 +210,6 @@ export const useTableService = (): any => {
type: c.type,
size: c.size ? c.size : null,
d: c.d ? c.d : null,
- dfid: c.dfid ? c.dfid : null,
enums: c.enums_values ? c.enums_values.split(',') : [],
sets: c.sets_values ? c.sets_values.split(',') : [],
index_length: c.index_length,
diff --git a/dbrepo-ui/composables/view-service.ts b/dbrepo-ui/composables/view-service.ts
index 642a7c6e51ca7344dae72dd3ee12550c84c893a3..5b3a25a149813ddf30f622fcb3d51fccb31f6730 100644
--- a/dbrepo-ui/composables/view-service.ts
+++ b/dbrepo-ui/composables/view-service.ts
@@ -1,4 +1,5 @@
import {axiosErrorToApiError} from '@/utils'
+import type {AxiosRequestConfig} from "axios";
export const useViewService = (): any => {
async function remove(databaseId: number, viewId: number): Promise<void> {
@@ -66,5 +67,27 @@ export const useViewService = (): any => {
})
}
- return {remove, create, reExecuteData, reExecuteCount}
+ async function exportData(databaseId: number, viewId: number): Promise<QueryResultDto> {
+ const axios = useAxiosInstance()
+ const config: AxiosRequestConfig = {
+ responseType: 'blob',
+ headers: {
+ Accept: 'text/csv'
+ }
+ }
+ console.debug('export data for view with id', viewId, 'in database with id', databaseId);
+ return new Promise<QueryResultDto>((resolve, reject) => {
+ axios.get<QueryResultDto>(`/api/database/${databaseId}/view/${viewId}/export`, config)
+ .then((response) => {
+ console.info('Exported data for view with id', viewId, 'in database with id', databaseId)
+ resolve(response.data)
+ })
+ .catch((error) => {
+ console.error('Failed to export data', error)
+ reject(axiosErrorToApiError(error))
+ })
+ })
+ }
+
+ return {remove, create, reExecuteData, reExecuteCount, exportData}
}
diff --git a/dbrepo-ui/dto/index.ts b/dbrepo-ui/dto/index.ts
index df0babcfe1f310bdff6415f6351a82020ec3cf4e..74b3911764fbd3da5d41d5d72cd269d79ee3963d 100644
--- a/dbrepo-ui/dto/index.ts
+++ b/dbrepo-ui/dto/index.ts
@@ -336,7 +336,6 @@ interface ColumnDto {
table_id: number;
internal_name: string;
date_format: ImageDateDto;
- auto_generated: boolean;
is_primary_key: boolean;
index_length: number;
length: number;
@@ -532,9 +531,6 @@ interface ImportCsv {
separator: string;
quote: string;
skip_lines: number;
- false_element: string;
- true_element: string;
- null_element: string;
line_termination: string;
}
@@ -562,7 +558,6 @@ interface ColumnCreateDto {
type: string;
size: number | null;
d: number | null;
- dfid: number | null;
enums: string[];
sets: string[];
index_length: number;
@@ -574,7 +569,6 @@ interface InternalColumnDto {
type: string;
size: number;
d: number;
- dfid: number;
enums: string[];
sets: string[];
primary_key: boolean;
@@ -658,9 +652,6 @@ interface ImportDto {
separator: string;
quote: string;
skip_lines: number;
- false_element: string;
- true_element: string;
- null_element: string;
line_termination: string;
}
diff --git a/dbrepo-ui/dto/mysql.ts b/dbrepo-ui/dto/mysql.ts
index b100da017c241b94d84169d1c4545d9fb800e9fc..c366e43f649c9f3eebd14b5c114164f5c4c9c71c 100644
--- a/dbrepo-ui/dto/mysql.ts
+++ b/dbrepo-ui/dto/mysql.ts
@@ -1,8 +1,15 @@
-interface MySql8DataType {
+interface DataTypeDto {
+ display_name: string;
value: string;
- text: string;
- defaultSize: number | null;
- defaultD: number | null;
- quoted: boolean;
- isBuildable: boolean;
+ size_min: number | null;
+ size_max: number | null;
+ size_default: number | null;
+ size_required: number | null;
+ d_min: number | null;
+ d_max: number | null;
+ d_default: number | null;
+ d_required: number | null;
+ documentation: string;
+ is_quoted: boolean;
+ is_buildable: boolean;
}
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index fef6700c4f95024619ae0563533a9a42fd3425a7..51b936816299f1565b2517fb0b8daeb01fa5af2f 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -17,8 +17,9 @@
<v-list-item
class="mt-2">
<v-list-item-title
- class="text-h6"
- v-text="title" />
+ class="text-h6">
+ {{ title }}
+ </v-list-item-title>
</v-list-item>
<v-list nav>
<v-list-item
@@ -49,7 +50,7 @@
border="start"
tile
:type="message.type">
- {{ message.message }}<span v-if="message.link"> — <a :href="message.link" v-text="message.link_text ? message.link_text : message.link" /></span>
+ {{ message.message }}<span v-if="message.link"> — <a :href="message.link">{{ message.link_text ? message.link_text : message.link }}</a></span>
</v-alert>
<div class="d-flex pa-2">
<v-spacer />
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index 6abf715bc0ea6b7e8756acb78141672758ef9b54..3a3846e2efdb70cb02793834c3e018ea9c189f08 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -32,7 +32,9 @@
"no": "No",
"mine": "(mine)",
"loading": "Loading",
- "view": "View"
+ "view": "View",
+ "modify": "Modify",
+ "help": "Help"
},
"pages": {
"identifier": {
@@ -543,8 +545,9 @@
"subtitle": "Select a timestamp to view the data for this specific time of day",
"chart": {
"title": "Data Events",
+ "legend": "Chart legend: green color marks data insertions, red color marks data deletions (=data updates in some cases)",
"ylabel": "# Events",
- "xlabel": "Timestamp"
+ "xlabel": "Data Timestamp (UTC)"
},
"timestamp": {
"label": "Timestamp",
@@ -561,7 +564,7 @@
"hint": "Value is a primary key"
},
"format": {
- "hint": "Value must be in format"
+ "hint": "Format hint:"
},
"required": {
"hint": "Required. "
@@ -611,10 +614,10 @@
"access": {
"title": "Database Access",
"subtitle": "Overview on users with their access to the database",
- "read": "You can read all contents",
- "write-own": "You can write own tables and read all contents",
- "write-all": "You can write own tables and read all contents",
- "revoke": "Revoke",
+ "read": "Read all contents",
+ "write-own": "Read all contents & write own tables",
+ "write-all": "Read all contents & write all tables",
+ "revoke": "No access",
"action": "Action",
"username": {
"label": "Username",
@@ -623,9 +626,6 @@
"type": {
"label": "Access Type",
"hint": "Required"
- },
- "submit": {
- "text": "Modify"
}
},
"create": {
@@ -1144,8 +1144,8 @@
"query": {
"missing": "Failed to find query in data service",
"invalid": "Query is invalid",
- "type.exists": "Failed to build query: no such column type",
- "type.build": "Failed to build query: currently no query build support for column type",
+ "exists": "Failed to build query: no such column type",
+ "build": "Failed to build query: currently no query build support for column type",
"column.exists": "Failed to build query: data columns are missing column with name"
},
"store": {
@@ -1442,6 +1442,9 @@
"pattern": "Invalid URI",
"exists": "URI exists"
},
+ "column": {
+ "exists": "Column with this name exists"
+ },
"user": {
"pattern": "Only lowercase letters, min. 3 length",
"exists": "This username is already taken"
diff --git a/dbrepo-ui/nuxt.config.ts b/dbrepo-ui/nuxt.config.ts
index f33c990a71ca2ca1b4e594a6b219b8ac5cbcb748..8def4012d992f9f998969ec2b247398706ec5db4 100644
--- a/dbrepo-ui/nuxt.config.ts
+++ b/dbrepo-ui/nuxt.config.ts
@@ -1,6 +1,6 @@
-import { transformAssetUrls } from 'vite-plugin-vuetify'
+import {transformAssetUrls} from 'vite-plugin-vuetify'
-const proxy : any = {}
+const proxy: any = {}
/* proxies the backend calls, >>NOT<< the frontend calls (clicking) */
if (process.env.NODE_ENV === 'development') {
@@ -19,155 +19,147 @@ if (process.env.NODE_ENV === 'development') {
/**
* https://nuxt.com/docs/guide/concepts/rendering#hybrid-rendering
*/
-const routeRules = {
-}
+const routeRules = {}
export default defineNuxtConfig({
- app: {
- head: {
- charset: 'utf-8',
- viewport: 'width=device-width, initial-scale=1',
- meta: [
- { 'http-equiv': 'Content-Security-Policy', content: 'upgrade-insecure-requests' }
- ],
- htmlAttrs: {
- lang: 'en-US'
- }
- }
- },
-
- build: {
- transpile: ['vuetify'],
- },
-
- css: [
- 'vuetify/lib/styles/main.sass',
- '@mdi/font/css/materialdesignicons.min.css',
- '@/assets/globals.css',
- '@/assets/overrides.css',
- ],
-
- runtimeConfig: {
- public: {
- commit: '',
- title: 'Database Repository',
- logo: '/logo.svg',
- icon: '/favicon.ico',
- touch: '/apple-touch-icon.png',
- version: 'bun-dev',
- broker: {
- host: 'localhost',
- port: {
- '5672': false
- },
- extra: ''
- },
- variant: {
- input: {
- normal: 'underlined',
- contrast: 'outlined',
- },
- button: {
- normal: 'flat',
- contrast: 'outlined',
- },
- list: {
- normal: '',
- contrast: 'flat',
- }
- },
- api: {
- client: 'http://localhost',
- server: 'http://gateway-service',
- },
- upload: {
- client: 'http://localhost/api/upload/files',
- prefix: '/'
- },
- database: {
- unsupported: '*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--',
- image: {
- width: 200,
- height: 200
- },
- extra: ''
- },
- pid: {
- default: {
- publisher: 'Example University'
- }
- },
- doi: {
- enabled: false,
- endpoint: 'https://doi.org'
- },
- links: {
- rabbitmq: {
- text: 'RabbitMQ Admin',
- href: '/admin/broker/'
- },
- keycloak: {
- text: 'Keycloak Admin',
- href: '/api/auth/'
- }
- }
- }
- },
-
- routeRules,
-
- devServer: {
- port: 3001
- },
-
- modules: [
- '@pinia/nuxt',
- '@pinia-plugin-persistedstate/nuxt',
- '@nuxtjs/i18n',
- '@artmizu/nuxt-prometheus'
- ],
-
- pinia: {
- storesDirs: ['./stores/**'],
- },
-
- piniaPersistedstate: {
- storage: 'localStorage'
- },
-
- i18n: {
- lazy: false,
- langDir: 'locales',
- strategy: 'no_prefix',
- defaultLocale: 'de',
- locales: [
- {
- 'code': 'en',
- 'file': 'en-US.json',
- 'name': 'English (US)',
- 'iso': 'en-US'
- },
- {
- 'code': 'de',
- 'file': 'de-AT.json',
- 'name': 'German (AT)',
- 'iso': 'de-AT'
- }
- ]
-
- },
-
- vite: {
- server: {
- proxy
- },
- vue: {
- template: {
- transformAssetUrls,
- },
- },
- },
-
- devtools: { enabled: true },
- compatibilityDate: '2024-07-24'
+ app: {
+ head: {
+ charset: 'utf-8',
+ viewport: 'width=device-width, initial-scale=1',
+ meta: [
+ {'http-equiv': 'Content-Security-Policy', content: 'upgrade-insecure-requests'}
+ ],
+ htmlAttrs: {
+ lang: 'en-US'
+ }
+ }
+ },
+
+ build: {
+ transpile: ['vuetify'],
+ },
+
+ builder: 'vite',
+
+ css: [
+ 'vuetify/lib/styles/main.sass',
+ '@mdi/font/css/materialdesignicons.min.css',
+ '@/assets/globals.css',
+ '@/assets/overrides.css',
+ ],
+
+ runtimeConfig: {
+ public: {
+ commit: '',
+ title: 'Database Repository',
+ logo: '/logo.svg',
+ icon: '/favicon.ico',
+ touch: '/apple-touch-icon.png',
+ version: 'bun-dev',
+ broker: {
+ host: 'localhost',
+ port: {
+ '5672': false
+ },
+ extra: ''
+ },
+ variant: {
+ input: {
+ normal: 'underlined',
+ contrast: 'outlined',
+ },
+ button: {
+ normal: 'flat',
+ contrast: 'outlined',
+ },
+ list: {
+ normal: '',
+ contrast: 'flat',
+ }
+ },
+ api: {
+ client: 'http://localhost',
+ server: 'http://gateway-service',
+ },
+ upload: {
+ client: 'http://localhost/api/upload/files',
+ prefix: '/'
+ },
+ database: {
+ unsupported: '*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--',
+ image: {
+ width: 200,
+ height: 200
+ },
+ extra: ''
+ },
+ pid: {
+ default: {
+ publisher: 'Example University'
+ }
+ },
+ doi: {
+ enabled: false,
+ endpoint: 'https://doi.org'
+ },
+ links: {}
+ }
+ },
+
+ routeRules,
+
+ devServer: {
+ port: 3001
+ },
+
+ modules: [
+ '@artmizu/nuxt-prometheus',
+ '@nuxtjs/i18n',
+ '@pinia/nuxt',
+ '@pinia-plugin-persistedstate/nuxt'
+ ],
+
+ pinia: {
+ storesDirs: ['./stores/**'],
+ },
+
+ piniaPersistedstate: {
+ storage: 'localStorage'
+ },
+
+ i18n: {
+ lazy: false,
+ langDir: 'locales',
+ strategy: 'no_prefix',
+ defaultLocale: 'de',
+ locales: [
+ {
+ 'code': 'en',
+ 'file': 'en-US.json',
+ 'name': 'English (US)',
+ 'iso': 'en-US'
+ },
+ {
+ 'code': 'de',
+ 'file': 'de-AT.json',
+ 'name': 'German (AT)',
+ 'iso': 'de-AT'
+ }
+ ]
+
+ },
+
+ vite: {
+ server: {
+ proxy
+ },
+ vue: {
+ template: {
+ transformAssetUrls,
+ },
+ },
+ },
+
+ devtools: {enabled: true},
+ compatibilityDate: '2024-07-24'
})
diff --git a/dbrepo-ui/package.json b/dbrepo-ui/package.json
index a1ed44b93a9887fbe98bfd878ea5dd9aaf628262..5af18adf4d6bd4c58e0e1e89fdf02b8937bb05b3 100644
--- a/dbrepo-ui/package.json
+++ b/dbrepo-ui/package.json
@@ -12,6 +12,7 @@
},
"dependencies": {
"@artmizu/nuxt-prometheus": "^2.4.0",
+ "@date-fns/utc": "^2.1.0",
"@fontsource/open-sans": "^5.0.24",
"@mdi/font": "^7.4.47",
"@nuxtjs/robots": "^3.0.0",
@@ -37,7 +38,7 @@
"vue-meta": "^2.4.0",
"vue-toast-notification": "^3.1.2",
"vue3-ace-editor": "^2.2.4",
- "vuetify": "^3.5.7"
+ "vuetify": "^3.7.2"
},
"devDependencies": {
"@nuxtjs/i18n": "^8.1.1",
diff --git a/dbrepo-ui/pages/database/[database_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/info.vue
index e2b139fe8fd2a2616c7dae56b8383e502bdb95e3..432b14e21a60968048440da6f0084eb535aa06a7 100644
--- a/dbrepo-ui/pages/database/[database_id]/info.vue
+++ b/dbrepo-ui/pages/database/[database_id]/info.vue
@@ -45,22 +45,30 @@
<v-list-item
:title="$t('pages.database.name.title')"
density="compact">
- <div v-text="database.name" />
+ <div>
+ {{ database.name }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.database.internal-name.title')"
density="compact">
- <div v-text="database.internal_name" />
+ <div>
+ {{ database.internal_name }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.database.visibility.title')"
density="compact">
- <div v-text="`${database.is_public ? 'Public' : 'Private'}`" />
+ <div>
+ {{ database.is_public ? 'Public' : 'Private' }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.database.size.title')"
density="compact">
- <div v-text="databaseSize" />
+ <div>
+ {{ databaseSize }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.database.owner.title')"
@@ -74,7 +82,9 @@
<v-list-item
:title="$t('pages.database.created.title')"
density="compact">
- <div v-text="createdUTC" />
+ <div>
+ {{ createdUTC }}
+ </div>
</v-list-item>
<v-list-item
v-if="access && access.type"
@@ -87,9 +97,14 @@
inline
:content="databaseExtraInfo"
color="secondary">
- <span v-text="accessDescription.text" />
+ <span>
+ {{ accessDescription.text }}
+ </span>
</v-badge>
- <span v-else v-text="accessDescription.text" />
+ <span
+ v-else>
+ {{ accessDescription.text }}
+ </span>
</span>
</div>
</v-list-item>
@@ -97,9 +112,8 @@
v-if="access"
:title="$t('pages.database.connection.title')"
density="compact">
- <div>
- <pre class="pb-1" v-text="jdbcString" />
- </div>
+ <pre
+ class="pb-1">{{ jdbcString }}</pre>
</v-list-item>
<v-list-item
v-if="database.contact"
@@ -131,29 +145,39 @@
<v-list-item
:title="$t('pages.container.name.title')"
density="compact">
- <div v-text="container_name" />
+ <div>
+ {{ container_name }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.container.internal-name.title')"
density="compact">
- <div v-text="container_internal_name" />
+ <div>
+ {{ container_internal_name }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.container.image-name.title')"
density="compact">
- <div v-text="image_name" />
+ <div>
+ {{ image_name }}
+ </div>
</v-list-item>
<v-list-item
:title="$t('pages.container.image-tag.title')"
density="compact">
- <div v-text="image_version" />
+ <div>
+ {{ image_version }}
+ </div>
</v-list-item>
</v-list>
</v-card-text>
</v-card>
</v-window-item>
</v-window>
- <v-breadcrumbs :items="items" class="pa-0 mt-2" />
+ <v-breadcrumbs
+ :items="items"
+ class="pa-0 mt-2" />
</div>
</template>
diff --git a/dbrepo-ui/pages/database/[database_id]/settings.vue b/dbrepo-ui/pages/database/[database_id]/settings.vue
index 09c3d8263bc46bc74eb0fe34b8651e41c6214ccc..c205e8c431dc6851d9b9b21c0dc8adc916d9d7f5 100644
--- a/dbrepo-ui/pages/database/[database_id]/settings.vue
+++ b/dbrepo-ui/pages/database/[database_id]/settings.vue
@@ -89,15 +89,19 @@
:items="database.accesses"
:items-per-page="10">
<template v-slot:item.qualified_name="{ item }">
- <span v-if="item && item.user" v-text="item.user.qualified_name" />
+ <span
+ v-if="item && item.user">
+ {{ item.user.qualified_name }}
+ </span>
</template>
<template v-slot:item.action="{ item }">
<v-btn
v-if="item && item.user && item.user.username !== user.username"
size="x-small"
variant="flat"
+ color="warning"
:disabled="!canModifyAccess"
- :text="$t('pages.database.subpages.access.submit.text')"
+ :text="$t('navigation.modify')"
@click="modifyAccess(item)" />
</template>
</v-data-table>
@@ -107,7 +111,7 @@
variant="flat"
:disabled="!canCreateAccess"
color="warning"
- :text="$t('pages.database.subpages.access.submit.text')"
+ :text="$t('navigation.create')"
@click="giveAccess" />
</v-card-text>
</v-card>
@@ -422,7 +426,7 @@ export default {
this.$refs.form.validate()
},
closeDialog () {
- this.reloadDatabase()
+ this.cacheStore.reloadDatabase()
this.editAccessDialog = false
},
updateDatabaseVisibility () {
@@ -510,11 +514,11 @@ export default {
updateDatabaseOwner () {
this.loading = true
const databaseService = useDatabaseService()
- databaseService.updateOwner(this.$route.params.database_id, this.modifyOwner.id)
+ databaseService.updateOwner(this.$route.params.database_id, { id: this.modifyOwner.id })
.then(() => {
const toast = useToastInstance()
toast.success(this.$t('success.database.transfer'))
- location.reload()
+ this.$router.push(`/database/${this.$route.params.database_id}/info`)
})
.catch(() => {
this.loading = false
diff --git a/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/data.vue b/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/data.vue
index 4902e2c54f243c7a2e4f3df90f3aa16cf7c26753..b063317e074d69d97c99812a74cdd22a5d3feceb 100644
--- a/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/data.vue
+++ b/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/data.vue
@@ -11,8 +11,9 @@
color="secondary"
width="500" />
<span
- v-else
- v-text="executionUTC" />
+ v-else>
+ {{ executionUTC }}
+ </span>
</v-toolbar-title>
<v-spacer />
<v-btn
diff --git a/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/info.vue
index 1d9101fbf240d8d577026e53361f2cedb8f6486e..01620ea35eebf78969c6353b9ccaa0e7e9fdfb05 100644
--- a/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/info.vue
+++ b/dbrepo-ui/pages/database/[database_id]/subset/[subset_id]/info.vue
@@ -52,7 +52,7 @@
<v-list-item
:title="$t('pages.subset.query-hash.title')"
density="compact">
- <pre v-text="`${$t('pages.subset.query-hash.prefix')}${subset.query_hash}`" />
+ <pre>{{ $t('pages.subset.query-hash.prefix') }}{{ subset.query_hash }}</pre>
</v-list-item>
<v-list-item
v-if="executionUTC"
@@ -63,7 +63,7 @@
<v-list-item
:title="$t('pages.subset.result-hash.title')"
density="compact">
- <pre v-text="result_hash" />
+ <pre>{{ result_hash }}</pre>
</v-list-item>
<v-list-item
:title="$t('pages.subset.result-rows.title')"
@@ -90,8 +90,9 @@
:title="$t('pages.database.name.title')">
<NuxtLink
class="text-primary"
- :to="`/database/${database.id}`"
- v-text="database.internal_name" />
+ :to="`/database/${database.id}`">
+ {{ database.internal_name }}
+ </NuxtLink>
</v-list-item>
</v-list>
</v-card-text>
diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue
index bcab9b60be8812f270836644e5f521553a22040d..e9173726e96af147ab849aa2fcd4515484c03825 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/data.vue
@@ -50,7 +50,7 @@
:prepend-icon="$vuetify.display.lgAndUp ? 'mdi-update' : null"
variant="flat"
:text="$t('toolbars.table.data.version')"
- class="ml-2"
+ class="ml-2 mr-2"
@click.stop="pick" />
</v-toolbar>
<TimeDrift />
@@ -60,8 +60,9 @@
<v-card
v-if="error"
variant="flat">
- <v-card-text
- v-text="$t('error.table.connection')" />
+ <v-card-text>
+ {{ $t('error.table.connection') }}
+ </v-card-text>
</v-card>
<v-data-table-server
v-if="!error"
@@ -75,6 +76,7 @@
:loading="loadingData || loadingCount"
:options.sync="options"
:footer-props="footerProps"
+ :items-per-page-options="footerProps.itemsPerPageOptions"
@update:options="loadData">
<template
v-for="(blobColumn, idx) in blobColumns"
@@ -346,6 +348,7 @@ export default {
const tableService = useTableService()
tableService.exportData(this.$route.params.database_id, this.$route.params.table_id)
.then((data) => {
+ this.downloadLoading = false
const url = URL.createObjectURL(data)
const link = document.createElement('a')
link.href = url
diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue
index 08b42c0d936c7e034b67e09edbd07203edde12d7..0221c64df232721f3a81b6bf2641ad37ce6fbf32 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/info.vue
@@ -67,9 +67,14 @@
inline
color="secondary"
:content="brokerExtraInfo">
- <span v-text="accessDescription" />
+ <span>
+ {{ accessDescription }}
+ </span>
</v-badge>
- <span v-else v-text="accessDescription" />
+ <span
+ v-else>
+ {{ accessDescription}}
+ </span>
</span>
</v-list-item>
</v-list>
@@ -87,7 +92,9 @@
dense>
<v-list-item
:title="$t('pages.table.protocol.title')">
- <span v-text="$t('pages.table.protocol.name')" />
+ <span>
+ {{ $t('pages.table.protocol.name') }}
+ </span>
</v-list-item>
<v-list-item
:title="$t('pages.table.exchange.title')">
@@ -100,7 +107,7 @@
<v-list-item
:title="$t('pages.table.routing-key.title')">
<div v-if="table.routing_key">
- <pre v-text="table.routing_key" />
+ <pre>{{ table.routing_key }}</pre>
</div>
</v-list-item>
<v-list-item
@@ -113,8 +120,7 @@
:content="port.secure ? $t('pages.table.connection.secure') : $t('pages.table.connection.insecure')"
:color="port.secure ? 'success' : ''">
<pre
- class="pb-1"
- v-text="amqpString(port)" />
+ class="pb-1">{{ amqpString(port) }}</pre>
</v-badge>
</p>
</v-list-item>
@@ -137,8 +143,9 @@
:title="$t('pages.database.name.title')">
<NuxtLink
class="text-primary"
- :to="`/database/${database.id}`"
- v-text="database.internal_name" />
+ :to="`/database/${database.id}`">
+ {{ database.internal_name }}
+ </NuxtLink>
</v-list-item>
</v-list>
</v-card-text>
diff --git a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/schema.vue b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/schema.vue
index 3a821a730b50c6292f603b67c8b666add18aaa08..65b6034348399844ddc8f195da9f9cc828056efa 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/[table_id]/schema.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/[table_id]/schema.vue
@@ -20,15 +20,14 @@
:items="table.columns">
<template v-slot:item.is_null_allowed="{ item }">
<span
- v-if="item.is_null_allowed"
- v-text="$t('pages.table.subpages.schema.bullet')" /> {{ item.is_null_allowed }}
+ v-if="item.is_null_allowed">
+ {{ $t('pages.table.subpages.schema.bullet') }}
+ </span>
+ {{ item.is_null_allowed }}
</template>
<template v-slot:item.extra="{ item }">
<pre>{{ extra(item) }}</pre>
</template>
- <template v-slot:item.auto_generated="{ item }">
- <span v-if="item.auto_generated">●</span> {{ item.auto_generated }}
- </template>
<template v-slot:item.column_concept="{ item }">
<v-btn
v-if="canAssignSemanticInformation && !hasConcept(item)"
@@ -47,8 +46,9 @@
@click="pick(item, 'concept')" />
<a
v-if="!canAssignSemanticInformation && hasConcept(item)"
- :href="item.concept.uri"
- v-text="item.concept.name ? item.concept.name : item.concept.uri" />
+ :href="item.concept.uri">
+ {{ item.concept.name ? item.concept.name : item.concept.uri }}
+ </a>
</template>
<template v-slot:item.column_unit="{ item }">
<v-btn
@@ -68,8 +68,9 @@
@click="pick(item, 'unit')" />
<a
v-if="!canAssignSemanticInformation && hasUnit(item)"
- :href="item.unit.uri"
- v-text="item.unit.name ? item.unit.name : item.unit.uri" />
+ :href="item.unit.uri">
+ {{ item.unit.name ? item.unit.name : item.unit.uri }}
+ </a>
</template>
</v-data-table>
</v-card>
@@ -84,18 +85,18 @@
<ul>
<li v-if="table.constraints.primary_key.length > 0">
<strong>PRIMARY KEY</strong>
- (<i v-text="primaryKeysColumns" />)
+ (<i>{{ primaryKeysColumns }}</i>)
</li>
<li v-for="(foreignKey, i) in table.constraints.foreign_keys" :key="`fk-${i}`">
- <strong>FOREIGN KEY</strong> <span v-text="foreignKey.name" /> (<i v-text="foreignKeyColumns(foreignKey)" />) <strong>REFERENCES</strong> <a :href="`/database/${database.id}/table/${foreignKey.referenced_table.id}/schema`" v-text="foreignKeyReferencedTable(foreignKey)" /> (<i v-text="foreignKeyReferencedColumns(foreignKey)" />)
+ <strong>FOREIGN KEY</strong> <span>{{ foreignKey.name }}</span> (<i>{{ foreignKeyColumns(foreignKey) }}</i>) <strong>REFERENCES</strong> <a :href="`/database/${database.id}/table/${foreignKey.referenced_table.id}/schema`">{{ foreignKeyReferencedTable(foreignKey) }}</a> (<i>{{ foreignKeyReferencedColumns(foreignKey) }}</i>)
</li>
<li v-for="(uniqueConstraint, i) in table.constraints.uniques" :key="`uk-${i}`">
<strong>UNIQUE INDEX</strong>
- (<i v-text="uniqueColumns(uniqueConstraint)" />)
+ (<i>{{ uniqueColumns(uniqueConstraint) }}</i>)
</li>
<li v-for="(checkConstraint, i) in table.constraints.checks" :key="`uk-${i}`">
<strong>CHECK CONSTRAINT</strong>
- (<i v-text="checkConstraint" />)
+ (<i>{{ checkConstraint }}</i>)
</li>
</ul>
</v-container>
@@ -163,7 +164,6 @@ export default {
{ value: 'column_concept', title: this.$t('pages.table.subpages.schema.concept.title') },
{ value: 'column_unit', title: this.$t('pages.table.subpages.schema.unit.title') },
{ value: 'is_null_allowed', title: this.$t('pages.table.subpages.schema.nullable.title') },
- { value: 'auto_generated', title: this.$t('pages.table.subpages.schema.sequence.title') },
{ value: 'description', title: this.$t('pages.table.subpages.schema.description.title') },
],
dateColumns: [],
@@ -217,12 +217,20 @@ export default {
},
methods: {
extra (column) {
- if (['date', 'datetime', 'timestamp', 'time'].includes(column.column_type)) {
- return `fsp=${column.date_format.unix_format}`
- } else if (column.column_type === 'float') {
- return `p=${column.size}`
+ if (column.column_type === 'float') {
+ return `precision=${column.size}`
} else if (['decimal', 'double'].includes(column.column_type)) {
- return `size=${column.size} d=${column.d}`
+ let extra = ''
+ if (column.size !== null) {
+ extra += `size=${column.size}`
+ }
+ if (column.d !== null) {
+ if (extra.length > 0) {
+ extra += ', '
+ }
+ extra += `d=${column.d}`
+ }
+ return extra
} else if (column.column_type === 'enum') {
return `(${column.enums.join(', ')})`
} else if (column.column_type === 'set') {
diff --git a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
index c3b5a38c7ab8f95892ecf496325d8365dd5f1fcb..c54314abcba4d714426e4990527d1a53b3a287d6 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/create/dataset.vue
@@ -22,8 +22,9 @@
color="info">
{{ $t('pages.table.subpages.import.dataset.text') }}
<NuxtLink
- :href="`/database/${$route.params.database_id}/table/create/schema`"
- v-text="$t('pages.table.subpages.import.schema.text')" />
+ :href="`/database/${$route.params.database_id}/table/create/schema`">
+ {{ $t('pages.table.subpages.import.schema.text') }}
+ </NuxtLink>
</v-alert>
</v-col>
</v-row>
@@ -140,7 +141,9 @@
border="start"
color="success">
{{ $t('pages.table.subpages.create.summary.text') }}
- <strong v-text="table.internal_name"/>
+ <strong>
+ {{ table.internal_name }}
+ </strong>
</v-alert>
</v-col>
</v-row>
@@ -241,9 +244,6 @@ export default {
tableImport: {
location: null,
quote: '"',
- false_element: null,
- true_element: null,
- null_element: '',
separator: ',',
line_termination: null,
skip_lines: 1
@@ -364,9 +364,6 @@ export default {
this.tableImport.separator = separator
this.tableImport.skip_lines = skip_lines
this.tableImport.quote = quote
- this.tableImport.null_element = null_element
- this.tableImport.true_element = true_element
- this.tableImport.false_element = false_element
if (filename) {
this.step = 4
}
diff --git a/dbrepo-ui/pages/database/[database_id]/table/create/schema.vue b/dbrepo-ui/pages/database/[database_id]/table/create/schema.vue
index 6642e89bf41e31326a42b5bae1e1100e0f04f5fb..57f943f22b36ee21f858f15120d5ca812b8b8bfc 100644
--- a/dbrepo-ui/pages/database/[database_id]/table/create/schema.vue
+++ b/dbrepo-ui/pages/database/[database_id]/table/create/schema.vue
@@ -116,8 +116,9 @@
<v-col md="8">
<v-alert
border="start"
- color="success"
- v-text="$t('pages.table.subpages.schema.summary.text') + ' ' + table.internal_name" />
+ color="success">
+ {{ $t('pages.table.subpages.schema.summary.text') + ' ' + table.internal_name }}
+ </v-alert>
</v-col>
</v-row>
<v-row>
@@ -269,13 +270,13 @@ export default {
this.cacheStore.reloadDatabase()
this.table = table
})
- .catch(({code}) => {
+ .catch(({code, message}) => {
this.loading = false
const toast = useToastInstance()
if (typeof code !== 'string') {
return
}
- toast.error(this.$t(code))
+ toast.error(message)
})
.finally(() => {
this.loading = false
diff --git a/dbrepo-ui/pages/database/[database_id]/view/[view_id]/data.vue b/dbrepo-ui/pages/database/[database_id]/view/[view_id]/data.vue
index 838ef2f0f1adf0a90f722ffd73d43457a5b92186..60bfe33a13f367ba88349a94a7808567dbde92d3 100644
--- a/dbrepo-ui/pages/database/[database_id]/view/[view_id]/data.vue
+++ b/dbrepo-ui/pages/database/[database_id]/view/[view_id]/data.vue
@@ -6,11 +6,19 @@
color="secondary"
:title="$t('toolbars.database.current')"
flat>
+ <v-btn
+ v-if="canDownload"
+ :prepend-icon="$vuetify.display.lgAndUp ? 'mdi-download' : null"
+ variant="flat"
+ :loading="downloadLoading"
+ :text="$t('toolbars.table.data.download')"
+ class="mr-2"
+ @click.stop="download" />
<v-btn
:prepend-icon="$vuetify.display.lgAndUp ? 'mdi-refresh' : null"
variant="flat"
:text="$t('toolbars.table.data.refresh')"
- class="mb-1 mr-2"
+ class="mr-2"
:loading="loadingData"
@click="reload" />
</v-toolbar>
@@ -29,7 +37,6 @@
<script>
import TimeDrift from '@/components/TimeDrift.vue'
import QueryResults from '@/components/subset/Results.vue'
-import { useCacheStore } from '@/stores/cache'
export default {
components: {
@@ -39,6 +46,7 @@ export default {
data () {
return {
loadingData: false,
+ downloadLoading: false,
items: [
{
title: this.$t('navigation.databases'),
@@ -73,6 +81,21 @@ export default {
return null
}
return this.database.views.filter(v => v.id === Number(this.$route.params.view_id))[0]
+ },
+ access () {
+ return this.userStore.getAccess
+ },
+ canDownload () {
+ if (!this.view) {
+ return false
+ }
+ if (this.view.is_public) {
+ return true
+ }
+ if (!this.access) {
+ return false
+ }
+ return this.access.type === 'read' || this.access.type === 'write_own' || this.access.type === 'write_all'
}
},
mounted () {
@@ -82,6 +105,31 @@ export default {
reload () {
this.$refs.queryResults.reExecute(Number(this.$route.params.view_id))
this.$refs.queryResults.reExecuteCount(Number(this.$route.params.view_id))
+ },
+ download () {
+ this.downloadLoading = true
+ const viewService = useViewService()
+ viewService.exportData(this.$route.params.database_id, this.$route.params.view_id)
+ .then((data) => {
+ this.downloadLoading = false
+ const url = URL.createObjectURL(data)
+ const link = document.createElement('a')
+ link.href = url
+ link.download = 'view.csv'
+ document.body.appendChild(link)
+ link.click()
+ })
+ .catch(({code}) => {
+ this.downloadLoading = false
+ const toast = useToastInstance()
+ if (typeof code !== 'string') {
+ return
+ }
+ toast.error(this.$t(code))
+ })
+ .finally(() => {
+ this.downloadLoading = false
+ })
}
}
}
diff --git a/dbrepo-ui/pages/database/[database_id]/view/[view_id]/info.vue b/dbrepo-ui/pages/database/[database_id]/view/[view_id]/info.vue
index 3ec97f2bdaec1109edc16f1bedf0ee22b07a1f52..064fa5f3f20f0c9e1be84fc010e215745834d278 100644
--- a/dbrepo-ui/pages/database/[database_id]/view/[view_id]/info.vue
+++ b/dbrepo-ui/pages/database/[database_id]/view/[view_id]/info.vue
@@ -65,8 +65,9 @@
:title="$t('pages.database.name.title')">
<NuxtLink
class="text-primary"
- :to="`/database/${database.id}`"
- v-text="database.internal_name" />
+ :to="`/database/${database.id}`">
+ {{ database.internal_name }}
+ </NuxtLink>
</v-list-item>
</v-list>
</v-card-text>
diff --git a/dbrepo-ui/pages/index.vue b/dbrepo-ui/pages/index.vue
index 93c48e189938bd75ff9c93c956163de0a18379ca..037f5b9410f316cce4e24ec2a9d45c6d6615a741 100644
--- a/dbrepo-ui/pages/index.vue
+++ b/dbrepo-ui/pages/index.vue
@@ -11,7 +11,7 @@
prepend-icon="mdi-plus"
variant="flat"
:text="$t('toolbars.database.create.text')"
- color="primary"
+ color="secondary"
@click.stop="dialog = true" />
</v-toolbar>
<DatabaseList
diff --git a/dbrepo-ui/pages/search.vue b/dbrepo-ui/pages/search.vue
index fe427b25efa416f242eac5405cecdfb9cb7379a1..ebe16ecec1c159de639a6c735b8f806dda1da21f 100644
--- a/dbrepo-ui/pages/search.vue
+++ b/dbrepo-ui/pages/search.vue
@@ -2,17 +2,19 @@
<div>
<v-toolbar
variant="flat">
- <v-toolbar-title
- v-text="header" />
+ <v-toolbar-title>
+ {{ header }}
+ </v-toolbar-title>
<v-spacer />
<v-btn
v-if="canCreateDatabase"
class="mr-4"
prepend-icon="mdi-plus"
- :text="$t('toolbars.database.create.text')"
- color="primary"
+ color="secondary"
variant="flat"
- @click.stop="createDbDialog = true" />
+ @click.stop="createDbDialog = true">
+ {{ $t('toolbars.database.create.text') }}
+ </v-btn>
</v-toolbar>
<v-card
rounded="0"
@@ -25,7 +27,7 @@
v-if="isDatabaseSearch"
:loading="loading"
:databases="results" />
- <div v-else>
+ <div>
<v-card
v-for="(result, idx) in results"
:key="idx"
@@ -36,10 +38,16 @@
<v-divider class="mx-4" />
<v-card-title
class="text-primary text-decoration-underline">
- <a v-if="link(result)" :href="link(result)">{{ title(result) }}</a>
- <span v-else>{{ title(result) }}</span>
+ <a v-if="link(result)" :href="link(result)">
+ {{ title(result) }}
+ </a>
+ <span v-else>
+ {{ title(result) }}
+ </span>
</v-card-title>
- <v-card-subtitle v-text="description(result)" />
+ <v-card-subtitle>
+ {{ description(result) }}
+ </v-card-subtitle>
<v-card-text>
<div
v-if="tags(result).length > 0"
@@ -49,8 +57,9 @@
:key="i"
size="small"
:color="tag.color"
- variant="outlined"
- v-text="tag.text" />
+ variant="outlined">
+ {{ tag.text }}
+ </v-chip>
</div>
</v-card-text>
</v-card>
diff --git a/dbrepo-ui/pages/semantic/index.vue b/dbrepo-ui/pages/semantic/index.vue
index f6b6721b17c28d1bc5f30d2885ee253139d96a0c..480483aaf83bf68911090c1f7dcdbe051542676d 100644
--- a/dbrepo-ui/pages/semantic/index.vue
+++ b/dbrepo-ui/pages/semantic/index.vue
@@ -1,7 +1,9 @@
<template>
<div v-if="canListOntologies">
<v-toolbar flat>
- <v-toolbar-title v-text="$t('pages.semantics.title')" />
+ <v-toolbar-title>
+ {{ $t('pages.semantics.title') }}
+ </v-toolbar-title>
<v-spacer />
<v-btn
v-if="canListOntologies"
@@ -13,10 +15,12 @@
<v-tabs
v-model="tab"
color="primary">
- <v-tab
- v-text="$t('toolbars.semantic.ontologies.concepts')" />
- <v-tab
- v-text="$t('toolbars.semantic.ontologies.units')" />
+ <v-tab>
+ {{ $t('toolbars.semantic.ontologies.concepts') }}
+ </v-tab>
+ <v-tab>
+ {{ $t('toolbars.semantic.ontologies.units') }}
+ </v-tab>
</v-tabs>
</template>
</v-toolbar>
@@ -27,9 +31,13 @@
:items="rows"
:options.sync="options"
:server-items-length="total"
- :footer-props="footerProps">
+ :footer-props="footerProps"
+ :items-per-page-options="footerProps.itemsPerPageOptions">
<template v-slot:item.uri="{ item }">
- <a :href="item.uri" target="_blank" v-text="item.uri" />
+ <a :href="item.uri"
+ target="_blank">
+ {{ item.uri }}
+ </a>
</template>
<template v-slot:item.action="{ item }">
<v-btn
@@ -83,7 +91,7 @@ export default {
},
total: -1,
footerProps: {
- 'items-per-page-options': [10, 20, 30, 40, 50]
+ itemsPerPageOptions: [10, 25, 50, 100]
},
tab: 0,
tabs: [
diff --git a/dbrepo-ui/pages/semantic/ontology/_ontology_id/index.vue b/dbrepo-ui/pages/semantic/ontology/_ontology_id/index.vue
index 41cfa20426c6d51a12f656ef7cd40bc0dff45405..108ef73e4bfdb6d6f79357c341808dc264302123 100644
--- a/dbrepo-ui/pages/semantic/ontology/_ontology_id/index.vue
+++ b/dbrepo-ui/pages/semantic/ontology/_ontology_id/index.vue
@@ -1,20 +1,38 @@
<template>
- <div v-if="canListOntologies">
+ <div
+ v-if="canListOntologies">
<v-toolbar flat>
<v-toolbar-title>
- <v-btn id="back-btn" plain class="mr-2" to="/semantic/ontology">
+ <v-btn
+ id="back-btn"
+ plain
+ class="mr-2"
+ to="/semantic/ontology">
<v-icon left>mdi-arrow-left</v-icon>
</v-btn>
</v-toolbar-title>
<v-toolbar-title>
- <v-skeleton-loader v-if="loading" type="text" class="skeleton-small" />
+ <v-skeleton-loader
+ v-if="loading"
+ type="text"
+ class="skeleton-small" />
<span v-if="!loading">
- Ontology <a v-if="ontology" :href="ontology.uri" target="_blank" v-text="ontology.uri" />
+ Ontology
+ <a
+ v-if="ontology"
+ :href="ontology.uri"
+ target="_blank">
+ {{ ontology.uri }}
+ </a>
</span>
</v-toolbar-title>
<v-spacer />
<v-toolbar-title>
- <v-btn v-if="canDeleteOntology" :loading="loadingDelete" color="error" @click="deleteOntology">
+ <v-btn
+ v-if="canDeleteOntology"
+ :loading="loadingDelete"
+ color="error"
+ @click="deleteOntology">
Delete Ontology
</v-btn>
</v-toolbar-title>
diff --git a/dbrepo-ui/pages/semantic/ontology/index.vue b/dbrepo-ui/pages/semantic/ontology/index.vue
index c4c5291aefcce046d401c4986fee05a530d897fa..a19b5216c14650cac687b502b2e47706b37ace0a 100644
--- a/dbrepo-ui/pages/semantic/ontology/index.vue
+++ b/dbrepo-ui/pages/semantic/ontology/index.vue
@@ -6,8 +6,9 @@
size="small"
icon="mdi-arrow-left"
to="/semantic" />
- <v-toolbar-title
- v-text="ontologies.length + ' ' + $t('toolbars.semantic.ontologies.title')" />
+ <v-toolbar-title>
+ {{ ontologies.length + ' ' + $t('toolbars.semantic.ontologies.title') }}
+ </v-toolbar-title>
<v-spacer />
<v-btn
v-if="canCreateOntology"
diff --git a/dbrepo-ui/plugins/vuetify.ts b/dbrepo-ui/plugins/vuetify.ts
index 8f48e315dda516f320283f4b52e262d4e6d6f4ac..e942e529f50cbb6f7eddd9d63080a751006aaa94 100644
--- a/dbrepo-ui/plugins/vuetify.ts
+++ b/dbrepo-ui/plugins/vuetify.ts
@@ -4,6 +4,7 @@ import colors from 'vuetify/util/colors'
import * as components from 'vuetify/components'
import * as directives from 'vuetify/directives'
import '@mdi/font/css/materialdesignicons.css'
+import {rgbParse} from "@kurkle/color";
const tuwThemeLight: ThemeDefinition = {
dark: false,
diff --git a/dbrepo-ui/test/test_heap.sh b/dbrepo-ui/test/test_heap.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d3ed8722cdc1dacdf4678459a847a1488595fd2b
--- /dev/null
+++ b/dbrepo-ui/test/test_heap.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+CALLS=${CALLS:-1000}
+CONCURRENCY=${CONCURRENCY:-10}
+ENDPOINT=${ENDPOINT:-http://localhost}
+
+echo "[DEBUG] Testing endpoint: ${ENDPOINT} x${CALLS} (concurrency ${CONCURRENCY})"
+ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/"
+ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/search"
+ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/login"
+ab -n "${CALLS}" -c "${CONCURRENCY}" "${ENDPOINT}/signup"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6b412ac7d8153c3c75b166177252dc88e336f656..e8cec6aa893092b08fe98a1dc352fa4d5c378aa0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,13 +7,15 @@ volumes:
search-db-data:
storage-service-data:
identity-service-data:
+ metric-db-data:
+ dashboard-service-data:
services:
dbrepo-metadata-db:
restart: "no"
container_name: dbrepo-metadata-db
hostname: metadata-db
- image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
+ image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8
volumes:
- metadata-db-data:/bitnami/mariadb
- ./dbrepo-metadata-db/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
@@ -23,6 +25,7 @@ services:
environment:
MARIADB_DATABASE: "${METADATA_DB:-dbrepo}"
MARIADB_ROOT_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
+ MARIADB_GALERA_MARIABACKUP_PASSWORD: "${METADATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck:
test: mysqladmin ping --user=root --password="${METADATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
@@ -35,7 +38,7 @@ services:
restart: "no"
container_name: dbrepo-data-db
hostname: data-db
- image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
+ image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r8
volumes:
- data-db-data:/bitnami/mariadb
- "${SHARED_VOLUME:-/tmp}:/tmp"
@@ -43,6 +46,7 @@ services:
- "3307:3306"
environment:
MARIADB_ROOT_PASSWORD: "${DATA_DB_PASSWORD:-dbrepo}"
+ MARIADB_GALERA_MARIABACKUP_PASSWORD: "${DATA_DB_BACKUP_PASSWORD:-dbrepobackup}"
healthcheck:
test: mysqladmin ping --user=root --password="${DATA_DB_PASSWORD:-dbrepo}" --silent
interval: 10s
@@ -55,16 +59,18 @@ services:
restart: "no"
container_name: dbrepo-auth-db
hostname: auth-db
- image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
+ image: docker.io/bitnami/postgresql:17.0.0-debian-12-r1
volumes:
- - auth-db-data:/bitnami/mariadb
+ - auth-db-data:/bitnami/postgresql
ports:
- - "3308:3306"
+ - "5432:5432"
environment:
- MARIADB_DATABASE: "${AUTH_DB_NAME:-keycloak}"
- MARIADB_ROOT_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+ POSTGRESQL_DATABASE: "${AUTH_DB_NAME:-keycloak}"
+ POSTGRESQL_USERNAME: "${AUTH_DB_USERNAME:-keycloak}"
+ POSTGRESQL_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+ PGPASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: mysqladmin ping --user=root --password="${AUTH_DB_PASSWORD:-dbrepo}" --silent
+ test: "psql -U ${AUTH_DB_USERNAME:-keycloak} -h 127.0.0.1 -p 5432 -d ${AUTH_DB_NAME:-keycloak} -c 'select version();'"
interval: 15s
timeout: 5s
retries: 12
@@ -75,23 +81,26 @@ services:
restart: "no"
container_name: dbrepo-auth-service
hostname: auth-service
- image: dbrepo-auth-service:latest
+ image: bitnami/keycloak:26.0.0-debian-12-r1
+ volumes:
+ - ./dbrepo-auth-service/import-realms.sh:/docker-entrypoint-initdb.d/import-realms.sh
+ - ./dbrepo-auth-service/master-realm.json:/opt/keycloak/data/import/master-realm.json
+ - ./dbrepo-auth-service/dbrepo-realm.json:/opt/keycloak/data/import/dbrepo-realm.json
ports:
- "8080:8080"
- build:
- context: ./dbrepo-auth-service
- network: host
+ environment:
+ KEYCLOAK_ENABLE_HTTPS: "false"
+ KEYCLOAK_ENABLE_STATISTICS: "true"
+ KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: "true"
+ KEYCLOAK_DATABASE_HOST: "auth-db"
+ KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}"
+ KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
+ KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
healthcheck:
- test: curl -sSL 'http://0.0.0.0:8080/realms/dbrepo' | grep "dbrepo" || exit 1
- interval: 15s
+ test: curl --head -fsS http://localhost:9000/health/ready
+ interval: 10s
timeout: 5s
retries: 12
- environment:
- AUTH_DB: "${AUTH_DB:-keycloak}"
- KC_DB_USERNAME: root
- KC_DB_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
- KEYCLOAK_ADMIN: "${AUTH_SERVICE_ADMIN_USERNAME:-admin}"
- KEYCLOAK_ADMIN_PASSWORD: "${AUTH_SERVICE_ADMIN_PASSWORD:-admin}"
depends_on:
dbrepo-identity-service:
condition: service_healthy
@@ -203,16 +212,19 @@ services:
restart: "no"
container_name: dbrepo-broker-service
hostname: broker-service
- image: docker.io/bitnami/rabbitmq:3.12-debian-12
+ image: docker.io/bitnami/rabbitmq:3.13.7-debian-12-r4
ports:
- 15672:15672
- 5672:5672
+ - 1883:1883
volumes:
- ./dbrepo-broker-service/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
- ./dbrepo-broker-service/advanced.config:/etc/rabbitmq/advanced.config
- ./dbrepo-broker-service/enabled_plugins:/etc/rabbitmq/enabled_plugins
- ./dbrepo-broker-service/definitions.json:/app/definitions.json
- broker-service-data:/bitnami/rabbitmq/mnesia
+ environment:
+ RABBITMQ_FEATURE_FLAGS: mqtt_v5
depends_on:
dbrepo-identity-service:
condition: service_healthy
@@ -272,6 +284,11 @@ services:
OPENSEARCH_USERNAME: ${SEARCH_DB_USERNAME:-admin}
OPENSEARCH_PASSWORD: ${SEARCH_DB_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-info}
+ healthcheck:
+ test: curl -sSL localhost:8080/health | grep 'UP' || exit 1
+ interval: 10s
+ timeout: 5s
+ retries: 12
dbrepo-data-db-sidecar:
restart: "no"
@@ -316,11 +333,11 @@ services:
NUXT_PUBLIC_UPLOAD_CLIENT: "${BASE_URL:-http://localhost}/api/upload/files"
depends_on:
dbrepo-search-service:
- condition: service_started
- dbrepo-storage-service:
+ condition: service_healthy
+ dbrepo-upload-service:
condition: service_healthy
healthcheck:
- test: wget -qO- localhost:3000 | grep "Database Repository" || exit 1
+ test: curl -fsSL http://127.0.0.1:3000 && curl -fsSL http://127.0.0.1:3000/health
interval: 10s
timeout: 5s
retries: 12
@@ -340,12 +357,8 @@ services:
depends_on:
dbrepo-analyse-service:
condition: service_healthy
- dbrepo-auth-service:
- condition: service_healthy
dbrepo-broker-service:
condition: service_healthy
- dbrepo-dashboard-service:
- condition: service_healthy
dbrepo-metadata-service:
condition: service_healthy
dbrepo-search-db:
@@ -381,6 +394,7 @@ services:
dbrepo-search-service-init:
restart: "no"
+ init: true
container_name: dbrepo-search-service-init
hostname: search-service-init
image: dbrepo-search-service-init:latest
@@ -428,6 +442,9 @@ services:
image: bitnami/prometheus:2.54.1-debian-12-r4
volumes:
- ./dbrepo-metric-db/prometheus.yml:/etc/prometheus/prometheus.yml
+ - metric-db-data:/opt/bitnami/prometheus/data
+ ports:
+ - 9090:9090
healthcheck:
test: promtool check healthy
interval: 10s
@@ -440,16 +457,15 @@ services:
restart: "no"
container_name: dbrepo-dashboard-service
hostname: dashboard-service
- image: docker.io/bitnami/grafana:11.2.0-debian-12-r4
+ image: dbrepo-dashboard-service:latest
+ build:
+ context: ./dbrepo-dashboard-service
+ network: host
+ ports:
+ - "3000:3000"
volumes:
- - ./dbrepo-dashboard-service/dashboards:/app/dashboards
- - ./dbrepo-dashboard-service/provisioning:/etc/grafana/provisioning
- - ./dbrepo-dashboard-service/grafana.ini:/etc/grafana/grafana.ini
- - ./dbrepo-dashboard-service/ldap.toml:/etc/grafana/ldap.toml
+ - dashboard-service-data:/opt/bitnami/grafana/data
environment:
- GF_SERVER_DOMAIN: "dashboard-service"
- GF_SERVER_ROOT_URL: "${BASE_URL:-http://localhost}/dashboard/"
- GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true"
LDAP_ADMIN_USERNAME: "${IDENTITY_SERVICE_ADMIN_USERNAME:-admin}"
LDAP_ADMIN_PASSWORD: "${IDENTITY_SERVICE_ADMIN_PASSWORD:-admin}"
LDAP_ROOT: "${IDENTITY_SERVICE_ROOT:-dc=dbrepo,dc=at}"
@@ -466,6 +482,7 @@ services:
dbrepo-storage-service-init:
restart: "no"
+ init: true
container_name: dbrepo-storage-service-init
hostname: storage-service-init
image: dbrepo-storage-service-init:latest
@@ -530,7 +547,7 @@ services:
BROKER_HOST: "${BROKER_ENDPOINT:-broker-service}"
BROKER_PASSWORD: "${SYSTEM_PASSWORD:-admin}"
BROKER_PORT: ${BROKER_PORT:-5672}
- BROKER_SERVICE_ENDPOINT: "${BROKER_SERVICE_ENDPOINT:-http://gateway-service/admin/broker}"
+ BROKER_SERVICE_ENDPOINT: "${BROKER_SERVICE_ENDPOINT:-http://broker-service:15672}"
BROKER_USERNAME: "${SYSTEM_USERNAME:-admin}"
BROKER_VIRTUALHOST: "${BROKER_VIRTUALHOST:-dbrepo}"
CONNECTION_TIMEOUT: ${CONNECTION_TIMEOUT:-60000}
diff --git a/helm/dbrepo/Chart.lock b/helm/dbrepo/Chart.lock
index 842d2c5ef663269a4574172661aba8d98d1b55f8..0937dd527af328b079b719db542efa264c410368 100644
--- a/helm/dbrepo/Chart.lock
+++ b/helm/dbrepo/Chart.lock
@@ -7,7 +7,7 @@ dependencies:
version: 21.6.1
- name: dbrepo-mariadb-galera
repository: file://../dbrepo-mariadb-galera
- version: 1.4.6
+ version: 1.4.7
- name: mariadb-galera
repository: https://charts.bitnami.com/bitnami
version: 10.1.3
@@ -25,9 +25,9 @@ dependencies:
version: 4.2.5
- name: grafana
repository: https://charts.bitnami.com/bitnami
- version: 11.3.20
+ version: 10.1.1
- name: prometheus
repository: https://charts.bitnami.com/bitnami
version: 1.3.22
-digest: sha256:8f67589f08da255fba018e5a8eec1c0ae736a5ee775d958eee9b45a5bda57f0a
-generated: "2024-09-27T09:21:08.969905261+02:00"
+digest: sha256:840d2ea4b1e36fe8fa399fc4170b6274a3de161c13a4a1a3b18ce3107ab71f79
+generated: "2024-10-01T07:48:55.174297756+02:00"
diff --git a/helm/dbrepo/Chart.yaml b/helm/dbrepo/Chart.yaml
index bf69c2237fbb3101631b80244a769a5031507e79..9e09e7f8e37033cc9c8ff2fa4f1776f43212c59c 100644
--- a/helm/dbrepo/Chart.yaml
+++ b/helm/dbrepo/Chart.yaml
@@ -6,8 +6,8 @@ description: Helm Chart for installing DBRepo
sources:
- https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
type: application
-version: "1.4.6"
-appVersion: "1.4.6"
+version: "1.4.7"
+appVersion: "1.4.7"
keywords:
- dbrepo
maintainers:
@@ -28,7 +28,7 @@ dependencies:
condition: authservice.enabled
- name: dbrepo-mariadb-galera
alias: datadb
- version: 1.4.6
+ version: 1.4.7
repository: file://../dbrepo-mariadb-galera
condition: datadb.enabled
- name: mariadb-galera
@@ -58,7 +58,7 @@ dependencies:
condition: identityservice.enabled
- name: grafana
alias: dashboardservice
- version: 11.3.20
+ version: 10.1.1
repository: https://charts.bitnami.com/bitnami
condition: dashboardservice.enabled
- name: prometheus
diff --git a/helm/dbrepo/README.md b/helm/dbrepo/README.md
index 53d920f47e1462e5203dc56222b25263bc928f8c..8c479003df6c435f27bc999d2c181bdd2daa11b1 100644
--- a/helm/dbrepo/README.md
+++ b/helm/dbrepo/README.md
@@ -1,16 +1,17 @@
# DBRepo Helm chart
-[DBRepo](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.4/) is a database repository system that
+[DBRepo](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/) is a database repository system that
allows researchers to ingest data into a central, versioned repository through common interfaces.
## TL;DR
Download the
-sample [`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.4/helm-charts/dbrepo/values.yaml?inline=true)
+sample [
+`values.yaml`](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-1.4.7/helm-charts/dbrepo/values.yaml?inline=true)
for your deployment and update the variables, especially `hostname`.
```bash
-helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.4"
+helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" --values ./values.yaml --version "1.4.7"
```
## Prerequisites
@@ -27,7 +28,7 @@ helm install my-release "oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --valu
To install the chart with the release name `my-release`:
```bash
-helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.4"
+helm install my-release "oci://oci://registry.datalab.tuwien.ac.at/dbrepo/helm" --values ./values.yaml --version "1.4.7"
```
The command deploys DBRepo on the Kubernetes cluster in the default configuration. The Parameters section lists the
@@ -48,24 +49,23 @@ The command removes all the Kubernetes components associated with the chart and
### Global parameters
| Name | Description | Value |
-| ----------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ |
+|-------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------|
| `global.compatibility.openshift.adaptSecurityContext` | Adapt the securityContext sections of the deployment to make them compatible with Openshift restricted-v2 SCC: remove runAsUser, runAsGroup and fsGroup and let the platform use their allowed default IDs. Possible values: auto (apply if the detected running cluster is Openshift), force (perform the adaptation always), disabled (do not perform adaptation) | `auto` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` |
### Common parameters
-| Name | Description | Value |
-| --------------- | ---------------------------------- | --------------------- |
-| `namespace` | The namespace to install the chart | `dbrepo` |
-| `hostname` | The hostname. | `example.com` |
-| `gateway` | The gateway endpoint. | `https://example.com` |
-| `strategyType` | The image pull | `RollingUpdate` |
-| `clusterDomain` | The cluster domain. | `cluster.local` |
+| Name | Description | Value |
+|-----------------|-----------------------|-----------------------|
+| `hostname` | The hostname. | `example.com` |
+| `gateway` | The gateway endpoint. | `https://example.com` |
+| `strategyType` | The image pull | `RollingUpdate` |
+| `clusterDomain` | The cluster domain. | `cluster.local` |
### Metadata Database
| Name | Description | Value |
-| ---------------------------------------- | ---------------------------------------------------------------- | ------------- |
+|------------------------------------------|------------------------------------------------------------------|---------------|
| `metadatadb.enabled` | Enable the Metadata Database. | `true` |
| `metadatadb.host` | The hostname for the microservices. | `metadata-db` |
| `metadatadb.rootUser.user` | The root username. | `root` |
@@ -81,23 +81,22 @@ The command removes all the Kubernetes components associated with the chart and
### Auth Service
| Name | Description | Value |
-| -------------------------------- | ------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+|----------------------------------|--------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `authservice.enabled` | Enable the Auth Service. | `true` |
| `authservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
| `authservice.endpoint` | The hostname for the microservices. | `http://auth-service` |
| `authservice.jwt.pubkey` | The JWT public key from the `dbrepo-client`. | `MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB` |
| `authservice.tls.enabled` | Enable TLS/SSL communication. Required for HTTPS. | `true` |
| `authservice.tls.existingSecret` | The secret containing the `tls.crt`, `tls.key` and `ca.crt`. | `ingress-cert` |
-| `authservice.metrics.enabled` | Enable the Prometheus metrics export sidecar container. | `false` |
| `authservice.client.id` | The client id for the microservices. | `dbrepo-client` |
| `authservice.client.secret` | The client secret for the microservices. | `MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG` |
### Data Database
| Name | Description | Value |
-| --------------------------------- | ----------------------------------------------------------- | ------------- |
+|-----------------------------------|-------------------------------------------------------------|---------------|
| `datadb.enabled` | Enable the Data Database. | `true` |
-| `datadb.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
+| `datadb.database.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
| `datadb.auth.rootPassword` | The root user password. | `dbrepo` |
| `datadb.auth.replicationUser` | The database replication user password | `replication` |
| `datadb.auth.replicationPassword` | The database replication user password | `replication` |
@@ -105,7 +104,7 @@ The command removes all the Kubernetes components associated with the chart and
### Search Database
| Name | Description | Value |
-| ---------------------- | ----------------------------------- | ----------- |
+|------------------------|-------------------------------------|-------------|
| `searchdb.enabled` | Enable the Data Database. | `true` |
| `searchdb.host` | The hostname for the microservices. | `search-db` |
| `searchdb.port` | The port for the microservices. | `9200` |
@@ -114,14 +113,14 @@ The command removes all the Kubernetes components associated with the chart and
### Upload Service
| Name | Description | Value |
-| ---------------------------- | -------------------------- | ------ |
+|------------------------------|----------------------------|--------|
| `uploadservice.enabled` | Enable the Upload Service. | `true` |
| `uploadservice.replicaCount` | The number of replicas. | `2` |
### Broker Service
| Name | Description | Value |
-| ----------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- |
+|-------------------------------------|----------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------|
| `brokerservice.enabled` | Enable the Broker Service. | `true` |
| `brokerservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `true` |
| `brokerservice.endpoint` | The management api endpoint for the microservices. | `http://broker-service:15672` |
@@ -144,7 +143,7 @@ The command removes all the Kubernetes components associated with the chart and
### Analyse Service
| Name | Description | Value |
-| ------------------------------------------------------------------ | ----------------------------------------------------------- | -------------------------------- |
+|--------------------------------------------------------------------|-------------------------------------------------------------|----------------------------------|
| `analyseservice.enabled` | Enable the Broker Service. | `true` |
| `analyseservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
| `analyseservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
@@ -168,7 +167,7 @@ The command removes all the Kubernetes components associated with the chart and
### Metadata Service
| Name | Description | Value |
-| ------------------------------------------------------------------- | ---------------------------------------------------------------------------------- | -------------------------------- |
+|---------------------------------------------------------------------|------------------------------------------------------------------------------------|----------------------------------|
| `metadataservice.enabled` | Enable the Broker Service. | `true` |
| `metadataservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
| `metadataservice.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
@@ -206,7 +205,7 @@ The command removes all the Kubernetes components associated with the chart and
### Data Service
| Name | Description | Value |
-| --------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------- |
+|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
| `dataservice.enabled` | Enable the Broker Service. | `true` |
| `dataservice.endpoint` | Absolute URL to the data service in the form of http://host:port | `http://data-service` |
| `dataservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
@@ -244,7 +243,7 @@ The command removes all the Kubernetes components associated with the chart and
### Search Service
| Name | Description | Value |
-| ----------------------------------------------------------------- | ------------------------------------------------------------------ | ----------------------- |
+|-------------------------------------------------------------------|--------------------------------------------------------------------|-------------------------|
| `searchservice.enabled` | Enable the Broker Service. | `true` |
| `searchservice.endpoint` | Absolute URL to the search service in the form of http://host:port | `http://search-service` |
| `searchservice.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
@@ -267,7 +266,7 @@ The command removes all the Kubernetes components associated with the chart and
### Storage Service
| Name | Description | Value |
-| --------------------------------------------- | -------------------------------------------------------------------------------------- | ---------------- |
+|-----------------------------------------------|----------------------------------------------------------------------------------------|------------------|
| `storageservice.enabled` | Enable the Storage Service. | `true` |
| `storageservice.mariadb.auth.rootPassword` | The user password for the root user. | `seaweedfsdb` |
| `storageservice.filer.enabled` | Enable the storage service filer which is required for S3. | `true` |
@@ -280,7 +279,7 @@ The command removes all the Kubernetes components associated with the chart and
### Identity Service
| Name | Description | Value |
-| -------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ----------------- |
+|----------------------------------------|---------------------------------------------------------------------------------------------------------------|-------------------|
| `identityservice.enabled` | Enable the Identity Service. | `true` |
| `identityservice.global.ldapDomain` | The LDAP domain name in domain "dbrepo.at" form or explicit in "dc=dbrepo,dc=at" form. | `dc=dbrepo,dc=at` |
| `identityservice.global.adminUser` | The admin username that is used to bind. | `admin` |
@@ -295,7 +294,7 @@ The command removes all the Kubernetes components associated with the chart and
### User Interface
| Name | Description | Value |
-| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------- | ----------------------- |
+|--------------------------------------------------------|------------------------------------------------------------------------------------------------------|-------------------------|
| `ui.enabled` | Enable the Broker Service. | `true` |
| `ui.image.debug` | Set the logging level to `trace`. Otherwise, set to `info`. | `false` |
| `ui.podSecurityContext.enabled` | Enable pods' Security Context | `true` |
@@ -329,10 +328,23 @@ The command removes all the Kubernetes components associated with the chart and
| `ui.public.doi.endpoint` | The DOI proxy. | `https://doi.org` |
| `ui.replicaCount` | The number of replicas. | `2` |
+### Dashboard Service
+
+| Name | Description | Value |
+|-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------|--------|
+| `dashboardservice.enabled` | Enable the Dashboard Service. | `true` |
+| `dashboardservice.dashboardsProvider.enabled` | Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards | `true` |
+
+### Metric Service
+
+| Name | Description | Value |
+|--------------------|----------------------------|--------|
+| `metricdb.enabled` | Enable the Metric Service. | `true` |
+
### Ingress
| Name | Description | Value |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------- | -------------- |
+|--------------------------|-----------------------------------------------------------------------------------------------------------------|----------------|
| `ingress.enabled` | Enable the ingress. | `false` |
| `ingress.className` | The ingress class name. | `nginx` |
| `ingress.tls.enabled` | Enable the ingress. | `true` |
diff --git a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz
index 986e13f7c5261495cfd9ea53ace6e263b0e3c2fa..4af22ff6e998199f69a8e1ff43fd96c3f55aa8ec 100644
Binary files a/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz and b/helm/dbrepo/charts/dbrepo-mariadb-galera-1.4.6.tgz differ
diff --git a/helm/dbrepo/charts/grafana-10.1.1.tgz b/helm/dbrepo/charts/grafana-10.1.1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..332c7758f160e873e5e5bebe46e5c0353aa03d88
Binary files /dev/null and b/helm/dbrepo/charts/grafana-10.1.1.tgz differ
diff --git a/helm/dbrepo/charts/grafana-11.3.20.tgz b/helm/dbrepo/charts/grafana-11.3.20.tgz
deleted file mode 100644
index 489481f1027c446bff9a60a9411eeda957d789ee..0000000000000000000000000000000000000000
Binary files a/helm/dbrepo/charts/grafana-11.3.20.tgz and /dev/null differ
diff --git a/helm/dbrepo/files/system.json b/helm/dbrepo/files/system.json
index 75287d5a0353df5aa77f82ee361888fe00274ef8..52bf6d067122e2e803d2858256bfb274351d1f49 100644
--- a/helm/dbrepo/files/system.json
+++ b/helm/dbrepo/files/system.json
@@ -29,7 +29,7 @@
"title": "Docs",
"tooltip": "",
"type": "link",
- "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/"
+ "url": "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/"
}
],
"panels": [
@@ -41,9 +41,9 @@
"x": 0,
"y": 0
},
- "id": 3,
+ "id": 15,
"panels": [],
- "title": "Overview",
+ "title": "Data",
"type": "row"
},
{
@@ -56,41 +56,25 @@
"defaults": {
"mappings": [],
"thresholds": {
- "mode": "percentage",
+ "mode": "absolute",
"steps": [
{
- "color": "purple",
+ "color": "blue",
"value": null
- },
- {
- "color": "red",
- "value": 0
- },
- {
- "color": "orange",
- "value": 60
- },
- {
- "color": "#EAB839",
- "value": 80
- },
- {
- "color": "green",
- "value": 100
}
]
},
- "unit": "percentunit"
+ "unit": "short"
},
"overrides": []
},
"gridPos": {
"h": 3,
- "w": 3,
+ "w": 4,
"x": 0,
"y": 1
},
- "id": 9,
+ "id": 4,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -108,7 +92,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -116,32 +100,20 @@
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
- "editorMode": "code",
- "expr": "sum(up)/count(up)",
+ "editorMode": "builder",
+ "expr": "dbrepo_database_count",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
- "legendFormat": "Services Running",
+ "legendFormat": "__auto",
"range": true,
"refId": "A",
"useBackend": false
}
],
+ "title": "Databases",
"type": "stat"
},
- {
- "collapsed": false,
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 4
- },
- "id": 15,
- "panels": [],
- "title": "Data",
- "type": "row"
- },
{
"datasource": {
"default": true,
@@ -150,7 +122,6 @@
},
"fieldConfig": {
"defaults": {
- "displayName": "Databases",
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -167,11 +138,11 @@
},
"gridPos": {
"h": 3,
- "w": 5,
- "x": 0,
- "y": 5
+ "w": 4,
+ "x": 4,
+ "y": 1
},
- "id": 4,
+ "id": 5,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -189,7 +160,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -198,16 +169,64 @@
},
"disableTextWrap": false,
"editorMode": "builder",
- "expr": "dbrepo_database_count",
+ "expr": "dbrepo_view_count",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
"legendFormat": "__auto",
"range": true,
- "refId": "A",
+ "refId": "Views",
+ "useBackend": false
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "dbrepo_subset_count",
+ "fullMetaSearch": false,
+ "hide": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "Subsets",
+ "useBackend": false
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "dbrepo_table_count",
+ "fullMetaSearch": false,
+ "hide": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "Tables",
"useBackend": false
}
],
+ "title": "Datasources",
+ "transformations": [
+ {
+ "id": "calculateField",
+ "options": {
+ "alias": "",
+ "mode": "reduceRow",
+ "reduce": {
+ "reducer": "sum"
+ },
+ "replaceFields": true
+ }
+ }
+ ],
"type": "stat"
},
{
@@ -216,9 +235,9 @@
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "",
"fieldConfig": {
"defaults": {
- "displayName": "Datasources",
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -229,17 +248,17 @@
}
]
},
- "unit": "short"
+ "unit": "decbytes"
},
"overrides": []
},
"gridPos": {
"h": 3,
- "w": 5,
- "x": 5,
- "y": 5
+ "w": 4,
+ "x": 8,
+ "y": 1
},
- "id": 5,
+ "id": 8,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -257,7 +276,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -266,95 +285,157 @@
},
"disableTextWrap": false,
"editorMode": "builder",
- "expr": "dbrepo_view_count",
+ "expr": "dbrepo_volume_sum",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
"legendFormat": "__auto",
"range": true,
- "refId": "Views",
+ "refId": "A",
"useBackend": false
- },
- {
- "datasource": {
- "type": "prometheus",
- "uid": "P18F45E9DC7E75912"
+ }
+ ],
+ "title": "Data Volume",
+ "type": "stat"
+ },
+ {
+ "collapsed": false,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 4
+ },
+ "id": 22,
+ "panels": [],
+ "title": "UI",
+ "type": "row"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "#EAB839",
+ "value": 300
+ },
+ {
+ "color": "orange",
+ "value": 600
+ },
+ {
+ "color": "red",
+ "value": 900
+ }
+ ]
},
- "disableTextWrap": false,
- "editorMode": "builder",
- "expr": "dbrepo_subset_count",
- "fullMetaSearch": false,
- "hide": false,
- "includeNullMetadata": true,
- "instant": false,
- "legendFormat": "__auto",
- "range": true,
- "refId": "Subsets",
- "useBackend": false
+ "unit": "ms"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 0,
+ "y": 5
+ },
+ "id": 17,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
},
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
- "editorMode": "builder",
- "expr": "dbrepo_table_count",
+ "editorMode": "code",
+ "expr": "avg(page_render_time)",
"fullMetaSearch": false,
- "hide": false,
"includeNullMetadata": true,
"instant": false,
"legendFormat": "__auto",
"range": true,
- "refId": "Tables",
+ "refId": "A",
"useBackend": false
}
],
- "transformations": [
- {
- "id": "calculateField",
- "options": {
- "alias": "",
- "mode": "reduceRow",
- "reduce": {
- "reducer": "sum"
- },
- "replaceFields": true
- }
- }
- ],
+ "title": "UI Response Time (avg)",
"type": "stat"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "",
"fieldConfig": {
"defaults": {
- "displayName": "Volume",
"mappings": [],
+ "max": 100,
+ "min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
- "color": "blue",
+ "color": "green",
"value": null
+ },
+ {
+ "color": "#EAB839",
+ "value": 0.02
+ },
+ {
+ "color": "orange",
+ "value": 0.05
+ },
+ {
+ "color": "red",
+ "value": 0.1
}
]
},
- "unit": "decbytes"
+ "unit": "s"
},
"overrides": []
},
"gridPos": {
"h": 3,
- "w": 5,
- "x": 10,
+ "w": 4,
+ "x": 4,
"y": 5
},
- "id": 8,
+ "id": 24,
"options": {
"colorMode": "background",
"graphMode": "none",
@@ -372,7 +453,7 @@
"textMode": "auto",
"wideLayout": true
},
- "pluginVersion": "11.2.0",
+ "pluginVersion": "10.4.9",
"targets": [
{
"datasource": {
@@ -380,8 +461,8 @@
"uid": "P18F45E9DC7E75912"
},
"disableTextWrap": false,
- "editorMode": "builder",
- "expr": "dbrepo_volume_sum",
+ "editorMode": "code",
+ "expr": "nodejs_eventloop_lag_mean_seconds",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": false,
@@ -391,17 +472,412 @@
"useBackend": false
}
],
+ "title": "UI Event Lag (avg)",
"type": "stat"
},
{
- "collapsed": false,
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
"gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 8
+ "h": 3,
+ "w": 4,
+ "x": 8,
+ "y": 5
},
- "id": 2,
+ "id": 25,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_handles{type=\"Server\"}",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Servers",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 12,
+ "y": 5
+ },
+ "id": 26,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_handles{type=\"Socket\"}",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Sockets",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "fixedColor": "blue",
+ "mode": "fixed"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "none"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 16,
+ "y": 5
+ },
+ "id": 27,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "nodejs_active_requests_total",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Active Requests",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "yellow",
+ "value": 300
+ },
+ {
+ "color": "orange",
+ "value": 600
+ },
+ {
+ "color": "red",
+ "value": 900
+ }
+ ]
+ },
+ "unit": "ms"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 0,
+ "y": 8
+ },
+ "id": 20,
+ "options": {
+ "displayMode": "basic",
+ "maxVizHeight": 300,
+ "minVizHeight": 16,
+ "minVizWidth": 8,
+ "namePlacement": "auto",
+ "orientation": "horizontal",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showUnfilled": true,
+ "sizing": "auto",
+ "valueMode": "color"
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "page_render_time",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{path}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "UI Response Time per Path (avg)",
+ "type": "bargauge"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "dashed"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 256000000
+ }
+ ]
+ },
+ "unit": "decbytes"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 8
+ },
+ "id": 21,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "nodejs_heap_space_size_total_bytes",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{space}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "NodeJS Heap Bytes",
+ "type": "timeseries"
+ },
+ {
+ "collapsed": false,
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 15
+ },
+ "id": 2,
"panels": [],
"title": "Services",
"type": "row"
@@ -412,6 +888,357 @@
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
+ "description": "Quality of Service",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "purple",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 0
+ },
+ {
+ "color": "orange",
+ "value": 60
+ },
+ {
+ "color": "#EAB839",
+ "value": 80
+ },
+ {
+ "color": "green",
+ "value": 100
+ }
+ ]
+ },
+ "unit": "percent"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 0,
+ "y": 16
+ },
+ "id": 9,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "sum(up)*100/count(up)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "Services Running",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "QoS",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "mappings": [],
+ "max": 100,
+ "min": 0,
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "blue",
+ "value": null
+ }
+ ]
+ },
+ "unit": "s"
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 3,
+ "w": 4,
+ "x": 4,
+ "y": 16
+ },
+ "id": 28,
+ "options": {
+ "colorMode": "background",
+ "graphMode": "none",
+ "justifyMode": "auto",
+ "orientation": "auto",
+ "percentChangeColorMode": "standard",
+ "reduceOptions": {
+ "calcs": [
+ "lastNotNull"
+ ],
+ "fields": "",
+ "values": false
+ },
+ "showPercentChange": false,
+ "textMode": "auto",
+ "wideLayout": true
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "min(process_uptime_seconds)",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "__auto",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Uptime",
+ "type": "stat"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "thresholds"
+ },
+ "custom": {
+ "fillOpacity": 70,
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "lineWidth": 1
+ },
+ "mappings": [
+ {
+ "options": {
+ "0": {
+ "index": 0,
+ "text": "DOWN"
+ },
+ "1": {
+ "index": 1,
+ "text": "UP"
+ }
+ },
+ "type": "value"
+ }
+ ],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "red",
+ "value": null
+ },
+ {
+ "color": "green",
+ "value": 1
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 16
+ },
+ "id": 16,
+ "options": {
+ "colWidth": 0.9,
+ "legend": {
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": false
+ },
+ "rowHeight": 0.9,
+ "showValue": "auto",
+ "tooltip": {
+ "mode": "single",
+ "sort": "none"
+ }
+ },
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "builder",
+ "expr": "up",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{instance}}",
+ "range": true,
+ "refId": "A",
+ "useBackend": false
+ }
+ ],
+ "title": "Service QoS",
+ "type": "status-history"
+ },
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "",
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "auto",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ }
+ },
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 7,
+ "w": 12,
+ "x": 0,
+ "y": 19
+ },
+ "id": 23,
+ "options": {
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "none"
+ }
+ },
+ "pluginVersion": "10.4.9",
+ "targets": [
+ {
+ "datasource": {
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "disableTextWrap": false,
+ "editorMode": "code",
+ "expr": "process_open_fds\n",
+ "fullMetaSearch": false,
+ "includeNullMetadata": true,
+ "instant": false,
+ "legendFormat": "{{instance}}",
+ "range": true,
+ "refId": "process_open_fds",
+ "useBackend": false
+ }
+ ],
+ "title": "File Descriptors",
+ "type": "timeseries"
+ },
+ {
+ "datasource": {
+ "default": true,
+ "type": "prometheus",
+ "uid": "P18F45E9DC7E75912"
+ },
+ "description": "Heap and non-heap memory summed",
"fieldConfig": {
"defaults": {
"color": {
@@ -424,7 +1251,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -434,8 +1260,8 @@
"viz": false
},
"insertNulls": false,
- "lineInterpolation": "linear",
- "lineWidth": 1,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
@@ -457,19 +1283,16 @@
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
- }
+ },
+ "unit": "decbytes"
},
"overrides": [
{
"matcher": {
"id": "byName",
- "options": "auth-service:8080"
+ "options": "auth-service:9000"
},
"properties": [
{
@@ -484,13 +1307,13 @@
{
"matcher": {
"id": "byName",
- "options": "broker-service:15692"
+ "options": "data-service:8080"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "light-blue",
+ "fixedColor": "blue",
"mode": "fixed"
}
}
@@ -511,36 +1334,6 @@
}
]
},
- {
- "matcher": {
- "id": "byName",
- "options": "analyse-service:80"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "super-light-red",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "auth-service-metrics:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "green",
- "mode": "fixed"
- }
- }
- ]
- },
{
"matcher": {
"id": "byName",
@@ -555,61 +1348,16 @@
}
}
]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "data-service:80"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "purple",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "search-service:80"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "semi-dark-purple",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "ui:80"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "super-light-purple",
- "mode": "fixed"
- }
- }
- ]
}
]
},
"gridPos": {
- "h": 6,
- "w": 24,
- "x": 0,
- "y": 9
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 23
},
- "id": 1,
+ "id": 7,
"options": {
"legend": {
"calcs": [],
@@ -618,7 +1366,7 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
@@ -631,10 +1379,10 @@
},
"disableTextWrap": false,
"editorMode": "builder",
- "expr": "up",
+ "expr": "sum by(instance) (jvm_memory_used_bytes)",
"fullMetaSearch": false,
"hide": false,
- "includeNullMetadata": true,
+ "includeNullMetadata": false,
"instant": false,
"legendFormat": "{{instance}}",
"range": true,
@@ -642,12 +1390,11 @@
"useBackend": false
}
],
- "title": "Service Instances Running",
+ "title": "JVM Memory Usage",
"type": "timeseries"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
@@ -663,7 +1410,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -674,7 +1420,7 @@
},
"insertNulls": false,
"lineInterpolation": "smooth",
- "lineWidth": 1,
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
@@ -696,19 +1442,16 @@
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
- }
+ },
+ "unit": "none"
},
"overrides": [
{
"matcher": {
"id": "byName",
- "options": "auth-service:8080"
+ "options": "auth-service:9000"
},
"properties": [
{
@@ -768,10 +1511,10 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
+ "h": 7,
+ "w": 12,
"x": 0,
- "y": 15
+ "y": 26
},
"id": 6,
"options": {
@@ -802,7 +1545,7 @@
"instant": false,
"legendFormat": "{{instance}}",
"range": true,
- "refId": "Java",
+ "refId": "process_cpu_usage",
"useBackend": false
}
],
@@ -811,11 +1554,9 @@
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "description": "Heap and non-heap memory summed",
"fieldConfig": {
"defaults": {
"color": {
@@ -828,7 +1569,6 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
"fillOpacity": 25,
"gradientMode": "none",
@@ -838,8 +1578,8 @@
"viz": false
},
"insertNulls": false,
- "lineInterpolation": "linear",
- "lineWidth": 1,
+ "lineInterpolation": "smooth",
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
@@ -848,7 +1588,7 @@
"spanNulls": false,
"stacking": {
"group": "A",
- "mode": "normal"
+ "mode": "none"
},
"thresholdsStyle": {
"mode": "off"
@@ -864,49 +1604,19 @@
}
]
},
- "unit": "decbytes"
+ "unit": "reqps"
},
"overrides": [
{
"matcher": {
- "id": "byName",
- "options": "auth-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "data-service:8080"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "blue",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "metadata-service:8080"
+ "id": "byRegexp",
+ "options": "/.*search-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "purple",
+ "fixedColor": "orange",
"mode": "fixed"
}
}
@@ -914,14 +1624,14 @@
},
{
"matcher": {
- "id": "byName",
- "options": "metadata-service:80"
+ "id": "byRegexp",
+ "options": "/.*analyse-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "blue",
+ "fixedColor": "super-light-orange",
"mode": "fixed"
}
}
@@ -930,12 +1640,12 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
- "x": 0,
- "y": 21
+ "h": 7,
+ "w": 12,
+ "x": 12,
+ "y": 30
},
- "id": 7,
+ "id": 19,
"options": {
"legend": {
"calcs": [],
@@ -944,36 +1654,29 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
- "pluginVersion": "11.2.0",
"targets": [
{
"datasource": {
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
- "disableTextWrap": false,
- "editorMode": "builder",
- "expr": "sum by(instance) (jvm_memory_used_bytes)",
- "fullMetaSearch": false,
- "hide": false,
- "includeNullMetadata": false,
+ "editorMode": "code",
+ "expr": "rate(flask_http_request_duration_seconds_count{status!~\"200|201|202\"}[$__rate_interval])",
"instant": false,
- "legendFormat": "{{instance}}",
+ "legendFormat": "{{method}} {{instance}} ({{status}})",
"range": true,
- "refId": "A",
- "useBackend": false
+ "refId": "A"
}
],
- "title": "JVM Memory Usage",
+ "title": "Failed API Requests",
"type": "timeseries"
},
{
"datasource": {
- "default": true,
"type": "prometheus",
"uid": "P18F45E9DC7E75912"
},
@@ -989,9 +1692,8 @@
"axisLabel": "",
"axisPlacement": "auto",
"barAlignment": 0,
- "barWidthFactor": 0.6,
"drawStyle": "line",
- "fillOpacity": 10,
+ "fillOpacity": 25,
"gradientMode": "none",
"hideFrom": {
"legend": false,
@@ -1000,12 +1702,12 @@
},
"insertNulls": false,
"lineInterpolation": "smooth",
- "lineWidth": 1,
+ "lineWidth": 2,
"pointSize": 5,
"scaleDistribution": {
"type": "linear"
},
- "showPoints": "never",
+ "showPoints": "auto",
"spanNulls": false,
"stacking": {
"group": "A",
@@ -1015,7 +1717,6 @@
"mode": "off"
}
},
- "links": [],
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -1023,20 +1724,16 @@
{
"color": "green",
"value": null
- },
- {
- "color": "red",
- "value": 80
}
]
},
- "unit": "short"
+ "unit": "reqps"
},
"overrides": [
{
"matcher": {
- "id": "byName",
- "options": "400"
+ "id": "byRegexp",
+ "options": "/.*search-service.*/"
},
"properties": [
{
@@ -1050,104 +1747,14 @@
},
{
"matcher": {
- "id": "byName",
- "options": "500"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "#BF1B00",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "-1"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "purple",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "200"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "green",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "302"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "light-yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "304"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "super-light-yellow",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "401"
- },
- "properties": [
- {
- "id": "color",
- "value": {
- "fixedColor": "light-orange",
- "mode": "fixed"
- }
- }
- ]
- },
- {
- "matcher": {
- "id": "byName",
- "options": "499"
+ "id": "byRegexp",
+ "options": "/.*analyse-service.*/"
},
"properties": [
{
"id": "color",
"value": {
- "fixedColor": "red",
+ "fixedColor": "super-light-orange",
"mode": "fixed"
}
}
@@ -1156,12 +1763,12 @@
]
},
"gridPos": {
- "h": 6,
- "w": 24,
+ "h": 7,
+ "w": 12,
"x": 0,
- "y": 27
+ "y": 33
},
- "id": 13,
+ "id": 18,
"options": {
"legend": {
"calcs": [],
@@ -1170,11 +1777,10 @@
"showLegend": true
},
"tooltip": {
- "mode": "single",
+ "mode": "multi",
"sort": "none"
}
},
- "pluginVersion": "8.1.0-pre",
"targets": [
{
"datasource": {
@@ -1182,28 +1788,28 @@
"uid": "P18F45E9DC7E75912"
},
"editorMode": "code",
- "expr": "sum by (status_code) (irate(grafana_http_request_duration_seconds_count[5m]))",
- "format": "time_series",
- "intervalFactor": 3,
- "legendFormat": "{{status_code}}",
+ "expr": "rate(flask_http_request_duration_seconds_count{status=~\"200|201|202\",path!=\"/health\"}[$__rate_interval])",
+ "instant": false,
+ "legendFormat": "{{method}} {{instance}} {{path}} ({{status}})",
"range": true,
- "refId": "B",
- "step": 15,
- "target": "dev.grafana.cb-office.alerting.active_alerts"
+ "refId": "A"
}
],
- "title": "Dashboard Service HTTP Status Codes",
+ "title": "Successful API Requests",
"type": "timeseries"
}
],
- "refresh": "10s",
+ "refresh": "1m",
"schemaVersion": 39,
- "tags": ["provisioned", "dbrepo"],
+ "tags": [
+ "provisioned",
+ "dbrepo"
+ ],
"templating": {
"list": []
},
"time": {
- "from": "now-15m",
+ "from": "now-30m",
"to": "now"
},
"timepicker": {},
diff --git a/helm/dbrepo/templates/dashboard-secret.yaml b/helm/dbrepo/templates/dashboard-secret.yaml
index 6e5a05e1768a8faffb0841429ddd2ea5dd315bc3..c224c1d17b2352b228b7ed3f8946eaec0366b595 100644
--- a/helm/dbrepo/templates/dashboard-secret.yaml
+++ b/helm/dbrepo/templates/dashboard-secret.yaml
@@ -6,8 +6,11 @@ metadata:
name: dashboard-service-secret
namespace: {{ include "common.names.namespace" . | quote }}
stringData:
+ GF_SERVER_PROTOCOL: "http"
GF_SERVER_DOMAIN: "dashboard-service"
- GF_SERVER_ROOT_URL: "http://dashboard-service:3000/dashboard/"
+ GF_SERVER_ROOT_URL: "http://%(domain)s/dashboard/"
+ GF_AUTH_ANONYMOUS_ENABLED: "true"
+ GF_AUTH_ANONYMOUS_ORG_ROLE: "Viewer"
GF_SERVER_SERVE_FROM_SUB_PATH: "true"
GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION: "true"
LDAP_ADMIN_USERNAME: "{{ .Values.identityservice.global.adminUser }}"
diff --git a/helm/dbrepo/templates/metadata-configmap.yaml b/helm/dbrepo/templates/metadata-configmap.yaml
index 93919ed2a11a70442a643f7348bfca22a58f8890..893f255627c17b9ddf0a3ad765527857b3f9982b 100644
--- a/helm/dbrepo/templates/metadata-configmap.yaml
+++ b/helm/dbrepo/templates/metadata-configmap.yaml
@@ -12,7 +12,7 @@ data:
02-setup-data.sql: |
BEGIN;
INSERT INTO `mdb_containers` (name, internal_name, image_id, host, port, sidecar_host, sidecar_port, privileged_username, privileged_password)
- VALUES ('MariaDB 11.1.3', 'mariadb_11_1_3', 1, 'data-db', 3306, 'data-db', 8080, 'root', 'dbrepo');
+ VALUES ('mariadb:11.1.3-debian-11-r6', 'mariadb_11_1_3', 1, 'data-db', 3306, 'data-db', 8080, 'root', 'dbrepo');
COMMIT;
01-setup-schema.sql: |
BEGIN;
@@ -36,7 +36,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_images`
(
- id bigint NOT NULL AUTO_INCREMENT,
+ id SERIAL,
registry character varying(255) NOT NULL DEFAULT 'docker.io',
name character varying(255) NOT NULL,
version character varying(255) NOT NULL,
@@ -52,23 +52,9 @@ data:
UNIQUE (is_default)
) WITH SYSTEM VERSIONING;
- CREATE TABLE IF NOT EXISTS `mdb_images_date`
- (
- id bigint NOT NULL AUTO_INCREMENT,
- iid bigint NOT NULL,
- database_format character varying(255) NOT NULL,
- unix_format character varying(255) NOT NULL,
- example character varying(255) NOT NULL,
- has_time boolean NOT NULL,
- created_at timestamp NOT NULL DEFAULT NOW(),
- PRIMARY KEY (id),
- FOREIGN KEY (iid) REFERENCES mdb_images (id),
- UNIQUE (database_format, unix_format, example)
- ) WITH SYSTEM VERSIONING;
-
CREATE TABLE IF NOT EXISTS `mdb_containers`
(
- id bigint NOT NULL AUTO_INCREMENT,
+ id SERIAL,
internal_name character varying(255) NOT NULL,
name character varying(255) NOT NULL,
host character varying(255) NOT NULL,
@@ -84,13 +70,12 @@ data:
privileged_username character varying(255) NOT NULL,
privileged_password character varying(255) NOT NULL,
quota integer NOT NULL DEFAULT 50,
- PRIMARY KEY (id),
- FOREIGN KEY (image_id) REFERENCES mdb_images (id)
+ PRIMARY KEY (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_data`
(
- ID bigint NOT NULL AUTO_INCREMENT,
+ ID SERIAL,
PROVENANCE text,
FileEncoding text,
FileType character varying(100),
@@ -110,8 +95,8 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_databases`
(
- id bigint NOT NULL AUTO_INCREMENT,
- cid bigint NOT NULL,
+ id SERIAL,
+ cid BIGINT UNSIGNED NOT NULL,
name character varying(255) NOT NULL,
internal_name character varying(255) NOT NULL,
exchange_name character varying(255) NOT NULL,
@@ -125,7 +110,7 @@ data:
created timestamp NOT NULL DEFAULT NOW(),
last_modified timestamp,
PRIMARY KEY (id),
- FOREIGN KEY (cid) REFERENCES mdb_containers (id) /* currently we only support one-to-one */,
+ FOREIGN KEY (cid) REFERENCES mdb_containers (id),
FOREIGN KEY (created_by) REFERENCES mdb_users (id),
FOREIGN KEY (owned_by) REFERENCES mdb_users (id),
FOREIGN KEY (contact_person) REFERENCES mdb_users (id)
@@ -140,8 +125,8 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_tables`
(
- ID bigint NOT NULL AUTO_INCREMENT,
- tDBID bigint NOT NULL,
+ ID SERIAL,
+ tDBID BIGINT UNSIGNED NOT NULL,
tName VARCHAR(64) NOT NULL,
internal_name VARCHAR(64) NOT NULL,
queue_name VARCHAR(255) NOT NULL,
@@ -172,35 +157,35 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_columns`
(
- ID BIGINT NOT NULL AUTO_INCREMENT,
- tID BIGINT NOT NULL,
- dfID BIGINT,
+ ID SERIAL,
+ tID BIGINT UNSIGNED NOT NULL,
cName VARCHAR(64),
- internal_name VARCHAR(64) NOT NULL,
+ internal_name VARCHAR(64) NOT NULL,
Datatype ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- length BIGINT NULL,
- ordinal_position INTEGER NOT NULL,
- index_length BIGINT NULL,
+ length BIGINT UNSIGNED NULL,
+ ordinal_position INTEGER NOT NULL,
+ index_length BIGINT UNSIGNED NULL,
description VARCHAR(2048),
- size BIGINT,
- d BIGINT,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL DEFAULT true,
- val_min NUMERIC NULL,
- val_max NUMERIC NULL,
- mean NUMERIC NULL,
- median NUMERIC NULL,
- std_dev Numeric NULL,
- created timestamp NOT NULL DEFAULT NOW(),
+ size BIGINT UNSIGNED,
+ d BIGINT UNSIGNED,
+ auto_generated BOOLEAN DEFAULT false,
+ is_null_allowed BOOLEAN NOT NULL DEFAULT true,
+ val_min NUMERIC NULL,
+ val_max NUMERIC NULL,
+ mean NUMERIC NULL,
+ median NUMERIC NULL,
+ std_dev Numeric NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
last_modified timestamp,
FOREIGN KEY (tID) REFERENCES mdb_tables (ID) ON DELETE CASCADE,
- PRIMARY KEY (ID)
+ PRIMARY KEY (ID),
+ UNIQUE (tID, internal_name)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns_enums`
(
- id bigint NOT NULL AUTO_INCREMENT,
- column_id bigint NOT NULL,
+ id SERIAL,
+ column_id BIGINT UNSIGNED NOT NULL,
value CHARACTER VARYING(255) NOT NULL,
FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
PRIMARY KEY (id)
@@ -208,8 +193,8 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_columns_sets`
(
- id bigint NOT NULL AUTO_INCREMENT,
- column_id bigint NOT NULL,
+ id SERIAL,
+ column_id BIGINT UNSIGNED NOT NULL,
value CHARACTER VARYING(255) NOT NULL,
FOREIGN KEY (column_id) REFERENCES mdb_columns (ID) ON DELETE CASCADE,
PRIMARY KEY (id)
@@ -217,36 +202,36 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_columns_nom`
(
- tID bigint,
- cID bigint,
+ cID BIGINT UNSIGNED,
+ tID BIGINT UNSIGNED,
maxlength INTEGER,
last_modified timestamp,
created timestamp NOT NULL DEFAULT NOW(),
- FOREIGN KEY (tID, cID) REFERENCES mdb_columns (tID, ID),
- PRIMARY KEY (tID, cID)
+ PRIMARY KEY (cID),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns_cat`
(
- tID bigint,
- cID bigint,
+ cID BIGINT UNSIGNED,
+ tID BIGINT UNSIGNED,
num_cat INTEGER,
-- cat_array TEXT[],
last_modified timestamp,
created timestamp NOT NULL DEFAULT NOW(),
- FOREIGN KEY (tID, cID) REFERENCES mdb_columns (tID, ID),
- PRIMARY KEY (tID, cID)
+ PRIMARY KEY (cID),
+ FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
(
- fkid BIGINT NOT NULL AUTO_INCREMENT,
- tid BIGINT NOT NULL,
- rtid BIGINT NOT NULL,
- name VARCHAR(255) NOT NULL,
- on_update VARCHAR(50) NULL,
- on_delete VARCHAR(50) NULL,
- position INT NULL,
+ fkid BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+ tid BIGINT UNSIGNED NOT NULL,
+ rtid BIGINT UNSIGNED NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ on_update VARCHAR(50) NULL,
+ on_delete VARCHAR(50) NULL,
+ position INT NULL,
PRIMARY KEY (fkid),
FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
@@ -254,9 +239,9 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_constraints_primary_key`
(
- pkid BIGINT NOT NULL AUTO_INCREMENT,
- tID BIGINT NOT NULL,
- cid BIGINT NOT NULL,
+ pkid SERIAL,
+ tID BIGINT UNSIGNED NOT NULL,
+ cid BIGINT UNSIGNED NOT NULL,
PRIMARY KEY (pkid),
FOREIGN KEY (tID) REFERENCES mdb_tables (id) ON DELETE CASCADE,
FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
@@ -264,10 +249,10 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key_reference`
(
- id BIGINT NOT NULL AUTO_INCREMENT,
- fkid BIGINT NOT NULL,
- cid BIGINT NOT NULL,
- rcid BIGINT NOT NULL,
+ id SERIAL,
+ fkid BIGINT UNSIGNED NOT NULL,
+ cid BIGINT UNSIGNED NOT NULL,
+ rcid BIGINT UNSIGNED NOT NULL,
PRIMARY KEY (id),
UNIQUE (fkid, cid, rcid),
FOREIGN KEY (fkid) REFERENCES mdb_constraints_foreign_key (fkid) ON UPDATE CASCADE,
@@ -277,19 +262,19 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
(
- uid BIGINT NOT NULL AUTO_INCREMENT,
- name VARCHAR(255) NOT NULL,
- tid BIGINT NOT NULL,
- position INT NULL,
+ uid BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
+ name VARCHAR(255) NOT NULL,
+ tid BIGINT UNSIGNED NOT NULL,
+ position INT NULL,
PRIMARY KEY (uid),
FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
);
CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
(
- id BIGINT NOT NULL AUTO_INCREMENT,
- uid BIGINT NOT NULL,
- cid BIGINT NOT NULL,
+ id SERIAL,
+ uid BIGINT UNSIGNED NOT NULL,
+ cid BIGINT UNSIGNED NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid),
FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
@@ -297,9 +282,9 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
(
- id BIGINT NOT NULL AUTO_INCREMENT,
- tid BIGINT NOT NULL,
- checks VARCHAR(255) NOT NULL,
+ id SERIAL,
+ tid BIGINT UNSIGNED NOT NULL,
+ checks VARCHAR(255) NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
@@ -307,7 +292,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_concepts`
(
- id bigint NOT NULL AUTO_INCREMENT,
+ id SERIAL,
uri text not null,
name VARCHAR(255) null,
description TEXT null,
@@ -318,7 +303,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_units`
(
- id bigint NOT NULL AUTO_INCREMENT,
+ id SERIAL,
uri text not null,
name VARCHAR(255) null,
description TEXT null,
@@ -329,26 +314,26 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_columns_concepts`
(
- id bigint NOT NULL,
- cID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
+ id BIGINT UNSIGNED NOT NULL,
+ cID BIGINT UNSIGNED NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (id, cid),
FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_columns_units`
(
- id bigint NOT NULL,
- cID bigint NOT NULL,
- created timestamp NOT NULL DEFAULT NOW(),
+ id BIGINT UNSIGNED NOT NULL,
+ cID BIGINT UNSIGNED NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (id, cID),
FOREIGN KEY (cID) REFERENCES mdb_columns (ID)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_view`
(
- id bigint NOT NULL AUTO_INCREMENT,
- vdbid bigint NOT NULL,
+ id SERIAL,
+ vdbid BIGINT UNSIGNED NOT NULL,
vName VARCHAR(64) NOT NULL,
internal_name VARCHAR(64) NOT NULL,
Query TEXT NOT NULL,
@@ -365,7 +350,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_banner_messages`
(
- id bigint NOT NULL AUTO_INCREMENT,
+ id SERIAL,
type ENUM ('ERROR', 'WARNING', 'INFO') NOT NULL default 'INFO',
message TEXT NOT NULL,
link TEXT NULL,
@@ -377,7 +362,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_ontologies`
(
- id bigint NOT NULL AUTO_INCREMENT,
+ id SERIAL,
prefix VARCHAR(8) NOT NULL,
uri TEXT NOT NULL,
uri_pattern TEXT,
@@ -392,28 +377,28 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_view_columns`
(
- id BIGINT NOT NULL AUTO_INCREMENT,
- view_id BIGINT NOT NULL,
- dfID BIGINT,
+ id SERIAL,
+ view_id BIGINT UNSIGNED NOT NULL,
+ dfID BIGINT UNSIGNED,
name VARCHAR(64),
- internal_name VARCHAR(64) NOT NULL,
+ internal_name VARCHAR(64) NOT NULL,
column_type ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
- ordinal_position INTEGER NOT NULL,
- size BIGINT,
- d BIGINT,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL DEFAULT true,
+ ordinal_position INTEGER NOT NULL,
+ size BIGINT UNSIGNED,
+ d BIGINT UNSIGNED,
+ auto_generated BOOLEAN DEFAULT false,
+ is_null_allowed BOOLEAN NOT NULL DEFAULT true,
PRIMARY KEY (id),
- FOREIGN KEY (view_id) REFERENCES mdb_view (id)
+ FOREIGN KEY (view_id) REFERENCES mdb_view (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_identifiers`
(
- id BIGINT NOT NULL AUTO_INCREMENT,
- dbid BIGINT NOT NULL,
- qid BIGINT,
- vid BIGINT,
- tid BIGINT,
+ id SERIAL,
+ dbid BIGINT UNSIGNED NOT NULL,
+ qid BIGINT UNSIGNED,
+ vid BIGINT UNSIGNED,
+ tid BIGINT UNSIGNED,
publisher VARCHAR(255) NOT NULL,
language VARCHAR(2),
publication_year INTEGER NOT NULL,
@@ -438,8 +423,8 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_identifier_licenses`
(
- pid bigint NOT NULL,
- license_id VARCHAR(255) NOT NULL,
+ pid BIGINT UNSIGNED NOT NULL,
+ license_id VARCHAR(255) NOT NULL,
PRIMARY KEY (pid, license_id),
FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
FOREIGN KEY (license_id) REFERENCES mdb_licenses (identifier)
@@ -447,9 +432,9 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_identifier_titles`
(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- title text NOT NULL,
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ title text NOT NULL,
title_type ENUM ('ALTERNATIVE_TITLE', 'SUBTITLE', 'TRANSLATED_TITLE', 'OTHER'),
language VARCHAR(2),
PRIMARY KEY (id),
@@ -458,9 +443,9 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_identifier_funders`
(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- funder_name VARCHAR(255) NOT NULL,
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ funder_name VARCHAR(255) NOT NULL,
funder_identifier TEXT,
funder_identifier_type ENUM ('CROSSREF_FUNDER_ID', 'GRID', 'ISNI', 'ROR', 'OTHER'),
scheme_uri text,
@@ -473,9 +458,9 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_identifier_descriptions`
(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- description text NOT NULL,
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ description text NOT NULL,
description_type ENUM ('ABSTRACT', 'METHODS', 'SERIES_INFORMATION', 'TABLE_OF_CONTENTS', 'TECHNICAL_INFO', 'OTHER'),
language VARCHAR(2),
PRIMARY KEY (id),
@@ -484,11 +469,11 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_related_identifiers`
(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
- value varchar(255) NOT NULL,
- type varchar(255) NOT NULL,
- relation varchar(255) NOT NULL,
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
+ value varchar(255) NOT NULL,
+ type varchar(255) NOT NULL,
+ relation varchar(255) NOT NULL,
PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
FOREIGN KEY (pid) REFERENCES mdb_identifiers (id),
UNIQUE (pid, value)
@@ -496,11 +481,11 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_identifier_creators`
(
- id bigint NOT NULL AUTO_INCREMENT,
- pid bigint NOT NULL,
+ id SERIAL,
+ pid BIGINT UNSIGNED NOT NULL,
given_names text,
family_name text,
- creator_name VARCHAR(255) NOT NULL,
+ creator_name VARCHAR(255) NOT NULL,
name_type ENUM ('PERSONAL', 'ORGANIZATIONAL') default 'PERSONAL',
name_identifier text,
name_identifier_scheme ENUM ('ROR', 'GRID', 'ISNI', 'ORCID'),
@@ -516,7 +501,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_update`
(
uUserID character varying(255) NOT NULL,
- uDBID bigint NOT NULL,
+ uDBID BIGINT UNSIGNED NOT NULL,
created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (uUserID, uDBID),
FOREIGN KEY (uDBID) REFERENCES mdb_databases (id)
@@ -525,7 +510,7 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_access`
(
aUserID character varying(255) NOT NULL,
- aDBID bigint REFERENCES mdb_databases (id),
+ aDBID BIGINT UNSIGNED REFERENCES mdb_databases (id),
attime TIMESTAMP,
download BOOLEAN,
created timestamp NOT NULL DEFAULT NOW(),
@@ -535,14 +520,40 @@ data:
CREATE TABLE IF NOT EXISTS `mdb_have_access`
(
user_id character varying(36) NOT NULL,
- database_id bigint REFERENCES mdb_databases (id),
+ database_id BIGINT UNSIGNED REFERENCES mdb_databases (id),
access_type ENUM ('READ', 'WRITE_OWN', 'WRITE_ALL') NOT NULL,
created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (user_id, database_id),
FOREIGN KEY (user_id) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
+ CREATE TABLE IF NOT EXISTS `mdb_image_types`
+ (
+ id SERIAL,
+ image_id BIGINT UNSIGNED NOT NULL,
+ display_name varchar(255) NOT NULL,
+ value varchar(255) NOT NULL,
+ size_min INT UNSIGNED,
+ size_max INT UNSIGNED,
+ size_default INT UNSIGNED,
+ size_required BOOLEAN COMMENT 'When setting NULL, the service assumes the data type has no size',
+ size_step INT UNSIGNED,
+ d_min INT UNSIGNED,
+ d_max INT UNSIGNED,
+ d_default INT UNSIGNED,
+ d_required BOOLEAN COMMENT 'When setting NULL, the service assumes the data type has no d',
+ d_step INT UNSIGNED,
+ hint TEXT,
+ documentation TEXT NOT NULL,
+ is_quoted BOOLEAN NOT NULL,
+ is_buildable BOOLEAN NOT NULL,
+ PRIMARY KEY (id),
+ FOREIGN KEY (image_id) REFERENCES `mdb_images` (`id`),
+ UNIQUE (value)
+ ) WITH SYSTEM VERSIONING;
+
COMMIT;
+
BEGIN;
INSERT INTO `mdb_licenses` (identifier, uri, description)
@@ -555,14 +566,71 @@ data:
VALUES ('mariadb', 'docker.io', '11.1.3', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver',
'mariadb');
- INSERT INTO `mdb_images_date` (iid, database_format, unix_format, example, has_time)
- VALUES (1, '%Y-%c-%d %H:%i:%S.%f', 'yyyy-MM-dd HH:mm:ss.SSSSSS', '2022-01-30 13:44:25.499', true),
- (1, '%Y-%c-%d %H:%i:%S', 'yyyy-MM-dd HH:mm:ss', '2022-01-30 13:44:25', true),
- (1, '%Y-%c-%d', 'yyyy-MM-dd', '2022-01-30', false),
- (1, '%H:%i:%S', 'HH:mm:ss', '13:44:25', true),
- (1, '%d.%c.%Y', 'dd.MM.yyyy', '30.01.2022', false);
-
- INSERT INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
+ INSERT INTO `mdb_image_types` (image_id, display_name, value, size_min, size_max, size_default, size_required,
+ size_step, d_min, d_max, d_default, d_required, d_step, hint, documentation, is_quoted,
+ is_buildable)
+ VALUES (1, 'BIGINT(size)', 'bigint', 0, null, null, false, 1, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/bigint/', false, true),
+ (1, 'BINARY(size)', 'binary', 0, 255, 255, true, 1, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/binary/', false, true),
+ (1, 'BIT(size)', 'bit', 0, 64, null, false, 1, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/bit/', false, true),
+ (1, 'BLOB(size)', 'blob', 0, 65535, null, false, 1, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/blob/', false, false),
+ (1, 'BOOL', 'bool', null, null, null, null, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/bool/', false, true),
+ (1, 'CHAR(size)', 'char', 0, 255, 255, false, 1, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/char/', false, true),
+ (1, 'DATE', 'date', null, null, null, null, null, null, null, null, null, null,
+ 'min. 1000-01-01, max. 9999-12-31', 'https://mariadb.com/kb/en/date/', true, true),
+ (1, 'DATETIME(fsp)', 'datetime', 0, 6, null, null, 1, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 1000-01-01 00:00:00.0, max. 9999-12-31 23:59:59.9',
+ 'https://mariadb.com/kb/en/datetime/', true, true),
+ (1, 'DECIMAL(size, d)', 'decimal', 0, 65, null, false, 1, 0, 38, null, false, null, null,
+ 'https://mariadb.com/kb/en/decimal/', false, true),
+ (1, 'DOUBLE(size, d)', 'double', null, null, null, false, null, null, null, null, false, null, null,
+ 'https://mariadb.com/kb/en/double/', false, true),
+ (1, 'ENUM(v1,v2,...)', 'enum', null, null, null, null, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/enum/', true, true),
+ (1, 'FLOAT(size)', 'float', null, null, null, false, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/float/', false, true),
+ (1, 'INT(size)', 'int', null, null, null, false, null, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/int/', false, true),
+ (1, 'LONGBLOB', 'longblob', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB',
+ 'https://mariadb.com/kb/en/longblob/', false, true),
+ (1, 'LONGTEXT', 'longtext', null, null, null, null, null, null, null, null, null, null, 'max. 3.999 GiB',
+ 'https://mariadb.com/kb/en/longtext/', true, true),
+ (1, 'MEDIUMBLOB', 'mediumblob', null, null, null, null, null, null, null, null, null, null, 'max. 15.999 MiB',
+ 'https://mariadb.com/kb/en/mediumblob/', false, true),
+ (1, 'MEDIUMINT', 'mediumint', null, null, null, null, null, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/mediumint/', false, true),
+ (1, 'MEDIUMTEXT', 'mediumtext', null, null, null, null, null, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/mediumtext/', true, true),
+ (1, 'SET(v1,v2,...)', 'set', null, null, null, null, null, null, null, null, null, null, null,
+ 'https://mariadb.com/kb/en/set/', true, true),
+ (1, 'SMALLINT(size)', 'smallint', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/smallint/', false, true),
+ (1, 'TEXT(size)', 'text', 0, null, null, false, null, null, null, null, null, null, 'size in Bytes',
+ 'https://mariadb.com/kb/en/text/', true, true),
+ (1, 'TIME(fsp)', 'time', 0, 6, 0, false, null, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/time/', true, true),
+ (1, 'TIMESTAMP(fsp)', 'timestamp', 0, 6, 0, false, null, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', true, true),
+ (1, 'TINYBLOB', 'tinyblob', null, null, null, null, null, null, null, null, null, null,
+ 'fsp=microsecond precision, min. 0, max. 6', 'https://mariadb.com/kb/en/timestamp/', false, true),
+ (1, 'TINYINT(size)', 'tinyint', 0, null, null, false, null, null, null, null, null, null,
+ 'size in Bytes', 'https://mariadb.com/kb/en/tinyint/', false, true),
+ (1, 'TINYTEXT', 'tinytext', null, null, null, null, null, null, null, null, null, null,
+ 'max. 255 characters', 'https://mariadb.com/kb/en/tinytext/', true, true),
+ (1, 'YEAR', 'year', 2, 4, null, false, 2, null, null, null, null, null, 'min. 1901, max. 2155',
+ 'https://mariadb.com/kb/en/year/', false, true),
+ (1, 'VARBINARY(size)', 'varbinary', 0, null, null, true, null, null, null, null, null, null,
+ null, 'https://mariadb.com/kb/en/varbinary/', false, true),
+ (1, 'VARCHAR(size)', 'varchar', 0, 65532, 255, true, null, null, null, null, null, null,
+ null, 'https://mariadb.com/kb/en/varchar/', false, true);
+
+ INSERT
+ INTO `mdb_ontologies` (prefix, uri, uri_pattern, sparql_endpoint, rdf_path)
VALUES ('om', 'http://www.ontology-of-units-of-measure.org/resource/om-2/',
'http://www.ontology-of-units-of-measure.org/resource/om-2/.*', null, 'rdf/om-2.0.rdf'),
('wd', 'http://www.wikidata.org/', 'http://www.wikidata.org/entity/.*', 'https://query.wikidata.org/sparql',
diff --git a/helm/dbrepo/values.schema.json b/helm/dbrepo/values.schema.json
index c988efbfbe6678651fca94cf33dc7b5fae30a3ee..a8e7bbbf743a45c32d8a3a43c8785f4c279fc0ba 100644
--- a/helm/dbrepo/values.schema.json
+++ b/helm/dbrepo/values.schema.json
@@ -356,6 +356,14 @@
},
"type": "object"
},
+ "metrics": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
"persistence": {
"properties": {
"enabled": {
@@ -378,6 +386,23 @@
},
"service": {
"properties": {
+ "extraPorts": {
+ "items": {
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "port": {
+ "type": "integer"
+ },
+ "targetPort": {
+ "type": "integer"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
"managerPortEnabled": {
"type": "boolean"
},
@@ -398,21 +423,87 @@
},
"dashboardservice": {
"properties": {
+ "dashboardsProvider": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "datasources": {
+ "properties": {
+ "secretDefinition": {
+ "properties": {
+ "apiVersion": {
+ "type": "integer"
+ },
+ "datasources": {
+ "items": {
+ "properties": {
+ "name": {
+ "type": "string"
+ },
+ "type": {
+ "type": "string"
+ },
+ "uid": {
+ "type": "string"
+ },
+ "url": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
"enabled": {
"type": "boolean"
},
- "envFromSecret": {
- "type": "string"
- },
"fullnameOverride": {
"type": "string"
},
+ "grafana": {
+ "properties": {
+ "extraConfigmaps": {
+ "items": {
+ "properties": {
+ "mountPath": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "readOnly": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
+ "extraEnvVarsSecret": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ },
"ldap": {
"properties": {
+ "allowSignUp": {
+ "type": "boolean"
+ },
"enabled": {
"type": "boolean"
},
- "existingSecret": {
+ "secretName": {
"type": "string"
}
},
@@ -423,16 +514,45 @@
},
"datadb": {
"properties": {
- "auth": {
+ "database": {
"properties": {
- "replicationPassword": {
- "type": "string"
+ "auth": {
+ "properties": {
+ "replicationPassword": {
+ "type": "string"
+ },
+ "replicationUser": {
+ "type": "string"
+ },
+ "rootPassword": {
+ "type": "string"
+ }
+ },
+ "type": "object"
},
- "replicationUser": {
- "type": "string"
+ "image": {
+ "properties": {
+ "debug": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
},
- "rootPassword": {
- "type": "string"
+ "metrics": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "secondary": {
+ "properties": {
+ "replicaCount": {
+ "type": "integer"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
@@ -442,30 +562,6 @@
},
"fullnameOverride": {
"type": "string"
- },
- "image": {
- "properties": {
- "debug": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "metrics": {
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- },
- "type": "object"
- },
- "secondary": {
- "properties": {
- "replicaCount": {
- "type": "integer"
- }
- },
- "type": "object"
}
},
"type": "object"
@@ -1114,6 +1210,79 @@
},
"type": "object"
},
+ "metricdb": {
+ "properties": {
+ "alertmanager": {
+ "properties": {
+ "service": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
+ "enabled": {
+ "type": "boolean"
+ },
+ "fullnameOverride": {
+ "type": "string"
+ },
+ "server": {
+ "properties": {
+ "extraScrapeConfigs": {
+ "items": {
+ "properties": {
+ "job_name": {
+ "type": "string"
+ },
+ "metrics_path": {
+ "type": "string"
+ },
+ "static_configs": {
+ "items": {
+ "properties": {
+ "targets": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ }
+ },
+ "type": "object"
+ },
+ "type": "array"
+ },
+ "persistence": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
+ },
+ "service": {
+ "properties": {
+ "type": {
+ "type": "string"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ }
+ },
+ "type": "object"
+ },
"searchdb": {
"properties": {
"clusterName": {
@@ -1332,6 +1501,14 @@
"properties": {
"enabled": {
"type": "boolean"
+ },
+ "metrics": {
+ "properties": {
+ "enabled": {
+ "type": "boolean"
+ }
+ },
+ "type": "object"
}
},
"type": "object"
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 845465ac169763f9bb9edb2dd75fcf546fd304d0..68c2e4e06fed820f6c5858efdce9bcf97550fada 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -136,13 +136,13 @@ datadb:
## @skip datadb.database.secondary
secondary:
replicaCount: 2
- auth:
- ## @param datadb.auth.rootPassword The root user password.
- rootPassword: dbrepo
- ## @param datadb.auth.replicationUser The database replication user password
- replicationUser: replication
- ## @param datadb.auth.replicationPassword The database replication user password
- replicationPassword: replication
+ auth:
+ ## @param datadb.auth.rootPassword The root user password.
+ rootPassword: dbrepo
+ ## @param datadb.auth.replicationUser The database replication user password
+ replicationUser: replication
+ ## @param datadb.auth.replicationPassword The database replication user password
+ replicationPassword: replication
## @section Search Database
@@ -262,7 +262,7 @@ brokerservice:
enabled: true
existingSecret: broker-service-secret
## @param brokerservice.extraPlugins The list of plugins to be activated.
- extraPlugins: rabbitmq_prometheus rabbitmq_auth_backend_ldap rabbitmq_auth_mechanism_ssl
+ extraPlugins: rabbitmq_prometheus rabbitmq_auth_backend_ldap rabbitmq_auth_mechanism_ssl rabbitmq_mqtt
persistence:
## @param brokerservice.persistence.enabled If set to true, a PVC will be created.
enabled: false
@@ -270,6 +270,10 @@ brokerservice:
service:
type: ClusterIP
managerPortEnabled: true
+ extraPorts:
+ - name: mqtt
+ port: 1883
+ targetPort: 1883
# loadBalancerIP:
## @param brokerservice.replicaCount The number of replicas.
replicaCount: 1
@@ -281,7 +285,7 @@ analyseservice:
enabled: true
image:
## @skip analyseservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.6
+ name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.4.7
## @skip analyseservice.image.pullPolicy
pullPolicy: Always
## @param analyseservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`.
@@ -343,7 +347,7 @@ metadataservice:
enabled: true
image:
## @skip metadataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.6
+ name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.4.7
## @skip metadataservice.image.pullPolicy
pullPolicy: Always
## @param metadataservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`.
@@ -442,7 +446,7 @@ dataservice:
endpoint: http://data-service
image:
## @skip dataservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.6
+ name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.4.7
## @skip dataservice.image.pullPolicy
pullPolicy: Always
## @param dataservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`.
@@ -529,7 +533,7 @@ searchservice:
endpoint: http://search-service
image:
## @skip searchservice.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.6
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.4.7
## @skip searchservice.image.pullPolicy
pullPolicy: Always
## @param searchservice.image.debug Set the logging level to `trace`. Otherwise, set to `info`.
@@ -578,7 +582,7 @@ searchservice:
## @skip searchservice.init
init:
image:
- name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.6
+ name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.4.7
pullPolicy: Always
## @param searchservice.replicaCount The number of replicas.
replicaCount: 2
@@ -626,7 +630,7 @@ storageservice:
adminSecretAccessKey: seaweedfsadmin
## @skip storageservice.init
init:
- image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.6
+ image: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.4.7
pullPolicy: Always
## @section Identity Service
@@ -689,7 +693,7 @@ ui:
enabled: true
image:
## @skip ui.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.6
+ name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.4.7
## @skip ui.image.pullPolicy
pullPolicy: Always
## @param ui.image.debug Set the logging level to `trace`. Otherwise, set to `info`.
@@ -812,11 +816,13 @@ dashboardservice:
grafana:
## @skip dashboardservice.grafana.extraEnvVarsSecret
extraEnvVarsSecret: dashboard-service-secret
+ ## @skip dashboardservice.grafana.extraConfigmaps
extraConfigmaps:
- name: dashboard-service-config
mountPath: /opt/bitnami/grafana/dashboards
readOnly: true
datasources:
+ ## @skip dashboardservice.datasources.secretDefinition
secretDefinition:
apiVersion: 1
datasources:
@@ -825,6 +831,7 @@ dashboardservice:
type: "prometheus"
url: "http://metric-db-server"
dashboardsProvider:
+ ## @param dashboardservice.dashboardsProvider.enabled Enable the default dashboard provisioning provider to routinely import dashboards from /opt/bitnami/grafana/dashboards
enabled: true
## @section Metric Service
@@ -833,7 +840,7 @@ metricdb:
## @param metricdb.enabled Enable the Metric Service.
enabled: true
## @skip metricdb.fullnameOverride
- fullnameOverride: metric-service
+ fullnameOverride: metric-db
alertmanager:
service:
## @skip metricdb.alertmanager.service.type
@@ -847,14 +854,18 @@ metricdb:
enabled: true
## @skip metricdb.server.extraScrapeConfigs
extraScrapeConfigs:
- - job_name: 'spring boot scrape'
+ - job_name: 'actuator scrape'
metrics_path: '/actuator/prometheus'
static_configs:
- - targets: [ 'data-service', 'metadata-service' ]
+ - targets: [ 'data-service', 'metadata-service', 'ui' ]
- job_name: 'metrics scrape'
metrics_path: '/metrics'
static_configs:
- - targets: [ 'auth-service-metrics:8080', 'analyse-service', 'search-service', 'data-db:8080', 'data-db-metrics:9104', 'broker-service:9419', 'ui', 'metadata-db-metrics:9104', 'dashboard-service:3000', 'storage-service-master-metrics:9327', 'upload-service' ]
+ - targets: [ 'auth-service-metrics:8080', 'analyse-service', 'search-service', 'data-db:8080', 'data-db-metrics:9104', 'broker-service:9419', 'metadata-db-metrics:9104', 'storage-service-master-metrics:9327', 'upload-service' ]
+ - job_name: 'dashboard scrape'
+ metrics_path: '/dashboard/metrics'
+ static_configs:
+ - targets: [ 'dashboard-service:3000' ]
## @section Ingress
diff --git a/install.sh b/install.sh
index a59965816bd2200960b407a53aacbd3e0b879b0d..03974502c259f964cd22a8bd5f5f2ec983635c71 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# preset
-VERSION="1.4.6"
+VERSION="1.4.7"
MIN_CPU=8
MIN_RAM=4
MIN_MAP_COUNT=262144
@@ -58,7 +58,7 @@ fi
# environment
echo "[🚀] Gathering environment for version ${VERSION} ..."
-curl -sSL -o ./dist.tar.gz "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/${VERSION}/dist.tar.gz"
+curl -ksSL -o ./dist.tar.gz "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/${VERSION}/dist.tar.gz"
tar xzfv ./dist.tar.gz
if [[ $DOWNLOAD_ONLY -eq 1 ]]; then
diff --git a/lib/python/.coveragerc b/lib/python/.coveragerc
new file mode 100644
index 0000000000000000000000000000000000000000..2301243c8400da8046858a8cbfc8a5abfad9b5d7
--- /dev/null
+++ b/lib/python/.coveragerc
@@ -0,0 +1,3 @@
+[report]
+omit =
+ */tests/*
diff --git a/lib/python/.gitignore b/lib/python/.gitignore
index 46916e3e91c948d297fa8fda068bc1b123d9aced..c954a774008e444617bea9ec16df30b7dda3183b 100644
--- a/lib/python/.gitignore
+++ b/lib/python/.gitignore
@@ -5,6 +5,7 @@
dist/
dbrepo.egg-info/
build/
+htmlcov/
# debug
debug.py
diff --git a/lib/python/Makefile b/lib/python/Makefile
index 229fa04db39df9ca8d20263cf3777b8b79e1febe..afebb199acc957c9972a89535b90052f510edbb5 100644
--- a/lib/python/Makefile
+++ b/lib/python/Makefile
@@ -1,4 +1,4 @@
-all: build install
+all: build
clean:
rm -rf ./python/dist/* ./docs/build/* ./dist/*
@@ -14,14 +14,6 @@ build: clean
python3 -m build --sdist .
python3 -m build --wheel .
-install:
- cp ./dist/dbrepo-* ../../dbrepo-analyse-service/lib/
- (cd ../../dbrepo-analyse-service && pipenv lock)
- cp ./dist/dbrepo-* ../../dbrepo-search-service/lib/
- (cd ../../dbrepo-search-service && pipenv lock)
- cp ./dist/dbrepo-* ../../dbrepo-search-service/init/lib/
- (cd ../../dbrepo-search-service/init && pipenv lock)
-
deploy: build
python3 -m twine upload --config-file ~/.pypirc --verbose --repository pypi ./dist/dbrepo-*
diff --git a/lib/python/Pipfile.lock b/lib/python/Pipfile.lock
index 953bcf20f326a8e1fc3c313683f09d546271f963..fd2af13e692cfbe941701b905d22f00e6b14064c 100644
--- a/lib/python/Pipfile.lock
+++ b/lib/python/Pipfile.lock
@@ -16,87 +16,110 @@
]
},
"default": {
+ "aiohappyeyeballs": {
+ "hashes": [
+ "sha256:75cf88a15106a5002a8eb1dab212525c00d1f4c0fa96e551c9fbe6f09a621586",
+ "sha256:8a7a83727b2756f394ab2895ea0765a0a8c475e3c71e98d43d76f22b4b435572"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==2.4.3"
+ },
"aiohttp": {
"hashes": [
- "sha256:0605cc2c0088fcaae79f01c913a38611ad09ba68ff482402d3410bf59039bfb8",
- "sha256:0a158704edf0abcac8ac371fbb54044f3270bdbc93e254a82b6c82be1ef08f3c",
- "sha256:0cbf56238f4bbf49dab8c2dc2e6b1b68502b1e88d335bea59b3f5b9f4c001475",
- "sha256:1732102949ff6087589408d76cd6dea656b93c896b011ecafff418c9661dc4ed",
- "sha256:18f634d540dd099c262e9f887c8bbacc959847cfe5da7a0e2e1cf3f14dbf2daf",
- "sha256:239f975589a944eeb1bad26b8b140a59a3a320067fb3cd10b75c3092405a1372",
- "sha256:2faa61a904b83142747fc6a6d7ad8fccff898c849123030f8e75d5d967fd4a81",
- "sha256:320e8618eda64e19d11bdb3bd04ccc0a816c17eaecb7e4945d01deee2a22f95f",
- "sha256:38d80498e2e169bc61418ff36170e0aad0cd268da8b38a17c4cf29d254a8b3f1",
- "sha256:3916c8692dbd9d55c523374a3b8213e628424d19116ac4308e434dbf6d95bbdd",
- "sha256:393c7aba2b55559ef7ab791c94b44f7482a07bf7640d17b341b79081f5e5cd1a",
- "sha256:3b7b30258348082826d274504fbc7c849959f1989d86c29bc355107accec6cfb",
- "sha256:3fcb4046d2904378e3aeea1df51f697b0467f2aac55d232c87ba162709478c46",
- "sha256:4109adee842b90671f1b689901b948f347325045c15f46b39797ae1bf17019de",
- "sha256:4558e5012ee03d2638c681e156461d37b7a113fe13970d438d95d10173d25f78",
- "sha256:45731330e754f5811c314901cebdf19dd776a44b31927fa4b4dbecab9e457b0c",
- "sha256:4715a9b778f4293b9f8ae7a0a7cef9829f02ff8d6277a39d7f40565c737d3771",
- "sha256:471f0ef53ccedec9995287f02caf0c068732f026455f07db3f01a46e49d76bbb",
- "sha256:4d3ebb9e1316ec74277d19c5f482f98cc65a73ccd5430540d6d11682cd857430",
- "sha256:4ff550491f5492ab5ed3533e76b8567f4b37bd2995e780a1f46bca2024223233",
- "sha256:52c27110f3862a1afbcb2af4281fc9fdc40327fa286c4625dfee247c3ba90156",
- "sha256:55b39c8684a46e56ef8c8d24faf02de4a2b2ac60d26cee93bc595651ff545de9",
- "sha256:5a7ee16aab26e76add4afc45e8f8206c95d1d75540f1039b84a03c3b3800dd59",
- "sha256:5ca51eadbd67045396bc92a4345d1790b7301c14d1848feaac1d6a6c9289e888",
- "sha256:5d6b3f1fabe465e819aed2c421a6743d8debbde79b6a8600739300630a01bf2c",
- "sha256:60cdbd56f4cad9f69c35eaac0fbbdf1f77b0ff9456cebd4902f3dd1cf096464c",
- "sha256:6380c039ec52866c06d69b5c7aad5478b24ed11696f0e72f6b807cfb261453da",
- "sha256:639d0042b7670222f33b0028de6b4e2fad6451462ce7df2af8aee37dcac55424",
- "sha256:66331d00fb28dc90aa606d9a54304af76b335ae204d1836f65797d6fe27f1ca2",
- "sha256:67c3119f5ddc7261d47163ed86d760ddf0e625cd6246b4ed852e82159617b5fb",
- "sha256:694d828b5c41255e54bc2dddb51a9f5150b4eefa9886e38b52605a05d96566e8",
- "sha256:6ae79c1bc12c34082d92bf9422764f799aee4746fd7a392db46b7fd357d4a17a",
- "sha256:702e2c7c187c1a498a4e2b03155d52658fdd6fda882d3d7fbb891a5cf108bb10",
- "sha256:714d4e5231fed4ba2762ed489b4aec07b2b9953cf4ee31e9871caac895a839c0",
- "sha256:7b179eea70833c8dee51ec42f3b4097bd6370892fa93f510f76762105568cf09",
- "sha256:7f64cbd44443e80094309875d4f9c71d0401e966d191c3d469cde4642bc2e031",
- "sha256:82a6a97d9771cb48ae16979c3a3a9a18b600a8505b1115cfe354dfb2054468b4",
- "sha256:84dabd95154f43a2ea80deffec9cb44d2e301e38a0c9d331cc4aa0166fe28ae3",
- "sha256:8676e8fd73141ded15ea586de0b7cda1542960a7b9ad89b2b06428e97125d4fa",
- "sha256:88e311d98cc0bf45b62fc46c66753a83445f5ab20038bcc1b8a1cc05666f428a",
- "sha256:8b4f72fbb66279624bfe83fd5eb6aea0022dad8eec62b71e7bf63ee1caadeafe",
- "sha256:8c64a6dc3fe5db7b1b4d2b5cb84c4f677768bdc340611eca673afb7cf416ef5a",
- "sha256:8cf142aa6c1a751fcb364158fd710b8a9be874b81889c2bd13aa8893197455e2",
- "sha256:8d1964eb7617907c792ca00b341b5ec3e01ae8c280825deadbbd678447b127e1",
- "sha256:93e22add827447d2e26d67c9ac0161756007f152fdc5210277d00a85f6c92323",
- "sha256:9c69e77370cce2d6df5d12b4e12bdcca60c47ba13d1cbbc8645dd005a20b738b",
- "sha256:9dbc053ac75ccc63dc3a3cc547b98c7258ec35a215a92bd9f983e0aac95d3d5b",
- "sha256:9e3a1ae66e3d0c17cf65c08968a5ee3180c5a95920ec2731f53343fac9bad106",
- "sha256:a6ea1a5b409a85477fd8e5ee6ad8f0e40bf2844c270955e09360418cfd09abac",
- "sha256:a81b1143d42b66ffc40a441379387076243ef7b51019204fd3ec36b9f69e77d6",
- "sha256:ad7f2919d7dac062f24d6f5fe95d401597fbb015a25771f85e692d043c9d7832",
- "sha256:afc52b8d969eff14e069a710057d15ab9ac17cd4b6753042c407dcea0e40bf75",
- "sha256:b3df71da99c98534be076196791adca8819761f0bf6e08e07fd7da25127150d6",
- "sha256:c088c4d70d21f8ca5c0b8b5403fe84a7bc8e024161febdd4ef04575ef35d474d",
- "sha256:c26959ca7b75ff768e2776d8055bf9582a6267e24556bb7f7bd29e677932be72",
- "sha256:c413016880e03e69d166efb5a1a95d40f83d5a3a648d16486592c49ffb76d0db",
- "sha256:c6021d296318cb6f9414b48e6a439a7f5d1f665464da507e8ff640848ee2a58a",
- "sha256:c671dc117c2c21a1ca10c116cfcd6e3e44da7fcde37bf83b2be485ab377b25da",
- "sha256:c7a4b7a6cf5b6eb11e109a9755fd4fda7d57395f8c575e166d363b9fc3ec4678",
- "sha256:c8a02fbeca6f63cb1f0475c799679057fc9268b77075ab7cf3f1c600e81dd46b",
- "sha256:cd2adf5c87ff6d8b277814a28a535b59e20bfea40a101db6b3bdca7e9926bc24",
- "sha256:d1469f228cd9ffddd396d9948b8c9cd8022b6d1bf1e40c6f25b0fb90b4f893ed",
- "sha256:d153f652a687a8e95ad367a86a61e8d53d528b0530ef382ec5aaf533140ed00f",
- "sha256:d5ab8e1f6bee051a4bf6195e38a5c13e5e161cb7bad83d8854524798bd9fcd6e",
- "sha256:da00da442a0e31f1c69d26d224e1efd3a1ca5bcbf210978a2ca7426dfcae9f58",
- "sha256:da22dab31d7180f8c3ac7c7635f3bcd53808f374f6aa333fe0b0b9e14b01f91a",
- "sha256:e0ae53e33ee7476dd3d1132f932eeb39bf6125083820049d06edcdca4381f342",
- "sha256:e7a6a8354f1b62e15d48e04350f13e726fa08b62c3d7b8401c0a1314f02e3558",
- "sha256:e9a3d838441bebcf5cf442700e3963f58b5c33f015341f9ea86dcd7d503c07e2",
- "sha256:edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551",
- "sha256:f22eb3a6c1080d862befa0a89c380b4dafce29dc6cd56083f630073d102eb595",
- "sha256:f26383adb94da5e7fb388d441bf09c61e5e35f455a3217bfd790c6b6bc64b2ee",
- "sha256:f3c2890ca8c59ee683fd09adf32321a40fe1cf164e3387799efb2acebf090c11",
- "sha256:f64fd07515dad67f24b6ea4a66ae2876c01031de91c93075b8093f07c0a2d93d",
- "sha256:fcde4c397f673fdec23e6b05ebf8d4751314fa7c24f93334bf1f1364c1c69ac7",
- "sha256:ff84aeb864e0fac81f676be9f4685f0527b660f1efdc40dcede3c251ef1e867f"
+ "sha256:02d1d6610588bcd743fae827bd6f2e47e0d09b346f230824b4c6fb85c6065f9c",
+ "sha256:03690541e4cc866eef79626cfa1ef4dd729c5c1408600c8cb9e12e1137eed6ab",
+ "sha256:0bc059ecbce835630e635879f5f480a742e130d9821fbe3d2f76610a6698ee25",
+ "sha256:0c21c82df33b264216abffff9f8370f303dab65d8eee3767efbbd2734363f677",
+ "sha256:1298b854fd31d0567cbb916091be9d3278168064fca88e70b8468875ef9ff7e7",
+ "sha256:1321658f12b6caffafdc35cfba6c882cb014af86bef4e78c125e7e794dfb927b",
+ "sha256:143b0026a9dab07a05ad2dd9e46aa859bffdd6348ddc5967b42161168c24f857",
+ "sha256:16e6a51d8bc96b77f04a6764b4ad03eeef43baa32014fce71e882bd71302c7e4",
+ "sha256:172ad884bb61ad31ed7beed8be776eb17e7fb423f1c1be836d5cb357a096bf12",
+ "sha256:17c272cfe7b07a5bb0c6ad3f234e0c336fb53f3bf17840f66bd77b5815ab3d16",
+ "sha256:1a0ee6c0d590c917f1b9629371fce5f3d3f22c317aa96fbdcce3260754d7ea21",
+ "sha256:2746d8994ebca1bdc55a1e998feff4e94222da709623bb18f6e5cfec8ec01baf",
+ "sha256:2914caa46054f3b5ff910468d686742ff8cff54b8a67319d75f5d5945fd0a13d",
+ "sha256:2bbf94d4a0447705b7775417ca8bb8086cc5482023a6e17cdc8f96d0b1b5aba6",
+ "sha256:2bd9f3eac515c16c4360a6a00c38119333901b8590fe93c3257a9b536026594d",
+ "sha256:2c33fa6e10bb7ed262e3ff03cc69d52869514f16558db0626a7c5c61dde3c29f",
+ "sha256:2d37f4718002863b82c6f391c8efd4d3a817da37030a29e2682a94d2716209de",
+ "sha256:3668d0c2a4d23fb136a753eba42caa2c0abbd3d9c5c87ee150a716a16c6deec1",
+ "sha256:36d4fba838be5f083f5490ddd281813b44d69685db910907636bc5dca6322316",
+ "sha256:40ff5b7660f903dc587ed36ef08a88d46840182d9d4b5694e7607877ced698a1",
+ "sha256:42775de0ca04f90c10c5c46291535ec08e9bcc4756f1b48f02a0657febe89b10",
+ "sha256:482c85cf3d429844396d939b22bc2a03849cb9ad33344689ad1c85697bcba33a",
+ "sha256:4e6cb75f8ddd9c2132d00bc03c9716add57f4beff1263463724f6398b813e7eb",
+ "sha256:4edc3fd701e2b9a0d605a7b23d3de4ad23137d23fc0dbab726aa71d92f11aaaf",
+ "sha256:4fd16b30567c5b8e167923be6e027eeae0f20cf2b8a26b98a25115f28ad48ee0",
+ "sha256:5002a02c17fcfd796d20bac719981d2fca9c006aac0797eb8f430a58e9d12431",
+ "sha256:51d0a4901b27272ae54e42067bc4b9a90e619a690b4dc43ea5950eb3070afc32",
+ "sha256:558b3d223fd631ad134d89adea876e7fdb4c93c849ef195049c063ada82b7d08",
+ "sha256:5c070430fda1a550a1c3a4c2d7281d3b8cfc0c6715f616e40e3332201a253067",
+ "sha256:5f392ef50e22c31fa49b5a46af7f983fa3f118f3eccb8522063bee8bfa6755f8",
+ "sha256:60555211a006d26e1a389222e3fab8cd379f28e0fbf7472ee55b16c6c529e3a6",
+ "sha256:608cecd8d58d285bfd52dbca5b6251ca8d6ea567022c8a0eaae03c2589cd9af9",
+ "sha256:60ad5b8a7452c0f5645c73d4dad7490afd6119d453d302cd5b72b678a85d6044",
+ "sha256:63649309da83277f06a15bbdc2a54fbe75efb92caa2c25bb57ca37762789c746",
+ "sha256:6ebdc3b3714afe1b134b3bbeb5f745eed3ecbcff92ab25d80e4ef299e83a5465",
+ "sha256:6f3c6648aa123bcd73d6f26607d59967b607b0da8ffcc27d418a4b59f4c98c7c",
+ "sha256:7003f33f5f7da1eb02f0446b0f8d2ccf57d253ca6c2e7a5732d25889da82b517",
+ "sha256:776e9f3c9b377fcf097c4a04b241b15691e6662d850168642ff976780609303c",
+ "sha256:85711eec2d875cd88c7eb40e734c4ca6d9ae477d6f26bd2b5bb4f7f60e41b156",
+ "sha256:87d1e4185c5d7187684d41ebb50c9aeaaaa06ca1875f4c57593071b0409d2444",
+ "sha256:8a3f063b41cc06e8d0b3fcbbfc9c05b7420f41287e0cd4f75ce0a1f3d80729e6",
+ "sha256:8b3fb28a9ac8f2558760d8e637dbf27aef1e8b7f1d221e8669a1074d1a266bb2",
+ "sha256:8bd9125dd0cc8ebd84bff2be64b10fdba7dc6fd7be431b5eaf67723557de3a31",
+ "sha256:8be1a65487bdfc285bd5e9baf3208c2132ca92a9b4020e9f27df1b16fab998a9",
+ "sha256:8cc0d13b4e3b1362d424ce3f4e8c79e1f7247a00d792823ffd640878abf28e56",
+ "sha256:8d9d10d10ec27c0d46ddaecc3c5598c4db9ce4e6398ca872cdde0525765caa2f",
+ "sha256:8debb45545ad95b58cc16c3c1cc19ad82cffcb106db12b437885dbee265f0ab5",
+ "sha256:91aa966858593f64c8a65cdefa3d6dc8fe3c2768b159da84c1ddbbb2c01ab4ef",
+ "sha256:9331dd34145ff105177855017920dde140b447049cd62bb589de320fd6ddd582",
+ "sha256:99f9678bf0e2b1b695e8028fedac24ab6770937932eda695815d5a6618c37e04",
+ "sha256:9fdf5c839bf95fc67be5794c780419edb0dbef776edcfc6c2e5e2ffd5ee755fa",
+ "sha256:a14e4b672c257a6b94fe934ee62666bacbc8e45b7876f9dd9502d0f0fe69db16",
+ "sha256:a19caae0d670771ea7854ca30df76f676eb47e0fd9b2ee4392d44708f272122d",
+ "sha256:a35ed3d03910785f7d9d6f5381f0c24002b2b888b298e6f941b2fc94c5055fcd",
+ "sha256:a61df62966ce6507aafab24e124e0c3a1cfbe23c59732987fc0fd0d71daa0b88",
+ "sha256:a6e00c8a92e7663ed2be6fcc08a2997ff06ce73c8080cd0df10cc0321a3168d7",
+ "sha256:ac3196952c673822ebed8871cf8802e17254fff2a2ed4835d9c045d9b88c5ec7",
+ "sha256:ac74e794e3aee92ae8f571bfeaa103a141e409863a100ab63a253b1c53b707eb",
+ "sha256:ad3675c126f2a95bde637d162f8231cff6bc0bc9fbe31bd78075f9ff7921e322",
+ "sha256:aeebd3061f6f1747c011e1d0b0b5f04f9f54ad1a2ca183e687e7277bef2e0da2",
+ "sha256:ba1a599255ad6a41022e261e31bc2f6f9355a419575b391f9655c4d9e5df5ff5",
+ "sha256:bbdb8def5268f3f9cd753a265756f49228a20ed14a480d151df727808b4531dd",
+ "sha256:c2555e4949c8d8782f18ef20e9d39730d2656e218a6f1a21a4c4c0b56546a02e",
+ "sha256:c2695c61cf53a5d4345a43d689f37fc0f6d3a2dc520660aec27ec0f06288d1f9",
+ "sha256:c2b627d3c8982691b06d89d31093cee158c30629fdfebe705a91814d49b554f8",
+ "sha256:c46131c6112b534b178d4e002abe450a0a29840b61413ac25243f1291613806a",
+ "sha256:c54dc329cd44f7f7883a9f4baaefe686e8b9662e2c6c184ea15cceee587d8d69",
+ "sha256:c7d7cafc11d70fdd8801abfc2ff276744ae4cb39d8060b6b542c7e44e5f2cfc2",
+ "sha256:cb0b2d5d51f96b6cc19e6ab46a7b684be23240426ae951dcdac9639ab111b45e",
+ "sha256:d15a29424e96fad56dc2f3abed10a89c50c099f97d2416520c7a543e8fddf066",
+ "sha256:d1f5c9169e26db6a61276008582d945405b8316aae2bb198220466e68114a0f5",
+ "sha256:d271f770b52e32236d945911b2082f9318e90ff835d45224fa9e28374303f729",
+ "sha256:d646fdd74c25bbdd4a055414f0fe32896c400f38ffbdfc78c68e62812a9e0257",
+ "sha256:d6e395c3d1f773cf0651cd3559e25182eb0c03a2777b53b4575d8adc1149c6e9",
+ "sha256:d7c071235a47d407b0e93aa6262b49422dbe48d7d8566e1158fecc91043dd948",
+ "sha256:d97273a52d7f89a75b11ec386f786d3da7723d7efae3034b4dda79f6f093edc1",
+ "sha256:dcf354661f54e6a49193d0b5653a1b011ba856e0b7a76bda2c33e4c6892f34ea",
+ "sha256:e3e7fabedb3fe06933f47f1538df7b3a8d78e13d7167195f51ca47ee12690373",
+ "sha256:e525b69ee8a92c146ae5b4da9ecd15e518df4d40003b01b454ad694a27f498b5",
+ "sha256:e709d6ac598c5416f879bb1bae3fd751366120ac3fa235a01de763537385d036",
+ "sha256:e83dfefb4f7d285c2d6a07a22268344a97d61579b3e0dce482a5be0251d672ab",
+ "sha256:e86260b76786c28acf0b5fe31c8dca4c2add95098c709b11e8c35b424ebd4f5b",
+ "sha256:e883b61b75ca6efc2541fcd52a5c8ccfe288b24d97e20ac08fdf343b8ac672ea",
+ "sha256:f0a44bb40b6aaa4fb9a5c1ee07880570ecda2065433a96ccff409c9c20c1624a",
+ "sha256:f82ace0ec57c94aaf5b0e118d4366cff5889097412c75aa14b4fd5fc0c44ee3e",
+ "sha256:f9ca09414003c0e96a735daa1f071f7d7ed06962ef4fa29ceb6c80d06696d900",
+ "sha256:fa430b871220dc62572cef9c69b41e0d70fcb9d486a4a207a5de4c1f25d82593",
+ "sha256:fc262c3df78c8ff6020c782d9ce02e4bcffe4900ad71c0ecdad59943cba54442",
+ "sha256:fcd546782d03181b0b1d20b43d612429a90a68779659ba8045114b867971ab71",
+ "sha256:fd4ceeae2fb8cabdd1b71c82bfdd39662473d3433ec95b962200e9e752fb70d0",
+ "sha256:fec5fac7aea6c060f317f07494961236434928e6f4374e170ef50b3001e14581"
],
"markers": "python_version >= '3.8'",
- "version": "==3.9.5"
+ "version": "==3.10.9"
},
"aiosignal": {
"hashes": [
@@ -116,19 +139,19 @@
},
"attrs": {
"hashes": [
- "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30",
- "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"
+ "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346",
+ "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2"
],
"markers": "python_version >= '3.7'",
- "version": "==23.2.0"
+ "version": "==24.2.0"
},
"certifi": {
"hashes": [
- "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516",
- "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"
+ "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+ "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
],
"markers": "python_version >= '3.6'",
- "version": "==2024.6.2"
+ "version": "==2024.8.30"
},
"charset-normalizer": {
"hashes": [
@@ -311,184 +334,217 @@
},
"idna": {
"hashes": [
- "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
- "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
],
- "markers": "python_version >= '3.5'",
- "version": "==3.7"
+ "markers": "python_version >= '3.6'",
+ "version": "==3.10"
},
"multidict": {
"hashes": [
- "sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556",
- "sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c",
- "sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29",
- "sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b",
- "sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8",
- "sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7",
- "sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd",
- "sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40",
- "sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6",
- "sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3",
- "sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c",
- "sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9",
- "sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5",
- "sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae",
- "sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442",
- "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9",
- "sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc",
- "sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c",
- "sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea",
- "sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5",
- "sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50",
- "sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182",
- "sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453",
- "sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e",
- "sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600",
- "sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733",
- "sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda",
- "sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241",
- "sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461",
- "sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e",
- "sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e",
- "sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b",
- "sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e",
- "sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7",
- "sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386",
- "sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd",
- "sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9",
- "sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf",
- "sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee",
- "sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5",
- "sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a",
- "sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271",
- "sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54",
- "sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4",
- "sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496",
- "sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb",
- "sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319",
- "sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3",
- "sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f",
- "sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527",
- "sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed",
- "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604",
- "sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef",
- "sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8",
- "sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5",
- "sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5",
- "sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626",
- "sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c",
- "sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d",
- "sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c",
- "sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc",
- "sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc",
- "sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b",
- "sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38",
- "sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450",
- "sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1",
- "sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f",
- "sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3",
- "sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755",
- "sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226",
- "sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a",
- "sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046",
- "sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf",
- "sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479",
- "sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e",
- "sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1",
- "sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a",
- "sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83",
- "sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929",
- "sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93",
- "sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a",
- "sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c",
- "sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44",
- "sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89",
- "sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba",
- "sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e",
- "sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da",
- "sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24",
- "sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423",
- "sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef"
+ "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.7'",
- "version": "==6.0.5"
+ "markers": "python_version >= '3.8'",
+ "version": "==6.1.0"
},
"numpy": {
"hashes": [
- "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b",
- "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818",
- "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20",
- "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0",
- "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010",
- "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a",
- "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea",
- "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c",
- "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71",
- "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110",
- "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be",
- "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a",
- "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a",
- "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5",
- "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed",
- "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd",
- "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c",
- "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e",
- "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0",
- "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c",
- "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a",
- "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b",
- "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0",
- "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6",
- "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2",
- "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a",
- "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30",
- "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218",
- "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5",
- "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07",
- "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2",
- "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4",
- "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764",
- "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef",
- "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3",
- "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"
+ "sha256:05b2d4e667895cc55e3ff2b56077e4c8a5604361fc21a042845ea3ad67465aa8",
+ "sha256:12edb90831ff481f7ef5f6bc6431a9d74dc0e5ff401559a71e5e4611d4f2d466",
+ "sha256:13311c2db4c5f7609b462bc0f43d3c465424d25c626d95040f073e30f7570e35",
+ "sha256:13532a088217fa624c99b843eeb54640de23b3414b14aa66d023805eb731066c",
+ "sha256:13602b3174432a35b16c4cfb5de9a12d229727c3dd47a6ce35111f2ebdf66ff4",
+ "sha256:1600068c262af1ca9580a527d43dc9d959b0b1d8e56f8a05d830eea39b7c8af6",
+ "sha256:1b8cde4f11f0a975d1fd59373b32e2f5a562ade7cde4f85b7137f3de8fbb29a0",
+ "sha256:1c193d0b0238638e6fc5f10f1b074a6993cb13b0b431f64079a509d63d3aa8b7",
+ "sha256:1ebec5fd716c5a5b3d8dfcc439be82a8407b7b24b230d0ad28a81b61c2f4659a",
+ "sha256:242b39d00e4944431a3cd2db2f5377e15b5785920421993770cddb89992c3f3a",
+ "sha256:259ec80d54999cc34cd1eb8ded513cb053c3bf4829152a2e00de2371bd406f5e",
+ "sha256:2abbf905a0b568706391ec6fa15161fad0fb5d8b68d73c461b3c1bab6064dd62",
+ "sha256:2cbba4b30bf31ddbe97f1c7205ef976909a93a66bb1583e983adbd155ba72ac2",
+ "sha256:2ffef621c14ebb0188a8633348504a35c13680d6da93ab5cb86f4e54b7e922b5",
+ "sha256:30d53720b726ec36a7f88dc873f0eec8447fbc93d93a8f079dfac2629598d6ee",
+ "sha256:32e16a03138cabe0cb28e1007ee82264296ac0983714094380b408097a418cfe",
+ "sha256:43cca367bf94a14aca50b89e9bc2061683116cfe864e56740e083392f533ce7a",
+ "sha256:456e3b11cb79ac9946c822a56346ec80275eaf2950314b249b512896c0d2505e",
+ "sha256:4d6ec0d4222e8ffdab1744da2560f07856421b367928026fb540e1945f2eeeaf",
+ "sha256:5006b13a06e0b38d561fab5ccc37581f23c9511879be7693bd33c7cd15ca227c",
+ "sha256:675c741d4739af2dc20cd6c6a5c4b7355c728167845e3c6b0e824e4e5d36a6c3",
+ "sha256:6cdb606a7478f9ad91c6283e238544451e3a95f30fb5467fbf715964341a8a86",
+ "sha256:6d95f286b8244b3649b477ac066c6906fbb2905f8ac19b170e2175d3d799f4df",
+ "sha256:76322dcdb16fccf2ac56f99048af32259dcc488d9b7e25b51e5eca5147a3fb98",
+ "sha256:7c1c60328bd964b53f8b835df69ae8198659e2b9302ff9ebb7de4e5a5994db3d",
+ "sha256:860ec6e63e2c5c2ee5e9121808145c7bf86c96cca9ad396c0bd3e0f2798ccbe2",
+ "sha256:8e00ea6fc82e8a804433d3e9cedaa1051a1422cb6e443011590c14d2dea59146",
+ "sha256:9c6c754df29ce6a89ed23afb25550d1c2d5fdb9901d9c67a16e0b16eaf7e2550",
+ "sha256:a26ae94658d3ba3781d5e103ac07a876b3e9b29db53f68ed7df432fd033358a8",
+ "sha256:a65acfdb9c6ebb8368490dbafe83c03c7e277b37e6857f0caeadbbc56e12f4fb",
+ "sha256:a7d80b2e904faa63068ead63107189164ca443b42dd1930299e0d1cb041cec2e",
+ "sha256:a84498e0d0a1174f2b3ed769b67b656aa5460c92c9554039e11f20a05650f00d",
+ "sha256:ab4754d432e3ac42d33a269c8567413bdb541689b02d93788af4131018cbf366",
+ "sha256:ad369ed238b1959dfbade9018a740fb9392c5ac4f9b5173f420bd4f37ba1f7a0",
+ "sha256:b1d0fcae4f0949f215d4632be684a539859b295e2d0cb14f78ec231915d644db",
+ "sha256:b42a1a511c81cc78cbc4539675713bbcf9d9c3913386243ceff0e9429ca892fe",
+ "sha256:bd33f82e95ba7ad632bc57837ee99dba3d7e006536200c4e9124089e1bf42426",
+ "sha256:bdd407c40483463898b84490770199d5714dcc9dd9b792f6c6caccc523c00952",
+ "sha256:c6eef7a2dbd0abfb0d9eaf78b73017dbfd0b54051102ff4e6a7b2980d5ac1a03",
+ "sha256:c82af4b2ddd2ee72d1fc0c6695048d457e00b3582ccde72d8a1c991b808bb20f",
+ "sha256:d666cb72687559689e9906197e3bec7b736764df6a2e58ee265e360663e9baf7",
+ "sha256:d7bf0a4f9f15b32b5ba53147369e94296f5fffb783db5aacc1be15b4bf72f43b",
+ "sha256:d82075752f40c0ddf57e6e02673a17f6cb0f8eb3f587f63ca1eaab5594da5b17",
+ "sha256:da65fb46d4cbb75cb417cddf6ba5e7582eb7bb0b47db4b99c9fe5787ce5d91f5",
+ "sha256:e2b49c3c0804e8ecb05d59af8386ec2f74877f7ca8fd9c1e00be2672e4d399b1",
+ "sha256:e585c8ae871fd38ac50598f4763d73ec5497b0de9a0ab4ef5b69f01c6a046142",
+ "sha256:e8d3ca0a72dd8846eb6f7dfe8f19088060fcb76931ed592d29128e0219652884",
+ "sha256:ef444c57d664d35cac4e18c298c47d7b504c66b17c2ea91312e979fcfbdfb08a",
+ "sha256:f1eb068ead09f4994dec71c24b2844f1e4e4e013b9629f812f292f04bd1510d9",
+ "sha256:f2ded8d9b6f68cc26f8425eda5d3877b47343e68ca23d0d0846f4d312ecaa445",
+ "sha256:f751ed0a2f250541e19dfca9f1eafa31a392c71c832b6bb9e113b10d050cb0f1",
+ "sha256:faa88bc527d0f097abdc2c663cddf37c05a1c2f113716601555249805cf573f1",
+ "sha256:fc44e3c68ff00fd991b59092a54350e6e4911152682b4782f68070985aa9e648"
],
"markers": "python_version == '3.11'",
- "version": "==1.26.4"
+ "version": "==2.1.2"
},
"pandas": {
"hashes": [
- "sha256:001910ad31abc7bf06f49dcc903755d2f7f3a9186c0c040b827e522e9cef0863",
- "sha256:0ca6377b8fca51815f382bd0b697a0814c8bda55115678cbc94c30aacbb6eff2",
- "sha256:0cace394b6ea70c01ca1595f839cf193df35d1575986e484ad35c4aeae7266c1",
- "sha256:1cb51fe389360f3b5a4d57dbd2848a5f033350336ca3b340d1c53a1fad33bcad",
- "sha256:2925720037f06e89af896c70bca73459d7e6a4be96f9de79e2d440bd499fe0db",
- "sha256:3e374f59e440d4ab45ca2fffde54b81ac3834cf5ae2cdfa69c90bc03bde04d76",
- "sha256:40ae1dffb3967a52203105a077415a86044a2bea011b5f321c6aa64b379a3f51",
- "sha256:43498c0bdb43d55cb162cdc8c06fac328ccb5d2eabe3cadeb3529ae6f0517c32",
- "sha256:4abfe0be0d7221be4f12552995e58723c7422c80a659da13ca382697de830c08",
- "sha256:58b84b91b0b9f4bafac2a0ac55002280c094dfc6402402332c0913a59654ab2b",
- "sha256:640cef9aa381b60e296db324337a554aeeb883ead99dc8f6c18e81a93942f5f4",
- "sha256:66b479b0bd07204e37583c191535505410daa8df638fd8e75ae1b383851fe921",
- "sha256:696039430f7a562b74fa45f540aca068ea85fa34c244d0deee539cb6d70aa288",
- "sha256:6d2123dc9ad6a814bcdea0f099885276b31b24f7edf40f6cdbc0912672e22eee",
- "sha256:8635c16bf3d99040fdf3ca3db669a7250ddf49c55dc4aa8fe0ae0fa8d6dcc1f0",
- "sha256:873d13d177501a28b2756375d59816c365e42ed8417b41665f346289adc68d24",
- "sha256:8e5a0b00e1e56a842f922e7fae8ae4077aee4af0acb5ae3622bd4b4c30aedf99",
- "sha256:8e90497254aacacbc4ea6ae5e7a8cd75629d6ad2b30025a4a8b09aa4faf55151",
- "sha256:9057e6aa78a584bc93a13f0a9bf7e753a5e9770a30b4d758b8d5f2a62a9433cd",
- "sha256:90c6fca2acf139569e74e8781709dccb6fe25940488755716d1d354d6bc58bce",
- "sha256:92fd6b027924a7e178ac202cfbe25e53368db90d56872d20ffae94b96c7acc57",
- "sha256:9dfde2a0ddef507a631dc9dc4af6a9489d5e2e740e226ad426a05cabfbd7c8ef",
- "sha256:9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54",
- "sha256:a77e9d1c386196879aa5eb712e77461aaee433e54c68cf253053a73b7e49c33a",
- "sha256:c7adfc142dac335d8c1e0dcbd37eb8617eac386596eb9e1a1b77791cf2498238",
- "sha256:d187d355ecec3629624fccb01d104da7d7f391db0311145817525281e2804d23",
- "sha256:ddf818e4e6c7c6f4f7c8a12709696d193976b591cc7dc50588d3d1a6b5dc8772",
- "sha256:e9b79011ff7a0f4b1d6da6a61aa1aa604fb312d6647de5bad20013682d1429ce",
- "sha256:eee3a87076c0756de40b05c5e9a6069c035ba43e8dd71c379e68cab2c20f16ad"
+ "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"
],
"index": "pypi",
- "version": "==2.2.2"
+ "markers": "python_version >= '3.9'",
+ "version": "==2.2.3"
},
"pika": {
"hashes": [
@@ -496,100 +552,216 @@
"sha256:b2a327ddddf8570b4965b3576ac77091b850262d34ce8c1d8cb4e4146aa4145f"
],
"index": "pypi",
+ "markers": "python_version >= '3.7'",
"version": "==1.3.2"
},
+ "propcache": {
+ "hashes": [
+ "sha256:00181262b17e517df2cd85656fcd6b4e70946fe62cd625b9d74ac9977b64d8d9",
+ "sha256:0e53cb83fdd61cbd67202735e6a6687a7b491c8742dfc39c9e01e80354956763",
+ "sha256:1235c01ddaa80da8235741e80815ce381c5267f96cc49b1477fdcf8c047ef325",
+ "sha256:140fbf08ab3588b3468932974a9331aff43c0ab8a2ec2c608b6d7d1756dbb6cb",
+ "sha256:191db28dc6dcd29d1a3e063c3be0b40688ed76434622c53a284e5427565bbd9b",
+ "sha256:1e41d67757ff4fbc8ef2af99b338bfb955010444b92929e9e55a6d4dcc3c4f09",
+ "sha256:1ec43d76b9677637a89d6ab86e1fef70d739217fefa208c65352ecf0282be957",
+ "sha256:20a617c776f520c3875cf4511e0d1db847a076d720714ae35ffe0df3e440be68",
+ "sha256:218db2a3c297a3768c11a34812e63b3ac1c3234c3a086def9c0fee50d35add1f",
+ "sha256:22aa8f2272d81d9317ff5756bb108021a056805ce63dd3630e27d042c8092798",
+ "sha256:25a1f88b471b3bc911d18b935ecb7115dff3a192b6fef46f0bfaf71ff4f12418",
+ "sha256:25c8d773a62ce0451b020c7b29a35cfbc05de8b291163a7a0f3b7904f27253e6",
+ "sha256:2a60ad3e2553a74168d275a0ef35e8c0a965448ffbc3b300ab3a5bb9956c2162",
+ "sha256:2a66df3d4992bc1d725b9aa803e8c5a66c010c65c741ad901e260ece77f58d2f",
+ "sha256:2ccc28197af5313706511fab3a8b66dcd6da067a1331372c82ea1cb74285e036",
+ "sha256:2e900bad2a8456d00a113cad8c13343f3b1f327534e3589acc2219729237a2e8",
+ "sha256:2ee7606193fb267be4b2e3b32714f2d58cad27217638db98a60f9efb5efeccc2",
+ "sha256:33ac8f098df0585c0b53009f039dfd913b38c1d2edafed0cedcc0c32a05aa110",
+ "sha256:3444cdba6628accf384e349014084b1cacd866fbb88433cd9d279d90a54e0b23",
+ "sha256:363ea8cd3c5cb6679f1c2f5f1f9669587361c062e4899fce56758efa928728f8",
+ "sha256:375a12d7556d462dc64d70475a9ee5982465fbb3d2b364f16b86ba9135793638",
+ "sha256:388f3217649d6d59292b722d940d4d2e1e6a7003259eb835724092a1cca0203a",
+ "sha256:3947483a381259c06921612550867b37d22e1df6d6d7e8361264b6d037595f44",
+ "sha256:39e104da444a34830751715f45ef9fc537475ba21b7f1f5b0f4d71a3b60d7fe2",
+ "sha256:3c997f8c44ec9b9b0bcbf2d422cc00a1d9b9c681f56efa6ca149a941e5560da2",
+ "sha256:3dfafb44f7bb35c0c06eda6b2ab4bfd58f02729e7c4045e179f9a861b07c9850",
+ "sha256:3ebbcf2a07621f29638799828b8d8668c421bfb94c6cb04269130d8de4fb7136",
+ "sha256:3f88a4095e913f98988f5b338c1d4d5d07dbb0b6bad19892fd447484e483ba6b",
+ "sha256:439e76255daa0f8151d3cb325f6dd4a3e93043e6403e6491813bcaaaa8733887",
+ "sha256:4569158070180c3855e9c0791c56be3ceeb192defa2cdf6a3f39e54319e56b89",
+ "sha256:466c219deee4536fbc83c08d09115249db301550625c7fef1c5563a584c9bc87",
+ "sha256:4a9d9b4d0a9b38d1c391bb4ad24aa65f306c6f01b512e10a8a34a2dc5675d348",
+ "sha256:4c7dde9e533c0a49d802b4f3f218fa9ad0a1ce21f2c2eb80d5216565202acab4",
+ "sha256:53d1bd3f979ed529f0805dd35ddaca330f80a9a6d90bc0121d2ff398f8ed8861",
+ "sha256:55346705687dbd7ef0d77883ab4f6fabc48232f587925bdaf95219bae072491e",
+ "sha256:56295eb1e5f3aecd516d91b00cfd8bf3a13991de5a479df9e27dd569ea23959c",
+ "sha256:56bb5c98f058a41bb58eead194b4db8c05b088c93d94d5161728515bd52b052b",
+ "sha256:5a5b3bb545ead161be780ee85a2b54fdf7092815995661947812dde94a40f6fb",
+ "sha256:5f2564ec89058ee7c7989a7b719115bdfe2a2fb8e7a4543b8d1c0cc4cf6478c1",
+ "sha256:608cce1da6f2672a56b24a015b42db4ac612ee709f3d29f27a00c943d9e851de",
+ "sha256:63f13bf09cc3336eb04a837490b8f332e0db41da66995c9fd1ba04552e516354",
+ "sha256:662dd62358bdeaca0aee5761de8727cfd6861432e3bb828dc2a693aa0471a563",
+ "sha256:676135dcf3262c9c5081cc8f19ad55c8a64e3f7282a21266d05544450bffc3a5",
+ "sha256:67aeb72e0f482709991aa91345a831d0b707d16b0257e8ef88a2ad246a7280bf",
+ "sha256:67b69535c870670c9f9b14a75d28baa32221d06f6b6fa6f77a0a13c5a7b0a5b9",
+ "sha256:682a7c79a2fbf40f5dbb1eb6bfe2cd865376deeac65acf9beb607505dced9e12",
+ "sha256:6994984550eaf25dd7fc7bd1b700ff45c894149341725bb4edc67f0ffa94efa4",
+ "sha256:69d3a98eebae99a420d4b28756c8ce6ea5a29291baf2dc9ff9414b42676f61d5",
+ "sha256:6e2e54267980349b723cff366d1e29b138b9a60fa376664a157a342689553f71",
+ "sha256:73e4b40ea0eda421b115248d7e79b59214411109a5bc47d0d48e4c73e3b8fcf9",
+ "sha256:74acd6e291f885678631b7ebc85d2d4aec458dd849b8c841b57ef04047833bed",
+ "sha256:7665f04d0c7f26ff8bb534e1c65068409bf4687aa2534faf7104d7182debb336",
+ "sha256:7735e82e3498c27bcb2d17cb65d62c14f1100b71723b68362872bca7d0913d90",
+ "sha256:77a86c261679ea5f3896ec060be9dc8e365788248cc1e049632a1be682442063",
+ "sha256:7cf18abf9764746b9c8704774d8b06714bcb0a63641518a3a89c7f85cc02c2ad",
+ "sha256:83928404adf8fb3d26793665633ea79b7361efa0287dfbd372a7e74311d51ee6",
+ "sha256:8e40876731f99b6f3c897b66b803c9e1c07a989b366c6b5b475fafd1f7ba3fb8",
+ "sha256:8f188cfcc64fb1266f4684206c9de0e80f54622c3f22a910cbd200478aeae61e",
+ "sha256:91997d9cb4a325b60d4e3f20967f8eb08dfcb32b22554d5ef78e6fd1dda743a2",
+ "sha256:91ee8fc02ca52e24bcb77b234f22afc03288e1dafbb1f88fe24db308910c4ac7",
+ "sha256:92fe151145a990c22cbccf9ae15cae8ae9eddabfc949a219c9f667877e40853d",
+ "sha256:945db8ee295d3af9dbdbb698cce9bbc5c59b5c3fe328bbc4387f59a8a35f998d",
+ "sha256:9517d5e9e0731957468c29dbfd0f976736a0e55afaea843726e887f36fe017df",
+ "sha256:952e0d9d07609d9c5be361f33b0d6d650cd2bae393aabb11d9b719364521984b",
+ "sha256:97a58a28bcf63284e8b4d7b460cbee1edaab24634e82059c7b8c09e65284f178",
+ "sha256:97e48e8875e6c13909c800fa344cd54cc4b2b0db1d5f911f840458a500fde2c2",
+ "sha256:9e0f07b42d2a50c7dd2d8675d50f7343d998c64008f1da5fef888396b7f84630",
+ "sha256:a3dc1a4b165283bd865e8f8cb5f0c64c05001e0718ed06250d8cac9bec115b48",
+ "sha256:a3ebe9a75be7ab0b7da2464a77bb27febcb4fab46a34f9288f39d74833db7f61",
+ "sha256:a64e32f8bd94c105cc27f42d3b658902b5bcc947ece3c8fe7bc1b05982f60e89",
+ "sha256:a6ed8db0a556343d566a5c124ee483ae113acc9a557a807d439bcecc44e7dfbb",
+ "sha256:ad9c9b99b05f163109466638bd30ada1722abb01bbb85c739c50b6dc11f92dc3",
+ "sha256:b33d7a286c0dc1a15f5fc864cc48ae92a846df287ceac2dd499926c3801054a6",
+ "sha256:bc092ba439d91df90aea38168e11f75c655880c12782facf5cf9c00f3d42b562",
+ "sha256:c436130cc779806bdf5d5fae0d848713105472b8566b75ff70048c47d3961c5b",
+ "sha256:c5869b8fd70b81835a6f187c5fdbe67917a04d7e52b6e7cc4e5fe39d55c39d58",
+ "sha256:c5ecca8f9bab618340c8e848d340baf68bcd8ad90a8ecd7a4524a81c1764b3db",
+ "sha256:cfac69017ef97db2438efb854edf24f5a29fd09a536ff3a992b75990720cdc99",
+ "sha256:d2f0d0f976985f85dfb5f3d685697ef769faa6b71993b46b295cdbbd6be8cc37",
+ "sha256:d5bed7f9805cc29c780f3aee05de3262ee7ce1f47083cfe9f77471e9d6777e83",
+ "sha256:d6a21ef516d36909931a2967621eecb256018aeb11fc48656e3257e73e2e247a",
+ "sha256:d9b6ddac6408194e934002a69bcaadbc88c10b5f38fb9307779d1c629181815d",
+ "sha256:db47514ffdbd91ccdc7e6f8407aac4ee94cc871b15b577c1c324236b013ddd04",
+ "sha256:df81779732feb9d01e5d513fad0122efb3d53bbc75f61b2a4f29a020bc985e70",
+ "sha256:e4a91d44379f45f5e540971d41e4626dacd7f01004826a18cb048e7da7e96544",
+ "sha256:e63e3e1e0271f374ed489ff5ee73d4b6e7c60710e1f76af5f0e1a6117cd26394",
+ "sha256:e70fac33e8b4ac63dfc4c956fd7d85a0b1139adcfc0d964ce288b7c527537fea",
+ "sha256:ecddc221a077a8132cf7c747d5352a15ed763b674c0448d811f408bf803d9ad7",
+ "sha256:f45eec587dafd4b2d41ac189c2156461ebd0c1082d2fe7013571598abb8505d1",
+ "sha256:f52a68c21363c45297aca15561812d542f8fc683c85201df0bebe209e349f793",
+ "sha256:f571aea50ba5623c308aa146eb650eebf7dbe0fd8c5d946e28343cb3b5aad577",
+ "sha256:f60f0ac7005b9f5a6091009b09a419ace1610e163fa5deaba5ce3484341840e7",
+ "sha256:f6475a1b2ecb310c98c28d271a30df74f9dd436ee46d09236a6b750a7599ce57",
+ "sha256:f6d5749fdd33d90e34c2efb174c7e236829147a2713334d708746e94c4bde40d",
+ "sha256:f902804113e032e2cdf8c71015651c97af6418363bea8d78dc0911d56c335032",
+ "sha256:fa1076244f54bb76e65e22cb6910365779d5c3d71d1f18b275f1dfc7b0d71b4d",
+ "sha256:fc2db02409338bf36590aa985a461b2c96fce91f8e7e0f14c50c5fcc4f229016",
+ "sha256:ffcad6c564fe6b9b8916c1aefbb37a362deebf9394bd2974e9d84232e3e08504"
+ ],
+ "markers": "python_version >= '3.8'",
+ "version": "==0.2.0"
+ },
"pydantic": {
"hashes": [
- "sha256:c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e",
- "sha256:ea91b002777bf643bb20dd717c028ec43216b24a6001a280f83877fd2655d0b4"
+ "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f",
+ "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"
],
"index": "pypi",
- "version": "==2.7.3"
+ "markers": "python_version >= '3.8'",
+ "version": "==2.9.2"
},
"pydantic-core": {
"hashes": [
- "sha256:01dd777215e2aa86dfd664daed5957704b769e726626393438f9c87690ce78c3",
- "sha256:0eb2a4f660fcd8e2b1c90ad566db2b98d7f3f4717c64fe0a83e0adb39766d5b8",
- "sha256:0fbbdc827fe5e42e4d196c746b890b3d72876bdbf160b0eafe9f0334525119c8",
- "sha256:123c3cec203e3f5ac7b000bd82235f1a3eced8665b63d18be751f115588fea30",
- "sha256:14601cdb733d741b8958224030e2bfe21a4a881fb3dd6fbb21f071cabd48fa0a",
- "sha256:18f469a3d2a2fdafe99296a87e8a4c37748b5080a26b806a707f25a902c040a8",
- "sha256:19894b95aacfa98e7cb093cd7881a0c76f55731efad31073db4521e2b6ff5b7d",
- "sha256:1b4de2e51bbcb61fdebd0ab86ef28062704f62c82bbf4addc4e37fa4b00b7cbc",
- "sha256:1d886dc848e60cb7666f771e406acae54ab279b9f1e4143babc9c2258213daa2",
- "sha256:1f4d26ceb5eb9eed4af91bebeae4b06c3fb28966ca3a8fb765208cf6b51102ab",
- "sha256:21a5e440dbe315ab9825fcd459b8814bb92b27c974cbc23c3e8baa2b76890077",
- "sha256:293afe532740370aba8c060882f7d26cfd00c94cae32fd2e212a3a6e3b7bc15e",
- "sha256:2f5966897e5461f818e136b8451d0551a2e77259eb0f73a837027b47dc95dab9",
- "sha256:2fd41f6eff4c20778d717af1cc50eca52f5afe7805ee530a4fbd0bae284f16e9",
- "sha256:2fdf2156aa3d017fddf8aea5adfba9f777db1d6022d392b682d2a8329e087cef",
- "sha256:3c40d4eaad41f78e3bbda31b89edc46a3f3dc6e171bf0ecf097ff7a0ffff7cb1",
- "sha256:43d447dd2ae072a0065389092a231283f62d960030ecd27565672bd40746c507",
- "sha256:44a688331d4a4e2129140a8118479443bd6f1905231138971372fcde37e43528",
- "sha256:44c7486a4228413c317952e9d89598bcdfb06399735e49e0f8df643e1ccd0558",
- "sha256:44cd83ab6a51da80fb5adbd9560e26018e2ac7826f9626bc06ca3dc074cd198b",
- "sha256:46387e38bd641b3ee5ce247563b60c5ca098da9c56c75c157a05eaa0933ed154",
- "sha256:4701b19f7e3a06ea655513f7938de6f108123bf7c86bbebb1196eb9bd35cf724",
- "sha256:4748321b5078216070b151d5271ef3e7cc905ab170bbfd27d5c83ee3ec436695",
- "sha256:4b06beb3b3f1479d32befd1f3079cc47b34fa2da62457cdf6c963393340b56e9",
- "sha256:4d0dcc59664fcb8974b356fe0a18a672d6d7cf9f54746c05f43275fc48636851",
- "sha256:4e99bc050fe65c450344421017f98298a97cefc18c53bb2f7b3531eb39bc7805",
- "sha256:509daade3b8649f80d4e5ff21aa5673e4ebe58590b25fe42fac5f0f52c6f034a",
- "sha256:51991a89639a912c17bef4b45c87bd83593aee0437d8102556af4885811d59f5",
- "sha256:53db086f9f6ab2b4061958d9c276d1dbe3690e8dd727d6abf2321d6cce37fa94",
- "sha256:564d7922e4b13a16b98772441879fcdcbe82ff50daa622d681dd682175ea918c",
- "sha256:574d92eac874f7f4db0ca653514d823a0d22e2354359d0759e3f6a406db5d55d",
- "sha256:578e24f761f3b425834f297b9935e1ce2e30f51400964ce4801002435a1b41ef",
- "sha256:59ff3e89f4eaf14050c8022011862df275b552caef8082e37b542b066ce1ff26",
- "sha256:5f09baa656c904807e832cf9cce799c6460c450c4ad80803517032da0cd062e2",
- "sha256:6891a2ae0e8692679c07728819b6e2b822fb30ca7445f67bbf6509b25a96332c",
- "sha256:6a750aec7bf431517a9fd78cb93c97b9b0c496090fee84a47a0d23668976b4b0",
- "sha256:6f5c4d41b2771c730ea1c34e458e781b18cc668d194958e0112455fff4e402b2",
- "sha256:77450e6d20016ec41f43ca4a6c63e9fdde03f0ae3fe90e7c27bdbeaece8b1ed4",
- "sha256:81b5efb2f126454586d0f40c4d834010979cb80785173d1586df845a632e4e6d",
- "sha256:823be1deb01793da05ecb0484d6c9e20baebb39bd42b5d72636ae9cf8350dbd2",
- "sha256:834b5230b5dfc0c1ec37b2fda433b271cbbc0e507560b5d1588e2cc1148cf1ce",
- "sha256:847a35c4d58721c5dc3dba599878ebbdfd96784f3fb8bb2c356e123bdcd73f34",
- "sha256:86110d7e1907ab36691f80b33eb2da87d780f4739ae773e5fc83fb272f88825f",
- "sha256:8951eee36c57cd128f779e641e21eb40bc5073eb28b2d23f33eb0ef14ffb3f5d",
- "sha256:8a7164fe2005d03c64fd3b85649891cd4953a8de53107940bf272500ba8a788b",
- "sha256:8b8bab4c97248095ae0c4455b5a1cd1cdd96e4e4769306ab19dda135ea4cdb07",
- "sha256:90afc12421df2b1b4dcc975f814e21bc1754640d502a2fbcc6d41e77af5ec312",
- "sha256:938cb21650855054dc54dfd9120a851c974f95450f00683399006aa6e8abb057",
- "sha256:942ba11e7dfb66dc70f9ae66b33452f51ac7bb90676da39a7345e99ffb55402d",
- "sha256:972658f4a72d02b8abfa2581d92d59f59897d2e9f7e708fdabe922f9087773af",
- "sha256:97736815b9cc893b2b7f663628e63f436018b75f44854c8027040e05230eeddb",
- "sha256:98906207f29bc2c459ff64fa007afd10a8c8ac080f7e4d5beff4c97086a3dabd",
- "sha256:99457f184ad90235cfe8461c4d70ab7dd2680e28821c29eca00252ba90308c78",
- "sha256:a0d829524aaefdebccb869eed855e2d04c21d2d7479b6cada7ace5448416597b",
- "sha256:a2fdd81edd64342c85ac7cf2753ccae0b79bf2dfa063785503cb85a7d3593223",
- "sha256:a55b5b16c839df1070bc113c1f7f94a0af4433fcfa1b41799ce7606e5c79ce0a",
- "sha256:a642295cd0c8df1b86fc3dced1d067874c353a188dc8e0f744626d49e9aa51c4",
- "sha256:ab86ce7c8f9bea87b9d12c7f0af71102acbf5ecbc66c17796cff45dae54ef9a5",
- "sha256:abc267fa9837245cc28ea6929f19fa335f3dc330a35d2e45509b6566dc18be23",
- "sha256:ae1d6df168efb88d7d522664693607b80b4080be6750c913eefb77e34c12c71a",
- "sha256:b2ebef0e0b4454320274f5e83a41844c63438fdc874ea40a8b5b4ecb7693f1c4",
- "sha256:b48ece5bde2e768197a2d0f6e925f9d7e3e826f0ad2271120f8144a9db18d5c8",
- "sha256:b7cdf28938ac6b8b49ae5e92f2735056a7ba99c9b110a474473fd71185c1af5d",
- "sha256:bb4462bd43c2460774914b8525f79b00f8f407c945d50881568f294c1d9b4443",
- "sha256:bc4ff9805858bd54d1a20efff925ccd89c9d2e7cf4986144b30802bf78091c3e",
- "sha256:c1322d7dd74713dcc157a2b7898a564ab091ca6c58302d5c7b4c07296e3fd00f",
- "sha256:c67598100338d5d985db1b3d21f3619ef392e185e71b8d52bceacc4a7771ea7e",
- "sha256:ca26a1e73c48cfc54c4a76ff78df3727b9d9f4ccc8dbee4ae3f73306a591676d",
- "sha256:d323a01da91851a4f17bf592faf46149c9169d68430b3146dcba2bb5e5719abc",
- "sha256:dc1803ac5c32ec324c5261c7209e8f8ce88e83254c4e1aebdc8b0a39f9ddb443",
- "sha256:e00a3f196329e08e43d99b79b286d60ce46bed10f2280d25a1718399457e06be",
- "sha256:e85637bc8fe81ddb73fda9e56bab24560bdddfa98aa64f87aaa4e4b6730c23d2",
- "sha256:e858ac0a25074ba4bce653f9b5d0a85b7456eaddadc0ce82d3878c22489fa4ee",
- "sha256:eae237477a873ab46e8dd748e515c72c0c804fb380fbe6c85533c7de51f23a8f",
- "sha256:ebef0dd9bf9b812bf75bda96743f2a6c5734a02092ae7f721c048d156d5fabae",
- "sha256:ec3beeada09ff865c344ff3bc2f427f5e6c26401cc6113d77e372c3fdac73864",
- "sha256:f76d0ad001edd426b92233d45c746fd08f467d56100fd8f30e9ace4b005266e4",
- "sha256:f85d05aa0918283cf29a30b547b4df2fbb56b45b135f9e35b6807cb28bc47951",
- "sha256:f9899c94762343f2cc2fc64c13e7cae4c3cc65cdfc87dd810a31654c9b7358cc"
+ "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36",
+ "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05",
+ "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071",
+ "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327",
+ "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c",
+ "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36",
+ "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29",
+ "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744",
+ "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d",
+ "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec",
+ "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e",
+ "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e",
+ "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577",
+ "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232",
+ "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863",
+ "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6",
+ "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368",
+ "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480",
+ "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2",
+ "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2",
+ "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6",
+ "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769",
+ "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d",
+ "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2",
+ "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84",
+ "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166",
+ "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271",
+ "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5",
+ "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb",
+ "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13",
+ "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323",
+ "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556",
+ "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665",
+ "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef",
+ "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb",
+ "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119",
+ "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126",
+ "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510",
+ "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b",
+ "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87",
+ "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f",
+ "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc",
+ "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8",
+ "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21",
+ "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f",
+ "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6",
+ "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658",
+ "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b",
+ "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3",
+ "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb",
+ "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59",
+ "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24",
+ "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9",
+ "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3",
+ "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd",
+ "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753",
+ "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55",
+ "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad",
+ "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a",
+ "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605",
+ "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e",
+ "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b",
+ "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433",
+ "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8",
+ "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07",
+ "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728",
+ "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0",
+ "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327",
+ "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555",
+ "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64",
+ "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6",
+ "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea",
+ "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b",
+ "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df",
+ "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e",
+ "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd",
+ "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068",
+ "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3",
+ "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040",
+ "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12",
+ "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916",
+ "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f",
+ "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f",
+ "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801",
+ "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231",
+ "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5",
+ "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8",
+ "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee",
+ "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"
],
"markers": "python_version >= '3.8'",
- "version": "==2.18.4"
+ "version": "==2.23.4"
},
"python-dateutil": {
"hashes": [
@@ -601,10 +773,10 @@
},
"pytz": {
"hashes": [
- "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812",
- "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"
+ "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a",
+ "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"
],
- "version": "==2024.1"
+ "version": "==2024.2"
},
"requests": {
"hashes": [
@@ -612,6 +784,7 @@
"sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
],
"index": "pypi",
+ "markers": "python_version >= '3.8'",
"version": "==2.32.3"
},
"six": {
@@ -624,11 +797,11 @@
},
"tinydb": {
"hashes": [
- "sha256:30c06d12383d7c332e404ca6a6103fb2b32cbf25712689648c39d9a6bd34bd3d",
- "sha256:6dd686a9c5a75dfa9280088fd79a419aefe19cd7f4bd85eba203540ef856d564"
+ "sha256:09c4c6a239da9be676b948f1f28074cffd1cf08e7af920c1df50424cc8bee8d6",
+ "sha256:1c7c507ef520c789f94f1f5786f0722a98a59a85031a2e81e2accc701721f07f"
],
- "markers": "python_version >= '3.7' and python_version < '4.0'",
- "version": "==4.8.0"
+ "markers": "python_version >= '3.8' and python_version < '4.0'",
+ "version": "==4.8.1"
},
"tuspy": {
"hashes": [
@@ -636,145 +809,148 @@
"sha256:024d3d1745120098a85635e42242039ca6b1bc787f561ec974fffb45fc775c1b"
],
"index": "pypi",
+ "markers": "python_full_version >= '3.5.3'",
"version": "==1.0.3"
},
"typing-extensions": {
"hashes": [
- "sha256:6024b58b69089e5a89c347397254e35f1bf02a907728ec7fee9bf0fe837d203a",
- "sha256:915f5e35ff76f56588223f15fdd5938f9a1cf9195c0de25130c627e4d597f6d1"
+ "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d",
+ "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8"
],
- "markers": "python_version >= '3.8'",
- "version": "==4.12.1"
+ "markers": "python_version < '3.13'",
+ "version": "==4.12.2"
},
"tzdata": {
"hashes": [
- "sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd",
- "sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252"
+ "sha256:7d85cc416e9382e69095b7bdf4afd9e3880418a2413feec7069d533d6b4e31cc",
+ "sha256:a48093786cdcde33cad18c2555e8532f34422074448fbc874186f0abd79565cd"
],
"markers": "python_version >= '2'",
- "version": "==2024.1"
+ "version": "==2024.2"
},
"urllib3": {
"hashes": [
- "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
- "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+ "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+ "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
"markers": "python_version >= '3.8'",
- "version": "==2.2.1"
+ "version": "==2.2.3"
},
"yarl": {
"hashes": [
- "sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51",
- "sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce",
- "sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559",
- "sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0",
- "sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81",
- "sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc",
- "sha256:18580f672e44ce1238b82f7fb87d727c4a131f3a9d33a5e0e82b793362bf18b4",
- "sha256:1f23e4fe1e8794f74b6027d7cf19dc25f8b63af1483d91d595d4a07eca1fb26c",
- "sha256:206a55215e6d05dbc6c98ce598a59e6fbd0c493e2de4ea6cc2f4934d5a18d130",
- "sha256:23d32a2594cb5d565d358a92e151315d1b2268bc10f4610d098f96b147370136",
- "sha256:26a1dc6285e03f3cc9e839a2da83bcbf31dcb0d004c72d0730e755b33466c30e",
- "sha256:29e0f83f37610f173eb7e7b5562dd71467993495e568e708d99e9d1944f561ec",
- "sha256:2b134fd795e2322b7684155b7855cc99409d10b2e408056db2b93b51a52accc7",
- "sha256:2d47552b6e52c3319fede1b60b3de120fe83bde9b7bddad11a69fb0af7db32f1",
- "sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455",
- "sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099",
- "sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129",
- "sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10",
- "sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142",
- "sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98",
- "sha256:4aa9741085f635934f3a2583e16fcf62ba835719a8b2b28fb2917bb0537c1dfa",
- "sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7",
- "sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525",
- "sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c",
- "sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9",
- "sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c",
- "sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8",
- "sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b",
- "sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf",
- "sha256:5a2e2433eb9344a163aced6a5f6c9222c0786e5a9e9cac2c89f0b28433f56e23",
- "sha256:5aef935237d60a51a62b86249839b51345f47564208c6ee615ed2a40878dccdd",
- "sha256:604f31d97fa493083ea21bd9b92c419012531c4e17ea6da0f65cacdcf5d0bd27",
- "sha256:63b20738b5aac74e239622d2fe30df4fca4942a86e31bf47a81a0e94c14df94f",
- "sha256:686a0c2f85f83463272ddffd4deb5e591c98aac1897d65e92319f729c320eece",
- "sha256:6a962e04b8f91f8c4e5917e518d17958e3bdee71fd1d8b88cdce74dd0ebbf434",
- "sha256:6ad6d10ed9b67a382b45f29ea028f92d25bc0bc1daf6c5b801b90b5aa70fb9ec",
- "sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff",
- "sha256:6fe79f998a4052d79e1c30eeb7d6c1c1056ad33300f682465e1b4e9b5a188b78",
- "sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d",
- "sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863",
- "sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53",
- "sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31",
- "sha256:824d6c50492add5da9374875ce72db7a0733b29c2394890aef23d533106e2b15",
- "sha256:8397a3817d7dcdd14bb266283cd1d6fc7264a48c186b986f32e86d86d35fbac5",
- "sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b",
- "sha256:84fc30f71689d7fc9168b92788abc977dc8cefa806909565fc2951d02f6b7d57",
- "sha256:8619d6915b3b0b34420cf9b2bb6d81ef59d984cb0fde7544e9ece32b4b3043c3",
- "sha256:8a854227cf581330ffa2c4824d96e52ee621dd571078a252c25e3a3b3d94a1b1",
- "sha256:8be9e837ea9113676e5754b43b940b50cce76d9ed7d2461df1af39a8ee674d9f",
- "sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad",
- "sha256:957b4774373cf6f709359e5c8c4a0af9f6d7875db657adb0feaf8d6cb3c3964c",
- "sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7",
- "sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2",
- "sha256:a00862fb23195b6b8322f7d781b0dc1d82cb3bcac346d1e38689370cc1cc398b",
- "sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2",
- "sha256:a6327976c7c2f4ee6816eff196e25385ccc02cb81427952414a64811037bbc8b",
- "sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9",
- "sha256:a825ec844298c791fd28ed14ed1bffc56a98d15b8c58a20e0e08c1f5f2bea1be",
- "sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e",
- "sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984",
- "sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4",
- "sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074",
- "sha256:ad4d7a90a92e528aadf4965d685c17dacff3df282db1121136c382dc0b6014d2",
- "sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392",
- "sha256:ba6f52cbc7809cd8d74604cce9c14868306ae4aa0282016b641c661f981a6e91",
- "sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541",
- "sha256:bef596fdaa8f26e3d66af846bbe77057237cb6e8efff8cd7cc8dff9a62278bbf",
- "sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572",
- "sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66",
- "sha256:c7224cab95645c7ab53791022ae77a4509472613e839dab722a72abe5a684575",
- "sha256:c74018551e31269d56fab81a728f683667e7c28c04e807ba08f8c9e3bba32f14",
- "sha256:ca06675212f94e7a610e85ca36948bb8fc023e458dd6c63ef71abfd482481aa5",
- "sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1",
- "sha256:d25039a474c4c72a5ad4b52495056f843a7ff07b632c1b92ea9043a3d9950f6e",
- "sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551",
- "sha256:d7d7f7de27b8944f1fee2c26a88b4dabc2409d2fea7a9ed3df79b67277644e17",
- "sha256:d7eeb6d22331e2fd42fce928a81c697c9ee2d51400bd1a28803965883e13cead",
- "sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0",
- "sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe",
- "sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234",
- "sha256:db8e58b9d79200c76956cefd14d5c90af54416ff5353c5bfd7cbe58818e26ef0",
- "sha256:ddb2a5c08a4eaaba605340fdee8fc08e406c56617566d9643ad8bf6852778fc7",
- "sha256:e0381b4ce23ff92f8170080c97678040fc5b08da85e9e292292aba67fdac6c34",
- "sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42",
- "sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385",
- "sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78",
- "sha256:ec61d826d80fc293ed46c9dd26995921e3a82146feacd952ef0757236fc137be",
- "sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958",
- "sha256:f3bc6af6e2b8f92eced34ef6a96ffb248e863af20ef4fde9448cc8c9b858b749",
- "sha256:f7d6b36dd2e029b6bcb8a13cf19664c7b8e19ab3a58e0fefbb5b8461447ed5ec"
+ "sha256:047b258e00b99091b6f90355521f026238c63bd76dcf996d93527bb13320eefd",
+ "sha256:06ff23462398333c78b6f4f8d3d70410d657a471c2c5bbe6086133be43fc8f1a",
+ "sha256:07f9eaf57719d6721ab15805d85f4b01a5b509a0868d7320134371bcb652152d",
+ "sha256:0aa92e3e30a04f9462a25077db689c4ac5ea9ab6cc68a2e563881b987d42f16d",
+ "sha256:0cf21f46a15d445417de8fc89f2568852cf57fe8ca1ab3d19ddb24d45c0383ae",
+ "sha256:0fd7b941dd1b00b5f0acb97455fea2c4b7aac2dd31ea43fb9d155e9bc7b78664",
+ "sha256:147e36331f6f63e08a14640acf12369e041e0751bb70d9362df68c2d9dcf0c87",
+ "sha256:16a682a127930f3fc4e42583becca6049e1d7214bcad23520c590edd741d2114",
+ "sha256:176110bff341b6730f64a1eb3a7070e12b373cf1c910a9337e7c3240497db76f",
+ "sha256:19268b4fec1d7760134f2de46ef2608c2920134fb1fa61e451f679e41356dc55",
+ "sha256:1b16f6c75cffc2dc0616ea295abb0e1967601bd1fb1e0af6a1de1c6c887f3439",
+ "sha256:1bfc25aa6a7c99cf86564210f79a0b7d4484159c67e01232b116e445b3036547",
+ "sha256:1ca3894e9e9f72da93544f64988d9c052254a338a9f855165f37f51edb6591de",
+ "sha256:1dda53508df0de87b6e6b0a52d6718ff6c62a5aca8f5552748404963df639269",
+ "sha256:217a782020b875538eebf3948fac3a7f9bbbd0fd9bf8538f7c2ad7489e80f4e8",
+ "sha256:2192f718db4a8509f63dd6d950f143279211fa7e6a2c612edc17d85bf043d36e",
+ "sha256:29a84a46ec3ebae7a1c024c055612b11e9363a8a23238b3e905552d77a2bc51b",
+ "sha256:3007a5b75cb50140708420fe688c393e71139324df599434633019314ceb8b59",
+ "sha256:30600ba5db60f7c0820ef38a2568bb7379e1418ecc947a0f76fd8b2ff4257a97",
+ "sha256:337912bcdcf193ade64b9aae5a4017a0a1950caf8ca140362e361543c6773f21",
+ "sha256:37001e5d4621cef710c8dc1429ca04e189e572f128ab12312eab4e04cf007132",
+ "sha256:3d569f877ed9a708e4c71a2d13d2940cb0791da309f70bd970ac1a5c088a0a92",
+ "sha256:4009def9be3a7e5175db20aa2d7307ecd00bbf50f7f0f989300710eee1d0b0b9",
+ "sha256:46a9772a1efa93f9cd170ad33101c1817c77e0e9914d4fe33e2da299d7cf0f9b",
+ "sha256:47eede5d11d669ab3759b63afb70d28d5328c14744b8edba3323e27dc52d298d",
+ "sha256:498b3c55087b9d762636bca9b45f60d37e51d24341786dc01b81253f9552a607",
+ "sha256:4e0d45ebf975634468682c8bec021618b3ad52c37619e5c938f8f831fa1ac5c0",
+ "sha256:4f24f08b6c9b9818fd80612c97857d28f9779f0d1211653ece9844fc7b414df2",
+ "sha256:55c144d363ad4626ca744556c049c94e2b95096041ac87098bb363dcc8635e8d",
+ "sha256:582cedde49603f139be572252a318b30dc41039bc0b8165f070f279e5d12187f",
+ "sha256:587c3cc59bc148a9b1c07a019346eda2549bc9f468acd2f9824d185749acf0a6",
+ "sha256:5cd5dad8366e0168e0fd23d10705a603790484a6dbb9eb272b33673b8f2cce72",
+ "sha256:5d02d700705d67e09e1f57681f758f0b9d4412eeb70b2eb8d96ca6200b486db3",
+ "sha256:625f207b1799e95e7c823f42f473c1e9dbfb6192bd56bba8695656d92be4535f",
+ "sha256:659603d26d40dd4463200df9bfbc339fbfaed3fe32e5c432fe1dc2b5d4aa94b4",
+ "sha256:689a99a42ee4583fcb0d3a67a0204664aa1539684aed72bdafcbd505197a91c4",
+ "sha256:68ac1a09392ed6e3fd14be880d39b951d7b981fd135416db7d18a6208c536561",
+ "sha256:6a615cad11ec3428020fb3c5a88d85ce1b5c69fd66e9fcb91a7daa5e855325dd",
+ "sha256:73bedd2be05f48af19f0f2e9e1353921ce0c83f4a1c9e8556ecdcf1f1eae4892",
+ "sha256:742aef0a99844faaac200564ea6f5e08facb285d37ea18bd1a5acf2771f3255a",
+ "sha256:75ff4c819757f9bdb35de049a509814d6ce851fe26f06eb95a392a5640052482",
+ "sha256:781e2495e408a81e4eaeedeb41ba32b63b1980dddf8b60dbbeff6036bcd35049",
+ "sha256:7a9f917966d27f7ce30039fe8d900f913c5304134096554fd9bea0774bcda6d1",
+ "sha256:7e2637d75e92763d1322cb5041573279ec43a80c0f7fbbd2d64f5aee98447b17",
+ "sha256:8089d4634d8fa2b1806ce44fefa4979b1ab2c12c0bc7ef3dfa45c8a374811348",
+ "sha256:816d24f584edefcc5ca63428f0b38fee00b39fe64e3c5e558f895a18983efe96",
+ "sha256:8385ab36bf812e9d37cf7613999a87715f27ef67a53f0687d28c44b819df7cb0",
+ "sha256:85cb3e40eaa98489f1e2e8b29f5ad02ee1ee40d6ce6b88d50cf0f205de1d9d2c",
+ "sha256:8648180b34faaea4aa5b5ca7e871d9eb1277033fa439693855cf0ea9195f85f1",
+ "sha256:8892fa575ac9b1b25fae7b221bc4792a273877b9b56a99ee2d8d03eeb3dbb1d2",
+ "sha256:88c7d9d58aab0724b979ab5617330acb1c7030b79379c8138c1c8c94e121d1b3",
+ "sha256:8a2f8fb7f944bcdfecd4e8d855f84c703804a594da5123dd206f75036e536d4d",
+ "sha256:8f4e475f29a9122f908d0f1f706e1f2fc3656536ffd21014ff8a6f2e1b14d1d8",
+ "sha256:8f50eb3837012a937a2b649ec872b66ba9541ad9d6f103ddcafb8231cfcafd22",
+ "sha256:91d875f75fabf76b3018c5f196bf3d308ed2b49ddcb46c1576d6b075754a1393",
+ "sha256:94b2bb9bcfd5be9d27004ea4398fb640373dd0c1a9e219084f42c08f77a720ab",
+ "sha256:9557c9322aaa33174d285b0c1961fb32499d65ad1866155b7845edc876c3c835",
+ "sha256:95e16e9eaa2d7f5d87421b8fe694dd71606aa61d74b824c8d17fc85cc51983d1",
+ "sha256:96952f642ac69075e44c7d0284528938fdff39422a1d90d3e45ce40b72e5e2d9",
+ "sha256:985623575e5c4ea763056ffe0e2d63836f771a8c294b3de06d09480538316b13",
+ "sha256:99ff3744f5fe48288be6bc402533b38e89749623a43208e1d57091fc96b783b9",
+ "sha256:9abe80ae2c9d37c17599557b712e6515f4100a80efb2cda15f5f070306477cd2",
+ "sha256:a152751af7ef7b5d5fa6d215756e508dd05eb07d0cf2ba51f3e740076aa74373",
+ "sha256:a2e4725a08cb2b4794db09e350c86dee18202bb8286527210e13a1514dc9a59a",
+ "sha256:a56fbe3d7f3bce1d060ea18d2413a2ca9ca814eea7cedc4d247b5f338d54844e",
+ "sha256:ab3abc0b78a5dfaa4795a6afbe7b282b6aa88d81cf8c1bb5e394993d7cae3457",
+ "sha256:b03384eed107dbeb5f625a99dc3a7de8be04fc8480c9ad42fccbc73434170b20",
+ "sha256:b0547ab1e9345dc468cac8368d88ea4c5bd473ebc1d8d755347d7401982b5dd8",
+ "sha256:b4c1ecba93e7826dc71ddba75fb7740cdb52e7bd0be9f03136b83f54e6a1f511",
+ "sha256:b693c63e7e64b524f54aa4888403c680342d1ad0d97be1707c531584d6aeeb4f",
+ "sha256:b6d0147574ce2e7b812c989e50fa72bbc5338045411a836bd066ce5fc8ac0bce",
+ "sha256:b9cfef3f14f75bf6aba73a76caf61f9d00865912a04a4393c468a7ce0981b519",
+ "sha256:b9f805e37ed16cc212fdc538a608422d7517e7faf539bedea4fe69425bc55d76",
+ "sha256:bab03192091681d54e8225c53f270b0517637915d9297028409a2a5114ff4634",
+ "sha256:bc24f968b82455f336b79bf37dbb243b7d76cd40897489888d663d4e028f5069",
+ "sha256:c14b504a74e58e2deb0378b3eca10f3d076635c100f45b113c18c770b4a47a50",
+ "sha256:c2089a9afef887664115f7fa6d3c0edd6454adaca5488dba836ca91f60401075",
+ "sha256:c8ed4034f0765f8861620c1f2f2364d2e58520ea288497084dae880424fc0d9f",
+ "sha256:cd2660c01367eb3ef081b8fa0a5da7fe767f9427aa82023a961a5f28f0d4af6c",
+ "sha256:d8361c7d04e6a264481f0b802e395f647cd3f8bbe27acfa7c12049efea675bd1",
+ "sha256:d9baec588f015d0ee564057aa7574313c53a530662ffad930b7886becc85abdf",
+ "sha256:dbd9ff43a04f8ffe8a959a944c2dca10d22f5f99fc6a459f49c3ebfb409309d9",
+ "sha256:e3f8bfc1db82589ef965ed234b87de30d140db8b6dc50ada9e33951ccd8ec07a",
+ "sha256:e6a2c5c5bb2556dfbfffffc2bcfb9c235fd2b566d5006dfb2a37afc7e3278a07",
+ "sha256:e749af6c912a7bb441d105c50c1a3da720474e8acb91c89350080dd600228f0e",
+ "sha256:e85d86527baebb41a214cc3b45c17177177d900a2ad5783dbe6f291642d4906f",
+ "sha256:ee2c68e4f2dd1b1c15b849ba1c96fac105fca6ffdb7c1e8be51da6fabbdeafb9",
+ "sha256:f3ab950f8814f3b7b5e3eebc117986f817ec933676f68f0a6c5b2137dd7c9c69",
+ "sha256:f4f4547944d4f5cfcdc03f3f097d6f05bbbc915eaaf80a2ee120d0e756de377d",
+ "sha256:f72a0d746d38cb299b79ce3d4d60ba0892c84bbc905d0d49c13df5bace1b65f8",
+ "sha256:fc2c80bc87fba076e6cbb926216c27fba274dae7100a7b9a0983b53132dd99f2",
+ "sha256:fe4d2536c827f508348d7b40c08767e8c7071614250927233bf0c92170451c0a"
],
- "markers": "python_version >= '3.7'",
- "version": "==1.9.4"
+ "markers": "python_version >= '3.8'",
+ "version": "==1.14.0"
}
},
"develop": {
"alabaster": {
"hashes": [
- "sha256:75a8b99c28a5dad50dd7f8ccdd447a121ddb3892da9e53d1ca5cca3106d58d65",
- "sha256:b46733c07dce03ae4e150330b975c75737fa60f0a7c591b6c8bf4928a28e2c92"
+ "sha256:c00dca57bca26fa62a6d7d0a9fcce65f3e026e9bfe33e9c538fd3fbb2144fd9e",
+ "sha256:fc6786402dc3fcb2de3cabd5fe455a2db534b371124f1f21de8731783dec828b"
],
- "markers": "python_version >= '3.9'",
- "version": "==0.7.16"
+ "markers": "python_version >= '3.10'",
+ "version": "==1.0.0"
},
"babel": {
"hashes": [
- "sha256:08706bdad8d0a3413266ab61bd6c34d0c28d6e1e7badf40a2cebe67644e2e1fb",
- "sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413"
+ "sha256:368b5b98b37c06b7daf6696391c3240c938b37767d4584413e8438c5c435fa8b",
+ "sha256:d1f3554ca26605fe173f3de0c65f750f5a42f924499bf134de6423582298e316"
],
"markers": "python_version >= '3.8'",
- "version": "==2.15.0"
+ "version": "==2.16.0"
},
"backports.tarfile": {
"hashes": [
@@ -794,77 +970,93 @@
},
"build": {
"hashes": [
- "sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d",
- "sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4"
+ "sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5",
+ "sha256:b36993e92ca9375a219c99e606a122ff365a760a2d4bba0caa09bd5278b608b7"
],
"index": "pypi",
- "version": "==1.2.1"
+ "markers": "python_version >= '3.8'",
+ "version": "==1.2.2.post1"
},
"certifi": {
"hashes": [
- "sha256:3cd43f1c6fa7dedc5899d69d3ad0398fd018ad1a17fba83ddaf78aa46c747516",
- "sha256:ddc6c8ce995e6987e7faf5e3f1b02b302836a0e5d98ece18392cb1a36c72ad56"
+ "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8",
+ "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"
],
"markers": "python_version >= '3.6'",
- "version": "==2024.6.2"
+ "version": "==2024.8.30"
},
"cffi": {
"hashes": [
- "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc",
- "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a",
- "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417",
- "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab",
- "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520",
- "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36",
- "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743",
- "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8",
- "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed",
- "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684",
- "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56",
- "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324",
- "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d",
- "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235",
- "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e",
- "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088",
- "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000",
- "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7",
- "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e",
- "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673",
- "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c",
- "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe",
- "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2",
- "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098",
- "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8",
- "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a",
- "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0",
- "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b",
- "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896",
- "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e",
- "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9",
- "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2",
- "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b",
- "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6",
- "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404",
- "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f",
- "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0",
- "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4",
- "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc",
- "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936",
- "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba",
- "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872",
- "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb",
- "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614",
- "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1",
- "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d",
- "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969",
- "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b",
- "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4",
- "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627",
- "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956",
- "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"
+ "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": "platform_python_implementation != 'PyPy'",
- "version": "==1.16.0"
+ "version": "==1.17.1"
},
"charset-normalizer": {
"hashes": [
@@ -964,99 +1156,115 @@
},
"coverage": {
"hashes": [
- "sha256:015eddc5ccd5364dcb902eaecf9515636806fa1e0d5bef5769d06d0f31b54523",
- "sha256:04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f",
- "sha256:05ac5f60faa0c704c0f7e6a5cbfd6f02101ed05e0aee4d2822637a9e672c998d",
- "sha256:0bbddc54bbacfc09b3edaec644d4ac90c08ee8ed4844b0f86227dcda2d428fcb",
- "sha256:1d2a830ade66d3563bb61d1e3c77c8def97b30ed91e166c67d0632c018f380f0",
- "sha256:239a4e75e09c2b12ea478d28815acf83334d32e722e7433471fbf641c606344c",
- "sha256:244f509f126dc71369393ce5fea17c0592c40ee44e607b6d855e9c4ac57aac98",
- "sha256:25a5caf742c6195e08002d3b6c2dd6947e50efc5fc2c2205f61ecb47592d2d83",
- "sha256:296a7d9bbc598e8744c00f7a6cecf1da9b30ae9ad51c566291ff1314e6cbbed8",
- "sha256:2e079c9ec772fedbade9d7ebc36202a1d9ef7291bc9b3a024ca395c4d52853d7",
- "sha256:33ca90a0eb29225f195e30684ba4a6db05dbef03c2ccd50b9077714c48153cac",
- "sha256:33fc65740267222fc02975c061eb7167185fef4cc8f2770267ee8bf7d6a42f84",
- "sha256:341dd8f61c26337c37988345ca5c8ccabeff33093a26953a1ac72e7d0103c4fb",
- "sha256:34d6d21d8795a97b14d503dcaf74226ae51eb1f2bd41015d3ef332a24d0a17b3",
- "sha256:3538d8fb1ee9bdd2e2692b3b18c22bb1c19ffbefd06880f5ac496e42d7bb3884",
- "sha256:38a3b98dae8a7c9057bd91fbf3415c05e700a5114c5f1b5b0ea5f8f429ba6614",
- "sha256:3d5a67f0da401e105753d474369ab034c7bae51a4c31c77d94030d59e41df5bd",
- "sha256:50084d3516aa263791198913a17354bd1dc627d3c1639209640b9cac3fef5807",
- "sha256:55f689f846661e3f26efa535071775d0483388a1ccfab899df72924805e9e7cd",
- "sha256:5bc5a8c87714b0c67cfeb4c7caa82b2d71e8864d1a46aa990b5588fa953673b8",
- "sha256:62bda40da1e68898186f274f832ef3e759ce929da9a9fd9fcf265956de269dbc",
- "sha256:705f3d7c2b098c40f5b81790a5fedb274113373d4d1a69e65f8b68b0cc26f6db",
- "sha256:75e3f4e86804023e991096b29e147e635f5e2568f77883a1e6eed74512659ab0",
- "sha256:7b2a19e13dfb5c8e145c7a6ea959485ee8e2204699903c88c7d25283584bfc08",
- "sha256:7cec2af81f9e7569280822be68bd57e51b86d42e59ea30d10ebdbb22d2cb7232",
- "sha256:8383a6c8cefba1b7cecc0149415046b6fc38836295bc4c84e820872eb5478b3d",
- "sha256:8c836309931839cca658a78a888dab9676b5c988d0dd34ca247f5f3e679f4e7a",
- "sha256:8e317953bb4c074c06c798a11dbdd2cf9979dbcaa8ccc0fa4701d80042d4ebf1",
- "sha256:923b7b1c717bd0f0f92d862d1ff51d9b2b55dbbd133e05680204465f454bb286",
- "sha256:990fb20b32990b2ce2c5f974c3e738c9358b2735bc05075d50a6f36721b8f303",
- "sha256:9aad68c3f2566dfae84bf46295a79e79d904e1c21ccfc66de88cd446f8686341",
- "sha256:a5812840d1d00eafae6585aba38021f90a705a25b8216ec7f66aebe5b619fb84",
- "sha256:a6519d917abb15e12380406d721e37613e2a67d166f9fb7e5a8ce0375744cd45",
- "sha256:ab0b028165eea880af12f66086694768f2c3139b2c31ad5e032c8edbafca6ffc",
- "sha256:aea7da970f1feccf48be7335f8b2ca64baf9b589d79e05b9397a06696ce1a1ec",
- "sha256:b1196e13c45e327d6cd0b6e471530a1882f1017eb83c6229fc613cd1a11b53cd",
- "sha256:b368e1aee1b9b75757942d44d7598dcd22a9dbb126affcbba82d15917f0cc155",
- "sha256:bde997cac85fcac227b27d4fb2c7608a2c5f6558469b0eb704c5726ae49e1c52",
- "sha256:c4c2872b3c91f9baa836147ca33650dc5c172e9273c808c3c3199c75490e709d",
- "sha256:c59d2ad092dc0551d9f79d9d44d005c945ba95832a6798f98f9216ede3d5f485",
- "sha256:d1da0a2e3b37b745a2b2a678a4c796462cf753aebf94edcc87dcc6b8641eae31",
- "sha256:d8b7339180d00de83e930358223c617cc343dd08e1aa5ec7b06c3a121aec4e1d",
- "sha256:dd4b3355b01273a56b20c219e74e7549e14370b31a4ffe42706a8cda91f19f6d",
- "sha256:e08c470c2eb01977d221fd87495b44867a56d4d594f43739a8028f8646a51e0d",
- "sha256:f5102a92855d518b0996eb197772f5ac2a527c0ec617124ad5242a3af5e25f85",
- "sha256:f542287b1489c7a860d43a7d8883e27ca62ab84ca53c965d11dac1d3a1fab7ce",
- "sha256:f78300789a708ac1f17e134593f577407d52d0417305435b134805c4fb135adb",
- "sha256:f81bc26d609bf0fbc622c7122ba6307993c83c795d2d6f6f6fd8c000a770d974",
- "sha256:f836c174c3a7f639bded48ec913f348c4761cbf49de4a20a956d3431a7c9cb24",
- "sha256:fa21a04112c59ad54f69d80e376f7f9d0f5f9123ab87ecd18fbb9ec3a2beed56",
- "sha256:fcf7d1d6f5da887ca04302db8e0e0cf56ce9a5e05f202720e49b3e8157ddb9a9",
- "sha256:fd27d8b49e574e50caa65196d908f80e4dff64d7e592d0c59788b45aad7e8b35"
+ "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca",
+ "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d",
+ "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6",
+ "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989",
+ "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c",
+ "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b",
+ "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223",
+ "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f",
+ "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56",
+ "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3",
+ "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8",
+ "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb",
+ "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388",
+ "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0",
+ "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a",
+ "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8",
+ "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f",
+ "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a",
+ "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962",
+ "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8",
+ "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391",
+ "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc",
+ "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2",
+ "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155",
+ "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb",
+ "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0",
+ "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c",
+ "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a",
+ "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004",
+ "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060",
+ "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232",
+ "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93",
+ "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129",
+ "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163",
+ "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de",
+ "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6",
+ "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23",
+ "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569",
+ "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d",
+ "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778",
+ "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d",
+ "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36",
+ "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a",
+ "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6",
+ "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34",
+ "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704",
+ "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106",
+ "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9",
+ "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862",
+ "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b",
+ "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255",
+ "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16",
+ "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3",
+ "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133",
+ "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb",
+ "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657",
+ "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d",
+ "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca",
+ "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36",
+ "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c",
+ "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e",
+ "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff",
+ "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7",
+ "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5",
+ "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02",
+ "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c",
+ "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df",
+ "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3",
+ "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a",
+ "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959",
+ "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234",
+ "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc"
],
"index": "pypi",
- "version": "==7.5.3"
+ "markers": "python_version >= '3.8'",
+ "version": "==7.6.1"
},
"cryptography": {
"hashes": [
- "sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad",
- "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583",
- "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b",
- "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c",
- "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1",
- "sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648",
- "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949",
- "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba",
- "sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c",
- "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9",
- "sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d",
- "sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c",
- "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e",
- "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2",
- "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d",
- "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7",
- "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70",
- "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2",
- "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7",
- "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14",
- "sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe",
- "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e",
- "sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71",
- "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961",
- "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7",
- "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c",
- "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28",
- "sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842",
- "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902",
- "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801",
- "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a",
- "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e"
+ "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494",
+ "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806",
+ "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d",
+ "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062",
+ "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2",
+ "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4",
+ "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1",
+ "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85",
+ "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84",
+ "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042",
+ "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d",
+ "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962",
+ "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2",
+ "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa",
+ "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d",
+ "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365",
+ "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96",
+ "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47",
+ "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d",
+ "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d",
+ "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c",
+ "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb",
+ "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277",
+ "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172",
+ "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034",
+ "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a",
+ "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289"
],
"markers": "python_version >= '3.7'",
- "version": "==42.0.8"
+ "version": "==43.0.1"
},
"docutils": {
"hashes": [
@@ -1068,19 +1276,20 @@
},
"furo": {
"hashes": [
- "sha256:490a00d08c0a37ecc90de03ae9227e8eb5d6f7f750edf9807f398a2bdf2358de",
- "sha256:81f205a6605ebccbb883350432b4831c0196dd3d1bc92f61e1f459045b3d2b0b"
+ "sha256:6cd97c58b47813d3619e63e9081169880fbe331f0ca883c871ff1f3f11814f5c",
+ "sha256:b63e4cee8abfc3136d3bc03a3d45a76a850bada4d6374d24c1716b0e01394a01"
],
"index": "pypi",
- "version": "==2024.5.6"
+ "markers": "python_version >= '3.8'",
+ "version": "==2024.8.6"
},
"idna": {
"hashes": [
- "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc",
- "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"
+ "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
+ "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
],
- "markers": "python_version >= '3.5'",
- "version": "==3.7"
+ "markers": "python_version >= '3.6'",
+ "version": "==3.10"
},
"imagesize": {
"hashes": [
@@ -1092,11 +1301,11 @@
},
"importlib-metadata": {
"hashes": [
- "sha256:30962b96c0c223483ed6cc7280e7f0199feb01a0e40cfae4d4450fc6fab1f570",
- "sha256:b78938b926ee8d5f020fc4772d487045805a55ddbad2ecf21c6d60938dc7fcd2"
+ "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b",
+ "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7"
],
"markers": "python_version >= '3.8'",
- "version": "==7.1.0"
+ "version": "==8.5.0"
},
"iniconfig": {
"hashes": [
@@ -1116,19 +1325,19 @@
},
"jaraco.context": {
"hashes": [
- "sha256:3e16388f7da43d384a1a7cd3452e72e14732ac9fe459678773a3608a812bf266",
- "sha256:c2f67165ce1f9be20f32f650f25d8edfc1646a8aeee48ae06fb35f90763576d2"
+ "sha256:9bae4ea555cf0b14938dc0aee7c9f32ed303aa20a3b73e7dc80111628792d1b3",
+ "sha256:f797fc481b490edb305122c9181830a3a5b76d84ef6d1aef2fb9b47ab956f9e4"
],
"markers": "python_version >= '3.8'",
- "version": "==5.3.0"
+ "version": "==6.0.1"
},
"jaraco.functools": {
"hashes": [
- "sha256:3b24ccb921d6b593bdceb56ce14799204f473976e2a9d4b15b04d0f2c2326664",
- "sha256:d33fa765374c0611b52f8b3a795f8900869aa88c84769d4d1746cd68fb28c3e8"
+ "sha256:70f7e0e2ae076498e212562325e805204fc092d7b4c17e0e86c959e249701a9d",
+ "sha256:ad159f13428bc4acbf5541ad6dec511f91573b90fba04df61dafa2a1231cf649"
],
"markers": "python_version >= '3.8'",
- "version": "==4.0.1"
+ "version": "==4.1.0"
},
"jeepney": {
"hashes": [
@@ -1148,11 +1357,11 @@
},
"keyring": {
"hashes": [
- "sha256:2458681cdefc0dbc0b7eb6cf75d0b98e59f9ad9b2d4edd319d18f68bdca95e50",
- "sha256:daaffd42dbda25ddafb1ad5fec4024e5bbcfe424597ca1ca452b299861e49f1b"
+ "sha256:5426f817cf7f6f007ba5ec722b1bcad95a75b27d780343772ad76b17cb47b0bf",
+ "sha256:b07ebc55f3e8ed86ac81dd31ef14e81ace9dd9c3d4b5d77a6e9a2016d0d71a1b"
],
"markers": "python_version >= '3.8'",
- "version": "==25.2.1"
+ "version": "==25.4.1"
},
"markdown-it-py": {
"hashes": [
@@ -1164,69 +1373,70 @@
},
"markupsafe": {
"hashes": [
- "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf",
- "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff",
- "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f",
- "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3",
- "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532",
- "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f",
- "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617",
- "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df",
- "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4",
- "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906",
- "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f",
- "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4",
- "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8",
- "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371",
- "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2",
- "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465",
- "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52",
- "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6",
- "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169",
- "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad",
- "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2",
- "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0",
- "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029",
- "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f",
- "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a",
- "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced",
- "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5",
- "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c",
- "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf",
- "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9",
- "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb",
- "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad",
- "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3",
- "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1",
- "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46",
- "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc",
- "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a",
- "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee",
- "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900",
- "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5",
- "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea",
- "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f",
- "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5",
- "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e",
- "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a",
- "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f",
- "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50",
- "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a",
- "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b",
- "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4",
- "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff",
- "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2",
- "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46",
- "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b",
- "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf",
- "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5",
- "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5",
- "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab",
- "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd",
- "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68"
+ "sha256:0778de17cff1acaeccc3ff30cd99a3fd5c50fc58ad3d6c0e0c4c58092b859396",
+ "sha256:0f84af7e813784feb4d5e4ff7db633aba6c8ca64a833f61d8e4eade234ef0c38",
+ "sha256:17b2aea42a7280db02ac644db1d634ad47dcc96faf38ab304fe26ba2680d359a",
+ "sha256:242d6860f1fd9191aef5fae22b51c5c19767f93fb9ead4d21924e0bcb17619d8",
+ "sha256:244dbe463d5fb6d7ce161301a03a6fe744dac9072328ba9fc82289238582697b",
+ "sha256:26627785a54a947f6d7336ce5963569b5d75614619e75193bdb4e06e21d447ad",
+ "sha256:2a4b34a8d14649315c4bc26bbfa352663eb51d146e35eef231dd739d54a5430a",
+ "sha256:2ae99f31f47d849758a687102afdd05bd3d3ff7dbab0a8f1587981b58a76152a",
+ "sha256:312387403cd40699ab91d50735ea7a507b788091c416dd007eac54434aee51da",
+ "sha256:3341c043c37d78cc5ae6e3e305e988532b072329639007fd408a476642a89fd6",
+ "sha256:33d1c36b90e570ba7785dacd1faaf091203d9942bc036118fab8110a401eb1a8",
+ "sha256:3e683ee4f5d0fa2dde4db77ed8dd8a876686e3fc417655c2ece9a90576905344",
+ "sha256:3ffb4a8e7d46ed96ae48805746755fadd0909fea2306f93d5d8233ba23dda12a",
+ "sha256:40621d60d0e58aa573b68ac5e2d6b20d44392878e0bfc159012a5787c4e35bc8",
+ "sha256:40f1e10d51c92859765522cbd79c5c8989f40f0419614bcdc5015e7b6bf97fc5",
+ "sha256:45d42d132cff577c92bfba536aefcfea7e26efb975bd455db4e6602f5c9f45e7",
+ "sha256:48488d999ed50ba8d38c581d67e496f955821dc183883550a6fbc7f1aefdc170",
+ "sha256:4935dd7883f1d50e2ffecca0aa33dc1946a94c8f3fdafb8df5c330e48f71b132",
+ "sha256:4c2d64fdba74ad16138300815cfdc6ab2f4647e23ced81f59e940d7d4a1469d9",
+ "sha256:4c8817557d0de9349109acb38b9dd570b03cc5014e8aabf1cbddc6e81005becd",
+ "sha256:4ffaaac913c3f7345579db4f33b0020db693f302ca5137f106060316761beea9",
+ "sha256:5a4cb365cb49b750bdb60b846b0c0bc49ed62e59a76635095a179d440540c346",
+ "sha256:62fada2c942702ef8952754abfc1a9f7658a4d5460fabe95ac7ec2cbe0d02abc",
+ "sha256:67c519635a4f64e495c50e3107d9b4075aec33634272b5db1cde839e07367589",
+ "sha256:6a54c43d3ec4cf2a39f4387ad044221c66a376e58c0d0e971d47c475ba79c6b5",
+ "sha256:7044312a928a66a4c2a22644147bc61a199c1709712069a344a3fb5cfcf16915",
+ "sha256:730d86af59e0e43ce277bb83970530dd223bf7f2a838e086b50affa6ec5f9295",
+ "sha256:800100d45176652ded796134277ecb13640c1a537cad3b8b53da45aa96330453",
+ "sha256:80fcbf3add8790caddfab6764bde258b5d09aefbe9169c183f88a7410f0f6dea",
+ "sha256:82b5dba6eb1bcc29cc305a18a3c5365d2af06ee71b123216416f7e20d2a84e5b",
+ "sha256:852dc840f6d7c985603e60b5deaae1d89c56cb038b577f6b5b8c808c97580f1d",
+ "sha256:8ad4ad1429cd4f315f32ef263c1342166695fad76c100c5d979c45d5570ed58b",
+ "sha256:8ae369e84466aa70f3154ee23c1451fda10a8ee1b63923ce76667e3077f2b0c4",
+ "sha256:93e8248d650e7e9d49e8251f883eed60ecbc0e8ffd6349e18550925e31bd029b",
+ "sha256:973a371a55ce9ed333a3a0f8e0bcfae9e0d637711534bcb11e130af2ab9334e7",
+ "sha256:9ba25a71ebf05b9bb0e2ae99f8bc08a07ee8e98c612175087112656ca0f5c8bf",
+ "sha256:a10860e00ded1dd0a65b83e717af28845bb7bd16d8ace40fe5531491de76b79f",
+ "sha256:a4792d3b3a6dfafefdf8e937f14906a51bd27025a36f4b188728a73382231d91",
+ "sha256:a7420ceda262dbb4b8d839a4ec63d61c261e4e77677ed7c66c99f4e7cb5030dd",
+ "sha256:ad91738f14eb8da0ff82f2acd0098b6257621410dcbd4df20aaa5b4233d75a50",
+ "sha256:b6a387d61fe41cdf7ea95b38e9af11cfb1a63499af2759444b99185c4ab33f5b",
+ "sha256:b954093679d5750495725ea6f88409946d69cfb25ea7b4c846eef5044194f583",
+ "sha256:bbde71a705f8e9e4c3e9e33db69341d040c827c7afa6789b14c6e16776074f5a",
+ "sha256:beeebf760a9c1f4c07ef6a53465e8cfa776ea6a2021eda0d0417ec41043fe984",
+ "sha256:c91b394f7601438ff79a4b93d16be92f216adb57d813a78be4446fe0f6bc2d8c",
+ "sha256:c97ff7fedf56d86bae92fa0a646ce1a0ec7509a7578e1ed238731ba13aabcd1c",
+ "sha256:cb53e2a99df28eee3b5f4fea166020d3ef9116fdc5764bc5117486e6d1211b25",
+ "sha256:cbf445eb5628981a80f54087f9acdbf84f9b7d862756110d172993b9a5ae81aa",
+ "sha256:d06b24c686a34c86c8c1fba923181eae6b10565e4d80bdd7bc1c8e2f11247aa4",
+ "sha256:d98e66a24497637dd31ccab090b34392dddb1f2f811c4b4cd80c230205c074a3",
+ "sha256:db15ce28e1e127a0013dfb8ac243a8e392db8c61eae113337536edb28bdc1f97",
+ "sha256:db842712984e91707437461930e6011e60b39136c7331e971952bb30465bc1a1",
+ "sha256:e24bfe89c6ac4c31792793ad9f861b8f6dc4546ac6dc8f1c9083c7c4f2b335cd",
+ "sha256:e81c52638315ff4ac1b533d427f50bc0afc746deb949210bc85f05d4f15fd772",
+ "sha256:e9393357f19954248b00bed7c56f29a25c930593a77630c719653d51e7669c2a",
+ "sha256:ee3941769bd2522fe39222206f6dd97ae83c442a94c90f2b7a25d847d40f4729",
+ "sha256:f31ae06f1328595d762c9a2bf29dafd8621c7d3adc130cbb46278079758779ca",
+ "sha256:f94190df587738280d544971500b9cafc9b950d32efcb1fba9ac10d84e6aa4e6",
+ "sha256:fa7d686ed9883f3d664d39d5a8e74d3c5f63e603c2e3ff0abcba23eac6542635",
+ "sha256:fb532dd9900381d2e8f48172ddc5a59db4c445a11b9fab40b3b786da40d3b56b",
+ "sha256:fe32482b37b4b00c7a52a07211b479653b7fe4f22b2e481b9a9b099d8a430f2f"
],
- "markers": "python_version >= '3.7'",
- "version": "==2.1.5"
+ "markers": "python_version >= '3.9'",
+ "version": "==3.0.1"
},
"mdurl": {
"hashes": [
@@ -1238,48 +1448,48 @@
},
"more-itertools": {
"hashes": [
- "sha256:686b06abe565edfab151cb8fd385a05651e1fdf8f0a14191e4439283421f8684",
- "sha256:8fccb480c43d3e99a00087634c06dd02b0d50fbf088b380de5a41a015ec239e1"
+ "sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef",
+ "sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6"
],
"markers": "python_version >= '3.8'",
- "version": "==10.2.0"
+ "version": "==10.5.0"
},
"nh3": {
"hashes": [
- "sha256:0316c25b76289cf23be6b66c77d3608a4fdf537b35426280032f432f14291b9a",
- "sha256:1a814dd7bba1cb0aba5bcb9bebcc88fd801b63e21e2450ae6c52d3b3336bc911",
- "sha256:1aa52a7def528297f256de0844e8dd680ee279e79583c76d6fa73a978186ddfb",
- "sha256:22c26e20acbb253a5bdd33d432a326d18508a910e4dcf9a3316179860d53345a",
- "sha256:40015514022af31975c0b3bca4014634fa13cb5dc4dbcbc00570acc781316dcc",
- "sha256:40d0741a19c3d645e54efba71cb0d8c475b59135c1e3c580f879ad5514cbf028",
- "sha256:551672fd71d06cd828e282abdb810d1be24e1abb7ae2543a8fa36a71c1006fe9",
- "sha256:66f17d78826096291bd264f260213d2b3905e3c7fae6dfc5337d49429f1dc9f3",
- "sha256:85cdbcca8ef10733bd31f931956f7fbb85145a4d11ab9e6742bbf44d88b7e351",
- "sha256:a3f55fabe29164ba6026b5ad5c3151c314d136fd67415a17660b4aaddacf1b10",
- "sha256:b4427ef0d2dfdec10b641ed0bdaf17957eb625b2ec0ea9329b3d28806c153d71",
- "sha256:ba73a2f8d3a1b966e9cdba7b211779ad8a2561d2dba9674b8a19ed817923f65f",
- "sha256:c21bac1a7245cbd88c0b0e4a420221b7bfa838a2814ee5bb924e9c2f10a1120b",
- "sha256:c551eb2a3876e8ff2ac63dff1585236ed5dfec5ffd82216a7a174f7c5082a78a",
- "sha256:c790769152308421283679a142dbdb3d1c46c79c823008ecea8e8141db1a2062",
- "sha256:d7a25fd8c86657f5d9d576268e3b3767c5cd4f42867c9383618be8517f0f022a"
- ],
- "version": "==0.2.17"
+ "sha256:0411beb0589eacb6734f28d5497ca2ed379eafab8ad8c84b31bb5c34072b7164",
+ "sha256:14c5a72e9fe82aea5fe3072116ad4661af5cf8e8ff8fc5ad3450f123e4925e86",
+ "sha256:19aaba96e0f795bd0a6c56291495ff59364f4300d4a39b29a0abc9cb3774a84b",
+ "sha256:34c03fa78e328c691f982b7c03d4423bdfd7da69cd707fe572f544cf74ac23ad",
+ "sha256:36c95d4b70530b320b365659bb5034341316e6a9b30f0b25fa9c9eff4c27a204",
+ "sha256:3a157ab149e591bb638a55c8c6bcb8cdb559c8b12c13a8affaba6cedfe51713a",
+ "sha256:42c64511469005058cd17cc1537578eac40ae9f7200bedcfd1fc1a05f4f8c200",
+ "sha256:5f36b271dae35c465ef5e9090e1fdaba4a60a56f0bb0ba03e0932a66f28b9189",
+ "sha256:6955369e4d9f48f41e3f238a9e60f9410645db7e07435e62c6a9ea6135a4907f",
+ "sha256:7b7c2a3c9eb1a827d42539aa64091640bd275b81e097cd1d8d82ef91ffa2e811",
+ "sha256:8ce0f819d2f1933953fca255db2471ad58184a60508f03e6285e5114b6254844",
+ "sha256:94a166927e53972a9698af9542ace4e38b9de50c34352b962f4d9a7d4c927af4",
+ "sha256:a7f1b5b2c15866f2db413a3649a8fe4fd7b428ae58be2c0f6bca5eefd53ca2be",
+ "sha256:c8b3a1cebcba9b3669ed1a84cc65bf005728d2f0bc1ed2a6594a992e817f3a50",
+ "sha256:de3ceed6e661954871d6cd78b410213bdcb136f79aafe22aa7182e028b8c7307",
+ "sha256:f0eca9ca8628dbb4e916ae2491d72957fdd35f7a5d326b7032a345f111ac07fe"
+ ],
+ "version": "==0.2.18"
},
"packaging": {
"hashes": [
- "sha256:2ddfb553fdf02fb784c234c7ba6ccc288296ceabec964ad2eae3777778130bc5",
- "sha256:eb82c5e3e56209074766e6885bb04b8c38a0c015d0a30036ebe7ece34c9989e9"
+ "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002",
+ "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"
],
- "markers": "python_version >= '3.7'",
- "version": "==24.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==24.1"
},
"pkginfo": {
"hashes": [
- "sha256:6d4998d1cd42c297af72cc0eab5f5bab1d356fb8a55b828fa914173f8bc1ba05",
- "sha256:dba885aa82e31e80d615119874384923f4e011c2a39b0c4b7104359e36cb7087"
+ "sha256:5df73835398d10db79f8eecd5cd86b1f6d29317589ea70796994d49399af6297",
+ "sha256:889a6da2ed7ffc58ab5b900d888ddce90bce912f2d2de1dc1c26f4cb9fe65097"
],
- "markers": "python_version >= '3.8'",
- "version": "==1.11.0"
+ "markers": "python_version >= '3.6'",
+ "version": "==1.10.0"
},
"pluggy": {
"hashes": [
@@ -1307,27 +1517,28 @@
},
"pyproject-hooks": {
"hashes": [
- "sha256:4b37730834edbd6bd37f26ece6b44802fb1c1ee2ece0e54ddff8bfc06db86965",
- "sha256:7ceeefe9aec63a1064c18d939bdc3adf2d8aa1988a510afec15151578b232aa2"
+ "sha256:1e859bd5c40fae9448642dd871adf459e5e2084186e8d2c2a79a824c970da1f8",
+ "sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913"
],
"markers": "python_version >= '3.7'",
- "version": "==1.1.0"
+ "version": "==1.2.0"
},
"pytest": {
"hashes": [
- "sha256:c434598117762e2bd304e526244f67bf66bbd7b5d6cf22138be51ff661980343",
- "sha256:de4bb8104e201939ccdc688b27a89a7be2079b22e2bd2b07f806b6ba71117977"
+ "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181",
+ "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"
],
"index": "pypi",
- "version": "==8.2.2"
+ "markers": "python_version >= '3.8'",
+ "version": "==8.3.3"
},
"readme-renderer": {
"hashes": [
- "sha256:1818dd28140813509eeed8d62687f7cd4f7bad90d4db586001c5dc09d4fde311",
- "sha256:19db308d86ecd60e5affa3b2a98f017af384678c63c88e5d4556a380e674f3f9"
+ "sha256:2fbca89b81a08526aadf1357a8c2ae889ec05fb03f5da67f9769c9a592166151",
+ "sha256:8712034eabbfa6805cacf1402b4eeb2a73028f72d1166d6f5cb7f9c047c5d1e1"
],
- "markers": "python_version >= '3.8'",
- "version": "==43.0"
+ "markers": "python_version >= '3.9'",
+ "version": "==44.0"
},
"requests": {
"hashes": [
@@ -1335,6 +1546,7 @@
"sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"
],
"index": "pypi",
+ "markers": "python_version >= '3.8'",
"version": "==2.32.3"
},
"requests-mock": {
@@ -1343,6 +1555,7 @@
"sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401"
],
"index": "pypi",
+ "markers": "python_version >= '3.5'",
"version": "==1.12.1"
},
"requests-toolbelt": {
@@ -1363,11 +1576,11 @@
},
"rich": {
"hashes": [
- "sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222",
- "sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432"
+ "sha256:51a2c62057461aaf7152b4d611168f93a9fc73068f8ded2790f29fe2b5366d0c",
+ "sha256:8c82a3d3f8dcfe9e734771313e606b39d8247bb6b826e196f4914b333b743cf1"
],
- "markers": "python_full_version >= '3.7.0'",
- "version": "==13.7.1"
+ "markers": "python_full_version >= '3.8.0'",
+ "version": "==13.9.2"
},
"secretstorage": {
"hashes": [
@@ -1379,11 +1592,12 @@
},
"setuptools": {
"hashes": [
- "sha256:54faa7f2e8d2d11bcd2c07bed282eef1046b5c080d1c32add737d7b5817b1ad4",
- "sha256:f211a66637b8fa059bb28183da127d4e86396c991a942b028c6650d4319c3fd0"
+ "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2",
+ "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"
],
"index": "pypi",
- "version": "==70.0.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==75.1.0"
},
"snowballstemmer": {
"hashes": [
@@ -1394,19 +1608,19 @@
},
"soupsieve": {
"hashes": [
- "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690",
- "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7"
+ "sha256:e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb",
+ "sha256:e72c4ff06e4fb6e4b5a9f0f55fe6e81514581fca1515028625d0f299c602ccc9"
],
"markers": "python_version >= '3.8'",
- "version": "==2.5"
+ "version": "==2.6"
},
"sphinx": {
"hashes": [
- "sha256:413f75440be4cacf328f580b4274ada4565fb2187d696a84970c23f77b64d8c3",
- "sha256:a4a7db75ed37531c05002d56ed6948d4c42f473a36f46e1382b0bd76ca9627bc"
+ "sha256:0cce1ddcc4fd3532cf1dd283bc7d886758362c5c1de6598696579ce96d8ffa5b",
+ "sha256:56173572ae6c1b9a38911786e206a110c9749116745873feae4f9ce88e59391d"
],
- "markers": "python_version >= '3.9'",
- "version": "==7.3.7"
+ "markers": "python_version >= '3.10'",
+ "version": "==8.0.2"
},
"sphinx-basic-ng": {
"hashes": [
@@ -1418,27 +1632,27 @@
},
"sphinxcontrib-applehelp": {
"hashes": [
- "sha256:c40a4f96f3776c4393d933412053962fac2b84f4c99a7982ba42e09576a70619",
- "sha256:cb61eb0ec1b61f349e5cc36b2028e9e7ca765be05e49641c97241274753067b4"
+ "sha256:2f29ef331735ce958efa4734873f084941970894c6090408b079c61b2e1c06d1",
+ "sha256:4cd3f0ec4ac5dd9c17ec65e9ab272c9b867ea77425228e68ecf08d6b28ddbdb5"
],
"markers": "python_version >= '3.9'",
- "version": "==1.0.8"
+ "version": "==2.0.0"
},
"sphinxcontrib-devhelp": {
"hashes": [
- "sha256:6485d09629944511c893fa11355bda18b742b83a2b181f9a009f7e500595c90f",
- "sha256:9893fd3f90506bc4b97bdb977ceb8fbd823989f4316b28c3841ec128544372d3"
+ "sha256:411f5d96d445d1d73bb5d52133377b4248ec79db5c793ce7dbe59e074b4dd1ad",
+ "sha256:aefb8b83854e4b0998877524d1029fd3e6879210422ee3780459e28a1f03a8a2"
],
"markers": "python_version >= '3.9'",
- "version": "==1.0.6"
+ "version": "==2.0.0"
},
"sphinxcontrib-htmlhelp": {
"hashes": [
- "sha256:0dc87637d5de53dd5eec3a6a01753b1ccf99494bd756aafecd74b4fa9e729015",
- "sha256:393f04f112b4d2f53d93448d4bce35842f62b307ccdc549ec1585e950bc35e04"
+ "sha256:166759820b47002d22914d64a075ce08f4c46818e17cfc9470a9786b759b19f8",
+ "sha256:c9e2916ace8aad64cc13a0d233ee22317f2b9025b9cf3295249fa985cc7082e9"
],
"markers": "python_version >= '3.9'",
- "version": "==2.0.5"
+ "version": "==2.1.0"
},
"sphinxcontrib-jsmath": {
"hashes": [
@@ -1450,43 +1664,44 @@
},
"sphinxcontrib-qthelp": {
"hashes": [
- "sha256:053dedc38823a80a7209a80860b16b722e9e0209e32fea98c90e4e6624588ed6",
- "sha256:e2ae3b5c492d58fcbd73281fbd27e34b8393ec34a073c792642cd8e529288182"
+ "sha256:4fe7d0ac8fc171045be623aba3e2a8f613f8682731f9153bb2e40ece16b9bbab",
+ "sha256:b18a828cdba941ccd6ee8445dbe72ffa3ef8cbe7505d8cd1fa0d42d3f2d5f3eb"
],
"markers": "python_version >= '3.9'",
- "version": "==1.0.7"
+ "version": "==2.0.0"
},
"sphinxcontrib-serializinghtml": {
"hashes": [
- "sha256:326369b8df80a7d2d8d7f99aa5ac577f51ea51556ed974e7716cfd4fca3f6cb7",
- "sha256:93f3f5dc458b91b192fe10c397e324f262cf163d79f3282c158e8436a2c4511f"
+ "sha256:6e2cb0eef194e10c27ec0023bfeb25badbbb5868244cf5bc5bdc04e4464bf331",
+ "sha256:e9d912827f872c029017a53f0ef2180b327c3f7fd23c87229f7a8e8b70031d4d"
],
"markers": "python_version >= '3.9'",
- "version": "==1.1.10"
+ "version": "==2.0.0"
},
"twine": {
"hashes": [
- "sha256:4d74770c88c4fcaf8134d2a6a9d863e40f08255ff7d8e2acb3cbbd57d25f6e9d",
- "sha256:fe1d814395bfe50cfbe27783cb74efe93abeac3f66deaeb6c8390e4e92bacb43"
+ "sha256:215dbe7b4b94c2c50a7315c0275d2258399280fbb7d04182c7e55e24b5f93997",
+ "sha256:9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db"
],
"index": "pypi",
- "version": "==5.1.0"
+ "markers": "python_version >= '3.8'",
+ "version": "==5.1.1"
},
"urllib3": {
"hashes": [
- "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d",
- "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19"
+ "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac",
+ "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"
],
"markers": "python_version >= '3.8'",
- "version": "==2.2.1"
+ "version": "==2.2.3"
},
"zipp": {
"hashes": [
- "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19",
- "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"
+ "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350",
+ "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"
],
"markers": "python_version >= '3.8'",
- "version": "==3.19.2"
+ "version": "==3.20.2"
}
}
}
diff --git a/lib/python/README.md b/lib/python/README.md
index d3db052010c3088ee203159f840c01cee6041cff..ccf6e82dd14db37362a3b87ac6fe605c14f4e9de 100644
--- a/lib/python/README.md
+++ b/lib/python/README.md
@@ -48,17 +48,17 @@ 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.6/api/#create-user-account))
+ account ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/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.6/api/#create-database))
+ visibility ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#create-database))
- Import
- dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/api/#import-dataset))
+ dataset ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#import-dataset))
- Create persistent
- identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/api/#assign-database-pid))
+ identifiers ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#assign-database-pid))
- Execute
- queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/api/#export-subset))
+ queries ([docs](https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/#export-subset))
- Get data from tables/views/subsets
## Configure
diff --git a/lib/python/dbrepo/AmqpClient.py b/lib/python/dbrepo/AmqpClient.py
index 27f7fc4f0fd702e7f40135102f844bb8108971d2..cd0b1140996d0572586985ee0eb2e1285e556c27 100644
--- a/lib/python/dbrepo/AmqpClient.py
+++ b/lib/python/dbrepo/AmqpClient.py
@@ -4,6 +4,8 @@ import sys
import json
import logging
+from dbrepo.api.exceptions import AuthenticationError
+
logging.basicConfig(format='%(asctime)s %(name)-12s %(levelname)-6s %(message)s', level=logging.INFO,
stream=sys.stdout)
@@ -14,9 +16,9 @@ class AmqpClient:
via environment variables, e.g. set endpoint with DBREPO_ENDPOINT. You can override the constructor parameters \
with the environment variables.
- :param broker_host: The AMQP API host. Optional. Default: "broker-service"
- :param broker_port: The AMQP API port. Optional. Default: 5672
- :param broker_virtual_host: The AMQP API virtual host. Optional. Default: "/"
+ :param broker_host: The AMQP API host. Optional. Default: "localhost".
+ :param broker_port: The AMQP API port. Optional. Default: 5672,
+ :param broker_virtual_host: The AMQP API virtual host. Optional. Default: "dbrepo".
:param username: The AMQP API username. Optional.
:param password: The AMQP API password. Optional.
"""
@@ -27,9 +29,9 @@ class AmqpClient:
password: str = None
def __init__(self,
- broker_host: str = 'broker-service',
+ broker_host: str = 'localhost',
broker_port: int = 5672,
- broker_virtual_host: str = '/',
+ broker_virtual_host: str = 'dbrepo',
username: str = None,
password: str = None) -> None:
self.broker_host = os.environ.get('AMQP_API_HOST', broker_host)
@@ -41,14 +43,16 @@ class AmqpClient:
self.username = os.environ.get('AMQP_API_USERNAME', username)
self.password = os.environ.get('AMQP_API_PASSWORD', password)
- def publish(self, exchange: str, routing_key: str, data=dict) -> None:
+ def publish(self, routing_key: str, data=dict, exchange: str = 'dbrepo') -> None:
"""
Publishes data to a given exchange with the given routing key with a blocking connection.
- :param exchange: The exchange name.
:param routing_key: The routing key.
:param data: The data.
+ :param exchange: The exchange name. Default: "dbrepo".
"""
+ if self.username is None or self.password is None:
+ raise AuthenticationError(f"Failed to perform request: authentication required")
parameters = pika.ConnectionParameters(host=self.broker_host, port=self.broker_port,
virtual_host=self.broker_virtual_host,
credentials=pika.credentials.PlainCredentials(self.username,
diff --git a/lib/python/dbrepo/RestClient.py b/lib/python/dbrepo/RestClient.py
index 01defc078e803e7bf7b96d11f1c05cbd58d2b125..8e0e782bb88055e8bc34a8ae8afb46aea0cb30f7 100644
--- a/lib/python/dbrepo/RestClient.py
+++ b/lib/python/dbrepo/RestClient.py
@@ -1103,7 +1103,6 @@ class RestClient:
def import_table_data(self, database_id: int, table_id: int, file_name_or_data_frame: str | DataFrame,
separator: str = ",", quote: str = "\"", skip_lines: int = 0,
- false_encoding: str = None, true_encoding: str = None, null_encoding: str = None,
line_encoding: str = "\n") -> None:
"""
Import a csv dataset from a file into a table in a database with given database id and table id. ATTENTION:
@@ -1116,9 +1115,6 @@ class RestClient:
:param separator: The csv column separator. Optional.
:param quote: The column data quotation character. Optional.
:param skip_lines: The number of lines to skip. Optional. Default: 0.
- :param false_encoding: The encoding of boolean false. Optional.
- :param true_encoding: The encoding of boolean true. Optional.
- :param null_encoding: The encoding of null. Optional.
:param line_encoding: The encoding of the line termination. Optional. Default: CR (Windows).
:raises MalformedError: If the payload is rejected by the service (e.g. LOB could not be imported).
@@ -1138,9 +1134,7 @@ class RestClient:
url = f'/api/database/{database_id}/table/{table_id}/data/import'
response = self._wrapper(method="post", url=url, force_auth=True,
payload=Import(location=filename, separator=separator, quote=quote,
- skip_lines=skip_lines, false_element=false_encoding,
- true_element=true_encoding, null_element=null_encoding,
- line_termination=line_encoding))
+ skip_lines=skip_lines, line_termination=line_encoding))
if response.status_code == 202:
return
if response.status_code == 400:
diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py
index c601125767c2065e62062c9c82e39ad402ee5bc8..fc97c2b8d731b064e2d8ff7a77e458e727f95f3c 100644
--- a/lib/python/dbrepo/api/dto.py
+++ b/lib/python/dbrepo/api/dto.py
@@ -11,14 +11,6 @@ Timestamp = Annotated[
]
-class ImageDate(BaseModel):
- id: int
- database_format: str
- unix_format: str
- has_time: bool
- created_at: Timestamp
-
-
class JwtAuth(BaseModel):
access_token: str
refresh_token: str
@@ -40,7 +32,7 @@ class Image(BaseModel):
driver_class: str
jdbc_method: str
default_port: int
- date_formats: Optional[List[ImageDate]] = field(default_factory=list)
+ data_types: List[DataType] = field(default_factory=list)
class ImageBrief(BaseModel):
@@ -193,6 +185,7 @@ class ColumnType(str, Enum):
LONGTEXT = "longtext"
LONGBLOB = "longblob"
ENUM = "enum"
+ SERIAL = "serial"
SET = "set"
BIT = "bit"
TINYINT = "tinyint"
@@ -487,9 +480,6 @@ class Import(BaseModel):
separator: str
quote: Optional[str] = None
skip_lines: Optional[int] = None
- false_element: Optional[bool] = None
- true_element: Optional[bool] = None
- null_element: Optional[str] = None
line_termination: Optional[str] = None
@@ -522,7 +512,6 @@ class CreateTableColumn(BaseModel):
index_length: Optional[int] = None
size: Optional[int] = None
d: Optional[int] = None
- dfid: Optional[int] = None
enums: Optional[List[str]] = None
sets: Optional[List[str]] = None
@@ -885,13 +874,30 @@ class UpdateQuery(BaseModel):
persist: bool
+class DataType(BaseModel):
+ display_name: str
+ value: str
+ documentation: str
+ is_quoted: bool
+ is_buildable: bool
+ size_min: Optional[int] = None
+ size_max: Optional[int] = None
+ size_default: Optional[int] = None
+ size_required: Optional[bool] = None
+ d_min: Optional[int] = None
+ d_max: Optional[int] = None
+ d_default: Optional[int] = None
+ d_required: Optional[bool] = None
+ data_hint: Optional[str] = None
+ type_hint: Optional[str] = None
+
+
class Column(BaseModel):
id: int
name: str
database_id: int
table_id: int
internal_name: str
- auto_generated: bool
column_type: ColumnType
is_public: bool
is_null_allowed: bool
@@ -905,7 +911,6 @@ class Column(BaseModel):
unit: Optional[Unit] = None
enums: Optional[List[str]] = field(default_factory=list)
sets: Optional[List[str]] = field(default_factory=list)
- date_format: Optional[ImageDate] = None
index_length: Optional[int] = None
length: Optional[int] = None
data_length: Optional[int] = None
@@ -921,7 +926,6 @@ class ViewColumn(BaseModel):
name: str
database_id: int
internal_name: str
- auto_generated: bool
column_type: ColumnType
is_public: bool
is_null_allowed: bool
@@ -932,7 +936,6 @@ class ViewColumn(BaseModel):
median: Optional[float] = None
concept: Optional[Concept] = None
unit: Optional[Unit] = None
- date_format: Optional[ImageDate] = None
index_length: Optional[int] = None
length: Optional[int] = None
diff --git a/lib/python/docs/index.rst b/lib/python/docs/index.rst
index 6348ed12d3f7de6514621cf6e9add754204690fc..d535a0b2d359e13ca02bee2ecc12cbfb3d3d0bce 100644
--- a/lib/python/docs/index.rst
+++ b/lib/python/docs/index.rst
@@ -12,7 +12,7 @@ Quickstart
----------
Find numerous quickstart examples on
-the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/api/>`_.
+the `DBRepo website <https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/api/>`_.
AMQP API Client
-----------
diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml
index 8c89061ce82d02b398c4c45f14a5b43efa64ac15..4e6642658bab6423df8db412f529021104e532fd 100644
--- a/lib/python/pyproject.toml
+++ b/lib/python/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "dbrepo"
-version = "1.4.6"
+version = "1.4.7"
description = "DBRepo Python Library"
keywords = [
"DBRepo",
@@ -34,7 +34,7 @@ requires = [
build-backend = "setuptools.build_meta"
[project.urls]
-Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.4/"
-Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.4/python/"
+Homepage = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/"
+Documentation = "https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/python/"
Issues = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/issues"
Source = "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/"
\ No newline at end of file
diff --git a/lib/python/setup.py b/lib/python/setup.py
index b92f73d34f8384aa9bc5bcac4ef5387f9261fa0e..8d686818235b9ca80e1f9f2bcb83765ee8a912d6 100644
--- a/lib/python/setup.py
+++ b/lib/python/setup.py
@@ -2,9 +2,9 @@
from distutils.core import setup
setup(name="dbrepo",
- version="1.4.6",
+ version="1.4.7",
description="A library for communicating with DBRepo",
- url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/",
+ url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/",
author="Martin Weise",
license="Apache-2.0",
author_email="martin.weise@tuwien.ac.at",
diff --git a/lib/python/test.sh b/lib/python/test.sh
index 532d9a58d1a981cbd070f371ebf6dfaea7757c20..cd0129654a468e4aa0d9bec0b1ba3b04f193fd24 100644
--- a/lib/python/test.sh
+++ b/lib/python/test.sh
@@ -1,3 +1,3 @@
#!/bin/bash
source ./lib/python/venv/bin/activate
-cd ./lib/python/ && coverage run -m pytest tests/*.py --junitxml=report.xml && coverage html --omit="test/*" && coverage report --omit="test/*" > ./coverage.txt
\ No newline at end of file
+cd ./lib/python/ && coverage run -m pytest tests/*.py --junitxml=report.xml && coverage html && coverage report > ./coverage.txt
\ No newline at end of file
diff --git a/lib/python/tests/test_unit_container.py b/lib/python/tests/test_unit_container.py
index 8f3297879ada5fcf416cc8afc508d059cf28c95d..0e1d93faa0e9b1c598afcede5ad71c7e08ef9767 100644
--- a/lib/python/tests/test_unit_container.py
+++ b/lib/python/tests/test_unit_container.py
@@ -4,11 +4,9 @@ import requests_mock
import datetime
from dbrepo.RestClient import RestClient
-from dbrepo.api.dto import Container, Image, ContainerBrief, ImageBrief
+from dbrepo.api.dto import Container, Image, ContainerBrief, ImageBrief, DataType
from dbrepo.api.exceptions import ResponseCodeError, NotExistsError
-from dbrepo.api.dto import ImageDate
-
class ContainerUnitTest(unittest.TestCase):
@@ -69,29 +67,10 @@ class ContainerUnitTest(unittest.TestCase):
dialect="org.hibernate.dialect.MariaDBDialect",
driver_class="org.mariadb.jdbc.Driver",
jdbc_method="mariadb",
- date_formats=[
- ImageDate(id=1,
- example="2024-03-26 10:26:00",
- database_format="%Y-%c-%d %H:%i:%S",
- unix_format="yyyy-MM-dd HH:mm:ss",
- has_time=True,
- created_at=datetime.datetime(2024, 3, 26, 10, 26, 0, 0,
- datetime.timezone.utc)),
- ImageDate(id=2,
- example="2024-03-26",
- database_format="%Y-%c-%d",
- unix_format="yyyy-MM-dd",
- has_time=False,
- created_at=datetime.datetime(2024, 3, 26, 0, 0, 0, 0,
- datetime.timezone.utc)),
- ImageDate(id=3,
- example="10:25:01",
- database_format="%Y-%c-%d",
- unix_format="yyyy-MM-dd",
- has_time=False,
- created_at=datetime.datetime(2024, 3, 26, 0, 0, 0, 0,
- datetime.timezone.utc)),
- ]),
+ data_types=[
+ DataType(display_name="SERIAL", value="serial",
+ documentation="https://mariadb.com/kb/en/bigint/",
+ is_quoted=False, is_buildable=True)]),
hash="f829dd8a884182d0da846f365dee1221fd16610a14c81b8f9f295ff162749e50")
# mock
mock.get('/api/container/1', json=exp.model_dump())
diff --git a/lib/python/tests/test_unit_database.py b/lib/python/tests/test_unit_database.py
index dea15691e22a990434772c433683eb6eefc0b253..f72c80c93c0497eb0d2d6f68e2ab8029cccb2aec 100644
--- a/lib/python/tests/test_unit_database.py
+++ b/lib/python/tests/test_unit_database.py
@@ -7,11 +7,9 @@ from pydantic_core import ValidationError
from dbrepo.RestClient import RestClient
from dbrepo.api.dto import Database, User, Container, Image, UserAttributes, DatabaseAccess, AccessType, DatabaseBrief, \
- UserBrief
+ UserBrief, DataType
from dbrepo.api.exceptions import ResponseCodeError, NotExistsError, ForbiddenError, MalformedError, AuthenticationError
-from dbrepo.api.dto import ImageDate
-
class DatabaseUnitTest(unittest.TestCase):
@@ -72,7 +70,11 @@ class DatabaseUnitTest(unittest.TestCase):
dialect='org.hibernate.dialect.MariaDBDialect',
driver_class='org.mariadb.jdbc.Driver',
jdbc_method='mariadb',
- default_port=3306
+ default_port=3306,
+ data_types=[
+ DataType(display_name="SERIAL", value="serial",
+ documentation="https://mariadb.com/kb/en/bigint/",
+ is_quoted=False, is_buildable=True)]
)
)
)
diff --git a/make/build.mk b/make/build.mk
index 861226251224ec7432d77d9bb1b7fa9fb33d0fe9..06e49be88844fac41e68c1c022c5f04877c7fe58 100644
--- a/make/build.mk
+++ b/make/build.mk
@@ -23,11 +23,11 @@ build-lib: ## Build the Python Library.
python3 -m build --sdist ./lib/python
python3 -m build --wheel ./lib/python
cp ./lib/python/dist/dbrepo-${APP_VERSION}.tar.gz ./dbrepo-analyse-service/lib/dbrepo-${APP_VERSION}.tar.gz
- (cd ./dbrepo-analyse-service && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install)
+ (cd ./dbrepo-analyse-service && PIPENV_IGNORE_VIRTUALENVS=1 pipenv lock)
cp ./lib/python/dist/dbrepo-${APP_VERSION}.tar.gz ./dbrepo-search-service/lib/dbrepo-${APP_VERSION}.tar.gz
- (cd ./dbrepo-search-service && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install)
+ (cd ./dbrepo-search-service && PIPENV_IGNORE_VIRTUALENVS=1 pipenv lock)
cp ./lib/python/dist/dbrepo-${APP_VERSION}.tar.gz ./dbrepo-search-service/init/lib/dbrepo-${APP_VERSION}.tar.gz
- (cd ./dbrepo-search-service/init && PIPENV_IGNORE_VIRTUALENVS=1 pipenv install)
+ (cd ./dbrepo-search-service/init && PIPENV_IGNORE_VIRTUALENVS=1 pipenv lock)
.PHONY: build-helm
build-helm: ## Build the DBRepo and DBRepo MariaDB Galera Helm Charts.
diff --git a/make/dev.mk b/make/dev.mk
index b5f7871441aba3bd20806a864d8a8c24d3fb4719..76c05989eb224c0ca0625f4d380f6467b8688f2f 100644
--- a/make/dev.mk
+++ b/make/dev.mk
@@ -11,6 +11,9 @@ stop-dev: ## Stop the development deployment and remove all data.
.PHONY: package-config
package-config: ## Package the config files
+ cp ./dbrepo-auth-service/dbrepo-realm.json ./.docker/config
+ cp ./dbrepo-auth-service/import-realms.sh ./.docker/config
+ cp ./dbrepo-auth-service/master-realm.json ./.docker/config
cp ./dbrepo-metadata-db/1_setup-schema.sql ./.docker/config
cp ./dbrepo-metadata-db/2_setup-data.sql ./.docker/config
cp ./dbrepo-broker-service/rabbitmq.conf ./.docker/config
@@ -19,8 +22,8 @@ package-config: ## Package the config files
cp ./dbrepo-broker-service/advanced.config ./.docker/config
cp ./dbrepo-dashboard-service/grafana.ini ./.docker/config
cp ./dbrepo-dashboard-service/ldap.toml ./.docker/config
- cp ./dbrepo-dashboard-service/dashboards ./.docker/config
- cp ./dbrepo-dashboard-service/provisioning ./.docker/config
+ cp -r ./dbrepo-dashboard-service/dashboards ./.docker/config
+ cp -r ./dbrepo-dashboard-service/provisioning ./.docker/config
cp ./dbrepo-gateway-service/dbrepo.conf ./.docker/config
cp ./dbrepo-metric-db/prometheus.yml ./.docker/config
cp ./dbrepo-storage-service/s3_config.json ./.docker/config
diff --git a/make/rel.mk b/make/rel.mk
index 1f8b5a1cc56c5d6fe7164ebfa4c9007363a4ddbc..042b93d5680b93115202bd207538821c952d8f28 100644
--- a/make/rel.mk
+++ b/make/rel.mk
@@ -4,6 +4,7 @@
tag-images: build-images ## Tag the docker images.
docker tag dbrepo-analyse-service:latest "${REPOSITORY_URL}/analyse-service:${APP_VERSION}"
docker tag dbrepo-auth-service:latest "${REPOSITORY_URL}/auth-service:${APP_VERSION}"
+ docker tag dbrepo-dashboard-service:latest "${REPOSITORY_URL}/dashboard-service:${APP_VERSION}"
docker tag dbrepo-ui:latest "${REPOSITORY_URL}/ui:${APP_VERSION}"
docker tag dbrepo-data-service:latest "${REPOSITORY_URL}/data-service:${APP_VERSION}"
docker tag dbrepo-metadata-service:latest "${REPOSITORY_URL}/metadata-service:${APP_VERSION}"
@@ -17,6 +18,7 @@ tag-images: build-images ## Tag the docker images.
release-images: tag-images ## Release the docker images.
docker push "${REPOSITORY_URL}/analyse-service:${APP_VERSION}"
docker push "${REPOSITORY_URL}/auth-service:${APP_VERSION}"
+ docker push "${REPOSITORY_URL}/dashboard-service:${APP_VERSION}"
docker push "${REPOSITORY_URL}/ui:${APP_VERSION}"
docker push "${REPOSITORY_URL}/data-service:${APP_VERSION}"
docker push "${REPOSITORY_URL}/search-db:${APP_VERSION}"
diff --git a/make/test.mk b/make/test.mk
index c3d2cd8804831f25d7450d0f34914c69c6f53477..36d44d42f56f1592b8cd5364efb3111617e72d30 100644
--- a/make/test.mk
+++ b/make/test.mk
@@ -12,6 +12,14 @@ test-metadata-service: ## Test the Metadata Service.
test-analyse-service: ## Test the Analyse Service.
bash ./dbrepo-analyse-service/test.sh
+.PHONY: test-search-service
+test-search-service: ## Test the Search Service
+ bash ./dbrepo-search-service/test.sh
+
.PHONY: test-lib
test-lib: ## Test the Python Library.
bash ./lib/python/test.sh
+
+.PHONY: test-ui
+test-ui: ## Test the UI.
+ bash ./dbrepo-ui/test/test_heap.sh
diff --git a/mkdocs.yml b/mkdocs.yml
index 19afed5341b4a548af2e2a01a0083e75a0e2e5b9..28f04c8365f0d0a729a0eaf093cf87ebd72ff04a 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
site_name: Database Repository
-site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.6/
+site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.4.7/
repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
repo_name: fda-services
site_author: Research Unit Data Science, Technische Universität Wien
@@ -12,6 +12,7 @@ nav:
- Help with DBRepo: help.md
- Installation: installation.md
- Kubernetes: kubernetes.md
+ - changelog.md
- contributing.md
- Concepts:
- Overview: concepts/index.md
@@ -120,7 +121,7 @@ markdown_extensions:
extra:
homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
version:
- default: 1.4.6
+ default: 1.4.7
provider: mike
social:
- icon: simple/artifacthub
diff --git a/requirements.txt b/requirements.txt
index 6442ea60759d27863ddf1879ab4e6be9151a5901..659eb487ea25bbc048959ecd8755ea65bfa84f06 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,5 @@ requests==2.31.0
pika==1.3.2
pydantic==2.6.4
tuspy==1.0.3
-mike==2.0.0
\ No newline at end of file
+mike==2.0.0
+anybadge==1.14.0
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
index 45670cc4659d29f9badf6419ed16dbe2cceba60f..d034d57b104243b02aa8eb0f050a4497e39f513a 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@
sonar.projectKey=fair-data-austria-db-repository_fda-services_a57fa043-ab99-4cdd-a721-162d9a916d77
sonar.host.url=https://s34.datalab.tuwien.ac.at
# project
-sonar.projectVersion=1.4.4
+sonar.projectVersion=1.4.7
# general
sonar.qualitygate.wait=true
sonar.projectCreation.mainBranchName=master
diff --git a/versions.json b/versions.json
index dc4adc279a0ddb9514930e5087fc04a3cf31b8da..760242683ec68967ba967b659c87d8b970ed1cc9 100644
--- a/versions.json
+++ b/versions.json
@@ -1,8 +1,13 @@
[
+ {
+ "version": "1.4.7",
+ "title": "1.4.7",
+ "aliases": []
+ },
{
"version": "1.4.6",
"title": "1.4.6",
- "aliases": ["latest"]
+ "aliases": []
},
{
"version": "1.4.5",