process-bigraph 0.0.24__tar.gz → 0.0.26__tar.gz

{process-bigraph-0.0.24/process_bigraph.egg-info → process-bigraph-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: process-bigraph
-Version: 0.0.24
+Version: 0.0.26
 Summary: UNKNOWN
 Home-page: https://github.com/vivarium-collective/process-bigraph
 Author: Ryan Spangler, Eran Agmon

{process-bigraph-0.0.24 → process-bigraph-0.0.26}/process_bigraph/composite.py

@@ -336,7 +336,7 @@ def deserialize_process(schema, encoded, core):
     if not encoded:
         deserialized = core.default(schema)
     else:
-        deserialized = encoded.copy()
+        deserialized = encoded
 
     if not deserialized.get('address'):
         return deserialized
@@ -377,8 +377,10 @@ def deserialize_process(schema, encoded, core):
 
     deserialized['config'] = config
     deserialized['interval'] = interval
-    deserialized['_inputs'] = deserialized['instance'].inputs()
-    deserialized['_outputs'] = deserialized['instance'].outputs()
+    deserialized['_inputs'] = copy.deepcopy(
+        deserialized['instance'].inputs())
+    deserialized['_outputs'] = copy.deepcopy(
+        deserialized['instance'].outputs())
 
     return deserialized
 
@@ -387,7 +389,7 @@ def deserialize_step(schema, encoded, core):
     if not encoded:
         deserialized = core.default(schema)
     else:
-        deserialized = encoded.copy()
+        deserialized = copy.deepcopy(encoded)
 
     if not deserialized['address']:
         return deserialized
@@ -414,8 +416,10 @@ def deserialize_step(schema, encoded, core):
         deserialized['instance'] = process
 
     deserialized['config'] = config
-    deserialized['_inputs'] = deserialized['instance'].inputs()
-    deserialized['_outputs'] = deserialized['instance'].outputs()
+    deserialized['_inputs'] = copy.deepcopy(
+        deserialized['instance'].inputs())
+    deserialized['_outputs'] = copy.deepcopy(
+        deserialized['instance'].outputs())
 
     return deserialized
 
@@ -484,7 +488,7 @@ class ProcessTypes(TypeSystem):
         self.process_registry = Registry()
         self.protocol_registry = Registry()
 
-        self.register_types(PROCESS_TYPES)
+        self.update_types(PROCESS_TYPES)
         self.register_protocols(BASE_PROTOCOLS)
         self.register_processes(BASE_EMITTERS)
 
@@ -526,8 +530,8 @@ class ProcessTypes(TypeSystem):
         if not initial_state:
             return initial_state
 
-        input_ports = get_path(schema, path + ('_inputs',))
-        output_ports = get_path(schema, path + ('_outputs',))
+        input_ports = copy.deepcopy(get_path(schema, path + ('_inputs',)))
+        output_ports = copy.deepcopy(get_path(schema, path + ('_outputs',)))
         ports = {
             '_inputs': input_ports,
             '_outputs': output_ports}
@@ -784,8 +788,9 @@ class Composite(Process):
         #     self.state)
 
         self.process_schema = {}
+
         for port in ['inputs', 'outputs']:
-            self.process_schema[port], defaults = self.core.infer_edge(
+            self.process_schema[port] = self.core.wire_schema(
                 self.composition,
                 self.bridge[port])
 
@@ -797,8 +802,19 @@ class Composite(Process):
             self.add_emitter(
                 emitter_config)
 
-        self.step_triggers = {}
+        self.front: Dict = {
+            path: empty_front(self.state['global_time'])
+            for path in self.process_paths}
 
+        self.bridge_updates = []
+
+        # build the step network
+        self.build_step_network()
+
+        # self.run_steps(self.to_run)
+
+    def build_step_network(self):
+        self.step_triggers = {}
         for step_path, step in self.step_paths.items():
             step_triggers = find_step_triggers(
                 step_path, step)
@@ -808,12 +824,6 @@ class Composite(Process):
 
         self.steps_run = set([])
 
-        self.front: Dict = {
-            path: empty_front(self.state['global_time'])
-            for path in self.process_paths}
-
-        self.bridge_updates = []
-
         self.step_dependencies, self.node_dependencies = build_step_network(
             self.step_paths)
 
@@ -822,8 +832,6 @@ class Composite(Process):
 
         self.to_run = self.cycle_step_state()
 
-        # self.run_steps(self.to_run)
-
     def serialize_state(self):
         return self.core.serialize(
             self.composition,
@@ -864,6 +872,10 @@ class Composite(Process):
             print(f"Created new file: {filename}")
 
 
+    def __repr__(self):
+        return self.core.representation(self.composition)
+
+
     def reset_step_state(self, step_paths):
         self.trigger_state = build_trigger_state(
             self.node_dependencies)

{process-bigraph-0.0.24 → process-bigraph-0.0.26}/process_bigraph/process_types.py

@@ -98,7 +98,7 @@ def deserialize_process(schema, encoded, core):
     if not encoded:
         deserialized = core.default(schema)
     else:
-        deserialized = encoded.copy()
+        deserialized = encoded
 
     if not deserialized.get('address'):
         return deserialized
@@ -139,8 +139,10 @@ def deserialize_process(schema, encoded, core):
 
     deserialized['config'] = config
     deserialized['interval'] = interval
-    deserialized['_inputs'] = deserialized['instance'].inputs()
-    deserialized['_outputs'] = deserialized['instance'].outputs()
+    deserialized['_inputs'] = copy.deepcopy(
+        deserialized['instance'].inputs())
+    deserialized['_outputs'] = copy.deepcopy(
+        deserialized['instance'].outputs())
 
     return deserialized
 

{process-bigraph-0.0.24 → process-bigraph-0.0.26}/process_bigraph/tests.py

@@ -577,6 +577,8 @@ def test_grow_divide(core):
                 'environment': ['environment']}}},
         core=core)
 
+    print(str(composite))
+
     updates = composite.update({
         'environment': {
             '0': {

{process-bigraph-0.0.24 → process-bigraph-0.0.26/process_bigraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: process-bigraph
-Version: 0.0.24
+Version: 0.0.26
 Summary: UNKNOWN
 Home-page: https://github.com/vivarium-collective/process-bigraph
 Author: Ryan Spangler, Eran Agmon

{process-bigraph-0.0.24 → process-bigraph-0.0.26}/setup.py

@@ -2,7 +2,7 @@ import re
 from setuptools import setup, find_packages
 
 
-VERSION = '0.0.24'
+VERSION = '0.0.26'
 
 
 with open("README.md", "r") as readme: