corva-worker-python 1.2.3__tar.gz → 2.0.0__tar.gz

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/PKG-INFO

@@ -1,21 +1,30 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.4
 Name: corva-worker-python
-Version: 1.2.3
+Version: 2.0.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>
 License: Unlicensed
-Description: UNKNOWN
 Keywords: corva,worker
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
+Requires-Python: >=3.13
+Requires-Dist: numpy>=2.3.5
+Requires-Dist: redis>=7.1.0
+Requires-Dist: requests>=2.32.5
+Requires-Dist: simplejson>=3.20.2
+Requires-Dist: urllib3>=2.5.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/corva_worker_python.egg-info/PKG-INFO

@@ -1,21 +1,30 @@
-Metadata-Version: 1.2
+Metadata-Version: 2.4
 Name: corva-worker-python
-Version: 1.2.3
+Version: 2.0.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>
 License: Unlicensed
-Description: UNKNOWN
 Keywords: corva,worker
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
+Requires-Python: >=3.13
+Requires-Dist: numpy>=2.3.5
+Requires-Dist: redis>=7.1.0
+Requires-Dist: requests>=2.32.5
+Requires-Dist: simplejson>=3.20.2
+Requires-Dist: urllib3>=2.5.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

corva_worker_python-2.0.0/corva_worker_python.egg-info/requires.txt

@@ -0,0 +1,5 @@
+numpy>=2.3.5
+redis>=7.1.0
+requests>=2.32.5
+simplejson>=3.20.2
+urllib3>=2.5.0

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/setup.py

@@ -6,10 +6,8 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Software Development :: Libraries",
 ]
 
@@ -17,13 +15,19 @@ setup(
     name="corva-worker-python",
     author="Jordan Ambra <jordan.ambra@corva.ai>, Mohammadreza Kamyab <m.kamyab@corva.ai>",
     url="https://github.com/corva-ai/corva-worker-python",
-    version="1.2.3",
+    version="2.0.0",
     classifiers=classifiers,
-    python_requires=">=3.8",
+    python_requires=">=3.13",
     description="SDK for interacting with Corva",
     keywords="corva, worker",
     packages=find_packages(exclude=["testcase"]),
-    install_requires=["numpy", "redis", "requests", "simplejson"],
+    install_requires=[
+        "numpy>=2.3.5",
+        "redis>=7.1.0",
+        "requests>=2.32.5",
+        "simplejson>=3.20.2",
+        "urllib3>=2.5.0",
+    ],
     include_package_data=True,
     license="Unlicensed",
 )

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/testcase/app/__init__.py

@@ -3,4 +3,5 @@ The purpose of this simple test app is to compute Surface MSE
 every 30 seconds of wits stream records. Note that this parameter
 is only generated when the state is Drilling (either Rotary or Slide).
 """
+
 from testcase.app.app_constants import constants  # noqa: F401

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/testcase/state_testing_app/__init__.py

@@ -2,4 +2,5 @@
 The purpose of this App is to test the RedisMixin functionality
 This app tests saving/loading, deleting of states on Redis:
 """
+
 from testcase.app.app_constants import constants  # noqa: F401

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/worker/partial_rerun_merge/merge.py

@@ -181,6 +181,7 @@ class PartialRerunMerge:
         self,
         collection_name: str,
         downsample_count: Optional[int] = None,
+        downsample_ratio: Optional[float] = None,
         skip_progress: Optional[bool] = False,
     ) -> bool:
         """
@@ -191,6 +192,7 @@ class PartialRerunMerge:
         Args:
             collection_name (str): the collection name
             downsample_count (Optional[int]): the downsample count. Defaults to None.
+            downsample_ratio (Optional[float]): the downsample ratio. Defaults to None.
             skip_progress (Optional[bool]): whether to skip the progress. Defaults to False.
         """
         dataset_progress = self.merging_progress.get_dataset_progress(collection_name)
@@ -216,6 +218,7 @@ class PartialRerunMerge:
                 break
 
             updated_data = self._get_data(collection_name, self.rerun_asset_id, start_time, self.end_timestamp, "once")
+            original_records_count = len(updated_data)
             if not updated_data:
                 dataset_progress.mark_completed_at(self.end_timestamp)
                 is_completed = True
@@ -223,14 +226,14 @@ class PartialRerunMerge:
 
             last_timestamp = updated_data[-1]["timestamp"]
 
-            if downsample_count:
-                updated_data = choose_items(updated_data, self.MAX_RECORDS_COUNT)
+            if downsample_count is not None or downsample_ratio is not None:
+                updated_data = choose_items(updated_data, downsample_count, downsample_ratio)
 
             self._move_records(collection_name, updated_data)
 
             dataset_progress.processed_timestamp = last_timestamp
 
-            if len(updated_data) < self.MAX_API_GET_LIMIT:
+            if original_records_count < self.MAX_API_GET_LIMIT:
                 dataset_progress.mark_completed_at(self.end_timestamp)
                 is_completed = True
                 break
@@ -454,7 +457,11 @@ class PartialRerunMerge:
         time.sleep(seconds)
 
 
-def choose_items(records: List, max_records_count: Optional[int] = None) -> List:
+def choose_items(
+    records: List,
+    max_records_count: Optional[int] = None,
+    max_records_ratio: Optional[float] = None,
+) -> List:
     """
     Choose a subset of records from a list of records; the first and last
     records an inclusive.
@@ -463,11 +470,23 @@ def choose_items(records: List, max_records_count: Optional[int] = None) -> List
         records (List): A list of records.
         max_records_count (Optional[int]): The maximum number of records
             to choose. If None, all records are chosen.
+        max_records_ratio (Optional[float]): The maximum ratio of records
+            to choose. If None, all records are chosen.
 
     Returns:
         List: A list of chosen records.
     """
-    if max_records_count is None or max_records_count <= 0 or len(records) <= max_records_count or len(records) < 3:
+    if max_records_count is None and max_records_ratio is None:
+        return records
+
+    # only one of max_records_count and max_records_ratio can be provided
+    if max_records_count is not None and max_records_ratio is not None:
+        raise ValueError("Only one of max_records_count and max_records_ratio can be provided.")
+
+    if max_records_ratio is not None:
+        max_records_count = int(len(records) * max_records_ratio)
+
+    if max_records_count <= 0 or len(records) <= max_records_count or len(records) < 3:
         return records
 
     step = pymath.ceil((len(records) - 2) / max_records_count)

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/worker/partial_rerun_merge/models.py

@@ -2,6 +2,7 @@
 This file contains the models for the configurations for
 the collections and cache updates.
 """
+
 from dataclasses import dataclass, field
 from typing import List, Optional
 

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/worker/partial_rerun_merge/progress.py

@@ -1,6 +1,7 @@
 """
 This module defines the progress of the partial reruns.
 """
+
 from dataclasses import asdict, dataclass
 from typing import List, Optional
 

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/worker/test/lambda_function_test_run.py

@@ -22,7 +22,6 @@ if __name__ == '__main__':
 """
 
 import argparse
-from distutils.util import strtobool
 from typing import List
 
 from dotenv import load_dotenv
@@ -41,6 +40,22 @@ from worker.test.utils import create_scheduler_events, get_last_processed_timest
 load_dotenv(override=True)
 
 
+def strtobool(val):
+    """Convert a string representation of truth to true (1) or false (0).
+
+    True values are 'y', 'yes', 't', 'true', 'on', and '1'.
+    False values are 'n', 'no', 'f', 'false', 'off', and '0'.
+    Raises ValueError if 'val' is anything else.
+    """
+    val = val.lower()
+    if val in ("y", "yes", "t", "true", "on", "1"):
+        return 1
+    elif val in ("n", "no", "f", "false", "off", "0"):
+        return 0
+    else:
+        raise ValueError("invalid truth value %r" % (val,))
+
+
 def generate_runner_parser():
     """
     Creating the supporting arguments

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/worker/test/local_testing/to_local_transfer.py

@@ -77,7 +77,7 @@ class ToLocalTransfer(LoggingMixin):
         # but for the purpose of this test analysis is not important.
         "data.casing",
         "data.drillstring",
-        "data.mud"
+        "data.mud",
         # not required for most of the cases
         # "data.formations",
         # "data.pressure-gradient",

{corva-worker-python-1.2.3 → corva_worker_python-2.0.0}/worker/wellbore/wellbore.py

@@ -150,7 +150,7 @@ class Wellbore:
                 Logger.debug(f"Updated API with under-reamer activation at depth {self.under_reamer.ur_opened_depth}")
             else:
                 Logger.info(
-                    f"Under-reamer was opened at {self.under_reamer.ur_opened_depth }. "
+                    f"Under-reamer was opened at {self.under_reamer.ur_opened_depth}. "
                     f"However, not updating the ur_opened_depth on drillstring on api "
                     f"because it was not triggered from Stream app"
                 )

corva-worker-python-1.2.3/corva_worker_python.egg-info/requires.txt

@@ -1,4 +0,0 @@
-numpy
-redis
-requests
-simplejson