Server update

Author: VaghinakDev

requirements.txt

@@ -2,6 +2,7 @@ pydicom>=2.0.0
 boto3>=1.14.53
 requests==2.26.0
 requests-toolbelt>=0.9.1
+aiohttp>=3.8.1
 tqdm==4.64.0
 pillow>=7.2.0
 matplotlib>=3.3.1
@@ -15,7 +16,6 @@ fire==0.4.0
 mixpanel==4.8.3
 pydantic>=1.10.2
 setuptools>=57.4.0
-aiohttp==3.8.1
 email-validator>=1.0.3
 nest-asyncio==1.5.4
 jsonschema==3.2.0

src/superannotate/__init__.py

@@ -2,7 +2,7 @@
 import sys
 import typing
 
-__version__ = "4.4.8"
+__version__ = "4.4.9dev1"
 
 sys.path.append(os.path.split(os.path.realpath(__file__))[0])
 
@@ -29,7 +29,7 @@
 SESSIONS = {}
 
 
-def create_app(apps: typing.List[str]) -> SAServer:
+def create_app(apps: typing.List[str] = None) -> SAServer:
     setup_app(apps)
     server = SAServer()
     return server

src/superannotate/lib/app/interface/cli_interface.py

@@ -270,3 +270,8 @@ def create_server(self, name: str, path: str = None):
         default_files_path = Path(sa_lib.__file__).parent / "app" / "server"
         shutil.copy(default_files_path / "__app.py", path / "app.py")
         shutil.copy(default_files_path / "__wsgi.py", path / "wsgi.py")
+        shutil.copy(default_files_path / "Dockerfile", path / "Dockerfile")
+        shutil.copy(default_files_path / "requirements.txt", path / "requirements.txt")
+        shutil.copy(default_files_path / "README.rst", path / "README.rst")
+        shutil.copy(default_files_path / "run.sh", path / "run.sh")
+        shutil.copytree(default_files_path / "deployment", path / "deployment")

src/superannotate/lib/app/server/Dockerfile

@@ -0,0 +1,30 @@
+FROM tiangolo/uwsgi-nginx:python3.8
+
+
+# Install requirements
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install --upgrade pip
+
+RUN pip install --no-cache-dir -r /tmp/requirements.txt
+
+# Add the app
+COPY . /app
+WORKDIR /app
+
+# Make /app/* available to be imported by Python globally to better support several use cases like Alembic migrations.
+ENV PYTHONPATH=/app
+
+# Move the base entrypoint to reuse it
+RUN mv /entrypoint.sh /uwsgi-nginx-entrypoint.sh
+
+# Copy the entrypoint that will generate Nginx additional configs
+COPY deployment/entrypoint.sh /entrypoint.sh
+COPY deployment/uwsgi.ini /uwsgi.ini
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+# Run the start script provided by the parent image tiangolo/uwsgi-nginx.
+# It will check for an /app/prestart.sh script (e.g. for migrations)
+# And then will start Supervisor, which in turn will start Nginx and uWSGI
+CMD ["/start.sh"]

src/superannotate/lib/app/server/README.rst

@@ -0,0 +1,46 @@
+#! /usr/bin/env sh
+set -e
+
+/uwsgi-nginx-entrypoint.sh
+
+# Get the URL for static files from the environment variable
+USE_STATIC_URL=${STATIC_URL:-'/static'}
+# Get the absolute path of the static files from the environment variable
+USE_STATIC_PATH=${STATIC_PATH:-'/app/static'}
+# Get the listen port for Nginx, default to 80
+USE_LISTEN_PORT=${LISTEN_PORT:-80}
+
+if [ -f /app/nginx.conf ]; then
+    cp /app/nginx.conf /etc/nginx/nginx.conf
+else
+    content_server='server {\n'
+    content_server=$content_server"    listen ${USE_LISTEN_PORT};\n"
+    content_server=$content_server'    location / {\n'
+    content_server=$content_server'        try_files $uri @app;\n'
+    content_server=$content_server'    }\n'
+    content_server=$content_server'    location @app {\n'
+    content_server=$content_server'        include uwsgi_params;\n'
+    content_server=$content_server'        uwsgi_pass unix:///tmp/uwsgi.sock;\n'
+    content_server=$content_server'    }\n'
+    content_server=$content_server"    location $USE_STATIC_URL {\n"
+    content_server=$content_server"        alias $USE_STATIC_PATH;\n"
+    content_server=$content_server'    }\n'
+    # If STATIC_INDEX is 1, serve / with /static/index.html directly (or the static URL configured)
+    if [ "$STATIC_INDEX" = 1 ] ; then
+        content_server=$content_server'    location = / {\n'
+        content_server=$content_server"        index $USE_STATIC_URL/index.html;\n"
+        content_server=$content_server'    }\n'
+    fi
+    content_server=$content_server'}\n'
+    # Save generated server /etc/nginx/conf.d/nginx.conf
+    printf "$content_server" > /etc/nginx/conf.d/nginx.conf
+fi
+
+# For Alpine:
+# Explicitly add installed Python packages and uWSGI Python packages to PYTHONPATH
+# Otherwise uWSGI can't import Flask
+if [ -n "$ALPINEPYTHON" ] ; then
+    export PYTHONPATH=$PYTHONPATH:/usr/local/lib/$ALPINEPYTHON/site-packages:/usr/lib/$ALPINEPYTHON/site-packages
+fi
+
+exec "$@"

src/superannotate/lib/app/server/deployment/entrypoint.sh

@@ -0,0 +1,3 @@
+[uwsgi]
+psqi = wsgi
+callable = app

src/superannotate/lib/app/server/deployment/uwsgi.ini

@@ -0,0 +1 @@
+superannotate

src/superannotate/lib/app/server/requirements.txt

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+########################################################
+
+## Shell Script to Build and Run Docker Image
+
+########################################################
+
+
+echo "build the docker image"
+sudo docker build . -t sa_server
+echo "built docker images and proceeding to delete existing container"
+result=$(docker ps -q -f name=sa_server)
+if [[ $? -eq 0 ]]; then
+  echo "Container exists"
+  sudo docker container rm -f sa_server
+  echo "Deleted the existing docker container"
+else
+  echo "No such container"
+fi
+echo "Deploying the updated container"
+#sudo docker run -d sa_server -p 80:80
+sudo docker run sa_server
+echo "Deploying the container"

src/superannotate/lib/app/server/run.sh

@@ -2,7 +2,8 @@
 from importlib import import_module
 
 
-def setup_app(apps: typing.List[str]):
-    apps.extend(["superannotate.lib.app.server.default_app"])
-    for path in apps:
-        import_module(path)
+def setup_app(apps: typing.List[str] = None):
+    if apps:
+        apps.extend(["superannotate.lib.app.server.default_app"])
+        for path in apps:
+            import_module(path)