From 02a43d829162bfcbf3b3975185379e838d251dd9 Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Tue, 16 May 2023 16:20:50 -0600
Subject: [PATCH] Removed List module. Renamed observatories to
observatory_metadata. Passed created_by_label to created_by flag.
---
geomagio/processing/copy_observatory.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/geomagio/processing/copy_observatory.py b/geomagio/processing/copy_observatory.py
index c93e2827..331418ee 100644
--- a/geomagio/processing/copy_observatory.py
+++ b/geomagio/processing/copy_observatory.py
@@ -5,7 +5,6 @@ Created on Thu Jul 7 11:05:19 2022
@author: awernle
"""
import os
-from typing import List
import typer
@@ -29,7 +28,9 @@ def copy_observatory(
):
"""Copy observatory metadata into the metadata webservice."""
- observatories = get_observatory_metadata(
+ created_by_label = "copy_observatory.py"
+
+ observatory_metadata = get_observatory_metadata(
observatory=observatory,
)
@@ -40,15 +41,17 @@ def copy_observatory(
# write observatory metadata to metadata service
metadata_factory = MetadataFactory(token=metadata_token, url=metadata_url)
with typer.progressbar(
- iterable=observatories, label="Uploading to metadata service"
+ iterable=observatory_metadata, label="Uploading to metadata service"
) as progressbar:
for observatory in progressbar:
- upload_observatory_metdata(
- factory=metadata_factory, observatory=observatory
+ upload_observatory_metadata(
+ factory=metadata_factory,
+ observatory=observatory,
+ created_by_label=created_by_label,
)
-def create_observatory_metadata(observatory) -> Metadata:
+def create_observatory_metadata(observatory, created_by_label: str) -> Metadata:
"""Create observatory metadata object.
Parameters
@@ -76,7 +79,7 @@ def create_observatory_metadata(observatory) -> Metadata:
metadata = Metadata(
category=MetadataCategory.OBSERVATORY,
- created_by="copy_observatory",
+ created_by=created_by_label,
network=network,
station=observatory.id,
metadata=observatory.dict(),
@@ -113,7 +116,9 @@ def main() -> None:
typer.run(copy_observatory)
-def upload_observatory_metdata(factory: MetadataFactory, observatory) -> Metadata:
+def upload_observatory_metadata(
+ factory: MetadataFactory, observatory, created_by_label: str
+) -> Metadata:
"""Upload observatory to metadata service
Parameters
@@ -127,7 +132,9 @@ def upload_observatory_metdata(factory: MetadataFactory, observatory) -> Metadat
-------
created metadata object
"""
- metadata = create_observatory_metadata(observatory=observatory)
+ metadata = create_observatory_metadata(
+ observatory=observatory, created_by_label=created_by_label
+ )
return factory.create_metadata(metadata=metadata)
--
GitLab