pyegeria 5.4.0.dev10__py3-none-any.whl → 5.4.0.dev12__py3-none-any.whl

commands/cat/dr_egeria_md.py

@@ -1,12 +1,15 @@
 """
 This is an ongoing experiment in parsing and playing with Freddie docs
 """
-import os, sys
+import os
+import sys
 from datetime import datetime
+
 from loguru import logger
+
 log_format = "{time} | {level} | {function} | {line} | {message} | {extra}"
 logger.remove()
-logger.add(sys.stderr, level="SUCCESS", format=log_format, colorize=True)
+logger.add(sys.stderr, level="INFO", format=log_format, colorize=True)
 logger.add("debug_log.log", rotation="1 day", retention="1 week", compression="zip", level="TRACE", format=log_format,
            colorize=True)
 import click
@@ -16,12 +19,13 @@ from rich.console import Console
 from md_processing import (extract_command, process_glossary_upsert_command, process_term_upsert_command,
                            process_category_upsert_command, process_provenance_command, get_current_datetime_string,
                            process_per_proj_upsert_command, command_list, process_blueprint_upsert_command,
-                           process_solution_component_upsert_command, process_term_list_command,
+                           process_solution_component_upsert_command, process_component_link_unlink_command,
+                           process_term_list_command,
                            process_category_list_command, process_glossary_list_command, process_term_history_command,
                            process_glossary_structure_command, process_term_revision_history_command,
                            process_create_term_term_relationship_command, process_term_details_command,
-                           process_information_supply_chain_upsert_command, process_information_supply_chain_segment_upsert_command,
-                           process_information_supply_chain_link_unlink_command,process_sol_arch_list_command)
+                           process_information_supply_chain_upsert_command,
+                           process_information_supply_chain_link_unlink_command, process_sol_arch_list_command)
 from md_processing.md_commands.data_designer_commands import (process_data_spec_upsert_command,
                                                               process_data_dict_upsert_command,
                                                               process_data_collection_list_command,
@@ -64,7 +68,8 @@ EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "md_processing/dr_eger
 @click.option("--userid", default=EGERIA_USER, help="Egeria user")
 @click.option("--user_pass", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 @logger.catch
-def process_markdown_file(input_file: str, directive: str, server: str, url: str, userid: str, user_pass: str, ) -> None:
+def process_markdown_file(input_file: str, directive: str, server: str, url: str, userid: str,
+                          user_pass: str, ) -> None:
     """
     Process a markdown file by parsing and executing Dr. Egeria md_commands. Write output to a new file.
     """
@@ -135,20 +140,24 @@ def process_markdown_file(input_file: str, directive: str, server: str, url: str
                                        "Update Solution Blueprint"]:
                 result = process_blueprint_upsert_command(client, current_block, directive)
             elif potential_command in ["View Solution Blueprints", "View Blueprint", "View Solution Blueprint"]:
-                result = process_sol_arch_list_command(client, current_block, "Solution Blueprints",directive)
+                result = process_sol_arch_list_command(client, current_block, "Solution Blueprints", directive)
             elif potential_command in ["View Solution Component", "View Solution Components"]:
-                result = process_sol_arch_list_command(client, current_block, "Solution Components",directive)
+                result = process_sol_arch_list_command(client, current_block, "Solution Components", directive)
             elif potential_command in ["View Solution Roles", "View Solution Role"]:
-                result = process_sol_arch_list_command(client, current_block, "Solution Roles",directive)
+                result = process_sol_arch_list_command(client, current_block, "Solution Roles", directive)
             elif potential_command in ["View Information Supply Chain", "View Information Supply Chains"]:
-                result = process_sol_arch_list_command(client, current_block, "Information Supply Chains",directive)
+                result = process_sol_arch_list_command(client, current_block, "Information Supply Chains", directive)
             elif potential_command in ["Create Solution Component", "Update Solution Component"]:
                 result = process_solution_component_upsert_command(client, current_block, directive)
+            elif potential_command in ["Link Solution Components", "Link Solution Component Peers", "Wire Solution Components",
+                                       "Unlink Solution Components", "Detach Solution Components", "Detach Solution Component Peers"]:
+                result = process_component_link_unlink_command(client, current_block, directive)
             elif potential_command in ["Create Information Supply Chain", "Update Information Supply Chain"]:
                 result = process_information_supply_chain_upsert_command(client, current_block, directive)
-            elif potential_command in ["Create Information Supply Chain Segment", "Update Information Supply Chain Segment"]:
-                result = process_information_supply_chain_segment_upsert_command(client, current_block, directive)
-            elif potential_command in ["Link Segments", "Detach Segments"]:
+
+            elif potential_command in ["Link Information Supply Chain Peers", "Link Information Supply Chains",
+                                       "Link Supply Chains", "Unlink Information Supply Chain Peers",
+                                       "Unlink Information Supply Chains", "Unlink Supply Chains"]:
                 result = process_information_supply_chain_link_unlink_command(client, current_block, directive)
 
             elif potential_command in ["Create Data Spec", "Create Data Specification", "Update Data Spec",
@@ -163,7 +172,8 @@ def process_markdown_file(input_file: str, directive: str, server: str, url: str
                 result = process_data_structure_upsert_command(client, current_block, directive)
             elif potential_command in ["Create Data Class", "Update Data Class"]:
                 result = process_data_class_upsert_command(client, current_block, directive)
-            elif potential_command in ["View Data Dictionaries", "View Data Dictionary", "View Data Specifications", "View Data Specs"]:
+            elif potential_command in ["View Data Dictionaries", "View Data Dictionary", "View Data Specifications",
+                                       "View Data Specs"]:
                 result = process_data_collection_list_command(client, current_block, directive)
             elif potential_command in ["View Data Structures", "View Data Structure"]:
                 result = process_data_structure_list_command(client, current_block, directive)

commands/cat/list_collections.py

@@ -87,14 +87,21 @@ def display_collections(
             action = "Report"
         elif output_format == "DICT":
             action = "Dict"
+        elif output_format == "HTML":
+            action = "html"
+        elif output_format == "LIST":
+            action = "List"
 
         if output_format != "TABLE":
             file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH)
-            file_name = f"Terms-{time.strftime('%Y-%m-%d-%H-%M-%S')}-{action}.md"
+            if output_format == "HTML":
+                file_name = f"Collections-{time.strftime('%Y-%m-%d-%H-%M-%S')}-{action}.html"
+            else:
+                file_name = f"Collections-{time.strftime('%Y-%m-%d-%H-%M-%S')}-{action}.md"
             full_file_path = os.path.join(file_path, file_name)
             os.makedirs(os.path.dirname(full_file_path), exist_ok=True)
             output = m_client.find_collections(
-                search_string.strip(), None, None, False, ends_with=False, ignore_case=True,
+                search_string.strip(), None, True, False, ignore_case=True,
                 output_format=output_format
                 )
             if output == NO_ELEMENTS_FOUND:
@@ -129,7 +136,7 @@ def display_collections(
         table.add_column("Members")
 
         collections = m_client.find_collections(
-            search_string.strip(), None, None, False, ends_with=False, ignore_case=True,
+            search_string.strip(), None, True, False, ignore_case=True,
             output_format = "DICT"
         )
         if type(collections) is list:
@@ -200,7 +207,7 @@ def main():
         search_string = Prompt.ask(
             "Enter the collection you are searching for or '*' for all:", default="*"
         ).strip()
-        output_format = Prompt.ask("What output format do you want?", choices=["DICT", "TABLE", "FORM", "REPORT"], default="TABLE")
+        output_format = Prompt.ask("What output format do you want?", choices=["DICT", "TABLE", "FORM", "REPORT", "HTML", "LIST"], default="TABLE")
 
         display_collections(search_string, server, url, userid, user_pass, output_format = output_format)
 

md_processing/__init__.py

@@ -2,10 +2,12 @@
 This package contains functions to parse and process Egeria Markdown (Freddie)
 """
 
+from md_processing.md_commands.product_manager_commands import (process_digital_product_upsert_command,)
+
 from md_processing.md_commands.solution_architect_commands import (process_blueprint_upsert_command,
                                                                    process_solution_component_upsert_command,
+                                                                   process_component_link_unlink_command,
                                                                    process_information_supply_chain_upsert_command,
-                                                                   process_information_supply_chain_segment_upsert_command,
                                                                    process_information_supply_chain_link_unlink_command,
                                                                    process_sol_arch_list_command)