pyegeria 5.4.7.1__tar.gz → 5.4.7.2__tar.gz

{pyegeria-5.4.7.1/pyegeria.egg-info → pyegeria-5.4.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyegeria
-Version: 5.4.7.1
+Version: 5.4.7.2
 Summary: A python client for Egeria
 Author-email: Dan Wolfson <dan.wolfson@pdr-associates.com>
 License-Expression: Apache-2.0

{pyegeria-5.4.7.1 → pyegeria-5.4.7.2}/pyegeria/_output_formats.py

@@ -121,6 +121,7 @@ COMMON_COLUMNS = [
     Column(name='Category', key='category'),
     Column(name='Description', key='description', format=True),
     Column(name='Status', key='status'),
+    Column(name='Type Name', key='type_name')
 ]
 
 
@@ -560,6 +561,29 @@ base_output_format_sets = FormatSetDict({
             spec_params={"metadata_element_types": ["DigitalProductCatalog"]},
         ),
     ),
+"Digital-Product-Catalog-MyE": FormatSet(
+        target_type="DigitalProductCatalog",
+        heading="Catalogs for Digital Products",
+        description="Attributes generic to all Digital Product Catalogs..",
+        aliases=[],
+        annotations={},
+        formats=[
+            Format(
+                types=["DICT", "TABLE", "LIST", "MD", "FORM","REPORT"],
+                columns=COMMON_COLUMNS + [
+                    Column(name="Containing Members", key='collection_members'),
+                    Column(name="Member Of", key='member_of_collections')
+                ]
+            ),
+
+        ],
+        action=ActionParameter(
+            function="CollectionManager.find_collections",
+            required_params=["search_string"],
+            optional_params=OPTIONAL_PARAMS,
+            spec_params={"metadata_element_types": ["DigitalProductCatalog"]},
+        ),
+    ),
 
     "Digital-Products": FormatSet(
         target_type="DigitalProduct",
@@ -617,6 +641,53 @@ base_output_format_sets = FormatSetDict({
             spec_params={},
         )
     ),
+    "Digital-Products-MyE": FormatSet(
+        target_type="DigitalProduct",
+        heading="Digital Product Information",
+        description="Attributes useful to Digital Products.",
+        aliases=[],
+        annotations={},
+        formats=[
+            Format(
+                types=["FORM", "DICT", "TABLE", "LIST", "MD"],
+                columns=COMMON_COLUMNS + [
+                    Column(name="Status", key='status'),
+                    Column(name='Product Name', key='product_name'),
+                    Column(name='Members', key='members', format=True),
+                    Column(name='Product Manager', key='assigned_actors'),
+                ]),
+            Format(
+                types=["REPORT", "HTML"],
+                columns=COMMON_COLUMNS + [
+                    Column(name="Status", key='status'),
+                    Column(name='Product Name', key='product_name'),
+                    Column(name='Identifier', key='identifier'),
+                    Column(name='Maturity', key='maturity'),
+                    Column(name='Service Life', key='service_life'),
+                    Column(name='Next Version', key='next_version'),
+                    Column(name='Withdraw Date', key='withdraw_date'),
+                    Column(name='Members', key='members', format=True),
+                    Column(name='Uses Products', key='uses_digital_products'),
+                    Column(name='Used by Products', key='used_by_digital_products'),
+                    Column(name='Product Manager', key='assigned_actors'),
+                    Column(name='License', key='governed_by'),
+                    Column(name='Solution Blueprint', key='solution_designs'),
+                    Column(name="Mermaid", key="mermaid")
+                ],
+            )
+        ],
+        action=ActionParameter(
+            function="CollectionManager.find_collections",
+            required_params=["search_string"],
+            optional_params=OPTIONAL_PARAMS,
+            spec_params={"metadata_element_types": ["DigitalProduct"]},
+        ),
+        get_additional_props=ActionParameter(
+            function="CollectionManager._extract_digital_product_properties",
+            required_params=[],
+            spec_params={},
+        )
+    ),
 
     "Agreements": FormatSet(
         target_type="Agreement",

{pyegeria-5.4.7.1 → pyegeria-5.4.7.2}/pyegeria/format_set_executor.py

@@ -187,7 +187,7 @@ async def _async_run_report(
 
 
 
-def run_format_set_action_return(
+def exec_format_set(
     format_set_name: str,
     *,
     output_format: str = "DICT",

{pyegeria-5.4.7.1 → pyegeria-5.4.7.2}/pyegeria/mcp_adapter.py

@@ -20,7 +20,7 @@ from pyegeria._output_formats import (
     select_output_format_set,
 )
 from pyegeria.egeria_tech_client import EgeriaTech
-from pyegeria.format_set_executor import run_format_set_action_return, _async_run_report
+from pyegeria.format_set_executor import exec_format_set, _async_run_report
 
 
 def list_reports() -> dict:
@@ -62,7 +62,7 @@ def _execute_egeria_call_blocking(
     from pyegeria.config import settings as _settings
 
 
-    return run_format_set_action_return(
+    return exec_format_set(
         format_set_name=report,
         output_format="DICT",
         params=params or {},
@@ -97,7 +97,7 @@ def run_report(
     # Lazy import of settings to avoid circulars when optional args are None
     from pyegeria.config import settings as _settings
     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(
+    return run_format_set(
         format_set_name=report,
         output_format="DICT",
         params=params or {},

{pyegeria-5.4.7.1 → pyegeria-5.4.7.2/pyegeria.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyegeria
-Version: 5.4.7.1
+Version: 5.4.7.2
 Summary: A python client for Egeria
 Author-email: Dan Wolfson <dan.wolfson@pdr-associates.com>
 License-Expression: Apache-2.0

{pyegeria-5.4.7.1 → pyegeria-5.4.7.2}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = "pyegeria"
-version = "5.4.7.1"
+version = "5.4.7.2"
 license = 'Apache-2.0'
 license-files = ["LICENSE"]
 authors = [{name = "Dan Wolfson", email = "dan.wolfson@pdr-associates.com"},]

{pyegeria-5.4.7.1 → pyegeria-5.4.7.2}/tests/test_mcp_adapter.py

@@ -33,7 +33,7 @@ def test_run_tool_monkeypatched(monkeypatch):
         assert kwargs["output_format"] == "DICT"
         return fake_result
 
-    monkeypatch.setattr(m, "run_format_set_action_return", fake_exec)
+    monkeypatch.setattr(m, "exec_format_set", fake_exec)
 
     out = m.run_mcp_tool(formatSet="Digital-Products", outputFormat="DICT", params={"search_string": "*"})
     assert out == fake_result