pyegeria 5.4.7.2__tar.gz → 5.4.7.4__tar.gz

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

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

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/commands/cat/dr_egeria_md.py

@@ -36,7 +36,7 @@ EGERIA_WIDTH = os.environ.get("EGERIA_WIDTH", 220)
 EGERIA_JUPYTER = os.environ.get("EGERIA_JUPYTER", False)
 EGERIA_HOME_GLOSSARY_GUID = os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None)
 EGERIA_GLOSSARY_PATH = os.environ.get("EGERIA_GLOSSARY_PATH", None)
-EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "../../")
+EGERIA_ROOT_PATH = os.environ.get("EGERIA_ROOT_PATH", "../..")
 EGERIA_INBOX_PATH = os.environ.get("EGERIA_INBOX_PATH", "md_processing/dr_egeria_inbox")
 EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "md_processing/dr_egeria_outbox")
 

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/commands/cat/list_format_set.py

@@ -40,6 +40,7 @@ import os
 import time
 
 from loguru import logger
+from pydantic import ValidationError
 from rich import box
 from rich.console import Console
 from rich.markdown import Markdown
@@ -51,7 +52,7 @@ import pydevd_pycharm
 from pyegeria import (
     EgeriaTech,
     CollectionManager,
-    NO_ELEMENTS_FOUND, GovernanceOfficer, GlossaryManager,
+    NO_ELEMENTS_FOUND, GovernanceOfficer, GlossaryManager, print_validation_error,
 )
 from pyegeria.config import settings
 from pyegeria.external_references import ExternalReferences
