pyobs-core 2.0.0.dev49__tar.gz → 2.0.0.dev51__tar.gz

{pyobs_core-2.0.0.dev49 → pyobs_core-2.0.0.dev51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-core
-Version: 2.0.0.dev49
+Version: 2.0.0.dev51
 Summary: robotic telescope software
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_core-2.0.0.dev49 → pyobs_core-2.0.0.dev51}/pyobs/comm/xmpp/serializer.py

@@ -78,6 +78,13 @@ def value_to_xml(value: Any, type_hint: Any) -> ET.Element:
         elem = ET.Element("nil")
         return elem
 
+    # Coerce to the declared `str` type when the runtime value doesn't match it (e.g. a
+    # stray bool leaking through code that violates a `dict[str, str]`'s own contract) --
+    # otherwise the isinstance-based dispatch below wins regardless of what the field
+    # actually declares, and the value's Python type silently corrupts across the wire.
+    if type_hint is str and not isinstance(value, str):
+        value = str(value)
+
     # bool (before int — bool is subclass of int)
     if isinstance(value, bool):
         elem = ET.Element("boolean")
@@ -108,6 +115,14 @@ def value_to_xml(value: Any, type_hint: Any) -> ET.Element:
         elem.text = value.value
         return elem
 
+    # Time (pyobs's astropy.time.Time subclass) -- serialize as ISO text, reconstructed on
+    # decode via type_hint (mirrors the StrEnum pattern above). Without this, Time fell
+    # through to the generic stringify fallback below with no way back to a Time object.
+    if isinstance(value, _Time):
+        elem = ET.Element("string")
+        elem.text = value.isot
+        return elem
+
     # dataclass — serialize as <{namespace}state> with plain field children
     if dataclasses.is_dataclass(value) and not isinstance(value, type):
         return _dataclass_to_xml(value)
@@ -184,20 +199,34 @@ def xml_to_value(elem: ET.Element, type_hint: Any) -> Any:
     if tag == "nil":
         return None
 
+    # boolean/int/double coerced to str when the field is declared `str` but a
+    # not-yet-upgraded sender is still emitting the wrong wire tag for it (the mirror image
+    # of value_to_xml's own str coercion on encode -- see the comment there) -- otherwise a
+    # bool/int/float leaks straight into a str-typed field/dict value.
     if tag == "boolean":
-        return elem.text == "true"
+        value = elem.text == "true"
+        return str(value) if type_hint is str else value
 
     if tag == "int":
-        return int(elem.text) if elem.text is not None else 0
+        value = int(elem.text) if elem.text is not None else 0
+        return str(value) if type_hint is str else value
 
     if tag == "double":
-        return float(elem.text) if elem.text is not None else 0.0
+        value = float(elem.text) if elem.text is not None else 0.0
+        return str(value) if type_hint is str else value
 
     if tag == "string":
         text = elem.text or ""
         # cast to enum if type_hint is a StrEnum subclass
         if type_hint and isinstance(type_hint, type) and issubclass(type_hint, StrEnum):
             return type_hint(text)
+        # cast to Time if type_hint is a Time subclass (see the matching encode branch).
+        # No explicit format=: astropy auto-detects "isot" (this fix's own encoding) as well
+        # as "iso" (the plain str(Time) space-separated format a not-yet-upgraded sender on
+        # the old serializer would still be emitting via the stringify fallback) -- pinning
+        # to "isot" would hard-fail on exactly that mixed-version case.
+        if type_hint and isinstance(type_hint, type) and issubclass(type_hint, _Time):
+            return type_hint(text)
         return text
 
     if tag == "items":
@@ -340,6 +369,8 @@ def _parse_scalar(text: str, type_hint: Any) -> Any:
         return float(text)
     if isinstance(type_hint, type) and issubclass(type_hint, StrEnum):
         return type_hint(text)
+    if isinstance(type_hint, type) and issubclass(type_hint, _Time):
+        return type_hint(text)
     return text
 
 

{pyobs_core-2.0.0.dev49 → pyobs_core-2.0.0.dev51}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyobs-core"
-version = "2.0.0.dev49"
+version = "2.0.0.dev51"
 description = "robotic telescope software"
 authors = [{ name = "Tim-Oliver Husser", email = "thusser@uni-goettingen.de" }]
 requires-python = ">=3.11"