bigraph-schema 0.0.50__tar.gz → 0.0.51__tar.gz

{bigraph-schema-0.0.50/bigraph_schema.egg-info → bigraph-schema-0.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bigraph-schema
-Version: 0.0.50
+Version: 0.0.51
 Summary: A serializable type schema for compositional systems biology
 Home-page: https://github.com/vivarium-collective/bigraph-schema
 Author: Eran Agmon, Ryan Spangler

{bigraph-schema-0.0.50 → bigraph-schema-0.0.51}/bigraph_schema/type_functions.py

@@ -2517,7 +2517,8 @@ registry_types = {
     'quote': {
         '_type': 'quote',
         '_generate': generate_quote,
-        '_sort': sort_quote},
+        '_sort': sort_quote,
+        '_description': 'protect a schema from generation, ie in the config for a nested composite which has type information we only want to evaluate inside of the composite'},
 
     'tuple': {
         '_type': 'tuple',

{bigraph-schema-0.0.50 → bigraph-schema-0.0.51}/bigraph_schema/type_system.py

@@ -603,20 +603,34 @@ class TypeSystem(Registry):
         return validation
 
 
-    def representation(self, schema, level=None):
+    def representation(self, schema, path=None, parents=None):
         '''
         produce a string representation of the schema
         * intended to be the inverse of parse_expression()
         '''
 
 
+        path = path or []
+        parents = parents or []
+        schema_id = id(schema)
+
+        if schema_id in parents:
+            index = parents.index(schema_id)
+            reference = path[:index]
+            output = '/'.join(reference)
+
+            return f'/{output}'
+
         if isinstance(schema, str):
             return schema
 
         elif isinstance(schema, tuple):
             inner = [
-                self.representation(element)
-                for element in schema]
+                self.representation(
+                    element,
+                    path + [index],
+                    parents + [schema_id])
+                for index, element in enumerate(schema)]
 
             pipes = '|'.join(inner)
             return f'({pipes})'
@@ -632,7 +646,9 @@ class TypeSystem(Registry):
                         schema_key = f'_{parameter_key}'
                         if schema_key in schema:
                             parameter = self.representation(
-                                schema[schema_key])
+                                schema[schema_key],
+                                path + [schema_key],
+                                parents + [schema_id])
                             inner.append(parameter)
                         else:
                             inner.append('()')
@@ -650,7 +666,9 @@ class TypeSystem(Registry):
                 inner = {}
                 for key in non_schema_keys(schema):
                     subschema = self.representation(
-                        schema[key])
+                        schema[key],
+                        path + [key],
+                        parents + [schema_id])
 
                     inner[key] = subschema
 
@@ -1987,6 +2005,23 @@ class TypeSystem(Registry):
         return top_schema, top_state
 
 
+    def wire_schema(self, schema, wires, path=None):
+        outcome = {}
+        path = path or []
+
+        if isinstance(wires, dict):
+            for key, subwires in wires.items():
+                outcome[key] = self.wire_schema(
+                    schema,
+                    wires[key],
+                    path + [key])
+
+        else:
+            _, outcome = self.slice('schema', schema, wires)
+
+        return outcome
+
+
     def hydrate(self, schema, state):
         hydrated = self.deserialize(schema, state)
         return self.fill(schema, hydrated)

{bigraph-schema-0.0.50 → bigraph-schema-0.0.51/bigraph_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bigraph-schema
-Version: 0.0.50
+Version: 0.0.51
 Summary: A serializable type schema for compositional systems biology
 Home-page: https://github.com/vivarium-collective/bigraph-schema
 Author: Eran Agmon, Ryan Spangler

{bigraph-schema-0.0.50 → bigraph-schema-0.0.51}/setup.py

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