wbnews 1.45.0__py2.py3-none-any.whl → 1.58.1__py2.py3-none-any.whl

wbnews/viewsets/views.py

@@ -2,8 +2,12 @@ from functools import reduce
 from operator import or_
 
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import OuterRef, Q, Subquery
+from django.db.models import F, Q
+from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
+from rest_framework.decorators import action
+from rest_framework.permissions import IsAdminUser
+from rest_framework.response import Response
 from wbcore import viewsets
 from wbcore.content_type.utils import get_ancestors_content_type
 
@@ -16,15 +20,15 @@ from wbnews.serializers import (
     SourceRepresentationSerializer,
 )
 
-from ..filters import NewsFilterSet
-from .buttons import NewsButtonConfig
+from ..filters import NewsFilterSet, NewsRelationshipFilterSet
+from .buttons import NewsButtonConfig, NewsRelationshipButtonConfig
 from .display import (
     NewsDisplayConfig,
     NewsRelationshipDisplayConfig,
     NewsSourceDisplayConfig,
     SourceDisplayConfig,
 )
-from .endpoints import NewsEndpointConfig, NewsSourceEndpointConfig
+from .endpoints import NewsEndpointConfig, NewsRelationshipEndpointConfig, NewsSourceEndpointConfig
 from .titles import (
     NewsRelationshipTitleConfig,
     NewsSourceModelTitleConfig,
@@ -93,45 +97,66 @@ class NewsModelViewSet(viewsets.ReadOnlyModelViewSet):
             qs = qs.filter(relationships__in=relationships)
         return qs.distinct()
 
-
-class NewsRelationshipModelViewSet(viewsets.ReadOnlyModelViewSet):
+    @action(detail=True, methods=["PATCH"], permission_classes=[IsAdminUser])
+    def refreshrelationship(self, request, pk=None):
+        """
+        Action to allow administrator to reset news relationships and recreate them on demand.
+        """
+        new = get_object_or_404(News, pk=pk)
+        relationships = new.relationships.all()
+        if content_type_id := self.request.GET.get("content_type_id", None):
+            relationships = relationships.filter(content_type_id=content_type_id)
+        if object_id := self.request.GET.get("content_id", None):
+            relationships = relationships.filter(object_id=object_id)
+        relationships.delete()
+        new.update_and_create_news_relationships()
+        return Response({"status": "ok"})
+
+
+class NewsRelationshipModelViewSet(viewsets.ModelViewSet):
+    IDENTIFIER = "wbnews:newsrelationship"
     serializer_class = NewsRelationshipModelSerializer
-    queryset = News.objects.all()
+    queryset = NewsRelationship.objects.all()
     display_config_class = NewsRelationshipDisplayConfig
     title_config_class = NewsRelationshipTitleConfig
+    button_config_class = NewsRelationshipButtonConfig
+    endpoint_config_class = NewsRelationshipEndpointConfig
     ordering = ["-datetime"]
+    filterset_class = NewsRelationshipFilterSet
 
     @cached_property
     def content_type(self) -> ContentType:
-        if content_type_id := self.kwargs.get("content_type"):
+        if content_type_id := self.request.GET.get("content_type", self.request.POST.get("content_type")):
             return ContentType.objects.get_for_id(content_type_id)
 
+    @cached_property
+    def object_id(self) -> int:
+        return self.request.GET.get("object_id", self.request.POST.get("object_id"))
+
     @cached_property
     def content_object(self):
-        if (object_id := self.kwargs.get("content_id")) and self.content_type:
+        if (object_id := self.object_id) and self.content_type:
             return self.content_type.get_object_for_this_type(id=object_id)
 
     def get_queryset(self):
         queryset = super().get_queryset()
 
-        if self.content_type and self.content_object:
+        if self.content_type:
             content_types = list(get_ancestors_content_type(self.content_type))
+            queryset = queryset.filter(content_type__in=content_types)
+        if self.content_object:
             # we ensure that for MPTT model, all descendants news are included as well
             if hasattr(self.content_object, "get_family"):
-                conditions = []
-                for descendant in self.content_object.get_family():
-                    for ct in content_types:
-                        conditions.append(Q(content_type=ct, object_id=descendant.id))
+                queryset = queryset.filter(object_id__in=[obj.id for obj in self.content_object.get_family()])
             else:
-                conditions = [Q(content_type=ct, object_id=self.content_object.id) for ct in content_types]
-            relationships = NewsRelationship.objects.filter(reduce(or_, conditions))
-
-            return queryset.filter(id__in=relationships.values("news")).annotate(
-                analysis=Subquery(relationships.filter(news=OuterRef("id")).values("analysis")[:1]),
-                sentiment=Subquery(relationships.filter(news=OuterRef("id")).values("sentiment")[:1]),
-                important=Subquery(relationships.filter(news=OuterRef("id")).values("important")[:1]),
-            )
-        return News.objects.none()
+                queryset = queryset.filter(object_id=self.object_id)
+        return queryset.select_related("news").annotate(
+            source=F("news__source"),
+            title=F("news__title"),
+            description=F("news__description"),
+            summary=F("news__summary"),
+            datetime=F("news__datetime"),
+        )
 
 
 class NewsSourceModelViewSet(NewsModelViewSet):

{wbnews-1.45.0.dist-info → wbnews-1.58.1.dist-info}/METADATA

@@ -1,8 +1,7 @@
 Metadata-Version: 2.4
 Name: wbnews
-Version: 1.45.0
+Version: 1.58.1
 Summary: A workbench module for managing news.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: feedparser==6.*
-Requires-Dist: langdetect==1.*
 Requires-Dist: wbcore

wbnews-1.58.1.dist-info/RECORD

@@ -0,0 +1,65 @@
+wbnews/.coveragerc,sha256=OOkT651L0NuoSVSXKZiLAbnQmHe9DRoLOzo1_S_buQc,383
+wbnews/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
+wbnews/admin.py,sha256=cn-PF0LclyQ0FFNfw0mdVoW7v3g0b9uotTiAFKmLVPQ,832
+wbnews/apps.py,sha256=l4kfE3Pux84Fb34xNgKDxcxRHuPCp6odCGFE9Sa3Wzw,212
+wbnews/factories.py,sha256=_EBIeMafeiyAjnSAG-xXxdqw7vVwAu8u-DfdLn8mtHk,1172
+wbnews/serializers.py,sha256=KihExQ_GS1fNZnojryEcfU32xlTiPn-K2WGO0Zc84Cw,4732
+wbnews/signals.py,sha256=eqipwffwJnDQWUZ9VTKr5Jp-OMXLmVSNwoIsawnCKvM,192
+wbnews/tasks.py,sha256=ce9JbXKnJnf7La74h0LPwm3yrygHNe1BKZju_4m1itw,384
+wbnews/urls.py,sha256=2Gs9RGU8x6tNOLJiuG17n_ik82QVb8jlw7bU07Lk_S4,1008
+wbnews/utils.py,sha256=h4TdMbUL0qQ2h3o3jEpGuGwT90TWiryVRtBXc7avLW0,1955
+wbnews/filters/__init__.py,sha256=FXJcPsLQePCU-fzjpIu44Dsdu9vCckLHr0Kr-8Z_-C4,59
+wbnews/filters/news.py,sha256=glG45wx_Jxee57H43oqCCJIjQumrNUh8pVXiD0hBM6E,1662
+wbnews/fixtures/wbnews.yaml,sha256=cDu1UWYwIFxz-hdivW7rxLYsNOweBm4GdN1GDsycN90,173164
+wbnews/import_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/import_export/backends/__init__.py,sha256=_2HnB9uCuGhQDNg-Z0V2uIvKn26LtRBXAxUBoNetBIo,30
+wbnews/import_export/backends/news.py,sha256=QqMeAWYh4U3W4Sng0HlHx11RoR1LV_WZmRUr58dYrVg,1461
+wbnews/import_export/handlers/__init__.py,sha256=zOeENt9cpEcSLG9ZaVb4otmbTnLAa0XdTPsUjD11dXs,36
+wbnews/import_export/handlers/news.py,sha256=cdrtWIP3XOU8NMYZKF8VLYH5qHmPLboUm_GwNAvO2ew,2181
+wbnews/import_export/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/import_export/parsers/emails/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/import_export/parsers/emails/news.py,sha256=8fSgjSPuSmdfGKV1IxLMWriqGhDAG-tiZUyAgWpjZ_M,1236
+wbnews/import_export/parsers/emails/utils.py,sha256=k7R1HZx18FKXRq10COARFgHjjBadsWe1DY3AHCrwHRs,2207
+wbnews/import_export/parsers/rss/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/import_export/parsers/rss/news.py,sha256=H89avqOU_AUAyHiIXd_tfoMbcqy67GgDQ2-ucihDpks,2076
+wbnews/locale/de/LC_MESSAGES/django.mo,sha256=M70N6el-I7EymxHLw9n773Bimbztf8s8equWa9SydBs,1283
+wbnews/locale/de/LC_MESSAGES/django.po,sha256=furtxh-NgkodwE4dv0uXaRtWF2z3NxWtEw64tH9OMN4,3494
+wbnews/locale/de/LC_MESSAGES/django.po.translated,sha256=ILRIDL_vON91Do5QhZr5N85Y4vsOAIHsaU8QX0FiEA4,3962
+wbnews/locale/en/LC_MESSAGES/django.mo,sha256=UXCQbz2AxBvh-IQ7bGgjoBnijo8h9DfE9107A-2Mgkk,337
+wbnews/locale/en/LC_MESSAGES/django.po,sha256=K7SPoXdLZHyOOAoIOEydgJwl1qdQMrK3uapd4EMrVIg,3125
+wbnews/locale/fr/LC_MESSAGES/django.mo,sha256=t4lh3zX7kshbDAFzXa5HU_YGPXkPzKqODNXL2MeZ5KQ,429
+wbnews/locale/fr/LC_MESSAGES/django.po,sha256=kRBjvETEy0GMPqX0H6EArGqrtzhYXwswjUW-JDajlbM,3232
+wbnews/migrations/0001_initial_squashed_0005_alter_news_import_source.py,sha256=4qxqfpAYVeU16GsWaj7kUbtOk0ZLzuECTfzhUfmni2A,14596
+wbnews/migrations/0006_alter_news_language.py,sha256=necqSWKi20sHLok-RO9He3vnmMlmmdx07AiN3lnZPBM,4638
+wbnews/migrations/0007_auto_20240103_0955.py,sha256=YzkH_LSWH_8qdw_BrKaTN5vqLNCPnjMlJZxs03Xbbvw,1478
+wbnews/migrations/0008_alter_news_language.py,sha256=4tbpcVSey9PJOdf8xWndl1R8GmhmflpVQtI8YTwcevw,4648
+wbnews/migrations/0009_newsrelationship_analysis_newsrelationship_sentiment.py,sha256=ud_yO6skjVx2s32snxzai6Z4Uao1s-40v6UZaq4k64I,3432
+wbnews/migrations/0010_newsrelationship_important.py,sha256=seK-bFIzXa6uzja0gPnRhwS4vNgY_sR3sMm_OmP8sZE,440
+wbnews/migrations/0011_newsrelationship_content_object_repr.py,sha256=oJUhx__5WI6TjPGPqqEqBgb3yDluc02hhh05nXTjbHw,428
+wbnews/migrations/0012_alter_news_unique_together_news_identifier_and_more.py,sha256=SLtQiREJYMwOytGGLqaCYr_9pSeD_XD5ax7lXSETT3w,3111
+wbnews/migrations/0013_alter_news_datetime.py,sha256=q4Gbxo25jClsv9b1kfTqBLmpPNHAq7LxOgEZeLYYRk4,497
+wbnews/migrations/0014_newsrelationship_unique_news_relationship.py,sha256=aZUHLMKRMaXHJrrbnV9O2ZJRDVjbpkb9NjVPB7VKVW0,1073
+wbnews/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/models/__init__.py,sha256=KKIcQbpCPCVNJUPJs2MtpN9Q2Wb34Qdk-C7w6AAOy7w,99
+wbnews/models/news.py,sha256=yRbOpVG69yssvJPzv9bZJGMoFcb9n2uLaG2mz2j8oxM,5203
+wbnews/models/relationships.py,sha256=bcQbRa-ObS9h67pIuIrodD63RnkzbaOaRT4L6ctBoI0,1841
+wbnews/models/sources.py,sha256=N3-rBg4myeGG_stHvKiNnSoH0yS-LS_Zr_UeKPMBr5s,2629
+wbnews/models/utils.py,sha256=1JQxV4WxmmFGl7MdVtJoEeao3vnqqVwCi7mhSToaUvM,600
+wbnews/models/llm/cleaned_news.py,sha256=PA0McsgMmR0TOZUNWs55sBnsCXGbaC61VtVFbJ8vx28,2226
+wbnews/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/tests/conftest.py,sha256=UEZOYH5Av-Cqqq5t8WQCR7QJdNnajhthBPpF8AnwQjY,186
+wbnews/tests/test_models.py,sha256=op79cYyz9f5dX1uRBztw-E0J4HYAY8K-7cz4kBCN0qk,3278
+wbnews/tests/test_utils.py,sha256=PsyHH_F_y-Uy3mdVgDINH19bPEd1bmZT_UQ7yu87BNU,278
+wbnews/tests/tests.py,sha256=OADY-vbKZBe0bjjVEO1KNzRYAP2JA9mWkO9pZuh1TSs,280
+wbnews/tests/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wbnews/tests/parsers/test_emails.py,sha256=dStdTPI7Ns1jSw5PDbDEc84FJaoNPnBHC4BskWDDMxY,1073
+wbnews/viewsets/__init__.py,sha256=2OhRiJy0MVK9TdMpFmS9x9jl_gM-CjBxUoUHlZB3_8U,531
+wbnews/viewsets/buttons.py,sha256=6m_IdRYCQgTH4mD51DUoOa8Vx1y1-2zPQydUdvL_nF4,1788
+wbnews/viewsets/display.py,sha256=fwMZLlwxHcNHM4AppwYpYTOicLD_pXaQ4QeFeIl4whk,5315
+wbnews/viewsets/endpoints.py,sha256=2slGDJin_SA2heWsIaMdNTUN46FqZJvusbY1jhAaeZM,1165
+wbnews/viewsets/menu.py,sha256=XTShfTIykN9t7oclosPfFVb1r6o46QyglEEe1C7QCMk,979
+wbnews/viewsets/titles.py,sha256=iMyiGBMBpzng8s2ySVLqEOwueHRnAoEuc75dt9nCPjc,1367
+wbnews/viewsets/views.py,sha256=SMCDT6bJMQblyqX5cQ7X3qDe0zxTVWh1q7Aqj0fBo2Q,6795
+wbnews-1.58.1.dist-info/METADATA,sha256=fcooyHVRuEH6JK057omSnAA1I-EzsLuJJuoX5Ruvovs,215
+wbnews-1.58.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbnews-1.58.1.dist-info/RECORD,,

wbnews-1.45.0.dist-info/RECORD

@@ -1,49 +0,0 @@
-wbnews/.coveragerc,sha256=OOkT651L0NuoSVSXKZiLAbnQmHe9DRoLOzo1_S_buQc,383
-wbnews/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
-wbnews/admin.py,sha256=-FksVPcu1L6PttiHJP9gIGguEd_G4wXNpM31bkkV0ik,732
-wbnews/apps.py,sha256=l4kfE3Pux84Fb34xNgKDxcxRHuPCp6odCGFE9Sa3Wzw,212
-wbnews/factories.py,sha256=zOCINW-3JqwSfFz-0_dV3TeYC1HbCvruFOcoXGCOmVc,1017
-wbnews/serializers.py,sha256=An-4CBSwFoJEnJFILtklms4fk1K3plha3KNu6SMBd3o,2862
-wbnews/signals.py,sha256=eqipwffwJnDQWUZ9VTKr5Jp-OMXLmVSNwoIsawnCKvM,192
-wbnews/urls.py,sha256=a1-aS9VoxqbEqYI-NwQMUw7l7UfIoN7p80b8sp6dlTQ,1215
-wbnews/filters/__init__.py,sha256=rYd0_Zne1BQrZbXQRHiifKF1cGwmI4CmQn6dGpJ-_Ak,32
-wbnews/filters/news.py,sha256=XTN12_yqjKV55xw2A2d7VfOQwYDJrULdYWpFKsh8sCc,269
-wbnews/fixtures/wbnews.yaml,sha256=cDu1UWYwIFxz-hdivW7rxLYsNOweBm4GdN1GDsycN90,173164
-wbnews/import_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbnews/import_export/backends/__init__.py,sha256=_2HnB9uCuGhQDNg-Z0V2uIvKn26LtRBXAxUBoNetBIo,30
-wbnews/import_export/backends/news.py,sha256=ZdI2dNHxszwH_YzbWUKVVit_L5u8JCLoutr0beIAt6o,1446
-wbnews/import_export/handlers/__init__.py,sha256=zOeENt9cpEcSLG9ZaVb4otmbTnLAa0XdTPsUjD11dXs,36
-wbnews/import_export/handlers/news.py,sha256=FqxS7oKVGYYzKbgNxnHZa4FTvGEXBfm6XcIx70BfFOY,1091
-wbnews/import_export/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbnews/import_export/parsers/emails/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbnews/import_export/parsers/emails/news.py,sha256=YbInbXJ5pk1IS7fEOutuW9LIU4KzZXBx0HZHZrKmeIc,1507
-wbnews/import_export/parsers/emails/utils.py,sha256=zvLBr1EvwBd2tBKgc7H7ZI-ifHYg1NvluOZlwvPI1v8,1946
-wbnews/import_export/parsers/rss/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbnews/import_export/parsers/rss/news.py,sha256=0zoEFR3Tu3smIOmUPCv3gjunnRLEb-i9yZkE3rFasWU,2310
-wbnews/locale/de/LC_MESSAGES/django.po,sha256=b5Mc0-cowNbFMo-5cbhGa2-B-KfRM6pw8EZxTg6uRx4,2662
-wbnews/migrations/0001_initial_squashed_0005_alter_news_import_source.py,sha256=4qxqfpAYVeU16GsWaj7kUbtOk0ZLzuECTfzhUfmni2A,14596
-wbnews/migrations/0006_alter_news_language.py,sha256=necqSWKi20sHLok-RO9He3vnmMlmmdx07AiN3lnZPBM,4638
-wbnews/migrations/0007_auto_20240103_0955.py,sha256=YzkH_LSWH_8qdw_BrKaTN5vqLNCPnjMlJZxs03Xbbvw,1478
-wbnews/migrations/0008_alter_news_language.py,sha256=4tbpcVSey9PJOdf8xWndl1R8GmhmflpVQtI8YTwcevw,4648
-wbnews/migrations/0009_newsrelationship_analysis_newsrelationship_sentiment.py,sha256=ud_yO6skjVx2s32snxzai6Z4Uao1s-40v6UZaq4k64I,3432
-wbnews/migrations/0010_newsrelationship_important.py,sha256=seK-bFIzXa6uzja0gPnRhwS4vNgY_sR3sMm_OmP8sZE,440
-wbnews/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbnews/models/__init__.py,sha256=KKIcQbpCPCVNJUPJs2MtpN9Q2Wb34Qdk-C7w6AAOy7w,99
-wbnews/models/news.py,sha256=CEgg70uaN4M4OJMUYVpktGTymf04XjsiYUaO6WhG9-0,4569
-wbnews/models/relationships.py,sha256=PenPJUhzd5axjFnJqhUPgd22lCt45Iqc59bInYWTBVc,891
-wbnews/models/sources.py,sha256=ekMBGzA12nqUD9yvLQeZgnXncsJP-OuOGJzpE1Hrz9w,1350
-wbnews/models/llm/cleaned_news.py,sha256=87T-qZjnTTJdCbbUWFCBc4cJr8Km9SmDP39fixVdo5o,2077
-wbnews/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbnews/tests/conftest.py,sha256=UEZOYH5Av-Cqqq5t8WQCR7QJdNnajhthBPpF8AnwQjY,186
-wbnews/tests/test_models.py,sha256=S1FElzu4MMMOHM_vZ39GZeOV3O0Z9Sx0b-8U2ffxaf4,407
-wbnews/tests/tests.py,sha256=OADY-vbKZBe0bjjVEO1KNzRYAP2JA9mWkO9pZuh1TSs,280
-wbnews/viewsets/__init__.py,sha256=SY6hiVZtArCvU5LpWn9U0J5DAQwv8wtlE7OTIJYcLvI,499
-wbnews/viewsets/buttons.py,sha256=K1_2K7B1Bn9bHhrss1WslECQ7BBusA56xnDNINfPeq4,1038
-wbnews/viewsets/display.py,sha256=M3P3HQzUBHAkRevW3fTxOH9forvahbv-k5Xxgbhmxdg,5269
-wbnews/viewsets/endpoints.py,sha256=QX4iMqU6XtRmGDkr5EQ5i_QwCkQvYDH_XBgoJkTgKp4,618
-wbnews/viewsets/menu.py,sha256=tdU6NUX7WXR4lRf3T1chp8tHbAubAk7EBhMDoa-IlHc,793
-wbnews/viewsets/titles.py,sha256=iezHoaCSFxALnO4Bvh-Sp2YSbkijaBm0u_shgAi6Fro,1244
-wbnews/viewsets/views.py,sha256=wevSXXflYJS9lqEbepLjuq_tRK8iNC2ksZjVFtY5wrA,5729
-wbnews-1.45.0.dist-info/METADATA,sha256=7f8xy8ecu2m7T7lWEwIUVgwlRJWofZtMy8DdoMlBQOI,246
-wbnews-1.45.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbnews-1.45.0.dist-info/RECORD,,