try with gunicorn

Author: matuskosut

pyproject.toml

@@ -14,11 +14,11 @@ readme = "README.md"
 license = { file = "LICENSE.md" }
 requires-python = ">=3.8"
 dependencies = [
-    "jupyter-server-proxy>=3.2.2",
+    "jupyter-server-proxy>=3.2.2,<4.0.0",
     "pgadmin4",
     "simple-websocket",
     "psycopg",
-    "uwsgi"
+    "gunicorn",
 ]
 classifiers = [
     "Framework :: Jupyter",

setup/config_system.py

@@ -24,6 +24,14 @@
 
 # from pgadmin.utils import env
 
+
+TRUTHY = ("true", "1", "yes", "on", "y")
+
+
+def truthy(val):
+    return str(val).strip('"').strip("'").lower() in TRUTHY
+
+
 ##########################################################################
 # Application settings
 ##########################################################################
@@ -115,11 +123,11 @@
 #       SESSION_DB_PATH, STORAGE_DIR, KERBEROS_CCACHE_DIR, and
 #       AZURE_CREDENTIAL_CACHE_DIR
 
-if (not hasattr(builtins, 'SERVER_MODE')) or builtins.SERVER_MODE is None:
-    SERVER_MODE = True
-else:
-    SERVER_MODE = builtins.SERVER_MODE
-# SERVER_MODE = False
+# if (not hasattr(builtins, 'SERVER_MODE')) or builtins.SERVER_MODE is None:
+#     SERVER_MODE = True
+# else:
+#     SERVER_MODE = builtins.SERVER_MODE
+SERVER_MODE = truthy(os.getenv('PGADMIN_SERVER_MODE'))
 
 # HTTP headers to search for CSRF token when it is not provided in the form.
 # Default is ['X-CSRFToken', 'X-CSRF-Token']
@@ -334,7 +342,7 @@
 # Using PGPASS file
 # postgresql://username@host:port?options=-csearch_path=pgadmin
 ##########################################################################
-CONFIG_DATABASE_URI = ''
+CONFIG_DATABASE_URI = ""
 
 ##########################################################################
 # User account and settings storage
@@ -584,7 +592,7 @@
 # Master password is used to encrypt/decrypt saved server passwords
 # Applicable for desktop mode only
 ##########################################################################
-MASTER_PASSWORD_REQUIRED = True
+MASTER_PASSWORD_REQUIRED = truthy(os.getenv("MASTER_PASSWORD_REQUIRED"))
 
 ##########################################################################
 

src/jupyter_pgadmin_proxy/__init__.py

@@ -6,7 +6,7 @@
 import site
 
 logging.basicConfig(level="INFO")
-logger = logging.getLogger("pgadmin")
+logger = logging.getLogger("pgAdmin4")
 logger.setLevel("INFO")
 
 
@@ -24,16 +24,21 @@ def _get_env(port, base_url):
     logger.info(f"pgAdmin ENV: {base_url}pgadmin4/")
 
     default_email = os.getenv("PGADMIN_DEFAULT_EMAIL", "[email protected]")
-    setup_email = os.getenv("PGADMIN_SETUP_EMAIL", "[email protected]")
+    # setup_email = os.getenv("PGADMIN_SETUP_EMAIL", "[email protected]")
     return {
-        "PGADMIN_SERVER_MODE": 'True',
+        # "PGADMIN_SERVER_MODE": "True",
+        # "PGADMIN_SETUP_EMAIL": setup_email,
+        # "PGADMIN_SETUP_PASSWORD": ".",
         "PGADMIN_DEFAULT_EMAIL": default_email,
-        "PGADMIN_SETUP_EMAIL": setup_email,
-        "PGADMIN_SETUP_PASSWORD": "",
         "PGADMIN_LISTEN_PORT": str(port),
         "APPLICATION_ROOT": f"{base_url}pgadmin4/",
         "SCRIPT_NAME": f"{base_url}pgadmin4/",
         "REMOTE_USER": os.getenv("USER", os.getenv("NB_USER", "nobody")),
+        "PGHOST": os.getenv("PGHOST"),
+        "PGPORT": os.getenv("PGPORT"),
+        "PGDATABASE": os.getenv("PGDATABASE"),
+        "PGUSER": os.getenv("PGUSER"),
+        "PGPASSWORD": os.getenv("PGPASSWORD"),
     }
 
 
@@ -43,7 +48,6 @@ def get_icon_path():
     )
 
 
-
 def get_system_user():
     try:
         user = pwd.getpwuid(os.getuid())[0]
@@ -62,36 +66,32 @@ def run_app():
 
     icon_path = get_icon_path()
     try:
-        executable_name = shutil.which("pgadmin4")
+        executable_name = shutil.which("gunicorn")
     except Exception:
-        executable_name = "pgadmin4"
-    host = "127.0.0.1"
+        executable_name = "gunicorn"
     user = get_system_user()
     try:
         chdir_path = f"{site.getsitepackages()[0]}/pgadmin4"
         if not os.path.exists(chdir_path):
             chdir_path = os.path.dirname(os.path.abspath(__file__))
     except Exception:
         chdir_path = "/"
-    logger.debug(f"[{user}] Icon_path:  {icon_path}")
+    logger.debug(f"[{user}] Icon path: {icon_path}")
     logger.debug(f"[{user}] Launch Command: {executable_name}")
+    logger.debug(f"[{user}] pgAdmin path: {chdir_path}")
     return {
         "command": [
-            # executable_name,
-            "uwsgi",
-            "--http-socket", "127.0.0.1:{port}",
-            "--mount", "{base_url}pgadmin4/=pgAdmin4:app",
-            "--chdir", chdir_path,
-            "--manage-script-name",
-            "--processes", "1",
-            "--threads", "25",
-            "--need-app",
+            executable_name,
+            '-b', '127.0.0.1:{port}',
+            '-e', 'SCRIPT_NAME={base_url}pgadmin',
+            '--chdir', chdir_path,
+            'pgAdmin4:app',
         ],
         "timeout": 300,
         "environment": _get_env,
         "absolute_url": True,
         # "rewrite_response": rewrite_netloc,
-        # "request_headers_override": {"X-Script-Name": "{base_url}pgadmin4/"},
+        # "request_headers_override": {"X-Script-Name": "{base_url}pgadmin"},
         "launcher_entry": {
             "title": "pgAdmin4",
             "icon_path": icon_path