@@ -238,6 +239,10 @@ def execute_format_set_action(
                 else:
                     # For standalone functions, call with client as first argument
                     output = func(client, **params)
+            except ValidationError as e:
+                print_validation_error(e)
+                return
+
             except TypeError as e:
                 # Handle parameter mismatch errors
                 print(f"Error calling function: {e}")

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/commands/ops/list_catalog_targets.py

@@ -10,6 +10,7 @@ List catalog targets
 """
 import argparse
 import os
+import sys
 import time
 
 from rich import box
@@ -18,13 +19,13 @@ from rich.markdown import Markdown
 from rich.prompt import Prompt
 from rich.table import Table
 
+
 from pyegeria import (
     INTEGRATION_GUIDS,
     AutomatedCuration,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
-    print_exception_response,
+    EgeriaTech,
+    PyegeriaException,
+    print_basic_exception,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -144,26 +145,28 @@ def display_catalog_targets(
         return table
 
     try:
-        a_client = AutomatedCuration(view_server, view_url, user)
+        a_client = EgeriaTech(view_server, view_url, user)
         token = a_client.create_egeria_bearer_token(user, user_pass)
         connector = connector.strip()
-        if connector not in INTEGRATION_GUIDS.keys():
-            raise Exception
 
-        connector_guid = INTEGRATION_GUIDS[connector]
+
+        connector_guid = a_client.get_connector_guid(connector)
+        if connector_guid is None or connector_guid == "No connector found":
+            console.print(f"\n\n===> No connector found with name '{connector}'\n\n")
+            sys.exit(1)
+
         cat_targets = a_client.get_catalog_targets(connector_guid)
         console = Console(force_terminal=not jupyter, width=width, soft_wrap=True)
         with console.pager(styles=True):
             console.print(generate_table(), soft_wrap=True)
 
+
+    except PyegeriaException as e:
+        print(f"\n\n===> Perhaps integration connector {connector} is not known?\n\n")
+        print_basic_exception(e)
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        Exception
     ) as e:
-        print_exception_response(e)
-    except Exception as e:
-        print(f"\n\n===> Perhaps integration connector {connector} is not known?\n\n")
         console.print_exception()
     finally:
         a_client.close_session()

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/commands/ops/monitor_engine_activity.py

@@ -146,7 +146,7 @@ def display_engine_activity(
                     "ACTIVATING",
                 ):
                     action_status = f"[yellow]{action['actionStatus']}"
-                elif action["actionStatus"] in ("IN_PROGRESS", "ACTIONED"):
+                elif action["actionStatus"] in ("IN_PROGRESS", "COMPLETED"):
                     action_status = f"[green]{action['actionStatus']}"
                 else:
                     action_status = f"[red]{action['actionStatus']}"

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/commands/ops/monitor_engine_activity_c.py

@@ -148,7 +148,7 @@ def display_engine_activity_c(
                     "ACTIVATING",
                 ):
                     action_status = f"[yellow]{action['actionStatus']}"
-                elif action["actionStatus"] in ("IN_PROGRESS", "ACTIONED"):
+                elif action["actionStatus"] in ("IN_PROGRESS", "COMPLETED"):
                     action_status = f"[green]{action['actionStatus']}"
                 else:
                     action_status = f"[red]{action['actionStatus']}"

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/commands/tech/list_gov_action_processes.py

@@ -19,11 +19,9 @@ from rich.table import Table
 
 from pyegeria import (
     EgeriaTech,
-    InvalidParameterException,
-    PropertyServerException,
-    UserNotAuthorizedException,
+    PyegeriaException,
     ValidMetadataManager,
-    print_exception_response,
+    print_basic_exception,
 )
 
 EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
@@ -104,15 +102,13 @@ def display_gov_processes(
             console.print(generate_table(type_name))
 
     except (
-        InvalidParameterException,
-        PropertyServerException,
-        UserNotAuthorizedException,
+        PyegeriaException,
         ValueError,
     ) as e:
         if type(e) is str:
             print(e)
         else:
-            print_exception_response(e)
+            print_basic_exception(e)
 
 
 def main():

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/md_processing/dr_egeria.py

@@ -42,7 +42,7 @@ from md_processing import (extract_command, process_glossary_upsert_command, pro
                            process_link_to_external_reference_command, process_link_to_media_reference_command,
                            process_link_to_cited_document_command, EXT_REF_UPSERT, LINK_CITED_DOC, LINK_MEDIA,LINK_EXT_REF)
 
-from .md_commands.data_designer_commands import (process_data_spec_upsert_command,
+from md_processing.md_commands.data_designer_commands import (process_data_spec_upsert_command,
                                                               process_data_dict_upsert_command,
                                                               process_data_field_upsert_command,
                                                               process_data_structure_upsert_command,

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/md_processing/md_commands/ext_ref_commands.py

@@ -21,9 +21,8 @@ from md_processing.md_processing_utils.common_md_utils import (update_element_di
 from md_processing.md_processing_utils.extraction_utils import (extract_command_plus, update_a_command)
 
 from pyegeria import PyegeriaException, print_basic_exception, print_validation_error
-from pyegeria import body_slimmer
 from pyegeria.egeria_tech_client import EgeriaTech
-from pyegeria.utils import make_format_set_name_from_type
+from pyegeria.utils import make_format_set_name_from_type, body_slimmer
 
 
 # EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/md_processing/md_commands/glossary_commands.py

@@ -32,10 +32,9 @@ from md_processing.md_processing_utils.extraction_utils import (extract_command_
                                                                 update_a_command, extract_attribute,
                                                                 get_element_by_name, process_name_list)
 
-from pyegeria import body_slimmer
 from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_CATEGORIES_FOUND)
 from pyegeria.egeria_tech_client import EgeriaTech
-from pyegeria.utils import make_format_set_name_from_type
+from pyegeria.utils import make_format_set_name_from_type, body_slimmer
 
 
 # EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))

{pyegeria-5.4.7.2 → pyegeria-5.4.7.4}/md_processing/md_commands/project_commands.py

@@ -36,10 +36,9 @@ from md_processing.md_processing_utils.extraction_utils import (extract_command_
                                                                 update_a_command, extract_attribute,
                                                                 get_element_by_name, process_name_list)
 
-from pyegeria import body_slimmer
 from pyegeria._globals import (NO_GLOSSARIES_FOUND, NO_ELEMENTS_FOUND, NO_CATEGORIES_FOUND)
 from pyegeria.egeria_tech_client import EgeriaTech
-from pyegeria.utils import make_format_set_name_from_type
+from pyegeria.utils import make_format_set_name_from_type, body_slimmer
 
 
 # EGERIA_WIDTH = int(os.environ.get("EGERIA_WIDTH", "170"))

pyegeria-5.4.7.4/pyegeria/__init__.py

@@ -0,0 +1,99 @@
+"""
+SPDX-License-Identifier: Apache-2.0
+Copyright Contributors to the ODPi Egeria project.
+
+This is the pyegeria client package. The purpose of the package is to provide
+easy access to Egeria (https://egeria-project.org). The package is currently in
+development.
+
+The first capabilities are around Egeria's platform services used to start and stop
+the server platform and servers.
+
+"""
+# from .load_config import load_app_config, get_app_config
+# from .logging_configuration import config_logging, init_logging
+from ._globals import (INTEGRATION_GUIDS, TEMPLATE_GUIDS, default_time_out, disable_ssl_warnings, enable_ssl_check,
+                       is_debug, max_paging_size, NO_ELEMENTS_FOUND, NO_ASSETS_FOUND, NO_SERVERS_FOUND,
+                       NO_CATALOGS_FOUND, NO_GLOSSARIES_FOUND, NO_TERMS_FOUND, NO_CATEGORIES_FOUND, NO_ELEMENT_FOUND,
+                       NO_PROJECTS_FOUND, DEBUG_LEVEL, NO_COLLECTION_FOUND, NO_GUID_RETURNED, TEMPLATE_GUIDS,
+                       INTEGRATION_GUIDS)
+
+
+
+if disable_ssl_warnings:
+    from urllib3 import disable_warnings
+    from urllib3.exceptions import InsecureRequestWarning
+
+    disable_warnings(InsecureRequestWarning)
+
+from ._client import Client
+from ._client_new import Client2
+from ._exceptions_new import (PyegeriaInvalidParameterException,PyegeriaAPIException, PyegeriaException,
+                              PyegeriaUnauthorizedException, PyegeriaClientException, PyegeriaUnknownException,
+                              PyegeriaConnectionException, PyegeriaNotFoundException,
+                              print_exception_table, print_basic_exception, print_validation_error)
+from .config import load_app_config, get_app_config, settings
+from .logging_configuration import config_logging, console_log_filter, init_logging
+from ._exceptions import (InvalidParameterException, PropertyServerException, UserNotAuthorizedException,
+                          print_exception_response, )
+from ._validators import (is_json, validate_guid, validate_name, validate_public, validate_search_string,
+                          validate_server_name, validate_url, validate_user_id, )
+from .asset_catalog_omvs import AssetCatalog
+from .automated_curation import AutomatedCuration
+from .classification_manager_omvs import ClassificationManager
+from .collection_manager import CollectionManager
+from .core_omag_server_config import CoreServerConfig
+from .create_tech_guid_lists import build_global_guid_lists
+from .egeria_cat_client import EgeriaCat
+from .egeria_client import Egeria
+from .egeria_config_client import EgeriaConfig
+from .egeria_my_client import EgeriaMy
+from .egeria_tech_client import EgeriaTech
+from .feedback_manager_omvs import FeedbackManager
+from .full_omag_server_config import FullServerConfig
+from .glossary_manager import GlossaryManager
+from .governance_officer import GovernanceOfficer
+from .mermaid_utilities import (construct_mermaid_web, construct_mermaid_jup,  load_mermaid,
+                                parse_mermaid_code, render_mermaid, save_mermaid_graph, save_mermaid_html, )
+from .metadata_explorer_omvs import MetadataExplorer
+from .my_profile_omvs import MyProfile
+from .platform_services import Platform
+from .project_manager import ProjectManager
+from .registered_info import RegisteredInfo
+from .runtime_manager_omvs import RuntimeManager
+from .server_operations import ServerOps
+from .solution_architect import SolutionArchitect
+from .utils import body_slimmer,to_pascal_case, to_camel_case, camel_to_title_case
+from .valid_metadata_omvs import ValidMetadataManager
+from .x_action_author_omvs import ActionAuthor
+from .template_manager_omvs import TemplateManager
+from .data_designer import DataDesigner
+from ._output_formats import select_output_format_set
+from .mcp_adapter import list_reports, describe_report, run_report, _async_run_report, _execute_egeria_call_blocking
+
+#
+global template_guids, integration_guids
+
+# 2/12/25
+
+def __getattr__(name):
+    """
+    Lazy attribute loader to avoid import-time circular dependencies while preserving API.
+    Exposes:
+    - process_markdown_file via commands.cat.dr_egeria_md
+    - md_processing package
+    - commands package
+    """
+    if name == "process_markdown_file":
+        from commands.cat.dr_egeria_md import process_markdown_file as _pmf
+        return _pmf
+    if name == "md_processing":
+        import md_processing as _mdp
+        return _mdp
+    if name == "commands":
+        import commands as _cmd
+        return _cmd
+    raise AttributeError(f"module 'pyegeria' has no attribute {name!r}")
+
+if __name__ == "__main__":
+    print("Main-Init")