Merge PR #31 from DM-16021-16022-14659-jupyter

DM-16021-16022-14659 firefly_client now work new lab channel system

firefly_client/firefly_client.py

@@ -26,7 +26,9 @@
 
 _my_localurl = 'http://localhost:8080/firefly'
 
-if 'FIREFLY_URL' in os.environ:
+if 'fireflyLabExtension' in os.environ:
+    _my_url = os.environ['fireflyURLLab']
+elif 'FIREFLY_URL' in os.environ:
     _my_url = os.environ['FIREFLY_URL']
 else:
     _my_url = _my_localurl
@@ -128,7 +130,10 @@ def __init__(self, url=_my_url, channel=None, html_file=_my_html_file,
 
         # auto-generate unique channel if not provided
         if channel is None:
-            channel = str(uuid.uuid1())
+            if 'fireflyLabExtension' in os.environ:
+                channel = os.environ['fireflyChannelLab']
+            else:
+                channel = str(uuid.uuid1())
 
         # websocket url
         ws_url = '%s://%s/sticky/firefly/events' % (wsproto, location)  # web socket url