Code

Setup CLI#401

Code

Open

tieneupin wants to merge 94 commits intomainDiamondLightSource/python-murfey:mainfrom setup-cliDiamondLightSource/python-murfey:setup-cliCopy head branch name to clipboard

+1,898-170

Commits

Commits on Oct 15, 2024

• The machine config for the instrument is already accessed via key

  d-j-hatton

  committed
  02c9b17

• No longer strictly an int

  d-j-hatton

  committed
  3d747ad

Commits on Oct 17, 2024

• Allow spaces in directory names when looking for gain references

  d-j-hatton

  committed
  66a424d

• Fix for instrument card display now that the whole machine configuration is pulled by the server

  d-j-hatton

  committed
  c18c782

• Ignore parts with spaces, don't remove them

  d-j-hatton

  committed
  29f50ac

• Remove unused function

  d-j-hatton

  committed
  8e4b0e2

• THe function wasn't unused but should be renamed

  d-j-hatton

  committed
  60ec9a1

• If there is no ISPyB connection then autogenerate data collection and processing job IDs in the Murfey database

  d-j-hatton

  committed
  7c6548f

• Setup for multigrid controller to be able to skip the rsync step

  d-j-hatton

  committed
  a1996a9

Commits on Oct 18, 2024

• Make data transfer option configurable

  d-j-hatton

  committed
  df0719c

• Extend data transfer option configuration to TUI

  d-j-hatton

  committed
  42984f1

Commits on Oct 21, 2024

• Add visit creation option in TUI

  d-j-hatton

  committed
  600d71f

Commits on Oct 24, 2024

• Explanatory comment

  d-j-hatton

  committed
  d171395

• Remove some path construction that is specific to DLS directory structure

  d-j-hatton

  committed
  aed6c98

• Starting to add some description to configuration

  d-j-hatton

  committed
  74871e1

• Further improvements to machine configuration including some validation depending on other configuration operations

  d-j-hatton

  committed
  7fc5e28

• Early development of command line tool for generating a configuration file

  d-j-hatton

  committed
  b6b6b50

Commits on Nov 11, 2024

• Merged recent changes from 'main' branch

  tieneupin

  committed
  616ecaf

Commits on Nov 12, 2024

• Rearranged MachineConfig keys by purpose and added descriptions

  tieneupin

  committed
  db60fa4

Commits on Nov 13, 2024

• Renamed Security as ServerConfig, given the change in its contents

  tieneupin

  committed
  816738a

• Fixed '_resize_initial_model' since 'executables' dict stores Path objects now.

  tieneupin

  committed
  70e1c68

• Replaced 'from_file' with 'machine_config_from_file' for greater clarity

  tieneupin

  committed
  c53b099

• Updated code to reflect type changes of parameters from str to Path and making keys Optional in MachineConfig

  tieneupin

  committed
  3e13879

• Renamed 'security_from_file' to 'server_config_from_file' for greater clarity

  tieneupin

  committed
  203eaac

• Renamed 'ServerConfig' to 'GlobalConfig' and 'get_security_config' to 'get_global_config'

  tieneupin

  committed
  2888524

• Missed renaming 'get_security_config' in 'tests' folder

  tieneupin

  committed
  bde9c95

• Added default options to the description of 'flip_gain'

  tieneupin

  committed
  edfb058

Commits on Nov 14, 2024

• Rearranged keys and updated descriptions

  tieneupin

  committed
  c1a7ccf

• Updated 'generate_config' CLI (WIP)

  tieneupin

  committed
  e6178db

Commits on Nov 15, 2024

• Fixed errors in code logic

  tieneupin

  committed
  4e77371

• Set data transfer and data processing to False by default; set rsync basepath to / by default; added Config class to MachineConfig model

  tieneupin

  committed
  3ac7467

• Fixed logic in setup to save config as a YAML file with complex objects properly serialised

  tieneupin

  committed
  b7ac67f

Commits on Nov 18, 2024

• Adjusted type hint for 'rsync_module'

  tieneupin

  committed
  e7b37bf

• Fixed logic when saving config; adjusted colour of messages

  tieneupin

  committed
  617d84b

• Added debug flag for machine config setup; further updated colours of messages

  tieneupin

  committed
  92a57df

• Replaced 'exit() in 'set_up_machine_config' with 'return'.

  tieneupin

  committed
  bf2ce95

• Added function to set up data directories

  tieneupin

  committed
  4cf7e2a

• Updated notes and type hints for 'camera'

  tieneupin

  committed
  a7a6b05

• Added function to set up directories for Murfey to create

  tieneupin

  committed
  71de649

• Added function to set up folders to analyse; added validation to setup functions

  tieneupin

  committed
  422d1f5

Commits on Nov 19, 2024

• Added function to standardise field validation.

  tieneupin

  committed
  0cf5b15

• Updated field description

  tieneupin

  committed
  97e7117

• Added more helper functions to construct generics lists and dicts, and to check for value duplicates; updated grammar for some of the auto-generated prompts

  tieneupin

  committed
  03d60f5

Commits on Nov 20, 2024

• Replaced requesting for calibration JSONs with manual input instead (not everyone will have calibrations in readable formats)

  tieneupin

  committed
  9954b76

• Added logic to sort fully numeric dictionary keys numerically and separately from alphanumeric ones

  tieneupin

  committed
  8c5b3a8

