pyegeria 5.2.0.42.7__tar.gz → 5.2.1__tar.gz

{pyegeria-5.2.0.42.7 → pyegeria-5.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 5.2.0.42.7
+Version: 5.2.1
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0
@@ -14,18 +14,17 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: confluent-kafka (>=2.5.0,<3.0.0)
-Requires-Dist: httpx (>=0.27,<0.28)
+Requires-Dist: httpx
 Requires-Dist: jupyter (>=1.0.0,<2.0.0)
-Requires-Dist: mermaid-py (>=0.5.3,<0.6.0)
+Requires-Dist: mermaid-py
 Requires-Dist: psycopg2-binary (>=2.9.9,<3.0.0)
 Requires-Dist: pytest (>=8.2.2,<9.0.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: rich (>=13,<14)
-Requires-Dist: rich-pixels (>=3.0.1,<4.0.0)
-Requires-Dist: textual (>=0.86,<0.87)
+Requires-Dist: requests
+Requires-Dist: rich
+Requires-Dist: textual
 Requires-Dist: trogon (>=0.6.0,<0.7.0)
-Requires-Dist: urllib3 (>=2.2.2,<3.0.0)
-Requires-Dist: validators (>=0.32.0,<0.33.0)
+Requires-Dist: urllib3
+Requires-Dist: validators
 Project-URL: Repository, https://github.com/odpi/egeria-python
 Description-Content-Type: text/markdown
 

{pyegeria-5.2.0.42.7 → pyegeria-5.2.1}/pyegeria/commands/cat/glossary_actions.py

@@ -127,7 +127,7 @@ def create_glossary(
 @click.option("--userid", default=EGERIA_USER, help="Egeria user")
 @click.option("--password", default=EGERIA_USER_PASSWORD, help="Egeria user password")
 @click.option("--timeout", default=60, help="Number of seconds to wait")
-@click.argument("glossary-guid", default=EGERIA_HOME_GLOSSARY_GUID)
+@click.argument("glossary-guid")
 def delete_glossary(server, url, userid, password, timeout, glossary_guid):
     """Delete the glossary specified"""
     m_client = EgeriaTech(server, url, user_id=userid, user_pwd=password)
@@ -164,7 +164,7 @@ def delete_glossary(server, url, userid, password, timeout, glossary_guid):
     "--status",
     help="Status",
     type=click.Choice(
-        ["DRAFT", "ACTIVE", "DEPRACATED", "OBSOLETE", "OTHER"], case_sensitive=False
+        ["DRAFT", "ACTIVE", "DEPRECATED", "OBSOLETE", "OTHER"], case_sensitive=False
     ),
     default="DRAFT",
 )
@@ -329,7 +329,6 @@ def import_terms(
 @click.command("export-terms")
 @click.option(
     "--glossary_guid",
-    default=EGERIA_HOME_GLOSSARY_GUID,
     help="GUID of Glossary to export",
     required=True,
 )

{pyegeria-5.2.0.42.7 → pyegeria-5.2.1}/pyegeria/commands/cli/egeria_cat.py

@@ -138,6 +138,12 @@ from pyegeria.commands.tech.list_asset_types import display_asset_types
     default=os.environ.get("EGERIA_HOME_GLOSSARY_GUID", None),
     help="Glossary guid to use as the home glossary",
 )
+@click.option(
+    "--glossary_path",
+    default=os.environ.get("EGERIA_GLOSSARY_PATH", "/home/jovyan/loading-bay/glossary"),
+    help="Path to glossary import/export files",
+)
+
 @click.pass_context
 def cli(
     ctx,
@@ -157,6 +163,7 @@ def cli(
     jupyter,
     width,
     home_glossary_guid,
+    glossary_path
 ):
     """An Egeria Command Line interface for Operations"""
     ctx.obj = Config(
@@ -176,6 +183,7 @@ def cli(
         jupyter,
         width,
         home_glossary_guid,
+        glossary_path,
     )
     ctx.max_content_width = 250
     ctx.ensure_object(Config)
@@ -622,27 +630,7 @@ tell_todo.add_command(delete_todo)
 tell_todo.add_command(create_todo)
 
 
-# @tell.group("survey")
-# @click.pass_context
-# def survey(ctx):
-#     """Refresh the specified integration connector or ALL connectors if not specified"""
-#     c = ctx.obj
-#     pass
-
-
-# @survey.command("survey-uc-server")
-# @click.pass_context
-# @click.option(
-#     "--uc_endpoint",
-#     default="https://localhost:8080",
-#     help="Endpoint of the Unity Catalog Server to Survey",
-# )
-# def survey_uc_server(ctx, uc_endpoint):
-#     """Survey the Unity Catalog server at the given endpoint"""
-#     c = ctx.obj
-#     pass
-#     # restart_connector(connector, c.integration_daemon, c.integration_daemon_url,
-#     #                   c.userid, c.password)
+
 
 
 if __name__ == "__main__":

{pyegeria-5.2.0.42.7 → pyegeria-5.2.1}/pyegeria/commands/cli/ops_config.py

@@ -4,22 +4,23 @@ import click
 class Config(object):
     def __init__(
         self,
-        server: str = None,
-        url: str = None,
-        view_server: str = "view-server",
-        view_server_url: str = "https://localhost:9443",
-        integration_daemon: str = "integration_daemon",
-        integration_daemon_url: str = "https://localhost:9443",
-        engine_host: str = "engine-host",
-        engine_host_url: str = "https://localhost:9443",
-        admin_user: str = "garygeeke",
-        admin_user_password: str = "secret",
-        userid: str = None,
-        password: str = None,
-        timeout: int = 30,
-        jupyter: bool = False,
-        width: int = 200,
-        home_glossary_guid: str = None,
+        server: str ,
+        url: str ,
+        view_server: str ,
+        view_server_url: str,
+        integration_daemon: str,
+        integration_daemon_url: str,
+        engine_host: str,
+        engine_host_url: str,
+        admin_user: str ,
+        admin_user_password: str ,
+        userid: str ,
+        password: str ,
+        timeout: int ,
+        jupyter: bool ,
+        width: int ,
+        home_glossary_guid: str ,
+        glossary_path: str,
     ):
         self.metadata_store = server
         self.metadata_store_url = url
@@ -39,6 +40,6 @@ class Config(object):
         self.server = server
         self.url = url
         self.home_glossary_guid = home_glossary_guid
-
+        self.glossary_path = glossary_path
 
 pass_config = click.make_pass_decorator(Config)

{pyegeria-5.2.0.42.7 → pyegeria-5.2.1}/pyegeria/glossary_manager_omvs.py

@@ -1845,7 +1845,12 @@ class GlossaryManager(GlossaryBrowser):
                 count += 1
         return count
 
-    def export_glossary_to_csv(self, glossary_guid: str, target_file: str) -> int:
+    def export_glossary_to_csv(
+        self,
+        glossary_guid: str,
+        target_file: str,
+        file_path: str = os.environ.get("EGERIA_GLOSSARY_PATH", None),
+    ) -> int:
         """Export all the terms in a glossary to a CSV file.
 
         Parameters:
@@ -1854,6 +1859,9 @@ class GlossaryManager(GlossaryBrowser):
             Identity of the glossary to export.
         target_file: str
             Complete file name with path and extension to export to.
+        file_path: str, default is EGERIA_GLOSSARY_PATH if specified or None
+                If EGERIA_GLOSSARY_PATH environment variable is set, then it will be used in forming the
+                prepended to the filename parameter to form the full path to the file.
 
         Returns:
             int: Number of rows exported.
@@ -1861,7 +1869,7 @@ class GlossaryManager(GlossaryBrowser):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_export_glossary_to_csv(glossary_guid, target_file)
+            self._async_export_glossary_to_csv(glossary_guid, target_file, file_path)
         )
 
         return response

{pyegeria-5.2.0.42.7 → pyegeria-5.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyegeria"
-version = "5.2.0.42.7"
+version = "5.2.1"
 license = 'Apache 2.0'
 authors = ["Dan Wolfson <dan.wolfson@pdr-associates.com>"]
 readme = "README.md"
@@ -27,21 +27,20 @@ packages = [
 #python = "^3.11" # 3.12 seemed to fail
 python = "^3.12.3"
 #python = "^3.13" Need to upgrade jupyter image
-httpx = "^0.27"
-rich = "^13"
-validators = "^0.32.0"
-urllib3 = "^2.2.2"
-requests = "^2.32.3"
+httpx = "*"
+rich = "*"
+validators = "*"
+urllib3 = "*"
+requests = "*"
 confluent-kafka = "^2.5.0"
 pytest = "^8.2.2"
 jupyter = "^1.0.0"
 click = "^8.1.7"
 trogon = "^0.6.0"
-#textual-forms = "^0.3.0"
-textual = "^0.86"
-mermaid-py = "^0.5.3"
+textual = "*"
+mermaid-py = "*"
 psycopg2-binary = "^2.9.9"
-rich-pixels = "^3.0.1"
+
 
 [build-system]
 requires = ["poetry-core"]