Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
75baedb4
Commit
75baedb4
authored
1 year ago
by
Nathan Bockisch
Browse files
Options
Downloads
Patches
Plain Diff
Just kidding, turns out it's a list of tuples
parent
9f1ef11b
No related branches found
Branches containing commit
Tags
2.5.0-rc2
Tags containing commit
2 merge requests
!1605
Merge 2.8.2.3 work to main
,
!1514
Just kidding, turns out it's a list of tuples
Pipeline
#12770
passed
1 year ago
Stage: pull-db
Stage: build
Stage: unit-test
Stage: .post
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/cli/utilities/aat_wrest/aat_wrest/metadata_wrester.py
+2
-1
2 additions, 1 deletion
apps/cli/utilities/aat_wrest/aat_wrest/metadata_wrester.py
services/workflow/workflow/server.py
+1
-0
1 addition, 0 deletions
services/workflow/workflow/server.py
with
3 additions
and
1 deletion
apps/cli/utilities/aat_wrest/aat_wrest/metadata_wrester.py
+
2
−
1
View file @
75baedb4
...
...
@@ -436,7 +436,8 @@ class WrestWorkflowMetadata:
data
=
cursor
.
fetchall
()
if
data
:
# This should have all the ancillary and science product names
make_json
=
json
.
dumps
({
"
filesList
"
:
sum
(
data
,
[])})
# It returns from the query as a list of tuples, so it must be flattened
make_json
=
json
.
dumps
({
"
filesList
"
:
list
(
sum
(
data
,
()))})
else
:
self
.
logger
.
error
(
f
"
ERROR: Failed to fetch products from product ID
{
product_group_id
}
"
)
else
:
...
...
This diff is collapsed.
Click to expand it.
services/workflow/workflow/server.py
+
1
−
0
View file @
75baedb4
...
...
@@ -901,3 +901,4 @@ def main(global_config, **settings):
config
.
add_tween
(
"
workflow.server.prometheus_route_timing_factory
"
)
return
config
.
make_wsgi_app
()
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