Merge pull request #433 from baobabsoluciones/development

Feature/local dev (#432)

cornflow-server/Dockerfile

@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV TERM linux
 
 # CORNFLOW vars
-ARG CORNFLOW_VERSION=1.0.2
+ARG CORNFLOW_VERSION=1.0.3
 
 # install linux pkg
 RUN apt update -y && apt-get install -y --no-install-recommends \

cornflow-server/cornflow/__init__.py

@@ -1 +0,0 @@
-from .app import create_app

cornflow-server/cornflow/app.py

@@ -1,10 +1,6 @@
 """
 Main file with the creation of the app logic
 """
-from gevent import monkey
-
-monkey.patch_all()
-
 # Full imports
 import os
 import click

cornflow-server/cornflow/cli/service.py

@@ -7,6 +7,7 @@
 
 import click
 import cornflow
+from cornflow.app import create_app
 from cornflow.commands import (
     access_init_command,
     create_user_with_role,
@@ -124,7 +125,7 @@ def init_cornflow_service():
 
     if external_application == 0:
         click.echo("Starting cornflow")
-        app = cornflow.create_app(environment, cornflow_db_conn)
+        app = create_app(environment, cornflow_db_conn)
         with app.app_context():
             path = f"{os.path.dirname(cornflow.__file__)}/migrations"
             migrate = Migrate(app=app, db=db, directory=path)
@@ -156,7 +157,7 @@ def init_cornflow_service():
 
         # execute gunicorn application
         os.system(
-            "/usr/local/bin/gunicorn -c python:cornflow.gunicorn \"cornflow:create_app('$FLASK_ENV')\""
+            "/usr/local/bin/gunicorn -c python:cornflow.gunicorn \"cornflow.app:create_app('$FLASK_ENV')\""
         )
 
     elif external_application == 1:

cornflow-server/cornflow/cli/utils.py

@@ -11,7 +11,7 @@ def get_app():
         warnings.filterwarnings("ignore")
     external = int(os.getenv("EXTERNAL_APP", 0))
     if external == 0:
-        from cornflow import create_app
+        from cornflow.app import create_app
     else:
         sys.path.append("./")
         external_app = os.getenv("EXTERNAL_APP_MODULE", "external_app")

cornflow-server/cornflow/tests/integration/test_cornflowclient.py

@@ -88,7 +88,9 @@ def create_new_case_payload(self, payload):
         self.assertEqual(case["id"], response["id"])
         self.assertEqual(case["name"], payload["name"])
         self.assertEqual(case["description"], payload["description"])
-        case_data = self.client.raw.get_api_for_id("case", response["id"], "data").json()
+        case_data = self.client.raw.get_api_for_id(
+            "case", response["id"], "data"
+        ).json()
         self.assertEqual(case_data["data"], payload["data"])
         return case
 
@@ -282,7 +284,8 @@ def test_get_all_schemas(self):
     def test_get_one_schema(self):
         response = self.client.raw.get_schema("solve_model_dag")
         self.assertEqual(
-            {"error": "User does not have permission to access this dag"}, response.json()
+            {"error": "User does not have permission to access this dag"},
+            response.json(),
         )
 
 

cornflow-server/cornflow/tests/unit/test_cli.py

@@ -2,7 +2,7 @@
 import os
 
 from click.testing import CliRunner
-from cornflow import create_app
+from cornflow.app import create_app
 from cornflow.cli import cli
 from cornflow.models import UserModel
 from cornflow_core.models import (

cornflow-server/cornflow/tests/unit/test_commands.py

@@ -24,6 +24,7 @@
     register_views,
 )
 
+
 from cornflow.commands.dag import register_deployed_dags_command_test
 from cornflow.endpoints import resources
 

cornflow-server/cornflow/tests/unit/test_example_data.py

@@ -8,11 +8,7 @@
 from unittest.mock import patch
 
 
-# Imports from environment
-from cornflow_client import get_pulp_jsonschema, get_empty_schema
-
 # Imports from internal modules
-from cornflow.app import create_app
 from cornflow.tests.const import EXAMPLE_URL, INSTANCE_PATH
 from cornflow.tests.custom_test_case import CustomTestCase
 

cornflow-server/setup.py

@@ -9,7 +9,7 @@
 
 setuptools.setup(
     name="cornflow",
-    version="1.0.2",
+    version="1.0.3",
     author="baobab soluciones",
     author_email="cornflow@baobabsoluciones.es",
     description="Cornflow is an open source multi-solver optimization server with a REST API built using flask.",