upgrade to autosar-data-abstraction-0.6

Author: DanielT

Cargo.lock

@@ -14,5 +14,5 @@ crate-type = ["cdylib"]
 [dependencies]
 autosar-data = {version = "0.20"}
 autosar-data-specification = {version = "0.20"}
-autosar-data-abstraction = {version = "0.5"}
+autosar-data-abstraction = {version = "0.6"}
 pyo3 = "0.25"

Cargo.toml

@@ -791,7 +791,7 @@ class ParameterDataPrototype:
     # """data type of the parameter"""
     element: Element
     name: str
-    init_value: ValueSpecification
+    init_value: Optional[ValueSpecification]
 
 @final
 class ParameterInterface:

python/autosar_data/abstraction/software_component/__init__.pyi

@@ -83,8 +83,10 @@ impl ISignal {
 
     /// set the init value for this signal
     #[setter]
-    fn set_init_value(&self, init_value: &Bound<'_, PyAny>) -> PyResult<()> {
-        let init_value = pyobject_to_value_specification(init_value)?;
+    fn set_init_value(&self, init_value: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
+        let init_value = init_value
+            .map(|val| pyobject_to_value_specification(val))
+            .transpose()?;
         self.0
             .set_init_value(init_value)
             .map_err(abstraction_err_to_pyerr)

src/abstraction/communication/signal/mod.rs

@@ -288,8 +288,10 @@ impl ParameterDataPrototype {
 
     /// set the init value for the data element
     #[setter]
-    fn set_init_value(&self, init_value: &Bound<'_, PyAny>) -> PyResult<()> {
-        let init_value = pyobject_to_value_specification(init_value)?;
+    fn set_init_value(&self, init_value: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
+        let init_value = init_value
+            .map(|val| pyobject_to_value_specification(val))
+            .transpose()?;
         self.0
             .set_init_value(init_value)
             .map_err(abstraction_err_to_pyerr)

src/abstraction/software_component/interface/mod.rs

@@ -166,8 +166,10 @@ impl VariableDataPrototype {
 
     /// set the init value for the data element
     #[setter]
-    fn set_init_value(&self, init_value: &Bound<'_, PyAny>) -> PyResult<()> {
-        let init_value = pyobject_to_value_specification(init_value)?;
+    fn set_init_value(&self, init_value: Option<&Bound<'_, PyAny>>) -> PyResult<()> {
+        let init_value = init_value
+            .map(|val| pyobject_to_value_specification(val))
+            .transpose()?;
         self.0
             .set_init_value(init_value)
             .map_err(abstraction_err_to_pyerr)

src/abstraction/software_component/interface/senderreceiver.rs

@@ -273,8 +273,8 @@ def test_application_rule_based_value_specification() -> None:
                         RuleArgument.V(0),
                         RuleArgument.Vf(1),
                         RuleArgument.Vt("vt"),
-                        # RuleArgument.VtfNumber(2),
-                        # RuleArgument.VtfText("VtfText"),
+                        RuleArgument.VtfNumber(2),
+                        RuleArgument.VtfText("VtfText"),
                     ],
                     RuleBasedFillUntil.MaxSize,
                     max_size_to_fill=42,
@@ -287,8 +287,8 @@ def test_application_rule_based_value_specification() -> None:
                     RuleArgument.V(0),
                     RuleArgument.Vf(1),
                     RuleArgument.Vt("vt"),
-                    # RuleArgument.VtfNumber(2),
-                    # RuleArgument.VtfText("VtfText"),
+                    RuleArgument.VtfNumber(2),
+                    RuleArgument.VtfText("VtfText"),
                 ],
                 RuleBasedFillUntil.MaxSize,
                 max_size_to_fill=42,