juham-visualcrossing 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

juham_visualcrossing/visualcrossing.py

@@ -2,7 +2,7 @@ from datetime import datetime, timedelta, timezone
 import json
 from typing_extensions import override
 from typing import Any, Optional, cast
-from masterpiece.mqtt import MqttMsg, Mqtt
+from masterpiece import MqttMsg, Mqtt
 from juham_core import JuhamThread, JuhamCloudThread
 
 
@@ -68,7 +68,7 @@ class VisualCrossingThread(JuhamCloudThread):
     def process_data(self, data: Any) -> None:
         self.info("VisualCrossing process_data()")
         data = data.json()
-        forecast = []
+        forecast: list[dict[str, Any]] = []
         self.info(f"VisualCrossing {data}")
         for day in data["days"]:
             for hour in day["hours"]:
@@ -113,6 +113,8 @@ class VisualCrossing(JuhamThread):
     update_interval.
     """
 
+    _VISUALCROSSING: str = "visualcrossing"
+
     workerThreadId: str = VisualCrossingThread.get_class_id()
     base_url: str = (
         "https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/"
@@ -121,7 +123,7 @@ class VisualCrossing(JuhamThread):
     api_key: str = "SE9W7EHP775N7NDNW8ANM2MZN"
     location: str = "lahti,finland"
 
-    def __init__(self, name="visualcrossing") -> None:
+    def __init__(self, name: str = "visualcrossing") -> None:
         """Constructs VisualCrossing automation object for acquiring and publishing
         forecast data.
 
@@ -148,11 +150,11 @@ class VisualCrossing(JuhamThread):
         else:
             super().on_message(client, userdata, msg)
 
-    def on_forecast(self, em: dict) -> None:
+    def on_forecast(self, em: dict[str, Any]) -> None:
         """Handle weather forecast data.
 
         Args:
-            em (dict): forecast
+            em (dict[str, Any]): forecast
         """
         # self.debug(f"VisualCrossing: got mqtt message {em}")
 
@@ -176,19 +178,20 @@ class VisualCrossing(JuhamThread):
         super().run()
 
     @override
-    def to_dict(self) -> dict:
-        data = super().to_dict()
-        data["_visualcrossing"] = {
-            "topic": self.forecast_topic,
-            "url": self.base_url,
+    def to_dict(self) -> dict[str, Any]:
+        data: dict[str, dict[str, Any]] = super().to_dict()
+        data[self._VISUALCROSSING] = {
+            "forecast_topic": self.forecast_topic,
+            "base_url": self.base_url,
             "api_key": self.api_key,
-            "interval": self.update_interval,
+            "update_interval": self.update_interval,
+            "location": self.location,
         }
         return data
 
     @override
-    def from_dict(self, data) -> None:
+    def from_dict(self, data: dict[str, Any]) -> None:
         super().from_dict(data)
-        if "_visualcrossing" in data:
-            for key, value in data["_visualcrossing"].items():
+        if self._VISUALCROSSING in data:
+            for key, value in data[self._VISUALCROSSING].items():
                 setattr(self, key, value)

juham_visualcrossing/visualcrossing_plugin.py

@@ -1,4 +1,3 @@
-from ast import Str
 from typing_extensions import override
 from masterpiece import Plugin, Composite
 from .visualcrossing import VisualCrossing

{juham_visualcrossing-0.1.8.dist-info → juham_visualcrossing-0.1.9.dist-info}/METADATA

@@ -1,32 +1,10 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: juham-visualcrossing
-Version: 0.1.8
+Version: 0.1.9
 Summary: A Weather forecast  plugin extending `Juham` applications
 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/juham-visualcrossing
 Project-URL: Bug Reports, https://gitlab.com/juham/juham/juham-visualcrossing
 Project-URL: Funding, https://meskanen.com
@@ -36,15 +14,15 @@ Keywords: object-oriented,plugin,framework
 Classifier: Development Status :: 3 - 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/x-rst
 License-File: LICENSE.rst
-Requires-Dist: juham-core>=0.1.1
+Requires-Dist: juham-core>=0.1.5
 Requires-Dist: pytz>=2024.1
 Provides-Extra: dev
 Requires-Dist: check-manifest; extra == "dev"
+Dynamic: license-file
 
 VisualCrossing forecast plugin for Juham™
 =========================================

juham_visualcrossing-0.1.9.dist-info/RECORD

@@ -0,0 +1,10 @@
+juham_visualcrossing/__init__.py,sha256=7Xv5LN6-LEd9cpYZBrQqQshEScEkoMyWrTcZE9IkE8o,282
+juham_visualcrossing/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+juham_visualcrossing/visualcrossing.py,sha256=6plkxOS0jTwuBk-Lg9zaw_mETAhyYUeOMlPl8cOyncY,7228
+juham_visualcrossing/visualcrossing_plugin.py,sha256=nhm05gczzpkc_KEja-Mk1U5cgnwClHEIgVEw1P_sGFc,605
+juham_visualcrossing-0.1.9.dist-info/licenses/LICENSE.rst,sha256=xCUTZIYDotncT_ibKn8nNVkUGiK05hJyOWypG8G7Evk,1074
+juham_visualcrossing-0.1.9.dist-info/METADATA,sha256=AB2tMjyFYEhsi4pU3wqYNccnW1ziMZ5Hoy2VPgfQ07E,1710
+juham_visualcrossing-0.1.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+juham_visualcrossing-0.1.9.dist-info/entry_points.txt,sha256=BMRgZy0x03nSQfh37apI68H1nlgU0bGsvkV6LrnF1eI,82
+juham_visualcrossing-0.1.9.dist-info/top_level.txt,sha256=7yWaUHZo-Ng96VJBzUFhaFCBamL71PUjIxZISxMBjSM,21
+juham_visualcrossing-0.1.9.dist-info/RECORD,,

{juham_visualcrossing-0.1.8.dist-info → juham_visualcrossing-0.1.9.dist-info}/WHEEL

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

juham_visualcrossing-0.1.8.dist-info/RECORD

@@ -1,10 +0,0 @@
-juham_visualcrossing/__init__.py,sha256=7Xv5LN6-LEd9cpYZBrQqQshEScEkoMyWrTcZE9IkE8o,282
-juham_visualcrossing/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-juham_visualcrossing/visualcrossing.py,sha256=N0z3UZAlelHXXg0z9OFMvkWQO6pgZBGPmS7AU_ZTxrc,7017
-juham_visualcrossing/visualcrossing_plugin.py,sha256=Qj9On-gcobpErjBJ4jEvSnAAaQor7sbPCUFq-XxIalA,625
-juham_visualcrossing-0.1.8.dist-info/LICENSE.rst,sha256=xCUTZIYDotncT_ibKn8nNVkUGiK05hJyOWypG8G7Evk,1074
-juham_visualcrossing-0.1.8.dist-info/METADATA,sha256=oVcKuuXZ5138udzQQN4gerP4grarFPalAWqlUeFoRDU,2975
-juham_visualcrossing-0.1.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-juham_visualcrossing-0.1.8.dist-info/entry_points.txt,sha256=BMRgZy0x03nSQfh37apI68H1nlgU0bGsvkV6LrnF1eI,82
-juham_visualcrossing-0.1.8.dist-info/top_level.txt,sha256=7yWaUHZo-Ng96VJBzUFhaFCBamL71PUjIxZISxMBjSM,21
-juham_visualcrossing-0.1.8.dist-info/RECORD,,