thds.mops 3.6.20250409174052__py3-none-any.whl → 3.6.20250409195941__py3-none-any.whl

thds/mops/k8s/launch.py

@@ -41,16 +41,27 @@ class Counter:
             return self.value
 
 
+def sanitize_str(name: str) -> str:
+    # you can't have anything other than lowercase alphanumeric characters or dashes.
+    # you can't start with a dash. I don't know if you can end with a dash, but i see no point to that.
+    return "".join([c if c.isalnum() or c == "-" else "-" for c in name.lower()]).strip("-")
+
+
 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([str(os.getpid()), job_num, str(uuid.uuid4())[:8]]).lstrip("-")
+    mops_name_part = "-".join([str(os.getpid()), 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
         # 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
-    name = f"{user_prefix[:63 - (len(mops_name_part) + 1)]}-{mops_name_part}"
-    name = "".join([c if c.isalnum() or c == "-" else "-" for c in name.lower()])
-    assert len(name) <= 63, f"Job name `{name}` is too long; max length is 63 characters."
+
+    user_prefix = sanitize_str(user_prefix)
+    if user_prefix:
+        name = f"{user_prefix[:63 - 1 - len(mops_name_part)]}-{mops_name_part}"
+    else:
+        name = mops_name_part
+    name = sanitize_str(name)
+    assert len(name) <= 63, f"Job name `{name}` is too long ({len(name)}); max length is 63 characters."
     return name
 
 

{thds_mops-3.6.20250409174052.dist-info → thds_mops-3.6.20250409195941.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: thds.mops
-Version: 3.6.20250409174052
+Version: 3.6.20250409195941
 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.6.20250409174052.dist-info → thds_mops-3.6.20250409195941.dist-info}/RECORD

@@ -23,7 +23,7 @@ thds/mops/k8s/auth.py,sha256=mXFPZvyJYEPASsBatv1r8syB9AoayuHGptHHnNUg8LE,1517
 thds/mops/k8s/config.py,sha256=FyzuiUaNq8mQR01GqrezQWSc21QVqjLY9iaJUGu5WAo,2568
 thds/mops/k8s/container_registry.py,sha256=qOiGCE4t_tLYgJDGrhKV9KNv48lF_AlwCDHyFgucd2s,539
 thds/mops/k8s/jobs.py,sha256=3u0jc5Fnll2ncnmcdTUHlcxJ_KYNK9s66W7r6ez49As,3271
-thds/mops/k8s/launch.py,sha256=PXAcqFSLp839bKhu13RPFVH-UzOdS6u7hm_J-N5Kkeg,10087
+thds/mops/k8s/launch.py,sha256=SIeao2oJVKEvef8vmWDoE8QAPIMBV2TmRxHYBRXaJFM,10479
 thds/mops/k8s/logging.py,sha256=yJ5Gt_luyo6LXbUJSXbhA4f1z7il1WuHQjMcP8eB00U,9591
 thds/mops/k8s/namespace.py,sha256=Z6trVTU9WFashto4PqIhTcxu-foOF93W0TpgqCU7WIA,383
 thds/mops/k8s/node_selection.py,sha256=Gy2Jz8IxZblg2LmtGg8-MtKI4RmXz2AMXqFPP8OQyu0,2065
@@ -103,8 +103,8 @@ thds/mops/pure/tools/summarize/cli.py,sha256=gaechsJhRZsOxGJGG1dQsW5dMBlgSv2sUmE
 thds/mops/pure/tools/summarize/run_summary.py,sha256=HCfAJhgAa9u6kXbzJlHa2n-9vVTaTHYSxrN_DP-Sjo4,4892
 thds/mops/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thds/mops/testing/deferred_imports.py,sha256=f0ezCgQAtzTqW1yAOb0OWgsB9ZrlztLB894LtpWDaVw,3780
-thds_mops-3.6.20250409174052.dist-info/METADATA,sha256=3o0zZlabkMh3mdOY_c5jwxY-WiGYgOrFuIE0mxrdWRw,2161
-thds_mops-3.6.20250409174052.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-thds_mops-3.6.20250409174052.dist-info/entry_points.txt,sha256=GShNqjcjbq0TAJuwpyeCI5XCltiwdZxnNHkBpmYbNkU,329
-thds_mops-3.6.20250409174052.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_mops-3.6.20250409174052.dist-info/RECORD,,
+thds_mops-3.6.20250409195941.dist-info/METADATA,sha256=kec_ctjKEDHeEP5JlZQvxfpRvxwrlFT7ru8FsmxAoMQ,2161
+thds_mops-3.6.20250409195941.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+thds_mops-3.6.20250409195941.dist-info/entry_points.txt,sha256=GShNqjcjbq0TAJuwpyeCI5XCltiwdZxnNHkBpmYbNkU,329
+thds_mops-3.6.20250409195941.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_mops-3.6.20250409195941.dist-info/RECORD,,