aepp 0.4.3.post2__tar.gz → 0.4.3.post3__tar.gz

{aepp-0.4.3.post2/aepp.egg-info → aepp-0.4.3.post3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aepp
-Version: 0.4.3.post2
+Version: 0.4.3.post3
 Summary: Package to manage AEP API endpoint and some helper functions
 Author-email: Julien Piccini <piccini.julien@gmail.com>
 License: Apache-2.0

aepp-0.4.3.post3/aepp/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.4.3-3"

{aepp-0.4.3.post2 → aepp-0.4.3.post3}/aepp/cli/__main__.py

@@ -33,23 +33,27 @@ class ServiceShell(cmd.Cmd):
         super().__init__()
         self.config = None
         self.connectInstance = True
-        if kwargs.get("config_file"):
-            mypath = Path.cwd()
-            dict_config = json.load(FileIO( mypath / Path(kwargs.get("config_file"))))
+        config_path = Path(kwargs.get("config_file"))
+        if not config_path.is_absolute():
+            config_path = Path.cwd() / config_path
+        if config_path.exists() and kwargs.get("config_file") is not None:
+            print("Loading configuration from file...")
+            print(f"Config path: {config_path}")
+            dict_config = json.load(FileIO(config_path))
             self.sandbox = kwargs.get("sandbox",dict_config.get("sandbox-name","prod"))
             self.secret = dict_config.get("secret",kwargs.get("secret"))
             self.org_id = dict_config.get("org_id",kwargs.get("org_id"))
             self.client_id = dict_config.get("client_id",kwargs.get("client_id"))
             self.scopes = dict_config.get("scopes",kwargs.get("scopes"))
-            self.connectInstance = True
         else:
             self.sandbox = kwargs.get("sandbox","prod")
             self.secret = kwargs.get("secret")
             self.org_id = kwargs.get("org_id")
             self.client_id = kwargs.get("client_id")
             self.scopes = kwargs.get("scopes")
-            self.connectInstance = True
-        if self.sandbox is not None and self.secret is not None and self.org_id is not None and self.client_id is not None:
+        print(f"Debug: sandbox={self.sandbox}, secret={self.secret}, org_id={self.org_id}, client_id={self.client_id}, scopes={self.scopes}")
+        self.connectInstance = True
+        if self.sandbox is not None and self.secret is not None and self.org_id is not None and self.client_id is not None and self.scopes is not None:
             print("Auto-configuring connection...")
             self.config = aepp.configure(
                 connectInstance=self.connectInstance,
@@ -1227,8 +1231,7 @@ def main():
     parser.add_argument("-sc", "--scopes", help="Scopes")
     parser.add_argument("-cid", "--client_id", help="Auto-login client ID")
     parser.add_argument("-cf", "--config_file", help="Path to config file", default=None)
-    args = parser.parse_args()
-    # Initialize the shell
+    args = parser.parse_args() 
     shell = ServiceShell(**vars(args))
     try:
         shell.cmdloop()

{aepp-0.4.3.post2 → aepp-0.4.3.post3}/aepp/flowservice.py

@@ -1993,7 +1993,7 @@ class FlowManager:
 
     def __init__(self,
                 flowId:str=None,
-                config: Union[dict,aepp.ConnectObject] = aepp.config.config_object
+                config: Union[dict,ConnectObject] = aepp.config.config_object
                 )->None:
         """
         Instantiate a Flow Manager Instance based on the flow ID.

{aepp-0.4.3.post2 → aepp-0.4.3.post3}/aepp/synchronizer.py

@@ -15,11 +15,12 @@ from copy import deepcopy
 from typing import Union
 from pathlib import Path
 from io import FileIO
+from .configs import ConnectObject
 
 
 class Synchronizer:
     ## TO DO -> Add support for local environment
-    def __init__(self,targets:list=None,config:aepp.ConnectObject=None,baseSandbox:str=None,region:str='nld2',localFolder:str=None):
+    def __init__(self,targets:list=None,config:'ConnectObject'=None,baseSandbox:str=None,region:str='nld2',localFolder:str=None):
         """
         Setup the synchronizor object with the base sandbox and target sandbox.
         Arguments:
@@ -42,7 +43,7 @@ class Synchronizer:
         self.localfolder = None
         if targets is None:
             raise ValueError("a list of target sandboxes must be provided - at least one")
-        if config is None or type(config) != aepp.ConnectObject:
+        if config is None or type(config) != ConnectObject:
             raise ValueError("a ConnectObject must be provided")
         config_object = deepcopy(config.getConfigObject())
         if baseSandbox is not None and localFolder is None:

{aepp-0.4.3.post2 → aepp-0.4.3.post3/aepp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aepp
-Version: 0.4.3.post2
+Version: 0.4.3.post3
 Summary: Package to manage AEP API endpoint and some helper functions
 Author-email: Julien Piccini <piccini.julien@gmail.com>
 License: Apache-2.0

{aepp-0.4.3.post2 → aepp-0.4.3.post3}/pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
 aepp = "aepp.cli.__main__:main"
 
 [tool.setuptools]
-packages = { find = { where = ["."], include = ["aepp*"] } }
+packages = ["aepp", "aepp.cli"]
 include-package-data = true
 
 [tool.setuptools.dynamic]

aepp-0.4.3.post2/aepp/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.4.3-2"