Merge branch 'prepare_demo' into 'main'

prepare demo

See merge request !1

.gitlab-ci.yml

@@ -26,7 +26,7 @@ test:
     - conda config --env --add channels tango-controls
     - conda install --file demo/requirements-conda.txt
     - conda install pytest
-    - python -m pip install git+https://github.com/woutdenolf/dahu.git@server_entry_point
+    - python -m pip install git+https://github.com/kif/dahu.git
     - pip install --pre .[test]
     - pytest --pyargs dahu
     - pytest -v

dahu_demo/plugins/math.py

+from dahu.plugin import Plugin
+from dahu.factory import register
+
+
+@register
+class AddNumbers(Plugin):
+    def process(self):
+        self.output["sum"] = self.input["a"] + self.input["b"]

dahu_demo/plugins/workflow.py

@@ -6,8 +6,10 @@ from ewoks import execute_graph
 @register
 class ExecuteGraph(Plugin):
     def process(self):
-        kwargs = {
-            k: v for k, v in self.input.items() if k not in ("job_id", "plugin_name")
-        }
+        kwargs = dict(self.input)
+        kwargs.pop("plugin_name")
+        kwargs.pop("job_id")
+        # job_id = kwargs.pop("job_id")
+        # kwargs["execinfo"] = {"job_id": job_id}
         execute_graph(**kwargs)
         # self.output["result"] = ...

demo/install.sh

@@ -12,7 +12,7 @@ function main {
     # install dahu
     local dahu_source=$HOME/dev/dahu
     find $dahu_source| grep -E "(__pycache__|\.pyc|\.pyo|\.egg-info$)" | xargs rm -rf
-    python -m pip install -e $dahu_source
+    python -m pip install $dahu_source  # NO DEV INSTALLATION!
 
     # install the demo project
     python -m pip install -e $SCRIPT_ROOT/..

demo/requirements-conda.txt

 python=3.8
 pytango
 numpy
+
+# dev:
+black
+flake8
+pytest
\ No newline at end of file

demo/run.py

 import json
 from time import sleep
 from tango import DeviceProxy
-from ewokscore.tests.examples.graphs import get_graph
 
-
-plugin = "workflow.executegraph"
-workflow, _ = get_graph("acyclic1")
-varinfo = {"root_uri": "results"}
-kwargs = {"graph": workflow, "binding": None, "varinfo": varinfo}
+plugin = "math.addnumbers"
+kwargs = {"a": 1, "b": 2}
 
 proxy = DeviceProxy("tango://localhost:10000/id00/dahu/1")
 pid = proxy.startJob([plugin, json.dumps(kwargs)])

demo/run.sh

+#!/bin/bash
+
+SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source ${SCRIPT_ROOT}/utils.sh
+
+function main {
+    source $(conda_root)/bin/activate $(conda_env)
+
+    python ${SCRIPT_ROOT}/run.py
+}
+
+main
\ No newline at end of file

demo/run_workflow.py

+import json
+from time import sleep
+from tango import DeviceProxy
+from ewokscore.tests.examples.graphs import get_graph
+
+
+plugin = "workflow.executegraph"
+workflow, _ = get_graph("acyclic1")
+varinfo = {"root_uri": "results"}
+kwargs = {"graph": workflow, "binding": None, "varinfo": varinfo}
+
+proxy = DeviceProxy("tango://localhost:10000/id00/dahu/1")
+pid = proxy.startJob([plugin, json.dumps(kwargs)])
+while proxy.getJobState(pid) == "starting":
+    sleep(0.01)
+proxy.waitJob(pid)
+print("Output: %s" % proxy.getJobOutput(pid))

demo/start_dahu.sh

 #!/bin/bash
 
-export TANGO_HOST=localhost:10000
-export DAHU_PLUGINS=$(python -c "from dahu_demo import plugins;print(plugins.__path__[0])")
-dahu-register --instance dahu
-dahu-server dahu -v3
+SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source ${SCRIPT_ROOT}/utils.sh
+
+function main {
+    source $(conda_root)/bin/activate $(conda_env)
+
+    export TANGO_HOST=localhost:10000
+    export DAHU_PLUGINS=$(python -c "from dahu_demo import plugins;print(plugins.__path__[0])")
+    dahu-register --instance dahu --member 1
+    dahu-server dahu -v3
+}
+
+main
\ No newline at end of file