aepp 0.5.1.post1__tar.gz → 0.5.2__tar.gz

{aepp-0.5.1.post1/aepp.egg-info → aepp-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aepp
-Version: 0.5.1.post1
+Version: 0.5.2
 Summary: Package to manage AEP API endpoint and some helper functions
 Author-email: Julien Piccini <piccini.julien@gmail.com>
 License: Apache-2.0
@@ -22,6 +22,7 @@ Requires-Dist: tenacity
 Requires-Dist: deprecation
 Requires-Dist: datamodel-code-generator
 Requires-Dist: rich
+Requires-Dist: matplotlib
 Dynamic: license-file
 
 # Adobe Experience Platform API made for humans

aepp-0.5.2/aepp/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.5.2"

{aepp-0.5.1.post1 → aepp-0.5.2}/aepp/classmanager.py

@@ -23,7 +23,7 @@ class ClassManager:
             schemaAPI:'Schema'=None,
             config: Union[dict,ConnectObject] = aepp.config.config_object,
             description: str = 'power by aepp',
-            localFolder:str=None,
+            localFolder:str | list | None = None,
             sandbox:str=None,
             **kwargs
             )->None:
@@ -48,13 +48,16 @@ class ClassManager:
         elif config is not None and localFolder is None:
             self.schemaAPI = Schema(config=config)
         elif localFolder is not None:
-            self.localfolder = Path(localFolder)
-            if self.localfolder.exists() is False:
+            if isinstance(localFolder, str):
+                self.localfolder = [Path(localFolder)]
+            elif isinstance(localFolder, list):
+                self.localfolder = [Path(lf) for lf in localFolder]
+            if any([folder.exists() is False for folder in self.localfolder]):
                 raise Exception(f"The local folder {self.localfolder} does not exist. Please create it and extract your sandbox before using it.")
             self.schemaAPI = None
-            self.classFolder = self.localfolder / 'class'
-            self.behavFolder = self.localfolder / 'behaviour'
-            if self.classFolder.exists() is False:
+            self.classFolder = [folder / 'class' for folder in self.localfolder]
+            self.behavFolder = [folder / 'behaviour' for folder in self.localfolder]
+            if any([folder.exists() is False for folder in self.classFolder]):
                 raise Exception(f"The local folder {self.classFolder} does not exist. Please create it and extract your sandbox before using it.")
         else:
             raise Exception("You need to provide a schemaAPI instance or a config object to connect to the API or a local folder to use the local storage")
@@ -71,9 +74,11 @@ class ClassManager:
         elif type(aepclass) == dict:
             self.tenantId = aepclass.get('meta:tenantNamespace',"  ")
         elif self.localfolder is not None:
-            config_json = json.load(FileIO(self.localfolder / 'config.json'))
-            if config_json.get('tenantId',None) is not None:
-                self.tenantId = config_json.get('tenantId')
+            for folder in self.localfolder:
+                config_json = json.load(FileIO(folder / 'config.json'))
+                if config_json.get('tenantId',None) is not None:
+                    self.tenantId = config_json.get('tenantId')
+                    break
         else:
             self.tenantId = "  "
         if type(aepclass) == dict:
@@ -82,10 +87,15 @@ class ClassManager:
                     self.aepclass = self.schemaAPI.getClass(aepclass['$id'],full=False,xtype='xed')
                     self.EDITABLE = True
                 elif self.localfolder is not None:
-                    for json_file in self.classFolder.glob('*.json'):
-                        tmp_def = json.load(FileIO(json_file))
-                        if tmp_def.get('$id') == aepclass['$id']:
-                            self.aepclass = tmp_def
+                    found = False
+                    for folder in self.classFolder:
+                        for json_file in folder.glob('*.json'):
+                            tmp_def = json.load(FileIO(json_file))
+                            if tmp_def.get('$id') == aepclass['$id']:
+                                self.aepclass = tmp_def
+                                found = True
+                                break
+                        if found:
                             break
                     self.EDITABLE = False
             elif self.tenantId[1:] not in aepclass['$id']:
@@ -93,10 +103,15 @@ class ClassManager:
                     self.aepclass = self.schemaAPI.getClass(aepclass['$id'],full=True,xtype='xed')
                     self.EDITABLE = False
                 elif self.localfolder is not None:
-                    for json_file in self.classFolder.glob('*.json'):
-                        tmp_def = json.load(FileIO(json_file))
-                        if tmp_def.get('$id') == aepclass['$id']:
-                            self.aepclass = tmp_def
+                    found = False
+                    for folder in self.classFolder:
+                        for json_file in folder.glob('*.json'):
+                            tmp_def = json.load(FileIO(json_file))
+                            if tmp_def.get('$id') == aepclass['$id']:
+                                self.aepclass = tmp_def
+                                found = True
+                                break
+                        if found:
                             break
                     self.EDITABLE = False
             self.__setAttributes__(self.aepclass)
@@ -106,20 +121,30 @@ class ClassManager:
                     self.aepclass = self.schemaAPI.getClass(aepclass,full=False,xtype='xed')
                     self.EDITABLE = True
                 elif self.localfolder is not None:
-                    for json_file in self.classFolder.glob('*.json'):
-                        tmp_def = json.load(FileIO(json_file))
-                        if tmp_def.get('$id') == aepclass or tmp_def.get('meta:altId') == aepclass:
-                            self.aepclass = tmp_def
+                    found = False
+                    for folder in self.classFolder:
+                        for json_file in folder.glob('*.json'):
+                            tmp_def = json.load(FileIO(json_file))
+                            if tmp_def.get('$id') == aepclass or tmp_def.get('meta:altId') == aepclass:
+                                self.aepclass = tmp_def
+                                found = True
+                                break
+                        if found:
                             break
                     self.EDITABLE = False
             else:
                 if self.schemaAPI is not None:
                     self.aepclass = self.schemaAPI.getClass(aepclass,full=True,xtype='xed')
                 elif self.localfolder is not None:
-                    for json_file in self.classFolder.glob('*.json'):
-                        tmp_def = json.load(FileIO(json_file))
-                        if tmp_def.get('$id') == aepclass or tmp_def.get('meta:altId') == aepclass:
-                            self.aepclass = tmp_def
+                    found = False
+                    for folder in self.classFolder:
+                        for json_file in folder.glob('*.json'):
+                            tmp_def = json.load(FileIO(json_file))
+                            if tmp_def.get('$id') == aepclass or tmp_def.get('meta:altId') == aepclass:
+                                self.aepclass = tmp_def
+                                found = True
+                                break
+                        if found:
                             break
                 self.EDITABLE = False
             self.__setAttributes__(self.aepclass)
@@ -168,10 +193,15 @@ class ClassManager:
         if self.schemaAPI is not None:
             self.behaviorDefinition = self.schemaAPI.getBehavior(behavId,full=True,xtype='xed')
         elif self.localfolder is not None:
-            for json_file in self.behavFolder.glob('*.json'):
-                tmp_def = json.load(FileIO(json_file))
-                if tmp_def.get('$id') == behavId:
-                    self.behaviorDefinition = tmp_def
+            found = False
+            for folder in self.behavFolder:
+                for json_file in folder.glob('*.json'):
+                    tmp_def = json.load(FileIO(json_file))
+                    if tmp_def.get('$id') == behavId:
+                        self.behaviorDefinition = tmp_def
+                        found = True
+                        break
+                if found:
                     break
         self.requiredFields = set()
     

{aepp-0.5.1.post1 → aepp-0.5.2}/aepp/cli/__main__.py

@@ -47,26 +47,25 @@ class ServiceShell(cmd.Cmd):
                 self.sandbox = str(dict_config.get("sandbox-name","prod"))
             else:
                 self.sandbox = str(kwargs.get("sandbox","prod"))
-            self.secret = str(dict_config.get("secret",kwargs.get("secret")))
-            self.org_id = str(dict_config.get("org_id",kwargs.get("org_id")))
-            self.client_id = str(dict_config.get("client_id",kwargs.get("client_id")))
-            self.scopes = str(dict_config.get("scopes",kwargs.get("scopes")))
+            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"))
         else:
