cornflow 1.1.1a1__py3-none-any.whl → 1.1.2__py3-none-any.whl

cornflow/tests/integration/test_cornflowclient.py

@@ -1,17 +1,17 @@
 """
-Main script to run the integration tests of cornflow-server
-"""
 
+"""
+# Full imports
 import json
+import pulp
 import logging as log
-import os
 import time
-from typing import Callable, Any
 
-import pulp
+# Imports from environment
 from cornflow_client import CornFlowApiError
 from cornflow_client.constants import INSTANCE_SCHEMA, SOLUTION_SCHEMA
 
+# Import internal modules
 from cornflow.app import create_app
 from cornflow.shared.const import (
     EXEC_STATE_CORRECT,
@@ -19,13 +19,12 @@ from cornflow.shared.const import (
     EXEC_STATE_RUNNING,
     EXEC_STATE_QUEUED,
     STATUS_HEALTHY,
-    REPORT_STATE,
 )
-from cornflow.tests.const import INSTANCE_PATH, CASE_PATH, INSTANCE_MPS, INSTANCE_TSP
-from cornflow.tests.custom_live_server import CustomTestCaseLive
+from cornflow.tests.const import INSTANCE_PATH, CASE_PATH
+from cornflow.tests.custom_liveServer import CustomTestCaseLive
 
 
-def load_file(_file: str):
+def load_file(_file):
     with open(_file) as f:
         temp = json.load(f)
     return temp
@@ -35,7 +34,6 @@ class TestCornflowClientBasic(CustomTestCaseLive):
     def setUp(self, create_all=False):
         super().setUp()
         self.items_to_check = ["name", "description"]
-        log.info(f"Start test case name: {self.id()}")
 
     def check_status_evolution(self, execution, end_state=EXEC_STATE_CORRECT):
         statuses = [execution["state"]]
@@ -129,7 +127,7 @@ class TestCornflowClientBasic(CustomTestCaseLive):
         return execution
 
     def create_instance_and_execution(self):
-        one_instance = self.create_new_instance(INSTANCE_MPS)
+        one_instance = self.create_new_instance("./cornflow/tests/data/test_mps.mps")
         name = "test_execution_name_123"
         description = "test_execution_description_123"
         schema = "solve_model_dag"
@@ -142,31 +140,6 @@ class TestCornflowClientBasic(CustomTestCaseLive):
         )
         return self.create_new_execution(payload)
 
-    def create_instance_and_execution_report(
-        self,
-        schema="tsp",
-        solver="cpsat",
-        data=None,
-        timeLimit=10,
-        report_name="report",
-    ):
-        name = "test_instance_1"
-        description = "description123"
-        if data is None:
-            data = load_file(INSTANCE_TSP)
-        payload = dict(data=data, name=name, description=description, schema=schema)
-        one_instance = self.create_new_instance_payload(payload)
-        payload = dict(
-            instance_id=one_instance["id"],
-            config=dict(
-                solver=solver, timeLimit=timeLimit, report=dict(name=report_name)
-            ),
-            description="test_execution_description_123",
-            name="test_execution_123",
-            schema=schema,
-        )
-        return self.create_new_execution(payload)
-
     def create_timer_instance_and_execution(self, seconds=5):
         payload = dict(
             data=dict(seconds=seconds),
@@ -184,47 +157,16 @@ class TestCornflowClientBasic(CustomTestCaseLive):
         )
         return self.create_new_execution(payload)
 
-    @staticmethod
-    def try_until_condition(
-        func: Callable,
-        condition: Callable[[Any], bool],
-        number_of_times: int = 10,
-        sleep_time: float = 10,
-    ):
-        for i in range(number_of_times):
-            time.sleep(sleep_time)
-            result = func()
-            if condition(result):
-                return result
-        raise TimeoutError(
-            "Timed out after {} seconds".format(number_of_times * sleep_time)
-        )
-
-    @staticmethod
-    def wait_until_report_finishes(
-        client, execution_id: str, report_status=REPORT_STATE.CORRECT
-    ):
-        def func():
-            my_reports = client.raw.get_results(execution_id).json()["reports"]
-            if len(my_reports) == 0:
-                return None
-            first = my_reports[0]
-            if first["state"] != report_status:
-                return None
-            return first
-
-        return func
-
 
 class TestCornflowClientOpen(TestCornflowClientBasic):
     # TODO: user management
     # TODO: infeasible execution
 
     def test_new_instance_file(self):
-        self.create_new_instance_file(INSTANCE_MPS)
+        self.create_new_instance_file("./cornflow/tests/data/test_mps.mps")
 
     def test_new_instance(self):
-        return self.create_new_instance(INSTANCE_MPS)
+        return self.create_new_instance("./cornflow/tests/data/test_mps.mps")
 
     # TODO: reactivate test with new version of cornflow client which allows to pass
     #  optional arguments for the headers of the request
@@ -247,49 +189,6 @@ class TestCornflowClientOpen(TestCornflowClientBasic):
     def test_new_execution(self):
         return self.create_instance_and_execution()
 
-    def test_new_execution_with_tsp_report(self):
-        return self.create_instance_and_execution_report()
-
-    #
-    def test_new_execution_with_tsp_report_wait(self):
-        execution = self.create_instance_and_execution_report()
-        func = self.wait_until_report_finishes(self.client, execution["id"])
-        reports_info = self.try_until_condition(func, lambda v: v is not None, 20, 5)
-        id_report = reports_info["id"]
-        my_name = "./my_report.html"
-        try:
-            os.remove(my_name)
-        except:
-            pass
-        self.client.raw.get_one_report(id_report, "./", my_name)
-        self.assertTrue(os.path.exists(my_name))
-        try:
-            os.remove(my_name)
-        except OSError:
-            pass
-
-    # read header of file? we can parse it with beatifulsoup
-
-    def test_new_execution_with_timer_report_wait(self):
-        payload = dict(
-            solver="default", schema="timer", data={"seconds": 1}, timeLimit=1
-        )
-        execution = self.create_instance_and_execution_report(**payload)
-        func = self.wait_until_report_finishes(self.client, execution["id"])
-        reports_info = self.try_until_condition(func, lambda v: v is not None, 20, 5)
-        id_report = reports_info["id"]
-        my_name = "./my_report.html"
-        try:
-            os.remove(my_name)
-        except:
-            pass
-        self.client.raw.get_one_report(id_report, "./", my_name)
-        self.assertTrue(os.path.exists(my_name))
-        try:
-            os.remove(my_name)
-        except OSError:
-            pass
-
     def test_delete_execution(self):
         execution = self.test_new_execution()
         response = self.client.raw.get_api_for_id("execution/", execution["id"])
@@ -314,7 +213,7 @@ class TestCornflowClientOpen(TestCornflowClientBasic):
         self.assertTrue("error" in response.json())
 
     def test_new_execution_bad_dag_name(self):
-        one_instance = self.create_new_instance(INSTANCE_MPS)
+        one_instance = self.create_new_instance("./cornflow/tests/data/test_mps.mps")
         name = "test_execution_name_123"
         description = "test_execution_description_123"
         payload = dict(
@@ -328,7 +227,7 @@ class TestCornflowClientOpen(TestCornflowClientBasic):
         self.assertRaises(CornFlowApiError, _bad_func)
 
     def test_new_execution_with_schema(self):
-        one_instance = self.create_new_instance(INSTANCE_MPS)
+        one_instance = self.create_new_instance("./cornflow/tests/data/test_mps.mps")
         name = "test_execution_name_123"
         description = "test_execution_description_123"
         payload = dict(
@@ -410,6 +309,19 @@ class TestCornflowClientAdmin(TestCornflowClientBasic):
     def setUp(self, create_all=False):
         super().setUp()
 
+        # we create a service user:
+        self.create_service_user(
+            dict(username="airflow", pwd="Airflow_test_password1", email="af@cf.com")
+        )
+
+        self.create_service_user(
+            dict(
+                username="service_user@cornflow.com",
+                pwd="Serviceuser_1234",
+                email="service_user@cornflow.com",
+            )
+        )
+
         # we create an admin user
         # we guarantee that the admin is there for airflow
         self.client.token = self.create_admin(
@@ -492,7 +404,7 @@ class TestCornflowClientAdmin(TestCornflowClientBasic):
         self.assertIsNone(execution_data["data"])
 
     def test_edit_one_execution(self):
-        one_instance = self.create_new_instance(INSTANCE_MPS)
+        one_instance = self.create_new_instance("./cornflow/tests/data/test_mps.mps")
         payload = dict(
             name="bla",
             config=dict(solver="CBC"),
@@ -543,7 +455,7 @@ class TestCornflowClientAdmin(TestCornflowClientBasic):
         self.assertRaises(CornFlowApiError, _launch_too_soon_func)
 
     def test_check_instance(self):
-        instance = self.create_new_instance(INSTANCE_MPS)
+        instance = self.create_new_instance("./cornflow/tests/data/test_mps.mps")
         data_check_execution = self.client.create_instance_data_check(instance["id"])
         self.assertEqual(data_check_execution["instance_id"], instance["id"])
         status = self.client.get_status(data_check_execution["id"])

cornflow/tests/unit/test_alarms.py

@@ -1,10 +1,6 @@
 """
 
 """
-
-import unittest
-import os
-
 # Imports from internal modules
 from cornflow.models import AlarmsModel
 from cornflow.tests.const import ALARMS_URL
@@ -19,34 +15,25 @@ class TestAlarmsEndpoint(CustomTestCase):
         self.response_items = {"id", "name", "description", "criticality", "schema"}
         self.items_to_check = ["name", "description", "schema", "criticality"]
 
-    @unittest.skipUnless(
-        int(os.getenv("CF_ALARMS_ENDPOINT")) == 1, "No alarms implemented"
-    )
     def test_post_alarm(self):
-        payload = {
-            "name": "Alarm 1",
-            "description": "Description Alarm 1",
-            "criticality": 1,
-        }
+        payload = {"name": "Alarm 1", "description": "Description Alarm 1", "criticality": 1}
         self.create_new_row(self.url, self.model, payload)
 
-    @unittest.skipUnless(
-        int(os.getenv("CF_ALARMS_ENDPOINT")) == 1, "No alarms implemented"
-    )
     def test_get_alarms(self):
         data = [
             {"name": "Alarm 1", "description": "Description Alarm 1", "criticality": 1},
-            {
-                "name": "Alarm 2",
-                "description": "Description Alarm 2",
-                "criticality": 2,
-                "schema": "solve_model_dag",
-            },
+            {"name": "Alarm 2", "description": "Description Alarm 2", "criticality": 2, "schema": "solve_model_dag"},
         ]
-        rows = self.get_rows(self.url, data, check_data=False)
+        rows = self.get_rows(
+            self.url,
+            data,
+            check_data=False
+        )
         rows_data = list(rows.json)
         for i in range(len(data)):
             for key in self.get_keys_to_check(data[i]):
                 self.assertIn(key, rows_data[i])
                 if key in data[i]:
                     self.assertEqual(rows_data[i][key], data[i][key])
+
+

cornflow/tests/unit/test_cli.py

@@ -20,11 +20,6 @@ from cornflow.shared.exceptions import NoPermission, ObjectDoesNotExist
 class CLITests(TestCase):
     def setUp(self):
         db.create_all()
-        self.number_of_views = 52
-        self.number_of_permissions = 574
-        if int(os.getenv("CF_ALARMS_ENDPOINT", 0)) != 1:
-            self.number_of_views = 50
-            self.number_of_permissions = 519
 
     def tearDown(self):
         db.session.remove()
@@ -136,7 +131,7 @@ class CLITests(TestCase):
         result = runner.invoke(cli, ["views", "init", "-v"])
         self.assertEqual(result.exit_code, 0)
         views = ViewModel.get_all_objects().all()
-        self.assertEqual(len(views), self.number_of_views)
+        self.assertEqual(len(views), 49)
 
     def test_permissions_entrypoint(self):
         runner = CliRunner()
@@ -160,8 +155,8 @@ class CLITests(TestCase):
         permissions = PermissionViewRoleModel.get_all_objects().all()
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
-        self.assertEqual(len(views), self.number_of_views)
-        self.assertEqual(len(permissions), self.number_of_permissions)
+        self.assertEqual(len(views), 49)
+        self.assertEqual(len(permissions), 546)
 
     def test_permissions_base_command(self):
         runner = CliRunner()
@@ -176,8 +171,8 @@ class CLITests(TestCase):
         permissions = PermissionViewRoleModel.get_all_objects().all()
         self.assertEqual(len(actions), 5)
         self.assertEqual(len(roles), 4)
-        self.assertEqual(len(views), self.number_of_views)
-        self.assertEqual(len(permissions), self.number_of_permissions)
+        self.assertEqual(len(views), 49)
+        self.assertEqual(len(permissions), 546)
 
     def test_service_entrypoint(self):
         runner = CliRunner()

cornflow/tests/unit/test_commands.py

@@ -1,5 +1,5 @@
 import json
-import os
+
 from flask_testing import TestCase
 
 from cornflow.app import (
@@ -48,11 +48,7 @@ class TestCommands(TestCase):
             "email": "testemail@test.org",
             "password": "Testpassword1!",
         }
-
-        if int(os.getenv("CF_ALARMS_ENDPOINT")) == 1:
-            self.resources = resources + alarms_resources
-        else:
-            self.resources = resources
+        self.resources = resources + alarms_resources
         self.runner = self.create_app().test_cli_runner()
         self.runner.invoke(register_roles, ["-v"])
 

cornflow/tests/unit/test_executions.py

@@ -57,7 +57,6 @@ class TestExecutionsListEndpoint(BaseTestCases.ListFilters):
             "instance_id",
             "name",
             "indicators",
-            "reports",
         ]
 
     def test_new_execution(self):
@@ -261,7 +260,6 @@ class TestExecutionsDetailEndpointMock(CustomTestCase):
             "schema",
             "user_id",
             "indicators",
-            "reports",
         }
         # we only check the following because this endpoint does not return data
         self.items_to_check = ["name", "description"]
@@ -305,7 +303,6 @@ class TestExecutionsDetailEndpoint(
             "name",
             "created_at",
             "state",
-            "reports",
         ]
         execution = self.get_one_row(
             self.url + idx,
@@ -411,7 +408,6 @@ class TestExecutionsDataEndpoint(TestExecutionsDetailEndpointMock):
             "state",
             "name",
             "id",
-            "reports",
         ]
 
     def test_get_one_execution(self):
@@ -454,7 +450,6 @@ class TestExecutionsLogEndpoint(TestExecutionsDetailEndpointMock):
             "user_id",
             "config",
             "indicators",
-            "reports",
         ]
 
     def test_get_one_execution(self):

cornflow/tests/unit/test_main_alarms.py

@@ -2,8 +2,6 @@
 
 """
 
