Merge pull request #6 from openearth/jack-tracker-unregister

added unregister to tracker client

Author: jackha

mmi/mmi_client.py

@@ -20,9 +20,9 @@ def initialize(self, configfile=None):
         """
         Initialize the module
         """
-        
+
         method = "initialize"
-        
+
         A = None
         metadata = {method : configfile}
 
@@ -33,9 +33,9 @@ def finalize(self):
         """
         Finalize the module
         """
-        
+
         method = "finalize"
-        
+
         A = None
         metadata = {method : -1}
 
@@ -48,7 +48,7 @@ def get_var_count(self):
         """
 
         method = "get_var_count"
-        
+
         A = None
         metadata = {method : -1}
 
@@ -63,7 +63,7 @@ def get_var_name(self, i):
         """
 
         method = "get_var_name"
-        
+
         A = None
         metadata = {method : i}
 
@@ -78,7 +78,7 @@ def get_var_type(self, name):
         """
 
         method = "get_var_type"
-        
+
         A = None
         metadata = {method : name}
 
@@ -93,7 +93,7 @@ def get_var_rank(self, name):
         """
 
         method = "get_var_rank"
-        
+
         A = None
         metadata = {method : name}
 
@@ -108,7 +108,7 @@ def get_var_shape(self, name):
         """
 
         method = "get_var_shape"
-        
+
         A = None
         metadata = {method : rank}
 
@@ -123,7 +123,7 @@ def get_var(self, name):
         """
 
         method = "get_var"
-        
+
         A = None
         metadata = {method : name}
 
@@ -151,7 +151,7 @@ def get_start_time(self):
         """
 
         method = "get_start_time"
-        
+
         A = None
         metadata = {method : -1}
 
@@ -166,7 +166,7 @@ def get_end_time(self):
         """
 
         method = "get_end_time"
-        
+
         A = None
         metadata = {method : -1}
 
@@ -181,7 +181,7 @@ def get_current_time(self):
         """
 
         method = "get_current_time"
-        
+
         A = None
         metadata = {method : -1}
 
@@ -214,4 +214,19 @@ def inq_compound_field(self, name, index):
         """
         Lookup the type,rank and shape of a compound field
         """
-        pass
+        pass
+
+    def remote(self, action):
+        """
+        Function specific for MMI, not BMI.
+        action is one of: "play", "stop", "pause", "rewind", "quit"
+        """
+        method = "remote"
+
+        A = None
+        metadata = {method: action}
+
+        send_array(self.socket, A, metadata)
+        A, metadata = recv_array(self.socket)
+
+        return metadata[method]

mmi/runner.py

@@ -97,7 +97,10 @@ def process_incoming(model, sockets, data):
                     var = model.get_var(name).copy()
                 else:
                     var = model.get_var(name)
-                logger.debug("sending variable %s with shape %s", name, var.shape)
+                if var is None:
+                    logger.warning("Get_var returns None for %s" % name)
+                else:
+                    logger.debug("sending variable %s with shape %s", name, var.shape)
                 metadata['name'] = name
                 # assert socket is req socket
 
@@ -171,7 +174,8 @@ def process_incoming(model, sockets, data):
                 # assert socket is req socket
             # custom actions
             elif "remote" in metadata:
-                assert metadata["remote"] in {"play", "stop", "pause", "rewind"}
+                assert metadata["remote"] in {
+                    "play", "stop", "pause", "rewind", "quit"}
                 model.state = metadata["remote"]
             elif "operator" in metadata:
                 # TODO: support same operators as MPI_ops here....,
@@ -360,15 +364,16 @@ def runner(
 
         # Keep on counting indefinitely
         counter = itertools.count()
-
+        logger.info("Entering timeloop...")
         for i in counter:
             while model.state == "pause":
                 # keep waiting for messages when paused
                 process_incoming(model, sockets, data)
             else:
                 # otherwise process messages once and continue
                 process_incoming(model, sockets, data)
-            logger.debug("i %s", i)
+            if model.state == "quit":
+                break
 
             # paused ...
             model.update(-1)
@@ -385,6 +390,8 @@ def runner(
                 if 'pub' in sockets:
                     send_array(sockets['pub'], value, metadata=metadata)
 
+    logger.info("Exiting...")
+
 
 def main():
     arguments = docopt.docopt(__doc__)

mmi/tracker_client.py

@@ -1,5 +1,7 @@
 import urllib2
 import json
+import requests
+import urlparse
 
 
 class MMITracker(object):
@@ -35,3 +37,8 @@ def zmq_address(self, key):
         """
         zmq_address = "tcp://" + self.database[key]['node'] + ":" + str(self.database[key]['ports']['REQ'])
         return zmq_address
+
+    def unregister(self, uuid):
+        """Unregister a uuid from tracker"""
+        requests.delete(
+            urlparse.urljoin(self.tracker_url, 'models' + "/" + uuid))