Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
geomag-algorithms
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
Container Registry
Model registry
Operate
Environments
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
ghsc
National Geomagnetism Program
geomag-algorithms
Commits
1e505ec3
Commit
1e505ec3
authored
4 years ago
by
Cain, Payton David
Browse files
Options
Downloads
Patches
Plain Diff
Get factory from interval
parent
90b3a31d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!146
Release CMO metadata to production
,
!69
WS Factory from Sampling Period
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
geomagio/api/ws/DataApiQuery.py
+0
-7
0 additions, 7 deletions
geomagio/api/ws/DataApiQuery.py
geomagio/api/ws/data.py
+7
-5
7 additions, 5 deletions
geomagio/api/ws/data.py
with
7 additions
and
12 deletions
geomagio/api/ws/DataApiQuery.py
+
0
−
7
View file @
1e505ec3
...
...
@@ -39,13 +39,6 @@ class SamplingPeriod(float, enum.Enum):
HOUR
=
3600.0
DAY
=
86400.0
@property
def
input_factory
(
self
):
if
self
in
[
SamplingPeriod
.
TEN_HERTZ
,
SamplingPeriod
.
HOUR
,
SamplingPeriod
.
DAY
]:
return
"
miniseed
"
else
:
return
"
edge
"
class
DataApiQuery
(
BaseModel
):
id
:
str
...
...
This diff is collapsed.
Click to expand it.
geomagio/api/ws/data.py
+
7
−
5
View file @
1e505ec3
...
...
@@ -29,13 +29,15 @@ def get_data_factory(
Edge or miniseed factory object
"""
host
=
os
.
getenv
(
"
DATA_HOST
"
,
"
cwbpub.cr.usgs.gov
"
)
factory
=
query
.
sampling_period
.
input_factory
if
factory
==
"
edge
"
:
return
EdgeFactory
(
host
=
host
,
port
=
os
.
getenv
(
"
DATA_EARTHWORM_PORT
"
,
"
2060
"
))
elif
factory
==
"
miniseed
"
:
sampling_period
=
query
.
sampling_period
if
sampling_period
in
[
SamplingPeriod
.
TEN_HERTZ
,
SamplingPeriod
.
HOUR
,
SamplingPeriod
.
DAY
,
]:
return
MiniSeedFactory
(
host
=
host
,
port
=
os
.
getenv
(
"
DATA_MINISEED_PORT
"
,
"
2061
"
))
else
:
return
None
return
EdgeFactory
(
host
=
host
,
port
=
os
.
getenv
(
"
DATA_EARTHWORM_PORT
"
,
"
2060
"
))
def
get_data_query
(
...
...
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