Changeset 968 for trunk/zoo-project

Timestamp:

Dec 18, 2020, 7:11:27 PM (4 years ago)

Author:

djay

Message:

Add websocketd container to docker-compose and make the OGC API - Processes and it basic UI available.

Location:

trunk/zoo-project

Files:

• zoo-kernel/configure.ac (modified) (2 diffs)
• zoo-services/utils/open-api/cgi-env/service.py (modified) (1 diff)
• zoo-services/utils/open-api/server/publish.py (modified) (1 diff)
• zoo-services/utils/open-api/server/subscriber.py (modified) (2 diffs)
• zoo-services/utils/open-api/static/openapi.js (modified) (1 diff)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -542 +542 @@
 
 AC_ARG_WITH([r], 
-        [AS_HELP_STRING([--with-r=PATH], [To enable python support or Specifies an alternative directory for R installation,  disabled by default])], 
+        [AS_HELP_STRING([--with-r=PATH], [To enable R support or Specifies an alternative directory for R installation,  disabled by default])], 
         [R_PATH="$withval"; R_ENABLED="-DUSE_R"], [R_ENABLED=""])
 
@@ -605 +605 @@
         fi
 
+        echo $PYTHONCONFIG
         # Extract the linker and include flags 
         PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`

trunk/zoo-project/zoo-services/utils/open-api/cgi-env/service.py

@@ -28 +28 @@
 def display(conf,inputs,outputs):
     config = configparser.ConfigParser()
-    config.read(conf["lenv"]["cwd"]+'/oas.cfg')
+    config.read(conf["lenv"]["cwd"]+'/oas.cfg',"utf-8")
     nameSpace = {'conf': conf,'inputs': inputs, 'outputs': outputs,"openapi": config}
     t = Template(file=conf["main"]["templatesPath"]+"/index.html",searchList=nameSpace)

trunk/zoo-project/zoo-services/utils/open-api/server/publish.py

@@ -14 +14 @@
 
 from urllib import parse
+
 try:
-        params=parse.parse_qs(os.environ["QUERY_STRING"])
-        r = redis.Redis(host='localhost', port=6379, db=0)
-        print(params)
-        r.publish(params["jobid"][0],data)
+    params=parse.parse_qs(os.environ["QUERY_STRING"])
+    r=None
+    if "ZOO_REDIS_HOST" in os.environ:
+        r = redis.Redis(host=os.environ["ZOO_REDIS_HOST"], port=6379, db=0)
+    else:
+        r = redis.Redis(host='redis', port=6379, db=0)
+    print(params)
+    r.publish(params["jobid"][0],data)
 except Exception as e:
         print(e)

trunk/zoo-project/zoo-services/utils/open-api/server/subscriber.py

@@ -11 +11 @@
 import redis
 import json
+import os
 
 mThreads=[]
-r = redis.Redis(host='localhost', port=6379, db=0)
+r=None
+
+if "ZOO_REDIS_HOST" in os.environ:
+    r = redis.Redis(host=os.environ["ZOO_REDIS_HOST"], port=6379, db=0)
+else:
+    r = redis.Redis(host='redis', port=6379, db=0)
 
 def send(t):
@@ -59 +65 @@
 
 t0.join()
-for i in range(len(mThreads)):
-    mThreads[i].join()
+#for i in range(len(mThreads)):
+#    mThreads[i].join()

trunk/zoo-project/zoo-services/utils/open-api/static/openapi.js

@@ -108 +108 @@
     for(var i=0;i < System["JSON_STR"]["outputs"].length;i++){
         var cOutput={};
+        console.log($('input[name="oapi_ioAsArray"]').val()=="true");
         if($('input[name="oapi_ioAsArray"]').val()=="true")
-            cOutputs={"id": System["JSON_STR"]["outputs"][i]["id"]};
+            cOutput={"id": System["JSON_STR"]["outputs"][i]["id"]};
         var cName=System["JSON_STR"]["outputs"][i]["id"].replace(/\./g,"_");
         if(System["JSON_STR"]["outputs"][i]["output"]["formats"]){