experiment_server 0.3.2__tar.gz → 0.3.3__tar.gz

{experiment_server-0.3.2 → experiment_server-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
-Name: experiment-server
-Version: 0.3.2
+Name: experiment_server
+Version: 0.3.3
 Summary: Server for experiments to get configuarations from
 Home-page: https://shariff-faleel.com/experiment_server/
 License: MIT
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: Jinja2 (>=3.1.2)
 Requires-Dist: asyncio (>=3.4.3)
 Requires-Dist: click (>=6.0)

{experiment_server-0.3.2 → experiment_server-0.3.3}/experiment_server/_server.py

@@ -320,7 +320,7 @@ class ExperimentHandler(RequestHandler):
 
             try:
                 block_name = self.experiment.move_to_next(participant_id)
-                logger.info(f"Loading block: {self.experiment.get_participant_state(participant_id).block}\n")
+                logger.info(f"Loading block: {self.experiment.get_participant_state(participant_id).block_name}\n")
                 self.write({"name": block_name})
             except KeyError:
                 self.write(f"Participant with ID {participant_id} not known. Consider initializing new participant.")

{experiment_server-0.3.2 → experiment_server-0.3.3}/experiment_server/cli.py

@@ -1,6 +1,7 @@
 """CLI."""
 
 import click
+from click.core import ParameterSource
 from loguru import logger
 from pathlib import Path
 from click_aliases import ClickAliasedGroup
@@ -16,11 +17,29 @@ def cli():
     pass
 
 
+def _ask_default_participant_index_callback(ctx:click.Context, _, flag_value:bool):
+    """Callback used to process the ask-default-participant-index in the run."""
+    if not flag_value:
+        return
+
+    if ctx.get_parameter_source("default_participant_index") != ParameterSource.DEFAULT:
+        logger.warning("The value passed for `default_participant_index` (-i) is being overwritten with `ask_default_participant_index` (-a).")
+    if "default_participant_index" in ctx.params:
+        default_value = ctx.params["default_participant_index"]
+    else:
+        default_value = 1
+    ctx.params["default_participant_index"] = click.prompt("Default participant index",
+                                                           default_value,
+                                                           type=click.IntRange(min=1, max_open=True))
+
+
 @cli.command(aliases=["r"])
 @click.argument("config-file")
-@click.option("-i", "--default-participant-index", default=1, type=click.IntRange(min=1, max_open=True))
+# NOTE: making this eager to make sure the data is set for the ask callback
+@click.option("-i", "--default-participant-index", default=1, type=click.IntRange(min=1, max_open=True), is_eager=True)
 @click.option("-h", "--host", default='127.0.0.1')
 @click.option("-p", "--port", default='5000')
+@click.option("-a", "--ask-default-participant-index", is_flag=True, default=False, expose_value=False, callback=_ask_default_participant_index_callback)
 def run(default_participant_index, config_file, host, port):
     """Launch server with the `config-file` used to setup the configurations"""
     _server(default_participant_index=default_participant_index if default_participant_index > 0 else None, host=host, port=port, config_file=config_file)
@@ -64,7 +83,7 @@ def new_config_file(new_file_location):
     """
     out_location = Path(new_file_location)
 
-    if out_location.suffix is not ".toml":
+    if out_location.suffix != ".toml":
         if out_location.exists():
             logger.error(f"{out_location} exists and does not end with `.toml`")
             return

{experiment_server-0.3.2 → experiment_server-0.3.3}/experiment_server/static/index.html

@@ -196,18 +196,18 @@
 			    hx-trigger="click"
                             hx-include="#checkUseDefault,#txtPPID"
 			    hx-swap="none">
-			View config
+			View config for participant
 		        </button>
 		    </div>
 	        </div>
 	        <div class="row">
 		    <div class="col-sm-12">
 		        <button id="btnResetConfig" type="button" style="width:100%" class="btn btn-primary"
-                            hx-get="/web/reset-config"
+                            hx-get="/web/reset-participant"
 			    hx-trigger="click"
                             hx-include="#checkUseDefault,#txtPPID"
 			    hx-swap="none">
-			Reset config
+			Reset config for participant
 		        </button>
 		    </div>
 	        </div>

{experiment_server-0.3.2 → experiment_server-0.3.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "experiment_server"
-version = "0.3.2"
+version = "0.3.3"
 description = "Server for experiments to get configuarations from"
 
 license = "MIT"