-            self.sandbox = str(kwargs.get("sandbox","prod"))
-            self.secret = str(kwargs.get("secret"))
-            self.org_id = str(kwargs.get("org_id"))
-            self.client_id = str(kwargs.get("client_id"))
-            self.scopes = str(kwargs.get("scopes"))
-        self.connectInstance = True
+            self.sandbox:str|None = kwargs.get("sandbox","prod")
+            self.secret:str|None = kwargs.get("secret")
+            self.org_id:str|None = kwargs.get("org_id")
+            self.client_id:str|None = kwargs.get("client_id")
+            self.scopes:str|None = kwargs.get("scopes")
         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("Configuring connection...")
             self.config = aepp.configure(
-                connectInstance=self.connectInstance,
                 sandbox=self.sandbox,
                 secret=self.secret,
                 org_id=self.org_id,
                 client_id=self.client_id,
-                scopes=self.scopes
+                scopes=self.scopes,
+                connectInstance=self.connectInstance
             )
             self.prompt = f"{self.config.sandbox}> "
             console.print(Panel(f"Connected to [bold green]{self.sandbox}[/bold green]", style="blue"))
@@ -82,7 +81,6 @@ class ServiceShell(cmd.Cmd):
         console.print(f"Configuration file created at {Path.cwd() / Path(filename_json)}", style="green")
         return
 
-
     # # --- Commands ---
     def do_config(self, arg:Any) -> None:
         """connect to an AEP instance"""
@@ -94,14 +92,14 @@ class ServiceShell(cmd.Cmd):
         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(shlex.split(arg))
-        if args.config_file:
+        if args.config_file is not None:
             mypath = Path.cwd()
             dict_config = json.load(FileIO(mypath / Path(args.config_file)))
-            self.sandbox = str(args.sandbox) if args.sandbox else str(dict_config.get("sandbox-name",args.sandbox))
-            self.secret = str(dict_config.get("secret",args.secret))
-            self.org_id = str(dict_config.get("org_id",args.org_id))
-            self.client_id = str(dict_config.get("client_id",args.client_id))
-            self.scopes = str(dict_config.get("scopes",args.scopes))
+            self.sandbox:str|None = args.sandbox if args.sandbox else dict_config.get("sandbox-name",args.sandbox)
+            self.secret:str|None = dict_config.get("secret",args.secret)
+            self.org_id:str|None = dict_config.get("org_id",args.org_id)
+            self.client_id:str|None = dict_config.get("client_id",args.client_id)
+            self.scopes:str|None = dict_config.get("scopes",args.scopes)
             self.connectInstance = True
         else:
             if args.sandbox: self.sandbox = str(args.sandbox)
@@ -1203,18 +1201,14 @@ class ServiceShell(cmd.Cmd):
         console.print("Syncing artifact...", style="blue")
         parser = argparse.ArgumentParser(prog='extractArtifact', description='Extract artifacts from AEP')
         parser.add_argument('artifact', help='artifact to extract (name or id): "schema","fieldgroup","datatype","descriptor","dataset","identity","mergepolicy","audience"')
-        parser.add_argument('-at','--artifactType', help='artifact type ')
-        parser.add_argument('-t','--targets', help='target sandboxes')
-        parser.add_argument('-lf','--localfolder', help='Local folder to extract artifacts to',default='extractions')
+        parser.add_argument('-at','--artifactType', help='artifact type ',type=str)
+        parser.add_argument('-t','--targets', help='target sandboxes',nargs='+',type=str)
+        parser.add_argument('-lf','--localfolder', help='Local folder to extract artifacts to',default='extractions',nargs='+',type=str)
         parser.add_argument('-b','--baseSandbox', help='Base sandbox for synchronization')
         parser.add_argument('-rg','--region', help='Region to extract artifacts from: "ndl2" (default), "va7", "aus5", "can2", "ind2"',default='ndl2')
         parser.add_argument('-v','--verbose', help='Enable verbose output',default=True)
         try:
             args = parser.parse_args(shlex.split(args))
-            if ',' in args.targets:
-                args.targets = args.targets.split(',')
-            else:
-                args.targets = [args.targets]
             console.print("Initializing Synchronizor...", style="blue")
             if args.baseSandbox:
                 synchronizor = synchronizer.Synchronizer(

{aepp-0.5.1.post1 → aepp-0.5.2}/aepp/datatypemanager.py

@@ -36,7 +36,7 @@ class DataTypeManager:
                 schemaAPI:'Schema'=None,
                 config: Union[dict,ConnectObject] = aepp.config.config_object,
                 description:str="",
-                localFolder:str=None,
+                localFolder:str|list|None=None,
                 sandbox:str=None,
                 **kwargs
                 )->None:
@@ -65,10 +65,13 @@ class DataTypeManager:
         elif config is not None and localFolder is None:
             self.schemaAPI = Schema(config=config)
         elif localFolder is not None:
-            self.localfolder = Path(localFolder)
-            self.datatypeFolder = self.localfolder / 'datatype'
-            self.datatypeGlobalFolder = self.datatypeFolder / 'global'
-            if self.localfolder.exists() is False:
+            if isinstance(localFolder, str):
+                self.localfolder = [Path(localFolder)]
+            elif isinstance(localFolder, list):
+                self.localfolder = [Path(folder) for folder in localFolder]
+            self.datatypeFolder = [folder / 'datatype' for folder in self.localfolder]
+            self.datatypeGlobalFolder = [folder / 'global' for folder in self.datatypeFolder]
+            if any([folder.exists() is False for folder in self.localfolder]):
                 raise Exception(f"The local folder {self.localfolder} does not exist. Please create it and extract your sandbox before using it.")
             self.schemaAPI = None
         if self.schemaAPI is not None:
@@ -99,20 +102,32 @@ class DataTypeManager:
                     self.dataType = self.schemaAPI.getDataType(dataType['$id'],full=False)
                     self.EDITABLE = True
                 elif self.localfolder is not None:
-                    for dataTypeFile in self.datatypeFolder.glob(f"*.json"):
-                        tmp_def = json.load(FileIO(dataTypeFile))
-                        if tmp_def.get('$id') == dataType.get('$id') or tmp_def.get('meta:altId') == dataType.get('meta:altId'):
-                            self.dataType = tmp_def
+                    found = False
+                    for folder in self.datatypeFolder:
+                        for dataTypeFile in folder.glob(f"*.json"):
+                            tmp_def = json.load(FileIO(dataTypeFile))
+                            if tmp_def.get('$id') == dataType.get('$id') or tmp_def.get('meta:altId') == dataType.get('meta:altId'):
+                                self.dataType = tmp_def
+                                found = True
+                                break
+                        if found:
+                            break
                     self.EDITABLE = False
             else:
                 if self.schemaAPI is not None:
                     self.dataType = self.schemaAPI.getDataType(dataType['$id'],full=True)
                     self.EDITABLE = True
                 elif self.localfolder is not None:
-                    for dataTypeFile in self.datatypeGlobalFolder.glob("*.json"):
-                        tmp_def = json.load(FileIO(dataTypeFile))
-                        if tmp_def.get('$id') == dataType.get('$id') or tmp_def.get('meta:altId') == dataType.get('meta:altId') or tmp_def.get('title') == dataType.get('title'):   
-                            self.dataType = tmp_def
+                    found = False
+                    for folder in self.datatypeGlobalFolder:
+                        for dataTypeFile in folder.glob("*.json"):
+                            tmp_def = json.load(FileIO(dataTypeFile))
+                            if tmp_def.get('$id') == dataType.get('$id') or tmp_def.get('meta:altId') == dataType.get('meta:altId') or tmp_def.get('title') == dataType.get('title'):   
+                                self.dataType = tmp_def
+                                found = True
+                                break
+                        if found:
+                            break
                     self.EDITABLE = False
         elif type(dataType) == str:
             if self.tenantId[1:] in dataType:
@@ -122,10 +137,16 @@ class DataTypeManager:
                         raise ValueError(f"Cannot find the data type with id {dataType} in the schema API.")
                     self.EDITABLE = True
                 elif self.localfolder is not None:
-                    for dataTypeFile in self.datatypeFolder.glob("*.json"):
-                        tmp_def = json.load(FileIO(dataTypeFile))
-                        if tmp_def.get('$id') == dataType or tmp_def.get('meta:altId') == dataType or tmp_def.get('title') == dataType:
-                            self.dataType = tmp_def
+                    found = False
+                    for folder in self.datatypeFolder:
+                        for dataTypeFile in folder.glob("*.json"):
+                            tmp_def = json.load(FileIO(dataTypeFile))
+                            if tmp_def.get('$id') == dataType or tmp_def.get('meta:altId') == dataType or tmp_def.get('title') == dataType:
+                                self.dataType = tmp_def
+                                found = True
+                                break
+                        if found:
+                            break
                     self.EDITABLE = False
                 else:
                     raise Exception("You try to retrieve the datatype definition from the id, but no API or localFolder has been passed as a parameter.")
