udata 10.5.1.dev36004__py2.py3-none-any.whl → 10.5.1.dev36025__py2.py3-none-any.whl

udata/harvest/api.py

@@ -62,7 +62,7 @@ item_fields = api.model(
             dataset_ref_fields, description="The processed dataset", allow_null=True
         ),
         "dataservice": fields.Nested(
-            Dataservice.__read_fields__, description="The processed dataservice", allow_null=True
+            Dataservice.__ref_fields__, description="The processed dataservice", allow_null=True
         ),
         "status": fields.String(
             description="The item status", required=True, enum=list(HARVEST_ITEM_STATUS)
@@ -208,21 +208,26 @@ backend_fields = api.model(
     },
 )
 
+preview_dataservice_fields = api.clone(
+    "DataservicePreview",
+    Dataservice.__ref_fields__,
+    {
+        "self_web_url": fields.Raw(
+            attribute=lambda _d: None, description="The dataservice webpage URL (fake)"
+        ),
+        "self_api_url": fields.Raw(
+            attribute=lambda _d: None, description="The dataservice API URL (fake)"
+        ),
+    },
+)
+
+
 preview_dataset_fields = api.clone(
     "DatasetPreview",
     dataset_fields,
     {
-        "uri": fields.UrlFor(
-            "api.dataset",
-            lambda o: {"dataset": "not-available"},
-            description="The dataset API URI (fake)",
-        ),
-        "page": fields.UrlFor(
-            "datasets.show",
-            lambda o: {"dataset": "not-available"},
-            description="The dataset page URL (fake)",
-            fallback_endpoint="api.dataset",
-        ),
+        "uri": fields.Raw(attribute=lambda _d: None, description="The dataset API URL (fake)"),
+        "page": fields.Raw(attribute=lambda _d: None, description="The dataset page URL (fake)"),
     },
 )
 
@@ -233,6 +238,9 @@ preview_item_fields = api.clone(
         "dataset": fields.Nested(
             preview_dataset_fields, description="The processed dataset", allow_null=True
         ),
+        "dataservice": fields.Nested(
+            preview_dataservice_fields, description="The processed dataset", allow_null=True
+        ),
     },
 )
 

{udata-10.5.1.dev36004.dist-info → udata-10.5.1.dev36025.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.5.1.dev36004
+Version: 10.5.1.dev36025
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -142,6 +142,7 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
+- Fix failing to return dataservice in harvest preview because of no ID for URL [#3357](https://github.com/opendatateam/udata/pull/3357/)
 - Fix invalid resource format from harvested RDF records [#3354](https://github.com/opendatateam/udata/pull/3354)
 - Expose `dataset_id` for CommunityResource in /dataset/resource/id [#3258](https://github.com/opendatateam/udata/pull/3258)
 - Add a CI job to create a release on Sentry [#3266](https://github.com/opendatateam/udata/pull/3266)

{udata-10.5.1.dev36004.dist-info → udata-10.5.1.dev36025.dist-info}/RECORD

@@ -284,7 +284,7 @@ udata/frontend/__init__.py,sha256=Aa5BX19jTAcjGiGKszPabbOju5thvA7XFz4aYvxwXQw,35
 udata/frontend/markdown.py,sha256=5kNMVOMLlGvJfpIVONaQv4JT1pi6qWNcnb_BVV_VNJQ,4324
 udata/harvest/__init__.py,sha256=C4y5w4vGb_F9Opy62lzV3eHo4DkNyRgPCq-wsarPXiQ,28
 udata/harvest/actions.py,sha256=oqPc-nIRXsWjvSMFkTVFXW_f9XkYa6JlKWYEBsJYt9k,9812
-udata/harvest/api.py,sha256=jSYeZYPW46ZvlcctVHBhb5V5dciI6Bbgk1ibT9XbmSQ,16554
+udata/harvest/api.py,sha256=9PUUM4SEt2m6cnNeTEzNKqm_UnT52E3_efAgSd5TaCo,16873
 udata/harvest/commands.py,sha256=7dSYjphW8sxyZRef-ixJEsQc36bPIVKMN_wt4IRcKUY,4766
 udata/harvest/csv.py,sha256=TcHWJLiEbK8ouwGGYZy9US4nMxfWk1Ydw8sMlPit1tk,392
 udata/harvest/exceptions.py,sha256=-sTbXece_YQstXlnpSZX5EJGTONYZ4J2RgByG0WlqAI,302
@@ -731,9 +731,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=9sCd1MUKvtVP_sOXvK-G5v4PfWkkdA
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=-eJptz9s63rjkdm-3HJi_2t70pyv3-8EuXBn-B2qI_4,48419
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=qduXntHWe__KaUxJ4JwwyGG3eSgYb1auGdNax0lS49c,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=6QCuLMCRjgyAvu9U7i0P19ae8fm_uStfmxHLqUO9EoY,55394
-udata-10.5.1.dev36004.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.5.1.dev36004.dist-info/METADATA,sha256=lCv9FEK_awPJBvIeunzYP6FofHZYJ53_DDWanH6FgBk,149326
-udata-10.5.1.dev36004.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.5.1.dev36004.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.5.1.dev36004.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.5.1.dev36004.dist-info/RECORD,,
+udata-10.5.1.dev36025.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.5.1.dev36025.dist-info/METADATA,sha256=237ROhTbnqYWcMMFPeEtkwsOS0zwENbwJOd7U8UDaO8,149464
+udata-10.5.1.dev36025.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.5.1.dev36025.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.5.1.dev36025.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.5.1.dev36025.dist-info/RECORD,,