truefoundry 0.7.2__py3-none-any.whl → 0.7.3rc1__py3-none-any.whl

truefoundry/_client.py

@@ -33,4 +33,4 @@ class _LazyTrueFoundry(truefoundry_sdk.TrueFoundry):
         )
 
 
-client = _LazyTrueFoundry().v1
+client = _LazyTrueFoundry()

truefoundry/deploy/lib/clients/ask_client.py

@@ -1,10 +1,7 @@
 try:
     from mcp import ClientSession
+    from mcp.client.streamable_http import streamablehttp_client
     from mcp.types import TextContent
-
-    from truefoundry.deploy.lib.clients._mcp_streamable_http import (
-        streamablehttp_client,
-    )
 except ImportError:
     import sys
 
@@ -75,7 +72,7 @@ class AskClient:
             (
                 read_stream,
                 write_stream,
-                self._terminate_cb,
+                _,
             ) = await self._streams_context.__aenter__()
             self._session_context = ClientSession(
                 read_stream=read_stream, write_stream=write_stream
@@ -99,7 +96,6 @@ class AskClient:
 
     async def cleanup(self):
         """Properly close all async contexts opened during session initialization."""
-        await self._terminate_cb()
         for context in [
             getattr(self, "_session_context", None),
             getattr(self, "_streams_context", None),

{truefoundry-0.7.2.dist-info → truefoundry-0.7.3rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.7.2
+Version: 0.7.3rc1
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -14,7 +14,7 @@ Requires-Dist: gitpython<4.0.0,>=3.1.43
 Requires-Dist: importlib-metadata<9.0.0,>=4.11.3
 Requires-Dist: importlib-resources<7.0.0,>=5.2.0
 Requires-Dist: mako<2.0.0,>=1.1.6
-Requires-Dist: mcp==1.7.1; python_version >= '3.10'
+Requires-Dist: mcp==1.8.1; python_version >= '3.10'
 Requires-Dist: numpy<3.0.0,>=1.23.0
 Requires-Dist: openai<2.0.0,>=1.16.2
 Requires-Dist: packaging<26.0,>=20.0
@@ -31,7 +31,7 @@ Requires-Dist: requirements-parser<0.12.0,>=0.11.0
 Requires-Dist: rich-click<2.0.0,>=1.2.1
 Requires-Dist: rich<14.0.0,>=13.7.1
 Requires-Dist: tqdm<5.0.0,>=4.0.0
-Requires-Dist: truefoundry-sdk==0.0.16
+Requires-Dist: truefoundry-sdk==0.1.0
 Requires-Dist: typing-extensions>=4.0
 Requires-Dist: urllib3<3,>=1.26.18
 Requires-Dist: yq<4.0.0,>=3.1.0

{truefoundry-0.7.2.dist-info → truefoundry-0.7.3rc1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 truefoundry/__init__.py,sha256=VVpO-Awh1v93VOURe7hank8QpeSPc0dCykwr14GOFsw,967
-truefoundry/_client.py,sha256=VQEfRvPE7nuqq--q28cpmnIYPG3RH52RSifIFOzzvTg,1420
+truefoundry/_client.py,sha256=Y3qHi_Lg4Sx6GNvsjAHIoAfFr8PJnqgCrXmpNAI3ECg,1417
 truefoundry/logger.py,sha256=u-YCNjg5HBwE70uQcpjIG64Ghos-K2ulTWaxC03BSj4,714
 truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,345
 truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
@@ -95,8 +95,7 @@ truefoundry/deploy/lib/session.py,sha256=fLdgR6ZDp8-hFl5NTON4ngnWLsMzGxvKtfpDOOw
 truefoundry/deploy/lib/util.py,sha256=J7r8San2wKo48A7-BlH2-OKTlBO67zlPjLEhMsL8os0,1059
 truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXArrY,5009
 truefoundry/deploy/lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/deploy/lib/clients/_mcp_streamable_http.py,sha256=oO_pdgVy0BkksLDZo-arcnaJ4gSaTJmMMZF9u-uF7Mk,10851
-truefoundry/deploy/lib/clients/ask_client.py,sha256=PINeyjZF9IMkphU6ln6JVKlFJrHPhkkE5wolFBrp_f8,13589
+truefoundry/deploy/lib/clients/ask_client.py,sha256=77106708EC16wsi2M1n1_5HgOVboEZoq9_obKsf24M0,13494
 truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=fmRlPYCimk1ZLbMgdzfJVCbcKRCVnFYL5T3j2uJA0Tc,27037
 truefoundry/deploy/lib/dao/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/dao/application.py,sha256=oMszpueXPUfTUuN_XdKwoRjQyqAgWHhZ-10cbprCVdM,9226
@@ -376,7 +375,7 @@ truefoundry/workflow/remote_filesystem/__init__.py,sha256=LQ95ViEjJ7Ts4JcCGOxMPs
 truefoundry/workflow/remote_filesystem/logger.py,sha256=em2l7D6sw7xTLDP0kQSLpgfRRCLpN14Qw85TN7ujQcE,1022
 truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQlgzcj0nP3tJopyFSVWT1uv3nhiTIuwfXYeg,12342
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
-truefoundry-0.7.2.dist-info/METADATA,sha256=wjXiGA-c9eUYLeH9Qcy2QfYLBmi9FOa1j-R5AABgtgg,2459
-truefoundry-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.7.2.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.7.2.dist-info/RECORD,,
+truefoundry-0.7.3rc1.dist-info/METADATA,sha256=lZHcPxXnM4vcAzc06dsU8ssksI2aCkSOoplZR9of_TA,2461
+truefoundry-0.7.3rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.7.3rc1.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.7.3rc1.dist-info/RECORD,,

truefoundry/deploy/lib/clients/_mcp_streamable_http.py

@@ -1,264 +0,0 @@
-"""
-StreamableHTTP Client Transport Module
-# From https://github.com/modelcontextprotocol/python-sdk/pull/573
-
-This module implements the StreamableHTTP transport for MCP clients,
-providing support for HTTP POST requests with optional SSE streaming responses
-and session management.
-"""
-
-import logging
-from contextlib import asynccontextmanager
-from datetime import timedelta
-from typing import Any
-
-import anyio
-import httpx
-from httpx_sse import EventSource, aconnect_sse
-from mcp.types import (
-    ErrorData,
-    JSONRPCError,
-    JSONRPCMessage,
-    JSONRPCNotification,
-    JSONRPCRequest,
-)
-
-logger = logging.getLogger(__name__)
-
-# Header names
-MCP_SESSION_ID_HEADER = "mcp-session-id"
-LAST_EVENT_ID_HEADER = "last-event-id"
-
-# Content types
-CONTENT_TYPE_JSON = "application/json"
-CONTENT_TYPE_SSE = "text/event-stream"
-
-
-@asynccontextmanager
-async def streamablehttp_client(
-    url: str,
-    headers: dict[str, Any] | None = None,
-    timeout: timedelta = timedelta(seconds=30),
-    sse_read_timeout: timedelta = timedelta(seconds=60 * 5),
-):
-    """
-    Client transport for StreamableHTTP.
-
-    `sse_read_timeout` determines how long (in seconds) the client will wait for a new
-    event before disconnecting. All other HTTP operations are controlled by `timeout`.
-
-    Yields:
-        Tuple of (read_stream, write_stream, terminate_callback)
-    """
-
-    read_stream_writer, read_stream = anyio.create_memory_object_stream[
-        JSONRPCMessage | Exception
-    ](0)
-    write_stream, write_stream_reader = anyio.create_memory_object_stream[
-        JSONRPCMessage
-    ](0)
-
-    async def get_stream():
-        """
-        Optional GET stream for server-initiated messages
-        """
-        nonlocal session_id
-        try:
-            # Only attempt GET if we have a session ID
-            if not session_id:
-                return
-
-            get_headers = request_headers.copy()
-            get_headers[MCP_SESSION_ID_HEADER] = session_id
-
-            async with aconnect_sse(
-                client,
-                "GET",
-                url,
-                headers=get_headers,
-                timeout=httpx.Timeout(timeout.seconds, read=sse_read_timeout.seconds),
-            ) as event_source:
-                event_source.response.raise_for_status()
-                logger.debug("GET SSE connection established")
-
-                async for sse in event_source.aiter_sse():
-                    if sse.event == "message":
-                        try:
-                            message = JSONRPCMessage.model_validate_json(sse.data)
-                            logger.debug(f"GET message: {message}")
-                            await read_stream_writer.send(message)
-                        except Exception as exc:
-                            logger.error(f"Error parsing GET message: {exc}")
-                            await read_stream_writer.send(exc)
-                    else:
-                        logger.warning(f"Unknown SSE event from GET: {sse.event}")
-        except Exception as exc:
-            # GET stream is optional, so don't propagate errors
-            logger.debug(f"GET stream error (non-fatal): {exc}")
-
-    async def post_writer(client: httpx.AsyncClient):
-        nonlocal session_id
-        try:
-            async with write_stream_reader:
-                async for message in write_stream_reader:
-                    # Add session ID to headers if we have one
-                    post_headers = request_headers.copy()
-                    if session_id:
-                        post_headers[MCP_SESSION_ID_HEADER] = session_id
-
-                    logger.debug(f"Sending client message: {message}")
-
-                    # Handle initial initialization request
-                    is_initialization = (
-                        isinstance(message.root, JSONRPCRequest)
-                        and message.root.method == "initialize"
-                    )
-                    if (
-                        isinstance(message.root, JSONRPCNotification)
-                        and message.root.method == "notifications/initialized"
-                    ):
-                        tg.start_soon(get_stream)
-
-                    async with client.stream(
-                        "POST",
-                        url,
-                        json=message.model_dump(
-                            by_alias=True, mode="json", exclude_none=True
-                        ),
-                        headers=post_headers,
-                    ) as response:
-                        if response.status_code == 202:
-                            logger.debug("Received 202 Accepted")
-                            continue
-                        # Check for 404 (session expired/invalid)
-                        if response.status_code == 404:
-                            if isinstance(message.root, JSONRPCRequest):
-                                jsonrpc_error = JSONRPCError(
-                                    jsonrpc="2.0",
-                                    id=message.root.id,
-                                    error=ErrorData(
-                                        code=32600,
-                                        message="Session terminated",
-                                    ),
-                                )
-                                await read_stream_writer.send(
-                                    JSONRPCMessage(jsonrpc_error)
-                                )
-                                continue
-
-                        if not response.is_success:
-                            _response_content = await response.aread()
-                            logger.error(
-                                f"Response: {response.status_code} {_response_content}"
-                            )
-                            response.raise_for_status()
-
-                        # Extract session ID from response headers
-                        if is_initialization:
-                            new_session_id = response.headers.get(MCP_SESSION_ID_HEADER)
-                            if new_session_id:
-                                session_id = new_session_id
-                                logger.info(f"Received session ID: {session_id}")
-
-                        # Handle different response types
-                        content_type = response.headers.get("content-type", "").lower()
-
-                        if content_type.startswith(CONTENT_TYPE_JSON):
-                            try:
-                                content = await response.aread()
-                                json_message = JSONRPCMessage.model_validate_json(
-                                    content
-                                )
-                                await read_stream_writer.send(json_message)
-                            except Exception as exc:
-                                logger.error(f"Error parsing JSON response: {exc}")
-                                await read_stream_writer.send(exc)
-
-                        elif content_type.startswith(CONTENT_TYPE_SSE):
-                            # Parse SSE events from the response
-                            try:
-                                event_source = EventSource(response)
-                                async for sse in event_source.aiter_sse():
-                                    if sse.event == "message":
-                                        try:
-                                            await read_stream_writer.send(
-                                                JSONRPCMessage.model_validate_json(
-                                                    sse.data
-                                                )
-                                            )
-                                        except Exception as exc:
-                                            logger.exception("Error parsing message")
-                                            await read_stream_writer.send(exc)
-                                    else:
-                                        logger.warning(f"Unknown event: {sse.event}")
-
-                            except Exception as e:
-                                logger.exception("Error reading SSE stream:")
-                                await read_stream_writer.send(e)
-
-                        else:
-                            # For 202 Accepted with no body
-                            if response.status_code == 202:
-                                logger.debug("Received 202 Accepted")
-                                continue
-
-                            error_msg = f"Unexpected content type: {content_type}"
-                            logger.error(error_msg)
-                            await read_stream_writer.send(ValueError(error_msg))
-
-        except Exception as exc:
-            logger.error(f"Error in post_writer: {exc}")
-        finally:
-            await read_stream_writer.aclose()
-            await write_stream.aclose()
-
-    async def terminate_session():
-        """
-        Terminate the session by sending a DELETE request.
-        """
-        nonlocal session_id
-        if not session_id:
-            return  # No session to terminate
-
-        try:
-            delete_headers = request_headers.copy()
-            delete_headers[MCP_SESSION_ID_HEADER] = session_id
-
-            response = await client.delete(
-                url,
-                headers=delete_headers,
-            )
-
-            if response.status_code == 405:
-                # Server doesn't allow client-initiated termination
-                logger.debug("Server does not allow session termination")
-            elif response.status_code != 200:
-                logger.warning(f"Session termination failed: {response.status_code}")
-        except Exception as exc:
-            logger.warning(f"Session termination failed: {exc}")
-
-    async with anyio.create_task_group() as tg:
-        try:
-            logger.debug(f"Connecting to StreamableHTTP endpoint: {url}")
-            # Set up headers with required Accept header
-            request_headers = {
-                "Accept": f"{CONTENT_TYPE_JSON}, {CONTENT_TYPE_SSE}",
-                "Content-Type": CONTENT_TYPE_JSON,
-                **(headers or {}),
-            }
-            # Track session ID if provided by server
-            session_id: str | None = None
-
-            async with httpx.AsyncClient(
-                headers=request_headers,
-                timeout=httpx.Timeout(timeout.seconds, read=sse_read_timeout.seconds),
-                follow_redirects=True,
-            ) as client:
-                tg.start_soon(post_writer, client)
-                try:
-                    yield read_stream, write_stream, terminate_session
-                finally:
-                    tg.cancel_scope.cancel()
-        finally:
-            await read_stream_writer.aclose()
-            await write_stream.aclose()