Enhanced wikibase validation

Author: ulitol97

build.sbt

@@ -183,12 +183,6 @@ lazy val resolverSettings = Seq(
     Resolver.sonatypeRepo("snapshots")
   )
 )
-// "sbt-github-actions" plugin settings
-val JavaCIVersion  = "adopt@1.11"
-val ScalaCIVersion = "2.13.6"
-ThisBuild / githubWorkflowJavaVersions := Seq(JavaCIVersion)
-ThisBuild / githubWorkflowScalaVersions := Seq(ScalaCIVersion)
-
 // Shared settings for the BuildInfo Plugin
 // See https://github.com/sbt/sbt-buildinfo
 lazy val buildInfoSettings = Seq(
@@ -275,6 +269,8 @@ lazy val server = project
       mongodb
     )
   )
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaCIVersion)
+ThisBuild / githubWorkflowScalaVersions := Seq(ScalaCIVersion)
 /* ------------------------------------------------------------------------- */
 // Documentation project, for MDoc + Docusaurus documentation
 lazy val docs = project
@@ -299,8 +295,8 @@ lazy val mongodbVersion      = "4.4.0"
 lazy val any23Version        = "2.4"
 lazy val rdf4jVersion        = "3.7.4"
 lazy val graphvizJavaVersion = "0.18.1"
-lazy val logbackVersion      = "1.2.10"
-lazy val loggingVersion      = "3.9.4"
+lazy val logbackVersion      = "1.2.8"
+lazy val scalaLoggingVersion = "3.9.4"
 lazy val groovyVersion       = "3.0.8"
 lazy val munitVersion        = "0.7.27"
 lazy val munitEffectVersion  = "1.0.7"
@@ -333,7 +329,7 @@ lazy val graphvizJava  = "guru.nidi"         % "graphviz-java" % graphvizJavaVer
 lazy val plantuml       = "net.sourceforge.plantuml" % "plantuml"        % plantumlVersion
 lazy val logbackClassic = "ch.qos.logback"           % "logback-classic" % logbackVersion
 lazy val scalaLogging =
-  "com.typesafe.scala-logging" %% "scala-logging" % loggingVersion
+  "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion
 lazy val groovy = "org.codehaus.groovy" % "groovy" % groovyVersion
 lazy val munit  = "org.scalameta"      %% "munit"  % munitVersion
 lazy val munitEffect =
@@ -344,3 +340,6 @@ lazy val shexs      = "es.weso" %% "shexs"      % shexsVersion
 lazy val shaclex    = "es.weso" %% "shaclex"    % shaclexVersion
 lazy val umlShaclex = "es.weso" %% "umlshaclex" % umlShaclexVersion
 lazy val wesoUtils  = "es.weso" %% "utilstest"  % wesoUtilsVersion
+// "sbt-github-actions" plugin settings
+val JavaCIVersion  = "adopt@1.11"
+val ScalaCIVersion = "2.13.6"

modules/server/src/main/scala/es/weso/rdfshape/server/api/routes/data/service/DataService.scala

@@ -192,7 +192,6 @@ class DataService(client: Client[IO])
                         case errorMessage: String =>
                           errorResponseJson(errorMessage, InternalServerError)
                         case _ => // null exception message, return a general error message
-                          err.printStackTrace()
                           errorResponseJson(
                             DataServiceError.couldNotParseData,
                             InternalServerError

modules/server/src/main/scala/es/weso/rdfshape/server/api/routes/schema/logic/operations/SchemaValidate.scala

@@ -59,8 +59,8 @@ private[api] object SchemaValidate extends LazyLogging {
           for {
             innerSchema <- schema.getSchema
             result = innerSchema.flatMap(s => {
-              trigger.getValidationTrigger.map(vt => {
-                s.validate(rdf, vt, builder)
+              trigger.getValidationTrigger.map(trigger => {
+                s.validate(rdf, trigger, builder)
               })
             })
             validation <- result match {

modules/server/src/main/scala/es/weso/rdfshape/server/api/routes/shapemap/logic/ShapeMap.scala

@@ -58,7 +58,6 @@ sealed case class ShapeMap private (
       case None | Some("") =>
         Left("Cannot extract the ShapeMap from an empty instance")
       case Some(shapeMapStr) =>
-        println(nodesPrefixMap.pm)
         ShapeMapW
           .fromString(
             shapeMapStr,

modules/server/src/main/scala/es/weso/rdfshape/server/api/routes/wikibase/logic/operations/WikibaseOperationDetails.scala

@@ -23,6 +23,7 @@ import org.http4s.implicits.http4sLiteralsSyntax
   *                        (empty list returns all available languages).
   *                        Each language must be represented by its language code.
   * @param limit           Maximum amount of results queried in search operations
+  *                        In SPARQL queries, the limit is embedded in the query text
   * @param continue        Offset where to continue a search operation
   * @param format          Format in which results are requested
   * @see [[https://www.mediawiki.org/wiki/Wikibase/API#API_documentation_and_Wikibase_modules]]

modules/server/src/main/scala/es/weso/rdfshape/server/api/routes/wikibase/logic/operations/schema/WikibaseSchemaValidate.scala

@@ -1,12 +1,14 @@
 package es.weso.rdfshape.server.api.routes.wikibase.logic.operations.schema
 
 import cats.effect.IO
+import cats.implicits.catsSyntaxEitherId
 import com.typesafe.scalalogging.LazyLogging
 import es.weso.rdf.NONE
 import es.weso.rdf.nodes.IRI
 import es.weso.rdfshape.server.api.format.dataFormats.{Compact, Turtle}
 import es.weso.rdfshape.server.api.routes.data.logic.DataSource
 import es.weso.rdfshape.server.api.routes.data.logic.types.DataSingle
+import es.weso.rdfshape.server.api.routes.data.logic.types.merged.DataCompound
 import es.weso.rdfshape.server.api.routes.schema.logic.operations.SchemaValidate
 import es.weso.rdfshape.server.api.routes.schema.logic.trigger.TriggerShapeMap
 import es.weso.rdfshape.server.api.routes.schema.logic.types.Schema
@@ -53,25 +55,37 @@ private[wikibase] case class WikibaseSchemaValidate(
 
   override lazy val targetUri: Uri = uri"" // unused
 
+  private val entitiesSeparator = '|'
+
   override def performOperation: IO[WikibaseOperationResult] = {
-    val entityUri = operationData.payload
+
+    val entityUris = operationData.payload.split(entitiesSeparator)
 
     // Raise error if target is not Wikidata
     if(targetWikibase != Wikidata)
       IO.raiseError(WikibaseServiceException(wikidataOnlyMessage))
     else {
       val tryResult = for {
-        // Get the Wikidata item info from the URI submitted as payload
-        wdEntity <- Try {
-          WikidataEntity(Uri.unsafeFromString(entityUri))
+        // Get the Wikidata items info from the URI submitted as payload
+        wdEntities <- Try {
+          entityUris.map(it => WikidataEntity(Uri.unsafeFromString(it)))
         }
         // Create the data to be validated, using Wikidata to get the URL
         // to the Turtle contents
-        inputData = DataSingle(
-          dataPre = Some(wdEntity.contentUri.renderString),
-          dataFormat = Turtle,
-          inference = NONE,
-          dataSource = DataSource.URL
+        /* Data will be a compound of several simple data fetched from each
+         * entity */
+
+        inputData = DataCompound(
+          wdEntities
+            .map(entity =>
+              DataSingle(
+                dataPre = Some(entity.contentUri.renderString),
+                dataFormat = Turtle,
+                inference = NONE,
+                dataSource = DataSource.URL
+              )
+            )
+            .toList
         )
 
         /* Get the schema model needed for validation: already passed to the
@@ -80,9 +94,12 @@ private[wikibase] case class WikibaseSchemaValidate(
         // Perform validation
         eitherValidationResults = for {
           // Create your trigger mode: ShEx with basic Shapemap
-          shapeMapModel <- ShapeMapW.empty.add(
-            IRI(wdEntity.entityUri.renderString),
-            Start
+          // For each entity, add a start point
+          shapeMapModel <- wdEntities.foldLeft(ShapeMapW.empty.asRight[String])(
+            (sm, entity) => {
+              val entityUri = IRI(entity.entityUri.renderString)
+              sm.flatMap(_.add(entityUri, Start))
+            }
           )
           shapeMapFinalModel <- shapeMapModel.serialize(Compact.name)
           trigger = TriggerShapeMap(
@@ -122,7 +139,7 @@ private[wikibase] case class WikibaseSchemaValidate(
               wikibase = targetWikibase,
               result = Json.fromFields(
                 List(
-                  ("entity", Json.fromString(entityUri)),
+                  ("entity", entityUris.asJson),
                   ("result", validationResults.asJson)
                 )
               )