pyrestoolbox 3.8.1__tar.gz → 3.8.3__tar.gz

{pyrestoolbox-3.8.1 → 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

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

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

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrestoolbox
-Version: 3.8.1
+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+)
@@ -45,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

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

@@ -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

{pyrestoolbox-3.8.1 → 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.8.1 → 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,<2",
-    "pyrestoolbox>=3.7",
+    "mcp>=1.2,<3",
+    "pyrestoolbox>=3.8.2",
 ]
 readme = "README.md"
 

{pyrestoolbox-3.8.1 → 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 "
@@ -250,7 +255,7 @@ def _construct(dotted, key, spec):
 @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
@@ -263,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)
 
 
@@ -291,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.
@@ -304,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}
@@ -382,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__":

{pyrestoolbox-3.8.1 → pyrestoolbox-3.8.3}/mcp/tests/test_server.py

@@ -4,9 +4,9 @@ Run from the repo root:
     PYTHONPATH=/home/mark/projects/pyResToolbox:/home/mark/projects/pyResToolbox/mcp \
         python3 -m pytest mcp/tests/ -q
 
-Most tests exercise the tool functions directly (FastMCP's @tool decorator
+Most tests exercise the tool functions directly (the SDK's @tool decorator
 returns the undecorated function). test_client_session_* run the full MCP
-protocol over an in-process transport.
+protocol over an in-process transport. The suite runs on mcp 1.x and 2.x.
 """
 
 import os
@@ -186,15 +186,19 @@ def test_fit_and_forecast_exponential():
 
 # ------------------------------------------------- full MCP protocol session
 
+def _in_memory_client():
+    """In-process client session: mcp 2.x Client takes the server directly;
+    1.x needs the memory-stream helper and the low-level server."""
+    if srv._MCP_V2:
+        from mcp.client import Client
+        return Client(srv.mcp)
+    from mcp.shared.memory import create_connected_server_and_client_session
+    return create_connected_server_and_client_session(srv.mcp._mcp_server)
+
+
 @pytest.mark.anyio
 async def test_client_session_tools_and_resources():
-    try:
-        from mcp.shared.memory import create_connected_server_and_client_session
-    except ImportError:
-        pytest.skip('mcp.shared.memory helper not available in this SDK version')
-
-    async with create_connected_server_and_client_session(
-            srv.mcp._mcp_server) as client:
+    async with _in_memory_client() as client:
         tools = await client.list_tools()
         names = {t.name for t in tools.tools}
         assert {'list_functions', 'describe', 'call', 'recommend_methods',
@@ -204,7 +208,8 @@ async def test_client_session_tools_and_resources():
         result = await client.call_tool(
             'call', {'name': 'gas.gas_z',
                      'arguments': {'p': 2000, 'sg': 0.75, 'degf': 200}})
-        assert not result.isError
+        # 2.x result fields are snake_case
+        assert not (result.is_error if srv._MCP_V2 else result.isError)
         assert '0.868265' in result.content[0].text
 
         resources = await client.list_resources()
@@ -230,3 +235,29 @@ def test_cli_parser_defaults_and_http():
                          '--host', '0.0.0.0', '--port', '9000'])
     assert (args.transport, args.host, args.port) == ('streamable-http',
                                                       '0.0.0.0', 9000)
+
+
+def test_main_passes_http_settings_to_the_sdk(monkeypatch):
+    """host, port and stateless_http reach the SDK: as run() keywords on
+    mcp 2.x, through mcp.settings on 1.x."""
+    calls = []
+    monkeypatch.setattr(srv.mcp, 'run', lambda **kw: calls.append(kw))
+    monkeypatch.setattr('sys.argv', ['pyrestoolbox-mcp', '--transport', 'streamable-http',
+                                     '--host', '0.0.0.0', '--port', '9000'])
+    srv.main()
+    want = {'host': '0.0.0.0', 'port': 9000, 'stateless_http': True}
+    if srv._MCP_V2:
+        assert calls == [dict(transport='streamable-http', **want)]
+    else:
+        assert calls == [{'transport': 'streamable-http'}]
+        assert {k: getattr(srv.mcp.settings, k) for k in want} == want
+    calls.clear()
+    monkeypatch.setattr('sys.argv', ['pyrestoolbox-mcp'])
+    srv.main()
+    assert calls == [{'transport': 'stdio'}]
+
+
+def test_sw_brine_props_helium():
+    out = srv.sw_brine_props(pres=3000, temp=150, ppm=50000, y_He=1.0)
+    assert out['x']['He'] > 0
+    assert out['bDen'][0] < out['bDen'][1]

{pyrestoolbox-3.8.1 → pyrestoolbox-3.8.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "pyrestoolbox"
-version = "3.8.1"
+version = "3.8.3"
 description = "pyResToolbox - A collection of Reservoir Engineering Utilities"
 license = {text = "GPL-3.0-or-later"}
 authors = [{name = "Mark W. Burgoyne", email = "mark.w.burgoyne@gmail.com"}]

{pyrestoolbox-3.8.1 → pyrestoolbox-3.8.3}/pyrestoolbox/brine/_lib_salting_library.py

@@ -26,7 +26,7 @@ LN10 = np.log(10.0)  # 2.302585...
 # ====================================================================
 # Boiling points (K) for S&W gases
 TB_K = {
-    'H2': 20.3, 'N2': 77.4, 'CO2': 194.7, 'H2S': 212.8,  # H2S NBP 212.87 K (NIST)
+    'H2': 20.3, 'He': 4.2238, 'N2': 77.4, 'CO2': 194.7, 'H2S': 212.8,  # H2S NBP 212.87 K (NIST)
     'CH4': 111.6, 'C2H6': 184.6, 'C3H8': 231.1,
     'iC4H10': 261.4, 'nC4H10': 272.7, 'iC5H12': 301.0,
     'nC5H12': 309.2, 'nC6H14': 341.9, 'nC7H16': 371.6,