thds.mops 3.9.20250904205929__py3-none-any.whl → 3.9.20250908154102__py3-none-any.whl

thds/mops/k8s/_launch.py

@@ -30,14 +30,14 @@ def sanitize_str(name: str) -> str:
 
 def construct_job_name(user_prefix: str, job_num: str) -> str:
     # we want some consistency here, but also some randomness in case the prefixes don't exist or aren't unique.
-    mops_name_part = "-".join([sanitize_str(job_num), str(os.getpid()), str(uuid.uuid4())[:8]])
+    mops_name_part = "-".join([sanitize_str(job_num), str(uuid.uuid4())[:8]])
     if len(mops_name_part) > 63:
-        # this should be _impossible_, because having a job num longer than even 20 digits would be an impossibly large
+        # this should be _unlikely_, because having a job num longer than even 20 digits would be an impossibly large
         # number of jobs. but just in case, we'll truncate it to the last 63 characters.
-        mops_name_part = mops_name_part[-63:]  # keep the most random part, to avoid collisions
+        mops_name_part = mops_name_part[-63:]  # prefer the most random part, to avoid collisions
 
     user_prefix = sanitize_str(user_prefix)
-    if user_prefix:
+    if user_prefix and len(mops_name_part) < 62:
         name = f"{user_prefix[:63 - 1 - len(mops_name_part)]}-{mops_name_part}"
     else:
         name = mops_name_part
@@ -90,7 +90,9 @@ def launch(
         raise ValueError("You cannot specify both full_name and name_prefix; use one or the other.")
 
     if not full_name:
-        name = construct_job_name(name_prefix, counts.to_name(counts.inc(counts.LAUNCH_COUNT)))
+        name = construct_job_name(
+            "-".join([name_prefix, str(os.getpid())]), counts.to_name(counts.inc(counts.LAUNCH_COUNT))
+        )
     else:
         name = full_name
 

thds/mops/k8s/batching.py

@@ -14,6 +14,7 @@ import atexit
 import concurrent.futures
 import itertools
 import multiprocessing
+import os
 import threading
 import typing as ty
 
@@ -56,7 +57,7 @@ class K8sJobBatchingShim(_AtExitBatcher[str]):
         submit_func: ty.Callable[[ty.Collection[str]], ty.Any],
         max_batch_size: int,
         job_counter: counts.MpValue[int],
-        name_prefix: str = "",
+        job_prefix: str = "",
     ) -> None:
         """submit_func in particular should be a closure around whatever setup you need to
         do to call back into a function that is locally wrapped with a k8s shim that will
@@ -66,13 +67,13 @@ class K8sJobBatchingShim(_AtExitBatcher[str]):
         self._max_batch_size = max_batch_size
         self._job_counter = job_counter
         self._job_name = ""
-        self._name_prefix = name_prefix
+        self._job_prefix = job_prefix
         self._submit_func = submit_func
 
     def _get_new_name(self) -> str:
         # counts.inc takes a multiprocess lock. do not forget this!
         job_num = counts.inc(self._job_counter)
-        return _launch.construct_job_name(self._name_prefix, counts.to_name(job_num))
+        return _launch.construct_job_name(self._job_prefix, counts.to_name(job_num))
 
     def add_to_named_job(self, mops_invocation: ty.Sequence[str]) -> str:
         """Returns job name for the invocation."""
@@ -103,7 +104,7 @@ def init_batcher(
     submit_func: ty.Callable[[ty.Collection[str]], ty.Any],
     func_max_batch_size: int,
     job_counter: counts.MpValue[int],
-    name_prefix: str = "",
+    job_prefix: str = "",
 ) -> None:
     # for use with multiprocessing pool initializer
     global _BATCHER
@@ -111,7 +112,7 @@ def init_batcher(
         logger.warning("Batcher is already initialized; reinitializing will reset the job name.")
         return
 
-    _BATCHER = K8sJobBatchingShim(submit_func, func_max_batch_size, job_counter, name_prefix)
+    _BATCHER = K8sJobBatchingShim(submit_func, func_max_batch_size, job_counter, job_prefix)
 
 
 def init_batcher_with_unpicklable_submit_func(
@@ -119,13 +120,13 @@ def init_batcher_with_unpicklable_submit_func(
     submit_func_arg: T,
     func_max_batch_size: int,
     job_counter: counts.MpValue[int],
-    name_prefix: str = "",
+    job_prefix: str = "",
 ) -> None:
     """Use this if you want to have an unpicklable submit function - because applying make_submit_func(submit_func_arg)
     will happen inside the pool worker process after all the pickling/unpickling has happened.
     """
     return init_batcher(
-        make_submit_func(submit_func_arg), func_max_batch_size, job_counter, name_prefix=name_prefix
+        make_submit_func(submit_func_arg), func_max_batch_size, job_counter, job_prefix=job_prefix
     )
 
 
@@ -170,7 +171,13 @@ def make_counting_process_pool_executor(
     return concurrent.futures.ProcessPoolExecutor(
         max_workers=max_workers or cpus.available_cpu_count(),
         initializer=init_batcher_with_unpicklable_submit_func,
-        initargs=(make_submit_func, submit_func_arg, max_batch_size, launch_count, name_prefix),
+        initargs=(
+            make_submit_func,
+            submit_func_arg,
+            max_batch_size,
+            launch_count,
+            "-".join([name_prefix, str(os.getpid())]),
+        ),
         mp_context=mp_context,
     )
 

{thds_mops-3.9.20250904205929.dist-info → thds_mops-3.9.20250908154102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.mops
-Version: 3.9.20250904205929
+Version: 3.9.20250908154102
 Summary: ML Ops tools for Trilliant Health
 Author-email: Trilliant Health <info@trillianthealth.com>
 Project-URL: Repository, https://github.com/TrilliantHealth/ds-monorepo

{thds_mops-3.9.20250904205929.dist-info → thds_mops-3.9.20250908154102.dist-info}/RECORD

@@ -16,11 +16,11 @@ thds/mops/impure/__init__.py,sha256=VnrHPVgbOYUjkrVnnVicvNV39G6K6ENcWtCuV-BedW4,
 thds/mops/impure/keyfunc.py,sha256=6VRa44qW95mH-cWkwPaU-aarXv6Nz0EwBOn4Aowy73s,525
 thds/mops/impure/runner.py,sha256=UI1NZWMZ_5TQHfFKLnoiSm2zDR3zCunTKFmJoybkyCo,2840
 thds/mops/k8s/__init__.py,sha256=zl4GVcCFRvPscyo6gvv5Lx0OKB7d3QjtVFjYurnxMuE,764
-thds/mops/k8s/_launch.py,sha256=n4a3v6JNjcShFlBgRyL6JdS9My0ApggsjurtZFuKOnk,10893
+thds/mops/k8s/_launch.py,sha256=hgPty47CdwryPHKMmEnoxSsSvcSpXhHYSVYnLC2QJb0,10956
 thds/mops/k8s/_shared.py,sha256=MR-s6ijWUHZGjxK_fsOpHuRDB6kuofjo5xiIb7ul2VM,86
 thds/mops/k8s/apply_yaml.py,sha256=hVW6dIVbNdzHdbGlc2VAPGkdByv_rH2oPybyIm7tKIM,820
 thds/mops/k8s/auth.py,sha256=0zs4TQgkD6VPrhDD43xt7JGwP6uWf3ctySGLcPKN7iw,1691
-thds/mops/k8s/batching.py,sha256=VJw6DhdhklOSu-iUW6r_BpAP7Jx62uoKV2Bpy0V9U_Q,8266
+thds/mops/k8s/batching.py,sha256=Djt17ffxWyTq4Q7XcAKQdCe9JIIfPahHwm0wqgFqevI,8368
 thds/mops/k8s/config.py,sha256=_znocX5BW8kfG_Cbq6f3apx5FqSihD7Tmic-SBkVjMQ,2992
 thds/mops/k8s/container_registry.py,sha256=qOiGCE4t_tLYgJDGrhKV9KNv48lF_AlwCDHyFgucd2s,539
 thds/mops/k8s/counts.py,sha256=D-OVHY_dhsgJ2YHApy2qvrcSKzE5mlweDPredFU6tOU,572
@@ -109,8 +109,8 @@ thds/mops/pure/tools/summarize/cli.py,sha256=7kDtn24ok8oBO3jFjlMmOK3jnZYpMoE_5Y8
 thds/mops/pure/tools/summarize/run_summary.py,sha256=w45qiQr7elrHDiK9Hgs85gtU3gwLuXa447ih1Y23BBY,5776
 thds/mops/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thds/mops/testing/deferred_imports.py,sha256=f0ezCgQAtzTqW1yAOb0OWgsB9ZrlztLB894LtpWDaVw,3780
-thds_mops-3.9.20250904205929.dist-info/METADATA,sha256=ZrpOlrjBlpD2R66M4j-Aw8FLZmVcY3Sz_cG-Gt22ooA,2225
-thds_mops-3.9.20250904205929.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_mops-3.9.20250904205929.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
-thds_mops-3.9.20250904205929.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_mops-3.9.20250904205929.dist-info/RECORD,,
+thds_mops-3.9.20250908154102.dist-info/METADATA,sha256=hvJu7tdH_mELqF73dc_jUd0RLtCTAfdXg54lYIAhH6Q,2225
+thds_mops-3.9.20250908154102.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_mops-3.9.20250908154102.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
+thds_mops-3.9.20250908154102.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_mops-3.9.20250908154102.dist-info/RECORD,,