diff --git a/.github/workflows/nucliadb.yml b/.github/workflows/nucliadb.yml index 447e1d20b9..292ab60042 100644 --- a/.github/workflows/nucliadb.yml +++ b/.github/workflows/nucliadb.yml @@ -51,11 +51,11 @@ jobs: filters: | workflows: - 'nucliadb_node/**' - - "nucliadb_sidecar/**" - - 'nucliadb_texts2/**' - - 'nucliadb_paragraphs3/**' - - 'nucliadb_vectors/**' - - 'nucliadb_relations2/**' + - 'nucliadb_paragraphs[0-9]*/**' + - 'nucliadb_relations[0-9]*/**' + - 'nucliadb_sidecar/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' - name: Calc git info id: git diff --git a/.github/workflows/nucliadb_dataset.yml b/.github/workflows/nucliadb_dataset.yml index d2a75af041..5999399adf 100644 --- a/.github/workflows/nucliadb_dataset.yml +++ b/.github/workflows/nucliadb_dataset.yml @@ -42,12 +42,12 @@ jobs: nucliadb_node_modified: - 'nucliadb_core/**' - 'nucliadb_node/src/**' - - 'nucliadb_paragraphs3/**' + - 'nucliadb_paragraphs[0-9]*/**' - 'nucliadb_procs/**' - - 'nucliadb_relations2/**' + - 'nucliadb_relations[0-9]*/**' - 'nucliadb_telemetry/**' - - 'nucliadb_texts2/**' - - 'nucliadb_vectors/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' nucliadb_modified: - 'nucliadb/**' diff --git a/.github/workflows/nucliadb_node.yml b/.github/workflows/nucliadb_node.yml index de21b8a9f5..fa8d3d1b88 100644 --- a/.github/workflows/nucliadb_node.yml +++ b/.github/workflows/nucliadb_node.yml @@ -11,18 +11,14 @@ on: - "Dockerfile.node_sidecar" - "Cargo.lock" - "Cargo.toml" - - "nucliadb_paragraphs/**" - - "nucliadb_texts/**" - - "nucliadb_texts2/**" - "nucliadb_core/**" - - "nucliadb_telemetry/**" - "nucliadb_node/**" + - "nucliadb_paragraphs[0-9]*/**" + - "nucliadb_relations[0-9]*/**" - "nucliadb_sidecar/**" - - "nucliadb_vectors/**" - - "nucliadb_paragraphs/**" - - "nucliadb_core/**" - - "nucliadb_relations/**" - - 'nucliadb_relations2/**' + - "nucliadb_telemetry/**" + - "nucliadb_texts[0-9]*/**" + - "nucliadb_vectors[0-9]*/**" push: branches: - main @@ -34,19 +30,17 @@ on: - "Dockerfile.basenode" - "Cargo.lock" - "Cargo.toml" - - "nucliadb_paragraphs/**" - - "nucliadb_texts/**" - - "nucliadb_texts2/**" - "nucliadb_core/**" - - "nucliadb_telemetry/**" - "nucliadb_node/**" - - "nucliadb_sidecar/**" - "nucliadb_node_binding/**" - - "nucliadb_vectors/**" - - "nucliadb_relations/**" - - 'nucliadb_relations2/**' + - "nucliadb_paragraphs[0-9]*/**" + - "nucliadb_relations[0-9]*/**" + - "nucliadb_sidecar/**" + - "nucliadb_telemetry/**" - "nucliadb_telemetry/src/**" + - "nucliadb_texts[0-9]*/**" - "nucliadb_utils/**" + - "nucliadb_vectors[0-9]*/**" concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -190,15 +184,12 @@ jobs: node_modified: - 'nucliadb_core/**' - 'nucliadb_node/src/**' - - 'nucliadb_paragraphs/**' - - 'nucliadb_paragraphs/**' + - 'nucliadb_paragraphs[0-9]*/**' - 'nucliadb_procs/**' - - 'nucliadb_relations/**' - - 'nucliadb_relations2/**' + - 'nucliadb_relations[0-9]*/**' - 'nucliadb_telemetry/**' - - 'nucliadb_texts/**' - - 'nucliadb_texts2/**' - - 'nucliadb_vectors/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' - name: Build local Node for testing if: steps.filter.outputs.node_modified == 'true' diff --git a/.github/workflows/nucliadb_node_release.yml b/.github/workflows/nucliadb_node_release.yml index 9c4ef1bfae..936222e8e1 100644 --- a/.github/workflows/nucliadb_node_release.yml +++ b/.github/workflows/nucliadb_node_release.yml @@ -9,17 +9,13 @@ on: - "nucliadb_node_binding/**" - "Cargo.lock" - "Cargo.toml" - - "nucliadb_paragraphs/**" - - "nucliadb_texts/**" - - "nucliadb_texts2/**" - "nucliadb_core/**" - "nucliadb_node/src/**" - "nucliadb_node/Cargo.toml" - - "nucliadb_vectors/**" - - "nucliadb_paragraphs/**" - - "nucliadb_core/**" - - "nucliadb_relations/**" - - "nucliadb_relations2/**" + - "nucliadb_paragraphs[0-9]*/**" + - "nucliadb_relations[0-9]*/**" + - "nucliadb_texts[0-9]*/**" + - "nucliadb_vectors[0-9]*/**" push: branches: - main @@ -28,17 +24,13 @@ on: - "nucliadb_node_binding/**" - "Cargo.lock" - "Cargo.toml" - - "nucliadb_paragraphs/**" - - "nucliadb_texts/**" - - "nucliadb_texts2/**" - "nucliadb_core/**" - - "nucliadb_node/src/**" - "nucliadb_node/Cargo.toml" - - "nucliadb_vectors/**" - - "nucliadb_paragraphs/**" - - "nucliadb_core/**" - - "nucliadb_relations/**" - - "nucliadb_relations2/**" + - "nucliadb_node/src/**" + - "nucliadb_paragraphs[0-9]*/**" + - "nucliadb_relations[0-9]*/**" + - "nucliadb_texts[0-9]*/**" + - "nucliadb_vectors[0-9]*/**" concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/nucliadb_sdk.yml b/.github/workflows/nucliadb_sdk.yml index 5baa85b67f..010c83bf00 100644 --- a/.github/workflows/nucliadb_sdk.yml +++ b/.github/workflows/nucliadb_sdk.yml @@ -44,15 +44,12 @@ jobs: nucliadb_node_modified: - 'nucliadb_core/**' - 'nucliadb_node/src/**' - - 'nucliadb_paragraphs/**' - - 'nucliadb_paragraphs/**' + - 'nucliadb_paragraphs[0-9]*/**' - 'nucliadb_procs/**' - - 'nucliadb_relations/**' - - 'nucliadb_relations2/**' + - 'nucliadb_relations[0-9]*/**' - 'nucliadb_telemetry/**' - - 'nucliadb_texts/**' - - 'nucliadb_texts2/**' - - 'nucliadb_vectors/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' - name: Build local NucliaDB for testing if: steps.filter.outputs.nucliadb_modified == 'true' && steps.filter.outputs.nucliadb_node_modified == 'false' diff --git a/.github/workflows/nucliadb_search.yml b/.github/workflows/nucliadb_search.yml index e82576f630..48f8e7a0ab 100644 --- a/.github/workflows/nucliadb_search.yml +++ b/.github/workflows/nucliadb_search.yml @@ -7,20 +7,21 @@ on: paths: - '.github/workflows/nucliadb_search.yml' - 'charts/nucliadb_search/**' - - 'nucliadb_utils/**' + - 'nucliadb/src/nucliadb/common/**' - 'nucliadb/src/nucliadb/ingest/**' - 'nucliadb/src/nucliadb/search/**' - - 'nucliadb/src/nucliadb/common/**' + - 'nucliadb_core/**' - 'nucliadb_models/**' - - 'nucliadb_telemetry/**' - - 'nucliadb_protos/python/**' - 'nucliadb_node/**' - - "nucliadb_sidecar/**" - - 'nucliadb_vectors/**' - - 'nucliadb_texts2/**' - - 'nucliadb_paragraphs3/**' - - 'nucliadb_core/**' - - 'nucliadb_relations2/**' + - 'nucliadb_paragraphs[0-9]*/**' + - 'nucliadb_protos/python/**' + - 'nucliadb_relations[0-9]*/**' + - 'nucliadb_sidecar/**' + - 'nucliadb_telemetry/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_utils/**' + - 'nucliadb_vectors[0-9]*/**' + push: branches: - main @@ -106,12 +107,12 @@ jobs: node_modified: - 'nucliadb_core/**' - 'nucliadb_node/src/**' - - 'nucliadb_paragraphs3/**' + - 'nucliadb_paragraphs[0-9]*/**' - 'nucliadb_procs/**' - - 'nucliadb_relations2/**' + - 'nucliadb_relations[0-9]*/**' - 'nucliadb_telemetry/**' - - 'nucliadb_texts2/**' - - 'nucliadb_vectors/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' sidecar_modified: - 'nucliadb_sidecar/**' diff --git a/.github/workflows/nucliadb_standalone.yml b/.github/workflows/nucliadb_standalone.yml index 99bc2cb762..61b37337b6 100644 --- a/.github/workflows/nucliadb_standalone.yml +++ b/.github/workflows/nucliadb_standalone.yml @@ -21,13 +21,11 @@ on: - "nucliadb_protos/**" - "nucliadb_node/**" - "nucliadb_sidecar/**" - - "nucliadb_vectors/**" - - "nucliadb_texts/**" - - "nucliadb_texts2/**" - - "nucliadb_paragraphs/**" - "nucliadb_core/**" - - "nucliadb_relations/**" - - 'nucliadb_relations2/**' + - "nucliadb_paragraphs[0-9]*/**" + - "nucliadb_relations[0-9]*/**" + - "nucliadb_texts[0-9]*/**" + - "nucliadb_vectors[0-9]*/**" push: branches: - main @@ -91,12 +89,12 @@ jobs: node_modified: - 'nucliadb_core/**' - 'nucliadb_node/src/**' - - 'nucliadb_paragraphs3/**' + - 'nucliadb_paragraphs[0-9]*/**' - 'nucliadb_procs/**' - - 'nucliadb_relations2/**' + - 'nucliadb_relations[0-9]*/**' - 'nucliadb_telemetry/**' - - 'nucliadb_texts2/**' - - 'nucliadb_vectors/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' sidecar_modified: - 'nucliadb_sidecar/**' diff --git a/.github/workflows/nucliadb_train.yml b/.github/workflows/nucliadb_train.yml index a393bbbcd3..dfe3b4eeee 100644 --- a/.github/workflows/nucliadb_train.yml +++ b/.github/workflows/nucliadb_train.yml @@ -45,11 +45,11 @@ jobs: filters: | workflows: - 'nucliadb_node/**' - - "nucliadb_sidecar/**" - - 'nucliadb_texts2/**' - - 'nucliadb_paragraphs3/**' - - 'nucliadb_vectors/**' - - 'nucliadb_relations2/**' + - 'nucliadb_paragraphs[0-9]*/**' + - 'nucliadb_relations[0-9]*/**' + - 'nucliadb_sidecar/**' + - 'nucliadb_texts[0-9]*/**' + - 'nucliadb_vectors[0-9]*/**' - name: Calc git info id: git diff --git a/.licenserc.yaml b/.licenserc.yaml index e07d2c2b5e..9849875215 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -46,20 +46,20 @@ header: paths: - - "nucliadb_node/**" - - "nucliadb_utils/**" - - "nucliadb_telemetry/**" - - "nucliadb_paragraphs/**" - - "nucliadb_vectors/**" - - "nucliadb_relations/**" - - "nucliadb_core/**" - - "nucliadb_sdk/**" - "nucliadb/**" - - "nucliadb_texts/**" + - "nucliadb_core/**" - "nucliadb_dataset/**" + - "nucliadb_node/**" + - "nucliadb_paragraphs[0-9]*/**" + - "nucliadb_performance/**" - "nucliadb_protos/build.rs" - "nucliadb_protos/src/lib.rs" - - "nucliadb_performance/**" + - "nucliadb_relations[0-9]*/**" + - "nucliadb_sdk/**" + - "nucliadb_telemetry/**" + - "nucliadb_texts[0-9]*/**" + - "nucliadb_utils/**" + - "nucliadb_vectors[0-9]*/**" paths-ignore: - "**/Cargo.toml" diff --git a/nucliadb_paragraphs3/src/set_query.rs b/nucliadb_paragraphs3/src/set_query.rs index e57292977a..38796e745c 100644 --- a/nucliadb_paragraphs3/src/set_query.rs +++ b/nucliadb_paragraphs3/src/set_query.rs @@ -1,3 +1,23 @@ +// Copyright (C) 2021 Bosutech XXI S.L. +// +// nucliadb is offered under the AGPL v3.0 and as commercial software. +// For commercial licensing, contact us at info@nuclia.com. +// +// AGPL: +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +// + use std::collections::HashSet; use std::sync::Arc; diff --git a/nucliadb_paragraphs3/stop_words/extract.py b/nucliadb_paragraphs3/stop_words/extract.py index 32a4d1a694..fb93b562c6 100644 --- a/nucliadb_paragraphs3/stop_words/extract.py +++ b/nucliadb_paragraphs3/stop_words/extract.py @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # import os import json