Fix ecowitt service (#13)

- Update dependencies
  - Update to Py3.13
- Add `iotdevice_list` to Ecowitt Device model
- Fix Solar, UVIndex and Wind graphs

Author: Buried-In-Code

.editorconfig

@@ -9,36 +9,14 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 max_line_length = 100
 
-[*.cs]
-indent_size = 4
-insert_final_newline = false
-
 [{*.html,*.jte,*.kte,*.jinja}]
 indent_size = 4
 insert_final_newline = false
 max_line_length = off
 
-[*.java]
-indent_size = 4
-insert_final_newline = false
-
 [*.json]
 insert_final_newline = false
 
-[{*.kt,*.kts}]
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
-ij_kotlin_packages_to_use_import_on_demand = unset
-indent_size = 4
-ktlint_code_style = ktlint_official
-ktlint_standard = enabled
-ktlint_experimental = disabled
-ktlint_standard_string-template-indent = disabled
-ktlint_standard_multiline-expression-wrapping = disabled
-ktlint_function_signature_body_expression_wrapping = multiline
-max_line_length = 140
-
 [*.md]
 trim_trailing_whitespace = false
 max_line_length = off

.gitignore

@@ -2,21 +2,17 @@
 __pycache__/
 __pypackages__/
 .idea/
-.pytest_cache/
 .ruff_cache/
-.tox/
 .venv/
-.vscode/
 build/
 dist/
 logs/
 
 # =====Files=====
-*.csv
 *.iml
-.coverage
-.pdm.toml
+*.log
+.envrc
+.pdm-python
 .python-version
-
-# =====Project=====
 pdm.lock
+uv.lock

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.2
+    rev: v0.9.1
     hooks:
       - id: ruff-format
       - id: ruff
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: 0.7.21
     hooks:
       - id: mdformat
         additional_dependencies:
@@ -15,7 +15,7 @@ repos:
           - --number
           - --wrap=keep
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-ast
       - id: check-builtin-literals
@@ -37,7 +37,7 @@ repos:
         args:
           - --markdown-linebreak-ext=md
   - repo: https://github.com/pappasam/toml-sort
-    rev: v0.23.1
+    rev: v0.24.2
     hooks:
       - id: toml-sort
         args:

Dockerfile

@@ -1,19 +1,24 @@
-FROM python:3.11
+FROM python:3.13
 
 WORKDIR /app
 
 COPY weatherdan /app/weatherdan
-COPY static /app/static
-COPY templates /app/templates
 COPY pyproject.toml README.md run.py /app/
 
 RUN pip install --no-cache-dir .[postgres]
 
-ENV XDG_CACHE_HOME /app/cache
-ENV XDG_CONFIG_HOME /app/config
-RUN mkdir -p $XDG_CONFIG_HOME/weatherdan
-ENV XDG_DATA_HOME /app/data
-RUN mkdir -p $XDG_DATA_HOME/weatherdan
+ENV XDG_CACHE_HOME=/app/cache \
+    XDG_CONFIG_HOME=/app/config \
+    XDG_DATA_HOME=/app/data \
+    XDG_STATE_HOME=/app/state
+
+RUN mkdir -p $XDG_CACHE_HOME \
+    && mkdir -p $XDG_CONFIG_HOME/weatherdan \
+    && mkdir -p $XDG_DATA_HOME/weatherdan \
+    && mkdir -p $XDG_STATE_HOME/weatherdan
+
+COPY static /app/static
+COPY templates /app/templates
 
 EXPOSE 25710
 

README.md

@@ -1,13 +1,10 @@
-<img src="./static/img/logo.png" align="left" width="128" height="128" alt="Weatherdan Logo"/>
-
 # Weatherdan
 
-![Python](https://img.shields.io/badge/Python-3.11-green?style=flat-square)
+![Python](https://img.shields.io/badge/Python-3.13-green?style=flat-square)
 ![Status](https://img.shields.io/badge/Status-Beta-yellowgreen?style=flat-square)
 
-[![Rye](https://img.shields.io/badge/Rye-informational?style=flat-square&logo=rye&labelColor=grey)](https://rye.astral.sh)
-[![Pre-Commit](https://img.shields.io/badge/Pre--Commit-informational?style=flat-square&logo=pre-commit&labelColor=grey)](https://github.com/pre-commit/pre-commit)
-[![Ruff](https://img.shields.io/badge/Ruff-informational?style=flat-square&logo=ruff&labelColor=grey)](https://github.com/astral-sh/ruff)
+[![Pre-Commit](https://img.shields.io/badge/pre--commit-enabled-informational?logo=pre-commit&style=flat-square)](https://github.com/pre-commit/pre-commit)
+[![Ruff](https://img.shields.io/badge/ruff-enabled-informational?logo=ruff&style=flat-square)](https://github.com/astral-sh/ruff)
 
 [![Github - Version](https://img.shields.io/github/v/tag/Buried-In-Code/Weatherdan?logo=Github&label=Version&style=flat-square)](https://github.com/Buried-In-Code/Weatherdan/tags)
 [![Github - License](https://img.shields.io/github/license/Buried-In-Code/Weatherdan?logo=Github&label=License&style=flat-square)](https://opensource.org/licenses/MIT)
@@ -18,20 +15,14 @@ Currently, tracks total Rainfall and high, average and low for Solar, UV Index a
 
 ## Usage
 
-### via Pip
+### via uv
 
-1. Make sure you have a supported version of [Python](https://www.python.org/) installed: `python --version`
+1. Make sure you have [uv](https://docs.astral.sh/uv/) installed: `uv --version`
 2. Clone the repo: `git clone https://github.com/Buried-In-Code/Weatherdan`
-3. Install the project: `pip install .`
-4. Run using: `Weatherdan`
-
-### via Pipx
-
-1. Make sure you have [Pipx](https://github.com/pypa/pipx) installed: `pipx --version`
-2. Install the project `pipx install git+https://github.com/Buried-In-Code/Weatherdan.git`
-3. Run using: `Weatherdan`
+3. Install the project: `uv sync`
+4. Run using: `uv run run.py`
 
-### via Docker-Compose
+### via Docker Compose
 
 1. Make sure you have [Docker](https://www.docker.com/) installed: `docker --version`
 2. Make sure you have [Docker-Compose](https://github.com/docker/compose) installed: `docker-compose --version`
@@ -49,8 +40,10 @@ services:
     ports:
       - '25710:25710'
     volumes:
+      - './cache:/app/cache'
       - './config:/app/config'
       - './data:/app/data'
+      - './state:/app/state'
 ```
 
 4. Run using: `docker-compose up -d`

pyproject.toml

@@ -2,55 +2,76 @@
 build-backend = "hatchling.build"
 requires = ["hatchling"]
 
+[dependency-groups]
+dev = [
+  "pre-commit >= 4.0.1"
+]
+tests = [
+  "pytest >= 8.3.4",
+  "pytest-cov >= 6.0.0",
+  "tox >= 4.23.2",
+  "tox-uv >= 1.17.0"
+]
+
 [project]
 authors = [
   {email = "BuriedInCode@tuta.io", name = "BuriedInCode"}
 ]
 classifiers = [
   "Development Status :: 4 - Beta",
+  "Framework :: Pydantic :: 2",
   "Intended Audience :: End Users/Desktop",
   "License :: OSI Approved :: MIT License",
   "Natural Language :: English",
   "Operating System :: MacOS",
   "Operating System :: Microsoft :: Windows",
   "Operating System :: POSIX :: Linux",
-  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.13",
   "Typing :: Typed"
 ]
 dependencies = [
-  "fastapi >= 0.104.1",
-  "jinja2 >= 3.1.2",
-  "pydantic >= 2.5.2",
+  "fastapi >= 0.115.6",
+  "jinja2 >= 3.1.5",
+  "pydantic >= 2.10.5",
   "ratelimit >= 2.2.1",
-  "requests >= 2.31.0",
-  "rich >= 13.7.0",
-  "sqlmodel>=0.0.19",
-  "tomli-w >= 1.0.0",
-  "uvicorn >= 0.24.0"
+  "requests >= 2.32.3",
+  "rich >= 13.9.4",
+  "sqlmodel >= 0.0.22",
+  "tomli-w >= 1.1.0",
+  "uvicorn >= 0.34.0"
 ]
 description = "Rainfall tracking system using Ecowitt."
 dynamic = ["version"]
 keywords = []
 license = {text = "MIT"}
 name = "weatherdan"
 readme = "README.md"
-requires-python = ">= 3.11"
+requires-python = ">= 3.13"
 
 [project.optional-dependencies]
 postgres = [
-  "psycopg >= 3.1.19"
+  "psycopg >= 3.2.3"
 ]
 
-[project.scripts]
-Weatherdan = "run:main"
-
 [project.urls]
 Issues = "https://github.com/Buried-In-Code/Weatherdan/issues"
 Source = "https://github.com/Buried-In-Code/Weatherdan"
 
+[tool.coverage.report]
+show_missing = true
+
+[tool.coverage.run]
+source = ["weatherdan"]
+
+[tool.hatch.build.targets.sdist]
+exclude = [".github/"]
+
 [tool.hatch.version]
 path = "weatherdan/__init__.py"
 
+[tool.pytest.ini_options]
+addopts = ["--cov"]
+
 [tool.ruff]
 fix = true
 line-length = 100
@@ -68,7 +89,6 @@ ignore = [
   "COM812",
   "D",
   "DTZ",
-  "EXE",
   "FBT",
   "PLR2004",
   "TCH"
@@ -101,7 +121,5 @@ convention = "google"
 [tool.ruff.lint.pyupgrade]
 keep-runtime-typing = true
 
-[tool.rye]
-dev-dependencies = [
-  "pre-commit >= 3.7.1"
-]
+[tool.tomlsort]
+all = true