modified: srcdev/INSTALL.md

docker/Dockerfile

@@ -1,31 +0,0 @@
-FROM python:slim
-
-RUN ln -sf /usr/share/zoneinfo/Europe/Warsaw /etc/localtime
-
-EXPOSE 8000
-
-ARG USERNAME
-ARG PASSWORD
-# ARG LOG_LEVEL
-
-ENV USERNAME=$USERNAME
-ENV PASSWORD=$PASSWORD
-# ENV LOG_LEVEL=$LOG_LEVEL
-
-WORKDIR /app
-
-###
-
-COPY ../src/rund.sh /app
-COPY ../src/requirements.txt /app
-COPY ../src/main.py /app
-COPY ../src/api.py /app
-COPY ../src/cron.py /app
-COPY ../src/moj_licznik.py /app
-
-#RUN chmod +x /app/rund.sh
-RUN pip install -r requirements.txt
-
-RUN ls /app
-
-CMD ["./rund.sh"]

docker/docker_build.sh

@@ -0,0 +1,7 @@
+docker build -t energa-meter:latest .
+docker build -t energa-meter:v0.1.6-dev .
+
+
+
+
+docker run -p 8000:8000 -e ENERGA_USERNAME=plkp.roz.z2@gmail.com -e ENERGA_PASSWORD=1WUnSnbdnbGempSzEahh energa-meter:v0.1.6-dev

docker/rund.sh

@@ -14,14 +14,11 @@ if [ -z "$PASSWORD" ]; then
     exit 1
 fi
 
-echo "Uruchamiam API"
+if [ -z "$LOG_LEVEL" ]; then
-python api.py &
+    echo "Błąd: Zmienna LOG_LEVEL jest pusta. Przypisuję wartość domyślną INFO."
-echo "Uruchamiam MAIN"
+    LOG_LEVEL="INFO"
-python main.py
+fi
-echo "Uruchamiam CRON"
 
-while true; do
+echo "Uruchamiam aplikację"
-    python cron.py
+python run.py
-    echo "Czekam..."
+echo "..."
-    sleep 1800
-done

srcdev/INSTALL.md

@@ -13,7 +13,6 @@
 ![i386-shield]
 
 
-
 [kawa-logo]: https://github.com/tcich/ha-addon-energa-meter/blob/main/img/buycoffeeto-btn-primary-outline.png
 [kawa]: https://buycoffee.to/tcich
 

srcdev/README.md

@@ -76,6 +76,20 @@ sensor:
     unit_of_measurement: "kWh"
     value_template: "{{ value_json.countner.meter_value | round(2) }}"       
 ```    
+## Suma liczników, bilans
+W celu uzyskania sumy liczników, bilansu, itp należy użyć templates:
+```
+template:
+  - sensor:
+      - name: "Suma liczników"
+        unit_of_measurement: "kWh"
+        state: "{{ states('sensor.123456789_apt1') | float + states('sensor.123456789_apt2') | float | round(2) }}"
+  - sensor:
+      - name: "Bilans/różnica liczników"
+        unit_of_measurement: "kWh"
+        state: "{{ states('sensor.123456789_apt1') | float - states('sensor.123456789_apt2') | float | round(2) }}"        
+```
+
 
 ### Opis konfiguracji
 | element konfiguracji | Opis |

srcdev/config.yaml

@@ -1,6 +1,6 @@
 name: "Energa meter (dev)"
 description: "Energa meter addon"
-version: "0.1.5"
+version: "0.1.6"
 slug: "energa_meter_dev"
 init: false
 options:

srcdev/moj_licznik.py

@@ -358,7 +358,7 @@ class MojLicznik:
     def save_main_charts(self, mp, vals, m_type):
         for val in vals:
             #try:
-                logger.info(f"save_main_charts: mp: {mp}, val: {val}, meter_type: {m_type}")
+                logger.debug(f"save_main_charts: mp: {mp}, val: {val}, meter_type: {m_type}")
                 z = val["zones"]
                 if z[0]:
                     # MainChartTable.get_or_create(tm = val["tm"], zone = 1, value = z[0], tarAvg=val["tarAvg"], est=val["est"], cplt=val["cplt"])
@@ -433,7 +433,7 @@ class MojLicznik:
 
         # meter_type = 'A+'
         chart_url = f"{self.meter_url}/dp/resources/chart?mainChartDate={tsm_date}&type={chart_type}&meterPoint={meter_point}&mo={urllib.parse.quote_plus(meter_type)}"
-        logger.info(f"chart_url: {chart_url}")
+        logger.debug(f"chart_url: {chart_url}")
         try:
             response = self.session.get(chart_url)
             data = json.loads(response.text)

srcdev/run.py

@@ -72,7 +72,7 @@ if __name__ == "__main__":
     else:
         username = os.getenv("USERNAME")
         password = os.getenv("PASSWORD")
-        log_level = os.getenv("LOGLEVEL")
+        log_level = os.getenv("LOG_LEVEL")
 
     logger_name = "energaMeter"