udata 7.0.7.dev28628__py2.py3-none-any.whl → 7.0.7.dev28639__py2.py3-none-any.whl

udata/api/__init__.py

@@ -19,8 +19,8 @@ from udata.i18n import get_locale
 from udata.auth import (
     current_user, login_user, Permission, RoleNeed, PermissionDenied
 )
-from udata.core.user.models import User
 from udata.utils import safe_unicode
+from udata.mongo.errors import FieldValidationError
 
 from . import fields, oauth2
 from .signals import on_api_call
@@ -128,6 +128,8 @@ class UDataApi(Api):
         '''Authentify the user if credentials are given'''
         @wraps(func)
         def wrapper(*args, **kwargs):
+            from udata.core.user.models import User
+
             if current_user.is_authenticated:
                 return func(*args, **kwargs)
 
@@ -282,6 +284,19 @@ def handle_unauthorized_file_type(error):
     return {'message': msg}, 400
 
 
+validation_error_fields = api.model('ValidationError', {
+    'errors': fields.Raw
+})
+
+@api.errorhandler(FieldValidationError)
+@api.marshal_with(validation_error_fields, code=400)
+def handle_validation_error(error: FieldValidationError):
+    '''A validation error'''
+    errors = {}
+    errors[error.field] = [error.message]
+
+    return { 'errors': errors}, 400
+
 class API(Resource):  # Avoid name collision as resource is a core model
     pass
 

udata/api/oauth2.py

@@ -36,7 +36,6 @@ from udata.app import csrf
 from udata.auth import current_user, login_required, login_user
 from udata.i18n import I18nBlueprint, lazy_gettext as _
 from udata.mongo import db
-from udata.core.user.models import User
 from udata.core.storages import images, default_image_basename
 
 
@@ -244,6 +243,8 @@ class AuthorizationCodeGrant(grants.AuthorizationCodeGrant):
 
 class PasswordGrant(grants.ResourceOwnerPasswordCredentialsGrant):
     def authenticate_user(self, username, password):
+        from udata.core.user.models import User
+
         user = User.objects(email=username).first()
         if user and verify_password(password, user.password):
             return user

udata/core/dataset/forms.py

@@ -5,6 +5,7 @@ from udata.i18n import lazy_gettext as _
 
 from udata.core.storages import resources
 from udata.core.spatial.forms import SpatialCoverageField
