master branch update to 1.3

.gitattributes

@@ -1 +1,3 @@
-* text=auto
+* text=auto
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
+

README.md

@@ -16,6 +16,8 @@
 [[English](README_en.md)]
 [[한국어](README.md)]
 
+MacOS / Linux 사용자는 본 문서 하단의 설치 가이드를 따라 진행하시면 Brightics Studio를 사용하실 수 있습니다.
+
 ## Overview
 
 ---
@@ -43,7 +45,7 @@
 ### Prerequisite
 #
 * 데이터베이스와 상호 작용하는 일부 기능에는 [Oracle Instant Client](http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html) 와 같은 클라이언트 라이브러리가 필요합니다.
-* Apple M1 processor 기반 장치에서는 동작하지 않을 수 있습니다. [Docker Support](#docker-support)를 참고하여 Brightics Studio Docker 이미지를 사용할 수 있습니다.
+* [Installation - docker](#installation---docker)를 참고하여 Brightics Studio Docker 이미지를 사용할 수 있습니다.
 
 ### Installation - release file
 #
@@ -55,7 +57,7 @@
 
       ```
       BrighticsStudio-\<version\>-\<os name\>.exe : for windows
-      BrighticsStudio-\<version\>-\<os name\>.sh : for linux and mac
+      BrighticsStudio-\<version\>-\<os name\>.sh : for linux (Ubuntu)
       ```  
 
       디렉토리의 세부 사항은 다음과 같습니다:  
@@ -74,7 +76,7 @@
       ```
       Brightics-Studio-Launcher.exe : Launcher for windows
       start-brightics.cmd : for windows
-      start-brightics.sh : for linux and mac
+      start-brightics.sh : for linux (Ubuntu)
       ```
 
       > **Notes**
@@ -87,36 +89,37 @@
 
       새 버전이 출시되면 아래 파일을 최신 버전의 brightics-studio로 이동하여 데이터와 프로젝트를 유지해야 합니다.
 
-        ```
-        /brightics-studio/visual-analytics/brightics.db
-        /brightics-studio/brightics-server/data/*
-        ```
+      ```
+      /brightics-studio/visual-analytics/brightics.db
+      /brightics-studio/brightics-server/data/*
+      ```
 
   * Run
 
       Brightics Studio는 start-brightics.cmd(또는 start-brightics.sh) 실행 후 Chrome 브라우저에 팝업됩니다. 
-
       Brightics Studio가 자동으로 팝업되지 않는 경우 수동으로 http://127.0.0.1:3000 으로 이동하여 Brightics Studio를 사용하십시오.  
-
-      ※ macOS 에서 http://127.0.0.1:3000에 접속이 되지 않는 경우 [Brightics AI 포탈 FAQ](https://www.brightics.ai/community/FAQ) 의 "Brightics Studio Mac 버전 설치 오류가 발생합니다."를 확인해주세요.
-
-  * **Optional** : macOS 사용자는 [Homebrew](https://brew.sh/) 를 사용하여 [graphviz](http://graphviz.org/download/) 를 설치해야 Decision Tree의 트리 그림을 그릴 수 있습니다.   
-  하지만 설치가 쉽지 않다면 넘어가도 됩니다.
-      ```
-      brew install graphviz
-      ```  
-
 
 ### Installation - docker
 #
   * Docker
 
       작업환경에 [Docker](https://www.docker.com/get-started/)를 설치합니다. 
+      <img src="docs/images/docker.png"></img>
 
   * Docker Image  
 
-      Brightics Studio Docker 이미지는 [Docker Hub](https://hub.docker.com/r/brightics/studio) 에서 제공됩니다. [Docker Hub](https://hub.docker.com/r/brightics/studio) 페이지로 이동하여 지시에 따라 설치합니다.
+      Brightics Studio Docker 이미지는 [Docker Hub](https://hub.docker.com/r/brightics/studio) 에서 제공됩니다.
+
+      실행
+      ```
+      $ docker volume create brightics
+      $ docker run -d -p 3000:3000 --privileged=true -v brightics:/brightics-studio/userdata --name brightics brightics/studio:latest
+      ```      
 
+      중지
+      ```
+      $ docker stop brightics
+      ```      
 
 ## Contact us
 ---

README_en.md

@@ -16,6 +16,8 @@
 [[English](README_en.md)]
 [[한국어](README.md)]
 
+MacOS / Linux users can use Brightics Studio by following the installation guide below.
+
 ## Overview
 
 ---
@@ -42,7 +44,7 @@ You can install Brightics Studio using a release file or a docker image.
 ### Prerequisite
 #
 * Some functions which interact with database need client libraries such as [Oracle Instant Client](http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html)
-* It may not work on devices based on Apple M1 processor. You can use the Brightics Studio Docker image by referring to [Docker Support](#docker-support).
+* You can use the Brightics Studio Docker image by referring to [Installation - docker](#installation---docker).
 
 
 ### Installation - release file
@@ -55,7 +57,7 @@ You can install Brightics Studio using a release file or a docker image.
 
       ```
       BrighticsStudio-\<version\>-\<os name\>.exe : for windows
-      BrighticsStudio-\<version\>-\<os name\>.sh : for linux and mac
+      BrighticsStudio-\<version\>-\<os name\>.sh : for linux (Ubuntu)
       ```
 
       Details of the directory is as follows:
@@ -75,7 +77,7 @@ You can install Brightics Studio using a release file or a docker image.
       ```
       Brightics-Studio-Launcher.exe : Launcher for windows
       start-brightics.cmd : for windows
-      start-brightics.sh : for linux and mac
+      start-brightics.sh : for linux (Ubuntu)
       ```
 
       > **Notes**
@@ -99,24 +101,28 @@ You can install Brightics Studio using a release file or a docker image.
       Brightics Studio pops up on Chrome browser after launching start-brightics.cmd (or start-brightics.sh).   
       Please go to http://127.0.0.1:3000 manually to use Brightics Studio if it does not pop up automatically.
 
-
-  * **Optional** : macOS users have to install [graphviz](http://graphviz.org/download/) using [Homebrew](https://brew.sh/) to plot tree figures of Decision Tree.  
-  However, if it is not easy to install it just skip it.
-      ```
-      brew install graphviz
-      ```
-
 ### Installation - docker
 #
   * Docker
 
       Install [Docker](https://www.docker.com/get-started/) in user's working environment.
+	  <img src="docs/images/docker.png"></img>
 
 
   * Docker Image  
 
-      Docker image is available on [Docker Hub](https://hub.docker.com/r/brightics/studio). Move to [Docker Hub](https://hub.docker.com/r/brightics/studio) page and follow the instructions to install.
+      Docker image is available on [Docker Hub](https://hub.docker.com/r/brightics/studio).
+
+      Run
+      ```
+      $ docker volume create brightics
+      $ docker run -d -p 3000:3000 --privileged=true -v brightics:/brightics-studio/userdata --name brightics brightics/studio:latest
+      ```      
 
+      Stop
+      ```
+      $ docker stop brightics
+      ```      
 
 ## Contact us
 ---

agent/brightics-agent/pom.xml

@@ -8,6 +8,12 @@
         <version>3.5.0</version>
     </parent>
     <artifactId>brightics-agent</artifactId>
+    <repositories>
+        <repository>
+            <id>pentaho-omni</id>
+            <url>http://nexus.sdsdev.co.kr:8081/repository/pentaho-omni/</url>
+        </repository>
+    </repositories>
     <build>
         <plugins>
             <plugin>

api-server/brightics-server/bin/start-server.cmd

@@ -6,8 +6,11 @@ SET BRIGHTICS_SERVER_HOME=%~dp0
 SET BRIGHTICS_HOME=%BRIGHTICS_SERVER_HOME%..
 SET USER_ID=%1
 SET ACCESS_TOKEN=%2
-SET PATH=%PATH%;%BRIGHTICS_HOME%\lib\graphviz\bin;%BRIGHTICS_SERVER_HOME%
+SET PATH=%PATH%;%BRIGHTICS_HOME%\lib\graphviz\bin;%BRIGHTICS_SERVER_HOME%;%BRIGHTICS_HOME%\lib\python\Scripts
 SET HADOOP_HOME=%BRIGHTICS_HOME%\lib\hadoop
+SET JAVA_HOME=%BRIGHTICS_HOME%\lib\java
+SET PYTHONPATH=%BRIGHTICS_HOME%\brightics-server\functions\python
+SET BRIGHTICS_PYTHON_PATH=%BRIGHTICS_HOME%\lib\python\python.exe
 
 if "%USER_ID%"=="" (
 	ECHO Please enter USER_ID
@@ -22,7 +25,7 @@ if "%ACCESS_TOKEN%"=="" (
 
 SET _JAVA_OPTIONS=
 SET GC_OPTS=-XX:+UseConcMarkSweepGC -verbose:gc --Xloggc:"%BRIGHTICS_SERVER_HOME%gc.out" -XX:+CMSClassUnloadingEnabled
-SET JAVA_OPTS=-Xms1g -Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir="%BRIGHTICS_SERVER_HOME%tmp" -Dbrightics.local.token=%ACCESS_TOKEN% -Dbrightics.local.user=%USER_ID% -Dfile.encoding=utf-8 
+SET JAVA_OPTS=-Xms1g -Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir="%BRIGHTICS_SERVER_HOME%tmp" -Dbrightics.local.token=%ACCESS_TOKEN% -Dbrightics.local.user=%USER_ID% -Dfile.encoding=utf-8 -Djava.library.path=%HADOOP_HOME%\bin
 SET MAIN=org.springframework.boot.loader.JarLauncher -Dspring.config.location="%BRIGHTICS_SERVER_HOME%BOOT-INF\classes\" 
 
 IF EXIST "%BRIGHTICS_SERVER_HOME%tmp" (
@@ -31,7 +34,7 @@ IF EXIST "%BRIGHTICS_SERVER_HOME%tmp" (
 
 mkdir "%BRIGHTICS_SERVER_HOME%tmp"
 
-java %JAVA_OPTS% -classpath . %MAIN% 
+"%JAVA_HOME%\bin\java" %JAVA_OPTS% -classpath . %MAIN%
 
 :usage
 echo Usage: %~n0 USER_ID ACCESS_TOKEN

api-server/brightics-server/bin/start-server.sh

@@ -11,27 +11,30 @@ get_abs_script_path
 export appdir
 export BRIGHTICS_SERVER_HOME=$appdir
 export BRIGHTICS_DATA_ROOT=$BRIGHTICS_SERVER_HOME/data
+export BRIGHTICS_PYTHON_PATH=$BRIGHTICS_SERVER_HOME/../lib/brightics_python_env/bin/python
+export BRIGHTICS_FUNCTION_HOME=$BRIGHTICS_SERVER_HOME/functions
+export PYTHONPATH=$BRIGHTICS_FUNCTION_HOME/python
 
 PIDFILE=brightics-server.pid
 
 GC_OPTS="-XX:+UseConcMarkSweepGC -verbose:gc -XX:+PrintGCTimeStamps -Xloggc:$appdir/gc.out -XX:+CMSClassUnloadingEnabled "
 
-JAVA_OPTS="-Xms1g -Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=$BRIGHTICS_SERVER_HOME/tmp -Dbrightics.local.user=$1 -Dbrightics.local.token=$2 -Dfile.encoding=utf-8"
+JAVA_OPTS="-Xms1g -Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Djava.io.tmpdir=$BRIGHTICS_SERVER_HOME/tmp -Dbrightics.local.user=$1 -Dbrightics.local.token=$2 -Dfile.encoding=uft-8"
 
 DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6007"
 
 MAIN="org.springframework.boot.loader.JarLauncher -Dspring.config.location=$appdir/BOOT-INF/classes/"
 
 if [ -z "$JAVA_HOME" ]; then
-	echo 'JAVA_HOME is not found.'
-	exit 1
+  echo 'JAVA_HOME is not found.'
+  exit 1
 fi
 
 if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE"); then
    echo 'Brightics server is already running'
    exit 1
 fi
 
-exec java $JAVA_OPTS $MAIN &>/dev/null &
+exec $JAVA_HOME/bin/java $JAVA_OPTS $MAIN &>/dev/null &
 
-echo $! > $PIDFILE
+echo $! > $PIDFILE

api-server/brightics-server/pom.xml

@@ -18,7 +18,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-parent</artifactId>
-                <version>2.1.0.RELEASE</version>
+                <version>2.6.8</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -48,8 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.session</groupId>
-            <artifactId>spring-session</artifactId>
-            <version>1.3.3.RELEASE</version>
+            <artifactId>spring-session-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -62,7 +61,7 @@
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
-            <version>2.1.0.RELEASE</version>
+            <version>2.5.1.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.codehaus.jackson</groupId>
@@ -140,11 +139,28 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-core</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
             <version>5.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>logback-core</artifactId>
+                    <groupId>ch.qos.logback</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.samsung.sds.brightics</groupId>
@@ -159,6 +175,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>2.1.214</version>
         </dependency>
         <dependency>
             <groupId>com.samsung.sds.brightics</groupId>
@@ -192,6 +209,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.13.Final</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -200,7 +226,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.0.2.RELEASE</version>
+                <version>2.6.8</version>
                 <executions>
                     <execution>
                         <goals>

api-server/brightics-server/src/main/java/com/samsung/sds/brightics/server/Application.java

@@ -1,27 +1,29 @@
-/*
-    Copyright 2019 Samsung SDS
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
+/*
+    Copyright 2019 Samsung SDS
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
 package com.samsung.sds.brightics.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.DependsOn;
 
 @SpringBootApplication
+@EnableJpaAuditing
 public class Application {