radboy 0.0.713__py3-none-any.whl → 0.0.715__py3-none-any.whl

radboy/DB/OrderedAndRxd.py

@@ -20,6 +20,9 @@ def CountTo():
         }
     start=datetime.now()
     data=FormBuilder(data=fd)
+    if data is None:
+        print("bad parameters!")
+        return
     absolute_start=False
     useLast=False
     while True:
@@ -41,6 +44,9 @@ def CountTo():
             }
             start=datetime.now()
             data=FormBuilder(data=fd)
+            if data is None:
+                print("bad parameters!")
+                return
             absolute_start=False
         if useLast:
             print("using last setup!")

radboy/DB/Prompt.py

@@ -26,7 +26,7 @@ import lzma,base64
 from Crypto.Cipher import AES
 #from Cryptodome.Cipher import AES
 from Crypto.Util.Padding import pad, unpad
-from decimal import Decimal,localcontext
+from decimal import Decimal,localcontext,getcontext
 import biip
 import itertools
 from inputimeout import inputimeout, TimeoutOccurred
@@ -2469,6 +2469,18 @@ class Prompt(object):
                             print(helpText)
                             continue
                         elif cmd.lower() in generate_cmds(startcmd=['precision','prcsn'],endCmd=['set','st','=']):
+                            toplvl=Control(func=FormBuilderMkText,ptext="Is this for everything globally(False)?",helpText="boolean",data="boolean")
+                            if toplvl in ['NaN',None]:
+                                continue
+                            elif toplvl in ['d',]:
+                                toplvl=False
+
+                            saveIt=Control(func=FormBuilderMkText,ptext="Save to settings(False)?",helpText="boolean",data="boolean")
+                            if saveIt in ['NaN',None]:
+                                continue
+                            elif saveIt in ['d',]:
+                                saveIt=False
+
                             value=Control(func=FormBuilderMkText,ptext="How many digits of precision?",helpText=f"1-{decimal.MAX_PREC}",data="integer")
                             if value in ['NaN',None]:
                                 continue
@@ -2477,7 +2489,12 @@ class Prompt(object):
                             elif value < 1:
                                 print("invalid value")
                                 continue
-                            PROMPT_CONTEXT.prec=value
+                            if not toplvl:
+                                PROMPT_CONTEXT.prec=value
+                            else:
+                                getcontext().prec=value
+                            if saveIt:
+                                PROMPT_CONTEXT.prec=int(db.detectGetOrSet("lsbld ROUNDTO default",value,setValue=True,literal=False))
                             continue
                         elif cmd.lower() in generate_cmds(startcmd=['simple','smpl'],endCmd=['scanner','scanr','scnnr','scnr']):
                             TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).simple_scanner()

radboy/FB/FormBuilder.py

@@ -13,6 +13,7 @@ from datetime import date,time,datetime
 from radboy.FB.FBMTXT import *
 from copy import copy
 from radboy.DB import db as DB
+from decimal import localcontext
 
 def findAndSelectKey(options=None):
     if options is None:
@@ -64,309 +65,311 @@ def findAndSelectKey(options=None):
                 print(e)
 
 def FormBuilder(data,extra_tooling=False,passThruText=None):
-    if passThruText != None:
-        passThruText=f"{Fore.light_green}{passThruText}: {Fore.light_yellow}"
-    GOTOK=None
-    def keys_index(data):
-        for num,k in enumerate(data.keys()):
-            msg=f"{Fore.light_cyan}{num}/{Fore.light_magenta}{num+1}{Fore.light_steel_blue} of {Fore.light_red}{len(data.keys())}{Fore.medium_violet_red} as {Fore.light_green}{k}:{Fore.cyan}{data[k]['type']}={Fore.magenta}{data[k]['default']}{Style.reset}"
-            print(msg)
+    with localcontext() as ctx:
+        ctx.prec=ROUNDTO=int(db.detectGetOrSet("lsbld ROUNDTO default",4,setValue=False,literal=True))
+        if passThruText != None:
+            passThruText=f"{Fore.light_green}{passThruText}: {Fore.light_yellow}"
+        GOTOK=None
+        def keys_index(data):
+            for num,k in enumerate(data.keys()):
+                msg=f"{Fore.light_cyan}{num}/{Fore.light_magenta}{num+1}{Fore.light_steel_blue} of {Fore.light_red}{len(data.keys())}{Fore.medium_violet_red} as {Fore.light_green}{k}:{Fore.cyan}{data[k]['type']}={Fore.magenta}{data[k]['default']}{Style.reset}"
+                print(msg)
 
-    def setGOTOK(GOTOK):
-        gotoi=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What index do you wish to goto?",helpText=f"please type an integer between 0 to {len(data.keys())-1}",data="integer")
-        if gotoi in [None,]:
-            return
-        elif gotoi in ['d',]:
-            pass
-        else:
-            try:
-                keys=data.keys()
-                GOTOK=list(keys)[gotoi]
-                print(GOTOK)
-                return GOTOK
-            except Exception as e:
-                print(e)
-                print(f"Index {gotoi} not found in {data} in its keys-list indexes: {data.keys()}")
-                
-    def setGOTOK_str(data):
-        while True:
-            gotoi=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What key do you wish to goto?",helpText=f"please type the key you want to goto",data="string")
+        def setGOTOK(GOTOK):
+            gotoi=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What index do you wish to goto?",helpText=f"please type an integer between 0 to {len(data.keys())-1}",data="integer")
             if gotoi in [None,]:
                 return
             elif gotoi in ['d',]:
                 pass
             else:
                 try:
-                    test=data[gotoi]
-                    return gotoi
+                    keys=data.keys()
+                    GOTOK=list(keys)[gotoi]
+                    print(GOTOK)
+                    return GOTOK
                 except Exception as e:
                     print(e)
-                    print(f"Key {gotoi} not found in {data} in its keys {data.keys()}")
-    index=None
-    item={}
-    for num,k in enumerate(data.keys()):
-        item[k]=data[k]['default']
-    review=False
-    finalize=False
-    finish=False
-    while True:
-        if finalize:
-            break
+                    print(f"Index {gotoi} not found in {data} in its keys-list indexes: {data.keys()}")
+                    
+        def setGOTOK_str(data):
+            while True:
+                gotoi=Prompt.__init2__(None,func=FormBuilderMkText,ptext="What key do you wish to goto?",helpText=f"please type the key you want to goto",data="string")
+                if gotoi in [None,]:
+                    return
+                elif gotoi in ['d',]:
+                    pass
+                else:
+                    try:
+                        test=data[gotoi]
+                        return gotoi
+                    except Exception as e:
+                        print(e)
+                        print(f"Key {gotoi} not found in {data} in its keys {data.keys()}")
+        index=None
+        item={}
+        for num,k in enumerate(data.keys()):
+            item[k]=data[k]['default']
+        review=False
+        finalize=False
+        finish=False
         while True:
             if finalize:
                 break
