udata 10.8.3.dev37212__py2.py3-none-any.whl → 10.8.3.dev37263__py2.py3-none-any.whl

udata/core/organization/csv.py

@@ -4,6 +4,13 @@ from udata.core.dataset.models import Dataset
 from .models import Organization
 
 
+def get_resource_download_count(organization: Organization) -> int:
+    return sum(
+        dat.metrics.get("resources_downloads", 0) or 0
+        for dat in Dataset.objects(organization=organization).only("metrics").visible()
+    )
+
+
 @csv.adapter(Organization)
 class OrganizationCsvAdapter(csv.Adapter):
     downloads_counts = None
@@ -21,32 +28,8 @@ class OrganizationCsvAdapter(csv.Adapter):
         "last_modified",
         "business_number_id",
         ("members_count", lambda o: len(o.members)),
+        ("downloads", get_resource_download_count),
     )
 
     def dynamic_fields(self):
-        return csv.metric_fields(Organization) + self.get_dynamic_field_downloads()
-
-    def get_dynamic_field_downloads(self):
-        downloads_counts = self.get_downloads_counts()
-        return [("downloads", lambda o: downloads_counts.get(str(o.id), 0))]
-
-    def get_downloads_counts(self):
-        """
-        Prefetch all the resources' downloads for all selected organization into memory
-        """
-        if self.downloads_counts is not None:
-            return self.downloads_counts
-
-        self.downloads_counts = {}
-
-        ids = [o.id for o in self.queryset]
-        for dataset in Dataset.objects(organization__in=ids):
-            org_id = str(dataset.organization.id)
-            if self.downloads_counts.get(org_id) is None:
-                self.downloads_counts[org_id] = 0
-
-            self.downloads_counts[org_id] += sum(
-                resource.metrics.get("views", 0) for resource in dataset.resources
-            )
-
-        return self.downloads_counts
+        return csv.metric_fields(Organization)

udata/tests/organization/test_csv_adapter.py

@@ -1,6 +1,6 @@
 import pytest
 
-from udata.core.dataset.factories import DatasetFactory, ResourceFactory
+from udata.core.dataset.factories import DatasetFactory
 from udata.core.organization.csv import OrganizationCsvAdapter
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Organization
@@ -15,21 +15,9 @@ class OrganizationCSVAdapterTest:
 
         DatasetFactory(
             organization=org_with_dataset,
-            resources=[
-                ResourceFactory(
-                    metrics={
-                        "views": 42,
-                    }
-                ),
-                ResourceFactory(
-                    metrics={
-                        "views": 1337,
-                    }
-                ),
-                ResourceFactory(),
-            ],
+            metrics={"resources_downloads": 1337},
         )
-        DatasetFactory(organization=org_with_dataset, resources=[])
+        DatasetFactory(organization=org_with_dataset, metrics={"resources_downloads": 42})
         adapter = OrganizationCsvAdapter(Organization.objects.all())
 
         # Build a dict (Org ID to dict of header name to value) from the CSV values and headers to simplify testing below.

