Improve A1.3

VERSION

@@ -1 +1 @@
-2.1.3
+2.2.3

app/services/a_indicators.py

@@ -92,7 +92,20 @@ def compA1_3(instance) -> Tuple[bool, str]:
         logs.append('This is a web-based software. This indicator is not applicable.')
         return False, logs
 
-    # 1. Check if there is a valid document similar to installation instructions
+
+    # 1. Check if @inst_instr is True
+    logs.append("⚙️ Checking if installation instructions are provided")
+    inst_instr = instance.inst_instr
+    logs.append(f"🔍 Received inst_instr: {inst_instr}")
+    if inst_instr is True:
+        logs.append("✅ Installation instructions are provided.")
+        logs.append("Result: PASSED")
+        return True, logs
+    else:
+        logs.append("❌ Installation instructions are not provided. Checking documentation ...")
+
+
+    # 2. Check if there is a valid document similar to installation instructions
     # Check if the url is operational
     logs.append("⚙️ Checking if there are installation instructions and whether they are operational")
     documentation = instance.documentation
@@ -119,7 +132,7 @@ def compA1_3(instance) -> Tuple[bool, str]:
     else:
         logs.append("❌ No installation instructions found in documentation. Checking sources ...")
 
-    #2. Check if any of the sources provide installation instructions
+    # 3. Check if any of the sources provide installation instructions
     logs.append("⚙️ Checking if any of the sources provide installation instructions")
     source = instance.source
     logs = log_sources(instance, logs)

app/tests/test_compA1_3.py

@@ -5,12 +5,13 @@
 from app.models.instance import Instance, Documentation
 
 # Define test instances using Pydantic models
-def create_instance(type, download, source, documentation):
+def create_instance(type, download, source, documentation, inst_instr=False):
     return Instance(
         type=type,
         download=[HttpUrl(url) for url in download] if download else [],
         source=source,
-        documentation=[Documentation(type=doc['type'], url=HttpUrl(doc['url'])) for doc in documentation] if documentation else []
+        documentation=[Documentation(type=doc['type'], url=HttpUrl(doc['url'])) for doc in documentation] if documentation else [],
+        inst_instr=inst_instr
     )
 
 def test_compA1_3_with_no_web_and_download():
@@ -85,6 +86,28 @@ def test_compA1_3_with_web_and_valid_source():
     result, logs = compA1_3(instance)
     assert result == False
 
+def test_compA1_3_with_web_and_true_inst_intr():
+    instance = create_instance(
+        type='web', 
+        download=[], 
+        source=["bioconda"], 
+        documentation=[],
+        inst_instr=True
+    )
+    result, logs = compA1_3(instance)
+    assert result == False
+
+def test_compA1_3_with_cmd_and_true_inst_intr():
+    instance = create_instance(
+        type='cmd', 
+        download=[], 
+        source=["bioconda"], 
+        documentation=[],
+        inst_instr=True
+    )
+    result, logs = compA1_3(instance)
+    assert result == True
+
 def test_compA1_3_with_web_and_installation_instructions():
     instance = create_instance(
         type='web',