cornflow 1.1.1a1__tar.gz → 1.1.2__tar.gz

{cornflow-1.1.1a1 → cornflow-1.1.2}/MANIFEST.in

@@ -3,5 +3,4 @@ include MANIFEST.in
 include README.rst
 include setup.py
 include cornflow/migrations/*
-include cornflow/migrations/versions/*
-include cornflow/static/*
+include cornflow/migrations/versions/*

{cornflow-1.1.1a1/cornflow.egg-info → cornflow-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: cornflow
-Version: 1.1.1a1
+Version: 1.1.2
 Summary: Cornflow is an open source multi-solver optimization server with a REST API built using flask.
 Home-page: https://github.com/baobabsoluciones/cornflow
 Author: baobab soluciones

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/app.py

@@ -46,9 +46,6 @@ def create_app(env_name="development", dataconn=None):
     :return: the application that is going to be running :class:`Flask`
     :rtype: :class:`Flask`
     """
-    if os.getenv("FLASK_ENV", None) is not None:
-        env_name = os.getenv("FLASK_ENV")
-
     dictConfig(log_config(app_config[env_name].LOG_LEVEL))
 
     app = Flask(__name__)
@@ -77,7 +74,6 @@ def create_app(env_name="development", dataconn=None):
     api = Api(app)
     for res in resources:
         api.add_resource(res["resource"], res["urls"], endpoint=res["endpoint"])
-
     if app.config["ALARMS_ENDPOINTS"]:
         for res in alarms_resources:
             api.add_resource(res["resource"], res["urls"], endpoint=res["endpoint"])

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/cli/utils.py

@@ -6,7 +6,7 @@ import warnings
 
 def get_app():
     env = os.getenv("FLASK_ENV", "development")
-    data_conn = os.getenv("DATABASE_URL")
+    data_conn = os.getenv("DATABASE_URL", "sqlite:///cornflow.db")
     if env == "production":
         warnings.filterwarnings("ignore")
     external = int(os.getenv("EXTERNAL_APP", 0))

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/config.py

@@ -22,14 +22,6 @@ class DefaultConfig(object):
     SIGNUP_ACTIVATED = int(os.getenv("SIGNUP_ACTIVATED", 1))
     CORNFLOW_SERVICE_USER = os.getenv("CORNFLOW_SERVICE_USER", "service_user")
 
-    # file support for reports
-    FILE_BACKEND = os.getenv("FILE_BACKEND", "local")
-    UPLOAD_FOLDER = os.getenv(
-        "UPLOAD_FOLDER",
-        os.path.abspath(os.path.join(os.path.dirname(__file__), "./static")),
-    )
-    ALLOWED_EXTENSIONS = os.getenv("ALLOWED_EXTENSIONS", ["pdf", "html"])
-
     # Open deployment (all dags accessible to all users)
     OPEN_DEPLOYMENT = os.getenv("OPEN_DEPLOYMENT", 1)
 
@@ -92,6 +84,7 @@ class DefaultConfig(object):
 
 
 class Development(DefaultConfig):
+
     """ """
 
     ENV = "development"
@@ -102,7 +95,7 @@ class Testing(DefaultConfig):
 
     ENV = "testing"
     SQLALCHEMY_TRACK_MODIFICATIONS = False
-    DEBUG = True
+    DEBUG = False
     TESTING = True
     PROPAGATE_EXCEPTIONS = True
     SECRET_TOKEN_KEY = "TESTINGSECRETKEY"
@@ -126,7 +119,6 @@ class Production(DefaultConfig):
     # needs to be on to avoid getting only 500 codes:
     # and https://medium.com/@johanesriandy/flask-error-handler-not-working-on-production-mode-3adca4c7385c
     PROPAGATE_EXCEPTIONS = True
-    UPLOAD_FOLDER = os.getenv("UPLOAD_FOLDER", "/usr/src/app/static")
 
 
 app_config = {"development": Development, "testing": Testing, "production": Production}

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/endpoints/__init__.py

@@ -37,8 +37,6 @@ from .execution import (
     ExecutionLogEndpoint,
     ExecutionRelaunchEndpoint,
 )
-
-from .reports import ReportEndpoint, ReportDetailsEndpoint, ReportDetailsEditEndpoint
 from .health import HealthEndpoint
 from .instance import (
     InstanceEndpoint,
@@ -49,7 +47,6 @@ from .instance import (
 from .licenses import LicensesEndpoint
 from .main_alarms import MainAlarmsEndpoint
 from .permission import PermissionsViewRoleEndpoint, PermissionsViewRoleDetailEndpoint
-from .reports import ReportEndpoint, ReportDetailsEndpoint
 from .roles import RolesListEndpoint, RoleDetailEndpoint
 from .schemas import SchemaDetailsEndpoint, SchemaEndpoint
 from .tables import TablesEndpoint, TablesDetailsEndpoint
@@ -219,17 +216,6 @@ resources = [
         urls="/table/<string:table_name>/<string:idx>/",
         endpoint="tables-detail",
     ),
-    dict(
-        resource=ReportDetailsEndpoint,
-        urls="/report/<int:idx>/",
-        endpoint="report-detail",
-    ),
-    dict(
-        resource=ReportDetailsEditEndpoint,
-        urls="/report/<int:idx>/edit/",
-        endpoint="report-detail-edit",
-    ),
-    dict(resource=ReportEndpoint, urls="/report/", endpoint="report"),
 ]
 
 

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/endpoints/execution.py

@@ -1,7 +1,7 @@
 """
 External endpoints to manage the executions: create new ones, list all of them, get one in particular
 or check the status of an ongoing one
-These endpoints have different access url, but manage the same data entities
+These endpoints hve different access url, but manage the same data entities
 """
 
 # Import from libraries

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/endpoints/login.py

@@ -34,7 +34,6 @@ class LoginBaseEndpoint(BaseMetaResource):
     """
     Base endpoint to perform a login action from a user
     """
-
     def __init__(self):
         super().__init__()
         self.ldap_class = LDAPBase
@@ -64,7 +63,6 @@ class LoginBaseEndpoint(BaseMetaResource):
         try:
             token = self.auth_class.generate_token(user.id)
         except Exception as e:
-            current_app.logger.error(f"Error in generating user token: {str(e)}")
             raise InvalidUsage(f"Error in generating user token: {str(e)}", 400)
 
         response.update({"token": token, "id": user.id})
@@ -83,11 +81,9 @@ class LoginBaseEndpoint(BaseMetaResource):
         user = self.data_model.get_one_object(username=username)
 
         if not user:
-            current_app.logger.error(f"Error on login user does not exist")
             raise InvalidCredentials()
 
         if not user.check_hash(password):
-            current_app.logger.error(f"Error on login invalid credentials")
             raise InvalidCredentials()
 
         return user
@@ -106,9 +102,7 @@ class LoginBaseEndpoint(BaseMetaResource):
             raise InvalidCredentials()
         user = self.data_model.get_one_object(username=username)
         if not user:
-            current_app.logger.info(
-                f"LDAP user {username} does not exist and is created"
-            )
+            current_app.logger.info(f"LDAP user {username} does not exist and is created")
             email = ldap_obj.get_user_email(username)
             if not email:
                 email = ""
@@ -128,14 +122,10 @@ class LoginBaseEndpoint(BaseMetaResource):
 
         except IntegrityError as e:
             db.session.rollback()
-            current_app.logger.error(
-                f"Integrity error on user role assignment on log in: {e}"
-            )
+            current_app.logger.error(f"Integrity error on user role assignment on log in: {e}")
         except DBAPIError as e:
             db.session.rollback()
-            current_app.logger.error(
-                f"Unknown error on user role assignment on log in: {e}"
-            )
+            current_app.logger.error(f"Unknown error on user role assignment on log in: {e}")
 
         return user
 
@@ -173,9 +163,7 @@ class LoginBaseEndpoint(BaseMetaResource):
         user = self.data_model.get_one_object(username=username)
 
         if not user:
-            current_app.logger.info(
-                f"OpenID user {username} does not exist and is created"
-            )
+            current_app.logger.info(f"OpenID user {username} does not exist and is created")
 
             data = {"username": username, "email": username}
 
@@ -195,11 +183,7 @@ class LoginBaseEndpoint(BaseMetaResource):
 
 def check_last_password_change(user):
     if user.pwd_last_change:
-        if (
-            user.pwd_last_change
-            + timedelta(days=int(current_app.config["PWD_ROTATION_TIME"]))
-            < datetime.utcnow()
-        ):
+        if user.pwd_last_change + timedelta(days=int(current_app.config["PWD_ROTATION_TIME"])) < datetime.utcnow():
             return True
     return False
 
@@ -226,11 +210,7 @@ class LoginEndpoint(LoginBaseEndpoint):
         :rtype: Tuple(dict, integer)
         """
 
-        try:
-            return self.log_in(**kwargs)
-        except Exception as e:
-            current_app.logger.error(f"Final exception: {str(e)}")
-            raise e
+        return self.log_in(**kwargs)
 
 
 class LoginOpenAuthEndpoint(LoginBaseEndpoint):

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/models/__init__.py

@@ -1,7 +1,6 @@
 """
 Initialization file for the models module
 """
-
 from .action import ActionModel
 from .alarms import AlarmsModel
 from .case import CaseModel
@@ -15,4 +14,3 @@ from .role import RoleModel
 from .user import UserModel
 from .user_role import UserRoleModel
 from .view import ViewModel
-from .reports import ReportModel

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/models/execution.py

@@ -64,14 +64,6 @@ class ExecutionModel(BaseDataModel):
         default=EXECUTION_STATE_MESSAGE_DICT[DEFAULT_EXECUTION_CODE],
         nullable=True,
     )
-    reports = db.relationship(
-        "ReportModel",
-        backref="executions",
-        lazy=True,
-        primaryjoin="and_(ExecutionModel.id==ReportModel.execution_id, "
-        "ReportModel.deleted_at==None)",
-        cascade="all,delete",
-    )
 
     def __init__(self, data):
         super().__init__(data)

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/models/meta_models.py

@@ -33,29 +33,17 @@ class EmptyBaseModel(db.Model):
 
         try:
             db.session.commit()
-            current_app.logger.debug(
-                f"Transaction type: {action}, performed correctly on {self}"
-            )
-
+            current_app.logger.debug(f"Transaction type: {action}, performed correctly on {self}")
         except IntegrityError as err:
             db.session.rollback()
             current_app.logger.error(f"Integrity error on {action} data: {err}")
             current_app.logger.error(f"Data: {self.__dict__}")
-
-            if "FOREIGN KEY" in str(err):
-                message = f"Foreign key constraint error while {action} on {self.__class__.__tablename__} table"
-                raise InvalidData(message)
-            else:
-                raise InvalidData(f"Integrity error on {action} with data {self}")
-
+            raise InvalidData(f"Integrity error on {action} with data {self}")
         except DBAPIError as err:
             db.session.rollback()
-            current_app.logger.error(
-                f"Unknown database error on {action} data: {type(err)}"
-            )
+            current_app.logger.error(f"Unknown database error on {action} data: {err}")
             current_app.logger.error(f"Data: {self.__dict__}")
             raise InvalidData(f"Unknown database error on {action} with data {self}")
-
         except Exception as err:
             db.session.rollback()
             current_app.logger.error(f"Unknown error on {action} data: {err}")
@@ -111,9 +99,7 @@ class EmptyBaseModel(db.Model):
         action = "bulk create"
         try:
             db.session.commit()
-            current_app.logger.debug(
-                f"Transaction type: {action}, performed correctly on {cls}"
-            )
+            current_app.logger.debug(f"Transaction type: {action}, performed correctly on {cls}")
         except IntegrityError as err:
             db.session.rollback()
             current_app.logger.error(f"Integrity error on {action} data: {err}")
@@ -134,9 +120,7 @@ class EmptyBaseModel(db.Model):
         action = "bulk create update"
         try:
             db.session.commit()
-            current_app.logger.debug(
-                f"Transaction type: {action}, performed correctly on {cls}"
-            )
+            current_app.logger.debug(f"Transaction type: {action}, performed correctly on {cls}")
         except IntegrityError as err:
             db.session.rollback()
             current_app.logger.error(f"Integrity error on {action} data: {err}")
@@ -152,7 +136,12 @@ class EmptyBaseModel(db.Model):
         return instances
 
     @classmethod
-    def get_all_objects(cls, offset=0, limit=None, **kwargs):
+    def get_all_objects(
+        cls,
+        offset=0,
+        limit=None,
+        **kwargs
+    ):
         """
         Method to get all the objects from the database applying the filters passed as keyword arguments
 
@@ -272,7 +261,7 @@ class TraceAttributesModel(EmptyBaseModel):
         update_date_lte=None,
         offset=0,
         limit=None,
-        **kwargs,
+        **kwargs
     ):
         """
         Method to get all the objects from the database applying the filters passed as keyword arguments

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/schemas/execution.py

@@ -5,7 +5,6 @@ from marshmallow import fields, Schema, validate
 from cornflow.shared.const import MIN_EXECUTION_STATUS_CODE, MAX_EXECUTION_STATUS_CODE
 from .common import QueryFilters, BaseDataEndpointResponse
 from .solution_log import LogSchema, BasicLogSchema
-from .reports import ReportSchemaBase
 
 
 class QueryFiltersExecution(QueryFilters):
@@ -31,7 +30,6 @@ class ConfigSchema(Schema):
     threads = fields.Int(required=False)
     logPath = fields.Str(required=False)
     MIPGap = fields.Float(required=False)
-    report = fields.Raw(required=False)
 
 
 class ConfigSchemaResponse(ConfigSchema):
@@ -97,7 +95,6 @@ class ExecutionDagPostRequest(ExecutionRequest, ExecutionDagRequest):
 
 
 class ExecutionDetailsEndpointResponse(BaseDataEndpointResponse):
-    reports = fields.Nested(ReportSchemaBase, many=True)
     config = fields.Nested(ConfigSchemaResponse)
     instance_id = fields.Str()
     state = fields.Int()

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/shared/const.py

@@ -43,25 +43,6 @@ AIRFLOW_TO_STATE_MAP = dict(
     queued=EXEC_STATE_QUEUED,
 )
 
-# Reports codes
-
-
-class REPORT_STATE:
-    RUNNING = 0
-    CORRECT = 1
-    ERROR = -1
-    UNKNOWN = -5
-    ERROR_NO_QUARTO = -10
-
-
-REPORT_STATE_MSG = {
-    REPORT_STATE.RUNNING: "The report is currently running.",
-    REPORT_STATE.CORRECT: "The report has been solved correctly.",
-    REPORT_STATE.ERROR: "The report has an error.",
-    REPORT_STATE.UNKNOWN: "The report has an unknown error.",
-    REPORT_STATE.ERROR_NO_QUARTO: "The report failed because Quarto was not found.",
-}
-
 # These codes and names are inherited from flask app builder in order to have the same names and values
 # as this library that is the base of airflow
 AUTH_DB = 1
@@ -141,6 +122,4 @@ BASE_PERMISSION_ASSIGNATION = [
 
 EXTRA_PERMISSION_ASSIGNATION = [
     (VIEWER_ROLE, PUT_ACTION, "user-detail"),
-    (VIEWER_ROLE, GET_ACTION, "report"),
-    (PLANNER_ROLE, GET_ACTION, "report"),
 ]

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/shared/exceptions.py

@@ -21,10 +21,7 @@ class InvalidUsage(Exception):
     def __init__(self, error=None, status_code=None, payload=None, log_txt=None):
         Exception.__init__(self, error)
         if error is not None:
-            if isinstance(error, Exception):
-                self.error = str(error)
-            else:
-                self.error = error
+            self.error = error
         if status_code is not None:
             self.status_code = status_code
         self.payload = payload
@@ -125,21 +122,10 @@ class ConfigurationError(InvalidUsage):
     error = "No authentication method configured on the server"
 
 
-class FileError(InvalidUsage):
-    """
-    Exception used when there is an error regarding the upload of a file to the server
-    """
-
-    status_code = 400
-    error = "Error uploading the file"
-
-
 INTERNAL_SERVER_ERROR_MESSAGE = "500 Internal Server Error"
-INTERNAL_SERVER_ERROR_MESSAGE_DETAIL = (
-    "The server encountered an internal error and was unable "
-    "to complete your request. Either the server is overloaded or "
-    "there is an error in the application."
-)
+INTERNAL_SERVER_ERROR_MESSAGE_DETAIL = "The server encountered an internal error and was unable " \
+                                       "to complete your request. Either the server is overloaded or " \
+                                       "there is an error in the application."
 
 
 def initialize_errorhandlers(app):
@@ -201,7 +187,10 @@ def initialize_errorhandlers(app):
             status_code = error.code or status_code
             error_msg = f"{status_code} {error.name or INTERNAL_SERVER_ERROR_MESSAGE}"
             error_str = f"{error_msg}. {str(error.description or '') or INTERNAL_SERVER_ERROR_MESSAGE_DETAIL}"
-            response_dict = {"message": error_msg, "error": error_str}
+            response_dict = {
+                "message": error_msg,
+                "error": error_str
+            }
             response = jsonify(response_dict)
 
         elif app.config["ENV"] == "production":
@@ -213,7 +202,7 @@ def initialize_errorhandlers(app):
 
             response_dict = {
                 "message": INTERNAL_SERVER_ERROR_MESSAGE,
-                "error": INTERNAL_SERVER_ERROR_MESSAGE_DETAIL,
+                "error": INTERNAL_SERVER_ERROR_MESSAGE_DETAIL
             }
             response = jsonify(response_dict)
         else:

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/tests/const.py

@@ -14,7 +14,6 @@ INSTANCE_URL = PREFIX + "/instance/"
 INSTANCE_MPS = _get_file("./data/test_mps.mps")
 INSTANCE_GC_20 = _get_file("./data/gc_20_7.json")
 INSTANCE_FILE_FAIL = _get_file("./unit/test_instances.py")
-INSTANCE_TSP = _get_file("./data/tsp_instance.json")
 
 EXECUTION_PATH = _get_file("./data/new_execution.json")
 BAD_EXECUTION_PATH = _get_file("./data/bad_execution.json")
@@ -35,12 +34,6 @@ CASE_INSTANCE_URL = PREFIX + "/case/instance/"
 FULL_CASE_PATH = _get_file("./data/full_case_raw.json")
 FULL_CASE_LIST = [FULL_CASE_PATH, _get_file("./data/full_case_raw_2.json")]
 
-REPORT_PATH = _get_file("./data/new_report.json")
-REPORT_HTML_FILE_PATH = _get_file("./data/new_report.html")
-REPORT_PDF_FILE_PATH = _get_file("./data/new_report_2.pdf")
-BAD_REPORT_PATH = _get_file("./data/bad_report.json")
-REPORT_URL = PREFIX + "/report/"
-
 JSON_PATCH_GOOD_PATH = _get_file("./data/json_patch_good.json")
 JSON_PATCH_BAD_PATH = _get_file("./data/json_patch_bad.json")
 FULL_CASE_JSON_PATCH_1 = _get_file("./data/full_case_patch.json")

cornflow-1.1.1a1/cornflow/tests/custom_live_server.py → cornflow-1.1.2/cornflow/tests/custom_liveServer.py

@@ -39,9 +39,7 @@ class CustomTestCaseLive(LiveServerTestCase):
         if create_all:
             db.create_all()
         access_init_command(False)
-        register_deployed_dags_command_test(
-            verbose=False, dags=["solve_model_dag", "gc", "timer", "tsp"]
-        )
+        register_deployed_dags_command_test(verbose=False)
         user_data = dict(
             username="testname",
             email="test@test.com",

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/tests/custom_test_case.py

@@ -90,8 +90,8 @@ class CustomTestCase(TestCase):
         self.roles_with_access = []
 
     @staticmethod
-    def get_header_with_auth(token, content_type="application/json"):
-        return {"Content-Type": content_type, "Authorization": "Bearer " + token}
+    def get_header_with_auth(token):
+        return {"Content-Type": "application/json", "Authorization": "Bearer " + token}
 
     def create_user(self, data):
         return self.client.post(
@@ -169,6 +169,7 @@ class CustomTestCase(TestCase):
         self.assertEqual(row.id, response.json["id"])
 
         for key in self.get_keys_to_check(payload):
+            getattr(row, key)
             if key in payload:
                 self.assertEqual(getattr(row, key), payload[key])
         return row.id

{cornflow-1.1.1a1 → cornflow-1.1.2}/cornflow/tests/integration/test_commands.py

@@ -3,7 +3,7 @@ from flask import current_app
 from cornflow.commands.dag import register_deployed_dags_command
 from cornflow.models import DeployedDAG
 from cornflow.tests.const import PUBLIC_DAGS
-from cornflow.tests.custom_live_server import CustomTestCaseLive
+from cornflow.tests.custom_liveServer import CustomTestCaseLive
 
 
 class TestCornflowCommands(CustomTestCaseLive):