test

Author: Licini

src/compas_cloud/server.py

@@ -8,6 +8,7 @@
 import sys
 import traceback
 import pkg_resources
+from compas_cloud.speckle import Speckle
 
 try:
     from compas.data import DataEncoder
@@ -22,6 +23,7 @@ class CompasServerProtocol(WebSocketServerProtocol):
     cached = {}
     sessions = None
     server_type = "NORMAL"
+    speckle = Speckle()
 
     def onConnect(self, request):
         """print client info on connection"""
@@ -178,6 +180,9 @@ def process(self, data):
             if 'version' in data:
                 result = self.version()
 
+            if 'speckle' in data:
+                result = self.speckle.process_command(data['speckle'])
+
         except BaseException as error:
 
             if isinstance(error, KeyboardInterrupt):

src/compas_cloud/speckle/__init__.py

@@ -1 +1 @@
-from .client import SpeckleClient
+from .speckle import Speckle

src/compas_cloud/speckle/client.py src/compas_cloud/speckle/speckle.pysrc/compas_cloud/speckle/client.py renamed to src/compas_cloud/speckle/speckle.py

@@ -2,18 +2,33 @@
 from specklepy.api.credentials import get_account_from_token
 from specklepy.transports.server import ServerTransport
 from specklepy.api import operations
-from data import Data as SpeckleData
+from compas_cloud.speckle.data import Data as SpeckleData
 from compas.data import json_loads
 import json
 
 
 class Speckle():
-    def __init__(self, host="speckle.xyz", token=None):
+
+    def process_command(self, command):
+        if 'connect' in command:
+            return self.connect(host=command['connect']['host'], token=command['connect']['token'])
+        if 'get' in command:
+            return self.get_item(command['get']['stream_id'])
+        if 'update' in command:
+            return self.update_item(command['update']['item'], stream_id=command['update']['stream_id'])
+        else:
+            return "Command not found"
+
+    def connect(self, host="speckle.xyz", token=None):
+        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"
 
     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)
@@ -34,19 +49,23 @@ 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__":
 
     import compas
     from compas.datastructures import Mesh
 
-    client = Speckle(token="5da18a1e41f477bf4d70bce651b151aa6e14d5cc8d")
+    client = Speckle()
+    client.connect(token="4b6a06f4c7b114e3b4115e1bba5536261cb4d3bf20")
 
     stream_id = "c0538fd521"
-    # mesh = Mesh.from_obj(compas.get('faces.obj'))
-    # stream_id = client.update_item(mesh, name="faces", stream_id=stream_id)
-    # print(stream_id)
+    mesh = Mesh.from_obj(compas.get('faces.obj'))
+    stream_id = client.update_item(mesh, name="faces", stream_id=stream_id)
+    print(stream_id)
 
     # stream_id = "c0538fd521"
-    item = client.get_item(stream_id)
-    print(item)
+    # item = client.get_item(stream_id)
+    # print(item)

temp/speckle.py

@@ -0,0 +1,15 @@
+import compas
+from compas.datastructures import Mesh
+
+from compas_cloud.proxy import Proxy
+
+p = Proxy()
+result = p.send({"speckle": {"connect": {"host": "speckle.xyz", "token": "4b6a06f4c7b114e3b4115e1bba5536261cb4d3bf20"}}})
+print("check", result)
+
+mesh = Mesh.from_obj(compas.get('faces.obj'))
+# mesh = Mesh.from_off(compas.get('tubemesh.off'))
+
+
+mesh = p.send({"speckle": {"update": {"stream_id": "c0538fd521", "item": mesh}}})
+print(mesh)

temp/test.py

@@ -0,0 +1,4 @@
+from compas_cloud.proxy import Proxy
+
+p = Proxy(speckle={"host": "speckle.xyz", "token": "__YOUR_TOKEN__"})
+p.speckle.watch([stream1, stream2, stream3])