elody 0.0.215__py3-none-any.whl → 0.0.217__py3-none-any.whl

elody/job.py

@@ -9,12 +9,11 @@ _post_crud_hook = _config.crud()["post_crud_hook"]
 def add_document_to_job(
     id,
     id_of_document_job_was_initiated_for,
-    type_of_document_job_was_initiated_for,
     *,
     get_rabbit,
 ):
     relations = []
-    if id_of_document_job_was_initiated_for and type_of_document_job_was_initiated_for:
+    if id_of_document_job_was_initiated_for:
         relations.append(
             {"key": id_of_document_job_was_initiated_for, "type": "isJobFor"}
         )
@@ -25,12 +24,6 @@ def add_document_to_job(
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-    __patch_document_job_was_initiated_for(
-        id,
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
 
 
 def init_job(
@@ -42,14 +35,13 @@ def init_job(
     user_email=None,
     parent_id=None,
     id_of_document_job_was_initiated_for=None,
-    type_of_document_job_was_initiated_for=None,
 ) -> str:
     relations = []
     if parent_id:
         relations.append({"key": parent_id, "type": "hasParentJob"})
-    if id_of_document_job_was_initiated_for and type_of_document_job_was_initiated_for:
+    if id_of_document_job_was_initiated_for:
         relations.append(
-            {"key": id_of_document_job_was_initiated_for, "type": "isJobOf"}
+            {"key": id_of_document_job_was_initiated_for, "type": "isJobFor"}
         )
 
     job = _create(
@@ -69,19 +61,12 @@ def init_job(
     _post_crud_hook(
         crud="create", document=job, parent_id=parent_id, get_rabbit=get_rabbit
     )
-    __patch_document_job_was_initiated_for(
-        job["_id"],
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
     return job["_id"]
 
 
 def start_job(
     id,
     id_of_document_job_was_initiated_for=None,
-    type_of_document_job_was_initiated_for=None,
     *,
     get_rabbit,
 ):
@@ -94,18 +79,11 @@ def start_job(
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-    __patch_document_job_was_initiated_for(
-        id,
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
 
 
 def finish_job(
     id,
     id_of_document_job_was_initiated_for=None,
-    type_of_document_job_was_initiated_for=None,
     *,
     get_rabbit,
 ):
@@ -117,12 +95,6 @@ def finish_job(
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-    __patch_document_job_was_initiated_for(
-        id,
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
 
 
 def fail_job(id, exception_message, *, get_rabbit):
@@ -136,12 +108,3 @@ def fail_job(id, exception_message, *, get_rabbit):
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-
-
-def __patch_document_job_was_initiated_for(job_id, document_id, type, get_rabbit):
-    if id and type:
-        document = {
-            "document_info_job_was_initiated_for": {"id": document_id, "type": type},
-            "patch": {"relations": [{"key": job_id, "type": "hasJob"}]},
-        }
-        _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)

elody/object_configurations/job_configuration.py

@@ -42,20 +42,6 @@ class JobConfiguration(ElodyConfiguration):
                 "dams.job_created",
                 document,
             )
-            if parent_id := kwargs.get("parent_id"):
-                send_cloudevent(
-                    get_rabbit(),
-                    getenv("MQ_EXCHANGE", "dams"),
-                    "dams.job_changed",
-                    {
-                        "id": parent_id,
-                        "patch": {
-                            "relations": [
-                                {"key": document["_id"], "type": "isParentJobOf"}
-                            ]
-                        },
-                    },
-                )
         elif crud == "update":
             send_cloudevent(
                 get_rabbit(),

elody/policies/authentication/base_user_tenant_validation_policy.py

@@ -35,6 +35,10 @@ class BaseUserTenantValidationPolicy(ABC):
 
         return self.user
 
+    @abstractmethod
+    def promote_role(self, user_context: UserContext):
+        pass
+
     @abstractmethod
     def build_user_context_for_anonymous_user(
         self, request, user_context: UserContext
@@ -86,30 +90,37 @@ class BaseUserTenantValidationPolicy(ABC):
         """
 
         roles = []
-        for metadata in self.user.get("metadata", []):
-            if (
-                metadata["key"]
-                == user_context.bag["user_metadata_key_for_global_roles"]
+        try:
+            for metadata in self.user.get("metadata", []):
+                if (
+                    metadata["key"]
+                    == user_context.bag["user_metadata_key_for_global_roles"]
+                ):
+                    roles.extend(metadata["value"])
+
+            if user_context.x_tenant.id:
+                tenant_ids = user_context.x_tenant.id.split(",")
+                for tenant_id in tenant_ids:
+                    try:
+                        user_tenant_relation = self.__get_user_tenant_relation(
+                            tenant_id, user_context.bag["user_tenant_relation_type"]
+                        )
+                    except Forbidden as error:
+                        user_tenant_relation = {}
+                        if len(roles) == 0:
+                            raise Forbidden(error.description)
+                    roles.extend(user_tenant_relation.get("roles", []))
+
+            if len(roles) == 0 and not regex.match(
+                "(/[^/]+/v[0-9]+)?/tenants$", request.path
             ):
-                roles.extend(metadata["value"])
-
-        if user_context.x_tenant.id:
-            tenant_ids = user_context.x_tenant.id.split(",")
-            for tenant_id in tenant_ids:
-                try:
-                    user_tenant_relation = self.__get_user_tenant_relation(
-                        tenant_id, user_context.bag["user_tenant_relation_type"]
-                    )
-                except Forbidden as error:
-                    user_tenant_relation = {}
-                    if len(roles) == 0:
-                        raise Forbidden(error.description)
-                roles.extend(user_tenant_relation.get("roles", []))
-
-        if len(roles) == 0 and not regex.match(
-            "(/[^/]+/v[0-9]+)?/tenants$", request.path
-        ):
-            raise Forbidden("User has no global roles, switch to a specific tenant.")
+                raise Forbidden(
+                    "User has no global roles, switch to a specific tenant."
+                )
+        except Forbidden as exception:
+            if not (promoted_role := self.promote_role(user_context)):
+                raise exception
+            roles.append(promoted_role)
 
         return list(set(roles))
 

elody/policies/permission_handler.py

@@ -222,7 +222,7 @@ def __is_allowed_to_crud_item_keys(
                 if key_to_check and key_to_check == restricted_key:
                     user_context.bag["restricted_keys"].append(restricted_key)
             else:
-                if flat_request_body.get(restricted_key):
+                if flat_request_body.get(restricted_key) is not None:
                     user_context.bag["restricted_keys"].append(restricted_key)
 
     user_context.bag["requested_item"] = item

{elody-0.0.215.dist-info → elody-0.0.217.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.215
+Version: 0.0.217
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE

{elody-0.0.215.dist-info → elody-0.0.217.dist-info}/RECORD

@@ -4,7 +4,7 @@ elody/client.py,sha256=15SBfnLHJXXY5Vf5BnkWdjtvkH21E_AsWTzm2-zcbf0,8799
 elody/csv.py,sha256=f8HphE-KC2OqKFzV0HiifWBgMHb3g0EA_Y82o_6JEiE,16761
 elody/error_codes.py,sha256=d3wNPZU0HFMyl8xN95ciNd6QD94al1tX18h6HiqiAHo,4310
 elody/exceptions.py,sha256=5KSw2sPCZz3lDIJX4LiR2iL9n4m4KIil04D1d3X5rd0,968
-elody/job.py,sha256=3_heLwfNrWYcjIMKPG-vWsQayAAI7tyLFUUC_b1rT7w,4264
+elody/job.py,sha256=4dNpTWDdui53VqXfPsDNoTZ9MQohfqXnT2AsuI8q5Ec,2900
 elody/loader.py,sha256=yNakab07ja478gZaIC277n8Wf8SJ7_P3q-Z39BDdWQc,5419
 elody/schemas.py,sha256=WtKdZEAX-PtEuAaRohyS3Md8H4-8yKVXMkHfCQ2SDR4,4676
 elody/util.py,sha256=QqcqkV7GZ_1p4Uf_GJnc_nfAJt0mkBGzQ7-wCxMJ1ZM,9080
@@ -14,13 +14,13 @@ elody/migration/base_object_migrator.py,sha256=n8uvgGfjEUy60G47RD7Y-oxp1vHLOauwP
 elody/object_configurations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/object_configurations/base_object_configuration.py,sha256=8wyUq_zqRkGb4Mp198pyxOaGdz2WMZzVOO65s1SDCRw,7393
 elody/object_configurations/elody_configuration.py,sha256=pktiS14jeZja-G6677Hse5zzeUpH5rHRzy7YK-H2wNU,10519
-elody/object_configurations/job_configuration.py,sha256=HMDxaRUyfqhIy0q3yQDDMH9uW5iCd7VCmqknQofXNt0,2039
+elody/object_configurations/job_configuration.py,sha256=-dGhXGfCewLEcPLjkBiSgwUa1dPty6OMm8b0IOUOUgo,1507
 elody/object_configurations/saved_search_configuration.py,sha256=ddOry4EqYOeEKRF7q2M_fHoqZv8DXpQjFq8VaZ7jhVI,732
 elody/policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/policies/helpers.py,sha256=0mlTd-hu2TKwVNH3ov4yCEV-P_f2k7XFJ7XYUtGTjXk,2239
-elody/policies/permission_handler.py,sha256=Bb4PHlM2A3Y-gknIdh4tNIk4gfv6iRjNeVULnUCITFc,10330
+elody/policies/permission_handler.py,sha256=9vxiYjkPrnqIxWi8X9qoGwb09SQaZmQeF4f_9LSQRDs,10342
 elody/policies/authentication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-elody/policies/authentication/base_user_tenant_validation_policy.py,sha256=zQo9tyGDwHHh6Wt3akbaT5CIEG5rqz1DT-BsAtbJNhw,5419
+elody/policies/authentication/base_user_tenant_validation_policy.py,sha256=p7draxPCqly1vy7vnJX-gpmRfDeyaTxt9Cf0YpH9PZI,5829
 elody/policies/authentication/multi_tenant_policy.py,sha256=g4ZYUQMmCjgLg09wj0-0lGKsJsRt7h4ppI25o1VdZHw,4039
 elody/policies/authorization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/policies/authorization/filter_generic_objects_policy.py,sha256=mF32moh8hRetBgG8vQW-rz4xjoRQD2yOxdI740SFSUo,6522
@@ -35,13 +35,13 @@ elody/policies/authorization/mediafile_derivatives_policy.py,sha256=OwNpbS8i7-Lz
 elody/policies/authorization/mediafile_download_policy.py,sha256=XMsKavBucmTh4W1kWOzpFWxJ_ZXgHVK1RS7JB4HjtQo,1979
 elody/policies/authorization/multi_tenant_policy.py,sha256=SA9H7SBjzuh8mY3gYN7pDG8TV7hdI3GEUtNeiZeNL3M,3164
 elody/policies/authorization/tenant_request_policy.py,sha256=dEgblwRAqwWVcE-O7Jn8hVL3OnwDlQhDEOcPlcElBrk,1185
-elody-0.0.215.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+elody-0.0.217.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
 tests/__init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/data.py,sha256=Q3oxduf-E3m-Z5G_p3fcs8jVy6g10I7zXKL1m94UVMI,2906
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_csv.py,sha256=NQaOhehfQ4GuXku0Y1SA8DYjJeqqidbF50zEHAi8RZA,15923
 tests/unit/test_utils.py,sha256=g63szcEZyHhCOtrW4BnNbcgVca3oYPIOLjBdIzNwwN0,8784
-elody-0.0.215.dist-info/METADATA,sha256=PsmLEfEJhwLxo523Qr8QnvgR2asF-3nf9AeNvUcJUqg,23358
-elody-0.0.215.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-elody-0.0.215.dist-info/top_level.txt,sha256=E0mImupLj0KmtUUCXRYEoLDRaSkuiGaOIIseAa0oQ-M,21
-elody-0.0.215.dist-info/RECORD,,
+elody-0.0.217.dist-info/METADATA,sha256=g8halEqhgIY79MS5CoCPvPek-cV4EbqaEF-DjBFWBGA,23358
+elody-0.0.217.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+elody-0.0.217.dist-info/top_level.txt,sha256=E0mImupLj0KmtUUCXRYEoLDRaSkuiGaOIIseAa0oQ-M,21
+elody-0.0.217.dist-info/RECORD,,