Merge pull request #359 from killer0071234/forecast-test

First forecast test version

Author: killer0071234

.devcontainer/devcontainer.json

@@ -8,7 +8,6 @@
     "vscode": {
       "extensions": [
         "ms-python.vscode-pylance",
-        "visualstudioexptteam.vscodeintellicode",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",
         "GitHub.vscode-pull-request-github"

.flake8

@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 88
-ignore = D202,E501,W503
+ignore = D202,E203,E501,W503
 per-file-ignores = tests/*:DAR,S101

.pre-commit-config.yaml

@@ -18,6 +18,8 @@ repos:
     rev: 1.7.4
     hooks:
       - id: bandit
+        additional_dependencies:
+          - pbr
         args:
           - --quiet
           - --format=custom
@@ -58,6 +60,12 @@ repos:
         files: ^(src|examples|tests)/.+\.py$
   - repo: local
     hooks:
+      - id: isort
+        name: isort
+        entry: isort
+        language: system
+        types: [python]
+        args: [--profile=black]
       - id: black
         name: black
         entry: black
@@ -70,16 +78,10 @@ repos:
         language: system
         types: [python]
         require_serial: true
-      - id: reorder-python-imports
-        name: Reorder python imports
-        entry: reorder-python-imports
-        language: system
-        types: [python]
-        args: [--application-directories=src]
       - id: pytest
         name: 🧪 Running tests and test coverage with pytest
         language: system
         types: [python]
-        entry: poetry run pytest
+        entry: bash -c 'poetry run python -m coverage --version >/dev/null 2>&1 && poetry run python -m coverage run -m pytest && poetry run python -m coverage report -m || poetry run pytest'
         pass_filenames: false
         always_run: true

.vscode/launch.json

@@ -6,18 +6,26 @@
   "configurations": [
     {
       "name":"Python: Current File",
-      "type":"python",
+      "type":"debugpy",
       "request":"launch",
       "module":"${file}",
       "console":"integratedTerminal"
     },
     {
       "name": "Python: Run (control.py)",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "module": "control",
       "justMyCode": false,
       "args": ["--debug", "-c", "config"]
     },
+    {
+      "name": "Python: Run (forecast_test.py)",
+      "type": "debugpy",
+      "request": "launch",
+      "module": "forecast_test",
+      "justMyCode": false,
+      "args": ["--debug", "-c", "config"]
+    },
   ]
 }

Dockerfile.dev

@@ -1,27 +1,22 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.11
+FROM mcr.microsoft.com/devcontainers/python:3.13
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN \
-    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-    && apt-get update \
+    apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         # Additional library needed by some tests and accordingly by VScode Tests Discovery
         git \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /usr/src
-
 WORKDIR /workspaces
 
 # Install Python dependencies from requirements
 COPY requirements.txt ./
 COPY .github/workflows/constraints.txt ./
-RUN pip3 install -r requirements.txt
-RUN pip3 install -r constraints.txt
-RUN rm -rf requirements.txt
-RUN rm -rf constraints.txt
+RUN pip3 install -r requirements.txt -c constraints.txt \
+    && rm -f requirements.txt constraints.txt
 
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash

README.md

@@ -42,7 +42,7 @@ async def main():
         async with src.zamg.zamg.ZamgData() as zamg:
             # option to disable verify of ssl check
             zamg.verify_ssl = False
-            # trying to read zamg station id of the closest station
+            # trying to read GeoSphere Austria station id of the closest station
             data = await zamg.closest_station(46.99, 15.499)
             # set closest station as default one to read
             zamg.set_default_station(data)
@@ -69,7 +69,7 @@ async def main():
                     + str(zamg.get_data(parameter=param, data_type="unit"))
                 )
             print("last update: %s", zamg.last_update)
-    except (ZamgError) as exc:
+    except ZamgError as exc:
         print(exc)
 
 

control.py

@@ -1,5 +1,6 @@
 # pylint: disable=W0621
 """Asynchronous Python client for GeoSphere Austria weather data."""
+
 import asyncio
 
 import src.zamg.zamg

examples/read_data.py

@@ -1,5 +1,6 @@
 # pylint: disable=W0621
 """Asynchronous Python client for GeoSphere Austria weather data."""
+
 import asyncio
 from os import curdir
 

forecast.py

@@ -0,0 +1,61 @@
+# pylint: disable=W0621
+"""Asynchronous Python client for GeoSphere Austria weather data."""
+
+import asyncio
+
+import src.zamg.zamg
+from src.zamg.exceptions import ZamgError
+
+
+async def main():
+    """Sample of getting data"""
+    try:
+        async with src.zamg.zamg.ZamgData() as zamg:
+            # option to disable verify of ssl check
+            zamg.verify_ssl = False
+
+            # data = await zamg.zamg_stations()
+
+            # print(f"forecast_metadata: {zamg.forecast_metadata}")
+            # print(f"get_forecast_all_parameters: {zamg.get_forecast_all_parameters()}")
+
+            data = await zamg.get_forecast("46.99,15.499", current_only=True)
+            print(f"get_forecast(current_only=True): {data}")
+            data = await zamg.get_forecast("46.99,15.499", current_only=False)
+            print(f"get_forecast(current_only=False): {data}")
+
+            return
+
+            # trying to read GeoSphere Austria station id of the closest station
+            data = await zamg.closest_station(46.99, 15.499)
+            # set closest station as default one to read
+            zamg.set_default_station(data)
+            print("closest_station = " + str(zamg.get_station_name) + " / " + str(data))
+            # print list with all possible parameters
+            print(f"Possible station parameters: {zamg.get_all_parameters()}")
+            # set parameters directly
+            zamg.station_parameters = "TL,SO"
+            # or set parameters as list
+            zamg.set_parameters(("TL", "SO"))
+            # if none of the above parameters are set, all possible parameters are read
+            # do an update
+            await zamg.update()
+
+            print(f"---------- Weather for station {zamg.get_station_name} ({data})")
+            for param in zamg.get_parameters():
+                print(
+                    str(param)
+                    + " -> "
+                    + str(zamg.get_data(parameter=param, data_type="name"))
+                    + " -> "
+                    + str(zamg.get_data(parameter=param))
+                    + " "
+                    + str(zamg.get_data(parameter=param, data_type="unit"))
+                )
+            print("last update: %s", zamg.last_update)
+    except ZamgError as exc:
+        print(exc)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zamg",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "private": true,
   "description": "Asynchronous Python client for GeoSphere Austria (ZAMG) weather data.",
   "scripts": {