radboy 0.0.755__py3-none-any.whl → 0.0.756__py3-none-any.whl

radboy/DB/ExerciseTracker.py

@@ -22,6 +22,7 @@ from sqlalchemy.ext.declarative import declarative_base as dbase
 from sqlalchemy.ext.automap import automap_base
 from pathlib import Path
 import upcean
+import nanoid
 
 class RoutineDuration(BASE,Template):
     __tablename__="RoutineDuration"
@@ -39,17 +40,23 @@ RoutineDuration.metadata.create_all(ENGINE)
 class Exercise(BASE,Template):
     __tablename__="Exercise"
     exid=Column(Integer,primary_key=True)
-    Name=Column(String)
-    Note=Column(String)
-    Reps=Column(Integer) # 8 reps of 30 repcounts NAME
-    RepCount=Column(Integer) #30 times rep
-    CurrentRep=Column(Integer)
+    Name=Column(String,default=f'Generic Exercise Name [{nanoid.generate()}]')
+    Note=Column(String,default='')
+    Reps=Column(Integer,default=1) # 8 reps of 30 repcounts NAME
+    RepCount=Column(Integer,default=30) #30 times rep
+    CurrentRep=Column(Integer,default=0)
     cdt=Column(DateTime) #CurrentDateTime
     ldt=Column(DateTime) #LastDateTime
 
     def __init__(self,**kwargs):
         kwargs['__tablename__']=self.__tablename__
         self.init(**kwargs,)
+        if 'cdt' not in kwargs.keys():
+            self.cdt=datetime.now()
+
+        if 'ldt' not in kwargs.keys():
+            self.ldt=datetime.now()
+
 
 class Routine(BASE,Template):
     __tablename__="Routine"
@@ -97,6 +104,19 @@ e_data={'Name':{
             },
       }    
 
+def gethpv(routine):
+    with Session(ENGINE) as session:
+        if isinstance(routine,dict):
+            hpv=session.query(Routine).filter(Routine.Name==routine.get("Name")).order_by(Routine.precedence.desc()).first()
+        elif isinstance(routine,Routine):
+            hpv=session.query(Routine).filter(Routine.Name==getattr(routine,"Name")).order_by(Routine.precedence.desc()).first()
+        else:
+            raise Exception(f"Unsupported Type! {routine} -> type({type(routine)})")
+        #print(hpv)
+        if hpv:
+            return hpv.precedence
+        else:
+            return 0
 
 class ExerciseTracker:
     def newExercise(self):
@@ -246,14 +266,7 @@ class ExerciseTracker:
                 if exercises in [None,]:
                     break
                 precedence=None
-                def gethpv(routine):
-                    with Session(ENGINE) as session:
-                        hpv=session.query(Routine).filter(Routine.Name==routine.get("Name")).order_by(Routine.precedence.desc()).first()
-                        #print(hpv)
-                        if hpv:
-                            return hpv.precedence
-                        else:
-                            return 0
+
                 precedence=gethpv(routine)
                 for num,i in enumerate(exercises):
                     print(i)
@@ -274,6 +287,129 @@ class ExerciseTracker:
                     else:
                         pass
 
+
+    def Add2Routine(self):
+        with Session(ENGINE) as session:
+            fields={
+                'are you adding a new excercise or using an old one [New=True,False=Old]?':{
+                'default':True,
+                'type':'boolean',
+                },
+                'Routine ID(RID)':{
+                'default':None,
+                'type':'integer'
+                }
+            }
+            fd=FormBuilder(data=fields)
+            if fd is not None:
+                routine=session.query(Routine).filter(Routine.roid==fd['Routine ID(RID)']).first()
+                if routine is None:
+                    print(f"{Fore.orange_red_1}There is no Routine by that ID (Make sure it is an RID)")
+                    return
+
+                mode=fd['are you adding a new excercise or using an old one [New=True,False=Old]?']
+                if mode in [None,True]:
+                    excludes=['exid',]
+                    tmp=Exercise()
+                    session.add(tmp)
+                    session.commit()
+                    session.refresh(tmp)
+                    fields={
+                    i.name:{
+                        'default':getattr(tmp,i.name),
+                        'type':str(i.type).lower()
+                        } for i in tmp.__table__.columns if i.name not in excludes
+                    }
+                    fd=FormBuilder(data=fields,passThruText=f"Create a New Exercise\n To Attach to Routine(roid={routine.roid},RoutineName={routine.Name})")
+                    if fd is None:
+                        print(f"{Fore.orange_red_1}User Cancelled!{Style.reset}")
+                        session.delete(tmp)
+                        session.commit()
+                        return
+                    try:
+                        for k in fd:
+                            setattr(tmp,k,fd[k])
+                        session.commit()
+                        session.refresh(tmp)
+                        dtoe=datetime.now()
+                        doe=date(dtoe.year,dtoe.month,dtoe.day)
+                        toe=time(dtoe.hour,dtoe.minute,dtoe.second)
+                        nt=gethpv(routine)
+                        #print(nt)
+                        nt+=1
+                        rts=Routine(Name=getattr(routine,"Name"),Note=getattr(routine,"Note"),exid=tmp.exid,precedence=nt,doe=doe,dtoe=dtoe,toe=toe)
+                        session.add(rts)
+                        session.commit()
+                    except Exception as e:
+                        print(e,repr(e),str(e))
+                        session.rollback()
+                        session.commit()
+                elif mode in [False,]:
+                    excludes=['exid',]
+                    fields={
+                    'What are looking for':{
+                        'type':'string',
+                        'default':''
+                        }
+                    }
+                    fd=FormBuilder(data=fields,passThruText="What are looking to copy to this routine?")
+                    if fd is None:
+                        print(f"{Fore.orange_red_1}User Cancelled!{Style.reset}")
+                        return
+                    search=fd['What are looking for']
+                    OR=or_(Exercise.Name.icontains(search),Exercise.Note.icontains(search))
+                    AND=and_(Exercise.Name.icontains(search),Exercise.Note.icontains(search))
+
+                    query=session.query(Exercise).filter(or_(OR,AND))
+                    ordered=orderQuery(query,Exercise.Name)
+                    results=ordered.all()
+                    cta=len(results)
+                    htext=[]
+                    for num,i in enumerate(results):
+                        htext.append(std_colorize(i,num,cta))
+                    htext='\n'.join(htext)
+                    print(htext)
+                    whichIndexes=Control(func=FormBuilderMkText,ptext="Which index(es)?",helpText=f"{htext}\nseperate the indexes by commas",data="list")
+                    if whichIndexes in ['NaN',None,'d']:
+                        print(f"{Fore.orange_red_1}User Cancelled!{Style.reset}")
+                        return
+                    elif whichIndexes in [[],]:
+                        print(f"{Fore.orange_red_1}the list provided was empty, so user may have cancelled!{Style.reset}")
+                        return
+                    for index in whichIndexes:
+                        try:
+                            index=int(index)
+                            exercise=results[index]
+                            nex=Exercise()
+                            fields={
+                                i.name:{
+                                    'default':getattr(exercise,i.name),
+                                    'type':str(i.type).lower()
+                                    } for i in exercise.__table__.columns if i.name not in excludes
+                                }
+                            for f in fields:
+                                setattr(nex,f,getattr(exercise,f))
+                            session.add(nex)
+                            session.commit()
+                            session.refresh(nex)
+                            print(nex)
+                            dtoe=datetime.now()
+                            doe=date(dtoe.year,dtoe.month,dtoe.day)
+                            toe=time(dtoe.hour,dtoe.minute,dtoe.second)
+                            nt=gethpv(routine)
+                            #print(nt)
+                            nt+=1
+                            rts=Routine(Name=getattr(routine,"Name"),Note=getattr(routine,"Note"),exid=nex.exid,precedence=nt,doe=doe,dtoe=dtoe,toe=toe)
+                            session.add(rts)
+                            session.commit()
+                        except Exception as e:
+                            print(e)
+                            print(f"{Fore.magenta}Processing will attempt to continue!")
+                print("Added Exercise to Routine!")
+            else:
+                print(f"{Fore.orange_red_1}User Cancelled!{Style.reset}")
+                return
+
     def summarize(self):
         try:
             start=datetime.now()
@@ -431,7 +567,7 @@ class ExerciseTracker:
                             #return
                         total_dur=timedelta(seconds=0)
                         l=0
-                        while completed < ct:
+                        while completed < total_reps:
                             lapStart=datetime.now()
                             for num, i in enumerate(rout):
                                 if completed_reps > total_reps:
@@ -561,6 +697,8 @@ class ExerciseTracker:
         rr,RemoveRoutine - delete a routine
         cr,ClearRoutine - reset routine CurrentRep
         su,summarize,Summarize - show the contents of a specified Routine
+
+        a2r,add2routine - add an exercise to a routine specified by RID
         '''
         while True:
             doWhat=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{h} Do what?",helpText=helpText,data="string")
@@ -590,4 +728,6 @@ class ExerciseTracker:
             elif doWhat.lower() in ['hl','healthlog'.lower()]:
                 HealthLogUi()
             elif doWhat.lower() in "su,summarize".split(","):
-                self.summarize()
+                self.summarize()
+            elif doWhat.lower() in 'a2r,add2routine'.split(","):
+                self.Add2Routine()

radboy/SpiceTools/__init__.py

@@ -0,0 +1,33 @@
+from radboy.DB.db import *
+#from radboy.DB.RandomStringUtil import *
+#import radboy.Unified.Unified as unified
+#import radboy.possibleCode as pc
+from radboy.DB.Prompt import *
+from radboy.DB.Prompt import prefix_text
+#from radboy.TasksMode.ReFormula import *
+#from radboy.TasksMode.SetEntryNEU import *
+from radboy.FB.FormBuilder import *
+from radboy.FB.FBMTXT import *
+#from radboy.RNE.RNE import *
+#from radboy.Lookup2.Lookup2 import Lookup as Lookup2
+#from radboy.DayLog.DayLogger import *
+#from radboy.DB.masterLookup import *
+from collections import namedtuple,OrderedDict
+import nanoid,qrcode,io
+#from password_generator import PasswordGenerator
+import random
+from pint import UnitRegistry
+import pandas as pd
+import numpy as np
+from datetime import *
+from colored import Style,Fore
+import json,sys,math,re,calendar,hashlib,haversine
+from time import sleep
+import itertools
+SpiceToolsEnabled=False
+if Path('.spicetools.enabled').exists():
+    from .SpiceTools import *
+    print("{Fore.orange_red_1}SpiceTools is {Fore.light_green)}enabled!{Style.reset")
+    SpiceToolsEnabled=True
+
+

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.755'
+VERSION='0.0.756'

{radboy-0.0.755.dist-info → radboy-0.0.756.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.755
+Version: 0.0.756
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.755.dist-info → radboy-0.0.756.dist-info}/RECORD

@@ -5,12 +5,12 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=h30zoTqt-XLt_afDPlxMxBiKKwmKi3N-yAuldNCqXUo,41476
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=tQ-UaxTOBNZuj8AcX8MzN8OUWDvBtTkAqWftyM-LXPk,17
+radboy/__init__.py,sha256=vsfKP5sjRyUikzsWgyBvbjBLVrzwYa9dg35cclEFcZs,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
 radboy/changelog.txt,sha256=_73e-OcHDecsK-eHEE45T84zHbUZ8Io3FzvLNwHPdoY,3714
-radboy/code.png,sha256=FKn3s-dwfKfdcWyXe3e3xh42eMoJNHKUtIbzHBnBf70,575
+radboy/code.png,sha256=DvZ1QpLmaKcJwJM6HFD4YatBTi_mHp0h-fLZto47U-8,322
 radboy/db.csv,sha256=hpecu18LtCow5fH01queqWgqPByR628K7pLuEuLSuj4,19
 radboy/dictionary.txt,sha256=EJlEazI8RfTDX_Uzd6xnXLm9IjU5AEq6HVDwi42Y4_4,195680
 radboy/export.csv,sha256=YIU8c34enlknKMzKwzfQEN8e0mUdyW8m6O8GvgUQ9do,41015
@@ -82,7 +82,7 @@ radboy/DB/CoinCombo.py,sha256=NJfTmx3XYgS41zkAyyO2W6de1Mj3rWsCWqU4ikHfvJI,13604
 radboy/DB/DatePicker.py,sha256=B75mDtXQrkHRCpoU9TJsaBVvkK37ykMaJyaiqGOo4dM,18334
 radboy/DB/DisplayItemDb.py,sha256=uVvrNyFyBuKvrw-BEPXKYvfa-QWyFN5ahESi2l6vUUA,52046
 radboy/DB/EstimatedPayCalendarWorkSheet.txt,sha256=GOjRSmGxFoNTdAnpPe2kGv7CkXDrh0Mee01HslamGbo,17173
-radboy/DB/ExerciseTracker.py,sha256=OS9i8jGIZPj-6m1bB0-eKNHQ6vf2iv_AYPEc0s4bkBM,27809
+radboy/DB/ExerciseTracker.py,sha256=URi-Cgc0ppo6HX4d8HTUbXFVeY1nvb9kovrTAHE7U5c,34524
 radboy/DB/LetterWriter.py,sha256=0B14GB-hJK2Xf_TFASriOELFygiI1LwkSb__R3tUiU0,2631
 radboy/DB/OrderedAndRxd.py,sha256=v_vrTOiTDhKqT5KErK6MOG_u4Nt7ug2MoLTHvAnm88M,19450
 radboy/DB/PayDay.py,sha256=H2kPGvBCDkMOz7lbxQhYtUt_oAInpxi37Q6MFrah98I,8710
@@ -97,6 +97,7 @@ radboy/DB/blankDataFile.py,sha256=YX_05Usi71UpDkZN9UTMYwUipbTndTAtEgqzBEga0kE,92
 radboy/DB/config.py,sha256=bvu43dUl1_yO3Zq3gsLuenGUgJSiS3S9Cs6ppFEvZbg,239
 radboy/DB/db.py,sha256=F2l9oQ4EqzTdiu7LBnmW6Fqv65ivsQ3CUUcjvjVMEv8,263344
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
+radboy/DB/jobnotes.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/DB/lsToday.py,sha256=Pevus6GBHLM2xudBEx8u36Q-jYvatOI-y5o72BmFnzA,9435
 radboy/DB/masterLookup.py,sha256=DBaM2uscG3_X5dek49wjdnOzhrjWhKgvOEz_umdz0mY,4566
 radboy/DB/msg.txt,sha256=YxWed6A6tuP1djJ5QPS2Rz3ING4TKKf8kUiCCPtzHXE,7937
@@ -113,7 +114,7 @@ radboy/DB/__pycache__/DatePicker.cpython-313.pyc,sha256=jV__j5ER1oshsenGPynR0UNH
 radboy/DB/__pycache__/DisplayItemDb.cpython-312.pyc,sha256=n2nRfavATZBSa7rBgH39pd11Ka-nUfGHVzr-R9KO7_Q,63121
 radboy/DB/__pycache__/DisplayItemDb.cpython-313.pyc,sha256=M4jujGXKVqYObZKQipamkTpw68YhEWLqBmywtPgnG-A,63715
 radboy/DB/__pycache__/ExerciseTracker.cpython-312.pyc,sha256=KzCmPhacS7t-70cpZM5tCnL8mBmRbA9dc4uuatdcQkI,34820
-radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc,sha256=OhUi666CCM0I4Ga3dri0EdStPpG-b2ea7BfTfLY3ot8,37578
+radboy/DB/__pycache__/ExerciseTracker.cpython-313.pyc,sha256=fVTAas-YWbxhP0IVM_5rdZ8ZUW_d-GWoeMKIm3N8ysk,45984
 radboy/DB/__pycache__/FormBuilder.cpython-312.pyc,sha256=p1o-5SMRL8OXP_XQ5liUpf-_EkvU8oQwg-BrTWVkcTY,5566
 radboy/DB/__pycache__/PrintLogging.cpython-312.pyc,sha256=pIAFqTi6OiQQORSc-oMH1zAbsdH7sY1TifxrN_QOvnU,148
 radboy/DB/__pycache__/Prompt.cpython-311.pyc,sha256=P2uPRpeqfLFtxieZ0JHBG3X_HZzWUCsFSLb_fpRqky0,6407
@@ -338,6 +339,8 @@ radboy/Solver/__pycache__/Solver.cpython-312.pyc,sha256=naBpsq0jyNcui_Xhocf9Asub
 radboy/Solver/__pycache__/Solver.cpython-313.pyc,sha256=F9t9iYHb2qUH6tdUpEldrYWNYW0t3hKRqprPW7WfLuY,27302
 radboy/Solver/__pycache__/__init__.cpython-312.pyc,sha256=5OTER7wiUddDSljXwQO3snJCmIv01LrM8uRZDbihoeA,1207
 radboy/Solver/__pycache__/__init__.cpython-313.pyc,sha256=mDExDm2GKBxXJhP-7YBxfnT0O5vd2Ju3sT4TZ2Z0rhQ,1207
+radboy/SpiceTools/SpiceTools.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+radboy/SpiceTools/__init__.py,sha256=ht6vxVokfL2h_knFvukHOsxBdu-6KxoJ9AXshrcp9dA,1090
 radboy/StopWatchUi/StopWatchUi.py,sha256=1SK89TKUjG9Ml6O9aLfg72Mewcff7PuQPjbnX49PaBI,9401
 radboy/StopWatchUi/__init__.py,sha256=OSncIX-anAMHR4Ppls6hSkisYdYvSvkTHc3QXArPNNI,834
 radboy/StopWatchUi/__pycache__/StopWatch.cpython-312.pyc,sha256=D106VHcNR4F2km811ibUFzYC89DOkTt1DYOgk9D8g-o,9520
@@ -409,7 +412,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=ve2NyMk9TvBWej_JUfjlEy5-Igoe_y_9Z2Jg0PRCm5s,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=R7AiYRConBZto8JKJvuWShySJjZv-1cwHZXbQxGXIfo,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
@@ -437,7 +440,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.755.dist-info/METADATA,sha256=e1RiUtBITb3QdNWRnQ1cfdYy1gmSkB4DIvrXjtueTew,1920
-radboy-0.0.755.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.755.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.755.dist-info/RECORD,,
+radboy-0.0.756.dist-info/METADATA,sha256=s-MFdFU9Bsab2F4QHqqipym2GIna4YC2tZCqIUK0cyc,1920
+radboy-0.0.756.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.756.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.756.dist-info/RECORD,,