Feature/ophidia

.github/CODEOWNERS

@@ -1 +1 @@
-* @orviz @davrodgon @mariojmdavid @dianamariand92 @samuelbernardolip
+# * @orviz @davrodgon @mariojmdavid @dianamariand92 @samuelbernardolip

QC.FAIR/Dockerfile

@@ -4,7 +4,7 @@ LABEL authors="Pablo Orviz <orviz@ifca.unican.es>, Fernando Aguilar <aguilarf@if
 
 # Deploy FAIR-eva API
 WORKDIR /FAIR_eva
-RUN git clone https://github.com/EOSC-synergy/FAIR_eva.git -b 2.0.0 .
+RUN git clone https://github.com/EOSC-synergy/FAIR_eva.git -b 3.0.3 .
 RUN pip3 install -r requirements.txt
 
 # FAIR-eva client

QC.Sty/pyophidia/Dockerfile

@@ -1,4 +1,7 @@
-FROM python:3-slim
+FROM python:3.10
+
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
 
 COPY find_oph_workflows.py /usr/bin
 

QC.Sty/pyophidia/find_oph_workflows.py

@@ -1,9 +1,9 @@
-from PyOphidia import client
-import os
+#!/usr/bin/env python
+from pyophidia import client
 import json
 import argparse
 import urllib
-import requests
+import os
 
 
 def find(pattern, path):
@@ -30,27 +30,41 @@ def evaluate_workflow_path(candidates):
     passed = False
     passed_list = []
     failed_list = []
+    reasons_list = []
     results = {
         "result": passed,
         "passed_list": passed_list,
         "failed_list": failed_list,
+        "reasons_list": reasons_list,
     }
     for jsons in candidates:
-        f = open(str(jsons), "r")
+        try:
+            f = open(str(jsons), "r")
+            data = json.load(f)
+
+            res, msg = ophclient.wisvalid2(data)
+        except:
+            try:
+
+                data = dict(f.read())
 
-        data = json.load(f)
-        res, msg = ophclient.wisvalid(data)
+                res, msg = ophclient.wisvalid2(data)
+            except:
 
+                res = False
+                msg = "Not readable workflow"
         if res:
             passed = True
             passed_list.append(jsons)
         else:
             failed_list.append(jsons)
+            reasons_list.append(msg)
 
         results = {
             "result": passed,
             "passed_list": passed_list,
             "failed_list": failed_list,
+            "reasons_list": reasons_list,
         }
     return results
 

QC.Sty/pyophidia/requirements.txt

@@ -0,0 +1,2 @@
+argparse
+PyOphidia @git+https://github.com/OphidiaBigData/PyOphidia@release

QC.Sty/staticcheck/Dockerfile

@@ -1,2 +1,2 @@
 FROM golang
-RUN go install honnef.co/go/tools/cmd/staticcheck@2022.1.3
+RUN go install honnef.co/go/tools/cmd/staticcheck@2024.1.1

tooling.json

@@ -26,8 +26,8 @@
 
         "Workflow_manager": {
             "PyOphidia": {
-                "docs": "https://pyophidia.readthedocs.io/en/latest/"
-            ,
+                "docs": "https://pyophidia.readthedocs.io/en/latest/",
+                "executable" : "find_oph_workflows.py",
                 "docker": {
                         "dockerfile": "QC.Sty/Ophidia/Dockerfile",
                         "reviewed": "2024-10-02"
@@ -414,9 +414,9 @@
                 "version": "latest",
                 "docs": "QC.FAIR/fair-eva.py",
                 "docker": {
-                    "image": "eoscsynergy/sqaaas-fair_eva:2.0.0",
+                    "image": "eoscsynergy/sqaaas-fair_eva:3.0.3",
                     "oneshot": false,
-                    "reviewed": "2022-04-05"
+                    "reviewed": "2024-12-10"
                 },
                 "args": [
                     {