wbcore 1.46.0__py2.py3-none-any.whl → 1.58.2__py2.py3-none-any.whl

wbcore/contrib/authentication/viewsets/endpoints/user_activities.py

@@ -1,5 +1,3 @@
-from rest_framework.reverse import reverse
-
 from wbcore.metadata.configs.endpoints import EndpointViewConfig
 
 
@@ -7,17 +5,10 @@ class UserActivityModelEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbcore:authentication:useractivity-list", args=[], request=self.request)
-
 
 class UserActivityUserModelEndpointConfig(UserActivityModelEndpointConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbcore:authentication:user-useractivity-list", args=[self.view.kwargs["user_id"]], request=self.request
-        )
+    pass
 
 
 class UserActivityTableEndpointConfig(UserActivityModelEndpointConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbcore:authentication:useractivitytable-list", args=[], request=self.request)
+    pass

wbcore/contrib/authentication/viewsets/endpoints/users.py

@@ -14,8 +14,5 @@ class UserProfileModelEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbcore:authentication:userprofile-list", args=[], request=self.request)
-
     def get_instance_endpoint(self, **kwargs):
         return reverse("wbcore:authentication:userprofile-list", args=[], request=self.request)

wbcore/contrib/authentication/viewsets/user_activities.py

@@ -157,7 +157,8 @@ class UserActivityChart(viewsets.ChartViewSet):
                 cum_times = pd.Series(
                     dt
                     for group in [
-                        pd.date_range(start, end, freq="Min") for start, end in zip(dff.date, dff.latest_refresh)
+                        pd.date_range(start, end, freq="Min")
+                        for start, end in zip(dff.date, dff.latest_refresh, strict=False)
                     ]
                     for dt in group
                 ).value_counts()

wbcore/contrib/authentication/viewsets/users.py

@@ -1,4 +1,5 @@
 import logging
+from contextlib import suppress
 
 from django.conf import settings
 from django.contrib.auth.models import Group, Permission
@@ -66,11 +67,12 @@ logger = logging.getLogger()
 @permission_classes([AllowAny])
 @authentication_classes([])
 def reset_password_email(request):
-    try:
+    with suppress(User.DoesNotExist):
         user = User.objects.get(email=request.data["email"])
-        user.reset_password(request)
-    except Exception:
-        pass
+        try:
+            user.reset_password(request)
+        except Exception as e:
+            logger.error(f"While user {user} try to reset password, we encounter the error {e}")
     return Response(
         {
             "status": "ok",

wbcore/contrib/color/models.py

@@ -39,7 +39,8 @@ class ColorGradient(models.Model):
         if color:
             color_rgb = _hex2rgb(color)
             nearest_color = min(
-                self.colors, key=lambda subject: sum((s - q) ** 2 for s, q in zip(_hex2rgb(subject), color_rgb))
+                self.colors,
+                key=lambda subject: sum((s - q) ** 2 for s, q in zip(_hex2rgb(subject), color_rgb, strict=False)),
             )
 
             index = self.colors.index(nearest_color)

wbcore/contrib/currency/factories.py

@@ -6,7 +6,7 @@ import yaml
 from .models import Currency, CurrencyFXRates
 
 with open(pathlib.Path(__file__).parent.joinpath("fixtures").joinpath("currency.yaml"), "r") as yaml_file:
-    currency_dict = yaml.load(yaml_file, Loader=yaml.CLoader)
+    currency_dict = yaml.load(yaml_file, Loader=yaml.CLoader)  # noqa: S506
 
 
 class CurrencyFactory(factory.django.DjangoModelFactory):

wbcore/contrib/currency/import_export/backends/fixerio/currency_fx_rates.py

@@ -55,7 +55,9 @@ class DataBackend(AbstractDataBackend):
             params["symbols"] = ",".join(obj_external_ids)
         res = []
         for _date in pd.date_range(start, execution_date, freq="B"):
-            r = requests.get(f'{self.ENDPOINT}/{_date.strftime("%Y-%m-%d")}?', params=params, headers=self.HEADERS)
+            r = requests.get(
+                f'{self.ENDPOINT}/{_date.strftime("%Y-%m-%d")}?', params=params, headers=self.HEADERS, timeout=10
+            )
             if r.status_code == requests.codes.ok:
                 res_json = r.json()
                 if res_json and res_json["success"]:

wbcore/contrib/currency/models.py

@@ -4,7 +4,9 @@ from datetime import date as date_lib
 from decimal import Decimal
 
 from django.db import models
-from django.db.models import Expression, ExpressionWrapper, Subquery
+from django.db.models import Case, CharField, Expression, ExpressionWrapper, F, Q, Subquery, Value, When
+from django.db.models.functions import Concat
+from persisting_theory import QuerySet
 
 from wbcore.contrib.io.mixins import ImportMixin
 from wbcore.models import WBModel
@@ -13,6 +15,21 @@ from wbcore.utils.models import LabelKeyMixin
 from .import_export.handlers import CurrencyFXRatesImportHandler, CurrencyImportHandler
 
 
+class CurrencyDefaultManager(models.Manager):
+    def get_queryset(self) -> QuerySet:
+        return (
+            super()
+            .get_queryset()
+            .annotate(
+                name_repr=Case(
+                    When(Q(symbol="") | Q(symbol__isnull=True), then=F("title")),
+                    default=Concat(F("title"), Value(" ("), F("symbol"), Value(")")),
+                    output_field=CharField(),
+                )
+            )
+        )
+
+
 class Currency(ImportMixin, LabelKeyMixin, WBModel):
     import_export_handler_class = CurrencyImportHandler
 
@@ -21,18 +38,19 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
         verbose_name_plural = "Currencies"
         ordering = ("title",)
 
-    def __str__(self):
-        symbol = f"({self.symbol})" if self.symbol else ""
-        return f"{self.key} {symbol}"
+    def __str__(self) -> str:
+        if self.symbol:
+            return f"{self.title} ({self.symbol})"
+        return self.title
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return self.key
 
     title = models.CharField(max_length=255)
     symbol = models.CharField(max_length=10, blank=True, null=True)
     key = models.CharField(max_length=3, unique=True)
 
-    objects = models.Manager()
+    objects = CurrencyDefaultManager()
 
     LABEL_KEY = "{{key}} ({{symbol}})"
 
@@ -46,6 +64,8 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
         Returns:
             float -- The fx rate value with the new base currency
         """
+        if self == other_currency:
+            return Decimal(1.0)
         try:
             if exact_lookup:
                 base = CurrencyFXRates.objects.get(date=valuation_date, currency=self)
@@ -63,7 +83,9 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
                     raise CurrencyFXRates.DoesNotExist
             return (1 / base.value) * other.value
         except CurrencyFXRates.DoesNotExist:
-            return Decimal(1.0)
+            if exact_lookup:
+                return self.convert(valuation_date, other_currency, exact_lookup=False)
+            raise CurrencyFXRates.DoesNotExist from None
 
     @classmethod
     def get_endpoint_basename(cls) -> str:
@@ -79,7 +101,7 @@ class Currency(ImportMixin, LabelKeyMixin, WBModel):
 
     @classmethod
     def get_representation_label_key(cls) -> str:
-        return "{{key}} ({{symbol}})"
+        return "{{name_repr}}"
 
 
 class CurrencyFXRates(ImportMixin, models.Model):

wbcore/contrib/currency/serializers.py

@@ -8,11 +8,15 @@ from .models import Currency, CurrencyFXRates
 class CurrencyRepresentationSerializer(wb_serializers.RepresentationSerializer):
     """Representation Serializer for Currencies"""
 
+    name_repr = wb_serializers.SerializerMethodField(read_only=True)
     _detail = wb_serializers.HyperlinkField(reverse_name="wbcore:currency:currency-detail")
 
+    def get_name_repr(self, obj):
+        return str(obj)
+
     class Meta:
         model = Currency
-        fields = ("id", "title", "key", "symbol", "_detail")
+        fields = ("id", "name_repr", "key", "_detail")
 
 
 class CurrencyModelSerializer(wb_serializers.ModelSerializer):

wbcore/contrib/currency/tests/test_serializers.py

@@ -30,6 +30,10 @@ class TestSerializers:
         mocker.patch.object(currency_fx_rate, "currency_id", currency.id)
         return currency_fx_rate
 
+    @pytest.fixture
+    def expected_representation_data(self, currency):
+        return {"id": currency.id, "name_repr": f"{currency.title} ({currency.symbol})", "key": currency.key}
+
     @pytest.fixture
     def expected_data(self, currency):
         return {"id": currency.id, "title": currency.title, "key": currency.key, "symbol": currency.symbol}
@@ -43,12 +47,12 @@ class TestSerializers:
             "currency": currency_fx_rate.currency_id,
         }
 
-    def test_currency_representation_serializer(self, mocker: MockerFixture, currency, expected_data):
+    def test_currency_representation_serializer(self, mocker: MockerFixture, currency, expected_representation_data):
         detail = f"/wbcore/currency/currency/{currency.id}/"
         mocker.patch("wbcore.serializers.fields.fields.HyperlinkField", return_value=detail)
         serializer = CurrencyRepresentationSerializer(instance=currency)
-        expected_data["_detail"] = detail
-        assert serializer.data == expected_data
+        expected_representation_data["_detail"] = detail
+        assert serializer.data == expected_representation_data
 
     def test_currency_model_serializer(self, mocker: MockerFixture, currency, expected_data):
         mocker.patch(

wbcore/contrib/currency/tests/test_viewsets.py

@@ -50,7 +50,7 @@ class TestCurrencyRepresentationViewSets:
         assert response.status_code == status.HTTP_200_OK
         assert instance.get("id") == euro.id
         assert instance.get("key") == euro.key
-        assert instance.get("title") == euro.title
+        assert instance.get("name_repr") == f"{euro.title} ({euro.symbol})"
 
 
 @pytest.mark.viewset_tests

wbcore/contrib/currency/viewsets/currency.py

@@ -19,8 +19,8 @@ class CurrencyRepresentationViewSet(viewsets.RepresentationViewSet):
     serializer_class = CurrencyRepresentationSerializer
     filter_backends = (filters.OrderingFilter, filters.SearchFilter)
 
-    ordering = ordering_fields = ["-symbol"]
-    search_fields = ("symbol", "key")
+    ordering = ["name_repr"]
+    search_fields = ("name_repr", "key")
 
 
 class CurrencyModelViewSet(viewsets.ModelViewSet):

wbcore/contrib/currency/viewsets/endpoints/currency_fx_rates.py

@@ -1,15 +1,6 @@
-from rest_framework.reverse import reverse
-
 from wbcore.metadata.configs.endpoints import EndpointViewConfig
 
 
 class CurrencyFXRatesCurrencyEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
-
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbcore:currency:currency-currencyfxrates-list",
-            args=[self.view.kwargs["currency_id"]],
-            request=self.request,
-        )

wbcore/contrib/dataloader/tests/test/dataloaders/protocols.py

@@ -2,5 +2,4 @@ from typing import Iterator, Protocol
 
 
 class EntityTestDataProtocol(Protocol):
-    def data(self, n: int) -> Iterator[int]:
-        ...
+    def data(self, n: int) -> Iterator[int]: ...

wbcore/contrib/dataloader/utils.py

@@ -12,9 +12,9 @@ def dictfetchall[T](cursor: "CursorWrapper", dict_type: type[T] = dict) -> Itera
     columns = get_columns(cursor)
     for row in cursor.fetchall():
         # The spec for TypedDict is not compliant with the sepc for dict
-        yield dict_type(zip(columns, row))  # type: ignore
+        yield dict_type(zip(columns, row, strict=False))  # type: ignore
 
 
 def dictfetchone(cursor: "CursorWrapper") -> dict:
     columns = get_columns(cursor)
-    return dict(zip(columns, cursor.fetchone() or []))
+    return dict(zip(columns, cursor.fetchone() or [], strict=False))

wbcore/contrib/directory/factories/__init__.py

@@ -18,7 +18,7 @@ from .entries import (
     EntryFactory,
     PersonFactory,
     PersonWithEmployerFactory,
-    Random_ClientFactory,
+    RandomClientFactory,
     SpecializationFactory,
     UnemployedPersonFactory,
     PersonSignatureFactory,

wbcore/contrib/directory/factories/entries.py

@@ -114,6 +114,7 @@ class PersonFactory(EntryFactory):
     first_name = factory.Faker("first_name")
     last_name = factory.Faker("last_name")
     birthday = factory.Faker("date_object")
+    description = factory.Faker("text")
     personality_profile_red = random.randint(1, 5)
     personality_profile_green = random.randint(1, 5)
     personality_profile_blue = random.randint(1, 5)
@@ -157,7 +158,7 @@ class ClientFactory(PersonFactory):
                 self.clients.add(person)
 
 
-class Random_ClientFactory(ClientFactory):
+class RandomClientFactory(ClientFactory):
     @factory.post_generation
     def clients(self, create, extracted, **kwargs):
         self.clients.add(PersonFactory())

wbcore/contrib/directory/filters/entries.py

@@ -30,6 +30,15 @@ class EntryFilter(wb_filters.FilterSet):
         help_text=_("Filter by activities in a date range"),
         method="filter_last_event",
     )
+    last_event_period_endswith = wb_filters.DateTimeFilter(
+        label=_("Last Event Period End date"), field_name="last_event_period_endswith", lookup_expr="exact"
+    )
+    last_event_period_endswith__gte = wb_filters.DateTimeFilter(
+        label=_("Last Event Period End date"), field_name="last_event_period_endswith", lookup_expr="gte"
+    )
+    last_event_period_endswith__lte = wb_filters.DateTimeFilter(
+        label=_("Last Event Period End date"), field_name="last_event_period_endswith", lookup_expr="lte"
+    )
 
     activity_heat = wb_filters.MultipleLookupFilter(
         field_class=wb_filters.RangeSelectFilter,