aepp 0.5.2.post1__py3-none-any.whl → 0.5.2.post3__py3-none-any.whl

aepp/__init__.py

@@ -159,9 +159,8 @@ def __titleSafe__(text: str) -> str:
     Arguments:
         text : REQUIRED : the text to be converted
     """
-    invalid_chars = ['<', '>', ':', '"', '/', '\\', '|', '?', '*', ' ']
-    for char in invalid_chars:
-        text = text.replace(char, '_')
+    valid_chars = "[^a-zA-Z0-9_\n\\.]"
+    text = re.sub(valid_chars, "_", text)
     return text
 
 
@@ -187,7 +186,7 @@ def extractSandboxArtifacts(
         completePath = mypath / f'{sandbox.sandbox}'
     else:
         completePath = Path(localFolder)
-    from aepp import schema, catalog, identity,customerprofile, segmentation
+    from aepp import schema, catalog, identity,customerprofile, segmentation, tags
     sch = schema.Schema(config=sandbox)
     cat = catalog.Catalog(config=sandbox)
     ide = identity.Identity(config=sandbox,region=region)
@@ -223,6 +222,16 @@ def extractSandboxArtifacts(
     mergePolicyPath.mkdir(exist_ok=True)
     audiencePath = completePath / 'audience'
     audiencePath.mkdir(exist_ok=True)
+    tagPath = completePath / 'tag'
+    tagPath.mkdir(exist_ok=True)
+    ## handling tags
+    tag_manager = tags.Tags(config=sandbox)
+    all_tags = tag_manager.getTags()
+    dict_id_name = {tag['id']:tag['name'] for tag in all_tags}
+    for tag in all_tags:
+        safe_name = __titleSafe__(tag.get('name','unknown'))
+        with open(f"{tagPath / safe_name}.json",'w') as f:
+            json.dump(tag,f,indent=2)
     myclasses = sch.getClasses()
     classesGlobal = sch.getClassesGlobal()
     behaviors = sch.getBehaviors()
@@ -290,6 +299,9 @@ def extractSandboxArtifacts(
     datasets = cat.getDataSets()
     for key,value in datasets.items():
         value['id'] = key
+        if len(value.get('unifiedTags',[])) > 0:
+            tag_names = [dict_id_name.get(tag_id) for tag_id in value.get('unifiedTags',[])]
+            value['unifiedTags'] = tag_names
         with open(f"{datasetPath / value.get('tags',{}).get('adobe/pqs/table',[key])[0]}.json",'w') as f:
             json.dump(value,f,indent=2)
     identities = ide.getIdentities()
@@ -307,6 +319,9 @@ def extractSandboxArtifacts(
     audiences = mysegmentation.getAudiences()
     for el in audiences:
         safe_name = __titleSafe__(el.get('name','unknown'))
+        if len(el.get('tags',[])) > 0:
+            tag_names = [dict_id_name.get(tag_id) for tag_id in el.get('tags',[])]
+            el['tags'] = tag_names
         with open(f"{audiencePath / safe_name}.json",'w') as f:
             json.dump(el,f,indent=2)
 
@@ -345,9 +360,17 @@ def extractSandboxArtifact(
     with open(f'{completePath}/config.json','w') as f:
         json.dump(globalConfig,f,indent=2)
     
-    from aepp import schema, catalog, identity
+    from aepp import schema, catalog, tags
     sch = schema.Schema(config=sandbox)
     cat = catalog.Catalog(config=sandbox)
+    ### taking care of tas
+    tagPath = completePath / 'tag'
+    tagPath.mkdir(exist_ok=True)
+    tag_manager = tags.Tags(config=sandbox)
+    all_tags = tag_manager.getTags()
+    dict_tag_id_name = {tag['id']:tag['name'] for tag in all_tags}
+    with open(f'{tagPath}/tags.json','w') as f:
+        json.dump(all_tags,f,indent=2)
     if artifactType == 'class':
         __extractClass__(artifact,completePath,sandbox)
     elif artifactType == 'schema':
@@ -357,16 +380,16 @@ def extractSandboxArtifact(
     elif artifactType == 'datatype':
         __extractDataType__(artifact,completePath,sandbox)
     elif artifactType == 'dataset':
-        __extractDataset__(artifact,completePath,sandbox,region)
+        __extractDataset__(artifact,completePath,sandbox,region,dict_tag_id_name)
     elif artifactType == 'identity':
         __extractIdentity__(artifact,region,completePath,sandbox)
     elif artifactType == 'mergepolicy':
-        __extractMergePolicy__(artifact,completePath,sandbox)
+        __extractMergePolicy__(artifact,completePath,sandbox,dict_tag_id_name=dict_tag_id_name)
     elif artifactType == 'audience':
-        __extractAudience__(artifact,completePath,sandbox)
+        __extractAudience__(artifact,completePath,sandbox,dict_tag_id_name)
     else:
         raise ValueError("artifactType not recognized")
-    
+
 def __extractClass__(classEl: str,folder: Union[str, Path] = None,sandbox: 'ConnectObject' = None):
     classPath = Path(folder) / 'class'
     classPath.mkdir(exist_ok=True)
@@ -511,7 +534,7 @@ def __extractIdentity__(identityStr: str,region:str=None,folder: Union[str, Path
     with open(f"{identityPath / file_name}.json",'w') as f:
         json.dump(myIdentity,f,indent=2)
 
-def __extractDataset__(dataset: str,folder: Union[str, Path] = None,sandbox: 'ConnectObject' = None, region:str=None):
+def __extractDataset__(dataset: str,folder: Union[str, Path] = None,sandbox: 'ConnectObject' = None, region:str=None,dict_tag_id_name: dict = None,**kwargs):
     from aepp import catalog
     cat = catalog.Catalog(config=sandbox)
     datasets = cat.getDataSets()
@@ -520,6 +543,9 @@ def __extractDataset__(dataset: str,folder: Union[str, Path] = None,sandbox: 'Co
         if key == dataset or value.get('tags',{}).get('adobe/pqs/table',[''])[0] == dataset or value.get('name','') == dataset:
             myDataset = value
             myDataset['id'] = key
+            if dict_tag_id_name is not None and len(myDataset.get('unifiedTags',[])) > 0:
+                tag_names = [dict_tag_id_name.get(tag_id) for tag_id in myDataset.get('unifiedTags',[])]
+                myDataset['unifiedTags'] = tag_names
     if myDataset is None:
         raise ValueError("Dataset not found")
     datasetPath = Path(folder) / 'dataset'
@@ -531,7 +557,7 @@ def __extractDataset__(dataset: str,folder: Union[str, Path] = None,sandbox: 'Co
     if schema is not None:
         __extractSchema__(schema,folder,sandbox,region)
 
-def __extractMergePolicy__(mergePolicy: str = None,folder:Union[str, Path]=None, sandbox: 'ConnectObject' = None,region:str=None):
+def __extractMergePolicy__(mergePolicy: str = None,folder:Union[str, Path]=None, sandbox: 'ConnectObject' = None,region:str=None,dict_tag_id_name: dict = None,**kwargs):
     from aepp import customerprofile
     ups = customerprofile.Profile(config=sandbox)
     mymergePolicies = ups.getMergePolicies()
@@ -539,13 +565,13 @@ def __extractMergePolicy__(mergePolicy: str = None,folder:Union[str, Path]=None,
     if mymergePolicy['attributeMerge'].get('type','timestampOrdered') == 'dataSetPrecedence':
         list_ds = mymergePolicy['attributeMerge'].get('order',[])
         for ds in list_ds:
-            __extractDataset__(ds,folder,sandbox,region)
+            __extractDataset__(ds,folder,sandbox,region,dict_tag_id_name=dict_tag_id_name)
     mergePolicyPath = Path(folder) / 'mergePolicy'
     mergePolicyPath.mkdir(exist_ok=True)
     with open(f"{mergePolicyPath / mymergePolicy.get('id','unknown')}.json",'w') as f:
         json.dump(mymergePolicy,f,indent=2)
 
-def __extractAudience__(audienceName: str = None,folder:Union[str, Path]=None, sandbox: 'ConnectObject' = None):
+def __extractAudience__(audienceName: str = None,folder:Union[str, Path]=None, sandbox: 'ConnectObject' = None,dict_tag_id_name: dict = None,**kwargs):
     from aepp import segmentation
     mysegmentation = segmentation.Segmentation(config=sandbox) 
     audiences = mysegmentation.getAudiences()
@@ -553,5 +579,8 @@ def __extractAudience__(audienceName: str = None,folder:Union[str, Path]=None, s
     audiencePath = Path(folder) / 'audience'
     audiencePath.mkdir(exist_ok=True)
     safe_name = __titleSafe__(myaudience.get('name','unknown'))
+    if len(myaudience.get('tags',[])) > 0 and dict_tag_id_name is not None:
+        tag_names = [dict_tag_id_name.get(tag_id) for tag_id in myaudience.get('tags',[])]
+        myaudience['tags'] = tag_names
     with open(f"{audiencePath / safe_name}.json",'w') as f:
         json.dump(myaudience,f,indent=2)

aepp/__version__.py

@@ -1 +1 @@
-__version__ = "0.5.2-1"
+__version__ = "0.5.2-3"

aepp/catalog.py

@@ -489,6 +489,7 @@ class Catalog:
                 identityEnabled:bool=False,
                 upsert:bool=False,
                 tags:dict=None,
+                unifiedTags:list[str]=None,
                 systemLabels:list[str]=None,
                 **kwargs)-> dict:
         """
@@ -503,6 +504,7 @@ class Catalog:
             upsert : OPTIONAL : If the dataset to be created with profile enbaled and Upsert capability.
             tags : OPTIONAL : set of attribute to add as tags.
             systemLabels : OPTIONAL : A list of string to attribute system based label on creation.
+            unifiedTags : OPTIONAL : a list of tags to be added to the dataset
         possible kwargs
             requestDataSource : Set to true if you want Catalog to create a dataSource on your behalf; otherwise, pass a dataSourceId in the body.
         """
@@ -533,6 +535,8 @@ class Catalog:
                 data['tags']["unifiedIdentity"] = ["enabled:true"]
             if upsert:
                 data['tags']['unifiedProfile'] = ["enabled: true","isUpsert: true"]
+            if unifiedTags is not None and type(unifiedTags) == list:
+                data["unifiedTags"] = unifiedTags
             if tags is not None and type(tags) == dict:
                 for key in tags:
                     data['tags'][key] = tags[key]

aepp/cli/__main__.py

@@ -1,7 +1,7 @@
-from ast import arg
 from matplotlib.pyplot import table
 import aepp
 from aepp import synchronizer, schema, schemamanager, fieldgroupmanager, datatypemanager, identity, queryservice,catalog,flowservice,sandboxes, segmentation
+from aepp.cli.upsfieldsanalyzer import UpsFieldsAnalyzer
 import argparse, cmd, shlex, json
 from functools import wraps
 from rich.console import Console
@@ -37,6 +37,7 @@ class ServiceShell(cmd.Cmd):
         super().__init__()
         self.config = None
         self.connectInstance = True
+        self.ups_profile_analyzer:UpsFieldsAnalyzer|None = None
         if kwargs.get("config_file") is not None:
             config_path = Path(kwargs.get("config_file"))
             if not config_path.is_absolute():
@@ -69,7 +70,7 @@ class ServiceShell(cmd.Cmd):
             )
             self.prompt = f"{self.config.sandbox}> "
             console.print(Panel(f"Connected to [bold green]{self.sandbox}[/bold green]", style="blue"))
-        
+
     def do_createConfigFile(self, arg:Any) -> None:
         """Create a configuration file for future use"""
         parser = argparse.ArgumentParser(prog='createConfigFile', add_help=True)
@@ -124,15 +125,20 @@ class ServiceShell(cmd.Cmd):
         """Change the current sandbox after configuration"""
         parser = argparse.ArgumentParser(prog='change sandbox', add_help=True)
         parser.add_argument("sandbox", help="sandbox name to switch to")
-        args = parser.parse_args(shlex.split(args))
-        self.sandbox = str(args.sandbox) if args.sandbox else console.print(Panel("(!) Please provide a sandbox name using -sx or --sandbox", style="red"))
-        if self.config is not None:
-            if args.sandbox:
-                self.config.setSandbox(str(args.sandbox))
-                self.prompt = f"{self.config.sandbox}> "
-                console.print(Panel(f"Sandbox changed to: [bold green]{self.config.sandbox}[/bold green]", style="blue"))
-        else:
-            console.print(Panel("(!) You must configure the connection first using the 'config' command.", style="red"))
+        try:
+            args = parser.parse_args(shlex.split(args))
+            self.sandbox = str(args.sandbox) if args.sandbox else console.print(Panel("(!) Please provide a sandbox name using -sx or --sandbox", style="red"))
+            if self.config is not None:
+                if args.sandbox:
+                    self.config.setSandbox(str(args.sandbox))
+                    self.prompt = f"{self.config.sandbox}> "
+                    console.print(Panel(f"Sandbox changed to: [bold green]{self.config.sandbox}[/bold green]", style="blue"))
+            else:
+                console.print(Panel("(!) You must configure the connection first using the 'config' command.", style="red"))
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
+        except SystemExit:
+            return
     
     @login_required
     def do_get_sandboxes(self, args:Any) -> None:
@@ -169,7 +175,112 @@ class ServiceShell(cmd.Cmd):
             console.print(f"(!) Error: {str(e)}", style="red")
         except SystemExit:
             return
-
+        
+    @login_required
+    def do_get_profile_paths_info(self,args:Any)->None:
+        """Get usage information for all Profile paths"""
+        parser = argparse.ArgumentParser(prog='get_profile_paths_info', add_help=True)
+        try:
+            args = parser.parse_args(shlex.split(args))
+            if self.ups_profile_analyzer is None:
+                console.print("Initializing Profile UPS Fields Analyzer. This will take few minutes...", style="blue")
+                self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config)
+            else:
+                if self.config.sandbox != self.ups_profile_analyzer.sandbox:
+                    console.print("Re-initializing Profile UPS Fields Analyzer for the new sandbox. This will take few minutes...", style="blue")
+                    self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config)
+            console.print("Analyzing all Profile paths information. This will take few minutes...", style="blue")
+            df_analysis:pd.DataFrame = self.ups_profile_analyzer.analyzePaths(output='df')
+            if df_analysis is not None:
+                console.print(df_analysis)
+                df_analysis.to_csv(f"profile_all_paths_info.csv", index=False)
+                console.print(f"Profile all paths information data exported to profile_all_paths_info.csv", style="green")
+            else:
+                console.print("(!) No profile paths information data found.", style="red")
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
+        except SystemExit:
+            return
+        
+    @login_required
+    def do_get_profile_path_info(self, args:Any) -> None:
+        """Get path information on Profile"""
+        parser = argparse.ArgumentParser(prog='get_profile_path_info', add_help=True)
+        parser.add_argument("path", help="Dot notation of the path to analyze in Profile Storage", default=None,type=str)
+        try:
+            args = parser.parse_args(shlex.split(args))
+            if self.ups_profile_analyzer is None:
+                console.print("Initializing Profile UPS Fields Analyzer. This will take few minutes...", style="blue")
+                self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config)
+            else:
+                if self.config.sandbox != self.ups_profile_analyzer.sandbox:
+                    console.print("Re-initializing Profile UPS Fields Analyzer for the new sandbox. This will take few minutes...", style="blue")
+                    self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config)
+            analysis = self.ups_profile_analyzer.analyzePath(args.path)
+            if analysis:
+                console.print_json(data=analysis)
+                with open(f"profile_path_info_{args.path.replace('/','_')}.json", 'w') as f:
+                    json.dump(analysis, f, indent=4)
+                console.print(f"Profile path information data exported to profile_path_info_{args.path.replace('/','_')}.json", style="green")
+            else:
+                console.print("(!) No profile path information data found.", style="red")
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
+        except SystemExit:
+            return
+    
+    @login_required
+    def do_get_event_paths_info(self,args:Any)->None:
+        """Get information for all Experience Event paths"""
+        parser = argparse.ArgumentParser(prog='get_event_paths_info', add_help=True)
+        try:
+            args = parser.parse_args(shlex.split(args))
+            if self.ups_profile_analyzer is None:
+                console.print("Initializing Event UPS Fields Analyzer. This will take few minutes...", style="blue")
+                self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config,union='https://ns.adobe.com/xdm/context/experienceevent__union')
+            else:
+                if self.config.sandbox != self.ups_profile_analyzer.sandbox:
+                    console.print("Re-initializing Event UPS Fields Analyzer for the new sandbox. This will take few minutes...", style="blue")
+                    self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config,union='https://ns.adobe.com/xdm/context/experienceevent__union')
+            console.print("Analyzing all Event paths information. This will take few minutes...", style="blue")
+            df_analysis:pd.DataFrame = self.ups_profile_analyzer.analyzePaths(output='df')
+            if df_analysis is not None:
+                console.print(df_analysis)
+                df_analysis.to_csv(f"event_all_paths_info.csv", index=False)
+                console.print(f"Event all paths information data exported to event_all_paths_info.csv", style="green")
+            else:
+                console.print("(!) No event paths information data found.", style="red")
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
+        except SystemExit:
+            return
+    
+    @login_required
+    def do_get_event_path_info(self, args:Any) -> None:
+        """Get path information on Experience Event"""
+        parser = argparse.ArgumentParser(prog='get_event_path_info', add_help=True)
+        parser.add_argument("path", help="Dot notation of the path to analyze in Experience Event Storage", default=None,type=str)
+        try:
+            args = parser.parse_args(shlex.split(args))
+            if self.ups_profile_analyzer is None:
+                console.print("Initializing Event UPS Fields Analyzer. This will take few minutes...", style="blue")
+                self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config,union='https://ns.adobe.com/xdm/context/experienceevent__union')
+            else:
+                if self.config.sandbox != self.ups_profile_analyzer.sandbox:
+                    console.print("Re-initializing Event UPS Fields Analyzer for the new sandbox. This will take few minutes...", style="blue")
+                    self.ups_profile_analyzer = UpsFieldsAnalyzer(config=self.config,union='https://ns.adobe.com/xdm/context/experienceevent__union')
+            analysis = self.ups_profile_analyzer.analyzePath(args.path)
+            if analysis:
+                console.print_json(data=analysis)
+                with open(f"event_path_info_{args.path.replace('/','_')}.json", 'w') as f:
+                    json.dump(analysis, f, indent=4)
+                console.print(f"Event path information data exported to event_path_info_{args.path.replace('/','_')}.json", style="green")
+            else:
+                console.print("(!) No event path information data found.", style="red")
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
+        except SystemExit:
+            return
     
     @login_required
     def do_get_schemas(self, args:Any) -> None:
@@ -783,8 +894,9 @@ class ServiceShell(cmd.Cmd):
             return
     
     @login_required
-    def do_get_datasets_tableName(self, args:Any) -> None:
-        parser = argparse.ArgumentParser(prog='get_datasets', add_help=True)
+    def do_get_datasets_tableNames(self, args:Any) -> None:
+        """List all datasets with their table names in the current sandbox"""
+        parser = argparse.ArgumentParser(prog='get_datasets_tableNames', add_help=True)
         try:
             args = parser.parse_args(shlex.split(args))
             aepp_cat = catalog.Catalog(config=self.config)
@@ -956,10 +1068,11 @@ class ServiceShell(cmd.Cmd):
     def do_get_identities(self, args:Any) -> None:
         """List all identities in the current sandbox"""
         parser = argparse.ArgumentParser(prog='get_identities', add_help=True)
-        parser.add_argument("-r","--region", help="Region to get identities from: 'ndl2' (default), 'va7', 'aus5', 'can2', 'ind2'", default='ndl2')
+        parser.add_argument("-r","--region", help="Region to get identities from: 'ndl2' (default), 'va7', 'aus5', 'can2', 'ind2'", default='ndl2',type=str)
         parser.add_argument("-co","--custom_only",help="Get only custom identities", default=False,type=bool)
         try:
             args = parser.parse_args(shlex.split(args))
+            region = args.region if args.region else 'ndl2'
             aepp_identity = identity.Identity(config=self.config,region=args.region)
             identities = aepp_identity.getIdentities(only_custom=args.custom_only)
             df_identites = pd.DataFrame(identities)
@@ -991,6 +1104,23 @@ class ServiceShell(cmd.Cmd):
             args = parser.parse_args(shlex.split(args))
             aepp_audience = segmentation.Segmentation(config=self.config)
             audiences = aepp_audience.getAudiences()
+            flw = flowservice.FlowService(config=self.config)
+            destinations = flw.getFlows(onlyDestinations=True)
+            segments_shared = []
+            for tmpFlow in destinations:
+                if len(tmpFlow['transformations'])>0:
+                    tmpSegmentShared = tmpFlow['transformations'][0].get('params',{}).get('segmentSelectors',{}).get('selectors',[])
+                    for s in tmpSegmentShared:
+                        s['flowId'] = tmpFlow['id']
+                    segments_shared += tmpSegmentShared
+            segment_shared_dict = {seg.get('value',{}).get('id'):{
+                "exportMode" : seg.get('value',{}).get('exportMode'),
+                "scheduleFrequency": seg.get('value',{}).get("schedule",{}).get('frequency',''),
+                "flowId" : seg["flowId"]
+            } for seg in segments_shared}
+            for aud in audiences:
+                aud['usedInFlow'] = True if segment_shared_dict.get(aud.get("id","N/A"),{}) != {} else False
+                aud['sharedInfo'] = segment_shared_dict.get(aud.get("id","N/A"),{})    
             df_audiences = pd.DataFrame(audiences)
             df_audiences.to_csv(f"{self.config.sandbox}_audiences.csv",index=False)
             console.print(f"Audiences exported to {self.config.sandbox}_audiences.csv", style="green")
@@ -999,14 +1129,44 @@ class ServiceShell(cmd.Cmd):
             table.add_column("Name", style="magenta")
             table.add_column("Evaluation", style="yellow")
             table.add_column("Total Profiles", style="green")
-            table.add_column("Evaluation Date", style="white")
+            table.add_column("In Flow", style="white")
             for aud in audiences:
                 table.add_row(
                     aud.get("id","N/A"),
                     aud.get("name","N/A"),
-                    '[red3]Batch[/red3]' if aud.get("evaluationInfo",{}).get("batch",{}).get('enabled') else '[chartreuse1]Streaming[/chartreuse1]' if aud.get("evaluationInfo",{}).get("continuous",{}).get('enabled') else '[blue_violet]Edge[/blue_violet]' if aud.get("evaluationInfo",{}).get("synchronous",{}).get('enabled') else 'N/A',
+                    '[bright_blue]Batch[/bright_blue]' if aud.get("evaluationInfo",{}).get("batch",{}).get('enabled') else '[chartreuse1]Streaming[/chartreuse1]' if aud.get("evaluationInfo",{}).get("continuous",{}).get('enabled') else '[purple]Edge[/purple]' if aud.get("evaluationInfo",{}).get("synchronous",{}).get('enabled') else 'N/A',
                     str(aud.get('metrics',{}).get('data',{}).get('totalProfiles','N/A')),
-                    datetime.fromtimestamp(aud.get('metrics',{}).get('updateEpoch',0)).isoformat(),
+                    '[green3]True[/green3]' if aud.get("usedInFlow",False) else '[red3]False[/red3]',
+                )
+            console.print(table)
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
+        except SystemExit:
+            return
+    
+    @login_required
+    def do_get_tags(self,args)->None:
+        """
+        Provide the list of tags defined in the current organization
+        """
+        parser = argparse.ArgumentParser(prog='get_tags', add_help=True)
+        try:
+            from aepp import tags
+            args = parser.parse_args(shlex.split(args))
+            aepp_tag = tags.Tags(config=self.config)
+            tags = aepp_tag.getTags()
+            df_tags = pd.DataFrame(tags)
+            df_tags.to_csv(f"tags.csv",index=False)
+            console.print(f"Tags exported to tags.csv", style="green")
+            table = Table(title=f"Tags in Organization: {self.config.org_id}")
+            table.add_column("ID", style="cyan")
+            table.add_column("Name", style="magenta")
+            table.add_column("Category Name", style="white")
+            for _, tg in df_tags.iterrows():
+                table.add_row(
+                    str(tg.get("id","N/A")),
+                    tg.get("name","N/A"),
+                    tg.get("tagCategoryName","N/A"),
                 )
             console.print(table)
         except Exception as e:
@@ -1316,7 +1476,7 @@ class ServiceShell(cmd.Cmd):
             conn = aepp_query.connection()
             iqs2 = queryservice.InteractiveQuery2(conn)
             result:pd.DataFrame = iqs2.query(sql=args.sql_query)
-            result.to_csv(f"query_result_{int(datetime.now().timestamp())}.csv", index=False)
+            result.sample(5).to_csv(f"query_result_{int(datetime.now().timestamp())}.csv", index=False)
             console.print(f"Query result exported to query_result_{int(datetime.now().timestamp())}.csv", style="green")
             console.print(result)
         except Exception as e:
@@ -1328,11 +1488,11 @@ class ServiceShell(cmd.Cmd):
     @login_required
     def do_extractArtifacts(self,args:Any) -> None:
         """extractArtifacts localfolder"""
-        console.print("Extracting artifacts...", style="blue")
-        parser = argparse.ArgumentParser(prog='extractArtifacts', description='Extract artifacts from AEP')
+        parser = argparse.ArgumentParser(prog='extractArtifacts', description='Extract artifacts from AEP',add_help=True)
         parser.add_argument('-lf','--localfolder', help='Local folder to extract artifacts to', default='./extractions')
         parser.add_argument('-rg','--region', help='Region to extract artifacts from: "ndl2" (default), "va7", "aus5", "can2", "ind2"',default='ndl2')
         try:
+            console.print("Extracting artifacts...", style="blue")
             args = parser.parse_args(shlex.split(args))
             aepp.extractSandboxArtifacts(
                 sandbox=self.config,
@@ -1342,18 +1502,19 @@ class ServiceShell(cmd.Cmd):
             console.print(Panel("Extraction completed!", style="green"))
         except SystemExit:
             return
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
 
     @login_required
     def do_extractArtifact(self,args:Any) -> None:
         """extractArtifacts localfolder"""
-        console.print("Extracting artifact...", style="blue")
-        parser = argparse.ArgumentParser(prog='extractArtifact', description='Extract artifacts from AEP')
+        parser = argparse.ArgumentParser(prog='extractArtifact', description='Extract artifacts from AEP',add_help=True)
         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('-lf','--localfolder', help='Local folder to extract artifacts to',default='extractions')
         parser.add_argument('-rg','--region', help='Region to extract artifacts from: "ndl2" (default), "va7", "aus5", "can2", "ind2"',default='ndl2')
-        
         try:
+            console.print("Extracting artifact...", style="blue")
             args = parser.parse_args(shlex.split(args))
             aepp.extractSandboxArtifact(
                 artifact=args.artifact,
@@ -1364,12 +1525,13 @@ class ServiceShell(cmd.Cmd):
             console.print("Extraction completed!", style="green")
         except SystemExit:
             return
+        except Exception as e:
+            console.print(f"(!) Error: {str(e)}", style="red")
 
     @login_required
     def do_sync(self,args:Any) -> None:
         """extractArtifacts localfolder"""
-        console.print("Syncing artifact...", style="blue")
-        parser = argparse.ArgumentParser(prog='extractArtifact', description='Extract artifacts from AEP')
+        parser = argparse.ArgumentParser(prog='extractArtifact', description='Extract artifacts from AEP',add_help=True)
         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 ',type=str)
         parser.add_argument('-t','--targets', help='target sandboxes',nargs='+',type=str)
@@ -1380,18 +1542,22 @@ class ServiceShell(cmd.Cmd):
         try:
             args = parser.parse_args(shlex.split(args))
             console.print("Initializing Synchronizor...", style="blue")
+            if args.region:
+                region=args.region
+            else:
+                region='ndl2'
             if args.baseSandbox:
                 synchronizor = synchronizer.Synchronizer(
                     config=self.config,
                     targets=args.targets,
-                    region=args.region,
+                    region=region,
                     baseSandbox=args.baseSandbox,
                 )
             elif args.localfolder:
                 synchronizor = synchronizer.Synchronizer(
                     config=self.config,
                     targets=args.targets,
-                    region=args.region,
+                    region=region,
                     localFolder=args.localfolder,
             )
             console.print("Starting Sync...", style="blue")