add speckle controls

Author: Licini

src/compas_cloud/proxy.py

@@ -92,7 +92,7 @@ class Proxy():
 
     """
 
-    def __init__(self, host='127.0.0.1', port=9009, background=True, errorHandler=None, once=True, start_server=True):
+    def __init__(self, host='127.0.0.1', port=9009, background=True, errorHandler=None, once=True, start_server=True, speckle={}):
         """init function that starts a remote server then assigns corresponding client(websockets/.net) to the proxy"""
         self._python = compas._os.select_python(None)
         self.host = host
@@ -112,6 +112,9 @@ def __init__(self, host='127.0.0.1', port=9009, background=True, errorHandler=No
 
         self.callbacks = {}
         self.errorHandler = errorHandler
+        if speckle:
+            result = self.speckle_connect(host=speckle['host'], token=speckle['token'])
+            print(result)
 
     def package(self, function, cache=False):
         raise RuntimeError("Proxy.package() has been deprecated, please use Proxy.function() instead.")
@@ -296,7 +299,15 @@ def check(self):
     def once(self):
         """Set the server to close once this client disconnet"""
         return self.send({'control': 'once'})
+    
+    def speckle_connect(self, host="speckle.xyz", token=None):
+        return self.send({"speckle": {"connect": {"host": host, "token": token}}})
 
+    def speckle_push(self, stream_id, item):
+        return self.send({"speckle": {"update": {"stream_id": stream_id, "item": item}}})
+
+    def speckle_pull(self, stream_id):
+        return self.send({"speckle": {"get": {"stream_id": stream_id}}})
 
 class Sessions_client():
 

src/compas_cloud/speckle/data.py

@@ -6,6 +6,8 @@
 class Data(Base):
     data = dict
 
-    def __init__(self, data={}, **kwargs) -> None:
+    def __init__(self, data={}, stream_id=None, **kwargs) -> None:
         super().__init__(**kwargs)
         self.data = json.loads(json_dumps(data))
+        if stream_id:
+            self.data['stream_id'] = stream_id

src/compas_cloud/speckle/speckle.py

@@ -1,8 +1,13 @@
-from specklepy.api.client import SpeckleClient
-from specklepy.api.credentials import get_account_from_token
-from specklepy.transports.server import ServerTransport
-from specklepy.api import operations
-from compas_cloud.speckle.data import Data as SpeckleData
+try:
+    import specklepy
+    from specklepy.api.client import SpeckleClient
+    from specklepy.api.credentials import get_account_from_token
+    from specklepy.transports.server import ServerTransport
+    from specklepy.api import operations
+    from compas_cloud.speckle.data import Data as SpeckleData
+except ImportError:
+    specklepy = None
+
 from compas.data import json_loads
 import json
 
@@ -20,20 +25,20 @@ def process_command(self, command):
             return "Command not found"
 
     def connect(self, host="speckle.xyz", token=None):
+        if not specklepy:
+            raise ImportError("Specklepy is not installed")
         print("Connecting to {} with {}".format(host, token))
         self.client = SpeckleClient(host=host)
         account = get_account_from_token(token, host)
         self.client.authenticate_with_account(account)
-        return "Connected"
+        return "Connected to {} with {}".format(host, token)
 
     def update_item(self, item, stream_id=None, name=None, message=None):
-        print("CHECK!", item)
-        print("CHECK!", stream_id)
         # Create new stream if stream_id is None
         if not stream_id:
             stream_id = self.client.stream.create(name=name)
         transport = ServerTransport(client=self.client, stream_id=stream_id)
-        hash = operations.send(base=SpeckleData(item), transports=[transport])
+        hash = operations.send(base=SpeckleData(item, stream_id), transports=[transport])
         self.client.commit.create(
             stream_id=stream_id,
             object_id=hash,
@@ -49,9 +54,6 @@ def get_item(self, stream_id):
         data = received_base.data
         return json_loads(json.dumps(data))
 
-    # def watch_item(self, stream_id, callback):
-    #     item = self.get_item(stream_id)
-    #     callback(item)
 
 if __name__ == "__main__":