From 9ef87026a030ad5b61a053292163acf0f3d3e485 Mon Sep 17 00:00:00 2001 From: Kirk Brauer Date: Sun, 26 Jan 2025 12:12:21 -0500 Subject: [PATCH] Fix import ordering --- .../jumpstarter_cli_admin/create.py | 3 +-- .../jumpstarter_cli_admin/create_test.py | 11 +++++------ .../jumpstarter_cli_admin/delete.py | 3 +-- .../jumpstarter_cli_admin/delete_test.py | 15 +++++++-------- .../jumpstarter_cli_admin/import_res.py | 11 +++++------ .../jumpstarter_cli_admin/import_res_test.py | 9 ++++----- .../jumpstarter_cli_client/__init__.py | 3 +-- .../jumpstarter_cli_client/client_config.py | 3 +-- .../jumpstarter_cli_client/client_shell.py | 1 - .../jumpstarter_cli_client/client_test.py | 1 - .../jumpstarter_cli_client/lease.py | 3 +-- .../jumpstarter_cli_exporter/exporter.py | 1 - .../jumpstarter_cli_exporter/exporter_config.py | 3 +-- .../jumpstarter_cli_exporter/exporter_test.py | 1 - .../jumpstarter_driver_can/client.py | 3 +-- .../jumpstarter_driver_can/client_test.py | 2 +- .../jumpstarter_driver_can/driver.py | 3 +-- .../jumpstarter_driver_composite/client.py | 1 - .../jumpstarter_driver_composite/driver.py | 3 +-- .../jumpstarter_driver_composite/driver_test.py | 3 +-- .../examples/dutlink.py | 3 +-- .../jumpstarter_driver_dutlink/driver.py | 3 +-- .../jumpstarter_driver_dutlink/driver_test.py | 2 +- .../jumpstarter_driver_http/client.py | 3 +-- .../jumpstarter_driver_http/driver.py | 1 - .../jumpstarter_driver_http/driver_test.py | 1 - .../adapters/fabric_test.py | 3 +-- .../adapters/novnc_test.py | 3 +-- .../jumpstarter_driver_network/driver.py | 1 - .../jumpstarter_driver_network/driver_test.py | 1 - .../jumpstarter_driver_opendal/adapter.py | 5 ++--- .../jumpstarter_driver_opendal/client.py | 3 +-- .../jumpstarter_driver_opendal/driver.py | 1 - .../jumpstarter_driver_opendal/driver_test.py | 3 +-- .../jumpstarter_driver_power/client.py | 1 - .../jumpstarter_driver_pyserial/client.py | 3 +-- .../jumpstarter_driver_pyserial/driver.py | 3 +-- .../jumpstarter_driver_raspberrypi/driver.py | 1 - .../jumpstarter_driver_raspberrypi/driver_test.py | 2 +- .../jumpstarter_driver_sdwire/driver.py | 3 +-- .../jumpstarter_driver_sdwire/driver_test.py | 2 +- .../jumpstarter_driver_tftp/client.py | 3 +-- .../jumpstarter_driver_tftp/driver.py | 2 +- .../jumpstarter_driver_tftp/driver_test.py | 2 +- .../jumpstarter_driver_ustreamer/client.py | 3 +-- .../jumpstarter_driver_ustreamer/driver.py | 1 - .../jumpstarter_driver_ustreamer/driver_test.py | 2 +- .../jumpstarter_imagehash/imagehash.py | 3 +-- .../jumpstarter_kubernetes/clients.py | 3 +-- .../jumpstarter_kubernetes/exporters.py | 3 +-- .../jumpstarter_testing/pytest.py | 1 - .../jumpstarter_testing/pytest_test.py | 5 ++--- packages/jumpstarter/conftest.py | 3 +-- packages/jumpstarter/jumpstarter/client/base.py | 3 +-- packages/jumpstarter/jumpstarter/client/client.py | 3 +-- packages/jumpstarter/jumpstarter/client/core.py | 3 +-- packages/jumpstarter/jumpstarter/client/lease.py | 3 +-- .../jumpstarter/jumpstarter/common/streams.py | 5 ++--- packages/jumpstarter/jumpstarter/common/utils.py | 1 - packages/jumpstarter/jumpstarter/config/client.py | 5 ++--- .../jumpstarter/config/client_config_test.py | 3 +-- .../jumpstarter/jumpstarter/config/exporter.py | 3 +-- .../jumpstarter/config/exporter_test.py | 1 - .../jumpstarter/config/user_config_test.py | 1 - packages/jumpstarter/jumpstarter/driver/base.py | 7 +++---- .../jumpstarter/jumpstarter/exporter/exporter.py | 9 ++++----- .../jumpstarter/jumpstarter/exporter/session.py | 9 ++++----- packages/jumpstarter/jumpstarter/listener_test.py | 3 +-- 68 files changed, 80 insertions(+), 141 deletions(-) diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py index d2fc864a..d5ebcf7a 100644 --- a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py +++ b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py @@ -2,6 +2,7 @@ from typing import Optional import asyncclick as click +from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1 from jumpstarter_cli_common import ( AliasedGroup, opt_context, @@ -13,8 +14,6 @@ from kubernetes_asyncio.client.exceptions import ApiException from kubernetes_asyncio.config.config_exception import ConfigException -from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1 - from .k8s import ( handle_k8s_api_exception, handle_k8s_config_exception, diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py index 1ccd5862..f7fd3ecf 100644 --- a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py +++ b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py @@ -3,6 +3,11 @@ import pytest from asyncclick.testing import CliRunner +from jumpstarter.config import ( + ClientConfigV1Alpha1, + ClientConfigV1Alpha1Drivers, + ExporterConfigV1Alpha1, +) from jumpstarter_kubernetes import ( ClientsV1Alpha1Api, ExportersV1Alpha1Api, @@ -13,12 +18,6 @@ ) from kubernetes_asyncio.client.models import V1ObjectMeta -from jumpstarter.config import ( - ClientConfigV1Alpha1, - ClientConfigV1Alpha1Drivers, - ExporterConfigV1Alpha1, -) - from .create import create # Generate a random client name diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py index dc0d55b4..3df7151f 100644 --- a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py +++ b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py @@ -2,6 +2,7 @@ from typing import Optional import asyncclick as click +from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1 from jumpstarter_cli_common import ( AliasedGroup, opt_context, @@ -13,8 +14,6 @@ from kubernetes_asyncio.client.exceptions import ApiException from kubernetes_asyncio.config.config_exception import ConfigException -from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1 - from .k8s import ( handle_k8s_api_exception, handle_k8s_config_exception, diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py index bba248db..52196690 100644 --- a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py +++ b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py @@ -2,14 +2,6 @@ import pytest from asyncclick.testing import CliRunner -from jumpstarter_kubernetes import ( - ClientsV1Alpha1Api, - ExportersV1Alpha1Api, - V1Alpha1Exporter, - V1Alpha1ExporterStatus, -) -from kubernetes_asyncio.client.models import V1ObjectMeta - from jumpstarter.config import ( ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, @@ -17,6 +9,13 @@ UserConfigV1Alpha1, UserConfigV1Alpha1Config, ) +from jumpstarter_kubernetes import ( + ClientsV1Alpha1Api, + ExportersV1Alpha1Api, + V1Alpha1Exporter, + V1Alpha1ExporterStatus, +) +from kubernetes_asyncio.client.models import V1ObjectMeta from .delete import delete diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py index 0ab62c33..10dd4aa8 100644 --- a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py +++ b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py @@ -1,6 +1,11 @@ from typing import Optional import asyncclick as click +from jumpstarter.config import ( + ClientConfigV1Alpha1, + UserConfigV1Alpha1, +) +from jumpstarter.config.exporter import ExporterConfigV1Alpha1 from jumpstarter_cli_common import ( opt_context, opt_kubeconfig, @@ -10,12 +15,6 @@ from kubernetes_asyncio.client.exceptions import ApiException from kubernetes_asyncio.config.config_exception import ConfigException -from jumpstarter.config import ( - ClientConfigV1Alpha1, - UserConfigV1Alpha1, -) -from jumpstarter.config.exporter import ExporterConfigV1Alpha1 - from .k8s import ( handle_k8s_api_exception, handle_k8s_config_exception, diff --git a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py index c124b5d9..da977d81 100644 --- a/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py +++ b/packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py @@ -3,16 +3,15 @@ import pytest from asyncclick.testing import CliRunner -from jumpstarter_kubernetes import ( - ClientsV1Alpha1Api, - ExportersV1Alpha1Api, -) - from jumpstarter.config import ( ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, ExporterConfigV1Alpha1, ) +from jumpstarter_kubernetes import ( + ClientsV1Alpha1Api, + ExportersV1Alpha1Api, +) from .import_res import import_res diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py index 35f0215a..4dfdb81c 100644 --- a/packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py +++ b/packages/jumpstarter-cli-client/jumpstarter_cli_client/__init__.py @@ -2,9 +2,8 @@ from typing import Optional import asyncclick as click -from jumpstarter_cli_common import AliasedGroup, opt_log_level, version - from jumpstarter.common.utils import env +from jumpstarter_cli_common import AliasedGroup, opt_log_level, version from .client_config import create_client_config, delete_client_config, list_client_configs, use_client_config from .client_shell import client_shell diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py index 5a08aa25..bed794ea 100644 --- a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py +++ b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_config.py @@ -1,9 +1,8 @@ from typing import Optional import asyncclick as click -from jumpstarter_cli_common import make_table - from jumpstarter.config import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, UserConfigV1Alpha1 +from jumpstarter_cli_common import make_table @click.command("create-config", short_help="Create a client config.") diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py index ec5c1185..fc1eb856 100644 --- a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py +++ b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_shell.py @@ -1,5 +1,4 @@ import asyncclick as click - from jumpstarter.common import MetadataFilter from jumpstarter.common.utils import launch_shell from jumpstarter.config import ( diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py index e717a84b..1440e5ad 100644 --- a/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py +++ b/packages/jumpstarter-cli-client/jumpstarter_cli_client/client_test.py @@ -1,6 +1,5 @@ import pytest from asyncclick.testing import CliRunner - from jumpstarter.config import ClientConfigV1Alpha1, UserConfigV1Alpha1 from . import client diff --git a/packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py b/packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py index 7f20e7c9..cbff1274 100644 --- a/packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py +++ b/packages/jumpstarter-cli-client/jumpstarter_cli_client/lease.py @@ -1,11 +1,10 @@ import asyncclick as click -from jumpstarter_cli_common import AliasedGroup - from jumpstarter.common import MetadataFilter from jumpstarter.config import ( ClientConfigV1Alpha1, UserConfigV1Alpha1, ) +from jumpstarter_cli_common import AliasedGroup @click.group(cls=AliasedGroup, short_help="") diff --git a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py index e35b8cdf..870ac78b 100644 --- a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py +++ b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter.py @@ -3,7 +3,6 @@ from pathlib import Path import asyncclick as click - from jumpstarter.common.utils import launch_shell from jumpstarter.config.exporter import ExporterConfigV1Alpha1 diff --git a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py index 6283f609..074ec266 100644 --- a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py +++ b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_config.py @@ -1,7 +1,6 @@ import asyncclick as click -from jumpstarter_cli_common import make_table - from jumpstarter.config.exporter import ExporterConfigV1Alpha1 +from jumpstarter_cli_common import make_table arg_alias = click.argument("alias", default="default") diff --git a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py index 473337db..f3824fd2 100644 --- a/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py +++ b/packages/jumpstarter-cli-exporter/jumpstarter_cli_exporter/exporter_test.py @@ -1,6 +1,5 @@ import pytest from asyncclick.testing import CliRunner - from jumpstarter.config.exporter import ExporterConfigV1Alpha1 from . import exporter diff --git a/packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py b/packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py index 3555ec0c..bf86a2b3 100644 --- a/packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py +++ b/packages/jumpstarter-driver-can/jumpstarter_driver_can/client.py @@ -8,9 +8,8 @@ import can import isotp from can.bus import _SelfRemovingCyclicTask -from pydantic import ConfigDict, validate_call - from jumpstarter.client import DriverClient +from pydantic import ConfigDict, validate_call from .common import CanMessage, IsoTpAddress, IsoTpAsymmetricAddress, IsoTpMessage diff --git a/packages/jumpstarter-driver-can/jumpstarter_driver_can/client_test.py b/packages/jumpstarter-driver-can/jumpstarter_driver_can/client_test.py index fe73e8d0..88c130af 100644 --- a/packages/jumpstarter-driver-can/jumpstarter_driver_can/client_test.py +++ b/packages/jumpstarter-driver-can/jumpstarter_driver_can/client_test.py @@ -6,8 +6,8 @@ import can import isotp import pytest - from jumpstarter.common.utils import serve + from jumpstarter_driver_can.common import IsoTpParams from jumpstarter_driver_can.driver import Can, IsoTpPython, IsoTpSocket diff --git a/packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py b/packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py index 177d341e..96f2c06e 100644 --- a/packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py +++ b/packages/jumpstarter-driver-can/jumpstarter_driver_can/driver.py @@ -4,11 +4,10 @@ import can import isotp +from jumpstarter.driver import Driver, export from pydantic import ConfigDict, validate_call from pydantic.dataclasses import dataclass -from jumpstarter.driver import Driver, export - from .common import CanMessage, IsoTpAddress, IsoTpAsymmetricAddress, IsoTpMessage, IsoTpParams diff --git a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py index fed7d169..273e0434 100644 --- a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py +++ b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/client.py @@ -1,7 +1,6 @@ from dataclasses import dataclass import asyncclick as click - from jumpstarter.client import DriverClient diff --git a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py index 5a8f6699..438ce317 100644 --- a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py +++ b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver.py @@ -1,6 +1,5 @@ -from pydantic.dataclasses import dataclass - from jumpstarter.driver import Driver +from pydantic.dataclasses import dataclass class CompositeInterface: diff --git a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py index 03f4fb58..b2adf6d0 100644 --- a/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py +++ b/packages/jumpstarter-driver-composite/jumpstarter_driver_composite/driver_test.py @@ -1,6 +1,5 @@ -from jumpstarter_driver_power.driver import MockPower - from jumpstarter.common.utils import serve +from jumpstarter_driver_power.driver import MockPower from .driver import Composite diff --git a/packages/jumpstarter-driver-dutlink/examples/dutlink.py b/packages/jumpstarter-driver-dutlink/examples/dutlink.py index dc2fea04..b04840f4 100755 --- a/packages/jumpstarter-driver-dutlink/examples/dutlink.py +++ b/packages/jumpstarter-driver-dutlink/examples/dutlink.py @@ -3,9 +3,8 @@ import time import asyncclick as click -from jumpstarter_driver_network.adapters import PexpectAdapter - from jumpstarter.common.utils import env +from jumpstarter_driver_network.adapters import PexpectAdapter # initialize client from exporter config # from jumpstarter.common import MetadataFilter diff --git a/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py b/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py index 17068e9c..b8210de5 100644 --- a/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py +++ b/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver.py @@ -11,14 +11,13 @@ import usb.util from anyio import fail_after, sleep from anyio.streams.file import FileReadStream, FileWriteStream +from jumpstarter.driver import Driver, export from jumpstarter_driver_composite.driver import CompositeInterface from jumpstarter_driver_opendal.driver import StorageMuxInterface from jumpstarter_driver_power.driver import PowerInterface, PowerReading from jumpstarter_driver_pyserial.driver import PySerial from serial.serialutil import SerialException -from jumpstarter.driver import Driver, export - log = logging.getLogger(__name__) diff --git a/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py b/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py index 18c82ae0..efab289d 100644 --- a/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py +++ b/packages/jumpstarter-driver-dutlink/jumpstarter_driver_dutlink/driver_test.py @@ -1,8 +1,8 @@ import pytest import usb +from jumpstarter.common.utils import serve from jumpstarter_driver_network.adapters import PexpectAdapter -from jumpstarter.common.utils import serve from jumpstarter_driver_dutlink.driver import Dutlink diff --git a/packages/jumpstarter-driver-http/jumpstarter_driver_http/client.py b/packages/jumpstarter-driver-http/jumpstarter_driver_http/client.py index e541f3a9..cf68516e 100644 --- a/packages/jumpstarter-driver-http/jumpstarter_driver_http/client.py +++ b/packages/jumpstarter-driver-http/jumpstarter_driver_http/client.py @@ -1,11 +1,10 @@ from dataclasses import dataclass from pathlib import Path +from jumpstarter.client import DriverClient from jumpstarter_driver_opendal.adapter import OpendalAdapter from opendal import Operator -from jumpstarter.client import DriverClient - @dataclass(kw_only=True) class HttpServerClient(DriverClient): diff --git a/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py b/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py index 5b7774aa..08ba2030 100644 --- a/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py +++ b/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver.py @@ -7,7 +7,6 @@ import anyio from aiohttp import web from anyio.streams.file import FileWriteStream - from jumpstarter.driver import Driver, export logger = logging.getLogger(__name__) diff --git a/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver_test.py b/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver_test.py index 7a221544..519fce79 100644 --- a/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver_test.py +++ b/packages/jumpstarter-driver-http/jumpstarter_driver_http/driver_test.py @@ -6,7 +6,6 @@ import anyio import pytest from anyio import create_memory_object_stream - from jumpstarter.common.resources import ClientStreamResource from .driver import HttpServer diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/fabric_test.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/fabric_test.py index 12d47875..6845e257 100644 --- a/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/fabric_test.py +++ b/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/fabric_test.py @@ -2,11 +2,10 @@ from threading import Thread from time import sleep +from jumpstarter.common.utils import serve from paramiko import AUTH_SUCCESSFUL, OPEN_SUCCEEDED, ServerInterface, Transport from paramiko.rsakey import RSAKey -from jumpstarter.common.utils import serve - from ..driver import TcpNetwork from .fabric import FabricAdapter diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/novnc_test.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/novnc_test.py index 7f84c9d0..f3b5deaa 100644 --- a/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/novnc_test.py +++ b/packages/jumpstarter-driver-network/jumpstarter_driver_network/adapters/novnc_test.py @@ -2,10 +2,9 @@ from urllib.parse import parse_qsl, urlparse from anyio.from_thread import start_blocking_portal -from websocket import create_connection - from jumpstarter.common import TemporaryTcpListener from jumpstarter.common.utils import serve +from websocket import create_connection from ..driver import TcpNetwork from .novnc import NovncAdapter diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver.py index 8b7e64ce..8b2293ef 100644 --- a/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver.py +++ b/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver.py @@ -10,7 +10,6 @@ create_memory_object_stream, ) from anyio.streams.stapled import StapledObjectStream - from jumpstarter.driver import Driver, exportstream logger = logging.getLogger(__name__) diff --git a/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver_test.py b/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver_test.py index 7dbe04ec..647e229b 100644 --- a/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver_test.py +++ b/packages/jumpstarter-driver-network/jumpstarter_driver_network/driver_test.py @@ -5,7 +5,6 @@ import pytest from anyio.from_thread import start_blocking_portal - from jumpstarter.common import TemporaryTcpListener, TemporaryUnixListener from jumpstarter.common.utils import serve diff --git a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/adapter.py b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/adapter.py index 1dde1034..a94be794 100644 --- a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/adapter.py +++ b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/adapter.py @@ -4,11 +4,10 @@ from anyio import BrokenResourceError, EndOfStream from anyio.abc import ObjectStream -from opendal import AsyncFile, Operator -from opendal.exceptions import Error - from jumpstarter.client.adapters import ClientAdapter from jumpstarter.common.resources import PresignedRequestResource +from opendal import AsyncFile, Operator +from opendal.exceptions import Error @dataclass(frozen=True, kw_only=True, slots=True) diff --git a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/client.py b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/client.py index 5905b453..261a8606 100644 --- a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/client.py +++ b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/client.py @@ -1,9 +1,8 @@ from pathlib import Path import asyncclick as click -from opendal import Operator - from jumpstarter.client import DriverClient +from opendal import Operator from .adapter import OpendalAdapter diff --git a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver.py b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver.py index 0b2f1793..47d36f19 100644 --- a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver.py +++ b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver.py @@ -3,7 +3,6 @@ from tempfile import NamedTemporaryFile from anyio.streams.file import FileReadStream, FileWriteStream - from jumpstarter.driver import Driver, export diff --git a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver_test.py b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver_test.py index 1b053631..90221b44 100644 --- a/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver_test.py +++ b/packages/jumpstarter-driver-opendal/jumpstarter_driver_opendal/driver_test.py @@ -5,9 +5,8 @@ from threading import Thread import pytest -from opendal import Operator - from jumpstarter.common.utils import serve +from opendal import Operator from .driver import MockStorageMux diff --git a/packages/jumpstarter-driver-power/jumpstarter_driver_power/client.py b/packages/jumpstarter-driver-power/jumpstarter_driver_power/client.py index f9aa897d..be200377 100644 --- a/packages/jumpstarter-driver-power/jumpstarter_driver_power/client.py +++ b/packages/jumpstarter-driver-power/jumpstarter_driver_power/client.py @@ -1,7 +1,6 @@ from collections.abc import Generator import asyncclick as click - from jumpstarter.client import DriverClient from .common import PowerReading diff --git a/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/client.py b/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/client.py index c0080db7..f6640cc4 100644 --- a/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/client.py +++ b/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/client.py @@ -1,11 +1,10 @@ from contextlib import contextmanager import asyncclick as click +from jumpstarter.client import DriverClient from jumpstarter_driver_network.adapters import PexpectAdapter from pexpect.fdpexpect import fdspawn -from jumpstarter.client import DriverClient - from .console import Console diff --git a/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py b/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py index 67505d14..69d4d0f8 100644 --- a/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py +++ b/packages/jumpstarter-driver-pyserial/jumpstarter_driver_pyserial/driver.py @@ -4,9 +4,8 @@ from anyio.abc import ObjectStream from anyio.to_thread import run_sync -from serial import Serial, serial_for_url - from jumpstarter.driver import Driver, exportstream +from serial import Serial, serial_for_url log = logging.getLogger(__name__) diff --git a/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver.py b/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver.py index 20c4a0cb..1e86d525 100644 --- a/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver.py +++ b/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver.py @@ -1,7 +1,6 @@ from dataclasses import dataclass, field from gpiozero import DigitalInputDevice, DigitalOutputDevice, InputDevice - from jumpstarter.driver import Driver, export diff --git a/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver_test.py b/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver_test.py index de71d989..a933ac17 100644 --- a/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver_test.py +++ b/packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/driver_test.py @@ -2,8 +2,8 @@ from gpiozero import Device from gpiozero.pins.mock import MockFactory - from jumpstarter.common.utils import serve + from jumpstarter_driver_raspberrypi.driver import DigitalInput, DigitalOutput Device.pin_factory = MockFactory() diff --git a/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver.py b/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver.py index f7c6d826..ad5d9441 100644 --- a/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver.py +++ b/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver.py @@ -8,9 +8,8 @@ import usb.util from anyio import fail_after, sleep from anyio.streams.file import FileReadStream, FileWriteStream -from jumpstarter_driver_opendal.driver import StorageMuxInterface - from jumpstarter.driver import Driver, export +from jumpstarter_driver_opendal.driver import StorageMuxInterface @dataclass(kw_only=True) diff --git a/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver_test.py b/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver_test.py index d6d9c9ae..8f4434d0 100644 --- a/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver_test.py +++ b/packages/jumpstarter-driver-sdwire/jumpstarter_driver_sdwire/driver_test.py @@ -1,7 +1,7 @@ import pytest import usb - from jumpstarter.common.utils import serve + from jumpstarter_driver_sdwire.driver import SDWire diff --git a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/client.py b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/client.py index cc22910c..06c009c6 100644 --- a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/client.py +++ b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/client.py @@ -1,11 +1,10 @@ from dataclasses import dataclass from pathlib import Path +from jumpstarter.client import DriverClient from jumpstarter_driver_opendal.adapter import OpendalAdapter from opendal import Operator -from jumpstarter.client import DriverClient - @dataclass(kw_only=True) class TftpServerClient(DriverClient): diff --git a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py index 465d5d0e..2c917d59 100644 --- a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py +++ b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver.py @@ -8,8 +8,8 @@ from typing import Optional from anyio.streams.file import FileWriteStream - from jumpstarter.driver import Driver, export + from jumpstarter_driver_tftp.server import TftpServer logger = logging.getLogger(__name__) diff --git a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver_test.py b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver_test.py index 733130cc..196cdb4b 100644 --- a/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver_test.py +++ b/packages/jumpstarter-driver-tftp/jumpstarter_driver_tftp/driver_test.py @@ -6,8 +6,8 @@ import anyio import pytest from anyio import create_memory_object_stream - from jumpstarter.common.resources import ClientStreamResource + from jumpstarter_driver_tftp.driver import ( FileNotFound, Tftp, diff --git a/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/client.py b/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/client.py index 7f40da8e..e2e8f510 100644 --- a/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/client.py +++ b/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/client.py @@ -2,9 +2,8 @@ import logging from base64 import b64decode -from PIL import Image - from jumpstarter.client import DriverClient +from PIL import Image from .common import UStreamerState diff --git a/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver.py b/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver.py index e0a62098..24f21d72 100644 --- a/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver.py +++ b/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver.py @@ -10,7 +10,6 @@ from aiohttp import ClientSession, UnixConnector from anyio import connect_unix - from jumpstarter.driver import Driver, export, exportstream from .common import UStreamerState diff --git a/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver_test.py b/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver_test.py index 7cbda285..de52cd3b 100644 --- a/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver_test.py +++ b/packages/jumpstarter-driver-ustreamer/jumpstarter_driver_ustreamer/driver_test.py @@ -1,6 +1,6 @@ import pytest - from jumpstarter.common.utils import serve + from jumpstarter_driver_ustreamer.driver import UStreamer diff --git a/packages/jumpstarter-imagehash/jumpstarter_imagehash/imagehash.py b/packages/jumpstarter-imagehash/jumpstarter_imagehash/imagehash.py index 3e5e394c..e7b74711 100644 --- a/packages/jumpstarter-imagehash/jumpstarter_imagehash/imagehash.py +++ b/packages/jumpstarter-imagehash/jumpstarter_imagehash/imagehash.py @@ -5,9 +5,8 @@ from typing import Any import imagehash -from PIL import Image - from jumpstarter.client import DriverClient +from PIL import Image log = logging.getLogger("imagehash") diff --git a/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/clients.py b/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/clients.py index cd3d69e3..34d80f35 100644 --- a/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/clients.py +++ b/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/clients.py @@ -4,9 +4,8 @@ from dataclasses import dataclass from typing import Literal, Optional -from kubernetes_asyncio.client.models import V1ObjectMeta, V1ObjectReference - from jumpstarter.config import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers +from kubernetes_asyncio.client.models import V1ObjectMeta, V1ObjectReference from .util import AbstractAsyncCustomObjectApi diff --git a/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/exporters.py b/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/exporters.py index 27b115e2..ff23bb21 100644 --- a/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/exporters.py +++ b/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/exporters.py @@ -3,9 +3,8 @@ from dataclasses import dataclass from typing import Literal -from kubernetes_asyncio.client.models import V1ObjectMeta, V1ObjectReference - from jumpstarter.config import ExporterConfigV1Alpha1 +from kubernetes_asyncio.client.models import V1ObjectMeta, V1ObjectReference from .util import AbstractAsyncCustomObjectApi diff --git a/packages/jumpstarter-testing/jumpstarter_testing/pytest.py b/packages/jumpstarter-testing/jumpstarter_testing/pytest.py index 7d3908c8..512abcd1 100644 --- a/packages/jumpstarter-testing/jumpstarter_testing/pytest.py +++ b/packages/jumpstarter-testing/jumpstarter_testing/pytest.py @@ -3,7 +3,6 @@ from typing import ClassVar import pytest - from jumpstarter.common import MetadataFilter from jumpstarter.common.utils import env from jumpstarter.config.client import ClientConfigV1Alpha1 diff --git a/packages/jumpstarter-testing/jumpstarter_testing/pytest_test.py b/packages/jumpstarter-testing/jumpstarter_testing/pytest_test.py index b026ec5d..60be99a0 100644 --- a/packages/jumpstarter-testing/jumpstarter_testing/pytest_test.py +++ b/packages/jumpstarter-testing/jumpstarter_testing/pytest_test.py @@ -1,8 +1,7 @@ -from jumpstarter_driver_power.driver import MockPower -from pytest import Pytester - from jumpstarter.config.env import JMP_DRIVERS_ALLOW, JUMPSTARTER_HOST from jumpstarter.exporter import Session +from jumpstarter_driver_power.driver import MockPower +from pytest import Pytester def test_env(pytester: Pytester, monkeypatch): diff --git a/packages/jumpstarter/conftest.py b/packages/jumpstarter/conftest.py index 91a57bc3..159b28ab 100644 --- a/packages/jumpstarter/conftest.py +++ b/packages/jumpstarter/conftest.py @@ -14,6 +14,7 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes, serialization from cryptography.hazmat.primitives.asymmetric import rsa +from jumpstarter.streams import RouterStream, forward_stream from jumpstarter_protocol import ( jumpstarter_pb2, jumpstarter_pb2_grpc, @@ -21,8 +22,6 @@ router_pb2_grpc, ) -from jumpstarter.streams import RouterStream, forward_stream - @dataclass(kw_only=True) class MockRouter(router_pb2_grpc.RouterServiceServicer): diff --git a/packages/jumpstarter/jumpstarter/client/base.py b/packages/jumpstarter/jumpstarter/client/base.py index 5b4e7cfd..22f23644 100644 --- a/packages/jumpstarter/jumpstarter/client/base.py +++ b/packages/jumpstarter/jumpstarter/client/base.py @@ -8,11 +8,10 @@ from dataclasses import field from anyio.from_thread import BlockingPortal +from jumpstarter.streams import BlockingStream from pydantic import ConfigDict from pydantic.dataclasses import dataclass -from jumpstarter.streams import BlockingStream - from .core import AsyncDriverClient diff --git a/packages/jumpstarter/jumpstarter/client/client.py b/packages/jumpstarter/jumpstarter/client/client.py index 87aabf6b..64730330 100644 --- a/packages/jumpstarter/jumpstarter/client/client.py +++ b/packages/jumpstarter/jumpstarter/client/client.py @@ -6,10 +6,9 @@ import grpc from anyio.from_thread import BlockingPortal from google.protobuf import empty_pb2 -from jumpstarter_protocol import jumpstarter_pb2_grpc - from jumpstarter.client import DriverClient from jumpstarter.common.importlib import import_class +from jumpstarter_protocol import jumpstarter_pb2_grpc @asynccontextmanager diff --git a/packages/jumpstarter/jumpstarter/client/core.py b/packages/jumpstarter/jumpstarter/client/core.py index 193d1e49..f7deaae5 100644 --- a/packages/jumpstarter/jumpstarter/client/core.py +++ b/packages/jumpstarter/jumpstarter/client/core.py @@ -7,8 +7,6 @@ from grpc import StatusCode from grpc.aio import AioRpcError, Channel -from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc, router_pb2_grpc - from jumpstarter.common import Metadata from jumpstarter.common.resources import ResourceMetadata from jumpstarter.common.serde import decode_value, encode_value @@ -24,6 +22,7 @@ RouterStream, forward_stream, ) +from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc, router_pb2_grpc @dataclass(kw_only=True) diff --git a/packages/jumpstarter/jumpstarter/client/lease.py b/packages/jumpstarter/jumpstarter/client/lease.py index d7f66d49..3a3f96e4 100644 --- a/packages/jumpstarter/jumpstarter/client/lease.py +++ b/packages/jumpstarter/jumpstarter/client/lease.py @@ -6,13 +6,12 @@ from anyio.from_thread import BlockingPortal from google.protobuf import duration_pb2 from grpc.aio import Channel -from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc, kubernetes_pb2 - from jumpstarter.client import client_from_path from jumpstarter.common import MetadataFilter, TemporaryUnixListener from jumpstarter.common.condition import condition_false, condition_present_and_equal, condition_true from jumpstarter.common.streams import connect_router_stream from jumpstarter.config.tls import TLSConfigV1Alpha1 +from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc, kubernetes_pb2 logger = logging.getLogger(__name__) diff --git a/packages/jumpstarter/jumpstarter/common/streams.py b/packages/jumpstarter/jumpstarter/common/streams.py index d1fa265d..e2a9db6a 100644 --- a/packages/jumpstarter/jumpstarter/common/streams.py +++ b/packages/jumpstarter/jumpstarter/common/streams.py @@ -3,11 +3,10 @@ from uuid import UUID import grpc -from jumpstarter_protocol.jumpstarter.v1 import router_pb2_grpc -from pydantic import BaseModel, Field, Json - from jumpstarter.common.grpc import aio_secure_channel, ssl_channel_credentials from jumpstarter.streams import RouterStream, forward_stream +from jumpstarter_protocol.jumpstarter.v1 import router_pb2_grpc +from pydantic import BaseModel, Field, Json class ResourceStreamRequest(BaseModel): diff --git a/packages/jumpstarter/jumpstarter/common/utils.py b/packages/jumpstarter/jumpstarter/common/utils.py index d9908e0a..20e91c46 100644 --- a/packages/jumpstarter/jumpstarter/common/utils.py +++ b/packages/jumpstarter/jumpstarter/common/utils.py @@ -4,7 +4,6 @@ from subprocess import Popen from anyio.from_thread import BlockingPortal, start_blocking_portal - from jumpstarter.client import client_from_path from jumpstarter.config.client import _allow_from_env from jumpstarter.config.env import JMP_DRIVERS_ALLOW, JUMPSTARTER_HOST diff --git a/packages/jumpstarter/jumpstarter/config/client.py b/packages/jumpstarter/jumpstarter/config/client.py index 6e8594e1..633d36ad 100644 --- a/packages/jumpstarter/jumpstarter/config/client.py +++ b/packages/jumpstarter/jumpstarter/config/client.py @@ -6,11 +6,10 @@ import grpc import yaml from anyio.from_thread import BlockingPortal, start_blocking_portal -from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc -from pydantic import BaseModel, Field, ValidationError - from jumpstarter.common import MetadataFilter from jumpstarter.common.grpc import aio_secure_channel, ssl_channel_credentials +from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc +from pydantic import BaseModel, Field, ValidationError from .common import CONFIG_PATH from .env import JMP_DRIVERS_ALLOW, JMP_ENDPOINT, JMP_LEASE, JMP_TOKEN diff --git a/packages/jumpstarter/jumpstarter/config/client_config_test.py b/packages/jumpstarter/jumpstarter/config/client_config_test.py index fbdc1e9a..32587347 100644 --- a/packages/jumpstarter/jumpstarter/config/client_config_test.py +++ b/packages/jumpstarter/jumpstarter/config/client_config_test.py @@ -5,13 +5,12 @@ import pytest import yaml -from pydantic import ValidationError - from jumpstarter.config import ( ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, ) from jumpstarter.config.env import JMP_DRIVERS_ALLOW, JMP_ENDPOINT, JMP_TOKEN +from pydantic import ValidationError def test_client_ensure_exists_makes_dir(monkeypatch: pytest.MonkeyPatch): diff --git a/packages/jumpstarter/jumpstarter/config/exporter.py b/packages/jumpstarter/jumpstarter/config/exporter.py index 46a4a241..a241d81d 100644 --- a/packages/jumpstarter/jumpstarter/config/exporter.py +++ b/packages/jumpstarter/jumpstarter/config/exporter.py @@ -7,11 +7,10 @@ import grpc import yaml from anyio.from_thread import start_blocking_portal -from pydantic import BaseModel, Field - from jumpstarter.common.grpc import aio_secure_channel, ssl_channel_credentials from jumpstarter.common.importlib import import_class from jumpstarter.driver import Driver +from pydantic import BaseModel, Field from .tls import TLSConfigV1Alpha1 diff --git a/packages/jumpstarter/jumpstarter/config/exporter_test.py b/packages/jumpstarter/jumpstarter/config/exporter_test.py index df0577f7..92e00319 100644 --- a/packages/jumpstarter/jumpstarter/config/exporter_test.py +++ b/packages/jumpstarter/jumpstarter/config/exporter_test.py @@ -3,7 +3,6 @@ import pytest from anyio import create_task_group from anyio.from_thread import start_blocking_portal - from jumpstarter.common import MetadataFilter from .client import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers diff --git a/packages/jumpstarter/jumpstarter/config/user_config_test.py b/packages/jumpstarter/jumpstarter/config/user_config_test.py index d7daa9d0..2504ab94 100644 --- a/packages/jumpstarter/jumpstarter/config/user_config_test.py +++ b/packages/jumpstarter/jumpstarter/config/user_config_test.py @@ -3,7 +3,6 @@ from unittest.mock import patch import pytest - from jumpstarter.config import ( ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, diff --git a/packages/jumpstarter/jumpstarter/driver/base.py b/packages/jumpstarter/jumpstarter/driver/base.py index b425b624..712b21a1 100644 --- a/packages/jumpstarter/jumpstarter/driver/base.py +++ b/packages/jumpstarter/jumpstarter/driver/base.py @@ -15,10 +15,6 @@ import aiohttp from anyio import to_thread from grpc import StatusCode -from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc, router_pb2_grpc -from pydantic import TypeAdapter -from pydantic.dataclasses import dataclass - from jumpstarter.common import Metadata from jumpstarter.common.resources import ClientStreamResource, PresignedRequestResource, Resource, ResourceMetadata from jumpstarter.common.serde import decode_value, encode_value @@ -27,6 +23,9 @@ ResourceStreamRequest, ) from jumpstarter.streams import AiohttpStreamReaderStream, MetadataStream, create_memory_stream +from jumpstarter_protocol import jumpstarter_pb2, jumpstarter_pb2_grpc, router_pb2_grpc +from pydantic import TypeAdapter +from pydantic.dataclasses import dataclass from .decorators import ( MARKER_DRIVERCALL, diff --git a/packages/jumpstarter/jumpstarter/exporter/exporter.py b/packages/jumpstarter/jumpstarter/exporter/exporter.py index ff3963d3..1420215c 100644 --- a/packages/jumpstarter/jumpstarter/exporter/exporter.py +++ b/packages/jumpstarter/jumpstarter/exporter/exporter.py @@ -6,16 +6,15 @@ import grpc from anyio import connect_unix, create_task_group from google.protobuf import empty_pb2 -from jumpstarter_protocol import ( - jumpstarter_pb2, - jumpstarter_pb2_grpc, -) - from jumpstarter.common import Metadata from jumpstarter.common.streams import connect_router_stream from jumpstarter.config.tls import TLSConfigV1Alpha1 from jumpstarter.driver import Driver from jumpstarter.exporter.session import Session +from jumpstarter_protocol import ( + jumpstarter_pb2, + jumpstarter_pb2_grpc, +) logger = logging.getLogger(__name__) diff --git a/packages/jumpstarter/jumpstarter/exporter/session.py b/packages/jumpstarter/jumpstarter/exporter/session.py index 3e8e82b9..892e9585 100644 --- a/packages/jumpstarter/jumpstarter/exporter/session.py +++ b/packages/jumpstarter/jumpstarter/exporter/session.py @@ -6,17 +6,16 @@ import grpc from anyio import Event, TypedAttributeLookupError from anyio.from_thread import start_blocking_portal +from jumpstarter.common import Metadata, TemporarySocket +from jumpstarter.common.streams import StreamRequestMetadata +from jumpstarter.driver import Driver +from jumpstarter.streams import MetadataStreamAttributes, RouterStream, forward_stream from jumpstarter_protocol import ( jumpstarter_pb2, jumpstarter_pb2_grpc, router_pb2_grpc, ) -from jumpstarter.common import Metadata, TemporarySocket -from jumpstarter.common.streams import StreamRequestMetadata -from jumpstarter.driver import Driver -from jumpstarter.streams import MetadataStreamAttributes, RouterStream, forward_stream - logger = logging.getLogger(__name__) diff --git a/packages/jumpstarter/jumpstarter/listener_test.py b/packages/jumpstarter/jumpstarter/listener_test.py index d2025489..73c3e8b5 100644 --- a/packages/jumpstarter/jumpstarter/listener_test.py +++ b/packages/jumpstarter/jumpstarter/listener_test.py @@ -7,14 +7,13 @@ import pytest from anyio import create_task_group from anyio.from_thread import start_blocking_portal -from jumpstarter_driver_power.driver import MockPower - from jumpstarter.client import Lease from jumpstarter.common import MetadataFilter from jumpstarter.common.grpc import aio_secure_channel, ssl_channel_credentials from jumpstarter.common.streams import connect_router_stream from jumpstarter.config.tls import TLSConfigV1Alpha1 from jumpstarter.exporter import Exporter, Session +from jumpstarter_driver_power.driver import MockPower pytestmark = pytest.mark.anyio