pyegeria 5.4.0.20__py3-none-any.whl → 5.4.0.23__py3-none-any.whl

pyegeria/collection_manager_omvs.py

@@ -16,7 +16,7 @@ from pyegeria._client import Client
 from pyegeria._globals import NO_ELEMENTS_FOUND, NO_GUID_RETURNED, NO_MEMBERS_FOUND
 from pyegeria._validators import validate_guid, validate_search_string
 from pyegeria.output_formatter import (generate_output,
-                                       _extract_referenceable_properties)
+                                       _extract_referenceable_properties, get_required_relationships)
 from pyegeria.utils import body_slimmer, dynamic_catch
 
 
@@ -6431,34 +6431,63 @@ class CollectionManager(Client2):
         return resp
 
 
-    def _extract_collection_properties(self, element: dict) -> dict:
+    def _extract_collection_properties(self, element: dict, columns_struct: dict) -> dict:
         """
-        Extract common properties from a collection element.
+        Extract common properties from a collection element and populate into the provided columns_struct.
 
         Args:
             element (dict): The collection element
+            columns_struct (dict): The columns structure to populate
 
         Returns:
-            dict: Dictionary of extracted properties
+            dict: columns_struct with column 'value' fields populated
         """
-
-        props = _extract_referenceable_properties(element)
-        classification_names = ""
-        # classifications = element['elementHeader'].get("classifications", [])
-        for classification in props['classifications']:
-            classification_names += f"{classification['classificationName']}, "
-        props["classifications"] = classification_names[:-2]  # why?
-
-        props['mermaid'] = element.get('mermaidGraph', "") or ""
-
+        col_data = columns_struct
+        # Populate display/qualified/description etc. from properties via output formatter util not available here,
+        # so we do minimal direct mapping for OMVS variant.
+        props = element.get('properties', {}) or {}
+        columns_list = col_data.get('formats', {}).get('columns', [])
+        
+        # Header props
+        header_props = _extract_referenceable_properties(element)
+        for column in columns_list:
+            key = column.get('key')
+            # from element.properties (camelCase); keys here are snake_case or GUID
+            if isinstance(key, str):
+                if key.lower() == 'guid':
+                    column['value'] = header_props.get('GUID')
+                elif key in header_props:
+                    column['value'] = header_props.get(key)
+                else:
+                    # simple camelCase mapping inline to reduce imports here
+                    snake_parts = key.split('_')
+                    camel = snake_parts[0] + ''.join([p.capitalize() if p.lower() != 'guid' else 'GUID' for p in snake_parts[1:]])
+                    if camel in props:
+                        column['value'] = props.get(camel)
+        
+        # Mermaid graph
+        for column in columns_list:
+            if column.get('key') == 'mermaid':
+                column['value'] = element.get('mermaidGraph', '') or ''
+                break
+        
+        # Members list (uses API call)
         member_names = ""
-        members = self.get_member_list(collection_guid=props["GUID"])
+        members = self.get_member_list(collection_guid=header_props.get('GUID'))
         if isinstance(members, list):
             for member in members:
                 member_names += f"{member['qualifiedName']}, "
-            props['members'] = member_names[:-2]
-        logger.trace(f"Extracted properties: {props}")
-        return props
+            member_names = member_names[:-2]
+        for column in columns_list:
+            if column.get('key') == 'members':
+                column['value'] = member_names
+                break
+        
+        # Populate any additional requested relationship-based columns generically
+        col_data = get_required_relationships(element, col_data)
+        
+        logger.trace(f"Extracted/Populated columns: {col_data}")
+        return col_data
 
 
     def _generate_collection_output(self, elements: dict|list[dict], filter: Optional[str],
@@ -6487,7 +6516,7 @@ class CollectionManager(Client2):
                 output_formats = select_output_format_set(output_format_set, output_format)
             if isinstance(output_format_set, dict):
                 output_formats = get_output_format_type_match(output_format_set, output_format)
-        # If no output_format was set, then use the classification_name to lookup the output format
+        # If no output_format was set, then use the collection_type to lookup the output format
         elif classification_name:
             output_formats = select_output_format_set(classification_name, output_format)
         else:

pyegeria/egeria_cat_client.py

@@ -8,7 +8,7 @@ AssetCatalog, CollectionManager, GlossaryManager, and ProjectManager.
 """
 from pyegeria.egeria_my_client import EgeriaMy
 from pyegeria.asset_catalog_omvs import AssetCatalog
-from pyegeria.collection_manager_omvs import CollectionManager
+from pyegeria.collection_manager import CollectionManager
 from pyegeria.glossary_manager_omvs import GlossaryManager
 from pyegeria.project_manager_omvs import ProjectManager
 

pyegeria/egeria_client.py

@@ -15,6 +15,7 @@ for all use cases..using the more role based clients is often appropriate:
 from pyegeria.asset_catalog_omvs import AssetCatalog
 from pyegeria.collection_manager_omvs import CollectionManager
 from pyegeria.glossary_manager_omvs import GlossaryManager
+from pyegeria.governance_officer import GovernanceOfficer
 from pyegeria.project_manager_omvs import ProjectManager
 from pyegeria.automated_curation_omvs import AutomatedCuration
 from pyegeria.classification_manager_omvs import ClassificationManager
@@ -30,6 +31,7 @@ from pyegeria.registered_info import RegisteredInfo
 from pyegeria.valid_metadata_omvs import ValidMetadataManager
 from pyegeria.egeria_config_client import EgeriaConfig
 from pyegeria.data_designer_omvs import DataDesigner
+from pyegeria.governance_officer import GovernanceOfficer
 # from pyegeria.md_processing_utils import render_markdown
 
 
@@ -55,6 +57,7 @@ class Egeria(
     SolutionArchitect,
     EgeriaConfig,
     DataDesigner,
+    GovernanceOfficer
 ):
     """
     Client to issue Runtime status requests.
@@ -129,4 +132,7 @@ class Egeria(
         DataDesigner.__init__(
             self, view_server, platform_url, user_id, user_pwd, token
             )
+        GovernanceOfficer.__init__(
+            self, view_server, platform_url, user_id, user_pwd, token
+            )
 print(Egeria.mro())

pyegeria/egeria_tech_client.py

@@ -15,7 +15,8 @@ from pyegeria.runtime_manager_omvs import RuntimeManager
 from pyegeria.solution_architect_omvs import SolutionArchitect
 from pyegeria.template_manager_omvs import TemplateManager
 from pyegeria.valid_metadata_omvs import ValidMetadataManager
-from pyegeria.governance_officer_omvs import GovernanceOfficer
+from pyegeria.governance_officer import GovernanceOfficer
+from pyegeria.collection_manager import CollectionManager
 
 
 class EgeriaTech(
@@ -31,6 +32,7 @@ class EgeriaTech(
     DataDesigner,
     TemplateManager,
     GovernanceOfficer,
+    CollectionManager
 ):
     """
     Client for technical Egeria users.
@@ -94,6 +96,9 @@ class EgeriaTech(
         GovernanceOfficer.__init__(
             self, view_server, platform_url, user_id, user_pwd, token
             )
+        CollectionManager.__init__(
+            self, view_server, platform_url, user_id, user_pwd, token
+            )
 
 if __name__ == "__main__":
     print("Main-Tech Client")