radboy 0.0.755__tar.gz → 0.0.756__tar.gz

{radboy-0.0.755 → radboy-0.0.756}/PKG-INFO

@@ -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.756/STDOUT.TXT

@@ -0,0 +1,2 @@
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"0.0.756"

{radboy-0.0.755 → radboy-0.0.756}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radboy"
-version = "0.0.755"
+version = "0.0.756"
 authors = [
   { name="Carl Hirner III", email="k.j.hirner.wisdom@gmail.com" },
 ]

{radboy-0.0.755 → radboy-0.0.756}/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-0.0.756/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-0.0.756/radboy/__init__.py

@@ -0,0 +1 @@
+VERSION='0.0.756'

{radboy-0.0.755 → radboy-0.0.756}/radboy.egg-info/PKG-INFO

@@ -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 → radboy-0.0.756}/radboy.egg-info/SOURCES.txt

@@ -122,6 +122,7 @@ radboy/DB/blankDataFile.py
 radboy/DB/config.py
 radboy/DB/db.py
 radboy/DB/glossary_db.py
+radboy/DB/jobnotes.txt
 radboy/DB/lsToday.py
 radboy/DB/masterLookup.py
 radboy/DB/msg.txt
@@ -363,6 +364,8 @@ radboy/Solver/__pycache__/Solver.cpython-312.pyc
 radboy/Solver/__pycache__/Solver.cpython-313.pyc
 radboy/Solver/__pycache__/__init__.cpython-312.pyc
 radboy/Solver/__pycache__/__init__.cpython-313.pyc
+radboy/SpiceTools/SpiceTools.py
+radboy/SpiceTools/__init__.py
 radboy/StopWatchUi/StopWatchUi.py
 radboy/StopWatchUi/__init__.py
 radboy/StopWatchUi/__pycache__/StopWatch.cpython-312.pyc

{radboy-0.0.755 → radboy-0.0.756}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup,find_packages
 from datetime import datetime
 from pathlib import Path
-VERSION="0.0.755"
+VERSION="0.0.756"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.755/STDOUT.TXT

@@ -1,6 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"sysls"
-#USER INPUT# -> :"ff"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.755"

radboy-0.0.755/radboy/__init__.py

@@ -1 +0,0 @@
-VERSION='0.0.755'