pyegeria 5.4.7__py3-none-any.whl → 5.4.7.1__py3-none-any.whl

pyegeria/format_set_executor.py

@@ -13,7 +13,9 @@ Notes
 """
 from __future__ import annotations
 
+import asyncio
 import json
+import sys
 from typing import Any, Dict, Optional
 
 from loguru import logger
@@ -52,6 +54,139 @@ def _resolve_client_and_method(func_decl: str):
     return (client_class, method_name)
 
 
+
+async def safe_call_tool(func, **call_params):
+    """
+    Safely calls a function, awaiting it only if it is an asynchronous coroutine.
+    """
+    try:
+        if asyncio.iscoroutinefunction(func):
+            # If it's an async function, call it with await
+            print("DEBUG: Function is async, using await.", file=sys.stderr)
+            result = await func(**call_params)
+        else:
+            # If it's a synchronous function, call it directly
+            print("DEBUG: Function is sync, calling directly.", file=sys.stderr)
+            result = func(**call_params)
+
+        return result
+
+    except Exception as e:
+        print(f"ERROR calling function: {e}", file=sys.stderr)
+        raise
+
+
+
+async def _async_run_report(
+    report_name: str,
+    egeria_client: EgeriaTech,
+    output_format: str = "DICT",
+    params: Optional[Dict[str, Any]] = None,
+) -> Dict[str, Any]:
+    """
+        Execute the action for a given format set and return a normalized result structure.
+
+        Returns shapes:
+        - {"kind":"empty"}
+        - {"kind":"json","data": <list|dict|any>}
+        - {"kind":"text","mime": "text/markdown"|"text/html","content": str}
+        - {"kind":"unknown","raw": any}
+        """
+    params = dict(params or {})
+
+    # Resolve the format set and action
+    fmt = select_output_format_set(report_name, output_format)
+    if not fmt:
+        raise ValueError(
+            f"Output format set '{report_name}' does not have a compatible '{output_format}' format."
+        )
+    if "action" not in fmt:
+        raise ValueError(f"Output format set '{report_name}' does not have an action property.")
+
+    action = fmt["action"]
+    func_decl = action.get("function")
+    if isinstance(func_decl, str) and "." in func_decl:
+        class_name, method_name = func_decl.split(".")
+
+    if not method_name.startswith("_async_"):
+        method_name = "_async_" + method_name
+        func_decl = class_name + "." + method_name
+
+    required_params = action.get("required_params", action.get("user_params", [])) or []
+    optional_params = action.get("optional_params", []) or []
+    spec_params = action.get("spec_params", {}) or {}
+    print(f"func_decl={func_decl}", file=sys.stderr)
+    # Build call params: required/optional provided by caller + fixed spec_params
+    call_params: Dict[str, Any] = {}
+
+    # Populate required and optional params when provided
+    for p in required_params:
+        if p in params and params[p] is not None:
+            call_params[p] = params[p]
+        elif p not in spec_params:
+            # Missing required param
+            logger.warning(f"Required parameter '{p}' not provided for format set '{report_name}'.")
+    for p in optional_params:
+        if p in params and params[p] is not None:
+            call_params[p] = params[p]
+
+    # Include fixed specifics
+    call_params.update(spec_params)
+
+    # Always include output_format and output_format_set for downstream rendering
+    call_params["output_format"] = output_format
+    call_params["output_format_set"] = report_name
+
+    client_class, method_name = _resolve_client_and_method(func_decl)
+
+
+    try:
+        egeria_client.create_egeria_bearer_token()
+        func = getattr(egeria_client, method_name) if method_name and hasattr(egeria_client, method_name) else None
+        # Add logging to validate func
+        msg = f"DEBUG: func={func}, method_name={method_name}, client_class={client_class}"
+        logger.debug(msg)
+        print(msg, file=sys.stderr)
+
+        if func is None or not callable(func):
+            raise TypeError(
+                f"Resolved function '{method_name}'  not found in client class '{client_class.__name__}' is not callable."
+            )
+
+        result = await func(**call_params)
+
+        if not result or result == NO_ELEMENTS_FOUND:
+            return {"kind": "empty"}
+
+        # Prepare optional preamble for narrative outputs
+        heading = get_output_format_set_heading(report_name)
+        desc = get_output_format_set_description(report_name)
+        preamble = f"# {heading}\n{desc}\n\n" if heading and desc else ""
+
+        if output_format in {"DICT", "JSON", "ALL"}:
+            # Return raw data (list/dict/any) — do not stringify here
+            return {"kind": "json", "data": result}
+        elif output_format in {"REPORT", "MERMAID"}:
+            content = result
+            if isinstance(result, (list, dict)):
+                # Make a simple JSON code block if the source returned structured data unexpectedly
+                content = preamble + "```json\n" + json.dumps(result, indent=2) + "\n```"
+            else:
+                content = preamble + str(result)
+            return {"kind": "text", "mime": "text/markdown", "content": content}
+        elif output_format == "HTML":
+            content = str(result)
+            return {"kind": "text", "mime": "text/html", "content": content}
+        else:
+            # Unknown or table-like formats which aren't appropriate for MCP by default
+            return {"kind": "unknown", "raw": result}
+
+    except PyegeriaException as e:
+        # Re-raise with a simpler message for upstream mapping
+        raise
+
+
+
 def run_format_set_action_return(
     format_set_name: str,
     *,

pyegeria/mcp_adapter.py

@@ -11,9 +11,6 @@ from __future__ import annotations
 
 import json
 import sys
-import asyncio
-
-from loguru import logger
 from typing import Any, Dict, Optional
 
 from loguru import logger
@@ -21,9 +18,9 @@ from loguru import logger
 from pyegeria._output_formats import (
     list_mcp_format_sets,
     select_output_format_set,
-    get_output_format_type_match,
 )
-from pyegeria.format_set_executor import run_format_set_action_return
+from pyegeria.egeria_tech_client import EgeriaTech
+from pyegeria.format_set_executor import run_format_set_action_return, _async_run_report
 
 
 def list_reports() -> dict:
@@ -31,12 +28,12 @@ def list_reports() -> dict:
     return  list_mcp_format_sets()
 
 
-def describe_report(name: str, outputType: str = "DICT") -> Dict[str, Any]:
+def describe_report(name: str, output_type: str = "DICT") -> Dict[str, Any]:
     """
     Describe a format set for MCP discovery. If outputType != ANY, a concrete format
     will be resolved; otherwise only metadata/action are returned.
     """
-    meta = select_output_format_set(name, outputType)
+    meta = select_output_format_set(name, output_type)
     if not meta:
         raise ValueError(f"Unknown or incompatible format set: {name}")
     return meta
@@ -82,6 +79,7 @@ def _execute_egeria_call_blocking(
     # }
 
 
+
 def run_report(
     *,
     report: str,
@@ -98,7 +96,7 @@ def run_report(
     print(f"Format set: {report}\nparams: {json.dumps(params)}\nview_server: {view_server}\nview_url: {view_url}\nuser: {user}\nuser_pass: {user_pass}", file=sys.stderr)
     # Lazy import of settings to avoid circulars when optional args are None
     from pyegeria.config import settings as _settings
-    logger.info(f"Format set: {formatSet}\nparams: {json.dumps(params)}\nview_server: {view_server}\nview_url: {view_url}\nuser: {user}\nuser_pass: {user_pass}")
+    logger.info(f"Format set: {report}\nparams: {json.dumps(params)}\nview_server: {view_server}\nview_url: {view_url}\nuser: {user}\nuser_pass: {user_pass}")
     return run_format_set_action_return(
         format_set_name=report,
         output_format="DICT",
@@ -108,3 +106,19 @@ def run_report(
         user=user if user is not None else _settings.User_Profile.user_name,
         user_pass=user_pass if user_pass is not None else _settings.User_Profile.user_pwd,
     )
+
+async def _async_run_report_tool(
+    *,
+    report: str,
+    egeria_client: EgeriaTech,
+    params: Optional[Dict[str, Any]] = None,
+) -> Dict[str, Any]:
+    """
+    Execute a format set action as an MCP-style tool. Enforces DICT/ALL by default.
+    Caller may pass credentials explicitly; otherwise defaults are used from config.
+    """
+    # Lazy import of settings to avoid circulars when optional args are None
+
+    print(f"Report: {report}\n params: {json.dumps(params)}\n", file=sys.stderr)
+    result = await _async_run_report(report, egeria_client, output_format="DICT", params=params)
+    return result

pyegeria/mcp_server.py

@@ -3,26 +3,28 @@ Copyright Contributors to the ODPi Egeria project.
 
 This module provides a basic MCP server for Egeria.
 """
-import asyncio
 import re
 import sys
-from typing import Any, Dict, Optional, List, Coroutine
+from typing import Any, Dict, Optional
+
+from pyegeria.egeria_tech_client import EgeriaTech
+
+GLOBAL_EGERIA_CLIENT: Optional[EgeriaTech] = None
 
 try:
     # We use Optional[] and List[] types, so we import them.
     from mcp.server.fastmcp import FastMCP
+    from pyegeria.mcp_adapter import (
+        list_reports,
+        describe_report,
+        run_report, _execute_egeria_call_blocking,
+        _async_run_report_tool
+    )
     print("MCP import successful...", file=sys.stderr)
 except ImportError:
     print("MCP import failed.", file=sys.stderr)
     raise
 
-from pyegeria.mcp_adapter import (
-    list_reports,
-    describe_report,
-    run_report, _execute_egeria_call_blocking,
-)
-
-
 def _ok(result: Dict[str, Any] ) -> Dict[str, Any]:
     # Pass-through helper in case you want to normalize or add metadata
     print("OK: Operation completed successfully.", file=sys.stderr)
@@ -31,6 +33,29 @@ def _ok(result: Dict[str, Any] ) -> Dict[str, Any]:
 
 def main() -> None:
     # Initialize the server
+
+    global GLOBAL_EGERIA_CLIENT
+
+    try:
+        """ Runs ONCE when the server starts.
+            Initializes the Egeria client and stores it in the server's state.
+        """
+        print("DEBUG: Initializing Egeria client...", file=sys.stderr)
+        from pyegeria.config import settings as _settings
+
+        GLOBAL_EGERIA_CLIENT = EgeriaTech(
+            _settings.Environment.egeria_view_server,
+            _settings.Environment.egeria_view_server_url,
+            _settings.User_Profile.user_name,
+            _settings.User_Profile.user_pwd
+        )
+        GLOBAL_EGERIA_CLIENT.create_egeria_bearer_token("erinoverview","secret")
+        print("DEBUG: Egeria Client connected", file=sys.stderr)
+
+    except Exception as e:
+        print(f"DEBUG: Exception occurred: {str(e)}", file=sys.stderr)
+        raise
+
     srv = FastMCP(name="pyegeria-mcp")
     print("Starting MCP server...", file=sys.stderr)
 
