triggerflow 0.1.9__tar.gz → 0.1.11__tar.gz

{triggerflow-0.1.9 → triggerflow-0.1.11}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.1.9
+Version: 0.1.11
 Summary: Utilities for ML models targeting hardware triggers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: mlflow>=2.0
 

{triggerflow-0.1.9 → triggerflow-0.1.11}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "triggerflow"
-version = "0.1.9"
+version = "0.1.11"
 description = "Utilities for ML models targeting hardware triggers"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = [
     "mlflow>=2.0"
 ]

{triggerflow-0.1.9 → triggerflow-0.1.11}/src/triggerflow/core.py

@@ -111,7 +111,6 @@ class HLS4MLStrategy(CompilerStrategy):
         firmware_model.compile()
         return firmware_model
 
-
 class ConiferStrategy(CompilerStrategy):
     """Conifer compilation strategy for XGBoost models"""
 
@@ -124,13 +123,11 @@ class ConiferStrategy(CompilerStrategy):
         firmware_dir = workspace / "firmware"
         firmware_dir.mkdir(exist_ok=True)
 
+
+        project_name = kwargs.pop('project_name', None)
+        
         cfg = config or conifer.backends.xilinxhls.auto_config()
         cfg['OutputDir'] = str(firmware_dir)
-
-        project_name = kwargs.pop('ProjectName', None)
-        if project_name:
-            cfg['ProjectName'] = project_name  
-            
         cfg.update(kwargs)
 
         firmware_model = conifer.converters.convert_from_xgboost(
@@ -138,6 +135,9 @@ class ConiferStrategy(CompilerStrategy):
             config=cfg
         )
 
+        if project_name:
+            firmware_model.config.project_name = project_name
+
         firmware_model.compile()
         if shutil.which("vivado") is not None:
             firmware_model.build()
@@ -146,14 +146,6 @@ class ConiferStrategy(CompilerStrategy):
 
         firmware_model.save(firmware_dir / "firmware_model.fml")
         return firmware_model
-    
-    def load_compiled_model(self, workspace: Path) -> Any:
-        from conifer import load_model
-        
-        firmware_model = load_model(workspace / "firmware_model.fml")
-        firmware_model.compile()
-        return firmware_model
-
 
 class DA4MLStrategy(CompilerStrategy):
     """DA4ML compilation strategy (placeholder)"""

{triggerflow-0.1.9 → triggerflow-0.1.11}/src/triggerflow/mlflow_wrapper.py

@@ -10,12 +10,15 @@ from .core import TriggerModel
 
 
 def setup_mlflow(mlflow_uri: str = None, 
+                 web_eos_url: str = None,
+                 web_eos_path: str = None,
                  model_name: str = None, 
                  experiment_name: str = None, 
                  run_name: str = None, 
                  experiment_id: str = None,
                  run_id: str = None,
-                 save_env_file: bool = True,
+                 creat_web_eos_dir: bool = False,
+                 save_env_file: bool = False,
                  auto_configure: bool = False
                  ):
 
@@ -100,6 +103,34 @@ def setup_mlflow(mlflow_uri: str = None,
     os.environ["MLFLOW_RUN_ID"] = run_id
     print(f"Started run with ID: {run_id}")
 
+
+    if creat_web_eos_dir:
+        # Set the web_eos_url
+        if web_eos_url is None:
+            web_eos_url = os.getenv('WEB_EOS_URL', 'https://ngt-modeltraining.web.cern.ch/')
+        os.environ["WEB_EOS_URL"] = web_eos_url
+        print(f"Using WEB_EOS_URL: {web_eos_url}")
+
+        # Set the web_eos_path
+        if web_eos_path is None:
+            web_eos_path = os.getenv('WEB_EOS_PATH', '/eos/user/m/mlflowngt/backend/www')
+        os.environ["WEB_EOS_PATH"] = web_eos_path
+        print(f"Using WEB_EOS_PATH: {web_eos_path}")
+
+        # Create WebEOS experiment dir
+        web_eos_experiment_dir = os.path.join(web_eos_path, experiment_name, run_name)
+        web_eos_experiment_url = os.path.join(web_eos_url, experiment_name, run_name)
+        os.makedirs(web_eos_experiment_dir, exist_ok=True)
+        print(f"Created WebEOS experiment directory: {web_eos_experiment_dir}")
+        print(f"Using WebEOS experiment URL: {web_eos_experiment_url}")
+    
+    else:
+        web_eos_url=None
+        web_eos_path=None
+        web_eos_experiment_dir=None
+        web_eos_experiment_url=None
+
+
     # Save environment variables to a file for later steps in CI/CD pipelines
     if save_env_file and os.getenv("CI") == "true":
         print(f"Saving MLflow environment variables to {os.getenv('CI_ENV_FILE', 'mlflow.env')}")
@@ -111,11 +142,28 @@ def setup_mlflow(mlflow_uri: str = None,
             f.write(f"MLFLOW_EXPERIMENT_ID={experiment_id}\n")
             f.write(f"MLFLOW_RUN_ID={run_id}\n")
 
+            if creat_web_eos_dir:
+                f.write(f"WEB_EOS_URL={web_eos_url}\n")
+                f.write(f"WEB_EOS_PATH={web_eos_path}\n")
+                f.write(f"WEB_EOS_EXPERIMENT_DIR={web_eos_experiment_dir}\n")
+                f.write(f"WEB_EOS_EXPERIMENT_URL={web_eos_experiment_url}\n")
+
             if auto_configure:
                 print("Auto_configure is set to true. Exporting AUTO_CONFIGURE=true")
                 f.write(f"AUTO_CONFIGURE=true\n")
 
-    return experiment_name, run_name, experiment_id, run_id
+    return {
+        "experiment_name": experiment_name,
+        "run_name": run_name,
+        "experiment_id": experiment_id,
+        "run_id": run_id,
+        "mlflow_uri": mlflow_uri,
+        "model_name": model_name,
+        "web_eos_url": web_eos_url,
+        "web_eos_path": web_eos_path,
+        "web_eos_experiment_dir": web_eos_experiment_dir,
+        "web_eos_experiment_url": web_eos_experiment_url,
+    }
 
 if os.getenv("AUTO_CONFIGURE") == "true":
     print("AUTO_CONFIGURE is true and running in CI environment. Setting up mlflow...")
@@ -165,10 +213,13 @@ def _get_pip_requirements(trigger_model: TriggerModel) -> list:
     return requirements
 
 
-def log_model(trigger_model: TriggerModel, registered_model_name: str, artifact_path: str = "TriggerModel"):
+def log_model(trigger_model: TriggerModel, registered_model_name: str = None, artifact_path: str = "TriggerModel"):
     """Log a TriggerModel as a PyFunc model and register it in the Model Registry."""
     if not registered_model_name:
-        raise ValueError("registered_model_name must be provided and non-empty")
+        if not os.getenv("MLFLOW_MODEL_NAME"):
+            raise ValueError("registered_model_name must be provided and non-empty")
+        else:
+            registered_model_name = os.getenv("MLFLOW_MODEL_NAME")
 
     if mlflow.active_run() is None:
         raise RuntimeError("No active MLflow run. Start a run before logging.")

{triggerflow-0.1.9 → triggerflow-0.1.11}/src/triggerflow.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: triggerflow
-Version: 0.1.9
+Version: 0.1.11
 Summary: Utilities for ML models targeting hardware triggers
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: mlflow>=2.0