pyegeria 5.4.7.6__tar.gz → 5.4.7.7__tar.gz

{pyegeria-5.4.7.6/pyegeria.egg-info → pyegeria-5.4.7.7}/PKG-INFO

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

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/md_processing/md_commands/ext_ref_commands.py

@@ -100,13 +100,15 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
             prop_body["copyright"] = attributes.get('Copyright', {}).get('value', None)
             prop_body["attribution"] = attributes.get('Attribution', {}).get('value', None)
 
-            if object_type == "RelatedMedia":
+            if object_type in ["RelatedMedia", "Related Media"]:
+                object_type = "RelatedMedia"
                 prop_body["class"]  = "RelatedProperties"
                 prop_body["mediaType"]  = attributes.get('Media Type', {}).get('value', None)
                 prop_body["mediaTypeOtherId"] = attributes.get('Media Type Other ID', {}).get('value', None)
                 prop_body["defaultMediaUsage"]= attributes.get('Default Media Usage', {}).get('value', None)
                 prop_body["defaultMediaUsageOtherId"] = attributes.get('Default Media Usage Other ID', {}).get('value', None)
-            elif object_type == "CitedDocument":
+            elif object_type in ["CitedDocument", "Cited Document"]:
+                object_type = "CitedDocument"
                 prop_body["class"]  = "CitedDocumentProperties"
                 prop_body["numberOfPages"]  = attributes.get('Number of Pages', {}).get('value', None)
                 prop_body["pageRange"] = attributes.get('Page Range', {}).get('value', None)
@@ -119,7 +121,8 @@ def process_external_reference_upsert_command(egeria_client: EgeriaTech, txt: st
                 prop_body["publicationCity"] = attributes.get('Publication City', {}).get('value', None)
                 prop_body["publicationYear"] = attributes.get('Publication Year', {}).get('value', None)
                 prop_body["publicationNumbers"]= attributes.get('Publication Numbers', {}).get('value', None)
-
+            elif object_type in ["ExternalReference", "External Reference"]:
+                object_type = "ExternalReference"
 
 
             if object_action == "Update":

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/_client_new.py

@@ -1565,7 +1565,7 @@ class Client2:
         json_body = validated_body.model_dump_json(indent=2, exclude_none=True)
 
         response = await self._async_make_request("POST", url, json_body)
-        elements = response.json().get("element", NO_ELEMENTS_FOUND)
+        elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is str:
             logger.info(NO_ELEMENTS_FOUND)
             return NO_ELEMENTS_FOUND

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/_output_formats.py

@@ -298,6 +298,26 @@ base_output_format_sets = FormatSetDict({
             )
         ],
     ),
+    "TechTypeDetail": FormatSet(
+        target_type="TechTypeDetail",
+        heading="Technology Type Details",
+        description="Details of a Technology Type Valid Value.",
+        annotations={},  # No specific annotations
+        formats=[
+            Format(
+                types=["ALL"],
+                columns= [
+                    Column(name='Display Name', key='display_name'),
+                    Column(name="Qualified Name", key='qualified_name'),
+                    Column(name="GUID", key='guid'),
+                    Column(name="Description", key='description'),
+                    Column(name="Catalog Template Placeholders", key='catalog_template_specs'),
+                    Column(name="Reference URL", key='ref_url'),
+                ],
+            )
+        ],
+    ),
+
     "ExternalReference": FormatSet(
         target_type="External Reference",
         heading="External Reference Attributes",

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/automated_curation.py

@@ -75,44 +75,35 @@ class AutomatedCuration(Client2):
         Extract properties from a technology type element and populate the provided columns_struct.
         Tolerant to missing fields.
         """
-        # Populate direct properties first
-        col_data = populate_columns_from_properties(element, columns_struct)
-        columns_list = col_data.get("formats", {}).get("columns", [])
-
-        # Referenceable header extraction (GUID, qualifiedName, displayName, etc.)
-        header_props = _extract_referenceable_properties(element)
-        for column in columns_list:
-            key = column.get("key")
-            if key in header_props:
-                column["value"] = header_props.get(key)
-            elif isinstance(key, str) and key.lower() == "guid":
-                column["value"] = header_props.get("GUID")
+        # # Populate direct properties first
+        # col_data = populate_columns_from_properties(element, columns_struct)
+        # columns_list = col_data.get("formats", {}).get("columns", [])
+        #
+        # # Referenceable header extraction (GUID, qualifiedName, displayName, etc.)
+        # header_props = _extract_referenceable_properties(element)
+        # for column in columns_list:
+        #     key = column.get("key")
+        #     if key in header_props:
+        #         column["value"] = header_props.get(key)
+        #     elif isinstance(key, str) and key.lower() == "guid":
+        #         column["value"] = header_props.get("GUID")
+        #
+        # # Try common category/type fields
+        # category = (
+        #     element.get("properties", {}).get("category")
+        #     or element.get("elementProperties", {}).get("category")
+        #     or element.get("elementType", {}).get("typeName")
+        #     or ""
+        # )
+        columns_list = columns_struct.get("formats", {}).get("columns", [])
+
+        guid = element.get('technologyTypeGUID',None)
+        qualified_name = element.get('qualifiedName',None)
+        display_name = element.get('displayName',None)
+        description = element.get('description',None)
+        catalog_templates = element.get('catalogTemplates',None)
+        external_references = element.get('externalReferences',None)
 
-        # Try common category/type fields
-        category = (
-            element.get("properties", {}).get("category")
-            or element.get("elementProperties", {}).get("category")
-            or element.get("elementType", {}).get("typeName")
-            or ""
-        )
-        for column in columns_list:
-            if column.get("key") in ("category", "type_name"):
-                column["value"] = category
-
-        # Classification names if present
-        class_names = []
-        for c in (element.get("elementHeader", {}).get("classifications") or []):
-            name = c.get("classificationName")
-            if name:
-                class_names.append(name)
-        if class_names:
-            for column in columns_list:
-                if column.get("key") == "classifications":
-                    column["value"] = ", ".join(class_names)
-                    break
-
-        # Relationship-driven fields (generic handling)
-        col_data = get_required_relationships(element, col_data)
 
         # Mermaid graph support if present
         mermaid_val = element.get("mermaidGraph", "") or ""
@@ -120,8 +111,33 @@ class AutomatedCuration(Client2):
             if column.get("key") == "mermaid":
                 column["value"] = mermaid_val
                 break
-
-        return col_data
+            elif column.get("key") == "catalog_template_specs":
+                specs = ""
+                for template in catalog_templates:
+                    for placeholder in template['specification']['placeholderProperty']:
+                        specs += (f"* Placeholder Property: {placeholder['placeholderPropertyName']}\n\t"
+                                  f"Type: {placeholder.get('dataType',"")}\n\t"
+                                  f"Description:  {placeholder.get('description',"")}\n\t"
+                                  f"Required: {placeholder.get("required","")}\n\t"
+                                  f"Example: {placeholder.get("example","")}\n\n")
+                column["value"] = specs
+            elif column.get("key") == "catalog_templates":
+                column["value"] =catalog_templates
+            elif column.get("key") == "guid":
+                column["value"] = guid
+            elif column.get("key") == "qualified_name":
+                column["value"] = qualified_name
+            elif column.get("key") == "display_name":
+                column["value"] = display_name
+            elif column.get("key") == "description":
+                column["value"] = description
+            elif column.get("key") == "external_references":
+                column["value"] = external_references
+            elif column.get("key") == "ref_url":
+                column["value"] = external_references[0]['relatedElement']['properties'].get('url',"")
+
+        columns_struct["formats"]["columns"] = columns_list
+        return columns_struct
 
     def _generate_tech_type_output(
         self,
@@ -3306,7 +3322,7 @@ class AutomatedCuration(Client2):
         )
         return response
 
-    async def _async_get_technology_type_detail(self, type_name: str, template_only: bool = False,
+    async def _async_get_technology_type_detail(self, type_name: str,
                                                 body: dict | FilterRequestBody = None,
                                                 output_format: str = "JSON",
                                                 output_format_set: str | dict = "TechType") -> list | str:
@@ -3316,13 +3332,9 @@ class AutomatedCuration(Client2):
         ----------
         type_name : str
             The name of the technology type to retrieve detailed information for.
-        template_only : bool
-            If true, only the template information will be returned.
         body: dict | FilterRequestBody
             If provided, the information in the body supersedes the other parameters and allows more advanced requests.
 
-
-
         Returns
         -------
         list[dict] | str
@@ -3356,27 +3368,24 @@ class AutomatedCuration(Client2):
         # validate_name(type_name)
         url = str(HttpUrl(f"{self.curation_command_root}/technology-types/by-name"))
         if body is None:
-            classified_elements = ["Template"] if template_only else []
             body = {
                 "class": "FilterRequestBody",
-                "filter": type_name,
-                "includeOnlyClassifiedElements": classified_elements,
+                "filter": type_name
             }
-        response = await self._async_get_name_request(
-            url,
-            _type=self.TECH_TYPE_ENTITY_LABEL,
-            _gen_output=self._generate_tech_type_output,
-            filter_string=type_name,
-            classification_names=classified_elements if template_only else None,
-            start_from=0,
-            page_size=0,
-            output_format=output_format,
-            output_format_set=output_format_set,
-            body=body,
-        )
-        return response
 
-    def get_technology_type_detail(self, type_name: str, template_only: bool = False,
+        response = await self._async_make_request("POST", url, body)
+        element = response.json().get("element", NO_ELEMENTS_FOUND)
+        if type(element) is str:
+            logger.info(NO_ELEMENTS_FOUND)
+            return NO_ELEMENTS_FOUND
+
+        if output_format != 'JSON':  # return a simplified markdown representation
+            logger.info(f"Found elements, output format: {output_format} and output_format_set: {output_format_set}")
+            return self._generate_tech_type_output(element, type_name, "ValidMetadataValue",
+                               output_format, output_format_set)
+        return element
+
+    def get_technology_type_detail(self, type_name: str,
                                    body: dict | FilterRequestBody = None,
                                    output_format: str = "JSON",
                                    output_format_set: str | dict = "TechType") -> list | str:
@@ -3386,13 +3395,9 @@ class AutomatedCuration(Client2):
              ----------
              type_name : str
                  The name of the technology type to retrieve detailed information for.
-             template_only : bool
-                 If true, only the template information will be returned.
              body: dict | FilterRequestBody
                  If provided, the information in the body supersedes the other parameters and allows more advanced requests.
 
-
-
              Returns
              -------
              list[dict] | str
@@ -3425,7 +3430,7 @@ class AutomatedCuration(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_technology_type_detail(type_name, template_only=template_only, body=body,
+            self._async_get_technology_type_detail(type_name, body=body,
                                                    output_format=output_format,
                                                    output_format_set=output_format_set)
         )

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/collection_manager.py

@@ -209,7 +209,7 @@ class CollectionManager(Client2):
 
         url = (f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/collection-manager/"
                f"metadata-elements/{parent_guid}/collections")
-        return await self._async_get_name_request(url, body, output_format, output_format_set)
+
         response = await self._async_make_request("POST", url, body_slimmer(body))
         elements = response.json().get("elements", NO_ELEMENTS_FOUND)
         if type(elements) is str:

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/external_references.py

@@ -1403,7 +1403,7 @@ class ExternalReferences(Client2):
               The principle specified by the user_id does not have authorization for the requested action
         """
         url = str(HttpUrl(f"{self.command_root}/external-references/by-name"))
-        response = await self._async_get_name_request(url, _type="Collection",
+        response = await self._async_get_name_request(url, _type="ExternalReference",
                                                       _gen_output=self._generate_external_reference_output,
                                                       filter_string=filter_string,
                                                       classification_names=classification_names,

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/mermaid_utilities.py

@@ -46,7 +46,7 @@ def load_mermaid():
     <script>
         document.addEventListener('DOMContentLoaded', function() {
             mermaid.initialize({startOnLoad: true},
-            {maxTextSize: 300000});
+            {maxTextSize: 300000}, {securityLevel: 'loose'});
         });
     </script>
 

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyegeria/output_formatter.py

@@ -23,7 +23,9 @@ Console = Console(width=settings.Environment.console_width)
 
 def _extract_referenceable_properties(element: dict[str, Any]) -> dict[str, Any]:
     # Get general header attributes
-    guid = element['elementHeader'].get("guid", None)
+    guid = element.get('elementHeader', {}).get("guid", None)
+    if guid is None:
+        return {}
     metadata_collection_id = element['elementHeader']['origin'].get("homeMetadataCollectionId", None)
     metadata_collection_name = element['elementHeader']['origin'].get("homeMetadataCollectionName", None)
     origin_category = element['elementHeader'].get("origin_category", None)

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7/pyegeria.egg-info}/PKG-INFO

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

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/pyproject.toml

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

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/tests/test_automated_curation_omvs.py

@@ -34,7 +34,7 @@ from pyegeria._exceptions import (
 # from pyegeria.admin_services import FullServerConfig
 
 disable_ssl_warnings = True
-console = Console()
+console = Console(width=200)
 
 
 class TestAutomatedCuration:
@@ -807,7 +807,17 @@ class TestAutomatedCuration:
 
             start_time = time.perf_counter()
             # response = a_client.get_technology_type_detail("CSV Data File", True)
-            response = a_client.get_technology_type_detail("File System", True)
+            response = a_client.get_technology_type_detail("File System", output_format="DICT",
+                                                           output_format_set="TechTypeDetail")
+            duration = time.perf_counter() - start_time
+            print(f"\n\tDuration was {duration} seconds")
+            if type(response) is list:
+                out = "\n\n" + json.dumps(response, indent=4)
+                count = len(response)
+                console.log(f"Found {count} elements")
+                print_json(out)
+            elif type(response) is str:
+                console.log("\n\n" + response)
 
             duration = time.perf_counter() - start_time
             print(f"\n\tDuration was {duration} seconds")

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/tests/test_external_references.py

@@ -145,10 +145,10 @@ class TestExternalReferences:
             )
             token = p_client.create_egeria_bearer_token(self.good_user_2, "secret")
             start_time = time.perf_counter()
-            search_string = "ERA"
+            search_string = "Data-Prep"
 
             response = p_client.find_external_references(
-                search_string, output_format="DICT", output_format_set="External-Reference"
+                search_string, metadata_element_types=["ExternalReference", "CitedDocument"],output_format="DICT", output_format_set="Regerenceable"
             )
             duration = time.perf_counter() - start_time
 
@@ -180,8 +180,8 @@ class TestExternalReferences:
             token = p_client.create_egeria_bearer_token(self.good_user_2, "secret")
             start_time = time.perf_counter()
             # project_name = "Teddy Bear Drop Foot Clinical Trial IT Setup"
-            project_name = "Second Task"
-            response = p_client.get_external_references_by_name(project_name)
+            ref_name = "ExtRef::Milvus---Web-Site"
+            response = p_client.get_external_references_by_name(ref_name)
             duration = time.perf_counter() - start_time
 
             print(f"\n\tDuration was {duration} seconds")
@@ -249,9 +249,9 @@ class TestExternalReferences:
             )
             token = p_client.create_egeria_bearer_token(self.good_user_2, "secret")
             start_time = time.perf_counter()