@@ -136,10 +157,16 @@ class DataTypeManager:
                         raise ValueError(f"Cannot find the data type with id {dataType} in the schema API.")
                     self.EDITABLE = True
                 elif self.localfolder is not None:
-                    for dataTypeFile in self.datatypeGlobalFolder.glob("*.json"):
-                        tmp_def = json.load(FileIO(dataTypeFile))
-                        if tmp_def.get('$id') == dataType or tmp_def.get('meta:altId') == dataType or tmp_def.get('title') == dataType:
-                            self.dataType = tmp_def
+                    found = False
+                    for folder in self.datatypeGlobalFolder:
+                        for dataTypeFile in folder.glob("*.json"):
+                            tmp_def = json.load(FileIO(dataTypeFile))
+                            if tmp_def.get('$id') == dataType or tmp_def.get('meta:altId') == dataType or tmp_def.get('title') == dataType:
+                                self.dataType = tmp_def
+                                found = True
+                                break
+                        if found:
+                            break
                     self.EDITABLE = False
                 else:
                     raise Exception("You try to retrieve the datatype definition from the id, but no API or localFolder has been passed as a parameter.")
@@ -181,12 +208,18 @@ class DataTypeManager:
                     self.dataTypeManagers[dt_manager.title] = dt_manager
             elif self.localfolder is not None:
                 for dt in dataTypes: ## today only searching custom data types in local folder
-                    for dataTypeFile in self.datatypeFolder.glob("*.json"):
-                        tmp_def = json.load(FileIO(dataTypeFile))
-                        if tmp_def.get('$id') == dt or tmp_def.get('meta:altId') == dt or tmp_def.get('title') == dt:
-                            dt_manager = DataTypeManager(dataType=tmp_def,localFolder=self.localfolder,tenantId=self.tenantId,sandbox=self.sandbox)
-                            self.dataTypes[dt_manager.id] = dt_manager.title
-                            self.dataTypeManagers[dt_manager.title] = dt_manager
+                    found = False
+                    for folder in self.datatypeFolder:
+                        for dataTypeFile in folder.glob("*.json"):
+                            tmp_def = json.load(FileIO(dataTypeFile))
+                            if tmp_def.get('$id') == dt or tmp_def.get('meta:altId') == dt or tmp_def.get('title') == dt:
+                                dt_manager = DataTypeManager(dataType=tmp_def,localFolder=self.localfolder,tenantId=self.tenantId,sandbox=self.sandbox)
+                                self.dataTypes[dt_manager.id] = dt_manager.title
+                                self.dataTypeManagers[dt_manager.title] = dt_manager
+                                found = True
+                                break
+                        if found:
+                            break
         if title is not None:
             self.dataType['title'] = title
             self.title = title

{aepp-0.5.1.post1 → aepp-0.5.2}/aepp/fieldgroupmanager.py

@@ -39,7 +39,7 @@ class FieldGroupManager:
                 config: Union[dict,ConnectObject] = aepp.config.config_object,
                 description:str="powered by aepp",
                 full:bool=None,
-                localFolder:str=None,
+                localFolder:str | list | None=None,
                 sandbox:str=None,
                 **kwargs
                 )->None:
@@ -71,13 +71,16 @@ class FieldGroupManager:
         elif config is not None and localFolder is None:
             self.schemaAPI = Schema(config=config)
         elif localFolder is not None:
-            self.localfolder = Path(localFolder)
-            self.datatypeFolder = self.localfolder / 'datatype'
-            self.datatypeGlobalFolder = self.datatypeFolder / 'global'
-            self.fieldgroupFolder = self.localfolder / 'fieldgroup'
-            self.fieldgroupGlobalFolder = self.fieldgroupFolder / 'global'
-            self.descriptorFolder = self.localfolder / 'descriptor'
-            if self.localfolder.exists() is False:
+            if isinstance(localFolder, str):
+                self.localfolder = [Path(localFolder)]
+            elif isinstance(localFolder, list):
+                self.localfolder = [Path(folder) for folder in localFolder]
+            self.datatypeFolder = [folder / 'datatype' for folder in self.localfolder]
+            self.datatypeGlobalFolder = [folder / 'global' for folder in self.datatypeFolder]
+            self.fieldgroupFolder = [folder / 'fieldgroup' for folder in self.localfolder]
+            self.fieldgroupGlobalFolder = [folder / 'global' for folder in self.fieldgroupFolder]
+            self.descriptorFolder = [folder / 'descriptor' for folder in self.localfolder]
+            if any([folder.exists() is False for folder in self.localfolder]):
                 raise Exception(f"The local folder {self.localfolder} does not exist. Please create it and extract your sandbox before using it.")
             self.schemaAPI = None
         if self.schemaAPI is not None:
@@ -95,9 +98,11 @@ class FieldGroupManager:
             if fieldGroup.get('meta:tenantNamespace') is not None:
                 self.tenantId = fieldGroup.get('meta:tenantNamespace')
         elif self.localfolder is not None:
-            config_json = json.load(FileIO(self.localfolder / 'config.json'))
-            if config_json.get('tenantId',None) is not None:
-                self.tenantId = config_json.get('tenantId')
+            for folder in self.localfolder:
+                config_json = json.load(FileIO(folder / 'config.json'))
+                if config_json.get('tenantId',None) is not None:
+                    self.tenantId = config_json.get('tenantId')
+                    break
         else:### Should not be a problem as the element without a tenantId are not supposed to change
             self.tenantId = "  "
         if fieldGroup is not None:
@@ -126,28 +131,40 @@ class FieldGroupManager:
                                 self.fieldGroup = tmp_def
                                 self.EDITABLE = False
                         elif self.localfolder is not None:
-                            for json_file in self.fieldgroupFolder.glob('*.json'):
-                                tmp_def = json.load(FileIO(json_file))
-                                if tmp_def.get('$id') == fieldGroup['$id'] or tmp_def.get('meta:altId') == fieldGroup.get('meta:altId') or tmp_def.get('title') == fieldGroup.get('title'):
-                                    self.fieldGroup = tmp_def
-                                    if self.tenantId[1:] in self.fieldGroup.get('$id'): ## custom field group
-                                        if '/datatypes/' in str(self.fieldGroup):
-                                            dataTypeSearch = f"(https://ns.adobe.com/{self.tenantId[1:]}/datatypes/[0-9a-z]+?)'"
-                                            dataTypes = re.findall(dataTypeSearch,str(self.fieldGroup))
-                                            for dt in dataTypes:
-                                                dt_manager = DataTypeManager(dt,localFolder=self.localfolder,sandbox=self.sandbox,tenantId=self.tenantId)
-                                                self.dataTypes[dt_manager.id] = dt_manager.title
-                                                self.dataTypeManagers[dt_manager.title] = dt_manager
-                                    else: ## OOTB field group
-                                        if 'properties' in self.fieldGroup.keys():
-                                            self.fieldGroup['definitions'] = self.fieldGroup['properties']
-                            if self.fieldGroup == {}:
-                                for json_file in self.fieldgroupGlobalFolder.glob('*.json'):
+                            found = False
+                            for folder in self.fieldgroupFolder:
+                                for json_file in folder.glob('*.json'):
                                     tmp_def = json.load(FileIO(json_file))
                                     if tmp_def.get('$id') == fieldGroup['$id'] or tmp_def.get('meta:altId') == fieldGroup.get('meta:altId') or tmp_def.get('title') == fieldGroup.get('title'):
                                         self.fieldGroup = tmp_def
