processforge 0.3.9__tar.gz → 0.3.11__tar.gz

{processforge-0.3.9/src/processforge.egg-info → processforge-0.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: processforge
-Version: 0.3.9
+Version: 0.3.11
 Summary: A Python-based process simulation framework for chemical engineering applications.
 Author-email: Processforge Team <team@processforge.dev>
 License-Expression: BSD-3-Clause
@@ -33,6 +33,7 @@ Requires-Dist: typer>=0.12
 Provides-Extra: api
 Requires-Dist: fastapi>=0.110; extra == "api"
 Requires-Dist: uvicorn>=0.29; extra == "api"
+Requires-Dist: s3fs>=2024.0; extra == "api"
 Provides-Extra: eo
 Requires-Dist: pyomo>=6.7; extra == "eo"
 Provides-Extra: eo-casadi

{processforge-0.3.9 → processforge-0.3.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "processforge"
-version = "0.3.9"
+version = "0.3.11"
 description = "A Python-based process simulation framework for chemical engineering applications."
 readme = "README.md"
 license = "BSD-3-Clause"
@@ -42,6 +42,7 @@ dependencies = [
 api = [
     "fastapi>=0.110",
     "uvicorn>=0.29",
+    "s3fs>=2024.0",
 ]
 eo = [
     "pyomo>=6.7",

{processforge-0.3.9 → processforge-0.3.11}/src/processforge/api/serve.py

@@ -15,6 +15,7 @@ import os
 import traceback
 
 from fastapi import FastAPI, HTTPException
+from loguru import logger
 
 app = FastAPI(title="Processforge Provider")
 
@@ -76,6 +77,7 @@ def run(body: dict):
     try:
         provider.initialize(provider_config, flowsheet_config)
         result = provider.run_simulation(unit_cfg, body.get("inlet", {}))
+        _maybe_upload_run_outputs(result)
         return result.as_dict() | {"metadata": result.metadata}
     except HTTPException:
         raise
@@ -88,6 +90,26 @@ def run(body: dict):
         provider.teardown()
 
 
+def _maybe_upload_run_outputs(result) -> None:
+    """Upload the provider's run_dir to S3 when configured.
+
+    No-op unless ``S3_BUCKET`` is set in the container environment and the
+    provider recorded a ``run_dir`` in its result metadata. Upload failures are
+    logged and never fail the run.
+    """
+    run_dir = result.metadata.get("run_dir")
+    if not run_dir:
+        return
+    try:
+        from processforge.utils.s3_upload import upload_directory_to_s3
+
+        s3_uri = upload_directory_to_s3(run_dir)
+        if s3_uri:
+            result.metadata["s3_uri"] = s3_uri
+    except Exception as exc:  # noqa: BLE001
+        logger.warning(f"S3 upload of {run_dir} failed: {exc}")
+
+
 if __name__ == "__main__":
     import uvicorn
 

{processforge-0.3.9 → processforge-0.3.11}/src/processforge/cli/run.py

@@ -100,6 +100,10 @@ def run(
     logger.info(f"  Backend      : {display_backend(config, getattr(fs, 'backend', 'dynamic'))}")
     logger.info(f"Results saved to {zarr_path}")
 
+    for name, res in results.items():
+        if isinstance(res, dict) and (s3_uri := res.get("metadata", {}).get("s3_uri")):
+            logger.info(f"  Run outputs (S3): {s3_uri}")
+
     if export_images:
         try:
             plot_results(results, fname=f"{base_name}_results.png")

{processforge-0.3.9 → processforge-0.3.11}/src/processforge/providers/container_client.py

@@ -1,13 +1,13 @@
 """CLI-side HTTP client for containerized providers (OpenMC, FESTIM, …).
 
 A provider that runs in a Docker container does its real work inside the
-container (in ``docker/provider_server.py``).  The CLI side must NOT import the
+container (in ``processforge.api.serve``).  The CLI side must NOT import the
 backend library (OpenMC, FESTIM, …) locally — instead it speaks HTTP to the
 container's ``provider_server.py`` instance.  :class:`ContainerProviderClient`
 implements the :class:`~processforge.providers.base.AbstractProvider` contract
 as a thin HTTP wrapper around that server.
 
-Request/response contract (matches ``docker/provider_server.py``)
+Request/response contract (matches ``processforge.api.serve``)
 ----------------------------------------------------------------
 * ``POST /run`` with a JSON body
   ``{"unit_config", "materials", "inlet", "output_dir", "provider_config"}``.