Clean state types
This commit is contained in:
Teknique
parent
cf2c26e99b
commit
00521a1283
@ -1,36 +1,47 @@
|
||||
from typing import Self, Optional
|
||||
from enum import StrEnum
|
||||
from typing import Optional, Self
|
||||
|
||||
from .config import VeilidConfig
|
||||
from .types import (ByteCount, RouteId, Timestamp, TimestampDuration, TypedKey,
|
||||
ValueData, ValueSubkey, VeilidLogLevel,
|
||||
urlsafe_b64decode_no_pad)
|
||||
|
||||
from .types import *
|
||||
from .config import *
|
||||
|
||||
class AttachmentState(StrEnum):
|
||||
DETACHED = 'Detached'
|
||||
ATTACHING = 'Attaching'
|
||||
ATTACHED_WEAK = 'AttachedWeak'
|
||||
ATTACHED_GOOD = 'AttachedGood'
|
||||
ATTACHED_STRONG = 'AttachedStrong'
|
||||
FULLY_ATTACHED = 'FullyAttached'
|
||||
OVER_ATTACHED = 'OverAttached'
|
||||
DETACHING = 'Detaching'
|
||||
DETACHED = "Detached"
|
||||
ATTACHING = "Attaching"
|
||||
ATTACHED_WEAK = "AttachedWeak"
|
||||
ATTACHED_GOOD = "AttachedGood"
|
||||
ATTACHED_STRONG = "AttachedStrong"
|
||||
FULLY_ATTACHED = "FullyAttached"
|
||||
OVER_ATTACHED = "OverAttached"
|
||||
DETACHING = "Detaching"
|
||||
|
||||
|
||||
class VeilidStateAttachment:
|
||||
state: AttachmentState
|
||||
public_internet_ready: bool
|
||||
local_network_ready: bool
|
||||
|
||||
def __init__(self, state: AttachmentState, public_internet_ready: bool, local_network_ready: bool):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
state: AttachmentState,
|
||||
public_internet_ready: bool,
|
||||
local_network_ready: bool,
|
||||
):
|
||||
self.state = state
|
||||
self.public_internet_ready = public_internet_ready
|
||||
self.local_network_ready = local_network_ready
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidStateAttachment(
|
||||
AttachmentState(j['state']),
|
||||
j['public_internet_ready'],
|
||||
j['local_network_ready'])
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
AttachmentState(j["state"]),
|
||||
j["public_internet_ready"],
|
||||
j["local_network_ready"],
|
||||
)
|
||||
|
||||
|
||||
class RPCStats:
|
||||
messages_sent: int
|
||||
@ -42,9 +53,17 @@ class RPCStats:
|
||||
recent_lost_answers: int
|
||||
failed_to_send: int
|
||||
|
||||
def __init__(self, messages_sent: int, messages_rcvd: int, questions_in_flight: int,
|
||||
last_question_ts: Optional[Timestamp], last_seen_ts: Optional[Timestamp],
|
||||
first_consecutive_seen_ts: Optional[Timestamp], recent_lost_answers: int, failed_to_send: int):
|
||||
def __init__(
|
||||
self,
|
||||
messages_sent: int,
|
||||
messages_rcvd: int,
|
||||
questions_in_flight: int,
|
||||
last_question_ts: Optional[Timestamp],
|
||||
last_seen_ts: Optional[Timestamp],
|
||||
first_consecutive_seen_ts: Optional[Timestamp],
|
||||
recent_lost_answers: int,
|
||||
failed_to_send: int,
|
||||
):
|
||||
self.messages_sent = messages_sent
|
||||
self.messages_rcvd = messages_rcvd
|
||||
self.questions_in_flight = questions_in_flight
|
||||
@ -53,37 +72,47 @@ class RPCStats:
|
||||
self.first_consecutive_seen_ts = first_consecutive_seen_ts
|
||||
self.recent_lost_answers = recent_lost_answers
|
||||
self.failed_to_send = failed_to_send
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return RPCStats(
|
||||
j['messages_sent'],
|
||||
j['messages_rcvd'],
|
||||
j['questions_in_flight'],
|
||||
None if j['last_question_ts'] is None else Timestamp(j['last_question_ts']),
|
||||
None if j['last_seen_ts'] is None else Timestamp(j['last_seen_ts']),
|
||||
None if j['first_consecutive_seen_ts'] is None else Timestamp(j['first_consecutive_seen_ts']),
|
||||
j['recent_lost_answers'],
|
||||
j['failed_to_send'])
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
j["messages_sent"],
|
||||
j["messages_rcvd"],
|
||||
j["questions_in_flight"],
|
||||
None if j["last_question_ts"] is None else Timestamp(j["last_question_ts"]),
|
||||
None if j["last_seen_ts"] is None else Timestamp(j["last_seen_ts"]),
|
||||
None
|
||||
if j["first_consecutive_seen_ts"] is None
|
||||
else Timestamp(j["first_consecutive_seen_ts"]),
|
||||
j["recent_lost_answers"],
|
||||
j["failed_to_send"],
|
||||
)
|
||||
|
||||
|
||||
class LatencyStats:
|
||||
fastest: TimestampDuration
|
||||
average: TimestampDuration
|
||||
slowest: TimestampDuration
|
||||
|
||||
def __init__(self, fastest: TimestampDuration, average: TimestampDuration, slowest: TimestampDuration):
|
||||
def __init__(
|
||||
self,
|
||||
fastest: TimestampDuration,
|
||||
average: TimestampDuration,
|
||||
slowest: TimestampDuration,
|
||||
):
|
||||
self.fastest = fastest
|
||||
self.average = average
|
||||
self.slowest = slowest
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return LatencyStats(
|
||||
TimestampDuration(j['fastest']),
|
||||
TimestampDuration(j['average']),
|
||||
TimestampDuration(j['slowest']))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
TimestampDuration(j["fastest"]),
|
||||
TimestampDuration(j["average"]),
|
||||
TimestampDuration(j["slowest"]),
|
||||
)
|
||||
|
||||
|
||||
class TransferStats:
|
||||
@ -92,20 +121,27 @@ class TransferStats:
|
||||
average: ByteCount
|
||||
minimum: ByteCount
|
||||
|
||||
def __init__(self, total: ByteCount, maximum: ByteCount, average: ByteCount, minimum: ByteCount):
|
||||
def __init__(
|
||||
self,
|
||||
total: ByteCount,
|
||||
maximum: ByteCount,
|
||||
average: ByteCount,
|
||||
minimum: ByteCount,
|
||||
):
|
||||
self.total = total
|
||||
self.maximum = maximum
|
||||
self.average = average
|
||||
self.minimum = minimum
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return TransferStats(
|
||||
ByteCount(j['total']),
|
||||
ByteCount(j['maximum']),
|
||||
ByteCount(j['average']),
|
||||
ByteCount(j['minimum']))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
ByteCount(j["total"]),
|
||||
ByteCount(j["maximum"]),
|
||||
ByteCount(j["average"]),
|
||||
ByteCount(j["minimum"]),
|
||||
)
|
||||
|
||||
|
||||
class TransferStatsDownUp:
|
||||
@ -116,12 +152,11 @@ class TransferStatsDownUp:
|
||||
self.down = down
|
||||
self.up = up
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return TransferStatsDownUp(
|
||||
TransferStats.from_json(j['down']),
|
||||
TransferStats.from_json(j['up']))
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(TransferStats.from_json(j["down"]), TransferStats.from_json(j["up"]))
|
||||
|
||||
|
||||
class PeerStats:
|
||||
time_added: Timestamp
|
||||
@ -129,20 +164,28 @@ class PeerStats:
|
||||
latency: Optional[LatencyStats]
|
||||
transfer: TransferStatsDownUp
|
||||
|
||||
def __init__(self, time_added: Timestamp, rpc_stats: RPCStats, latency: Optional[LatencyStats], transfer: TransferStatsDownUp):
|
||||
def __init__(
|
||||
self,
|
||||
time_added: Timestamp,
|
||||
rpc_stats: RPCStats,
|
||||
latency: Optional[LatencyStats],
|
||||
transfer: TransferStatsDownUp,
|
||||
):
|
||||
self.time_added = time_added
|
||||
self.rpc_stats = rpc_stats
|
||||
self.latency = latency
|
||||
self.latency = latency
|
||||
self.transfer = transfer
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return PeerStats(
|
||||
j['time_added'],
|
||||
RPCStats.from_json(j['rpc_stats']),
|
||||
None if j['latency'] is None else LatencyStats.from_json(j['latency']),
|
||||
TransferStatsDownUp.from_json(j['transfer']))
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
j["time_added"],
|
||||
RPCStats.from_json(j["rpc_stats"]),
|
||||
None if j["latency"] is None else LatencyStats.from_json(j["latency"]),
|
||||
TransferStatsDownUp.from_json(j["transfer"]),
|
||||
)
|
||||
|
||||
|
||||
class PeerTableData:
|
||||
node_ids: list[str]
|
||||
@ -153,14 +196,14 @@ class PeerTableData:
|
||||
self.node_ids = node_ids
|
||||
self.peer_address = peer_address
|
||||
self.peer_stats = peer_stats
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return PeerTableData(
|
||||
j['node_ids'],
|
||||
j['peer_address'],
|
||||
PeerStats.from_json(j['peer_stats']))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
j["node_ids"], j["peer_address"], PeerStats.from_json(j["peer_stats"])
|
||||
)
|
||||
|
||||
|
||||
class VeilidStateNetwork:
|
||||
started: bool
|
||||
@ -168,102 +211,120 @@ class VeilidStateNetwork:
|
||||
bps_up: ByteCount
|
||||
peers: list[PeerTableData]
|
||||
|
||||
def __init__(self, started: bool, bps_down: ByteCount, bps_up: ByteCount, peers: list[PeerTableData]):
|
||||
def __init__(
|
||||
self,
|
||||
started: bool,
|
||||
bps_down: ByteCount,
|
||||
bps_up: ByteCount,
|
||||
peers: list[PeerTableData],
|
||||
):
|
||||
self.started = started
|
||||
self.bps_down = bps_down
|
||||
self.bps_up = bps_up
|
||||
self.peers = peers
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidStateNetwork(
|
||||
j['started'],
|
||||
ByteCount(j['bps_down']),
|
||||
ByteCount(j['bps_up']),
|
||||
list(map(lambda x: PeerTableData.from_json(x), j['peers'])))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
j["started"],
|
||||
ByteCount(j["bps_down"]),
|
||||
ByteCount(j["bps_up"]),
|
||||
[PeerTableData.from_json(peer) for peer in j["peers"]],
|
||||
)
|
||||
|
||||
|
||||
class VeilidStateConfig:
|
||||
config: VeilidConfig
|
||||
|
||||
def __init__(self, config: VeilidConfig):
|
||||
self.config = config
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidStateConfig(
|
||||
VeilidConfig.from_json(j['config'])
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(VeilidConfig.from_json(j["config"]))
|
||||
|
||||
|
||||
class VeilidState:
|
||||
attachment: VeilidStateAttachment
|
||||
network: VeilidStateNetwork
|
||||
config: VeilidStateConfig
|
||||
|
||||
def __init__(self, attachment: VeilidStateAttachment, network: VeilidStateNetwork, config: VeilidStateConfig):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
attachment: VeilidStateAttachment,
|
||||
network: VeilidStateNetwork,
|
||||
config: VeilidStateConfig,
|
||||
):
|
||||
self.attachment = attachment
|
||||
self.network = network
|
||||
self.config = config
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidState(
|
||||
VeilidStateAttachment.from_json(j['attachment']),
|
||||
VeilidStateNetwork.from_json(j['network']),
|
||||
VeilidStateConfig.from_json(j['config']))
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
VeilidStateAttachment.from_json(j["attachment"]),
|
||||
VeilidStateNetwork.from_json(j["network"]),
|
||||
VeilidStateConfig.from_json(j["config"]),
|
||||
)
|
||||
|
||||
|
||||
class VeilidLog:
|
||||
log_level: VeilidLogLevel
|
||||
message: str
|
||||
backtrace: Optional[str]
|
||||
|
||||
def __init__(self, log_level: VeilidLogLevel, message: str, backtrace: Optional[str]):
|
||||
def __init__(
|
||||
self, log_level: VeilidLogLevel, message: str, backtrace: Optional[str]
|
||||
):
|
||||
self.log_level = log_level
|
||||
self.message = message
|
||||
self.backtrace = backtrace
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidLog(
|
||||
VeilidLogLevel(j['log_level']),
|
||||
j['message'],
|
||||
j['backtrace'])
|
||||
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(VeilidLogLevel(j["log_level"]), j["message"], j["backtrace"])
|
||||
|
||||
|
||||
class VeilidAppMessage:
|
||||
sender: Optional[TypedKey]
|
||||
message: bytes
|
||||
|
||||
|
||||
def __init__(self, sender: Optional[TypedKey], message: bytes):
|
||||
self.sender = sender
|
||||
self.message = message
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidAppMessage(
|
||||
None if j['sender'] is None else TypedKey(j['sender']),
|
||||
urlsafe_b64decode_no_pad(j['message']))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
None if j["sender"] is None else TypedKey(j["sender"]),
|
||||
urlsafe_b64decode_no_pad(j["message"]),
|
||||
)
|
||||
|
||||
|
||||
class VeilidAppCall:
|
||||
sender: Optional[TypedKey]
|
||||
message: bytes
|
||||
call_id: str
|
||||
|
||||
|
||||
def __init__(self, sender: Optional[TypedKey], message: bytes, call_id: str):
|
||||
self.sender = sender
|
||||
self.message = message
|
||||
self.call_id = call_id
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidAppCall(
|
||||
None if j['sender'] is None else TypedKey(j['sender']),
|
||||
urlsafe_b64decode_no_pad(j['message']),
|
||||
j['call_id'])
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
None if j["sender"] is None else TypedKey(j["sender"]),
|
||||
urlsafe_b64decode_no_pad(j["message"]),
|
||||
j["call_id"],
|
||||
)
|
||||
|
||||
|
||||
class VeilidRouteChange:
|
||||
dead_routes: list[RouteId]
|
||||
@ -272,13 +333,15 @@ class VeilidRouteChange:
|
||||
def __init__(self, dead_routes: list[RouteId], dead_remote_routes: list[RouteId]):
|
||||
self.dead_routes = dead_routes
|
||||
self.dead_remote_routes = dead_remote_routes
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidRouteChange(
|
||||
list(map(lambda x: RouteId(x), j['dead_routes'])),
|
||||
list(map(lambda x: RouteId(x), j['dead_remote_routes'])))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
[RouteId(route) for route in j["dead_routes"]],
|
||||
[RouteId(route) for route in j["dead_remote_routes"]],
|
||||
)
|
||||
|
||||
|
||||
class VeilidValueChange:
|
||||
key: TypedKey
|
||||
@ -286,20 +349,23 @@ class VeilidValueChange:
|
||||
count: int
|
||||
value: ValueData
|
||||
|
||||
def __init__(self, key: TypedKey, subkeys: list[ValueSubkey], count: int, value: ValueData):
|
||||
def __init__(
|
||||
self, key: TypedKey, subkeys: list[ValueSubkey], count: int, value: ValueData
|
||||
):
|
||||
self.key = key
|
||||
self.subkeys = subkeys
|
||||
self.count = count
|
||||
self.value = value
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
return VeilidValueChange(
|
||||
TypedKey(j['key']),
|
||||
list(map(lambda x: ValueSubkey(x), j['subkeys'])),
|
||||
j['count'],
|
||||
ValueData.from_json(j['value']))
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
return cls(
|
||||
TypedKey(j["key"]),
|
||||
[ValueSubkey(key) for key in j["subkeys"]],
|
||||
j["count"],
|
||||
ValueData.from_json(j["value"]),
|
||||
)
|
||||
|
||||
|
||||
class VeilidUpdateKind(StrEnum):
|
||||
@ -313,19 +379,36 @@ class VeilidUpdateKind(StrEnum):
|
||||
VALUE_CHANGE = "ValueChange"
|
||||
SHUTDOWN = "Shutdown"
|
||||
|
||||
|
||||
VeilidUpdateDetailType = Optional[
|
||||
VeilidLog
|
||||
| VeilidAppMessage
|
||||
| VeilidAppCall
|
||||
| VeilidStateAttachment
|
||||
| VeilidStateNetwork
|
||||
| VeilidStateConfig
|
||||
| VeilidRouteChange
|
||||
| VeilidValueChange
|
||||
]
|
||||
|
||||
|
||||
class VeilidUpdate:
|
||||
kind: VeilidUpdateKind
|
||||
detail: Optional[VeilidLog | VeilidAppMessage | VeilidAppCall | VeilidStateAttachment | VeilidStateNetwork | VeilidStateConfig | VeilidRouteChange | VeilidValueChange]
|
||||
detail: VeilidUpdateDetailType
|
||||
|
||||
def __init__(self, kind: VeilidUpdateKind, detail: Optional[VeilidLog | VeilidAppMessage | VeilidAppCall | VeilidStateAttachment | VeilidStateNetwork | VeilidStateConfig | VeilidRouteChange | VeilidValueChange]):
|
||||
def __init__(
|
||||
self,
|
||||
kind: VeilidUpdateKind,
|
||||
detail: VeilidUpdateDetailType,
|
||||
):
|
||||
self.kind = kind
|
||||
self.detail = detail
|
||||
|
||||
@staticmethod
|
||||
def from_json(j: dict) -> Self:
|
||||
'''JSON object hook'''
|
||||
kind = VeilidUpdateKind(j['kind'])
|
||||
detail = None
|
||||
|
||||
@classmethod
|
||||
def from_json(cls, j: dict) -> Self:
|
||||
"""JSON object hook"""
|
||||
kind = VeilidUpdateKind(j["kind"])
|
||||
detail: VeilidUpdateDetailType = None
|
||||
match kind:
|
||||
case VeilidUpdateKind.LOG:
|
||||
detail = VeilidLog.from_json(j)
|
||||
@ -347,4 +430,4 @@ class VeilidUpdate:
|
||||
detail = None
|
||||
case _:
|
||||
raise ValueError("Unknown VeilidUpdateKind")
|
||||
return VeilidUpdate(kind, detail)
|
||||
return cls(kind, detail)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user