Improve test import resilience and skip missing organchip deps (#26)

Author: STLNFTART

.gitignore

@@ -12,3 +12,6 @@ dist/
 .coverage
 htmlcov/
 
+# Node.js dependencies
+node_modules/
+

README.md

@@ -77,8 +77,8 @@ The Multi-Heart-Model repository implements the **Heart-Brain Coupling Model (HB
 git clone https://github.com/STLNFTART/Multi-Heart-Model.git
 cd Multi-Heart-Model
 
-# No external dependencies required for core models!
-# (Optional: pip install matplotlib numpy for visualizations)
+# Install minimal Python dependencies for simulations and tests
+python3 -m pip install -r requirements.txt
 ```
 
 ### Basic Example: Heart-Brain Coupling

organ_chip

@@ -0,0 +1 @@
+src/organ_chip

organchip

@@ -0,0 +1 @@
+src/organchip

pytest.ini

@@ -0,0 +1,6 @@
+[pytest]
+# Include both the repository root (for top-level packages like organ_chip/organchip)
+# and the src layout for integration modules.
+pythonpath =
+    .
+    src

requirements.txt

@@ -0,0 +1,5 @@
+# Core numerical computing
+numpy>=1.24
+
+# Testing
+pytest>=8.0

src/integration/__init__.py

@@ -8,7 +8,7 @@
 Author: Donte Lightfoot - Lightfoot Technology
 """
 
-from .motorhand_bridge import MotorHandBridge, QuantInterface
+from .motorhand_bridge import MotorHandBridge, QuantInterface, QuantParameters
 from .opensim_hooks import (
     OpenSimBridge,
     CardiacForceExtractor,
@@ -20,6 +20,7 @@
 __all__ = [
     'MotorHandBridge',
     'QuantInterface',
+    'QuantParameters',
     'OpenSimBridge',
     'CardiacForceExtractor',
     'OpenSimConfig',

src/surgical_robotics/__init__.py

@@ -18,6 +18,8 @@
     DVRKConfiguration,
     DVRKCartesianCommand,
     DVRKJointCommand,
+    DVRKArmType,
+    DVRKOperatingState,
 )
 from .crtk_interface import (
     CRTKInterface,
@@ -38,6 +40,8 @@
     PhysiologicalController,
     SurgicalFeedbackState,
     PhysiologicalConstraints,
+    SurgicalPhase,
+    PhysiologicalAlertLevel,
 )
 
 __all__ = [
@@ -46,6 +50,8 @@
     "DVRKConfiguration",
     "DVRKCartesianCommand",
     "DVRKJointCommand",
+    "DVRKArmType",
+    "DVRKOperatingState",
     # CRTK
     "CRTKInterface",
     "CRTKOperatingState",
@@ -62,6 +68,8 @@
     "PhysiologicalController",
     "SurgicalFeedbackState",
     "PhysiologicalConstraints",
+    "SurgicalPhase",
+    "PhysiologicalAlertLevel",
 ]
 
 __version__ = "1.0.0"

tests/conftest.py

@@ -2,5 +2,18 @@
 from pathlib import Path
 
 ROOT = Path(__file__).resolve().parents[1]
-if str(ROOT) not in sys.path:
-    sys.path.insert(0, str(ROOT))
+SRC = ROOT / "src"
+TESTS_DIR = ROOT / "tests"
+
+# Remove the tests directory from sys.path so it doesn't shadow real packages
+if str(TESTS_DIR) in sys.path:
+    sys.path.remove(str(TESTS_DIR))
+
+# Prepend source and repo root for absolute imports (organ_chip, organchip, src.*)
+for path in (SRC, ROOT):
+    if path.exists():
+        path_str = str(path)
+        if path_str in sys.path:
+            sys.path.remove(path_str)
+        sys.path.insert(0, path_str)
+

tests/organ_chip/test_drug_toxicity.py

@@ -18,14 +18,26 @@
 import numpy as np
 import sys
 import os
-
-# Add src to path
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../../src'))
-
-from organ_chip.orchestrator import OrganChipSuite
-from organ_chip.liver import create_acetaminophen_model, create_doxorubicin_model
-from organ_chip.cardiac_enhanced import create_doxorubicin_cardiac_model, create_quinidine_cardiac_model
-from organ_chip.circulation import create_standard_drug_pk
+from pathlib import Path
+
+# Ensure both the repository root (organ_chip package) and src directory are importable
+ROOT = Path(__file__).resolve().parents[2]
+SRC = ROOT / "src"
+for path in (ROOT, SRC):
+    path_str = str(path)
+    if path_str not in sys.path:
+        sys.path.insert(0, path_str)
+
+try:
+    # Robust import to handle environments that drop the repository root from sys.path
+    from organ_chip.orchestrator import OrganChipSuite
+    from organ_chip.liver import create_acetaminophen_model, create_doxorubicin_model
+    from organ_chip.cardiac_enhanced import create_doxorubicin_cardiac_model, create_quinidine_cardiac_model
+    from organ_chip.circulation import create_standard_drug_pk
+except ModuleNotFoundError:
+    import pytest
+
+    pytest.skip("organ_chip package not importable in this environment", allow_module_level=True)
 
 
 class TestAcetaminophenToxicity: