From 117566b6b35050ff480d5d3a5361b42483ad06c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=82=B9=E3=82=B3=E3=83=83=E3=83=88?=
 <scotthaleen@users.noreply.github.com>
Date: Wed, 17 Jul 2024 13:50:56 -0400
Subject: [PATCH] grade and tonnage 2 (#49)

* grade and tonnage 2

* hyper site

* hypersite to dedupsite

* version update
---
 cdr_schemas/mineral.py | 51 +++++++++++++++++++++++++++++++++++-------
 pyproject.toml         |  2 +-
 2 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/cdr_schemas/mineral.py b/cdr_schemas/mineral.py
index 2b23579..221f7ae 100644
--- a/cdr_schemas/mineral.py
+++ b/cdr_schemas/mineral.py
@@ -222,13 +222,30 @@ class MineralSite(BaseModel):
     )
 
 
-class GradeAndTonnage(BaseModel):
-    id: Optional[str] = Field(default=None, description="grade and tonnage record id")
+class DedupSiteRecord(BaseModel):
+    id: Optional[str] = Field(default=None, description="dedup site record record id")
     mineral_site_id: str = Field(description="Mineral Site Id")
-    name: str = Field(default="")
-    commodity: str = Field(..., description="Commodity Name")
+    name: str = Field(default="", description="Mineral Site Name")
     country: str = Field(default="")
     province: str = Field(default="")
+    site_rank: str = Field(default="")
+    site_type: str = Field(default="")
+
+
+class DedupSite(BaseModel):
+    id: Optional[str] = Field(default=None, description="dedup site id")
+    sites: List[DedupSiteRecord] = Field(
+        default_factory=list, description="Mineral Sites"
+    )
+
+    commodity: str = Field(..., description="Commodity Name")
+    contained_metal: Optional[float] = Field(default=None)
+    contained_metal_units: str = Field(default="")
+    tonnage: Optional[float] = Field(default=None)
+    tonnage_units: str = Field(default="")
+    grade: Optional[float] = Field(default=None)
+    grade_units: str = Field(default="")
+
     crs: str = Field(
         default="", description="The Coordinate Reference System (CRS) of the location"
     )
@@ -236,10 +253,28 @@ class GradeAndTonnage(BaseModel):
         default="",
         description="Type: Polygon or Point, value indicates the geolocation of the site",
     )
-    document_url: str = Field(default="")
-    total_contained_metal: Optional[float] = Field(default=None)
-    total_tonnage: Optional[float] = Field(default=None)
-    total_grade: Optional[float] = Field(default=None)
+
+    top1_deposit_type_id: str = Field(default="")
+    top1_deposit_classification_source: str = Field(default="")
+    top1_deposit_classification_confidence: Optional[float] = Field(default=None)
+
+    top2_deposit_type_id: str = Field(default="")
+    top2_deposit_classification_source: str = Field(default="")
+    top2_deposit_classification_confidence: Optional[float] = Field(default=None)
+
+    top3_deposit_type_id: str = Field(default="")
+    top3_deposit_classification_source: str = Field(default="")
+    top3_deposit_classification_confidence: Optional[float] = Field(default=None)
+
+    top4_deposit_type_id: str = Field(default="")
+    top4_deposit_classification_source: str = Field(default="")
+    top4_deposit_classification_confidence: Optional[float] = Field(default=None)
+
+    top5_deposit_type_id: str = Field(default="")
+    top5_deposit_classification_source: str = Field(default="")
+    top5_deposit_classification_confidence: Optional[float] = Field(default=None)
 
     system: str = Field(..., description="The name of the system used.")
     system_version: str = Field(..., description="The version of the system used.")
+    data_snapshot: str = Field(..., description="version of data")
+    data_snapshot_date: str = Field(..., description="date of data")
diff --git a/pyproject.toml b/pyproject.toml
index e53fab5..08064db 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cdr_schemas"
-version = "0.3.6"
+version = "0.3.7"
 description = "CDR Schemas"
 authors = []
 readme = "README.md"