udata 10.0.9.dev33820__py2.py3-none-any.whl → 10.0.9.dev33868__py2.py3-none-any.whl

udata/core/dataset/api.py

@@ -54,6 +54,7 @@ from .api_fields import (
     license_fields,
     resource_fields,
     resource_type_fields,
+    upload_community_fields,
     upload_fields,
 )
 from .constants import RESOURCE_TYPES, UPDATE_FREQUENCIES
@@ -452,7 +453,7 @@ class UploadNewCommunityResources(UploadMixin, API):
         responses={415: "Incorrect file content type", 400: "Upload error"},
     )
     @api.expect(upload_parser)
-    @api.marshal_with(upload_fields, code=201)
+    @api.marshal_with(upload_community_fields, code=201)
     def post(self, dataset):
         """Upload a new community resource"""
         infos = self.handle_upload(dataset)
@@ -511,7 +512,7 @@ class ReuploadCommunityResource(ResourceMixin, UploadMixin, API):
         "upload_community_resource",
         responses={415: "Incorrect file content type", 400: "Upload error"},
     )
-    @api.marshal_with(upload_fields)
+    @api.marshal_with(upload_community_fields)
     def post(self, community):
         """Update the file related to a given community resource"""
         ResourceEditPermission(community).test()

udata/core/dataset/api_fields.py

@@ -125,7 +125,7 @@ resource_fields = api.model(
         "title": fields.String(description="The resource title", required=True),
         "description": fields.Markdown(description="The resource markdown description"),
         "filetype": fields.String(
-            description=("Whether the resource is an uploaded file, " "a remote file or an API"),
+            description=("Whether the resource is an uploaded file, a remote file or an API"),
             required=True,
             enum=list(RESOURCE_FILETYPES),
         ),
@@ -236,6 +236,17 @@ community_resource_fields = api.inherit(
     },
 )
 
+
+upload_community_fields = api.inherit(
+    "UploadedCommunityResource",
+    community_resource_fields,
+    {
+        "success": fields.Boolean(
+            description="Whether the upload succeeded or not.", readonly=True, default=True
+        ),
+    },
+)
+
 community_resource_page_fields = api.model(
     "CommunityResourcePage", fields.pager(community_resource_fields)
 )
@@ -332,7 +343,7 @@ dataset_fields = api.model(
         ),
         "frequency_date": fields.ISODateTime(
             description=(
-                "Next expected update date, you will be notified " "once that date is reached."
+                "Next expected update date, you will be notified once that date is reached."
             )
         ),
         "harvest": fields.Nested(

udata/harvest/api.py

@@ -36,7 +36,11 @@ error_fields = api.model(
             description="The error creation date", required=True, readonly=True
         ),
         "message": fields.String(description="The error short message", required=True),
-        "details": fields.String(description="Optional details (ie. stacktrace)"),
+        "details": fields.Raw(
+            attribute=lambda o: o.details if admin_permission else None,
+            description="Optional details (only for super-admins)",
+            readonly=True,
+        ),
     },
 )