@@ -53,7 +78,6 @@ def main() -> None:
             print(f"DEBUG: Exception during describe_report: {str(e)}", file=sys.stderr)
             raise
 
-    # run_report tool (formerly run_format_set_action)
     @srv.tool(name="run_report")
     async def run_report_tool(
             report_name: str,
@@ -92,10 +116,13 @@ def main() -> None:
 
         try:
 
-            result = await asyncio.to_thread(
-                _execute_egeria_call_blocking,
-                report = report_name,
-                params = params
+            egeria_client: EgeriaTech = GLOBAL_EGERIA_CLIENT
+            print("DEBUG: Egeria Client connected", file=sys.stderr)
+
+            result = await _async_run_report_tool(
+                report=report_name,
+                egeria_client=egeria_client,
+                params=params
             )
             print("DEBUG: run_report completed successfully", file=sys.stderr)
             return _ok(result)

{pyegeria-5.4.7.dist-info → pyegeria-5.4.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyegeria
-Version: 5.4.7
+Version: 5.4.7.1
 Summary: A python client for Egeria
 Author-email: Dan Wolfson <dan.wolfson@pdr-associates.com>
 License-Expression: Apache-2.0
@@ -18,7 +18,6 @@ Requires-Dist: requests
 Requires-Dist: jupyter
 Requires-Dist: click
 Requires-Dist: trogon
-Requires-Dist: textual
 Requires-Dist: mermaid-py
 Requires-Dist: psycopg2-binary
 Requires-Dist: jupyter-notebook-parser

{pyegeria-5.4.7.dist-info → pyegeria-5.4.7.1.dist-info}/RECORD

@@ -92,13 +92,16 @@ commands/tech/table_tech_templates.py,sha256=jI1c9YKa3KirArMNXeCRKeaiVdwQSN-ztPq
 commands/tech/x_list_related_elements.py,sha256=ynaw792VnbMZ9IXBi5mmG7xBfC0kn0esKiFTsjvLGzc,5900
 md_processing/__init__.py,sha256=B3hBAEI84SsAVFDCSHqoiVnBwSVbuxpeJuX3Jfe5B6U,7327
 md_processing/dr_egeria.py,sha256=T1YRmGAAlamuYZB5dnBdEeyL9oODhYsxy-G4M_DtCak,20672
+md_processing/data/commands-working.json,sha256=uCo_azcuuYqGm7QffJeCGj7PyZuZRGdu7kKf4XWmMoA,1162560
+md_processing/data/commands.json,sha256=_J0WEfekVTBv994aV6rXdnyWy__WvoYdUJOPhSkPY4I,1759456
+md_processing/data/generated_format_sets.json,sha256=TXvGK_Gm5ieq9i6u9M1j4CaNPzoV2m0hisKK2fWCtIM,98502
 md_processing/data/generated_format_sets.py,sha256=2BfRzb5G5n8Cz6VwirQXlBq1fHBISIh4x7jquXg6QEw,36402
 md_processing/md_commands/__init__.py,sha256=ssEojzFlSYtY2bHqqOoKo8PFaANZ_kq_gIbtlXnuc2s,93
 md_processing/md_commands/data_designer_commands.py,sha256=WGCDlTPmGhcETdmus89w6Y8a3EhyQJ86SJURvphnM24,65516
 md_processing/md_commands/ext_ref_commands.py,sha256=c-ZdYkWGMsrAyku9R_IReJzrLhNaNFY6vyyiFEjxNT4,23144
 md_processing/md_commands/glossary_commands.py,sha256=slKnvs6ktdAOZI_EmpVWUB7hrdSngUnitucZu9dR9PE,33411
 md_processing/md_commands/governance_officer_commands.py,sha256=c7SnJqQooPr3zCebDzeztAM8wZq9G7ZB4EpJ-uR5moI,26479
-md_processing/md_commands/product_manager_commands.py,sha256=M63irUyEf52g075U3kzwvm9V1OiqWXp0O68nRNCRWxU,57366
+md_processing/md_commands/product_manager_commands.py,sha256=4YKKdd_2tI5ekZlSJBiJJGqFISD7X6m0rfEd2wEL_PY,57790
 md_processing/md_commands/project_commands.py,sha256=peAoemgzb8bEQghi8nFU6JrZ5Hro90Bl1JDHl7_nAtM,17127
 md_processing/md_commands/solution_architect_commands.py,sha256=4Ghb8j2wlDdWtHoSCrx5jCJFEJfqII4mnFJ_tqduRKI,52569
 md_processing/md_commands/view_commands.py,sha256=bIOSw0GVluOcpZMQNioeO1Srr4Y_84YNz-VHMKpPfVE,12092
@@ -113,7 +116,7 @@ md_processing/md_processing_utils/generate_md_cmd_templates.py,sha256=mFenxe9Jq8
 md_processing/md_processing_utils/generate_md_templates.py,sha256=DMnMQ7_LbmQCS8aG-ppHGTu25obOSn4ZzSg7V21k9jo,3547
 md_processing/md_processing_utils/md_processing_constants.py,sha256=_j8FSsB1mZ2SsmDaQWaPH8iWKy1ZHYYjzOgcdIoLZPE,21108
 md_processing/md_processing_utils/message_constants.py,sha256=UBf18obM83umM6zplR7ychre4xLRbBnTzidHDZ2gNvM,548
-pyegeria/__init__.py,sha256=gQqIohRhPr5LKit1oqCD0_gbtHFsnJF1WxT4QOUybmk,11904
+pyegeria/__init__.py,sha256=hgrGk4lBno1rgKRBKWAcljb2wGSHAKhmtu8vbESwUZM,11955
 pyegeria/_client.py,sha256=hJHn5pD8sbelP_M9dK-M5Z2CYqpRXzXfg1UCgAdQ6dQ,33416
 pyegeria/_client_new.py,sha256=9GQDOlmCxGPcAhKT_kkrLlS0x7nnVhha7VVR0rAlBnQ,69777
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
@@ -139,14 +142,14 @@ pyegeria/egeria_my_client.py,sha256=3dSBUlrivzih75hodNHe-2BM9pGB8AQVLru-_NbhYNE,
 pyegeria/egeria_tech_client.py,sha256=8Apr5YEFL2qgn-QTv9YWTI-23rGI94NiUp4418EiZ4k,4707
 pyegeria/external_references.py,sha256=7CNUlnD7MsWZqdLASYSxqfHAU1EqBzuv8_7INYMJI3A,74755
 pyegeria/feedback_manager_omvs.py,sha256=0xBs0p54vmdfVYYgQ8pOanLC4fxfgTk1Z61Y6D1U7_I,152978
-pyegeria/format_set_executor.py,sha256=z1KJsu4_1WyVJaY5SgXSfsTgxvSW9VMhxbpNVClRonY,6127
+pyegeria/format_set_executor.py,sha256=9r1Ffd1ujvrEyoFQM4w4_wEi7YXeE-mwCanA-8g87ug,11331
 pyegeria/full_omag_server_config.py,sha256=CQqLCy_3DZFvJZEOcGf50HWdFaWpiAIs6z-kKyjvpDA,47464
 pyegeria/glossary_manager.py,sha256=EmCnIPG-W0bUD7MVn2Vopb-cb_TR1J8MMOOFzo38aWk,106786
 pyegeria/governance_officer.py,sha256=OYEewhoe3HBcxTR6kGdKNkwLT4gkQDRGKfFIsVlD5oI,109203
 pyegeria/load_config.py,sha256=XDwPAHB3MvGRuoP8kg1lJJAI4BgMWZ3TYxfxYROgJj4,1188
 pyegeria/logging_configuration.py,sha256=BxTQRN-7OOdk5t1f1xSn8gKU8iT-MfWEgbn6cYWrRsY,7674
-pyegeria/mcp_adapter.py,sha256=90tqUmqKyG47ozFL39KJYn4-OoAvxoADAXniEe47U-w,4401
-pyegeria/mcp_server.py,sha256=BbGF2rMNxD99SKCin7Kdy5Zo_uvBHQRIsljHZ6wGJLs,7159
+pyegeria/mcp_adapter.py,sha256=flkWmRRXOROV6dm6U52rziGZRiB9eZeehzvAC8EwkD4,5010
+pyegeria/mcp_server.py,sha256=UsgpV8Nq09S2nzEGTIVvJizAPUeNdARZjIuLwrTlVOE,8179
 pyegeria/md_processing_helpers.py,sha256=xlQuK5eP_PJqUdy4BScQ97NyBD95jMS3EUg0wK5CsZo,2137
 pyegeria/md_processing_utils.py,sha256=KRESCqAYjCgHRAdhHH49lLDDhaq740CUlqTG0bN-6Oo,99119
 pyegeria/md_processing_utils_orig.py,sha256=SToZtXQiysi2_vmIY4-T2NIELRirzQ1zjkho_2jFsNE,52603
@@ -166,9 +169,9 @@ pyegeria/template_manager_omvs.py,sha256=chBljs1vy5wr9DRAtbvIt4Cob_7HxGfxLkCNlDT
 pyegeria/utils.py,sha256=xOTxk9PH8ZGZmgIwz_a6rczTVLADLEjucr10ZJTUnY4,9272
 pyegeria/valid_metadata_omvs.py,sha256=Xq9DqBQvBFFJzaFIRKcVZ2k4gJvSh9yeXs_j-O3vn1w,65050
 pyegeria/x_action_author_omvs.py,sha256=XyRsUgN-xnWR-cJayzo5RtY4Xv1uBDML4pwaKHrwC1w,6430
-pyegeria-5.4.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.4.7.dist-info/METADATA,sha256=CXS_liB7ALPquBJanIT9bUr_9vFxxhIiCLdH_IeDL_U,5919
-pyegeria-5.4.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyegeria-5.4.7.dist-info/entry_points.txt,sha256=Ig9cZyl-nq_RohLvahgWXzZbcpHzLS3Zdc1A8qvdPG0,6595
-pyegeria-5.4.7.dist-info/top_level.txt,sha256=48Mt-O3p8yO7jiEv6-Y9bUsryqJn9BQsiyV0BqSn8tk,32
-pyegeria-5.4.7.dist-info/RECORD,,
+pyegeria-5.4.7.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.4.7.1.dist-info/METADATA,sha256=4dMoMfdoVgUW_tbqRx18ghTs7EZsTZK91TXBs733dho,5898
+pyegeria-5.4.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyegeria-5.4.7.1.dist-info/entry_points.txt,sha256=Ig9cZyl-nq_RohLvahgWXzZbcpHzLS3Zdc1A8qvdPG0,6595
+pyegeria-5.4.7.1.dist-info/top_level.txt,sha256=48Mt-O3p8yO7jiEv6-Y9bUsryqJn9BQsiyV0BqSn8tk,32
+pyegeria-5.4.7.1.dist-info/RECORD,,