Index: trunk/zoo-project/zoo-services/utils/open-api/cgi-env/display.zcfg =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/cgi-env/display.zcfg (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/cgi-env/display.zcfg (revision 962) @@ -0,0 +1,36 @@ +[display] + Title = Print Cheetah templates as HTML + Abstract = Print Cheetah templates as HTML. + processVersion = 2 + storeSupported = true + statusSupported = true + serviceProvider = service + serviceType = Python + + [tmpl] + Title = Template name + Abstract = The name of the template to fill. + minOccurs = 1 + maxOccurs = 1 + + + mimeType = application/json + encoding = utf-8 + + + + + [Result] + Title = The welcome message + Abstract = The HTML content out of the template. + + + mimeType = text/html + encoding = utf-8 + + + mimeType = text/plain + encoding = utf-8 + + + Index: trunk/zoo-project/zoo-services/utils/open-api/cgi-env/service.py =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/cgi-env/service.py (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/cgi-env/service.py (revision 962) @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +############################################################################### +# Author: Gérald Fenoy, gerald.fenoy@geolabs.fr +# Copyright (c) 2020, GeoLabs SARL. +############################################################################### +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +################################################################################ +from Cheetah.Template import Template +import configparser +import zoo + +def display(conf,inputs,outputs): + config = configparser.ConfigParser() + config.read(conf["lenv"]["cwd"]+'/oas.cfg') + nameSpace = {'conf': conf,'inputs': inputs, 'outputs': outputs,"openapi": config} + t = Template(file=conf["main"]["templatesPath"]+"/index.html",searchList=nameSpace) + outputs["Result"]["value"]=t.__str__() + return zoo.SERVICE_SUCCEEDED Index: trunk/zoo-project/zoo-services/utils/open-api/requirements.txt =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/requirements.txt (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/requirements.txt (revision 962) @@ -0,0 +1,6 @@ +aioredis +appdirs +hiredis +websockets +Cheetah3 +redis Index: trunk/zoo-project/zoo-services/utils/open-api/server/.htaccess =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/server/.htaccess (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/server/.htaccess (revision 962) @@ -0,0 +1,4 @@ +RewriteRule ^ogc-api/api.html$ /cgi-bin3/zoo_loader.cgi?/api.html [L,QSA] +RewriteRule ^ogc-api/index.html$ /cgi-bin3/zoo_loader.cgi?service=WPS&service=WPS&request=Execute&version=1.0.0&Identifier=display&RawDataOutput=Result&DataInputs=tmpl=@xlink:href=https://demo.mapmint.com/ogc-api/ [L,QSA] +RewriteRule ^ogc-api(.*).html$ /cgi-bin3/zoo_loader.cgi?service=WPS&service=WPS&request=Execute&version=1.0.0&Identifier=display&RawDataOutput=Result&DataInputs=tmpl=@xlink:href=https://demo.mapmint.com/ogc-api$1 [L,QSA] +RewriteRule ^ogc-api(.*)$ /cgi-bin3/zoo_loader.cgi?$1 [L,QSA] Index: trunk/zoo-project/zoo-services/utils/open-api/server/publish.py =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/server/publish.py (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/server/publish.py (revision 962) @@ -0,0 +1,23 @@ +#!/usr/bin/python3 +import os +import sys +import redis +data = sys.stdin.read(); + +print('Content-Type: text/html') +print('') +print('Environment variables') +for param in os.environ.keys(): + print ("%20s: %s
" % (param, os.environ[param])) + +print(data) + +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) +except Exception as e: + print(e) + Index: trunk/zoo-project/zoo-services/utils/open-api/server/subscriber.py =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/server/subscriber.py (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/server/subscriber.py (revision 962) @@ -0,0 +1,62 @@ +#!/usr/bin/python3 +# cf. https://github.com/joewalnes/websocketd/wiki/Simple-Python-Duplex-Example +# +# example usage: +# websocketd --port=4430 --ssl --sslcert /ssl/fullchain.pem --sslkey /ssl/privkey.pem subscriber.py --devconsole +# + +from sys import stdout, stdin +import sys +import threading +import redis +import json + +mThreads=[] +r = redis.Redis(host='localhost', port=6379, db=0) + +def send(t): + # send string to web page + stdout.write(t+'\n') + stdout.flush() + +def listenMessages(jobID=None): + global r + p = r.pubsub() + p.subscribe(jobID) + hasSend=False + for raw_message in p.listen(): + try: + send(str(raw_message["data"],'utf-8')) + hasSend=True + try: + tmp=json.loads(str(raw_message["data"],'utf-8')) + if tmp is not None and "outputs" in tmp: + sys.exit() + except Exception as e: + print(str(e)) + return + except: + if not(hasSend): + send(str(raw_message["data"])) + + +def receive(): + global n + global mThreads + while True: + t = stdin.readline().strip() + if not t: + break + t1 = t.split(" ") + if t1[0]=="SUB": + mThreads += [threading.Thread(target=listenMessages,kwargs={"jobID":t1[1]})] + mThreads[len(mThreads)-1].start() + else: + send(t) + +t0 = threading.Thread(target=receive) +t0.start() + +t0.join() +for i in range(len(mThreads)): + mThreads[i].join() Index: trunk/zoo-project/zoo-services/utils/open-api/static/openapi.css =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/static/openapi.css (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/static/openapi.css (revision 962) @@ -0,0 +1,49 @@ +/* Sticky footer styles +-------------------------------------------------- */ +html { + position: relative; + min-height: 100%; +} +body { + /* Margin bottom by footer height */ + margin-bottom: 60px; +} +.footer { + position: absolute; + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: 60px; + line-height: 60px; /* Vertically center the text there */ + background-color: #f5f5f5; +} + + +/* Custom page CSS +-------------------------------------------------- */ +/* Not required for template or sticky footer method. */ + +body > .container-fluid { + padding: 60px 15px 0; +} + +.footer > .container-fluid { + padding-right: 15px; + padding-left: 15px; +} + +code { + font-size: 80%; +} + +.bi::before { + display: inline-block; + content: ""; + background-image: url("data:image/svg+xml,"); + background-repeat: no-repeat; + background-size: 1rem 1rem; +} + +.bg-dark { + background-color: #663e05!important; +} Index: trunk/zoo-project/zoo-services/utils/open-api/templates/index.html =================================================================== --- trunk/zoo-project/zoo-services/utils/open-api/templates/index.html (revision 962) +++ trunk/zoo-project/zoo-services/utils/open-api/templates/index.html (revision 962) @@ -0,0 +1,678 @@ + +#import zoo +#import html,os +#set removeCacheFile=False +#set strUrl=$inputs["tmpl"]["xlink:href"] +#set currentUrl=$strUrl.replace($openapi["openapi"]["rootUrl"],"") +#if $currentUrl=="/" +#set currentKey="root" +#set $currentUrl="/index" +#else +#set currentKey=$currentUrl +#end if +#set urlCompnents=$currentUrl.split('/') +#* +* Load the JSON content from the API +*# +#try +#import json +#if "cache_file" in $inputs["tmpl"] +#set values=json.load(open($inputs["tmpl"]["cache_file"])) +#else +#set values=$inputs["tmpl"]["value"] +#end if +#except Exception as e +$e +#end try + + + + + + + + + + + + + #if "id" in $values#$values["id"]#else##if $currentKey in $openapi and "title" in $openapi[$currentKey]#$openapi[$currentKey]["title"]#else#Landing Page#end if##end if# + + +
+ + +
+ + +#def printRel($o,$v) +#if $v in $o +$o[$v] +#else +View default (no title found for $v). +#end if +#end def +#* + +*# +#def printControl(obj) +#if "type" not in $obj +#set oType="format" +#else +#set oType=$obj["type"] +#end if +
+
+
$obj["title"]
+
+ #if "ph" in $obj + + #else + + #end if + #if "required" in $obj +
+ Please set a value for $obj["id"]. +
+ #end if +
+#end def +#def printCard(obj) +
+
+

+ +

+
+
+
+ $obj["content"] +
+
+
+#end def +#def printInputContent($obj) +#set cName=$obj["id"].replace(".","_") +#if "formats" in $obj["input"] + #set cFormats=[] + #for j in range(len($obj["input"]["formats"])) + #set $cFormats+=[$obj["input"]["formats"][$j]["mimeType"]] + #end for + $printControl({"title": "format","type": "input_format","name": $cName,"options":$cFormats}) + #set largs={"id": $obj["id"],"title": "href","type": "input_value","name": $cName,"ph":"URL"} + #if $obj["minOccurs"]>0 + #set $largs["required"]=True + #end if + $printControl($largs) +#else + #if "literalDataDomains" in $obj["input"] + #set cDataDomain=$obj["input"]["literalDataDomains"][0] + #set largs={"id": $obj["id"],"title": $cDataDomain["dataType"]["name"],"type": "input_value", "name": $cName,} + #if $obj["minOccurs"]>0 + #set $largs["required"]=True + #end if + #if "anyValue" in $cDataDomain["valueDefinition"] + #set $largs["ph"]="Value" + $printControl($largs) + #else + #if "allowedValues" in $cDataDomain["valueDefinition"] + #set $largs["options"]=$cDataDomain["valueDefinition"]["allowedValues"] + $printControl($largs) + #else + ELSE + $obj + #end if + #end if + #if "defaultValue" in $cDataDomain + + #end if + #else + $obj + ELSE + #end if +#end if +#end def +#def printProvider(conf) +#set provider=$conf["provider"] + $provider["providerName"] +

+#end def +#def printContact(conf) +#set provider=$conf["provider"] +#set alt=$openapi["provider_alt"] +#set elements=list($alt.keys()) + Address + #for i in ["addressDeliveryPoint","addressCity","addressAdministrativeArea","addressPostalCode","addressCountry","addressElectronicMailAddress","phoneVoice","phoneFacsimile"] + #if i!="addressElectronicMailAddress" and $provider[$i]!="False" +

+ #if i=="phoneVoice" + Phone + + + + #end if + $provider[$i] +

+ #else + #if i=="addressElectronicMailAddress" + Email +

+ $provider[$i] +

+ #end if + #end if + #end for +#end def +#def printIndentification(conf) +#set provider=$conf["provider"] +$printCard({"id": "provider","title": "Provider","content": $printProvider($conf),"class": "show"}) +$printCard({"id": "contact","title": "Contact","content": $printContact($conf),"class": "show","attrs":'itemprop="address" itemscope itemtype="https://schema.org/PostalAddress"'}) +#end def + +#if $currentKey=="root" +
+
+
+#end if + + +
+

#if "id" in $values#$values["id"]: #end if##if "title" in $values#$html.escape($values["title"])#else##if len($urlCompnents)==2#$currentUrl[1:].title()#else#$currentUrl[1:]#end if##end if#

+ #if "description" in $values#

$html.escape($values["description"])

#end if# + #if $currentKey=="root" +
+ #for i in $conf["identification"]["keywords"].split(',') + + #end for +
+ License: + $openapi["openapi"]["license_name"] + #end if + #if "inputs" in $values +#set $cid="JOBSOCKET-"+$conf["lenv"]["usid"] +
+

Inputs

+
+ #for i in range(len(values["inputs"])) + #set cInput=$values["inputs"][$i] + #set cName=$cInput["id"].replace(".","_") + $printCard({"id": $cName, "title": $cInput["id"],"content":'

'+$cInput["description"]+'

'+$printInputContent($cInput)}) + #end for +
+ +

Outputs

+
+ #for i in range(len(values["outputs"])) + #set cOutput=$values["outputs"][$i] + #set cName=$cOutput["id"].replace(".","_") + #set cFormats=[] + #if "formats" in $cOutput["output"] + #for j in range(len($cOutput["output"]["formats"])) + #set cFormats+=[$cOutput["output"]["formats"][$j]["mimeType"]] + #end for + #end if + #set cTransmissions=[] + #for j in range(len($values["outputTransmission"])) + #set cTransmissions+=[$values["outputTransmission"][$j]] + #end for + #set cContent="

"+$cOutput["description"]+"

" + #if len(cFormats)>0 + #set $cContent+=$printControl({"id": $cOutput["id"], "title": "format","type": "format","name": $cName,"options":$cFormats}) + #end if + #if len(cTransmissions)>0 + #set $cContent+=$printControl({"id": $cOutput["id"], "title": "transmission","type": "transmission","name": $cName,"options":$cTransmissions}) + #end if + $printCard({"id": $cName+"_"+str($i),"title": $cOutput["id"],"content": $cContent}) + #end for +
+ +

Execution options

+
+ #set cContent="" + #set cUrl=$openapi["openapi"]["publisherurl"]+cid+"&type=" + #for a in ["successUri","inProgressUri","failedUri"] + #set $cContent+=$printControl({"title": $a,"type": "main_value","name": $a,"ph":"URL","value":$cUrl+$a.replace("Uri","")}) + #end for + $printCard({"id":"ModeOne","title":"Subscribers","content": $cContent}) + $printCard({"id":"ModeTwo","title":"Response","content": $printControl({"title":"format","type": "main_value","name": "format","options":["document","raw"]})}) + $printCard({"id":"ModeThree","title":"Mode","content": $printControl({"title":"mode","type": "main_value","name": "mode","options":["async","sync"]})}) +
+ +
+ + + #end if + + #try + #if "links" in $values + #for i in range(len($values["links"])) + #if $i%2==0 +

$values["links"][$i]["title"]

+

+ $printRel($openapi["links_title"],$values["links"][$i]["rel"]) +

+ #if $i+1<=len($values["links"]) and len($values["links"])>1 and not($values["links"][$i+1]["rel"]=="alternate" and $openapi["openapi"]["full_html_support"]=="true") +

$printRel($openapi["links_title"],$values["links"][$i+1]["rel"])

+ #end if + #end if + #end for + #end if + #except Exception as e + $e + #end try + #if "conformsTo" in $values + + #end if + #if "jobs" in $urlCompnents + #set $removeCacheFile=True + #end if + #if hasattr($values, "__len__") and isinstance($values,list) and len($values)>0 + + + + #if "jobs" not in $urlCompnents + #* + * Processes list + *# + + + + #else + #* + * Jobs list + *# + + + + #end if + + + + #for i in range(len($values)) + + #if "jobs" not in $urlCompnents + #* + * Processes list + *# + + + + #else + #* + * Jobs list + *# + #set cValue=$values[$i]["infos"] + + + + #end if + + #end for + +
#TitleVersion#MessageLinks
+ + + + + + $values[$i]["id"] + + $values[$i]["title"]#if "version" in $values[$i]#$values[$i]["version"]#else#1.0.0#end if# + #if "status" in $cValue and $cValue["status"]=="successful" + + + + #else + #if "status" in $cValue and $cValue["status"]=="failed" + + + + #end if + #end if + $cValue["jobID"] + $cValue["message"] +
+ +
+ #for j in range(len($cValue["links"])) + #set $cValueLink=$cValue["links"][$j] + #if $cValueLink["href"].count("result")==0 + Delete + #end if + $cValueLink["title"] + #end for +
+
+
+ + #end if + +
$json.dumps(values)
+ + +
+
$openapi["openapi"]["rootUrl"]$(currentUrl).html
+ Last modified: Wed Oct 21 17:23:48 CEST 2020 +
+#if $currentKey=="root" +
+
+ $printIndentification($conf) +
+
+
+#end if + + + + + + + + + + + +#if "cache_file" in $inputs["tmpl"] and $removeCacheFile + +#import os +$(os.remove($inputs["tmpl"]["cache_file"])) +#end if