Close #353, close #350, close #346

Author: Silver Valdvee

yukon/domain/avatar.py

@@ -272,6 +272,8 @@ def to_builtin(self) -> Any:
             software_version = getattr(info, "software_version")
             hardware_version = getattr(info, "hardware_version")
             software_vcs_revision_id = getattr(info, "software_vcs_revision_id")
+            if software_vcs_revision_id:
+                software_vcs_revision_id = hex(software_vcs_revision_id)
             software_major_version = getattr(software_version, "major", 0)
             software_minor_version = getattr(getattr(info, "software_version"), "minor", 0)
             hardware_major_version = getattr(hardware_version, "major", 0)
@@ -339,6 +341,7 @@ def to_builtin(self) -> Any:
             ^ hash(frozenset(self._ports.sub))
             ^ hash(frozenset(self._ports.cln))
             ^ hash(frozenset(self._ports.srv))
+            ^ hash(vendor_specific_status_code)
             ^ hash(self._info.name.tobytes().decode() if self._info is not None else None)
             ^ hash(self.random_str_for_forced_update)  # This accounts for is_disappeared and is_being_queried
             ^ hash(self.disappeared_since)

yukon/services/utils.py

@@ -52,6 +52,7 @@ class Datatype:
     is_fixed_id: bool
     name: str
     class_reference: typing.Any
+    is_service: bool
 
     def __hash__(self) -> int:
         return hash(self.name)
