vfWorks 0.0.1b1__tar.gz → 0.0.1.dev5__tar.gz

{vfworks-0.0.1b1 → vfworks-0.0.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vfWorks
-Version: 0.0.1b1
+Version: 0.0.1.dev5
 Summary: vfWorks - your gateway to valid model (re-)use.
 Home-page: 
 Author: Jan Gladiné & Bert Van Acker

{vfworks-0.0.1b1 → vfworks-0.0.1.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vfWorks"
-version = "0.0.1b1"
+version = "0.0.1.dev5"
 description = "vfWorks - your gateway to valid model (re-)use."
 readme = "README.md"
 requires-python = ">=3.11"

{vfworks-0.0.1b1 → vfworks-0.0.1.dev5}/vfWorks.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vfWorks
-Version: 0.0.1b1
+Version: 0.0.1.dev5
 Summary: vfWorks - your gateway to valid model (re-)use.
 Home-page: 
 Author: Jan Gladiné & Bert Van Acker

{vfworks-0.0.1b1 → vfworks-0.0.1.dev5}/vfworks/metamodels/monitors.py

@@ -6,11 +6,11 @@
 # * vfWorks can not be copied and/or distributed without the express
 # * permission of Bert Van Acker
 # **************************************************************************************
-from vfworks.metamodels.common import *
-from vfworks.utils.constants import *
-import importlib.util
-import os
-from pathlib import Path
+from vfworks.metamodels.common import *
+from vfworks.utils.constants import *
+import importlib.util
+import os
+from pathlib import Path
 
 class Monitor(baseElement):
 
@@ -46,11 +46,6 @@ class Monitor(baseElement):
             """Setup the monitor, including loading any custom validation hooks."""
             self._load_custom_validation_hook(packageLocation=packageLocation)
 
-    def set_valid(self):
-        for observe in self.observes:
-            self.spec_status[observe.feature] = StatusType.VALID
-        self._status = StatusType.VALID
-
     @property
     def packageName(self):
         return self._packageName
@@ -174,16 +169,16 @@ class Monitor(baseElement):
 
         return global_is_valid
 
-    def _load_custom_validation_hook(self, packageLocation=None):
-        """Private helper to locate and bind custom vector validation scripts."""
-        package_root = Path(os.getcwd()) if packageLocation is None else Path(packageLocation)
-        custom_script_path = package_root / "Resources" / "monitors" / f"{self._custom_code_file}"
-
-        # Check if the user wrote a custom plugin matching this monitor type
-        if custom_script_path.exists():
-            try:
-                # Load the file dynamically as a Python module
-                spec = importlib.util.spec_from_file_location(self.name, custom_script_path)
+    def _load_custom_validation_hook(self, packageLocation=None):
+        """Private helper to locate and bind custom vector validation scripts."""
+        package_root = Path(os.getcwd()) if packageLocation is None else Path(packageLocation)
+        custom_script_path = package_root / "Resources" / "monitors" / f"{self._custom_code_file}"
+
+        # Check if the user wrote a custom plugin matching this monitor type
+        if custom_script_path.exists():
+            try:
+                # Load the file dynamically as a Python module
+                spec = importlib.util.spec_from_file_location(self.name, custom_script_path)
                 custom_module = importlib.util.module_from_spec(spec)
                 spec.loader.exec_module(custom_module)
 

{vfworks-0.0.1b1 → vfworks-0.0.1.dev5}/vfworks/metamodels/validity_frame.py

@@ -9,7 +9,6 @@
 import os
 import json
 import logging
-import re
 from pathlib import Path
 from vfworks.package.PackageManager import PackageManager
 from vfworks.metamodels.knowledge_graph import KnowledgeGraph
@@ -19,7 +18,7 @@ from vfworks.metamodels.specification import *
 from vfworks.metamodels.experiment import *
 from vfworks.metamodels.properties import *
 from vfworks.metamodels.common import *
-from vfworks.utils.constants import StatusType, MonitorTime
+from vfworks.utils.constants import StatusType
 from vfworks.logging.logger import *
 from vfworks.utils.model.modelLoader import *
 import networkx as nx
@@ -388,132 +387,6 @@ class ValidityFrame(baseElement):
         with open(file_name, 'w') as f:
             json.dump(graph_dict, f)
 
-    def architecture_graph(self):
-        """
-        Build an architecture graph payload from the metadata and operational state.
-        """
-
-        def humanize(name):
-            return re.sub(r'(?<!^)(?=[A-Z])', ' ', str(name)).strip()
-
-        def normalize(value):
-            return getattr(value, 'value', value)
-
-        model_structure = self.activeModelStructure
-        if model_structure is None and self.modelStructures:
-            model_structure = self.modelStructures[0]
-
-        if model_structure is None:
-            component = {
-                "id": self.GUID,
-                "name": self.name,
-                "inputs": [],
-                "outputs": [],
-                "ai_architecture": {
-                    "pattern": "unknown",
-                    "models": [],
-                    "flow": []
-                }
-            }
-        else:
-            inputs = []
-            for inport in model_structure.inports:
-                input_entry = {
-                    "id": f"input_{inport.name}",
-                    "name": inport.name,
-                    "datatype": normalize(inport.datatype),
-                    "dimensions": None,
-                    "shape": [],
-                    "unit": None if normalize(inport.unit) in (None, "-", "UNIT_none") else normalize(inport.unit),
-                    "description": inport.description
-                }
-                if "image" in inport.name.lower() or "image" in inport.description.lower():
-                    input_entry["format"] = "image"
-                inputs.append(input_entry)
-
-            outputs = []
-            has_confidence_output = False
-            for outport in model_structure.outports:
-                output_entry = {
-                    "id": f"output_{outport.name}",
-                    "name": outport.name,
-                    "datatype": normalize(outport.datatype),
-                    "dimensions": None,
-                    "shape": [],
-                    "unit": None if normalize(outport.unit) in (None, "-", "UNIT_none") else normalize(outport.unit),
-                    "description": outport.description
-                }
-                if outport.min != 0 or outport.max != 0:
-                    output_entry["value_range"] = {"min": outport.min, "max": outport.max}
-                if outport.name.lower() == "confidence":
-                    has_confidence_output = True
-                outputs.append(output_entry)
-
-            model_entry = {
-                "id": f"model_{model_structure.name}",
-                "name": humanize(model_structure.name),
-                "type": normalize(model_structure.modelType),
-                "reference": model_structure.modelRef
-            }
-
-            flow = []
-            for input_entry in inputs:
-                flow.append({"from": input_entry["id"], "to": model_entry["id"]})
-            for output_entry in outputs:
-                flow.append({"from": model_entry["id"], "to": output_entry["id"]})
-
-            component = {
-                "id": model_structure.name,
-                "name": humanize(model_structure.name),
-                "inputs": inputs,
-                "outputs": outputs,
-                "ai_architecture": {
-                    "pattern": "single_model_with_confidence_output" if has_confidence_output else "single_model",
-                    "models": [model_entry],
-                    "flow": flow
-                }
-            }
-
-        monitors = []
-        default_target = model_structure.inports[0].name if model_structure and model_structure.inports else "model"
-        for monitor in self.runtime_monitors:
-            if monitor.type == MonitorTime.DATA_VALIDATION:
-                target = "dataset"
-            elif monitor.type == MonitorTime.MODEL_VALIDATION:
-                target = "model"
-            elif monitor.type == MonitorTime.RUN_TIME:
-                observed_features = [spec.feature for spec in (monitor.observes or [])]
-                if any("odd" in feature.lower() for feature in observed_features) or "odd" in monitor.name.lower() or "odd" in monitor.description.lower():
-                    target = "environment"
-                else:
-                    target = default_target
-            else:
-                target = default_target
-
-            monitors.append({
-                "name": monitor.name,
-                "target": target,
-                "description": monitor.description,
-                "observes": [spec.feature for spec in (monitor.observes or [])]
-            })
-
-        return {
-            "component": component,
-            "monitors": monitors
-        }
-
-    def export_architecture_json(self, file_name="architecture.json"):
-        """
-        Export the architecture graph payload to a JSON file.
-        """
-        architecture = self.architecture_graph()
-        output_path = Path(file_name)
-        if not output_path.is_absolute():
-            output_path = self.package_manager.package_root / output_path
-
-        with open(output_path, 'w', encoding='utf-8') as f:
-            json.dump(architecture, f, indent=2)
-
     # ------------------------------------------------------------------------------------------------------------------
     #                                           IMPORT/EXPORT FUNCTIONS
     # -----------------------------------------------------------------------------------------------------------------

{vfworks-0.0.1b1 → vfworks-0.0.1.dev5}/vfworks/package/PackageManager.py

@@ -179,7 +179,7 @@ class PackageManager(object):
         for folder in ["loaders", "monitors"]:
             self._mkdir_custom(package_path/ "Resources" / folder, file="readme.rst")
 
-        self._addFile(file="MonitoredModel_loader.py", path=package_path / "Resources" / "loaders")
+        self._addFile(file="testType.py", path=package_path / "Resources" / "loaders")
         self._addFile(file="custom_monitor_example.py", path=package_path / "Resources" / "monitors")
 
         self._write_config(package_path, config or self.default_config(package_path))
@@ -219,7 +219,7 @@ class PackageManager(object):
             )
         elif "config.yaml" in file:
             content = yaml.safe_dump(self.default_config(target_dir.parent), sort_keys=False)
-        elif file == "MonitoredModel_loader.py":
+        elif file == "testType.py":
             content = (
                 '"""Template for Custom Model Loaders\n'
                 "\n"