Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nomad-FAIR
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nomad-lab
nomad-FAIR
Commits
f1ad437b
Commit
f1ad437b
authored
8 months ago
by
Amir Golparvar
Browse files
Options
Downloads
Plain Diff
Merge branch '2138-extra_fields-on-elabftw-fails-to-be-parsed' into 'develop'
Resolve "extra_fields on elabftw fails to be parsed" Closes
#2138
See merge request
!2112
parents
f7456562
47cd3383
No related branches found
No related tags found
1 merge request
!2112
Resolve "extra_fields on elabftw fails to be parsed"
Pipeline
#219800
passed
8 months ago
Stage: build
Stage: test
Stage: deploy
Stage: release
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
nomad/parsing/elabftw/elabftw.py
+22
-11
22 additions, 11 deletions
nomad/parsing/elabftw/elabftw.py
with
22 additions
and
11 deletions
nomad/parsing/elabftw/elabftw.py
+
22
−
11
View file @
f1ad437b
...
...
@@ -328,7 +328,13 @@ class ELabFTW(EntryData):
project_id
=
Quantity
(
type
=
str
,
description
=
'
Project ID
'
)
status
=
Quantity
(
type
=
MEnum
(
'
Not set
'
,
'
Running
'
,
'
Waiting
'
,
'
Success
'
,
'
Need to be redone
'
,
'
Fail
'
'
Not set
'
,
'
Running
'
,
'
Waiting
'
,
'
Success
'
,
'
Need to be redone
'
,
'
Fail
'
,
'
Maintenance mode
'
,
),
description
=
'
Status of the Experiment
'
,
)
...
...
@@ -585,13 +591,17 @@ def _parse_latest(
archive
,
logger
,
)
->
ELabFTW
:
latest_elab_instance
=
ELabFTW
(
author
=
raw_experiment
.
get
(
'
author
'
).
get
(
'
id
'
),
title
=
raw_experiment
.
get
(
'
name
'
,
None
),
keywords
=
raw_experiment
.
get
(
'
keywords
'
,
''
).
split
(
'
,
'
),
id
=
raw_experiment
.
get
(
'
id
'
,
''
),
status
=
raw_experiment
.
get
(
'
creative_work_status
'
,
'
Not set
'
),
)
try
:
latest_elab_instance
=
ELabFTW
(
author
=
raw_experiment
.
get
(
'
author
'
).
get
(
'
id
'
),
title
=
raw_experiment
.
get
(
'
name
'
,
None
),
keywords
=
raw_experiment
.
get
(
'
keywords
'
,
''
).
split
(
'
,
'
),
id
=
raw_experiment
.
get
(
'
id
'
,
''
),
status
=
raw_experiment
.
get
(
'
creative_work_status
'
,
'
Not set
'
),
)
except
Exception
:
logger
.
error
(
'
Failed to parse the eln file.
'
)
raise
ELabFTWParserError
()
_
=
_set_experiment_metadata
(
raw_experiment
,
exp_archive
,
latest_elab_instance
,
logger
...
...
@@ -600,9 +610,10 @@ def _parse_latest(
body
=
raw_experiment
.
get
(
'
text
'
,
None
),
created_at
=
raw_experiment
.
get
(
'
date_created
'
,
None
),
extra_fields
=
{
i
:
value
for
i
,
value
in
enumerate
(
raw_experiment
.
get
(
'
variable_measured
'
,
[]))
},
i
:
value
for
i
,
value
in
enumerate
(
raw_experiment
[
'
variable_measured
'
])
}
if
raw_experiment
.
get
(
'
variable_measured
'
)
is
not
None
else
None
,
)
data_section
.
steps
.
extend
(
[
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment