radboy 0.0.351__py3-none-any.whl → 0.0.352__py3-none-any.whl

radboy/DB/db.py

@@ -736,8 +736,11 @@ class EntryDataExtras(BASE,Template):
                         with Session(ENGINE) as session:
                             check=session.query(self.__class__).filter(self.__class__.field_name==kwargs[k],self.__class__.EntryId==kwargs['EntryId']).first()
                             if isinstance(check,self.__class__):
-                                dateStr=datetime.now().strftime("[Updated on %m/%d/%Y at %H:%M:%S.]")
-                                kwargs[k]=f"{kwargs[k]} {dateStr}"
+                                if check.field_value == kwargs['field_value']:
+                                    raise Exception(f"Value is duplicated for {k}={kwargs['field_value']}")
+                                else:
+                                    dateStr=datetime.now().strftime("[Updated on %m/%d/%Y at %H:%M:%S.]")
+                                    kwargs[k]=f"{kwargs[k]} {dateStr}"
                     setattr(self,k,str(kwargs[k]))
                 else:
                     setattr(self,k,kwargs[k])

radboy/EntryExtras/Extras.py

@@ -866,128 +866,132 @@ class EntryDataExtrasMenu:
     def sch_f2e(self,barcode=None):
         with Session(ENGINE) as session:
             while True:
-                if self.code is None or not isinstance(self.code,str):
-                    if barcode != None:
-                        search=barcode
+                try:
+                    if self.code is None or not isinstance(self.code,str):
+                        if barcode != None:
+                            search=barcode
+                        else:
+                            search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                            if search in [None]:
+                                return
                     else:
-                        search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-                        if search in [None]:
-                            return
-                else:
-                    search=self.code
+                        search=self.code
 
-                results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
-                ct=len(results)
-                if ct == 0:
-                    print("No Results were Found!")
-                    return
-                msg=[]
-                for num,i in enumerate(results):
-                    msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
-                msg='\n'.join(msg)
-                product=None
-                while True:
-                    print(msg)
-                    index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
-                    if index in [None,]:
+                    results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
+                    ct=len(results)
+                    if ct == 0:
+                        print("No Results were Found!")
                         return
-                    try:
-                        product=results[index]
-                        break
-                    except Exception as e:
-                        print(e)
-                if product in [None,]:
-                    return
-                print("sf2e()")
-                while True:
+                    msg=[]
+                    for num,i in enumerate(results):
+                        msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
+                    msg='\n'.join(msg)
+                    product=None
                     while True:
+                        print(msg)
+                        index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
+                        if index in [None,]:
+                            return
                         try:
-                            fs=[]
-                            fse=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
-                            ct_fse=len(fse)
-                            for nunm,i in enumerate(fse):
-                                fs.append(f"{Fore.light_yellow}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct_fse} -> {Fore.light_magenta}{i.field_name}{Style.reset}")
-                            fs='\n'.join(fs)
-                            field_search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search field?",helpText=f"searches EntryDataExtras field_names:\n{fs}",data="string")
-                            if field_search in [None]:
-                                return
-                            elif field_search in ['d',]:
-                                field_search=''
-                            query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
-                            results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
-                            if len(results_ede) < 1:
-                                continue
+                            product=results[index]
                             break
                         except Exception as e:
                             print(e)
-                    field=None
-                    msg_ede=[]
-                    for num,i in enumerate(results_ede):
-                        if num%2==0:
-                            color=Fore.cyan
-                        elif num%3==0:
-                            color=Fore.light_cyan
-                        elif num%4==0:
-                            color=Fore.light_steel_blue
-                        elif num%5==0:
-                            color=Fore.light_green
-                        elif num%6==0:
-                            color=Fore.turquoise_4
-                        elif num%7==0:
-                            color=Fore.deep_sky_blue_3a
-                        elif num%8==0:
-                            color=Fore.spring_green_3a
-                        elif num%9==0:
-                            color=Fore.dark_cyan
-                        else:
-                            color=Fore.light_blue
-                        msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
-                    msg_ede='\n'.join(msg_ede)
+                    if product in [None,]:
+                        return
+                    print("sf2e()")
                     while True:
-                        try:
-                            print(msg_ede)
-                            index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg_ede,data="integer")
-                            if index in [None,]:
-                                return
-                            if not isinstance(index,int):
-                                print(f"{Fore.light_red}Index must be an {Fore.light_cyan}integer{Style.reset}")
-                                continue
+                        while True:
                             try:
-                                print(index)
-                                if index <= len(results_ede)-1:
-                                    field=results_ede[index]
-                                else:
-                                    print(f"index is not within 0-{len(results_ede)-1}")
+                                fs=[]
+                                fse=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
+                                ct_fse=len(fse)
+                                for nunm,i in enumerate(fse):
+                                    fs.append(f"{Fore.light_yellow}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct_fse} -> {Fore.light_magenta}{i.field_name}{Style.reset}")
+                                fs='\n'.join(fs)
+                                field_search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search field?",helpText=f"searches EntryDataExtras field_names:\n{fs}",data="string")
+                                if field_search in [None]:
+                                    return
+                                elif field_search in ['d',]:
+                                    field_search=''
+                                query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
+                                results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
+                                if len(results_ede) < 1:
                                     continue
                                 break
                             except Exception as e:
                                 print(e)
-                                break
-                        except Exception as e:
-                            print(e)
-                    if field == None:
-                        return
-                    field_name=field.field_name
-                    field_type=field.field_type
-                    field_value=Prompt.__init2__(self,func=FormBuilderMkText,ptext="What do you wish to store as the value?",helpText=field_type,data=field_type)
-                    if field_value in [None,]:
-                        return
-                    
-                    print(field_name,field_type,field_value)
-                    extra=EntryDataExtras(field_name=field_name,field_type=field_type,field_value=field_value,EntryId=product.EntryId)
-                    session.add(extra)
-                    session.commit()
-                    session.refresh(extra)
-                    print(extra)
-                    anotherField=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Add another field to this product[y/n]?",helpText="yes/no/boolean",data="boolean")
-                    if anotherField in [None,]:
-                        return
-                    elif anotherField in ['d',True]:
-                        continue
-                    else:
+                        field=None
+                        msg_ede=[]
+                        for num,i in enumerate(results_ede):
+                            if num%2==0:
+                                color=Fore.cyan
+                            elif num%3==0:
+                                color=Fore.light_cyan
+                            elif num%4==0:
+                                color=Fore.light_steel_blue
+                            elif num%5==0:
+                                color=Fore.light_green
+                            elif num%6==0:
+                                color=Fore.turquoise_4
+                            elif num%7==0:
+                                color=Fore.deep_sky_blue_3a
+                            elif num%8==0:
+                                color=Fore.spring_green_3a
+                            elif num%9==0:
+                                color=Fore.dark_cyan
+                            else:
+                                color=Fore.light_blue
+                            msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
+                        msg_ede='\n'.join(msg_ede)
+                        while True:
+                            try:
+                                print(msg_ede)
+                                index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg_ede,data="integer")
+                                if index in [None,]:
+                                    return
+                                if not isinstance(index,int):
+                                    print(f"{Fore.light_red}Index must be an {Fore.light_cyan}integer{Style.reset}")
+                                    continue
+                                try:
+                                    print(index)
+                                    if index <= len(results_ede)-1:
+                                        field=results_ede[index]
+                                    else:
+                                        print(f"index is not within 0-{len(results_ede)-1}")
+                                        continue
+                                    break
+                                except Exception as e:
+                                    print(e)
+                                    break
+                            except Exception as e:
+                                print(e)
+                        if field == None:
+                            return
+                        field_name=field.field_name
+                        field_type=field.field_type
+                        field_value=Prompt.__init2__(self,func=FormBuilderMkText,ptext="What do you wish to store as the value?",helpText=field_type,data=field_type)
+                        if field_value in [None,]:
+                            return
+                        
+                        print(field_name,field_type,field_value)
+                        extra=EntryDataExtras(field_name=field_name,field_type=field_type,field_value=field_value,EntryId=product.EntryId)
+                        session.add(extra)
+                        session.commit()
+                        session.refresh(extra)
+                        print(extra)
+                        anotherField=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Add another field to this product[y/n]?",helpText="yes/no/boolean",data="boolean")
+                        if anotherField in [None,]:
+                            return
+                        elif anotherField in ['d',True]:
+                            continue
+                        else:
+                            break
+                    if barcode != None:
                         break
-                if barcode != None:
-                    break
+                except Exception as e:
+                    print(e)
+                    
 
     def sch_c2e(self,barcode=None):
         with Session(ENGINE) as session:

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.351'
+VERSION='0.0.352'

{radboy-0.0.351.dist-info → radboy-0.0.352.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.351
+Version: 0.0.352
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.351.dist-info → radboy-0.0.352.dist-info}/RECORD

@@ -5,7 +5,7 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=XXy-o5Z_yOgrgHNju4iqM3h7xhRBkNIoHG1qePtBnGY,41316
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=Rof_lEJXvW8euhOheSDBrewoLgLoNWnKLl-UI5eEBRY,17
+radboy/__init__.py,sha256=_oBxnLh0Z3XVfFIPnmK_QBIMvDPa_I9ciceP1jg_iVM,17
 radboy/api_key,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/case-export-2024-05-14-13-10-00.672971.xlsx,sha256=Wd592d_VLFmfUI9KKKSVjNwjV91euc1T7ATyvwvUhlg,5431
 radboy/case-export-2024-05-14-13-13-22.540614.xlsx,sha256=OnGrhmScHfGp_mVaWW-LNMsqrQgyZDpiU3wV-2s3U5Q,5556
@@ -90,7 +90,7 @@ radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,
 radboy/DB/__init__.py,sha256=JiigA9B7GalP7YuRdcwyGDu5PDSBahoi0lLjtScxlN8,49
 radboy/DB/blankDataFile.py,sha256=YX_05Usi71UpDkZN9UTMYwUipbTndTAtEgqzBEga0kE,9285
 radboy/DB/config.py,sha256=bvu43dUl1_yO3Zq3gsLuenGUgJSiS3S9Cs6ppFEvZbg,239
-radboy/DB/db.py,sha256=bTY303S1dqV5cv2JAlddtaVDMmjT5CTJTQi9KjVcUsk,228153
+radboy/DB/db.py,sha256=FuCvGyUuqaWZeh2UAIQqgGXxO8cq1D1E5lBmxYmyKOI,228386
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
 radboy/DB/masterLookup.py,sha256=DBaM2uscG3_X5dek49wjdnOzhrjWhKgvOEz_umdz0mY,4566
 radboy/DB/msg.txt,sha256=YxWed6A6tuP1djJ5QPS2Rz3ING4TKKf8kUiCCPtzHXE,7937
@@ -125,7 +125,7 @@ radboy/DB/__pycache__/config.cpython-312.pyc,sha256=Qo7E6MHrF6yqvKgepNFyCoekZXiv
 radboy/DB/__pycache__/config.cpython-313.pyc,sha256=_8wCIg_3jhyJjxnExD2Sm6aY-uZTw036p7Ki5znL7dc,376
 radboy/DB/__pycache__/db.cpython-311.pyc,sha256=rNgigyBd0D-cg1JxKAS8t0B_k0IEJivgVlRaZE10Xis,210105
 radboy/DB/__pycache__/db.cpython-312.pyc,sha256=ANDJPC0RoavbmSKFxG15vC7B4rEGyVt7xRJt7XGY3OA,334609
-radboy/DB/__pycache__/db.cpython-313.pyc,sha256=phmHMqSUXsdVI60Lu8o4MTHP0ERzY1xU3RUIoTxZIL8,359887
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=Y8TFajotRXIsYOWn-G6FN9Az3kOlZ60P9rFmGBEjvTM,360066
 radboy/DB/__pycache__/glossary_db.cpython-312.pyc,sha256=8UL-29cKqtKovx0BANm6kzKKteef1BW_2qF3wumzst4,36023
 radboy/DB/__pycache__/glossary_db.cpython-313.pyc,sha256=Ke9bkvllGv5CK0JdT9DRvQ3MOdrXxoYv7TVLNkqLux0,36582
 radboy/DB/__pycache__/masterLookup.cpython-312.pyc,sha256=bQiOkmMwwHgcO18tYSWGQ-YUff4GQlKVhBMp1GoWAqY,6324
@@ -144,10 +144,10 @@ radboy/DayLog/__pycache__/DayLogger.cpython-313.pyc,sha256=UC2v9eX_1UZNgIA9baQzr
 radboy/DayLog/__pycache__/__init__.cpython-311.pyc,sha256=Z5Y4DdVF77LZf6-Of92MDGFdi-IXik1ASQd4AdLNNfQ,231
 radboy/DayLog/__pycache__/__init__.cpython-312.pyc,sha256=lP_GHzSPt5JTrT1jLWiRMFGPmSdJYBn4eRV__OxgJ6s,269
 radboy/DayLog/__pycache__/__init__.cpython-313.pyc,sha256=UQw5v4r7yismC9qcqP0dEme6h-lawbOA5pXYpkqUwFk,148
