pyegeria 0.8.4.31__tar.gz → 0.8.4.33__tar.gz

{pyegeria-0.8.4.31 → pyegeria-0.8.4.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyegeria
-Version: 0.8.4.31
+Version: 0.8.4.33
 Summary: A python client for Egeria
 Home-page: https://github.com/odpi/egeria-python
 License: Apache 2.0
@@ -19,6 +19,7 @@ Requires-Dist: confluent-kafka (>=2.5.0,<3.0.0)
 Requires-Dist: httpx (>=0.27.0,<0.28.0)
 Requires-Dist: jupyter (>=1.0.0,<2.0.0)
 Requires-Dist: mermaid-py (>=0.5.3,<0.6.0)
+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.8.1,<14.0.0)

{pyegeria-0.8.4.31 → pyegeria-0.8.4.33}/commands/cat/list_glossary.py

@@ -53,8 +53,8 @@ def display_glossary_terms(
     jupyter: bool = EGERIA_JUPYTER,
     width: int = EGERIA_WIDTH,
 ):
-    g_client = GlossaryBrowser(server, url)
-    token = g_client.create_egeria_bearer_token(username, user_password)
+    g_client = GlossaryBrowser(server, url, username, user_password)
+    token = g_client.create_egeria_bearer_token()
 
     def generate_table(search_string: str = "*") -> Table:
         """Make a new table."""

{pyegeria-0.8.4.31 → pyegeria-0.8.4.33}/commands/ops/load_archive.py

@@ -58,8 +58,11 @@ def load_archive(file, server, view_server, url, userid, password, timeout):
     try:
         s_client = EgeriaTech(view_server, url, userid, password)
         token = s_client.create_egeria_bearer_token()
-        server_guid = s_client.get_guid_for_name(server)
-        s_client.add_archive_file(file, server_guid, time_out=timeout)
+        # server_guid = s_client.get_guid_for_name(server)
+        server_guid = None
+        s_client.add_archive_file(
+            file, server_guid, EGERIA_METADATA_STORE, time_out=timeout
+        )
 
         click.echo(f"Loaded archive: {file}")
 

{pyegeria-0.8.4.31 → pyegeria-0.8.4.33}/pyegeria/asset_catalog_omvs.py

@@ -44,19 +44,18 @@ class AssetCatalog(Client):
         user_pwd: str = None,
         token: str = None,
     ):
+        self.server_name = server_name
+        self.platform_url = platform_url
+        self.user_id = user_id
+        self.user_pwd = user_pwd
         Client.__init__(self, server_name, platform_url, user_id, user_pwd, token=token)
-        self.cur_command_root = f"{platform_url}/servers/"
 
-    async def _async_create_element_from_template(
-        self, body: dict, server: str = None
-    ) -> str:
+    async def _async_create_element_from_template(self, body: dict) -> str:
         """Create a new metadata element from a template.  Async version.
         Parameters
         ----------
         body : str
             The json body used to instantiate the template.
-        server : str, optional
-           The name of the view server to use. If not provided, the default server name will be used.
 
         Returns
         -------
@@ -95,13 +94,11 @@ class AssetCatalog(Client):
            }
         """
 
-        server = self.server_name if server is None else server
-
-        url = f"{self.platform_url}/servers/{server}/api/open-metadata/automated-curation/catalog-templates/new-element"
+        url = f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/automated-curation/catalog-templates/new-element"
         response = await self._async_make_request("POST", url, body)
         return response.json().get("guid", "GUID failed to be returned")
 
-    def create_element_from_template(self, body: dict, server: str = None) -> str:
+    def create_element_from_template(self, body: dict) -> str:
         """Create a new metadata element from a template.  Async version.
         Parameters
         ----------
@@ -148,12 +145,12 @@ class AssetCatalog(Client):
         """
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_create_element_from_template(body, server)
+            self._async_create_element_from_template(body)
         )
         return response
 
     async def _async_create_kafka_server_element_from_template(
-        self, kafka_server: str, host_name: str, port: str, server: str = None
+        self, kafka_server: str, host_name: str, port: str
     ) -> str:
         """Create a Kafka server element from a template. Async version.
 
@@ -168,9 +165,6 @@ class AssetCatalog(Client):
         port : str
             The port number of the Kafka server.
 
-        server : str, optional
-            The name of the view server to use. Default uses the client instance.
-
         Returns
         -------
         str
@@ -186,11 +180,11 @@ class AssetCatalog(Client):
                 "portNumber": port,
             },
         }
-        response = await self._async_create_element_from_template(body, server)
+        response = await self._async_create_element_from_template(body)
         return response
 
     def create_kafka_server_element_from_template(
-        self, kafka_server: str, host_name: str, port: str, server: str = None
+        self, kafka_server: str, host_name: str, port: str
     ) -> str:
         """Create a Kafka server element from a template.
 
@@ -205,9 +199,6 @@ class AssetCatalog(Client):
         port : str
             The port number of the Kafka server.
 
-        server : str, optional
-            The name of the view server to use. Default uses the client instance.
-
         Returns
         -------
         str
