Reorg cli and client (file moves and import updates)

pyproject.toml

@@ -23,8 +23,8 @@ dependencies = []
 dynamic = ["version"]
 
 [project.scripts]
-cm-service = "lsst.cmservice.cli.commands:server"
-cm-client = "lsst.cmservice.cli.commands:client_top"
+cm-service = "lsst.cmservice.cli.service.commands:top"
+cm-client = "lsst.cmservice.cli.client.commands:top"
 cm-worker = "lsst.cmservice.daemon:main"
 
 [project.urls]

src/lsst/cmservice/cli/__init__.py → src/lsst/cmservice/cli/client/__init__.py

@@ -16,7 +16,6 @@
 query: getting objects from the database
 """
 
-
 from . import (
     action,
     campaign,
@@ -25,19 +24,19 @@
     job,
     load,
     options,
-    pipetask_error,
     pipetask_error_type,
+    pipetask_error,
     product_set,
     production,
     queue,
-    script,
     script_dependency,
     script_error,
     script_template,
+    script,
     spec_block,
     specificaiton,
-    step,
     step_dependency,
+    step,
     task_set,
     wms_task_report,
     wrappers,

src/lsst/cmservice/cli/action.py → src/lsst/cmservice/cli/client/action.py

@@ -1,14 +1,14 @@
 from typing import Any
 
-from .. import db
-from ..client.client import CMClient
-from ..common.enums import StatusEnum
+from ... import db
+from ...common.enums import StatusEnum
 from . import options
-from .commands import client_top
+from .client import CMClient
+from .commands import top
 from .wrappers import output_dict, output_pydantic_list, output_pydantic_object
 
 
-@client_top.group()
+@top.group()
 def action() -> None:
     """Do something"""
 

src/lsst/cmservice/cli/campaign.py → src/lsst/cmservice/cli/client/campaign.py

@@ -1,11 +1,11 @@
 """CLI to manage Campaign table"""
 
-from .. import db
+from ... import db
 from . import options, wrappers
-from .commands import client_top
+from .commands import top
 
 
-@client_top.group(name="campaign")
+@top.group(name="campaign")
 def campaign_group() -> None:
     """Manage Campaign table"""
 

src/lsst/cmservice/client/actions.py → src/lsst/cmservice/cli/client/client/actions.py

@@ -4,8 +4,8 @@
 
 import httpx
 
-from .. import models
-from ..common.enums import StatusEnum
+from .... import models
+from ....common.enums import StatusEnum
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/campaigns.py → src/lsst/cmservice/cli/client/client/campaigns.py

@@ -6,8 +6,8 @@
 
 import httpx
 
-from .. import db, models
-from ..common.enums import StatusEnum
+from .... import db, models
+from ....common.enums import StatusEnum
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/client.py → src/lsst/cmservice/cli/client/client/client.py

@@ -6,9 +6,9 @@
 
 import httpx
 
+from ..config import client_config
 from .actions import CMActionClient
 from .campaigns import CMCampaignClient
-from .clientconfig import client_config
 from .groups import CMGroupClient
 from .jobs import CMJobClient
 from .loaders import CMLoadClient

src/lsst/cmservice/client/groups.py → src/lsst/cmservice/cli/client/client/groups.py

@@ -6,8 +6,8 @@
 
 import httpx
 
-from .. import db, models
-from ..common.enums import StatusEnum
+from .... import db, models
+from ....common.enums import StatusEnum
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/jobs.py → src/lsst/cmservice/cli/client/client/jobs.py

@@ -7,8 +7,8 @@
 
 import httpx
 
-from .. import db, models
-from ..common.enums import StatusEnum
+from .... import db, models
+from ....common.enums import StatusEnum
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/loaders.py → src/lsst/cmservice/cli/client/client/loaders.py

@@ -6,10 +6,10 @@
 import httpx
 import yaml
 
-from .. import models
-from ..common.enums import ErrorActionEnum, ErrorFlavorEnum, ErrorSourceEnum
-from ..common.errors import CMYamlParseError
-from ..common.utils import update_include_dict
+from .... import models
+from ....common.enums import ErrorActionEnum, ErrorFlavorEnum, ErrorSourceEnum
+from ....common.errors import CMYamlParseError
+from ....common.utils import update_include_dict
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/pipetask_error_types.py → src/lsst/cmservice/cli/client/client/pipetask_error_types.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/pipetask_errors.py → src/lsst/cmservice/cli/client/client/pipetask_errors.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/product_sets.py → src/lsst/cmservice/cli/client/client/product_sets.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/productions.py → src/lsst/cmservice/cli/client/client/productions.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/queues.py → src/lsst/cmservice/cli/client/client/queues.py

@@ -9,8 +9,8 @@
 import pause
 from pydantic import TypeAdapter, ValidationError
 
-from .. import db, models
-from ..common.errors import test_type_and_raise
+from .... import db, models
+from ....common.errors import test_type_and_raise
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/script_dependencies.py → src/lsst/cmservice/cli/client/client/script_dependencies.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/script_errors.py → src/lsst/cmservice/cli/client/client/script_errors.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/script_templates.py → src/lsst/cmservice/cli/client/client/script_templates.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/scripts.py → src/lsst/cmservice/cli/client/client/scripts.py

@@ -6,8 +6,8 @@
 
 import httpx
 
-from .. import db, models
-from ..common.enums import StatusEnum
+from .... import db, models
+from ....common.enums import StatusEnum
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/spec_blocks.py → src/lsst/cmservice/cli/client/client/spec_blocks.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/specifications.py → src/lsst/cmservice/cli/client/client/specifications.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/step_dependencies.py → src/lsst/cmservice/cli/client/client/step_dependencies.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/steps.py → src/lsst/cmservice/cli/client/client/steps.py

@@ -6,8 +6,8 @@
 
 import httpx
 
-from .. import db, models
-from ..common.enums import StatusEnum
+from .... import db, models
+from ....common.enums import StatusEnum
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/task_sets.py → src/lsst/cmservice/cli/client/client/task_sets.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/wms_task_reports.py → src/lsst/cmservice/cli/client/client/wms_task_reports.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from .. import db, models
+from .... import db, models
 from . import wrappers
 
 if TYPE_CHECKING:

src/lsst/cmservice/client/wrappers.py → src/lsst/cmservice/cli/client/client/wrappers.py

@@ -5,7 +5,7 @@
 
 from pydantic import BaseModel, TypeAdapter
 
-from .. import models
+from .... import models
 
 if TYPE_CHECKING:
     from .client import CMClient

src/lsst/cmservice/cli/client/commands.py

@@ -0,0 +1,7 @@
+import click
+
+
+@click.group(name="client")
+@click.version_option(package_name="lsst-cm-service")
+def top() -> None:
+    """Command-line client for cm-service."""

src/lsst/cmservice/cli/group.py → src/lsst/cmservice/cli/client/group.py

@@ -1,12 +1,12 @@
 """CLI to manage Group table"""
 
-from .. import db
-from ..client.client import CMClient
+from ... import db
 from . import options, wrappers
-from .commands import client_top
+from .client import CMClient
+from .commands import top
 
 
-@client_top.group(name="group")
+@top.group(name="group")
 def group_group() -> None:
     """Manage Group table"""
 

src/lsst/cmservice/cli/job.py → src/lsst/cmservice/cli/client/job.py

@@ -1,12 +1,12 @@
 """CLI to manage Job table"""
 
-from .. import db
-from ..client.client import CMClient
+from ... import db
 from . import options, wrappers
-from .commands import client_top
+from .client import CMClient
+from .commands import top
 
 
-@client_top.group(name="job")
+@top.group(name="job")
 def job_group() -> None:
     """Manage Job table"""
 

src/lsst/cmservice/cli/load.py → src/lsst/cmservice/cli/client/load.py

@@ -1,13 +1,13 @@
 from typing import Any
 
-from .. import db
-from ..client.client import CMClient
+from ... import db
 from . import options
-from .commands import client_top
+from .client import CMClient
+from .commands import top
 from .wrappers import output_pydantic_list, output_pydantic_object
 
 
-@client_top.group()
+@top.group()
 def load() -> None:
     """Read a yaml file and add stuff to the DB"""
 

src/lsst/cmservice/cli/options.py → src/lsst/cmservice/cli/client/options.py

@@ -6,14 +6,14 @@
 import click
 from click.decorators import FC
 
-from ..client.client import CMClient
-from ..common.enums import (
+from ...common.enums import (
     ErrorActionEnum,
     ErrorFlavorEnum,
     ErrorSourceEnum,
     NodeTypeEnum,
     StatusEnum,
 )
+from .client import CMClient
 
 __all__ = [
     "cmclient",

src/lsst/cmservice/cli/pipetask_error.py → src/lsst/cmservice/cli/client/pipetask_error.py

@@ -1,11 +1,11 @@
 """CLI to manage PipetaskError table"""
 
-from .. import db
+from ... import db
 from . import options, wrappers
-from .commands import client_top
+from .commands import top
 
 
-@client_top.group(name="pipetask_error")
+@top.group(name="pipetask_error")
 def pipetask_error_group() -> None:
     """Manage PipetaskError table"""