aboutsummaryrefslogtreecommitdiff
path: root/src_py
diff options
context:
space:
mode:
authorbozo.kopic <bozo@kopic.xyz>2022-05-12 21:36:59 +0200
committerbozo.kopic <bozo@kopic.xyz>2022-05-12 21:36:59 +0200
commitc81812414c1b55352aac2c9bdc9b7f4951f2c6ce (patch)
treeae5dc711e305b45945106df27d26fd0159afb8f2 /src_py
parentae33b2c75ec0e03fd1d80241a4c4b29acadb517c (diff)
requirements updatev0.3.2
Diffstat (limited to 'src_py')
-rw-r--r--src_py/opcut/main.py12
-rw-r--r--src_py/opcut/server.py1
2 files changed, 8 insertions, 5 deletions
diff --git a/src_py/opcut/main.py b/src_py/opcut/main.py
index 475288e..b1d66a8 100644
--- a/src_py/opcut/main.py
+++ b/src_py/opcut/main.py
@@ -19,6 +19,10 @@ params_schema_id: str = 'opcut://opcut.yaml#/definitions/params'
result_schema_id: str = 'opcut://opcut.yaml#/definitions/result'
+def _doc_enum_values(enum_cls):
+ return ', '.join(str(i.value) for i in enum_cls)
+
+
@click.group()
def main():
"""Application main entry point"""
@@ -28,7 +32,7 @@ def main():
@click.option('--method',
default=common.Method.FORWARD_GREEDY,
type=common.Method,
- help="calculate method")
+ help=f"calculate method ({_doc_enum_values(common.Method)})")
@click.option('--output',
default=None,
metavar='PATH',
@@ -42,7 +46,7 @@ def main():
def calculate(method: common.Method,
output: typing.Optional[Path],
params: typing.Optional[Path]):
- """Calculate result"""
+ """Calculate result based on parameters JSON"""
params = (json.decode_file(params) if params and params != Path('-')
else json.decode_stream(sys.stdin))
common.json_schema_repo.validate(params_schema_id, params)
@@ -66,7 +70,7 @@ def calculate(method: common.Method,
@click.option('--output-type',
default=common.OutputType.PDF,
type=common.OutputType,
- help="output type")
+ help=f"output type ({_doc_enum_values(common.OutputType)})")
@click.option('--panel',
default=None,
help="panel identifier")
@@ -84,7 +88,7 @@ def generate_output(output_type: common.OutputType,
panel: typing.Optional[str],
output: typing.Optional[Path],
result: typing.Optional[Path]):
- """Generate output"""
+ """Generate output based on result JSON"""
result = (json.decode_file(result) if result and result != Path('-')
else json.decode_stream(sys.stdin))
common.json_schema_repo.validate(result_schema_id, result)
diff --git a/src_py/opcut/server.py b/src_py/opcut/server.py
index 5e726ad..2ae76a2 100644
--- a/src_py/opcut/server.py
+++ b/src_py/opcut/server.py
@@ -18,7 +18,6 @@ async def create(host: str,
) -> 'Server':
server = Server()
server._async_group = aio.Group()
- server._executor = aio.create_executor()
app = aiohttp.web.Application()
app.add_routes([