bigraph-schema 0.0.42__tar.gz → 0.0.43__tar.gz

{bigraph-schema-0.0.42/bigraph_schema.egg-info → bigraph-schema-0.0.43}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: bigraph-schema
-Version: 0.0.42
+Version: 0.0.43
 Summary: A serializable type schema for compositional systems biology
 Home-page: https://github.com/vivarium-collective/bigraph-schema
 Author: Eran Agmon, Ryan Spangler
 Author-email: agmon.eran@gmail.com, ryan.spangler@gmail.com
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -52,3 +54,5 @@ This resource will guide you through the core concepts and methods, helping you
 ## License
 
 Bigraph-schema is open-source software released under the [Apache 2 License](https://github.com/vivarium-collective/bigraph-schema/blob/main/LICENSE).
+
+

{bigraph-schema-0.0.42 → bigraph-schema-0.0.43}/bigraph_schema/registry.py

@@ -1351,9 +1351,14 @@ class TypeRegistry(Registry):
                    key: self.access(branch)
                    for key, branch in schema.items()}
 
-        elif isinstance(schema, (tuple, int)):
-            if isinstance(schema, int):
-                schema = tuple([schema])
+        elif isinstance(schema, int):
+            return schema
+
+        elif isinstance(schema, tuple):
+            # import ipdb; ipdb.set_trace()
+
+            # if isinstance(schema, int):
+            #     schema = tuple([schema])
 
             tuple_schema = {
                 '_type': 'tuple',

{bigraph-schema-0.0.42 → bigraph-schema-0.0.43}/bigraph_schema/type_system.py

@@ -1239,7 +1239,13 @@ class TypeSystem:
         if descendant is None:
             return ancestor is None
 
-        if '_type' in ancestor and ancestor['_type'] == 'any':
+        if isinstance(ancestor, int):
+            if isinstance(descendant, int):
+                return ancestor == descendant
+            else:
+                return False
+
+        elif '_type' in ancestor and ancestor['_type'] == 'any':
             return True
 
         elif '_type' in descendant:
@@ -2112,7 +2118,7 @@ def serialize_map(schema, value, core=None):
     return {
         key: core.serialize(
             value_type,
-            subvalue)
+            subvalue) if not is_schema_key(key) else subvalue
         for key, subvalue in value.items()}
 
 
@@ -2345,10 +2351,12 @@ def apply_array(schema, current, update, core):
 
 
 def serialize_array(schema, value, core):
-    """ Serialize numpy array to bytes """
+    """ Serialize numpy array to list """
 
     if isinstance(value, dict):
         return value
+    elif isinstance(value, str):
+        import ipdb; ipdb.set_trace()
     else:
         array_data = 'string'
         dtype = value.dtype.name
@@ -2358,7 +2366,7 @@ def serialize_array(schema, value, core):
             array_data = 'float'
 
         return {
-            'bytes': value.tobytes(),
+            'list': value.tolist(),
             'data': array_data,
             'shape': value.shape}
 
@@ -2399,9 +2407,9 @@ def deserialize_array(schema, encoded, core):
                 core.parameters_for(
                     schema['_shape']))
 
-            if 'bytes' in encoded:
-                return np.frombuffer(
-                    encoded['bytes'],
+            if 'list' in encoded:
+                return np.array(
+                    encoded['list'],
                     dtype=dtype).reshape(
                         shape)
             else:

{bigraph-schema-0.0.42 → bigraph-schema-0.0.43/bigraph_schema.egg-info}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: bigraph-schema
-Version: 0.0.42
+Version: 0.0.43
 Summary: A serializable type schema for compositional systems biology
 Home-page: https://github.com/vivarium-collective/bigraph-schema
 Author: Eran Agmon, Ryan Spangler
 Author-email: agmon.eran@gmail.com, ryan.spangler@gmail.com
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -52,3 +54,5 @@ This resource will guide you through the core concepts and methods, helping you
 ## License
 
 Bigraph-schema is open-source software released under the [Apache 2 License](https://github.com/vivarium-collective/bigraph-schema/blob/main/LICENSE).
+
+

{bigraph-schema-0.0.42 → bigraph-schema-0.0.43}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '0.0.42'
+VERSION = '0.0.43'
 
 
 with open("README.md", "r") as readme: