Faster

conftest.py

@@ -7,8 +7,7 @@
 
 try:
     from jumpstarter.common.utils import serve
-    from jumpstarter.config import ExporterConfigV1Alpha1DriverInstance
-    from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+    from jumpstarter.config.exporter import ExporterConfigV1Alpha1, ExporterConfigV1Alpha1DriverInstance
 except ImportError:
     # some packages in the workspace does not depend on jumpstarter
     pass

docs/source/api-reference/drivers/dbus.md

@@ -18,7 +18,7 @@ Example configuration:
 
 ```{doctest}
 :hide:
->>> from jumpstarter.config import ExporterConfigV1Alpha1DriverInstance
+>>> from jumpstarter.config.exporter import ExporterConfigV1Alpha1DriverInstance
 >>> ExporterConfigV1Alpha1DriverInstance.from_path("source/api-reference/drivers/dbus.yaml").instantiate()
 DbusNetwork(...)
 ```

docs/source/api-reference/drivers/proxy.md

@@ -24,7 +24,7 @@ Example configuration:
 ```
 
 ```{testsetup} *
-from jumpstarter.config import ExporterConfigV1Alpha1DriverInstance
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1DriverInstance
 from jumpstarter.common.utils import serve
 
 instance = serve(

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/__init__.py

@@ -1,5 +1,6 @@
 import asyncclick as click
-from jumpstarter_cli_common import AliasedGroup, version
+from jumpstarter_cli_common.alias import AliasedGroup
+from jumpstarter_cli_common.version import version
 
 from .create import create
 from .delete import delete

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create.py

@@ -2,8 +2,8 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import (
-    AliasedGroup,
+from jumpstarter_cli_common.alias import AliasedGroup
+from jumpstarter_cli_common.opt import (
     OutputMode,
     OutputType,
     opt_context,
@@ -22,7 +22,9 @@
     handle_k8s_api_exception,
     handle_k8s_config_exception,
 )
-from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
+from jumpstarter.config.client import ClientConfigV1Alpha1
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter.config.user import UserConfigV1Alpha1
 
 opt_oidc_username = click.option("--oidc-username", "oidc_username", type=str, default=None, help="OIDC username")
 

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/create_test.py

@@ -14,12 +14,9 @@
 from kubernetes_asyncio.client.models import V1ObjectMeta, V1ObjectReference
 
 from .create import create
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ExporterConfigV1Alpha1,
-    ObjectMeta,
-)
+from jumpstarter.config.client import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers
+from jumpstarter.config.common import ObjectMeta
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 
 # Generate a random client name
 CLIENT_NAME = uuid.uuid4().hex

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete.py

@@ -2,8 +2,8 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import (
-    AliasedGroup,
+from jumpstarter_cli_common.alias import AliasedGroup
+from jumpstarter_cli_common.opt import (
     NameOutputType,
     opt_context,
     opt_kubeconfig,
@@ -20,7 +20,9 @@
     handle_k8s_api_exception,
     handle_k8s_config_exception,
 )
-from jumpstarter.config import ClientConfigV1Alpha1, ExporterConfigV1Alpha1, UserConfigV1Alpha1
+from jumpstarter.config.client import ClientConfigV1Alpha1
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter.config.user import UserConfigV1Alpha1
 
 
 @click.group(cls=AliasedGroup)

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/delete_test.py

@@ -11,14 +11,10 @@
 from kubernetes_asyncio.client.models import V1ObjectMeta, V1ObjectReference
 
 from .delete import delete
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ExporterConfigV1Alpha1,
-    ObjectMeta,
-    UserConfigV1Alpha1,
-    UserConfigV1Alpha1Config,
-)
+from jumpstarter.config.client import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers
+from jumpstarter.config.common import ObjectMeta
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter.config.user import UserConfigV1Alpha1, UserConfigV1Alpha1Config
 
 # Generate a random client name
 CLIENT_NAME = "test"

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/get.py

@@ -2,8 +2,8 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import (
-    AliasedGroup,
+from jumpstarter_cli_common.alias import AliasedGroup
+from jumpstarter_cli_common.opt import (
     OutputType,
     opt_context,
     opt_kubeconfig,

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import (
+from jumpstarter_cli_common.opt import (
     PathOutputType,
     opt_context,
     opt_kubeconfig,
@@ -17,11 +17,9 @@
     handle_k8s_api_exception,
     handle_k8s_config_exception,
 )
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    UserConfigV1Alpha1,
-)
+from jumpstarter.config.client import ClientConfigV1Alpha1
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter.config.user import UserConfigV1Alpha1
 
 
 @click.group("import")

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/import_res_test.py

@@ -10,12 +10,9 @@
 )
 
 from .import_res import import_res
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ExporterConfigV1Alpha1,
-    ObjectMeta,
-)
+from jumpstarter.config.client import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers
+from jumpstarter.config.common import ObjectMeta
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 
 # Generate a random client name
 CLIENT_NAME = uuid.uuid4().hex

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/install.py

@@ -1,7 +1,8 @@
 from typing import Literal, Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import get_client_version, opt_context, opt_kubeconfig
+from jumpstarter_cli_common.opt import opt_context, opt_kubeconfig
+from jumpstarter_cli_common.version import get_client_version
 from jumpstarter_kubernetes import get_ip_address, helm_installed, install_helm_chart
 
 

packages/jumpstarter-cli-admin/jumpstarter_cli_admin/print.py

@@ -1,10 +1,7 @@
 import asyncclick as click
-from jumpstarter_cli_common import (
-    OutputMode,
-    OutputType,
-    make_table,
-    time_since,
-)
+from jumpstarter_cli_common.opt import OutputMode, OutputType
+from jumpstarter_cli_common.table import make_table
+from jumpstarter_cli_common.time import time_since
 from jumpstarter_kubernetes import (
     V1Alpha1Client,
     V1Alpha1Exporter,

packages/jumpstarter-cli-common/jumpstarter_cli_common/__init__.py

@@ -1,42 +0,0 @@
-from .alias import AliasedGroup
-from .config import opt_config
-from .opt import (
-    NameOutputType,
-    OutputMode,
-    OutputType,
-    PathOutputType,
-    opt_context,
-    opt_kubeconfig,
-    opt_labels,
-    opt_log_level,
-    opt_namespace,
-    opt_nointeractive,
-    opt_output_all,
-    opt_output_name_only,
-    opt_output_path_only,
-)
-from .table import make_table
-from .time import time_since
-from .version import get_client_version, version
-
-__all__ = [
-    "AliasedGroup",
-    "make_table",
-    "opt_config",
-    "opt_context",
-    "opt_log_level",
-    "opt_kubeconfig",
-    "opt_namespace",
-    "opt_nointeractive",
-    "opt_labels",
-    "opt_output_all",
-    "opt_output_name_only",
-    "opt_output_path_only",
-    "OutputMode",
-    "OutputType",
-    "NameOutputType",
-    "PathOutputType",
-    "time_since",
-    "version",
-    "get_client_version",
-]

packages/jumpstarter-cli-common/jumpstarter_cli_common/config.py

@@ -3,11 +3,9 @@
 
 import asyncclick as click
 
-from jumpstarter.config import (
-    ClientConfigV1Alpha1,
-    ExporterConfigV1Alpha1,
-    UserConfigV1Alpha1,
-)
+from jumpstarter.config.client import ClientConfigV1Alpha1
+from jumpstarter.config.exporter import ExporterConfigV1Alpha1
+from jumpstarter.config.user import UserConfigV1Alpha1
 
 
 def opt_config_inner(  # noqa: C901

packages/jumpstarter-cli-driver/jumpstarter_cli_driver/__init__.py

@@ -2,7 +2,9 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
+from jumpstarter_cli_common.alias import AliasedGroup
+from jumpstarter_cli_common.opt import opt_log_level
+from jumpstarter_cli_common.version import version
 
 from .driver import list_drivers
 

packages/jumpstarter-cli-driver/jumpstarter_cli_driver/driver.py

@@ -1,7 +1,7 @@
 from importlib.metadata import entry_points
 
 import asyncclick as click
-from jumpstarter_cli_common import make_table
+from jumpstarter_cli_common.table import make_table
 
 
 @click.command("list")

packages/jumpstarter-cli/jumpstarter_cli/__init__.py

@@ -1,3 +0,0 @@
-from .jmp import jmp
-
-__all__ = ["jmp"]

packages/jumpstarter-cli/jumpstarter_cli/config_client.py

@@ -1,23 +1,19 @@
 from typing import Optional
 
 import asyncclick as click
-from jumpstarter_cli_common import (
+from jumpstarter_cli_common.exceptions import handle_exceptions
+from jumpstarter_cli_common.opt import (
     OutputMode,
     OutputType,
     PathOutputType,
-    make_table,
     opt_output_all,
     opt_output_path_only,
 )
-from jumpstarter_cli_common.exceptions import handle_exceptions
+from jumpstarter_cli_common.table import make_table
 
-from jumpstarter.config import (
-    ClientConfigListV1Alpha1,
-    ClientConfigV1Alpha1,
-    ClientConfigV1Alpha1Drivers,
-    ObjectMeta,
-    UserConfigV1Alpha1,
-)
+from jumpstarter.config.client import ClientConfigListV1Alpha1, ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers
+from jumpstarter.config.common import ObjectMeta
+from jumpstarter.config.user import UserConfigV1Alpha1
 
 
 @click.group("client")

packages/jumpstarter-cli/jumpstarter_cli/config_exporter.py

@@ -1,12 +1,12 @@
 import asyncclick as click
-from jumpstarter_cli_common import (
+from jumpstarter_cli_common.opt import (
     OutputMode,
     OutputType,
     PathOutputType,
-    make_table,
     opt_output_all,
     opt_output_path_only,
 )
+from jumpstarter_cli_common.table import make_table
 
 from jumpstarter.config.exporter import ExporterConfigListV1Alpha1, ExporterConfigV1Alpha1, ObjectMeta
 

packages/jumpstarter-cli/jumpstarter_cli/create.py

@@ -1,14 +1,10 @@
 from datetime import timedelta
 
 import asyncclick as click
-from jumpstarter_cli_common import (
-    OutputMode,
-    OutputType,
-    make_table,
-    opt_config,
-    opt_output_all,
-)
+from jumpstarter_cli_common.config import opt_config
 from jumpstarter_cli_common.exceptions import handle_exceptions
+from jumpstarter_cli_common.opt import OutputMode, OutputType, opt_output_all
+from jumpstarter_cli_common.table import make_table
 
 from .common import opt_duration_partial, opt_selector
 

packages/jumpstarter-cli/jumpstarter_cli/delete.py

@@ -1,6 +1,7 @@
 import asyncclick as click
-from jumpstarter_cli_common import OutputMode, OutputType, opt_config, opt_output_name_only
+from jumpstarter_cli_common.config import opt_config
 from jumpstarter_cli_common.exceptions import handle_exceptions
+from jumpstarter_cli_common.opt import OutputMode, OutputType, opt_output_name_only
 
 from .common import opt_selector
 

packages/jumpstarter-cli/jumpstarter_cli/get.py

@@ -1,6 +1,8 @@
 import asyncclick as click
-from jumpstarter_cli_common import OutputMode, OutputType, make_table, opt_config, opt_output_all
+from jumpstarter_cli_common.config import opt_config
 from jumpstarter_cli_common.exceptions import handle_exceptions
+from jumpstarter_cli_common.opt import OutputMode, OutputType, opt_output_all
+from jumpstarter_cli_common.table import make_table
 
 from .common import opt_selector
 

packages/jumpstarter-cli/jumpstarter_cli/j.py

@@ -3,7 +3,7 @@
 import asyncclick as click
 from jumpstarter_cli_common.exceptions import handle_exceptions
 
-from jumpstarter.common.utils import env
+from jumpstarter.utils.env import env
 
 
 def j():

packages/jumpstarter-cli/jumpstarter_cli/jmp.py

@@ -2,7 +2,9 @@
 
 import asyncclick as click
 from jumpstarter_cli_admin import admin
-from jumpstarter_cli_common import AliasedGroup, opt_log_level, version
+from jumpstarter_cli_common.alias import AliasedGroup
+from jumpstarter_cli_common.opt import opt_log_level
+from jumpstarter_cli_common.version import version
 from jumpstarter_cli_driver import driver
 
 from .config import config

packages/jumpstarter-cli/jumpstarter_cli/login.py

@@ -1,8 +1,9 @@
 import asyncclick as click
-from jumpstarter_cli_common import opt_config
+from jumpstarter_cli_common.config import opt_config
 from jumpstarter_cli_common.oidc import Config, decode_jwt_issuer, opt_oidc
 
-from jumpstarter.config import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers, ObjectMeta
+from jumpstarter.config.client import ClientConfigV1Alpha1, ClientConfigV1Alpha1Drivers
+from jumpstarter.config.common import ObjectMeta
 from jumpstarter.config.exporter import ExporterConfigV1Alpha1
 
 

packages/jumpstarter-cli/jumpstarter_cli/run.py

@@ -2,7 +2,7 @@
 import traceback
 
 import asyncclick as click
-from jumpstarter_cli_common import opt_config
+from jumpstarter_cli_common.config import opt_config
 from jumpstarter_cli_common.exceptions import handle_exceptions