udata 9.1.5.dev31465__py2.py3-none-any.whl → 9.1.5.dev31476__py2.py3-none-any.whl

udata/core/dataset/events.py

@@ -40,10 +40,16 @@ def serialize_resource_for_event(resource):
 
 @task(route="high.resource")
 def publish(url, document, resource_id, action):
-    if action == EventMessageType.DELETED:
-        resource = None
-    else:
-        resource = serialize_resource_for_event(get_by(document.resources, "id", resource_id))
+    match action:
+        case EventMessageType.CREATED:
+            method = requests.post
+            resource = serialize_resource_for_event(get_by(document.resources, "id", resource_id))
+        case EventMessageType.MODIFIED:
+            method = requests.put
+            resource = serialize_resource_for_event(get_by(document.resources, "id", resource_id))
+        case EventMessageType.DELETED:
+            method = requests.delete
+            resource = None
     payload = {
         "resource_id": str(resource_id),
         "dataset_id": str(document.id),
@@ -52,7 +58,7 @@ def publish(url, document, resource_id, action):
     headers = {}
     if current_app.config["RESOURCES_ANALYSER_API_KEY"]:
         headers = {"Authorization": f"Bearer {current_app.config['RESOURCES_ANALYSER_API_KEY']}"}
-    r = requests.post(url, json=payload, headers=headers)
+    r = method(url, json=payload, headers=headers)
     r.raise_for_status()
 
 
@@ -62,7 +68,7 @@ def publish_added_resource_message(sender, document, **kwargs):
         "RESOURCES_ANALYSER_URI"
     ):
         publish.delay(
-            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resource/created/",
+            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/",
             document,
             kwargs["resource_id"],
             EventMessageType.CREATED,
@@ -75,7 +81,7 @@ def publish_updated_resource_message(sender, document, **kwargs):
         "RESOURCES_ANALYSER_URI"
     ):
         publish.delay(
-            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resource/updated/",
+            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/",
             document,
             kwargs["resource_id"],
             EventMessageType.MODIFIED,
@@ -88,7 +94,7 @@ def publish_removed_resource_message(sender, document, **kwargs):
         "RESOURCES_ANALYSER_URI"
     ):
         publish.delay(
-            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resource/deleted/",
+            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/",
             document,
             kwargs["resource_id"],
             EventMessageType.DELETED,

udata/tests/dataset/test_dataset_events.py

@@ -31,7 +31,7 @@ class DatasetEventsTest:
         }
 
         mock_req.assert_called_with(
-            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/created/",
+            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resources/",
             json=expected_value,
             headers={},  # No RESOURCES_ANALYSER_API_KEY, no headers.
         )
@@ -53,12 +53,12 @@ class DatasetEventsTest:
             dataset.add_resource(resource)
 
         mock_req.assert_called_with(
-            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/created/",
+            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resources/",
             json=expected_value,
             headers={"Authorization": "Bearer foobar-api-key"},
         )
 
-    @patch("requests.post")
+    @patch("requests.put")
     @pytest.mark.options(RESOURCES_ANALYSER_API_KEY="foobar-api-key")
     def test_publish_message_resource_modified(self, mock_req):
         resource = ResourceFactory(schema=Schema(url="http://localhost/my-schema"))
@@ -77,7 +77,7 @@ class DatasetEventsTest:
             dataset.update_resource(resource)
 
         mock_req.assert_called_with(
-            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/updated/",
+            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resources/",
             json=expected_value,
             headers={"Authorization": "Bearer foobar-api-key"},
         )
@@ -87,7 +87,7 @@ class DatasetEventsTest:
         # (for example, encoding Embeds fails)
         complexjson.dumps(expected_value)
 
-    @patch("requests.post")
+    @patch("requests.delete")
     @pytest.mark.options(RESOURCES_ANALYSER_API_KEY="foobar-api-key")
     def test_publish_message_resource_removed(self, mock_req):
         resource = ResourceFactory()
@@ -104,7 +104,7 @@ class DatasetEventsTest:
             dataset.remove_resource(resource)
 
         mock_req.assert_called_with(
-            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resource/deleted/",
+            f"{current_app.config['RESOURCES_ANALYSER_URI']}/api/resources/",
             json=expected_value,
             headers={"Authorization": "Bearer foobar-api-key"},
         )

{udata-9.1.5.dev31465.dist-info → udata-9.1.5.dev31476.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.1.5.dev31465
+Version: 9.1.5.dev31476
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -145,6 +145,7 @@ It is collectively taken care of by members of the
 - Add a minimal publiccode.yml [#3144](https://github.com/opendatateam/udata/pull/3144)
 - Fix the boolean filters in the API for the "new system" endpoints [#3139](https://github.com/opendatateam/udata/pull/3139)
 - Update authlib dependency from 0.14.3 to 1.3.1 [#3135](https://github.com/opendatateam/udata/pull/3135)
+- Use hydra's RESTful endpoint URLs [#3142](https://github.com/opendatateam/udata/pull/3142)
 
 ## 9.1.4 (2024-08-26)
 

{udata-9.1.5.dev31465.dist-info → udata-9.1.5.dev31476.dist-info}/RECORD

@@ -95,7 +95,7 @@ udata/core/dataset/apiv2.py,sha256=VTE4eYx5udzOdHDUkD7TYpuCtppZMKp1okTSEE1fcgI,1
 udata/core/dataset/commands.py,sha256=__hPAk_6iHtgMnEG51ux0vbNWJHxUjXhi1ukH4hF5jY,3714
 udata/core/dataset/constants.py,sha256=pkOvrdNBq3k1ojJcv6oSg7kK1IUtb3PqLni-YJ3rKSY,2880
 udata/core/dataset/csv.py,sha256=XMl8MaYCEyGmkCZqRSWrGRxCht2C9e3aQYGwDQLXYT0,3618
-udata/core/dataset/events.py,sha256=LEL9_iMTZ0bZlli2TdkQtV8pCRbFQBd91Hqh_WCW84c,3444
+udata/core/dataset/events.py,sha256=LGSTwipns0H6141jaupLdEdrJhvcyhzL7yRUNBWWi9Q,3712
 udata/core/dataset/exceptions.py,sha256=uKiayLSpSzsnLvClObS6hOO0qXEqvURKN7_w8eimQNU,498
 udata/core/dataset/factories.py,sha256=fRDWDlybR_ud4pDs1-ntWuYHKtV9LMHeBOBp2SmTT6M,9006
 udata/core/dataset/forms.py,sha256=H2oeAD8XckMugnwUcyuKv7o1Xq1rEIlLz9FtxujqbIE,6196
@@ -629,7 +629,7 @@ udata/tests/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 udata/tests/dataset/test_csv_adapter.py,sha256=Bupsw2vmkZjFLAbVATSek-6M_WZRsidXNGd28UQRVdE,3444
 udata/tests/dataset/test_dataset_actions.py,sha256=bgDjVYjOvu3sX_FCTCzf2snZYSprsqor2nAhIVuokSs,722
 udata/tests/dataset/test_dataset_commands.py,sha256=zMPJG2wYwKBee2zI65kmboxf59Zqa84DDjT8V5wj9uo,801
-udata/tests/dataset/test_dataset_events.py,sha256=JP-qC9wxaCFn4CLUI3WWCqiDinXgfaa5nF9j-YhB0iQ,4034
+udata/tests/dataset/test_dataset_events.py,sha256=SYYvtK_YjPUoMzw44CfoVtXn5gOcc7i0PqApcwRZkOw,4007
 udata/tests/dataset/test_dataset_model.py,sha256=oaqm7q3DwZa4GLCyv7rj3rvtBIKxdCf4wUQdYo1pOiU,29745
 udata/tests/dataset/test_dataset_rdf.py,sha256=EAUYrM2es4WFOcTh42j1h3CzYTW6p0JfYQddHdiLln8,30082
 udata/tests/dataset/test_dataset_tasks.py,sha256=rSafDjCiOyEb2_tVUDN4wqGylF6Yf9VNB769SLmxlwI,2283
@@ -697,9 +697,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=WpPzAqVd2Onv_kz45ULUySKPLrpjcc
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=18Op9RUITewoDRewlOdYzzq6gjsf1lsvepACV1d7zxs,44976
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=NIYRNhVoETZUvIvWm3cCW7DtMBAnS2vXzZjMF5ZzD_c,28500
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=rQB-4V4WJ7bURj6g2j653vItr5TMHadcLQxec7_fDmg,51545
-udata-9.1.5.dev31465.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.1.5.dev31465.dist-info/METADATA,sha256=tFJYKtHS8Afh62Xq-YaVFXhXtcJFjIakvCHgBS4TdZY,130428
-udata-9.1.5.dev31465.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.1.5.dev31465.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.1.5.dev31465.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.1.5.dev31465.dist-info/RECORD,,
+udata-9.1.5.dev31476.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.1.5.dev31476.dist-info/METADATA,sha256=bMXc881-T_lSN5FOuwQI8YacVf-1J3AdhVYSVhefjIQ,130521
+udata-9.1.5.dev31476.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.1.5.dev31476.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.1.5.dev31476.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.1.5.dev31476.dist-info/RECORD,,