vantage6 5.0.0a0__py3-none-any.whl → 5.0.0a9__py3-none-any.whl

vantage6/cli/test/integration_test.py

@@ -1,122 +1,122 @@
-from pathlib import Path
-import click
+# from pathlib import Path
+# import click
 
-from vantage6.common.globals import Ports
-from vantage6.cli.utils import info
-from vantage6.cli.dev.create import create_demo_network
-from vantage6.cli.dev.start import start_demo_network
-from vantage6.cli.dev.stop import stop_demo_network
-from vantage6.cli.dev.remove import remove_demo_network
-from vantage6.cli.utils import prompt_config_name, check_config_name_allowed
-from vantage6.cli.test.feature_tester import cli_test_features
+# from vantage6.common.globals import Ports
+# from vantage6.cli.utils import info
+# from vantage6.cli.dev.create import create_demo_network
+# from vantage6.cli.dev.start import start_demo_network
+# from vantage6.cli.dev.stop import stop_demo_network
+# from vantage6.cli.dev.remove import remove_demo_network
+# from vantage6.cli.utils import prompt_config_name, check_config_name_allowed
+# from vantage6.cli.test.feature_tester import cli_test_features
 
 
-@click.command()
-@click.option(
-    "-n", "--name", default=None, type=str, help="Name for your development setup"
-)
-@click.option(
-    "--server-url",
-    type=str,
-    default="http://host.docker.internal",
-    help="Server URL to point to. If you are using Docker Desktop, "
-    "the default http://host.docker.internal should not be changed.",
-)
-@click.option(
-    "-i", "--image", type=str, default=None, help="Server Docker image to use"
-)
-@click.option(
-    "--keep",
-    type=bool,
-    default=False,
-    help="Keep the dev network after finishing the test",
-)
-@click.option(
-    "--extra-server-config",
-    type=click.Path(exists=True),
-    default=None,
-    help="YAML File with additional server "
-    "configuration. This will be appended to the server "
-    "configuration file",
-)
-@click.option(
-    "--extra-node-config",
-    type=click.Path("rb"),
-    default=None,
-    help="YAML File with additional node configuration. This will be"
-    " appended to each of the node configuration files",
-)
-@click.pass_context
-def cli_test_integration(
-    click_ctx: click.Context,
-    name: str,
-    server_url: str,
-    image: str,
-    keep: bool = False,
-    extra_server_config: Path = None,
-    extra_node_config: Path = None,
-) -> list[dict]:
-    """
-    Create dev network and run diagnostic checks on it.
+# @click.command()
+# @click.option(
+#     "-n", "--name", default=None, type=str, help="Name for your development setup"
+# )
+# @click.option(
+#     "--server-url",
+#     type=str,
+#     default="http://host.docker.internal",
+#     help="Server URL to point to. If you are using Docker Desktop, "
+#     "the default http://host.docker.internal should not be changed.",
+# )
+# @click.option(
+#     "-i", "--image", type=str, default=None, help="Server Docker image to use"
+# )
+# @click.option(
+#     "--keep",
+#     type=bool,
+#     default=False,
+#     help="Keep the dev network after finishing the test",
+# )
+# @click.option(
+#     "--extra-server-config",
+#     type=click.Path(exists=True),
+#     default=None,
+#     help="YAML File with additional server "
+#     "configuration. This will be appended to the server "
+#     "configuration file",
+# )
+# @click.option(
+#     "--extra-node-config",
+#     type=click.Path("rb"),
+#     default=None,
+#     help="YAML File with additional node configuration. This will be"
+#     " appended to each of the node configuration files",
+# )
+# @click.pass_context
+# def cli_test_integration(
+#     click_ctx: click.Context,
+#     name: str,
+#     server_url: str,
+#     image: str,
+#     keep: bool = False,
+#     extra_server_config: Path = None,
+#     extra_node_config: Path = None,
+# ) -> list[dict]:
+#     """
+#     Create dev network and run diagnostic checks on it.
 
-    This is a full integration test of the vantage6 network. It will create
-    a test server with some nodes using the `vdev` commands, and then run the
-    v6-diagnostics algorithm to test all functionality.
-    """
-    # get name for the development setup - if not given - and check if it is
-    # allowed
-    name = prompt_config_name(name)
-    check_config_name_allowed(name)
+#     This is a full integration test of the vantage6 network. It will create
+#     a test server with some nodes using the `vdev` commands, and then run the
+#     v6-diagnostics algorithm to test all functionality.
+#     """
+#     # get name for the development setup - if not given - and check if it is
+#     # allowed
+#     name = prompt_config_name(name)
+#     check_config_name_allowed(name)
 
-    # create server & node configurations and create test resources (
-    # collaborations, organizations, etc)
-    click_ctx.invoke(
-        create_demo_network,
-        name=name,
-        num_nodes=3,
-        server_url=server_url,
-        server_port=Ports.DEV_SERVER.value,
-        image=image,
-        extra_server_config=extra_server_config,
-        extra_node_config=extra_node_config,
-    )
+#     # create server & node configurations and create test resources (
+#     # collaborations, organizations, etc)
+#     click_ctx.invoke(
+#         create_demo_network,
+#         name=name,
+#         num_nodes=3,
+#         server_url=server_url,
+#         server_port=Ports.DEV_SERVER.value,
+#         image=image,
+#         extra_server_config=extra_server_config,
+#         extra_node_config=extra_node_config,
+#     )
 
-    # start the server and nodes
-    click_ctx.invoke(
-        start_demo_network,
-        name=name,
-        server_image=image,
-        node_image=image,
-    )
+#     # start the server and nodes
+#     click_ctx.invoke(
+#         start_demo_network,
+#         name=name,
+#         server_image=image,
+#         node_image=image,
+#     )
 
-    # run the diagnostic tests
-    # TODO the username and password should be coordinated with the vdev
-    # command - at present it spits out this username/password combination by
-    # default but both should be defined in the same place
-    # TODO VPN testing is always excluded - allow to include it with a flag
-    # when vdev commands can handle extra config parameters
-    diagnose_results = click_ctx.invoke(
-        cli_test_features,
-        host="http://localhost",
-        port=Ports.DEV_SERVER.value,
-        api_path="/api",
-        username="dev_admin",
-        password="password",
-        collaboration=1,
-        organizations=None,
-        all_nodes=True,
-        online_only=False,
-        no_vpn=True,
-    )
+#     # run the diagnostic tests
+#     # TODO the username and password should be coordinated with the vdev
+#     # command - at present it spits out this username/password combination by
+#     # default but both should be defined in the same place
+#     # TODO VPN testing is always excluded - allow to include it with a flag
+#     # when vdev commands can handle extra config parameters
+#     diagnose_results = click_ctx.invoke(
+#         cli_test_features,
+#         host="http://localhost",
+#         port=Ports.DEV_SERVER.value,
+#         api_path="/api",
+#         username="dev_admin",
+#         password="password",
+#         collaboration=1,
+#         organizations=None,
+#         all_nodes=True,
+#         online_only=False,
+#         no_vpn=True,
+#     )
 
-    # clean up the test resources
-    click_ctx.invoke(stop_demo_network, name=name)
-    if not keep:
-        click_ctx.invoke(remove_demo_network, name=name)
-    else:
-        info(
-            f"Keeping the demo network {name}. You can start it with `v6 dev "
-            "start-demo-network`"
-        )
+#     # clean up the test resources
+#     click_ctx.invoke(stop_demo_network, name=name)
+#     if not keep:
+#         click_ctx.invoke(remove_demo_network, name=name)
+#     else:
+#         info(
+#             f"Keeping the demo network {name}. You can start it with `v6 dev "
+#             "start-demo-network`"
+#         )
 
-    return diagnose_results
+#     return diagnose_results

vantage6/cli/utils.py

