Remove context from interface

wrappers/modelverse.py

@@ -178,8 +178,8 @@ def _process_OP(callback, taskname):
     p.start()
     p.join()
 
-def INPUT(action, context, parameters):
-    controller.addInput(Event("action", "action_in", [action, _next_ID(), context, parameters]))
+def INPUT(action, parameters):
+    controller.addInput(Event("action", "action_in", [action, _next_ID(), None, parameters]))
 
 def OUTPUT():
     while 1:
@@ -209,66 +209,66 @@ def init(address_param="127.0.0.1:8001", timeout=60.0, taskname=None):
     responses = controller.addOutputListener("action_out")
     controller.addOutputListener("ready").fetch(-1)
 
-    INPUT("init", None, [address_param, timeout])
+    INPUT("init", [address_param, timeout])
     controller.address = address_param
     return OUTPUT()
 
 def login(username, password):
     controller.username = username
     controller.password = password
-    INPUT("login", None, [username, password])
+    INPUT("login", [username, password])
     return OUTPUT()
 
 def model_list(location):
-    INPUT("model_list", None, [location])
+    INPUT("model_list", [location])
     return OUTPUT()
 
 def model_add(model_name, metamodel_name, model_code=""):
-    INPUT("model_add", None, [model_name, metamodel_name, model_code])
+    INPUT("model_add", [model_name, metamodel_name, model_code])
     return OUTPUT()
 
 def model_move(source_name, target_name):
-    INPUT("model_move", None, [source_name, target_name])
+    INPUT("model_move", [source_name, target_name])
     return OUTPUT()
 
 def model_delete(model_name):
-    INPUT("model_delete", None, [model_name])
+    INPUT("model_delete", [model_name])
     return OUTPUT()
 
 def model_list_full(location):
-    INPUT("model_list_full", None, [location])
+    INPUT("model_list_full", [location])
     return OUTPUT()
 
 def verify(model_name, metamodel_name):
-    INPUT("verify", None, [model_name, metamodel_name])
+    INPUT("verify", [model_name, metamodel_name])
     return OUTPUT()
 
 def model_overwrite(model_name, new_model):
-    INPUT("model_overwrite", None, [model_name, new_model])
+    INPUT("model_overwrite", [model_name, new_model])
     return OUTPUT()
 
 def disconnect():
-    INPUT("disconnect", None, [])
+    INPUT("disconnect", [])
     return OUTPUT()
 
 def user_logout():
-    INPUT("user_logout", None, [])
+    INPUT("user_logout", [])
     return OUTPUT()
 
 def user_delete():
-    INPUT("user_delete", None, [])
+    INPUT("user_delete", [])
     return OUTPUT()
 
 def model_render(model_name, mapper_name, rendered_name):
-    INPUT("model_render", None, [model_name, mapper_name, rendered_name])
+    INPUT("model_render", [model_name, mapper_name, rendered_name])
     return OUTPUT()
 
 def transformation_between(sources, targets):
-    INPUT("transformation_between", None, [sources, targets])
+    INPUT("transformation_between", [sources, targets])
     return OUTPUT()
 
 def transformation_add_MT(source_metamodels, target_metamodels, operation_name, code, callback=None):
-    INPUT("transformation_add_MT", None, [source_metamodels, target_metamodels, operation_name, code, True])
+    INPUT("transformation_add_MT", [source_metamodels, target_metamodels, operation_name, code, True])
     model = OUTPUT()
 
     if callback is not None:
@@ -278,7 +278,7 @@ def transformation_add_MT(source_metamodels, target_metamodels, operation_name,
     return OUTPUT()
 
 def transformation_add_AL(source_metamodels, target_metamodels, operation_name, code, callback=None):
-    INPUT("transformation_add_AL", None, [source_metamodels, target_metamodels, operation_name, code, True])
+    INPUT("transformation_add_AL", [source_metamodels, target_metamodels, operation_name, code, True])
     model = OUTPUT()
 
     if model is not None:
@@ -291,7 +291,7 @@ def transformation_add_AL(source_metamodels, target_metamodels, operation_name,
     return OUTPUT()
 
 def transformation_add_MANUAL(source_metamodels, target_metamodels, operation_name, callback=None):
-    INPUT("transformation_add_MANUAL", None, [source_metamodels, target_metamodels, operation_name, True])
+    INPUT("transformation_add_MANUAL", [source_metamodels, target_metamodels, operation_name, True])
     model = OUTPUT()
 
     if callback is not None:
@@ -304,7 +304,7 @@ def __transformation_execute(operation_name, input_models_dict, output_models_di
     if statechart is not None:
         port_sc = statechart[0].addOutputListener(statechart[2])
 
-    INPUT("transformation_execute", None, [operation_name, input_models_dict, output_models_dict, tracability_model, fetch_output])
+    INPUT("transformation_execute", [operation_name, input_models_dict, output_models_dict, tracability_model, fetch_output])
     taskname = OUTPUT()
     if statechart is not None:
         threading.Thread(target=_process_SC, args=[statechart, port_sc, taskname]).start()
@@ -317,7 +317,7 @@ def transformation_execute_AL(operation_name, input_models_dict, output_models_d
     return __transformation_execute(operation_name, input_models_dict, output_models_dict, statechart, tracability_model, fetch_output)
 
 def transformation_execute_MANUAL(operation_name, input_models_dict, output_models_dict, callback=None, tracability_model=""):
-    INPUT("transformation_execute", None, [operation_name, input_models_dict, output_models_dict, tracability_model])
+    INPUT("transformation_execute", [operation_name, input_models_dict, output_models_dict, tracability_model])
     taskname = OUTPUT()
 
     _process_OP(callback, taskname)
@@ -325,150 +325,150 @@ def transformation_execute_MANUAL(operation_name, input_models_dict, output_mode
     return OUTPUT()
 
 def transformation_signature(operation_name):
-    INPUT("transformation_signature", None, [operation_name])
+    INPUT("transformation_signature", [operation_name])
     return OUTPUT()
 
 def process_signature(process_name):
-    INPUT("process_signature", None, [process_name])
+    INPUT("process_signature", [process_name])
     return OUTPUT()
 
 def permission_modify(model_name, permissions):
-    INPUT("permission_modify", None, [model_name, permissions])
+    INPUT("permission_modify", [model_name, permissions])
     return OUTPUT()
 
 def permission_owner(model_name, permission):
-    INPUT("permission_owner", None, [model_name, permission])
+    INPUT("permission_owner", [model_name, permission])
     return OUTPUT()
 
 def permission_group(model_name, group):
-    INPUT("permission_group", None, [model_name, group])
+    INPUT("permission_group", [model_name, group])
     return OUTPUT()
 
 def group_create(group_name):
-    INPUT("group_create", None, [group_name])
+    INPUT("group_create", [group_name])
     return OUTPUT()
 
 def group_delete(group_name):
-    INPUT("group_delete", None, [group_name])
+    INPUT("group_delete", [group_name])
     return OUTPUT()
 
 def group_owner_add(group_name, user_name):
-    INPUT("group_owner_add", None, [group_name, user_name])
+    INPUT("group_owner_add", [group_name, user_name])
     return OUTPUT()
 
 def group_owner_delete(group_name, user_name):
-    INPUT("group_owner_delete", None, [group_name, user_name])
+    INPUT("group_owner_delete", [group_name, user_name])
     return OUTPUT()
 
 def group_join(group_name, user_name):
-    INPUT("group_join", None, [group_name, user_name])
+    INPUT("group_join", [group_name, user_name])
     return OUTPUT()
 
 def group_kick(group_name, user_name):
-    INPUT("group_kick", None, [group_name, user_name])
+    INPUT("group_kick", [group_name, user_name])
     return OUTPUT()
 
 def group_list():
-    INPUT("group_list", None, [])
+    INPUT("group_list", [])
     return OUTPUT()
 
 def admin_promote(user_name):
-    INPUT("admin_promote", None, [user_name])
+    INPUT("admin_promote", [user_name])
     return OUTPUT()
 
 def admin_demote(user_name):
-    INPUT("admin_demote", None, [user_name])
+    INPUT("admin_demote", [user_name])
     return OUTPUT()
 
 def conformance_delete(model_name, metamodel_name):
-    INPUT("conformance_delete", None, [model_name, metamodel_name])
+    INPUT("conformance_delete", [model_name, metamodel_name])
     return OUTPUT()
 
 def conformance_add(model_name, metamodel_name):
-    INPUT("conformance_add", None, [model_name, metamodel_name])
+    INPUT("conformance_add", [model_name, metamodel_name])
     return OUTPUT()
 
 def folder_create(folder_name):
-    INPUT("folder_create", None, [folder_name])
+    INPUT("folder_create", [folder_name])
     return OUTPUT()
 
 def model_types(model_name):
-    INPUT("model_types", None, [model_name])
+    INPUT("model_types", [model_name])
     return OUTPUT()
 
 def alter_context(model_name, metamodel_name):
-    INPUT("alter_context", None, [model_name, metamodel_name])
+    INPUT("alter_context", [model_name, metamodel_name])
 
-def element_list(model_name, context=None):
-    INPUT("element_list", context, [model_name])
+def element_list(model_name):
+    INPUT("element_list", [model_name])
     return OUTPUT()
 
-def element_list_nice(model_name, context=None):
-    INPUT("element_list_nice", context, [model_name])
+def element_list_nice(model_name):
+    INPUT("element_list_nice", [model_name])
     return OUTPUT()
 
-def types(model_name, context=None):
-    INPUT("types", context, [model_name])
+def types(model_name):
+    INPUT("types", [model_name])
     return OUTPUT()
 
-def types_full(model_name, context=None):
-    INPUT("types_full", context, [model_name])
+def types_full(model_name):
+    INPUT("types_full", [model_name])
     return OUTPUT()
 
-def read_info(model_name, ID, context=None):
-    INPUT("read_info", context, [model_name, ID])
+def read_info(model_name, ID):
+    INPUT("read_info", [model_name, ID])
     return OUTPUT()
 
-def read_attrs(model_name, ID, context=None):
-    INPUT("read_attrs", context, [model_name, ID])
+def read_attrs(model_name, ID):
+    INPUT("read_attrs", [model_name, ID])
     return OUTPUT()
 
-def instantiate(model_name, typename, edge=None, ID="", context=None):
-    INPUT("instantiate", context, [model_name, typename, edge, ID])
+def instantiate(model_name, typename, edge=None, ID=""):
+    INPUT("instantiate", [model_name, typename, edge, ID])
     return OUTPUT()
 
-def delete_element(model_name, ID, context=None):
-    INPUT("delete_element", context, [model_name, ID])
+def delete_element(model_name, ID):
+    INPUT("delete_element", [model_name, ID])
     return OUTPUT()
 
-def attr_assign(model_name, ID, attr, value, context=None):
-    INPUT("attr_assign", context, [model_name, ID, attr, value])
+def attr_assign(model_name, ID, attr, value):
+    INPUT("attr_assign", [model_name, ID, attr, value])
     return OUTPUT()
 
-def attr_assign_code(model_name, ID, attr, code, context=None):
-    INPUT("attr_assign_code", context, [model_name, ID, attr, code])
+def attr_assign_code(model_name, ID, attr, code):
+    INPUT("attr_assign_code", [model_name, ID, attr, code])
     return OUTPUT()
 
-def attr_delete(model_name, ID, attr, context=None):
-    INPUT("attr_delete", context, [model_name, ID, attr])
+def attr_delete(model_name, ID, attr):
+    INPUT("attr_delete", [model_name, ID, attr])
     return OUTPUT()
 
-def read_outgoing(model_name, ID, typename, context=None):
-    INPUT("read_outgoing", context, [model_name, ID, typename])
+def read_outgoing(model_name, ID, typename):
+    INPUT("read_outgoing", [model_name, ID, typename])
     return OUTPUT()
 
-def read_incoming(model_name, ID, typename, context=None):
-    INPUT("read_incoming", context, [model_name, ID, typename])
+def read_incoming(model_name, ID, typename):
+    INPUT("read_incoming", [model_name, ID, typename])
     return OUTPUT()
 
-def read_association_source(model_name, ID, context=None):
-    INPUT("read_association_source", context, [model_name, ID])
+def read_association_source(model_name, ID):
+    INPUT("read_association_source", [model_name, ID])
     return OUTPUT()
 
-def read_association_destination(model_name, ID, context=None):
-    INPUT("read_association_destination", context, [model_name, ID])
+def read_association_destination(model_name, ID):
+    INPUT("read_association_destination", [model_name, ID])
     return OUTPUT()
 
-def connections_between(model_name, source, target, context=None):
-    INPUT("connections_between", context, [model_name, source, target])
+def connections_between(model_name, source, target):
+    INPUT("connections_between", [model_name, source, target])
     return OUTPUT()
 
-def define_attribute(model_name, node, attr_name, attr_type, context=None):
-    INPUT("define_attribute", context, [model_name, node, attr_name, attr_type])
+def define_attribute(model_name, node, attr_name, attr_type):
+    INPUT("define_attribute", [model_name, node, attr_name, attr_type])
     return OUTPUT()
 
-def all_instances(model_name, type_name, context=None):
-    INPUT("all_instances", context, [model_name, type_name])
+def all_instances(model_name, type_name):
+    INPUT("all_instances", [model_name, type_name])
     return OUTPUT()
 
 def process_execute(process_name, model_mapping, callbacks={}):
@@ -479,7 +479,7 @@ def process_execute(process_name, model_mapping, callbacks={}):
             # Is a statechart, so register already
             sc_ports[k] = v[0].addOutputListener(v[2])
 
-    INPUT("process_execute", None, [process_name, model_mapping])
+    INPUT("process_execute", [process_name, model_mapping])
 
     while 1:
         result = OUTPUT()
@@ -507,7 +507,7 @@ def get_taskname():
     return controller.taskname
 
 def exit_save(model_name):
-    INPUT("exit_save", None, [model_name])
+    INPUT("exit_save", [model_name])
     return OUTPUT()
 
 """ Some hardcoded functions... Way easier to express them with code than with statecharts!"""
@@ -520,13 +520,13 @@ except ImportError:
 
 def service_register(name, function):
     """Register a function as a service with a specific name."""
-    INPUT("service_register", None, [name, function])
+    INPUT("service_register", [name, function])
     port = OUTPUT()
     return port
 
 def service_stop():
     """Stop the currently executing process."""
-    INPUT("service_stop", None, [])
+    INPUT("service_stop", [])
     return OUTPUT()
 
 def service_get(port):

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Wed May 23 09:41:55 2018
+Date:   Wed May 23 11:08:24 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server