From d20c610887b9c5cd837600a6bf9accd7cfc2da6b Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Tue, 3 Dec 2024 11:42:42 -0700
Subject: [PATCH 1/3] Use model_dump_json() instead of json()
---
geomagio/processing/copy_absolutes.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geomagio/processing/copy_absolutes.py b/geomagio/processing/copy_absolutes.py
index a438c246..2addce46 100644
--- a/geomagio/processing/copy_absolutes.py
+++ b/geomagio/processing/copy_absolutes.py
@@ -116,7 +116,7 @@ def create_reading_metadata(reading: Reading, created_by_label: str) -> Metadata
category=MetadataCategory.READING,
created_by=(created_by_label),
endtime=max(measurement_times),
- metadata=json.loads(reading.json()),
+ metadata=json.loads(reading.model_dump_json()),
network="NT",
starttime=min(measurement_times),
station=reading.metadata["station"],
--
GitLab
From 7bc046e0adc3eef863da61751489f16ba5c31f46 Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Tue, 3 Dec 2024 11:43:48 -0700
Subject: [PATCH 2/3] Use model_dump() for dict and some small fixes
---
geomagio/processing/copy_instrument.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/geomagio/processing/copy_instrument.py b/geomagio/processing/copy_instrument.py
index 32c2c71e..1e0f0e58 100644
--- a/geomagio/processing/copy_instrument.py
+++ b/geomagio/processing/copy_instrument.py
@@ -45,7 +45,7 @@ def copy_instrument(
show_default="environment variable GITLAB_API_TOKEN",
),
metadata_url: str = typer.Option(
- default="https://staging-geomag.cr.usgs.gov/ws/secure/metadata",
+ default="https://geomag.usgs.gov/ws/secure/metadata",
help="URL to metadata web service",
metavar="URL",
),
@@ -129,7 +129,7 @@ def create_metadata(
category=MetadataCategory.INSTRUMENT,
created_by=created_by_label,
endtime=endtime,
- metadata=metadata_class(**metadata),
+ metadata=(metadata_class(**metadata)).model_dump(),
network="NT",
location="R0",
starttime=starttime,
@@ -201,8 +201,7 @@ def upload_instrument_metadata(
print("Updating metadata")
return factory.update_metadata(metadata=instrument)
- print("pretending to upload")
- # return factory.create_metadata(metadata=instrument)
+ return factory.create_metadata(metadata=instrument)
if __name__ == "__main__":
--
GitLab
From 424bb16e0c9634efac62466152f69be1394eabd4 Mon Sep 17 00:00:00 2001
From: Alex Wernle <awernle@usgs.gov>
Date: Tue, 3 Dec 2024 11:46:07 -0700
Subject: [PATCH 3/3] fix typo in pydantic import.
---
geomagio/metadata/instrument/Instrument.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geomagio/metadata/instrument/Instrument.py b/geomagio/metadata/instrument/Instrument.py
index 378ed7da..4214667e 100644
--- a/geomagio/metadata/instrument/Instrument.py
+++ b/geomagio/metadata/instrument/Instrument.py
@@ -1,4 +1,4 @@
-from types import Optional
+from typing import Optional
from pydantic import BaseModel, Field
from enum import Enum
--
GitLab