-            for num,k in enumerate(data.keys()):
-                if GOTOK != None:
-                    print(k,GOTOK)
-                    if k != GOTOK:
-                        continue
-                    else:
-                        GOTOK=None
-                if isinstance(index,int):
-                    if num < index:
-                        continue
+            while True:
+                if finalize:
+                    break
+                for num,k in enumerate(data.keys()):
+                    if GOTOK != None:
+                        print(k,GOTOK)
+                        if k != GOTOK:
+                            continue
+                        else:
+                            GOTOK=None
+                    if isinstance(index,int):
+                        if num < index:
+                            continue
+                        else:
+                            index=None
+                    ht=''
+                    if data[k]['type'].lower() in ['date','datetime','time']:
+                        ht="type 'y' or 'n' to start"
+                    elif data[k]['type'].lower() in ['list']:
+                        ht="type your $DELIMITED list, the you will be asked for $DELIMITED character to use!"
+                    elif data[k]['type'].lower() in ['bool','boolean']:
+                        ht="type y|yes|t|true|1 for yes/True, and n|no|0|false|f for no/False"
+                    ht2=f"""{Style.bold}{Fore.dark_blue}{Back.grey_70} FormBuilder {Fore.dark_red_1}Options {Style.reset}
+    {Fore.light_yellow}#b{Fore.light_green} will restart {Fore.light_red}[If it is wired to, might be reverse of 'b']{Style.reset}
+    {Fore.light_yellow}b{Fore.light_green} will return to previous menu{Fore.light_red}[If it is wired to, might be reverse of '#b']{Style.reset}
+    {Fore.light_yellow}f{Fore.light_green} will proceeds to review, where 'f' finishes,'y/yes/1' will review,'<Enter>/<Return>/n/f/0' will act as finish{Style.reset}
+    {Fore.light_yellow}p{Fore.light_green} at field filling lines goes to previous field{Style.reset}
+    {Fore.light_yellow}d{Fore.light_green} use default{Style.reset}
+    {Fore.light_yellow}m{Fore.light_green} use manually entered data present under m key option{Style.reset}
+    {Fore.light_yellow}#done#{Fore.light_green} to finish a str+(MultiLine) Input{Style.reset}
+    {Fore.grey_70}*{Fore.light_cyan}{num}/{Fore.light_magenta}{num+1}{Fore.light_steel_blue} of {Fore.light_red}{len(data.keys())}{Fore.medium_violet_red} as {Fore.light_green}{k}:{Fore.cyan}{data[k]['type']}={Fore.magenta}{data[k]['default']}{Style.reset}
+    {Fore.grey_70}*{Fore.light_yellow}goto {Fore.light_cyan}i{Fore.light_yellow}/goto{Fore.light_cyan}i{Fore.light_green} - go to {Fore.light_cyan}index{Style.reset}
+    {Fore.grey_70}*{Fore.light_yellow}goto{Fore.light_cyan}k{Fore.light_yellow},goto {Fore.light_cyan}k{Fore.light_green} goto {Fore.light_cyan}key{Fore.light_green} for field in Form {Style.reset}
+    {Fore.grey_70}*{Fore.light_yellow}showkeys{Fore.light_green} to see indexes refering to form keys{Style.reset}
+    {Fore.grey_70}*{Fore.light_yellow}'schk','search keys','sch ky{Fore.light_green} to search select and goto key{Style.reset}
+    {Fore.grey_70}* {Fore.grey_50}These cmds only work with fields that return str/VARCHAR/TEXT/str+/list of str's, i.e. [str,]
+    {Fore.grey_70}*{Fore.grey_50}['na','not_a_number','nan']{Fore.light_green}set a field to None{Style.reset}
+    {Style.reset}"""
+                    print(ht2)
+                    FormBuilderHelpText()
+                    cmd=None
+                    if data[k]['type']=='str+':
+                        done=False
+                        while not done:
+                            lines=[]
+                            skip_review=False
+                            while True:
+                                line=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}\nuse {Fore.light_red}{Style.bold}{Back.grey_50}#done#{Style.reset} to stop.',data=data[k]['type'][:-1])
+                                if line in [None,]:
+                                    return
+                                elif line.lower() in ['#done#',]:
+                                    break
+                                elif isinstance(line,list) and [i.lower() for i in line] in [['gotoi',],['goto i']]:
+                                    GOTOK=setGOTOK(data)
+                                    while GOTOK not in list(data.keys()):
+                                        GOTOK=setGOTOK(data)
+                                        if GOTOK in [None,]:
+                                            return  
+                                    done=True
+                                    finalize=True
+                                    skip_review=True
+                                    break
+                                elif isinstance(line,list) and [i.lower() for i in line] in [['gotok',],['goto k']]:
+                                    GOTOK=setGOTOK_str(data)
+                                    while GOTOK not in list(data.keys()):
+                                        GOTOK=setGOTOK_str(data)
+                                        if GOTOK in [None,]:
+                                            return
+                                    done=True
+                                    finalize=True
+                                    skip_review=True
+                                    break
+                                elif isinstance(line,str) and line.lower() in ['gotoi','goto i']:
+                                    GOTOK=setGOTOK(GOTOK)
+                                    while GOTOK not in list(data.keys()):
+                                        GOTOK=setGOTOK(GOTOK)
+                                        if GOTOK in [None,]:
+                                            return
+                                    done=True
+                                    finalize=True
+                                    skip_review=True
+                                    break
+                                elif isinstance(line,str) and line.lower() in ['gotok','goto k']:
+                                    GOTOK=setGOTOK_str(data)
+                                    while GOTOK not in list(data.keys()):
+                                        GOTOK=setGOTOK(GOTOK)
+                                        if GOTOK in [None,]:
+                                            return
+                                    done=True
+                                    finalize=True
+                                    skip_review=True
+                                    break
+                                elif isinstance(line,str) and line.lower() in ['schk','search keys','sch ky']:
+                                    DATA={str(i):{'cmds':[i,],'desc':''} for i in data}
+                                    GOTOK=findAndSelectKey(options=DATA)
+                                    while GOTOK not in list(data.keys()):
+                                        GOTOK=setGOTOK_str(GOTOK)
+                                        if GOTOK in [None,]:
+                                            return
+                                    done=True
+                                    finalize=True
+                                    skip_review=True
+                                    break
+                                elif isinstance(line,str) and line.lower() in ['showkeys','show keys']:
+                                    keys_index(data)
+                                    '''
+                                    done=True
+                                    finalize=True
+                                    skip_review=True
+                                    '''
+                                    continue
+                                elif line.lower() == 'd':
+                                    line='\n'
+                                else:
+                                    if len(line) in [i for i in range(7,14)]:
+                                        with Session(ENGINE) as session:
+                                            possible=session.query(Entry).filter(or_(Entry.Barcode==line,Entry.Barcode.icontains(line),Entry.Code==line,Entry.Code.icontains(line))).all()
+                                            if len(possible) > 0:
+                                                line+="\nBarcode/Code Matches found Below\n"+f"{'-'*len('Barcode/Code Matches found Below')}\n"
+                                                for num,i in enumerate(possible):
+                                                    line+=i.seeShortRaw()+"\n"
+
+                                lines.append(line)
+                            cmd='\n'.join(lines)
+                            if not skip_review:
+                                use=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}{cmd}\nUse? [y/n]",helpText="type something that can be represented as a boolean, this includes boolean formulas used in if/if-then statements(True=y/1/t/true/yes/1==1,False=n/no/0/f/false/1==0)",data="boolean")
+                                if use in [None,]:
+                                    return
+                                elif use:
+                                    done=True
+                                    finalize=True
+                                    break
+                                else:
+                                    continue
                     else:
-                        index=None
-                ht=''
-                if data[k]['type'].lower() in ['date','datetime','time']:
-                    ht="type 'y' or 'n' to start"
-                elif data[k]['type'].lower() in ['list']:
-                    ht="type your $DELIMITED list, the you will be asked for $DELIMITED character to use!"
-                elif data[k]['type'].lower() in ['bool','boolean']:
-                    ht="type y|yes|t|true|1 for yes/True, and n|no|0|false|f for no/False"
-                ht2=f"""{Style.bold}{Fore.dark_blue}{Back.grey_70} FormBuilder {Fore.dark_red_1}Options {Style.reset}
-{Fore.light_yellow}#b{Fore.light_green} will restart {Fore.light_red}[If it is wired to, might be reverse of 'b']{Style.reset}
-{Fore.light_yellow}b{Fore.light_green} will return to previous menu{Fore.light_red}[If it is wired to, might be reverse of '#b']{Style.reset}
-{Fore.light_yellow}f{Fore.light_green} will proceeds to review, where 'f' finishes,'y/yes/1' will review,'<Enter>/<Return>/n/f/0' will act as finish{Style.reset}
-{Fore.light_yellow}p{Fore.light_green} at field filling lines goes to previous field{Style.reset}
-{Fore.light_yellow}d{Fore.light_green} use default{Style.reset}
-{Fore.light_yellow}m{Fore.light_green} use manually entered data present under m key option{Style.reset}
-{Fore.light_yellow}#done#{Fore.light_green} to finish a str+(MultiLine) Input{Style.reset}
-{Fore.grey_70}*{Fore.light_cyan}{num}/{Fore.light_magenta}{num+1}{Fore.light_steel_blue} of {Fore.light_red}{len(data.keys())}{Fore.medium_violet_red} as {Fore.light_green}{k}:{Fore.cyan}{data[k]['type']}={Fore.magenta}{data[k]['default']}{Style.reset}
-{Fore.grey_70}*{Fore.light_yellow}goto {Fore.light_cyan}i{Fore.light_yellow}/goto{Fore.light_cyan}i{Fore.light_green} - go to {Fore.light_cyan}index{Style.reset}
-{Fore.grey_70}*{Fore.light_yellow}goto{Fore.light_cyan}k{Fore.light_yellow},goto {Fore.light_cyan}k{Fore.light_green} goto {Fore.light_cyan}key{Fore.light_green} for field in Form {Style.reset}
-{Fore.grey_70}*{Fore.light_yellow}showkeys{Fore.light_green} to see indexes refering to form keys{Style.reset}
-{Fore.grey_70}*{Fore.light_yellow}'schk','search keys','sch ky{Fore.light_green} to search select and goto key{Style.reset}
-{Fore.grey_70}* {Fore.grey_50}These cmds only work with fields that return str/VARCHAR/TEXT/str+/list of str's, i.e. [str,]
-{Fore.grey_70}*{Fore.grey_50}['na','not_a_number','nan']{Fore.light_green}set a field to None{Style.reset}
-{Style.reset}"""
-                print(ht2)
-                FormBuilderHelpText()
-                cmd=None
-                if data[k]['type']=='str+':
-                    done=False
-                    while not done:
-                        lines=[]
-                        skip_review=False
+                        if_continue=False
                         while True:
-                            line=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}\nuse {Fore.light_red}{Style.bold}{Back.grey_50}#done#{Style.reset} to stop.',data=data[k]['type'][:-1])
-                            if line in [None,]:
+                            passThru=['gotoi','goto i','gotok','goto k','showkeys','show keys','ff','finalize','finish','schk','search keys','sch ky']
+                            cmd=Prompt.__init2__(None,func=lambda text,data:FormBuilderMkText(text,data,passThru=passThru,PassThru=True),ptext=f"{passThruText} You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}',data=data[k]['type'])
+                            if cmd in [None,]:
                                 return
-                            elif line.lower() in ['#done#',]:
-                                break
-                            elif isinstance(line,list) and [i.lower() for i in line] in [['gotoi',],['goto i']]:
+                            elif isinstance(cmd,list) and [i.lower() for i in cmd] in [['gotoi',],['goto i']]:
                                 GOTOK=setGOTOK(data)
                                 while GOTOK not in list(data.keys()):
                                     GOTOK=setGOTOK(data)
-                                    if GOTOK in [None,]:
-                                        return  
-                                done=True
-                                finalize=True
-                                skip_review=True
+                                if_continue=True
                                 break
-                            elif isinstance(line,list) and [i.lower() for i in line] in [['gotok',],['goto k']]:
+
+                            elif isinstance(cmd,list) and [i.lower() for i in cmd] in [['gotok',],['goto k']]:
                                 GOTOK=setGOTOK_str(data)
                                 while GOTOK not in list(data.keys()):
                                     GOTOK=setGOTOK_str(data)
-                                    if GOTOK in [None,]:
-                                        return
-                                done=True
-                                finalize=True
-                                skip_review=True
+                                if_continue=True
                                 break
-                            elif isinstance(line,str) and line.lower() in ['gotoi','goto i']:
+
+                            elif isinstance(cmd,str) and cmd.lower() in ['gotoi','goto i']:
                                 GOTOK=setGOTOK(GOTOK)
                                 while GOTOK not in list(data.keys()):
                                     GOTOK=setGOTOK(GOTOK)
-                                    if GOTOK in [None,]:
-                                        return
-                                done=True
-                                finalize=True
-                                skip_review=True
+                                if_continue=True
                                 break
-                            elif isinstance(line,str) and line.lower() in ['gotok','goto k']:
+
+                            elif isinstance(cmd,str) and cmd.lower() in ['gotok','goto k']:
                                 GOTOK=setGOTOK_str(data)
                                 while GOTOK not in list(data.keys()):
-                                    GOTOK=setGOTOK(GOTOK)
-                                    if GOTOK in [None,]:
-                                        return
-                                done=True
-                                finalize=True
-                                skip_review=True
+                                    GOTOK=setGOTOK_str(data)
+                                if_continue=True
                                 break
-                            elif isinstance(line,str) and line.lower() in ['schk','search keys','sch ky']:
+                            elif isinstance(cmd,str) and cmd.lower() in ['schk','search keys','sch ky']:
                                 DATA={str(i):{'cmds':[i,],'desc':''} for i in data}
                                 GOTOK=findAndSelectKey(options=DATA)
+                                print(GOTOK)
                                 while GOTOK not in list(data.keys()):
-                                    GOTOK=setGOTOK_str(GOTOK)
+                                    GOTOK=findAndSelectKey(options=DATA)
+                                    #GOTOK=setGOTOK_str(GOTOK)
                                     if GOTOK in [None,]:
                                         return
-                                done=True
-                                finalize=True
-                                skip_review=True
+                                if_continue=True
                                 break
-                            elif isinstance(line,str) and line.lower() in ['showkeys','show keys']:
+                            elif isinstance(cmd,str) and cmd.lower() in ['showkeys','show keys']:
                                 keys_index(data)
-                                '''
-                                done=True
-                                finalize=True
-                                skip_review=True
-                                '''
-                                continue
-                            elif line.lower() == 'd':
-                                line='\n'
-                            else:
-                                if len(line) in [i for i in range(7,14)]:
-                                    with Session(ENGINE) as session:
-                                        possible=session.query(Entry).filter(or_(Entry.Barcode==line,Entry.Barcode.icontains(line),Entry.Code==line,Entry.Code.icontains(line))).all()
-                                        if len(possible) > 0:
-                                            line+="\nBarcode/Code Matches found Below\n"+f"{'-'*len('Barcode/Code Matches found Below')}\n"
-                                            for num,i in enumerate(possible):
-                                                line+=i.seeShortRaw()+"\n"
-
-                            lines.append(line)
-                        cmd='\n'.join(lines)
-                        if not skip_review:
-                            use=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}{cmd}\nUse? [y/n]",helpText="type something that can be represented as a boolean, this includes boolean formulas used in if/if-then statements(True=y/1/t/true/yes/1==1,False=n/no/0/f/false/1==0)",data="boolean")
-                            if use in [None,]:
-                                return
-                            elif use:
-                                done=True
-                                finalize=True
-                                break
-                            else:
                                 continue
