Skip to content
Snippets Groups Projects
Commit a9d3ea16 authored by Jeremy M Fee's avatar Jeremy M Fee
Browse files

Clean up copy_absolutes

parent d5a81c41
No related branches found
No related tags found
1 merge request!189Add absolutes
...@@ -4,16 +4,15 @@ Created on Thu Jul 7 11:05:19 2022 ...@@ -4,16 +4,15 @@ Created on Thu Jul 7 11:05:19 2022
@author: awernle @author: awernle
""" """
import os
import json import json
import os
from datetime import date, datetime, time, timedelta from datetime import date, datetime, time, timedelta
from typing import List from typing import List
import typer import typer
from obspy import UTCDateTime from obspy import UTCDateTime
from ..metadata import Metadata, MetadataFactory, MetadataCategory from ..metadata import Metadata, MetadataCategory, MetadataFactory
from ..residual import Reading, WebAbsolutesFactory from ..residual import Reading, WebAbsolutesFactory
TODAY = datetime.combine(date.today(), time(0, 0, 0)) TODAY = datetime.combine(date.today(), time(0, 0, 0))
...@@ -51,7 +50,7 @@ def copy_absolutes( ...@@ -51,7 +50,7 @@ def copy_absolutes(
starttime=UTCDateTime(starttime), starttime=UTCDateTime(starttime),
endtime=UTCDateTime(endtime), endtime=UTCDateTime(endtime),
) )
typer.echo(f"Found {len(readings)} absolutes") print(f"Found {len(readings)} absolutes")
# write readings to metadata service # write readings to metadata service
metadata_factory = MetadataFactory(token=metadata_token, url=metadata_url) metadata_factory = MetadataFactory(token=metadata_token, url=metadata_url)
with typer.progressbar( with typer.progressbar(
...@@ -73,25 +72,20 @@ def create_reading_metadata(reading: Reading) -> Metadata: ...@@ -73,25 +72,20 @@ def create_reading_metadata(reading: Reading) -> Metadata:
------- -------
metadata object for reading metadata object for reading
""" """
json_string = reading.json() measurement_times = [m.time for m in reading.measurements if m.time]
reading_dict = json.loads(json_string)
reviewer = reading.metadata.get["reviewer"]
metadata = Metadata( metadata = Metadata(
category=MetadataCategory.READING, category=MetadataCategory.READING,
created_by=reading.metadata.get("observer", "copy_absolutes"), created_by=reading.metadata.get("observer", "copy_absolutes"),
endtime=max(measurement_times),
metadata=json.loads(reading.json()),
network="NT", network="NT",
updated_by=reviewer, starttime=min(measurement_times),
status="reviewed" if reading.metadata.get("reviewed") else "new",
starttime=min([m.time for m in reading.measurements if m.time]),
endtime=max([m.time for m in reading.measurements if m.time]),
station=reading.metadata["station"], station=reading.metadata["station"],
metadata=reading_dict, status="reviewed" if reading.metadata.get("reviewed") else "new",
updated_by=reading.metadata.get("reviewer"),
) )
return metadata return metadata
pass
def get_readings( def get_readings(
factory: WebAbsolutesFactory, factory: WebAbsolutesFactory,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment