Skip to content

Commit

Permalink
highlighted log line when top level function is called
Browse files Browse the repository at this point in the history
  • Loading branch information
jnussbaum committed Oct 4, 2023
1 parent 0d231b9 commit 3bc6995
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
11 changes: 8 additions & 3 deletions dsp_permissions_scripts/utils/doap_get.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@

from dsp_permissions_scripts.models.permission import Doap, DoapTarget, DoapTargetType
from dsp_permissions_scripts.utils.authentication import get_protocol
from dsp_permissions_scripts.utils.get_logger import get_timestamp
from dsp_permissions_scripts.utils.get_logger import get_logger, get_timestamp
from dsp_permissions_scripts.utils.project import get_project_iri_by_shortcode
from dsp_permissions_scripts.utils.scope_serialization import (
create_scope_from_admin_route_object,
)

logger = get_logger(__name__)


def __filter_doaps_by_target(
doaps: list[Doap],
Expand Down Expand Up @@ -80,6 +82,7 @@ def get_doaps_of_project(
Optionally, select only the DOAPs that are related to either a group, or a resource class, or a property.
By default, all DOAPs are returned, regardless of their target (target=all).
"""
logger.info(f"******* Getting DOAPs of project {shortcode} on server {host} *******")
project_iri = get_project_iri_by_shortcode(
shortcode=shortcode,
host=host,
Expand All @@ -102,10 +105,12 @@ def print_doaps_of_project(
shortcode: str,
target: DoapTargetType = DoapTargetType.ALL,
) -> None:
heading = f"{get_timestamp()}: Project {shortcode} on server {host} has {len(doaps)} DOAPs"
heading = f"Project {shortcode} on server {host} has {len(doaps)} DOAPs"
if target != DoapTargetType.ALL:
heading += f" which are related to a {target}"
print(f"\n{heading}\n{'=' * len(heading)}\n")
print(f"\n{get_timestamp()}: {heading}\n{'=' * len(heading)}\n")
logger.info(f"******* Printing DOAPs of project {shortcode} on server {host} *******")
logger.info(heading)
for d in doaps:
print(d.model_dump_json(indent=2, exclude_none=True))
print()
4 changes: 2 additions & 2 deletions dsp_permissions_scripts/utils/doap_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ def apply_updated_doaps_on_server(
host: the DSP server where the project is located
token: the access token
"""
logger.info(f"Updating {len(doaps)} DOAPs on {host}...")
heading = f"{get_timestamp()}: Update {len(doaps)} DOAPs on {host}..."
logger.info(f"******* Updating {len(doaps)} DOAPs on {host} *******")
heading = f"{get_timestamp()}: Updating {len(doaps)} DOAPs on {host}..."
print(f"\n{heading}\n{'=' * len(heading)}\n")
for d in doaps:
__log_and_print_doap_update(doap=d, state="before")
Expand Down
1 change: 1 addition & 0 deletions dsp_permissions_scripts/utils/oap.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def apply_updated_oaps_on_server(
token: str,
) -> None:
"""Applies object access permissions on a DSP server."""
logger.info("******* Applying updated object access permissions on server *******")
for index, resource_oap in enumerate(resource_oaps):
msg = f"Updating permissions of resource {index + 1}/{len(resource_oaps)}: {resource_oap.object_iri}..."
logger.info("=====")
Expand Down
1 change: 1 addition & 0 deletions dsp_permissions_scripts/utils/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def get_all_resource_oaps_of_project(
host: str,
token: str,
) -> list[Oap]:
logger.info(f"******* Getting all resource OAPs of project {shortcode} *******")
project_iri = get_project_iri_by_shortcode(
shortcode=shortcode,
host=host,
Expand Down

0 comments on commit 3bc6995

Please sign in to comment.