pyegeria 0.8.4.35__tar.gz → 0.8.4.37__tar.gz

{pyegeria-0.8.4.35 → pyegeria-0.8.4.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.35
+Version: 0.8.4.37
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

{pyegeria-0.8.4.35 → pyegeria-0.8.4.37}/commands/cat/list_glossary.py

@@ -86,8 +86,9 @@ def display_glossary_terms(
             status_filter=[],
             page_size=500,
         )
-        if len(terms) == 0:
-            print("No terms found!")
+
+        if type(terms) is str:
+            print(f"No terms found!")
             sys.exit(0)
         sorted_terms = sorted(
             terms, key=lambda k: k["glossaryTermProperties"]["displayName"]

{pyegeria-0.8.4.35 → pyegeria-0.8.4.37}/commands/ops/monitor_integ_daemon_status.py

@@ -45,20 +45,18 @@ disable_ssl_warnings = True
 
 
 def display_integration_daemon_status(
-    integ_server: str,
-    integ_url: str,
-    view_server: str,
-    view_url: str,
-    user: str,
-    user_pass: str,
-    paging: bool,
+    integ_server: str = EGERIA_INTEGRATION_DAEMON,
+    integ_url: str = EGERIA_INTEGRATION_DAEMON_URL,
+    view_server: str = EGERIA_VIEW_SERVER,
+    view_url: str = EGERIA_VIEW_SERVER_URL,
+    user: str = EGERIA_USER,
+    user_pass: str = EGERIA_USER_PASSWORD,
+    paging: bool = True,
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
     sort: bool = True,
 ):
     s_client = EgeriaTech(view_server, view_url, user, user_pass)
-    token = s_client.create_egeria_bearer_token()
-    server_guid = s_client.get_guid_for_name(integ_server)
 
     def generate_table() -> Table:
         """Make a new table."""
@@ -82,7 +80,9 @@ def display_integration_daemon_status(
         table.add_column("Target Element", min_width=20)
         table.add_column("Exception Message", min_width=10)
 
-        daemon_status = s_client.get_server_report(server_guid)
+        token = s_client.create_egeria_bearer_token()
+        # server_guid = s_client.get_guid_for_name(integ_server)
+        daemon_status = s_client.get_server_report(None, integ_server)
 
         reports = daemon_status["integrationConnectorReports"]
         if sort is True:

{pyegeria-0.8.4.35 → pyegeria-0.8.4.37}/pyegeria/asset_catalog_omvs.py

@@ -24,7 +24,7 @@ class AssetCatalog(Client):
     """Set up and maintain automation services in Egeria.
 
     Attributes:
-        server_name : str
+        view_server : str
             The name of the View Server to use.
         platform_url : str
             URL of the server platform to connect to
@@ -38,17 +38,17 @@ class AssetCatalog(Client):
 
     def __init__(
         self,
-        server_name: str,
+        view_server: str,
         platform_url: str,
         user_id: str,
         user_pwd: str = None,
         token: str = None,
     ):
-        self.server_name = server_name
+        self.view_server = view_server
         self.platform_url = platform_url
         self.user_id = user_id
         self.user_pwd = user_pwd
-        Client.__init__(self, server_name, platform_url, user_id, user_pwd, token=token)
+        Client.__init__(self, view_server, platform_url, user_id, user_pwd, token=token)
 
     async def _async_create_element_from_template(self, body: dict) -> str:
         """Create a new metadata element from a template.  Async version.
@@ -94,7 +94,7 @@ class AssetCatalog(Client):
            }
         """
 
-        url = f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/automated-curation/catalog-templates/new-element"
+        url = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/automated-curation/catalog-templates/new-element"
         response = await self._async_make_request("POST", url, body)
         return response.json().get("guid", "GUID failed to be returned")
 
@@ -357,7 +357,7 @@ class AssetCatalog(Client):
         ignore_case_s = str(ignore_case).lower()
 
         url = (
-            f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/in-domain/"
+            f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/asset-catalog/assets/in-domain/"
             f"by-search-string?startFrom={start_from}&pageSize={page_size}&startsWith={starts_with_s}&"
             f"endWith={ends_with_s}&ignoreCase={ignore_case_s}"
         )
@@ -459,7 +459,7 @@ class AssetCatalog(Client):
         """
 
         url = (
-            f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/{asset_guid}/"
+            f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/asset-catalog/assets/{asset_guid}/"
             f"as-graph?startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -546,7 +546,7 @@ class AssetCatalog(Client):
         """
 
         url = (
-            f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/by-metadata-collection-id/"
+            f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/asset-catalog/assets/by-metadata-collection-id/"
             f"{metadata_collection_id}?startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -627,7 +627,7 @@ class AssetCatalog(Client):
 
         """
 
-        url = f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/types"
+        url = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/asset-catalog/assets/types"
 
         response = await self._async_make_request("GET", url)
 

{pyegeria-0.8.4.35 → pyegeria-0.8.4.37}/pyegeria/automated_curation_omvs.py

@@ -23,7 +23,7 @@ class AutomatedCuration(Client):
     """Set up and maintain automation services in Egeria.
 
     Attributes:
-        server_name : str
+        view_server : str
             The name of the View Server to use.
         platform_url : str
             URL of the server platform to connect to
@@ -38,18 +38,18 @@ class AutomatedCuration(Client):
 
     def __init__(
         self,
-        server_name: str,
+        view_server: str,
         platform_url: str,
         user_id: str,
         user_pwd: str = None,
         token: str = None,
     ):
-        self.server_name = server_name
+        self.view_server = view_server
         self.platform_url = platform_url
         self.user_id = user_id
         self.user_pwd = user_pwd
-        Client.__init__(self, server_name, platform_url, user_id, user_pwd, token=token)
-        self.cur_command_root = f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/automated-curation"
+        Client.__init__(self, view_server, platform_url, user_id, user_pwd, token=token)
+        self.curation_command_root = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/automated-curation"
 
     async def _async_create_element_from_template(self, body: dict) -> str:
         """Create a new metadata element from a template.  Async version.
@@ -95,7 +95,7 @@ class AutomatedCuration(Client):
            }
         """
 
-        url = f"{self.cur_command_root}/catalog-templates/new-element"
+        url = f"{self.curation_command_root}/catalog-templates/new-element"
         response = await self._async_make_request("POST", url, body)
         return response.json().get("guid", "GUID failed to be returned")
 
@@ -1080,7 +1080,7 @@ class AutomatedCuration(Client):
         """
 
         url = (
-            f"{self.cur_command_root}/engine-actions?"
+            f"{self.curation_command_root}/engine-actions?"
             f"startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -1145,7 +1145,7 @@ class AutomatedCuration(Client):
         For more information see: https://egeria-project.org/concepts/engine-action
         """
 
-        url = f"{self.cur_command_root}/engine-actions/" f"{engine_action_guid}"
+        url = f"{self.curation_command_root}/engine-actions/" f"{engine_action_guid}"
 
         response = await self._async_make_request("GET", url)
         return response.json().get("element", "No element found")
@@ -1207,7 +1207,10 @@ class AutomatedCuration(Client):
 
         validate_guid(engine_action_guid)
 
-        url = f"{self.cur_command_root}/engine-actions/" f"{engine_action_guid}/cancel"
+        url = (
+            f"{self.curation_command_root}/engine-actions/"
+            f"{engine_action_guid}/cancel"
+        )
 
         await self._async_make_request("POST", url)
 
@@ -1268,7 +1271,7 @@ class AutomatedCuration(Client):
         """
 
         url = (
-            f"{self.cur_command_root}/engine-actions/active?"
+            f"{self.curation_command_root}/engine-actions/active?"
             f"startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -1346,7 +1349,7 @@ class AutomatedCuration(Client):
         validate_name(name)
 
         url = (
-            f"{self.cur_command_root}/engine-actions/by-name?"
+            f"{self.curation_command_root}/engine-actions/by-name?"
             f"startFrom={start_from}&pageSize={page_size}"
         )
         body = {"filter": name}
@@ -1452,7 +1455,7 @@ class AutomatedCuration(Client):
         ignore_case_s = str(ignore_case).lower()
 
         url = (
-            f"{self.cur_command_root}/engine-actions/"
+            f"{self.curation_command_root}/engine-actions/"
             f"by-search-string?startFrom={start_from}&pageSize={page_size}&startsWith={starts_with_s}&"
             f"endsWith={ends_with_s}&ignoreCase={ignore_case_s}"
         )
@@ -1551,7 +1554,10 @@ class AutomatedCuration(Client):
 
         validate_guid(process_guid)
 
-        url = f"{self.cur_command_root}/" f"governance-action-processes/{process_guid}"
+        url = (
+            f"{self.curation_command_root}/"
+            f"governance-action-processes/{process_guid}"
+        )
 
         response = await self._async_make_request("GET", url)
         return response.json().get("element", "no actions")
@@ -1608,7 +1614,7 @@ class AutomatedCuration(Client):
         validate_guid(process_guid)
 
         url = (
-            f"{self.cur_command_root}/"
+            f"{self.curation_command_root}/"
             f"governance-action-processes/{process_guid}/graph"
         )
 
@@ -1677,7 +1683,7 @@ class AutomatedCuration(Client):
         validate_name(name)
 
         url = (
-            f"{self.cur_command_root}/governance-action-processes/"
+            f"{self.curation_command_root}/governance-action-processes/"
             f"by-name?startFrom={start_from}&pageSize={page_size}"
         )
         body = {"filter": name}
@@ -1775,7 +1781,7 @@ class AutomatedCuration(Client):
         ignore_case_s = str(ignore_case).lower()
 
         url = (
-            f"{self.cur_command_root}/governance-action-processes/"
+            f"{self.curation_command_root}/governance-action-processes/"
             f"by-search-string?startFrom={start_from}&pageSize={page_size}&startsWith={starts_with_s}&"
             f"endsWith={ends_with_s}&ignoreCase={ignore_case_s}"
         )
@@ -1892,7 +1898,7 @@ class AutomatedCuration(Client):
             datetime.datetime.now() if start_time is None else start_time
         )
 
-        url = f"{self.cur_command_root}/governance-action-processes/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-processes/" f"initiate"
         body = {
             "class": "GovernanceActionProcessRequestBody",
             "processQualifiedName": action_type_qualified_name,
@@ -1986,7 +1992,7 @@ class AutomatedCuration(Client):
         validate_guid(gov_action_type_guid)
 
         url = (
-            f"{self.cur_command_root}/"
+            f"{self.curation_command_root}/"
             f"governance-action-types/{gov_action_type_guid}"
         )
 
@@ -2047,7 +2053,7 @@ class AutomatedCuration(Client):
         validate_name(action_type_name)
 
         url = (
-            f"{self.cur_command_root}/"
+            f"{self.curation_command_root}/"
             f"governance-action-types/by-name?startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -2145,7 +2151,7 @@ class AutomatedCuration(Client):
         ignore_case_s = str(ignore_case).lower()
 
         url = (
-            f"{self.cur_command_root}/governance-action-types/"
+            f"{self.curation_command_root}/governance-action-types/"
             f"by-search-string?startFrom={start_from}&pageSize={page_size}&startsWith={starts_with_s}&"
             f"endsWith={ends_with_s}&ignoreCase={ignore_case_s}"
         )
@@ -2252,7 +2258,7 @@ class AutomatedCuration(Client):
 
         """
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
         start = int(start_time.timestamp() * 1000) if start_time else None
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2330,7 +2336,7 @@ class AutomatedCuration(Client):
     ) -> str:
         """Initiate a postgres database survey"""
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2359,7 +2365,7 @@ class AutomatedCuration(Client):
     ) -> str:
         """Initiate a postgres server survey - Async version"""
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2420,7 +2426,7 @@ class AutomatedCuration(Client):
             - AssetSurvey:survey-all-folders-and-files
         """
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2483,7 +2489,7 @@ class AutomatedCuration(Client):
     async def _async_initiate_file_survey(self, file_guid: str) -> str:
         """Initiate a file survey - async version"""
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2519,7 +2525,7 @@ class AutomatedCuration(Client):
 
         """
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2570,7 +2576,7 @@ class AutomatedCuration(Client):
 
         """
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2620,7 +2626,7 @@ class AutomatedCuration(Client):
 
         """
 
-        url = f"{self.cur_command_root}/governance-action-types/" f"initiate"
+        url = f"{self.curation_command_root}/governance-action-types/" f"initiate"
 
         body = {
             "class": "InitiateGovernanceActionTypeRequestBody",
@@ -2674,7 +2680,7 @@ class AutomatedCuration(Client):
     #
     #     """
     #     server = self.view_server if server is None else server
-    #     url = (f"{self.cur_command_root}/governance-action-types/"
+    #     url = (f"{self.curation_command_root}/governance-action-types/"
     #            f"initiate")
     #
     #     body = {"class": "InitiateGovernanceActionTypeRequestBody",
@@ -2720,7 +2726,7 @@ class AutomatedCuration(Client):
     #
     #     """
     #     server = self.view_server if server is None else server
-    #     url = (f"{self.cur_command_root}/governance-action-types/"
+    #     url = (f"{self.curation_command_root}/governance-action-types/"
     #            f"initiate")
     #
     #     body = {"class": "InitiateGovernanceActionTypeRequestBody",
@@ -2766,7 +2772,7 @@ class AutomatedCuration(Client):
     #
     #     """
     #     server = self.view_server if server is None else server
-    #     url = (f"{self.cur_command_root}/governance-action-types/"
+    #     url = (f"{self.curation_command_root}/governance-action-types/"
     #            f"initiate")
     #
     #     body = {"class": "InitiateGovernanceActionTypeRequestBody",
@@ -2854,7 +2860,10 @@ class AutomatedCuration(Client):
 
         """
 
-        url = f"{self.cur_command_root}/governance-engines/" f"engine-actions/initiate"
+        url = (
+            f"{self.curation_command_root}/governance-engines/"
+            f"engine-actions/initiate"
+        )
         body = {
             "class": "GovernanceActionRequestBody",
             "qualifiedName": qualified_name + str(int(start_time.timestamp())),
@@ -2977,7 +2986,7 @@ class AutomatedCuration(Client):
         validate_guid(integ_connector_guid)
 
         url = (
-            f"{self.cur_command_root}/integration-connectors/"
+            f"{self.curation_command_root}/integration-connectors/"
             f"{integ_connector_guid}/catalog-targets?startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -3037,7 +3046,7 @@ class AutomatedCuration(Client):
 
         validate_guid(relationship_guid)
 
-        url = f"{self.cur_command_root}/catalog-targets/" f"{relationship_guid}"
+        url = f"{self.curation_command_root}/catalog-targets/" f"{relationship_guid}"
 
         response = await self._async_make_request("GET", url)
         return response.json().get("element", "no actions")
@@ -3120,7 +3129,7 @@ class AutomatedCuration(Client):
         validate_guid(metadata_element_guid)
 
         url = (
-            f"{self.cur_command_root}/integration-connectors/"
+            f"{self.curation_command_root}/integration-connectors/"
             f"{integ_connector_guid}/catalog-targets/{metadata_element_guid}"
         )
         body = {
@@ -3243,7 +3252,10 @@ class AutomatedCuration(Client):
 
         validate_guid(relationship_guid)
 
-        url = f"{self.cur_command_root}/catalog-targets/" f"{relationship_guid}/update"
+        url = (
+            f"{self.curation_command_root}/catalog-targets/"
+            f"{relationship_guid}/update"
+        )
         body = {
             "catalogTargetName": catalog_target_name,
             "metadataSourceQualifiedName": metadata_src_qual_name,
@@ -3327,7 +3339,10 @@ class AutomatedCuration(Client):
 
         validate_guid(relationship_guid)
 
-        url = f"{self.cur_command_root}/catalog-targets/" f"{relationship_guid}/remove"
+        url = (
+            f"{self.curation_command_root}/catalog-targets/"
+            f"{relationship_guid}/remove"
+        )
 
         await self._async_make_request("POST", url)
         return
@@ -3395,7 +3410,7 @@ class AutomatedCuration(Client):
 
         # validate_name(type_name)
         url = (
-            f"{self.cur_command_root}/open-metadata-types/"
+            f"{self.curation_command_root}/open-metadata-types/"
             f"{type_name}/technology-types?startFrom={start_from}&pageSize={page_size}"
         )
         body = {"filter": tech_name}
@@ -3470,7 +3485,7 @@ class AutomatedCuration(Client):
         """
 
         # validate_name(type_name)
-        url = f"{self.cur_command_root}/technology-types/by-name"
+        url = f"{self.curation_command_root}/technology-types/by-name"
 
         body = {"filter": type_name}
 
@@ -3561,7 +3576,7 @@ class AutomatedCuration(Client):
             search_string = ""
 
         url = (
-            f"{self.cur_command_root}/technology-types/"
+            f"{self.curation_command_root}/technology-types/"
             f"by-search-string?startFrom={start_from}&pageSize={page_size}&startsWith={starts_with_s}&"
             f"endsWith={ends_with_s}&ignoreCase={ignore_case_s}"
         )
@@ -3741,7 +3756,7 @@ class AutomatedCuration(Client):
         validate_name(filter)
 
         url = (
-            f"{self.cur_command_root}/technology-types/elements?"
+            f"{self.curation_command_root}/technology-types/elements?"
             f"startFrom={start_from}&pageSize={page_size}&getTemplates={get_templates_s}"
         )
         body = {"filter": filter, "effective_time": effective_time}