diff --git a/src/deadline/client/api/_loginout.py b/src/deadline/client/api/_loginout.py index 68e7d841..81fe5674 100644 --- a/src/deadline/client/api/_loginout.py +++ b/src/deadline/client/api/_loginout.py @@ -70,7 +70,7 @@ def _login_deadline_cloud_monitor( # Deadline Cloud monitor is a GUI app that will keep on running # So we sit here and test that profile for validity until it works if check_authentication_status(config) == AwsAuthenticationStatus.AUTHENTICATED: - return f"Deadline Cloud monitor Profile: {profile_name}" + return f"Deadline Cloud monitor profile: {profile_name}" if on_cancellation_check: # Check if the UI has signaled a cancel if on_cancellation_check(): @@ -81,10 +81,10 @@ def _login_deadline_cloud_monitor( # but let's be specific about Deadline Cloud monitor failing incase the error is non-obvious # and let's tack on stdout incase it helps err_prefix = ( - f"Deadline Cloud monitor was not able to log into the {profile_name} profile: " + f"Deadline Cloud monitor was not able to log into the {profile_name} profile:" ) out = p.stdout.read().decode("utf-8") if p.stdout else "" - raise DeadlineOperationError(f"{err_prefix}:\n{out}") + raise DeadlineOperationError(f"{err_prefix}\n{out}") time.sleep(0.5) diff --git a/src/deadline/client/ui/dataclasses/__init__.py b/src/deadline/client/ui/dataclasses/__init__.py index fc30686b..5c1adf20 100644 --- a/src/deadline/client/ui/dataclasses/__init__.py +++ b/src/deadline/client/ui/dataclasses/__init__.py @@ -21,7 +21,7 @@ class JobBundleSettings: # pylint: disable=too-many-instance-attributes submitter_name: str = field(default="JobBundle") # Shared settings - name: str = field(default="Job Bundle") + name: str = field(default="Job bundle") description: str = field(default="") # Job Bundle settings @@ -42,7 +42,7 @@ class CliJobSettings: # pylint: disable=too-many-instance-attributes submitter_name: str = field(default="CLI") # Shared settings - name: str = field(default="CLI Job") + name: str = field(default="CLI job") description: str = field(default="") # CLI job settings diff --git a/src/deadline/client/ui/dev_application.py b/src/deadline/client/ui/dev_application.py index d57f8812..ae308834 100644 --- a/src/deadline/client/ui/dev_application.py +++ b/src/deadline/client/ui/dev_application.py @@ -42,11 +42,11 @@ def __init__(self, parent=None): ) def setup_ui(self): - submit = self.menuBar().addMenu("&Submit Job") - submit.addAction("Submit Job Bundle...", self.submit_job_bundle) - submit.addAction("Submit CLI Job...", self.submit_cli_job) + submit = self.menuBar().addMenu("&Submit job") + submit.addAction("Submit job bundle...", self.submit_job_bundle) + submit.addAction("Submit CLI job...", self.submit_cli_job) account = self.menuBar().addMenu("&Account") - account.addAction("AWS Deadline Cloud Workstation Configuration...", self.configure) + account.addAction("AWS Deadline Cloud workstation configuration...", self.configure) account.addAction("Log in to AWS Deadline Cloud...", self.login) account.addAction("Log out of AWS Deadline Cloud...", self.logout) @@ -59,7 +59,7 @@ def submit_job_bundle(self): os.path.join(__file__, "../resources/cli_job_bundle") ) input_job_bundle_dir = QFileDialog.getExistingDirectory( - self, "Choose Job Bundle Directory", input_job_bundle_dir + self, "Choose job bundle directory", input_job_bundle_dir ) if input_job_bundle_dir: show_job_bundle_submitter( @@ -95,7 +95,7 @@ def app() -> None: app.setStyle(QStyleFactory.create("fusion")) # Set the application info. - app.setApplicationName("AWS Deadline Cloud Client Test GUI") + app.setApplicationName("AWS Deadline Cloud client test GUI") app.setOrganizationName("AWS") app.setOrganizationDomain("https://aws.amazon.com/") icon = QIcon(str(Path(__file__).parent / "resources" / "deadline_logo.svg")) diff --git a/src/deadline/client/ui/dialogs/deadline_config_dialog.py b/src/deadline/client/ui/dialogs/deadline_config_dialog.py index a76c3a0d..aa3d421e 100644 --- a/src/deadline/client/ui/dialogs/deadline_config_dialog.py +++ b/src/deadline/client/ui/dialogs/deadline_config_dialog.py @@ -77,7 +77,7 @@ def __init__(self, parent=None) -> None: parent=parent, f=Qt.WindowSystemMenuHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint ) - self.setWindowTitle("AWS Deadline Cloud Workstation Configuration") + self.setWindowTitle("AWS Deadline Cloud workstation configuration") self.deadline_authentication_status = DeadlineAuthenticationStatus.getInstance() self._build_ui() @@ -191,25 +191,25 @@ def _build_ui(self): self._refresh_callbacks: List[Callable] = [] # Global settings - self.global_settings_group = QGroupBox(parent=self, title="Global Settings") + self.global_settings_group = QGroupBox(parent=self, title="Global settings") self.layout.addWidget(self.global_settings_group) global_settings_layout = QFormLayout(self.global_settings_group) self._build_global_settings_ui(self.global_settings_group, global_settings_layout) # AWS Profile-specific settings - self.profile_settings_group = QGroupBox(parent=self, title="Profile Settings") + self.profile_settings_group = QGroupBox(parent=self, title="Profile settings") self.layout.addWidget(self.profile_settings_group) profile_settings_layout = QFormLayout(self.profile_settings_group) self._build_profile_settings_ui(self.profile_settings_group, profile_settings_layout) # Farm-specific settings - self.farm_settings_group = QGroupBox(parent=self, title="Farm Settings") + self.farm_settings_group = QGroupBox(parent=self, title="Farm settings") self.layout.addWidget(self.farm_settings_group) farm_settings_layout = QFormLayout(self.farm_settings_group) self._build_farm_settings_ui(self.farm_settings_group, farm_settings_layout) # General settings - self.general_settings_group = QGroupBox(parent=self, title="General Settings") + self.general_settings_group = QGroupBox(parent=self, title="General settings") self.layout.addWidget(self.general_settings_group) general_settings_layout = QFormLayout(self.general_settings_group) self._build_general_settings_ui(self.general_settings_group, general_settings_layout) @@ -218,37 +218,39 @@ def _build_ui(self): def _build_global_settings_ui(self, group, layout): self.aws_profiles_box = QComboBox(parent=group) - aws_profile_label = self.labels["defaults.aws_profile_name"] = QLabel("AWS Profile") + aws_profile_label = self.labels["defaults.aws_profile_name"] = QLabel("AWS profile") layout.addRow(aws_profile_label, self.aws_profiles_box) self.aws_profiles_box.currentTextChanged.connect(self.aws_profile_changed) def _build_profile_settings_ui(self, group, layout): self.job_history_dir_edit = DirectoryPickerWidget( initial_directory="", - directory_label="Job History Dir", + directory_label="Job history directory", parent=group, collapse_user_dir=True, ) - job_history_dir_label = self.labels["settings.job_history_dir"] = QLabel("Job History Dir") + job_history_dir_label = self.labels["settings.job_history_dir"] = QLabel( + "Job history directory" + ) layout.addRow(job_history_dir_label, self.job_history_dir_edit) self.job_history_dir_edit.path_changed.connect(self.job_history_dir_changed) self.default_farm_box = DeadlineFarmListComboBox(parent=group) - default_farm_box_label = self.labels["defaults.farm_id"] = QLabel("Default Farm") + default_farm_box_label = self.labels["defaults.farm_id"] = QLabel("Default farm") self.default_farm_box.box.currentIndexChanged.connect(self.default_farm_changed) self.default_farm_box.background_exception.connect(self.handle_background_exception) layout.addRow(default_farm_box_label, self.default_farm_box) def _build_farm_settings_ui(self, group, layout): self.default_queue_box = DeadlineQueueListComboBox(parent=group) - default_queue_box_label = self.labels["defaults.queue_id"] = QLabel("Default Queue") + default_queue_box_label = self.labels["defaults.queue_id"] = QLabel("Default queue") self.default_queue_box.box.currentIndexChanged.connect(self.default_queue_changed) self.default_queue_box.background_exception.connect(self.handle_background_exception) layout.addRow(default_queue_box_label, self.default_queue_box) self.default_storage_profile_box = DeadlineStorageProfileNameListComboBox(parent=group) default_storage_profile_box_label = self.labels["settings.storage_profile_id"] = QLabel( - "Default Storage Profile" + "Default storage profile" ) self.default_storage_profile_box.box.currentIndexChanged.connect( self.default_storage_profile_name_changed @@ -273,17 +275,17 @@ def _build_farm_settings_ui(self, group, layout): group=group, layout=layout, setting_name="defaults.job_attachments_file_system", - label_text="Job Attachments FileSystem Options", + label_text="Job attachments filesystem options", label_tooltip=job_attachments_file_system_tooltip, values_with_tooltips=values_with_tooltips, ) def _build_general_settings_ui(self, group, layout): self.auto_accept = self._init_checkbox_setting( - group, layout, "settings.auto_accept", "Auto Accept Prompt Defaults" + group, layout, "settings.auto_accept", "Auto accept prompt defaults" ) self.telemetry_opt_out = self._init_checkbox_setting( - group, layout, "telemetry.opt_out", "Telemetry Opt Out" + group, layout, "telemetry.opt_out", "Telemetry opt out" ) self._conflict_resolution_options = [option.name for option in FileConflictResolution] @@ -291,7 +293,7 @@ def _build_general_settings_ui(self, group, layout): group, layout, "settings.conflict_resolution", - "Conflict Resolution Option", + "Conflict resolution option", self._conflict_resolution_options, ) @@ -300,7 +302,7 @@ def _build_general_settings_ui(self, group, layout): group, layout, "settings.log_level", - "Current Logging Level", + "Current logging level", self._log_levels, ) @@ -554,7 +556,7 @@ def apply(self) -> bool: if value.startswith(NOT_VALID_MARKER): QMessageBox.warning( self, - "Apply Changes", + "Apply changes", f"Cannot apply changes, {value} is not valid for setting {setting_name}", ) return False @@ -695,7 +697,7 @@ def refresh_list(self): self.__refresh_id += 1 self.__refresh_thread = threading.Thread( target=self._refresh_thread_function, - name=f"AWS Deadline Cloud Refresh {self.resource_name} Thread", + name=f"AWS Deadline Cloud refresh {self.resource_name} thread", args=(self.__refresh_id, config), ) self.__refresh_thread.start() @@ -738,7 +740,7 @@ def _refresh_thread_function(self, refresh_id: int, config: Optional[ConfigParse self._list_update.emit(refresh_id, resources) except BaseException as e: if not self.canceled and refresh_id == self.__refresh_id: - self.background_exception.emit(f"Refresh {self.resource_name}s List", e) + self.background_exception.emit(f"Refresh {self.resource_name}s list", e) class DeadlineFarmListComboBox(_DeadlineResourceListComboBox): @@ -776,7 +778,7 @@ class DeadlineStorageProfileNameListComboBox(_DeadlineResourceListComboBox): def __init__(self, parent=None): super().__init__( - resource_name="Storage Profile", + resource_name="Storage profile", setting_name="settings.storage_profile_id", parent=parent, ) diff --git a/src/deadline/client/ui/dialogs/deadline_login_dialog.py b/src/deadline/client/ui/dialogs/deadline_login_dialog.py index ba0902c1..d04ee744 100644 --- a/src/deadline/client/ui/dialogs/deadline_login_dialog.py +++ b/src/deadline/client/ui/dialogs/deadline_login_dialog.py @@ -7,7 +7,7 @@ if DeadlineLoginDialog.login(parent=self): print("Logged in successfully.") else: - print("Failed to login.") + print("Failed to log in.") """ __all__ = ["DeadlineLoginDialog"] @@ -37,7 +37,7 @@ class DeadlineLoginDialog(QMessageBox): if DeadlineLoginDialog.login(parent=self): print("Logged in successfully.") else: - print("Failed to login.") + print("Failed to log in.") """ # This signal is sent when the background login thread raises an exception. @@ -132,7 +132,7 @@ def _start_login(self) -> None: """ self.__login_thread = threading.Thread( - target=self._login_background_thread, name="AWS Deadline Cloud Login Thread" + target=self._login_background_thread, name="AWS Deadline Cloud login thread" ) self.__login_thread.start() diff --git a/src/deadline/client/ui/dialogs/submit_job_progress_dialog.py b/src/deadline/client/ui/dialogs/submit_job_progress_dialog.py index 080210f1..6de80c2d 100644 --- a/src/deadline/client/ui/dialogs/submit_job_progress_dialog.py +++ b/src/deadline/client/ui/dialogs/submit_job_progress_dialog.py @@ -154,10 +154,10 @@ def _build_ui(self): self.status_label = QLabel("Preparing files...") self.status_label.setMargin(5) self.hashing_progress = JobAttachmentsProgressWidget( - initial_message="Preparing for hashing...", title="Hashing Progress", parent=self + initial_message="Preparing for hashing...", title="Hashing progress", parent=self ) self.upload_progress = JobAttachmentsProgressWidget( - initial_message="Preparing for upload...", title="Upload Progress", parent=self + initial_message="Preparing for upload...", title="Upload progress", parent=self ) self.summary_edit = QTextEdit() self.summary_edit.setVisible(False) @@ -172,7 +172,7 @@ def _build_ui(self): self.lyt.addWidget(self.summary_edit) self.lyt.addWidget(self.button_box) - self.setWindowTitle("AWS Deadline Cloud Submission") + self.setWindowTitle("AWS Deadline Cloud submission") self.hashing_thread_progress_report.connect(self.handle_hashing_thread_progress_report) self.hashing_thread_succeeded.connect(self.handle_hashing_thread_succeeded) @@ -411,7 +411,7 @@ def _create_job_background_thread(self) -> None: def _continue_create_job_wait() -> bool: return self._continue_submission - logger.info("Waiting for Job to be created...") + logger.info("Waiting for job to be created...") success = False @@ -434,7 +434,7 @@ def _continue_create_job_wait() -> bool: ) message += f"\n{job_id}\n" else: - message = "CreateJob response was empty, or did not contain a Job ID." + message = "CreateJob response was empty, or did not contain a job ID." if success: self.create_job_thread_succeeded.emit(success, message) else: @@ -461,7 +461,7 @@ def _start_hashing( self.status_label.setText("Hashing job attachments...") self.__hashing_thread = threading.Thread( target=self._hashing_background_thread, - name="AWS Deadline Cloud Hashing Background Thread", + name="AWS Deadline Cloud hashing background thread", args=(asset_groups, total_input_files, total_input_bytes), ) self.__hashing_thread.start() @@ -473,7 +473,7 @@ def _start_upload(self, asset_manifests: List[AssetRootManifest]) -> None: self.status_label.setText("Uploading job attachments...") self.__upload_thread = threading.Thread( target=self._upload_background_thread, - name="AWS Deadline Cloud Upload Background Thread", + name="AWS Deadline Cloud upload background thread", args=(asset_manifests,), ) self.__upload_thread.start() @@ -482,10 +482,10 @@ def _start_create_job(self) -> None: """ Starts the background thread to call CreateJob. """ - self.status_label.setText("Waiting for Job to be created...") + self.status_label.setText("Waiting for job to be created...") self.__create_job_thread = threading.Thread( target=self._create_job_background_thread, - name="AWS Deadline Cloud CreateJob Background Thread", + name="AWS Deadline Cloud CreateJob background thread", ) self.__create_job_thread.start() @@ -524,7 +524,7 @@ def handle_hashing_thread_succeeded( hashing_summary, from_gui=True ) self.summary_edit.setText( - f"\nHashing Summary:\n{textwrap.indent(str(hashing_summary), ' ')}" + f"\nHashing summary:\n{textwrap.indent(str(hashing_summary), ' ')}" ) self._start_upload(asset_manifests) @@ -546,7 +546,7 @@ def handle_upload_thread_succeeded( ) self.summary_edit.setText( f"{self.summary_edit.toPlainText()}" - + f"\nUpload Summary:\n{textwrap.indent(str(upload_summary), ' ')}" + + f"\nUpload summary:\n{textwrap.indent(str(upload_summary), ' ')}" ) self._start_create_job() @@ -564,11 +564,11 @@ def handle_create_job_thread_succeeded(self, success: bool, status_message: str) if success: self._submission_complete = True - self.status_label.setText("Submission Complete") + self.status_label.setText("Submission complete") self.button_box.setStandardButtons(QDialogButtonBox.Ok) self.button_box.button(QDialogButtonBox.Ok).setDefault(True) else: - self.status_label.setText("Submission Error") + self.status_label.setText("Submission error") self.button_box.setStandardButtons(QDialogButtonBox.Close) self.button_box.button(QDialogButtonBox.Close).setDefault(True) @@ -585,7 +585,7 @@ def handle_thread_exception(self, e: BaseException) -> None: self.upload_progress.setVisible(False) self.status_label.setVisible(False) self.button_box.setStandardButtons(QDialogButtonBox.Close) - self.summary_edit.setText(f"Error Occurred: {str(e)}") + self.summary_edit.setText(f"Error occurred: {str(e)}") self.summary_edit.setVisible(True) self.adjustSize() logger.error(str(e)) @@ -653,7 +653,7 @@ def _confirm_asset_references_outside_storage_profile( dont_ask_button.clicked.connect(lambda: set_setting("settings.auto_accept", "true")) message_box.addButton(dont_ask_button, QMessageBox.ActionRole) - message_box.setWindowTitle("Job Attachments Valid Files Confirmation") + message_box.setWindowTitle("Job attachments valid files confirmation") selection = message_box.exec() return selection != QMessageBox.Cancel diff --git a/src/deadline/client/ui/dialogs/submit_job_to_deadline_dialog.py b/src/deadline/client/ui/dialogs/submit_job_to_deadline_dialog.py index da3cd305..f7b463a2 100644 --- a/src/deadline/client/ui/dialogs/submit_job_to_deadline_dialog.py +++ b/src/deadline/client/ui/dialogs/submit_job_to_deadline_dialog.py @@ -177,7 +177,7 @@ def _build_ui( self.submit_button = QPushButton("Submit") self.submit_button.clicked.connect(self.on_submit) self.button_box.addButton(self.submit_button, QDialogButtonBox.AcceptRole) - self.export_bundle_button = QPushButton("Export Bundle") + self.export_bundle_button = QPushButton("Export bundle") self.export_bundle_button.clicked.connect(self.on_export_bundle) self.button_box.addButton(self.export_bundle_button, QDialogButtonBox.AcceptRole) @@ -197,7 +197,7 @@ def _set_submit_button_state(self): if not enable: self.submit_button.setToolTip( - "Cannot submit job to deadline cloud. Nonvalid credentials or queue parameters." + "Cannot submit job to Deadline Cloud. Nonvalid credentials or queue parameters." ) else: self.submit_button.setToolTip("") @@ -233,7 +233,7 @@ def keyPressEvent(self, event: QKeyEvent) -> None: def _build_shared_job_settings_tab(self, initial_job_settings, initial_shared_parameter_values): self.shared_job_settings_tab = QScrollArea() - self.tabs.addTab(self.shared_job_settings_tab, "Shared Job Settings") + self.tabs.addTab(self.shared_job_settings_tab, "Shared job settings") self.shared_job_settings = SharedJobSettingsWidget( initial_settings=initial_job_settings, initial_shared_parameter_values=initial_shared_parameter_values, @@ -246,7 +246,7 @@ def _build_shared_job_settings_tab(self, initial_job_settings, initial_shared_pa def _build_job_settings_tab(self, job_setup_widget_type, initial_job_settings): self.job_settings_tab = QScrollArea() - self.tabs.addTab(self.job_settings_tab, "Job-Specific Settings") + self.tabs.addTab(self.job_settings_tab, "Job-specific settings") self.job_settings_tab.setWidgetResizable(True) self.job_settings = job_setup_widget_type( @@ -260,7 +260,7 @@ def _build_job_attachments_tab( self, auto_detected_attachments: AssetReferences, attachments: AssetReferences ): self.job_attachments_tab = QScrollArea() - self.tabs.addTab(self.job_attachments_tab, "Job Attachments") + self.tabs.addTab(self.job_attachments_tab, "Job attachments") self.job_attachments = JobAttachmentsWidget( auto_detected_attachments, attachments, parent=self ) @@ -270,7 +270,7 @@ def _build_job_attachments_tab( def _build_host_requirements_tab(self): self.host_requirements = HostRequirementsWidget() self.host_requirements_tab = QScrollArea() - self.tabs.addTab(self.host_requirements_tab, "Host Requirements") + self.tabs.addTab(self.host_requirements_tab, "Host requirements") self.host_requirements_tab.setWidget(self.host_requirements) self.host_requirements_tab.setWidgetResizable(True) @@ -371,7 +371,7 @@ def on_export_bundle(self): os.startfile(job_history_bundle_dir) QMessageBox.information( self, - f"{settings.submitter_name} Job Submission", + f"{settings.submitter_name} job submission", f"Saved the submission as a job bundle:\n{job_history_bundle_dir}", ) # Close the submitter window to signal the submission is done @@ -379,7 +379,7 @@ def on_export_bundle(self): except Exception as exc: logger.exception("Error saving bundle") message = str(exc) - QMessageBox.warning(self, f"{settings.submitter_name} Job Submission", message) + QMessageBox.warning(self, f"{settings.submitter_name} job submission", message) def on_submit(self): """ @@ -479,7 +479,7 @@ def on_submit(self): ) except UserInitiatedCancel as uic: logger.info("Canceling submission.") - QMessageBox.information(self, f"{settings.submitter_name} Job Submission", str(uic)) + QMessageBox.information(self, f"{settings.submitter_name} job submission", str(uic)) job_progress_dialog.close() except Exception as exc: logger.exception("error submitting job") @@ -488,7 +488,7 @@ def on_submit(self): exception_type=str(type(exc)), from_gui=True, ) - QMessageBox.warning(self, f"{settings.submitter_name} Job Submission", str(exc)) + QMessageBox.warning(self, f"{settings.submitter_name} job submission", str(exc)) job_progress_dialog.close() if self.create_job_response: diff --git a/src/deadline/client/ui/job_bundle_submitter.py b/src/deadline/client/ui/job_bundle_submitter.py index 385871d6..e2429cce 100644 --- a/src/deadline/client/ui/job_bundle_submitter.py +++ b/src/deadline/client/ui/job_bundle_submitter.py @@ -59,7 +59,7 @@ def show_job_bundle_submitter( if not input_job_bundle_dir: input_job_bundle_dir = QFileDialog.getExistingDirectory( - parent, "Choose Job Bundle Directory", input_job_bundle_dir + parent, "Choose job bundle directory", input_job_bundle_dir ) if not input_job_bundle_dir: return None @@ -151,7 +151,7 @@ def on_create_job_bundle_callback( ) asset_references = AssetReferences.from_dict(asset_references_obj) - name = "Job Bundle Submission" + name = "Job bundle submission" if template: name = template.get("name", name) diff --git a/src/deadline/client/ui/resources/blender_example_bundle/template.yaml b/src/deadline/client/ui/resources/blender_example_bundle/template.yaml index e6814f28..327127f3 100644 --- a/src/deadline/client/ui/resources/blender_example_bundle/template.yaml +++ b/src/deadline/client/ui/resources/blender_example_bundle/template.yaml @@ -24,10 +24,14 @@ parameterDefinitions: description: Choose the file format to render as. default: PNG allowedValues: [TGA, RAWTGA, JPEG, IRIS, IRIZ, PNG, HDR, TIFF, OPEN_EXR, OPEN_EXR_MULTILAYER, CINEON, DPX, DDS, JP2, WEBP] + - name: CondaPackages + type: STRING + default: "blender" + description: List the conda packages to use, separated by spaces. Needs a queue environment to consume it. - name: RezPackages type: STRING default: "blender" - description: List the rez packages to use, separated by spaces. Needs a Queue Environment to consume it. + description: List the rez packages to use, separated by spaces. Needs a queue environment to consume it. steps: - name: RenderBlender parameterSpace: diff --git a/src/deadline/client/ui/resources/cli_job_bundle/template.yaml b/src/deadline/client/ui/resources/cli_job_bundle/template.yaml index c6333058..b9ad5425 100644 --- a/src/deadline/client/ui/resources/cli_job_bundle/template.yaml +++ b/src/deadline/client/ui/resources/cli_job_bundle/template.yaml @@ -1,11 +1,11 @@ specificationVersion: 'jobtemplate-2023-09' -name: Job Bundle - CLI Job Example +name: Job bundle - CLI job example parameterDefinitions: - name: BashScript type: STRING userInterface: control: MULTILINE_EDIT - label: Bash Script + label: Bash script description: "Write your bash script code here." default: | echo "The file contents attached to this job:" @@ -19,7 +19,7 @@ parameterDefinitions: dataFlow: INOUT userInterface: control: CHOOSE_DIRECTORY - label: Input/Output Data Directory + label: Input/Output data directory description: | This is a directory for your input files. Any output files that the script writes will download back to the same diff --git a/src/deadline/client/ui/resources/controls_demo_job_bundle/template.yaml b/src/deadline/client/ui/resources/controls_demo_job_bundle/template.yaml index 217aec74..613eb1ff 100644 --- a/src/deadline/client/ui/resources/controls_demo_job_bundle/template.yaml +++ b/src/deadline/client/ui/resources/controls_demo_job_bundle/template.yaml @@ -1,20 +1,20 @@ specificationVersion: 'jobtemplate-2023-09' -name: Job Template GUI Control Showcase +name: Job template GUI control showcase parameterDefinitions: - name: LineEditControl type: STRING userInterface: control: LINE_EDIT - label: Line Edit Control - groupLabel: Text Controls + label: Line edit control + groupLabel: Text controls description: "Unrestricted line of text!" default: Default line edit value. - name: MultiLineEditControl type: STRING userInterface: control: MULTILINE_EDIT - label: Multi-line Edit Control - groupLabel: Text Controls + label: Multi-line edit control + groupLabel: Text controls description: "Unrestricted text file" default: | This is a @@ -24,16 +24,16 @@ parameterDefinitions: type: INT userInterface: control: SPIN_BOX - label: Default Int Spinner - groupLabel: Int Spinners + label: Default int spinner + groupLabel: Int spinners description: A default integer spinner. default: 42 - name: BigStepIntSpinner type: INT userInterface: control: SPIN_BOX - label: Big Step Int Spinner - groupLabel: Int Spinners + label: Big step int spinner + groupLabel: Int spinners singleStepDelta: 30 description: A default integer spinner. default: 123 @@ -41,8 +41,8 @@ parameterDefinitions: type: INT userInterface: control: SPIN_BOX - label: Bounded Int Spinner - groupLabel: Int Spinners + label: Bounded int spinner + groupLabel: Int spinners description: A bounded integer spin box. minValue: -100 maxValue: 100 @@ -51,16 +51,16 @@ parameterDefinitions: type: FLOAT userInterface: control: SPIN_BOX - label: Default Float Spinner - groupLabel: Float Spinners + label: Default float spinner + groupLabel: Float spinners description: A default float spinner. default: 1234.56789 - name: FloatSpinnerOneDecimal type: FLOAT userInterface: control: SPIN_BOX - label: Float Spinner One Decimal - groupLabel: Float Spinners + label: Float spinner one decimal + groupLabel: Float spinners decimals: 1 description: A float spinner with one decimal of precision. default: 100000.01 @@ -68,8 +68,8 @@ parameterDefinitions: type: FLOAT userInterface: control: SPIN_BOX - label: Float Spinner Fixed Step - groupLabel: Float Spinners + label: Float spinner fixed step + groupLabel: Float spinners singleStepDelta: 0.875 default: 0.0 description: A float spinner with a fixed step of .875 @@ -77,8 +77,8 @@ parameterDefinitions: type: STRING userInterface: control: DROPDOWN_LIST - label: String Dropdown - groupLabel: Dropdown Controls + label: String dropdown + groupLabel: Dropdown controls description: A dropdown with string values. default: WEDNESDAY allowedValues: [MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY, SUNDAY] @@ -86,8 +86,8 @@ parameterDefinitions: type: INT userInterface: control: DROPDOWN_LIST - label: Int Dropdown - groupLabel: Dropdown Controls + label: Int dropdown + groupLabel: Dropdown controls description: A dropdown with integer values. default: 7 allowedValues: [3, 8, 7, 2, 9, 1] @@ -101,8 +101,8 @@ parameterDefinitions: type: FLOAT userInterface: control: DROPDOWN_LIST - label: Float Dropdown - groupLabel: Dropdown Controls + label: Float dropdown + groupLabel: Dropdown controls description: A dropdown with floating point values. default: 3.26 allowedValues: [1.23, 3.26, 9.9, 1.2345] @@ -112,12 +112,12 @@ parameterDefinitions: dataFlow: IN userInterface: control: CHOOSE_INPUT_FILE - label: Input File Picker - groupLabel: Picker Controls + label: Input file picker + groupLabel: Picker controls fileFilters: - - label: Scene Files + - label: Scene files patterns: ["*.blend", "*.mb", "*.ma", "*.nk"] - - label: Any Files + - label: Any files patterns: ["*"] description: Choose the input scene file. - name: OutputFilePicker @@ -126,16 +126,16 @@ parameterDefinitions: dataFlow: OUT userInterface: control: CHOOSE_OUTPUT_FILE - label: Output File Picker - groupLabel: Picker Controls + label: Output file picker + groupLabel: Picker controls fileFilters: - - label: EXR Files + - label: EXR files patterns: ["*.exr"] - - label: JPEG Files + - label: JPEG files patterns: ["*.jpg", "*.jpeg"] - - label: PNG Files + - label: PNG files patterns: ["*.png"] - - label: All Files + - label: All files patterns: ["*"] description: Choose the output image file. - name: DirectoryPicker @@ -144,14 +144,14 @@ parameterDefinitions: dataFlow: INOUT userInterface: control: CHOOSE_DIRECTORY - label: Directory Picker - groupLabel: Picker Controls + label: Directory picker + groupLabel: Picker controls description: Choose a directory. - name: CheckBox type: STRING userInterface: control: CHECK_BOX - label: Check Box "Boolean" + label: Check box "boolean" default: "True" allowedValues: ["True", "False"] description: Set a true/false value. diff --git a/src/deadline/client/ui/widgets/cli_job_settings_tab.py b/src/deadline/client/ui/widgets/cli_job_settings_tab.py index a4b82be0..e70e5a5b 100644 --- a/src/deadline/client/ui/widgets/cli_job_settings_tab.py +++ b/src/deadline/client/ui/widgets/cli_job_settings_tab.py @@ -37,7 +37,7 @@ def __init__(self, initial_settings: CliJobSettings, parent=None): self._load_initial_settings(initial_settings) def _set_enabled_with_label(self, prop_name: str, enabled: bool): - """Enable/disable a control w/ its label""" + """Set the enabled status of a control and its label""" getattr(self, prop_name).setEnabled(enabled) getattr(self, prop_name + "_label").setEnabled(enabled) @@ -61,27 +61,27 @@ def _build_ui(self): layout.addWidget(self.bash_script, 0, 0, 1, 2) - self.use_array_parameter_chck = QCheckBox("Use Array Parameter", self) + self.use_array_parameter_chck = QCheckBox("Use array parameter", self) self.array_parameter_name = QLineEdit(self) layout.addWidget(self.use_array_parameter_chck, 1, 0) layout.addWidget(self.array_parameter_name, 1, 1) self.use_array_parameter_chck.stateChanged.connect(self.use_array_parameter_changed) - self.array_parameter_values_label = QLabel("Array Parameter Values") + self.array_parameter_values_label = QLabel("Array parameter values") layout.addWidget(self.array_parameter_values_label, 2, 0) self.array_parameter_values = QLineEdit(self) layout.addWidget(self.array_parameter_values, 2, 1) - self.data_dir_label = QLabel("Data Dir") + self.data_dir_label = QLabel("Data directory") self.data_dir_edit = DirectoryPickerWidget( initial_directory=os.path.expanduser(os.path.join("~", "CLIJobData")), - directory_label="Data Dir", + directory_label="Data directory", parent=self, ) layout.addWidget(self.data_dir_label, 3, 0) layout.addWidget(self.data_dir_edit, 3, 1) - self.file_format_label = QLabel("Template File Format") + self.file_format_label = QLabel("Template file format") self.file_format_box = QComboBox(parent=self) self.file_format_box.addItems(["YAML", "JSON"]) layout.addWidget(self.file_format_label, 4, 0) diff --git a/src/deadline/client/ui/widgets/deadline_authentication_status_widget.py b/src/deadline/client/ui/widgets/deadline_authentication_status_widget.py index c342b177..250dbd2f 100644 --- a/src/deadline/client/ui/widgets/deadline_authentication_status_widget.py +++ b/src/deadline/client/ui/widgets/deadline_authentication_status_widget.py @@ -34,10 +34,10 @@ def __init__(self, parent=None) -> None: layout = QHBoxLayout(self) - self.creds_source_group = AuthenticationStatusGroup(title="Credential Source", parent=self) + self.creds_source_group = AuthenticationStatusGroup(title="Credential source", parent=self) layout.addWidget(self.creds_source_group) self.auth_status_group = AuthenticationStatusGroup( - title="Authentication Status", parent=self + title="Authentication status", parent=self ) layout.addWidget(self.auth_status_group) self.deadline_authorized_group = AuthenticationStatusGroup( diff --git a/src/deadline/client/ui/widgets/host_requirements_tab.py b/src/deadline/client/ui/widgets/host_requirements_tab.py index aff14e0e..ac540d18 100644 --- a/src/deadline/client/ui/widgets/host_requirements_tab.py +++ b/src/deadline/client/ui/widgets/host_requirements_tab.py @@ -1,7 +1,7 @@ # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. """ -UI widgets for the Host Requirements tab. +UI widgets for the host requirements tab. """ from typing import Any, Dict, List, Optional, Union from pathlib import Path @@ -205,8 +205,8 @@ def __init__(self, parent=None): self._build_ui() def _build_ui(self): - self.os_row = OSRequirementRowWidget("Operating System", ["linux", "macos", "windows"]) - self.cpu_row = OSRequirementRowWidget("CPU Architecture", ["x86_64", "arm64"]) + self.os_row = OSRequirementRowWidget("Operating system", ["linux", "macos", "windows"]) + self.cpu_row = OSRequirementRowWidget("CPU architecture", ["x86_64", "arm64"]) self.layout.addWidget(self.os_row) self.layout.addWidget(self.cpu_row) @@ -258,8 +258,8 @@ def _build_ui(self): self.cpu_row = HardwareRequirementsRowWidget("vCPUs", self) self.memory_row = HardwareRequirementsRowWidget("Memory (GiB)", self) self.gpu_row = HardwareRequirementsRowWidget("GPUs", self) - self.gpu_memory_row = HardwareRequirementsRowWidget("GPU Memory (GiB)", self) - self.scratch_space_row = HardwareRequirementsRowWidget("Scratch Space", self) + self.gpu_memory_row = HardwareRequirementsRowWidget("GPU memory (GiB)", self) + self.scratch_space_row = HardwareRequirementsRowWidget("Scratch space", self) # Add all rows to layout self.layout.addWidget(self.cpu_row) @@ -482,7 +482,7 @@ def __init__(self, list_item: QListWidgetItem, item_number: int, parent=None): def _build_ui(self): # Name / Value - self.name_label = QLabel("Amount Name") + self.name_label = QLabel("Amount name") self.name_label.setFixedWidth(LABEL_FIXED_WIDTH) self.name_line_edit = QLineEdit() self.name_line_edit.setFixedWidth(LABEL_FIXED_WIDTH) @@ -576,7 +576,7 @@ def __init__( def _build_ui(self): # Name / Value / All / Any - self.name_label = QLabel("Attribute Name") + self.name_label = QLabel("Attribute name") self.name_label.setFixedWidth(LABEL_FIXED_WIDTH) self.value_label = QLabel("Value(s)") self.all_of_button = QRadioButton("All") diff --git a/src/deadline/client/ui/widgets/job_attachments_tab.py b/src/deadline/client/ui/widgets/job_attachments_tab.py index 1a1f47b6..140e79b5 100644 --- a/src/deadline/client/ui/widgets/job_attachments_tab.py +++ b/src/deadline/client/ui/widgets/job_attachments_tab.py @@ -1,7 +1,7 @@ # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. """ -UI widgets for the Job Attachments tab. +UI widgets for the job attachments tab. """ from __future__ import annotations import os @@ -61,27 +61,27 @@ def _build_ui(self) -> None: # Create a group box for general settings size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) size_policy.setVerticalStretch(10) - self.general_group = QGroupBox("General Submission Settings", self) + self.general_group = QGroupBox("General submission settings", self) tab_layout.addWidget(self.general_group) self.general_group.setSizePolicy(size_policy) general_layout = QVBoxLayout(self.general_group) # Create a group box for each type of attachment - self.input_files_group = QGroupBox("Attach Input Files", self) + self.input_files_group = QGroupBox("Attach input files", self) size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) size_policy.setVerticalStretch(80) tab_layout.addWidget(self.input_files_group) self.input_files_group.setSizePolicy(size_policy) input_files_layout = QVBoxLayout(self.input_files_group) - self.input_directories_group = QGroupBox("Attach Input Directories", self) + self.input_directories_group = QGroupBox("Attach input directories", self) size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) size_policy.setVerticalStretch(10) self.input_directories_group.setSizePolicy(size_policy) tab_layout.addWidget(self.input_directories_group) input_directories_layout = QVBoxLayout(self.input_directories_group) - self.output_directories_group = QGroupBox("Specify Output Directories", self) + self.output_directories_group = QGroupBox("Specify output directories", self) size_policy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) size_policy.setVerticalStretch(10) self.output_directories_group.setSizePolicy(size_policy) @@ -108,7 +108,7 @@ def _build_ui(self) -> None: input_files_layout.addWidget(self.input_files_controls) input_files_layout.addWidget(self.input_files) - # The "Attach Input Directories" attachments + # The "Attach input directories" attachments self.input_directories_controls = JobAttachmentsControlsWidget(self) self.input_directories_controls.show_auto_detected.stateChanged.connect( self.show_auto_detected_change @@ -126,7 +126,7 @@ def _build_ui(self) -> None: input_directories_layout.addWidget(self.input_directories_controls) input_directories_layout.addWidget(self.input_directories) - # The "Specify Output Directories" attachments + # The "Specify output directories" attachments self.output_directories_controls = JobAttachmentsControlsWidget(self) self.output_directories_controls.show_auto_detected.stateChanged.connect( self.show_auto_detected_change @@ -232,7 +232,7 @@ def _update_status_messages(self) -> None: def _add_input_files(self) -> None: new_files, _ = QFileDialog.getOpenFileNames( - self, "Select Input Files To Attach To Your Job" + self, "Select input files to attach to your job" ) if new_files: @@ -260,7 +260,7 @@ def _remove_selected_input_files(self) -> None: ) def _add_input_directory(self) -> None: - new_dir = QFileDialog.getExistingDirectory(self, "Select a Directory To Attach To Your Job") + new_dir = QFileDialog.getExistingDirectory(self, "Select a directory to attach to your job") if new_dir: # Normalize the path @@ -287,7 +287,7 @@ def _remove_selected_input_directories(self) -> None: ) def _add_output_directory(self) -> None: - new_dir = QFileDialog.getExistingDirectory(self, "Select an Output Directory of Your Job") + new_dir = QFileDialog.getExistingDirectory(self, "Select an output directory of your job") if new_dir: # Normalize the path @@ -357,13 +357,13 @@ def __init__(self, parent=None) -> None: self.add = QPushButton("Add...", parent=self) layout.addWidget(self.add) - self.remove_selected = QPushButton("Remove Selected", parent=self) + self.remove_selected = QPushButton("Remove selected", parent=self) layout.addWidget(self.remove_selected) self.status_message = QLabel("0 total") self.status_message.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) layout.addWidget(self.status_message) - self.show_auto_detected = QCheckBox("Show Auto-Detected", parent=self) + self.show_auto_detected = QCheckBox("Show auto-detected", parent=self) self.show_auto_detected.setChecked(True) layout.addWidget(self.show_auto_detected) diff --git a/src/deadline/client/ui/widgets/job_bundle_settings_tab.py b/src/deadline/client/ui/widgets/job_bundle_settings_tab.py index 92edd88e..28c58134 100644 --- a/src/deadline/client/ui/widgets/job_bundle_settings_tab.py +++ b/src/deadline/client/ui/widgets/job_bundle_settings_tab.py @@ -1,7 +1,7 @@ # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. """ -UI widgets for the Scene Settings tab. +UI widgets for the scene settings tab. """ from __future__ import annotations @@ -92,7 +92,7 @@ def on_load_bundle(self): # Open the file picker dialog bundle_path = os.path.expanduser(config_file.get_setting("settings.job_history_dir")) input_job_bundle_dir = QFileDialog.getExistingDirectory( - self, "Choose Job Bundle Directory", bundle_path + self, "Choose job bundle directory", bundle_path ) if not input_job_bundle_dir: return @@ -109,16 +109,16 @@ def on_load_bundle(self): # Load the template to get the bundle name template = read_yaml_or_json_object(input_job_bundle_dir, "template", True) name = ( - template.get("name", "Job Bundle Submission") + template.get("name", "Job bundle submission") if template - else "Job Bundle Submission" + else "Job bundle submission" ) job_settings = JobBundleSettings(input_job_bundle_dir=input_job_bundle_dir, name=name) job_settings.parameters = read_job_bundle_parameters(input_job_bundle_dir) except Exception as e: msg = str(e) - QMessageBox.warning(self, "Could not Load Job Bundle", msg) + QMessageBox.warning(self, "Could not load job bundle", msg) logger.warning(msg) return diff --git a/src/deadline/client/ui/widgets/openjd_parameters_widget.py b/src/deadline/client/ui/widgets/openjd_parameters_widget.py index f350bae1..f620c1b7 100644 --- a/src/deadline/client/ui/widgets/openjd_parameters_widget.py +++ b/src/deadline/client/ui/widgets/openjd_parameters_widget.py @@ -486,7 +486,7 @@ def _build_ui(self, parameter): min_value = float(min_value) except ValueError: raise RuntimeError( - f"Job Template parameter {parameter['name']} with FLOAT type has non-numeric 'minValue' of {min_value!r}" + f"Job template parameter {parameter['name']} with FLOAT type has non-numeric 'minValue' of {min_value!r}" ) self.edit_control.setMinimum(min_value) @@ -497,7 +497,7 @@ def _build_ui(self, parameter): max_value = float(max_value) except ValueError: raise RuntimeError( - f"Job Template parameter {parameter['name']} with FLOAT type has non-numeric 'maxValue' of {max_value!r}" + f"Job template parameter {parameter['name']} with FLOAT type has non-numeric 'maxValue' of {max_value!r}" ) self.edit_control.setMaximum(max_value) @@ -606,7 +606,7 @@ class _JobTemplateBaseFileWidget(_JobTemplateWidget): def _build_ui(self, parameter): # Get the filters - filetype_filter = "Any Files (*)" + filetype_filter = "Any files (*)" selected_filter = "" if "userInterface" in parameter: file_filter_list = parameter["userInterface"].get("fileFilters") @@ -744,7 +744,7 @@ def _build_ui(self, parameter: Dict[str, Any]) -> None: allowed_values_set = set(v.upper() for v in allowed_values) if allowed_values_set not in [set(allowed) for allowed in ALLOWED_VALUES_FOR_CHECK_BOX]: raise RuntimeError( - f"Job Template parameter {parameter['name']} with CHECK_BOX user interface control requires that 'allowedValues' be " + f"Job template parameter {parameter['name']} with CHECK_BOX user interface control requires that 'allowedValues' be " + f"one of {ALLOWED_VALUES_FOR_CHECK_BOX} (case and order insensitive)" ) diff --git a/src/deadline/client/ui/widgets/shared_job_settings_tab.py b/src/deadline/client/ui/widgets/shared_job_settings_tab.py index 6c7986bd..c59163ee 100644 --- a/src/deadline/client/ui/widgets/shared_job_settings_tab.py +++ b/src/deadline/client/ui/widgets/shared_job_settings_tab.py @@ -149,7 +149,7 @@ def _handle_background_queue_parameters_exception(self, title: str, error: BaseE self.canceled.set_canceled() self.__refresh_queue_parameters_thread.join() self.queue_parameters_box.rebuild_ui( - async_loading_state="Error Loading Queue Environments: {}\n\nError Traceback: {}".format( + async_loading_state="Error loading queue environments: {}\n\nError traceback: {}".format( title, error ) ) @@ -168,7 +168,7 @@ def _start_load_queue_parameters_thread(self): self.canceled = CancelationFlag() self.__refresh_queue_parameters_thread = threading.Thread( target=self._load_queue_parameters_thread_function, - name="AWS Deadline Cloud Load Queue Parameters Thread", + name="AWS Deadline Cloud load queue parameters thread", args=(self.__refresh_queue_parameters_id, farm_id, queue_id), ) self.__refresh_queue_parameters_thread.start() @@ -197,7 +197,7 @@ def _load_queue_parameters_thread_function(self, refresh_id: int, farm_id: str, self._queue_parameters_update.emit(refresh_id, queue_parameters) except BaseException as e: if not self.canceled: - self._background_exception.emit("Invalid Queue Parameters", e) + self._background_exception.emit("Invalid queue parameters", e) def update_settings(self, settings): self.shared_job_properties_box.update_settings(settings) @@ -255,22 +255,22 @@ def _build_ui(self): self.priority_box = QSpinBox(parent=self) self.layout.addRow(self.priority_box_label, self.priority_box) - self.initial_status_box_label = QLabel("Initial State") + self.initial_status_box_label = QLabel("Initial state") self.initial_status_box = QComboBox(parent=self) self.initial_status_box.addItems(["READY", "SUSPENDED"]) self.layout.addRow(self.initial_status_box_label, self.initial_status_box) - self.max_failed_tasks_count_box_label = QLabel("Maximum Failed Tasks Count") + self.max_failed_tasks_count_box_label = QLabel("Maximum failed tasks count") self.max_failed_tasks_count_box_label.setToolTip( - "Maximum number of Tasks that can fail before the Job will be marked as failed." + "Maximum number of tasks that can fail before the job will be marked as failed." ) self.max_failed_tasks_count_box = QSpinBox(parent=self) self.max_failed_tasks_count_box.setRange(0, 2147483647) self.layout.addRow(self.max_failed_tasks_count_box_label, self.max_failed_tasks_count_box) - self.max_retries_per_task_box_label = QLabel("Maximum Retries Per Task") + self.max_retries_per_task_box_label = QLabel("Maximum retries per task") self.max_retries_per_task_box_label.setToolTip( - "Maximum number of times that a Task will retry before it's marked as failed." + "Maximum number of times that a task will retry before it's marked as failed." ) self.max_retries_per_task_box = QSpinBox(parent=self) self.max_retries_per_task_box.setRange(0, 2147483647) @@ -314,7 +314,7 @@ def get_parameters(self): "type": "STRING", "userInterface": { "control": "DROPDOWN_LIST", - "label": "Initial State", + "label": "Initial state", }, "allowedValues": ["READY", "SUSPENDED"], "value": self.initial_status_box.currentText(), @@ -325,18 +325,18 @@ def get_parameters(self): "type": "INT", "userInterface": { "control": "SPIN_BOX", - "label": "Maximum Failed Tasks Count", + "label": "Maximum failed tasks count", }, "minValue": 0, "value": self.max_failed_tasks_count_box.value(), }, { "name": "deadline:maxRetriesPerTask", - "description": "Maximum number of times that a Task will retry before it's marked as failed.", + "description": "Maximum number of times that a task will retry before it's marked as failed.", "type": "INT", "userInterface": { "control": "SPIN_BOX", - "label": "Maximum Retries Per Task", + "label": "Maximum retries per task", }, "minValue": 0, "value": self.max_retries_per_task_box.value(), @@ -354,11 +354,11 @@ def update_settings(self, settings): class DeadlineCloudSettingsWidget(QGroupBox): """ - UI component for the Deadline Render Manager. + UI component for the Deadline Cloud settings. """ def __init__(self, *, parent: Optional[QWidget] = None): - super().__init__("Deadline Cloud Settings", parent=parent) + super().__init__("Deadline Cloud settings", parent=parent) self.deadline_settings: Dict[str, Any] = {"counter": -1} self.layout = QFormLayout(self) self.layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow) @@ -366,7 +366,7 @@ def __init__(self, *, parent: Optional[QWidget] = None): self._build_ui() def _set_enabled_with_label(self, prop_name: str, enabled: bool): - """Enable/disable a control w/ its label""" + """Sets the enabled status of a control and its label""" getattr(self, prop_name).setEnabled(enabled) getattr(self, prop_name + "_label").setEnabled(enabled) @@ -472,7 +472,7 @@ def refresh(self, deadline_authorized): self.__refresh_id += 1 self.__refresh_thread = threading.Thread( target=self._refresh_thread_function, - name=f"AWS Deadline Cloud Refresh {self.resource_name} Item Thread", + name=f"AWS Deadline Cloud refresh {self.resource_name} item thread", args=(self.__refresh_id,), ) self.__refresh_thread.start() @@ -501,7 +501,7 @@ def _refresh_thread_function(self, refresh_id: int): self._item_update.emit(refresh_id, *item) except BaseException as e: if not self.canceled: - self.background_exception.emit(f"Refresh {self.resource_name} Item", e) + self.background_exception.emit(f"Refresh {self.resource_name} item", e) class DeadlineFarmDisplay(_DeadlineNamedResourceDisplay): @@ -540,7 +540,7 @@ class DeadlineStorageProfileNameDisplay(_DeadlineNamedResourceDisplay): def __init__(self, *, parent=None): super().__init__( - resource_name="Storage Profile Name", + resource_name="Storage profile name", setting_name="settings.storage_profile_id", parent=parent, ) diff --git a/test/unit/deadline_client/cli/test_cli_auth.py b/test/unit/deadline_client/cli/test_cli_auth.py index d8425be3..ad743e5f 100644 --- a/test/unit/deadline_client/cli/test_cli_auth.py +++ b/test/unit/deadline_client/cli/test_cli_auth.py @@ -65,7 +65,7 @@ def test_cli_deadline_cloud_monitor_login_and_logout(fresh_deadline_config): assert result.exit_code == 0 assert ( - "Successfully logged in: Deadline Cloud monitor Profile: sandbox-us-west-2" + "Successfully logged in: Deadline Cloud monitor profile: sandbox-us-west-2" in result.output ) assert result.exit_code == 0