pyegeria 5.2.1__py3-none-any.whl → 5.3__py3-none-any.whl

pyegeria/project_manager_omvs.py

@@ -6,17 +6,15 @@ Copyright Contributors to the ODPi Egeria project.
     https://egeria-project.org/concepts/project
 
 """
+
 import asyncio
 import time
 
 # import json
 from pyegeria._client import Client
-from pyegeria._validators import (
-    validate_guid,
-    validate_search_string,
-)
+from pyegeria._validators import validate_guid, validate_search_string
 from pyegeria.utils import body_slimmer
-
+from pyegeria._globals import NO_ELEMENTS_FOUND, NO_PROJECTS_FOUND
 
 class ProjectManager(Client):
     """
@@ -334,7 +332,7 @@ class ProjectManager(Client):
 
         resp = await self._async_make_request("POST", url, body_s)
 
-        result = resp.json().get("elements", "No elements found")
+        result = resp.json().get("elements", NO_ELEMENTS_FOUND)
         return result
 
     def get_project_team(
@@ -467,7 +465,7 @@ class ProjectManager(Client):
         )
 
         resp = await self._async_make_request("POST", url, body_s)
-        return resp.json().get("elements", "No elements found")
+        return resp.json().get("elements", NO_ELEMENTS_FOUND)
 
     def find_projects(
         self,
@@ -588,7 +586,7 @@ class ProjectManager(Client):
         )
 
         resp = await self._async_make_request("POST", url, body_s)
-        return resp.json().get("elements", "No elements found")
+        return resp.json().get("elements", NO_PROJECTS_FOUND)
 
     def get_projects_by_name(
         self,
@@ -637,7 +635,7 @@ class ProjectManager(Client):
 
         return resp
 
-    async def _async_get_project(
+    async def _async_get_project_by_guid(
         self,
         project_guid: str,
         effective_time: str = None,
@@ -677,9 +675,9 @@ class ProjectManager(Client):
         url = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/project-manager/projects/{project_guid}"
 
         resp = await self._async_make_request("GET", url, body)
-        return resp.json()
+        return resp.json().get('element',NO_ELEMENTS_FOUND)
 
-    def get_project(self, project_guid: str, effective_time: str = None) -> dict | str:
+    def get_project_by_guid(self, project_guid: str, effective_time: str = None) -> dict | str:
         """Return the properties of a specific project.
 
         Parameters
@@ -709,11 +707,87 @@ class ProjectManager(Client):
         """
         loop = asyncio.get_event_loop()
         resp = loop.run_until_complete(
-            self._async_get_project(project_guid, effective_time)
+            self._async_get_project_by_guid(project_guid, effective_time)
+        )
+
+        return resp
+
+    async def _async_get_project_graph(
+        self,
+        project_guid: str,
+        effective_time: str = None,
+    ) -> dict | str:
+        """Return the mermaid graph of a specific project. Async version.
+
+        Parameters
+        ----------
+        project_guid: str,
+            unique identifier of the project.
+        effective_time: str, [default=None], optional
+             Effective time of the query. If not specified will default to any time. Time in ISO8601 format is assumed.
+
+
+        Returns
+        -------
+         str
+
+            A mermaid markdown string representing the graph of the project.
+        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
+
+        """
+
+        validate_guid(project_guid)
+        body = {
+            "effective_time": effective_time,
+        }
+        url = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/project-manager/projects/{project_guid}/graph"
+
+        resp = await self._async_make_request("GET", url, body)
+        return resp.json().get('element',NO_ELEMENTS_FOUND)
+
+    def get_project_graph(self, project_guid: str, effective_time: str = None) -> dict | str:
+        """Return the mermaid graph of a specific project.
+
+        Parameters
+        ----------
+        project_guid: str,
+            unique identifier of the project.
+        effective_time: str, [default=None], optional
+             Effective time of the query. If not specified will default to any time. Time in ISO8601 format is assumed.
+
+
+        Returns
+        -------
+         str
+
+            A mermaid markdown string representing the graph of the project.
+        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
+
+        """
+        loop = asyncio.get_event_loop()
+        resp = loop.run_until_complete(
+            self._async_get_project_graph(project_guid, effective_time)
         )
 
         return resp
 
+
     #
     #   Create project methods
     #
@@ -1447,7 +1521,7 @@ class ProjectManager(Client):
 
     async def _async_delete_project(
         self,
-        project_guid: str,
+        project_guid: str, cascade: bool = False
     ) -> None:
         """Delete a project.  It is detected from all parent elements. Async version
 
@@ -1455,7 +1529,8 @@ class ProjectManager(Client):
         ----------
         project_guid: str
             The guid of the project to update.
-
+        cascade: bool, optional, defaults to False
+            If true, then all anchored elements will be deleted.
 
         Returns
         -------
@@ -1471,10 +1546,10 @@ class ProjectManager(Client):
           The principle specified by the user_id does not have authorization for the requested action
 
         """
-
+        cascade_s = str(cascade).lower()
         url = (
             f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/project-manager/projects/"
-            f"{project_guid}/delete"
+            f"{project_guid}/delete?cascadedDelete={cascade_s}"
         )
 
         body = {"class": "NullRequestBody"}
@@ -1484,7 +1559,7 @@ class ProjectManager(Client):
 
     def delete_project(
         self,
-        project_guid: str,
+        project_guid: str, cascade: bool = False
     ) -> None:
         """Delete a project.  It is detected from all parent elements.
 
@@ -1492,8 +1567,12 @@ class ProjectManager(Client):
         ----------
         project_guid: str
             The guid of the collection to update.
+        cascade: bool, optional, defaults to False
+            If true, then all anchored elements will be deleted.
 
 
+        cascade: bool, optional, defaults to False
+            If true, then all anchored elements will be deleted.
         Returns
         -------
         Nothing
@@ -1510,7 +1589,7 @@ class ProjectManager(Client):
 
         """
         loop = asyncio.get_event_loop()
-        loop.run_until_complete(self._async_delete_project(project_guid))
+        loop.run_until_complete(self._async_delete_project(project_guid, cascade))
         return
 
     async def _async_add_to_project_team(

pyegeria/runtime_manager_omvs.py

@@ -5,18 +5,15 @@ Copyright Contributors to the ODPi Egeria project.
 Runtime manager is a view service that supports user interaction with the running platforms.
 
 """
+
 import asyncio
 
 from requests import Response
-
-from pyegeria import (
-    Client,
-    max_paging_size,
-    body_slimmer,
-    InvalidParameterException,
-    default_time_out,
-)
-
+from pyegeria.utils import body_slimmer
+from pyegeria._client import Client
+from pyegeria import TEMPLATE_GUIDS, max_paging_size,default_time_out
+from pyegeria._exceptions import InvalidParameterException
+from pyegeria._globals import NO_ELEMENTS_FOUND
 
 class RuntimeManager(Client):
     """
@@ -53,7 +50,8 @@ class RuntimeManager(Client):
         self.time_out = time_out
         Client.__init__(self, view_server, platform_url, user_id, user_pwd, token=token)
         self.runtime_command_root = f"{self.platform_url}/servers/{self.view_server}/api/open-metadata/runtime-manager"
-        self.platform_guid = "44bf319f-1e41-4da1-b771-2753b92b631a"  # this is platform @ 9443 from the core content archive
+        # self.platform_guid = "44bf319f-1e41-4da1-b771-2753b92b631a"  # this is platform @ 9443 from the core content archive
+        self.platform_guid = None
         self.default_platform_name = (
             "Default Local OMAG Server Platform"  # this from the core content archive
         )

pyegeria/server_operations.py

@@ -10,9 +10,9 @@ import asyncio
 
 from requests import Response
 
-from pyegeria import Platform
+from pyegeria.platform_services import Platform
 from pyegeria._validators import validate_name
-
+from pyegeria._globals import NO_ELEMENTS_FOUND
 
 class ServerOps(Platform):
     """