-                                        if 'properties' in self.fieldGroup.keys():
-                                            self.fieldGroup['definitions'] = self.fieldGroup['properties']
+                                        if self.tenantId[1:] in self.fieldGroup.get('$id'): ## custom field group
+                                            if '/datatypes/' in str(self.fieldGroup):
+                                                dataTypeSearch = f"(https://ns.adobe.com/{self.tenantId[1:]}/datatypes/[0-9a-z]+?)'"
+                                                dataTypes = re.findall(dataTypeSearch,str(self.fieldGroup))
+                                                for dt in dataTypes:
+                                                    dt_manager = DataTypeManager(dt,localFolder=self.localfolder,sandbox=self.sandbox,tenantId=self.tenantId)
+                                                    self.dataTypes[dt_manager.id] = dt_manager.title
+                                                    self.dataTypeManagers[dt_manager.title] = dt_manager
+                                        else: ## OOTB field group
+                                            if 'properties' in self.fieldGroup.keys():
+                                                self.fieldGroup['definitions'] = self.fieldGroup['properties']
+                                        found = True
+                                        break
+                                if found:
+                                    break
+                            if self.fieldGroup == {}:
+                                found = False
+                                for folder in self.fieldgroupGlobalFolder:
+                                    for json_file in folder.glob('*.json'):
+                                        tmp_def = json.load(FileIO(json_file))
+                                        if tmp_def.get('$id') == fieldGroup['$id'] or tmp_def.get('meta:altId') == fieldGroup.get('meta:altId') or tmp_def.get('title') == fieldGroup.get('title'):
+                                            self.fieldGroup = tmp_def
+                                            if 'properties' in self.fieldGroup.keys():
+                                                self.fieldGroup['definitions'] = self.fieldGroup['properties']
+                                            found = True
+                                            break
+                                    if found:
+                                        break
                             self.EDITABLE = False
                     else: ## if definitions key not present
                         if 'properties' in self.fieldGroup.keys():
@@ -166,19 +183,24 @@ class FieldGroupManager:
                                     self.fieldGroup = self.schemaAPI.getFieldGroup(self.fieldGroup['$id'],full=True)
                                 self.EDITABLE = True
                         elif self.localfolder is not None: ## looking into local folder
-                            for json_file in self.fieldgroupFolder.glob('*.json'): ## only custom Field groups: TO DO check for OOTB FG without definition
-                                tmp_def = json.load(FileIO(json_file))
-                                if tmp_def.get('$id') == fieldGroup['$id'] or tmp_def.get('meta:altId') == fieldGroup.get('meta:altId') or tmp_def.get('title') == fieldGroup.get('title'):
-                                    self.fieldGroup = tmp_def
-                                    if self.tenantId[1:] in self.fieldGroup.get('$id'): ## custom field group
-                                        if '/datatypes/' in str(self.fieldGroup):
-                                            dataTypeSearch = f"(https://ns.adobe.com/{self.tenantId[1:]}/datatypes/[0-9a-z]+?)'"
-                                            dataTypes = re.findall(dataTypeSearch,str(self.fieldGroup))
-                                            for dt in dataTypes:
-                                                dt_manager = DataTypeManager(dt,localFolder=self.localfolder,sandbox=self.sandbox,tenantId=self.tenantId)
-                                                self.dataTypes[dt_manager.id] = dt_manager.title
-                                                self.dataTypeManagers[dt_manager.title] = dt_manager
-                                    
+                            found = False
+                            for folder in self.fieldgroupFolder:
+                                for json_file in folder.glob('*.json'): ## only custom Field groups: TO DO check for OOTB FG without definition
+                                    tmp_def = json.load(FileIO(json_file))
+                                    if tmp_def.get('$id') == fieldGroup['$id'] or tmp_def.get('meta:altId') == fieldGroup.get('meta:altId') or tmp_def.get('title') == fieldGroup.get('title'):
+                                        self.fieldGroup = tmp_def
+                                        if self.tenantId[1:] in self.fieldGroup.get('$id'): ## custom field group
+                                            if '/datatypes/' in str(self.fieldGroup):
+                                                dataTypeSearch = f"(https://ns.adobe.com/{self.tenantId[1:]}/datatypes/[0-9a-z]+?)'"
+                                                dataTypes = re.findall(dataTypeSearch,str(self.fieldGroup))
+                                                for dt in dataTypes:
+                                                    dt_manager = DataTypeManager(dt,localFolder=self.localfolder,sandbox=self.sandbox,tenantId=self.tenantId)
+                                                    self.dataTypes[dt_manager.id] = dt_manager.title
+                                                    self.dataTypeManagers[dt_manager.title] = dt_manager
+                                        found = True
+                                        break
+                                if found:
+                                    break
                         else:
                             raise ValueError("The field group definition provided does not contains the 'definitions' key. Please check the field group.")
                 else:
@@ -208,26 +230,38 @@ class FieldGroupManager:
                         self.fieldGroup = tmp_def
                         self.EDITABLE = False
                 elif self.localfolder is not None:
