cornflow 2.0.0a12__py3-none-any.whl → 2.0.0a13__py3-none-any.whl

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/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/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.dist-info → cornflow-2.0.0a13.dist-info}/METADATA

@@ -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.dist-info → cornflow-2.0.0a13.dist-info}/RECORD

@@ -104,7 +104,7 @@ cornflow/schemas/case.py,sha256=OXRsDi_sdB47MQJ59S_1eMjDmLlpUtG7kTFNInV2-cI,2909
 cornflow/schemas/common.py,sha256=QYuxWcOl4smXFZr_vL07OVgH9H50ZywCrXxycVNr1qA,473
 cornflow/schemas/dag.py,sha256=0ENA75X9L8YqjJW6ZO1Sb4zE8OxB15_O49_nwA6eAVw,901
 cornflow/schemas/example_data.py,sha256=hbE8TJakFqOweHXiA3mduNETM6FCX6xLTiQuH3EkSTc,281
-cornflow/schemas/execution.py,sha256=ssbc9jwwCKQ-nG8TmfR8VcvIicJBIDSzpB8ewXSlHio,4714
+cornflow/schemas/execution.py,sha256=99vqMSpX-KUNN5DF6ibasvyRmapOdkGWiHCdqnm009o,4759
 cornflow/schemas/health.py,sha256=8ptyAJc23HTgb-dgtFFEtowFrlwILgkZdgezJ-JSMDY,141
 cornflow/schemas/instance.py,sha256=qr4km0AlAhoNf9G1Il-pfHphT_vAiiLDpv7A9S3FKAw,1870
 cornflow/schemas/main_alarms.py,sha256=cC1_Vb1dmo_vdZpZQrA7jH-hRCjVtLRy6Z2JFBlTrlo,604
@@ -136,7 +136,7 @@ cornflow/shared/authentication/auth.py,sha256=oCWW3cUxaKYgGi-4--m4sYVBr4T5MzsR_f
 cornflow/shared/authentication/decorators.py,sha256=_QpwOU1kYzpaK85Dl0Btdj5hG8Ps47PFgySp_gqhlgk,1276
 cornflow/shared/authentication/ldap.py,sha256=QfdC2X_ZMcIJabKC5pYWDGMhS5pIOJJvdZXuuiruq-M,4853
 cornflow/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cornflow/tests/const.py,sha256=x8AfNOHHeU-XWkz3W_wGYidaJ4f6TXokveTR4K4cqfw,2561
+cornflow/tests/const.py,sha256=DvFhKS5WXR01962bAlTTDtEhyXCtKpUtTcY0FiEXTeY,2636
 cornflow/tests/custom_liveServer.py,sha256=I_0YNrcKIwVmRov3zCQMWwcCWkMe5V246Hpa4gS8AZE,3079
 cornflow/tests/custom_test_case.py,sha256=gW6S0qwNtMWli-5ZCYzUzkjah3QiybKUJcJXrdR3JLw,37919
 cornflow/tests/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -155,7 +155,7 @@ cornflow/tests/unit/test_commands.py,sha256=V0XFiiTrq9PctgnzGLMmBbjBFtofLBbnFWcO
 cornflow/tests/unit/test_dags.py,sha256=X9NmzWWOzOje05PLTyV1NcwzyX-BvKI8ptrRgoukMO0,13388
 cornflow/tests/unit/test_data_checks.py,sha256=6s50d1iuRTUcAYn14oEcRS39ZZ6E9ussU4YpkpYhtC4,8612
 cornflow/tests/unit/test_example_data.py,sha256=rCj3wNW4OMHyLfuPdIKxBa7-eRuFsymij-9Nk27_Z3o,4128
-cornflow/tests/unit/test_executions.py,sha256=-4HKJ9IWbGXApfgfJxATzAdo4AU3pjpdzmHlLKCbIdE,28244
+cornflow/tests/unit/test_executions.py,sha256=ucgqXBse2Y7rbQ6rvRNB0b60tCTAOmRIO3xYyAGpDXc,30074
 cornflow/tests/unit/test_generate_from_schema.py,sha256=L1EdnASbDJ8SjrX1V4WnUKKwV0sRTwVnNYnxSpyeSeQ,15376
 cornflow/tests/unit/test_health.py,sha256=er-CkoYI3Nb9lq0pGn-rIbhfIigxXI5wYNFNn-OsAoc,1043
 cornflow/tests/unit/test_instances.py,sha256=Mf9jijQOcDE3ylPfMTnVRocRegcugEdCnoMCqSmKKqQ,11083
@@ -172,8 +172,8 @@ cornflow/tests/unit/test_tables.py,sha256=7lZsdun8_SWvYO-6ezQeuTxRat_fyP9vCfXoU7
 cornflow/tests/unit/test_token.py,sha256=PZ11b46UCQpCESsRiAPhpgWkGAsAwKCVNxVQai_kxXM,4199
 cornflow/tests/unit/test_users.py,sha256=N5tcF5nSncD0F_ZlBxGuS87p6kNS4hUzRLr3_AcnK-o,22802
 cornflow/tests/unit/tools.py,sha256=F5nk7G7k9NkT_EGQvf-E-sML3Y8IpzmD7bMztsap6CQ,3166
-cornflow-2.0.0a12.dist-info/METADATA,sha256=h3jby48vcJ_ngG-Wy_gZCr4qlLyteEwhS2w0GbeRFXg,9571
-cornflow-2.0.0a12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cornflow-2.0.0a12.dist-info/entry_points.txt,sha256=q9cPKAFBsmHkERCqQ2JcOTM-tVBLHTl-DGxwCXowAWM,46
-cornflow-2.0.0a12.dist-info/top_level.txt,sha256=Qj9kLFJW1PLb-ZV2s_aCkQ-Wi5W6KC6fFR-LTBrx-rU,24
-cornflow-2.0.0a12.dist-info/RECORD,,
+cornflow-2.0.0a13.dist-info/METADATA,sha256=MQQ9oWFSn0kHFwyB-552yIlz8zk3BCkxB9iflm-NkSg,9571
+cornflow-2.0.0a13.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+cornflow-2.0.0a13.dist-info/entry_points.txt,sha256=q9cPKAFBsmHkERCqQ2JcOTM-tVBLHTl-DGxwCXowAWM,46
+cornflow-2.0.0a13.dist-info/top_level.txt,sha256=Qj9kLFJW1PLb-ZV2s_aCkQ-Wi5W6KC6fFR-LTBrx-rU,24
+cornflow-2.0.0a13.dist-info/RECORD,,

{cornflow-2.0.0a12.dist-info → cornflow-2.0.0a13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any