Release/1.4.0

.github/workflows/docker-CI.yml

@@ -2,7 +2,7 @@ name: Docker Build and Push
 
 on:
   push:
-    branches: [ master, develop, cleaning]
+    branches: [ master, develop, ma-lakhoune,evaluation]
 
 jobs:
   build:

assets/SyncMeta Models/vls.json

@@ -2190,89 +2190,83 @@
                     "name": "Attributes",
                     "type": "KeySelectionValueListAttribute",
                     "list": {
-                        "869849f65db9be737e99bd24": {
-                            "id": "869849f65db9be737e99bd24",
-                            "name": "869849f65db9be737e99bd24",
-                            "key": {
-                                "id": "869849f65db9be737e99bd24[key]",
-                                "name": "",
-                                "value": "Intent Keyword"
-                            },
-                            "value": {
-                                "id": "869849f65db9be737e99bd24[value]",
-                                "name": "",
-                                "value": "string"
-                            }
+                      "e7d374a1e2d32c5e67bc68cc": {
+                        "id": "e7d374a1e2d32c5e67bc68cc",
+                        "name": "e7d374a1e2d32c5e67bc68cc",
+                        "key": {
+                          "id": "e7d374a1e2d32c5e67bc68cc[key]",
+                          "name": "",
+                          "value": "Name"
                         },
-                        "e7d374a1e2d32c5e67bc68cc": {
-                            "id": "e7d374a1e2d32c5e67bc68cc",
-                            "name": "e7d374a1e2d32c5e67bc68cc",
-                            "key": {
-                                "id": "e7d374a1e2d32c5e67bc68cc[key]",
-                                "name": "",
-                                "value": "Intent Label"
-                            },
-                            "value": {
-                                "id": "e7d374a1e2d32c5e67bc68cc[value]",
-                                "name": "",
-                                "value": "string"
-                            }
+                        "value": {
+                          "id": "e7d374a1e2d32c5e67bc68cc[value]",
+                          "name": "",
+                          "value": "string"
+                        }
+                      },
+                      "869849f65db9be737e99bd24": {
+                        "id": "869849f65db9be737e99bd24",
+                        "name": "869849f65db9be737e99bd24",
+                        "key": {
+                          "id": "869849f65db9be737e99bd24[key]",
+                          "name": "",
+                          "value": "Intent Keyword"
                         },
-                        "3e8bfec67da28c354a969b46": {
-                            "id": "3e8bfec67da28c354a969b46",
-                            "name": "3e8bfec67da28c354a969b46",
-                            "key": {
-                                "id": "3e8bfec67da28c354a969b46[key]",
-                                "name": "",
-                                "value": "NLU ID"
-                            },
-                            "value": {
-                                "id": "3e8bfec67da28c354a969b46[value]",
-                                "name": "",
-                                "value": "string"
-                            }
+                        "value": {
+                          "id": "869849f65db9be737e99bd24[value]",
+                          "name": "",
+                          "value": "string"
+                        }
+                      },
+                      "3e8bfec67da28c354a969b46": {
+                        "id": "3e8bfec67da28c354a969b46",
+                        "name": "3e8bfec67da28c354a969b46",
+                        "key": {
+                          "id": "3e8bfec67da28c354a969b46[key]",
+                          "name": "",
+                          "value": "NLU ID"
                         },
-                        "8f8bee572ff26bedbfb46783": {
-                            "id": "8f8bee572ff26bedbfb46783",
-                            "name": "8f8bee572ff26bedbfb46783",
-                            "key": {
-                                "id": "8f8bee572ff26bedbfb46783[key]",
-                                "name": "",
-                                "value": "IsFile"
-                            },
-                            "value": {
-                                "id": "8f8bee572ff26bedbfb46783[value]",
-                                "name": "",
-                                "value": "boolean"
-                            }
+                        "value": {
+                          "id": "3e8bfec67da28c354a969b46[value]",
+                          "name": "",
+                          "value": "string"
+                        }
+                      },
+                      "8f8bee572ff26bedbfb46783": {
+                        "id": "8f8bee572ff26bedbfb46783",
+                        "name": "8f8bee572ff26bedbfb46783",
+                        "key": {
+                          "id": "8f8bee572ff26bedbfb46783[key]",
+                          "name": "",
+                          "value": "IsFile"
                         },
-                        "1ae4674949cfead101f6e8d8": {
-                            "id": "1ae4674949cfead101f6e8d8",
-                            "name": "1ae4674949cfead101f6e8d8",
-                            "key": {
-                                "id": "1ae4674949cfead101f6e8d8[key]",
-                                "name": "",
-                                "value": "FileURL"
-                            },
-                            "value": {
-                                "id": "1ae4674949cfead101f6e8d8[value]",
-                                "name": "",
-                                "value": "string"
-                            }
+                        "value": {
+                          "id": "8f8bee572ff26bedbfb46783[value]",
+                          "name": "",
+                          "value": "boolean"
+                        }
+                      },
+                      "1ae4674949cfead101f6e8d8": {
+                        "id": "1ae4674949cfead101f6e8d8",
+                        "name": "1ae4674949cfead101f6e8d8",
+                        "key": {
+                          "id": "1ae4674949cfead101f6e8d8[key]",
+                          "name": "",
+                          "value": "FileURL"
                         },
-                        "1b9710d3ac9dbdfd3b46110a": {
-                            "id": "1b9710d3ac9dbdfd3b46110a",
-                            "name": "1b9710d3ac9dbdfd3b46110a",
-                            "key": {
-                                "id": "1b9710d3ac9dbdfd3b46110a[key]",
-                                "name": "",
-                                "value": "ErrorMessage"
-                            },
-                            "value": {
-                                "id": "1b9710d3ac9dbdfd3b46110a[value]",
-                                "name": "",
-                                "value": "string"
-                            }
+                        "value": {
+                          "id": "1ae4674949cfead101f6e8d8[value]",
+                          "name": "",
+                          "value": "string"
+                        }
+                      },
+                      "1b9710d3ac9dbdfd3b46110a": {
+                        "id": "1b9710d3ac9dbdfd3b46110a",
+                        "name": "1b9710d3ac9dbdfd3b46110a",
+                        "key": {
+                          "id": "1b9710d3ac9dbdfd3b46110a[key]",
+                          "name": "",
+                          "value": "ErrorMessage"
                         },
                         "90cd8b63ad44500486ddbb02": {
                             "id": "90cd8b63ad44500486ddbb02",
@@ -2316,6 +2310,7 @@
                                 "value": "boolean"
                             }
                         }
+                      }
                     }
                 }
             }

config.json.sample

@@ -6,5 +6,6 @@
     "yjs_resource_path": "<YJS_RESOURCE_PATH>",
     "contact_service_url": "<CONTACT_SERVICE_URL>",
     "sbfManagerHost": "<SBF_MANAGER_HOST>",
-    "rasaEndpoint": "<RASA_NLU>"
+    "rasaEndpoint": "<RASA_NLU>",
+    "pm4botsEndpoint": "<PM4BOTS_ENDPOINT>"
 }

docker-compose.yml

@@ -2,33 +2,33 @@ version: '3'
 
 services:
   mobsos-data-processing:
-    image: registry.tech4comp.dbis.rwth-aachen.de/rwthacis/mobsos-data-processing:master
+    image: ${MOBSOS_DATA_PROCESSING_IMAGE:-registry.tech4comp.dbis.rwth-aachen.de/rwthacis/mobsos-data-processing:master}
     environment:
       MYSQL_HOST: db
-      MYSQL_PORT: ${DATABASE_PORT:-3306}
-      MYSQL_USER: ${DATABASE_USER:-root}
-      MYSQL_PASSWORD: ${DATABASE_PASSWORD:-root}
+      MYSQL_PORT: 3306
+      MYSQL_USER: root
+      MYSQL_PASSWORD: root
       LAS2PEER_PORT: 9013
       BOOTSTRAP: social-bot-manager:9011
     ports:
       - "9013:9013"
     depends_on:
       - social-bot-manager
   social-bot-manager:
-    image: registry.tech4comp.dbis.rwth-aachen.de/rwthacis/social-bot-manager:master
+    image: ${SOCIAL_BOT_MANAGER_IMAGE:-registry.tech4comp.dbis.rwth-aachen.de/rwthacis/social-bot-manager:master}
     environment:
-      DATABASE_NAME: ${DATABASE_NAME:-SBF}
+      DATABASE_NAME: SBF
       DATABASE_HOST: db
-      DATABASE_PORT: ${DATABASE_PORT:-3306}
-      DATABASE_USER: ${DATABASE_USER:-root}
-      DATABASE_PASSWORD: ${DATABASE_PASSWORD:-root}
-      ADDRESS: ${ADDRESS:-127.0.0.1:8080}
-      MONGO_HOST: ${MONGO_HOST:-mongo:8080}
-      MONGO_DB: ${MONGO_DB:-sbf}
-      MONGO_USER: ${MONGO_USER:-admin}
-      MONGO_PASSWORD: ${MONGO_PASSWORD:-password}
-      MONGO_AUTH: ${MONGO_AUTH:-auth}
-      LRS_URL: ${LRL_URL:-127.0.0.1:8080}
+      DATABASE_PORT: 3306
+      DATABASE_USER: root
+      DATABASE_PASSWORD: root
+      WEBCONNECTOR_URL: http://127.0.0.1:8080
+      MONGO_HOST: mongo:8083
+      MONGO_DB: sbf
+      MONGO_USER: admin
+      MONGO_PASSWORD: password
+      MONGO_AUTH: auth
+      LRS_URL: ${LRL_URL:-http://127.0.0.1:8084}
       LRS_AUTH_TOKEN: ${LRL_AUTH_TOKEN:-token} 
     ports:
       - "8080:8080"
@@ -44,29 +44,34 @@ services:
   rasa:
     image: ${RASA_IMAGE:-rasa/rasa:3.3.10-full}
     command: run --enable-api -m models --cors "*" --debug
+    ports:
+      - "5005:5005"
   db:
     image: mysql:8
-    platform: ${TARGETPLATFORM:-linux/amd64}
+    platform: ${MYSQL_TARGETPLATFORM:-linux/amd64}
     command: --default-authentication-plugin=mysql_native_password
     environment:
-      MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD:-root}
-      MYSQL_DATABASE: ${DATABASE_NAME:-SBF}
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: SBF
       MYSQL_INITDB_SQL: /docker-entrypoint-initdb.d/init.sql
     volumes:
-      - ./assets/SBF.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./assets/mysql-init-scripts:/docker-entrypoint-initdb.d/init.sql
+    ports:
+      - "8085:3306"
+    restart: always
 
-  frontend:
-    build: . # or use image: <your image>
-    # image: socialbotframework:latest 
+  frontend:    
+    # build: . 
+    image: ${SBF_IMAGE:-registry.tech4comp.dbis.rwth-aachen.de/rwthacis/sbf-utils:master}
     environment:
-      YJS: ${YJS:-localhost:1234}
-      PORT: ${PORT:-8082}
-      OIDC_CLIENT_ID: ${OIDC_CLIENT_ID:-localtestclient}
+      YJS: localhost:1234
+      PORT: 8082
+      OIDC_CLIENT_ID: localtestclient
       YJS_RESOURCE_PATH: ${YJS_RESOURCE_PATH:-/socket.io}
-      RASA_NLU: ${RASA_NLU:-http://rasa:5005}
-      SBF_MANAGER: ${SBF_MANAGER:-http://localhost:8080/SBFmanager}
+      RASA_NLU: http://rasa:5005
+      SBF_MANAGER: http://localhost:8080/SBFmanager
       CONTACT_SERVICE_URL: ${CONTACT_SERVICE_URL:-http://localhost:8080/contactservice}
-      YJS_PROTOCOL: ${YJS_PROTOCOL:-ws}
+      YJS_PROTOCOL: ws
     depends_on:
       - yjs
       - rasa
@@ -78,5 +83,34 @@ services:
       image: mongo
       restart: always
       environment:
-        MONGO_INITDB_ROOT_USERNAME: ${MONGO_USER:-admin}
-        MONGO_INITDB_ROOT_PASSWORD: ${MONGO_PASSWORD:-password}
+        MONGO_INITDB_ROOT_USERNAME: admin
+        MONGO_INITDB_ROOT_PASSWORD: password
+
+  event-log-generator:
+    image: ${EVENT_LOG_GENERATOR_IMAGE:-registry.tech4comp.dbis.rwth-aachen.de/rwthacis/event-log-generator:master}
+    environment:
+      MYSQL_USER: root
+      MYSQL_PASSWORD: root
+      MYSQL_HOST: db
+      MYSQL_PORT: 3306
+      MYSQL_DATABASE: LAS2PEERMON
+    ports:
+      - "8087:8087"
+    depends_on:
+      - db
+
+  pm4bots:
+    image: ${PM4BOTS_IMAGE:-registry.tech4comp.dbis.rwth-aachen.de/rwthacis/pm4bots:main}
+    environment:
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=root
+      - MYSQL_HOST=db
+      - MYSQL_PORT=3306
+      - MYSQL_EVENTS_DB=LAS2PEERMON
+      - CORS_ORIGIN=http://localhost:8082 # Needed to prevent CORS errors
+      - DEFAULT_BOT_PASSWORD = actingAgent
+      - DEVELOPMENT_MODE = true
+    ports:
+      - "8088:8088"
+    depends_on:
+      - db

docker-entrypoint.sh

@@ -16,6 +16,7 @@ check_if_exists "$YJS_RESOURCE_PATH" "YJS_RESOURCE_PATH"
 check_if_exists "$RASA_NLU" "RASA_NLU"
 check_if_exists "$SBF_MANAGER" "SBF_MANAGER"
 check_if_exists "$CONTACT_SERVICE_URL" "CONTACT_SERVICE_URL"
+check_if_exists "$PM4BOTS_ENDPOINT" "PM4BOTS_ENDPOINT"
 
 #### Set default values ####
 export YJS_HOST=${YJS_HOST:-localhost}
@@ -28,6 +29,7 @@ export OIDC_CLIENT_ID=${OIDC_CLIENT_ID:-localtestclient}
 export RASA_NLU=${RASA_NLU:-http://localhost:5005}
 export SBF_MANAGER=${SBF_MANAGER:-http://localhost:8080}
 export CONTACT_SERVICE_URL=${CONTACT_SERVICE_URL:-http://localhost:8080}
+export PM4BOTS_ENDPOINT=${PM4BOTS_ENDPOINT:-http://localhost:8088}
 
 cp config.json.sample config.json
 
@@ -39,6 +41,20 @@ sed -i "s=<YJS_RESOURCE_PATH>=$YJS_RESOURCE_PATH=g" config.json
 sed -i "s=<CONTACT_SERVICE_URL>=$CONTACT_SERVICE_URL=g" config.json
 sed -i "s=<RASA_NLU>=$RASA_NLU=g" config.json
 sed -i "s=<SBF_MANAGER_HOST>=$SBF_MANAGER=g" config.json
+sed -i "s=<PM4BOTS_ENDPOINT>=$PM4BOTS_ENDPOINT=g" config.json
+
+
+
+
+
+# if BASE_HREF then append it to the index.html head tag
+if [ -n "$BASE_HREF" ]; then
+    file="index.html"
+    tag="head"
+    line_to_add="<base href=\"/$BASE_HREF/\">"
+    sed -i "/<$tag>/a $line_to_add" "$file"
+fi
+
 
 npm run build:prod
 npm run node:prod

index.html

@@ -9,6 +9,7 @@
       name="description"
       content="An intuitive approach to social bot modeling"
     />
+    <base href="" />
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />