udata 14.5.1.dev6__py3-none-any.whl → 14.5.1.dev9__py3-none-any.whl

udata/core/dataset/api.py

@@ -328,17 +328,33 @@ class DatasetListAPI(API):
 @ns.route("/recent.atom", endpoint="recent_datasets_atom_feed")
 class DatasetsAtomFeedAPI(API):
     @api.doc("recent_datasets_atom_feed")
+    @api.expect(dataset_parser.parser)
     def get(self):
+        args = dataset_parser.parse()
+        queryset = Dataset.objects.visible()
+        queryset = DatasetApiParser.parse_filters(queryset, args)
+
+        q = args.get("q").strip() if args.get("q") else ""
+        has_filters = any(
+            args.get(k)
+            for k in ["q", "tag", "license", "organization", "owner", "format", "badge", "topic"]
+        )
+
+        if q:
+            title = _("Datasets search: {q}").format(q=q)
+        elif has_filters:
+            title = _("Filtered datasets")
+        else:
+            title = _("Latest datasets")
+
         feed = Atom1Feed(
-            _("Latest datasets"),
+            title,
             description=None,
             feed_url=request.url,
             link=request.url_root,
         )
 
-        datasets: list[Dataset] = get_rss_feed_list(
-            Dataset.objects.visible(), "created_at_internal"
-        )
+        datasets: list[Dataset] = get_rss_feed_list(queryset, "created_at_internal")
 
         for dataset in datasets:
             author_name = None

udata/core/dataset/api_fields.py

