Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PEDASI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Research Software Group
PEDASI
Commits
1a3b653d
Commit
1a3b653d
authored
6 years ago
by
James Graham
Browse files
Options
Downloads
Patches
Plain Diff
Add test and functionality to get data from BT HyperCat
parent
b597c2fa
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
datasources/connectors/hypercat.py
+9
-1
9 additions, 1 deletion
datasources/connectors/hypercat.py
datasources/tests/test_connectors.py
+17
-0
17 additions, 0 deletions
datasources/tests/test_connectors.py
with
26 additions
and
1 deletion
datasources/connectors/hypercat.py
+
9
−
1
View file @
1a3b653d
import
typing
import
typing
import
requests
import
requests
import
requests.auth
from
datasources.connectors.base
import
BaseDataConnector
,
DataConnectorContainsDatasets
,
DataConnectorHasMetadata
from
datasources.connectors.base
import
BaseDataConnector
,
DataConnectorContainsDatasets
,
DataConnectorHasMetadata
...
@@ -15,7 +16,14 @@ class HyperCat(DataConnectorContainsDatasets, DataConnectorHasMetadata, BaseData
...
@@ -15,7 +16,14 @@ class HyperCat(DataConnectorContainsDatasets, DataConnectorHasMetadata, BaseData
def
get_data
(
self
,
def
get_data
(
self
,
dataset
:
typing
.
Optional
[
str
]
=
None
,
dataset
:
typing
.
Optional
[
str
]
=
None
,
query_params
:
typing
.
Optional
[
typing
.
Mapping
[
str
,
str
]]
=
None
):
query_params
:
typing
.
Optional
[
typing
.
Mapping
[
str
,
str
]]
=
None
):
super
().
get_data
(
dataset
,
query_params
)
if
dataset
is
None
:
raise
ValueError
(
'
When requesting data from a HyperCat catalogue you must provide a dataset href.
'
)
location
=
dataset
r
=
requests
.
get
(
location
,
params
=
query_params
,
auth
=
requests
.
auth
.
HTTPBasicAuth
(
self
.
api_key
,
''
))
return
r
.
text
def
get_datasets
(
self
,
def
get_datasets
(
self
,
query_params
:
typing
.
Optional
[
typing
.
Mapping
[
str
,
str
]]
=
None
):
query_params
:
typing
.
Optional
[
typing
.
Mapping
[
str
,
str
]]
=
None
):
...
...
This diff is collapsed.
Click to expand it.
datasources/tests/test_connectors.py
+
17
−
0
View file @
1a3b653d
...
@@ -119,3 +119,20 @@ class ConnectorHyperCatTest(TestCase):
...
@@ -119,3 +119,20 @@ class ConnectorHyperCatTest(TestCase):
self
.
assertIn
(
'
application/json
'
,
self
.
assertIn
(
'
application/json
'
,
result
[
'
urn:X-hypercat:rels:isContentType
'
])
result
[
'
urn:X-hypercat:rels:isContentType
'
])
def
test_plugin_get_dataset_data
(
self
):
"""
Test that we can get data from a single dataset within the catalogue.
"""
from
decouple
import
config
api_key
=
config
(
'
HYPERCAT_BT_API_KEY
'
)
dataset
=
self
.
dataset
+
'
/datastreams/0
'
connection
=
self
.
plugin
(
self
.
url
,
api_key
=
api_key
)
result
=
connection
.
get_data
(
dataset
=
dataset
)
self
.
assertIsInstance
(
result
,
str
)
self
.
assertGreaterEqual
(
len
(
result
),
1
)
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