Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Typing: Fix type annotations in rule.py ("NOT FOR 34.0.0rc2") #6575

Merged
merged 1 commit into from Mar 19, 2024
Merged

Typing: Fix type annotations in rule.py ("NOT FOR 34.0.0rc2") #6575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/rucio/common/types.py
View file
Open in desktop
Expand Up @@ -174,3 +174,8 @@ class RuleDict(TypedDict):
activity: str
notify: Optional[Literal['Y', 'N', 'C', 'P']]
purge_replicas: bool


class DIDDict(TypedDict):
name: str
scope: InternalScope
26 changes: 13 additions & 13 deletions lib/rucio/core/rule.py
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@

import json
import logging
from collections.abc import Iterable, Iterator, Sequence
from collections.abc import Iterator, Sequence
from configparser import NoOptionError, NoSectionError
from copy import deepcopy
from datetime import datetime, timedelta
Expand Down Expand Up @@ -46,7 +46,7 @@
from rucio.common.plugins import PolicyPackageAlgorithms
from rucio.common.policy import policy_filter, get_scratchdisk_lifetime
from rucio.common.schema import validate_schema
from rucio.common.types import InternalScope, InternalAccount, LoggerFunction, RuleDict
from rucio.common.types import InternalScope, InternalAccount, LoggerFunction, DIDDict, RuleDict
from rucio.common.utils import str_to_date, sizefmt, chunks
from rucio.core import account_counter, rse_counter, request as request_core, transfer as transfer_core
from rucio.core.account import get_account
Expand Down Expand Up @@ -144,7 +144,7 @@ def default(rule: models.ReplicationRule, did: models.DataIdentifier, session: '

@transactional_session
def add_rule(
dids: Sequence[dict[str, Any]],
dids: Sequence[DIDDict],
account: InternalAccount,
copies: int,
rse_expression: str,
Expand Down Expand Up @@ -458,7 +458,7 @@ def add_rule(

@transactional_session
def add_rules(
dids: Sequence[dict[str, Any]],
dids: Sequence[DIDDict],
rules: Sequence[RuleDict],
*,
session: "Session",
Expand Down Expand Up @@ -2091,7 +2091,7 @@ def get_updated_dids(
total_workers: int,
worker_number: int,
limit: int = 100,
blocked_dids: Iterable[tuple[str, str]] = [],
blocked_dids: Sequence[tuple[str, str]] = [],
*,
session: "Session"
) -> list[tuple[str, InternalScope, str, DIDReEvaluation]]:
Expand Down Expand Up @@ -2841,7 +2841,7 @@ def insert_rule_history(
@transactional_session
def approve_rule(
rule_id: str,
approver: Optional[str] = None,
approver: str = '',
notify_approvers: bool = True,
*,
session: "Session"
Expand Down Expand Up @@ -2912,7 +2912,7 @@ def approve_rule(
@transactional_session
def deny_rule(
rule_id: str,
approver: Optional[str] = None,
approver: str = '',
reason: Optional[str] = None,
*,
session: "Session"
Expand Down Expand Up @@ -3194,8 +3194,8 @@ def list_rules_for_rse_decommissioning(
def __find_missing_locks_and_create_them(
datasetfiles: Sequence[dict[str, Any]],
locks: dict[tuple[InternalScope, str], Sequence[models.ReplicaLock]],
replicas: dict[tuple[InternalScope, str], Any],
source_replicas: dict[tuple[InternalScope, str], Any],
replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
source_replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
rseselector: RSESelector,
rule: models.ReplicationRule,
source_rses: Sequence[str],
Expand Down Expand Up @@ -3303,8 +3303,8 @@ def __find_surplus_locks_and_remove_them(
def __find_stuck_locks_and_repair_them(
datasetfiles: Sequence[dict[str, Any]],
locks: dict[tuple[InternalScope, str], Sequence[models.ReplicaLock]],
replicas: dict[tuple[InternalScope, str], Any],
source_replicas: dict[tuple[InternalScope, str], Any],
replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
source_replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
rseselector: RSESelector,
rule: models.ReplicationRule,
source_rses: Sequence[str],
Expand Down Expand Up @@ -4056,8 +4056,8 @@ def __resolve_dids_to_locks_and_replicas(
def __create_locks_replicas_transfers(
datasetfiles: Sequence[dict[str, Any]],
locks: dict[tuple[InternalScope, str], Sequence[models.ReplicaLock]],
replicas: dict[tuple[InternalScope, str], Any],
source_replicas: dict[tuple[InternalScope, str], Any],
replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
source_replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
rseselector: RSESelector,
rule: models.ReplicationRule,
preferred_rse_ids: Sequence[str] = [],
Expand Down
4 changes: 2 additions & 2 deletions lib/rucio/core/rule_grouping.py
View file
Open in desktop
Expand Up @@ -42,8 +42,8 @@
def apply_rule_grouping(
datasetfiles: Sequence[dict[str, Any]],
locks: dict[tuple[InternalScope, str], models.ReplicaLock],
replicas: dict[tuple[InternalScope, str], Any],
source_replicas: dict[tuple[InternalScope, str], Any],
replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
source_replicas: dict[tuple[InternalScope, str], Sequence[models.CollectionReplica]],
rseselector: RSESelector, rule: models.ReplicationRule,
preferred_rse_ids: Sequence[str] = [],
source_rses: Sequence[str] = [],
Expand Down