pyegeria 5.4.7.5__py3-none-any.whl → 5.4.7.6__py3-none-any.whl

commands/ops/monitor_engine_activity.py

@@ -109,7 +109,7 @@ def display_engine_activity(
         table.add_column("Process Name")
         table.add_column("Completion Message")
 
-        action_status = g_client.get_engine_actions()
+        action_status = g_client.get_active_engine_actions()
 
         if type(action_status) is str:
             requested_time = " "

md_processing/md_commands/solution_architect_commands.py

@@ -534,7 +534,7 @@ def process_solution_component_upsert_command(egeria_client: EgeriaTech, txt: st
 
                 else:
                     body = body_slimmer({
-                        "class": "NewSolutionElementRequestBody",
+                        "class": "NewElementRequestBody",
                         "anchorGUID": anchor_guid,
                         "isOwnAnchor": is_own_anchor,
                         "parentGUID": parent_guid,

pyegeria/automated_curation.py

@@ -1737,154 +1737,6 @@ class AutomatedCuration(Client2):
     #
     # Engine Actions
     #
-    async def _async_get_engine_actions(
-            self, start_from: int = 0, page_size: int = 0, body: dict | GetRequestBody = None,
-            output_format: str = "JSON", output_format_set: str | dict = "EngineAction"
-    ) -> list | str:
-        """Retrieve the engine actions that are known to the server. Async version.
-        Parameters
-        ----------
-
-        start_from : int, optional
-            The starting index of the actions to retrieve. Default is 0.
-        page_size : int, optional
-            The maximum number of actions to retrieve per page. Default is the global maximum paging size.
-        body: dict, optional
-            If provided, supersedes the other parameters. Allows advanced options.
-
-        Returns
-        -------
-        [dict]
-            A list of engine action descriptions as JSON.
-
-        Raises
-        ------
-                PyegeriaException
-        ValidationError
-
-        Notes
-        -----
-        For more information see: https://egeria-project.org/concepts/engine-action
-        sample body:
-            {
-              "class": "GetRequestBody",
-              "asOfTime": "{{$isoTimestamp}}",
-              "effectiveTime": "{{$isoTimestamp}}",
-              "forLineage": false,
-              "forDuplicateProcessing": false
-            }
-        """
-        url = (
-            f"{self.curation_command_root}/engine-actions?startFrom={start_from}&pageSize={page_size}"
-        )
-
-        # return await self._async_get_guid_request(url, "EngineAction", _generate_default_output,
-        #                                          output_format="JSON", output_format_set="Referenceable", body=body )
-        response = await self._async_make_request("GET", url)
-        elements = response.json().get("elements", "No element found")
-        # Apply formatter if not raw JSON requested
-        return self._generate_engine_action_output(elements, None, self.ENGINE_ACTION_LABEL,
-                                                   output_format=output_format, output_format_set=output_format_set)
-
-    def get_engine_actions(
-            self, start_from: int = 0, page_size: int = 0, body: dict | GetRequestBody = None,
-            output_format: str = "JSON", output_format_set: str | dict = "EngineAction"
-    ) -> list | str:
-        """Retrieve the engine actions that are known to the server.
-        Parameters
-        ----------
-        start_from : int, optional
-            The starting index of the actions to retrieve. Default is 0.
-        page_size : int, optional
-            The maximum number of actions to retrieve per page. Default is the global maximum paging size.
-        body: dict, optional
-            If provided, supersedes the other parameters. Allows advanced options.
-
-        Returns
-        -------
-        [dict]
-            A list of engine action descriptions as JSON.
-
-        Raises
-        ------
-                PyegeriaException
-        ValidationError
-
-        Notes
-        -----
-        For more information see: https://egeria-project.org/concepts/engine-action
-        sample body:
-            {
-              "class": "GetRequestBody",
-              "asOfTime": "{{$isoTimestamp}}",
-              "effectiveTime": "{{$isoTimestamp}}",
-              "forLineage": false,
-              "forDuplicateProcessing": false
-            }
-        """
-        loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(
-            self._async_get_engine_actions(start_from, page_size, body,
-                                           output_format=output_format, output_format_set=output_format_set)
-        )
-        return response
-
-    async def _async_get_engine_action(self, engine_action_guid: str) -> dict:
-        """Request the status and properties of an executing engine action request. Async version.
-        Parameters
-        ----------
-        engine_action_guid : str
-            The GUID of the engine action to retrieve.
-
-
-
-        Returns
-        -------
-        dict
-            The JSON representation of the engine action.
-
-        Raises
-        ------
-                PyegeriaException
-        ValidationError
-
-
-        Notes
-        -----
-        For more information see: https://egeria-project.org/concepts/engine-action
-        """
-
-        url = f"{self.curation_command_root}/engine-actions/{engine_action_guid}"
-
-        response = await self._async_make_request("GET", url)
-        return response.json().get("element", "No element found")
-
-    def get_engine_action(self, engine_action_guid: str) -> dict:
-        """Request the status and properties of an executing engine action request.
-        Parameters
-        ----------
-        engine_action_guid : str
-            The GUID of the engine action to retrieve.
-
-
-
-        Returns
-        -------
-        dict
-            The JSON representation of the engine action.
-
-        Raises
-        ------
-        PyegeriaException
-        Notes
-        -----
-        For more information see: https://egeria-project.org/concepts/engine-action
-        """
-        loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(
-            self._async_get_engine_action(engine_action_guid)
-        )
-        return response
 
     async def _async_cancel_engine_action(self, engine_action_guid: str) -> None:
         """Request that an engine action request is cancelled and any running governance service is stopped. Async Ver.
@@ -1944,7 +1796,7 @@ class AutomatedCuration(Client2):
 
     async def _async_get_active_engine_actions(
             self, start_from: int = 0, page_size: int = 0,
-            output_format: str = "JSON", output_format_set: str | dict = "EngineAction"
+            output_format: str = "JSON", output_format_set: str | dict = "EngineAction",
     ) -> list | str:
         """Retrieve the engine actions that are still in process. Async Version.
 
@@ -1976,13 +1828,20 @@ class AutomatedCuration(Client2):
         )
 
         response = await self._async_make_request("GET", url)
-        elements = response.json().get("elements", "no actions")
-        return self._generate_engine_action_output(elements, None, self.ENGINE_ACTION_LABEL,
-                                                   output_format=output_format, output_format_set=output_format_set)
+        elements = response.json().get("elements", "No actions found")
+        if type(elements) is str:
+            logger.info("No Actions Found")
+            return "No Actions Found"
+
+        if output_format.upper() != 'JSON':  # return a simplified markdown representation
+            # logger.info(f"Found elements, output format: {output_format} and output_format_set: {output_format_set}")
+            return self._generate_engine_action_output(elements, None, "EngineAction",
+                               output_format, output_format_set)
+        return elements
 
     def get_active_engine_actions(
             self, start_from: int = 0, page_size: int = 0,
-            output_format: str = "JSON", output_format_set: str | dict = "EngineAction"
+            output_format: str = "JSON", output_format_set: str | dict = "EngineAction",
     ) -> list | str:
         """Retrieve the engine actions that are still in process.
 

pyegeria/solution_architect.py

@@ -1619,7 +1619,8 @@ class SolutionArchitect(Client2):
 
         return self.find_information_supply_chains("*", classification_names, metadata_element_types, starts_with, ends_with, ignore_case, start_from, page_size, output_format, output_format_set, body)
 
-    async def _async_find_information_supply_chains(self, search_string: str = "*", classification_names: list[str] = None,
+    async def _async_find_information_supply_chains(self, search_string: str = "*", add_implementation: bool = True,
+                                                    classification_names: list[str] = None,
                                                     metadata_element_types: list[str] = None,
                                                     starts_with: bool = True, ends_with: bool = False,
                                                     ignore_case: bool = False, start_from: int = 0,
@@ -1682,7 +1683,7 @@ class SolutionArchitect(Client2):
 
             """
 
-        url = f"{self.solution_architect_command_root}/information-supply-chains/by-search-string"
+        url = f"{self.solution_architect_command_root}/information-supply-chains/by-search-string?addImplementation={add_implementation}"
         return await self._async_find_request(url, _type="GovernanceDefinition",
                                               _gen_output=self.generate_info_supply_chain_output,
                                               search_string=search_string, classification_names=classification_names,
@@ -1694,7 +1695,8 @@ class SolutionArchitect(Client2):
 
 
 
-    def find_information_supply_chains(self, search_string: str = "*", classification_names: list[str] = None,
+    def find_information_supply_chains(self, search_string: str = "*",  add_implementation: bool = False,
+                                    classification_names: list[str] = None,
                                     metadata_element_types: list[str] = None,
                                     starts_with: bool = True, ends_with: bool = False,
                                     ignore_case: bool = False, start_from: int = 0,
@@ -1763,7 +1765,7 @@ class SolutionArchitect(Client2):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_find_information_supply_chains(search_string, classification_names, metadata_element_types,
+            self._async_find_information_supply_chains(search_string, add_implementation,classification_names, metadata_element_types,
                                                        starts_with, ends_with, ignore_case,
                                                        start_from, page_size,  output_format,
                                                        output_format_set, body))

{pyegeria-5.4.7.5.dist-info → pyegeria-5.4.7.6.dist-info}/METADATA

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

{pyegeria-5.4.7.5.dist-info → pyegeria-5.4.7.6.dist-info}/RECORD

@@ -48,7 +48,7 @@ commands/ops/list_archives.py,sha256=jKm_easQUjJNRkuasILvuVpQBFuyyBlBHE-L0i0FGgQ
 commands/ops/list_catalog_targets.py,sha256=imtWWp71xObsN_-FDyUCcSjgzFKcAPXCtVRNm8ee_m4,7665
 commands/ops/load_archive.py,sha256=DRmwPq2MOaaW87icgM3vu8oSSAD4vwtCaA2DGr3brBU,3008
 commands/ops/monitor_asset_events.py,sha256=5XXWt5yvl9mGq1Lve9gdrWT0dvvTWpFr_lFWO-_WdaU,3883
-commands/ops/monitor_engine_activity.py,sha256=AVSOtxlKBSM5yrh9YsOk5agevZMhLGPjT8j0uaVWjqU,9897
+commands/ops/monitor_engine_activity.py,sha256=7PFDTZmOs8b2Uy_8VgSvUu5PH1tVefAKNrnY-ZF2kww,9904
 commands/ops/monitor_engine_activity_c.py,sha256=OlN72BaK_Abgp_HlYWa-aF8jhL0JqhZl7wFK9_QvzwY,10774
 commands/ops/monitor_gov_eng_status.py,sha256=gK5HXewXKnLEjCBRkbEyzbGtWs998P-AoFKaMCAQBLs,9917
 commands/ops/monitor_integ_daemon_status.py,sha256=N09KaP1eA3OiGfRS4GgbjKxnkheMYK6oQojNbuO6KRo,11828
@@ -103,7 +103,7 @@ md_processing/md_commands/glossary_commands.py,sha256=g0SHac8Gu_rtaUcscJYZHEbKDl
 md_processing/md_commands/governance_officer_commands.py,sha256=c7SnJqQooPr3zCebDzeztAM8wZq9G7ZB4EpJ-uR5moI,26479
 md_processing/md_commands/product_manager_commands.py,sha256=4YKKdd_2tI5ekZlSJBiJJGqFISD7X6m0rfEd2wEL_PY,57790
 md_processing/md_commands/project_commands.py,sha256=GXipp2o40o1syakH8pJ8lFO2y5mrZw4UZVcjTSPiIF8,17107
-md_processing/md_commands/solution_architect_commands.py,sha256=4Ghb8j2wlDdWtHoSCrx5jCJFEJfqII4mnFJ_tqduRKI,52569
+md_processing/md_commands/solution_architect_commands.py,sha256=FKBn-kO6Eqs39D04zhBDYM3CUl6HJP2Wt1yNORtRkkc,52561
 md_processing/md_commands/view_commands.py,sha256=bIOSw0GVluOcpZMQNioeO1Srr4Y_84YNz-VHMKpPfVE,12092
 md_processing/md_processing_utils/__init__.py,sha256=LxAmxlcji26ziKV4gGar01d95gL9vgToRIeJW8N-Ifs,80
 md_processing/md_processing_utils/common_md_proc_utils.py,sha256=gT9Xc2BlZZe7MBRpENfz2As95N3oGk4LRko1dg9AGyI,58673
@@ -127,7 +127,7 @@ pyegeria/_output_format_models.py,sha256=p9fTYaIa5KyTMIR4-JAbE9g66_gGMPTnUqjIq20
 pyegeria/_output_formats.py,sha256=0IXO8ol5nuZAtttBfQPYoUyEa3qX1RlkMLons2Xrmi8,184307
 pyegeria/_validators.py,sha256=pNxND0dN2qvyuGE52N74l1Ezfrh2p9Hao2ziR_t1ENI,7425
 pyegeria/asset_catalog_omvs.py,sha256=sBXPgkRe_ZFOunZ-xoZe4qndILf9L0dPRHpQb_95bHw,29030
-pyegeria/automated_curation.py,sha256=yI06WLkaCEVgmVJIMr-jNAqk7c7Ef9aXSUamBgs8Avs,146949
+pyegeria/automated_curation.py,sha256=34N4stE52OENMJHIuESm4TiR4B5AlyH_WV_o-8szEHM,142016
 pyegeria/classification_manager.py,sha256=wT42fqcdtu9qt3N9_gazxDzkjK63tc5Xg6uG801Opmk,250435
 pyegeria/classification_manager_omvs.py,sha256=QkcH33BmdoOnyM9Ojwi084ULC3BaesZV6_a-pNyYkcU,184192
 pyegeria/collection_manager.py,sha256=kNIo1XXoG5b7tQpSZWNnkjZ8lp8X8pTamyvGZmmkqe8,239194
@@ -164,14 +164,14 @@ pyegeria/reference_data.py,sha256=QWyTjrk-xfpIs578GxQO9gtOyl1gdc4PXhD12mbkwwI,42
 pyegeria/registered_info.py,sha256=y0-LgDIQXpph0lEWxIOG3_HsqX_Z2iAIb3xu4Aa4B70,6344
 pyegeria/runtime_manager_omvs.py,sha256=k0lwSuOrbql_UoJ7Rf4fgh-SQQbiii4CQbvOUlaejyM,80302
 pyegeria/server_operations.py,sha256=dTqUEmX1B77b0x61OSU0aonsW8KwIpfzb3eioRpwaiI,16832
-pyegeria/solution_architect.py,sha256=WQtbAJLOPeU2db9wT6IoOJikoTAmxASVw2fgath-QUc,233700
+pyegeria/solution_architect.py,sha256=dqtHIYMNug8vb4x7juyb_moWGDOeh4bkAwHuhz53GXA,233914
 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=XyRsUgN-xnWR-cJayzo5RtY4Xv1uBDML4pwaKHrwC1w,6430
-pyegeria-5.4.7.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-5.4.7.5.dist-info/METADATA,sha256=cOZDV2TIQinDhnTDxqH7UvDd0vZZrl38_5rnuvXt96o,5898
-pyegeria-5.4.7.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyegeria-5.4.7.5.dist-info/entry_points.txt,sha256=Ig9cZyl-nq_RohLvahgWXzZbcpHzLS3Zdc1A8qvdPG0,6595
-pyegeria-5.4.7.5.dist-info/top_level.txt,sha256=48Mt-O3p8yO7jiEv6-Y9bUsryqJn9BQsiyV0BqSn8tk,32
-pyegeria-5.4.7.5.dist-info/RECORD,,
+pyegeria-5.4.7.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-5.4.7.6.dist-info/METADATA,sha256=FN5gJq9nKqd-vmXtGw9gweZEZySzxfZ27PpQF7MKt2s,5898
+pyegeria-5.4.7.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyegeria-5.4.7.6.dist-info/entry_points.txt,sha256=Ig9cZyl-nq_RohLvahgWXzZbcpHzLS3Zdc1A8qvdPG0,6595
+pyegeria-5.4.7.6.dist-info/top_level.txt,sha256=48Mt-O3p8yO7jiEv6-Y9bUsryqJn9BQsiyV0BqSn8tk,32
+pyegeria-5.4.7.6.dist-info/RECORD,,