Merge branch 'release/v14'

europeana · Nov 25, 2024 · a4707f7 · a4707f7
2 parents 1d0de97 + 3af1d57
commit a4707f7
Show file tree

Hide file tree

Showing 44 changed files with 643 additions and 105 deletions.
diff --git a/metis-authentication/metis-authentication-common/pom.xml b/metis-authentication/metis-authentication-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-authentication-common</artifactId>
 

diff --git a/metis-authentication/metis-authentication-rest-client/pom.xml b/metis-authentication/metis-authentication-rest-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-authentication-rest-client</artifactId>
 

diff --git a/metis-authentication/metis-authentication-rest/pom.xml b/metis-authentication/metis-authentication-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-authentication-rest</artifactId>
 

diff --git a/metis-authentication/metis-authentication-service/pom.xml b/metis-authentication/metis-authentication-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-authentication</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-authentication-service</artifactId>
 

diff --git a/metis-authentication/pom.xml b/metis-authentication/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-authentication</artifactId>
   <packaging>pom</packaging>

diff --git a/metis-common/metis-common-base/pom.xml b/metis-common/metis-common-base/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.europeana.metis</groupId>
     <artifactId>metis-common</artifactId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common-base</artifactId>
 </project>
diff --git a/metis-common/metis-common-mongo/pom.xml b/metis-common/metis-common-mongo/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common-mongo</artifactId>
 

diff --git a/metis-common/metis-common-network/pom.xml b/metis-common/metis-common-network/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common-network</artifactId>
 

diff --git a/metis-common/metis-common-solr/pom.xml b/metis-common/metis-common-solr/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common-solr</artifactId>
 

diff --git a/metis-common/metis-common-spring-properties/pom.xml b/metis-common/metis-common-spring-properties/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.europeana.metis</groupId>
     <artifactId>metis-common</artifactId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common-spring-properties</artifactId>
 

diff --git a/metis-common/metis-common-utils/pom.xml b/metis-common/metis-common-utils/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-common</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common-utils</artifactId>
 

diff --git a/metis-common/pom.xml b/metis-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-common</artifactId>
   <packaging>pom</packaging>

diff --git a/metis-debias/metis-debias-detect-rest/pom.xml b/metis-debias/metis-debias-detect-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-debias</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-debias-detect-rest</artifactId>
   <dependencies>
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-debias-detect-service</artifactId>
-      <version>13</version>
+      <version>14</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/...c/test/java/eu/europeana/metis/debias/detect/rest/controller/DetectionControllerTest.java b/...c/test/java/eu/europeana/metis/debias/detect/rest/controller/DetectionControllerTest.java
@@ -40,6 +40,8 @@ class DetectionControllerTest {
 
   private static String getDetectionParameterJson() throws JsonProcessingException {
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",
         "a second addict sample title",

diff --git a/...test/java/eu/europeana/metis/debias/detect/rest/controller/DetectionControllerTestIT.java b/...test/java/eu/europeana/metis/debias/detect/rest/controller/DetectionControllerTestIT.java
@@ -72,6 +72,8 @@ void detection_successResponse() throws Exception {
             .withBody(successResponse)
             .withStatus(200)));
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",
         "a second addict sample title",
@@ -102,6 +104,8 @@ void detection_error_null_language_successResponse() throws Exception {
             .withBody(errorResponse)
         ));
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",
         "a second addict sample title",
@@ -133,6 +137,8 @@ void detection_error_null_values_successResponse() throws Exception {
             .withBody(errorResponse)
         ));
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setValues(null);
     biasInputLiterals.setLanguage("en");
     ObjectMapper mapper = new ObjectMapper();
@@ -186,6 +192,8 @@ void detection_error_bad_gateway_successResponse() throws Exception {
             .withStatus(502)
             .withBody(errorAPIResponse)));
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",
         "a second addict sample title",

diff --git a/metis-debias/metis-debias-detect-service/pom.xml b/metis-debias/metis-debias-detect-service/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>metis-debias</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-debias-detect-service</artifactId>
   <dependencies>

diff --git a/...rvice/src/main/java/eu/europeana/metis/debias/detect/model/request/BiasInputLiterals.java b/...rvice/src/main/java/eu/europeana/metis/debias/detect/model/request/BiasInputLiterals.java
@@ -9,6 +9,8 @@
  */
 public class BiasInputLiterals {
 
+  private boolean useNER;
+  private boolean useLLM;
   private String language;
   private List<String> values;
 
@@ -49,4 +51,40 @@ public void setValues(List<String> values) {
       this.values = Collections.unmodifiableList(values);
     }
   }
+
+  /**
+   * Is use ner boolean.
+   *
+   * @return the boolean
+   */
+  public boolean isUseNER() {
+    return useNER;
+  }
+
+  /**
+   * Sets use ner.
+   *
+   * @param useNER the use ner
+   */
+  public void setUseNER(boolean useNER) {
+    this.useNER = useNER;
+  }
+
+  /**
+   * Is use llm boolean.
+   *
+   * @return the boolean
+   */
+  public boolean isUseLLM() {
+    return useLLM;
+  }
+
+  /**
+   * Sets use llm.
+   *
+   * @param useLLM the use llm
+   */
+  public void setUseLLM(boolean useLLM) {
+    this.useLLM = useLLM;
+  }
 }
diff --git a/...etect-service/src/test/java/eu/europeana/metis/debias/detect/client/DeBiasClientTest.java b/...etect-service/src/test/java/eu/europeana/metis/debias/detect/client/DeBiasClientTest.java
@@ -77,6 +77,8 @@ void detect_successResponse() throws IOException {
             .withBody(successResponse)
             .withStatus(200)));
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setLanguage("en");
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",
@@ -103,6 +105,8 @@ void detect_errorResponse() throws IOException {
             .withBody(errorResponse)
             .withStatus(422)));
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setLanguage(null);
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",
@@ -120,6 +124,8 @@ void detect_errorResponse() throws IOException {
   void detect_noService_errorResponse() {
 
     BiasInputLiterals biasInputLiterals = new BiasInputLiterals();
+    biasInputLiterals.setUseLLM(true);
+    biasInputLiterals.setUseNER(true);
     biasInputLiterals.setLanguage("en");
     biasInputLiterals.setValues(List.of(
         "sample title of aboriginal and addict",

diff --git a/metis-debias/pom.xml b/metis-debias/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
     <artifactId>metis-framework</artifactId>
   </parent>
 

diff --git a/metis-dereference/metis-dereference-common/pom.xml b/metis-dereference/metis-dereference-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-dereference-common</artifactId>
   <dependencies>

diff --git a/metis-dereference/metis-dereference-import/pom.xml b/metis-dereference/metis-dereference-import/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>metis-dereference-import</artifactId>

diff --git a/metis-dereference/metis-dereference-rest/pom.xml b/metis-dereference/metis-dereference-rest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-dereference-rest</artifactId>
   <dependencies>

diff --git a/metis-dereference/metis-dereference-service/pom.xml b/metis-dereference/metis-dereference-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-dereference</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-dereference-service</artifactId>
   <dependencies>

diff --git a/metis-dereference/pom.xml b/metis-dereference/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
     <artifactId>metis-framework</artifactId>
   </parent>
 

diff --git a/metis-enrichment/metis-enrichment-client/pom.xml b/metis-enrichment/metis-enrichment-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-enrichment</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-enrichment-client</artifactId>
   <packaging>jar</packaging>

diff --git a/metis-enrichment/metis-enrichment-common/pom.xml b/metis-enrichment/metis-enrichment-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-enrichment</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-enrichment-common</artifactId>
 

diff --git a/metis-enrichment/pom.xml b/metis-enrichment/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-enrichment</artifactId>
   <packaging>pom</packaging>

diff --git a/metis-harvesting/pom.xml b/metis-harvesting/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>metis-framework</artifactId>
         <groupId>eu.europeana.metis</groupId>
-        <version>13</version>
+        <version>14</version>
     </parent>
     <artifactId>metis-harvesting</artifactId>
 

diff --git a/metis-indexing/pom.xml b/metis-indexing/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>metis-framework</artifactId>
     <groupId>eu.europeana.metis</groupId>
-    <version>13</version>
+    <version>14</version>
   </parent>
   <artifactId>metis-indexing</artifactId>
   <properties>