pyegeria 5.4.0.26__py3-none-any.whl → 5.4.0.27__py3-none-any.whl

pyegeria/egeria_cat_client.py

@@ -8,39 +8,29 @@ AssetCatalog, CollectionManager, GlossaryManager, and ProjectManager.
 """
 from pyegeria.egeria_my_client import EgeriaMy
 from pyegeria.asset_catalog_omvs import AssetCatalog
-from pyegeria.collection_manager import CollectionManager
+# from pyegeria.collection_manager import CollectionManager
 from pyegeria.glossary_manager import GlossaryManager
 from pyegeria.project_manager import ProjectManager
 
 
-class EgeriaCat(
-    AssetCatalog,
-    CollectionManager,
-    EgeriaMy,
-    GlossaryManager,
-    # GovernanceAuthor,
-    # PeopleOrganizer,
-    ProjectManager,
-):
+class EgeriaCat:
     """
-    Client to issue Runtime status requests.
+    Catalog-oriented client using composition of AssetCatalog, EgeriaMy, GlossaryManager, and ProjectManager.
 
     Attributes:
-
-        server_name: str
-                Name of the server to use.
+        view_server: str
+            Name of the view server to use.
         platform_url : str
             URL of the server platform to connect to
         user_id : str
-            The identity of the user calling the method - this sets a default optionally used by the methods
-            when the user doesn't pass the user_id on a method call.
+            The identity of the user calling the method.
         user_pwd: str
             The password associated with the user_id. Defaults to None
         token: str
             An optional bearer token
 
     Methods:
-
+        Methods are provided by composed sub-clients via delegation.
     """
 
     def __init__(
@@ -56,19 +46,47 @@ class EgeriaCat(
         self.user_id = user_id
         self.user_pwd = user_pwd
 
-        AssetCatalog.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        CollectionManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        EgeriaMy.__init__(self, view_server, platform_url, user_id, user_pwd, token)
+        # Compose sub-clients
+        self._asset_catalog = AssetCatalog(view_server, platform_url, user_id, user_pwd, token)
+        self._my = EgeriaMy(view_server, platform_url, user_id, user_pwd, token)
+        self._glossary = GlossaryManager(view_server, platform_url, user_id, user_pwd, token)
+        self._projects = ProjectManager(view_server, platform_url, user_id, user_pwd, token)
+        self._subclients = [
+            self._asset_catalog,
+            self._my,
+            self._glossary,
+            self._projects,
+        ]
+
+    def __getattr__(self, name):
+        for sub in self._subclients:
+            if hasattr(sub, name):
+                return getattr(sub, name)
+        raise AttributeError(f"{self.__class__.__name__!s} object has no attribute {name!r}")
+
+    def create_egeria_bearer_token(self, user_id: str = None, user_pwd: str = None):
+        token_val = None
+        for sub in self._subclients:
+            token_val = sub.create_egeria_bearer_token(user_id, user_pwd)
+        return token_val
+
+    def set_bearer_token(self, token: str) -> None:
+        for sub in self._subclients:
+            sub.set_bearer_token(token)
 
-        GlossaryManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
+    def get_token(self) -> str:
+        for sub in self._subclients:
+            if hasattr(sub, "get_token"):
+                return sub.get_token()
+        return None
 
-        ProjectManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
+    def close_session(self) -> None:
+        for sub in self._subclients:
+            if hasattr(sub, "close_session"):
+                try:
+                    sub.close_session()
+                except Exception:
+                    pass
 
 
 if __name__ == "__main__":

pyegeria/egeria_client.py

@@ -13,9 +13,8 @@ for all use cases..using the more role based clients is often appropriate:
 """
 # from pyegeria.x_action_author_omvs import ActionAuthor
 from pyegeria.asset_catalog_omvs import AssetCatalog
-from pyegeria.collection_manager import CollectionManager
+# from pyegeria.collection_manager import CollectionManager
 from pyegeria.glossary_manager import GlossaryManager
-from pyegeria.governance_officer import GovernanceOfficer
 from pyegeria.project_manager import ProjectManager
 from pyegeria.automated_curation_omvs import AutomatedCuration
 from pyegeria.classification_manager_omvs import ClassificationManager
@@ -35,37 +34,13 @@ from pyegeria.governance_officer import GovernanceOfficer
 # from pyegeria.md_processing_utils import render_markdown
 
 
-class Egeria(
-    AssetCatalog,
-    CollectionManager,
-    MyProfile,
-    FeedbackManager,
-    GlossaryManager,
-    # GovernanceAuthor,
-    # PeopleOrganizer,
-    ProjectManager,
-    RuntimeManager,
-    ServerOps,
-    FullServerConfig,
-    # ActionAuthor,
-    AutomatedCuration,
-    ClassificationManager,
-    RegisteredInfo,
-    TemplateManager,
-    ValidMetadataManager,
-    MetadataExplorer,
-    SolutionArchitect,
-    EgeriaConfig,
-    DataDesigner,
-    GovernanceOfficer
-):
+class Egeria:
     """
-    Client to issue Runtime status requests.
+    Overall Egeria client that composes all functional pyegeria clients and delegates calls to them.
 
     Attributes:
-
         view_server: str
-                Name of the view server to use.
+            Name of the view server to use.
         platform_url : str
             URL of the server platform to connect to
         user_id : str
@@ -77,7 +52,7 @@ class Egeria(
             An optional bearer token
 
     Methods:
-
+        Methods are provided by composed sub-clients via delegation.
     """
 
     def __init__(
@@ -88,51 +63,75 @@ class Egeria(
         user_pwd: str = None,
         token: str = None,
     ):
-        AssetCatalog.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        CollectionManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
+        # Compose major umbrella and service clients
+        self._asset_catalog = AssetCatalog(view_server, platform_url, user_id, user_pwd, token)
+        self._my_profile = MyProfile(view_server, platform_url, user_id, user_pwd, token)
+        self._feedback = FeedbackManager(view_server, platform_url, user_id, user_pwd, token)
+        self._glossary = GlossaryManager(view_server, platform_url, user_id, user_pwd, token)
+        self._projects = ProjectManager(view_server, platform_url, user_id, user_pwd, token)
+        self._runtime = RuntimeManager(view_server, platform_url, user_id, user_pwd, token)
+        self._server_ops = ServerOps(view_server, platform_url, user_id, user_pwd)
+        self._full_server_config = FullServerConfig(view_server, platform_url, user_id, user_pwd)
+        self._auto_curate = AutomatedCuration(view_server, platform_url, user_id, user_pwd, token)
+        self._class_mgr = ClassificationManager(view_server, platform_url, user_id, user_pwd, token)
+        self._reg_info = RegisteredInfo(view_server, platform_url, user_id, user_pwd, token)
+        self._templates = TemplateManager(view_server, platform_url, user_id, user_pwd, token)
+        self._valid = ValidMetadataManager(view_server, platform_url, user_id, user_pwd, token)
+        self._explorer = MetadataExplorer(view_server, platform_url, user_id, user_pwd, token)
+        self._sol_arch = SolutionArchitect(view_server, platform_url, user_id, user_pwd, token)
+        self._config = EgeriaConfig(view_server, platform_url, user_id, user_pwd)
+        self._designer = DataDesigner(view_server, platform_url, user_id, user_pwd, token)
+        self._gov_officer = GovernanceOfficer(view_server, platform_url, user_id, user_pwd, token)
 
-        MyProfile.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        FeedbackManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
+        self._subclients = [
+            self._asset_catalog,
+            self._my_profile,
+            self._feedback,
+            self._glossary,
+            self._projects,
+            self._runtime,
+            self._server_ops,
+            self._full_server_config,
+            self._auto_curate,
+            self._class_mgr,
+            self._reg_info,
+            self._templates,
+            self._valid,
+            self._explorer,
+            self._sol_arch,
+            self._config,
+            self._designer,
+            self._gov_officer,
+        ]
 
-        GlossaryManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
+    def __getattr__(self, name):
+        for sub in self._subclients:
+            if hasattr(sub, name):
+                return getattr(sub, name)
+        raise AttributeError(f"{self.__class__.__name__!s} object has no attribute {name!r}")
 
-        ProjectManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
+    def create_egeria_bearer_token(self, user_id: str = None, user_pwd: str = None):
+        token_val = None
+        for sub in self._subclients:
+            if hasattr(sub, "create_egeria_bearer_token"):
+                token_val = sub.create_egeria_bearer_token(user_id, user_pwd)
+        return token_val
 
-        RuntimeManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token=token
-        )
-        ServerOps.__init__(self, view_server, platform_url, user_id, user_pwd)
+    def set_bearer_token(self, token: str) -> None:
+        for sub in self._subclients:
+            if hasattr(sub, "set_bearer_token"):
+                sub.set_bearer_token(token)
 
-        EgeriaConfig.__init__(self, view_server, platform_url, user_id, user_pwd)
+    def get_token(self) -> str:
+        for sub in self._subclients:
+            if hasattr(sub, "get_token"):
+                return sub.get_token()
+        return None
 
-        # ActionAuthor.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        AutomatedCuration.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        ClassificationManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        RegisteredInfo.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        ValidMetadataManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        SolutionArchitect.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        DataDesigner.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
-        GovernanceOfficer.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
-print(Egeria.mro())
+    def close_session(self) -> None:
+        for sub in self._subclients:
+            if hasattr(sub, "close_session"):
+                try:
+                    sub.close_session()
+                except Exception:
+                    pass

pyegeria/egeria_config_client.py

@@ -10,14 +10,13 @@ from pyegeria.full_omag_server_config import FullServerConfig
 from pyegeria.server_operations import  ServerOps
 
 
-class EgeriaConfig(FullServerConfig, ServerOps):
+class EgeriaConfig:
     """
-    Client for configuring the Egeria Platform and Servers
+    Client for configuring the Egeria Platform and Servers using composition.
 
     Attributes:
-
         server_name: str
-                Name of the server to use.
+            Name of the server to use.
         platform_url : str
             URL of the server platform to connect to
         user_id : str
@@ -27,7 +26,7 @@ class EgeriaConfig(FullServerConfig, ServerOps):
             The password associated with the user_id. Defaults to None
 
     Methods:
-        Inherits methods from FullServerConfig
+        Methods are provided by composed sub-clients via delegation.
     """
 
     def __init__(
@@ -38,8 +37,39 @@ class EgeriaConfig(FullServerConfig, ServerOps):
         self.user_id = user_id
         self.user_pwd = user_pwd
 
-        FullServerConfig.__init__(self, server_name, platform_url, user_id, user_pwd)
-        ServerOps.__init__(self, server_name, platform_url, user_id, user_pwd)
+        self._config = FullServerConfig(server_name, platform_url, user_id, user_pwd)
+        self._ops = ServerOps(server_name, platform_url, user_id, user_pwd)
+        self._subclients = [self._config, self._ops]
+
+    def __getattr__(self, name):
+        for sub in self._subclients:
+            if hasattr(sub, name):
+                return getattr(sub, name)
+        raise AttributeError(f"{self.__class__.__name__!s} object has no attribute {name!r}")
+
+    def create_egeria_bearer_token(self, user_id: str = None, user_pwd: str = None):
+        token_val = None
+        for sub in self._subclients:
+            token_val = sub.create_egeria_bearer_token(user_id, user_pwd)
+        return token_val
+
+    def set_bearer_token(self, token: str) -> None:
+        for sub in self._subclients:
+            sub.set_bearer_token(token)
+
+    def get_token(self) -> str:
+        for sub in self._subclients:
+            if hasattr(sub, "get_token"):
+                return sub.get_token()
+        return None
+
+    def close_session(self) -> None:
+        for sub in self._subclients:
+            if hasattr(sub, "close_session"):
+                try:
+                    sub.close_session()
+                except Exception:
+                    pass
 
 
 if __name__ == "__main__":

pyegeria/egeria_my_client.py

@@ -12,14 +12,13 @@ from pyegeria.utils import body_slimmer
 from pyegeria._exceptions import InvalidParameterException
 
 
-class EgeriaMy(MyProfile, FeedbackManager):
+class EgeriaMy:
     """
-    Client to issue Runtime status requests.
+    Client to issue Runtime status requests using composition of MyProfile and FeedbackManager.
 
     Attributes:
-
         view_server: str
-                Name of the server to use.
+            Name of the view server to use.
         platform_url : str
             URL of the server platform to connect to
         user_id : str
@@ -27,10 +26,11 @@ class EgeriaMy(MyProfile, FeedbackManager):
             when the user doesn't pass the user_id on a method call.
         user_pwd: str
             The password associated with the user_id. Defaults to None
-
+        token: str, optional
+            Bearer token used for authentication.
 
     Methods:
-        Inherits from MyProfile, FeedbackManager
+        Methods are provided by composed sub-clients (MyProfile, FeedbackManager) via delegation.
     """
 
     def __init__(
@@ -46,10 +46,45 @@ class EgeriaMy(MyProfile, FeedbackManager):
         self.user_id = user_id
         self.user_pwd = user_pwd
 
-        MyProfile.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        FeedbackManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
+        # Compose sub-clients
+        self._my_profile = MyProfile(view_server, platform_url, user_id, user_pwd, token)
+        self._feedback = FeedbackManager(view_server, platform_url, user_id, user_pwd, token)
+        # Keep an ordered list for delegation lookups and bulk operations
+        self._subclients = [self._my_profile, self._feedback]
+
+    # Delegation: route unknown attributes to first sub-client that has it
+    def __getattr__(self, name):
+        for sub in self._subclients:
+            if hasattr(sub, name):
+                return getattr(sub, name)
+        raise AttributeError(f"{self.__class__.__name__!s} object has no attribute {name!r}")
+
+    # Token management across subclients
+    def create_egeria_bearer_token(self, user_id: str = None, user_pwd: str = None):
+        token_val = None
+        for sub in self._subclients:
+            token_val = sub.create_egeria_bearer_token(user_id, user_pwd)
+        return token_val
+
+    def set_bearer_token(self, token: str) -> None:
+        for sub in self._subclients:
+            sub.set_bearer_token(token)
+
+    def get_token(self) -> str:
+        # Return token from the first sub-client that provides it
+        for sub in self._subclients:
+            if hasattr(sub, "get_token"):
+                return sub.get_token()
+        return None
+
+    def close_session(self) -> None:
+        for sub in self._subclients:
+            if hasattr(sub, "close_session"):
+                try:
+                    sub.close_session()
+                except Exception:
+                    # Best-effort close; ignore individual errors
+                    pass
 
 
 if __name__ == "__main__":

pyegeria/egeria_tech_client.py

@@ -19,41 +19,24 @@ from pyegeria.governance_officer import GovernanceOfficer
 from pyegeria.collection_manager import CollectionManager
 
 
-class EgeriaTech(
-    # ActionAuthor,
-    AutomatedCuration,
-    EgeriaCat,
-    ClassificationManager,
-    RegisteredInfo,
-    RuntimeManager,
-    ValidMetadataManager,
-    MetadataExplorer,
-    SolutionArchitect,
-    DataDesigner,
-    TemplateManager,
-    GovernanceOfficer,
-    CollectionManager
-):
+class EgeriaTech:
     """
-    Client for technical Egeria users.
+    Client for technical Egeria users using composition.
 
     Attributes:
-
         view_server: str
-                Name of the server to use.
+            Name of the view server to use.
         platform_url : str
             URL of the server platform to connect to
         user_id : str
-            The identity of the user calling the method - this sets a default optionally used by the methods
-            when the user doesn't pass the user_id on a method call.
+            The identity of the user calling the method.
         user_pwd: str
             The password associated with the user_id. Defaults to None
         token: str, optional
             Bearer token
 
     Methods:
-        Inherits methods from EgeriaCat, ActionAuthor, AutomatedCuration,
-        ClassificationManager, RegisteredInfo, ValidMetadataManager
+        Methods are provided by composed sub-clients via delegation.
     """
 
     def __init__(
@@ -64,41 +47,69 @@ class EgeriaTech(
         user_pwd: str = None,
         token: str = None,
     ):
-        # ActionAuthor.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        AutomatedCuration.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        EgeriaCat.__init__(self, view_server, platform_url, user_id, user_pwd, token)
-        ClassificationManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        RegisteredInfo.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        RuntimeManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        ValidMetadataManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        MetadataExplorer.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        SolutionArchitect.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-        )
-        DataDesigner.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
-        TemplateManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
-        GovernanceOfficer.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
-        CollectionManager.__init__(
-            self, view_server, platform_url, user_id, user_pwd, token
-            )
+        self.view_server = view_server
+        self.platform_url = platform_url
+        self.user_id = user_id
+        self.user_pwd = user_pwd
+
+        # Compose sub-clients
+        self._auto_curate = AutomatedCuration(view_server, platform_url, user_id, user_pwd, token)
+        self._cat = EgeriaCat(view_server, platform_url, user_id, user_pwd, token)
+        self._class_mgr = ClassificationManager(view_server, platform_url, user_id, user_pwd, token)
+        self._reg_info = RegisteredInfo(view_server, platform_url, user_id, user_pwd, token)
+        self._runtime = RuntimeManager(view_server, platform_url, user_id, user_pwd, token)
+        self._valid = ValidMetadataManager(view_server, platform_url, user_id, user_pwd, token)
+        self._explorer = MetadataExplorer(view_server, platform_url, user_id, user_pwd, token)
+        self._sol_arch = SolutionArchitect(view_server, platform_url, user_id, user_pwd, token)
+        self._designer = DataDesigner(view_server, platform_url, user_id, user_pwd, token)
+        self._templates = TemplateManager(view_server, platform_url, user_id, user_pwd, token)
+        self._gov_officer = GovernanceOfficer(view_server, platform_url, user_id, user_pwd, token)
+        self._collections = CollectionManager(view_server, platform_url, user_id, user_pwd, token)
+
+        self._subclients = [
+            self._auto_curate,
+            self._cat,
+            self._class_mgr,
+            self._reg_info,
+            self._runtime,
+            self._valid,
+            self._explorer,
+            self._sol_arch,
+            self._designer,
+            self._templates,
+            self._gov_officer,
+            self._collections,
+        ]
+
+    def __getattr__(self, name):
+        for sub in self._subclients:
+            if hasattr(sub, name):
+                return getattr(sub, name)
+        raise AttributeError(f"{self.__class__.__name__!s} object has no attribute {name!r}")
+
+    def create_egeria_bearer_token(self, user_id: str = None, user_pwd: str = None):
+        token_val = None
+        for sub in self._subclients:
+            token_val = sub.create_egeria_bearer_token(user_id, user_pwd)
+        return token_val
+
+    def set_bearer_token(self, token: str) -> None:
+        for sub in self._subclients:
+            sub.set_bearer_token(token)
+
+    def get_token(self) -> str:
+        for sub in self._subclients:
+            if hasattr(sub, "get_token"):
+                return sub.get_token()
+        return None
+
+    def close_session(self) -> None:
+        for sub in self._subclients:
+            if hasattr(sub, "close_session"):
+                try:
+                    sub.close_session()
+                except Exception:
+                    pass
 
 if __name__ == "__main__":
     print("Main-Tech Client")