Merge pull request #83 from corva-ai/feature/DRO-325_delete_optional_fields

DRO-325 | Remove redundant fields and changed data payload to accept new fields

Author: vladbagmet

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Fields `partition` and `rerun_partition` are not expected in partial merge event payload.
+- Data structure under `data` key  of partial merge event payload can accept additional fields.
 
 
 ## [1.11.0] - 2023-12-07

src/corva/models/merge/merge.py

@@ -8,8 +8,6 @@ class PartialRerunMergeEvent(CorvaBaseEvent):
     Attributes:
         event_type: EventType.PARTIAL_WELL_RERUN_MERGE
         partial_well_rerun_id: partial well rerun id
-        partition: partition
-        rerun_partition: rerun partition
         rerun_mode: rerun mode
         start: start
         end: end
@@ -29,8 +27,6 @@ class PartialRerunMergeEvent(CorvaBaseEvent):
 
     event_type: EventType
     partial_well_rerun_id: int
-    partition: int
-    rerun_partition: int
     rerun_mode: RerunMode
     start: int
     end: int
@@ -46,3 +42,6 @@ class PartialRerunMergeEvent(CorvaBaseEvent):
     source_type: SourceType
     log_type: str
     run_until: int
+
+    class Config:
+        extra = "allow"

src/corva/models/merge/raw.py

@@ -10,8 +10,6 @@
 
 class RawPartialMergeEventData(pydantic.BaseModel):
     partial_well_rerun_id: int
-    partition: int
-    rerun_partition: int
     rerun_mode: RerunMode
     start: int
     end: int
@@ -30,6 +28,9 @@ class RawPartialMergeEventData(pydantic.BaseModel):
     log_type: str
     run_until: int
 
+    class Config:
+        extra = "allow"
+
 
 class RawPartialRerunMergeEvent(CorvaBaseEvent, RawBaseEvent):
     event_type: EventType

tests/unit/test_docs/test_app_types.py

@@ -73,8 +73,6 @@ def test_tutorial007(app_runner):
     partial_rerun_merge_event = PartialRerunMergeEvent(
         event_type="partial-well-rerun-merge",
         partial_well_rerun_id=123,
-        partition=95,
-        rerun_partition=2,
         rerun_mode="realtime",
         start=1543847760,
         end=1543847760,

tests/unit/test_partial_rerun_merge_app.py

@@ -13,8 +13,6 @@
     "event_type": "partial-well-rerun-merge",
     "data": {
         "partial_well_rerun_id": 123,
-        "partition": 95,
-        "rerun_partition": 2,
         "rerun_mode": "realtime",
         "start": 1543847760,
         "end": 1543847760,