Skip to content
Snippets Groups Projects
Commit 000a7ef5 authored by Wernle, Alexandra Nicole's avatar Wernle, Alexandra Nicole
Browse files

Changed add_empty_channels to False. Changed check_existing_metadata to return...

Changed add_empty_channels to False. Changed check_existing_metadata to return whole metadata object.
parent ca17a45e
No related branches found
No related tags found
1 merge request!344New MetadataAlgorithm, SpikesAlgorithm, and flag-spikes application
...@@ -2,6 +2,7 @@ from pydantic import BaseModel ...@@ -2,6 +2,7 @@ from pydantic import BaseModel
from obspy import UTCDateTime, Stream from obspy import UTCDateTime, Stream
from datetime import timedelta from datetime import timedelta
from enum import Enum from enum import Enum
from typing import Optional
from ..metadata.flag.Flag import Flag from ..metadata.flag.Flag import Flag
from ..metadata import Metadata, MetadataFactory, MetadataCategory from ..metadata import Metadata, MetadataFactory, MetadataCategory
...@@ -46,7 +47,7 @@ class MetadataAlgorithm(BaseModel): ...@@ -46,7 +47,7 @@ class MetadataAlgorithm(BaseModel):
return data_factory.get_timeseries( return data_factory.get_timeseries(
starttime=self.starttime, starttime=self.starttime,
endtime=self.endtime, endtime=self.endtime,
add_empty_channels=True, add_empty_channels=False,
) )
except Exception as e: except Exception as e:
raise ValueError(f"Failed to retrieve data stream from {self.factory}: {e}") raise ValueError(f"Failed to retrieve data stream from {self.factory}: {e}")
...@@ -78,8 +79,8 @@ class MetadataAlgorithm(BaseModel): ...@@ -78,8 +79,8 @@ class MetadataAlgorithm(BaseModel):
status=status, status=status,
) )
def check_existing_metadata(self, metadata_obj: Metadata) -> str | None: def check_existing_metadata(self, metadata_obj: Metadata) -> Optional[Metadata]:
"""Check if similar metadata already exists and return existing metadata ID if it does.""" """Check if similar metadata already exists and return existing metadata if it does."""
query_metadata = Metadata( query_metadata = Metadata(
category=metadata_obj.category, category=metadata_obj.category,
station=metadata_obj.station, station=metadata_obj.station,
...@@ -90,7 +91,7 @@ class MetadataAlgorithm(BaseModel): ...@@ -90,7 +91,7 @@ class MetadataAlgorithm(BaseModel):
metadata_factory = self._get_metadata_factory() metadata_factory = self._get_metadata_factory()
prior_metadata = metadata_factory.get_metadata(query=query_metadata) prior_metadata = metadata_factory.get_metadata(query=query_metadata)
return prior_metadata[0].id if prior_metadata else None return prior_metadata if prior_metadata else None
def update_metadata(self, metadata_obj: Metadata) -> Metadata: def update_metadata(self, metadata_obj: Metadata) -> Metadata:
"""Update existing metadata.""" """Update existing metadata."""
......
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