Prepare v1.0.0-rc.1 release candidate (#66)

Signed-off-by: hoangtungdinh <11166240+hoangtungdinh@users.noreply.github.com> Co-authored-by: hoangtungdinh <11166240+hoangtungdinh@users.noreply.github.com>
asam-ev · Oct 4, 2024 · 3c526eb · 3c526eb
1 parent 465afee
commit 3c526eb
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@
 
 This project implements the [ASAM OpenScenario XML Checker Bundle](checker_bundle_doc.md).
 
+**Disclaimer**: The current version is a release candidate. The first official release is expected to be in November.
+
 - [asam-qc-openscenarioxml](#asam-qc-openscenarioxml)
   - [Installation and usage](#installation-and-usage)
     - [Installation using pip](#installation-using-pip)
@@ -208,3 +210,34 @@ You need to have pre-commit installed and install the hooks:
 ```
 pre-commit install
 ```
+
+**To implement a new checker**
+
+1. Create a new Python module for each checker.
+2. Specify the following global variables for the Python module
+
+| Variable | Meaning |
+| --- | --- |
+| `CHECKER_ID` | The ID of the checker |
+| `CHECKER_DESCRIPTION` | The description of the checker |
+| `CHECKER_PRECONDITIONS` | A set of other checkers in which if any of them raise an issue, the current checker will be skipped |
+| `RULE_UID` | The rule UID of the rule that the checker will check |
+
+3. Implement the checker logic in the following function:
+
+```python
+def check_rule(checker_data: models.CheckerData) -> None:
+    pass
+```
+
+1. Register the checker module in the following function in [main.py](qc_openscenario/main.py).
+
+```python
+def run_checks(config: Configuration, result: Result) -> None:
+    ...
+    # Add the following line to register your checker module
+    execute_checker(your_checker_module, checker_data)
+    ...
+```
+
+All the checkers in this checker bundle are implemented in this way. Take a look at some of them before implementing your first checker.
diff --git a/checker_bundle_doc.md b/checker_bundle_doc.md
@@ -1,12 +1,12 @@
-
 # Checker bundle: xoscBundle
 
-* Build version:  0.1.0
+* Build version:  v1.0.0-rc.1
 * Description:    OpenScenario checker bundle
 
 ## Parameters
 
 * InputFile
+* resultFile
 
 ## Checkers
 

diff --git a/manifest_templates/windows_xosc_manifest.json b/manifest_templates/windows_xosc_manifest.json
@@ -4,7 +4,7 @@
       "name": "xoscBundle",
       "exec_type": "executable",
       "module_type": "checker_bundle",
-      "exec_command": "cd %ASAM_QC_FRAMEWORK_WORKING_DIR% && qc_openscenario -c %ASAM_QC_FRAMEWORK_CONFIG_FILE%"
+      "exec_command": "cd \"%ASAM_QC_FRAMEWORK_WORKING_DIR%\" && qc_openscenario -c \"%ASAM_QC_FRAMEWORK_CONFIG_FILE%\""
     }
   ]
 }
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "asam-qc-openscenarioxml"
-version = "0.1.0"
+version = "1.0.0rc1"
 description = "This project implements the OpenScenario Checker for the ASAM Quality Checker project."
 authors = ["Danilo Romano <danilo@ivex.ai>"]
 license = "MPL-2.0"

diff --git a/qc_openscenario/checks/utils.py b/qc_openscenario/checks/utils.py
@@ -17,7 +17,10 @@ def to_float(s):
         return None
 
 
-def get_root_without_default_namespace(path: str) -> etree._ElementTree:
+def get_root_without_default_namespace(path: str) -> Union[None, etree._ElementTree]:
+    if not os.path.exists(path):
+        return None
+
     with open(path, "rb") as raw_file:
         xml_string = raw_file.read().decode()
 

diff --git a/qc_openscenario/constants.py b/qc_openscenario/constants.py
@@ -1,2 +1,2 @@
 BUNDLE_NAME = "xoscBundle"
-BUNDLE_VERSION = "0.1.0"
+BUNDLE_VERSION = "v1.0.0-rc.1"
diff --git a/qc_openscenario/main.py b/qc_openscenario/main.py
@@ -234,7 +234,6 @@ def main():
         result = Result()
         result.register_checker_bundle(
             name=constants.BUNDLE_NAME,
-            build_date=datetime.today().strftime("%Y-%m-%d"),
             description="OpenScenario checker bundle",
             version=constants.BUNDLE_VERSION,
             summary="",

diff --git a/tests/data/non_existing_road_network_file/non_existing_road_network_file.xosc b/tests/data/non_existing_road_network_file/non_existing_road_network_file.xosc
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<OpenSCENARIO xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Schema/OpenSCENARIO.xsd">
+  <FileHeader author="ASAM e.V." date="2021-02-05T18:50:17" description="Simple Overtaker example" revMajor="1" revMinor="3" />
+  <ParameterDeclarations />
+  <CatalogLocations />
+  <RoadNetwork>
+    <LogicFile filepath="non_existing_file.xodr" />
+  </RoadNetwork>
+  <Entities>
+    <ScenarioObject name="Vehicle 1">
+      <Vehicle name="Vehicle 1" vehicleCategory="car">
+        <BoundingBox>
+          <Center x="1.3" y="0.0" z="0.75" />
+          <Dimensions width="1.8" length="4.5" height="1.5" />
+        </BoundingBox>
+        <Performance maxSpeed="200.0" maxDeceleration="30.0" maxAcceleration="200.0" />
+        <Axles>
+          <FrontAxle positionZ="0.4" trackWidth="1.68" positionX="2.98" maxSteering="0.5235987756" wheelDiameter="0.8" />
+          <RearAxle positionZ="0.4" trackWidth="1.68" positionX="0.0" maxSteering="0.5235987756" wheelDiameter="0.8" />
+        </Axles>
+      </Vehicle>
+    </ScenarioObject>
+  </Entities>
+  <Storyboard>
+    <Init>
+      <Actions>
+        <GlobalAction>
+          <InfrastructureAction>
+            <TrafficSignalAction>
+              <TrafficSignalStateAction name="12345" state="on;off;off" />
+            </TrafficSignalAction>
+          </InfrastructureAction>
+        </GlobalAction>
+        <Private entityRef="Vehicle 1">
+          <PrivateAction>
+            <TeleportAction>
+              <Position>
+                <WorldPosition x="0.0" y="0.0" />
+              </Position>
+            </TeleportAction>
+          </PrivateAction>
+        </Private>
+      </Actions>
+    </Init>
+  </Storyboard>
+</OpenSCENARIO>
diff --git a/tests/test_main_executor.py b/tests/test_main_executor.py
@@ -0,0 +1,21 @@
+import os
+import pytest
+import test_utils
+from qc_baselib import Result, IssueSeverity, StatusType
+from qc_openscenario.checks import basic_checker
+
+
+def test_non_existing_road_network_file(
+    monkeypatch,
+) -> None:
+    base_path = "tests/data/non_existing_road_network_file/"
+    target_file_name = f"non_existing_road_network_file.xosc"
+    target_file_path = os.path.join(base_path, target_file_name)
+
+    test_utils.create_test_config(target_file_path)
+
+    test_utils.launch_main(monkeypatch)
+
+    # Should have no exception
+    assert True
+    test_utils.cleanup_files()