radboy 0.0.352__tar.gz → 0.0.354__tar.gz

{radboy-0.0.352 → radboy-0.0.354}/PKG-INFO

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

radboy-0.0.354/STDOUT.TXT

@@ -0,0 +1,35 @@
+#USER INPUT# -> :""
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"esu"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"xr"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"esu"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"xr"
+#USER INPUT# -> :"x"
+#USER INPUT# -> :"#ml# "
+#USER INPUT# -> :"from decimal import Decimal,getcontext"
+#USER INPUT# -> :"getcontext().prec=3"
+#USER INPUT# -> :"crv=Decimal(0.05)"
+#USER INPUT# -> :"price=Decimal(2.64)"
+#USER INPUT# -> :"tax=price*Decimal(0.0925)"
+#USER INPUT# -> :"single_total=tax+crv+price"
+#USER INPUT# -> :"save(single_total*2)"
+#USER INPUT# -> :"#ml#"
+#USER INPUT# -> :" #ml#"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"xr"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"pxr"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"h"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"h"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.354"

{radboy-0.0.352 → radboy-0.0.354}/pyproject.toml

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

{radboy-0.0.352 → radboy-0.0.354}/radboy/DB/Prompt.py

@@ -1644,6 +1644,14 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
                         TSC.TouchStampC.TouchStampC(parent=self,engine=db.ENGINE)
                     elif cmd.lower() in ['tvu','tag data']:
                         pc.run(engine=db.ENGINE)
+                    elif cmd.lower() in ['exe','execute','x']:
+                        TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).executeInLine()
+                        continue
+                    elif cmd.lower() in ['exe-result','execute-result','xr']:
+                        return func(TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).getInLineResult(),str(text))
+                    elif cmd.lower() in ['exe-print','pxr','print exe result']:
+                        print(TM.Tasks.TasksMode(parent=self,engine=db.ENGINE,init_only=True).getInLineResult())
+                        continue
                     elif cmd.lower() in ['c','calc']:
                         #if len(inspect.stack(0)) <= 6:
                         TM.Tasks.TasksMode.evaluateFormula(None,fieldname="Prompt")
@@ -1806,6 +1814,9 @@ CMD's are not final until ended with {Fore.magenta}{hw_delim}{Style.reset}""")
 {Fore.grey_70}**{Fore.light_green}'fmbh','formbuilder help','form helptext'{Fore.light_steel_blue} print formbuilder helptext{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'text2file'{Fore.light_steel_blue} dump input/returned text to file{Style.reset}
 {Fore.grey_70}**{Fore.light_green}'qc','quick change','q-c','q.c'{Fore.light_steel_blue} use the quick change menu {Fore.orange_red_1}if available{Style.reset}
+{Fore.grey_70}**{Fore.light_green}'exe','execute','x'{Fore.light_steel_blue} write an inline script and excute it, using {Fore.magenta}#ml#{Fore.light_steel_blue} if multi-line{Fore.orange_red_1}[if available] {Fore.grey_70}**{Fore.green_yellow}to save results for use later, use the function {Fore.light_sea_green}save(result){Fore.green_yellow} where result is the variable containing your result to be used elsewhere.{Style.reset}
+{Fore.grey_70}**{Fore.light_green}'exe-result','execute-result','xr'{Fore.light_steel_blue} return result from inline script save(){Style.reset}
+{Fore.grey_70}**{Fore.light_green}'exe-print','pxr','print exe result'{Fore.light_steel_blue} print result of inline script from save without returning{Style.reset}
 '''
                         print(extra)
                         print(helpText)

{radboy-0.0.352 → radboy-0.0.354}/radboy/TasksMode/Tasks.py

@@ -35,7 +35,7 @@ from radboy.InListRestore.ILR import *
 from radboy.Compare.Compare import *
 from radboy.Unified.Unified2 import Unified2
 from copy import copy
-from decimal import Decimal
+from decimal import Decimal,getcontext
 from radboy.GDOWN.GDOWN import *
 from radboy.Unified.clearalll import clear_all
 
@@ -280,7 +280,23 @@ def TD(time_string):
 def td(time_string):
     return TD(time_string)
 
+
+def save(value):
+    detectGetOrSet("InLineResult",value,setValue=True,literal=True)
+
+
+
 class TasksMode:
+    def getInLineResult(self):
+        return str(detectGetOrSet("InLineResult",None,setValue=False,literal=True))
+
+    def executeInLine(self):
+        text=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Formula :",helpText="text script, to save output for elsewhere send results through save()",data="string")
+        if text is None:
+            return
+        else:
+            exec(text)
+
     def prec_calc(self):
         text=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Formula :",helpText="text formula",data="decimal")
         if text is None:
@@ -289,20 +305,23 @@ class TasksMode:
             return text
 
     def pricing(self):
+        prec=int(detectGetOrSet("Price/Tax/CRV Calculator Precision",4,setValue=False,literal=True))
+        getcontext().prec=prec
         while True:
             try:
-                default_taxrate=float(detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True))
-                default_price=float(detectGetOrSet("pricing default price",1,setValue=False,literal=True))
-                default_bottle_qty=float(detectGetOrSet("pricing default bottle_qty",1,setValue=False,literal=True))
-                default_bottle_size=float(detectGetOrSet("pricing default bottle_size",16.9,setValue=False,literal=True))
-                default_purchased_qty=float(detectGetOrSet("pricing default purchased_qty",1,setValue=False,literal=True))
+                default_taxrate=float(Decimal(detectGetOrSet("Tax Rate",0.0925,setValue=False,literal=True)))
+                default_price=float(Decimal(detectGetOrSet("pricing default price",1,setValue=False,literal=True)))
+                default_bottle_qty=float(Decimal(detectGetOrSet("pricing default bottle_qty",1,setValue=False,literal=True)))
+                default_bottle_size=float(Decimal(detectGetOrSet("pricing default bottle_size",16.9,setValue=False,literal=True)))
+                default_purchased_qty=float(Decimal(detectGetOrSet("pricing default purchased_qty",1,setValue=False,literal=True)))
                 defaults_msg=f"""
 {Fore.orange_red_1}Default Settings [changeable under sysset]{Style.reset}
 {Fore.light_sea_green}default_taxrate=={Fore.turquoise_4}{default_taxrate},
 {Fore.grey_70}default_price=={Fore.light_yellow}{default_price},
 {Fore.light_sea_green}default_bottle_qty=={Fore.turquoise_4}{default_bottle_qty},
 {Fore.grey_70}default_bottle_size=={Fore.light_yellow}{default_bottle_size},
-{Fore.light_sea_green}default_purchased_qty=={Fore.turquoise_4}{default_purchased_qty}{Style.reset}"""
+{Fore.light_sea_green}default_purchased_qty=={Fore.turquoise_4}{default_purchased_qty}
+{Fore.grey_70}Price/Tax/CRV Calculator Precision=={Fore.light_yellow}{prec}{Style.reset}"""
 
                 def beverage_PTCRV_base():
                     result=None
@@ -334,9 +353,9 @@ class TasksMode:
                         bottle_qty=default_bottle_qty
 
                     if xxx.magnitude < 24:
-                        crv=0.05*bottle_qty
+                        crv=float(Decimal(0.05)*Decimal(bottle_qty))
                     else:
-                        crv=0.10*bottle_qty
+                        crv=float(Decimal(0.10)*Decimal(bottle_qty))
 
                     tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
                     if tax_rate is None:
@@ -350,10 +369,11 @@ class TasksMode:
                     elif purchased_qty in ['d',]:
                         purchased_qty=default_purchased_qty
 
-                    price=(price*purchased_qty)+crv
-                    tax=price*tax_rate
+                    price=(Decimal(price)*Decimal(purchased_qty))+Decimal(crv)
+                    tax=price*Decimal(tax_rate)
 
-                    result=round(price+tax,3)
+
+                    result=round(float(Decimal(price)+tax),prec)
                     return result
 
                 def tax_with_crv():
@@ -386,9 +406,9 @@ class TasksMode:
                         bottle_qty=default_bottle_qty
 
                     if xxx.magnitude < 24:
-                        crv=0.05*bottle_qty
+                        crv=Decimal(0.05)*Decimal(bottle_qty)
                     else:
-                        crv=0.10*bottle_qty
+                        crv=Decimal(0.10)*Decimal(bottle_qty)
 
                     tax_rate=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"Tax Rate (0.01==1%(Default={default_taxrate})):",helpText="A float or integer",data="float")
                     if tax_rate is None:
@@ -402,10 +422,10 @@ class TasksMode:
                     elif purchased_qty in ['d',]:
                         purchased_qty=default_purchased_qty
 
-                    price=(price*purchased_qty)+crv
-                    tax=price*tax_rate
+                    price=Decimal(Decimal(price)*Decimal(purchased_qty))+crv
+                    tax=price*Decimal(tax_rate)
 
-                    result=round(tax,3)
+                    result=round(float(tax),prec)
                     return result
 
                 def crv_total():
@@ -431,12 +451,12 @@ class TasksMode:
                         bottle_qty=default_bottle_qty
 
                     if xxx.magnitude < 24:
-                        crv=0.05*bottle_qty
+                        crv=Decimal(0.05)*Decimal(bottle_qty)
                     else:
-                        crv=0.10*bottle_qty
+                        crv=Decimal(0.10)*Decimal(bottle_qty)
 
                     
-                    result=round(crv,3)
+                    result=round(float(crv),prec)
                     return result
 
                 def price_tax():
@@ -461,10 +481,10 @@ class TasksMode:
                     elif tax_rate == 'd':
                         tax_rate=default_taxrate
 
-                    price=price*bottle_qty
-                    tax=price*tax_rate
+                    price=Decimal(price)*Decimal(bottle_qty)
+                    tax=price*Decimal(tax_rate)
 
-                    result=round(price+tax,3)
+                    result=round(float(price+tax),3)
                     return result
 
                 def tax_no_crv():
@@ -489,10 +509,10 @@ class TasksMode:
                     elif tax_rate == 'd':
                         tax_rate=default_taxrate
 
-                    price=price*bottle_qty
-                    tax=price*tax_rate
+                    price=Decimal(price)*Decimal(bottle_qty)
+                    tax=price*Decimal(tax_rate)
 
-                    result=round(tax,3)
+                    result=round(float(tax),prec)
                     return result
 
                 def tax_rate_from_priceAndTax():
@@ -512,9 +532,9 @@ class TasksMode:
                         taxed=0
 
 
-                    tax_rate=taxed/price
+                    tax_rate=Decimal(taxed)/Decimal(price)
 
-                    result=round(tax_rate,3)
+                    result=round(float(tax_rate),prec)
                     return result
 
                 def tax_rate_from_oldPriceAndNewPrice():
@@ -532,10 +552,11 @@ class TasksMode:
                     elif new_price in ['','d']:
                         new_price=default_price
 
-                    taxed=round(new_price-old_price,3)
-                    tax_rate=round(taxed/old_price,3)
+                    taxed=Decimal(new_price)-Decimal(old_price)
+                    tax_rate=taxed/Decimal(old_price)
+                    tax_rate=round(float(tax_rate),prec)
 
-                    result=round(tax_rate,3)
+                    result=tax_rate
                     return result
 
                 while True:
@@ -562,7 +583,7 @@ class TasksMode:
                     },
                     '4':{
                         'cmds':['tax','tax no crv','tax 0 crv','4'],
-                        'desc':f'{Fore.light_yellow}tax+crv{Fore.medium_violet_red} asking questions like price and qty to get total crv{Style.reset}',
+                        'desc':f'{Fore.light_yellow}tax w/o crv{Fore.medium_violet_red} asking questions like price and qty to get total tax without crv{Style.reset}',
                         'exec':tax_no_crv
                     },
                     '5':{

radboy-0.0.354/radboy/__init__.py

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

{radboy-0.0.352 → radboy-0.0.354}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.352 → radboy-0.0.354}/setup.py

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

radboy-0.0.352/STDOUT.TXT

@@ -1,28 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"03201519"
-#USER INPUT# -> :""
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"ssf2e"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"iron"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"iron"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"0g"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"lu"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.352"

radboy-0.0.352/radboy/__init__.py

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