flux-batch 0.0.11__py3-none-any.whl → 0.0.12__py3-none-any.whl

flux_batch/service/scribe/__main__.py

@@ -38,6 +38,8 @@ class JournalScribe:
             logger.critical(f"Failed to connect to Flux: {e}")
             sys.exit(1)
 
+        logger.info(f"🍳 Handle: {self.handle.attr_get('local-uri')}")
+
         # Initialize Journal Consumer
         # This consumes the global event log for the entire instance
         self.consumer = flux.job.JournalConsumer(self.handle)

flux_batch/service/scribe/database.py

@@ -18,6 +18,7 @@ def _record_event_internal(session, cluster: str, event: Dict[str, Any]):
     data = event.get("payload", {})
     timestamp = event.get("timestamp", time.time())
 
+    # Add the new event with all metadata
     new_event = EventModel(
         job_id=job_id,
         cluster=cluster,

flux_batch/service/scribe/models.py

@@ -90,5 +90,9 @@ class EventModel(Base):
         Helper to convert ORM model to public DTO
         """
         return EventRecord(
-            timestamp=self.timestamp, event_type=self.event_type, payload=self.payload
+            timestamp=self.timestamp,
+            event_type=self.event_type,
+            payload=self.payload,
+            cluster=self.cluster,
+            job_id=self.job_id,
         )

flux_batch/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.11"
+__version__ = "0.0.12"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "vsoch@users.noreply.github.com"
 NAME = "flux-batch"

{flux_batch-0.0.11.dist-info → flux_batch-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flux-batch
-Version: 0.0.11
+Version: 0.0.12
 Summary: Python SDK for flux batch jobs and services
 Home-page: https://github.com/converged-computing/flux-batch
 Author: Vanessa Sochat
@@ -135,7 +135,7 @@ batch.add_job(["sleep", "5"])
 batch.add_job(["echo", "Job 2 finished"])
 
 # Wrap it up into a jobspec
-jobspec = flux_batch.BatchJobspecV1.from_jobs(
+spec = flux_batch.BatchJobspecV1.from_jobs(
     batch,
     nodes=1,
     nslots=1,
@@ -146,14 +146,15 @@ jobspec = flux_batch.BatchJobspecV1.from_jobs(
 )
 
 # Add a prolog and epilog
-jobspec.add_prolog("echo 'Batch Wrapper Starting'")
-jobspec.add_epilog("echo 'Batch Wrapper Finished'")
+spec.add_prolog("echo 'Batch Wrapper Starting'")
+spec.add_epilog("echo 'Batch Wrapper Finished'")
 
 # Add a service (this assumes user level that exists)
-jobspec.add_service("flux-scribe")
+spec.add_service("flux-scribe")
 
-# Preview it
-print(flux_batch.submit(handle, jobspec, dry_run=True))
+# Preview it (batch wrapper), or generate the jobspec (json)
+print(flux_batch.submit(handle, spec, dry_run=True))
+jobspec = flux_batch.jobspec(spec)
 
 # Submit that bad boi.
 jobid = flux_batch.submit(handle, jobspec)

{flux_batch-0.0.11.dist-info → flux_batch-0.0.12.dist-info}/RECORD

@@ -2,7 +2,7 @@ flux_batch/__init__.py,sha256=35032OVyHkBiQIptg7NBY_6mdhthFu1hpqOCsREm5lQ,280
 flux_batch/jobspec.py,sha256=MUMI4Y_DgjCRssgzUDagTTFw8L3t4L_5az1E3tmT1FI,5464
 flux_batch/models.py,sha256=JjrFqi4Skrop_cyIWfgAHTdY53kotkiGD0JpTnVlByI,2200
 flux_batch/submit.py,sha256=tNJMDvnsxbAuXg_5TkB8HurzQ9I-Dot_gXXpIU5LtTA,2654
-flux_batch/version.py,sha256=h-6jDEwrQuFPdUK7HJbFYJISN7mt1MwBKK0UnnS1-cM,643
+flux_batch/version.py,sha256=37BBFelchDrkt6_VMHK5S2_2983PJm2IQL7r_jhocWU,643
 flux_batch/logger/__init__.py,sha256=eDdpw_uppR5mPLHE39qT_haqMxu-2wniLlJZDigRC2k,52
 flux_batch/logger/generate.py,sha256=L9JyMY2oapp0ss7f7LGuihbLomzVJsMq7sByy9NhbZI,4017
 flux_batch/logger/logger.py,sha256=HKymVBNcoPdX87QWy69er5wUzHVeriiKp9p0bIYboUo,5927
@@ -11,18 +11,18 @@ flux_batch/script/save_logs.sh,sha256=HeapqvL0iR8aX7LtbwlcFTy19j5WxkQ-1M2J9epu-E
 flux_batch/service/__init__.py,sha256=pD7RYpdSLZvYU4qwShYXA6UcaJy191fKtzqJL3uttEc,2724
 flux_batch/service/scribe.py,sha256=dY6geiLvXYIRcIzuP_naZscKgzX4Y5dPzxoWf9Wywg0,253
 flux_batch/service/scribe/__init__.py,sha256=773-AzF_WRY6udG5nQSexf7Vga4K1YZLy1sfQAEd1uo,126
-flux_batch/service/scribe/__main__.py,sha256=3S0dyhkHk-bPT_Z0laNUg-HydrCFql4hPOV2ZNF5rO0,3777
-flux_batch/service/scribe/database.py,sha256=EB8OEMfNvfCplGaz-ZNMsfIpd305eP-mfCvSd-fg_k4,5626
-flux_batch/service/scribe/models.py,sha256=7lUrRosnQ2douFL_xD9GMYex4Z4lkN-CcBeWDhzmD8c,2668
+flux_batch/service/scribe/__main__.py,sha256=xQHIxRd2pjGxpVcIyv2tq88ts3e2IsmhrQuMVG-wrOw,3851
+flux_batch/service/scribe/database.py,sha256=kagh_YJFpKMtixJ5-Zs762vLFDGEU7Fq9lOYEgeKPmo,5668
+flux_batch/service/scribe/models.py,sha256=wVHgX5X9PUpUSDtZtMaz1M_fGC1Vyv8JdUt58AoEA3c,2759
 flux_batch/service/scribe/template.py,sha256=yDsheid2FXeYr458loxB3HyZKSWpGQpM8iUQfnfOA-s,1336
 flux_batch/utils/__init__.py,sha256=CqMhw_mBfR0HBcHwv7LtFITq0J7LBV413VQE9xrz8ks,42
 flux_batch/utils/fileio.py,sha256=Elz8WkNkJ9B6x7WmCwiIBW0GgsRSSFCcbuJh7aqu2z4,4879
 flux_batch/utils/text.py,sha256=Ci1BqHs2IbOSn2o60zhLkT4kIA7CSNuGj8mdiGaDIGk,606
 flux_batch/utils/timer.py,sha256=_Weec7Wd5hWQ1r4ZHjownG4YdoIowpVqilXhvYFmIgA,491
-flux_batch-0.0.11.dist-info/LICENSE,sha256=AlyLB1m_z0CENCx1ob0PedLTTohtH2VLZhs2kfygrfc,1108
-flux_batch-0.0.11.dist-info/METADATA,sha256=A0LLvVm-RKGxSM26HMfHlOKe5OxF22O7APLNWfvIBj0,5352
-flux_batch-0.0.11.dist-info/NOTICE,sha256=9CR93geVKl_4ZrJORbXN0fzkEM2y4DglWhY1hn9ZwQw,1167
-flux_batch-0.0.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-flux_batch-0.0.11.dist-info/entry_points.txt,sha256=ynoKpD82xn2V2sD-aZIQoq7NnfOu9VEKqW55Y1AoPGI,67
-flux_batch-0.0.11.dist-info/top_level.txt,sha256=jj8zAsZzMmbjiBISJL7lRtA37MSEAQYfObGLUncn9Lw,11
-flux_batch-0.0.11.dist-info/RECORD,,
+flux_batch-0.0.12.dist-info/LICENSE,sha256=AlyLB1m_z0CENCx1ob0PedLTTohtH2VLZhs2kfygrfc,1108
+flux_batch-0.0.12.dist-info/METADATA,sha256=AFex8ldVck2zs5c1ID2P1VEbiuJ0-sL8EzcWDn_bdyM,5420
+flux_batch-0.0.12.dist-info/NOTICE,sha256=9CR93geVKl_4ZrJORbXN0fzkEM2y4DglWhY1hn9ZwQw,1167
+flux_batch-0.0.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+flux_batch-0.0.12.dist-info/entry_points.txt,sha256=ynoKpD82xn2V2sD-aZIQoq7NnfOu9VEKqW55Y1AoPGI,67
+flux_batch-0.0.12.dist-info/top_level.txt,sha256=jj8zAsZzMmbjiBISJL7lRtA37MSEAQYfObGLUncn9Lw,11
+flux_batch-0.0.12.dist-info/RECORD,,