Bump hibernate-validator from 4.1.0.Final to 5.3.5.Final in /qbecore

.gitignore

@@ -87,3 +87,9 @@ Knowage-Python/pythonwebservice/logs/
 Knowage-Python/pythonwebservice/cert.pem
 
 Knowage-Python/pythonwebservice/key.pem
+
+Knowage-R/configs.R
+
+Knowage-R/.Rhistory
+
+Knowage-R/.RData

Knowage-Python/.dockerignore

@@ -0,0 +1,6 @@
+.git
+.idea
+__pycache__
+*.pyc
+*.pyo
+*.pyd

Knowage-Python/Dockerfile

@@ -0,0 +1,11 @@
+FROM python:3.7
+
+COPY . .
+
+RUN pip install -r requirements.txt
+
+WORKDIR /pythonwebservice
+
+EXPOSE 5000
+
+CMD [ "python3", "knowage-python.py" ]

Knowage-Python/pythonwebservice/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+

Knowage-Python/pythonwebservice/app/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+

Knowage-Python/pythonwebservice/app/services/__init__.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 from flask import Flask
 from flask_cors import CORS
 

Knowage-Python/pythonwebservice/app/services/dataset_service.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Knowage, Open Source Business Intelligence suite
 # Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
 #

Knowage-Python/pythonwebservice/app/services/editmode_service.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Knowage, Open Source Business Intelligence suite
 # Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
 #
@@ -45,7 +47,7 @@ def python_html():
         python_widget.script = python_widget.script.replace("$P{" + d + "}", "drivers_.get(\'" + d + "\')")
     #retrieve dataset
     if python_widget.dataset_name != None:
-        dataset_file = "tmp/" + python_widget.dataset_name + ".pckl"
+        dataset_file = constants.TMP_FOLDER + python_widget.dataset_name + ".pckl"
         df = utils.getDatasetAsDataframe(python_widget)
         df.to_pickle(dataset_file)
         python_widget.script = "import pandas as pd\n" + python_widget.dataset_name + " = pd.read_pickle(\"" + dataset_file + "\")\n" + python_widget.script

Knowage-Python/pythonwebservice/app/services/viewmode_service.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Knowage, Open Source Business Intelligence suite
 # Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
 #

Knowage-Python/pythonwebservice/app/utilities/__init__.py

@@ -0,0 +1,2 @@
+#!/usr/bin/env python3
+

Knowage-Python/pythonwebservice/app/utilities/constants.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 EDIT_PYTHON_SCRIPTS = "EditPythonScripts"
 TMP_FOLDER = "app/services/tmp/"
 LOG_FILE = "logs/knowage-python.log"

Knowage-Python/pythonwebservice/app/utilities/cuncurrency_manager.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 from threading import Lock
 
 active_servers = {} #{widget_id : bokeh_server}

Knowage-Python/pythonwebservice/app/utilities/objects.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Knowage, Open Source Business Intelligence suite
 # Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
 #
@@ -63,6 +65,10 @@ def widget_id(self):
     def script(self):
         return self._script
 
+    @property
+    def output_variable(self):
+        return self._output_variable
+
     @script.setter
     def script(self, value):
         self._script = value

Knowage-Python/pythonwebservice/app/utilities/security.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Knowage, Open Source Business Intelligence suite
 # Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
 #

Knowage-Python/pythonwebservice/app/utilities/utils.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Knowage, Open Source Business Intelligence suite
 # Copyright (C) 2016 Engineering Ingegneria Informatica S.p.A.
 #

Knowage-Python/pythonwebservice/knowage-python.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import sys
 from app.services import create_app
 from app.utilities import constants

Knowage-Python/requirements.txt

@@ -0,0 +1,8 @@
+bokeh==1.3.4
+Flask==1.1.1
+Flask-Cors==3.0.8
+pandas==0.25.1
+pybase64==1.0.1
+PyJWT==1.7.1
+requests==2.22.0
+tornado==6.0.3

Knowage-Python/setup.py

@@ -1,5 +1,12 @@
+#!/usr/bin/env python3
+
 import setuptools
 
+def parse_requirements(filename):
+    """ load requirements from a pip requirements file """
+    lineiter = (line.strip() for line in open(filename))
+    return [line for line in lineiter if line and not line.startswith("#")]
+
 with open("README.md", "r") as f:
     long_description = f.read()
 
@@ -17,16 +24,7 @@
     package_data={
         '': ['*.html'],
     },
-    install_requires=[
-          'flask',
-          'flask_cors',
-          'pybase64',
-          'bokeh',
-          'tornado',
-          'requests',
-          'pandas',
-          'pyjwt',
-      ],
+    install_requires = parse_requirements('requirements.txt'),
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU Affero General Public License v3",

Knowage-R/configs.R

@@ -0,0 +1 @@
+hmac_key <- "abc123"

Knowage-R/constants.R

@@ -0,0 +1,2 @@
+knowage_address <- "0.0.0.0"
+r_webservice_port <- 5001

Knowage-R/knowage-r.R

@@ -0,0 +1,4 @@
+source("constants.R")
+
+pr <- plumber::plumb("webservice.R")
+pr$run(port = r_webservice_port, host = knowage_address, swagger = FALSE)

Knowage-R/utils.R

