Skip to content

Commit e348b9b

Browse files
committed
Updated type hinting and rearranged functions in 'murfey.client.context'
1 parent ef1923a commit e348b9b

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

src/murfey/client/context.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import logging
44
from importlib.metadata import entry_points
55
from pathlib import Path
6-
from typing import Any, List, NamedTuple
6+
from typing import Any, NamedTuple, OrderedDict
77

88
import xmltodict
99

@@ -209,12 +209,6 @@ def ensure_dcg_exists(
209209
return dcg_tag
210210

211211

212-
class ProcessingParameter(NamedTuple):
213-
name: str
214-
label: str
215-
default: Any = None
216-
217-
218212
def detect_acquisition_software(dir_for_transfer: Path) -> str:
219213
glob = dir_for_transfer.glob("*")
220214
for f in glob:
@@ -225,9 +219,15 @@ def detect_acquisition_software(dir_for_transfer: Path) -> str:
225219
return ""
226220

227221

222+
class ProcessingParameter(NamedTuple):
223+
name: str
224+
label: str
225+
default: Any = None
226+
227+
228228
class Context:
229-
user_params: List[ProcessingParameter] = []
230-
metadata_params: List[ProcessingParameter] = []
229+
user_params: list[ProcessingParameter] = []
230+
metadata_params: list[ProcessingParameter] = []
231231

232232
def __init__(self, name: str, acquisition_software: str, token: str):
233233
self._acquisition_software = acquisition_software
@@ -256,7 +256,7 @@ def post_first_transfer(
256256

257257
def gather_metadata(
258258
self, metadata_file: Path, environment: MurfeyInstanceEnvironment | None = None
259-
):
259+
) -> OrderedDict | None:
260260
raise NotImplementedError(
261261
f"gather_metadata must be declared in derived class to be used: {self}"
262262
)

0 commit comments

Comments
 (0)