diff --git a/lib/rucio/db/sqla/models.py b/lib/rucio/db/sqla/models.py index 7887eac146..d6edbb72ed 100644 --- a/lib/rucio/db/sqla/models.py +++ b/lib/rucio/db/sqla/models.py @@ -522,7 +522,7 @@ class DeletedDataIdentifier(BASE, ModelBase): class UpdatedDID(BASE, ModelBase): """Represents the recently updated dids""" __tablename__ = 'updated_dids' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) rule_evaluation_action: Mapped[DIDReEvaluation] = mapped_column(Enum(DIDReEvaluation, name='UPDATED_DIDS_RULE_EVAL_ACT_CHK', @@ -539,7 +539,7 @@ class BadReplicas(BASE, ModelBase): __tablename__ = 'bad_replicas' scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) reason: Mapped[Optional[str]] = mapped_column(String(255)) state: Mapped[BadFilesStatus] = mapped_column(Enum(BadFilesStatus, name='BAD_REPLICAS_STATE_CHK', create_constraint=True, @@ -576,7 +576,7 @@ class BadPFNs(BASE, ModelBase): class QuarantinedReplica(BASE, ModelBase): """Represents the quarantined replicas""" __tablename__ = 'quarantined_replicas' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) path: Mapped[str] = mapped_column(String(1024)) bytes: Mapped[Optional[int]] = mapped_column(BigInteger) md5: Mapped[Optional[str]] = mapped_column(String(32)) @@ -591,7 +591,7 @@ class QuarantinedReplica(BASE, ModelBase): class QuarantinedReplicaHistory(BASE, ModelBase): """Represents the quarantined replicas history""" __tablename__ = 'quarantined_replicas_history' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) path: Mapped[str] = mapped_column(String(1024)) bytes: Mapped[Optional[int]] = mapped_column(BigInteger) md5: Mapped[Optional[str]] = mapped_column(String(32)) @@ -731,7 +731,7 @@ class DataIdentifierAssociationHistory(BASE, ModelBase): class RSE(BASE, SoftModelBase): """Represents a Rucio Location""" __tablename__ = 'rses' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) rse: Mapped[str] = mapped_column(String(255)) vo: Mapped[str] = mapped_column(String(3), nullable=False, server_default='def') rse_type: Mapped[RSEType] = mapped_column(Enum(RSEType, name='RSES_TYPE_CHK', @@ -769,7 +769,7 @@ class RSE(BASE, SoftModelBase): class RSELimit(BASE, ModelBase): """Represents RSE limits""" __tablename__ = 'rse_limits' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) name: Mapped[str] = mapped_column(String(255)) value: Mapped[int] = mapped_column(BigInteger) _table_args = (PrimaryKeyConstraint('rse_id', 'name', name='RSE_LIMITS_PK'), @@ -779,7 +779,7 @@ class RSELimit(BASE, ModelBase): class TransferLimit(BASE, ModelBase): """Represents limits used to throttle transfer requests""" __tablename__ = 'transfer_limits' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) rse_expression: Mapped[str] = mapped_column(String(3000)) activity: Mapped[Optional[str]] = mapped_column(String(50)) direction: Mapped[TransferLimitDirection] = mapped_column(Enum(TransferLimitDirection, name='TRANSFER_LIMITS_DIRECTION_TYPE_CHK', @@ -800,8 +800,8 @@ class TransferLimit(BASE, ModelBase): class RSETransferLimit(BASE, ModelBase): """Represents the binding of a transfer limit to an RSE as result of TransferLimit.rse_expression dereference""" __tablename__ = 'rse_transfer_limits' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) - limit_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) + limit_id: Mapped[str] = mapped_column(GUID()) _table_args = (PrimaryKeyConstraint('rse_id', 'limit_id', name='RSE_TRANSFER_LIMITS_PK'), Index('RSE_TRANSFER_LIMITS_LIMIT_ID_IDX', 'limit_id', 'rse_id'), ForeignKeyConstraint(['rse_id'], ['rses.id'], name='RSE_TRANSFER_LIMITS_RSE_ID_FK'), @@ -811,7 +811,7 @@ class RSETransferLimit(BASE, ModelBase): class RSEUsage(BASE, ModelBase): """Represents location usage""" __tablename__ = 'rse_usage' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) source: Mapped[str] = mapped_column(String(255)) used: Mapped[Optional[int]] = mapped_column(BigInteger) free: Mapped[Optional[int]] = mapped_column(BigInteger) @@ -823,7 +823,7 @@ class RSEUsage(BASE, ModelBase): class RSEUsageHistory(BASE, ModelBase): """Represents location usage history""" __tablename__ = 'rse_usage_history' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) source: Mapped[str] = mapped_column(String(255)) used: Mapped[Optional[int]] = mapped_column(BigInteger) free: Mapped[Optional[int]] = mapped_column(BigInteger) @@ -834,8 +834,8 @@ class RSEUsageHistory(BASE, ModelBase): class UpdatedRSECounter(BASE, ModelBase): """Represents the recently updated RSE counters""" __tablename__ = 'updated_rse_counters' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) + rse_id: Mapped[str] = mapped_column(GUID()) files: Mapped[int] = mapped_column(BigInteger) bytes: Mapped[int] = mapped_column(BigInteger) _table_args = (PrimaryKeyConstraint('id', name='UPDATED_RSE_CNTRS_PK'), @@ -846,7 +846,7 @@ class UpdatedRSECounter(BASE, ModelBase): class RSEAttrAssociation(BASE, ModelBase): """Represents the map between RSEs and tags""" __tablename__ = 'rse_attr_map' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) key: Mapped[str] = mapped_column(String(255)) value: Mapped[Optional[Union[bool, str]]] = mapped_column(BooleanString(255)) _table_args = (PrimaryKeyConstraint('rse_id', 'key', name='RSE_ATTR_MAP_PK'), @@ -857,7 +857,7 @@ class RSEAttrAssociation(BASE, ModelBase): class RSEProtocols(BASE, ModelBase): """Represents supported protocols of RSEs (Rucio Storage Elements)""" __tablename__ = 'rse_protocols' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) scheme: Mapped[str] = mapped_column(String(255)) hostname: Mapped[str] = mapped_column(String(255), server_default='') # For protocol without host e.g. POSIX on local file systems localhost is assumed as beeing default port: Mapped[int] = mapped_column(Integer, server_default='0') # like host, for local protocol the port 0 is assumed to be default @@ -880,7 +880,7 @@ class RSEProtocols(BASE, ModelBase): class RSEQoSAssociation(BASE, ModelBase): """Represents the mapping of RSEs""" __tablename__ = 'rse_qos_map' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) qos_policy: Mapped[str] = mapped_column(String(64)) _table_args = (PrimaryKeyConstraint('rse_id', 'qos_policy', name='RSE_QOS_MAP_PK'), ForeignKeyConstraint(['rse_id'], ['rses.id'], name='RSE_QOS_MAP_RSE_ID_FK')) @@ -890,7 +890,7 @@ class AccountLimit(BASE, ModelBase): """Represents account limits""" __tablename__ = 'account_limits' account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) bytes: Mapped[Optional[int]] = mapped_column(BigInteger) _table_args = (PrimaryKeyConstraint('account', 'rse_id', name='ACCOUNT_LIMITS_PK'), ForeignKeyConstraint(['account'], ['accounts.account'], name='ACCOUNT_LIMITS_ACCOUNT_FK'), @@ -911,7 +911,7 @@ class AccountUsage(BASE, ModelBase): """Represents account usage""" __tablename__ = 'account_usage' account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) files: Mapped[int] = mapped_column(BigInteger) bytes: Mapped[int] = mapped_column(BigInteger) _table_args = (PrimaryKeyConstraint('account', 'rse_id', name='ACCOUNT_USAGE_PK'), @@ -923,7 +923,7 @@ class AccountUsageHistory(BASE, ModelBase): """Represents account usage history""" __tablename__ = 'account_usage_history' account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) files: Mapped[int] = mapped_column(BigInteger) bytes: Mapped[int] = mapped_column(BigInteger) _table_args = (PrimaryKeyConstraint('account', 'rse_id', 'updated_at', name='ACCOUNT_USAGE_HISTORY_PK'),) @@ -932,7 +932,7 @@ class AccountUsageHistory(BASE, ModelBase): class RSEFileAssociation(BASE, ModelBase): """Represents the map between locations and files""" __tablename__ = 'replicas' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) bytes: Mapped[int] = mapped_column(BigInteger) @@ -965,7 +965,7 @@ class CollectionReplica(BASE, ModelBase): did_type: Mapped[DIDType] = mapped_column(Enum(DIDType, name='COLLECTION_REPLICAS_TYPE_CHK', create_constraint=True, values_callable=lambda obj: [e.value for e in obj])) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) bytes: Mapped[int] = mapped_column(BigInteger) length: Mapped[int] = mapped_column(BigInteger) available_bytes: Mapped[Optional[int]] = mapped_column(BigInteger) @@ -986,7 +986,7 @@ class CollectionReplica(BASE, ModelBase): class UpdatedCollectionReplica(BASE, ModelBase): """Represents updates to replicas for datasets/collections""" __tablename__ = 'updated_col_rep' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) did_type: Mapped[DIDType] = mapped_column(Enum(DIDType, name='UPDATED_COL_REP_TYPE_CHK', @@ -1002,7 +1002,7 @@ class UpdatedCollectionReplica(BASE, ModelBase): class RSEFileAssociationHistory(BASE, ModelBase): """Represents a short history of the deleted replicas""" __tablename__ = 'replicas_history' - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) bytes: Mapped[int] = mapped_column(BigInteger) @@ -1014,7 +1014,7 @@ class RSEFileAssociationHistory(BASE, ModelBase): class ReplicationRule(BASE, ModelBase): """Represents data identifier replication rules""" __tablename__ = 'rules' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) subscription_id: Mapped[Optional[uuid.UUID]] = mapped_column(GUID()) account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) @@ -1087,7 +1087,7 @@ class ReplicationRule(BASE, ModelBase): class ReplicationRuleHistoryRecent(BASE, ModelBase): """Represents replication rules in the recent history""" __tablename__ = 'rules_hist_recent' - id: Mapped[uuid.UUID] = mapped_column(GUID()) + id: Mapped[str] = mapped_column(GUID()) subscription_id: Mapped[Optional[uuid.UUID]] = mapped_column(GUID()) account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) @@ -1135,7 +1135,7 @@ class ReplicationRuleHistoryRecent(BASE, ModelBase): class ReplicationRuleHistory(BASE, ModelBase): """Represents replication rules in the longterm history""" __tablename__ = 'rules_history' - id: Mapped[uuid.UUID] = mapped_column(GUID()) + id: Mapped[str] = mapped_column(GUID()) subscription_id: Mapped[Optional[uuid.UUID]] = mapped_column(GUID()) account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) @@ -1184,8 +1184,8 @@ class ReplicaLock(BASE, ModelBase): __tablename__ = 'locks' scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) - rule_id: Mapped[uuid.UUID] = mapped_column(GUID()) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rule_id: Mapped[str] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) bytes: Mapped[Optional[int]] = mapped_column(BigInteger) state: Mapped[LockState] = mapped_column(Enum(LockState, name='LOCKS_STATE_CHK', @@ -1206,8 +1206,8 @@ class DatasetLock(BASE, ModelBase): __tablename__ = 'dataset_locks' scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) - rule_id: Mapped[uuid.UUID] = mapped_column(GUID()) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rule_id: Mapped[str] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) state: Mapped[LockState] = mapped_column(Enum(LockState, name='DATASET_LOCKS_STATE_CHK', create_constraint=True, @@ -1229,9 +1229,9 @@ class DatasetLock(BASE, ModelBase): class UpdatedAccountCounter(BASE, ModelBase): """Represents the recently updated Account counters""" __tablename__ = 'updated_account_counters' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) account: Mapped[InternalAccount] = mapped_column(InternalAccountString(get_schema_value('ACCOUNT_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) files: Mapped[int] = mapped_column(BigInteger) bytes: Mapped[int] = mapped_column(BigInteger) _table_args = (PrimaryKeyConstraint('id', name='UPDATED_ACCNT_CNTRS_PK'), @@ -1243,7 +1243,7 @@ class UpdatedAccountCounter(BASE, ModelBase): class Request(BASE, ModelBase): """Represents a request for a single file with a third party service""" __tablename__ = 'requests' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) request_type: Mapped[RequestType] = mapped_column(Enum(RequestType, name='REQUESTS_TYPE_CHK', create_constraint=True, values_callable=lambda obj: [e.value for e in obj]), @@ -1254,7 +1254,7 @@ class Request(BASE, ModelBase): create_constraint=True, values_callable=lambda obj: [e.value for e in obj]), default=DIDType.FILE) - dest_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + dest_rse_id: Mapped[str] = mapped_column(GUID()) source_rse_id: Mapped[Optional[uuid.UUID]] = mapped_column(GUID()) attributes: Mapped[Optional[str]] = mapped_column(String(4000)) state: Mapped[RequestState] = mapped_column(Enum(RequestState, name='REQUESTS_STATE_CHK', @@ -1304,9 +1304,9 @@ class Request(BASE, ModelBase): class TransferHop(BASE, ModelBase): """Represents source files for transfers""" __tablename__ = 'transfer_hops' - request_id: Mapped[uuid.UUID] = mapped_column(GUID()) - next_hop_request_id: Mapped[uuid.UUID] = mapped_column(GUID()) - initial_request_id: Mapped[uuid.UUID] = mapped_column(GUID()) + request_id: Mapped[str] = mapped_column(GUID()) + next_hop_request_id: Mapped[str] = mapped_column(GUID()) + initial_request_id: Mapped[str] = mapped_column(GUID()) _table_args = (PrimaryKeyConstraint('request_id', 'next_hop_request_id', 'initial_request_id', name='TRANSFER_HOPS_PK'), ForeignKeyConstraint(['initial_request_id'], ['requests.id'], name='TRANSFER_HOPS_INIT_REQ_ID_FK'), ForeignKeyConstraint(['request_id'], ['requests.id'], name='TRANSFER_HOPS_REQ_ID_FK'), @@ -1318,7 +1318,7 @@ class TransferHop(BASE, ModelBase): class RequestHistory(BASE, ModelBase): """Represents request history""" __tablename__ = 'requests_history' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) request_type: Mapped[RequestType] = mapped_column(Enum(RequestType, name='REQUESTS_HIST_TYPE_CHK', create_constraint=True, values_callable=lambda obj: [e.value for e in obj]), @@ -1329,7 +1329,7 @@ class RequestHistory(BASE, ModelBase): create_constraint=True, values_callable=lambda obj: [e.value for e in obj]), default=DIDType.FILE) - dest_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + dest_rse_id: Mapped[str] = mapped_column(GUID()) source_rse_id: Mapped[Optional[uuid.UUID]] = mapped_column(GUID()) attributes: Mapped[Optional[str]] = mapped_column(String(4000)) state: Mapped[RequestState] = mapped_column(Enum(RequestState, name='REQUESTS_HIST_STATE_CHK', @@ -1370,11 +1370,11 @@ class RequestHistory(BASE, ModelBase): class Source(BASE, ModelBase): """Represents source files for transfers""" __tablename__ = 'sources' - request_id: Mapped[uuid.UUID] = mapped_column(GUID()) + request_id: Mapped[str] = mapped_column(GUID()) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) - dest_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) + dest_rse_id: Mapped[str] = mapped_column(GUID()) url: Mapped[Optional[str]] = mapped_column(String(2048)) bytes: Mapped[Optional[int]] = mapped_column(BigInteger) ranking: Mapped[Optional[int]] = mapped_column(Integer()) @@ -1392,11 +1392,11 @@ class Source(BASE, ModelBase): class SourceHistory(BASE, ModelBase): """Represents history of source files for transfers""" __tablename__ = 'sources_history' - request_id: Mapped[uuid.UUID] = mapped_column(GUID()) + request_id: Mapped[str] = mapped_column(GUID()) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) - rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) - dest_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + rse_id: Mapped[str] = mapped_column(GUID()) + dest_rse_id: Mapped[str] = mapped_column(GUID()) url: Mapped[Optional[str]] = mapped_column(String(2048)) bytes: Mapped[Optional[int]] = mapped_column(BigInteger) ranking: Mapped[Optional[int]] = mapped_column(Integer()) @@ -1411,8 +1411,8 @@ class SourceHistory(BASE, ModelBase): class Distance(BASE, ModelBase): """Represents distance between rses""" __tablename__ = 'distances' - src_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) - dest_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + src_rse_id: Mapped[str] = mapped_column(GUID()) + dest_rse_id: Mapped[str] = mapped_column(GUID()) distance: Mapped[Optional[int]] = mapped_column(Integer()) _table_args = (PrimaryKeyConstraint('src_rse_id', 'dest_rse_id', name='DISTANCES_PK'), ForeignKeyConstraint(['src_rse_id'], ['rses.id'], name='DISTANCES_SRC_RSES_FK'), @@ -1423,11 +1423,11 @@ class Distance(BASE, ModelBase): class TransferStats(BASE, ModelBase): """Represents counters for transfer link usage""" __tablename__ = 'transfer_stats' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) resolution: Mapped[int] = mapped_column(Integer) timestamp: Mapped[datetime] = mapped_column(DateTime) - dest_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) - src_rse_id: Mapped[uuid.UUID] = mapped_column(GUID()) + dest_rse_id: Mapped[str] = mapped_column(GUID()) + src_rse_id: Mapped[str] = mapped_column(GUID()) activity: Mapped[Optional[str]] = mapped_column(String(50)) files_done: Mapped[int] = mapped_column(BigInteger) bytes_done: Mapped[int] = mapped_column(BigInteger) @@ -1441,7 +1441,7 @@ class TransferStats(BASE, ModelBase): class Subscription(BASE, ModelBase): """Represents a subscription""" __tablename__ = 'subscriptions' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) name: Mapped[str] = mapped_column(String(64)) filter: Mapped[Optional[str]] = mapped_column(String(4000)) replication_rules: Mapped[Optional[str]] = mapped_column(String(4000)) @@ -1468,7 +1468,7 @@ class Subscription(BASE, ModelBase): class SubscriptionHistory(BASE, ModelBase): """Represents a subscription history""" __tablename__ = 'subscriptions_history' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) name: Mapped[str] = mapped_column(String(64)) filter: Mapped[Optional[str]] = mapped_column(String(4000)) replication_rules: Mapped[Optional[str]] = mapped_column(String(4000)) @@ -1529,7 +1529,7 @@ class OAuthRequest(BASE, ModelBase): class Message(BASE, ModelBase): """Represents the event messages""" __tablename__ = 'messages' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) event_type: Mapped[str] = mapped_column(String(256)) payload: Mapped[str] = mapped_column(String(4000)) payload_nolimit: Mapped[Optional[str]] = mapped_column(Text) @@ -1543,7 +1543,7 @@ class Message(BASE, ModelBase): class MessageHistory(BASE, ModelBase): """Represents the history of event messages""" __tablename__ = 'messages_history' - id: Mapped[uuid.UUID] = mapped_column(GUID()) + id: Mapped[str] = mapped_column(GUID()) event_type: Mapped[Optional[str]] = mapped_column(String(1024)) payload: Mapped[Optional[str]] = mapped_column(String(4000)) payload_nolimit: Mapped[Optional[str]] = mapped_column(Text) @@ -1609,7 +1609,7 @@ class NamingConvention(BASE, ModelBase): class LifetimeExceptions(BASE, ModelBase): """Represents the exceptions to the lifetime model""" __tablename__ = 'lifetime_except' - id: Mapped[uuid.UUID] = mapped_column(GUID(), default=utils.generate_uuid) + id: Mapped[str] = mapped_column(GUID(), default=utils.generate_uuid) scope: Mapped[InternalScope] = mapped_column(InternalScopeString(get_schema_value('SCOPE_LENGTH'))) name: Mapped[str] = mapped_column(String(get_schema_value('NAME_LENGTH'))) did_type: Mapped[DIDType] = mapped_column(Enum(DIDType, name='LIFETIME_EXCEPT_TYPE_CHK',