@@ -90,7 +90,11 @@ def prompt_config_name(name: str | None) -> None:
         The name of the configuration
     """
     if not name:
-        name = q.text("Please enter a configuration-name:").ask()
+        try:
+            name = q.text("Please enter a configuration-name:").unsafe_ask()
+        except KeyboardInterrupt:
+            error("Aborted by user!")
+            exit(1)
         if name.count(" ") > 0:
             name = name.replace(" ", "-")
             info(f"Replaced spaces from configuration name: {name}")

{vantage6-5.0.0a0.dist-info → vantage6-5.0.0a9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 5.0.0a0
+Version: 5.0.0a9
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -10,14 +10,14 @@ Requires-Dist: colorama==0.4.6
 Requires-Dist: copier==9.2.0
 Requires-Dist: docker==7.1.0
 Requires-Dist: ipython==8.10.0
-Requires-Dist: jinja2==3.1.4
+Requires-Dist: jinja2==3.1.5
 Requires-Dist: pandas>=1.5.3
 Requires-Dist: questionary==1.10.0
 Requires-Dist: rich==13.5.2
 Requires-Dist: schema==0.7.5
-Requires-Dist: SQLAlchemy==1.4.46
-Requires-Dist: vantage6-common==5.0.0a0
-Requires-Dist: vantage6-client==5.0.0a0
+Requires-Dist: sqlalchemy==2.0.37
+Requires-Dist: vantage6-common==5.0.0a9
+Requires-Dist: vantage6-client==5.0.0a9
 Provides-Extra: dev
 Requires-Dist: coverage==6.4.4; extra == "dev"
 Requires-Dist: black; extra == "dev"

vantage6-5.0.0a9.dist-info/RECORD

@@ -0,0 +1,70 @@
+tests_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests_cli/test_example.py,sha256=0fw_v-lgZEacshWSDwLNyLMA1_xc48bKUGM3ll-n1L0,146
+tests_cli/test_node_cli.py,sha256=ajFdG1sTa9H7PjqK2dhcp3k59HGsJyO6ZoRfxgIUHcA,16842
+tests_cli/test_server_cli.py,sha256=n8amDe9ACPrHRFlxeO85oiOheIElQ4hc72lHT8r5wcI,6544
+tests_cli/test_wizard.py,sha256=NIj59eiCBuVNJXwhofrWLmLIKAsD45gSOzqOFWLmWhY,4916
+vantage6/cli/__build__,sha256=GVgeJ9587QD_HOULIEfnpWfHaxy666vl7wP3wwF7tbc,1
+vantage6/cli/__init__.py,sha256=ZXbeQ_-g2-M4XYteWZkoO5lMFYhqjm5doQgGy1fq8i0,125
+vantage6/cli/_version.py,sha256=iDijqhgy5jzZ0LAyzW1LlXeeuMcHWMyg9D8xbXtV7Ck,696
+vantage6/cli/cli.py,sha256=B0F328FSBBslwplMPk8lIlr0r-taKuCgb8v9DIdyE3Q,5699
+vantage6/cli/configuration_manager.py,sha256=cN4tQpQjLG5GaGrsjEP-5ed_LqvPApIkNkM1J6ai3n0,3588
+vantage6/cli/configuration_wizard.py,sha256=ifqvrVqHkxoM0ZVUVIwlYXFByzAbuVlahNjmwFGLVRU,20874
+vantage6/cli/globals.py,sha256=8AWI55FBbumVQTuI1bJzKp5hiRWtiwsVgTTKqWgRBes,1616
+vantage6/cli/utils.py,sha256=Jfr6IeHMQDk_wU5X7rJ1dRY118dhVVX8PwzwMYMv9Vw,2481
+vantage6/cli/algorithm/create.py,sha256=kRT1BlBcb0fDaB2Q988WxtA6EyAZmOW5QoU2uhbwBIo,2075
+vantage6/cli/algorithm/update.py,sha256=WwAfTnq0kTOgePUsBzGoo1AJQqGMn82E9Bjk1wf61CQ,1338
+vantage6/cli/algostore/attach.py,sha256=0WzLnKigJAelPpL5EaWcnRuUyQzMSofrrZfEzwDIvSw,311
+vantage6/cli/algostore/files.py,sha256=r89VRixK_K-c44qseq58Aa2Dqf1wEf8yompQRN5AVu4,580
+vantage6/cli/algostore/list.py,sha256=owBrU52ANp8oE68Rk1Hhd6yNYqWX-7uREtmCok_wndg,417
+vantage6/cli/algostore/new.py,sha256=ekqZ7_qCUtWs0QU6coo34thfkksHbCAYAD8nr0SKgO4,2147
+vantage6/cli/algostore/remove.py,sha256=ieQLpo2ZpblpPxaeRXdB7IO0DzTtURnveYQltW7TTSw,1643
+vantage6/cli/algostore/start.py,sha256=lkijG7K5TymXpZqVLhrW-YPhBmex_8T6WSLSruj64PQ,3169
+vantage6/cli/algostore/stop.py,sha256=8g5DlISUXTf7abs4BTi2b2XOsuKWTwUGuCPIOMgSAeA,1835
+vantage6/cli/common/decorator.py,sha256=7Iwlcc_ekgXJco4tNjEV79ul43Q28OrieiGkvDBeGeE,3625
+vantage6/cli/common/start.py,sha256=IazXW6hKzFTomGu19lvr5z-EOzyXOD1fKokCwiIA8zc,9253
+vantage6/cli/common/utils.py,sha256=zBBHcH47S10cF62qabvyfwqFsmYrNS63aQLBRno9Bnw,4977
+vantage6/cli/context/__init__.py,sha256=e8rfY2tCyu6_SLQ-rbVzEHkDtmbnGCZRHFN_HH-2bnA,2683
+vantage6/cli/context/algorithm_store.py,sha256=NsmrgDCTJ10KqQ209Q1sq-hBhuU_4LRqfbj3SZ-ivnU,3938
+vantage6/cli/context/base_server.py,sha256=paKSzNrKWD-J6eakHAtGELk2cD05A8NqoCAuQfF7c2s,2972
+vantage6/cli/context/node.py,sha256=BIDSIwbNkoqgAg8CUMA7Q_cJjp8vNwqnr3daY8X4Juw,7362
+vantage6/cli/context/server.py,sha256=vBGJWNsJoVcIryX5OLiWnFklNRcjOVkhqm2U5tqW5b0,3946
+vantage6/cli/node/attach.py,sha256=cmouPrkbIbg21_wlAe-L-ecmrKVxiDkzGmEtRaCnKQY,276
+vantage6/cli/node/clean.py,sha256=uCty2GNuwoTybs1nIOygQLxtbleQ-rnnS6_4ieWVmCw,1199
+vantage6/cli/node/create_private_key.py,sha256=yciL1DtACxrBeEGxeaDi0NefDTvegG6s4rr5jA9J5TY,5207
+vantage6/cli/node/files.py,sha256=V7bJeR8weX0Llpp6y9wQoNrRsvlotEE6e70aTJp9j6M,1331
+vantage6/cli/node/list.py,sha256=_WZ8EBIEUlzFhVp3cR2MK5FUuQicMEZHhD8npMwKSpM,1664
+vantage6/cli/node/new.py,sha256=wuv8mdL4sLV91TJMIksU8dx2LlcUFrA1oORyiICruMw,2039
+vantage6/cli/node/remove.py,sha256=Al1XALUwciOU6zIRQB2D9EggUdvtU23laOZTWyYKKvc,3552
+vantage6/cli/node/restart.py,sha256=bWx0n4tN8TWOy_o8lJkA7AR-H1UIbfAiPp93I5wXg1Y,3709
+vantage6/cli/node/set_api_key.py,sha256=2kB8wveTy9_N8kX4huVhJhY86Ppd2BI8v-d7MRXQAdA,1877
+vantage6/cli/node/start.py,sha256=LsHoIKprsfyoDAbSwxCCux3W5zZHsaEiOKz1dZ9-ynE,12395
+vantage6/cli/node/stop.py,sha256=Hf5z2r6ttbW-DeU0cdHNXIJcgL-eIVRv8i7zZLo4foY,4159
+vantage6/cli/node/version.py,sha256=X921xyIvIPYObPac2Si5msZ2tay5ySidnPWmGj1ilZw,1959
+vantage6/cli/node/common/__init__.py,sha256=Jq3cI0Y1cybM_khCmdl1xwY1H6FLNJSHuu1J85DFg7Q,3461
+vantage6/cli/rabbitmq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vantage6/cli/rabbitmq/definitions.py,sha256=CcS9jG7ZGB6LjzHQqZ2FliDurPItUvNSjHrOYptORZg,637
+vantage6/cli/rabbitmq/queue_manager.py,sha256=KGDGHy4NBN8O9xhjzfI7mh65i9lOQIqQwrOFqvGFdHI,7545
+vantage6/cli/rabbitmq/rabbitmq.config,sha256=LYAQAEoXaF472XeJDYXc9JfWSETIzPRIR2W-JB2i7fU,136
+vantage6/cli/server/attach.py,sha256=q1E40nGCBEFUF1p94sZoU-Ud3OXAUy4-FJqcP7Gqa7U,322
+vantage6/cli/server/files.py,sha256=LJhFyYHcEnCgFhVAM-lX6_EnfhMJ7YPdN21kVIpmwkc,507
+vantage6/cli/server/import_.py,sha256=mp6DgHzmRXd_M_507QPJOp0IiAtbXJY4V0IZxdkY0Lg,4516
+vantage6/cli/server/list.py,sha256=62ocNRtOAwbx9bgviva4Nd7_3rA7XmFDA55SPyNWZ1o,403
+vantage6/cli/server/new.py,sha256=JnUMMD0UUSCOdO0K7v19l5HOV7vnMd9D38WUoEJ2F00,2094
+vantage6/cli/server/remove.py,sha256=6tfKfVa5dYnZAKQYo_VlGZTuiugi7sh2F3U2cZ7mCmQ,1627
+vantage6/cli/server/shell.py,sha256=9b_koFmBQRQYIK57usm75hZAaIF4msicLTu55dYHlzM,1583
+vantage6/cli/server/start.py,sha256=sHTK7tCwLvFJbNKac5FB1IYhb8oTUrA9rM3nKjIplHw,7740
+vantage6/cli/server/stop.py,sha256=tUreB1ogc9SwKMrmejfvErtwt9d5M_qOON2s9UZmLvE,4135
+vantage6/cli/server/version.py,sha256=AUYp0CJBnYF8tD3HXqE7kM0RycXipjOYEDkraswUlaA,1306
+vantage6/cli/server/common/__init__.py,sha256=htv0mFYa4GhIHdzA2xqUUgKhHcMh09UQERlIjIgrwOM,2062
+vantage6/cli/template/algo_store_config.j2,sha256=QBGakqMOvUTcOIdAqoR4X6E8eApQ65ggAnQmaUViAV0,554
+vantage6/cli/template/node_config.j2,sha256=TPeCbfYEblwWonZkyBqzXluaoN-w0MpthwMTN8lTTW8,805
+vantage6/cli/template/server_config.j2,sha256=LKPa-ocK7h8qXgzrEYVHjxovaGX0CRQ0uPXImdAcpz0,804
+vantage6/cli/template/server_import_config.j2,sha256=9WT2XeG9-ADoYLb4ahXhof3i9Fcvg0oqwNPyFwLJpvc,1827
+vantage6/cli/test/feature_tester.py,sha256=M8hvebupPwYjcBZoUB8GB3qb8G1-d3ipNzRMc_3-Z8E,2761
+vantage6/cli/test/integration_test.py,sha256=MctR_t-WEyxzFpMdc6ByTcX1BQglZiT5-CIOQXTBBWo,4034
+vantage6/cli/test/common/diagnostic_runner.py,sha256=F8vEaCD6HeKWDcQGVzRkPYxdvEk9owqfciOVdN3bHbw,6607
+vantage6-5.0.0a9.dist-info/METADATA,sha256=VZAGO7gSOV-MCOqhOESnDpNYjKBMQA9UjocVy6vKUQ4,10884
+vantage6-5.0.0a9.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+vantage6-5.0.0a9.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
+vantage6-5.0.0a9.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-5.0.0a9.dist-info/RECORD,,