+from udata.mongo.errors import FieldValidationError
 
 from .models import (
     Dataset, Resource, Schema, License, Checksum, CommunityResource,
@@ -16,9 +17,6 @@ from .constants import (
 
 __all__ = ('DatasetForm', 'ResourceForm', 'CommunityResourceForm')
 
-from ...models import FieldValidationError
-
-
 class ChecksumForm(ModelForm):
     model_class = Checksum
     choices = list(zip(CHECKSUM_TYPES, CHECKSUM_TYPES))

udata/core/dataset/models.py

@@ -18,7 +18,8 @@ from typing import Optional, Tuple
 from udata.app import cache
 from udata.core import storages
 from udata.frontend.markdown import mdstrip
-from udata.models import db, WithMetrics, BadgeMixin, SpatialCoverage, FieldValidationError
+from udata.models import db, WithMetrics, BadgeMixin, SpatialCoverage
+from udata.mongo.errors import FieldValidationError
 from udata.i18n import lazy_gettext as _
 from udata.utils import get_by, hash_url, to_naive_datetime
 from udata.uris import ValidationError, endpoint_for

udata/models/__init__.py

@@ -3,13 +3,6 @@ from mongoengine.errors import ValidationError
 from udata import entrypoints
 from udata.mongo import *
 
-class FieldValidationError(ValidationError):
-    field: str
-
-    def __init__(self, *args, field: str, **kwargs):
-        self.field = field
-        super().__init__(*args, **kwargs)
-
 # Load all core models and mixins
 from udata.core.spatial.models import *  # noqa
 from udata.core.metrics.models import *  # noqa

udata/mongo/errors.py

@@ -0,0 +1,8 @@
+from mongoengine.errors import ValidationError
+
+class FieldValidationError(ValidationError):
+    field: str
+
+    def __init__(self, *args, field: str, **kwargs):
+        self.field = field
+        super().__init__(*args, **kwargs)

udata/rdf.py

@@ -13,8 +13,8 @@ from rdflib.namespace import (
 )
 from rdflib.util import SUFFIX_FORMAT_MAP, guess_format as raw_guess_format
 from udata import uris
-from udata.models import FieldValidationError, Schema, ResourceSchema
-from mongoengine import ValidationError
+from udata.models import Schema
+from udata.mongo.errors import FieldValidationError
 
 log = logging.getLogger(__name__)
 

{udata-7.0.7.dev28628.dist-info → udata-7.0.7.dev28639.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 7.0.7.dev28628
+Version: 7.0.7.dev28639
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -139,6 +139,8 @@ It is collectively taken care of by members of the
 - Move `db` and Mongo fields classes outside `udata.models` [#3005](https://github.com/opendatateam/udata/pull/3005)
 - :warning: Update LICENSE_GROUPS config layout [#3010](https://github.com/opendatateam/udata/pull/3010)
 - Remove unused dependencies [#3006](https://github.com/opendatateam/udata/pull/3006)
+- Move `FieldValidationError` into its own module and add an error handler [#3012](https://github.com/opendatateam/udata/pull/3012)
+- Move some `import User` to runtime imports [#3013](https://github.com/opendatateam/udata/pull/3013)
 - Move `Owned` mixin to its own module [#3008](https://github.com/opendatateam/udata/pull/3008)
 - Move `badge_fields` to separate module than `models.py` [#3011](https://github.com/opendatateam/udata/pull/3011)
 

{udata-7.0.7.dev28628.dist-info → udata-7.0.7.dev28639.dist-info}/RECORD

@@ -8,7 +8,7 @@ udata/errors.py,sha256=chc1880TPGteIL-Rfb9hdeAyZI4vdWZQU3JQ_5VF5t0,116
 udata/factories.py,sha256=6en2qdHHoR6rEvNEUeH_0-T-vR7x7GUBGgNEm9vuylE,492
 udata/i18n.py,sha256=E-JoY57Cv4vgPvChkWjpwZAbuYVI8e6BO6raeu_3_Pw,8352
 udata/mail.py,sha256=dAMcbEtk5e54alpQezvF5adDrRPgdaT36QEdHD_5v50,2145
-udata/rdf.py,sha256=eu_tKOGQ9Bs8yyf5QGQNE9yyXGiUxevDYAIIun_KqqI,9919
+udata/rdf.py,sha256=QiHcK2iklbtPkl6UFdBxTj0oaiY41en9k-kmbIVJ8Xw,9893
 udata/routing.py,sha256=lU1XNL-YQgx1GN3pjKue1tIjHzjO3QdTiF9aaLNLitg,7044
 udata/sentry.py,sha256=KiZz0PpmYpZMvykH9UAbHpF4xBY0Q-8DeiEbXEHDUdw,2683
 udata/settings.py,sha256=5cU5_oiPiuS8RS98F9qfCp37qbjjN_g8ipoyZjDQP0M,17298
@@ -23,11 +23,11 @@ udata/worker.py,sha256=K-Wafye5-uXP4kQlffRKws2J9YbJ6m6n2QjcVsY8Nsg,118
 udata/wsgi.py,sha256=P7AJvZ5JqY4uRSBOzaFiBniChWIU9RVQ-Y0PN4vCCMY,77
 udata/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/admin/views.py,sha256=wMlpnC1aINW-6JDk6-kQXhcTYBZH-5wajEuWzVDcIKA,331
-udata/api/__init__.py,sha256=Vj3a3gZZt4ySjV7k6iau64pFvLkxZfcmJWkLyH-iH78,10851
+udata/api/__init__.py,sha256=7AZWPTUCt-ib0FlPm-lEInFdHB1cruPjq-n_fLsRWRw,11278
 udata/api/commands.py,sha256=oK2p1VdUvULDdYuvYYpYvY_bdkPJy-KfROfoX71oOuA,3277
 udata/api/errors.py,sha256=Sy_f3WVrNTUPZjCOogIVgocDdUjnKz149KDi4mMA_Lg,240
 udata/api/fields.py,sha256=l-Fa27-easR86qgof2bk130jq1N1pNUgGmQzok1UI3Q,3094
-udata/api/oauth2.py,sha256=mRX5BpPp5dVBKoigrybmulvqsB4E9AzYYMCR_ukAZtE,11717
+udata/api/oauth2.py,sha256=ERppP1FtigiAJXO01IjhFFzG8ajPVD6gPcKpBrjHFO4,11726
 udata/api/parsers.py,sha256=Fo4krCaFao0D1QNqKpjWiFVvKVLd9b_2mon6RbbOXls,1485
 udata/api/signals.py,sha256=9zcw4NDdpJwhgsS5UyLtnls1w_RfqghYFULza6d4-cw,162
 udata/auth/__init__.py,sha256=ziR6gzkE1V4__3ynjE-_IPWHzmapOsZIrnaDAjDijsM,1958
@@ -89,8 +89,8 @@ udata/core/dataset/csv.py,sha256=d6JMuvlov_vR7EN10rJa6Q03Il0PfbzMTHQIud5H8qg,324
 udata/core/dataset/events.py,sha256=DI71VfRc1eDTtgWQ3TJx5gtUw2MO0O_CVLCKLq0OIF0,3207
 udata/core/dataset/exceptions.py,sha256=uI_NvZRZMr_MtYQBYdLD8tk-BIUeDDfMMcrWwqV7mi8,494
 udata/core/dataset/factories.py,sha256=fHPgEUUpqGw7p7K5wGg-wA6Q0-Pc9eNbzAQK-va8zMM,9120
-udata/core/dataset/forms.py,sha256=kICGBzoTal_ipXw9DqhnOWKQK8x7scQI9mEe0JGMt9g,6181
-udata/core/dataset/models.py,sha256=2JOyN7P2P39iRt1XQ9GRghwm6p_YTbBZBHM5Hg0m7dA,35992
+udata/core/dataset/forms.py,sha256=VJCsGtgzhQgLW-M-J4ObpQ8o6c_saC3TTc1Js33m3sQ,6188
+udata/core/dataset/models.py,sha256=Z9Sqf-Aly67BB5ESwz3H4qxJvG3zy03Goz6enL55HyE,36022
 udata/core/dataset/permissions.py,sha256=3F2J7le3_rEYNhh88o3hSRWHAAt01_yHJM6RPmvCrRo,1090
 udata/core/dataset/preview.py,sha256=puPKT3fBD7ezAcT6owh0JK1_rGNDFZOqgT223qGn3LY,2597
 udata/core/dataset/rdf.py,sha256=oQqVpDvDCQKsfp5LKlIXACxLg89LpA2ydbkICxZCvT0,22830
@@ -331,12 +331,13 @@ udata/migrations/2023-02-08-rename-internal-dates.py,sha256=AYewRwdVCfHsJ5APbhQW
 udata/migrations/2024-01-29-fix-reuse-and-dataset-with-private-None.py,sha256=173Zf67G-oJgLwXeQUpzoCzcpAOu1ifcLb4eUMJ9nfU,590
 udata/migrations/2024-03-22-migrate-activity-kwargs-to-extras.py,sha256=n5-udd1IdaD-e3q5cZx9nC4uMUSyJyT1TkI6I4gFgh0,400
 udata/migrations/__init__.py,sha256=3YP8ppVG5Jx_u6fWJ099X6m3JDYsbd_wetpu4arl6_U,10882
-udata/models/__init__.py,sha256=ObDl28eHct3v0sBKoP58drXbIhys7q31w5pjvD2iTXk,1472
+udata/models/__init__.py,sha256=RNv3-9A3ARWgKYYBJv-lJNvakPR3JLiuZ6722-CO6Kc,1288
 udata/mongo/__init__.py,sha256=_ubmmhJuo6_fpuoMPEAat9Pv-5K_8rDbUuXmhe62zvU,1419
 udata/mongo/badges_field.py,sha256=NnHA6OT40UysQzO3qnxiDNLR-SCj19KlqD1c-p1DP2Q,984
 udata/mongo/datetime_fields.py,sha256=f3Q4LYa9pKRdB2W2yZVFIuIqd7_ELim1djr6xjPhEZg,1932
 udata/mongo/document.py,sha256=fqqzrj3Q85iYDJ3biwU-Dv_QJqS31IBf_TGqvppCSz4,1200
 udata/mongo/engine.py,sha256=dLj-wEhdfk778Vqm7Tzq-Bg1M8_8BXLggug0hCvqdEs,2552
+udata/mongo/errors.py,sha256=BrUSYcX1z_JyZguBsw8bzHBv-K4YTlQQSByBWzb50wM,230
 udata/mongo/extras_fields.py,sha256=OQD-V2h2I9mrL7nP2YPx3QtsDt4TDZYxxjKEQNe5kug,3961
 udata/mongo/queryset.py,sha256=2EH9BikDbQXkUsL9c0SotZKYAwkWXUTlk1fi9aJlX8Q,3118
 udata/mongo/slug_fields.py,sha256=WOHfj1I7kIRxtEBYR83IirqLLhVX2WwqZQ0pKMODEmQ,6423
@@ -675,9 +676,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=zCVMB-a4-mLM1jNyYMk58rgVRaVIwQ
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=avfWczvlLBKSohyB55-4TLmUGMU_Rze4XmAo4OTk2v0,43513
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=ScuqdpaV4y1ZIpBAEfxeaKdzkyGZL0mJmKMoG6w0iRQ,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=QpgEXh1eHjztPa7oNLXd_sds1DC95A-STTtZyTE4m-E,50093
-udata-7.0.7.dev28628.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-7.0.7.dev28628.dist-info/METADATA,sha256=rw8B0w58nDD-jkK7WzvZYk61apwjUW5XgMq19DZ3jP4,121096
-udata-7.0.7.dev28628.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-udata-7.0.7.dev28628.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-7.0.7.dev28628.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-7.0.7.dev28628.dist-info/RECORD,,
+udata-7.0.7.dev28639.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-7.0.7.dev28639.dist-info/METADATA,sha256=urbhkUVJZqYRHWwG_faDwB9onhm6TRNPoXXckPHArJc,121330
+udata-7.0.7.dev28639.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+udata-7.0.7.dev28639.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-7.0.7.dev28639.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-7.0.7.dev28639.dist-info/RECORD,,