pyrestoolbox 3.7.7__tar.gz → 3.8.3__tar.gz

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/.github/complexity-baseline.json

@@ -2,17 +2,15 @@
   "pyrestoolbox/brine/_lib_vle_engine.py::SWBinaryVLE.calc_gas_solubility": 16,
   "pyrestoolbox/brine/_lib_vle_engine.py::SWMultiComponentFlash.build_kij_matrix": 18,
   "pyrestoolbox/brine/_lib_vle_engine.py::SWMultiComponentFlash.calc_equilibrium": 24,
-  "pyrestoolbox/brine/_lib_vle_engine.py::calc_gas_brine_equilibrium": 29,
+  "pyrestoolbox/brine/_lib_vle_engine.py::calc_gas_brine_equilibrium": 23,
   "pyrestoolbox/brine/brine.py::CO2_Brine_Mixture.__init__": 18,
-  "pyrestoolbox/brine/brine.py::SoreideWhitson.__init__": 28,
+  "pyrestoolbox/brine/brine.py::SoreideWhitson.__init__": 27,
   "pyrestoolbox/brine/brine.py::SoreideWhitson._calc_properties": 19,
-  "pyrestoolbox/brine/brine.py::brine_props": 19,
-  "pyrestoolbox/dca/dca.py::fit_decline": 17,
-  "pyrestoolbox/dca/dca.py::fit_decline_cum": 22,
+  "pyrestoolbox/brine/brine.py::brine_props": 17,
+  "pyrestoolbox/dca/dca.py::fit_decline_cum": 20,
   "pyrestoolbox/dca/dca.py::forecast": 16,
   "pyrestoolbox/dca/dca.py::hyp2_from_eur": 18,
   "pyrestoolbox/gas/_hydrate.py::gas_hydrate": 26,
-  "pyrestoolbox/gas/gas.py::gas_ponz2p": 16,
   "pyrestoolbox/gas/gas.py::gas_tc_pc": 16,
   "pyrestoolbox/gas/gas.py::gas_ug": 16,
   "pyrestoolbox/matbal/matbal.py::gas_matbal": 26,
@@ -20,11 +18,10 @@
   "pyrestoolbox/nodal/nodal.py::Completion.__init__": 21,
   "pyrestoolbox/nodal/nodal.py::_bb_flow_pattern": 18,
   "pyrestoolbox/nodal/nodal.py::_prepare_flow_inputs": 16,
-  "pyrestoolbox/nodal/nodal.py::ipr_curve": 27,
+  "pyrestoolbox/nodal/nodal.py::ipr_curve": 22,
   "pyrestoolbox/nodal/nodal.py::operating_point": 18,
   "pyrestoolbox/oil/_compressibility.py::oil_co": 16,
   "pyrestoolbox/oil/_correlations.py::oil_pbub": 16,
-  "pyrestoolbox/oil/_harmonize.py::oil_harmonize": 16,
   "pyrestoolbox/shared_fns/shared_fns.py::validate_pe_inputs": 43,
   "pyrestoolbox/simtools/_decks.py::_crawl_deck_includes": 16,
   "pyrestoolbox/simtools/_decks.py::ix_extract_problem_cells": 41,

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/.github/workflows/build-wheels.yml

@@ -45,7 +45,7 @@ jobs:
           # Use maturin as the build frontend
           CIBW_BUILD_FRONTEND: "build"
           # Build for CPython 3.8-3.13 (last 5+ years of Python releases)
-          CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*"
+          CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-*"
           # Skip 32-bit and musl (uncommon for scientific Python)
           CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux*"
           # maturin needs Rust in the build container
@@ -80,9 +80,9 @@ jobs:
           # missing OpenBLAS (this broke the v3.6.0 first build attempt - the
           # skip is load-bearing, do not remove it). Linux import + full-suite
           # coverage lives in .github/workflows/tests.yml instead.
-          # Also skip macOS (MPFR symbol issue) and cp38/cp39 (dependency
+          # Also skip macOS (MPFR symbol issue) and cp39 (dependency
           # ilt-inversion may not have matching wheels on PyPI yet).
-          CIBW_TEST_SKIP: "*-manylinux* *-macosx* cp38-* cp39-*"
+          CIBW_TEST_SKIP: "*-manylinux* *-macosx* cp39-*"
 
       - uses: actions/upload-artifact@v6
         with:
@@ -108,7 +108,7 @@ jobs:
         uses: pypa/cibuildwheel@v2.23
         env:
           CIBW_BUILD_FRONTEND: "build"
-          CIBW_BUILD: "cp38-* cp39-* cp310-* cp311-* cp312-* cp313-*"
+          CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-*"
           CIBW_ARCHS_MACOS: "x86_64"
           CIBW_TEST_COMMAND: >
             python -c "from pyrestoolbox._accelerator import get_status; s = get_status(); print(s); assert s['rust_available'], f'Rust not loaded: {s}'"

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/.github/workflows/tests.yml

@@ -63,6 +63,32 @@ jobs:
       - name: Run full test suite (Rust + parity)
         run: python3 -m pytest pyrestoolbox/tests/ -q
 
+  # ── MCP server (separate distribution in mcp/) on both SDK majors ────
+  # The server picks FastMCP (1.x) or MCPServer (2.x) at import; test both so
+  # an SDK release that breaks either path fails here, not in a deployment.
+  test-mcp:
+    name: MCP server (${{ matrix.mcp }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        mcp: ["mcp>=1.2,<2", "mcp>=2,<3"]
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install numpy scipy pandas tabulate openpyxl mpmath ilt-inversion pytest "${{ matrix.mcp }}"
+
+      # Library from the source tree (pure Python), server from mcp/.
+      - name: Run MCP tests
+        env:
+          PYRESTOOLBOX_NO_RUST: "1"
+        run: PYTHONPATH="$PWD:$PWD/mcp" python3 -m pytest mcp/tests/ -q
+
   # ── Complexity ratchet (new code only; existing offenders baselined) ─
   complexity:
     name: Complexity ratchet
@@ -80,7 +106,7 @@ jobs:
       - name: Check cyclomatic complexity against baseline
         run: python3 .github/scripts/check_complexity.py
 
-  # ── Rust lint ratchet (clippy clean; any new warning fails) ─────────
+  # ── Rust lint ratchet (clippy clean; any new warning fails) and unit tests ─
   rust-lint:
     name: Clippy
     runs-on: ubuntu-latest
@@ -96,3 +122,6 @@ jobs:
 
       - name: Clippy
         run: cargo clippy --all-targets -- -D warnings
+
+      - name: Rust unit tests
+        run: cargo test --release

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/.gitignore

@@ -57,3 +57,6 @@ pyrestoolbox-mcp-email.txt
 DEFECTS-FOUND-*.md
 PORT-SPEC-*.md
 *.zip
+
+# Local primary-source library (copyrighted papers and its index) - never published
+papers/

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/Cargo.lock

@@ -152,7 +152,7 @@ dependencies = [
 
 [[package]]
 name = "pyrestoolbox-native"
-version = "3.7.7"
+version = "3.8.3"
 dependencies = [
  "pyo3",
  "rug",

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pyrestoolbox-native"
-version = "3.7.7"
+version = "3.8.3"
 edition = "2021"
 license = "GPL-3.0-or-later"
 description = "Rust acceleration extensions for pyResToolbox"

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrestoolbox
-Version: 3.7.7
+Version: 3.8.3
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
@@ -12,7 +12,6 @@ Requires-Dist: tabulate
 Requires-Dist: ilt-inversion
 Requires-Dist: mpmath
 Requires-Dist: gmpy2
-Requires-Dist: python-flint
 Requires-Dist: openpyxl
 License-File: LICENSE
 Summary: pyResToolbox - A collection of Reservoir Engineering Utilities
@@ -20,7 +19,7 @@ Keywords: restoolbox,petroleum,reservoir
 Home-Page: https://github.com/mwburgoyne/pyResToolbox
 Author-email: "Mark W. Burgoyne" <mark.w.burgoyne@gmail.com>
 License: GPL-3.0-or-later
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst; charset=UTF-8
 Project-URL: Homepage, https://github.com/mwburgoyne/pyResToolbox
 
@@ -35,7 +34,7 @@ A collection of Reservoir Engineering Utilities
 This set of functions focuses on those that the author uses often while crafting programming solutions.
 These are the scripts that are often copy/pasted from previous work - sometimes slightly modified - resulting in a trail of slightly different versions over the years. Some attempt has been made here to make this implementation flexible enough such that it can be relied on as-is going forward.
 
-Note: Version 3.0 consolidates simulation-oriented functions under the simtools module, adds nodal analysis (VLP/IPR), VFP table generation, relative permeability curve fitting, and Eclipse METRIC unit support across all modules. Version 3.0.4 adds decline curve analysis, material balance, method recommendations, and sensitivity analysis.
+Modules: gas, oil, brine, nodal (VLP/IPR, VFP tables), simtools (black-oil, PVTW, rel-perm, aquifer and deck tools), dca (decline curves), matbal (material balance), layer, library, recommend and sensitivity. Every module accepts Eclipse METRIC units with ``metric=True``; the full documentation ships inside the package, and ``pyrestoolbox.docs_dir()`` returns its location for offline reading.
 
 Includes functions to perform calculations including;
 
@@ -46,7 +45,7 @@ Includes functions to perform calculations including;
 - Nodal analysis operating point determination
 - Eclipse VFP table generation (VFPPROD and VFPINJ keywords)
 - PVT Calculations for oil
-- PVT calculation for gas, including up to 100% inerts for CO2, H2S, N2 and H2
+- PVT calculation for gas, including up to 100% inerts for CO2, H2S, N2, H2 and He
 - Gas caloric properties (enthalpy, Cp, Cv, Joule-Thomson coefficient) from the BNS tuned Peng Robinson EOS
 - Gas hydrate formation prediction with thermodynamic inhibitor calculations
 - Return critical parameters for typical components
@@ -289,13 +288,11 @@ Or creating black oil table information for oil
     >>>
     >>> plt.tight_layout()
     >>> plt.show()
-    Iteratively solving for Rsb fraction to use in order to harmonize user specified Pb and Rsb
-
-    Stock Tank Oil Density: 52.09203539823009 lb/cuft
-    Stock Tank Gas Density: 0.052046870460837856 lb/cuft
-    Reservoir Water Density: 61.40223160167964 lb/cuft
+    Stock Tank Oil Density: 52.06448672566371 lb/cuft
+    Stock Tank Gas Density: 0.05204687045843109 lb/cuft
+    Reservoir Water Density: 61.37100825498743 lb/cuft
     Reservoir Water Compressibility: 2.930237693350768e-06 1/psi
-    Reservoir Water Viscosity: 0.3640686136171888 cP
+    Reservoir Water Viscosity: 0.36386395924173587 cP
 
 .. image:: https://raw.githubusercontent.com/mwburgoyne/pyResToolbox/main/pyrestoolbox/docs/img/bot.png
     :alt: Black Oil Properties
@@ -374,17 +371,17 @@ With ability to generate Live Oil PVTO style table data as well
     >>> ..
     >>> plt.show()
     Pb (psia): 4500
-    Bob (rb/stb): 1.6072798403441817
-    Rsb (mscf/stb): 1.2863705330979234
-    Rsb Scaling Required: 0.9713981737449556
-    Visob (cP): 0.3422139569449832
-    Cob (1/psi): 5.711273668114706e-05
-
-    Stock Tank Oil Density: 52.05522123893805 lb/cuft
-    Stock Tank Gas Density: 0.052025361717109773 lb/cuft
-    Reservoir Water Density: 61.40223160167964 lb/cuft
+    Bob (rb/stb): 1.5372158966466267
+    Rsb (mscf/stb): 1.137900924344287
+    Rsb Scaling Required: 1.0362710951888936
+    Visob (cP): 0.36663121233374113
+    Cob (1/psi): 2.0042955593519084e-05
+
+    Stock Tank Oil Density: 52.06448672566371 lb/cuft
+    Stock Tank Gas Density: 0.05204687045843109 lb/cuft
+    Reservoir Water Density: 61.37100825498743 lb/cuft
     Reservoir Water Compressibility: 2.930237693350768e-06 1/psi
-    Reservoir Water Viscosity: 0.3640686136171888 cP
+    Reservoir Water Viscosity: 0.36386395924173587 cP
 
 .. image:: https://raw.githubusercontent.com/mwburgoyne/pyResToolbox/main/pyrestoolbox/docs/img/bot_PVTO.png
     :alt: Live Oil Properties

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/README.rst

@@ -9,7 +9,7 @@ A collection of Reservoir Engineering Utilities
 This set of functions focuses on those that the author uses often while crafting programming solutions.
 These are the scripts that are often copy/pasted from previous work - sometimes slightly modified - resulting in a trail of slightly different versions over the years. Some attempt has been made here to make this implementation flexible enough such that it can be relied on as-is going forward.
 
-Note: Version 3.0 consolidates simulation-oriented functions under the simtools module, adds nodal analysis (VLP/IPR), VFP table generation, relative permeability curve fitting, and Eclipse METRIC unit support across all modules. Version 3.0.4 adds decline curve analysis, material balance, method recommendations, and sensitivity analysis.
+Modules: gas, oil, brine, nodal (VLP/IPR, VFP tables), simtools (black-oil, PVTW, rel-perm, aquifer and deck tools), dca (decline curves), matbal (material balance), layer, library, recommend and sensitivity. Every module accepts Eclipse METRIC units with ``metric=True``; the full documentation ships inside the package, and ``pyrestoolbox.docs_dir()`` returns its location for offline reading.
 
 Includes functions to perform calculations including;
 
@@ -20,7 +20,7 @@ Includes functions to perform calculations including;
 - Nodal analysis operating point determination
 - Eclipse VFP table generation (VFPPROD and VFPINJ keywords)
 - PVT Calculations for oil
-- PVT calculation for gas, including up to 100% inerts for CO2, H2S, N2 and H2
+- PVT calculation for gas, including up to 100% inerts for CO2, H2S, N2, H2 and He
 - Gas caloric properties (enthalpy, Cp, Cv, Joule-Thomson coefficient) from the BNS tuned Peng Robinson EOS
 - Gas hydrate formation prediction with thermodynamic inhibitor calculations
 - Return critical parameters for typical components
@@ -263,13 +263,11 @@ Or creating black oil table information for oil
     >>>
     >>> plt.tight_layout()
     >>> plt.show()
-    Iteratively solving for Rsb fraction to use in order to harmonize user specified Pb and Rsb
-
-    Stock Tank Oil Density: 52.09203539823009 lb/cuft
-    Stock Tank Gas Density: 0.052046870460837856 lb/cuft
-    Reservoir Water Density: 61.40223160167964 lb/cuft
+    Stock Tank Oil Density: 52.06448672566371 lb/cuft
+    Stock Tank Gas Density: 0.05204687045843109 lb/cuft
+    Reservoir Water Density: 61.37100825498743 lb/cuft
     Reservoir Water Compressibility: 2.930237693350768e-06 1/psi
-    Reservoir Water Viscosity: 0.3640686136171888 cP
+    Reservoir Water Viscosity: 0.36386395924173587 cP
 
 .. image:: https://raw.githubusercontent.com/mwburgoyne/pyResToolbox/main/pyrestoolbox/docs/img/bot.png
     :alt: Black Oil Properties
@@ -348,17 +346,17 @@ With ability to generate Live Oil PVTO style table data as well
     >>> ..
     >>> plt.show()
     Pb (psia): 4500
-    Bob (rb/stb): 1.6072798403441817
-    Rsb (mscf/stb): 1.2863705330979234
-    Rsb Scaling Required: 0.9713981737449556
-    Visob (cP): 0.3422139569449832
-    Cob (1/psi): 5.711273668114706e-05
-
-    Stock Tank Oil Density: 52.05522123893805 lb/cuft
-    Stock Tank Gas Density: 0.052025361717109773 lb/cuft
-    Reservoir Water Density: 61.40223160167964 lb/cuft
+    Bob (rb/stb): 1.5372158966466267
+    Rsb (mscf/stb): 1.137900924344287
+    Rsb Scaling Required: 1.0362710951888936
+    Visob (cP): 0.36663121233374113
+    Cob (1/psi): 2.0042955593519084e-05
+
+    Stock Tank Oil Density: 52.06448672566371 lb/cuft
+    Stock Tank Gas Density: 0.05204687045843109 lb/cuft
+    Reservoir Water Density: 61.37100825498743 lb/cuft
     Reservoir Water Compressibility: 2.930237693350768e-06 1/psi
-    Reservoir Water Viscosity: 0.3640686136171888 cP
+    Reservoir Water Viscosity: 0.36386395924173587 cP
 
 .. image:: https://raw.githubusercontent.com/mwburgoyne/pyResToolbox/main/pyrestoolbox/docs/img/bot_PVTO.png
     :alt: Live Oil Properties

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/mcp/Dockerfile

@@ -7,7 +7,7 @@ FROM python:3.11-slim
 
 # Pin the library version for reproducible corporate deployments; bump
 # deliberately and rebuild.
-ARG PYRESTOOLBOX_VERSION=3.7.0
+ARG PYRESTOOLBOX_VERSION=3.8.2
 
 WORKDIR /app
 COPY . /app/mcp

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/mcp/README.md

@@ -66,8 +66,7 @@ pyrestoolbox-mcp --transport streamable-http --host 0.0.0.0 --port 8000
 
 It is stateless (no session affinity needed behind a load balancer) and
 serves the MCP endpoint at `/mcp`. A `Dockerfile` is included; put an API
-gateway in front for authentication. See `DEPLOYMENT.md` for the platform
-team one-pager.
+gateway in front for authentication.
 
 ## Tests
 
@@ -80,8 +79,16 @@ PYTHONPATH=<repo>:<repo>/mcp python3 -m pytest mcp/tests/ -q
 - Units default to oilfield (psia, deg F, ft, mD, cP); pass `metric: true`
   where the function supports it. The plyasunov module is SI (K, MPa).
 - The oil module is scalar-only; gas and brine functions accept lists.
-- Stateful classes (`GasPVT`, `CO2_Brine_Mixture`, `SoreideWhitson`,
-  `DeclineResult`) are not exposed through `call` - the one-shot wrapper
-  tools cover the common workflows.
+- Gas rates are Mscf/d everywhere (sm3/d with `metric: true`).
+- Functions that take objects are callable through `call` with those objects
+  written as JSON objects of their constructor keywords: `completion`
+  (`nodal.Completion`, with an optional `segments` list of `WellSegment`
+  objects), `reservoir`, `gas_pvt`, `oil_pvt`, `result` (the object a
+  `fit_decline` or `fit_ratio` call returned), `ratios`, and `func` as a
+  `'module.function'` name for `sensitivity.sweep`/`tornado`. For example
+  `call('nodal.fbhp', {"thp": 500, "well_type": "gas", "qg_mscfd": 5000,
+  "completion": {"tid": 2.441, "length": 10000, "tht": 100, "bht": 200}})`.
+  Classes themselves are not called directly; the one-shot wrapper tools
+  cover the common stateful workflows.
 - File-writing simtools functions keep their `export=False` defaults, so
   calls return table text rather than touching disk.

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/mcp/pyproject.toml

@@ -11,8 +11,8 @@ authors = [{name = "Mark W. Burgoyne", email = "mark.w.burgoyne@gmail.com"}]
 keywords = ["mcp", "petroleum", "reservoir", "pyrestoolbox"]
 requires-python = ">=3.10"
 dependencies = [
-    "mcp>=1.2",
-    "pyrestoolbox>=3.7",
+    "mcp>=1.2,<3",
+    "pyrestoolbox>=3.8.2",
 ]
 readme = "README.md"
 

{pyrestoolbox-3.7.7 → pyrestoolbox-3.8.3}/mcp/pyrestoolbox_mcp/server.py

@@ -17,7 +17,12 @@ as MCP resources (docs://gas, docs://oil, ...).
 import importlib
 import inspect
 
-from mcp.server.fastmcp import FastMCP
+try:  # mcp >= 2 renamed FastMCP to MCPServer
+    from mcp.server.mcpserver import MCPServer as _MCPServer
+    _MCP_V2 = True
+except ImportError:  # mcp 1.x
+    from mcp.server.fastmcp import FastMCP as _MCPServer
+    _MCP_V2 = False
 
 from pyrestoolbox_mcp.serialize import to_jsonable
 
@@ -37,7 +42,7 @@ ALLOWED_MODULES = {
     "sensitivity": "Parameter sweeps and tornado analysis",
 }
 
-mcp = FastMCP(
+mcp = _MCPServer(
     "pyrestoolbox",
     instructions=(
         "Petroleum/reservoir engineering calculations from the pyrestoolbox "
@@ -53,6 +58,10 @@ mcp = FastMCP(
         "Fahrenheit value to `degf` with metric=True converts it twice and "
         "returns a wrong answer silently. Standard volumes are always at "
         "60 deg F and 14.696 psia, so metric sm3 is on that basis. "
+        "Gas rates are Mscf/d everywhere (sm3/d with metric=True). "
+        "Functions that take objects (Completion, Reservoir, GasPVT, OilPVT, "
+        "decline results) accept them through call() as JSON objects of their "
+        "constructor keywords; see the call tool description. "
         "Full module documentation is available as docs:// resources."
     ),
 )
@@ -147,8 +156,23 @@ def call(name: str, arguments: dict = {}) -> dict:
     Correlation methods are strings (e.g. "zmethod": "DAK"); an invalid
     method string returns an error listing the valid options. Gas and brine
     functions accept lists for pressure-like inputs; oil functions are
-    scalar-only. Classes cannot be called here - use the one-shot wrapper
-    tools (co2_brine_props, sw_brine_props, fit_and_forecast) instead.
+    scalar-only. Gas rates are Mscf/d (sm3/d with metric=True).
+
+    Object arguments are passed as JSON objects of their constructor keywords
+    and built here (describe the class for its keywords):
+      completion -> nodal.Completion   (a "segments" list of objects -> WellSegment)
+      reservoir  -> nodal.Reservoir
+      gas_pvt    -> gas.GasPVT
+      oil_pvt    -> oil.OilPVT
+      result     -> dca.DeclineResult (forecast) or dca.RatioResult (ratio_forecast);
+                    pass the object a fit_decline / fit_ratio call returned
+      ratios     -> {name: RatioResult object}
+      func       -> a 'module.function' name (sensitivity.sweep / tornado); objects
+                    inside base_kwargs are built by the same rules
+    e.g. call('nodal.fbhp', {"thp": 500, "well_type": "gas", "qg_mscfd": 5000,
+    "completion": {"tid": 2.441, "length": 10000, "tht": 100, "bht": 200}}).
+    Classes themselves cannot be called here; one-shot wrappers
+    (co2_brine_props, sw_brine_props, fit_and_forecast) cover the common cases.
     """
     _, obj = _resolve(name)
     if inspect.isclass(obj):
@@ -159,14 +183,79 @@ def call(name: str, arguments: dict = {}) -> dict:
         )
     if not callable(obj):
         raise ValueError(f"{name} is not callable (it is {type(obj).__name__})")
-    result = obj(**arguments)
+    result = obj(**_build_objects(obj, arguments))
     return {"result": to_jsonable(result)}
 
 
+def _library_class(dotted: str):
+    module, cls = dotted.split(".")
+    return getattr(_get_module(module), cls)
+
+
+# Keyword -> library class built from a JSON object. The library names these
+# parameters consistently, so one table covers every function that takes them.
+_OBJECT_PARAMS = {
+    "completion": "nodal.Completion",
+    "reservoir": "nodal.Reservoir",
+    "gas_pvt": "gas.GasPVT",
+    "oil_pvt": "oil.OilPVT",
+}
+
+
+def _build_objects(fn, arguments: dict) -> dict:
+    """Turn JSON objects in `arguments` into the library objects fn expects.
+
+    Raises ValueError naming the parameter and class when construction fails,
+    so an agent learns which keywords to fix instead of an AttributeError from
+    deep inside the library.
+    """
+    try:
+        annotations = {k: str(v.annotation) for k, v in inspect.signature(fn).parameters.items()}
+    except (TypeError, ValueError):
+        annotations = {}
+    out = {}
+    for key, value in arguments.items():
+        out[key] = _build_one(key, value, annotations.get(key, ""))
+    return out
+
+
+def _build_one(key, value, annotation):
+    if key == "func" and isinstance(value, str):
+        _, fn = _resolve(value)
+        return fn
+    if key == "base_kwargs" and isinstance(value, dict):
+        return {k: _build_one(k, v, "") for k, v in value.items()}
+    if not isinstance(value, dict):
+        return value
+    if key == "ratios":
+        return {name: _construct("dca.RatioResult", key, spec) for name, spec in value.items()}
+    if key == "result":
+        dotted = "dca.RatioResult" if "RatioResult" in annotation else "dca.DeclineResult"
+        return _construct(dotted, key, value)
+    if key in _OBJECT_PARAMS:
+        if key == "completion" and isinstance(value.get("segments"), list):
+            value = dict(value, segments=[
+                _construct("nodal.WellSegment", "completion.segments", seg)
+                if isinstance(seg, dict) else seg for seg in value["segments"]])
+        return _construct(_OBJECT_PARAMS[key], key, value)
+    return value
+
+
+def _construct(dotted, key, spec):
+    cls = _library_class(dotted)
+    try:
+        return cls(**spec)
+    except TypeError as exc:
+        raise ValueError(
+            f"Could not build {dotted} for '{key}' from {sorted(spec)}: {exc}. "
+            f"Use describe({dotted!r}) for its keywords."
+        ) from exc
+
+
 @mcp.tool()
 def recommend_methods(sg: float = 0.65, co2: float = 0, h2s: float = 0,
                       n2: float = 0, h2: float = 0, api: float | None = None,
-                      deviation: float = 0, well_type: str = "gas") -> dict:
+                      deviation: float = 0, well_type: str = "gas", he: float = 0) -> dict:
     """Recommend correlation methods for a fluid/well, with rationale.
 
     Composition fractions are molar. api: stock tank oil gravity (include to
@@ -179,7 +268,7 @@ def recommend_methods(sg: float = 0.65, co2: float = 0, h2s: float = 0,
     from pyrestoolbox import recommend
     recs = recommend.recommend_methods(sg=sg, co2=co2, h2s=h2s, n2=n2, h2=h2,
                                        api=api, deviation=deviation,
-                                       well_type=well_type)
+                                       well_type=well_type, he=he)
     return to_jsonable(recs)
 
 
@@ -207,12 +296,12 @@ def co2_brine_props(pres: float, temp: float, ppm: float = 0,
 def sw_brine_props(pres: float, temp: float, ppm: float = 0,
                    y_CO2: float = 0, y_H2S: float = 0, y_N2: float = 0,
                    y_H2: float = 0, sg: float = 0.65, cw_sat: bool = False,
-                   metric: bool = False) -> dict:
+                   metric: bool = False, y_He: float = 0) -> dict:
     """Multicomponent gas-saturated brine properties (Soreide-Whitson VLE).
 
     pres: pressure (psia, or barsa if metric=True). temp: temperature
     (deg F, or deg C if metric=True). ppm: NaCl-equivalent salinity.
-    y_*: molar fractions of CO2/H2S/N2/H2 in the equilibrium gas; the
+    y_*: molar fractions of CO2/H2S/N2/H2/He in the equilibrium gas; the
     remainder is hydrocarbon gas of specific gravity sg. Returns aqueous
     composition, brine density/viscosity triplets, Rs, water content and
     compressibilities.
@@ -220,7 +309,7 @@ def sw_brine_props(pres: float, temp: float, ppm: float = 0,
     from pyrestoolbox import brine
     sw = brine.SoreideWhitson(pres=pres, temp=temp, ppm=ppm, y_CO2=y_CO2,
                               y_H2S=y_H2S, y_N2=y_N2, y_H2=y_H2, sg=sg,
-                              cw_sat=cw_sat, metric=metric)
+                              cw_sat=cw_sat, metric=metric, y_He=y_He)
     keys = ("x", "bDen", "bVis", "bw", "Rs", "Rs_total", "water_content",
             "Cf_usat", "Cf_sat")
     return {k: to_jsonable(getattr(sw, k, None)) for k in keys}
@@ -298,13 +387,18 @@ def build_parser():
 
 def main():
     args = build_parser().parse_args()
-    if args.transport == "streamable-http":
-        mcp.settings.host = args.host
-        mcp.settings.port = args.port
-        # Independent request handling; no server-side session affinity needed
-        # behind a load balancer.
-        mcp.settings.stateless_http = True
-    mcp.run(transport=args.transport)
+    if args.transport != "streamable-http":
+        mcp.run(transport=args.transport)
+        return
+    # stateless_http: independent request handling; no server-side session
+    # affinity needed behind a load balancer.
+    http = {"host": args.host, "port": args.port, "stateless_http": True}
+    if _MCP_V2:
+        mcp.run(transport=args.transport, **http)
+    else:  # 1.x reads these from settings, not run()
+        for key, value in http.items():
+            setattr(mcp.settings, key, value)
+        mcp.run(transport=args.transport)
 
 
 if __name__ == "__main__":