From e7a612ea7691240f0c5c6c96753b5e0684382c37 Mon Sep 17 00:00:00 2001
From: Max KvR <max.kvr@web.de>
Date: Wed, 11 Sep 2024 14:26:16 +0200
Subject: [PATCH] feat: standardized CLI #9

---
 Dockerfile                    | 4 ++--
 metricq_source_modbus/main.py | 9 +++------
 setup.cfg                     | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 867459a..01f2a6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/metricq/metricq-python:v5.3 AS BUILDER
+FROM ghcr.io/metricq/metricq-python:v5.4 AS BUILDER
 
 USER root
 RUN apt-get update \
@@ -19,7 +19,7 @@ RUN /home/metricq/.local/bin/tox
 RUN pip install --user .
 
 
-FROM ghcr.io/metricq/metricq-python:v5.3
+FROM ghcr.io/metricq/metricq-python:v5.4
 
 COPY --from=BUILDER --chown=metricq:metricq /home/metricq/.local /home/metricq/.local
 
diff --git a/metricq_source_modbus/main.py b/metricq_source_modbus/main.py
index 1798af5..94adab6 100644
--- a/metricq_source_modbus/main.py
+++ b/metricq_source_modbus/main.py
@@ -28,9 +28,9 @@
 
 import logging
 
-import click
 import click_completion  # type: ignore
 import click_log  # type: ignore
+from metricq.cli import metricq_command
 from metricq.logging import get_logger
 
 from .source import ModbusSource
@@ -46,10 +46,7 @@
 click_completion.init()
 
 
-@click.command()
-@click.option("--server")
-@click.option("--token", default="source-modbus")
-@click_log.simple_verbosity_option(logger)  # type: ignore
-def run(server, token) -> None:
+@metricq_command(default_token="source-modbus")
+def run(server: str, token: str) -> None:
     src = ModbusSource(url=server, token=token)
     src.run()
diff --git a/setup.cfg b/setup.cfg
index f836bf3..f63e63e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,7 @@ packages =
     metricq_source_modbus
 python_requires = >=3.10
 install_requires =
-    metricq ~= 5.3
+    metricq[cli] ~= 5.4
     async-modbus >= 0.2.1
     python-hostlist
     pydantic