Merge branch 'main' into wip/DEV-2798-implement-administrative-permis…

…sions

dsp_permissions_scripts/utils/doap_get.py → dsp_permissions_scripts/doap/doap_get.py

@@ -3,7 +3,7 @@
 
 import requests
 
-from dsp_permissions_scripts.models.doap import Doap, DoapTarget, DoapTargetType
+from dsp_permissions_scripts.doap.doap_model import Doap, DoapTarget, DoapTargetType
 from dsp_permissions_scripts.utils.authentication import get_protocol
 from dsp_permissions_scripts.utils.get_logger import get_logger
 from dsp_permissions_scripts.utils.project import get_project_iri_by_shortcode

dsp_permissions_scripts/utils/doap_serialize.py → dsp_permissions_scripts/doap/doap_serialize.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Literal
 
-from dsp_permissions_scripts.models.doap import Doap, DoapTargetType
+from dsp_permissions_scripts.doap.doap_model import Doap, DoapTargetType
 
 
 def _get_file_path(

dsp_permissions_scripts/utils/doap_set.py → dsp_permissions_scripts/doap/doap_set.py

@@ -4,10 +4,10 @@
 
 import requests
 
-from dsp_permissions_scripts.models.doap import Doap
+from dsp_permissions_scripts.doap.doap_model import Doap
 from dsp_permissions_scripts.models.scope import PermissionScope
 from dsp_permissions_scripts.utils.authentication import get_protocol
-from dsp_permissions_scripts.utils.doap_get import create_doap_from_admin_route_response
+from dsp_permissions_scripts.doap.doap_get import create_doap_from_admin_route_response
 from dsp_permissions_scripts.utils.get_logger import get_logger, get_timestamp
 from dsp_permissions_scripts.utils.scope_serialization import (
     create_admin_route_object_from_scope,

dsp_permissions_scripts/utils/oap.py → dsp_permissions_scripts/oap/oap_get_set.py

@@ -1,13 +1,15 @@
+# pylint: disable=too-many-arguments
+
 import json
 import warnings
 from typing import Any
 from urllib.parse import quote_plus
 
 import requests
 
-from dsp_permissions_scripts.models.oap import Oap
 from dsp_permissions_scripts.models.scope import PermissionScope
 from dsp_permissions_scripts.models.value import ValueUpdate
+from dsp_permissions_scripts.oap.oap_model import Oap
 from dsp_permissions_scripts.utils.authentication import get_protocol
 from dsp_permissions_scripts.utils.get_logger import get_logger, get_timestamp
 from dsp_permissions_scripts.utils.scope_serialization import create_string_from_scope

dsp_permissions_scripts/utils/oap_serialize.py → dsp_permissions_scripts/oap/oap_serialize.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 from typing import Literal
 
-from dsp_permissions_scripts.models.oap import Oap
+from dsp_permissions_scripts.oap.oap_model import Oap
 
 
 def _get_project_data_path(

dsp_permissions_scripts/template.py

@@ -1,23 +1,23 @@
 from dotenv import load_dotenv
 
+from dsp_permissions_scripts.doap.doap_get import get_doaps_of_project
+from dsp_permissions_scripts.doap.doap_model import Doap
+from dsp_permissions_scripts.doap.doap_serialize import serialize_doaps_of_project
+from dsp_permissions_scripts.doap.doap_set import apply_updated_doaps_on_server
 from dsp_permissions_scripts.models import builtin_groups
 from dsp_permissions_scripts.models.ap import Ap, ApValue
-from dsp_permissions_scripts.models.doap import Doap
 from dsp_permissions_scripts.models.host import Hosts
-from dsp_permissions_scripts.models.oap import Oap
 from dsp_permissions_scripts.models.scope import PUBLIC
+from dsp_permissions_scripts.oap.oap_get_set import apply_updated_oaps_on_server
+from dsp_permissions_scripts.oap.oap_model import Oap
+from dsp_permissions_scripts.oap.oap_serialize import serialize_resource_oaps
 from dsp_permissions_scripts.utils.ap.ap_get import get_aps_of_project
 from dsp_permissions_scripts.utils.ap.ap_serialize import serialize_aps_of_project
 from dsp_permissions_scripts.utils.ap.ap_set import (
     apply_updated_aps_on_server,
     delete_ap,
 )
 from dsp_permissions_scripts.utils.authentication import login
-from dsp_permissions_scripts.utils.doap_get import get_doaps_of_project
-from dsp_permissions_scripts.utils.doap_serialize import serialize_doaps_of_project
-from dsp_permissions_scripts.utils.doap_set import apply_updated_doaps_on_server
-from dsp_permissions_scripts.utils.oap import apply_updated_oaps_on_server
-from dsp_permissions_scripts.utils.oap_serialize import serialize_resource_oaps
 from dsp_permissions_scripts.utils.project import get_all_resource_oaps_of_project
 
 

dsp_permissions_scripts/utils/project.py

@@ -2,7 +2,7 @@
 
 import requests
 
-from dsp_permissions_scripts.models.oap import Oap
+from dsp_permissions_scripts.oap.oap_model import Oap
 from dsp_permissions_scripts.utils.authentication import get_protocol
 from dsp_permissions_scripts.utils.get_logger import get_logger, get_timestamp
 from dsp_permissions_scripts.utils.helpers import dereference_prefix

tests/test_doap_serialization.py

@@ -3,9 +3,9 @@
 from pathlib import Path
 
 from dsp_permissions_scripts.models import builtin_groups
-from dsp_permissions_scripts.models.doap import Doap, DoapTarget
+from dsp_permissions_scripts.doap.doap_model import Doap, DoapTarget
 from dsp_permissions_scripts.models.scope import PermissionScope
-from dsp_permissions_scripts.utils.doap_serialize import (
+from dsp_permissions_scripts.doap.doap_serialize import (
     deserialize_doaps_of_project,
     serialize_doaps_of_project,
 )

tests/test_oap_serialization.py

@@ -3,9 +3,9 @@
 from pathlib import Path
 
 from dsp_permissions_scripts.models import builtin_groups
-from dsp_permissions_scripts.models.oap import Oap
+from dsp_permissions_scripts.oap.oap_model import Oap
 from dsp_permissions_scripts.models.scope import PermissionScope
-from dsp_permissions_scripts.utils.oap_serialize import (
+from dsp_permissions_scripts.oap.oap_serialize import (
     deserialize_resource_oaps,
     serialize_resource_oaps,
 )