pyegeria 5.3.7.8__py3-none-any.whl → 5.3.8.0__py3-none-any.whl

pyegeria/_client.py

@@ -775,12 +775,13 @@ class Client:
         """Helper function to create a qualified name for a given type and display name.
            If present, the local qualifier will be prepended to the qualified name."""
         EGERIA_LOCAL_QUALIFIER = os.environ.get("EGERIA_LOCAL_QUALIFIER", local_qualifier)
-        display_name = re.sub(r'\s','-',display_name.strip())
-        q_name = f"{type}:{display_name}"
+        # display_name = re.sub(r'\s','-',display_name.strip()) # This changes spaces between words to -; removing
+
+        q_name = f"{type}::{display_name.strip()}"
         if EGERIA_LOCAL_QUALIFIER:
-            q_name = f"{EGERIA_LOCAL_QUALIFIER}:{q_name}"
+            q_name = f"{EGERIA_LOCAL_QUALIFIER}::{q_name}"
         if version_identifier:
-            q_name = f"{q_name}:{version_identifier}"
+            q_name = f"{q_name}::{version_identifier}"
         return q_name
 
 if __name__ == "__main__":

pyegeria/commands/cat/Dr-Egeria_md-orig.py

@@ -47,7 +47,7 @@ console = Console(width=int(EGERIA_WIDTH))
 
 @click.command("process-markdown-file", help="Process a markdown file and return the output as a string.")
 @click.option("--file-path", help="File path to markdown file",
-              default="glossary_exp.md")
+              default="glossary_test1.md")
 @click.option("--directive", default="display-only", help="How to process the file")
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use.")
 @click.option(

pyegeria/commands/cat/dr_egeria_md.py

@@ -43,7 +43,7 @@ EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "pyegeria/commands/cat
 
 @click.command("process_markdown_file", help="Process a markdown file and return the output as a string.")
 @click.option("--file-path", help="File path to markdown file",
-              default="glossary_exp.md", required=True, prompt=False)
+              default="glossary_test1.md", required=True, prompt=False)
 @click.option("--directive", default="display", help="How to process the file",
               type=click.Choice(["display","validate","process"],case_sensitive=False), prompt=False,)
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use.")
@@ -119,14 +119,15 @@ def process_markdown_file(
             else:
                 # If command is not recognized, keep the block as-is
                 result = None
-            print(json.dumps(shared_state.get_element_dictionary(), indent=4))
+            # print(json.dumps(shared_state.get_element_dictionary(), indent=4))
             if result:
                 if directive == "process":
                     updated = True
                     final_output.append(result)
-                    print(json.dumps(shared_state.get_element_dictionary(), indent=4))
+                    # print(json.dumps(shared_state.get_element_dictionary(), indent=4))
                 elif directive == "validate":
-                    print(json.dumps(shared_state.get_element_dictionary(), indent=4))
+                    pass
+                    # print(json.dumps(shared_state.get_element_dictionary(), indent=4))
             elif directive == "process":
                 # Handle errors (skip this block but notify the user)
                 print(f"\n==>\tErrors found while processing command: \'{potential_command}\'\n"

pyegeria/commands/cli/egeria.py

@@ -151,7 +151,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -161,7 +161,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -171,7 +171,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(
@@ -2025,16 +2025,11 @@ def tell_integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-@click.option(
-    "--server",
-    default="integration-daemon",
-    help="Name of the integration server to refresh",
-)
-def refresh_connectors(ctx, server, connector):
+def refresh_connectors(ctx, connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     refresh_connector(
-        connector, server, c.view_server_url, c.view_server, c.userid, c.password
+        connector, c.integration_daemon, c.integration_daemon_urll, c.view_server, c.userid, c.password
     )
 
 
@@ -2045,16 +2040,12 @@ def refresh_connectors(ctx, server, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-@click.option(
-    "--server",
-    default="integration-daemon",
-    help="Name of the integration server to refresh",
-)
+
 def restart_connectors(ctx, server, connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     restart_connector(
-        connector, server, c.view_server_url, c.view_server, c.userid, c.password
+        connector, c.integration_daemon, c.integration_daemon_url, c.view_server, c.userid, c.password
     )
 
 

pyegeria/commands/cli/egeria_cat.py

@@ -66,7 +66,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -76,7 +76,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -86,7 +86,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -96,7 +96,7 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(

pyegeria/commands/cli/egeria_my.py

@@ -47,7 +47,7 @@ from pyegeria.commands.my.todo_actions import (
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -57,7 +57,7 @@ from pyegeria.commands.my.todo_actions import (
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -67,7 +67,7 @@ from pyegeria.commands.my.todo_actions import (
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -77,7 +77,7 @@ from pyegeria.commands.my.todo_actions import (
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(

pyegeria/commands/cli/egeria_ops.py

@@ -63,7 +63,7 @@ from pyegeria.commands.ops.restart_integration_daemon import restart_connector
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -73,7 +73,7 @@ from pyegeria.commands.ops.restart_integration_daemon import restart_connector
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -83,7 +83,7 @@ from pyegeria.commands.ops.restart_integration_daemon import restart_connector
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -93,7 +93,7 @@ from pyegeria.commands.ops.restart_integration_daemon import restart_connector
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(
@@ -449,16 +449,12 @@ def integration_daemon(ctx):
     default="all",
     help="Name of connector to refresh or 'all' to refresh all",
 )
-@click.option(
-    "--server",
-    default="integration-daemon",
-    help="Name of the integration server to refresh",
-)
-def refresh_connectors(ctx, server, connector):
+
+def refresh_connectors(ctx,  connector):
     """Refresh the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     refresh_connector(
-        connector, server, c.view_server_url, c.view_server, c.userid, c.password
+        connector, c.integration_daemon, c.integration_daemon_url, c.view_server, c.userid, c.password
     )
 
 
@@ -469,16 +465,11 @@ def refresh_connectors(ctx, server, connector):
     default="all",
     help="Name of connector to restart or 'all' to restart all",
 )
-@click.option(
-    "--server",
-    default="integration-daemon",
-    help="Name of the integration server to restart",
-)
-def restart_connectors(ctx, server, connector):
+def restart_connectors(ctx,  connector):
     """Restart the specified integration connector or ALL connectors if not specified"""
     c = ctx.obj
     restart_connector(
-        connector, server, c.view_server_url, c.view_server, c.userid, c.password
+        connector, c.integration_daemon, c.integration_daemon_url, c.view_server, c.userid, c.password
     )
 
 

pyegeria/commands/cli/egeria_tech.py

@@ -60,7 +60,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 @click.group()
 @click.option(
     "--server",
-    default=os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store"),
+    default=os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store"),
     help="Egeria metadata store to work with",
 )
 @click.option(
@@ -70,7 +70,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 )
 @click.option(
     "--integration_daemon",
-    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon"),
+    default=os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon"),
     help="Egeria integration daemon to work with",
 )
 @click.option(
@@ -80,7 +80,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 )
 @click.option(
     "--view_server",
-    default=os.environ.get("EGERIA_VIEW_SERVER", "view-server"),
+    default=os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server"),
     help="Egeria view server to work with",
 )
 @click.option(
@@ -90,7 +90,7 @@ from pyegeria.commands.tech.list_valid_metadata_values import display_metadata_v
 )
 @click.option(
     "--engine_host",
-    default=os.environ.get("EGERIA_ENGINE_HOST", "engine-host"),
+    default=os.environ.get("EGERIA_ENGINE_HOST", "qs-engine-host"),
     help="Egeria engine host to work with",
 )
 @click.option(

pyegeria/commands/ops/gov_server_actions.py

@@ -63,7 +63,7 @@ def add_catalog_target(
 @click.argument("relationship-guid")
 @click.pass_context
 def remove_catalog_target(ctx, relationship_guid: str):
-    """Remove the catalog target specified by the relationship guidr"""
+    """Remove the catalog target specified by the relationship guid"""
     try:
         c = ctx.obj
         a_client = AutomatedCuration(
@@ -129,7 +129,7 @@ def refresh_gov_eng_config(ctx, engine_host_guid: str):
 
 @click.command("start")
 @click.pass_context
-@click.option("--server", default="simple-metadata-store", help="OMAG Server to start")
+@click.option("--server", default="qs-metadata-store", help="OMAG Server to start")
 def start_server(ctx, server):
     """Start or restart an engine-host from its known configuration"""
     c = ctx.obj

pyegeria/commands/ops/refresh_integration_daemon.py

@@ -18,14 +18,14 @@ from pyegeria._exceptions import (
     print_exception_response,
 )
 
-EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
 EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
-EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )
@@ -44,7 +44,7 @@ def refresh_connector(
             statement = "ALL connectors"
         else:
             statement = f"the {connector} "
-        server = "integration_daemon" if server is None else server
+        server = "qs-integration_daemon" if server is None else server
 
         s_client.refresh_integration_connectors(
             connector_name=connector, server_guid=None, display_name=server

pyegeria/commands/ops/restart_integration_daemon.py

@@ -18,14 +18,14 @@ from pyegeria._exceptions import (
     print_exception_response,
 )
 
-EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
 EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
-EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/commands/ops/table_integ_daemon_status.py

@@ -25,14 +25,14 @@ from pyegeria._exceptions import (
     print_exception_response,
 )
 
-EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "active-metadata-store")
+EGERIA_METADATA_STORE = os.environ.get("EGERIA_METADATA_STORE", "qs-metadata-store")
 EGERIA_KAFKA_ENDPOINT = os.environ.get("KAFKA_ENDPOINT", "localhost:9092")
 EGERIA_PLATFORM_URL = os.environ.get("EGERIA_PLATFORM_URL", "https://localhost:9443")
-EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "view-server")
+EGERIA_VIEW_SERVER = os.environ.get("EGERIA_VIEW_SERVER", "qs-view-server")
 EGERIA_VIEW_SERVER_URL = os.environ.get(
     "EGERIA_VIEW_SERVER_URL", "https://localhost:9443"
 )
-EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "integration-daemon")
+EGERIA_INTEGRATION_DAEMON = os.environ.get("EGERIA_INTEGRATION_DAEMON", "qs-integration-daemon")
 EGERIA_INTEGRATION_DAEMON_URL = os.environ.get(
     "EGERIA_INTEGRATION_DAEMON_URL", "https://localhost:9443"
 )

pyegeria/glossary_browser_omvs.py

@@ -556,7 +556,7 @@ class GlossaryBrowser(Client):
 
     async def _async_get_glossary_by_guid(
         self, glossary_guid: str, effective_time: str = None, output_format: str = "JSON"
-    ) -> dict:
+    ) -> dict|str:
         """Retrieves information about a glossary
         Parameters
         ----------
@@ -574,9 +574,9 @@ class GlossaryBrowser(Client):
 
         Returns
         -------
-        dict
-            The glossary definition associated with the glossary_guid
-
+        dict | str
+            if output format is JSON: The glossary definition associated with the glossary_guid
+            if output format is MD: A markdown string with the same information.
         Raises
         ------
          InvalidParameterException

pyegeria/glossary_manager_omvs.py

@@ -1194,107 +1194,6 @@ class GlossaryManager(GlossaryBrowser):
 
         return response
 
-    async def _async_add_data_field_to_term(
-        self, glossary_term_guid: str, body: dict
-    ) -> None:
-        """Add the data field values classification to a glossary term
-
-            Async Version.
-
-        Parameters
-        ----------
-            glossary_guid : str
-                Unique identifier for the glossary category to retrieve terms from.
-            glossary_term_guid: str
-                Unique identifier for the source glossary term.
-            body: dict
-                Body containing information about the data field to add
-
-
-        Returns
-        -------
-        None
-
-        Raises
-        ------
-         InvalidParameterException
-             If the client passes incorrect parameters on the request - such as bad URLs or invalid values.
-         PropertyServerException
-             Raised by the server when an issue arises in processing a valid request.
-         NotAuthorizedException
-             The principle specified by the user_id does not have authorization for the requested action.
-        Notes
-        -----
-        Body is of the structure:
-
-        {
-            "class" : "ClassificationRequestBody",
-            "properties" :
-                {
-                    "class" : "DataFieldValuesProperties",
-                    "defaultValue" : "Add default value here",
-                    "sampleValues" : [ "Sample Value 1", "Sample Value 2"],
-                    "dataPattern" : ["add data pattern here"],
-                    "namePattern" : ["add column pattern here"]
-                }
-        }
-        """
-
-        validate_guid(glossary_term_guid)
-
-        url = (
-            f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/glossary-manager/glossaries/"
-            f"terms/{glossary_term_guid}/is-data-field"
-        )
-
-        await self._async_make_request("POST", url, body)
-        return
-
-    def add_data_field_to_term(self, glossary_term_guid: str, body: dict) -> None:
-        """Add the data field values classification to a glossary term
-
-        Parameters
-        ----------
-            glossary_term_guid: str
-                Unique identifier for the source glossary term.
-            body: dict
-                Body containing information about the data field to add
-
-
-        Returns
-        -------
-        None
-
-        Raises
-        ------
-         InvalidParameterException
-             If the client passes incorrect parameters on the request - such as bad URLs or invalid values.
-         PropertyServerException
-             Raised by the server when an issue arises in processing a valid request.
-         NotAuthorizedException
-             The principle specified by the user_id does not have authorization for the requested action.
-        Notes
-        -----
-        Body is of the structure:
-
-        {
-            "class" : "ClassificationRequestBody",
-            "properties" :
-                {
-                    "class" : "DataFieldValuesProperties",
-                    "defaultValue" : "Add default value here",
-                    "sampleValues" : [ "Sample Value 1", "Sample Value 2"],
-                    "dataPattern" : ["add data pattern here"],
-                    "namePattern" : ["add column pattern here"]
-                }
-        }
-        """
-        loop = asyncio.get_event_loop()
-        loop.run_until_complete(
-            self._async_add_data_field_to_term(glossary_term_guid, body)
-        )
-
-        return
 
     async def _async_add_term_to_category(
             self, glossary_term_guid: str, glossary_category_guid: str