udata 9.0.1.dev29780__py2.py3-none-any.whl → 9.0.1.dev29790__py2.py3-none-any.whl

udata/core/dataservices/factories.py

@@ -1,9 +1,23 @@
 import factory
 
-from udata.core.dataservices.models import Dataservice
+from udata.core.dataservices.models import Dataservice, HarvestMetadata
 from udata.core.organization.factories import OrganizationFactory
 from udata.factories import ModelFactory
 
+class HarvestMetadataFactory(ModelFactory):
+    class Meta:
+        model = HarvestMetadata
+
+    backend = 'csw-dcat'
+    domain = 'data.gouv.fr'
+
+    source_id = factory.Faker('unique_string')
+    source_url = factory.Faker('url')
+
+    remote_id = factory.Faker('unique_string')
+    remote_url = factory.Faker('url')
+
+    uri = factory.Faker('url')
 
 class DataserviceFactory(ModelFactory):
     class Meta:

udata/core/dataservices/rdf.py

@@ -59,14 +59,14 @@ def dataservice_from_rdf(graph: Graph, dataservice: Dataservice, node, all_datas
     return dataservice
 
 
-def dataservice_to_rdf(dataservice, graph=None):
+def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     '''
     Map a dataservice domain model to a DCAT/RDF graph
     '''
     # Use the unlocalized permalink to the dataset as URI when available
     # unless there is already an upstream URI
-    if dataservice.harvest and dataservice.harvest.rdf_node_id_as_url:
-        id = URIRef(dataservice.harvest.rdf_node_id_as_url)
+    if dataservice.harvest and dataservice.harvest.uri:
+        id = URIRef(dataservice.harvest.uri)
     elif dataservice.id:
         id = URIRef(endpoint_for('dataservices.show_redirect', 'api.dataservice',
                     dataservice=dataservice.id, _external=True))
@@ -76,8 +76,8 @@ def dataservice_to_rdf(dataservice, graph=None):
         id = BNode()
 
     # Expose upstream identifier if present
-    if dataservice.harvest and dataservice.harvest.dct_identifier:
-        identifier = dataservice.harvest.dct_identifier
+    if dataservice.harvest:
+        identifier = dataservice.harvest.remote_id
     else:
         identifier = dataservice.id
     graph = graph or Graph(namespace_manager=namespace_manager)

udata/tests/site/test_site_rdf.py

@@ -6,7 +6,7 @@ from rdflib import URIRef, Literal, Graph
 from rdflib.namespace import RDF, FOAF
 from rdflib.resource import Resource
 
-from udata.core.dataservices.factories import DataserviceFactory
+from udata.core.dataservices.factories import DataserviceFactory, HarvestMetadataFactory
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
@@ -251,7 +251,7 @@ class SiteRdfViewsTest:
         dataset_b = DatasetFactory.create()
         dataset_c = DatasetFactory.create()
 
-        dataservice_a = DataserviceFactory.create(datasets=[dataset_a.id])
+        dataservice_a = DataserviceFactory.create(datasets=[dataset_a.id], harvest=HarvestMetadataFactory())
         dataservice_b = DataserviceFactory.create(datasets=[dataset_b.id])
         dataservice_x = DataserviceFactory.create(datasets=[dataset_a.id, dataset_c.id])
         dataservice_y = DataserviceFactory.create(datasets=[])

{udata-9.0.1.dev29780.dist-info → udata-9.0.1.dev29790.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.0.1.dev29780
+Version: 9.0.1.dev29790
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -150,7 +150,7 @@ It is collectively taken care of by members of the
 - Update markdown base settings [#3067](https://github.com/opendatateam/udata/pull/3067)
 - Prevent tagging as spam owners' messages [#3071](https://github.com/opendatateam/udata/pull/3071)[#3076](https://github.com/opendatateam/udata/pull/3076)
 - Add api endpoint /me/org_topics/ [#3070](https://github.com/opendatateam/udata/pull/3070)
-- Expose dataservices in RDF catalog [#3058](https://github.com/opendatateam/udata/pull/3058)
+- Expose dataservices in RDF catalog [#3058](https://github.com/opendatateam/udata/pull/3058) [#3075](https://github.com/opendatateam/udata/pull/3075)
 - CORS: always returns 204 on OPTIONS request [#3046](https://github.com/opendatateam/udata/pull/3046) 
 
 ## 9.0.0 (2024-06-07)

{udata-9.0.1.dev29780.dist-info → udata-9.0.1.dev29790.dist-info}/RECORD

@@ -80,10 +80,10 @@ udata/core/contact_point/forms.py,sha256=ggLhSJ1IRn5MclrhydckjAxwr4fFZxgAD4huSSu
 udata/core/contact_point/models.py,sha256=NlNKureCpzgTLJuGviZPjNx-ABYRp4j2L-ur9Gmixao,324
 udata/core/dataservices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataservices/api.py,sha256=rjCU55NNGgCDRlurfhJUT2byBGJWN5coM8b7AApzEew,3090
-udata/core/dataservices/factories.py,sha256=_6Rp1qGB7z3BbPcIshj8LNsxUpublq0sf4KVTjBziPI,506
+udata/core/dataservices/factories.py,sha256=KVh7YxDpIfTcve3OgkAwJib0z4tyKFlTImOVnv9SzBk,873
 udata/core/dataservices/models.py,sha256=zMhzjnXm1p5GHZU1lYgMqft5u7iFyX0BIvNB1hM4D6Q,5868
 udata/core/dataservices/permissions.py,sha256=X9Bh8e0pnx6OgeEf6NowXZUiwyreUa6UY479B16cCqs,175
-udata/core/dataservices/rdf.py,sha256=YfHI60f0uJq0kSUKxSvFJzskbRH7c9yOj1ugcH6iLpA,4654
+udata/core/dataservices/rdf.py,sha256=M0mhwJ1WO_0iHP_F_fhA3GMPTUlYI4aZRQcvreNw7vM,4593
 udata/core/dataservices/tasks.py,sha256=NOWcTPoLasMrrvq9EkwQMGlUbQQmi_l3s815K-mtZTM,971
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=3pzBg_qOR-w7fwPpTOKUHXWC9lkjALbOn1UQFmmT-s0,1199
@@ -673,7 +673,7 @@ udata/tests/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 udata/tests/site/test_site_api.py,sha256=XIjRH-iiwKdwmX145bQflxOatfIChi5RLikIMwJSbjQ,2276
 udata/tests/site/test_site_metrics.py,sha256=Sn9dQORwe-fvoyA7ZAnF63Cq5CwUGq1myH8Xe0EtfDA,2263
 udata/tests/site/test_site_model.py,sha256=nAx9JjEKdfjdw1Kj5Rs7P5FEePoATtCuOYPiSXEnVD0,1313
-udata/tests/site/test_site_rdf.py,sha256=UeGzBkV2JW75lm7g4zMqFNHMj7QBFVI2xg0cmK25Elg,12695
+udata/tests/site/test_site_rdf.py,sha256=2d_MVXXb2fCg9mdlV6RlFU-g-xL3y0o5Ldp0IX5YYRk,12753
 udata/tests/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/user/test_user_rdf.py,sha256=HrKirMURUXS9N3If_NMb8qnfJ4kE9IZymR1SPcNvlF0,1851
 udata/tests/workers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -696,9 +696,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=Unzt8KXSviSWugimc9ficxraqJDz-h
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=O5E1eImTcE3v3m5Ub0UM9lKwK7bFGQ8_NLr1tZ4wjvs,44979
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=S2A9-Kq5YBc9klsEimF4JRm7ePxhcaM4_zeVEx3Em98,28500
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=a1c8DmzuWc-b-3kgXZl9n9aIODfttOYCN1F0pE6tPlA,51548
-udata-9.0.1.dev29780.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.0.1.dev29780.dist-info/METADATA,sha256=Kjw8IOdv7j57MIAfOeur-iXzPVaHJsCcWImKP8RU87M,125582
-udata-9.0.1.dev29780.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.0.1.dev29780.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.0.1.dev29780.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.0.1.dev29780.dist-info/RECORD,,
+udata-9.0.1.dev29790.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.0.1.dev29790.dist-info/METADATA,sha256=7gvo89de7GLNG7N_A3oaMJXuQUxSPnDfuNasT6hl3W8,125639
+udata-9.0.1.dev29790.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.0.1.dev29790.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.0.1.dev29790.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.0.1.dev29790.dist-info/RECORD,,