anss-formats 0.0.4__py3-none-any.whl → 0.1.0__py3-none-any.whl

{anss_formats-0.0.4.dist-info → anss_formats-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: anss-formats
-Version: 0.0.4
+Version: 0.1.0
 Summary: Python implementation of the library used to communicate seismic event detection information between systems
 License: CC0-1.0
 Keywords: anss,earthquakes,formats,detection
@@ -24,6 +24,17 @@ Project-URL: Repository, https://gitlab.com/anss-netops/anss-data-formats
 Description-Content-Type: text/markdown
 
 # ANSS Data Formats
+
+This is the Python implementation of the library used to generate and parse the 
+ANSS Formats.
+
+Dependencies
+------
+* ANSS Formats utilizes [JSON](www.json.org) for formatting.
+* ANSS Formats was written in Python 3.6
+* ANSS Formats uses [poetry](https://python-poetry.org/) for
+Package, dependency and environment management.
+
 The US Geological Survey (USGS) Advanced National Seismic System (ANSS) defines a number of data exchange formats to communicate seismic event detection information between processing systems. These formats are defined using objects as defined in the [JSON standard](http://www.json.org).
 
 The purpose of this project is to:
@@ -36,18 +47,20 @@ seismic event detections.
 ## Defined formats:
 
 * [Pick](format-docs/Pick.md) Format - A format for unassociated picks from a waveform arrival time picking algorithm.
+* [Detection](format-docs/Detection.md) Format - A format for an earthquake detection picks from a seismic detection algorithm.
 
 ## Supporting format objects:
 
 * [Amplitude](format-docs/Amplitude.md) Object - An object that contains information about an amplitude as part of a pick.
-* [Beam](format-docs/Beam.md) Object  - An object that contains information about a waveform beam as part of a pick.
 * [Associated](format-docs/Associated.md) Object - An object that contains associated information if a pick is included in a detection.
+* [Channel](format-docs/Channel.md) Object - A geoJSON object that contains channel/location information as part of a pick.
+* [EventType](format-docs/EventType.md) Object - An object that defines the event type for MachineLearning info.
 * [Filter](format-docs/Filter.md) Object - An object that contains filter information as part of a pick.
-* [Site](format-docs/Site.md) Object - An object that defines the station used to create a pick.
-* [Source](format-docs/Source.md) Object - An object that defines the creator/source of a pick.
-* [Quality](format-docs/Quality.md) Object - An object that defines the data quality of a pick.
+* [Hypocenter](format-docs/Hypocenter.md) Object - A geoJSON object that contains the hypocentral location, arrival time, and error information as part of a detection.
 * [MachineLearning](format-docs/MachineLearning.md) Object - An object that defines the machine learning information for a pick.
-* [EventType](format-docs/EventType.md) Object - An object that defines the event type for MachineLearning info.
+* [Magnitude](format-docs/Magnitude.md) Object - An object that defines an earthquake magnitude estimation, as part of a Machine Learning classification or earthquake detection.
+* [Quality](format-docs/Quality.md) Object - An object that defines the data quality of a pick.
+* [Source](format-docs/Source.md) Object - An object that defines the creator/source of a pick.
 
 # Amplitude Object Specification
 
@@ -119,99 +132,151 @@ association.
 * residual - A decimal number containing residual in seconds of the data if Association.
 * sigma - A decimal number reflecting the number of standard deviations of the data from the calculated value if Association.
 
-# Beam Object Specification
+# Site Object Specification
 
 ## Description
 
-The Beam object is an object designed to encode waveform beam information
-that may or may not be part of the [Pick](Pick.md) Format.  Beam uses the
-[JSON standard](http://www.json.org).
+The Site object is an object designed to define the seismic station used to
+produce a [Pick](Pick.md) message.  Site uses the [JSON](https://www.json.org) and [GeoJSON](https://geojson.org/) standards.
 
 ## Usage
 
-The Beam object is intended for use as part of the [Pick](Pick.md) Format
-in seismic data messaging between seismic applications and organizations.
+Site is intended for use as part of the [Pick](Pick.md) Format in seismic data messaging between seismic applications and organizations.
 
 ## Output
 
 ```json
-    {
-      "backAzimuth"      : Number,
-      "backAzimuthError" : Number,
-      "slowness"         : Number,
-      "slownessError"    : Number,
-      "powerRatio"       : Number,
-      "powerRatioError"  : Number
-    }
+{
+  "type": "Feature",
+  "geometry": {
+    "type": "Point",
+    "coordinates": [125.6, 10.1]
+  },
+  "properties": {
+    "station"   : String,
+    "channel"   : String,
+    "network"   : String,
+    "location"  : String
+  }
+}
 ```
 
 ## Glossary
 
 **Required Values:**
 
-These are the values **required** to define a beam.
+These are the properties **required** to define a Site.
 
-* backAzimuth - A decimal number containing the back azimuth.
-* slowness - A decimal number containing the horizontal slowness.
+* type - A string indicating the geojson feature type
+* geometry - A geojson point containing the station coordinates in the form [Latitude, Longitude, Elevation (in meters)]
+* properties - The associated properties for this geojson feature
 
-**Optional Values:**
+**Required Properties:**
 
-The following are supplementary values that **may or may not** be provided by
+These geojson feature properties are **required** to define a Site.
+* station - A string the station code.
+* network - A string containing network code.
+
+**Optional Properties:**
+
+The following are supplementary geojson feature properties that **may or may not** be provided by
 various algorithms.
 
-* backAzimuthError - A decimal number containing the back azimuth error.
-* slownessError - A decimal number containing the horizontal slowness error.
-* powerRatio - A decimal number containing the power ratio.
-* powerRatioError - A decimal number containing the power ratio error.
+* channel - A string containing the channel code.
+* location - A string containing the location code.
 
-# Site Object Specification
+# Detection Format Specification
 
 ## Description
 
-The Site object is an object designed to define the seismic station used to
-produce a [Pick](Pick.md) message.  Site uses the [JSON](https://www.json.org) and [GeoJSON](https://geojson.org/) standards.
+Detection is a format designed to encode the basic information of an earthquake
+event Detection.  Detection uses the [JSON standard](http://www.json.org).
 
 ## Usage
 
-Site is intended for use as part of the [Pick](Pick.md) Format in seismic data
-messaging between seismic applications and organizations.
+Detection is intended for use in seismic data messaging between seismic
+applications.
 
 ## Output
 
 ```json
-{
-  "type": "Feature",
-  "geometry": {
-    "type": "Point",
-    "coordinates": [125.6, 10.1]
-  },
-  "properties": {
-    "Station"   : String,
-    "Channel"   : String,
-    "Network"   : String,
-    "Location"  : String
-  }
-}
+    {
+      "type"        : "Detection",
+      "id"          : String,
+      "source"      :
+      {
+         "agencyID" : String,
+         "author"   : String
+      },
+      "hypocenter"  :
+        {
+          "type": "Feature",
+          "geometry": {
+            "type": "Point",
+            "coordinates": [125.6, 10.1, 1589.0]
+        },
+          "properties": {
+            "originTime"      : ISO8601,
+            "latitudeError"   : Number,
+            "longitudeError"  : Number,
+            "depthError"      : Number,
+            "originTimeError" : Number
+        }      
+      },
+      "detectionType"   : String,
+      "detectionTime"   : ISO8601,
+      "eventType" :
+      {
+          "type"      : String,
+          "certainty" : String
+      },
+      "minimumDistance" : Number,
+      "rms"             : Number,
+      "maximumGap"      : Number,
+      "detector"        : String,
+      "pickData"  : [Pick Objects],
+      "magnitudeData" :
+      [ 
+        {
+          "type" : String,
+          "id" : String,
+          "value" : Number,
+          "source" :
+          {
+            "agencyID" : String,
+            "author"   : String
+          },  
+          "error" : Number,
+          "probability" : Number
+        }, ...
+      ]
+    }
 ```
 
 ## Glossary
 
 **Required Values:**
 
-These are the properties **required** to define a Site.
+These are the values **required** to define a detection.
 
-* type - A string indicating the geojson feature type
-* geometry - A geojson point containing the station coordinates in the form [Latitude, Longitude, Elevation (in meters)]
-* station - A string the station code.
-* network - A string containing network code.
+* type - A string that identifies this message as a detection.
+* id - A string containing an unique identifier for this Detection.
+* source - An object containing the source of the Detection, see [Source](Source.md).
+* hypocenter - An object containing the hypocenter of the Detection, see [Hypocenter](Hypocenter.md).
 
 **Optional Values:**
 
-The following are supplementary properties that **may or may not** be provided as
-part of a Site.
+The following are supplementary values that **may or may not** be provided as part of a detection.
 
-* channel - A string containing the channel code.
-* location - A string containing the location code.
+* detectionType - A string that identifies whether the Detection is `New`, `Update`, or `Final`.
+* detectionTime - A string containing the UTC time this detection was made, i.e. how quickly after origin time was this detection created, in the ISO8601 format `YYYY-MM-DDTHH:MM:SS.SSSZ`.
+* eventType - An object containing the event type of the correlation, see [EventType](EventType.md).
+* rms - A decimal number containing the rms estimate for the detction
+* minimumDistance - A decimal number representing the minimum distance to the closest supporting station.
+* maximumGap - A decimal number representing the maximum gap in degrees between supporting stations.
+* detector - A string identifying the detection grid, algorithm, or other information.
+* pickData - An array of [Pick](Pick.md) objects used to generate this Detection.
+* magnitudeData - An array of [Magnitude](Magnitude.md) objects for this Detection.
 
 # EventType Object Specification
 
@@ -287,6 +352,60 @@ The following are values that **may or may not** be provided as part of a filter
 Note: The Type of filter is assumed to be "BandPass", and the Units are assumed
 to be "Hertz"
 
+# Hypocenter Object Specification
+
+## Description
+
+The Hypocenter object is an object designed to define a Hypocenter as part of a [Detection](Detection.md) message.  Hypocenter uses the [JSON standard](http://www.json.org) and [GeoJSON](https://geojson.org/) standards.
+
+
+## Usage
+
+Hypocenter is intended for use as part of the [Detection](Detection.md) Format in seismic data messaging between seismic applications and organizations.
+
+## Output
+
+```json
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Point",
+        "coordinates": [125.6, 10.1, 1589.0]
+      },
+      "properties": {
+        "originTime"      : ISO8601,
+        "latitudeError"   : Number,
+        "longitudeError"  : Number,
+        "depthError"      : Number,
+        "originTimeError" : Number
+      }      
+    }
+```
+
+## Glossary
+
+**Required Values:**
+
+These are the values **required** to define a hypocenter.
+* type - A string indicating the geojson feature type, always a point
+* geometry - A geojson point containing the station coordinates in the form [Latitude, Longitude, Depth (in meters)]
+* properties - The associated properties for this geojson feature
+
+**Required Properties:**
+
+These geojson feature properties are **required** to define a hypocenter.
+* originTime - A string containing the UTC origin time of this hypocenter, in the ISO8601 format `YYYY-MM-DDTHH:MM:SS.SSSZ`.
+
+**Optional Properties:**
+
+The following are supplementary geojson feature properties that **may or may not** be provided by
+various algorithms.
+
+* latitudeError - A decimal number that identifies the error of the latitude of this hypocenter in kilometers.
+* longitudeError - A decimal number that identifies the error of the longitude of this hypocenter in kilometers.
+* depthError - A decimal number that identifies the depth error of this hypocenter in kilometers.
+* originTimeError - A decimal number that identifies the error of the origin time in seconds.
+
 # MachineLearning Object Specification
 
 ## Description
@@ -313,9 +432,19 @@ applications and organizations.
         "distanceRangeSigma"       : Number,
         "backAzimuth"              : Number,
         "backAzimuthProbability"   : Number,
-        "magnitude"            : Number,
-        "magnitudeType"        : String,
-        "magnitudeProbability" : Number,
+        "magnitude" :
+        {
+            "type" : String,
+            "id" : String,
+            "value" : Number,
+            "source" :
+            {
+                "agencyID" : String,
+                "author"   : String
+            },  
+            "error" : Number,
+            "probability" : Number
+        }, 
         "depth"                : Number,
         "depthProbability"     : Number,
         "eventType" :
@@ -350,9 +479,7 @@ The following are values that **may or may not** be provided as part of MachineL
 * distanceRangeSigma - A decimal number containing the standard deviation for a probability PDF curve for Distance (e.g. Distance is 15 deg +/- 3 * DistanceRangeSigma where DistanceProbability is modified by the PDF probability, lowering as it gets further from Distance ).  DistanceRangeSigma is mutually exclusive of DistanceRangeHalfWidth, and if both are provided DistanceRangeSigma should be used. 
 * backAzimuth - A decimal number containing a backazimuth estimation in degrees
 * backAzimuthProbability - A decimal number containing the probability of the backazimuth estimation
-* magnitude - A decimal number containing the magnitude estimation
-* magnitudeType - A string that identifies the magnitude type
-* magnitudeProbability - A decimal number containing the probability of the magnitude estimation
+* magnitude - A [Magnitude](Magnitude.md) object containing the machine learning magnitude estimation
 * depth - A decimal number containing a depth estimation in kilometers
 * depthProbability - A decimal number containing the probability of the depth estimation
 * eventType - An object containing the event type, see [EventType](EventType.md).
@@ -363,6 +490,53 @@ The following are values that **may or may not** be provided as part of MachineL
 * repickCredibleIntervalUpper - A decimal number containing the repick shift credible interval upper
 * source - An object containing the source of the MachineLearning, see [Source](Source.md).
 
+# Magnitude Object Specification
+
+## Description
+
+The Magnitude object is an object designed to hold data quality for a [Detection](Detection.md) message.
+Site uses the [JSON standard](http://www.json.org).
+
+## Usage
+
+Magnitude is intended for use as part of the [Detection](Detection.md) Format in seismic data
+messaging between seismic applications and organizations.
+
+## Output
+
+```json
+    {
+      "type" : String,
+      "id" : String,
+      "value" : Number,
+      "source" :
+      {
+         "agencyID" : String,
+         "author"   : String
+      },  
+      "error" : Number,
+      "probability" : Number
+    }
+```
+
+## Glossary
+
+**Required Values:**
+
+These are the values **required** to define a Magnitude
+
+* type - A string containing the name of the magnitude type.
+* value - A decimal number containing numarical value of the magnitude.
+
+**Optional Values:**
+
+The following are supplementary values that **may or may not** be provided as part of a Magnitude.
+
+* id - A string containing an unique identifier for this Magnitude.
+* source - An object containing the source of the Magnitude, see [Source](Source.md).
+* error - A decimal number containing numarical error estimate of the magnitude.
+* probability - A decimal number containing the probability of the magnitude
+
 # Pick Format Specification
 
 ## Description
@@ -417,15 +591,6 @@ applications and organizations.
          "period"    : Number,
          "snr"       : Number
       },
-      "beamInfo" :
-      {
-        "backAzimuth"      : Number,
-        "backAzimuthError" : Number,
-        "slowness"         : Number,
-        "slownessError"    : Number,
-        "powerRatio"       : Number,
-        "powerRatioError"  : Number,
-      },
       "associationInfo" :
       {
          "phase"    : String,
@@ -448,9 +613,19 @@ applications and organizations.
         "distanceRangeSigma"       : Number,
         "backAzimuth"              : Number,
         "backAzimuthProbability"   : Number,
-        "magnitude"            : Number,
-        "magnitudeType"        : String,
-        "magnitudeProbability" : Number,
+        "magnitude" :
+        {
+          "type" : String,
+          "id" : String,
+          "value" : Number,
+          "source" :
+          {
+            "agencyID" : String,
+            "author"   : String
+          },  
+          "error" : Number,
+          "probability" : Number
+        },
         "depth"                : Number,
         "depthProbability"     : Number,
         "eventType" : {
@@ -493,7 +668,6 @@ various picking algorithms.
 * pickerType - A string describing the type of picker; "manual", "raypicker", "filterpicker", "earthworm", or "other".
 * filter - An array of objects containing the filter frequencies when the pick was made, see [Filter](Filter.md).
 * amplitude - An object containing the amplitude associated with the pick, see [Amplitude](Amplitude.md).
-* beam - An object containing the waveform beam information associated with the pick, see [Beam](Beam.md).
 * associationInfo - An object containing the association information if this pick is used as data in a Detection, see [Associated](Associated.md).
 * machineLearningInfo - An object containing the machine learning  information of this pick, see [MachineLearning](MachineLearning.md).
 * qualityInfo - An array of objects containing the containing the quality metric information for this pick, see [Quality](Quality.md).

anss_formats-0.1.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+anssformats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+anssformats/amplitude.py,sha256=DCtkc6siT8dj0C3ynBM01rfaSpKOeHTc-51CDmspELg,647
+anssformats/association.py,sha256=UjDmr213kSzCCIWHMDce06Xjzut3-l1IYKexxJR_C_I,1173
+anssformats/channel.py,sha256=z4sQGpJwSySSuzKCca_UovS6_DbPaP_j4BAZpX-Cqwc,1169
+anssformats/detection.py,sha256=dR76eFRmBp5fKyZoOm70bWcrYhc7Eo1f0mtWQI0u8lw,2015
+anssformats/eventType.py,sha256=6DHjovVVGug5AU1WRKX3RxQbrnwSPlg2KNtH2sLX1Q0,1216
+anssformats/filter.py,sha256=uOAUteSWeBvDcB12_9E_9sqe0wb6iR_lHZdjLv5agNM,675
+anssformats/formatbasemodel.py,sha256=mUKwY0jiHrcr8jdZLCQhzSx3qBg16FEUytRgB5wiuIY,2044
+anssformats/geojson.py,sha256=xjm_9ZxX9P8lzQKDBDO6L-ai1y7PQofVMJ5FwEIAVjU,1244
+anssformats/hypocenter.py,sha256=QkXfQkRzjHbefF4G3TaOTwD5PYcvFkX5dvxjeVS3yfs,1552
+anssformats/machineLearning.py,sha256=YJbnzv4JbJwr_UaE3TAaidKpGHfaM5dOmlAOqbnv32w,3008
+anssformats/magnitude.py,sha256=ncMmwMoj_Lv0kSzjjtQVZ5_41mSkCYFxgExxiaeSqao,993
+anssformats/pick.py,sha256=ME3vnE06jsrQHST9gXwXzn0z_bUX7V5G7QbYzk0c1I8,2682
+anssformats/quality.py,sha256=PK5sPAoJTUgCrmQkiWTerEB2klWbR1ECAU-qIABpcjA,389
+anssformats/source.py,sha256=G78YUwY2fimi8Uy0d1mKjaIIsEDUue50wdHpACQsSMU,398
+anss_formats-0.1.0.dist-info/METADATA,sha256=Dx1lfOeuCkIaYUfdOp2NfhTVSRpuMf5mXO1VgAtTajs,24969
+anss_formats-0.1.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+anss_formats-0.1.0.dist-info/RECORD,,

anssformats/channel.py

@@ -2,47 +2,11 @@ from typing import Optional, List, Literal
 
 from pydantic import Field, field_validator, ValidationInfo
 from anssformats.formatbasemodel import FormatBaseModel
-
-
-class ChannelGeometry(FormatBaseModel):
-    """A class holding the geojson geometry for the channel
-
-    type: string containing the type of this geometry
-
-    coordinates: List of floats containing the longitude in degrees, latitude in degrees, and elevation in meters, in that order
-    """
-
-    type: str = "Point"
-    coordinates: List[float]
-
-    # check that coordinates are valid
-    @field_validator("coordinates")
-    @classmethod
-    def validate_coordinates(
-        cls, value: List[float], info: ValidationInfo
-    ) -> List[float]:
-        if value is None:
-            raise ValueError("Missing coordinates")
-
-        if len(value) != 3:
-            raise ValueError("Incomplete coordinates")
-
-        # longitude
-        if value[0] < -180.0 or value[0] > 180.0:
-            raise ValueError("Longitude coordinate out of valid range")
-
-        # latitude
-        if value[1] < -90.0 or value[1] > 90.0:
-            raise ValueError("Latitude coordinate out of valid range")
-
-        # don't bother validating elevation
-        # value[2]
-
-        return value
+from anssformats.geojson import PointGeometry
 
 
 class ChannelProperties(FormatBaseModel):
-    """A class holding the channe specific custom properties for a geojson point feature
+    """A class holding the channel specific custom properties for a geojson point feature
 
     Station: string containing the station code
 
@@ -65,12 +29,12 @@ class Channel(FormatBaseModel):
 
     type: string containing the type of this geojson
 
-    geometry: ChannelGeometry object containing the geojson geometry for this feature
+    geometry: PointGeometry object containing the geojson geometry for this feature
 
     properties: ChannelProperties object containing the channel properties
     """
 
     type: str = "Feature"
 
-    geometry: ChannelGeometry
+    geometry: PointGeometry
     properties: ChannelProperties

anssformats/detection.py

@@ -0,0 +1,66 @@
+from typing import List, Literal, Optional
+
+from pydantic import Field
+
+
+from anssformats.formatbasemodel import CustomDT, FormatBaseModel
+from anssformats.eventType import EventType
+from anssformats.hypocenter import Hypocenter, HypocenterProperties
+from anssformats.source import Source
+from anssformats.pick import Pick
+from anssformats.magnitude import Magnitude
+
+
+class Detection(FormatBaseModel):
+    """A conversion class used to create, parse, and validate detection data.
+
+    type: string identifying this message as a detection
+
+    id: string containing a unique identifier for this detection
+
+    source: Source object containing the source of the detection
+
+    hypocenter: Hypocenter object containing the hypocenter of the detection
+
+    detectionType: optional string containing the origin type of this detection; valid
+        values are "New", "Update", "Final", and "Retract"
+
+    detectionTime: optional datetime containing the time this detection was made
+
+    eventType: optional EventType object containing the event type of the detection
+
+    minimumDistance: optional float containing the distance to the closest station
+
+    rms: optional float containing the detection RMS
+
+    maximumGap: optional float containing the detection gap
+
+    detector: optional string containing the detection grid, algorithm, or other
+        information
+
+    pickData: optional list of either Pick objects used to generate
+        this detection
+
+
+    """
+
+    type: Literal["Detection"]
+    id: str
+    source: Source
+
+    hypocenter: Hypocenter
+
+    detectionType: Optional[Literal["New", "Update", "Final", "Retract"]] = None
+    detectionTime: Optional[CustomDT] = None
+
+    eventType: Optional[EventType] = None
+
+    minimumDistance: Optional[float] = Field(None, ge=0.0)
+    rms: Optional[float] = None
+    maximumGap: Optional[float] = Field(None, ge=0.0, le=360.0)
+
+    detector: Optional[str] = None
+
+    pickData: Optional[List[Pick]] = None
+
+    magnitudeData: Optional[List[Magnitude]] = None

anssformats/formatbasemodel.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import Any
 
-from pydantic import BaseModel, GetCoreSchemaHandler
+from pydantic import BaseModel, GetCoreSchemaHandler, field_validator
 from pydantic_core import CoreSchema, core_schema
 
 
@@ -22,10 +22,6 @@ def convert_datetime_to_iso8601_with_z_suffix(dt: datetime) -> str:
 class FormatBaseModel(BaseModel):
     """A Pydantic BaseModel used for any required formatting of keys and values"""
 
-    class Config:
-        # conversion for datetime to datetime string
-        json_encoders = {datetime: convert_datetime_to_iso8601_with_z_suffix}
-
     def model_dump(self):
         """Override the default model_dump method to always exclude None values"""
         return super().model_dump(exclude_none=True)
@@ -41,17 +37,22 @@ class CustomDT(datetime):
     strings.
     """
 
+    @field_validator("*", mode="before")
     @classmethod
     def validate_no_tz(cls, v: Any, info: core_schema.ValidationInfo) -> Any:
         if isinstance(v, str):
             return datetime.strptime(v, "%Y-%m-%dT%H:%M:%S.%fZ").replace(tzinfo=None)
-        else:
-            return v.replace(tzinfo=None)
+        return v.replace(tzinfo=None)
 
     @classmethod
     def __get_pydantic_core_schema__(
         cls, source_type: Any, handler: GetCoreSchemaHandler
     ) -> CoreSchema:
-        return core_schema.with_info_plain_validator_function(
-            function=cls.validate_no_tz
+        return core_schema.with_info_before_validator_function(
+            cls.validate_no_tz,
+            handler(datetime),
+            serialization=core_schema.plain_serializer_function_ser_schema(
+                convert_datetime_to_iso8601_with_z_suffix,
+                when_used="json-unless-none",
+            ),
         )

anssformats/geojson.py

@@ -0,0 +1,41 @@
+from typing import Optional, List, Literal
+
+from pydantic import Field, field_validator, ValidationInfo
+from anssformats.formatbasemodel import FormatBaseModel
+
+
+class PointGeometry(FormatBaseModel):
+    """A class holding a geojson point geometry
+
+    type: string containing the type of this geometry
+
+    coordinates: List of floats containing the longitude in degrees, latitude in degrees, and elevation in meters or depth in kilometers, in that order
+    """
+
+    type: str = "Point"
+    coordinates: List[float]
+
+    # check that coordinates are valid
+    @field_validator("coordinates")
+    @classmethod
+    def validate_coordinates(
+        cls, value: List[float], info: ValidationInfo
+    ) -> List[float]:
+        if value is None:
+            raise ValueError("Missing coordinates")
+
+        if len(value) != 3:
+            raise ValueError("Incomplete coordinates")
+
+        # longitude
+        if value[0] < -180.0 or value[0] > 180.0:
+            raise ValueError("Longitude coordinate out of valid range")
+
+        # latitude
+        if value[1] < -90.0 or value[1] > 90.0:
+            raise ValueError("Latitude coordinate out of valid range")
+
+        # don't validate elevation/depth
+        # value[2]
+
+        return value

anssformats/hypocenter.py

@@ -0,0 +1,47 @@
+from typing import Optional, List, Literal
+
+from pydantic import Field, field_validator, ValidationInfo
+from anssformats.formatbasemodel import CustomDT, FormatBaseModel
+from anssformats.geojson import PointGeometry
+
+
+class HypocenterProperties(FormatBaseModel):
+    """A class holding the hypocenter specific custom properties for a geojson point feature
+
+    originTime: required datetime containing the origin time of the hypocenter
+
+    latitudeError: optional float containing the error of the latitude of this
+        hypocenter in kilometers
+
+    longitudeError: optional float containing the error of the longitude of this
+        hypocenter in kilometers
+
+    depthError: optional float containing the error of the depth of this hypocenter in
+        kilometers
+
+    timeError: optional float containing the error of the origin time of this hypocenter
+        in seconds
+    """
+
+    originTime: CustomDT
+    latitudeError: Optional[float] = None
+    longitudeError: Optional[float] = None
+    depthError: Optional[float] = None
+    timeError: Optional[float] = None
+
+
+class Hypocenter(FormatBaseModel):
+    """A conversion class used to create, parse, and validate geojson Hypocenter data as part of
+    detection data.
+
+    type: string containing the type of this geojson
+
+    geometry: PointGeometry object containing the geojson geometry for this feature
+
+    properties: HypocenterProperties object containing the hypocenter properties
+    """
+
+    type: str = "Feature"
+
+    geometry: PointGeometry
+    properties: HypocenterProperties

anssformats/machineLearning.py

@@ -5,6 +5,7 @@ from pydantic import Field
 from anssformats.eventType import EventType as EventTypeFormat
 from anssformats.formatbasemodel import FormatBaseModel
 from anssformats.source import Source as SourceFormat
+from anssformats.magnitude import Magnitude
 
 
 class MachineLearning(FormatBaseModel):
@@ -30,12 +31,7 @@ class MachineLearning(FormatBaseModel):
     backAzimuthProbability: optional float containing the probability of the
         MachineLearning back azimuth
 
-    magnitude: optional float containing the MachineLearning magnitude
-
-    magnitudeType: optional string containing the MachineLearning magnitude type
-
-    magnitudeProbability: optional float containing the probability of the
-        MachineLearning magnitude
+    magnitude: optional Magnitude object containing the MachineLearning magnitude
 
     depth: optional float containing the MachineLearning depth in kilometers
 
@@ -68,9 +64,7 @@ class MachineLearning(FormatBaseModel):
     backAzimuth: Optional[float] = Field(None, ge=0.0)
     backAzimuthProbability: Optional[float] = None
 
-    magnitude: Optional[float] = Field(None, ge=-2.0, le=10.0)
-    magnitudeType: Optional[str] = None
-    magnitudeProbability: Optional[float] = None
+    magnitude: Optional[Magnitude] = None
 
     depth: Optional[float] = Field(None, ge=-100.0, le=1500.0)
     depthProbability: Optional[float] = None

anssformats/magnitude.py

@@ -0,0 +1,35 @@
+from typing import Optional
+
+from pydantic import Field
+
+from anssformats.formatbasemodel import FormatBaseModel
+from anssformats.source import Source
+
+
+class Magnitude(FormatBaseModel):
+    """A conversion class used to create, parse, and validate Magnitude data as part
+    of detection data.
+
+    Attributes
+    ----------
+
+    value: float containing the magnitude value
+
+    type: string containing the magnitude type
+
+    error: optional float containing the associated magnitude error (if any)
+
+    probability: optional float containing the associated magnitude probability (if any)
+
+    id: optional string containing a unique identifier for this magnitude
+
+    source: optional Source object containing the source of the magnitude
+    """
+
+    value: float = Field(None, ge=-2.0, le=10.0)
+    type: str
+
+    error: Optional[float] = Field(None, ge=0.0)
+    probability: Optional[float] = Field(None, ge=0.0, le=100.0)
+    id: Optional[str] = None
+    source: Optional[Source] = None

anssformats/pick.py

@@ -4,7 +4,6 @@ from pydantic import Field
 
 from anssformats.amplitude import Amplitude
 from anssformats.association import Association
-from anssformats.beam import Beam
 from anssformats.machineLearning import MachineLearning
 from anssformats.filter import Filter
 from anssformats.formatbasemodel import CustomDT, FormatBaseModel
@@ -43,9 +42,6 @@ class Pick(FormatBaseModel):
     amplitude: optional Amplitude object containing the amplitude associated with the
         pick
 
-    beamInfo: optional Beam object containing the waveform beam information associated with
-        the pick
-
     associationInfo: optional Association object containing the association information
         if this pick is used as data in a Detection
 
@@ -72,7 +68,6 @@ class Pick(FormatBaseModel):
 
     filterInfo: Optional[List[Filter]] = None
     amplitudeInfo: Optional[Amplitude] = None
-    beamInfo: Optional[Beam] = None
 
     associationInfo: Optional[Association] = None
     machineLearningInfo: Optional[MachineLearning] = None

anss_formats-0.0.4.dist-info/RECORD

@@ -1,15 +0,0 @@
-anssformats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-anssformats/amplitude.py,sha256=DCtkc6siT8dj0C3ynBM01rfaSpKOeHTc-51CDmspELg,647
-anssformats/association.py,sha256=UjDmr213kSzCCIWHMDce06Xjzut3-l1IYKexxJR_C_I,1173
-anssformats/beam.py,sha256=lKmdXi_9Y9kglXPrsDG8WT2_41ssX92PrLxxjws7wT4,1004
-anssformats/channel.py,sha256=AQ6wrBCtMhXwN3gdxWQKkiutqnVB9H2FmbMrOY6CTC8,2240
-anssformats/eventType.py,sha256=6DHjovVVGug5AU1WRKX3RxQbrnwSPlg2KNtH2sLX1Q0,1216
-anssformats/filter.py,sha256=uOAUteSWeBvDcB12_9E_9sqe0wb6iR_lHZdjLv5agNM,675
-anssformats/formatbasemodel.py,sha256=naZFyuL6YOIMdpYpxD91l7MbbG6eafz3-itzLilSoG8,1933
-anssformats/machineLearning.py,sha256=6xwmv_F2VuxZl-ng7qUKlV7Mrlw6aQ-LKg6A6x3vdfo,3261
-anssformats/pick.py,sha256=Spaw7Paw_UCkVxNSJxJSirmiXM3e2KEY8-nIwVgk2Vg,2867
-anssformats/quality.py,sha256=PK5sPAoJTUgCrmQkiWTerEB2klWbR1ECAU-qIABpcjA,389
-anssformats/source.py,sha256=G78YUwY2fimi8Uy0d1mKjaIIsEDUue50wdHpACQsSMU,398
-anss_formats-0.0.4.dist-info/METADATA,sha256=8RSZ270Phj4OLm0zK_6NMkrokce0uEUHkoadqJY9a9w,19170
-anss_formats-0.0.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-anss_formats-0.0.4.dist-info/RECORD,,

anssformats/beam.py

@@ -1,34 +0,0 @@
-from typing import Optional
-
-from pydantic import Field
-
-from anssformats.formatbasemodel import FormatBaseModel
-
-
-class Beam(FormatBaseModel):
-    """A conversion class used to create, parse, and validate beam detection data.
-
-    Attributes
-    ----------
-
-    backAzimuth: float containing the back azimuth in degrees
-
-    backAzimuthError: optional float containing the back azimuth error
-
-    slowness: float containing the horizontal slowness
-
-    slownessError: optional float containing the horizontal slowness error
-
-    powerRatio: optional float containing the power ratio
-
-    powerRatioError: optional float containing the power ratio error
-    """
-
-    backAzimuth: float = Field(ge=0.0)
-    backAzimuthError: Optional[float] = Field(None, ge=0.0)
-
-    slowness: float = Field(ge=0.0)
-    slownessError: Optional[float] = Field(None, ge=0.0)
-
-    powerRatio: Optional[float] = Field(None, ge=0.0)
-    powerRatioError: Optional[float] = Field(None, ge=0.0)