-import unittest
-import os
 import json
 
 # Imports from internal modules
@@ -31,9 +29,6 @@ class TestMainAlarmsEndpoint(CustomTestCase):
             headers=self.get_header_with_auth(self.token),
         ).json["id"]
 
-    @unittest.skipUnless(
-        int(os.getenv("CF_ALARMS_ENDPOINT")) == 1, "No alarms implemented"
-    )
     def test_post_main_alarm(self):
         payload = {
             "message": "Message Main Alarm 1",
@@ -42,9 +37,6 @@ class TestMainAlarmsEndpoint(CustomTestCase):
         }
         self.create_new_row(self.url, self.model, payload)
 
-    @unittest.skipUnless(
-        int(os.getenv("CF_ALARMS_ENDPOINT")) == 1, "No alarms implemented"
-    )
     def test_get_main_alarms(self):
         data = [
             {

cornflow/tests/unit/test_users.py

@@ -363,11 +363,7 @@ class TestUserEndpoint(TestCase):
 
     def test_change_password_rotation(self):
         current_app.config["PWD_ROTATION_TIME"] = 1  # in days
-        payload = {
-            "pwd_last_change": (datetime.utcnow() - timedelta(days=2)).strftime(
-                "%Y-%m-%dT%H:%M:%SZ"
-            )
-        }
+        payload = {"pwd_last_change": (datetime.utcnow() - timedelta(days=2)).strftime("%Y-%m-%dT%H:%M:%SZ")}
         self.modify_info(self.planner, self.planner, payload)
         response = self.log_in(self.planner)
         self.assertEqual(True, response.json["change_password"])
@@ -375,6 +371,7 @@ class TestUserEndpoint(TestCase):
         payload = {"password": "Newtestpassword1!"}
         self.modify_info(self.planner, self.planner, payload)
         self.planner.update(payload)
+        print(self.planner)
         response = self.log_in(self.planner)
         self.assertEqual(False, response.json["change_password"])
 

{cornflow-1.1.1a1.dist-info → cornflow-1.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 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
@@ -15,14 +15,14 @@ Requires-Python: >=3.8
 Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec<=6.2.0
 Requires-Dist: click<=8.1.3
-Requires-Dist: cornflow-client==1.1.1a1
+Requires-Dist: cornflow-client>=1.1.0
 Requires-Dist: cryptography<=42.0.5
 Requires-Dist: disposable-email-domains>=0.0.86
 Requires-Dist: Flask==2.3.2
 Requires-Dist: flask-apispec<=0.11.4
 Requires-Dist: Flask-Bcrypt<=1.0.1
 Requires-Dist: Flask-Compress<=1.13
-Requires-Dist: flask-cors<=4.0.1
+Requires-Dist: flask-cors>=4.0.2
 Requires-Dist: flask-inflate<=0.3
 Requires-Dist: Flask-Migrate<=4.0.4
 Requires-Dist: Flask-RESTful<=0.3.9
@@ -32,14 +32,14 @@ Requires-Dist: gunicorn<=22.0.0
 Requires-Dist: jsonpatch<=1.32
 Requires-Dist: ldap3<=2.9.1
 Requires-Dist: marshmallow<=3.19.0
-Requires-Dist: PuLP<=2.7.0
+Requires-Dist: PuLP<=2.9.0
 Requires-Dist: psycopg2<=2.95
-Requires-Dist: PyJWT<=2.6.0,>=2.0.0
+Requires-Dist: PyJWT<=2.6.0
 Requires-Dist: pytups>=0.86.2
-Requires-Dist: requests<=2.31.0
+Requires-Dist: requests<=2.32.3
 Requires-Dist: SQLAlchemy==1.3.21
 Requires-Dist: webargs<=8.2.0
-Requires-Dist: Werkzeug<=3.0.3
+Requires-Dist: Werkzeug==3.0.6
 Requires-Dist: greenlet<=2.0.2; python_version < "3.11"
 Requires-Dist: greenlet==3.0.0; python_version >= "3.11"