juham-automation 0.0.8__tar.gz → 0.0.10__tar.gz

{juham_automation-0.0.8 → juham_automation-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.8
+Version: 0.0.10
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -50,7 +50,6 @@ Requires-Dist: masterpiece_pahomqtt>=0.0.3
 Requires-Dist: juham_core>=0.0.7
 Requires-Dist: requests>=2.31
 Requires-Dist: pytz>=2024.1
-Requires-Dist: importlib-metadata
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"

{juham_automation-0.0.8 → juham_automation-0.0.10}/docs/build/html/index.html

@@ -87,7 +87,7 @@
 </ul>
 </li>
 <li><a class="reference internal" href="#changelog">Changelog</a><ul>
-<li><a class="reference internal" href="#february23-2025">[0.1.8] - February23, 2025</a></li>
+<li><a class="reference internal" href="#february-23-2025">[0.1.8-10] - February 23, 2025</a></li>
 <li><a class="reference internal" href="#february-08-2025">[0.1.7] - February 08, 2025</a></li>
 </ul>
 </li>
@@ -161,7 +161,7 @@
 </ul>
 </li>
 <li><a class="reference internal" href="#changelog">Changelog</a><ul>
-<li><a class="reference internal" href="#february23-2025">[0.1.8] - February23, 2025</a></li>
+<li><a class="reference internal" href="#february-23-2025">[0.1.8-10] - February 23, 2025</a></li>
 <li><a class="reference internal" href="#february-08-2025">[0.1.7] - February 08, 2025</a></li>
 </ul>
 </li>
@@ -312,11 +312,13 @@ So there is a Makefile in the root folder. For those old dogs who are like me</p
 </section>
 <section id="changelog">
 <h1>Changelog<a class="headerlink" href="#changelog" title="Link to this heading">¶</a></h1>
-<section id="february23-2025">
-<h2>[0.1.8] - February23, 2025<a class="headerlink" href="#february23-2025" title="Link to this heading">¶</a></h2>
+<section id="february-23-2025">
+<h2>[0.1.8-10] - February 23, 2025<a class="headerlink" href="#february-23-2025" title="Link to this heading">¶</a></h2>
 <ul class="simple">
+<li><p>Support for grid (network) prices and tax added.</p></li>
 <li><p>Bug fix in the computation of the utilization optimization index: solar power was previously
 given in kW, while radiator power was in W, which underestimated the effect of available solar power.</p></li>
+<li><p>New attribute added to time series: GridCost (cost and tax per kWh)</p></li>
 </ul>
 </section>
 <section id="february-08-2025">

juham_automation-0.0.10/docs/build/html/searchindex.js

@@ -0,0 +1 @@
+Search.setIndex({"alltitles":{"Automation":[[0,"automation"]],"Changelog":[[0,"changelog"]],"Classes":[[0,"classes"]],"Code Formatting":[[0,"code-formatting"]],"Contents:":[[0,null]],"Contributing to Juham\u2122 - Juha\u2019s Ultimate Home Automation Masterpiece":[[0,"contributing-to-juham-juha-s-ultimate-home-automation-masterpiece"]],"Design":[[0,"design"]],"Design Patterns":[[0,"design-patterns"]],"Documentation":[[0,"documentation"]],"Index":[[0,"index"]],"Inline TODO":[[0,"inline-todo"]],"LICENSE":[[0,"license"]],"More Stuff":[[0,"more-stuff"]],"Project Description":[[0,"project-description"]],"Project Status":[[0,"project-status"]],"Special Thanks":[[0,"special-thanks"]],"TODOs for Juham\u2122":[[0,"todos-for-juham"]],"Testing":[[0,"testing"]],"Thank You!":[[0,"thank-you"]],"Todo":[[0,"id1"],[0,null]],"Using Emacs and Makefile":[[0,"using-emacs-and-makefile"]],"Welcome to Juham\u2122 - Juha\u2019s Ultimate Home Automation Masterpiece":[[0,"welcome-to-juham-juha-s-ultimate-home-automation-masterpiece"]],"Welcome to Juham\u2122 documentation!":[[0,null]],"[0.1.7] - February 08, 2025":[[0,"february-08-2025"]],"[0.1.8-10] - February 23, 2025":[[0,"february-23-2025"]],"juham_automation":[[1,null]]},"docnames":["index","juham_automation/index"],"envversion":{"sphinx":65,"sphinx.domains.c":3,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":9,"sphinx.domains.index":1,"sphinx.domains.javascript":3,"sphinx.domains.math":2,"sphinx.domains.python":4,"sphinx.domains.rst":2,"sphinx.domains.std":2,"sphinx.ext.intersphinx":1,"sphinx.ext.todo":2,"sphinx.ext.viewcode":1},"filenames":["index.rst","juham_automation/index.rst"],"indexentries":{},"objects":{},"objnames":{},"objtypes":{},"terms":{"15":0,"2":0,"2024":0,"43":0,"5":0,"A":0,"AND":0,"AS":0,"BE":0,"BUT":0,"FOR":0,"For":0,"IN":0,"It":0,"NO":0,"NOT":0,"OF":0,"OR":0,"THE":0,"TO":0,"The":0,"To":0,"WITH":0,"_":0,"abov":0,"acquir":0,"across":0,"action":0,"actual":0,"ad":0,"add":0,"adjust":0,"advanc":0,"align":0,"all":0,"alpha":0,"alreadi":0,"also":0,"an":0,"ani":0,"appreci":0,"ar":0,"aris":0,"associ":0,"attempt":0,"attribut":0,"author":0,"avail":0,"bake":0,"balanc":0,"base":0,"becaus":0,"been":0,"befor":0,"behind":0,"best":0,"between":0,"black":0,"block":0,"both":0,"bought":0,"bug":0,"build":0,"c":0,"capabl":0,"chapter":0,"charg":0,"circul":0,"claim":0,"common":0,"comput":0,"condit":0,"configur":0,"connect":0,"consist":0,"consumpt":0,"contain":0,"contract":0,"control":0,"copi":0,"copyright":0,"cost":0,"could":0,"cover":0,"currenc":0,"current":0,"damag":0,"data":0,"databas":0,"deal":0,"demonstr":0,"desper":0,"despit":0,"detect":0,"develop":0,"differ":0,"distinct":0,"distribut":0,"do":0,"doc":0,"docstr":0,"doesn":0,"dog":0,"don":0,"donat":0,"done":0,"down":0,"drag":0,"drop":0,"eclips":0,"effect":0,"effort":0,"electr":0,"element":0,"encourag":0,"encrypt":0,"endless":0,"energi":0,"energycostcalcul":0,"ensur":0,"entir":0,"entri":0,"essenti":0,"euro":0,"event":0,"everi":0,"except":0,"express":0,"extend":0,"extent":0,"extrac":0,"fall":0,"featur":0,"feedback":0,"few":0,"file":0,"find":0,"finland":0,"fit":0,"five":0,"fix":0,"folder":0,"follow":0,"formatt":0,"forthcom":0,"free":0,"from":0,"furnish":0,"gener":0,"gentlemen":0,"gitlab":0,"give":0,"given":0,"goal":0,"grant":0,"graphic":0,"grate":0,"grid":0,"gridcost":0,"ha":0,"half":0,"hard":0,"have":0,"help":0,"herebi":0,"hi":0,"highli":0,"holder":0,"hole":0,"hot":0,"hotwateroptim":0,"hour":0,"how":0,"howev":0,"i":0,"id":0,"idea":0,"imbal":0,"impli":0,"import":0,"improv":0,"includ":0,"individu":0,"initi":0,"inspect":0,"inspir":0,"instanc":0,"instrument":0,"integr":0,"invalu":0,"item":0,"its":0,"json":0,"juham_autom":0,"juham_cor":0,"k":0,"kind":0,"know":0,"known":0,"kw":0,"kwh":0,"lack":0,"later":0,"lenght":0,"liabil":0,"liabl":0,"like":0,"limit":0,"line":0,"list":0,"listen":0,"locat":0,"logo":0,"look":0,"love":0,"m":0,"mahi":0,"main":0,"maintain":0,"make":0,"mani":0,"me":0,"merchant":0,"merg":0,"meskanen":0,"microsoft":0,"minim":0,"minut":0,"mission":0,"modifi":0,"modul":0,"monitor":0,"most":0,"motion":0,"mqtt":0,"much":0,"multipl":0,"my":0,"need":0,"neg":0,"network":0,"new":0,"noninfring":0,"notic":0,"obtain":0,"offer":0,"okai":0,"old":0,"optim":0,"organ":0,"origin":0,"other":0,"otherwis":0,"out":0,"outstand":0,"own":0,"packag":0,"page":0,"panel":0,"particular":0,"password":0,"per":0,"period":0,"permiss":0,"permit":0,"person":0,"pi":0,"pleas":0,"plu":0,"portion":0,"possibl":0,"power":0,"pre":0,"previous":0,"price":0,"prioriz":0,"produc":0,"product":0,"profession":0,"properli":0,"provid":0,"publish":0,"pump":0,"purpos":0,"push":0,"python":0,"rabbit":0,"radiat":0,"raspberri":0,"read":0,"real":0,"realli":0,"record":0,"relai":0,"releas":0,"report":0,"requir":0,"restrict":0,"right":0,"robust":0,"root":0,"rst":0,"search":0,"secur":0,"seem":0,"sell":0,"semblanc":0,"sensor":0,"seri":0,"settlement":0,"shall":0,"shelli":0,"should":0,"simpli":0,"simul":0,"small":0,"so":0,"softwar":0,"solar":0,"some":0,"sourc":0,"spare":0,"spark":0,"spothintafi":0,"state":0,"still":0,"store":0,"strang":0,"structur":0,"sub":0,"subject":0,"sublicens":0,"substanti":0,"support":0,"system":0,"t":0,"tax":0,"tba":0,"temperatur":0,"teppo":0,"term":0,"thei":0,"thi":0,"those":0,"thought":0,"time":0,"tinker":0,"tool":0,"topic":0,"tort":0,"translat":0,"transmiss":0,"tri":0,"truli":0,"turn":0,"two":0,"underestim":0,"understand":0,"unit":0,"up":0,"util":0,"volt":0,"vscode":0,"w":0,"wa":0,"warranti":0,"wasn":0,"water":0,"watercircul":0,"we":0,"well":0,"whether":0,"which":0,"while":0,"who":0,"whom":0,"wifi":0,"without":0,"work":0,"workflow":0,"would":0,"write":0,"your":0},"titles":["Welcome to Juham\u2122 documentation!","juham_automation"],"titleterms":{"":0,"0":0,"08":0,"1":0,"10":0,"2025":0,"23":0,"7":0,"8":0,"autom":0,"changelog":0,"class":0,"code":0,"content":0,"contribut":0,"descript":0,"design":0,"document":0,"emac":0,"februari":0,"format":0,"home":0,"index":0,"inlin":0,"juha":0,"juham":0,"juham_autom":1,"licens":0,"makefil":0,"masterpiec":0,"more":0,"pattern":0,"project":0,"special":0,"statu":0,"stuff":0,"test":0,"thank":0,"todo":0,"ultim":0,"us":0,"welcom":0,"you":0}})

{juham_automation-0.0.8 → juham_automation-0.0.10}/juham_automation/automation/spothintafi.py

@@ -18,6 +18,9 @@ class SpotHintaFiThread(JuhamCloudThread):
     _spot_topic: str = ""
     _url: str = ""
     _interval: float = 12 * 3600
+    grid_cost_day: float = 0.0314
+    grid_cost_night: float = 0.0132
+    grid_cost_tax: float = 0.028272
 
     def __init__(self, client: Optional[Mqtt] = None) -> None:
         super().__init__(client)
@@ -51,11 +54,19 @@ class SpotHintaFiThread(JuhamCloudThread):
         for e in data:
             ts = time.mktime(time.strptime(e["DateTime"], "%Y-%m-%dT%H:%M:%S%z"))
             hour = datetime.utcfromtimestamp(ts).strftime("%H")
+            total_price: float
+            grid_cost: float
+            if int(hour) < 22 and int(hour) >= 6:
+                grid_cost = self.grid_cost_day
+            else:
+                grid_cost = self.grid_cost_night
+            total_price = e["PriceWithTax"] + grid_cost + self.grid_cost_tax
             h = {
                 "Timestamp": ts,
                 "hour": hour,
                 "Rank": e["Rank"],
-                "PriceWithTax": e["PriceWithTax"],
+                "PriceWithTax": total_price,
+                "GridCost": grid_cost + self.grid_cost_tax,
             }
             spot.append(h)
         self.publish(self._spot_topic, json.dumps(spot), 1, True)

{juham_automation-0.0.8 → juham_automation-0.0.10}/juham_automation/ts/electricityprice_ts.py

@@ -37,11 +37,15 @@ class ElectricityPriceTs(JuhamTs):
         Args:
             m (dict): holding hourlys spot electricity prices
         """
+        grid_cost : float
         for h in m:
-            point = (
-                self.measurement("spot")
-                .tag("hour", h["Timestamp"])
-                .field("value", h["PriceWithTax"])
-                .time(epoc2utc(h["Timestamp"]))
-            )
-            self.write(point)
+            if "GridCost" in h:
+                grid_cost = h["GridCost"]
+                point = (
+                    self.measurement("spot")
+                    .tag("hour", h["Timestamp"])
+                    .field("value", h["PriceWithTax"])
+                    .field("grid", grid_cost)
+                    .time(epoc2utc(h["Timestamp"]))
+                )
+                self.write(point)

{juham_automation-0.0.8 → juham_automation-0.0.10}/juham_automation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: juham-automation
-Version: 0.0.8
+Version: 0.0.10
 Summary: Juha's Ultimate Home Automation Masterpiece
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
@@ -50,7 +50,6 @@ Requires-Dist: masterpiece_pahomqtt>=0.0.3
 Requires-Dist: juham_core>=0.0.7
 Requires-Dist: requests>=2.31
 Requires-Dist: pytz>=2024.1
-Requires-Dist: importlib-metadata
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
 Requires-Dist: types-pyz; extra == "dev"

{juham_automation-0.0.8 → juham_automation-0.0.10}/juham_automation.egg-info/requires.txt

@@ -4,7 +4,6 @@ masterpiece_pahomqtt>=0.0.3
 juham_core>=0.0.7
 requests>=2.31
 pytz>=2024.1
-importlib-metadata
 
 [dev]
 check-manifest

{juham_automation-0.0.8 → juham_automation-0.0.10}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "juham-automation"
-version = "0.0.8"
+version = "0.0.10"
 description = "Juha's Ultimate Home Automation Masterpiece"
 readme = {file = "README.rst", content-type = "text/markdown"}
 requires-python = ">=3.8"
@@ -33,7 +33,6 @@ dependencies = [
   "juham_core >= 0.0.7",
   "requests >= 2.31",
   "pytz >= 2024.1",
-  "importlib-metadata"
 ]
 
 

juham_automation-0.0.8/docs/build/html/searchindex.js

@@ -1 +0,0 @@
-Search.setIndex({"alltitles":{"Automation":[[0,"automation"]],"Changelog":[[0,"changelog"]],"Classes":[[0,"classes"]],"Code Formatting":[[0,"code-formatting"]],"Contents:":[[0,null]],"Contributing to Juham\u2122 - Juha\u2019s Ultimate Home Automation Masterpiece":[[0,"contributing-to-juham-juha-s-ultimate-home-automation-masterpiece"]],"Design":[[0,"design"]],"Design Patterns":[[0,"design-patterns"]],"Documentation":[[0,"documentation"]],"Index":[[0,"index"]],"Inline TODO":[[0,"inline-todo"]],"LICENSE":[[0,"license"]],"More Stuff":[[0,"more-stuff"]],"Project Description":[[0,"project-description"]],"Project Status":[[0,"project-status"]],"Special Thanks":[[0,"special-thanks"]],"TODOs for Juham\u2122":[[0,"todos-for-juham"]],"Testing":[[0,"testing"]],"Thank You!":[[0,"thank-you"]],"Todo":[[0,"id1"],[0,null]],"Using Emacs and Makefile":[[0,"using-emacs-and-makefile"]],"Welcome to Juham\u2122 - Juha\u2019s Ultimate Home Automation Masterpiece":[[0,"welcome-to-juham-juha-s-ultimate-home-automation-masterpiece"]],"Welcome to Juham\u2122 documentation!":[[0,null]],"[0.1.7] - February 08, 2025":[[0,"february-08-2025"]],"[0.1.8] - February23, 2025":[[0,"february23-2025"]],"juham_automation":[[1,null]]},"docnames":["index","juham_automation/index"],"envversion":{"sphinx":65,"sphinx.domains.c":3,"sphinx.domains.changeset":1,"sphinx.domains.citation":1,"sphinx.domains.cpp":9,"sphinx.domains.index":1,"sphinx.domains.javascript":3,"sphinx.domains.math":2,"sphinx.domains.python":4,"sphinx.domains.rst":2,"sphinx.domains.std":2,"sphinx.ext.intersphinx":1,"sphinx.ext.todo":2,"sphinx.ext.viewcode":1},"filenames":["index.rst","juham_automation/index.rst"],"indexentries":{},"objects":{},"objnames":{},"objtypes":{},"terms":{"15":0,"2":0,"2024":0,"43":0,"5":0,"A":0,"AND":0,"AS":0,"BE":0,"BUT":0,"FOR":0,"For":0,"IN":0,"It":0,"NO":0,"NOT":0,"OF":0,"OR":0,"THE":0,"TO":0,"The":0,"To":0,"WITH":0,"_":0,"abov":0,"acquir":0,"across":0,"action":0,"actual":0,"add":0,"adjust":0,"advanc":0,"align":0,"all":0,"alpha":0,"alreadi":0,"also":0,"an":0,"ani":0,"appreci":0,"ar":0,"aris":0,"associ":0,"attempt":0,"author":0,"avail":0,"bake":0,"balanc":0,"base":0,"becaus":0,"been":0,"befor":0,"behind":0,"best":0,"between":0,"black":0,"block":0,"both":0,"bought":0,"bug":0,"build":0,"c":0,"capabl":0,"chapter":0,"charg":0,"circul":0,"claim":0,"common":0,"comput":0,"condit":0,"configur":0,"connect":0,"consist":0,"consumpt":0,"contain":0,"contract":0,"control":0,"copi":0,"copyright":0,"cost":0,"could":0,"cover":0,"currenc":0,"current":0,"damag":0,"data":0,"databas":0,"deal":0,"demonstr":0,"desper":0,"despit":0,"detect":0,"develop":0,"differ":0,"distinct":0,"distribut":0,"do":0,"doc":0,"docstr":0,"doesn":0,"dog":0,"don":0,"donat":0,"done":0,"down":0,"drag":0,"drop":0,"eclips":0,"effect":0,"effort":0,"electr":0,"element":0,"encourag":0,"encrypt":0,"endless":0,"energi":0,"energycostcalcul":0,"ensur":0,"entir":0,"entri":0,"essenti":0,"euro":0,"event":0,"everi":0,"except":0,"express":0,"extend":0,"extent":0,"extrac":0,"fall":0,"featur":0,"feedback":0,"few":0,"file":0,"find":0,"finland":0,"fit":0,"five":0,"fix":0,"folder":0,"follow":0,"formatt":0,"forthcom":0,"free":0,"from":0,"furnish":0,"gener":0,"gentlemen":0,"gitlab":0,"give":0,"given":0,"goal":0,"grant":0,"graphic":0,"grate":0,"ha":0,"half":0,"hard":0,"have":0,"help":0,"herebi":0,"hi":0,"highli":0,"holder":0,"hole":0,"hot":0,"hotwateroptim":0,"hour":0,"how":0,"howev":0,"i":0,"id":0,"idea":0,"imbal":0,"impli":0,"import":0,"improv":0,"includ":0,"individu":0,"initi":0,"inspect":0,"inspir":0,"instanc":0,"instrument":0,"integr":0,"invalu":0,"item":0,"its":0,"json":0,"juham_autom":0,"juham_cor":0,"k":0,"kind":0,"know":0,"known":0,"kw":0,"lack":0,"later":0,"lenght":0,"liabil":0,"liabl":0,"like":0,"limit":0,"line":0,"list":0,"listen":0,"locat":0,"logo":0,"look":0,"love":0,"m":0,"mahi":0,"main":0,"maintain":0,"make":0,"mani":0,"me":0,"merchant":0,"merg":0,"meskanen":0,"microsoft":0,"minim":0,"minut":0,"mission":0,"modifi":0,"modul":0,"monitor":0,"most":0,"motion":0,"mqtt":0,"much":0,"multipl":0,"my":0,"need":0,"neg":0,"new":0,"noninfring":0,"notic":0,"obtain":0,"offer":0,"okai":0,"old":0,"optim":0,"organ":0,"origin":0,"other":0,"otherwis":0,"out":0,"outstand":0,"own":0,"packag":0,"page":0,"panel":0,"particular":0,"password":0,"period":0,"permiss":0,"permit":0,"person":0,"pi":0,"pleas":0,"plu":0,"portion":0,"possibl":0,"power":0,"pre":0,"previous":0,"price":0,"prioriz":0,"produc":0,"product":0,"profession":0,"properli":0,"provid":0,"publish":0,"pump":0,"purpos":0,"push":0,"python":0,"rabbit":0,"radiat":0,"raspberri":0,"read":0,"real":0,"realli":0,"record":0,"relai":0,"releas":0,"report":0,"requir":0,"restrict":0,"right":0,"robust":0,"root":0,"rst":0,"search":0,"secur":0,"seem":0,"sell":0,"semblanc":0,"sensor":0,"seri":0,"settlement":0,"shall":0,"shelli":0,"should":0,"simpli":0,"simul":0,"small":0,"so":0,"softwar":0,"solar":0,"some":0,"sourc":0,"spare":0,"spark":0,"spothintafi":0,"state":0,"still":0,"store":0,"strang":0,"structur":0,"sub":0,"subject":0,"sublicens":0,"substanti":0,"support":0,"system":0,"t":0,"tba":0,"temperatur":0,"teppo":0,"term":0,"thei":0,"thi":0,"those":0,"thought":0,"time":0,"tinker":0,"tool":0,"topic":0,"tort":0,"translat":0,"transmiss":0,"tri":0,"truli":0,"turn":0,"two":0,"underestim":0,"understand":0,"unit":0,"up":0,"util":0,"volt":0,"vscode":0,"w":0,"wa":0,"warranti":0,"wasn":0,"water":0,"watercircul":0,"we":0,"well":0,"whether":0,"which":0,"while":0,"who":0,"whom":0,"wifi":0,"without":0,"work":0,"workflow":0,"would":0,"write":0,"your":0},"titles":["Welcome to Juham\u2122 documentation!","juham_automation"],"titleterms":{"":0,"0":0,"08":0,"1":0,"2025":0,"7":0,"8":0,"autom":0,"changelog":0,"class":0,"code":0,"content":0,"contribut":0,"descript":0,"design":0,"document":0,"emac":0,"februari":0,"february23":0,"format":0,"home":0,"index":0,"inlin":0,"juha":0,"juham":0,"juham_autom":1,"licens":0,"makefil":0,"masterpiec":0,"more":0,"pattern":0,"project":0,"special":0,"statu":0,"stuff":0,"test":0,"thank":0,"todo":0,"ultim":0,"us":0,"welcom":0,"you":0}})