From e3df094bc3329ceff40dc90ac9fa503e33b2059f Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Thu, 18 Aug 2022 14:39:36 -0600
Subject: [PATCH] Changed starttime/endtime to be defined by first absolutes
reading starttime and last absolutes reading(last commit was supposed to
include this but did not)
---
geomagio/processing/copy_absolutes.py | 28 ++++++++++++---------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/geomagio/processing/copy_absolutes.py b/geomagio/processing/copy_absolutes.py
index 27d81eed3..f5f127633 100644
--- a/geomagio/processing/copy_absolutes.py
+++ b/geomagio/processing/copy_absolutes.py
@@ -8,21 +8,15 @@ import os
import json
from datetime import date, datetime, time, timedelta
-# from types import NoneType
from typing import List
import typer
from obspy import UTCDateTime
-"""
from ..metadata import Metadata, MetadataFactory, MetadataCategory
from ..residual import Reading, WebAbsolutesFactory
-"""
-from geomagio.metadata import Metadata, MetadataFactory, MetadataCategory
-from geomagio.residual import Reading, WebAbsolutesFactory
TODAY = datetime.combine(date.today(), time(0, 0, 0))
-NoneType = type(None)
def copy_absolutes(
@@ -38,7 +32,7 @@ def copy_absolutes(
show_default="environment variable GITLAB_API_TOKEN",
),
metadata_url: str = typer.Option(
- default="https://geomag.usgs.gov/ws/secure", # insert staging
+ default="https://geomag.usgs.gov/ws/secure",
help="URL to metadata web service",
metavar="URL",
),
@@ -47,10 +41,11 @@ def copy_absolutes(
help="URL to web absolutes service",
metavar="URL",
),
-) -> List[Metadata]: # make this nonetype?
+):
"""Copy absolutes from the web absolutes service into the metadata service."""
# read readings from web absolutes
web_absolutes_factory = WebAbsolutesFactory(url=web_absolutes_url)
+ observatory = "BOU"
readings = get_readings(
factory=web_absolutes_factory,
observatory=observatory,
@@ -92,13 +87,14 @@ def create_reading_metadata(reading: Reading) -> Metadata:
created_by="absolutes_test.py",
network="NT",
updated_by=reviewer,
- starttime=reading.time,
- endtime=reading.time,
+ starttime=reading.absolutes[0].starttime,
+ endtime=reading.absolutes[2].endtime,
station=reading.metadata["station"],
metadata=reading_dict,
)
)
return metadata
+
# TODO: should reading starttime/endtime be for range of measurement times?
pass
@@ -135,6 +131,12 @@ def get_readings(
return readings
+def main() -> None:
+ """Entrypoint for copy absolutes method."""
+ # for one command, can use typer.run
+ typer.run(copy_absolutes)
+
+
def upload_reading(factory: MetadataFactory, reading: Reading) -> Metadata:
"""Upload reading to metadata service
@@ -156,11 +158,5 @@ def upload_reading(factory: MetadataFactory, reading: Reading) -> Metadata:
return factory.create_metadata(metadata=meta)
-def main() -> None:
- """Entrypoint for copy absolutes method."""
- # for one command, can use typer.run
- typer.run(copy_absolutes)
-
-
if __name__ == "__main__":
main()
--
GitLab