-                else:
-                    if_continue=False
-                    while True:
-                        passThru=['gotoi','goto i','gotok','goto k','showkeys','show keys','ff','finalize','finish','schk','search keys','sch ky']
-                        cmd=Prompt.__init2__(None,func=lambda text,data:FormBuilderMkText(text,data,passThru=passThru,PassThru=True),ptext=f"{passThruText} You(m):{item.get(k)}|Default(d):{data[k]['default']} Field:{str(k)}",helpText=f'{ht}',data=data[k]['type'])
-                        if cmd in [None,]:
-                            return
-                        elif isinstance(cmd,list) and [i.lower() for i in cmd] in [['gotoi',],['goto i']]:
-                            GOTOK=setGOTOK(data)
-                            while GOTOK not in list(data.keys()):
-                                GOTOK=setGOTOK(data)
-                            if_continue=True
                             break
-
-                        elif isinstance(cmd,list) and [i.lower() for i in cmd] in [['gotok',],['goto k']]:
-                            GOTOK=setGOTOK_str(data)
-                            while GOTOK not in list(data.keys()):
-                                GOTOK=setGOTOK_str(data)
-                            if_continue=True
+                        if if_continue:
+                            continue
+                    if cmd in [None,]:
+                        return
+                    elif isinstance(cmd,str):
+                        if cmd.lower() in ['p',]:
+                            if num == 0:
+                                index=len(data.keys())-1
+                            else:
+                                index=num-1
                             break
-
-                        elif isinstance(cmd,str) and cmd.lower() in ['gotoi','goto i']:
-                            GOTOK=setGOTOK(GOTOK)
-                            while GOTOK not in list(data.keys()):
-                                GOTOK=setGOTOK(GOTOK)
-                            if_continue=True
+                        elif cmd.lower() in ['d',]:
+                            item[k]=data[k]['default']
+                        elif cmd.lower() in ['f','finalize']:
+                            finalize=True
                             break
-
-                        elif isinstance(cmd,str) and cmd.lower() in ['gotok','goto k']:
-                            GOTOK=setGOTOK_str(data)
-                            while GOTOK not in list(data.keys()):
-                                GOTOK=setGOTOK_str(data)
-                            if_continue=True
+                        elif cmd.lower() in ['ff','finish']:
+                            finalize=True
+                            finish=True
                             break
