Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix iso_date_regex_pattern config in file_batcher module and allow override #1580

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Fix iso_date_regex_pattern config in file_batcher module and allow override #1580

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3eb2855
fix iso_date_regex_pattern config and allow override
efajardo-nv Mar 25, 2024
9cf0e04
Merge branch 'branch-24.03' of https://github.com/nv-morpheus/Morpheu…
efajardo-nv Mar 26, 2024
8742e81
file batcher module tests
efajardo-nv Mar 26, 2024
19a5363
style fixes
efajardo-nv Mar 26, 2024
4b100e7
remove unused import
efajardo-nv Mar 26, 2024
b4f3e38
fix copyright header
efajardo-nv Mar 26, 2024
c3a1284
fix sampling and add sampling tests
efajardo-nv Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion morpheus/modules/file_batcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def file_batcher(builder: mrc.Builder):
sampling = config.get("sampling", None)
sampling_rate_s = config.get("sampling_rate_s", None)

iso_date_regex_pattern = config.get("batch_iso_date_regex_pattern", DEFAULT_ISO_DATE_REGEX_PATTERN)
iso_date_regex_pattern = config.get("iso_date_regex_pattern", DEFAULT_ISO_DATE_REGEX_PATTERN)
iso_date_regex = re.compile(iso_date_regex_pattern)

if (sampling_rate_s is not None and sampling_rate_s > 0):
Expand All @@ -99,6 +99,7 @@ def file_batcher(builder: mrc.Builder):
"sampling": sampling,
"start_time": config.get("start_time"),
"end_time": config.get("end_time"),
"iso_date_regex_pattern": iso_date_regex_pattern
}

default_file_to_df_opts = {
Expand All @@ -123,6 +124,13 @@ def build_period_batches(files: typing.List[str],
params: typing.Dict[any, any]) -> typing.List[typing.Tuple[typing.List[str], int]]:
file_objects: fsspec.core.OpenFiles = fsspec.open_files(files)

nonlocal iso_date_regex_pattern
nonlocal iso_date_regex

if params["iso_date_regex_pattern"] != iso_date_regex_pattern:
iso_date_regex_pattern = params["iso_date_regex_pattern"]
iso_date_regex = re.compile(iso_date_regex_pattern)

try:
start_time = params["start_time"]
end_time = params["end_time"]
Expand Down
Loading