corva-worker-python 2.2.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

{corva_worker_python-2.2.1.dist-info → corva_worker_python-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: corva-worker-python
-Version: 2.2.1
+Version: 2.3.0
 Summary: SDK for interacting with Corva
 Home-page: https://github.com/corva-ai/corva-worker-python
 Author: Jordan Ambra <jordan.ambra@corva.ai>, Mohammadreza Kamyab <m.kamyab@corva.ai>

{corva_worker_python-2.2.1.dist-info → corva_worker_python-2.3.0.dist-info}/RECORD

@@ -31,9 +31,9 @@ worker/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 worker/mixins/logging.py,sha256=vZrEiRZVmON0y9nMhao1gV8qqBkZ9zcpMEJkTYyhRGc,3234
 worker/mixins/rollbar.py,sha256=DdmTw8PpExEofoZcPHBvmmIHfbMx4yB1lsdsMubtB5c,3089
 worker/partial_rerun_merge/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-worker/partial_rerun_merge/merge.py,sha256=9e-R5BlHHsTEepbUDbA3YNILHdyf93L-RCYFoKPYKEQ,17720
+worker/partial_rerun_merge/merge.py,sha256=eyrM_gJnsVTe_STzQRlUr2c3uRIn4KK4OtZonO_EzSU,17728
 worker/partial_rerun_merge/models.py,sha256=UaGBf2HZkTitg4jgZtvVSyQKEFtwMSNMfND5bM-KpT4,2794
-worker/partial_rerun_merge/progress.py,sha256=rzZx3kxk8V4oYlbGyKDJyYZ3T72fLu3FsbO_HIRTSRg,7813
+worker/partial_rerun_merge/progress.py,sha256=P5y3M5iMVA1jblve6ZEJ7fAymxD289UR5OytDKXCPGU,7881
 worker/state/__init__.py,sha256=X0TaxqfNqGp-lgraYgWpLHgdSDK0WlNjDYI0VWT9WOM,3069
 worker/state/mixins.py,sha256=43YuxtRUfYZ2c5Ql4wcUOOxuWNVnKevElwDxEtueNCE,4044
 worker/state/state.py,sha256=KEiw2-sB6xxyrweNE34JZ-iOD6C61sxXn3tsJvV6vLk,1267
@@ -43,7 +43,7 @@ worker/test/utils.py,sha256=Z7tgC_lUk2bRMlR-3tY9i5d836AdYlIY4i9WFFplheg,1479
 worker/test/local_testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 worker/test/local_testing/to_local_transfer.py,sha256=QYLGtT9fgDKsSK3x2QsaNDCMOpPZ5rpOsSnSl5s--WI,12343
 worker/wellbore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-worker/wellbore/factory.py,sha256=xKKpa9y3yuIQDfpps8wKSA2CiLhZuYFeAhrdZ0ZwdQM,19353
+worker/wellbore/factory.py,sha256=ph8wXwpinkSzbsRt6yTQTNntsgCPWc1hOLjXaXrxUsI,19674
 worker/wellbore/measured_depth_finder.py,sha256=I5FmkELT0_k1ajlraeBx2Q-G3noqNTAw1wEPKyUAQOw,367
 worker/wellbore/sections_mixin.py,sha256=JNeEKm_fRxMBBD7SUx7LM8lRDJjKIeIcVvcSOKt4DTY,1873
 worker/wellbore/wellbore.py,sha256=syvYszkbN40BhzxCQ8m6VmSBGPp2wQR9sJ6TcSu7WO8,11907
@@ -57,7 +57,7 @@ worker/wellbore/model/enums.py,sha256=DZm-o9ZCM1hSRHw_CcOK4Oy2Q_bmpDM7Gx3GlKQ_bv
 worker/wellbore/model/hole.py,sha256=LYikxOMJfxhc2yoKZN12pDBIl6W8apJcAGtGR3ZuvhM,10046
 worker/wellbore/model/hole_section.py,sha256=4sfP19xiY--wV1Ve2MtRoNqpya-FdPhNNmTgxLb90uk,1630
 worker/wellbore/model/riser.py,sha256=ElxvQMfdFTGGpJ1Jba_DNVue3zGAsm-05zDl1HBXwDk,824
-corva_worker_python-2.2.1.dist-info/METADATA,sha256=K3CfUaIHscGRNe42R-kDs4v7_lfvWGEQ2cF-srt8r4g,1017
-corva_worker_python-2.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-corva_worker_python-2.2.1.dist-info/top_level.txt,sha256=KrP-SOC-I1V0U33nVzMgkHR8wO-reJYASIvWVyLyFIY,7
-corva_worker_python-2.2.1.dist-info/RECORD,,
+corva_worker_python-2.3.0.dist-info/METADATA,sha256=SWPIpu4bSNRlGfj29SNs3_kQIxKH1KvghI1i6pBwaLE,1017
+corva_worker_python-2.3.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+corva_worker_python-2.3.0.dist-info/top_level.txt,sha256=KrP-SOC-I1V0U33nVzMgkHR8wO-reJYASIvWVyLyFIY,7
+corva_worker_python-2.3.0.dist-info/RECORD,,

{corva_worker_python-2.2.1.dist-info → corva_worker_python-2.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

worker/partial_rerun_merge/merge.py

@@ -199,7 +199,7 @@ class PartialRerunMerge:
         if not dataset_progress:
             if not skip_progress:
                 return True
-            dataset_progress = DatasetProgress(0, -1, False, collection_name)
+            dataset_progress = DatasetProgress(0, -1, False, collection_name, "time")
 
         start_time = self.start_timestamp
         if dataset_progress.is_started():

worker/partial_rerun_merge/progress.py

@@ -22,6 +22,7 @@ class DatasetProgress:
         processed_timestamp (int): The timestamp when the dataset was processed.
         completed (bool): Whether the dataset processing is completed or not.
         dataset_name (str): The name of the dataset.
+        dataset_type (str): The type of the dataset. Not used here.
     """
 
     dataset_id: int

worker/wellbore/factory.py

@@ -13,6 +13,10 @@ from worker.wellbore.wellbore import Wellbore
 MIN_LENGTH = 1  # ft
 
 
+def _remove_planning_drillstrings(drillstrings: List[dict]) -> List[dict]:
+    return [ds for ds in drillstrings if not ds.get("data", {}).get("planning", False)]
+
+
 def run_drillstring_and_create_wellbore(wits: dict, mud_flow_in: float = None) -> Union[Wellbore, None]:
     """
     Get the wits record and create a wellbore
@@ -64,6 +68,7 @@ def run_drillstring_and_create_wellbore(wits: dict, mud_flow_in: float = None) -
     drillstrings = api_worker.get(
         path="/v1/data/corva", collection="data.drillstring", asset_id=asset_id, query=query, sort=sort, limit=100
     ).data
+    drillstrings = _remove_planning_drillstrings(drillstrings)
     hole = add_open_holes(hole, drillstrings, smallest_cased_hole_diameter, hole_depth)
 
     mud_flow_in = get_mud_flow_in(mud_flow_in, wits)
@@ -160,6 +165,8 @@ def run_casingstring_and_create_wellbore(
     drill_sections = api_worker.get(
         path="/v1/data/corva", collection=drilling_data_source, asset_id=asset_id, sort=sort, limit=100
     ).data
+    if not is_design:
+        drill_sections = _remove_planning_drillstrings(drill_sections)
 
     # use data.well-sections to create hole
     if is_design: