pyegeria 1.5.1.1.19__py3-none-any.whl → 1.5.1.1.22__py3-none-any.whl

pyegeria/commands/cat/glossary_actions.py

@@ -88,12 +88,25 @@ def create_glossary(
 
         existing_glossary = m_client.find_glossaries(name)
         if type(existing_glossary) is list:
-            click.echo(f"\nFound {len(existing_glossary)} existing Glossaries\n")
+            click.echo(
+                f"\nFound {len(existing_glossary)} existing Glossaries with a similar name!\n"
+            )
             for glossary in existing_glossary:
-                click.echo(
-                    f"\tFound glossary: {glossary['glossaryProperties']['qualifiedName']} with id of {glossary['elementHeader']['guid']}\n"
-                )
-            sys.exit(0)
+                if (
+                    glossary["glossaryProperties"]["qualifiedName"]
+                    == "Glossary:" + name
+                ):
+                    click.echo(
+                        (
+                            f"\tFound existing glossary: {glossary['glossaryProperties']['qualifiedName']} with id of {glossary['elementHeader']['guid']}\n"
+                            "Exiting\n"
+                        )
+                    )
+                    sys.exit(0)
+                else:
+                    click.echo(
+                        "Found glossaries with similar names but different qualifiedNames...proceeding\n"
+                    )
 
         glossary_guid = m_client.create_glossary(name, description, language, usage)
         print(f"New glossary {name} created with id of {glossary_guid}")

pyegeria/glossary_manager_omvs.py

@@ -103,7 +103,7 @@ class GlossaryManager(GlossaryBrowser):
             "class": "ReferenceableRequestBody",
             "elementProperties": {
                 "class": "GlossaryProperties",
-                "qualifiedName": f"Glossary:{display_name}-{time.asctime()}",
+                "qualifiedName": f"Glossary:{display_name}",
                 "displayName": display_name,
                 "description": description,
                 "language": language,
@@ -1613,21 +1613,6 @@ class GlossaryManager(GlossaryBrowser):
                     # If upsert is set we need to see if it can be done (there must be a valid qualified name) and then
                     # do the update for the row - if there is no qualified name we will treat the row as an insert.
                     if qualified_name:
-                        body = {
-                            "class": "ReferenceableRequestBody",
-                            "elementProperties": {
-                                "class": "GlossaryTermProperties",
-                                "qualifiedName": qualified_name,
-                                "displayName": term_name,
-                                "summary": summary,
-                                "description": description,
-                                "abbreviation": abbrev,
-                                "examples": examples,
-                                "usage": usage,
-                                "publishVersionIdentifier": version,
-                            },
-                            "initialStatus": status,
-                        }
                         term_stuff = self.get_terms_by_name(
                             qualified_name, glossary_guid
                         )
@@ -1644,6 +1629,21 @@ class GlossaryManager(GlossaryBrowser):
                             continue
                         else:
                             # An existing term was found - so update it!
+                            body = {
+                                "class": "ReferenceableRequestBody",
+                                "elementProperties": {
+                                    "class": "GlossaryTermProperties",
+                                    "qualifiedName": qualified_name,
+                                    "displayName": term_name,
+                                    "summary": summary,
+                                    "description": description,
+                                    "abbreviation": abbrev,
+                                    "examples": examples,
+                                    "usage": usage,
+                                    "publishVersionIdentifier": version,
+                                },
+                                "initialStatus": status,
+                            }
                             term_guid = term_stuff["elementHeader"]["guid"]
                             self.update_term(
                                 term_guid, body_slimmer(body), is_merge_update=True

{pyegeria-1.5.1.1.19.dist-info → pyegeria-1.5.1.1.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 1.5.1.1.19
+Version: 1.5.1.1.22
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0

{pyegeria-1.5.1.1.19.dist-info → pyegeria-1.5.1.1.22.dist-info}/RECORD

@@ -9,6 +9,7 @@ pyegeria/asset_catalog_omvs.py,sha256=NUF9C3s_zs9pTfIZyRJlqMCKrhZASJPH08EXzzjki7
 pyegeria/automated_curation_omvs.py,sha256=BwNuF7XQJAV-POvzaWwFh0TS5yRnHZZPhlayvtIMlwY,130243
 pyegeria/classification_manager_omvs.py,sha256=3yInuRy7Cf43oSFZ8BuzcIgtGSm5BfvlKYqtWKRMlPU,186678
 pyegeria/collection_manager_omvs.py,sha256=kye2kjthNnmwxMZhHQKV0xoHbxcNPWjNzRAYOItj_gY,99201
+pyegeria/commands/.DS_Store,sha256=nBgW7MKJ6b4wSWyEEeGYHWwC8QJAiteQaWKM9PoNRzY,6148
 pyegeria/commands/README.md,sha256=zNfWZppDxoKqTJeRtcewzku9z1m6_hKacCyQUQw1iq4,1974
 pyegeria/commands/__init__.py,sha256=7y3p5oQ2c0C1465oIgSA_123W1uo7Wqwk91LXccUgrw,17
 pyegeria/commands/cat/README.md,sha256=-aaAnIT2fcfU63vajgB-RzQk4l4yFdhkyVfSaTPiqRY,967
@@ -19,7 +20,7 @@ pyegeria/commands/cat/get_project_dependencies.py,sha256=B0JaMSUi0hzVgos1sTY2uUP
 pyegeria/commands/cat/get_project_structure.py,sha256=n2GbNd07w1DTo7jTR8b2ewXRyNcat_2BcCBRyDMldwk,5969
 pyegeria/commands/cat/get_tech_type_elements.py,sha256=-m3Q0BoNqkCtV8h75vMwTcOV-_ymEXmnJcr4Ec7WMAw,6180
 pyegeria/commands/cat/get_tech_type_template.py,sha256=gMFVcgCIm09GQu1Vsc5ZUVH9XLhItAG1eVGZJrcnHeQ,6174
-pyegeria/commands/cat/glossary_actions.py,sha256=Tcpa9wCFo4D_fsfMilnbVoRerr_8f6Bqtw3hAJdcUvw,13493
+pyegeria/commands/cat/glossary_actions.py,sha256=hS3MVbMr279HGsb_anCrUuy4SF0Q_2WATCakD3Gy8Bs,14001
 pyegeria/commands/cat/list_archives.py,sha256=FEZ2XYnQIWo2PztWqnj6unn0pbblPU0-bMbTyI3csv4,5464
 pyegeria/commands/cat/list_assets.py,sha256=bNwSaBDz661hfnc2Rn4j4HPHAugKvz0XwN9L1m4FVQk,6529
 pyegeria/commands/cat/list_cert_types.py,sha256=mbCls_EqC5JKG5rvS4o69k7KgZ6aNXlcqoJ3DtHsTFA,7127
@@ -94,7 +95,7 @@ pyegeria/egeria_tech_client.py,sha256=7NfqpJFft5GR4NPRDVDw22L9caHbXB8fhx0TAf6qEo
 pyegeria/feedback_manager_omvs.py,sha256=B66e3ZCaC_dirb0mcb2Nz3PYh2ZKsoMAYNOb3euNiro,152931
 pyegeria/full_omag_server_config.py,sha256=LBnqUiz1ofBdlKBzECFs_pQbdJwcWigAukWHGJRR2nU,47340
 pyegeria/glossary_browser_omvs.py,sha256=NcitYaZJqwVODBO5zBtWpXPNUJJ3DKzEbRaOFSAyUlg,93554
-pyegeria/glossary_manager_omvs.py,sha256=s9BxAa2UJk5kinS6-U9H6xKqZUG-lp7aqHdNdStaGLs,126294
+pyegeria/glossary_manager_omvs.py,sha256=10o8TThZvD9IZOU9NodaTz8j-FtSjR7p3er94RIB7Mc,126337
 pyegeria/mermaid_utilities.py,sha256=GXiS-subb5nJcDqlThZWX2T8WspU1neFfhf4TxRoMh4,8344
 pyegeria/my_profile_omvs.py,sha256=DyECbUFEcgokrIbzdMMNljC3bqfqKGXAF2wZEpzvRYs,34666
 pyegeria/platform_services.py,sha256=CJIOYIFEbcIGwdWlApAQcXxZTsdrhFtpJcm4O3p7dG0,41646
@@ -106,8 +107,8 @@ pyegeria/template_manager_omvs.py,sha256=heqbKeum5hPCHap4r1RUZU8YB3QaQlxVNbq4GZi
 pyegeria/utils.py,sha256=1h6bwveadd6GpbnGLTmqPBmBk68QvxdjGTI9RfbrgKY,5415
 pyegeria/valid_metadata_omvs.py,sha256=tfCGXed5LLt59YA8uZNNtd9UJ-lRZfPU_uZxK31Yux0,65069
 pyegeria/x_action_author_omvs.py,sha256=xu1IQ0YbhIKi17C5a7Aq9u1Az2czwahNPpX9czmyVxE,6454
-pyegeria-1.5.1.1.19.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyegeria-1.5.1.1.19.dist-info/METADATA,sha256=OoLOd-kJQbZ0WU79fSXM9V4SrXVjoReUeWxiClYAPhQ,2998
-pyegeria-1.5.1.1.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pyegeria-1.5.1.1.19.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
-pyegeria-1.5.1.1.19.dist-info/RECORD,,
+pyegeria-1.5.1.1.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyegeria-1.5.1.1.22.dist-info/METADATA,sha256=yEHoxagZqOfG4aumCO8-amhpuE1Z7CpvlYTKaK8mizY,2998
+pyegeria-1.5.1.1.22.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pyegeria-1.5.1.1.22.dist-info/entry_points.txt,sha256=49rVcJuuKXUSC-9ZNzr-ybsaUL-wm6xrUodCZeKJdGc,4898
+pyegeria-1.5.1.1.22.dist-info/RECORD,,