-            ref_guid = "8269a34d-fc7b-44c5-b111-b156f2e48bc2"
+            ref_guid = 'c85c1f5e-f7fb-4a2c-82ee-4bc90534fcbd'
 
-            response = p_client.get_external_reference_by_guid(ref_guid, output_format="DICT", output_format_set="External-Reference-DrE")
+            response = p_client.get_external_reference_by_guid(ref_guid, element_type="Cited Document", output_format="DICT", output_format_set="External-Reference-DrE")
             duration = time.perf_counter() - start_time
             duration = time.perf_counter() - start_time
 
@@ -496,7 +496,7 @@ class TestExternalReferences:
     #     finally:
     #         p_client.close_session()
 
-    def test_delete_project(self):
+    def test_delete_ext_ref(self):
         try:
             p_client = ExternalReferences(
                 self.good_view_server_2,
@@ -506,13 +506,13 @@ class TestExternalReferences:
 
             token = p_client.create_egeria_bearer_token(self.good_user_2, "secret")
             start_time = time.perf_counter()
-            project_guid = "90213557-be19-421c-990d-78a76c30e0f5"
+            ext_ref_guid = 'c85c1f5e-f7fb-4a2c-82ee-4bc90534fcbd'
 
-            response = p_client.delete_project(project_guid)
+            response = p_client.delete_external_reference(ext_ref_guid)
             duration = time.perf_counter() - start_time
             # resp_str = json.loads(response)
             print(f"\n\tDuration was {duration} seconds\n")
-            print(f"Project GUID: {project_guid} was deleted")
+            print(f"Project GUID: {ext_ref_guid} was deleted")
             assert True
 
         except (

{pyegeria-5.4.7.6 → pyegeria-5.4.7.7}/tests/test_solution_architect_omvs.py

@@ -1336,7 +1336,7 @@ class TestSolutionArchitect:
 
             s_client.create_egeria_bearer_token()
             start_time = time.perf_counter()
-            response = s_client.find_solution_components(filter, output_format='DICT')
+            response = s_client.find_solution_components(filter, output_format='MERMAID')
             duration = time.perf_counter() - start_time
             print(
                 f"\n\tDuration was {duration:.2f} seconds, Type: {type(response)}, Element count is {len(response)}"