update

Author: thomaxxl

Webgenie.md

@@ -0,0 +1,22 @@
+# Build container
+
+```bash
+docker build -f docker/webgenie.Dockerfile -t apilogicserver/webgenie --rm .
+```
+
+# Run
+Without persistence (projects are deleted when container shuts down):
+
+```bash
+docker run -it --rm --name webgenie -p 8080:80 --env-file /opt/webgenai_env apilogicserver/webgenie
+```
+
+The web interface is accessible at http://localhost:8080
+
+To keep the projects on the host, mount a writable folder in the container (`/opt/projects`):
+```bash
+mkdir projects
+chmod 777 projects
+docker run -it --rm --name webgenie -p 8080:80 --env-file /opt/webgenai_env $PWD/projects: apilogicserver/webgenie
+```
+

webgenai/arun.sh

@@ -12,8 +12,6 @@ export UPLOAD_FOLDER="${PROJ_ROOT}/wgupload"
 
 mkdir -p "${UPLOAD_FOLDER}" "${PROJ_ROOT}/wgadmin/nginx"
 
-ln -sfr /opt/webgenai/database/db.sqlite "${PROJ_ROOT}/wgadmin/db.sqlite"
-
 RED='\033[0;31m'
 NC='\033[0m' # No Color
 
@@ -31,8 +29,17 @@ if [[ -z ${APILOGICSERVER_CHATGPT_APIKEY} ]]; then
     export APILOGICSERVER_CHATGPT_APIKEY
 fi
 
+export PYTHONPATH=$PWD
+# Database
+DB_URI=${DB_URI:-"${PROJ_ROOT}/wgadmin/db.sqlite"}
+export SQLALCHEMY_DATABASE_URI="sqlite:///${DB_URI}"
+export WG_SQLALCHEMY_DATABASE_URI="${SQLALCHEMY_DATABASE_URI}"
+if [[ ! -e "${DB_URI}" ]]; then
+    echo "Creating database at ${DB_URI}"
+    python database/manager.py -c
+fi
 # Kill any running project / set "running" to false
-PYTHONPATH=$PWD python database/manager.py -K
+python database/manager.py -K
 
 export GUNICORN_CMD_ARGS=" --worker-tmp-dir=/dev/shm -b 0.0.0.0:${APILOGICPROJECT_PORT} --timeout 60 --workers 3 --threads 2 --reload"
 gunicorn api_logic_server_run:flask_app

webgenai/database/db.sqlite

@@ -14,7 +14,7 @@
 import psutil
 
 
-DB_URL = 'sqlite:////opt/webgenai/database/db.sqlite' # TODO, use env var from config
+DB_URL = os.getenv('WG_SQLALCHEMY_DATABASE_URI', 'sqlite:////opt/webgenai/database/db.sqlite') # TODO, use env var from config
 
 def get_project(project_id: str) -> Project:
     """

webgenai/database/manager.py

@@ -251,6 +251,8 @@ def env(self):
         Method to return the environment variables for the project
         """
         env = os.environ.copy()
+        if 'SQLALCHEMY_DATABASE_URI' in env:
+            del env['SQLALCHEMY_DATABASE_URI']
         return env | {
             "APILOGICPROJECT_SWAGGER_PORT": "8080", #str(self.port),
             "APILOGICPROJECT_PORT": str(self.port),