Merge pull request #411 from jumpstarter-dev/faster

Faster

Author: NickCao

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")