-                    for json_file in self.fieldgroupFolder.glob('*.json'):
-                        tmp_def = json.load(FileIO(json_file))
-                        if tmp_def.get('$id') == fieldGroup or tmp_def.get('meta:altId') == fieldGroup or tmp_def.get('title') == fieldGroup:
-                            self.fieldGroup = tmp_def
-                            if tmp_def.get('meta:tenantNamespace',None) is not None:
-                                self.tenantId = tmp_def.get('meta:tenantNamespace')
-                                if '/datatypes/' in str(self.fieldGroup):
-                                    dataTypeSearch = f"(https://ns.adobe.com/{self.tenantId[1:]}/datatypes/[0-9a-z]+?)'"
-                                    dataTypes = re.findall(dataTypeSearch,str(self.fieldGroup.get('definitions')))
-                                    for file in self.datatypeFolder.glob('*.json'):
-                                        tmp_def = json.load(FileIO(file))
-                                        if tmp_def.get('$id') in dataTypes or tmp_def.get('meta:altId') in dataTypes:
-                                            dt_manager = DataTypeManager(tmp_def,localFolder=self.localfolder,sandbox=self.sandbox,tenantId=self.tenantId)
-                                            self.dataTypes[dt_manager.id] = dt_manager.title
-                                            self.dataTypeManagers[dt_manager.title] = dt_manager
-                    if self.fieldGroup == {}: ## looking into the global folder
-                        for json_file in self.fieldgroupGlobalFolder.glob('*.json'):
+                    found = False
+                    for folder in self.fieldgroupFolder:
+                        for json_file in folder.glob('*.json'):
                             tmp_def = json.load(FileIO(json_file))
                             if tmp_def.get('$id') == fieldGroup or tmp_def.get('meta:altId') == fieldGroup or tmp_def.get('title') == fieldGroup:
-                                self.fieldGroup = tmp_def              
+                                self.fieldGroup = tmp_def
+                                if tmp_def.get('meta:tenantNamespace',None) is not None:
+                                    self.tenantId = tmp_def.get('meta:tenantNamespace')
+                                    if '/datatypes/' in str(self.fieldGroup):
+                                        dataTypeSearch = f"(https://ns.adobe.com/{self.tenantId[1:]}/datatypes/[0-9a-z]+?)'"
+                                        dataTypes = re.findall(dataTypeSearch,str(self.fieldGroup.get('definitions')))
+                                        for file in self.datatypeFolder.glob('*.json'):
+                                            tmp_def = json.load(FileIO(file))
+                                            if tmp_def.get('$id') in dataTypes or tmp_def.get('meta:altId') in dataTypes:
+                                                dt_manager = DataTypeManager(tmp_def,localFolder=self.localfolder,sandbox=self.sandbox,tenantId=self.tenantId)
+                                                self.dataTypes[dt_manager.id] = dt_manager.title
+                                                self.dataTypeManagers[dt_manager.title] = dt_manager
+                                found = True
+                                break
+                        if found:
+                            break
+                        if self.fieldGroup == {}: ## looking into the global folder
+                            found = False
+                            for folder in self.fieldgroupGlobalFolder:
+                                for json_file in folder.glob('*.json'):
+                                    tmp_def = json.load(FileIO(json_file))
+                                    if tmp_def.get('$id') == fieldGroup or tmp_def.get('meta:altId') == fieldGroup or tmp_def.get('title') == fieldGroup:
+                                        self.fieldGroup = tmp_def            
+                                        found = True
+                                        break
+                                if found:
+                                    break  
             else:
                 raise ValueError("the element pass is not a field group definition")
         else:
@@ -1689,10 +1723,11 @@ class FieldGroupManager:
             res = self.schemaAPI.getDescriptors(prop=f"xdm:sourceSchema=={self.id}")
         elif self.localfolder is not None:
             res = []
-            for json_file in self.descriptorFolder.glob('*.json'):
-                tmp_def = json.load(FileIO(json_file))
-                if tmp_def.get('xdm:sourceSchema') == self.id:
-                    res.append(tmp_def)
+            for folder in self.descriptorFolder:
+                for json_file in folder.glob('*.json'):
+                    tmp_def = json.load(FileIO(json_file))
+                    if tmp_def.get('xdm:sourceSchema') == self.id:
+                        res.append(tmp_def)
         else:
             raise Exception("Require a schema API connection or local folder. Pass the instance of a Schema class or import a configuration file.")
         return res