cornflow 2.0.0a12__tar.gz → 2.0.0a13__tar.gz

{cornflow-2.0.0a12/cornflow.egg-info → cornflow-2.0.0a13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 2.0.0a12
+Version: 2.0.0a13
 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
@@ -14,7 +14,7 @@ Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec<=6.3.0
 Requires-Dist: cachetools==5.3.3
 Requires-Dist: click<=8.1.7
-Requires-Dist: cornflow-client==2.0.0a12
+Requires-Dist: cornflow-client==2.0.0a13
 Requires-Dist: cryptography<=44.0.1
 Requires-Dist: databricks-sdk==0.29.0
 Requires-Dist: disposable-email-domains>=0.0.86

{cornflow-2.0.0a12 → cornflow-2.0.0a13}/cornflow/schemas/execution.py

@@ -78,6 +78,7 @@ class ExecutionEditRequest(Schema):
     name = fields.Str()
     description = fields.Str()
     data = fields.Raw()
+    instance_id = fields.Str(required=False)
 
 
 class ExecutionDagRequest(Schema):

{cornflow-2.0.0a12 → cornflow-2.0.0a13}/cornflow/tests/const.py

@@ -15,6 +15,7 @@ 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")
+EDIT_EXECUTION_SOLUTION = _get_file("./data/edit_execution_solution.json")
 
 EXECUTION_PATH = _get_file("./data/new_execution.json")
 BAD_EXECUTION_PATH = _get_file("./data/bad_execution.json")

{cornflow-2.0.0a12 → cornflow-2.0.0a13}/cornflow/tests/unit/test_executions.py

@@ -19,7 +19,7 @@ from cornflow.tests.const import (
     INSTANCE_URL,
     DAG_URL,
     BAD_EXECUTION_PATH,
-    EXECUTION_SOLUTION_PATH,
+    EXECUTION_SOLUTION_PATH, EDIT_EXECUTION_SOLUTION,
 )
 from cornflow.tests.custom_test_case import CustomTestCase, BaseTestCases
 from cornflow.tests.unit.tools import patch_af_client, patch_db_client
@@ -473,6 +473,7 @@ class TestExecutionsDetailEndpointMock(CustomTestCase):
         with open(INSTANCE_PATH) as f:
             payload = json.load(f)
         fk_id = self.create_new_row(INSTANCE_URL, InstanceModel, payload)
+        self.instance_payload = payload
         self.model = ExecutionModel
         self.response_items = {
             "id",
@@ -523,51 +524,41 @@ class TestExecutionsDetailEndpointAirflow(
         self.assertEqual(200, response.status_code)
         self.assertEqual(response.json["message"], "The execution has been stopped")
 
+    def test_edit_execution(self):
 
-class TestExecutionsDetailEndpointDatabricks(
-    TestExecutionsDetailEndpointMock, BaseTestCases.DetailEndpoint
-):
-    def setUp(self):
-        super().setUp()
-        self.url = self.url
-        self.query_arguments = {"run": 0}
-
-    def create_app(self):
-        app = create_app("testing-databricks")
-        return app
-
-    @patch("cornflow.endpoints.execution.Databricks")
-    def test_stop_execution(self, db_client_class):
-        patch_db_client(db_client_class)
-
-        idx = self.create_new_row(EXECUTION_URL, self.model, payload=self.payload)
-
-        response = self.client.post(
-            self.url + str(idx) + "/",
-            follow_redirects=True,
-            headers=self.get_header_with_auth(self.token),
+        id_new_instance = self.create_new_row(
+            INSTANCE_URL, InstanceModel, self.instance_payload
         )
-
-        self.assertEqual(200, response.status_code)
-        self.assertEqual(
-            response.json["message"], "This feature is not available for Databricks"
+        idx = self.create_new_row(
+            self.url_with_query_arguments(), self.model, self.payload
         )
 
+        # Extract the data from data/edit_execution_solution.json
+        with open(EDIT_EXECUTION_SOLUTION) as f:
+            data = json.load(f)
 
-class TestExecutionsStatusEndpointAirflow(TestExecutionsDetailEndpointMock):
-    def setUp(self):
-        super().setUp()
-        self.response_items = {"id", "name", "status"}
-        self.items_to_check = []
-
-    def create_app(self):
-        app = create_app("testing")
-        return app
+        data = {
+            "name": "new_name",
+            "description": "Updated description",
+            "data": data,
+            "instance_id": id_new_instance,
+        }
+        payload_to_check = {
+            "id": idx,
+            "name":"new_name",
+            "description":"Updated description",
+            "data_hash":"74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b",
+            "instance_id":"805bad3280c95e45384dc6bd91a41317f9a7858c",
+            }
+        self.update_row(
+            self.url + str(idx) + "/",
+            data,
+            payload_to_check,
+        )
 
     @patch("cornflow.endpoints.execution.Airflow")
     def test_get_one_status(self, af_client_class):
         patch_af_client(af_client_class)
-
         idx = self.create_new_row(EXECUTION_URL, self.model, payload=self.payload)
         payload = dict(self.payload)
         payload["id"] = idx
@@ -597,6 +588,68 @@ class TestExecutionsStatusEndpointAirflow(TestExecutionsDetailEndpointMock):
         self.assertEqual(200, response.status_code)
         self.assertEqual(f"execution {idx} updated correctly", response.json["message"])
 
+class TestExecutionsDetailEndpointDatabricks(
+    TestExecutionsDetailEndpointMock, BaseTestCases.DetailEndpoint
+):
+    def setUp(self):
+        super().setUp()
+        self.url = self.url
+        self.query_arguments = {"run": 0}
+
+    def create_app(self):
+        app = create_app("testing-databricks")
+        return app
+
+    @patch("cornflow.endpoints.execution.Databricks")
+    def test_stop_execution(self, db_client_class):
+        patch_db_client(db_client_class)
+
+        idx = self.create_new_row(EXECUTION_URL, self.model, payload=self.payload)
+
+        response = self.client.post(
+            self.url + str(idx) + "/",
+            follow_redirects=True,
+            headers=self.get_header_with_auth(self.token),
+        )
+
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(
+            response.json["message"], "This feature is not available for Databricks"
+        )
+    def test_edit_execution(self):
+
+        id_new_instance = self.create_new_row(
+            INSTANCE_URL, InstanceModel, self.instance_payload
+        )
+        idx = self.create_new_row(
+            self.url_with_query_arguments(), self.model, self.payload
+        )
+
+        # Extract the data from data/edit_execution_solution.json
+        with open(EDIT_EXECUTION_SOLUTION) as f:
+            data = json.load(f)
+
+        data = {
+            "name": "new_name",
+            "description": "Updated description",
+            "data": data,
+            "instance_id": id_new_instance,
+        }
+        payload_to_check = {
+            "id": idx,
+            "name":"new_name",
+            "description":"Updated description",
+            "data_hash":"74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b",
+            "instance_id":"805bad3280c95e45384dc6bd91a41317f9a7858c",
+            }
+        self.update_row(
+            self.url + str(idx) + "/",
+            data,
+            payload_to_check,
+        )
+
+
+
 
 class TestExecutionsStatusEndpointDatabricks(TestExecutionsDetailEndpointMock):
     def setUp(self):

{cornflow-2.0.0a12 → cornflow-2.0.0a13/cornflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cornflow
-Version: 2.0.0a12
+Version: 2.0.0a13
 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
@@ -14,7 +14,7 @@ Requires-Dist: alembic==1.9.2
 Requires-Dist: apispec<=6.3.0
 Requires-Dist: cachetools==5.3.3
 Requires-Dist: click<=8.1.7
-Requires-Dist: cornflow-client==2.0.0a12
+Requires-Dist: cornflow-client==2.0.0a13
 Requires-Dist: cryptography<=44.0.1
 Requires-Dist: databricks-sdk==0.29.0
 Requires-Dist: disposable-email-domains>=0.0.86

{cornflow-2.0.0a12 → cornflow-2.0.0a13}/cornflow.egg-info/requires.txt

@@ -2,7 +2,7 @@ alembic==1.9.2
 apispec<=6.3.0
 cachetools==5.3.3
 click<=8.1.7
-cornflow-client==2.0.0a12
+cornflow-client==2.0.0a13
 cryptography<=44.0.1
 databricks-sdk==0.29.0
 disposable-email-domains>=0.0.86

{cornflow-2.0.0a12 → cornflow-2.0.0a13}/requirements.txt

@@ -2,7 +2,7 @@ alembic==1.9.2
 apispec<=6.3.0
 cachetools==5.3.3
 click<=8.1.7
-cornflow-client==2.0.0a12
+cornflow-client==2.0.0a13
 cryptography<=44.0.1
 databricks-sdk==0.29.0
 disposable-email-domains>=0.0.86

{cornflow-2.0.0a12 → cornflow-2.0.0a13}/setup.py

@@ -9,7 +9,7 @@ with open("requirements.txt", "r") as fh:
 
 setuptools.setup(
     name="cornflow",
-    version="2.0.0a12",
+    version="2.0.0a13",
     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.",