flopscope-server 0.4.2__tar.gz → 0.4.3__tar.gz

{flopscope_server-0.4.2 → flopscope_server-0.4.3}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: flopscope-server
-Version: 0.4.2
+Version: 0.4.3
 Summary: Backend server for flopscope client-server architecture
 License-Expression: MIT
 Requires-Python: >=3.10
-Requires-Dist: flopscope==0.4.2
+Requires-Dist: flopscope==0.4.3
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: numpy<2.5.0,>=2.0.0
 Requires-Dist: pyzmq>=26.0.0

{flopscope_server-0.4.2 → flopscope_server-0.4.3}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "hatchling.build"
 
 [project]
 name = "flopscope-server"
-version = "0.4.2"
+version = "0.4.3"
 description = "Backend server for flopscope client-server architecture"
 readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"
 dependencies = [
-    "flopscope==0.4.2",
+    "flopscope==0.4.3",
     "numpy>=2.0.0,<2.5.0",
     "pyzmq>=26.0.0",
     "msgpack>=1.0.0",

{flopscope_server-0.4.2 → flopscope_server-0.4.3}/src/flopscope_server/__init__.py

@@ -1,3 +1,3 @@
 """Flopscope backend server — executes numpy operations on behalf of remote clients."""
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"

{flopscope_server-0.4.2 → flopscope_server-0.4.3}/src/flopscope_server/_request_handler.py

@@ -49,6 +49,28 @@ def _make_serializable(obj):
     return obj
 
 
+_MSGPACK_SCALARS = (type(None), bool, int, float, str, bytes)
+
+
+def _is_msgpack_native(obj) -> bool:
+    """True if *obj* is composed only of msgpack-encodable Python types.
+
+    ``_make_serializable`` flattens numpy types but passes unknown objects
+    through unchanged; this distinguishes a genuinely-encodable result from one
+    that would only fail later inside ``msgpack.packb``.
+    """
+    if isinstance(obj, _MSGPACK_SCALARS):
+        return True
+    if isinstance(obj, (list, tuple)):
+        return all(_is_msgpack_native(item) for item in obj)
+    if isinstance(obj, dict):
+        return all(
+            isinstance(k, (str, bytes, int)) and _is_msgpack_native(v)
+            for k, v in obj.items()
+        )
+    return False
+
+
 #: Maximum allowed array size in bytes (configurable via environment variable).
 MAX_ARRAY_BYTES = int(os.environ.get("FLOPSCOPE_MAX_ARRAY_BYTES", 100 * 1024 * 1024))
 
@@ -113,6 +135,12 @@ class RequestHandler:
                 "error_type": "UnsupportedFunctionError",
                 "message": str(e),
             }
+        except flops.UnsupportedReturnType as e:
+            return {
+                "status": "error",
+                "error_type": "UnsupportedReturnType",
+                "message": str(e),
+            }
         except (ValueError, TypeError) as e:
             return {
                 "status": "error",
@@ -420,16 +448,19 @@ class RequestHandler:
             handle = self._session.store_generator(result)
             return {"status": "ok", "result": {"gen_id": handle}, "budget": budget}
 
-        # Fallback: try to make it serializable
-        try:
-            serializable = _make_serializable(result)
+        # Fallback: flatten nested numpy structures to JSON-safe values. If the
+        # result still isn't msgpack-native, fail loudly + attributably rather
+        # than silently str()-degrading (which previously surfaced downstream as
+        # an opaque "failed to serialize response" error). The registry-driven
+        # conformance test (tests/test_registry_conformance.py) catches any op
+        # whose return type lands here.
+        serializable = _make_serializable(result)
+        if _is_msgpack_native(serializable):
             return {"status": "ok", "result": {"value": serializable}, "budget": budget}
-        except Exception:
-            return {
-                "status": "ok",
-                "result": {"value": str(result), "dtype": "str"},
-                "budget": budget,
-            }
+        raise flops.UnsupportedReturnType(
+            f"{type(result).__name__} is not serializable across the "
+            f"client/server boundary"
+        )
 
 
 # ---------------------------------------------------------------------------