{udata-10.8.3.dev37212.dist-info → udata-10.8.3.dev37263.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.8.3.dev37212
+Version: 10.8.3.dev37263
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -151,6 +151,7 @@ It is collectively taken care of by members of the
 - Cache dcat harvest pages to avoid two rounds of requests [#3398](https://github.com/opendatateam/udata/pull/3398)
 - Ignore Dataset.accessService when processing DataService [#3399](https://github.com/opendatateam/udata/pull/3399)
 - Add dataset field `description_short` [#3397](https://github.com/opendatateam/udata/pull/3397)
+- Optimize csv organization export [#3401](https://github.com/opendatateam/udata/pull/3401)
 
 ## 10.8.2 (2025-07-31)
 

{udata-10.8.3.dev37212.dist-info → udata-10.8.3.dev37263.dist-info}/RECORD

@@ -154,7 +154,7 @@ udata/core/organization/api_fields.py,sha256=UlDYS62Wt1capSO0rYf6-m_rza3lCmpTuA9
 udata/core/organization/apiv2.py,sha256=fLMN5T7s8yF4u7c1WWHXMqQAlyH2OCSyAfmleiFlf7M,3037
 udata/core/organization/commands.py,sha256=DsRAtFDZvTciYNsUWumQWdn0jnNmKW-PwfIHUUZoBb8,1591
 udata/core/organization/constants.py,sha256=fncNtA-vFrRM22K1Wo6iYu9DQZjzknYxH6TIYfxM9kA,563
-udata/core/organization/csv.py,sha256=QR49HfMUtDzkAtxi8q3-P3VtQR4xf3cCnM6vIEJhRHU,1628
+udata/core/organization/csv.py,sha256=zdLeB4La-TeOEELg0WI3FryoQWnoAYit_DssInVSHRI,979
 udata/core/organization/factories.py,sha256=g8ubBcz79xbjvpunZ02IDOakFg1KE6cXjNkE9vFyFAc,624
 udata/core/organization/forms.py,sha256=tscDb1_yOpbTx3ahl8ttA7oDkX9jIyzLc4gOf6WbN3s,3552
 udata/core/organization/metrics.py,sha256=CEhkZLUufDyWi2XyizMoXkuddz7xDJvmdkPTweqfWyI,1144
@@ -717,7 +717,7 @@ udata/tests/metrics/helpers.py,sha256=1l5SvbWkWkXiJHmAAbf7VzSGhJY9eJxTtJ2S4cVB8T
 udata/tests/metrics/test_metrics.py,sha256=DHdHPdrTHPEIIRW0gwvYqQALfWkrPk4R4rjcT6C6mJM,2619
 udata/tests/metrics/test_tasks.py,sha256=asTCdErabrPQClFu-36HDVzqd8ZfQjsAJ4kULhpxdio,5589
 udata/tests/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/tests/organization/test_csv_adapter.py,sha256=vgTVbPMqKipcdg7wi99pHk9ZNhqtuU-yneEaVW3pZmU,1564
+udata/tests/organization/test_csv_adapter.py,sha256=61XIVDYdZxnWUyysN_wApWwghM7nT_Id-74IMtFd3Zg,1263
 udata/tests/organization/test_notifications.py,sha256=PGmME5BbYVtcPffeSE1sx47J6iAfm4RDAZIRv_MXDFE,1366
 udata/tests/organization/test_organization_model.py,sha256=ZEUHX7lvGMYMlHDpPiVUPeZeJeDDTp5owLEpFDSihjc,4311
 udata/tests/organization/test_organization_rdf.py,sha256=Uf-OgXV615wLUHfcBTmp9QFuV8VCFmjI4wgvShve-mc,8074
@@ -758,9 +758,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=ogtEGsjwIkOEtzrI49e57izi-NUim5
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=1omSlqdMEdwYtzHGalXrtptVk14mlb6JS_8xR8BsznU,48428
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=V7unDjO31PNLiRhfEkYU3pU47wWWct-otdL0GDma0S4,28692
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=wVBipfpPl-DmYeVm5wrlzWWM3oEvuruDVbJHx4I1p8s,55170
-udata-10.8.3.dev37212.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.8.3.dev37212.dist-info/METADATA,sha256=KlqzeSmD3qBZlkz_oq_R2cFkg3YWqe1PnNMXxSkTzPs,153949
-udata-10.8.3.dev37212.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.8.3.dev37212.dist-info/entry_points.txt,sha256=v2u12qO11i2lyLNIp136WmLJ-NHT-Kew3Duu8J-AXPM,614
-udata-10.8.3.dev37212.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.8.3.dev37212.dist-info/RECORD,,
+udata-10.8.3.dev37263.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.8.3.dev37263.dist-info/METADATA,sha256=ggikfx2gSGCDLw950R_xyJiFj-7oRLUgv7KvT0L-MNI,154041
+udata-10.8.3.dev37263.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.8.3.dev37263.dist-info/entry_points.txt,sha256=v2u12qO11i2lyLNIp136WmLJ-NHT-Kew3Duu8J-AXPM,614
+udata-10.8.3.dev37263.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.8.3.dev37263.dist-info/RECORD,,