-                        elif isinstance(cmd,str) and cmd.lower() in ['schk','search keys','sch ky']:
-                            DATA={str(i):{'cmds':[i,],'desc':''} for i in data}
-                            GOTOK=findAndSelectKey(options=DATA)
-                            print(GOTOK)
-                            while GOTOK not in list(data.keys()):
-                                GOTOK=findAndSelectKey(options=DATA)
-                                #GOTOK=setGOTOK_str(GOTOK)
-                                if GOTOK in [None,]:
-                                    return
-                            if_continue=True
-                            break
-                        elif isinstance(cmd,str) and cmd.lower() in ['showkeys','show keys']:
-                            keys_index(data)
-                            continue
-                        break
-                    if if_continue:
-                        continue
-                if cmd in [None,]:
-                    return
-                elif isinstance(cmd,str):
-                    if cmd.lower() in ['p',]:
-                        if num == 0:
-                            index=len(data.keys())-1
+                        elif cmd.lower() in ['na','not_a_number','nan']:
+                            item[k]=None
+                        elif cmd.lower() in ['m',]:
+                            print(f"Not changing User set value '{k}':'{item.get(k)}'")
+                            pass
                         else:
-                            index=num-1
-                        break
-                    elif cmd.lower() in ['d',]:
-                        item[k]=data[k]['default']
-                    elif cmd.lower() in ['f','finalize']:
-                        finalize=True
-                        break
-                    elif cmd.lower() in ['ff','finish']:
-                        finalize=True
-                        finish=True
-                        break
-                    elif cmd.lower() in ['na','not_a_number','nan']:
-                        item[k]=None
-                    elif cmd.lower() in ['m',]:
-                        print(f"Not changing User set value '{k}':'{item.get(k)}'")
-                        pass
+                            item[k]=cmd
                     else:
                         item[k]=cmd
+            if not finish:
+                review=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}review?",helpText="",data="bool")
+                #print(review)
+                if review in ['f',]:
+                    review=False
+                if review in [None,]:
+                    return 
+                elif review in [True,'d']:
+                    finalize=False
+                    continue
                 else:
-                    item[k]=cmd
-        if not finish:
-            review=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}review?",helpText="",data="bool")
-            #print(review)
-            if review in ['f',]:
-                review=False
-            if review in [None,]:
-                return 
-            elif review in [True,'d']:
-                finalize=False
-                continue
+                    break
             else:
+                review=False
                 break
-        else:
-            review=False
-            break
 
-    if extra_tooling == True:
-        tmp_item={str(num):item[i] for num,i in enumerate(item)}
-        #ask if extra data is needed
-        count=len(tmp_item)
-        while True:
-            nkv=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}New Key:Value Pair",helpText="yes or no",data="boolean")
-            if nkv in ['d',True]:
-                key=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}default[{count}] Key",helpText="yes or no",data="string")
-                if key in [None,]:
-                    continue
-                elif key in ['d',]:
-                    key=str(count)
-                value=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}Value",helpText="data text",data="string")
-                if value in [None,]:
-                    continue
-                tmp_item[key]=value
-                count+=1
-            else:
-                break
-        #loop through lines for removal
-        final_result={}
-        for k in tmp_item:
-            keep=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}['{tmp_item[k]}'] keep?",helpText="yes or no",data="boolean")
-            if keep in ['d',True]:    
-                final_result[k]=tmp_item[k]
-        return final_result
-    return item            
+        if extra_tooling == True:
+            tmp_item={str(num):item[i] for num,i in enumerate(item)}
+            #ask if extra data is needed
+            count=len(tmp_item)
+            while True:
+                nkv=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}New Key:Value Pair",helpText="yes or no",data="boolean")
+                if nkv in ['d',True]:
+                    key=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}default[{count}] Key",helpText="yes or no",data="string")
+                    if key in [None,]:
+                        continue
+                    elif key in ['d',]:
+                        key=str(count)
+                    value=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}Value",helpText="data text",data="string")
+                    if value in [None,]:
+                        continue
+                    tmp_item[key]=value
+                    count+=1
+                else:
+                    break
+            #loop through lines for removal
+            final_result={}
+            for k in tmp_item:
+                keep=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{passThruText}['{tmp_item[k]}'] keep?",helpText="yes or no",data="boolean")
+                if keep in ['d',True]:    
+                    final_result[k]=tmp_item[k]
+            return final_result
+        return item            
 
 '''
 form=FormBuilder(data=fm_data)