datarobot-genai 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

datarobot_genai/drmcp/core/dynamic_prompts/dr_lib.py

@@ -12,78 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from collections import defaultdict
-from dataclasses import dataclass
 
 import datarobot as dr
 
 from datarobot_genai.drmcp.core.clients import get_api_client
 
-# Needed SDK version (3.10.0) is not published yet. We'll reimplement simplified version of it.
-# get_datarobot_prompt_templates = dr.genai.PromptTemplate.list()
-# DrPrompt = dr.genai.PromptTemplate
-# DrPromptVersion = dr.genai.PromptTemplateVersion
-# DrVariable = dr.genai.Variable
 
-
-@dataclass
-class DrVariable:
-    name: str
-    description: str
-
-
-@dataclass
-class DrPromptVersion:
-    id: str
-    prompt_template_id: str
-    version: int
-    prompt_text: str
-    variables: list[DrVariable]
-
-    @classmethod
-    def from_dict(cls, d: dict) -> "DrPromptVersion":
-        variables = [
-            DrVariable(name=v["name"], description=v["description"]) for v in d["variables"]
-        ]
-        return cls(
-            id=d["id"],
-            prompt_template_id=d["promptTemplateId"],
-            version=d["version"],
-            prompt_text=d["promptText"],
-            variables=variables,
-        )
-
-
-@dataclass
-class DrPrompt:
-    id: str
-    name: str
-    description: str
-
-    def get_latest_version(self) -> DrPromptVersion | None:
-        all_prompt_template_versions = get_datarobot_prompt_template_versions([self.id])
-        prompt_template_versions = all_prompt_template_versions.get(self.id)
-
-        if not prompt_template_versions:
-            return None
-        latest_version = max(prompt_template_versions, key=lambda v: v.version)
-        return latest_version
-
-    @classmethod
-    def from_dict(cls, d: dict) -> "DrPrompt":
-        return cls(id=d["id"], name=d["name"], description=d["description"])
-
-
-def get_datarobot_prompt_templates() -> list[DrPrompt]:
-    prompt_templates_data = dr.utils.pagination.unpaginate(
-        initial_url="genai/promptTemplates/", initial_params={}, client=get_api_client()
-    )
-
-    return [DrPrompt.from_dict(prompt_template) for prompt_template in prompt_templates_data]
+def get_datarobot_prompt_templates() -> list[dr.genai.PromptTemplate]:
+    try:
+        return dr.genai.PromptTemplate.list()
+    except Exception:
+        return []
 
 
 def get_datarobot_prompt_template_versions(
     prompt_template_ids: list[str],
-) -> dict[str, list[DrPromptVersion]]:
+) -> dict[str, list[dr.genai.PromptTemplateVersion]]:
+    # Still missing in SDK
     prompt_template_versions_data = dr.utils.pagination.unpaginate(
         initial_url="genai/promptTemplates/versions/",
         initial_params={
@@ -94,35 +39,32 @@ def get_datarobot_prompt_template_versions(
     prompt_template_versions = defaultdict(list)
     for prompt_template_version in prompt_template_versions_data:
         prompt_template_versions[prompt_template_version["promptTemplateId"]].append(
-            DrPromptVersion.from_dict(prompt_template_version)
+            dr.genai.PromptTemplateVersion(
+                id=prompt_template_version["id"],
+                prompt_template_id=prompt_template_version["promptTemplateId"],
+                prompt_text=prompt_template_version["promptText"],
+                commit_comment=prompt_template_version["commitComment"],
+                version=prompt_template_version["version"],
+                variables=prompt_template_version["variables"],
+                creation_date=prompt_template_version["creationDate"],
+                creation_user_id=prompt_template_version["creationUserId"],
+                user_name=prompt_template_version["userName"],
+            )
         )
     return prompt_template_versions
 
 
-def get_datarobot_prompt_template(prompt_template_id: str) -> DrPrompt | None:
-    api_client = get_api_client()
+def get_datarobot_prompt_template(prompt_template_id: str) -> dr.genai.PromptTemplate | None:
     try:
-        prompt_template_response = api_client.get(
-            f"genai/promptTemplates/{prompt_template_id}/", join_endpoint=True
-        )
-        prompt_template_json = prompt_template_response.json()
+        return dr.genai.PromptTemplate.get(prompt_template_id)
     except Exception:
         return None
 
-    return DrPrompt.from_dict(prompt_template_json)
-
 
 def get_datarobot_prompt_template_version(
     prompt_template_id: str, prompt_template_version_id: str
-) -> DrPromptVersion | None:
-    api_client = get_api_client()
+) -> dr.genai.PromptTemplateVersion | None:
     try:
-        prompt_template_version_response = api_client.get(
-            f"genai/promptTemplates/{prompt_template_id}/versions/{prompt_template_version_id}/",
-            join_endpoint=True,
-        )
-        prompt_template_version_json = prompt_template_version_response.json()
+        return dr.genai.PromptTemplateVersion.get(prompt_template_id, prompt_template_version_id)
     except Exception:
         return None
-
-    return DrPromptVersion.from_dict(prompt_template_version_json)

datarobot_genai/drmcp/core/dynamic_prompts/register.py

@@ -18,15 +18,13 @@ from collections.abc import Callable
 from inspect import Parameter
 from inspect import Signature
 
+import datarobot as dr
 from fastmcp.prompts.prompt import Prompt
 from pydantic import Field
 
 from datarobot_genai.drmcp.core.exceptions import DynamicPromptRegistrationError
 from datarobot_genai.drmcp.core.mcp_instance import register_prompt
 
-from .dr_lib import DrPrompt
-from .dr_lib import DrPromptVersion
-from .dr_lib import DrVariable
 from .dr_lib import get_datarobot_prompt_template_versions
 from .dr_lib import get_datarobot_prompt_templates
 
@@ -57,7 +55,8 @@ async def register_prompts_from_datarobot_prompt_management() -> None:
 
 
 async def register_prompt_from_datarobot_prompt_management(
-    prompt_template: DrPrompt, prompt_template_version: DrPromptVersion | None = None
+    prompt_template: dr.genai.PromptTemplate,
+    prompt_template_version: dr.genai.PromptTemplateVersion | None = None,
 ) -> Prompt:
     """Register a single prompt.
 
@@ -173,7 +172,7 @@ def to_valid_mcp_prompt_name(s: str) -> str:
 
 
 def make_prompt_function(
-    name: str, description: str, prompt_text: str, variables: list[DrVariable]
+    name: str, description: str, prompt_text: str, variables: list[dr.genai.Variable]
 ) -> Callable:
     params = []
     for v in variables:

datarobot_genai/drmcp/core/mcp_instance.py

@@ -286,6 +286,9 @@ class TaggedFastMCP(FastMCP):
                 f"already mapped to {existing_prompt_template_version_id}. "
                 f"Updating to version id = {prompt_template_version_id} and name = {prompt_name}"
             )
+            await self.remove_prompt_mapping(
+                prompt_template_id, existing_prompt_template_version_id
+            )
 
         self._prompts_map[prompt_template_id] = (prompt_template_version_id, prompt_name)
 
@@ -526,13 +529,14 @@ async def register_prompt(
     )
 
     # Register the prompt
-    registered_prompt = mcp.add_prompt(prompt)
     if prompt_template:
         prompt_template_id, prompt_template_version_id = prompt_template
         await mcp.set_prompt_mapping(
             prompt_template_id, prompt_template_version_id, prompt_name_no_duplicate
         )
 
+    registered_prompt = mcp.add_prompt(prompt)
+
     # Verify prompt is registered
     prompts = await mcp.get_prompts()
     if not any(prompt.name == prompt_name_no_duplicate for prompt in prompts.values()):

datarobot_genai/drmcp/core/routes.py

@@ -428,7 +428,10 @@ def register_routes(mcp: TaggedFastMCP) -> None:
         """Refresh prompt templates."""
         try:
             await refresh_registered_prompt_template()
-            return JSONResponse(status_code=HTTPStatus.NO_CONTENT, content=None)
+            return JSONResponse(
+                status_code=HTTPStatus.OK,
+                content={"message": "Prompts refreshed successfully"},
+            )
         except Exception as e:
             return JSONResponse(
                 status_code=HTTPStatus.INTERNAL_SERVER_ERROR,

datarobot_genai/drmcp/test_utils/mcp_utils_ete.py

@@ -16,6 +16,8 @@ import os
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
+import aiohttp
+from aiohttp import ClientSession as HttpClientSession
 from mcp import ClientSession
 from mcp.client.streamable_http import streamablehttp_client
 
@@ -29,6 +31,11 @@ def get_dr_mcp_server_url() -> str | None:
     return os.environ.get("DR_MCP_SERVER_URL")
 
 
+def get_dr_mcp_server_http_url() -> str | None:
+    """Get DataRobot MCP server http URL."""
+    return os.environ.get("DR_MCP_SERVER_HTTP_URL")
+
+
 def get_openai_llm_client_config() -> dict[str, str]:
     """Get OpenAI LLM client configuration."""
     openai_api_key = os.environ.get("OPENAI_API_KEY")
@@ -94,3 +101,25 @@ async def ete_test_mcp_session(
                 yield session
     except asyncio.TimeoutError:
         raise TimeoutError(f"Check if the MCP server is running at {get_dr_mcp_server_url()}")
+
+
+@asynccontextmanager
+async def ete_test_http_session(
+    additional_headers: dict[str, str] | None = None,
+) -> AsyncGenerator[HttpClientSession, None]:
+    """Create an HTTP session for each test that can connect to MCP custom http routes.
+
+    Parameters
+    ----------
+    additional_headers : dict[str, str], optional
+        Additional headers to include in the HTTP session (e.g., auth headers for testing).
+    """
+    headers = get_headers()
+    if additional_headers:
+        headers.update(additional_headers)
+
+    async with ete_test_mcp_session(additional_headers=additional_headers):
+        async with aiohttp.ClientSession(
+            base_url=get_dr_mcp_server_http_url(), headers=headers
+        ) as client:
+            yield client

{datarobot_genai-0.2.0.dist-info → datarobot_genai-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datarobot-genai
-Version: 0.2.0
+Version: 0.2.1
 Summary: Generic helpers for GenAI
 Project-URL: Homepage, https://github.com/datarobot-oss/datarobot-genai
 Author: DataRobot, Inc.
@@ -11,7 +11,7 @@ Requires-Python: <3.13,>=3.10
 Requires-Dist: ag-ui-protocol<0.2.0,>=0.1.9
 Requires-Dist: datarobot-drum<2.0.0,>=1.17.5
 Requires-Dist: datarobot-predict<2.0.0,>=1.13.2
-Requires-Dist: datarobot<4.0.0,>=3.9.1
+Requires-Dist: datarobot<4.0.0,>=3.10.0
 Requires-Dist: openai<2.0.0,>=1.76.2
 Requires-Dist: opentelemetry-instrumentation-aiohttp-client<1.0.0,>=0.43b0
 Requires-Dist: opentelemetry-instrumentation-httpx<1.0.0,>=0.43b0

{datarobot_genai-0.2.0.dist-info → datarobot_genai-0.2.1.dist-info}/RECORD

@@ -35,9 +35,9 @@ datarobot_genai/drmcp/core/dr_mcp_server.py,sha256=7mu5UXHQmKNbIpNoQE0lPJaUI7AZa
 datarobot_genai/drmcp/core/dr_mcp_server_logo.py,sha256=hib-nfR1SNTW6CnpFsFCkL9H_OMwa4YYyinV7VNOuLk,4708
 datarobot_genai/drmcp/core/exceptions.py,sha256=eqsGI-lxybgvWL5w4BFhbm3XzH1eU5tetwjnhJxelpc,905
 datarobot_genai/drmcp/core/logging.py,sha256=Y_hig4eBWiXGaVV7B_3wBcaYVRNH4ydptbEQhrP9-mY,3414
-datarobot_genai/drmcp/core/mcp_instance.py,sha256=wMsP39xqTmNBYqd49olEQb5UHTSsxj6BOIoIElorRB0,19235
+datarobot_genai/drmcp/core/mcp_instance.py,sha256=9hw5GrAltYxlOoc-l6S0Eb9ppJVhqx-RvD7OAkdgHjc,19368
 datarobot_genai/drmcp/core/mcp_server_tools.py,sha256=odNZKozfx0VV38SLZHw9lY0C0JM_JnRI06W3BBXnyE4,4278
-datarobot_genai/drmcp/core/routes.py,sha256=nrgzYkiWWcwSy0BUJ-k5AuXdUHNrnGRudCo4AhtYvlY,17856
+datarobot_genai/drmcp/core/routes.py,sha256=dqE2M0UzAyyN9vQjlyTjYW4rpju3LT039po5weuO__I,17936
 datarobot_genai/drmcp/core/routes_utils.py,sha256=vSseXWlplMSnRgoJgtP_rHxWSAVYcx_tpTv4lyTpQoc,944
 datarobot_genai/drmcp/core/server_life_cycle.py,sha256=WKGJWGxalvqxupzJ2y67Kklc_9PgpZT0uyjlv_sr5wc,3419
 datarobot_genai/drmcp/core/telemetry.py,sha256=NEkSTC1w6uQgtukLHI-sWvR4EMgInysgATcvfQ5CplM,15378
@@ -45,8 +45,8 @@ datarobot_genai/drmcp/core/tool_filter.py,sha256=tLOcG50QBvS48cOVHM6OqoODYiiS6Ke
 datarobot_genai/drmcp/core/utils.py,sha256=dSjrayWVcnC5GxQcvOIOSHaoEymPIVtG_s2ZBMlmSOw,4336
 datarobot_genai/drmcp/core/dynamic_prompts/__init__.py,sha256=y4yapzp3KnFMzSR6HlNDS4uSuyNT7I1iPBvaCLsS0sU,577
 datarobot_genai/drmcp/core/dynamic_prompts/controllers.py,sha256=AGJlKqgHRO0Kd7Gl-Ulw9KYBgzjTTFXWBvOUF-SuKUI,5454
-datarobot_genai/drmcp/core/dynamic_prompts/dr_lib.py,sha256=IEdD2Gqm4SfUdiXJB99RiWxkN6frGaxJ2SfATetMM3c,4243
-datarobot_genai/drmcp/core/dynamic_prompts/register.py,sha256=5AEh1m8GX-gPZHUdiE1VATt7IKJQk-eThcxh01sWn0I,7204
+datarobot_genai/drmcp/core/dynamic_prompts/dr_lib.py,sha256=4j33AKmq7kQX_EE2_RWAbP8-K5KPVEvpUginTWn_MHs,2701
+datarobot_genai/drmcp/core/dynamic_prompts/register.py,sha256=2c-vBaTfu3mq_8tSFfDAzG5hG06uS9CghIC1sJxHRNw,7173
 datarobot_genai/drmcp/core/dynamic_prompts/utils.py,sha256=BZ3792AgfvYlwL0_J0MzQfGecyEA5_OKUMynEZYzCds,1136
 datarobot_genai/drmcp/core/dynamic_tools/__init__.py,sha256=0kq9vMkF7EBsS6lkEdiLibmUrghTQqosHbZ5k-V9a5g,578
 datarobot_genai/drmcp/core/dynamic_tools/register.py,sha256=3M5-F0mhUYTZJWmFDmqzsj3QAd7ut7b0kPv-JZyaTzg,9204
@@ -67,7 +67,7 @@ datarobot_genai/drmcp/core/memory_management/manager.py,sha256=gmc_SQs12YQFMWl2U
 datarobot_genai/drmcp/core/memory_management/memory_tools.py,sha256=AxzpwOlldmhhDfKZcAxaGs7Xih2SCe0XbQuXX5nQczI,6397
 datarobot_genai/drmcp/test_utils/__init__.py,sha256=y4yapzp3KnFMzSR6HlNDS4uSuyNT7I1iPBvaCLsS0sU,577
 datarobot_genai/drmcp/test_utils/integration_mcp_server.py,sha256=MdoR7r3m9uT7crodyhY69yhkrM7Thpe__BBD9lB_2oA,3328
-datarobot_genai/drmcp/test_utils/mcp_utils_ete.py,sha256=rvLOePXF9epIEksJzTOqdL9-fGn21bRLbK3yzpvi-6E,3430
+datarobot_genai/drmcp/test_utils/mcp_utils_ete.py,sha256=rgZkPF26YCHX2FGppWE4v22l_NQ3kLSPSUimO0tD4nM,4402
 datarobot_genai/drmcp/test_utils/mcp_utils_integration.py,sha256=0sU29Khal0CelnHBDInyTRiuPKrFFbTbIomOoUbyMhs,3271
 datarobot_genai/drmcp/test_utils/openai_llm_mcp_client.py,sha256=Va3_5c2ToZyfIsEjK2ef5d3z-FA5SE51voikvjKPt8Q,8837
 datarobot_genai/drmcp/test_utils/tool_base_ete.py,sha256=-mKHBkGkyOKQCVS2LHFhSnRofIqJBbeAPRkwizBDtTg,6104
@@ -93,9 +93,9 @@ datarobot_genai/nat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 datarobot_genai/nat/agent.py,sha256=siBLDWAff2-JwZ8Q3iNpM_e4_IoSwG9IvY0hyEjNenw,10292
 datarobot_genai/nat/datarobot_llm_clients.py,sha256=STzAZ4OF8U-Y_cUTywxmKBGVotwsnbGP6vTojnu6q0g,9921
 datarobot_genai/nat/datarobot_llm_providers.py,sha256=aDoQcTeGI-odqydPXEX9OGGNFbzAtpqzTvHHEkmJuEQ,4963
-datarobot_genai-0.2.0.dist-info/METADATA,sha256=Qfh60pUsGehZwD7PkQNDLxItoJIkH12bZBZx95F_Ujw,5941
-datarobot_genai-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-datarobot_genai-0.2.0.dist-info/entry_points.txt,sha256=CZhmZcSyt_RBltgLN_b9xasJD6J5SaDc_z7K0wuOY9Y,150
-datarobot_genai-0.2.0.dist-info/licenses/AUTHORS,sha256=isJGUXdjq1U7XZ_B_9AH8Qf0u4eX0XyQifJZ_Sxm4sA,80
-datarobot_genai-0.2.0.dist-info/licenses/LICENSE,sha256=U2_VkLIktQoa60Nf6Tbt7E4RMlfhFSjWjcJJfVC-YCE,11341
-datarobot_genai-0.2.0.dist-info/RECORD,,
+datarobot_genai-0.2.1.dist-info/METADATA,sha256=iucgLchfePrXrkSZslI9AAxEwQjYxvDpeSnG-_ZtyrQ,5942
+datarobot_genai-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+datarobot_genai-0.2.1.dist-info/entry_points.txt,sha256=CZhmZcSyt_RBltgLN_b9xasJD6J5SaDc_z7K0wuOY9Y,150
+datarobot_genai-0.2.1.dist-info/licenses/AUTHORS,sha256=isJGUXdjq1U7XZ_B_9AH8Qf0u4eX0XyQifJZ_Sxm4sA,80
+datarobot_genai-0.2.1.dist-info/licenses/LICENSE,sha256=U2_VkLIktQoa60Nf6Tbt7E4RMlfhFSjWjcJJfVC-YCE,11341
+datarobot_genai-0.2.1.dist-info/RECORD,,