juham-watermeter 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

juham_watermeter/watermeter_imgdiff.py

@@ -143,10 +143,6 @@ class WaterMeterThreadImgDiff(WebCameraThread):
         # Return a value between 0.0 (identical) and 1.0 (maximally different)
         return min(max(change_area, 0.0), 1.0)
 
-    @override
-    def update_interval(self) -> float:
-        return self._interval
-
     def upload_file(self, filename: str) -> None:
         """Upload the given filename to the ftp server, if the server is configured.
 
@@ -256,7 +252,7 @@ class WaterMeterImgDiff(WebCamera):
     ]
 
     _workerThreadId: str = WaterMeterThreadImgDiff.get_class_id()
-    update_interval: float = 30
+    update_interval: float = 60 * 10 # 10 minutes
     topic = "watermeter"
     location = "home"
     camera: int = 0

juham_watermeter/webcamera.py

@@ -1,6 +1,4 @@
-"""Web camera with basic image processing features.
-
-"""
+"""Web camera with basic image processing features."""
 
 import cv2
 import numpy as np
@@ -64,7 +62,6 @@ class WebCameraThread(MasterPieceThread):
 
         # Check if the webcam is opened correctly
         if not cap.isOpened():
-            print("CANNOT ACCESS THE CAMERA")
             self.error(f"Could not access the camera {self._camera}.")
             return np.zeros(
                 (1, 1, 3), dtype=np.uint8
@@ -74,7 +71,6 @@ class WebCameraThread(MasterPieceThread):
         try:
             ret, frame = cap.read()
             if not ret:
-                print("WTF, Camera failed")
                 self.error("Could not capture image.")
                 frame = np.zeros(
                     (1, 1, 3), dtype=np.uint8
@@ -142,7 +138,6 @@ class WebCamera(JuhamThread):
     _WEBCAMERA_ATTRS: list[str] = ["location", "camera"]
 
     _workerThreadId: str = WebCameraThread.get_class_id()
-    update_interval: float = 60
     location = "home"
     camera: int = 0
 

{juham_watermeter-0.0.7.dist-info → juham_watermeter-0.0.9.dist-info}/METADATA

@@ -1,32 +1,10 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: juham-watermeter
-Version: 0.0.7
+Version: 0.0.9
 Summary: Web-camera based watermeter for Juham
 Author-email: J Meskanen <juham.api@gmail.com>
 Maintainer-email: "J. Meskanen" <juham.api@gmail.com>
-License: MIT License
-        ===========
-        
-        Copyright (c) 2024, Juha Meskanen
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        
-        
+License-Expression: MIT
 Project-URL: Homepage, https://gitlab.com/juham/juham
 Project-URL: Bug Reports, https://gitlab.com/juham/juham
 Project-URL: Funding, https://meskanen.com
@@ -36,18 +14,18 @@ Keywords: object-oriented,plugin,framework,watermeter,home automation
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
-Requires-Dist: juham-core>=0.1.2
+Requires-Dist: juham-core>=0.1.5
 Requires-Dist: numpy
 Requires-Dist: Pillow>=10.4.0
 Requires-Dist: opencv-python-headless>=4.10.0
 Requires-Dist: pytesseract>=0.3.13
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
+Dynamic: license-file
 
 Watermeter plugin for Juham™
 =============================

juham_watermeter-0.0.9.dist-info/RECORD

@@ -0,0 +1,13 @@
+juham_watermeter/__init__.py,sha256=kFVTpeSgFaXsJJ-uxxYf656Os-zVVVriEx5yAjY1XhE,412
+juham_watermeter/leakdetector.py,sha256=IOTlvsRQ7N6zC2kADMr2XjrPMBGFnSBac-PpqixiyZE,6369
+juham_watermeter/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+juham_watermeter/watermeter_imgdiff.py,sha256=OD8Wc6VVeJteuWgYsbbjwbeWnRywHkin9vBzXnMP5aQ,12071
+juham_watermeter/watermeter_ocr.py,sha256=b9DS_7tPPDS_BHrS34x0Rfh3kTotJVMZ9tmtdz8OWz4,9105
+juham_watermeter/watermeter_ts.py,sha256=T4nKoVNpgU53CDvSIRgEbm4oy1UiqET7xfRcg_OtoPI,3246
+juham_watermeter/webcamera.py,sha256=ogmF6AKgqR3XmmZdlst46ElKb6LAHNhc77983fKTptk,5724
+juham_watermeter-0.0.9.dist-info/licenses/LICENSE.rst,sha256=xCUTZIYDotncT_ibKn8nNVkUGiK05hJyOWypG8G7Evk,1074
+juham_watermeter-0.0.9.dist-info/METADATA,sha256=7v8APM-30gJFB4vyGW1-9wockQ0r9i4sYANQtQl__LU,3600
+juham_watermeter-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+juham_watermeter-0.0.9.dist-info/entry_points.txt,sha256=4KQZ-XUjd026JX-9dLAvw6e5XE6kdshWYE4pqDgeYtE,252
+juham_watermeter-0.0.9.dist-info/top_level.txt,sha256=kvbS5ION4k6uJwlJuWRNHIKPrOvpVldiWeNLWbqH2X0,17
+juham_watermeter-0.0.9.dist-info/RECORD,,

{juham_watermeter-0.0.7.dist-info → juham_watermeter-0.0.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.9.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

juham_watermeter-0.0.7.dist-info/RECORD

@@ -1,13 +0,0 @@
-juham_watermeter/__init__.py,sha256=kFVTpeSgFaXsJJ-uxxYf656Os-zVVVriEx5yAjY1XhE,412
-juham_watermeter/leakdetector.py,sha256=IOTlvsRQ7N6zC2kADMr2XjrPMBGFnSBac-PpqixiyZE,6369
-juham_watermeter/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-juham_watermeter/watermeter_imgdiff.py,sha256=njBhUJpAK5YH5Ob3HpHyqVCikIFtRB8mZ-lTAOObECg,12138
-juham_watermeter/watermeter_ocr.py,sha256=b9DS_7tPPDS_BHrS34x0Rfh3kTotJVMZ9tmtdz8OWz4,9105
-juham_watermeter/watermeter_ts.py,sha256=T4nKoVNpgU53CDvSIRgEbm4oy1UiqET7xfRcg_OtoPI,3246
-juham_watermeter/webcamera.py,sha256=Z7Yk_XcHC6-qk6uMVlUCFwhnRzII0la7QFCkyuFlTTI,5848
-juham_watermeter-0.0.7.dist-info/LICENSE.rst,sha256=xCUTZIYDotncT_ibKn8nNVkUGiK05hJyOWypG8G7Evk,1074
-juham_watermeter-0.0.7.dist-info/METADATA,sha256=tUds1LkMKcZcrKdmx9nw4dFb0tzD7vL7bl6CY7swsI8,4865
-juham_watermeter-0.0.7.dist-info/WHEEL,sha256=EaM1zKIUYa7rQnxGiOCGhzJABRwy4WO57rWMR3_tj4I,91
-juham_watermeter-0.0.7.dist-info/entry_points.txt,sha256=4KQZ-XUjd026JX-9dLAvw6e5XE6kdshWYE4pqDgeYtE,252
-juham_watermeter-0.0.7.dist-info/top_level.txt,sha256=kvbS5ION4k6uJwlJuWRNHIKPrOvpVldiWeNLWbqH2X0,17
-juham_watermeter-0.0.7.dist-info/RECORD,,