@@ -115,6 +116,7 @@ def scan_package_look_for_classes(
                 break
             counter += 1
             module_or_class, previous_module_or_class = queue.get_nowait()
+            is_potentially_a_service = False
             # Get all modules and classes that are seen in the imported module
             elements = inspect.getmembers(module_or_class, lambda x: inspect.ismodule(x) or inspect.isclass(x))
             for element in elements:
@@ -133,7 +135,13 @@ def scan_package_look_for_classes(
                 except Exception:
                     logger.exception("Failed to get model for %s", _class)
                     continue
-                classes.append(Datatype(hasattr(_class, "_FIXED_PORT_ID_"), model.full_name, _class))
+                if _class.__name__ == "Request" or _class.__name__ == "Response":
+                    is_potentially_a_service = True
+                classes.append(
+                    Datatype(
+                        hasattr(_class, "_FIXED_PORT_ID_"), model.full_name, _class, is_service=is_potentially_a_service
+                    )
+                )
     except Empty:
         pass
     # logger.debug(f"Loop {loop_unique_id} took {time.time() - loop_start} seconds")
@@ -152,12 +160,14 @@ def get_datatype_return_dto(all_classes: typing.List[Datatype]) -> typing.Any:
                 return_object["fixed_id_messages"][str(datatype.class_reference._FIXED_PORT_ID_)] = {
                     "short_name": datatype.class_reference.__name__,
                     "name": datatype.name,
+                    "is_service": datatype.is_service,
                 }
             else:
                 return_object["variable_id_messages"].append(
                     {
                         "short_name": datatype.class_reference.__name__,
                         "name": datatype.name,
+                        "is_service": datatype.is_service,
                     }
                 )
         except Exception as e:

yukon/version.py

@@ -1 +1 @@
-__version__ = "2023.3.41"
+__version__ = "2023.3.42"

yukon/web/modules/meanings.module.js

@@ -42,7 +42,7 @@ export function getLinkInfo(subject_id, node_id, yukon_state) {
     }
     return Array.from(new Set(infos));
 }
-export function getRelatedLinks(port, yukon_state) {
+export function getRelatedLinks(port, port_type, yukon_state) {
     let links = [];
     for (const avatar of yukon_state.current_avatars) {
         const registersKeys = Object.keys(avatar.registers_values);
@@ -56,6 +56,7 @@ export function getRelatedLinks(port, yukon_state) {
             const link_name = results[2];
             const value = avatar.registers_values[register_name];
             if (parseInt(value) === parseInt(port) && register_name.endsWith(".id")) {
+                if((port_type === "pub" || port_type === "sub") && (link_type === "cln" || link_type === "srv")) continue;
                 const datatype_key = registersKeys.find((a) => a.endsWith(link_name + ".type"));
                 const datatype = avatar.registers_values[datatype_key];
                 links.push({ name: link_name, node_id: avatar.node_id, "port": port, type: link_type, "register_name": register_name, "datatype": datatype });

yukon/web/modules/panels/monitor2/monitor2.module.js

@@ -455,16 +455,23 @@ async function update_monitor2(containerElement, monitor2Div, yukon_state, force
                 continue;
             }
             // Getting info about more links than necessary for later highlighting purposes
-            const relatedLinks = getRelatedLinks(port.port, yukon_state);
+            const relatedLinks = getRelatedLinks(port.port, port.type, yukon_state);
             const currentLinkObjects = relatedLinks.filter(link => link.port === port.port && link.type === matchingPort.type && link.node_id === avatar.node_id);
             function doStuff(currentLinkObject) {
                 let toggledOn = { value: false };
                 let currentLinkDsdlDatatype = null;
                 let fixed_datatype_short = null;
                 let fixed_datatype_full = null;
                 if (datatypes_response["fixed_id_messages"] && datatypes_response["fixed_id_messages"][port.port] !== undefined) {
-                    fixed_datatype_short = datatypes_response["fixed_id_messages"][port.port]["short_name"];
-                    fixed_datatype_full = datatypes_response["fixed_id_messages"][port.port]["name"];
+                    const type_of_interest = datatypes_response["fixed_id_messages"][port.port];
+                    console.log(`Type of interest is ${type_of_interest} and is_service is ${type_of_interest.is_service}`);
+                    const is_a_service_and_for_a_service = type_of_interest.is_service && (port.type === "cln" || port.type === "srv");
+                    const is_a_message_and_for_a_message = !type_of_interest.is_service && (port.type === "pub" || port.type === "sub");
+                    console.log(`Port type is ${port.type} and is_a_service_and_for_a_service is ${is_a_service_and_for_a_service} and is_a_message_and_for_a_message is ${is_a_message_and_for_a_message}, port id is ${port.port}`);
+                    if(is_a_service_and_for_a_service || is_a_message_and_for_a_message) {
+                        fixed_datatype_short = datatypes_response["fixed_id_messages"][port.port]["short_name"];
+                        fixed_datatype_full = datatypes_response["fixed_id_messages"][port.port]["name"];
+                    }
                 }
                 if (currentLinkObject && !fixed_datatype_full) {
                     currentLinkDsdlDatatype = currentLinkObject.datatype || "";
@@ -931,8 +938,8 @@ function addHorizontalElements(monitor2Div, matchingPort, currentLinkDsdlDatatyp
     horizontal_line_label.style.width = "fit-content"; // settings.LinkInfoWidth  - settings.LabelLeftMargin + "px";
     horizontal_line_label.style.height = "fit-content";
     horizontal_line_label.style.position = "absolute";
-    if (currentLinkDsdlDatatype.endsWith(".Response")) {
-        currentLinkDsdlDatatype = currentLinkDsdlDatatype.replace(".Response", "");
+    if (currentLinkDsdlDatatype.endsWith(".Response") || currentLinkDsdlDatatype.endsWith(".Request")) {
+        currentLinkDsdlDatatype = currentLinkDsdlDatatype.replace(".Response", "").replace(".Request", "");
     }
     horizontal_line_label.innerHTML = currentLinkDsdlDatatype;
     horizontal_line_label.style.zIndex = "3";
@@ -1126,7 +1133,7 @@ function addVerticalLines(monitor2Div, ports, y_counter, containerElement, setti
                 potentialPopup.remove();
                 potentialPopup = null;
             } else {
-                const datatypes = await getDatatypesForPort(port.port, yukon_state);
+                const datatypes = await getDatatypesForPort(port.port, port.type, yukon_state);
                 potentialPopup = document.createElement("div");
                 potentialPopup.classList.add("popup");
                 potentialPopup.style.position = "absolute";

yukon/web/modules/panels/monitor2/subscriptions.module.js

@@ -579,7 +579,7 @@ export async function drawSubscriptions(subscriptionsDiv, settings, yukon_state)
             const select = document.createElement("select");
             async function updateSelectElements() {
                 select.innerHTML = "";
-                const datatypesOfPort = await getDatatypesForPort(subject_id_display.value, yukon_state);
+                const datatypesOfPort = await getDatatypesForPort(subject_id_display.value, "sub", yukon_state);
                 for (const datatype of datatypesOfPort) {
                     const option = document.createElement("option");
                     option.value = datatype;

yukon/web/modules/utilities.module.js

@@ -109,18 +109,23 @@ function createPortStructure(yukon_state) {
     }
     return ports;
 }
-export async function getDatatypesForPort(portNr, yukon_state) {
+export async function getDatatypesForPort(portNr, port_type, yukon_state) {
     const chosenDatatypes = {};
-    const relatedLinks = getRelatedLinks(portNr, yukon_state);
+    const relatedLinks = getRelatedLinks(portNr, port_type, yukon_state);
     //const ports = createPortStructure(yukon_state);
     const currentLinkObjects = relatedLinks.filter(link => link.port === portNr && (link.type === "sub" || link.type === "pub"));
     let fixed_datatype_short = null;
     let fixed_datatype_full = null;
     const datatypes_response = await yukon_state.zubax_apij.get_known_datatypes_from_dsdl();
     if (datatypes_response && datatypes_response["fixed_id_messages"] && datatypes_response["fixed_id_messages"][portNr] !== undefined) {
-        fixed_datatype_short = datatypes_response["fixed_id_messages"][portNr]["short_name"];
-        fixed_datatype_full = datatypes_response["fixed_id_messages"][portNr]["name"];
-        chosenDatatypes[fixed_datatype_full] = 1;
+        const fixed_datatype = datatypes_response["fixed_id_messages"][portNr];
+        const is_a_service_and_for_a_service = fixed_datatype.is_service && (port_type === "cln" || port_type === "srv");
+        const is_a_message_and_for_a_message = !fixed_datatype.is_service && (port_type === "pub" || port_type === "sub");
+        if(is_a_service_and_for_a_service || is_a_message_and_for_a_message) {
+            fixed_datatype_short = datatypes_response["fixed_id_messages"][portNr]["short_name"];
+            fixed_datatype_full = datatypes_response["fixed_id_messages"][portNr]["name"];
+            chosenDatatypes[fixed_datatype_full] = 1;
+        }
     }
     if (currentLinkObjects.length > 0) {
         for (const link of currentLinkObjects) {

yukon/web/style/monitor2.css

@@ -145,6 +145,9 @@
     border-right-style: solid;
     border-top-style: solid;
 }
+:root {
+    --line-color: rgb(178, 115, 33);
+}
 
 @media (prefers-color-scheme: dark) {
     #monitor2 .node {
@@ -153,16 +156,16 @@
     }
 
     #monitor2 .line {
-        background-color: rgb(69, 43, 9);
+        background-color: var(--line-color); 
         color: antiquewhite;
     }
 
     #monitor2 .circle {
-        background-color: rgb(69, 43, 9);
+        background-color: var(--line-color);
     }
 
     #monitor2 .horizontal_line {
-        background-color: rgb(69, 43, 9);
+        background-color: var(--line-color);
         color: antiquewhite;
         text-wrap: none;
     }
@@ -172,6 +175,6 @@
     }
 
     #monitor2>.arrowhead {
-        border-top-color: rgb(69, 43, 9);
+        border-top-color: var(--line-color);
     }
 }