@@ -0,0 +1,69 @@
+library(openssl)
+library(jose)
+source("configs.R")
+
+get_libraries <- function(){
+  str(allPackages <- installed.packages(.Library, priority = "high"))
+  lib_matrix <- allPackages[, c(1,3:5)]
+  lib_info <- lib_matrix[,c(1,2)]
+  lib_info
+}
+
+resolve_drivers <- function(script, drivers){
+  for(name in names(drivers)) {
+    value <- drivers[[name]]
+    original <- paste0('\\$P\\{', name , '\\}')
+    final <- paste0('drivers_[[\\"', name, '\\"]]')
+    script <- gsub(original,final,script)
+  }
+  script
+}
+
+build_parameters <- function(parameters){
+  to_return <- list()
+  if(length(parameters) > 0) {
+    parameters_df <- as.data.frame(parameters)
+    for(i in 1:nrow(parameters_df)) {
+      row <- parameters_df[i,]
+      name <- row[["name"]]
+      value <- row[["value"]]
+      type <- row[["type"]]
+      if(value == "") {
+        value <- row[["defaultValue"]]
+      }
+      if(type == "Number") {
+        value <- as.numeric(value)
+      }
+      to_return[[name]] <- value
+    }
+  }
+  to_return
+}
+
+resolve_parameters <- function(script, parameters){
+  for(name in names(parameters)) {
+    value <- parameters[[name]]
+    original <- paste0('\\$P\\{', name , '\\}')
+    final <- paste0('parameters_[[\\"', name, '\\"]]')
+    script <- gsub(original,final,script)
+  }
+  script
+}
+
+decode_jwt_token <- function(script){
+  token <- jwt_decode_hmac(script, secret = hmac_key)
+  token
+}
+
+get_script_from_token <- function(token){
+  script <- token[["script"]]
+  script
+}
+
+is_dataset_request_authorized <- function(token){
+  expirationTime <- token[["exp"]]
+  now <- as.numeric(as.POSIXct(Sys.time()))
+  if (now > expirationTime)
+    FALSE
+  TRUE
+}

Knowage-R/webservice.R

@@ -0,0 +1,58 @@
+library("jsonlite")
+library("base64enc")
+source("utils.R")
+
+#' @post /img
+function(dataset, dataset_name=NULL, script, drivers, output_variable){
+  env <- new.env()
+  analytical_drivers <- fromJSON(drivers)
+  env$drivers_ <- analytical_drivers
+  script <- resolve_drivers(script, analytical_drivers)
+  if (!is.null(dataset_name)) {
+    script <- gsub(dataset_name,"df_",script)
+    env$df_ <- as.data.frame(fromJSON(dataset))
+  }
+  eval(parse(text=script), envir = env)
+  enc_img <- base64encode(output_variable)
+  if (file.exists(output_variable))
+    file.remove(output_variable)
+  enc_img
+}
+
+#' @post /html
+function(dataset, dataset_name=NULL, script, drivers, output_variable){
+  env <- new.env()
+  analytical_drivers <- fromJSON(drivers)
+  env$drivers_ <- analytical_drivers
+  script <- resolve_drivers(script, analytical_drivers)
+  if (!is.null(dataset_name)) {
+    script <- gsub(dataset_name,"df_",script)
+    env$df_ <- as.data.frame(fromJSON(dataset))
+  }
+  script <- gsub(output_variable,"env$output_variable_",script)
+  eval(parse(text=script), envir = env)
+  html <- env$output_variable_
+  html
+}
+
+#' @post /dataset
+function(script, df_name, parameters){
+  env <- new.env()
+  token <- decode_jwt_token(script)
+  if (!is_dataset_request_authorized(token))
+    stop("Unauthorized")
+  decoded_script <- get_script_from_token(token)
+  env$parameters_ <- build_parameters(parameters)
+  decoded_script <- resolve_parameters(decoded_script, env$parameters_)
+  decoded_script <- gsub(df_name, "df_", decoded_script)
+  env$df_ <- data.frame()
+  eval(parse(text=decoded_script), envir = env)
+  env$df_
+}
+
+#' @get /libraries
+#' @get /dataset/libraries
+function(){
+  lib <- get_libraries()
+  lib
+}

ROADMAP.md

@@ -39,9 +39,7 @@ The following list of features is planned to be addressed in the short term, by
 
 The following list of features is planned to be addressed in the medium term, by Q2 2020 (release 7.3):
 
-* from data exploration tool (QbE) to cockpit designer in a seamless way 
-
-* AWS S3 compatibility
+* from data exploration tool (QbE) to cockpit designer in a seamless way
 
 * NGSI-LD compatibility
 

cas/src/main/webapp/META-INF/context.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Context >
-	<ResourceLink name="hmacKey" global="hmacKey" type="java.lang.String"/>
-</Context>
+	<ResourceLink global="hmacKey" name="hmacKey" type="java.lang.String"/>
+
+ </Context>

knowage-ce-parent/pom.xml

@@ -24,15 +24,16 @@
 			<url>https://www.license4j.com/maven/</url>
 			<layout>default</layout>
 		</repository>
-		<!-- We use boundlessgeo.com because it contains hibernate-spatial-1.1.1.jar, needed by Qbe core; this library is not available on Maven Central -->
-		<repository>
-			<id>boundlessgeo.com</id>
-			<url>https://repo.boundlessgeo.com/main/</url>
-		</repository>
+
 		<!-- We use osgeo.org because it contains geotools 2.7.5, needed by knowage DAO; this library is not available on Maven Central -->
 		<repository>
 			<id>osgeo.org</id>
-			<url>http://download.osgeo.org/webdav/geotools/</url>
+			<url>https://repo.osgeo.org/repository/release/</url>
+		</repository>
+			<!-- We use Maven Geo-Solutions for hibernate-spatial-1.1.1.jar, needed by Qbe core; this library is not available on Maven Central -->
+		<repository>
+			<id>geo-solutions</id>
+			<url>https://maven.geo-solutions.it/</url>
 		</repository>
 		<!-- We use Enonic Repository because it contains simplecaptcha 1.2.1 library, needed by knowage CE core; this library is not available on Maven Central -->
 		<repository>