@@ -332,7 +332,7 @@ dataset_fields = api.model(
         "id": fields.String(description="The dataset identifier", readonly=True),
         "title": fields.String(description="The dataset title", required=True),
         "acronym": fields.String(description="An optional dataset acronym"),
-        "slug": fields.String(description="The dataset permalink string", required=True),
+        "slug": fields.String(description="The dataset permalink string", readonly=True),
         "description": fields.Markdown(
             description="The dataset description in markdown", required=True
         ),

udata/core/dataset/apiv2.py

@@ -108,7 +108,7 @@ dataset_fields = apiv2.model(
         "id": fields.String(description="The dataset identifier", readonly=True),
         "title": fields.String(description="The dataset title", required=True),
         "acronym": fields.String(description="An optional dataset acronym"),
-        "slug": fields.String(description="The dataset permalink string", required=True),
+        "slug": fields.String(description="The dataset permalink string", readonly=True),
         "description": fields.Markdown(
             description="The dataset description in markdown", required=True
         ),

udata/core/organization/api_fields.py

@@ -14,7 +14,7 @@ org_ref_fields = api.inherit(
         "name": fields.String(description="The organization name", readonly=True),
         "acronym": fields.String(description="The organization acronym"),
         "slug": fields.String(
-            description="The organization string used as permalink", required=True
+            description="The organization string used as permalink", readonly=True
         ),
         "uri": fields.String(
             attribute=lambda o: o.self_api_url(),
@@ -122,12 +122,12 @@ member_fields = api.model(
 org_fields = api.model(
     "Organization",
     {
-        "id": fields.String(description="The organization identifier", required=True),
+        "id": fields.String(description="The organization identifier", readonly=True),
         "name": fields.String(description="The organization name", required=True),
         "acronym": fields.String(description="The organization acronym"),
         "url": fields.String(description="The organization website URL"),
         "slug": fields.String(
-            description="The organization string used as permalink", required=True
+            description="The organization string used as permalink", readonly=True
         ),
         "description": fields.Markdown(
             description="The organization description in Markdown", required=True

udata/core/user/api_fields.py

@@ -9,7 +9,7 @@ user_ref_fields = api.inherit(
     {
         "first_name": fields.String(description="The user first name", readonly=True),
         "last_name": fields.String(description="The user larst name", readonly=True),
-        "slug": fields.String(description="The user permalink string", required=True),
+        "slug": fields.String(description="The user permalink string", readonly=True),
         "uri": fields.String(
             attribute=lambda u: u.self_api_url(),
             description="The API URI for this user",
@@ -35,8 +35,8 @@ from udata.core.organization.api_fields import member_email_with_visibility_chec
 user_fields = api.model(
     "User",
     {
-        "id": fields.String(description="The user identifier", required=True),
-        "slug": fields.String(description="The user permalink string", required=True),
+        "id": fields.String(description="The user identifier", readonly=True),
+        "slug": fields.String(description="The user permalink string", readonly=True),
         "first_name": fields.String(description="The user first name", required=True),
         "last_name": fields.String(description="The user last name", required=True),
         "email": fields.Raw(

udata/rdf.py

@@ -356,7 +356,13 @@ def theme_labels_from_rdf(rdf):
 
 
 def themes_from_rdf(rdf):
-    tags = [tag.toPython() for tag in rdf.objects(DCAT.keyword)]
+    tags = []
+    for tag in rdf.objects(DCAT.keyword):
+        if isinstance(tag, RdfResource):
+            # dcat:keyword should be Literal, not a Resource/URIRef
+            log.warning(f"Ignoring dcat:keyword with URI value: {tag.identifier}")
+            continue
+        tags.append(tag.toPython())
     tags += theme_labels_from_rdf(rdf)
     return list(set(tags))
 

udata/tests/api/test_datasets_api.py

@@ -1555,6 +1555,44 @@ class DatasetsFeedAPItest(APITestCase):
         entry = feed.entries[0]
         assert uris.validate(entry["id"])
 
+    @pytest.mark.options(DELAY_BEFORE_APPEARING_IN_RSS_FEED=0)
+    def test_recent_feed_with_organization_filter(self):
+        org1 = OrganizationFactory()
+        org2 = OrganizationFactory()
+        DatasetFactory(title="Dataset Org1", organization=org1, resources=[ResourceFactory()])
+        DatasetFactory(title="Dataset Org2", organization=org2, resources=[ResourceFactory()])
+
+        response = self.get(url_for("api.recent_datasets_atom_feed", organization=str(org1.id)))
+        self.assert200(response)
+
+        feed = feedparser.parse(response.data)
+        self.assertEqual(len(feed.entries), 1)
+        self.assertEqual(feed.entries[0].title, "Dataset Org1")
+
+    @pytest.mark.options(DELAY_BEFORE_APPEARING_IN_RSS_FEED=0)
+    def test_recent_feed_with_tag_filter(self):
+        DatasetFactory(title="Tagged", tags=["transport"], resources=[ResourceFactory()])
+        DatasetFactory(title="Not Tagged", tags=["other"], resources=[ResourceFactory()])
+
+        response = self.get(url_for("api.recent_datasets_atom_feed", tag="transport"))
+        self.assert200(response)
+
+        feed = feedparser.parse(response.data)
+        self.assertEqual(len(feed.entries), 1)
+        self.assertEqual(feed.entries[0].title, "Tagged")
+
+    @pytest.mark.options(DELAY_BEFORE_APPEARING_IN_RSS_FEED=0)
+    def test_recent_feed_with_search_query(self):
+        DatasetFactory(title="Transport public", resources=[ResourceFactory()])
+        DatasetFactory(title="Environnement", resources=[ResourceFactory()])
+
+        response = self.get(url_for("api.recent_datasets_atom_feed", q="transport"))
+        self.assert200(response)
+
+        feed = feedparser.parse(response.data)
+        self.assertEqual(len(feed.entries), 1)
+        self.assertEqual(feed.entries[0].title, "Transport public")
+
 
 class DatasetBadgeAPITest(APITestCase):
     @classmethod

udata/tests/dataset/test_dataset_rdf.py

@@ -755,6 +755,22 @@ class RdfToDatasetTest(PytestOnlyDBTestCase):
         assert isinstance(dataset, Dataset)
         assert set(dataset.tags) == set(tags + themes)
 
+    def test_keyword_as_uriref(self):
+        """Regression test: keywords can be URIRef instead of Literal in some DCAT feeds."""
+        node = BNode()
+        g = Graph()
+
+        g.add((node, RDF.type, DCAT.Dataset))
+        g.add((node, DCT.title, Literal(faker.sentence())))
+        g.add((node, DCAT.keyword, Literal("literal-tag")))
+        g.add((node, DCAT.keyword, URIRef("http://example.org/keyword/uriref-tag")))
+
+        dataset = dataset_from_rdf(g)
+        dataset.validate()
+
+        assert isinstance(dataset, Dataset)
+        assert "literal-tag" in dataset.tags
+
     def test_parse_null_frequency(self):
         assert frequency_from_rdf(None) is None
 

{udata-14.5.1.dev6.dist-info → udata-14.5.1.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata
-Version: 14.5.1.dev6
+Version: 14.5.1.dev9
 Summary: Open data portal
 Author-email: Opendata Team <opendatateam@data.gouv.fr>
 Maintainer-email: Opendata Team <opendatateam@data.gouv.fr>

{udata-14.5.1.dev6.dist-info → udata-14.5.1.dev9.dist-info}/RECORD

@@ -6,7 +6,7 @@ udata/errors.py,sha256=E8W7b4PH7c5B85g_nsUMt8fHqMVpDFOZFkO6wMPl6bA,117
 udata/factories.py,sha256=MoklZnU8iwNL25dm3JsoXhoQs1PQWSVYL1WvcUBtJqM,492
 udata/i18n.py,sha256=R7WdU0EZslj5xEHdqbyQ4iOORGjiqcVvQFCnmQEkpHA,2602
 udata/mail.py,sha256=-5OjGWqW7X5EuLLsJfhdqIrjlBGJ3T0V_wVLKc9OyPQ,3722
-udata/rdf.py,sha256=pUD7VbmhHo9cgmBbaYUd142nmB0R7VKsMXTkZWJ62jY,23825
+udata/rdf.py,sha256=Utj7qNJJP5oaRRnTSXx3pjujrRETesP9F6cZPDLUrSs,24065
 udata/routing.py,sha256=3YQu9L81QYe4NxPSR_qyXe5WQLOgtm3sYKrkRxoxY-4,7741
 udata/sentry.py,sha256=j_6PSHV1id21KFX1XvpQR-Ur4d24310HgIq7MynEZ2Q,2887
 udata/settings.py,sha256=tk9VyAxg-umX3QW8hfFRsdA683IHxrEOBV-lJOWScGg,22490
@@ -97,9 +97,9 @@ udata/core/dataservices/tasks.py,sha256=DgOsTjQMx3poI0DdLPlTysRVNhf9dYNg-Zc_ut2S
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA,1222
 udata/core/dataset/activities.py,sha256=eGxMUnC47YHxTgcls6igQ3qP7cYgwFtPfj0asCylGsI,3315
-udata/core/dataset/api.py,sha256=07uiI9sF3ebGjMyNMFmbu0r-_NPt0B1zk7g9rTePBwc,35987
-udata/core/dataset/api_fields.py,sha256=tmC9zpsMUc3ZNsrYYRBbioGNo12YmTZ0lT3i14n7B0w,18591
-udata/core/dataset/apiv2.py,sha256=6nI_R2Uv-PUl3fyI3EPsW8Ppk5GiXvKSdA3HYondiW0,21576
+udata/core/dataset/api.py,sha256=-86CS5U8UZUe6qMAVkRYwDa04OxxVOwkxSWNiMsZVzo,36538
+udata/core/dataset/api_fields.py,sha256=k_80CjLwQS4mdDQwwissxu0_NzAxKKFb3TCKQtLGSvc,18591
+udata/core/dataset/apiv2.py,sha256=lpQtEXvIc1ZbYI4Yy7CCUqxDWqsoCNauHlQ4OtYAofU,21576
 udata/core/dataset/commands.py,sha256=3mKSdJ-M7ggdG29AVn77C4ouZanbYoqkTaGQoBKOp3s,3471
 udata/core/dataset/constants.py,sha256=cwJ5v4DbSIarlMIqmUFQSAEyeV6v86NL3a0-2j0yHlw,6984
 udata/core/dataset/csv.py,sha256=mNU5cuuNzrMgFF7Z0AKN8clsv458tpJHX1_pzAjpd-4,3653
@@ -153,7 +153,7 @@ udata/core/metrics/tasks.py,sha256=5hVSvBFF2-k_MZGn1XrzEWLgRp3TlrZJtPjX1Y_niS4,4
 udata/core/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/organization/activities.py,sha256=Mw4-R8Q6G745IZnCDgrj7h2ax2crGYRhZtcewSK6_Ok,1213
 udata/core/organization/api.py,sha256=RGyxe5LRqkyk5HzsXRB9r6z_YhGVqNeKkiaEgMaOvU8,22908
-udata/core/organization/api_fields.py,sha256=UlDYS62Wt1capSO0rYf6-m_rza3lCmpTuA93R-sV9w8,7776
+udata/core/organization/api_fields.py,sha256=NXZc__i31ntun3Zt4OGt2EdpodbtQvHqzuta-TskNPY,7776
 udata/core/organization/apiv2.py,sha256=HVZmfO-Cw9hlMPcHKAC1HnSmPXeWpBz-hqWUDl2Bhs8,2983
 udata/core/organization/commands.py,sha256=DsRAtFDZvTciYNsUWumQWdn0jnNmKW-PwfIHUUZoBb8,1591
 udata/core/organization/constants.py,sha256=fncNtA-vFrRM22K1Wo6iYu9DQZjzknYxH6TIYfxM9kA,563
@@ -254,7 +254,7 @@ udata/core/topic/tasks.py,sha256=_OrPfuZ9rKENp4p4IkoyV-Yqp9bxI3nNxhpfKrbgl-w,357
 udata/core/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/user/activities.py,sha256=d91G45XEgoxYUJetkSjVolSM-nqmNSuM5b-6geayGE4,3338
 udata/core/user/api.py,sha256=xO6Bsc_5IHH8DV7y2gmT-sTWhBVvIeRJOvXXv4hAoQE,13903
-udata/core/user/api_fields.py,sha256=fx3rv8YmovIKJpZ8ldtcUOAWuJHEELDYa4HwdaQOAnA,5986
+udata/core/user/api_fields.py,sha256=lzhB380tCesjesHkXWc9CwFq4E0ThJFbYwRAHUBtNKA,5986
 udata/core/user/apiv2.py,sha256=4eNsvJjb4ChJQFrXtVbkOtAvXEcQcQpZf8vkEbriXRA,1125
 udata/core/user/commands.py,sha256=8dyowvylgYqdScgzVGgr61MWLshlS6-UopZGAMvp4zA,3539
 udata/core/user/constants.py,sha256=aTluhTR2RGZ_cdG7-mkEoT5Ndbg8BNUwwzCOld0aLMY,77
@@ -475,7 +475,7 @@ udata/tests/api/test_auth_api.py,sha256=vLyDU1hdF2QEwpNTNUgP2QPUjL0y61lzj5Viaaj9
 udata/tests/api/test_base_api.py,sha256=jbT9s_YYuh-37xR98VMS5mAHHIL0g-6F_kkhFBb4E3A,2272
 udata/tests/api/test_contact_points.py,sha256=QmnTmJZ5oIohsUH_E_wfFalRx-Fx91jO7gs7PErpLqQ,8690
 udata/tests/api/test_dataservices_api.py,sha256=UPMH6OEEczYvebyV7thf7LjrEYFctgIm1TuJV1VC-OI,29914
-udata/tests/api/test_datasets_api.py,sha256=ue8ncXBfOf3XR1ZK3YwtoWqONSk2dsAzrRIWFXIj9kM,111967
+udata/tests/api/test_datasets_api.py,sha256=twJki_rjq8SHteOVqPsFc58pKuzyhlo2a9Lr4qTOCeI,113761
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
 udata/tests/api/test_follow_api.py,sha256=4nFXG5pZ_Hf2PJ4KEdHJX_uggjc9RpB8v0fidkAcw9I,5792
 udata/tests/api/test_me_api.py,sha256=MiKN9P75h2HyMxepuxt2SiLs3Yhgl22iQXKbvTR42sg,13796
@@ -507,7 +507,7 @@ udata/tests/dataset/test_dataset_actions.py,sha256=8d-6AUKCt3Nnb_uEaztV0BzNYFDyq
 udata/tests/dataset/test_dataset_commands.py,sha256=e-tLIveg_Vp7nfOd5VhcPSiUQZ-VBv2no2lAu-2j6BE,820
 udata/tests/dataset/test_dataset_events.py,sha256=tKCQ55y_pc0wOKv2B2iej5dDxWalguU9FLtr6J2y8hE,3682
 udata/tests/dataset/test_dataset_model.py,sha256=YWhQ6RxVdgUrQbtvwATzypyl8XyNpdDjHDetyK37chU,35795
-udata/tests/dataset/test_dataset_rdf.py,sha256=_7QDypmPQvL4DzrOgsVfkbL-hW5RrIftctIz3O0wMEw,58199
+udata/tests/dataset/test_dataset_rdf.py,sha256=RVIib5ah3B_wpTj9swbx4XSzUGyYj9_6kP_n416bnSQ,58782
 udata/tests/dataset/test_dataset_recommendations.py,sha256=UMwAsLHs6_XA1vp7-lnTjaPOc9E6zQYqw9VIuSCNUtk,7102
 udata/tests/dataset/test_dataset_tasks.py,sha256=6YmDBJUv3pIPNFj6DvY7FLsa4k7XxGeQ7BgOLrJOeTY,4564
 udata/tests/dataset/test_resource_preview.py,sha256=387FEdNHWZyEeOlmSETMIFlnhVuKQ-U4o2RkWgxXwik,2208
@@ -580,9 +580,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=n7ZHvruSL9hIPoSl4aCkGeC52LZYeg
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=24CsHDZ84nqTMr-cOvOZ-LNYsokLQNyQchI41o3Cq9M,49765
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=pw3gsvr8lPQJZvX9Jo8ymu59I3L6-rrpX2Fqy0Nu5r4,20441
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=1h8akWRpcQ1uD5zezqjp-Q-gAld5_93MkJL4BRlqKjQ,54738
-udata-14.5.1.dev6.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-14.5.1.dev6.dist-info/METADATA,sha256=qbQHMoJGGldXV--7F7oWanV4xdfGPPbMr49r5vGsnLs,4358
-udata-14.5.1.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-udata-14.5.1.dev6.dist-info/entry_points.txt,sha256=XwrEzP-n_6CKnwTsrNHzyCTWbMwg2FkvxVVB686f_C0,476
-udata-14.5.1.dev6.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
-udata-14.5.1.dev6.dist-info/RECORD,,
+udata-14.5.1.dev9.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-14.5.1.dev9.dist-info/METADATA,sha256=HzZLmJ05MmH_cM_Dfph767hBvXEDJ7l-PC0lZ1mZ4bA,4358
+udata-14.5.1.dev9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+udata-14.5.1.dev9.dist-info/entry_points.txt,sha256=XwrEzP-n_6CKnwTsrNHzyCTWbMwg2FkvxVVB686f_C0,476
+udata-14.5.1.dev9.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
+udata-14.5.1.dev9.dist-info/RECORD,,