pyegeria 5.4.0.dev3__tar.gz → 5.4.0.dev6__tar.gz

{pyegeria-5.4.0.dev3 → pyegeria-5.4.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyegeria
-Version: 5.4.0.dev3
+Version: 5.4.0.dev6
 Summary: A python client for Egeria
 License: Apache 2.0
 Keywords: egeria,metadata,governance

{pyegeria-5.4.0.dev3 → pyegeria-5.4.0.dev6}/commands/cat/dr_egeria_md.py

@@ -24,7 +24,10 @@ from md_processing import (extract_command, process_glossary_upsert_command, pro
                            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_dict_list_command,
+                                                              process_data_collection_list_command,
+                                                              process_data_structure_list_command,
+                                                              process_data_field_list_command,
+                                                              process_data_class_list_command,
                                                               process_data_field_upsert_command,
                                                               process_data_structure_upsert_command,
                                                               process_data_class_upsert_command)
@@ -160,8 +163,14 @@ def process_markdown_file(file_path: 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"]:
-                result = process_data_dict_list_command(client, current_block, directive)
+            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)
+            elif potential_command in ["View Data Fields", "View Data Field"]:
+                result = process_data_field_list_command(client, current_block, directive)
+            elif potential_command in ["View Data Classes", "View Data Class"]:
+                result = process_data_class_list_command(client, current_block, directive)
 
 
             else:

{pyegeria-5.4.0.dev3 → pyegeria-5.4.0.dev6}/commands/cat/list_collections.py

@@ -134,22 +134,23 @@ def display_collections(
         )
         if type(collections) is list:
             sorted_collection_list = sorted(
-                collections, key=lambda k: k["name"]
+                collections, key=lambda k: k["display_name"]
             )
             for collection in sorted_collection_list:
-                display_name = collection["name"]
-                qualified_name = collection["qualifiedName"]
-                guid = collection["guid"]
+                display_name = collection["display_name"]
+                qualified_name = collection["qualified_name"]
+                guid = collection["GUID"]
                 q_name = Text(f"{qualified_name}\n&\n{guid}", justify="center")
                 description = collection.get("description",'---')
                 collection_type = collection.get("collectionType", "---")
                 classifications = collection.get("classifications", "---")
+
                 classifications_md = Markdown(classifications)
-                members_struct = m_client.get_collection_members(collection_guid=guid)
+                members_struct = m_client.get_member_list(collection_guid=guid)
                 member_list = ""
                 if isinstance(members_struct, list):
                     for member in members_struct:
-                        member_list = member_list + f"- {member['properties'].get('qualifiedName','---')}\n"
+                        member_list = member_list + f"- {member.get('qualifiedName','---')}\n"
 
                 # members = "\n* ".join(collection.get("members", []))
                 members_md = Markdown(member_list)

{pyegeria-5.4.0.dev3 → pyegeria-5.4.0.dev6}/commands/cat/list_data_designer.py

@@ -28,6 +28,7 @@ from pyegeria import (
     PropertyServerException,
     UserNotAuthorizedException,
     print_exception_response,
+    NO_ELEMENTS_FOUND
 )
 
 disable_ssl_warnings = True
@@ -54,7 +55,7 @@ EGERIA_OUTBOX_PATH = os.environ.get("EGERIA_OUTBOX_PATH", "md_processing/dr_eger
 console = Console(width=EGERIA_WIDTH)
 
 
-def display_categories(
+def display_data_obj(
     object_type: str,
     search_string: str = "*",
     view_server: str = EGERIA_VIEW_SERVER,
@@ -97,8 +98,14 @@ def display_categories(
             find_proc = m_client.find_data_fields
         case "Data Classes":
             find_proc = m_client.find_data_classes
+        case _: #catch invalid patterns
+            print(f"Invalid object type: {object_type}")
+            return
 
     try:
+        if not callable(find_proc):
+            raise TypeError(f"find_proc is not callable for object type '{object_type}'")
+
         if output_format == "FORM":
             action = "Update-Form"
         elif output_format == "REPORT":
@@ -109,7 +116,7 @@ def display_categories(
             full_file_path = os.path.join(file_path, file_name)
             os.makedirs(os.path.dirname(full_file_path), exist_ok=True)
             output = find_proc(search_string, output_format=output_format)
-            if output == "NO_ELEMENTSS_FOUND":
+            if output == NO_ELEMENTS_FOUND:
                 print(f"\n==> No elements found for search string '{search_string}'")
                 return
             with open(full_file_path, 'w') as f:
@@ -117,7 +124,10 @@ def display_categories(
             print(f"\n==> Elements output written to {full_file_path}")
             return
         else:
-            output = find_proc(search_string, output_format=output_format)
+            output =find_proc(search_string, output_format="LIST")
+            if output == NO_ELEMENTS_FOUND:
+                print(f"\n==> No elements found for search string '{search_string}'")
+                return
             console.print(Markdown(output))
             return
 
@@ -131,9 +141,9 @@ def display_categories(
 
 
 def main_structs():
-    main(object_type = "Data Structure")
+    main(object_type = "Data Structures")
 
-def main_fileds():
+def main_fields():
     main(object_type = "Data Fields")
 
 def main_classes():
@@ -141,7 +151,7 @@ def main_classes():
 
 def main(object_type: str="Data Fields"):
     parser = argparse.ArgumentParser()
-    parser.add_argument("--object", choices=["Data Structure", "Data Fields", "Data Classes"])
+    parser.add_argument("--kind", choices=["Data Structures", "Data Fields", "Data Classes"])
     parser.add_argument("--server", help="Name of the server to display status for")
     parser.add_argument("--url", help="URL Platform to connect to")
     parser.add_argument("--userid", help="User Id")
@@ -153,15 +163,16 @@ def main(object_type: str="Data Fields"):
     url = args.url if args.url is not None else EGERIA_PLATFORM_URL
     userid = args.userid if args.userid is not None else EGERIA_USER
     user_pass = args.password if args.password is not None else EGERIA_USER_PASSWORD
+    kind = args.kind if args.kind is not None else object_type
 
     try:
         search_string = Prompt.ask(
-            "Enter the category you are searching for or '*' for all:", default="*"
+            "Enter the element you are searching for or '*' for all:", default="*"
         )
         output_format = Prompt.ask("What output format do you want?", choices=["TABLE", "FORM", "REPORT"],
                                    default="TABLE")
-        object_type = object if not None else object_type
-        display_categories(object_type, search_string, server, url, userid,
+
+        display_data_obj(kind, search_string, server, url, userid,
                            user_pass, output_format = output_format)
 
     except KeyboardInterrupt:

{pyegeria-5.4.0.dev3 → pyegeria-5.4.0.dev6}/md_Processing/data/commands.json

@@ -1,6 +1,6 @@
 {
   "Command Specifications": {
-    "exported": "Jun 15, 2025 at 1:18:01 PM",
+    "exported": "Jun 20, 2025 at 8:22:20 AM",
     "Data Dictionary": {
       "display_name": "Data Dictionary",
       "qn_prefix": "DataDict",
@@ -1572,7 +1572,7 @@
             "attr_labels": "",
             "examples": "string, int, list",
             "default_value": "string",
-            "valid_values": "Integer; String; Float; Big Int; Big Decimal; Double; Float; Char; integer; string; float; list; dict; str",
+            "valid_values": "string; int; long; date; boolean; char; byte; float; double; biginteger; bigdecimal; array<string>; array<int>; map<string,string>; map<string, boolean>; map<string, int>; map<string, long>; map<string,double>; map<string, date> map<string, object>; short; map<string, array<string>>; other",
             "existing_element": "",
             "description": "The data type of the data field. Point to data type valid value list if exists.",
             "qualified_name_pattern": "",
@@ -3200,7 +3200,7 @@
         }
       ]
     },
-    "View Data fields": {
+    "View Data Fields": {
       "display_name": "View Data Fields",
       "qn_prefix": "",
       "alternate_names": "List Data Fields",
@@ -3250,9 +3250,9 @@
             "variable_name": "",
             "inUpdate": true,
             "attr_labels": "Format",
-            "examples": "List, Form, Report",
-            "default_value": "List",
-            "valid_values": "List; Form; Report; Dict",
+            "examples": "LIST",
+            "default_value": "LIST",
+            "valid_values": "LIST; FORM; REPORT; MERMAID; DICT",
             "existing_element": "",
             "description": "Optional specification of output format for the query.",
             "qualified_name_pattern": "",
@@ -3293,10 +3293,135 @@
             "isAnchor": false,
             "min_cardinality": 0,
             "max_cardinality": 1,
+            "level": "INVISIBLE",
+            "Journal Entry": ""
+          }
+        },
+        {
+          "Effective Time": {
+            "variable_name": "effective_time",
+            "inUpdate": true,
+            "attr_labels": "",
+            "examples": "",
+            "default_value": "",
+            "valid_values": "",
+            "existing_element": "",
+            "description": "An ISO-8601 string representing the time to use for evaluating effectivity of the elements related to this one.",
+            "qualified_name_pattern": "",
+            "generated": false,
+            "style": "Simple",
+            "user_specified": true,
+            "unique": false,
+            "input_required": false,
+            "position": 0,
+            "ReferenceURL": "",
+            "isParent": false,
+            "isAnchor": false,
+            "min_cardinality": 1,
+            "max_cardinality": 1,
+            "level": "Advanced",
+            "Journal Entry": ""
+          }
+        }
+      ]
+    },
+    "View Data Classes": {
+      "display_name": "View Data Fields",
+      "qn_prefix": "",
+      "alternate_names": "List Data Class; View Data Class; List Data Class",
+      "description": "Return the data classes, optionally filtered by the search string.",
+      "upsert": false,
+      "list": false,
+      "details": false,
+      "form": false,
+      "ReferenceURL": "",
+      "isOwnAnchor": true,
+      "parent_relationship_type_name": "",
+      "parent_at_end1": true,
+      "style": "display",
+      "anchor_scope_id": "",
+      "parent_id": "",
+      "level": "Basic",
+      "Journal Entry": "",
+      "Attributes": [
+        {
+          "Search String": {
+            "variable_name": "",
+            "inUpdate": true,
+            "attr_labels": "Filter",
+            "examples": "",
+            "default_value": "*",
+            "valid_values": "",
+            "existing_element": "",
+            "description": "An optional search string to filter results by.",
+            "qualified_name_pattern": "",
+            "generated": false,
+            "style": "Simple",
+            "user_specified": true,
+            "unique": false,
+            "input_required": false,
+            "position": 0,
+            "ReferenceURL": "",
+            "isParent": false,
+            "isAnchor": false,
+            "min_cardinality": 0,
+            "max_cardinality": 1,
             "level": "Basic",
             "Journal Entry": ""
           }
         },
+        {
+          "Output Format": {
+            "variable_name": "",
+            "inUpdate": true,
+            "attr_labels": "Format",
+            "examples": "LIST, FORM",
+            "default_value": "LIST",
+            "valid_values": "LIST; FORM; REPORT; MERMAID; DICT",
+            "existing_element": "",
+            "description": "Optional specification of output format for the query.",
+            "qualified_name_pattern": "",
+            "generated": false,
+            "style": "Valid Value",
+            "user_specified": true,
+            "unique": false,
+            "input_required": false,
+            "position": 0,
+            "ReferenceURL": "",
+            "isParent": false,
+            "isAnchor": false,
+            "min_cardinality": 0,
+            "max_cardinality": 1,
+            "level": "Basic",
+            "Journal Entry": ""
+          }
+        },
+        {
+          "Detailed": {
+            "variable_name": "detailed",
+            "inUpdate": true,
+            "attr_labels": "",
+            "examples": "True; False",
+            "default_value": "True",
+            "valid_values": "",
+            "existing_element": "",
+            "description": "If true a more detailed set of attributes will be teturned.",
+            "qualified_name_pattern": "",
+            "generated": false,
+            "style": "Bool",
+            "user_specified": true,
+            "unique": false,
+            "input_required": false,
+            "position": 0,
+            "ReferenceURL": "",
+            "isParent": false,
+            "isAnchor": false,
+            "min_cardinality": 0,
+            "max_cardinality": 1,
+            "level": "INVISIBLE",
+            "Journal Entry": ""
+          }
+        },
         {
           "Effective Time": {
             "variable_name": "effective_time",
@@ -3418,7 +3543,7 @@
             "isAnchor": false,
             "min_cardinality": 0,
             "max_cardinality": 1,
-            "level": "Basic",
+            "level": "INVISIBLE",
             "Journal Entry": ""
           }
         },
@@ -3500,9 +3625,9 @@
             "variable_name": "",
             "inUpdate": true,
             "attr_labels": "Format",
-            "examples": "List, Form, Report",
-            "default_value": "List",
-            "valid_values": "List; Form; Report; Dict",
+            "examples": "LIST, FORM, REPORT",
+            "default_value": "LIST",
+            "valid_values": "LIST; FORM; DICT; MD; MERMAID; REPORT",
             "existing_element": "",
             "description": "Optional specification of output format for the query.",
             "qualified_name_pattern": "",
@@ -3543,7 +3668,7 @@
             "isAnchor": false,
             "min_cardinality": 0,
             "max_cardinality": 1,
-            "level": "Basic",
+            "level": "INVISIBLE",
             "Journal Entry": ""
           }
         },
@@ -3902,8 +4027,8 @@
             "inUpdate": true,
             "attr_labels": "Format",
             "examples": "List, Form, Report",
-            "default_value": "List",
-            "valid_values": "List; Form; Report; Dict",
+            "default_value": "LIST",
+            "valid_values": "LIST; FORM; DICT; MD; MERMAID; REPORT",
             "existing_element": "",
             "description": "Optional specification of output format for the query.",
             "qualified_name_pattern": "",
@@ -3929,7 +4054,7 @@
             "attr_labels": "",
             "examples": "BASIC",
             "default_value": "CORE",
-            "valid_values": "BASIC; CORE;  FULL",
+            "valid_values": "BASIC; CORE;  FULL; INVISIBLE",
             "existing_element": "",
             "description": "Defines the set of attributes displayed for a given output type.",
             "qualified_name_pattern": "",
@@ -3944,7 +4069,7 @@
             "isAnchor": false,
             "min_cardinality": 0,
             "max_cardinality": 1,
-            "level": "Basic",
+            "level": "Invisible",
             "Journal Entry": "BASIC - just show the basic properties  of the collection without members, additional properties or extended properties.\nCORE - add members, additional properties\n FULL - add anchor, parent, etc?\n\n"
           }
         }
@@ -6694,7 +6819,7 @@
     "View Solution Components": {
       "display_name": "View Solution Components",
       "qn_prefix": "",
-      "alternate_names": "List Detailed Data Structures",
+      "alternate_names": "View Components",
       "description": "Return the data structure details, optionally filtered by the search string.",
       "upsert": false,
       "list": false,
@@ -6819,7 +6944,7 @@
     "View Solution Blueprints": {
       "display_name": "View Solution Blueprints",
       "qn_prefix": "",
-      "alternate_names": "List Detailed Data Structures",
+      "alternate_names": "View Blueprints; List Solution Blueprints",
       "description": "Return the data structure details, optionally filtered by the search string.",
       "upsert": false,
       "list": false,

{pyegeria-5.4.0.dev3 → pyegeria-5.4.0.dev6}/md_processing/__init__.py

@@ -12,7 +12,10 @@ from md_processing.md_commands.solution_architect_commands import (process_bluep
 from md_processing.md_commands.data_designer_commands import (process_data_field_upsert_command,
                                                               process_data_spec_upsert_command,
                                                               process_data_dict_upsert_command,
-                                                              process_data_dict_list_command,
+                                                              process_data_collection_list_command,
+                                                              process_data_structure_list_command,
+                                                              process_data_field_list_command,
+                                                              process_data_class_list_command,
                                                               process_data_structure_upsert_command)
 
 from md_processing.md_commands.glossary_commands import (process_glossary_upsert_command, process_glossary_list_command,