flux-batch 0.0.11__tar.gz → 0.0.12__tar.gz

{flux_batch-0.0.11/flux_batch.egg-info → flux_batch-0.0.12}/PKG-INFO

@@ -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 → flux_batch-0.0.12}/README.md

@@ -101,7 +101,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,
@@ -112,14 +112,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 → flux_batch-0.0.12}/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-0.0.11 → flux_batch-0.0.12}/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-0.0.11 → flux_batch-0.0.12}/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-0.0.11 → flux_batch-0.0.12}/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 → flux_batch-0.0.12/flux_batch.egg-info}/PKG-INFO

@@ -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)