antonio-amjr
diff --git a/‎.version_information‎
Lines changed: 1 addition & 1 deletion b/‎.version_information‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/api/api_v1/endpoints/projects.py‎
Lines changed: 76 additions & 19 deletions b/‎app/api/api_v1/endpoints/projects.py‎
Lines changed: 76 additions & 19 deletions
diff --git a/‎app/api/api_v1/endpoints/test_run_executions.py‎
Lines changed: 42 additions & 0 deletions b/‎app/api/api_v1/endpoints/test_run_executions.py‎
Lines changed: 42 additions & 0 deletions
diff --git a/‎app/crud/crud_project.py‎
Lines changed: 3 additions & 0 deletions b/‎app/crud/crud_project.py‎
Lines changed: 3 additions & 0 deletions
@@ -1 +1 @@
-v2.12+spring2025
+v2.13+summer2025
@@ -14,12 +14,14 @@
 # limitations under the License.
 #
 import json
+import traceback
 from http import HTTPStatus
 from typing import List, Sequence, Union
 
 from fastapi import APIRouter, Depends, File, HTTPException, Request, UploadFile
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import JSONResponse
+from loguru import logger
 from pydantic import ValidationError, parse_obj_as
 from sqlalchemy.orm import Session
 from sqlalchemy.orm.attributes import flag_modified
@@ -29,11 +31,16 @@
 from app.default_environment_config import default_environment_config
 from app.models.project import Project
 from app.pics.pics_parser import PICSParser
-from app.pics_applicable_test_cases import applicable_test_cases_list
+from app.pics_applicable_test_cases import applicable_test_cases_set
 from app.schemas.pics import PICSError
 from app.schemas.project import Project as Proj
 from app.schemas.test_environment_config import TestEnvironmentConfigError
-from app.utils import TEST_ENVIRONMENT_CONFIG_NAME
+from app.utils import (
+    DMP_TEST_SKIP_CONFIG_NODE,
+    DMP_TEST_SKIP_FILENAME,
+    TEST_ENVIRONMENT_CONFIG_NAME,
+    parse_dmp_file,
+)
 
 router = APIRouter()
 
@@ -226,32 +233,66 @@ def unarchive_project(
     return crud.project.unarchive(db=db, db_obj=__project(db=db, id=id))
 
 
+def __upload_pics(file: UploadFile, db: Session, project: Project) -> Project:
+    cluster = PICSParser.parse(file=file.file)
+
+    project.pics.clusters[cluster.name] = cluster
+
+    return __persist_update_not_mutable(db=db, project=project, field="pics")
+
+
+def __persist_dmp_test_skip(file: UploadFile, db: Session, project: Project) -> Project:
+    try:
+        skip_test_list = parse_dmp_file(xml_file=file.file)
+        project.config[DMP_TEST_SKIP_CONFIG_NODE] = skip_test_list
+
+        return __persist_update_not_mutable(db=db, project=project, field="config")
+    except Exception:
+        logger.error(traceback.format_exc())
+        raise HTTPException(
+            status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+            detail=f"Not able to parse {file.filename} file",
+        )
+
+
 @router.put("/{id}/upload_pics", response_model=schemas.Project)
-def upload_pics(
+async def upload_pics(
     *,
     db: Session = Depends(get_db),
     file: UploadFile = File(...),
     id: int,
 ) -> models.Project:
-    """Upload PICS file of a project based on project identifier.
+    """Upload PICS or dmp-test-skip.xml file of a project based on project identifier.
 
     Args:
         id (int): project id
-        file : the PICS file to upload
+        file : the PICS or dmp-test-skip.xml file to upload
 
     Raises:
         HTTPException: if no project exists for provided project id (or)
                        if the PICS file is invalid
 
     Returns:
-        Project: project record that was updated with the PICS information
+        Project: project record that was updated with the PICS and dmp_test_skip
+        information.
     """
-    cluster = PICSParser.parse(file=file.file)
-
     project = __project(db=db, id=id)
-    project.pics.clusters[cluster.name] = cluster
 
-    return __persist_pics_update(db=db, project=project)
+    try:
+        if file and file.filename and file.filename.startswith(DMP_TEST_SKIP_FILENAME):
+            return __persist_dmp_test_skip(file=file, db=db, project=project)
+        else:
+            return __upload_pics(file=file, db=db, project=project)
+    except PICSError as e:
+        raise HTTPException(
+            status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+            detail=str(e),
+        )
+    except Exception as e:
+        raise HTTPException(
+            status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+            detail=f"Not able to parse {file.filename} file: {str(e)}",
+        )
 
 
 @router.delete("/{id}/pics_cluster_type", response_model=schemas.Project)
@@ -281,7 +322,7 @@ def remove_pics_cluster_type(
     # delete the PICS cluster.
     del project.pics.clusters[cluster_name]
 
-    return __persist_pics_update(db=db, project=project)
+    return __persist_update_not_mutable(db=db, project=project, field="pics")
 
 
 @router.get(
@@ -307,7 +348,19 @@ def applicable_test_cases(
 
     project_data = Proj.from_orm(project)
 
-    return applicable_test_cases_list(pics=project_data.pics)
+    try:
+        return applicable_test_cases_set(
+            pics=project_data.pics,
+            dmp_test_skip=project_data.config.get(  # type: ignore
+                DMP_TEST_SKIP_CONFIG_NODE, []
+            ),
+        )
+    except Exception as e:
+        logger.error(f"Error getting applicable test cases: {str(e)}")
+        raise HTTPException(
+            status_code=HTTPStatus.UNPROCESSABLE_ENTITY,
+            detail=f"Error getting applicable test cases: {str(e)}",
+        )
 
 
 def __project(db: Session, id: int) -> Project:
@@ -319,16 +372,20 @@ def __project(db: Session, id: int) -> Project:
     return project
 
 
-def __persist_pics_update(db: Session, project: Project) -> Project:
-    """Update Project PICS in DB.
+def __persist_update_not_mutable(db: Session, project: Project, field: str) -> Project:
+    """Update Project JSON fields in DB.
 
-    project.pics is stored in a JSON column mapped to PICS schema, this column is
-    not Mutable, so SQLAlchemy doesn't know when PICS changed.
+    Project contains JSON columns (like 'pics' and 'config') mapped to their respective
+    schemas.
+    These columns are not Mutable by default, so SQLAlchemy doesn't track changes
+    to their content.
 
-    Using `flag_modified` marks the property, so SQLAlchemy will update the field on
-    commit.
+    Using `flag_modified` explicitly marks the JSON property as changed, ensuring
+    SQLAlchemy will update the field on commit. This is necessary for any nested
+    modifications to JSON column data.
     """
-    flag_modified(project, "pics")
+
+    flag_modified(project, field)
     db.commit()
     db.refresh(project)
     return project
 
@@ -20,13 +20,15 @@
 from fastapi import APIRouter, BackgroundTasks, Depends, File, HTTPException, UploadFile
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import JSONResponse, StreamingResponse
+from loguru import logger
 from pydantic import ValidationError, parse_obj_as
 from sqlalchemy.orm import Session
 
 from app import crud, log_utils, models, schemas
 from app.api import DEFAULT_404_MESSAGE
 from app.crud.crud_test_run_execution import ImportError
 from app.db.session import get_db
+from app.default_environment_config import default_environment_config
 from app.models.test_run_execution import TestRunExecution
 from app.schemas.test_run_execution import TestRunExecutionUpdate
 from app.test_engine import TEST_ENGINE_ABORTING_TESTING_MESSAGE
@@ -41,6 +43,8 @@
 
 router = APIRouter()
 
+DEFAULT_CLI_PROJECT_NAME = "CLI Project Execution"
+
 
 @router.get("/", response_model=List[schemas.TestRunExecutionWithStats])
 def read_test_run_executions(
@@ -93,6 +97,44 @@ def create_test_run_execution(
     return test_run_execution
 
 
+@router.post("/cli", response_model=schemas.TestRunExecutionWithChildren)
+def create_cli_test_run_execution(
+    *,
+    db: Session = Depends(get_db),
+    test_run_execution_in: schemas.TestRunExecutionCreate,
+    selected_tests: schemas.TestSelection,
+    config: dict = {},
+) -> TestRunExecution:
+    """Creates a new test run execution on CLI request."""
+    if not config:
+        config = default_environment_config.__dict__
+
+    logger.info(f"CLI Config Arguments: {config}")
+
+    # Retrieve the default CLI project
+    cli_project = crud.project.get_by_name(db=db, name=DEFAULT_CLI_PROJECT_NAME)
+
+    # If the default CLI project does not exist, create it
+    if not cli_project:
+        project = schemas.ProjectCreate(name=DEFAULT_CLI_PROJECT_NAME)
+        project.config = config
+        project = crud.project.create(db=db, obj_in=project)
+    else:
+        # Update the default CLI project the cli config argument
+        project = crud.project.update(
+            db=db, db_obj=cli_project, obj_in=schemas.ProjectUpdate(config=config)
+        )
+
+    # TODO: Remove test_run_config completely from the project
+    test_run_execution_in.project_id = project.id
+    test_run_execution_in.certification_mode = False
+
+    test_run_execution = crud.test_run_execution.create(
+        db=db, obj_in=test_run_execution_in, selected_tests=selected_tests
+    )
+    return test_run_execution
+
+
 @router.put("/{id}/rename", response_model=schemas.TestRunExecutionWithChildren)
 def rename_test_run_execution(
     *, db: Session = Depends(get_db), id: int, new_execution_name: str
 
@@ -31,6 +31,9 @@ class CRUDProject(
     CRUDBaseDelete[Project],
     CRUDBaseUpdate[Project, ProjectUpdate],
 ):
+    def get_by_name(self, db: Session, name: str) -> Optional[Project]:
+        return db.query(self.model).filter(self.model.name == name).first()
+
     def get_multi(
         self,
         db: Session,