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

wbcore/contrib/directory/viewsets/display/relationships.py

@@ -4,7 +4,7 @@ from typing import Optional
 from django.utils.translation import gettext as _
 
 from wbcore.contrib.color.enums import WBColor
-from wbcore.contrib.directory.models import ClientManagerRelationship as CMR
+from wbcore.contrib.directory.models import ClientManagerRelationship
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
@@ -15,7 +15,7 @@ from wbcore.metadata.configs.display.instance_display.utils import repeat_field
 from wbcore.metadata.configs.display.view_config import DisplayViewConfig
 
 
-class CMR_Color(Enum):
+class ClientManagerRelationshipColor(Enum):
     DRAFT = WBColor.RED_LIGHT.value
     PENDING = WBColor.YELLOW_LIGHT.value
     APPROVED = WBColor.GREEN_LIGHT.value
@@ -203,29 +203,29 @@ class ClientManagerModelDisplay(DisplayViewConfig):
                     key="status",
                     items=[
                         dp.LegendItem(
-                            icon=CMR_Color.DRAFT.value,
-                            label=CMR.Status.DRAFT.label,
-                            value=CMR.Status.DRAFT.name,
+                            icon=ClientManagerRelationshipColor.DRAFT.value,
+                            label=ClientManagerRelationship.Status.DRAFT.label,
+                            value=ClientManagerRelationship.Status.DRAFT.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.PENDING.value,
-                            label=CMR.Status.PENDINGADD.label,
-                            value=CMR.Status.PENDINGADD.name,
+                            icon=ClientManagerRelationshipColor.PENDING.value,
+                            label=ClientManagerRelationship.Status.PENDINGADD.label,
+                            value=ClientManagerRelationship.Status.PENDINGADD.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.APPROVED.value,
-                            label=CMR.Status.APPROVED.label,
-                            value=CMR.Status.APPROVED.name,
+                            icon=ClientManagerRelationshipColor.APPROVED.value,
+                            label=ClientManagerRelationship.Status.APPROVED.label,
+                            value=ClientManagerRelationship.Status.APPROVED.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.PENDING_REMOVE.value,
-                            label=CMR.Status.PENDINGREMOVE.label,
-                            value=CMR.Status.PENDINGREMOVE.name,
+                            icon=ClientManagerRelationshipColor.PENDING_REMOVE.value,
+                            label=ClientManagerRelationship.Status.PENDINGREMOVE.label,
+                            value=ClientManagerRelationship.Status.PENDINGREMOVE.name,
                         ),
                         dp.LegendItem(
-                            icon=CMR_Color.REMOVED.value,
-                            label=CMR.Status.REMOVED.label,
-                            value=CMR.Status.REMOVED.name,
+                            icon=ClientManagerRelationshipColor.REMOVED.value,
+                            label=ClientManagerRelationship.Status.REMOVED.label,
+                            value=ClientManagerRelationship.Status.REMOVED.name,
                         ),
                     ],
                 ),
@@ -242,23 +242,23 @@ class ClientManagerModelDisplay(DisplayViewConfig):
                     formatting_rules=[
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.YELLOW_LIGHT.value},
-                            condition=("==", CMR.Status.PENDINGADD.name),
+                            condition=("==", ClientManagerRelationship.Status.PENDINGADD.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.YELLOW_DARK.value},
-                            condition=("==", CMR.Status.PENDINGREMOVE.name),
+                            condition=("==", ClientManagerRelationship.Status.PENDINGREMOVE.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.GREEN_LIGHT.value},
-                            condition=("==", CMR.Status.APPROVED.name),
+                            condition=("==", ClientManagerRelationship.Status.APPROVED.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.RED_LIGHT.value},
-                            condition=("==", CMR.Status.DRAFT.name),
+                            condition=("==", ClientManagerRelationship.Status.DRAFT.name),
                         ),
                         dp.FormattingRule(
                             style={"backgroundColor": WBColor.GREY.value},
-                            condition=("==", CMR.Status.REMOVED.name),
+                            condition=("==", ClientManagerRelationship.Status.REMOVED.name),
                         ),
                     ],
                 )

wbcore/contrib/directory/viewsets/entries.py

@@ -150,11 +150,10 @@ class PersonModelViewSet(ModelTranslateMixin, EntryModelViewSet):
         return super().get_serializer_class()
 
     def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
-        )
+        qs = super().get_queryset()
+        if "pk" in self.kwargs:
+            qs = qs.annotate(last_connection=Coalesce(UserActivity.get_latest_login_datetime_subquery(), None))
+        return qs
 
 
 class CompanyModelViewSet(EntryModelViewSet):

wbcore/contrib/directory/viewsets/previews/entries.py

@@ -1,3 +1,5 @@
+from contextlib import suppress
+
 from django.utils.translation import gettext as _
 
 from wbcore.contrib.icons import WBIcon
@@ -17,12 +19,10 @@ class EntryPreviewConfig(PreviewViewConfig):
             ["primary_telephone"],
             ["primary_manager_name"],
         ]
-        try:
+        with suppress(Exception):
             entry = self.view.get_object()
             if entry.profile_image:
                 fields.insert(0, "profile_image")
-        except Exception:
-            pass
 
         return create_simple_display(fields)
 

wbcore/contrib/directory/viewsets/relationships.py

@@ -2,8 +2,10 @@ from django.db.models import CharField, F, OuterRef, Q, Subquery, Value
 from django.db.models.functions import Concat
 from django.utils.functional import cached_property
 from dynamic_preferences.registries import global_preferences_registry
-from rest_framework import filters
+from rest_framework import filters, status
+from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
 from rest_fuzzysearch.search import RankedFuzzySearchFilter
 from reversion.views import RevisionMixin
 
@@ -19,6 +21,7 @@ from wbcore.filters import DjangoFilterBackend
 from wbcore.viewsets import ModelViewSet, ReadOnlyModelViewSet, RepresentationViewSet
 
 from ..filters import ClientManagerFilter, RelationshipEntryFilter, RelationshipFilter
+from ..permissions import IsClientManagerRelationshipAdmin
 from ..serializers import (
     ClientManagerModelSerializer,
     ClientManagerRelationshipRepresentationSerializer,
@@ -29,7 +32,7 @@ from ..serializers import (
     RelationshipTypeRepresentationSerializer,
     UserIsClientModelSerializer,
 )
-from .buttons import EmployerEmployeeRelationshipButtonConfig
+from .buttons import ClientManagerRelationshipButtonConfig, EmployerEmployeeRelationshipButtonConfig
 from .display import (
     ClientManagerModelDisplay,
     EmployeeEmployerDisplayConfig,
@@ -179,6 +182,7 @@ class ClientManagerViewSet(RevisionMixin, ModelViewSet):
     queryset = ClientManagerRelationship.objects.none()
     serializer_class = ClientManagerModelSerializer
     display_config_class = ClientManagerModelDisplay
+    button_config_class = ClientManagerRelationshipButtonConfig
     endpoint_config_class = ClientManagerEndpoint
     filterset_class = ClientManagerFilter
     title_config_class = ClientManagerTitleConfig
@@ -197,6 +201,16 @@ class ClientManagerViewSet(RevisionMixin, ModelViewSet):
             return ClientManagerRelationship.objects.select_related("client", "relationship_manager")
         return ClientManagerRelationship.objects.none()
 
+    @action(detail=False, methods=["PATCH"], permission_classes=[IsClientManagerRelationshipAdmin])
+    def approveallpendingrequests(self, *args, **kwargs):
+        for request in ClientManagerRelationship.objects.filter(status=ClientManagerRelationship.Status.PENDINGADD):
+            request.approve(by=self.request.user)
+            request.save()
+        for request in ClientManagerRelationship.objects.filter(status=ClientManagerRelationship.Status.PENDINGREMOVE):
+            request.approveremoval(by=self.request.user)
+            request.save()
+        return Response({}, status=status.HTTP_200_OK)
+
 
 class UserIsClientViewSet(ReadOnlyModelViewSet):
     queryset = ClientManagerRelationship.objects.all()

wbcore/contrib/directory/viewsets/titles/relationships.py

@@ -1,7 +1,6 @@
 from django.utils.translation import gettext as _
 
-from wbcore.contrib.directory.models import ClientManagerRelationship as CMR
-from wbcore.contrib.directory.models import Company, Entry, Person
+from wbcore.contrib.directory.models import ClientManagerRelationship, Company, Entry, Person
 from wbcore.metadata.configs.titles import TitleViewConfig
 
 
@@ -29,7 +28,7 @@ class RelationshipTypeModelTitleConfig(TitleViewConfig):
 class ClientManagerTitleConfig(TitleViewConfig):
     def get_instance_title(self):
         if pk := self.view.kwargs.get("pk"):
-            cmr_request = CMR.objects.get(id=pk)
+            cmr_request = ClientManagerRelationship.objects.get(id=pk)
             return _("Client Manager Relationship Between {client} & {person}").format(
                 client=str(cmr_request.client), person=str(cmr_request.relationship_manager)
             )

wbcore/contrib/documents/filters.py

@@ -13,7 +13,6 @@ from wbcore.contrib.documents.models import (
 class ShareableLinkFilter(wb_filters.FilterSet):
     valid = wb_filters.BooleanFilter(label=_("Valid"), method="boolean_is_valid")
     valid_until = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Valid Until",
     )
     link = wb_filters.CharFilter(label=_("Link"), method="filter_uuid")
@@ -36,7 +35,6 @@ class ShareableLinkFilter(wb_filters.FilterSet):
 class ShareableLinkAccessFilter(wb_filters.FilterSet):
     clearable = (False,)
     accessed = wb_filters.DateTimeRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Accessed between date",
     )
 

wbcore/contrib/example_app/models.py

@@ -69,7 +69,7 @@ class Role(models.Model):
         verbose_name_plural = _("Roles")
 
 
-class SportPerson(ComplexToStringMixin, models.Model):
+class SportPerson(ComplexToStringMixin):
     roles = models.ManyToManyField(to=Role, blank=True, related_name="sport_persons", verbose_name=_("Roles"))
     first_name = models.CharField(max_length=255, verbose_name=_("First Name"))
     last_name = models.CharField(max_length=255, verbose_name=_("Last Name"))
@@ -372,7 +372,7 @@ class Match(ComplexToStringMixin, CalendarItem):
                 WBColor.BLUE_LIGHT.value,
                 WBColor.GREEN_LIGHT.value,
             ]
-            return [status for status in zip(cls, colors)]
+            return [status for status in zip(cls, colors, strict=False)]
 
     home = models.ForeignKey(
         to="Team",
@@ -432,7 +432,7 @@ class Match(ComplexToStringMixin, CalendarItem):
 
     events: models.QuerySet[Event]
 
-    def has_permissions(instance: Match, user: User) -> bool:
+    def has_permissions(self: Match, user: User) -> bool:
         if user.is_superuser or user.has_perm("wbcore.change_match_status"):
             return True
         return False
@@ -741,7 +741,7 @@ def post_save_team(sender, instance: Team, created: bool, raw: bool, **kwargs):
                 away_match.recompute_computed_str()
 
 
-class Player(OrderableModel, SportPerson):
+class Player(OrderableModel, SportPerson):  # noqa
     PARTITION_BY = PARENT_FK = "current_team"
 
     position = models.CharField(max_length=50, null=True, blank=True, verbose_name=_("Position"))

wbcore/contrib/example_app/serializers/person_team.py

@@ -108,8 +108,8 @@ class TeamModelSerializer(serializers.ModelSerializer):
         if email:
             try:
                 validate_email(email)
-            except ValidationError:
-                raise ValidationError({"email": _("Invalid e-mail address")})
+            except ValidationError as e:
+                raise ValidationError({"email": _("Invalid e-mail address")}) from e
         if phone_number:
             try:
                 if phone_number.startswith("00"):
@@ -120,8 +120,8 @@ class TeamModelSerializer(serializers.ModelSerializer):
                 if parser_number:
                     formatted_number = phonenumbers.format_number(parser_number, phonenumbers.PhoneNumberFormat.E164)
                     data["phone_number"] = formatted_number
-            except Exception:
-                raise ValidationError({"phone_number": _("Invalid phone number format")})
+            except Exception as e:
+                raise ValidationError({"phone_number": _("Invalid phone number format")}) from e
 
         return super().validate(data)
 

wbcore/contrib/example_app/tests/e2e/test_teams.py

@@ -25,7 +25,7 @@ USER_PASSWORD = "User_Password"
 class TestTeam:
     def test_create_edit_delete_team(self, live_server, selenium):
         # Creating a test user and login to the WB
-        user: User = SuperUserFactory(plaintext_password=USER_PASSWORD)
+        user: User = SuperUserFactory(plaintext_password=USER_PASSWORD)  # noqa
         actions = ActionChains(selenium, 1000)
         set_up(selenium, live_server, user.email, USER_PASSWORD)
 

wbcore/contrib/geography/tests/test_viewsets.py

@@ -97,4 +97,4 @@ class TestViewsets:
         continent.refresh_from_db()
         # Assert
         assert response.status_code == status.HTTP_200_OK
-        assert getattr(continent, "name") == new_field_data
+        assert continent.name == new_field_data

wbcore/contrib/guardian/tests/test_model_mixins.py

@@ -4,7 +4,7 @@ from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
 
 @pytest.fixture
 def mocked_permission_object_model_mixin(mocker):
-    def __init__(self): ...
+    def __init__(self): ...  # noqa
 
     PermissionObjectModelMixin.__init__ = __init__
     PermissionObjectModelMixin.objects = mocker.Mock()
@@ -21,8 +21,8 @@ class TestPermissionObjectModelMixin:
     def test_save_run_assign_permissions(self, mocker, mocked_permission_object_model_mixin):
         mocker.patch("django.db.models.Model.save")
         on_commit = mocker.patch("wbcore.contrib.guardian.models.mixins.transaction.on_commit")
-        ContentType = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
-        ContentType.objects.get_for_model.return_value = mocker.Mock()
+        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class.objects.get_for_model.return_value = mocker.Mock()
 
         mocked_permission_object_model_mixin().save()
 

wbcore/contrib/guardian/tests/test_tasks.py

@@ -8,39 +8,39 @@ from wbcore.contrib.guardian.models.mixins import (
 
 class TestAssignUserPermissionsForObjectAsTask:
     def test_called(self, mocker):
-        ContentType = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
         content_type = mocker.Mock()
         model_class = mocker.Mock()
         instance = mocker.Mock()
         model_class.objects.get.return_value = instance
         content_type.model_class.return_value = model_class
-        ContentType.objects.get.return_value = content_type
+        content_type_class.objects.get.return_value = content_type
 
         assign_user_permissions_for_object_as_task(1, 1)
 
         instance.reload_permissions.assert_called_once_with(prune_existing=True)
 
     def test_called_with_prune_existing(self, mocker):
-        ContentType = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
         content_type = mocker.Mock()
         model_class = mocker.Mock()
         instance = mocker.Mock()
         model_class.objects.get.return_value = instance
         content_type.model_class.return_value = model_class
-        ContentType.objects.get.return_value = content_type
+        content_type_class.objects.get.return_value = content_type
 
         assign_user_permissions_for_object_as_task(1, 1, prune_existing=False)
 
         instance.reload_permissions.assert_called_once_with(prune_existing=False)
 
     def test_not_called_without_model_class(self, mocker):
-        ContentType = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
         content_type = mocker.Mock()
         model_class = mocker.Mock()
         instance = mocker.Mock()
         model_class.objects.get.return_value = instance
         content_type.model_class.return_value = None
-        ContentType.objects.get.return_value = content_type
+        content_type_class.objects.get.return_value = content_type
 
         assign_user_permissions_for_object_as_task(1, 1)
 
@@ -63,13 +63,13 @@ class TestAssignUserPermissionsForObjectAsTask:
 
 class TestAssignObjectPermissionsForUserAsTask:
     def test_called(self, mocker):
-        User = mocker.patch("wbcore.contrib.guardian.models.mixins.User")
+        user_class = mocker.patch("wbcore.contrib.guardian.models.mixins.User")
         user = mocker.Mock()
 
-        User.objects.get.return_value = user
+        user_class.objects.get.return_value = user
 
         get_inheriting_subclasses = mocker.patch("wbcore.contrib.guardian.models.mixins.get_inheriting_subclasses")
-        get_inheriting_subclasses.return_value = [User]
+        get_inheriting_subclasses.return_value = [user_class]
         reload_permissions = mocker.patch("wbcore.contrib.guardian.models.mixins.reload_permissions")
 
         assign_object_permissions_for_user_as_task(user_id=1)

wbcore/contrib/guardian/tests/test_viewsets.py

@@ -10,7 +10,7 @@ class TestPivotUserObjectPermissionModelViewSet:
     def test_cached_property_permissions(self, mocker, request):
         mocked_filter = mocker.patch("wbcore.contrib.guardian.viewsets.viewsets.Permission.objects.filter")
         view = PivotUserObjectPermissionModelViewSet(request=request, kwargs={"content_type_id": 1})
-        view.permissions
+        assert view.permissions
 
         mocked_filter.assert_called_once_with(
             Q(content_type=1)
@@ -24,7 +24,7 @@ class TestPivotUserObjectPermissionModelViewSet:
         mocked_get_object_for_this_type = mocker.Mock()
         mocked_contrib_type.get.return_value = mocked_get_object_for_this_type
         view = PivotUserObjectPermissionModelViewSet(request=request, kwargs={"content_type_id": 1, "object_pk": 1})
-        view.linked_object
+        assert view.linked_object
 
         mocked_get_object_for_this_type.get_object_for_this_type.assert_called_once()
 

wbcore/contrib/icons/backends/default.py

@@ -15,6 +15,7 @@ class IconBackend(AbstractBackend):
     APPROVE = "wb-icon-thumb-up"
     BANK = "wb-icon-bank"
     BIRTHDAY = "wb-icon-cake-1"
+    BROADCAST = "wb-icon-send"
     BOOKMARK = "wb-icon-bookmark"
     CALENDAR = "wb-icon-calendar-1"
     CHART_AREA = "wb-icon-chart-area"

wbcore/contrib/icons/backends/material.py

@@ -19,6 +19,7 @@ class IconBackend(AbstractBackend):
     BANK = "account_balance"
     BIRTHDAY = "cake"
     BOOKMARK = "bookmark_border"
+    BROADCAST = "arrow_split"
     CALENDAR = "calendar_month"
     CHART_AREA = "stacked_line_chart"
     CHART_BARS_HORIZONTAL = "align_horizontal_center"

wbcore/contrib/icons/icons.py

@@ -15,20 +15,16 @@ FALLBACK_ICON_VALUE = "FALLBACK_ICON"
 class WBIconMeta(ChoicesMeta):
     """A metaclass for creating a enum choices."""
 
-    def __new__(metacls, classname, bases, classdict, **kwds):
+    def __new__(cls, classname, bases, classdict, **kwds):
         dict.__setitem__(
             classdict, FALLBACK_ICON_VALUE, (FALLBACK_ICON_VALUE, "Fallback Icon")
         )  # add a default member that represent the fallback in case it's not yet implement in the imported backend
-        cls = super().__new__(metacls, classname, bases, classdict, **kwds)
+        cls = super().__new__(cls, classname, bases, classdict, **kwds)
         with suppress(ModuleNotFoundError):
-            setattr(
-                cls,
-                "icon_backend",
-                import_from_dotted_path(getattr(settings, "WBCORE_ICON_BACKEND", DEFAULT_ICON_BACKEND)),
-            )
+            cls.icon_backend = import_from_dotted_path(getattr(settings, "WBCORE_ICON_BACKEND", DEFAULT_ICON_BACKEND))
             icon_backend = cls.icon_backend
             # For each enumeration values, attached an "icon" property to its members
-            for member, value in zip(cls.__members__.values(), cls.values):
+            for member, value in zip(cls.__members__.values(), cls.values, strict=False):
                 member._icon_ = getattr(icon_backend, value, icon_backend.fallback_icon)
         return enum.unique(cls)
 
@@ -54,6 +50,7 @@ class WBIcon(TextChoices, metaclass=WBIconMeta):
     BANK = "BANK", "Bank"
     BIRTHDAY = "BIRTHDAY", "Birthday"
     BOOKMARK = "BOOKMARK", "Bookmark"
+    BROADCAST = "BROADCAST", "Broadcast"
     CALENDAR = "CALENDAR", "Calendar"
     CHART_AREA = "CHART_AREA", "Chart area"
     CHART_BARS_HORIZONTAL = "CHART_BARS_HORIZONTAL", "Chart bars horizonal"

wbcore/contrib/io/exceptions.py

@@ -8,6 +8,14 @@ class DeserializationError(Exception):
     pass
 
 
+class SkipImportError(Exception):
+    """
+    Exception excepted when a deserialized skip happens during the process object phase in the Handler.
+
+    This exception won't stop the importing process and won't trigger a warning
+    """
+
+
 class ImportError(Exception):
     """
     Exception returns when something wrong happens during the processing of the import source and means that not all data were succesfully imported

wbcore/contrib/io/import_export/backends/stream.py

@@ -35,7 +35,7 @@ class DataBackend(AbstractDataBackend):
         self.url = url
 
     @classmethod
-    def _check_content_type(self, output: BytesIO, filename: str) -> bool:
+    def _check_content_type(cls, output: BytesIO, filename: str) -> bool:
         """
         Check if given bytes stream matches the corresponding filename extension
 
@@ -80,7 +80,7 @@ class DataBackend(AbstractDataBackend):
         """
         with suppress(requests.ConnectionError):
             headers = kwargs.get("headers", {})
-            r = requests.get(self.url, headers=headers)
+            r = requests.get(self.url, headers=headers, timeout=10)
             if r.ok and (content := r.content):
                 content_file = BytesIO()
                 content_file.write(content)

wbcore/contrib/io/imports.py

@@ -12,7 +12,7 @@ from django.db import models
 from django.db.models import Model
 from tqdm import tqdm
 
-from .exceptions import DeserializationError, ImportError
+from .exceptions import DeserializationError, ImportError, SkipImportError
 from .models import ImportedObjectProviderRelationship, ImportSource
 from .utils import nest_row
 
@@ -30,6 +30,7 @@ class ImportExportHandler:
     def __init__(self, import_source: ImportSource, **kwargs):
         self.import_source: ImportSource = import_source
         self.model: Type[Model] = apps.get_model(self.MODEL_APP_LABEL)
+        self.processed_ids: list[int] = []
 
     def _inject_internal_id_from_data(self, data: dict[str, Any]) -> tuple[int, ContentType] | None:
         if provider_id := data.pop("provider_id", None):
@@ -45,7 +46,7 @@ class ImportExportHandler:
             else:
                 return provider_id, content_type
 
-    def _model_dict_diff(self, model: Any, data: Dict[str, Any]) -> Dict[str, Any]:
+    def _model_dict_diff(self, model: Any, data: Dict[str, Any]) -> Dict[str, Any]:  # noqa: C901
         """
         Given a model and its dictionary representation, compare them and find out the fields that are different
         Args:
@@ -167,7 +168,7 @@ class ImportExportHandler:
                 error_msg = f"\nError {e} while saving data {change_data} for object id {_object.pk}"
                 self.import_source.log += error_msg
                 if not getattr(self, "allow_update_save_failure", False):
-                    raise ImportError(error_msg)
+                    raise ImportError(error_msg) from e
             return True
         return False
 
@@ -295,10 +296,14 @@ class ImportExportHandler:
                     unmodified_objs.append(_object)
                 if (
                     len(self.import_source.log) > self.MAX_ALLOWED_LOG_SIZE
-                ):  # In case we are exceedning the max log size, we reset the log to avoid issue when saving it
+                ):  # In case we are exceeding the max log size, we reset the log to avoid issue when saving it
                     self.import_source.log = ""
+                if object_id := getattr(_object, "id", None):
+                    self.processed_ids.append(object_id)
+            except SkipImportError as e:
+                self.import_source.log += f"skipping Row {self.import_source.progress_index}: {str(e)}\n"
             except DeserializationError as e:
-                self.import_source.errors_log += f"Row {self.import_source.progress_index}: {str(e)}\n"
+                self.import_source.errors_log += f"Warning Row {self.import_source.progress_index}: {str(e)}\n"
             self.import_source.progress_index += 1
         if with_post_processing:
             if history.exists():

wbcore/contrib/io/models.py

@@ -95,19 +95,19 @@ class ParserHandler(models.Model):
         verbose_name_plural = _("Parsers-Handlers")
 
     @classmethod
-    def get_representation_value_key(self) -> str:
+    def get_representation_value_key(cls) -> str:
         return "id"
 
     @classmethod
-    def get_representation_label_key(self) -> str:
+    def get_representation_label_key(cls) -> str:
         return "{{parser}}::{{handler}}"
 
     @classmethod
-    def get_representation_endpoint(self) -> str:
+    def get_representation_endpoint(cls) -> str:
         return "wbcore:io:parserhandlerrepresentation-list"
 
 
-class ImportedObjectProviderRelationship(ComplexToStringMixin, models.Model):
+class ImportedObjectProviderRelationship(ComplexToStringMixin):
     """
     A model that represent the relationship/link between the imported object and a provider.
 
@@ -218,15 +218,15 @@ class DataBackend(models.Model):
         return self.title
 
     @classmethod
-    def get_representation_value_key(self) -> str:
+    def get_representation_value_key(cls) -> str:
         return "id"
 
     @classmethod
-    def get_representation_label_key(self) -> str:
+    def get_representation_label_key(cls) -> str:
         return "{{title}}"
 
     @classmethod
-    def get_representation_endpoint(self) -> str:
+    def get_representation_endpoint(cls) -> str:
         return "wbcore:io:databackendrepresentation-list"
 
 
@@ -522,7 +522,7 @@ class Source(models.Model):
         return res
 
     @classmethod
-    def load_sources_from_settings(self, settings: list[tuple[list[tuple[str, str]], str, dict[str, Any]]]):
+    def load_sources_from_settings(cls, settings: list[tuple[list[tuple[str, str]], str, dict[str, Any]]]):
         """
         Utility classmethod to parser sources from the settings.
 
@@ -588,15 +588,15 @@ class Source(models.Model):
                 source.save()
 
     @classmethod
-    def get_representation_value_key(self) -> str:
+    def get_representation_value_key(cls) -> str:
         return "id"
 
     @classmethod
-    def get_representation_label_key(self) -> str:
+    def get_representation_label_key(cls) -> str:
         return "{{title}} ({{id}})"
 
     @classmethod
-    def get_representation_endpoint(self) -> str:
+    def get_representation_endpoint(cls) -> str:
         return "wbcore:io:sourcerepresentation-list"
 
 
@@ -713,6 +713,9 @@ class ExportSource(ImportExportSource):
             )
         ]
 
+    def __str__(self) -> str:
+        return str(self.id)
+
     @property
     def file_format(self):
         return get_django_import_export_format(self.format)()
@@ -915,15 +918,15 @@ class ImportSource(ImportExportSource):
             )
 
     @classmethod
-    def get_representation_value_key(self) -> str:
+    def get_representation_value_key(cls) -> str:
         return "id"
 
     @classmethod
-    def get_representation_label_key(self) -> str:
+    def get_representation_label_key(cls) -> str:
         return "{{file}}"
 
     @classmethod
-    def get_representation_endpoint(self) -> str:
+    def get_representation_endpoint(cls) -> str:
         return "wbcore:io:importsourcerepresentation-list"
 
 

wbcore/contrib/io/serializers.py

@@ -88,8 +88,8 @@ class ImportSourceModelSerializer(ModelSerializer):
                 parser_lookup = dict(id=parser_handler)
             try:
                 data["parser_handler"] = ParserHandler.objects.get(**parser_lookup)
-            except (ParserHandler.DoesNotExist, ValueError):
-                raise ValidationError({"parser_handler": "Invalid parser handler"})
+            except (ParserHandler.DoesNotExist, ValueError) as e:
+                raise ValidationError({"parser_handler": "Invalid parser handler"}) from e
         return data
 
     def create(self, validated_data):