aepp 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

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/deletion.py

@@ -20,11 +20,11 @@ from aepp import connector
 
 class Deletion:
     """
-    This class regroups differet methods and combine some to clean and delete artefact from Adobe Experience Platform.
+    This class regroups differet methods and combine some to clean and delete artifact from Adobe Experience Platform.
     Supported in this class:
-    - Deleting datasets (and associated artefacts)
-    - Deleteting dataflows (and associated artefacts)
-    - Deleting schemas (and associated artefacts)
+    - Deleting datasets (and associated artifacts)
+    - Deleteting dataflows (and associated artifacts)
+    - Deleting schemas (and associated artifacts)
     - Deleting audiences
     """
     loggingEnabled = False
@@ -83,14 +83,14 @@ class Deletion:
     def __repr__self(self):
         return f"Deletion(config={self.config})"
     
-    def deleteDataset(self,datasetId: str,associatedArtefacts:bool=False) -> dict:
+    def deleteDataset(self,datasetId: str,associatedArtifacts:bool=False) -> dict:
         """
-        Delete a dataset and all associated artefacts (dataflows, schemas, data connections).
+        Delete a dataset and all associated artifacts (dataflows, schemas, data connections).
         Arguments:
             datasetId : REQUIRED : The identifier of the dataset to delete.
-            associatedArtefacts : OPTIONAL : If set to True, all associated artefacts (dataflows, schemas) will also be deleted (default False).
-                Note : Deleting associated arterfacts option will be pass down to other methods called within this method. So Field Groups, Data Type could be impacted.
-                In case, it is not possible to delete artefacts, it will be silently ignored and returns in the output dictionary.
+            associatedArtifacts : OPTIONAL : If set to True, all associated artifacts (dataflows, schemas) will also be deleted (default False).
+                Note : Deleting associated artifacts option will be pass down to other methods called within this method. So Field Groups, Data Type could be impacted.
+                In case, it is not possible to delete artifacts, it will be silently ignored and returns in the output dictionary.
         """
         result = {}
         from aepp import catalog
@@ -100,7 +100,7 @@ class Deletion:
         schemaRef = datasetInfo.get('schemaRef',{}).get('id',None)
         res = cat.deleteDataSet(datasetId=datasetId)
         result['dataset'] = res
-        if associatedArtefacts:
+        if associatedArtifacts:
             # Deleting associated dataflows
             result['flows'] = {'connections':{}, 'flows': {}} 
             from aepp import flowservice
@@ -113,21 +113,21 @@ class Deletion:
             flows = flow.getFlows()
             list_flowIds = [f['id'] for f in flows if f.get('sourceConnectionIds',[""])[0] in list_source_dataflowsIds or f.get('targetConnectionIds',[""])[0] in list_target_dataflowsIds]
             for flowId in list_flowIds:
-                res_flow = self.deleteDataFlow(flowId=flowId, associatedArtefacts=associatedArtefacts)
+                res_flow = self.deleteDataFlow(flowId=flowId, associatedArtifacts=associatedArtifacts)
                 result['flows']['flows'][flowId] = res_flow
             # Deleting associated schema
             if schemaRef is not None:
-                result['schema'] = self.deleteSchema(schemaId=schemaRef, associatedArtefacts=associatedArtefacts)
+                result['schema'] = self.deleteSchema(schemaId=schemaRef, associatedArtifacts=associatedArtifacts)
         return result
 
-    def deleteSchema(self,schemaId: str,associatedArtefacts:bool=False) -> dict:
+    def deleteSchema(self,schemaId: str,associatedArtifacts:bool=False) -> dict:
         """
-        Delete a schema and possibly all associated artefacts.
+        Delete a schema and possibly all associated artifacts.
         Arguments:
             schemaId : REQUIRED : The identifier of the schema to delete.
-            associatedArtefacts : OPTIONAL : If set to True, all associated artefacts (fieldGroup, datatype) will also be deleted (default False).
-                Note : Deleting associated arterfacts option will be pass down to other methods called within this method. So Field Groups, Data Type could be impacted.
-                In case, it is not possible to delete artefacts, it will be silently ignored and returns in the output dictionary.
+            associatedArtifacts : OPTIONAL : If set to True, all associated artifacts (fieldGroup, datatype) will also be deleted (default False).
+                Note : Deleting associated artifacts option will be pass down to other methods called within this method. So Field Groups, Data Type could be impacted.
+                In case, it is not possible to delete artifacts, it will be silently ignored and returns in the output dictionary.
         """
         result = {'fieldGroup': {}, 'schema': {} , 'datatypes':{} }
         from aepp import schema, schemamanager
@@ -135,7 +135,7 @@ class Deletion:
         schemaInfo = schemamanager.SchemaManager(schemaId,config=self.config)
         res = sch.deleteSchema(schemaId=schemaId)
         result['schema'] = res
-        if associatedArtefacts:
+        if associatedArtifacts:
             for fieldgroupId, fieldgroupName in schemaInfo.fieldGroups.items():
                 myFG = schemaInfo.getFieldGroupManager(fieldgroupName)
                 datatypes = myFG.dataTypes
@@ -146,12 +146,12 @@ class Deletion:
                 result['fieldGroupName'][fieldgroupId] = res_fg
         return result
     
-    def deleteDataFlow(self,flowId: str,associatedArtefacts:bool=False) -> dict:
+    def deleteDataFlow(self,flowId: str,associatedArtifacts:bool=False) -> dict:
         """
-        Delete a dataflow and possibly all associated artefacts.
+        Delete a dataflow and possibly all associated artifacts.
         Arguments:
             flowId : REQUIRED : The identifier of the dataflow to delete.
-            associatedArtefacts : OPTIONAL : If set to True, all associated artefacts (source and target) will also be deleted (default False).
+            associatedArtifacts : OPTIONAL : If set to True, all associated artifacts (source and target) will also be deleted (default False).
                 Note : The base connection will be identified and returned but not deleted. It can contains other dataflows still actives."""
         result = {'flow': {}, 'targetConnection': {},'sourceConnection':{}, 'baseConnection': {} }
         from aepp import flowservice
@@ -163,7 +163,7 @@ class Deletion:
         result['baseConnection'] = baseConn
         res = flow.deleteFlow(flowId=flowId)
         result['response_flow'] = res
-        if associatedArtefacts:
+        if associatedArtifacts:
             for sourceConnectionId in sourceConnectionIds:
                 res_sc = flow.deleteSourceConnection(connectionId=sourceConnectionId)
                 result["response_sourceConn"] = res_sc

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