Discard direct orm import from cmdline package

Author: edan-bainglass

src/aiida/cmdline/commands/cmd_code.py

@@ -12,11 +12,10 @@
 import warnings
 from collections import defaultdict
 from functools import partial
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import click
 
-from aiida import orm
 from aiida.cmdline.commands.cmd_data.cmd_export import data_export
 from aiida.cmdline.commands.cmd_verdi import verdi
 from aiida.cmdline.groups.dynamic import DynamicEntryPointCommandGroup
@@ -27,13 +26,16 @@
 from aiida.cmdline.utils.decorators import with_dbenv
 from aiida.common import exceptions
 
+if TYPE_CHECKING:
+    from aiida.orm import Code
+
 
 @verdi.group('code')
 def verdi_code():
     """Setup and manage codes."""
 
 
-def create_code(ctx: click.Context, cls: orm.Code, **kwargs) -> None:
+def create_code(ctx: click.Context, cls: Code, **kwargs) -> None:
     """Create a new `Code` instance."""
     try:
         Model = cls.Model.as_input_model()

src/aiida/cmdline/groups/dynamic.py

@@ -8,7 +8,6 @@
 
 import click
 
-from aiida import orm
 from aiida.common import exceptions
 from aiida.plugins.entry_point import ENTRY_POINT_GROUP_FACTORY_MAPPING, get_entry_point_names
 from aiida.plugins.factories import BaseFactory
@@ -98,7 +97,7 @@ def call_command(self, ctx: click.Context, cls: t.Any, non_interactive: bool, **
 
         if hasattr(cls, 'Model'):
             # The plugin defines a pydantic model: use it to validate the provided arguments
-            Model = cls.Model.as_input_model() if issubclass(cls, orm.Entity) else cls.Model
+            Model = cls.Model.as_input_model() if hasattr(cls.Model, 'as_input_model') else cls.Model
             try:
                 Model(**kwargs)
             except ValidationError as exception:
@@ -170,7 +169,7 @@ def list_options(self, entry_point: str) -> list[t.Callable[[FC], FC]]:
             options_spec = self.factory(entry_point).get_cli_options()  # type: ignore[union-attr]
             return [self.create_option(*item) for item in options_spec]
 
-        Model = cls.Model.as_input_model() if issubclass(cls, orm.Entity) else cls.Model
+        Model = cls.Model.as_input_model() if hasattr(cls.Model, 'as_input_model') else cls.Model
 
         options_spec = {}