-radboy/EntryExtras/Extras.py,sha256=CzRiM3lbooG27QaqV_r2v56OtxpgbSKqEnB_x77yNXE,66339
+radboy/EntryExtras/Extras.py,sha256=4z1hp3CZpia-4Y6cbmv1iyzUHUyv3MnVqlZWGmNNKVw,66933
 radboy/EntryExtras/__init__.py,sha256=K76Ku7o2DwTZU-Ya2mifH856KAcxb8MXdSaQMQLhu84,902
 radboy/EntryExtras/__pycache__/Extras.cpython-312.pyc,sha256=eHkeyKblMtG37lDhl38OEGQbvvKxXMriKK49kj2mg8o,34768
-radboy/EntryExtras/__pycache__/Extras.cpython-313.pyc,sha256=kVsCdqeYlNOhGlnNUEPRwkTbnL8JKQeaT1OeJKn5Mmw,85985
+radboy/EntryExtras/__pycache__/Extras.cpython-313.pyc,sha256=V7jYgyWJwgUr7FIDKnmlX7WFXNtig19rJKjnm_dLUJw,86179
 radboy/EntryExtras/__pycache__/__init__.cpython-312.pyc,sha256=0bBwhp_9PYvL-Nm_J0gsYf9yfKAFJMiMdpc6XzZrPzU,829
 radboy/EntryExtras/__pycache__/__init__.cpython-313.pyc,sha256=PqXXfBeREZI2pZc22BayKH7daLXbO7p3NozaXpnA3cQ,829
 radboy/EntryExtras/__pycache__/db.cpython-312.pyc,sha256=Qcqix5yi9h7fbsmGhJOWYdLHbHMTWixwolRRQYg8ISk,1781
@@ -386,7 +386,7 @@ radboy/__pycache__/Run.cpython-311.pyc,sha256=G_UEfMtkLRjR6ZpGA_BJzGenuaCcP469Y9
 radboy/__pycache__/Run.cpython-312.pyc,sha256=v4xolc3mHyla991XhpYBUbBHYT0bnJ1gE-lkFoQ4GFA,241
 radboy/__pycache__/__init__.cpython-311.pyc,sha256=R-DVbUioMOW-Fnaq7FpT5F1a5p0q3b_RW-HpLRArCAY,242
 radboy/__pycache__/__init__.cpython-312.pyc,sha256=FsFzLXOlTK8_7ixoPZzakkR8Wibt-DvXLFh-oG2QlPw,164
-radboy/__pycache__/__init__.cpython-313.pyc,sha256=WIgbGJm5sXuP4aKVCW7jPse4lWNgq3QO6tVTbP3-Nf4,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=L4tNvdvdn9QV04q8ekxMKvnkDbqMlIyIDTnkQc8CR8s,165
 radboy/__pycache__/__init__.cpython-39.pyc,sha256=D48T6x6FUeKPfubo0sdS_ZUut3FmBvPMP7qT6rYBZzU,275
 radboy/__pycache__/possibleCode.cpython-311.pyc,sha256=zFiHyzqD8gUnIWu4vtyMYIBposiRQqaRXfcT_fOl4rU,20882
 radboy/__pycache__/possibleCode.cpython-312.pyc,sha256=tk_CO-AcsO3YZj5j6vEsw3g37UmEzWc5YgeWEoJEUg4,27922
@@ -411,7 +411,7 @@ radboy/tkGui/Images/__pycache__/__init__.cpython-311.pyc,sha256=tXBYpqbOlZ24B1BI
 radboy/tkGui/__pycache__/BeginnersLuck.cpython-311.pyc,sha256=xLQOnV1wuqHGaub16mPX0dDMGU9ryCeLtNz5e517_GE,3004
 radboy/tkGui/__pycache__/Review.cpython-311.pyc,sha256=wKq24iM6Xe2OampgZ7-8U6Nvmgs2y-qWOrGwtWhc75k,4047
 radboy/tkGui/__pycache__/__init__.cpython-311.pyc,sha256=BX7DBn5qbvKTvlrKOP5gzTBPBTeTgSMjBW6EMl7N8e0,230
-radboy-0.0.351.dist-info/METADATA,sha256=tpw5FHvJbCi971RFYzmO7rw07wPIpvx2EAuF3dpfKZA,794
-radboy-0.0.351.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.351.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.351.dist-info/RECORD,,
+radboy-0.0.352.dist-info/METADATA,sha256=dM7TGRzF6CHGv1QPhkmxEH8rWYCK7nS5Uf_OONuM0rA,794
+radboy-0.0.352.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.352.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.352.dist-info/RECORD,,