@@ -216,7 +207,7 @@ class AssetCatalog(Client):
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_create_kafka_server_element_from_template(
-                kafka_server, host_name, port, server
+                kafka_server, host_name, port
             )
         )
         return response
@@ -228,7 +219,6 @@ class AssetCatalog(Client):
         port: str,
         db_user: str,
         db_pwd: str,
-        server: str = None,
     ) -> str:
         """Create a Postgres server element from a template. Async version.
 
@@ -249,9 +239,6 @@ class AssetCatalog(Client):
         db_pwd: str
             User password to connect to the database
 
-        server : str, optional
-            The name of the view server to use. Default uses the client instance.
-
         Returns
         -------
         str
@@ -268,7 +255,7 @@ class AssetCatalog(Client):
                 "databasePassword": db_pwd,
             },
         }
-        response = await self._async_create_element_from_template(body, server)
+        response = await self._async_create_element_from_template(body)
         return response
 
     def create_postgres_server_element_from_template(
@@ -278,7 +265,6 @@ class AssetCatalog(Client):
         port: str,
         db_user: str,
         db_pwd: str,
-        server: str = None,
     ) -> str:
         """Create a Postgres server element from a template.
 
@@ -293,9 +279,6 @@ class AssetCatalog(Client):
         port : str
             The port number of the Postgres server.
 
-        server : str, optional
-            The name of the view server to use. Default uses the client instance.
-
         db_user: str
             User name to connect to the database
 
@@ -310,7 +293,7 @@ class AssetCatalog(Client):
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
             self._async_create_postgres_server_element_from_template(
-                postgres_server, host_name, port, db_user, db_pwd, server
+                postgres_server, host_name, port, db_user, db_pwd
             )
         )
         return response
@@ -327,7 +310,6 @@ class AssetCatalog(Client):
         starts_with: bool = True,
         ends_with: bool = False,
         ignore_case: bool = True,
-        server: str = None,
         time_out: int = 60,
     ) -> list | str:
         """Retrieve the list of engine action metadata elements that contain the search string. Async Version.
@@ -336,9 +318,6 @@ class AssetCatalog(Client):
         search_string : str
             The string used for searching engine actions by name.
 
-        server : str, optional
-            The name of the server. If None, will use the default server specified in the instance will be used.
-
         starts_with : bool, optional
             Whether to search engine actions that start with the given search string. Default is False.
 
@@ -370,16 +349,15 @@ class AssetCatalog(Client):
         -----
         For more information see: https://egeria-project.org/concepts/engine-action
         """
-        server = self.server_name if server is None else server
+
         validate_search_string(search_string)
-        # if search_string == "*":
-        #     search_string = None
+
         starts_with_s = str(starts_with).lower()
         ends_with_s = str(ends_with).lower()
         ignore_case_s = str(ignore_case).lower()
 
         url = (
-            f"{self.platform_url}/servers/{server}/api/open-metadata/asset-catalog/assets/in-domain/"
+            f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/in-domain/"
             f"by-search-string?startFrom={start_from}&pageSize={page_size}&startsWith={starts_with_s}&"
             f"endWith={ends_with_s}&ignoreCase={ignore_case_s}"
         )
@@ -395,7 +373,6 @@ class AssetCatalog(Client):
         starts_with: bool = True,
         ends_with: bool = False,
         ignore_case: bool = True,
-        server: str = None,
         time_out: int = 60,
     ) -> list | str:
         """Retrieve the list of engine action metadata elements that contain the search string. Async Version.
@@ -404,9 +381,6 @@ class AssetCatalog(Client):
         search_string : str
             The string used for searching engine actions by name.
 
-        server : str, optional
-            The name of the server. If None, will use the default server specified in the instance will be used.
-
         starts_with : bool, optional
             Whether to search engine actions that start with the given search string. Default is False.
 
@@ -447,7 +421,6 @@ class AssetCatalog(Client):
                 starts_with,
                 ends_with,
                 ignore_case,
-                server,
                 time_out,
             )
         )
@@ -456,7 +429,6 @@ class AssetCatalog(Client):
     async def _async_get_asset_graph(
         self,
         asset_guid: str,
-        server: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
     ) -> str | dict:
@@ -467,9 +439,6 @@ class AssetCatalog(Client):
          asset_guid : str
              The unique identity of the asset to get the graph for.
 
-         server : str, optional
-             The name of the server. If None, will use the default server specified in the instance will be used.
-
          start_from : int, optional
              The index from which to start fetching the engine actions. Default is 0.
 
@@ -488,10 +457,9 @@ class AssetCatalog(Client):
          UserNotAuthorizedException
 
         """
-        server = self.server_name if server is None else server
 
         url = (
-            f"{self.platform_url}/servers/{server}/api/open-metadata/asset-catalog/assets/{asset_guid}/"
+            f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/{asset_guid}/"
             f"as-graph?startFrom={start_from}&pageSize={page_size}"
         )
 
@@ -501,7 +469,6 @@ class AssetCatalog(Client):
     def get_asset_graph(
         self,
         asset_guid: str,
-        server: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
     ) -> str | dict:
@@ -512,9 +479,6 @@ class AssetCatalog(Client):
          asset_guid : str
              The unique identity of the asset to get the graph for.
 
-         server : str, optional
-             The name of the server. If None, will use the default server specified in the instance will be used.
-
          start_from : int, optional
              The index from which to start fetching the engine actions. Default is 0.
 
@@ -536,7 +500,7 @@ class AssetCatalog(Client):
 
         loop = asyncio.get_event_loop()
         response = loop.run_until_complete(
-            self._async_get_asset_graph(asset_guid, server, start_from, page_size)
+            self._async_get_asset_graph(asset_guid, start_from, page_size)
         )
         return response
 
@@ -545,7 +509,6 @@ class AssetCatalog(Client):
         metadata_collection_id: str,
         type_name: str = None,
         effective_time: str = None,
-        server: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
     ) -> str | list:
@@ -563,9 +526,6 @@ class AssetCatalog(Client):
          effective_time: str, optional
              The effective time to filter on. If not specified, the current time is used.
 
-         server : str, optional
-            The name of the server. If None, will use the default server specified in the instance will be used.
-
          start_from : int, optional
             The index from which to start fetching the engine actions. Default is 0.
 
@@ -584,16 +544,14 @@ class AssetCatalog(Client):
          UserNotAuthorizedException
 
         """
-        server = self.server_name if server is None else server
 
         url = (
-            f"{self.platform_url}/servers/{server}/api/open-metadata/asset-catalog/assets/by-metadata-collection-id/"
+            f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/by-metadata-collection-id/"
             f"{metadata_collection_id}?startFrom={start_from}&pageSize={page_size}"
         )
 
         body = {"filter": type_name, "effectiveTime": effective_time}
         body_s = body_slimmer(body)
-        print(json.dumps(body_s))
         response = await self._async_make_request("POST", url, body_s)
         return response.json().get("assets", "no assets found")
 
@@ -602,7 +560,6 @@ class AssetCatalog(Client):
         metadata_collection_id: str,
         type_name: str = None,
         effective_time: str = None,
-        server: str = None,
         start_from: int = 0,
         page_size: int = max_paging_size,
     ) -> str | list:
@@ -620,9 +577,6 @@ class AssetCatalog(Client):
          effective_time: str, optional
              The effective time to filter on. If not specified, the current time is used.
 
-         server : str, optional
-            The name of the server. If None, will use the default server specified in the instance will be used.
-
          start_from : int, optional
             The index from which to start fetching the engine actions. Default is 0.
 
@@ -648,66 +602,42 @@ class AssetCatalog(Client):
                 metadata_collection_id,
                 type_name,
                 effective_time,
-                server,
                 start_from,
                 page_size,
             )
         )
         return response
 
-    async def _async_get_asset_catalog_types(self, server: str = None) -> str | dict:
+    async def _async_get_asset_types(self) -> str | dict:
         """Return all the elements that are anchored to an asset plus relationships between these elements and to
-          other elements. Async Version.
-         Parameters
-         ----------
-         asset_guid : str
-             The unique identity of the asset to get the graph for.
-
-         server : str, optional
-             The name of the server. If None, will use the default server specified in the instance will be used.
-
-         start_from : int, optional
-             The index from which to start fetching the engine actions. Default is 0.
-
-         page_size : int, optional
-             The maximum number of engine actions to fetch in a single request. Default is `max_paging_size`.
+         other elements. Async Version.
+        Parameters
+        ----------
 
-         Returns
-         -------
+        Returns
+        -------
         dict or str
-             A dictionary of the asset graph.
+            A dictionary of the asset graph.
 
-         Raises:
-         ------
-         InvalidParameterException
-         PropertyServerException
-         UserNotAuthorizedException
+        Raises:
+        ------
+        InvalidParameterException
+        PropertyServerException
+        UserNotAuthorizedException
 
         """
-        server = self.server_name if server is None else server
 
-        url = f"{self.platform_url}/servers/{server}/api/open-metadata/asset-catalog/assets/types"
+        url = f"{self.platform_url}/servers/{self.server_name}/api/open-metadata/asset-catalog/assets/types"
 
         response = await self._async_make_request("GET", url)
 
         return response.json().get("types", "No assets found")
 
-    def get_asset_catalog_types(self, server: str = None) -> str | dict:
+    def get_asset_catalog_types(self) -> str | dict:
         """Return all the elements that are anchored to an asset plus relationships between these elements and to
           other elements.
          Parameters
          ----------
-         asset_guid : str
-             The unique identity of the asset to get the graph for.
-
-         server : str, optional
-             The name of the server. If None, will use the default server specified in the instance will be used.
-
-         start_from : int, optional
-             The index from which to start fetching the engine actions. Default is 0.
-
-         page_size : int, optional
-             The maximum number of engine actions to fetch in a single request. Default is `max_paging_size`.
 
          Returns
          -------
@@ -723,7 +653,7 @@ class AssetCatalog(Client):
         """
 
         loop = asyncio.get_event_loop()
-        response = loop.run_until_complete(self._async_get_asset_catalog_types(server))
+        response = loop.run_until_complete(self._async_get_asset_types())
         return response