Implement asapo api changes

src/AsapoWorker/asapo_receiver.py

@@ -7,14 +7,15 @@ from AsapoWorker.errors import (
 log = logging.getLogger(__name__)
 
 
-def create_broker(source, path, beamtime, stream, token, timeout):
+def create_broker(
+        source, path, has_filesystem, beamtime, stream, token, timeout):
     log.info(
-        "Create new broker (source=%s, path=%s, beamtime=%s, "
-        "stream=%s, token=%s, timeout=%i).",
-        source, path, beamtime, stream, token, timeout)
+        "Create new broker (source=%s, path=%s, has_filesystem=%s, "
+        "beamtime=%s, stream=%s, token=%s, timeout=%i).",
+        source, path, has_filesystem, beamtime, stream, token, timeout)
     try:
         broker = asapo_consumer.create_server_broker(
-            source, path, beamtime, stream, token, timeout)
+            source, path, has_filesystem, beamtime, stream, token, timeout)
     except asapo_consumer.AsapoWrongInputError as err:
         raise ConfigurationError("Cannot create broker") from err
     except asapo_consumer.AsapoConsumerError as err:
@@ -44,6 +45,9 @@ class AsapoReceiver:
             token=Config("Beamtime access token", type=str),
             stream=Config(
                 "Name of input stream", type=str, default=""),
+            has_filesystem=Config(
+                "Read files directly from filesystem",
+                type=bool, default=False),
             timeout=Config(
                 "Allowed time in milliseconds for ASAP::O data access before "
                 "exception is thrown", type=float, default=3000)

src/AsapoWorker/asapo_sender.py

@@ -9,24 +9,27 @@ from AsapoWorker.errors import StreamError, ConfigurationError
 log = logging.getLogger(__name__)
 
 
-def create_producer(source, beamtime, stream, token, nthreads=1):
+def create_producer(
+        source, beamtime, beamline, stream, token, nthreads=1, timeout=3000):
+    timeout = timeout/1000
     log.info(
-        "Create new producer (source=%s, beamtime=%s, "
-        "stream=%s, token=%s, nthreads=%i).",
-        source, beamtime, stream, token, nthreads)
+        "Create new producer (source=%s, beamtime=%s, beamline=%s, "
+        "stream=%s, token=%s, nthreads=%i, timeout=%s).",
+        source, beamtime, beamline, stream, token, nthreads, timeout)
     producer = asapo_producer.create_producer(
-        source, beamtime, stream, token, nthreads)
+        source, beamtime, beamline, stream, token, nthreads, timeout)
     return producer
 
 
-def create_broker(source, path, beamtime, stream, token, timeout):
+def create_broker(
+        source, path, has_filesystem, beamtime, stream, token, timeout):
     log.info(
-        "Create new broker (source=%s, path=%s, beamtime=%s, "
-        "stream=%s, token=%s, timeout=%i).",
-        source, path, beamtime, stream, token, timeout)
+        "Create new broker (source=%s, path=%s, has_filesystem=%s, "
+        "beamtime=%s, stream=%s, token=%s, timeout=%i).",
+        source, path, has_filesystem, beamtime, stream, token, timeout)
     try:
         broker = asapo_consumer.create_server_broker(
-            source, path, beamtime, stream, token, timeout)
+            source, path, has_filesystem, beamtime, stream, token, timeout)
     except asapo_consumer.AsapoWrongInputError as err:
         raise ConfigurationError("Cannot create broker") from err
     except asapo_consumer.AsapoConsumerError as err:
@@ -64,10 +67,14 @@ class AsapoSender:
             source=Config("ASAP::O endpoint", type=str),
             beamtime=Config("Beamtime ID", type=str),
             token=Config("Beamtime access token", type=str),
+            beamline=Config("Beamline", type=str, default="auto"),
             stream=Config(
                 "Name of output stream", type=str, default=""),
             nthreads=Config(
-                "Number of threads", type=int, default=1)
+                "Number of threads", type=int, default=1),
+            timeout=Config(
+                "Allowed time in milliseconds for ASAP::O data access before "
+                "exception is thrown", type=float, default=3000)
         ))
     broker = Config(
         "An ASAP::O consumer broker", type=asapo_consumer.PyDataBroker,
@@ -78,6 +85,9 @@ class AsapoSender:
             token=Config("Beamtime access token", type=str),
             stream=Config(
                 "Name of output stream", type=str, default=""),
+            has_filesystem=Config(
+                "Read files directly from filesystem",
+                type=bool, default=False),
             timeout=Config(
                 "Allowed time in milliseconds for ASAP::O data access before "
                 "exception is thrown", type=float, default=3000)