Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-FAIR
Commits
1923abd3
Commit
1923abd3
authored
Jun 12, 2020
by
Markus Scheidgen
Browse files
Fixed meta index db url in optimade. More consistent use of https in optimate urls.
parent
91f85b02
Pipeline
#76479
failed with stages
in 20 minutes and 50 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
nomad/app/optimade/api.py
View file @
1923abd3
...
...
@@ -20,7 +20,7 @@ from nomad import config
blueprint
=
Blueprint
(
'optimade'
,
__name__
)
base_url
=
'http://%s/%s/optimade'
%
(
base_url
=
'http
s
://%s/%s/optimade'
%
(
config
.
services
.
api_host
.
strip
(
'/'
),
config
.
services
.
api_base_path
.
strip
(
'/'
))
...
...
nomad/app/optimade/models.py
View file @
1923abd3
...
...
@@ -110,7 +110,9 @@ json_api_meta_object_model = api.model('MetaObject', {
class
Meta
():
def
__init__
(
self
,
query
:
str
,
returned
:
int
,
available
:
int
=
None
,
last_id
:
str
=
None
):
def
__init__
(
self
,
query
:
str
,
returned
:
int
,
available
:
int
=
None
,
last_id
:
str
=
None
):
self
.
query
=
dict
(
representation
=
query
)
self
.
api_version
=
'0.10.1'
self
.
time_stamp
=
datetime
.
datetime
.
now
()
...
...
@@ -121,7 +123,7 @@ class Meta():
description
=
config
.
meta
.
name
,
prefix
=
'nomad'
,
homepage
=
config
.
meta
.
homepage
,
index_base_url
=
base_url
index_base_url
=
url
(
version
=
None
,
prefix
=
'index'
)
)
self
.
data_available
=
available
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment