refactor(framework): Move version and date modules into flwr.supercore (#6323)

danieljanes · web-flow · commit 543385b66bf3 · 2025-12-26T21:06:57.000+01:00
diff --git a/framework/py/flwr/__init__.py b/framework/py/flwr/__init__.py
@@ -17,7 +17,7 @@
 
 import importlib
 
-from flwr.common.version import package_version as _package_version
+from flwr.supercore.version import package_version as _package_version
 
 from . import app, clientapp, serverapp
 
diff --git a/framework/py/flwr/cli/app.py b/framework/py/flwr/cli/app.py
@@ -17,7 +17,7 @@
 import typer
 from typer.main import get_command
 
-from flwr.common.version import package_version
+from flwr.supercore.version import package_version
 
 from .app_cmd import publish as app_publish
 from .app_cmd import review as app_review
diff --git a/framework/py/flwr/cli/app_cmd/publish.py b/framework/py/flwr/cli/app_cmd/publish.py
@@ -24,7 +24,6 @@
 from requests import Response
 
 from flwr.common.constant import FAB_CONFIG_FILE
-from flwr.common.version import package_version as flwr_version
 from flwr.supercore.constant import (
     APP_PUBLISH_EXCLUDE_PATTERNS,
     APP_PUBLISH_INCLUDE_PATTERNS,
@@ -36,6 +35,7 @@
     PLATFORM_API_URL,
     UTF8,
 )
+from flwr.supercore.version import package_version as flwr_version
 
 from ..auth_plugin.oidc_cli_plugin import OidcCliPlugin
 from ..config_utils import (
diff --git a/framework/py/flwr/cli/app_cmd/review.py b/framework/py/flwr/cli/app_cmd/review.py
@@ -29,14 +29,14 @@
 from flwr.common import now
 from flwr.common.config import get_flwr_dir
 from flwr.common.constant import FAB_CONFIG_FILE
-from flwr.common.version import package_version as flwr_version
 from flwr.supercore.constant import PLATFORM_API_URL
 from flwr.supercore.primitives.asymmetric_ed25519 import (
     create_message_to_sign,
     load_private_key,
     sign_message,
 )
 from flwr.supercore.utils import parse_app_spec, request_download_link
+from flwr.supercore.version import package_version as flwr_version
 
 from ..auth_plugin.oidc_cli_plugin import OidcCliPlugin
 from ..config_utils import (
diff --git a/framework/py/flwr/cli/cli_test.py b/framework/py/flwr/cli/cli_test.py
@@ -16,7 +16,7 @@
 
 from typer.testing import CliRunner
 
-from flwr.common.version import package_version
+from flwr.supercore.version import package_version
 
 from .app import app
 
diff --git a/framework/py/flwr/cli/run_utils.py b/framework/py/flwr/cli/run_utils.py
@@ -18,8 +18,8 @@
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 
-from flwr.common.date import isoformat8601_utc
 from flwr.common.typing import Run
+from flwr.supercore.date import isoformat8601_utc
 
 
 @dataclass
diff --git a/framework/py/flwr/cli/supernode/ls.py b/framework/py/flwr/cli/supernode/ls.py
@@ -33,14 +33,14 @@
     validate_federation_in_project_config,
 )
 from flwr.common.constant import FAB_CONFIG_FILE, NOOP_ACCOUNT_NAME, CliOutputFormat
-from flwr.common.date import isoformat8601_utc
 from flwr.common.logger import print_json_error, redirect_output, restore_output
 from flwr.proto.control_pb2 import (  # pylint: disable=E0611
     ListNodesRequest,
     ListNodesResponse,
 )
 from flwr.proto.control_pb2_grpc import ControlStub
 from flwr.proto.node_pb2 import NodeInfo  # pylint: disable=E0611
+from flwr.supercore.date import isoformat8601_utc
 from flwr.supercore.utils import humanize_duration
 
 from ..utils import flwr_cli_grpc_exc_handler, init_channel, load_cli_auth_plugin
diff --git a/framework/py/flwr/client/grpc_rere_client/grpc_adapter.py b/framework/py/flwr/client/grpc_rere_client/grpc_adapter.py
@@ -32,7 +32,6 @@
     GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY,
     GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY,
 )
-from flwr.common.version import package_name, package_version
 from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
     ActivateNodeRequest,
@@ -64,6 +63,7 @@
 )
 from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse  # pylint: disable=E0611
 from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS
+from flwr.supercore.version import package_name, package_version
 
 T = TypeVar("T", bound=GrpcMessage)
 
diff --git a/framework/py/flwr/common/__init__.py b/framework/py/flwr/common/__init__.py
@@ -17,10 +17,10 @@
 
 from ..app.error import Error as Error
 from ..app.metadata import Metadata as Metadata
+from ..supercore.date import now as now
 from .constant import MessageType as MessageType
 from .constant import MessageTypeLegacy as MessageTypeLegacy
 from .context import Context as Context
-from .date import now as now
 from .grpc import GRPC_MAX_MESSAGE_LENGTH
 from .logger import configure as configure
 from .logger import log as log
diff --git a/framework/py/flwr/common/exit/exit.py b/framework/py/flwr/common/exit/exit.py
@@ -23,8 +23,8 @@
 from typing import Any, NoReturn
 
 from flwr.common import EventType, event
-from flwr.common.version import package_version
 from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS
+from flwr.supercore.version import package_version
 
 from ..logger import log
 from .exit_code import EXIT_CODE_HELP
diff --git a/framework/py/flwr/common/message.py b/framework/py/flwr/common/message.py
@@ -20,11 +20,11 @@
 from logging import WARNING
 from typing import Any, cast, overload
 
-from flwr.common.date import now
 from flwr.common.logger import warn_deprecated_feature
 from flwr.proto.message_pb2 import Message as ProtoMessage  # pylint: disable=E0611
 from flwr.proto.message_pb2 import Metadata as ProtoMetadata  # pylint: disable=E0611
 from flwr.proto.message_pb2 import ObjectIDs  # pylint: disable=E0611
+from flwr.supercore.date import now
 
 from ..app.error import Error
 from ..app.metadata import Metadata
diff --git a/framework/py/flwr/common/message_test.py b/framework/py/flwr/common/message_test.py
@@ -27,9 +27,9 @@
 
 from ..app.error import Error
 from ..app.metadata import Metadata
+from ..supercore.date import now
 from . import ConfigRecord, RecordDict
 from .constant import MESSAGE_TTL_TOLERANCE
-from .date import now
 from .inflatable import (
     get_object_body,
     get_object_children_ids_from_object_content,
diff --git a/framework/py/flwr/common/serde_test.py b/framework/py/flwr/common/serde_test.py
@@ -23,7 +23,6 @@
 import pytest
 
 from flwr.common.constant import SUPERLINK_NODE_ID
-from flwr.common.date import now
 from flwr.common.message import make_message
 
 # pylint: disable=E0611
@@ -37,6 +36,7 @@
 from flwr.proto.recorddict_pb2 import MetricRecord as ProtoMetricRecord
 from flwr.proto.recorddict_pb2 import RecordDict as ProtoRecordDict
 from flwr.proto.run_pb2 import Run as ProtoRun
+from flwr.supercore.date import now
 
 from ..app.error import Error
 from ..app.metadata import Metadata
diff --git a/framework/py/flwr/common/telemetry.py b/framework/py/flwr/common/telemetry.py
@@ -28,7 +28,7 @@
 from typing import Any, cast
 
 from flwr.common.constant import FLWR_DIR
-from flwr.common.version import package_name, package_version
+from flwr.supercore.version import package_name, package_version
 
 FLWR_TELEMETRY_ENABLED = os.getenv("FLWR_TELEMETRY_ENABLED", "1")
 FLWR_TELEMETRY_LOGGING = os.getenv("FLWR_TELEMETRY_LOGGING", "0")
diff --git a/framework/py/flwr/server/app.py b/framework/py/flwr/server/app.py
@@ -58,7 +58,6 @@
 from flwr.common.exit import ExitCode, flwr_exit, register_signal_handlers
 from flwr.common.grpc import generic_create_grpc_server
 from flwr.common.logger import log
-from flwr.common.version import package_version
 from flwr.proto.fleet_pb2_grpc import (  # pylint: disable=E0611
     add_FleetServicer_to_server,
 )
@@ -68,6 +67,7 @@
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.grpc_health import add_args_health, run_health_server_grpc_no_tls
 from flwr.supercore.object_store import ObjectStoreFactory
+from flwr.supercore.version import package_version
 from flwr.superlink.artifact_provider import ArtifactProvider
 from flwr.superlink.auth_plugin import (
     ControlAuthnPlugin,
diff --git a/framework/py/flwr/server/superlink/fleet/grpc_adapter/grpc_adapter_servicer.py b/framework/py/flwr/server/superlink/fleet/grpc_adapter/grpc_adapter_servicer.py
@@ -30,7 +30,6 @@
     GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY,
 )
 from flwr.common.logger import log
-from flwr.common.version import package_name, package_version
 from flwr.proto import grpcadapter_pb2_grpc  # pylint: disable=E0611
 from flwr.proto.fab_pb2 import GetFabRequest  # pylint: disable=E0611
 from flwr.proto.fleet_pb2 import (  # pylint: disable=E0611
@@ -49,6 +48,7 @@
     PushObjectRequest,
 )
 from flwr.proto.run_pb2 import GetRunRequest  # pylint: disable=E0611
+from flwr.supercore.version import package_name, package_version
 
 from ..grpc_rere.fleet_servicer import FleetServicer
 
diff --git a/framework/py/flwr/server/superlink/serverappio/serverappio_servicer_test.py b/framework/py/flwr/server/superlink/serverappio/serverappio_servicer_test.py
@@ -29,7 +29,6 @@
     SUPERLINK_NODE_ID,
     Status,
 )
-from flwr.common.date import now
 from flwr.common.inflatable import (
     get_all_nested_objects,
     get_object_id,
@@ -85,6 +84,7 @@
 from flwr.server.superlink.serverappio.serverappio_servicer import _raise_if
 from flwr.server.superlink.utils import _STATUS_TO_MSG
 from flwr.supercore.constant import FLWR_IN_MEMORY_DB_NAME, NOOP_FEDERATION
+from flwr.supercore.date import now
 from flwr.supercore.ffs import FfsFactory
 from flwr.supercore.object_store import ObjectStoreFactory
 from flwr.superlink.federation import NoOpFederationManager
diff --git a/framework/py/flwr/server/utils/validator.py b/framework/py/flwr/server/utils/validator.py
@@ -17,7 +17,7 @@
 
 from flwr.common import Message
 from flwr.common.constant import SUPERLINK_NODE_ID
-from flwr.common.date import now
+from flwr.supercore.date import now
 
 
 # pylint: disable-next=too-many-branches
diff --git a/framework/py/flwr/supercore/date.py b/framework/py/flwr/supercore/date.py
@@ -23,17 +23,6 @@ def now() -> datetime.datetime:
     return datetime.datetime.now(tz=datetime.timezone.utc)
 
 
-def format_timedelta(td: datetime.timedelta) -> str:
-    """Format a timedelta as a string."""
-    days = td.days
-    hours, remainder = divmod(td.seconds, 3600)
-    minutes, seconds = divmod(remainder, 60)
-
-    if days > 0:
-        return f"{days}d {hours:02}:{minutes:02}:{seconds:02}"
-    return f"{hours:02}:{minutes:02}:{seconds:02}"
-
-
 def isoformat8601_utc(dt: datetime.datetime) -> str:
     """Return the datetime formatted as an ISO 8601 string with a trailing 'Z'."""
     if dt.tzinfo != datetime.timezone.utc:
diff --git a/framework/py/flwr/supercore/utils.py b/framework/py/flwr/supercore/utils.py
@@ -20,7 +20,7 @@
 
 import requests
 
-from flwr.common.version import package_version as flwr_version
+from flwr.supercore.version import package_version as flwr_version
 
 from .constant import APP_ID_PATTERN, APP_VERSION_PATTERN
 
diff --git a/framework/py/flwr/supercore/version.py b/framework/py/flwr/supercore/version.py
diff --git a/framework/py/flwr/supernode/start_client_internal.py b/framework/py/flwr/supernode/start_client_internal.py
@@ -63,7 +63,6 @@
 from flwr.common.retry_invoker import RetryInvoker, _make_simple_grpc_retry_invoker
 from flwr.common.telemetry import EventType
 from flwr.common.typing import Fab, Run, RunNotRunningException, UserConfig
-from flwr.common.version import package_version
 from flwr.proto.clientappio_pb2_grpc import add_ClientAppIoServicer_to_server
 from flwr.proto.message_pb2 import ObjectTree  # pylint: disable=E0611
 from flwr.supercore.ffs import Ffs, FfsFactory
@@ -74,6 +73,7 @@
     decode_base64url,
     verify_signature,
 )
+from flwr.supercore.version import package_version
 from flwr.supernode.nodestate import NodeState, NodeStateFactory
 from flwr.supernode.servicer.clientappio import ClientAppIoServicer
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`GRPC_ADAPTER_METADATA_MESSAGE_QUALNAME_KEY,`
`33`	`33`	`GRPC_ADAPTER_METADATA_SHOULD_EXIT_KEY,`
`34`	`34`	`)`
`35`		`-from flwr.common.version import package_name, package_version`
`36`	`35`	`from flwr.proto.fab_pb2 import GetFabRequest, GetFabResponse # pylint: disable=E0611`
`37`	`36`	`from flwr.proto.fleet_pb2 import ( # pylint: disable=E0611`
`38`	`37`	`ActivateNodeRequest,`
`@@ -64,6 +63,7 @@`
`64`	`63`	`)`
`65`	`64`	`from flwr.proto.run_pb2 import GetRunRequest, GetRunResponse # pylint: disable=E0611`
`66`	`65`	`from flwr.supercore.constant import FORCE_EXIT_TIMEOUT_SECONDS`
	`66`	`+from flwr.supercore.version import package_name, package_version`
`67`	`67`
`68`	`68`	`T = TypeVar("T", bound=GrpcMessage)`
`69`	`69`