fix: schema for array inner types (#1494)

Closes #1471
CQCL · Aug 30, 2024 · d43cbb2 · d43cbb2
1 parent 26ec57a
commit d43cbb2
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/hugr-py/src/hugr/_serialization/tys.py b/hugr-py/src/hugr/_serialization/tys.py
@@ -224,18 +224,15 @@ class BaseType(ABC, ConfiguredBaseModel):
     def deserialize(self) -> tys.Type: ...
 
 
-class MultiContainer(BaseType):
-    ty: Type
-
-
-class Array(MultiContainer):
+class Array(BaseType):
     """Known size array whose elements are of the same type."""
 
     t: Literal["Array"] = "Array"
+    inner: Type
     len: int
 
     def deserialize(self) -> tys.Array:
-        return tys.Array(ty=self.ty.deserialize(), size=self.len)
+        return tys.Array(ty=self.inner.deserialize(), size=self.len)
 
 
 class UnitSum(BaseType):

diff --git a/hugr-py/src/hugr/tys.py b/hugr-py/src/hugr/tys.py
@@ -268,7 +268,7 @@ class Array(Type):
     size: int
 
     def _to_serial(self) -> stys.Array:
-        return stys.Array(ty=self.ty._to_serial_root(), len=self.size)
+        return stys.Array(inner=self.ty._to_serial_root(), len=self.size)
 
     def type_bound(self) -> TypeBound:
         return self.ty.type_bound()

diff --git a/specification/schema/hugr_schema_live.json b/specification/schema/hugr_schema_live.json
@@ -96,9 +96,6 @@
             "additionalProperties": true,
             "description": "Known size array whose elements are of the same type.",
             "properties": {
-                "ty": {
-                    "$ref": "#/$defs/Type"
-                },
                 "t": {
                     "const": "Array",
                     "default": "Array",
@@ -108,13 +105,16 @@
                     "title": "T",
                     "type": "string"
                 },
+                "inner": {
+                    "$ref": "#/$defs/Type"
+                },
                 "len": {
                     "title": "Len",
                     "type": "integer"
                 }
             },
             "required": [
-                "ty",
+                "inner",
                 "len"
             ],
             "title": "Array",

diff --git a/specification/schema/hugr_schema_strict_live.json b/specification/schema/hugr_schema_strict_live.json
@@ -96,9 +96,6 @@
             "additionalProperties": false,
             "description": "Known size array whose elements are of the same type.",
             "properties": {
-                "ty": {
-                    "$ref": "#/$defs/Type"
-                },
                 "t": {
                     "const": "Array",
                     "default": "Array",
@@ -108,13 +105,16 @@
                     "title": "T",
                     "type": "string"
                 },
+                "inner": {
+                    "$ref": "#/$defs/Type"
+                },
                 "len": {
                     "title": "Len",
                     "type": "integer"
                 }
             },
             "required": [
-                "ty",
+                "inner",
                 "len"
             ],
             "title": "Array",

diff --git a/specification/schema/testing_hugr_schema_live.json b/specification/schema/testing_hugr_schema_live.json
@@ -96,9 +96,6 @@
             "additionalProperties": true,
             "description": "Known size array whose elements are of the same type.",
             "properties": {
-                "ty": {
-                    "$ref": "#/$defs/Type"
-                },
                 "t": {
                     "const": "Array",
                     "default": "Array",
@@ -108,13 +105,16 @@
                     "title": "T",
                     "type": "string"
                 },
+                "inner": {
+                    "$ref": "#/$defs/Type"
+                },
                 "len": {
                     "title": "Len",
                     "type": "integer"
                 }
             },
             "required": [
-                "ty",
+                "inner",
                 "len"
             ],
             "title": "Array",

diff --git a/specification/schema/testing_hugr_schema_strict_live.json b/specification/schema/testing_hugr_schema_strict_live.json
@@ -96,9 +96,6 @@
             "additionalProperties": false,
             "description": "Known size array whose elements are of the same type.",
             "properties": {
-                "ty": {
-                    "$ref": "#/$defs/Type"
-                },
                 "t": {
                     "const": "Array",
                     "default": "Array",
@@ -108,13 +105,16 @@
                     "title": "T",
                     "type": "string"
                 },
+                "inner": {
+                    "$ref": "#/$defs/Type"
+                },
                 "len": {
                     "title": "Len",
                     "type": "integer"
                 }
             },
             "required": [
-                "ty",
+                "inner",
                 "len"
             ],
             "title": "Array",