pyegeria 5.4.4.6__py3-none-any.whl → 5.4.4.7__py3-none-any.whl

pyegeria/data_designer.py

@@ -280,7 +280,7 @@ class DataDesigner(Client2):
 
         """
         url = f"{self.data_designer_root}/data-structures/from-template"
-        return await self._async_create_element_from_template(url, body)
+        return await self._async_create_elem_from_template(url, body)
 
     @dynamic_catch
     def create_data_structure_from_template(self, body: dict | TemplateRequestBody) -> str:
@@ -1697,7 +1697,7 @@ class DataDesigner(Client2):
 
         url = f"{base_path(self, self.view_server)}/data-fields/from-template"
 
-        return await self._async_create_element_from_template(url, body)
+        return await self._async_create_elem_from_template(url, body)
 
     @dynamic_catch
     def create_data_field_from_template(self, body: dict | TemplateRequestBody) -> str:
@@ -2946,7 +2946,7 @@ class DataDesigner(Client2):
         """
 
         url = f"{base_path(self, self.view_server)}/data-classes/from-template"
-        return await self._async_create_element_from_template(url, body)
+        return await self._async_create_elem_from_template(url, body)
 
     @dynamic_catch
     def create_data_class_from_template(self, body: dict | TemplateRequestBody) -> str:

pyegeria/egeria_client.py

@@ -16,7 +16,7 @@ from pyegeria.asset_catalog_omvs import AssetCatalog
 # from pyegeria.collection_manager import CollectionManager
 from pyegeria.glossary_manager import GlossaryManager
 from pyegeria.project_manager import ProjectManager
-from pyegeria.automated_curation_omvs import AutomatedCuration
+from pyegeria.automated_curation import AutomatedCuration
 from pyegeria.classification_manager_omvs import ClassificationManager
 from pyegeria.template_manager_omvs import TemplateManager
 from pyegeria.runtime_manager_omvs import RuntimeManager

pyegeria/egeria_tech_client.py

@@ -5,7 +5,7 @@ Copyright Contributors to the ODPi Egeria project.
 Runtime manager is a view service that supports user interaction with the running platforms.
 
 """
-from pyegeria.automated_curation_omvs import AutomatedCuration
+from pyegeria.automated_curation import AutomatedCuration
 from pyegeria.classification_manager_omvs import ClassificationManager
 from pyegeria.data_designer import DataDesigner
 from pyegeria.egeria_cat_client import EgeriaCat

pyegeria/mermaid_utilities.py

@@ -21,7 +21,7 @@ nest_asyncio.apply()
 from IPython.display import HTML, display
 from rich.console import Console
 
-from pyegeria.automated_curation_omvs import AutomatedCuration
+from pyegeria.automated_curation import AutomatedCuration
 from pyegeria._exceptions import (
     InvalidParameterException,
     PropertyServerException,

pyegeria/models.py

@@ -323,7 +323,7 @@ class TemplateRequestBody(PyegeriaModel):
     parent_at_end_1: bool | None = True
     template_guid: str
     replacement_properties: dict[str, Any] = {}
-    placeholder_properties: dict[str, Any] = {}
+    placeholder_property_values: dict[str, Any] = {}
     deep_copy: bool | None = False
     effective_from: datetime | None = None
     effective_to: datetime | None = None

pyegeria/output_formatter.py

@@ -908,13 +908,53 @@ def extract_basic_dict(elements: Union[Dict, List[Dict]]) -> Union[Dict, List[Di
         result.append(body)
     return result
 
-def generate_output(elements: Union[Dict, List[Dict]], 
-                   search_string: str,
-                   entity_type: str,
-                   output_format: str,
-                   extract_properties_func: Callable,
-                   get_additional_props_func: Optional[Callable] = None,
-                   columns_struct: dict = None) -> Union[str, list[dict]]:
+def _extract_default_properties(self, element: dict, columns_struct: dict) -> dict:
+    props = element.get('properties', {}) or {}
+    normalized = {
+        'properties': props,
+        'elementHeader': element.get('elementHeader', {}),
+    }
+    # Common population pipeline
+    col_data = populate_common_columns(element, columns_struct)
+    columns_list = col_data.get('formats', {}).get('columns', [])
+
+    return col_data
+
+
+def _generate_default_output(self, elements: dict | list[dict], search_string: str,
+                             element_type_name: str | None,
+                             output_format: str = 'DICT',
+                             output_format_set: dict | str = None) -> str | list[dict]:
+    entity_type = 'Referenceable'
+    if output_format_set:
+        if isinstance(output_format_set, str):
+            output_formats = select_output_format_set(output_format_set, output_format)
+        elif isinstance(output_format_set, dict):
+            output_formats = get_output_format_type_match(output_format_set, output_format)
+        else:
+            output_formats = None
+    else:
+        output_formats = select_output_format_set(entity_type, output_format)
+    if output_formats is None:
+        output_formats = select_output_format_set('Default', output_format)
+    return generate_output(
+        elements=elements,
+        search_string=search_string,
+        entity_type=entity_type,
+        output_format=output_format,
+        extract_properties_func=_extract_default_properties,
+        get_additional_props_func=None,
+        columns_struct=output_formats,
+    )
+
+
+def generate_output(elements: Union[Dict, List[Dict]],
+               search_string: str,
+               entity_type: str,
+               output_format: str,
+               extract_properties_func: Callable,
+               get_additional_props_func: Optional[Callable] = None,
+               columns_struct: dict = None) -> Union[str, list[dict]]:
     """
     Generate output in the specified format for the given elements.
 

pyegeria/project_manager.py

@@ -915,7 +915,7 @@ class ProjectManager(Client2):
         """
 
         url = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/project-manager/projects/from-template"
-        return await self._async_create_element_from_template(url, body)
+        return await self._async_create_elem_from_template(url, body)
 
     @dynamic_catch
     def create_project_from_template(

pyegeria/reference_data.py

@@ -652,7 +652,7 @@ class ReferenceDataManager(Client2):
         """
 
         url = f"{self.ref_data_command_base}/valid-value-definitions/from-template"
-        return await self._async_create_element_from_template(url, body)
+        return await self._async_create_elem_from_template(url, body)
 
     @dynamic_catch
     def create_valid_value_definition_from_template(

pyegeria/x_action_author_omvs.py

@@ -9,7 +9,7 @@ Copyright Contributors to the ODPi Egeria project.
 
 
 from requests import Response
-from pyegeria.automated_curation_omvs import AutomatedCuration
+from pyegeria.automated_curation import AutomatedCuration
 from pyegeria._globals import NO_ELEMENTS_FOUND
 
 
@@ -49,7 +49,7 @@ class ActionAuthor(AutomatedCuration):
         )
         self.action_command_root = f"{platform_url}/servers/"
 
-    async def _async_create_element_from_template(
+    async def _async_create_elem_from_template(
         self, body: str, server: str = None
     ) -> str:
         """Create a metadata element from a template.  Async version.

{pyegeria-5.4.4.6.dist-info → pyegeria-5.4.4.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.4.4.6
+Version: 5.4.4.7
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance

{pyegeria-5.4.4.6.dist-info → pyegeria-5.4.4.7.dist-info}/RECORD

@@ -4,6 +4,7 @@ commands/cat/Dr-Egeria_md-orig.py,sha256=ZX20BvRo0fIFisvy5Z-VJDLVyKbQoud89-CUV2S
 commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiqRY,967
 commands/cat/__init__.py,sha256=l4CImkjEiTQKS7QR-RQwzHIgRpfP032Mn_NZEuIILwg,98
 commands/cat/debug_log.2025-09-14_11-03-29_316193.log.zip,sha256=A3iGk7EgW9u5eAXxUoQZe1glh_29TQceOAyjK_6IBZk,22787
+commands/cat/debug_log.2025-09-15_19-06-37_086464.log.zip,sha256=KVM2LYsrlKcAXtuTiNGRYRRVo7OCoXUW5ymusHiQzIk,11972
 commands/cat/dr_egeria_command_help.py,sha256=_HOJd1IplnYhoQm1cwsROS9SxVKILLUf9YNlGMvvdF4,15359
 commands/cat/dr_egeria_jupyter.py,sha256=rfLVV_84Q8Pqcq1flmijKvZ7sEZFy7JAcAP_NAbb46Y,5656
 commands/cat/dr_egeria_md.py,sha256=zz-XtRW0sfBOG8kA51OFR5uKQ7JULGoOgXeJBXQBqTM,4889
@@ -216,9 +217,10 @@ md_processing/.obsidian/core-plugins.json,sha256=Brm8YrAcwFEdXZjASKcuSS2gsKga_oP
 md_processing/.obsidian/workspace.json,sha256=NLVJEOtsowljw7Ka035ReHLPu4iitk2ZsuSDN6zUAFY,4282
 md_processing/__init__.py,sha256=gx-vCZXFjuq4T63qb5XKgW8DA2DoeAuqmO7xg4VmH3Y,7226
 md_processing/data/commands-working.json,sha256=uCo_azcuuYqGm7QffJeCGj7PyZuZRGdu7kKf4XWmMoA,1162560
-md_processing/data/commands.json,sha256=_4sHn5xofnkVi1yooAwtnX3oHErcN-DcigXWEABNSsE,1544948
+md_processing/data/commands.json,sha256=X-AFeNkzVWb3Q0x6Zf7Ej2qo_LY0vGIMeDqJVDIuass,1546841
 md_processing/data/generated_format_sets.json,sha256=TXvGK_Gm5ieq9i6u9M1j4CaNPzoV2m0hisKK2fWCtIM,98502
 md_processing/data/generated_format_sets.py,sha256=2BfRzb5G5n8Cz6VwirQXlBq1fHBISIh4x7jquXg6QEw,36402
+md_processing/dr-egeria-outbox/DataStruct-DrE-2025-09-19-22-35-57.md,sha256=TlARiu_jKhUa4vvF6Rpp9USoi0sEHbVYuVpFXQlWyJE,1269
 md_processing/dr_egeria.py,sha256=VVo0kv2qDAdHmbi-nZA1HoPJH8wzLVDa1a_FSWCsVBI,20405
 md_processing/dr_egeria_inbox/glossary_creation_experiment.ipynb,sha256=dbzNu90fCKNohOWVSRBOB1GLyd95x8Qw51I5AkaPtso,11552
 md_processing/md_commands/__init__.py,sha256=ssEojzFlSYtY2bHqqOoKo8PFaANZ_kq_gIbtlXnuc2s,93
@@ -226,68 +228,68 @@ md_processing/md_commands/data_designer_commands.py,sha256=cT2godlpPS5vbWvpZbzTD
 md_processing/md_commands/ext_ref_commands.py,sha256=Pv4JLiXJUQbHcuMsN71Dzg4U1B1vhNs4YwhXn0A1lc8,23129
 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=4u1AHohmXIvolxKYm44Hi3NG8_Z0TDOmn-gDEmLL6RY,51831
+md_processing/md_commands/product_manager_commands.py,sha256=CtRG_MCe1bhyOnlm03S_Ee-LcYkJGdZkBSsOLIqonew,52035
 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=dvRD0Vjv1w9FTfV5W-4EMQBTk2NAUJlIP2jQ411kHS4,11815
 md_processing/md_processing_utils/__init__.py,sha256=LxAmxlcji26ziKV4gGar01d95gL9vgToRIeJW8N-Ifs,80
-md_processing/md_processing_utils/common_md_proc_utils.py,sha256=wZQvmFLryko-Of-MaZ9BspejTSW27V9y6Azoaeb-w0o,58607
+md_processing/md_processing_utils/common_md_proc_utils.py,sha256=_Z4B0PPyFOuJ43gBtWGsolqUXnqOP6Hry0BpgzAvDlo,58610
 md_processing/md_processing_utils/common_md_utils.py,sha256=mHU-H5L43Egu_EpLqSQkMgyZS_xX-_TRloov_rUtO1w,26766
+md_processing/md_processing_utils/debug_log,sha256=33cQkrJSwgRN21MlKCikb-rvEGWZKCrZvn028LqAK5U,19887
 md_processing/md_processing_utils/determine_width.py,sha256=nzinSuSF9SeuVOfKXsg-l1cqLkNYKZnF6HYfJpft44A,4236
 md_processing/md_processing_utils/dr-egeria-help-2025-09-09T11:10:03.md,sha256=x_J_baA18EsMHW_O-EZiNkXAQ3MEwta8ZLsKPil55O8,166018
 md_processing/md_processing_utils/dr-egeria-help-2025-09-10T14:49:49.md,sha256=qnu8YS-7Ra0GQtPPiCKb4PpQBcJAmfaG50ufFpr9b-s,175356
 md_processing/md_processing_utils/dr-egeria-help-2025-09-10T14:57:46.md,sha256=1gBIR4iuBsAXpGdg4nPgFHOGcLcDCZbNvvg-9cHD4fM,55188
-md_processing/md_processing_utils/extraction_utils.py,sha256=nCtsnx_iSNV-h1StZ54GQLzSIqfx3hCNnmdDTWUKC10,22350
+md_processing/md_processing_utils/extraction_utils.py,sha256=Hx3OPjMLfChBPwJxHeRNeQaSrZbopoj87iE7poPV4ns,22358
 md_processing/md_processing_utils/gen_format_sets.py,sha256=ZdoLSjR-e7dZBG3tVr-HRmy-WQuAgIzj5g9tYIn4KQA,16480
 md_processing/md_processing_utils/generate_dr_help.py,sha256=MJWlr_22Y9pjWqQbfSLb6C-t1GlQNlbWXkCmDnphfME,7419
-md_processing/md_processing_utils/generate_md_cmd_templates.py,sha256=SVdtlA6Nc9JIN-pORGbf-_shEP7egReuVejEcMjxRYM,5797
+md_processing/md_processing_utils/generate_md_cmd_templates.py,sha256=mFenxe9Jq8QivgmI0ZFtO_iu6P6RH_EiNa__CGyDw_0,5809
 md_processing/md_processing_utils/generate_md_templates.py,sha256=DMnMQ7_LbmQCS8aG-ppHGTu25obOSn4ZzSg7V21k9jo,3547
-md_processing/md_processing_utils/md_processing_constants.py,sha256=e_Tbqwt-J_VLpmDoTDw4TnTzRQWP73jqDfi6V-v3R_Y,21043
+md_processing/md_processing_utils/md_processing_constants.py,sha256=8LEwrtYr7UkgWGyT6mquUaKMb4--LEtv24DHr1yeGv8,21069
 md_processing/md_processing_utils/message_constants.py,sha256=UBf18obM83umM6zplR7ychre4xLRbBnTzidHDZ2gNvM,548
 pyegeria/README.md,sha256=PwX5OC7-YSZUCIsoyHh1O-WBM2hE84sm3Bd4O353NOk,1464
-pyegeria/__init__.py,sha256=XxELwaqinmpSsdHaTd-5TGKRe-3Abi220tjZ6svIhLQ,11842
+pyegeria/__init__.py,sha256=H9U3s0TYSIJXqfpMb4uSme4mYZ5Q3O2cWdT3yJaTEow,11837
 pyegeria/_client.py,sha256=hJHn5pD8sbelP_M9dK-M5Z2CYqpRXzXfg1UCgAdQ6dQ,33416
-pyegeria/_client_new.py,sha256=jSD57a41JpCa3yeX7llOnVnyvfnNFc4jTq4LOJhJoQ4,69780
+pyegeria/_client_new.py,sha256=vK0uhQHk5dLukraTI9sT6eW3o_NUNG5eSLJVDKIZqDc,69774
 pyegeria/_deprecated_gov_engine.py,sha256=dWNcwVsE5__dF2u4QiIyQrssozzzOjBbLld8MdpmVCQ,17264
 pyegeria/_exceptions.py,sha256=1SrnV194V4_YJNnNAU0myTHQ3dhLn4GF2B2gZcj1u90,18153
 pyegeria/_exceptions_new.py,sha256=srmrlqoWy7VvOJOhPcYFKW32MCIovgEg5J7PrYDxzQA,19706
 pyegeria/_globals.py,sha256=qSU5hM4uuJZPp-YapEEKxfcdgH9hauc6R7gRkELLroY,1132
 pyegeria/_output_format_models.py,sha256=p9fTYaIa5KyTMIR4-JAbE9g66_gGMPTnUqjIq20Zr1o,14494
-pyegeria/_output_formats.py,sha256=-s2w8aoXcdCiBm1_CmeRMJjgpge2bWeFYcryql1wEwE,175171
+pyegeria/_output_formats.py,sha256=ayG2inyR0d6zwD9yOdT5VZ5DJSOgvGrtIqFvkH2E0ZE,175279
 pyegeria/_validators.py,sha256=pNxND0dN2qvyuGE52N74l1Ezfrh2p9Hao2ziR_t1ENI,7425
 pyegeria/asset_catalog_omvs.py,sha256=P6FceMP0FgakGSOt3ePxpEbsF7nnypzo1aQahjdL_94,29021
-pyegeria/automated_curation_omvs.py,sha256=tzwCyXL0Hx8UjryBBWcPoEuBRajXZpLuwPQ1vuOg2yc,130349
+pyegeria/automated_curation.py,sha256=GLUrPf90VeRf3AJNA2tZQJBj3dUhzoRtEBBw0NiSlyU,138891
 pyegeria/classification_manager_omvs.py,sha256=eodP8Fn7zi78unsjk0XNW7lnxI7R0Fb7_SLI-HA39PQ,187249
 pyegeria/collection_manager.py,sha256=-w6QMcLpfBh4tc0-aFF81idywFJrxdsm6AWQByrvqw4,236904
 pyegeria/collection_models.py,sha256=d3DdWONqDdAeuUQgussiCNfvhKIDFpaI35cdW_Tv4_0,5315
 pyegeria/config.py,sha256=N-qHq74GN29Mwfp8MbXvj7uEsKCIXotL7MDwFcj3nIU,29380
 pyegeria/core_omag_server_config.py,sha256=pNQpocICkZx8sRsTw5DPUe-TFyxlIo1U88qqgci_f7I,97764
 pyegeria/create_tech_guid_lists.py,sha256=hf5q8Xrdsz-bqeIW3yTORZ1XB6_BrKzLDWWwC_bNG2g,4811
-pyegeria/data_designer.py,sha256=mejzrpK9rLPqs2tOuEN_sAnj6DLxL4Hs-Dt-idjLu4w,188701
+pyegeria/data_designer.py,sha256=oMDC-knFdepi3d5S3s-cmcmKc_1DHjAVBu9m-lZppdM,188692
 pyegeria/egeria_cat_client.py,sha256=H4V3Qm52Vhfh16kwf2gTibtsT5PZwdjxTKOnNef1rbs,3088
-pyegeria/egeria_client.py,sha256=bjhdJNwzIC1lapa8a4v2cNLPWN4Nae4HIQYjqeIHr4Y,6107
+pyegeria/egeria_client.py,sha256=N_CvaUgb8tQtRLsy8dfLNJ2lPPiCrfW-AFiLBxqIlyI,6102
 pyegeria/egeria_config_client.py,sha256=YkgndiZ6-CfhwVeBW9ErS7l95SIrd0G9--H8kAfeBJY,2479
 pyegeria/egeria_my_client.py,sha256=3dSBUlrivzih75hodNHe-2BM9pGB8AQVLru-_NbhYNE,3186
-pyegeria/egeria_tech_client.py,sha256=TjuwE9APWQZ4cRsxM0MoVrsikF8e4vkISDt_ra93tY8,4712
+pyegeria/egeria_tech_client.py,sha256=8Apr5YEFL2qgn-QTv9YWTI-23rGI94NiUp4418EiZ4k,4707
 pyegeria/external_references.py,sha256=DyOmGhG0LWIN4INABCiJRrHxfZ5FWE7TFtc3S_k5iEI,74360
 pyegeria/feedback_manager_omvs.py,sha256=0xBs0p54vmdfVYYgQ8pOanLC4fxfgTk1Z61Y6D1U7_I,152978
 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/load_config_orig.py,sha256=lOM37vdIBcYfLQFTLP5bDuNc7vTFGBNYPfqHtWGNvA4,11624
 pyegeria/logging_configuration.py,sha256=BxTQRN-7OOdk5t1f1xSn8gKU8iT-MfWEgbn6cYWrRsY,7674
 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
-pyegeria/mermaid_utilities.py,sha256=Zcn8JRrqtf62oHoxuvP9tQ5G-BFxOGMNfr7-peuykgY,54290
+pyegeria/mermaid_utilities.py,sha256=w_zED21bLCeXtfpBoGpPoG3kQlJDXwrLznLIuugvXzM,54285
 pyegeria/metadata_explorer_omvs.py,sha256=xHnZTQKbd6XwOhYia-RiIisrvZcqHi0SL1l6OCf04Gk,86911
-pyegeria/models.py,sha256=rIchvpfFx_cRCaczH_VSU_kltq00efGBT_m0SB3FhZk,20370
+pyegeria/models.py,sha256=EhqVugZU7RT_FCiuSI4nRz_6sp8GkttrPYeB2hFN-8s,20375
 pyegeria/my_profile_omvs.py,sha256=d0oJYCJG7pS9BINPuGciVa00ac0jwPHNANXDCLginEc,34720
-pyegeria/output_formatter.py,sha256=Fvup9Z-QKsG8JII2lR4kkXwAGhkhcyCVuBkdJd8si4Y,41856
+pyegeria/output_formatter.py,sha256=pFHGEhSnLppRN0gl7_CwkHSZkC6G8r1Con9At2NMwOU,43442
 pyegeria/platform_services.py,sha256=AJNa8n2mKfAMK68q886YCD-p5bpCxIlCxBsRdr0R9O4,41708
-pyegeria/project_manager.py,sha256=BrI23_fWIM4FE1y5zRqo3651iaDJ1BI_aNBpZ7D6nJQ,65887
-pyegeria/reference_data.py,sha256=nKI_fxrSi3t0ay4wdAachvYw1-vpgKN_F9yB8XAklbk,41847
+pyegeria/project_manager.py,sha256=9L1tJPjGtcN_jwLjVAwR4mWDuT-R5mKJ8l1Jb30jqF0,65884
+pyegeria/reference_data.py,sha256=tTKNNqRXMUYgyByojHOEPNt5oAHlDIbzdWciaKSPxzw,41844
 pyegeria/registered_info.py,sha256=y0-LgDIQXpph0lEWxIOG3_HsqX_Z2iAIb3xu4Aa4B70,6344
 pyegeria/runtime_manager_omvs.py,sha256=bVAFJPRnIbTxdzmDHx7XgJBlyh_ZyHiKeUGqFT1Ozpg,80293
 pyegeria/server_operations.py,sha256=dTqUEmX1B77b0x61OSU0aonsW8KwIpfzb3eioRpwaiI,16832
@@ -295,9 +297,9 @@ pyegeria/solution_architect.py,sha256=wds7wIBmDdV1H6SPhLPicWDzA7dfjhSCfO-_s4CByD
 pyegeria/template_manager_omvs.py,sha256=chBljs1vy5wr9DRAtbvIt4Cob_7HxGfxLkCNlDTM-rQ,42755
 pyegeria/utils.py,sha256=xOTxk9PH8ZGZmgIwz_a6rczTVLADLEjucr10ZJTUnY4,9272
 pyegeria/valid_metadata_omvs.py,sha256=Xq9DqBQvBFFJzaFIRKcVZ2k4gJvSh9yeXs_j-O3vn1w,65050
-pyegeria/x_action_author_omvs.py,sha256=RcqSzahUKCtvb_3u_wyintAlc9WFkC_2v0E12TZs8lQ,6433
-pyegeria-5.4.4.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.4.4.6.dist-info/METADATA,sha256=0MD7RfgN6hwl4q-oByqWsY_opV2xzAo2L2mAAYSoHdg,6292
-pyegeria-5.4.4.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pyegeria-5.4.4.6.dist-info/entry_points.txt,sha256=HAS-LHaaBfkaZ19XU9g5mXwn2uj2HK99isdijI-VIDk,6353
-pyegeria-5.4.4.6.dist-info/RECORD,,
+pyegeria/x_action_author_omvs.py,sha256=uyN8IieAe9H4aOWqJyKTzW-fetStHuoDoybianjCT70,6425
+pyegeria-5.4.4.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.4.4.7.dist-info/METADATA,sha256=vYffXlfmeQOY45n9sI7sWDbjWpLhybHhkZsNJ4XF2fQ,6292
+pyegeria-5.4.4.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pyegeria-5.4.4.7.dist-info/entry_points.txt,sha256=HAS-LHaaBfkaZ19XU9g5mXwn2uj2HK99isdijI-VIDk,6353
+pyegeria-5.4.4.7.dist-info/RECORD,,

pyegeria/load_config_orig.py

@@ -1,218 +0,0 @@
-
-"""
-SPDX-License-Identifier: Apache-2.0
-Copyright Contributors to the ODPi Egeria project.
-
-This module manages configuration information for pyegeria and pyegeria clients.
-
-The load_app_config() function loads configuration information:
-1) Default configuration variables are specified in the Dict structure below.
-2) We construct a path to an external configuration JSON file from the Environment Variables
-    - PYEGERIA_ROOT_PATH
-    - PYEGERIA_CONFIG_FILE
-3) If a valid configuration file is found, the configuration will be loaded on top of the default configuration.
-4) We then update the in-memory configuration from Environment Variables, if set.
-
-The result is that Environment Variable values take priority over configuration file values which override the defaults.
-
-The get_app_config() function is used by other modules to get configuration information from the configuration structure
-and makes it available as a dict.
-
-"""
-import inspect
-import os
-import json
-
-from loguru import logger
-from pyegeria._exceptions_new import PyegeriaInvalidParameterException
-
-
-# from dotenv import load_dotenv # pip install python-dotenv if you use .env files
-
-# --- Configuration Loading Logic ---
-
-# Private variable to hold the loaded configuration
-_app_config = None
-
-def load_app_config():
-    """
-    Loads application configuration from files and environment variables.
-    This function should ideally be called only once at application startup.
-    """
-    global _app_config # Declare intent to modify the global _app_config
-
-    if _app_config is not None:
-        # Configuration already loaded, return existing instance
-        return _app_config
-
-
-    # Define default configuration values
-    config = {
-        "Environment": {
-                "Console Width": 200,
-                "Dr.Egeria Inbox": "md_processing/dr-egeria-inbox",
-                "Dr.Egeria Outbox": "md_processing/dr-egeria-outbox",
-                "Egeria Engine Host URL": "",
-                "Egeria Engine Host": "qs-engine-host",
-                "Egeria Glossary Path": "glossary",
-                "Egeria Integration Daemon URL": "https://localhost:9443",
-                "Egeria Integration Daemon": "qs-integration-daemon",
-                "Egeria Jupyter": True,
-                "Egeria Kafka Endpoint": "localhost:9192",
-                "Egeria Mermaid Folder": "mermaid_graphs",
-                "Egeria Metadata Store": "qs-metadata-store",
-                "Egeria Platform URL": "https://localhost:9443",
-                "Egeria View Server URL": "https://localhost:9443",
-                "Egeria View Server": "qs-view-server",
-                "Pyegeria Root": "/Users/dwolfson/localGit/egeria-v5-3/egeria-python",
-        },
-
-        "Debug": {
-                "debug_mode": False,
-                "enable_logger_catch": False,
-                "timeout_seconds": 30,
-        },
-        "feature_x_enabled": False,
-        "Logging": {
-                "console_filter_levels": [
-                        "ERROR"
-                ],
-                "console_logging_enabled": [
-                        "_client_new",
-                        "_exceptions_new",
-                        "collections_manager_omvs"
-                        "tests",
-                ],
-                "console_logging_level": "INFO",
-                "enable_logging": False,
-                "file_logging_level": "INFO",
-                "log_directory": "logs",
-                "logging_console_format":
-                    " <cyan>{name}</cyan>:<cyan>{line}</cyan> - <level>{message}</level> -{extra}",
-                    " <green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level}</level> |"
-                "logging_file_format":
-                    " {time:YYYY-MM-DD HH:mm:ss} | {level} | {function}:{line} - {message }-{extra}"
-        },
-        "User Profile": {
-                "Egeria Home Collection": "MyHome",
-                "Egeria Home Glossary Name": "Egeria-Markdown",
-                "Egeria Local Qualifier": "PDR"
-        }
-}
-
-    root_path = os.getenv("PYEGERIA_ROOT_PATH", config["Environment"].get("Pyegeria Root",""))
-    config_file = os.getenv("PYEGERIA_CONFIG_FILE", "config.json")
-    config_file_path = os.path.join(root_path,config_file)
-    if os.path.exists(config_file_path):
-        try:
-            with open(config_file_path, 'r') as f:
-                file_config = json.load(f)
-                config.update(file_config) # Merge/override defaults
-                # logger.debug("Configuration file loaded from {}".format(config_file_path))
-        except json.JSONDecodeError:
-            print(f"Warning: Could not parse {config_file_path}. Using defaults/env vars.")
-        except Exception as e:
-            print(f"Warning: Error reading {config_file_path}: {e}. Using defaults/env vars.")
-    else:
-        logger.warning(f"Warning: Could not find {config_file_path}. Using defaults/env vars.")
-
-    debug = config["Debug"]
-    debug['debug_mode'] = os.getenv("PYEGERIA_DEBUG_MODE", debug.get("debug_mode", False))
-    debug["enable_logger_catch"] = os.getenv("PYEGERIA_ENABLE_LOGGER_CATCH", debug.get("enable_logger_catch", False))
-    debug["timeout_seconds"] = int(os.getenv("PYEGERIA_TIMEOUT_SECONDS", debug.get("timeout_seconds", 30)))
-
-    env = config["Environment"]
-    env["Console Width"] = int(os.getenv("PYEGERIA_CONSOLE_WIDTH", env.get("EGERIA_WIDTH", 200)))
-    env["Dr.Egeria Inbox"] = os.getenv("DR_EGERIA_INBOX_PATH", env.get("Dr_EGERIA_INBOX",
-                                                                       "md_processing/dr-egeria-inbox"))
-    env["Dr.Egeria Outbox"] = os.getenv("DR_EGERIA_OUTBOX_PATH", env.get("DR_EGERIA_OUTBOX",
-                                                                         "md_processing/dr-egeria-outbox"))
-    env["Egeria Engine Host"] = os.getenv("EGERIA_ENGINE_HOST", env.get("Egeria Engine Host", "qs-engine-host"))
-    env["Egeria Engine Host URL"] = os.getenv("EGERIA_ENGINE_HOST_URL",env.get("Egeria Engine Host URL", "https://localhost:9443"))
-
-    env["Egeria Glossary Path"] = os.getenv("EGERIA_GLOSSARY_PATH", env.get("Egeria Glossary Path", "glossary"))
-    env["Egeria Integration Daemon"] = os.getenv("EGERIA_INTEGRATION_DAEMON", env.get("Egeria Integration Daemon", "qs-integration-daemon"))
-    env["Egeria Integration Daemon URL"] = os.getenv("EGERIA_INTEGRATION_DAEMON_URL",env.get("Egeria Integration Daemon URL", "https://localhost:9443"))
-    env["Egeria Jupyter"] = os.getenv("EGERIA_JUPYTER", env.get("Egeria Jupyter", True))
-    env["Egeria Kafka"] = os.getenv("EGERIA_KAFKA", env.get("Egeria Kafka", "https://localhost:9192"))
-    env["Egeria Mermaid Folder"] = os.getenv("EGERIA_MERMAID_FOLDER", env.get("Egeria Mermaid Folder","mermaid_graphs"))
-    env["Egeria Metadata Store"] = os.getenv("EGERIA_METADATA_STORE", env.get("Egeria Metadata Store","qs-metadata-store"))
-    env["Egeria Platform URL"] = os.getenv("EGERIA_PLATFORM_URL", env.get("Egeria Platform URL","https://localhost:9443"))
-    env["Egeria View Server"] = os.getenv("EGERIA_VIEW_SERVER", env.get("Egeria View Server","qs-view-server"))
-    env["Egeria VIew Server URL"] = os.getenv("EGERIA_VIEW_SERVER_URL", env.get("Egeria View Server URL","https://localhost:9443"))
-    env["Pyegeria Root"] = root_path
-
-    log = config["Logging"]
-    log["console_filter_levels"] = os.getenv("PYEGERIA_CONSOLE_FILTER_LEVELS",
-                                                log.get("console_filter_levels", ["ERROR"]))
-    log["console_logging_enabled"] = os.getenv("PYEGERIA_CONSOLE_LOGGING_ENABLED",
-                                                  log.get("console_logging_enabled", ["tests"]))
-    log["console_logging_level"] = os.getenv("PYEGERIA_CONSOLE_LOG_LVL", log.get("console_logging_level", None))
-    log["enable_logging"] = os.getenv("PYEGERIA_ENABLE_LOGGING", log.get("enable_logging", False))
-    log["file_logging_level"] = os.getenv("PYEGERIA_FILE_LOG_LVL", log.get("file_logging_level","INFO"))
-    log["log_directory"] = os.getenv("PYEGERIA_LOG_DIRECTORY", log.get("log_directory",'logs'))
-    log["logging_console_format"] = os.getenv("PYEGERIA_LOGGING_CONSOLE_FORMAT", log.get("logging_console_format",
-                                             " <green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level}</level> | "
-                                             "<cyan>{name}</cyan>:<cyan>{line}</cyan> - "
-                                             "<level>{message}</level> -{extra}"  ))
-    log["logging_file_format"] = os.getenv("PYEGERIA_LOGGING_FILE_FORMAT",log.get("logging_file_format",
-                                           " {time:YYYY-MM-DD HH:mm:ss} | {level} | {function}:{line} "
-                                           "- {message }-{extra}"  ))
-
-    user = config["User Profile"]
-    user["Egeria Home Collection"] = os.getenv("EGERIA_HOME_COLLECTION", user.get("Egeria Home Collection", "myHome"))
-    user["Egeria Home Glossary Name"] = os.getenv("EGERIA_HOME_GLOSSARY_NAME", user.get("Egeria Home Glossary Name", "Egeria-Markdown"))
-    user["Egeria Local Qualifier"] = os.getenv("EGERIA_LOCAL_QUALIFIER", user.get("Egeria Local Qualifier", "myLocal"))
-    user["user_name"] = os.getenv("EGERIA_USER_NAME", "peterprofile")
-    user["user_pwd"] = os.getenv("EGERIA_USER_PASSWORD", "secret")
-
-    if not user.get("user_pwd"):
-        context: dict = {}
-        context['caller method'] = inspect.currentframe().f_back.f_code.co_name
-        additional_info: dict = {"reason": "Egeria user password is not found in the environment"}
-        raise PyegeriaInvalidParameterException(None, context, additional_info)
-
-
-
-
-    # Handle type conversion for env vars (they are always strings)
-    # if "TIMEOUT_SECONDS" in os.environ:
-    #     try:
-    #         config["timeout_seconds"] = int(os.getenv("TIMEOUT_SECONDS"))
-    #     except ValueError:
-    #         print("Warning: TIMEOUT_SECONDS environment variable is not an integer. Using default.")
-    #
-    # if "DEBUG_MODE" in os.environ:
-    #     # Convert string "True", "False", "1", "0" to boolean
-    #     debug_str = os.getenv("DEBUG_MODE").lower()
-    #     config["debug_mode"] = debug_str in ('True', '1', 't', 'y', 'yes', 'on')
-    #
-    # if "FEATURE_X_ENABLED" in os.environ:
-    #     feature_x_str = os.getenv("FEATURE_X_ENABLED").lower()
-    #     config["feature_x_enabled"] = feature_x_str in ('True', '1', 't', 'y', 'yes', 'on')
-
-    # 4. Handle sensitive API key (only from environment variable)
-    # config["api_key"] = os.getenv("MY_SERVICE_API_KEY")
-    # if config["api_key"] is None:
-    #     print("Error: MY_SERVICE_API_KEY environment variable is critical and not set.")
-    #     # In a production application, you might raise a critical exception here:
-    #     # raise ValueError("MY_SERVICE_API_KEY is not set!")
-
-    _app_config = config # Store the final loaded configuration
-    return _app_config
-
-def get_app_config():
-    """
-    Provides access to the loaded application configuration.
-    Ensures config is loaded if not already (useful for testing or simple scripts).
-    For structured apps, load_app_config() should be called explicitly once at startup.
-    """
-    if _app_config is None:
-        # If get_app_config is called before load_app_config, load it now.
-        # This can be convenient but explicit loading is generally better.
-        return load_app_config()
-    return _app_config
-
-# You can also define constants based on the config for common access,
-# but be aware these won't update if the config changes after initial load.
-# E.g., API_ENDPOINT = get_app_config().get("api_endpoint")