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

commands/cat/dr_egeria_md.py

@@ -64,7 +64,7 @@ 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(file_path: 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.
     """
@@ -75,7 +75,7 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
     token = client.create_egeria_bearer_token(userid, user_pass)
 
     updated = False
-    full_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_INBOX_PATH, file_path)
+    full_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_INBOX_PATH, input_file)
     logger.info("\n\n====================================================\n\n")
     logger.info(f"Processing Markdown File: {full_file_path}")
     try:
@@ -87,7 +87,7 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
 
     final_output = []
     prov_found = False
-    prov_output = (f"\n# Provenance\n\n* Results from processing file {file_path} on "
+    prov_output = (f"\n# Provenance\n\n* Results from processing file {input_file} on "
                    f"{datetime.now().strftime("%Y-%m-%d %H:%M")}\n")
     h1_blocks = []
     current_block = ""
@@ -104,7 +104,7 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
         if potential_command in cmd_list:
             # Process the block based on the object_action
             if potential_command == "Provenance":
-                result = process_provenance_command(file_path, current_block)
+                result = process_provenance_command(input_file, current_block)
                 prov_found = True
 
             elif potential_command in ["Create Glossary", "Update Glossary"]:
@@ -233,7 +233,7 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
 
     try:
         if updated:
-            path, filename = os.path.split(file_path)  # Get both parts
+            path, filename = os.path.split(input_file)  # Get both parts
             new_filename = f"processed-{get_current_datetime_string()}-{filename}"  # Create the new filename
             new_file_path = os.path.join(EGERIA_ROOT_PATH, EGERIA_OUTBOX_PATH, new_filename)  # Construct the new path
             os.makedirs(os.path.dirname(new_file_path), exist_ok=True)
@@ -267,11 +267,11 @@ def process_markdown_file(file_path: str, directive: str, server: str, url: str,
 #     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
 #     time_out = args.time_out if args.time_out is not None else 60
 #     try:
-#         file_path = Prompt.ask("Markdown File name to process:", default="")
+#         input_file = Prompt.ask("Markdown File name to process:", default="")
 #         directive = Prompt.ask("Processing Directive:", choices=[ "display", "validate", "process"],
 #         default="validate")
 #
-#         process_markdown_file(file_path, directive, server, url, userid, user_pass)
+#         process_markdown_file(input_file, directive, server, url, userid, user_pass)
 #     except KeyboardInterrupt:
 #         pass
 #

commands/cat/glossary_actions.py

@@ -315,7 +315,7 @@ def remove_term_from_category(server, url, userid, password, timeout, term_guid,
 @click.option("--glossary_name", help="Name of Glossary", required=True)
 @click.option("--file_name", help="Name of CSV file", required=True)
 @click.option(
-    "--file_path", help="Path of CSV file", default=EGERIA_GLOSSARY_PATH, required=False
+    "--input_file", help="Path of CSV file", default=EGERIA_GLOSSARY_PATH, required=False
 )
 @click.option(
     "--verbose",
@@ -380,7 +380,7 @@ def import_terms_csv(
 )
 @click.option("--file_name", help="Name of CSV file", required=True)
 @click.option(
-    "--file_path", help="Path of CSV file", default=EGERIA_GLOSSARY_PATH, required=False
+    "--input_file", help="Path of CSV file", default=EGERIA_GLOSSARY_PATH, required=False
 )
 @click.option("--server", default=EGERIA_VIEW_SERVER, help="Egeria view server to use")
 @click.option(

md_processing/md_commands/data_designer_commands.py

@@ -63,8 +63,12 @@ def add_member_to_data_collections(egeria_client: EgeriaTech, collection_list: l
     Add member to data dictionaries and data specifications.
     """
     body = {
-        "class": "CollectionMembershipProperties", "membershipRationale": "User Specified",
-        "notes": "Added by Dr.Egeria"
+        "class": "RelationshipRequestBody",
+        "properties": {
+            "class": "CollectionMembershipProperties",
+            "membershipRationale": "User Specified",
+            "notes": "Added by Dr.Egeria"
+            }
         }
     try:
         if collection_list is not None:
@@ -526,10 +530,11 @@ def process_data_spec_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                     logger.error(msg)
                     return None
                 else:
-                    guid = egeria_client.create_data_spec_collection(anchor_guid, parent_guid,
-                                                                     parent_relationship_type_name, parent_at_end1,
-                                                                     display_name, description, collection_type,
-                                                                     anchor_scope_guid, is_own_anchor, qualified_name)
+                    guid = egeria_client.create_data_spec_collection(display_name, description,
+                                                                     is_own_anchor, anchor_guid, parent_guid, parent_relationship_type_name,
+                                                                     parent_at_end1, collection_type,
+                                                                     anchor_scope_guid, collection_ordering,order_property_name,
+                                                                     additional_properties, extended_properties)
                     if guid:
                         update_element_dictionary(qualified_name, {
                             'guid': guid, 'display_name': display_name
@@ -639,12 +644,12 @@ def process_data_dict_upsert_command(egeria_client: EgeriaTech, txt: str, direct
                                  f"`Create` to `Update` in processed output\n\n___")
                     return update_a_command(txt, object_action, object_type, qualified_name, guid)
                 else:
-                    guid = egeria_client.create_data_dictionary_collection(anchor_guid, parent_guid,
-                                                                           parent_relationship_type_name,
-                                                                           parent_at_end1, display_name, description,
-                                                                           collection_type, anchor_scope_guid,
-                                                                           is_own_anchor, qualified_name,
-                                                                           additional_properties, extended_properties)
+                    guid = egeria_client.create_data_dictionary_collection(display_name,description, is_own_anchor, anchor_guid,
+                                                                           parent_guid, parent_relationship_type_name,
+                                                                           parent_at_end1, collection_type,
+                                                                           anchor_scope_guid, collection_ordering,
+                                                                           order_property_name, additional_properties,
+                                                                           extended_properties)
                     if guid:
                         update_element_dictionary(qualified_name, {
                             'guid': guid, 'display_name': display_name

md_processing/md_commands/glossary_commands.py

@@ -527,6 +527,7 @@ def process_term_upsert_command(egeria_client: EgeriaTech, txt: str, directive:
     else:
         known_glossary_q_name, known_glossary_guid, glossary_valid, glossary_exists = process_element_identifiers(
             egeria_client, "Glossary", GLOSSARY_NAME_LABELS, txt, EXISTS_REQUIRED, None)
+# Todo - add logic to fail if no valid glossary provided.
 
     # process categories, if present
     categories = process_simple_attribute(txt, ['Glossary Categories', 'Glossary Category', 'Category', 'Categories'])