format

adap · Sep 23, 2024 · 0eb8ad1 · 0eb8ad1
1 parent aeac5b1
commit 0eb8ad1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 30 deletions.
diff --git a/src/py/flwr/server/superlink/state/sqlite_state.py b/src/py/flwr/server/superlink/state/sqlite_state.py
@@ -27,11 +27,17 @@
 from flwr.common import log, now
 from flwr.common.constant import NODE_ID_NUM_BYTES, RUN_ID_NUM_BYTES, Status
 from flwr.common.typing import Run, RunStatus, UserConfig
-from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
-from flwr.proto.recordset_pb2 import RecordSet  # pylint: disable=E0611
-from flwr.proto.task_pb2 import Task, TaskIns, TaskRes  # pylint: disable=E0611
+from flwr.proto.task_pb2 import TaskIns, TaskRes  # pylint: disable=E0611
 from flwr.server.utils.validator import validate_task_ins_or_res
 
+from .sqlite_state_utils import (
+    determine_run_status,
+    dict_factory,
+    dict_to_task_ins,
+    dict_to_task_res,
+    task_ins_to_dict,
+    task_res_to_dict,
+)
 from .state import State
 from .utils import (
     convert_sint64_to_uint64,
@@ -43,7 +49,6 @@
     is_valid_transition,
     make_node_unavailable_taskres,
 )
-from .sqlite_state_utils import task_ins_to_dict, dict_to_task_ins, task_res_to_dict, dict_to_task_res, dict_factory, determine_run_status
 
 SQL_CREATE_TABLE_NODE = """
 CREATE TABLE IF NOT EXISTS node(
@@ -876,4 +881,3 @@ def acknowledge_ping(self, node_id: int, ping_interval: float) -> bool:
         except sqlite3.IntegrityError:
             log(ERROR, "`node_id` does not exist.")
             return False
-
diff --git a/src/py/flwr/server/superlink/state/sqlite_state_utils.py b/src/py/flwr/server/superlink/state/sqlite_state_utils.py
@@ -15,34 +15,15 @@
 """Utility functions for SQLite based implemenation of server state."""
 
 
-import json
-import re
 import sqlite3
-import time
-from collections.abc import Sequence
-from logging import DEBUG, ERROR
-from typing import Any, Optional, Union, cast
-from uuid import UUID, uuid4
-
-from flwr.common import log, now
-from flwr.common.constant import NODE_ID_NUM_BYTES, RUN_ID_NUM_BYTES, Status
-from flwr.common.typing import Run, RunStatus, UserConfig
+from typing import Any
+
+from flwr.common.constant import Status
 from flwr.proto.node_pb2 import Node  # pylint: disable=E0611
 from flwr.proto.recordset_pb2 import RecordSet  # pylint: disable=E0611
 from flwr.proto.task_pb2 import Task, TaskIns, TaskRes  # pylint: disable=E0611
-from flwr.server.utils.validator import validate_task_ins_or_res
-
-from .state import State
-from .utils import (
-    convert_sint64_to_uint64,
-    convert_sint64_values_in_dict_to_uint64,
-    convert_uint64_to_sint64,
-    convert_uint64_values_in_dict_to_sint64,
-    generate_rand_int_from_bytes,
-    has_valid_sub_status,
-    is_valid_transition,
-    make_node_unavailable_taskres,
-)
+
+from .utils import convert_sint64_to_uint64
 
 
 def dict_factory(

diff --git a/src/py/flwr/server/superlink/state/sqlite_state_utils_test.py b/src/py/flwr/server/superlink/state/sqlite_state_utils_test.py
@@ -17,7 +17,7 @@
 
 import unittest
 
-from flwr.server.superlink.state.sqlite_state import task_ins_to_dict
+from flwr.server.superlink.state.sqlite_state_utils import task_ins_to_dict
 from flwr.server.superlink.state.state_test import create_task_ins