• Updated dictionary and list sorting conditions

  tieneupin

  committed
  431e477

• Updated dictionary and list sorting conditions

  tieneupin

  committed
  b551dfd

• Fixed sorting logic for lists and dicts; added option to restrict allowed type inputs

  tieneupin

  committed
  e21928a

• Replaced more parts of the config setup with the generic dict and list construction functions

  tieneupin

  committed
  e64eadd

• Added option to pass functions as inputs to the list and dict constructors, allowing for nested data structures

  tieneupin

  committed
  24f3a49

• Replaced parts of 'add_software_package' with the generic list and dict constructors

  tieneupin

  committed
  a8e66eb

• Replaced parts of 'add_create_directories' with the generic dict constructor

  tieneupin

  committed
  e784085

• Added generic constructors for folder names, folder paths, and file paths

  tieneupin

  committed
  9b7f6de

• Replaced directory creation functions with the generic ones

  tieneupin

  committed
  9d6679a

Commits on Nov 21, 2024

• Updated description to make it more accurate

  tieneupin

  committed
  423460d

• Updated description of 'upstream_data_directories'

  tieneupin

  committed
  d90b585

• Added function to handle data transfer related fields in config

  tieneupin

  committed
  975f04a

• Added placeholders to lambda functions to make sure sorting criteria tuples are of same length

  tieneupin

  committed
  2925f66

• Allowed more functions to offer to be run again if a field fails validation

  tieneupin

  committed
  0cffe36

• Added function to populate data processing fields in config

  tieneupin

  committed
  c3be80e

• Adjusted order of some keys in MachineConfig

  tieneupin

  committed
  ae8a9fe

• Updated descriptionof 'external_environment' field in MachineConfig

  tieneupin

  committed
  8878244

• Added functions to handle external executables and environments, as well as Murfey plugins

  tieneupin

  committed
  1f6a774

• Forgot to remove a #TODO comment

  tieneupin

  committed
  6ffd694

• Added logic to write machine configs to YAML file in alphabetical order of instrument name

  tieneupin

  committed
  0dae68a

• Add alias to 'global_configuration_path' to facilitate shift away from 'security_configuration_path'

  tieneupin

  committed
  d977662

• Added a welcome panel to the setup tool; adjusted font colours

  tieneupin

  committed
  c543f6a

Commits on Dec 18, 2024

• Merged recent changes from main branch

  tieneupin

  committed
  3c6a31b

• Put y/n prompt in a different colour

  tieneupin

  committed
  8db6865

Commits on Dec 19, 2024

• Allow setup wizard to skip sections if they are disabled; updated font styles of config key descriptions

  tieneupin

  committed
  094470e

• Renamed 'generate_config' to 'create_config'

  tieneupin

  committed
  043046e

• Empty console inputs for simple fields are now converted to the default field values

  tieneupin

  committed
  cfffcf2

• Updated data directories type from dict[str, str] to list[Path]; changed default camera value to ''

  tieneupin

  committed
  aab451f

• Added logic to use default values for fields if empty console input is received; updated 'data_directories' creation function to reflect change in MachineConfig

  tieneupin

  committed
  436fab7

• Recipe keys are nowtype hinted as string literals

  tieneupin

  committed
  ae2d291

• Grouped 'rsync_url' together with other data transfer-related keys

  tieneupin

  committed
  53a30ad

• Updated printed messages

  tieneupin

  committed
  194341b

• Removed unused variable

  tieneupin

  committed
  2b25266

• Modernised type hints

  tieneupin

  committed
  93ebb07

• Fixed improperly cased 'GLOBAL_CONFIGURATION_PATH'

  tieneupin

  committed
  d19683d

• Union type hint still needed for Python 3.9 pytest tests

  tieneupin

  committed
  05b1057

• Fixed improperly cased 'MURFEY_GLOBAL_CONFIGURATION'

  tieneupin

  committed
  d43ab64

Commits on Dec 20, 2024

• 'murfey_db_credentials' in GlobalConfig is now a Path

  tieneupin

  committed
  85d905d

• 'murfey_db_credentials' no longer part of MachineConfig

  tieneupin

  committed
  c8e6caa

• Added description for 'sqlalchemy_pooling' field in GlobalConfig

  tieneupin

  committed
  0b12cb7

• Added description for the 'crypto_key' field in the GlobalConfig

  tieneupin

  committed
  01f9532

• Added description for the 'feedback_queue' field in the GlobalConfig

  tieneupin

  committed
  22b72f3

• Added description for the 'auth_type' field in the GlobalConfig

  tieneupin

  committed
  3742c71

Commits on Jan 7, 2025

• Merged recent changes from 'main' branch

  tieneupin

  committed
  67e9322

• 'MachineConfig.rsync_basepath' is now no longer None

  tieneupin

  committed
  aba0618

• Grouped all skippable keys under a single 'if' block

  tieneupin

  committed
  af80bf3

Commits on Jan 8, 2025

• Adjust logic for using default values when an empty console input is provided

  tieneupin

  committed
  9167512

Commits on Jan 10, 2025

• Merged recent changes from 'main' branch and resolved merge conflicts

  tieneupin

  committed
  a69aa2a

• 'murfey_db_credentials', and 'rabbit_mq_credentials' should be mandatory fields, but have type Optional[Path]

  tieneupin

  committed
  838720f