udata 10.4.4.dev35901__py2.py3-none-any.whl → 10.4.4.dev35923__py2.py3-none-any.whl

udata/core/dataset/rdf.py

@@ -109,7 +109,8 @@ def temporal_to_rdf(
     graph = graph or Graph(namespace_manager=namespace_manager)
     pot = graph.resource(BNode())
     pot.set(RDF.type, DCT.PeriodOfTime)
-    pot.set(DCAT.startDate, Literal(daterange.start))
+    if daterange.start:
+        pot.set(DCAT.startDate, Literal(daterange.start))
     if daterange.end:
         pot.set(DCAT.endDate, Literal(daterange.end))
     return pot
@@ -409,6 +410,14 @@ def temporal_from_literal(text):
             )
 
 
+def maybe_date_range(start, end):
+    if start or end:
+        return db.DateRange(
+            start=start.toPython() if start else None,
+            end=end.toPython() if end else None,
+        )
+
+
 def temporal_from_resource(resource):
     """
     Parse a temporal coverage from a RDF class/resource ie. either:
@@ -422,24 +431,12 @@ def temporal_from_resource(resource):
         # Fetch remote ontology if necessary
         g = Graph().parse(str(resource.identifier))
         resource = g.resource(resource.identifier)
-    if resource.value(SCHEMA.startDate):
-        end = resource.value(SCHEMA.endDate)
-        return db.DateRange(
-            start=resource.value(SCHEMA.startDate).toPython(),
-            end=end.toPython() if end else None,
-        )
-    elif resource.value(DCAT.startDate):
-        end = resource.value(DCAT.endDate)
-        return db.DateRange(
-            start=resource.value(DCAT.startDate).toPython(),
-            end=end.toPython() if end else None,
-        )
-    elif resource.value(SCV.min):
-        end = resource.value(SCV.max)
-        return db.DateRange(
-            start=resource.value(SCV.min).toPython(),
-            end=end.toPython() if end else None,
-        )
+    if range := maybe_date_range(resource.value(SCHEMA.startDate), resource.value(SCHEMA.endDate)):
+        return range
+    elif range := maybe_date_range(resource.value(DCAT.startDate), resource.value(DCAT.endDate)):
+        return range
+    elif range := maybe_date_range(resource.value(SCV.min), resource.value(SCV.max)):
+        return range
 
 
 def temporal_from_rdf(period_of_time):

udata/tests/dataset/test_dataset_rdf.py

@@ -292,6 +292,19 @@ class DatasetToRdfTest:
         assert pot.value(DCAT.startDate).toPython() == start
         assert pot.value(DCAT.endDate) is None
 
+    def test_temporal_coverage_only_end(self):
+        end = faker.future_date(end_date="+30d")
+        temporal_coverage = db.DateRange(end=end)
+        dataset = DatasetFactory(temporal_coverage=temporal_coverage)
+
+        d = dataset_to_rdf(dataset)
+
+        pot = d.value(DCT.temporal)
+
+        assert pot.value(RDF.type).identifier == DCT.PeriodOfTime
+        assert pot.value(DCAT.startDate) is None
+        assert pot.value(DCAT.endDate).toPython() == end
+
     def test_from_external_repository(self):
         dataset = DatasetFactory(
             harvest=HarvestDatasetMetadata(
@@ -893,6 +906,20 @@ class RdfToDatasetTest:
         assert daterange.start == start
         assert daterange.end is None
 
+    def test_parse_temporal_as_schema_format_only_end_date(self):
+        node = BNode()
+        g = Graph()
+        end = faker.future_date(end_date="+30d")
+
+        g.set((node, RDF.type, DCT.PeriodOfTime))
+        g.set((node, SCHEMA.endDate, Literal(end)))
+
+        daterange = temporal_from_rdf(g.resource(node))
+
+        assert isinstance(daterange, db.DateRange)
+        assert daterange.start is None
+        assert daterange.end == end
+
     def test_parse_temporal_as_iso_interval(self):
         start = faker.past_date(start_date="-30d")
         end = faker.future_date(end_date="+30d")

{udata-10.4.4.dev35901.dist-info → udata-10.4.4.dev35923.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.4.4.dev35901
+Version: 10.4.4.dev35923
 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)
 
+- Allow temporal intervals with no start date [#3353](https://github.com/opendatateam/udata/pull/3353)
 - Fix removing schema by sending null [#3350](https://github.com/opendatateam/udata/pull/3350)
 - Use datagouv patched ISO-DCAT XSLT URL [#3351](https://github.com/opendatateam/udata/pull/3351)
 

{udata-10.4.4.dev35901.dist-info → udata-10.4.4.dev35923.dist-info}/RECORD

@@ -108,7 +108,7 @@ udata/core/dataset/forms.py,sha256=7KUxuFcEGT0MUe0cZCiZtsnZhvGgvEd68pe13NgeSMI,6
 udata/core/dataset/models.py,sha256=_zsUDRl4xUt2Rp1QuIw2f85FxBNx_e2XgpiXVxVQ-tE,42889
 udata/core/dataset/permissions.py,sha256=zXQ6kU-Ni3Pl5tDtat-ZPupug9InsNeCN7xRLc2Vcrc,1097
 udata/core/dataset/preview.py,sha256=IwCqiNTjjXbtA_SSKF52pwnzKKEz0GyYM95QNn2Dkog,2561
-udata/core/dataset/rdf.py,sha256=XrdW_ipDYiaGpFFPS4Icce_tVpTtu8JcsL5O1H1Wwg4,31807
+udata/core/dataset/rdf.py,sha256=anpTfjH9dUdZZRk_X8oixtSqXwffVKwXgfy3lB5OA8A,31698
 udata/core/dataset/search.py,sha256=E7LqHBnq3sMefvmLwTpiw-Ovem2a3NJswHesRjctboE,5627
 udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs,161
 udata/core/dataset/tasks.py,sha256=6FzeLzJRQxzq7sBLUE8H8ZGLByix2EDOzGAsA8FteX8,10019
@@ -663,7 +663,7 @@ udata/tests/dataset/test_dataset_actions.py,sha256=bgDjVYjOvu3sX_FCTCzf2snZYSprs
 udata/tests/dataset/test_dataset_commands.py,sha256=zMPJG2wYwKBee2zI65kmboxf59Zqa84DDjT8V5wj9uo,801
 udata/tests/dataset/test_dataset_events.py,sha256=hlrpoOiBbnX_COUI9Pzdqlp45GZZDqu5piwupbnPiTI,3601
 udata/tests/dataset/test_dataset_model.py,sha256=av4RhOnT-52qs-WL1NCn6R2SMa_fzDcoV-06vjccsdw,33891
-udata/tests/dataset/test_dataset_rdf.py,sha256=fWMfhJvxmRKPw7cdvksS-sJBJT4G9DepDIm5RTdvrJ4,41310
+udata/tests/dataset/test_dataset_rdf.py,sha256=kFnrKzt_Gyw5zoRB2Tkhd3LN-XOpaIVzrF0oYvVS1fA,42220
 udata/tests/dataset/test_dataset_tasks.py,sha256=n1W2Pg0ez02d66zQG3N93kh7dpR2yLMRDqUI6PnPaI0,3088
 udata/tests/dataset/test_resource_preview.py,sha256=fp9mSL7unhyM66GR0gwhgX3OGQ4TJt7G9xU-CjsL3HI,3908
 udata/tests/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.4.4.dev35901.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.4.4.dev35901.dist-info/METADATA,sha256=K-J7vGWIl8-PJTvrkioCYToxUwCEnqBDTpaEm7E1R4E,148725
-udata-10.4.4.dev35901.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.4.4.dev35901.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.4.4.dev35901.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.4.4.dev35901.dist-info/RECORD,,
+udata-10.4.4.dev35923.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.4.4.dev35923.dist-info/METADATA,sha256=Ln2jXmBiBf_pOsqdpwHrrRj376CTSZWVeq1rj68RJak,148828
+udata-10.4.4.dev35923.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.4.4.dev35923.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.4.4.dev35923.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.4.4.dev35923.dist-info/RECORD,,